From e1d8629ade2885fcdd1b61c68a339ace7033975b Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Mon, 19 Oct 2026 15:36:43 -0700
Subject: [PATCH 001/207] fix(native-chat): one ownership index with link
 roles, and a chat refuses to start while a terminal writes its conversation

Each chat link now carries its role (head or earlier) and key; Session History names
the chat continuing a conversation first, duplicate adoption checks only head links in
both the pre-commit check and the store transaction, and terminal resumes stay refused
exactly as before. The terminal-writer check now also runs inside acquireOwner before
the spawn, refusing with the typed pre-spawn reason conversationOpenInTerminal.
---
 ...ructured-session-ownership.test-support.ts |  26 +++-
 .../structured-session-ownership.test.ts      |  36 +++++
 .../ai-vault/structured-session-ownership.ts  |  73 +++++----
 .../structured-agent-session-acquisition.ts   |   9 ++
 .../structured-agent-session-adapter.ts       |   1 +
 .../structured-agent-session-attach-flow.ts   |   2 +
 ...ured-agent-session-attach-orchestration.ts |   3 +
 .../structured-agent-session-failure-text.ts  |   3 +-
 .../structured-agent-session-host-types.ts    |   2 +
 ...nt-session-terminal-writer-acquire.test.ts | 138 ++++++++++++++++++
 .../structured-provider-session-ownership.ts  |  61 ++++++--
 ...red-agent-session-history-adoption.test.ts |   9 +-
 ...ructured-agent-session-history-adoption.ts |  10 +-
 .../structured-conversation-key.ts            |  63 ++++++++
 ...gent-session-reservation-admission.test.ts |  23 +++
 .../agent-session-reservation-admission.ts    |  18 ++-
 .../structured-session-cli-writer-host.ts     |  17 +++
 .../structured-session-create-support.ts      |   4 +-
 .../structured-agent-session-runtime.ts       |   3 +
 .../workspace-process-listing-dependencies.ts |   4 +
 .../workspaces/workspace-process-listing.ts   |   1 +
 .../agent-session-failure-words-text.ts       |   6 +
 .../tab-bar/cli-chat-resume-feedback.ts       |   8 +
 .../src/i18n/en-runtime-required.json         |   1 +
 src/renderer/src/i18n/locales/en.json         |   1 +
 src/renderer/src/i18n/locales/es.json         |   1 +
 src/renderer/src/i18n/locales/fr.json         |   1 +
 src/renderer/src/i18n/locales/ja.json         |   1 +
 src/renderer/src/i18n/locales/ko.json         |   1 +
 src/renderer/src/i18n/locales/zh.json         |   1 +
 .../agent-session-attachment-failure-words.ts |  43 ++++++
 src/shared/agent-session-failure-copy.ts      |   2 +
 src/shared/agent-session-failure-words.ts     |  36 +----
 src/shared/agent-session-failure.ts           |   1 +
 src/shared/agent-session-refusal-details.ts   |   2 +
 .../agent-session-refusal-reason-words.ts     |   1 +
 ...ctured-agent-session-dispatch-rejection.ts |   2 +
 37 files changed, 521 insertions(+), 93 deletions(-)
 create mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts
 create mode 100644 src/main/native-chat/structured-conversation-key.ts
 create mode 100644 src/shared/agent-session-attachment-failure-words.ts

diff --git a/src/main/ai-vault/structured-session-ownership.test-support.ts b/src/main/ai-vault/structured-session-ownership.test-support.ts
index f1b8048549b9..51f1b60bc6b5 100644
--- a/src/main/ai-vault/structured-session-ownership.test-support.ts
+++ b/src/main/ai-vault/structured-session-ownership.test-support.ts
@@ -18,12 +18,12 @@ export const PROVIDER_SESSION = '019fd532-7c11-7a90-b6de-4e1a2c3d5f60'
 /** Installs a host whose one record owns a conversation: by default a Codex chat on
  *  PROVIDER_SESSION, or the agent `handle` names. */
 export function installOwnership(
-  overrides: Partial<StructuredProviderSessionOwnership> & {
+  overrides: Partial<Omit<StructuredProviderSessionOwnership, 'role' | 'key'>> & {
     handle?: AgentSessionProviderHandle
   } = {}
 ): void {
   const { handle, ...ownershipOverrides } = overrides
-  const ownership: StructuredProviderSessionOwnership = {
+  const ownership: Omit<StructuredProviderSessionOwnership, 'role' | 'key'> = {
     sessionId: 'session-alpha',
     workspaceId: 'workspace-1',
     provider: handle?.agent ?? 'codex',
@@ -90,6 +90,28 @@ export function installCopyingChat(
   } as never)
 }
 
+/** A live Codex chat whose chain held `threadIds` in order; the last is its head. */
+export function codexChatHolding(sessionId: string, threadIds: string[]): AgentSessionRecord {
+  const lease = { ...agentSessionLeaseFixture(), sessionId }
+  const fixture = agentSessionRecordFixture(lease)
+  return {
+    ...fixture,
+    sessionId,
+    provider: 'codex',
+    providerHandleChain: threadIds.map((threadId, index) => ({
+      ...fixture.providerHandleChain[0]!,
+      linkId: `${sessionId}-${index}`,
+      handle: codexProviderHandle(threadId)
+    })),
+    lease
+  }
+}
+
+export function installChats(records: AgentSessionRecord[]): void {
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the ownership read touches only `deps.store.listRecords`; the rest of the host is never reached.
+  setStructuredAgentSessionHost({ deps: { store: { listRecords: () => records } } } as never)
+}
+
 export function listResult(): AiVaultListResult {
   const session: AiVaultSession = {
     id: `local:codex:${PROVIDER_SESSION}`,
diff --git a/src/main/ai-vault/structured-session-ownership.test.ts b/src/main/ai-vault/structured-session-ownership.test.ts
index 3cda409fbadc..53367be93765 100644
--- a/src/main/ai-vault/structured-session-ownership.test.ts
+++ b/src/main/ai-vault/structured-session-ownership.test.ts
@@ -4,12 +4,15 @@ import { setStructuredAgentSessionHost } from '../native-chat/agent-session-wire
 import {
   assertLegacyAiVaultResumeAllowed,
   assertLegacyAiVaultResumeCommandAllowed,
+  findResumeOwnership,
   OPENS_EVERY_STRUCTURED_CHAT,
   projectStructuredAiVaultSearchResponse,
   projectStructuredAiVaultSessions
 } from './structured-session-ownership'
 import type { AiVaultSearchHit, AiVaultSearchResponse } from '../../shared/ai-vault-search-types'
 import {
+  codexChatHolding,
+  installChats,
   installOwnership,
   listResult,
   PROVIDER_SESSION
@@ -108,6 +111,39 @@ describe('structured AI Vault ownership', () => {
     }
   )
 
+  it('names the chat continuing a conversation first, while every link still refuses a terminal', async () => {
+    const movedOn = codexChatHolding('session-moved', [PROVIDER_SESSION, OTHER_SESSION])
+    const owned = (records: ReturnType<typeof codexChatHolding>[]) => {
+      installChats(records)
+      return projectStructuredAiVaultSessions(listResult(), OPENS_EVERY_STRUCTURED_CHAT).sessions[0]
+        ?.structuredSession?.sessionId
+    }
+    expect(owned([movedOn, codexChatHolding('session-now', [PROVIDER_SESSION])])).toBe(
+      'session-now'
+    )
+    expect(owned([movedOn])).toBe('session-moved')
+    expect(
+      findResumeOwnership({ agent: 'codex', sessionId: PROVIDER_SESSION, filePath: '' })
+    ).toMatchObject({
+      sessionId: 'session-moved',
+      role: 'earlier'
+    })
+    expect(() =>
+      assertLegacyAiVaultResumeAllowed({
+        agent: 'codex',
+        filePath: `/sessions/rollout-${PROVIDER_SESSION}.jsonl`,
+        codexHome: null,
+        executionHostId: 'local'
+      })
+    ).toThrow('agent_session_conflict')
+    await expect(
+      assertLegacyAiVaultResumeCommandAllowed(
+        `codex resume ${PROVIDER_SESSION}`,
+        async () => undefined
+      )
+    ).rejects.toThrow('agent_session_conflict')
+  })
+
   it('derives typed refusals from the single writer predicate for live and proving leases', async () => {
     installOwnership()
     expect(() =>
diff --git a/src/main/ai-vault/structured-session-ownership.ts b/src/main/ai-vault/structured-session-ownership.ts
index e2551eab731f..2bd9640c3193 100644
--- a/src/main/ai-vault/structured-session-ownership.ts
+++ b/src/main/ai-vault/structured-session-ownership.ts
@@ -9,6 +9,7 @@ import { getStructuredAgentSessionHost } from '../native-chat/agent-session-wire
 import { ensureStructuredAgentSessionHostUnlessRefused } from '../runtime/structured-agent-session-host-refusal'
 import {
   listStructuredProviderSessionOwnership,
+  terminalResumeBlocked,
   type StructuredProviderSessionOwnership
 } from '../native-chat/agent-session-wire/structured-provider-session-ownership'
 import type { StructuredAgentId } from '../../shared/agent-session-provider-handle'
@@ -115,7 +116,8 @@ function ownedRow(rowAgent: string, ownership: StructuredProviderSessionOwnershi
     : { structuredSession }
 }
 
-/** One index per projection: a list holds hundreds of rows, each once searched every record. */
+/** One index per projection: a list holds hundreds of rows, each once searched every record. A row
+ *  names the chat continuing its conversation now, else one whose chain held it earlier. */
 function ownershipLookup():
   | ((row: { agent: string; sessionId: string }) => StructuredProviderSessionOwnership | null)
   | null {
@@ -125,18 +127,16 @@ function ownershipLookup():
   const byProviderSession = new Map<string, StructuredProviderSessionOwnership>()
   for (const ownership of listOwnership()) {
     const key = `${ownership.provider}\0${ownership.providerSessionId}`
-    if (!byProviderSession.has(key)) {
+    const kept = byProviderSession.get(key)
+    if (!kept || (kept.role !== 'head' && ownership.role === 'head')) {
       byProviderSession.set(key, ownership)
     }
   }
   return (row) => {
-    for (const owner of historyRowOwners(row.agent)) {
-      const ownership = byProviderSession.get(`${owner}\0${row.sessionId}`)
-      if (ownership) {
-        return ownership
-      }
-    }
-    return null
+    const found = historyRowOwners(row.agent).flatMap(
+      (owner) => byProviderSession.get(`${owner}\0${row.sessionId}`) ?? []
+    )
+    return found.find((ownership) => ownership.role === 'head') ?? found[0] ?? null
   }
 }
 
@@ -157,50 +157,63 @@ function historyRowOwners(rowAgent: string): readonly StructuredAgentId[] {
 
 export function assertLegacyAiVaultResumeAllowed(args: AiVaultPrepareSessionResumeArgs): void {
   // A fork writes a new conversation, and preparing its home never writes this one.
-  const ownership = args.fork ? null : findResumeOwnership(args)
-  if (ownership) {
-    refuseLegacyWriter(ownership)
+  const blocking = args.fork ? undefined : resumeOwnerships(args).find(terminalResumeBlocked)
+  if (blocking) {
+    refuseLegacyWriter(blocking)
   }
 }
 
-export async function assertLegacyAiVaultResumeCommandAllowed(
+/** A terminal resume a command asks for: the chat agent whose conversations it names, and the
+ *  conversation (null: any of that agent's). */
+export type AdmittedResumeInvocation = { provider: StructuredAgentId; target: string | null }
+
+/** Refuses a command resuming a conversation a chat holds; otherwise `register` runs in the same
+ *  synchronous step as the check, so a chat starting meanwhile sees what it registered. */
+export async function assertLegacyAiVaultResumeCommandAllowed<T>(
   command: string,
-  ensureHost: () => Promise<void>
-): Promise<void> {
+  ensureHost: () => Promise<void>,
+  register?: (invocations: AdmittedResumeInvocation[]) => T
+): Promise<T | undefined> {
   const invocations = parseResumeInvocations(command)
   if (invocations.length === 0) {
-    return
+    return undefined
   }
   // A terminal command is not a chat: with chats refused here there is no ownership to check.
   await ensureStructuredAgentSessionHostUnlessRefused(ensureHost)
-  const host = getStructuredAgentSessionHost()
-  if (!host) {
-    return
-  }
   for (const ownership of listOwnership()) {
-    if (invocations.some((invocation) => resumesOwnedSession(invocation, ownership))) {
+    if (
+      terminalResumeBlocked(ownership) &&
+      invocations.some((invocation) => resumesOwnedSession(invocation, ownership))
+    ) {
       refuseLegacyWriter(ownership)
     }
   }
+  return register?.(invocations.map(({ provider, target }) => ({ provider, target })))
 }
 
-/** The chat that owns the row a resume or fork names; null when none does. */
+/** Any chat whose chain ever held the row a resume or fork names; null when none did. */
 export function findResumeOwnership(
   args: Pick<AiVaultPrepareSessionResumeArgs, 'agent' | 'sessionId' | 'filePath'>
 ): StructuredProviderSessionOwnership | null {
+  return resumeOwnerships(args)[0] ?? null
+}
+
+/** Every link naming the row, those matched by id first. */
+function resumeOwnerships(
+  args: Pick<AiVaultPrepareSessionResumeArgs, 'agent' | 'sessionId' | 'filePath'>
+): StructuredProviderSessionOwnership[] {
   const owners = new Set(historyRowOwners(args.agent))
   if (owners.size === 0) {
-    return null
+    return []
   }
   const owned = listOwnership().filter((ownership) => owners.has(ownership.provider))
   const fileName = args.filePath.split(/[\\/]/).at(-1) ?? ''
-  return (
-    (args.sessionId
-      ? owned.find((ownership) => ownership.providerSessionId === args.sessionId)
-      : undefined) ??
-    owned.find((ownership) => fileName.includes(ownership.providerSessionId)) ??
-    null
-  )
+  return [
+    ...(args.sessionId
+      ? owned.filter((ownership) => ownership.providerSessionId === args.sessionId)
+      : []),
+    ...owned.filter((ownership) => fileName.includes(ownership.providerSessionId))
+  ]
 }
 
 function listOwnership(): StructuredProviderSessionOwnership[] {
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition.ts
index dac32c5e34ec..5a2028e82fc3 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition.ts
@@ -45,6 +45,15 @@ export async function acquireOwner(
       throw new AgentSessionPreSpawnError(error)
     }
     const permissionMode = await input.launchPermissionMode?.(record)
+    try {
+      await input.assertNoTerminalWriter?.(record)
+    } catch (error) {
+      // Not a code: a code message would travel as the census's own conflict, not this reason.
+      throw new AgentSessionPreSpawnError(error, {
+        reason: 'conversationOpenInTerminal',
+        message: 'a terminal may still be writing this conversation'
+      })
+    }
     // Right before the spawn: a close, Stop or quit that landed during any wait above launches nothing.
     if (input.acquireSignal?.aborted) {
       throw new AgentSessionPreSpawnError(abortSignalReason(input.acquireSignal))
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 baabf4eb1f10..6af0c62364e2 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
@@ -132,6 +132,7 @@ export type AgentSessionPreSpawnReason = Extract<
   | 'claudeAccountSetupFailed'
   | 'agentCommandNotRunnable'
   | 'runtimeNotInstalled'
+  | 'conversationOpenInTerminal'
 >
 
 /** Acquisition failed with first-hand proof that no provider process existed. */
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-attach-flow.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-attach-flow.ts
index f45d9bdddfc7..43603cebdc5b 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-attach-flow.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-attach-flow.ts
@@ -104,6 +104,8 @@ export type AttachFlowInput = {
   eventSink?: StructuredAgentSessionEventSink
   /** Stops acquisition-window events targeting the superseded journal. */
   onAcquiring?: () => Promise<void> | void
+  /** Refuses the spawn while a terminal may still be writing the record's conversation. */
+  assertNoTerminalWriter?: (record: AgentSessionRecord) => Promise<void>
   /** Settles writes already captured by the superseded journal before opening another. */
   beforeJournalOpen?: () => Promise<void> | void
   /** The conversation's own open journal, which the attach adopts: it never opens one itself. */
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-attach-orchestration.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-attach-orchestration.ts
index 76c1655826a4..a3b0df17933b 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-attach-orchestration.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-attach-orchestration.ts
@@ -256,6 +256,9 @@ async function runAttachUnderAbort(
       launchPermissionMode: async (record) =>
         (await lock.wait(structuredAgentSessionLaunchPermission(context.deps, record))) ??
         undefined,
+      assertNoTerminalWriter: async (record) => {
+        await lock.wait(Promise.resolve(context.deps.assertNoTerminalWriter?.(record)))
+      },
       ...(options.onAcquisitionFailed ? { onAcquisitionFailed: options.onAcquisitionFailed } : {}),
       openConversation: async (record) => {
         const conversation = await context.openConversation(record.sessionId, { acquisition: true })
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-failure-text.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-failure-text.ts
index ac7c598fecb8..f4438f6e3a2c 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-failure-text.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-failure-text.ts
@@ -37,7 +37,8 @@ const TYPED_START_REFUSALS = [
   'claudeAccountFolderMissing',
   'claudeAccountSetupFailed',
   'agentCommandNotRunnable',
-  'runtimeNotInstalled'
+  'runtimeNotInstalled',
+  'conversationOpenInTerminal'
 ] as const satisfies readonly (AgentSessionFailureKind &
   AgentSessionRefusalReason<'agent_session_operation_invalid'>)[]
 
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host-types.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host-types.ts
index 29bf3d3ab55b..4a3caddd92da 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-host-types.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host-types.ts
@@ -160,6 +160,8 @@ export type StructuredAgentSessionHostDeps = {
   hasOpenDispatch?: (record: AgentSessionRecord) => boolean
   /** A chat tab left the screen: closed, or its workspace removed. Advisory; a throw is logged. */
   onSessionTabHidden?: (sessionId: string) => void
+  /** Throws while a terminal may still write the record's head conversation; run before a spawn. */
+  assertNoTerminalWriter?: (record: AgentSessionRecord) => Promise<void>
   /** Where every failure the host carries on past is reported. Required: a host without one would
    *  drop exactly the failures nobody sees in the UI. */
   logger: StructuredAgentSessionLogger
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts
new file mode 100644
index 000000000000..001d926b0860
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts
@@ -0,0 +1,138 @@
+import { mkdtemp, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope'
+import { agentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
+import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding'
+import type { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
+import { openTestAgentSessionRecordStore } from '../../runtime/agent-session-record-store-test-harness'
+import { openTestJournalHostDatabase } from '../agent-session-journal/journal-host-database-test-support'
+import type { StructuredAgentSessionAdapter } from './structured-agent-session-adapter'
+import { NO_STRUCTURED_AGENTS } from './structured-agent-session-adapter-router-test-support'
+import { StructuredAgentSessionHost } from './structured-agent-session-host'
+import {
+  HOST_TEST_NOW as NOW,
+  HOST_TEST_SESSION as SESSION,
+  HOST_TEST_THREAD as THREAD,
+  hostTestAttachParams,
+  hostTestMessage,
+  hostTestOperationId,
+  resetHostTestOperationIds
+} from './structured-agent-session-host-test-data'
+import { createStructuredAgentSessionLogger } from './structured-agent-session-logger'
+
+let root: string
+let store: AgentSessionRecordStore
+let host: StructuredAgentSessionHost
+let terminalWriting: boolean
+const CALLER = { callerKey: 'client-1' }
+const acquire = vi.fn<StructuredAgentSessionAdapter['acquire']>(async ({ fence, spawnToken }) => ({
+  process: { hostId: 'local', pid: 4242, processStartTimeMs: 1_700_000_000_000, spawnToken },
+  acquisitionGeneration: `generation-${fence}`,
+  link: {
+    linkId: `link-${fence}`,
+    handle: codexProviderHandle(THREAD),
+    origin: fence === 1 ? ('created' as const) : ('resumed' as const),
+    mintedAtFence: fence,
+    observedAt: NOW
+  }
+}))
+const assertNoTerminalWriter = vi.fn(async () => {
+  if (terminalWriting) {
+    throw agentSessionRefusalError('agent_session_conflict', {
+      reason: 'conversationHeldElsewhere'
+    })
+  }
+})
+
+beforeEach(async () => {
+  root = await mkdtemp(join(tmpdir(), 'orca-terminal-writer-acquire-'))
+  resetHostTestOperationIds()
+  terminalWriting = false
+  acquire.mockClear()
+  assertNoTerminalWriter.mockClear()
+  store = await openTestAgentSessionRecordStore(root)
+  host = new StructuredAgentSessionHost({
+    agents: NO_STRUCTURED_AGENTS,
+    logger: createStructuredAgentSessionLogger(),
+    store,
+    adapter: {
+      acquire,
+      dispatch: vi.fn(async () => ({
+        state: 'accepted' as const,
+        providerIdentity: { provider: 'codex' as const, threadId: THREAD, turnId: 't', ordinal: 1 }
+      })),
+      closeSession: vi.fn(async () => true),
+      releaseAcquisition: vi.fn(async () => true),
+      cancelTurn: vi.fn(async () => ({ cancelled: false })),
+      answerPrompt: vi.fn(async () => undefined),
+      setOption: vi.fn(async () => undefined),
+      open: async () => ({ reportedOptions: { model: '' } })
+    },
+    journalDatabase: openTestJournalHostDatabase(root),
+    claimKeyId: 'key-1',
+    mintSpawnToken: () => `spawn-${acquire.mock.calls.length}`,
+    assertNoTerminalWriter,
+    now: () => NOW
+  })
+  expect(await host.attach(CALLER, hostTestAttachParams(null))).toMatchObject({ ok: true })
+})
+
+afterEach(async () => {
+  await host.flushAllStreamedEvents()
+  await rm(root, { recursive: true, force: true })
+})
+
+async function send(text: string): Promise<string> {
+  const body = hostTestMessage(text)
+  const envelope = {
+    sessionId: SESSION,
+    clientOperationId: hostTestOperationId(),
+    expectedRuntimeFence: 1,
+    payloadFingerprint: computeAgentSessionPayloadFingerprint({
+      method: 'agentSession.send',
+      sessionId: SESSION,
+      fields: { body }
+    })
+  }
+  expect(await host.send(CALLER, { envelope, body })).toMatchObject({ ok: true })
+  return envelope.clientOperationId
+}
+
+async function rejection(id: string) {
+  await vi.waitFor(
+    async () =>
+      expect(
+        (await host.journalSnapshot(SESSION)).submissions.find((s) => s.clientMessageId === id)
+          ?.dispatchState
+      ).toBe('rejected'),
+    { timeout: 10_000 }
+  )
+  return (await host.journalSnapshot(SESSION)).submissions.find((s) => s.clientMessageId === id)
+}
+
+// H10: a chat reopened while its conversation runs in a terminal starts no second writer.
+it('refuses the chat agent start while a terminal writes its conversation, once per send', async () => {
+  await host.close(SESSION, 'evict')
+  terminalWriting = true
+  await host.revealSession(SESSION)
+  const spawnsBefore = acquire.mock.calls.length
+  assertNoTerminalWriter.mockClear()
+
+  const first = await rejection(await send('first'))
+  expect(first?.rejection).toMatchObject({ kind: 'conversationOpenInTerminal' })
+  expect(first?.reason).toContain('has exited in its terminal')
+  expect(acquire.mock.calls.length).toBe(spawnsBefore)
+  expect(store.getRecord(SESSION)?.lease.reservedSpawnToken).toBeNull()
+
+  await rejection(await send('second'))
+  expect(assertNoTerminalWriter).toHaveBeenCalledTimes(2)
+  expect(acquire.mock.calls.length).toBe(spawnsBefore)
+
+  terminalWriting = false
+  await send('after the terminal exits')
+  await vi.waitFor(() => expect(acquire.mock.calls.length).toBe(spawnsBefore + 1), {
+    timeout: 10_000
+  })
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-provider-session-ownership.ts b/src/main/native-chat/agent-session-wire/structured-provider-session-ownership.ts
index a541bfcfbbae..a7f34eb73fd0 100644
--- a/src/main/native-chat/agent-session-wire/structured-provider-session-ownership.ts
+++ b/src/main/native-chat/agent-session-wire/structured-provider-session-ownership.ts
@@ -1,6 +1,12 @@
 import type { AgentSessionLease, AgentSessionRecord } from '../../../shared/agent-session-record'
 import type { StructuredAgentId } from '../../../shared/agent-session-provider-handle'
+import { agentSessionLeaseOwnerVerdict } from '../../../shared/agent-session-lease-adjudication'
 import { structuredAgentRuntimeMetadata } from '../../runtime/structured-agent-runtime-metadata'
+import {
+  keysMayMatch,
+  recordConversationKey,
+  type ConversationKey
+} from '../structured-conversation-key'
 
 export type StructuredProviderSessionOwnership = {
   sessionId: string
@@ -9,24 +15,57 @@ export type StructuredProviderSessionOwnership = {
   providerSessionId: string
   conversationName?: string
   lease: AgentSessionLease
+  /** `head`: the conversation the chat continues now; `earlier`: one its chain held before. */
+  role: 'head' | 'earlier'
+  key: ConversationKey
 }
 
-/** Which chat owns each conversation, under the Session History row id its agent's registration
- *  names: the one index both the duplicate-adoption check and Session History ownership read. */
+/** Every handle link of every chat, under the Session History row id its agent's registration
+ *  names, with its role and lease; each consumer applies its own predicate. */
 export function listStructuredProviderSessionOwnership(
   records: readonly AgentSessionRecord[]
 ): StructuredProviderSessionOwnership[] {
   return records.flatMap((record) => {
     const history = structuredAgentRuntimeMetadata(record.provider)?.sessionHistory
-    return history
-      ? record.providerHandleChain.map((link) => ({
-          sessionId: record.sessionId,
-          workspaceId: record.location.workspaceId,
-          provider: record.provider,
-          providerSessionId: history.rowSessionId(link),
-          conversationName: record.conversationName,
-          lease: record.lease
-        }))
+    const head = record.providerHandleChain.at(-1)
+    const headKey = head ? recordConversationKey(record, head) : null
+    return history && headKey
+      ? record.providerHandleChain.flatMap((link) => {
+          const key = recordConversationKey(record, link)
+          return key
+            ? [
+                {
+                  sessionId: record.sessionId,
+                  workspaceId: record.location.workspaceId,
+                  provider: record.provider,
+                  providerSessionId: history.rowSessionId(link),
+                  conversationName: record.conversationName,
+                  lease: record.lease,
+                  // A repeat resume link of the head's id is the head too.
+                  role: keysMayMatch(key, headKey) ? ('head' as const) : ('earlier' as const),
+                  key
+                }
+              ]
+            : []
+        })
       : []
   })
 }
+
+/** Fail closed: only a lease released on proof its owner exited can't be writing. */
+export function agentSessionLeasePossiblyWriting(lease: AgentSessionLease): boolean {
+  return agentSessionLeaseOwnerVerdict(lease) !== 'exited'
+}
+
+/** Agents whose chats let a terminal resume the same conversation once the chat stopped writing. */
+export function sameIdTerminalResumeEnabled(_provider: StructuredAgentId): boolean {
+  return false
+}
+
+/** Whether a terminal resume of this link's conversation is refused. */
+export function terminalResumeBlocked(holding: StructuredProviderSessionOwnership): boolean {
+  return (
+    !sameIdTerminalResumeEnabled(holding.provider) ||
+    (holding.role === 'head' && agentSessionLeasePossiblyWriting(holding.lease))
+  )
+}
diff --git a/src/main/native-chat/structured-agent-session-history-adoption.test.ts b/src/main/native-chat/structured-agent-session-history-adoption.test.ts
index 718e7fa85b54..412d4ff6d179 100644
--- a/src/main/native-chat/structured-agent-session-history-adoption.test.ts
+++ b/src/main/native-chat/structured-agent-session-history-adoption.test.ts
@@ -64,12 +64,13 @@ function ownership(
     provider: 'codex',
     providerSessionId: 'thread-1',
     lease: agentSessionLeaseFixture(),
+    role: 'head',
     ...overrides
   }
 }
 
 describe('findConflictingStructuredAdoption', () => {
-  it('names the session that already holds the conversation', () => {
+  it('names the session continuing the conversation now, never one that held it earlier', () => {
     const owner = ownership()
 
     expect(
@@ -77,7 +78,11 @@ describe('findConflictingStructuredAdoption', () => {
         agent: 'codex',
         providerSessionId: 'thread-1',
         selfSessionId: 'codex_new',
-        ownership: [ownership({ sessionId: 'other', providerSessionId: 'thread-2' }), owner]
+        ownership: [
+          ownership({ sessionId: 'other', providerSessionId: 'thread-2' }),
+          ownership({ sessionId: 'moved_on', role: 'earlier' }),
+          owner
+        ]
       })
     ).toBe(owner)
   })
diff --git a/src/main/native-chat/structured-agent-session-history-adoption.ts b/src/main/native-chat/structured-agent-session-history-adoption.ts
index 65a5e37c92c8..6f0cb006735e 100644
--- a/src/main/native-chat/structured-agent-session-history-adoption.ts
+++ b/src/main/native-chat/structured-agent-session-history-adoption.ts
@@ -24,6 +24,7 @@ export type StructuredAgentSessionAdoptionOwnership = {
   provider: StructuredAgentId
   providerSessionId: string
   lease: AgentSessionLease
+  role: 'head' | 'earlier'
 }
 
 export type StructuredAgentSessionAdoption = {
@@ -75,10 +76,10 @@ export function findCommittedStructuredAgentSessionAdoptionReplay(input: {
 }
 
 /**
- * A conversation has exactly one writer. Codex takes no lock of its own: a second app-server holding
- * the same thread never errors, it loads history once and then diverges, and the rollout ends up
- * recording a conversation that never happened. So the refusal is the correctness guard, and it has
- * to be able to tell "someone else owns this" from "this very operation owns it".
+ * A conversation has exactly one writer, and an adoption must never mint a second chat for one a
+ * chat continues now (its head link; an earlier link holds nothing). Codex's own writer lock covers
+ * only a running process, so this refusal is the guard for chats at rest, and it has to tell
+ * "someone else owns this" from "this very operation owns it".
  *
  * @param selfSessionId the structured session this create is reserving. A retry of a committed
  * create re-runs every pre-commit check, and by then the record it created is itself in the
@@ -94,6 +95,7 @@ export function findConflictingStructuredAdoption(input: {
     input.ownership.find(
       (owner) =>
         owner.sessionId !== input.selfSessionId &&
+        owner.role === 'head' &&
         chatAgentsShareConversations(owner.provider, input.agent) &&
         owner.providerSessionId === input.providerSessionId
     ) ?? null
diff --git a/src/main/native-chat/structured-conversation-key.ts b/src/main/native-chat/structured-conversation-key.ts
new file mode 100644
index 000000000000..ac1a7c3823e4
--- /dev/null
+++ b/src/main/native-chat/structured-conversation-key.ts
@@ -0,0 +1,63 @@
+import {
+  chatAgentsShareConversations,
+  CLI_CONVERSATION_ADOPTING_AGENTS
+} from '../../shared/structured-agent-cli-conversation-adoption'
+import {
+  agentSessionAccountHomesEqual,
+  type AgentSessionAccountHome
+} from '../../shared/agent-session-account-home'
+import type { AgentSessionProviderHandleLink } from '../../shared/agent-session-provider-handle'
+import type { AgentSessionRecord } from '../../shared/agent-session-record'
+import { structuredAgentRuntimeMetadata } from '../runtime/structured-agent-runtime-metadata'
+import { sessionIdFromFileName } from '../ai-vault/session-scanner-accumulator'
+
+/** One conversation wherever it is named: the agents sharing its ids, its id (null: a targetless
+ *  resume that may pick any of the family's), and its account home (null: the namer can't tell). */
+export type ConversationKey = {
+  family: string
+  id: string | null
+  home: AgentSessionAccountHome | null
+}
+
+const FAMILY_MEMBERS = [...new Set(Object.entries(CLI_CONVERSATION_ADOPTING_AGENTS).flat(2))].sort()
+
+/** Agents that open one conversation's ids (`opencode`, `opencode2`) share one family name. */
+export function conversationFamily(agent: string): string {
+  return FAMILY_MEMBERS.find((member) => chatAgentsShareConversations(member, agent)) ?? agent
+}
+
+export function recordConversationKey(
+  record: AgentSessionRecord,
+  link: AgentSessionProviderHandleLink
+): ConversationKey | null {
+  const history = structuredAgentRuntimeMetadata(record.provider)?.sessionHistory
+  return history
+    ? {
+        family: conversationFamily(record.provider),
+        id: history.rowSessionId(link),
+        home: record.accountHome
+      }
+    : null
+}
+
+/** A terminal names a conversation by the id its hooks or command carry; its home is unknown. */
+export function terminalConversationKey(agent: string, id: string | null): ConversationKey {
+  return { family: conversationFamily(agent), id: id?.trim() || null, home: null }
+}
+
+export function keysMayMatch(left: ConversationKey, right: ConversationKey): boolean {
+  return (
+    left.family === right.family &&
+    (left.id === null || right.id === null || sameConversationId(left.id, right.id)) &&
+    (left.home === null ||
+      right.home === null ||
+      agentSessionAccountHomesEqual(left.home, right.home))
+  )
+}
+
+// A session-file agent's terminal may name the file; Session History lists its file-name id.
+function sameConversationId(left: string, right: string): boolean {
+  const normalize = (id: string) =>
+    (/[\\/]/.test(id) ? sessionIdFromFileName(id) : id).toLowerCase()
+  return normalize(left) === normalize(right)
+}
diff --git a/src/main/runtime/agent-session-reservation-admission.test.ts b/src/main/runtime/agent-session-reservation-admission.test.ts
index 0858424559e4..c4a0b534f156 100644
--- a/src/main/runtime/agent-session-reservation-admission.test.ts
+++ b/src/main/runtime/agent-session-reservation-admission.test.ts
@@ -143,6 +143,29 @@ describe('adopted conversation ownership', () => {
     ).not.toThrow()
   })
 
+  it('admits a conversation another record only held before its current one', () => {
+    const fixture = agentSessionRecordFixture()
+    const holder: AgentSessionRecord = {
+      ...fixture,
+      providerHandleChain: [
+        ...fixture.providerHandleChain,
+        adoptedLink({
+          linkId: 'later',
+          handle: claudeProviderHandle('provider-session-later', null),
+          origin: 'created'
+        })
+      ]
+    }
+
+    expect(() =>
+      applyAgentSessionReservation(
+        storeState([holder]),
+        reserveRequest({ adoptedHandleLink: adoptedLink() }),
+        LEASE_TTL_MS
+      )
+    ).not.toThrow()
+  })
+
   it('exempts the requesting session so a committed create can be re-run', () => {
     // Pins the guard's own contract. No wire shape reaches it today: `adopt` is accepted only on
     // create-by-intent, which always carries a null expected fence, and an existing record with a
diff --git a/src/main/runtime/agent-session-reservation-admission.ts b/src/main/runtime/agent-session-reservation-admission.ts
index 31a1ece91ff5..eceb805ffed9 100644
--- a/src/main/runtime/agent-session-reservation-admission.ts
+++ b/src/main/runtime/agent-session-reservation-admission.ts
@@ -221,7 +221,8 @@ export function applyAgentSessionReservation(
 }
 
 /**
- * Refuse an adoption whose conversation ANOTHER record already holds.
+ * Refuse an adoption whose conversation ANOTHER record continues now (its head link), the same rule
+ * as the pre-commit check, so that check never admits what this one refuses.
  *
  * The self-exemption is part of that definition, not a replay mechanism: replay is settled earlier
  * by the operation ledger, and an adoption always arrives with a null expected fence, so a request
@@ -246,14 +247,15 @@ export function assertAdoptedConversationUnowned(
     if (record.sessionId === request.sessionId) {
       continue
     }
-    const holdsSameConversation = record.providerHandleChain.some(
-      (link) =>
-        agentSessionProviderHandleRoot(link.handle) === root ||
+    // Only the conversation a chat continues now: an earlier link no longer holds anything.
+    const head = record.providerHandleChain.at(-1)
+    const holdsSameConversation =
+      !!head &&
+      (agentSessionProviderHandleRoot(head.handle) === root ||
         // One id from two chat agents that open the same conversations (`opencode`, `opencode2`).
-        (link.handle.transport === adopted.handle.transport &&
-          link.handle.nativeId === adopted.handle.nativeId &&
-          chatAgentsShareConversations(link.handle.agent, adopted.handle.agent))
-    )
+        (head.handle.transport === adopted.handle.transport &&
+          head.handle.nativeId === adopted.handle.nativeId &&
+          chatAgentsShareConversations(head.handle.agent, adopted.handle.agent)))
     if (holdsSameConversation) {
       throw agentSessionRefusalError('agent_session_conflict', {
         reason: 'conversationHeldElsewhere',
diff --git a/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts b/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts
index 9cc4e05c4532..6621f1daabb7 100644
--- a/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts
+++ b/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts
@@ -16,6 +16,9 @@ import {
   OPEN_CODE_WRITER_TOPOLOGY,
   cliWriterTopology
 } from '../../agent-hooks/server/cli-writer-observation'
+import type { AgentSessionRecord } from '../../../shared/agent-session-record'
+import { CLI_CONVERSATION_ADOPTING_AGENTS } from '../../../shared/structured-agent-cli-conversation-adoption'
+import { recordConversationKey } from '../../native-chat/structured-conversation-key'
 
 export abstract class OrcaRuntimeWithStructuredSessionCliWriterHost extends OrcaRuntimeWithGetWorktreePs {
   private cliWriterPtyPane(ptyId: string | null | undefined): CliWriterPane | null {
@@ -70,6 +73,20 @@ export abstract class OrcaRuntimeWithStructuredSessionCliWriterHost extends Orca
     })
   }
 
+  /** Before a chat's agent spawns: refuses while a terminal may still write its head conversation.
+   *  Never enters the session queue, so it can run inside an acquisition. */
+  protected async assertStructuredChatAcquireAdmissible(record: AgentSessionRecord): Promise<void> {
+    const head = record.providerHandleChain.at(-1)
+    const key = head ? recordConversationKey(record, head) : null
+    const adopts = Object.values(CLI_CONVERSATION_ADOPTING_AGENTS).some(
+      (agents: readonly string[]) => agents.includes(record.provider)
+    )
+    if (!key?.id || !adopts) {
+      return
+    }
+    await this.assertStructuredAdoptionTerminalWritersExited(record.provider, key.id)
+  }
+
   async assertStructuredAdoptionTerminalWritersExited(
     agent: StructuredAgentId,
     providerSessionId: string,
diff --git a/src/main/runtime/session-tabs/structured-session-create-support.ts b/src/main/runtime/session-tabs/structured-session-create-support.ts
index b71a8c6003dd..eb3262759d67 100644
--- a/src/main/runtime/session-tabs/structured-session-create-support.ts
+++ b/src/main/runtime/session-tabs/structured-session-create-support.ts
@@ -128,8 +128,8 @@ export abstract class OrcaRuntimeWithGetStructuredAgentSessionCreateSupport exte
           selfSessionId: input.envelope.sessionId
         })
       } catch (ownerConflict) {
-        // A switch out of a live terminal refuses as such: the owning chat's first send would
-        // otherwise start a second writer.
+        // A switch out of a live terminal refuses as such, early; the owning chat's agent start
+        // refuses it again.
         await this.assertStructuredAdoptionTerminalWritersExited(
           input.agent,
           providerSessionId,
diff --git a/src/main/runtime/structured-agent-session-runtime.ts b/src/main/runtime/structured-agent-session-runtime.ts
index fa5a7afab6dd..98b4c39c092e 100644
--- a/src/main/runtime/structured-agent-session-runtime.ts
+++ b/src/main/runtime/structured-agent-session-runtime.ts
@@ -130,6 +130,8 @@ export type StructuredAgentSessionRuntimeDeps = StructuredAgentSessionTransportO
   prepareCodexCatalogProbeHome?: (homePath: string) => void
   /** See `StructuredAgentSessionHostDeps.onSessionTabHidden`. */
   onSessionTabHidden?: StructuredAgentSessionHostDeps['onSessionTabHidden']
+  /** See `StructuredAgentSessionHostDeps.assertNoTerminalWriter`. */
+  assertNoTerminalWriter?: StructuredAgentSessionHostDeps['assertNoTerminalWriter']
   /** Host-owned phone delivery and reconciliation from the current journal projection. */
   attentionDelivery?: StructuredAttentionMobileDelivery
   /** The account home a structured launch would pin right now, for catalog
@@ -316,6 +318,7 @@ async function installOnJournal(
     ...(deps.hasOpenDispatch ? { hasOpenDispatch: deps.hasOpenDispatch } : {}),
     ...(deps.startupLimits ? { startupLimits: deps.startupLimits } : {}),
     ...(deps.onSessionTabHidden ? { onSessionTabHidden: deps.onSessionTabHidden } : {}),
+    ...(deps.assertNoTerminalWriter ? { assertNoTerminalWriter: deps.assertNoTerminalWriter } : {}),
     ...(await modelCatalogHostDeps({
       store,
       agents,
diff --git a/src/main/runtime/workspaces/workspace-process-listing-dependencies.ts b/src/main/runtime/workspaces/workspace-process-listing-dependencies.ts
index b7add175f797..607b4cfdf11d 100644
--- a/src/main/runtime/workspaces/workspace-process-listing-dependencies.ts
+++ b/src/main/runtime/workspaces/workspace-process-listing-dependencies.ts
@@ -5,6 +5,7 @@ import type { OrcaRuntimeWithPruneMobileSessionTabGroupLayout } from '../session
 import type { OrcaRuntimeWithGetStructuredAgentSessionCreateSupport } from '../session-tabs/structured-session-create-support'
 import type { OrcaRuntimeWithGetPtyRecordForPaneKey } from '../orchestration/terminal-pane-mail-routing'
 import { OrcaRuntimeWithStartTuiIdleVisibleReadProbe } from '../terminal/wait/terminal-wait-visible-probe'
+import type { AgentSessionRecord } from '../../../shared/agent-session-record'
 
 /** Members the worktree listing reads from later runtime layers; declarations only. */
 export abstract class OrcaRuntimeWithWorktreePsDependencies extends OrcaRuntimeWithStartTuiIdleVisibleReadProbe {
@@ -43,6 +44,9 @@ export abstract class OrcaRuntimeWithWorktreePsDependencies extends OrcaRuntimeW
   abstract onStructuredSessionStatusForMail(
     ...args: Parameters<OrcaRuntimeWithGetPtyRecordForPaneKey['onStructuredSessionStatusForMail']>
   ): ReturnType<OrcaRuntimeWithGetPtyRecordForPaneKey['onStructuredSessionStatusForMail']>
+  protected abstract assertStructuredChatAcquireAdmissible(
+    record: AgentSessionRecord
+  ): Promise<void>
   abstract onStructuredSessionTabHidden(
     ...args: Parameters<OrcaRuntimeWithGetPtyRecordForPaneKey['onStructuredSessionTabHidden']>
   ): ReturnType<OrcaRuntimeWithGetPtyRecordForPaneKey['onStructuredSessionTabHidden']>
diff --git a/src/main/runtime/workspaces/workspace-process-listing.ts b/src/main/runtime/workspaces/workspace-process-listing.ts
index 52078926e78f..916ce04af7be 100644
--- a/src/main/runtime/workspaces/workspace-process-listing.ts
+++ b/src/main/runtime/workspaces/workspace-process-listing.ts
@@ -300,6 +300,7 @@ export abstract class OrcaRuntimeWithGetWorktreePs extends OrcaRuntimeWithWorktr
       ...(this.structuredAgentStatusSinkFn ? { statusSink: this.structuredAgentStatusSinkFn } : {}),
       // A closed chat settles the Dispatch it was working, as a closed terminal does.
       onSessionTabHidden: (sessionId) => this.onStructuredSessionTabHidden(sessionId),
+      assertNoTerminalWriter: (record) => this.assertStructuredChatAcquireAdmissible(record),
       attentionDelivery: createStructuredAttentionMobileDelivery({
         readNotificationSettings: () => this.requireStore().getSettings().notifications,
         readWorkspaceLabels: (scope) =>
diff --git a/src/renderer/src/components/native-chat/agent-session-failure-words-text.ts b/src/renderer/src/components/native-chat/agent-session-failure-words-text.ts
index 036f0d14c8eb..ccfb02113db0 100644
--- a/src/renderer/src/components/native-chat/agent-session-failure-words-text.ts
+++ b/src/renderer/src/components/native-chat/agent-session-failure-words-text.ts
@@ -142,6 +142,12 @@ const PIECES: Record<AgentSessionFailureCopyId, (values: AgentSessionFailureCopy
         COPY.runtimeNotInstalled,
         values
       ),
+    conversationOpenInTerminal: (values) =>
+      translate(
+        'components.native-chat.failureWords.conversationOpenInTerminal',
+        COPY.conversationOpenInTerminal,
+        values
+      ),
     chooseClaudeAccount: () =>
       translate(
         'components.native-chat.failureWords.chooseClaudeAccount',
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
index 2b2949f763f3..1807c15f9c3f 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
@@ -36,6 +36,14 @@ export async function reportCliChatResumeFailure(
     )
     return
   }
+  // The chat's agent refused to start while the terminal may still write the conversation.
+  if (
+    refusal?.code === 'agent_session_operation_invalid' &&
+    refusal.details?.reason === 'conversationOpenInTerminal'
+  ) {
+    toast.error(cliConversationExitGuidance(source.agent, true))
+    return
+  }
   if (refusal?.code === 'agent_session_identity_required') {
     if (refusal.details?.reason === 'transcriptNotFound') {
       toast.error(
diff --git a/src/renderer/src/i18n/en-runtime-required.json b/src/renderer/src/i18n/en-runtime-required.json
index 2d64b000458d..cfb2f0362c15 100644
--- a/src/renderer/src/i18n/en-runtime-required.json
+++ b/src/renderer/src/i18n/en-runtime-required.json
@@ -2969,6 +2969,7 @@
         "runCommandAgain": "Run /{{command}} again.",
         "runCommandWhenDone": "Run /{{command}} when it's done.",
         "runtimeNotInstalled": "{{agent}} isn't installed on the computer running this chat. Install it from the chat in a current version of Orca.",
+        "conversationOpenInTerminal": "Orca can't confirm {{agent}} has exited in its terminal. Stop what's running there or close the terminal, then try again.",
         "sendAgainToTryOnceMore": "Send your message again to try once more.",
         "sendToTryAgain": "Send your message to try again.",
         "sessionNotRestored": "{{agent}} couldn't reopen its earlier session, so this chat continues in a new one. {{agent}} doesn't remember the earlier messages.",
diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index 7695e77a7dbd..6baed6a4e4fc 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -18346,6 +18346,7 @@
         "claudeAccountSetupFailed": "The selected Claude account could not be set up. Try again or choose another account.",
         "agentCommandNotRunnable": "{{agent}}'s Command in Settings → Agents must be a program path or name Orca can find, with no arguments or variables. Change it or reset it.",
         "runtimeNotInstalled": "{{agent}} isn't installed on the computer running this chat. Install it from the chat in a current version of Orca.",
+        "conversationOpenInTerminal": "Orca can't confirm {{agent}} has exited in its terminal. Stop what's running there or close the terminal, then try again.",
         "chooseClaudeAccount": "Choose or add one in Claude Accounts settings.",
         "chooseClaudeAccountThenRunCommand": "Choose or add one in Claude Accounts settings, then run /{{command}} again.",
         "chooseClaudeAccountThenSend": "Choose or add one in Claude Accounts settings, then send your message again.",
diff --git a/src/renderer/src/i18n/locales/es.json b/src/renderer/src/i18n/locales/es.json
index 7dd3a99fd388..6d425fd3aa2b 100644
--- a/src/renderer/src/i18n/locales/es.json
+++ b/src/renderer/src/i18n/locales/es.json
@@ -18060,6 +18060,7 @@
         "claudeAccountSetupFailed": "No se pudo configurar la cuenta de Claude seleccionada. Vuelva a intentarlo o elija otra cuenta.",
         "agentCommandNotRunnable": "{{agent}}: el Comando en Ajustes → Agentes debe ser la ruta o el nombre de un programa que Orca pueda encontrar, sin argumentos ni variables. Cámbielo o restablézcalo con Reiniciar.",
         "runtimeNotInstalled": "{{agent}} no está instalado en el equipo que ejecuta este chat. Instálelo desde el chat en una versión actual de Orca.",
+        "conversationOpenInTerminal": "Orca no puede confirmar que {{agent}} haya salido en su terminal. Detenga lo que se esté ejecutando allí o cierre la terminal y vuelva a intentarlo.",
         "chooseClaudeAccount": "Elija o agregue una en la configuración de Cuentas de Claude.",
         "chooseClaudeAccountThenRunCommand": "Elija o agregue una en la configuración de Cuentas de Claude y vuelva a ejecutar /{{command}}.",
         "chooseClaudeAccountThenSend": "Elija o agregue una en la configuración de Cuentas de Claude y vuelva a enviar su mensaje.",
diff --git a/src/renderer/src/i18n/locales/fr.json b/src/renderer/src/i18n/locales/fr.json
index 35ae420d8dc6..bfcd4eaac1d2 100644
--- a/src/renderer/src/i18n/locales/fr.json
+++ b/src/renderer/src/i18n/locales/fr.json
@@ -18169,6 +18169,7 @@
         "claudeAccountSetupFailed": "Le compte Claude sélectionné n'a pas pu être configuré. Réessayez ou choisissez un autre compte.",
         "agentCommandNotRunnable": "{{agent}} : la Commande dans Paramètres → Agents doit être le chemin ou le nom d'un programme qu'Orca peut trouver, sans arguments ni variables. Modifiez-la ou réinitialisez-la.",
         "runtimeNotInstalled": "{{agent}} n'est pas installé sur l'ordinateur qui exécute ce chat. Installez-le depuis le chat dans une version récente d'Orca.",
+        "conversationOpenInTerminal": "Orca ne peut pas confirmer que {{agent}} a quitté son terminal. Arrêtez ce qui s'y exécute ou fermez le terminal, puis réessayez.",
         "chooseClaudeAccount": "Choisissez-en un ou ajoutez-en un dans les paramètres Comptes Claude.",
         "chooseClaudeAccountThenRunCommand": "Choisissez-en un ou ajoutez-en un dans les paramètres Comptes Claude, puis relancez /{{command}}.",
         "chooseClaudeAccountThenSend": "Choisissez-en un ou ajoutez-en un dans les paramètres Comptes Claude, puis renvoyez votre message.",
diff --git a/src/renderer/src/i18n/locales/ja.json b/src/renderer/src/i18n/locales/ja.json
index 04e50160373e..ff8ec483edad 100644
--- a/src/renderer/src/i18n/locales/ja.json
+++ b/src/renderer/src/i18n/locales/ja.json
@@ -18100,6 +18100,7 @@
         "claudeAccountSetupFailed": "選択した Claude アカウントを設定できませんでした。もう一度試すか、別のアカウントを選択してください。",
         "agentCommandNotRunnable": "[設定] → [Agent] にある {{agent}} の [コマンド] には、Orca が見つけられるプログラムのパスまたは名前を、引数や変数なしで指定する必要があります。変更するか、[リセット] してください。",
         "runtimeNotInstalled": "{{agent}} はこのチャットを実行しているコンピューターにインストールされていません。最新バージョンの Orca でチャットからインストールしてください。",
+        "conversationOpenInTerminal": "Orca は {{agent}} がターミナルで終了したことを確認できません。そこで実行中のものを停止するかターミナルを閉じてから、もう一度お試しください。",
         "chooseClaudeAccount": "Claude アカウントの設定で選択または追加してください。",
         "chooseClaudeAccountThenRunCommand": "Claude アカウントの設定で選択または追加してから、/{{command}} をもう一度実行してください。",
         "chooseClaudeAccountThenSend": "Claude アカウントの設定で選択または追加してから、メッセージをもう一度送信してください。",
diff --git a/src/renderer/src/i18n/locales/ko.json b/src/renderer/src/i18n/locales/ko.json
index ed902a140f04..a2bf337d92a5 100644
--- a/src/renderer/src/i18n/locales/ko.json
+++ b/src/renderer/src/i18n/locales/ko.json
@@ -18100,6 +18100,7 @@
         "claudeAccountSetupFailed": "선택한 Claude 계정을 설정할 수 없습니다. 다시 시도하거나 다른 계정을 선택하세요.",
         "agentCommandNotRunnable": "{{agent}}의 설정 → 에이전트 → 명령은 Orca가 찾을 수 있는 프로그램 경로나 이름이어야 하며, 인수나 변수를 포함할 수 없습니다. 변경하거나 재설정하세요.",
         "runtimeNotInstalled": "{{agent}}이(가) 이 채팅을 실행하는 컴퓨터에 설치되어 있지 않습니다. 최신 버전의 Orca에서 채팅을 통해 설치하세요.",
+        "conversationOpenInTerminal": "Orca에서 {{agent}}이(가) 터미널에서 종료되었는지 확인할 수 없습니다. 그곳에서 실행 중인 항목을 중지하거나 터미널을 닫은 후 다시 시도하세요.",
         "chooseClaudeAccount": "Claude 계정 설정에서 선택하거나 추가하세요.",
         "chooseClaudeAccountThenRunCommand": "Claude 계정 설정에서 선택하거나 추가한 다음 /{{command}}을(를) 다시 실행하세요.",
         "chooseClaudeAccountThenSend": "Claude 계정 설정에서 선택하거나 추가한 다음 메시지를 다시 보내세요.",
diff --git a/src/renderer/src/i18n/locales/zh.json b/src/renderer/src/i18n/locales/zh.json
index 8838e457e685..7a8ec0fb5a7c 100644
--- a/src/renderer/src/i18n/locales/zh.json
+++ b/src/renderer/src/i18n/locales/zh.json
@@ -18065,6 +18065,7 @@
         "claudeAccountSetupFailed": "无法设置所选 Claude 账户。请重试或选择其他账户。",
         "agentCommandNotRunnable": "{{agent}} 在设置 → 智能体中的命令必须是 Orca 能找到的程序路径或名称，且不能包含参数或变量。请修改或重置。",
         "runtimeNotInstalled": "运行此聊天的计算机上未安装 {{agent}}。请在最新版本的 Orca 中从聊天里安装。",
+        "conversationOpenInTerminal": "Orca 无法确认 {{agent}} 已在其终端中退出。请停止那里正在运行的内容或关闭终端，然后重试。",
         "chooseClaudeAccount": "请在 Claude 账户设置中选择或添加一个。",
         "chooseClaudeAccountThenRunCommand": "请在 Claude 账户设置中选择或添加一个，然后重新运行 /{{command}}。",
         "chooseClaudeAccountThenSend": "请在 Claude 账户设置中选择或添加一个，然后重新发送您的消息。",
diff --git a/src/shared/agent-session-attachment-failure-words.ts b/src/shared/agent-session-attachment-failure-words.ts
new file mode 100644
index 000000000000..c53239e8f238
--- /dev/null
+++ b/src/shared/agent-session-attachment-failure-words.ts
@@ -0,0 +1,43 @@
+import type {
+  AgentSessionAttachmentProblem,
+  AgentSessionAttachmentProblemReason
+} from './agent-session-failure'
+import type { AgentSessionFailureSay } from './agent-session-failure-copy'
+
+const BYTES_PER_MB = 1024 * 1024
+
+/** The sentence for an attachment a chat refused, from the problem the host found. */
+export function attachmentProblemSentence(
+  say: AgentSessionFailureSay,
+  agent: { agent: string },
+  problem: AgentSessionAttachmentProblem
+): string {
+  return ATTACHMENT_SENTENCES[problem.reason](say, agent, problem)
+}
+
+// The number only; each language's sentence carries its own unit.
+function megabytes(bytes: number): string {
+  return String(Math.round((bytes / BYTES_PER_MB) * 10) / 10)
+}
+
+const ATTACHMENT_SENTENCES = {
+  empty: (say) => say('attachmentEmpty'),
+  tooLarge: (say, _, { limit }) =>
+    limit ? say('attachmentLargerThan', { size: megabytes(limit) }) : say('attachmentTooLarge'),
+  tooMany: (say, agent, { limit }) =>
+    limit ? say('attachmentAtMost', { ...agent, limit: String(limit) }) : say('attachmentTooMany'),
+  totalTooLarge: (say, _, { limit }) =>
+    limit
+      ? say('attachmentTotalMoreThan', { size: megabytes(limit) })
+      : say('attachmentTotalTooLarge'),
+  unsupportedType: (say, agent) => say('attachmentUnsupportedType', agent),
+  notAFile: (say) => say('attachmentNotAFile'),
+  noSource: (say) => say('attachmentNoSource')
+} satisfies Record<
+  AgentSessionAttachmentProblemReason,
+  (
+    say: AgentSessionFailureSay,
+    agent: { agent: string },
+    problem: AgentSessionAttachmentProblem
+  ) => string
+>
diff --git a/src/shared/agent-session-failure-copy.ts b/src/shared/agent-session-failure-copy.ts
index bd7523db85cd..d0043aa466bc 100644
--- a/src/shared/agent-session-failure-copy.ts
+++ b/src/shared/agent-session-failure-copy.ts
@@ -76,6 +76,8 @@ export const AGENT_SESSION_FAILURE_COPY = {
     "{{agent}}'s Command in Settings → Agents must be a program path or name Orca can find, with no arguments or variables. Change it or reset it.",
   runtimeNotInstalled:
     "{{agent}} isn't installed on the computer running this chat. Install it from the chat in a current version of Orca.",
+  conversationOpenInTerminal:
+    "Orca can't confirm {{agent}} has exited in its terminal. Stop what's running there or close the terminal, then try again.",
   chooseClaudeAccount: 'Choose or add one in Claude Accounts settings.',
   chooseClaudeAccountThenRunCommand:
     'Choose or add one in Claude Accounts settings, then run /{{command}} again.',
diff --git a/src/shared/agent-session-failure-words.ts b/src/shared/agent-session-failure-words.ts
index 2d163cf3b7e9..a6dc78b30004 100644
--- a/src/shared/agent-session-failure-words.ts
+++ b/src/shared/agent-session-failure-words.ts
@@ -9,8 +9,6 @@
 
 import {
   isSubmissionRejectionFact,
-  type AgentSessionAttachmentProblem,
-  type AgentSessionAttachmentProblemReason,
   type AgentSessionFailureFact,
   type AgentSessionFailureKind,
   type ProviderDiagnostic,
@@ -30,6 +28,7 @@ import { START_REFUSAL_RESUMABLE } from './agent-session-start-refusal-resumable
 import { providerRetryWords, withRetryCause } from './agent-session-provider-retry-words'
 import { commandRefusedByReason } from './agent-session-command-refusal-words'
 import { joinSentences } from './sentence-joining'
+import { attachmentProblemSentence } from './agent-session-attachment-failure-words'
 import {
   DISPATCH_REJECTED_CANCELLED,
   DISPATCH_REJECTED_CODEX_QUEUE_FULL,
@@ -76,7 +75,6 @@ export type AgentSessionFailureWordsContext = {
 
 /** Person-facing provider text is quoted, but bounded so the sentence stays one. */
 const MAX_QUOTED_DETAIL_CHARS = 512
-const BYTES_PER_MB = 1024 * 1024
 
 type Sentence = (
   context: AgentSessionFailureWordsContext,
@@ -168,35 +166,6 @@ function couldNot(verb: 'couldNotStart' | 'couldNotRestart'): Sentence {
   }
 }
 
-// The number only; each language's sentence carries its own unit.
-function megabytes(bytes: number): string {
-  return String(Math.round((bytes / BYTES_PER_MB) * 10) / 10)
-}
-
-const ATTACHMENT_SENTENCES = {
-  empty: (say) => say('attachmentEmpty'),
-  tooLarge: (say, _, { limit }) =>
-    limit ? say('attachmentLargerThan', { size: megabytes(limit) }) : say('attachmentTooLarge'),
-  tooMany: (say, context, { limit }) =>
-    limit
-      ? say('attachmentAtMost', { ...agent(say, context), limit: String(limit) })
-      : say('attachmentTooMany'),
-  totalTooLarge: (say, _, { limit }) =>
-    limit
-      ? say('attachmentTotalMoreThan', { size: megabytes(limit) })
-      : say('attachmentTotalTooLarge'),
-  unsupportedType: (say, context) => say('attachmentUnsupportedType', agent(say, context)),
-  notAFile: (say) => say('attachmentNotAFile'),
-  noSource: (say) => say('attachmentNoSource')
-} satisfies Record<
-  AgentSessionAttachmentProblemReason,
-  (
-    say: AgentSessionFailureSay,
-    context: AgentSessionFailureWordsContext,
-    problem: AgentSessionAttachmentProblem
-  ) => string
->
-
 const FAILURE_SENTENCES = {
   providerStartFailed: (context, _fact, _surface, say) =>
     joinSentences([say('providerStartFailed', agent(say, context)), ...startRetry(say, context)]),
@@ -213,6 +182,7 @@ const FAILURE_SENTENCES = {
   claudeAccountSetupFailed: (_context, _fact, _surface, say) => say('claudeAccountSetupFailed'),
   agentCommandNotRunnable: namingAgent('agentCommandNotRunnable'),
   runtimeNotInstalled: namingAgent('runtimeNotInstalled'),
+  conversationOpenInTerminal: namingAgent('conversationOpenInTerminal'),
   managedAccountUnsupported: (context, _fact, _surface, say) =>
     joinSentences([
       say('managedAccountUnsupported'),
@@ -242,7 +212,7 @@ const FAILURE_SENTENCES = {
     ),
   attachmentInvalid: (context, fact, _surface, say) =>
     fact.attachment
-      ? ATTACHMENT_SENTENCES[fact.attachment.reason](say, context, fact.attachment)
+      ? attachmentProblemSentence(say, agent(say, context), fact.attachment)
       : say('attachmentInvalid'),
   attachmentUnreadable: (_context, _fact, _surface, say) => say('attachmentUnreadable'),
   emptyMessage: (_context, _fact, _surface, say) => say('emptyMessage'),
diff --git a/src/shared/agent-session-failure.ts b/src/shared/agent-session-failure.ts
index 2d5984331e6a..3237bbad826f 100644
--- a/src/shared/agent-session-failure.ts
+++ b/src/shared/agent-session-failure.ts
@@ -38,6 +38,7 @@ export const AGENT_SESSION_FAILURE_KINDS = [
   'claudeAccountSetupFailed',
   'agentCommandNotRunnable',
   'runtimeNotInstalled',
+  'conversationOpenInTerminal',
   'providerExited',
   'restartFailed',
   'providerRejected',
diff --git a/src/shared/agent-session-refusal-details.ts b/src/shared/agent-session-refusal-details.ts
index 0f44e4f4785e..d4e756e0ef6f 100644
--- a/src/shared/agent-session-refusal-details.ts
+++ b/src/shared/agent-session-refusal-details.ts
@@ -86,6 +86,8 @@ export const AGENT_SESSION_REFUSAL_REASONS = {
     'agentCommandNotRunnable',
     /** The runtime Orca installs for the agent is not installed on this host. */
     'runtimeNotInstalled',
+    /** A terminal may still be writing the chat's conversation, so its agent did not start. */
+    'conversationOpenInTerminal',
     /** The agent started, then Orca could not open the chat's conversation for it. */
     'attachFailed'
   ],
diff --git a/src/shared/agent-session-refusal-reason-words.ts b/src/shared/agent-session-refusal-reason-words.ts
index 6fd418277394..8819bb4e7855 100644
--- a/src/shared/agent-session-refusal-reason-words.ts
+++ b/src/shared/agent-session-refusal-reason-words.ts
@@ -119,6 +119,7 @@ const REASON_WORDS = {
     claudeAccountSetupFailed: { fact: 'claudeAccountSetupFailed', action: 'retry' },
     agentCommandNotRunnable: { fact: 'agentCommandNotRunnable', action: 'actFirst' },
     runtimeNotInstalled: { fact: 'runtimeNotInstalled', action: 'actFirst' },
+    conversationOpenInTerminal: { fact: 'conversationOpenInTerminal', action: 'actFirst' },
     attachFailed: codeWords('retry')
   },
   agent_session_ownership_unknown: {
diff --git a/src/shared/structured-agent-session-dispatch-rejection.ts b/src/shared/structured-agent-session-dispatch-rejection.ts
index 991070f1466d..d38686cc4c23 100644
--- a/src/shared/structured-agent-session-dispatch-rejection.ts
+++ b/src/shared/structured-agent-session-dispatch-rejection.ts
@@ -97,6 +97,7 @@ const KIND_CATEGORY = {
   claudeAccountSetupFailed: 'startFailed',
   agentCommandNotRunnable: 'startFailed',
   runtimeNotInstalled: 'startFailed',
+  conversationOpenInTerminal: 'startFailed',
   restartFailed: 'startFailed',
   providerRejected: 'content',
   attachmentInvalid: 'content',
@@ -130,6 +131,7 @@ const KIND_VERDICT = {
   claudeAccountSetupFailed: 'failure',
   agentCommandNotRunnable: 'failure',
   runtimeNotInstalled: 'failure',
+  conversationOpenInTerminal: 'failure',
   restartFailed: 'failure',
   providerRejected: 'failure',
   attachmentInvalid: 'failure',

From f7af5301e4def3c8748bc6d77251a1bd3013230c Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Mon, 19 Oct 2026 15:46:35 -0700
Subject: [PATCH 002/207] fix(native-chat): hold a terminal start Orca issues
 until its terminal reports it

An in-memory registry of managed terminal starts per conversation, registered in the
same step as the resume admission (terminal.send with a resume command, createTerminal
with a command), bound to the PTY execution that runs it, and ended only when that
terminal's hooks report the conversation or the execution is gone. A chat's agent
start refuses while an entry may hold its conversation.
---
 .../managed-conversation-starts.test.ts       | 60 ++++++++++++++
 .../runtime/managed-conversation-starts.ts    | 79 +++++++++++++++++++
 src/main/runtime/rpc/methods/session-tabs.ts  | 36 +++++++--
 .../methods/terminal/terminal-send-method.ts  | 17 +---
 .../terminal/terminal-send-resume-starts.ts   | 72 +++++++++++++++++
 .../structured-session-cli-writer-host.ts     | 62 ++++++++++++++-
 6 files changed, 304 insertions(+), 22 deletions(-)
 create mode 100644 src/main/runtime/managed-conversation-starts.test.ts
 create mode 100644 src/main/runtime/managed-conversation-starts.ts
 create mode 100644 src/main/runtime/rpc/methods/terminal/terminal-send-resume-starts.ts

diff --git a/src/main/runtime/managed-conversation-starts.test.ts b/src/main/runtime/managed-conversation-starts.test.ts
new file mode 100644
index 000000000000..3b15c83d802e
--- /dev/null
+++ b/src/main/runtime/managed-conversation-starts.test.ts
@@ -0,0 +1,60 @@
+import { describe, expect, it, vi } from 'vitest'
+import { agentSessionRecordFixture } from '../../shared/agent-session-record.test-fixture'
+import type { AgentStatusIpcPayload } from '../../shared/agent-status-types'
+import { terminalConversationKey } from '../native-chat/structured-conversation-key'
+import { ManagedConversationStarts, type ManagedStartPty } from './managed-conversation-starts'
+import { OrcaRuntimeService } from './orca-runtime'
+
+const C = 'provider-session-alpha-1'
+const key = terminalConversationKey('claude', C)
+
+describe('managed conversation starts', () => {
+  it('holds a start until its terminal reports the conversation or its execution ends', () => {
+    const starts = new ManagedConversationStarts()
+    const pty: ManagedStartPty = { incarnationId: null, cliConversations: undefined, exited: false }
+    const read = vi.fn((): ManagedStartPty | null => pty)
+    const reported = starts.reserve([key])
+    expect(starts.live(key, read)).toBe(true)
+    reported.bind('pty-1', null)
+    expect(starts.live(key, read)).toBe(true)
+    pty.cliConversations = {
+      incarnationId: null,
+      byKey: new Map([['k', { agent: 'claude', id: C, paneOwned: true }]])
+    }
+    expect(starts.live(key, read)).toBe(false)
+
+    starts.reserve([terminalConversationKey('opencode2', null)]).bind('pty-2', null)
+    // A targetless resume holds the whole family; a gone PTY ends it.
+    expect(
+      starts.live(terminalConversationKey('opencode', 'ses_1'), () => ({
+        ...pty,
+        cliConversations: undefined
+      }))
+    ).toBe(true)
+    expect(starts.live(terminalConversationKey('opencode', 'ses_1'), () => null)).toBe(false)
+  })
+
+  it("refuses a chat's agent start while a start holds its conversation, never for its own hook row", async () => {
+    const runtime = new OrcaRuntimeService()
+    const record = agentSessionRecordFixture()
+    const ownRow = {
+      paneKey: 'chat',
+      agentType: 'claude',
+      structuredHost: 'owned',
+      providerSession: { key: 'claude', id: C }
+    }
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the census reads only these row fields.
+    const rows = [ownRow as unknown as AgentStatusIpcPayload]
+    vi.spyOn(runtime, 'getAgentProviderSessionRows').mockReturnValue(rows)
+    const admit = () => runtime['assertStructuredChatAcquireAdmissible'](record)
+    await expect(admit()).resolves.toBeUndefined()
+
+    const start = runtime.reserveManagedConversationStart([key])
+    await expect(admit()).rejects.toMatchObject({
+      refusal: { details: { reason: 'conversationHeldElsewhere' } }
+    })
+    // Bound to a PTY this host doesn't run, the start can't write here.
+    runtime.bindManagedConversationStart(start, 'pty-missing')
+    await expect(admit()).resolves.toBeUndefined()
+  })
+})
diff --git a/src/main/runtime/managed-conversation-starts.ts b/src/main/runtime/managed-conversation-starts.ts
new file mode 100644
index 000000000000..b2bb8a0ecab6
--- /dev/null
+++ b/src/main/runtime/managed-conversation-starts.ts
@@ -0,0 +1,79 @@
+import type { PtyIncarnationId } from '../../shared/pty-incarnation'
+import type { RuntimePtyWorktreeRecord } from './runtime-terminal-state-records'
+import {
+  keysMayMatch,
+  terminalConversationKey,
+  type ConversationKey
+} from '../native-chat/structured-conversation-key'
+
+/** A terminal start of a conversation Orca issued itself, which a chat's agent start must not race. */
+export type ManagedConversationStart = {
+  /** Ties the start to the PTY execution running it; until then it holds unconditionally. */
+  bind: (ptyId: string, incarnationId: PtyIncarnationId | null) => void
+  drop: () => void
+}
+
+export type ManagedStartPty = Pick<
+  RuntimePtyWorktreeRecord,
+  'incarnationId' | 'cliConversations'
+> & {
+  exited: boolean
+}
+
+type Entry = {
+  keys: readonly ConversationKey[]
+  pty: { ptyId: string; incarnationId: PtyIncarnationId | null } | null
+}
+
+/**
+ * In memory only: a host restart loses every entry, and a restored pane then goes through the
+ * automatic-home guard instead. No timer ends an entry; only re-derived truth does: its terminal's
+ * hooks reported the conversation (the census takes over), or its PTY execution is gone.
+ */
+export class ManagedConversationStarts {
+  private readonly entries = new Set<Entry>()
+
+  /** Synchronous, so a caller's admission check and this registration are one step. */
+  reserve(keys: readonly ConversationKey[]): ManagedConversationStart {
+    const entry: Entry = { keys, pty: null }
+    this.entries.add(entry)
+    return {
+      bind: (ptyId, incarnationId) => {
+        if (this.entries.has(entry)) {
+          entry.pty = { ptyId, incarnationId }
+        }
+      },
+      drop: () => {
+        this.entries.delete(entry)
+      }
+    }
+  }
+
+  /** Whether a managed start may still be writing `key`'s conversation; ends those that can't. */
+  live(key: ConversationKey, readPty: (ptyId: string) => ManagedStartPty | null): boolean {
+    let live = false
+    for (const entry of this.entries) {
+      if (entry.pty && ended(entry, readPty(entry.pty.ptyId))) {
+        this.entries.delete(entry)
+      } else if (entry.keys.some((held) => keysMayMatch(held, key))) {
+        live = true
+      }
+    }
+    return live
+  }
+}
+
+function ended(entry: Entry, pty: ManagedStartPty | null): boolean {
+  if (!pty || pty.exited || pty.incarnationId !== entry.pty?.incarnationId) {
+    return true
+  }
+  const reported =
+    pty.cliConversations?.incarnationId === pty.incarnationId
+      ? [...pty.cliConversations.byKey.values()]
+      : []
+  return reported.some((conversation) =>
+    entry.keys.some((held) =>
+      keysMayMatch(terminalConversationKey(conversation.agent, conversation.id), held)
+    )
+  )
+}
diff --git a/src/main/runtime/rpc/methods/session-tabs.ts b/src/main/runtime/rpc/methods/session-tabs.ts
index 11440e01fe1b..7eec6432b222 100644
--- a/src/main/runtime/rpc/methods/session-tabs.ts
+++ b/src/main/runtime/rpc/methods/session-tabs.ts
@@ -19,6 +19,7 @@ import { SESSION_TAB_MUTATION_METHODS } from './session-tab-mutation-methods'
 import { createSessionTabsRetirementProofDelta } from './session-tabs-retirement-proof-delta'
 import { restoreStructuredTabsIfSupported } from './structured-session-tab-restore'
 import { assertLegacyAiVaultResumeCommandAllowed } from '../../../ai-vault/structured-session-ownership'
+import { terminalConversationKey } from '../../../native-chat/structured-conversation-key'
 import { SessionTabsUnsubscribeAllParams } from '../../../../shared/rpc-contract/session-tabs-params'
 import { SESSION_TABS_SPLIT_GROUP_PLACEMENT_RUNTIME_CAPABILITY } from '../../../../shared/protocol-version'
 import { createSessionTabsTabDeltaEncoder } from '../../../../shared/session-tabs-tab-delta'
@@ -57,12 +58,22 @@ export const SESSION_TAB_METHODS = [
     params: CreateTerminalTab,
     handler: async (params, context) => {
       const { runtime, signal, clientKind, pairedDeviceId, clientCapabilities } = context
-      if (params.command) {
-        await assertLegacyAiVaultResumeCommandAllowed(params.command, () =>
-          runtime.ensureStructuredAgentSessionHost()
-        )
-      }
-      return runtime.createMobileSessionTerminal(params.worktree, {
+      // With a resume session the spawn step registers the start; a bare command registers here.
+      const start = params.command
+        ? await assertLegacyAiVaultResumeCommandAllowed(
+            params.command,
+            () => runtime.ensureStructuredAgentSessionHost(),
+            params.resumeProviderSession
+              ? undefined
+              : (invocations) =>
+                  runtime.reserveManagedConversationStart(
+                    invocations.map((invocation) =>
+                      terminalConversationKey(invocation.provider, invocation.target)
+                    )
+                  )
+          )
+        : undefined
+      const created = runtime.createMobileSessionTerminal(params.worktree, {
         ...(params.sourceChatFork ? { sourceChatFork: params.sourceChatFork } : {}),
         terminalImageViewerSupported: terminalImageViewerSupported(context),
         afterTabId: params.afterTabId,
@@ -102,6 +113,19 @@ export const SESSION_TAB_METHODS = [
         // of running down the timeout and rolling back a live tab (#7718).
         signal
       })
+      // A renderer-backed create has no live PTY yet, so its start isn't held (a known gap).
+      return start
+        ? created.then(
+            (result) => {
+              runtime.bindManagedConversationStartToTerminal(start, result.tab.terminal)
+              return result
+            },
+            (error: unknown) => {
+              start.drop()
+              throw error
+            }
+          )
+        : created
     }
   }),
   defineStreamingMethod({
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-send-method.ts b/src/main/runtime/rpc/methods/terminal/terminal-send-method.ts
index f162192474de..5a9e8d29568e 100644
--- a/src/main/runtime/rpc/methods/terminal/terminal-send-method.ts
+++ b/src/main/runtime/rpc/methods/terminal/terminal-send-method.ts
@@ -1,12 +1,11 @@
-import { assertLegacyAiVaultResumeCommandAllowed } from '../../../../ai-vault/structured-session-ownership'
 import { InvalidArgumentError, defineMethod } from '../../core'
 import { isTerminalQueryReply } from '../../../../../shared/terminal-query-reply'
 import { isUntypedTerminalInput } from '../../../../../shared/terminal-untyped-input'
 import { assertTerminalAgentSendable } from '../../terminal-agent-send-guard'
 import { TerminalSend } from '../../../../../shared/rpc-contract/terminal-unary-params'
+import { withTerminalSendResumeStarts } from './terminal-send-resume-starts'
 import {
   assertTerminalSendExactPtyBinding,
-  assertTerminalSendTextWithinLimit,
   commitMobileInputFloorClaim,
   getTerminalSendGuardRefusedReason,
   isTerminalInputLockedForClient,
@@ -37,18 +36,6 @@ export const TERMINAL_SEND_METHODS = [
         replayedMutationReceipt
       }
     ) => {
-      await assertTerminalSendTextWithinLimit(params.text)
-      await assertTerminalSendTextWithinLimit(params.resolvedLaunchDraft?.text)
-      if (params.text) {
-        await assertLegacyAiVaultResumeCommandAllowed(params.text, () =>
-          runtime.ensureStructuredAgentSessionHost()
-        )
-      }
-      if (params.resolvedLaunchDraft?.text) {
-        await assertLegacyAiVaultResumeCommandAllowed(params.resolvedLaunchDraft.text, () =>
-          runtime.ensureStructuredAgentSessionHost()
-        )
-      }
       const queryReplyClientId = clientId ?? params.client?.id
       if (
         params.inputKind === 'query-reply' &&
@@ -304,4 +291,4 @@ export const TERMINAL_SEND_METHODS = [
       return { send: result }
     }
   })
-]
+].map(withTerminalSendResumeStarts)
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-send-resume-starts.ts b/src/main/runtime/rpc/methods/terminal/terminal-send-resume-starts.ts
new file mode 100644
index 000000000000..f2192e6a38d4
--- /dev/null
+++ b/src/main/runtime/rpc/methods/terminal/terminal-send-resume-starts.ts
@@ -0,0 +1,72 @@
+import { assertLegacyAiVaultResumeCommandAllowed } from '../../../../ai-vault/structured-session-ownership'
+import { terminalConversationKey } from '../../../../native-chat/structured-conversation-key'
+import type { TerminalSend } from '../../../../../shared/rpc-contract/terminal-unary-params'
+import type { ManagedConversationStart } from '../../../managed-conversation-starts'
+import type { RpcContext, RpcTypedMethod } from '../../core'
+import { assertTerminalSendTextWithinLimit } from './terminal-input-delivery'
+
+/** A send whose text resumes a conversation refuses one a chat holds; otherwise it registers the
+ *  start in the same step, bound to the PTY it writes, and drops it when nothing was written. */
+export function withTerminalSendResumeStarts<TName extends string, TResult>(
+  method: RpcTypedMethod<TName, typeof TerminalSend, Promise<TResult>>
+): RpcTypedMethod<TName, typeof TerminalSend, Promise<TResult>> {
+  const send = method.handler
+  return {
+    ...method,
+    handler: async (params, context) => {
+      const { runtime } = context
+      await assertTerminalSendTextWithinLimit(params.text)
+      await assertTerminalSendTextWithinLimit(params.resolvedLaunchDraft?.text)
+      const starts: ManagedConversationStart[] = []
+      try {
+        for (const text of [params.text, params.resolvedLaunchDraft?.text]) {
+          const start = text
+            ? await assertLegacyAiVaultResumeCommandAllowed(
+                text,
+                () => runtime.ensureStructuredAgentSessionHost(),
+                (invocations) =>
+                  runtime.reserveManagedConversationStart(
+                    invocations.map((invocation) =>
+                      terminalConversationKey(invocation.provider, invocation.target)
+                    ),
+                    livePtyId(context, params.terminal)
+                  )
+              )
+            : undefined
+          if (start) {
+            starts.push(start)
+          }
+        }
+        const result = await send(params, context)
+        if (!sendAccepted(result)) {
+          starts.forEach((start) => start.drop())
+        }
+        return result
+      } catch (error) {
+        starts.forEach((start) => start.drop())
+        throw error
+      }
+    }
+  }
+}
+
+// The send itself reports a stale handle; here it only means nothing to bind.
+function livePtyId({ runtime }: RpcContext, handle: string): string | null {
+  try {
+    return runtime.resolveLiveLeafForHandle(handle)?.ptyId ?? null
+  } catch {
+    return null
+  }
+}
+
+function sendAccepted(result: unknown): boolean {
+  return (
+    typeof result === 'object' &&
+    result !== null &&
+    'send' in result &&
+    typeof result.send === 'object' &&
+    result.send !== null &&
+    'accepted' in result.send &&
+    result.send.accepted === true
+  )
+}
diff --git a/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts b/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts
index 6621f1daabb7..ada5f7b3f2aa 100644
--- a/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts
+++ b/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts
@@ -18,9 +18,63 @@ import {
 } from '../../agent-hooks/server/cli-writer-observation'
 import type { AgentSessionRecord } from '../../../shared/agent-session-record'
 import { CLI_CONVERSATION_ADOPTING_AGENTS } from '../../../shared/structured-agent-cli-conversation-adoption'
-import { recordConversationKey } from '../../native-chat/structured-conversation-key'
+import {
+  recordConversationKey,
+  type ConversationKey
+} from '../../native-chat/structured-conversation-key'
+import { agentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
+import {
+  ManagedConversationStarts,
+  type ManagedConversationStart,
+  type ManagedStartPty
+} from '../managed-conversation-starts'
 
 export abstract class OrcaRuntimeWithStructuredSessionCliWriterHost extends OrcaRuntimeWithGetWorktreePs {
+  private readonly managedConversationStarts = new ManagedConversationStarts()
+
+  /** Registers a terminal start Orca issues of `keys`; `ptyId` binds it now, else its spawn does. */
+  reserveManagedConversationStart(
+    keys: readonly ConversationKey[],
+    ptyId?: string | null
+  ): ManagedConversationStart {
+    const start = this.managedConversationStarts.reserve(keys)
+    if (ptyId !== undefined) {
+      this.bindManagedConversationStart(start, ptyId)
+    }
+    return start
+  }
+
+  bindManagedConversationStart(start: ManagedConversationStart, ptyId: string | null): void {
+    const pty = ptyId ? this.ptysById.get(ptyId) : undefined
+    // Only this host's own panes write its chats' conversations; a remote or WSL pane's is another's.
+    if (!pty || pty.connectionId || pty.isWsl) {
+      start.drop()
+      return
+    }
+    start.bind(pty.ptyId, pty.incarnationId)
+  }
+
+  bindManagedConversationStartToTerminal(
+    start: ManagedConversationStart,
+    handle: string | null | undefined
+  ): void {
+    this.bindManagedConversationStart(
+      start,
+      (handle && this.getLivePtyForHandle(handle)?.pty.ptyId) || null
+    )
+  }
+
+  private managedStartPty(ptyId: string): ManagedStartPty | null {
+    const pty = this.ptysById.get(ptyId)
+    return pty
+      ? {
+          incarnationId: pty.incarnationId,
+          cliConversations: pty.cliConversations,
+          exited: this.getPtyLivenessVerdict(ptyId)?.status === 'exited'
+        }
+      : null
+  }
+
   private cliWriterPtyPane(ptyId: string | null | undefined): CliWriterPane | null {
     const pty = ptyId ? this.ptysById.get(ptyId) : undefined
     return pty?.connected && !pty.connectionId && !pty.isWsl && pty.incarnationId
@@ -84,6 +138,12 @@ export abstract class OrcaRuntimeWithStructuredSessionCliWriterHost extends Orca
     if (!key?.id || !adopts) {
       return
     }
+    // A start Orca issued that its terminal's hooks haven't reported yet: the census can't see it.
+    if (this.managedConversationStarts.live(key, (ptyId) => this.managedStartPty(ptyId))) {
+      throw agentSessionRefusalError('agent_session_conflict', {
+        reason: 'conversationHeldElsewhere'
+      })
+    }
     await this.assertStructuredAdoptionTerminalWritersExited(record.provider, key.id)
   }
 

From 762a3bc282784667ed0c1f82bfe1fe7293cabad7 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Mon, 19 Oct 2026 16:26:33 -0700
Subject: [PATCH 003/207] fix(terminal): an automatic pane restore never
 resumes a conversation an open chat continues

Resume recipes built from a pane's saved facts (cold restore, deferred and late reattach,
sleeping wake, host mobile materialization) carry resumeOrigin 'saved'. The execution host
decides before any command is issued: while an open chat continues the conversation, or a
chat may be writing it, the pane starts its plain shell with the started-fresh notice and
its saved claim is forgotten; with unreadable records only a saved restore is refused and
its record kept. An admitted resume registers its managed start in the same step, so the
chat's agent start refuses until the terminal reports it or exits. Clearing the last saved
record now reaches disk.
---
 .../agent-hooks/server/server-tab-cleanup.ts  |  22 ++
 .../ipc/pty-codex-account-attribution.test.ts |   5 +-
 .../pty-daemon-spawn-agent-home-env.test.ts   |   6 +-
 src/main/ipc/pty-ipc-mock-registry.ts         |  13 +
 src/main/ipc/pty-ipc-suite-environment.ts     |   2 +
 .../pty-spawn-codex-home-unavailable.test.ts  |   3 +-
 ...-spawn-env-codex-resume-provenance.test.ts |   3 +-
 .../pty-spawn-saved-resume-admission.test.ts  | 169 +++++++++++++
 .../pty/host-env/saved-resume-admission.ts    | 234 ++++++++++++++++++
 src/main/ipc/pty/ipc/spawn-commit.ts          |  32 ++-
 src/main/ipc/pty/ipc/spawn-preflight.ts       |   9 +
 src/main/ipc/pty/ipc/spawn-run.ts             |  21 ++
 src/main/ipc/pty/ipc/spawn-state.ts           |   4 +
 src/main/ipc/pty/ipc/spawn-types.ts           |   2 +
 .../spawn-preflight-saved-resume.test.ts      | 123 +++++++++
 src/main/ipc/pty/runtime/spawn-preflight.ts   |  37 +++
 src/main/ipc/pty/runtime/spawn-state.ts       |   6 +
 src/main/ipc/pty/runtime/spawn.ts             |   4 +
 .../terminal/terminal-lifecycle-methods.ts    |   1 +
 .../runtime-pty-controller-contract.ts        |   1 +
 .../runtime/runtime-terminal-contracts.ts     |   2 +
 ...form-mobile-session-pty-records-refresh.ts |   1 +
 .../launch/mobile-terminal-owned-create.ts    |   2 +
 .../terminal/launch/terminal-create.ts        |   1 +
 .../stop/worktree-sleep-resume-recording.ts   |  29 ++-
 src/preload/api/pty-api.ts                    |   2 +
 src/preload/api/pty-bridge-session-control.ts |   2 +
 .../terminal-pane/ipc-pty-connect-result.ts   |  10 +-
 .../terminal-pane/ipc-pty-connect.ts          |  11 +-
 .../terminal-pane/ipc-pty-spawn-request.ts    |   4 +
 .../terminal-pane/pty-connection-types.ts     |   2 +
 .../pty-connection/apply-reattach-payload.ts  |  19 +-
 .../cold-restore-resume-startup.ts            |   1 +
 .../deferred-session-reattach-connect.ts      |  15 +-
 .../pty-connection/fresh-spawn-start.ts       |  24 +-
 .../pty-connection/fresh-spawn-types.ts       |   4 +
 .../pty-connection/pane-transport-options.ts  |   3 +
 .../pty-connection/reattach-result-handler.ts |  23 +-
 .../pty-connection/spawn-deferred-sleep.ts    |  17 +-
 .../terminal-pane/pty-transport-types.ts      |   5 +
 .../remote-runtime-pty-transport.ts           |   4 +
 .../ipc-events/agent-status-listeners.ts      |  39 ++-
 .../src/lib/forget-refused-pane-resume.ts     |  75 ++++++
 .../src/lib/sleeping-agent-session-launch.ts  |   1 +
 .../src/lib/workspace-session-patch.test.ts   |   6 +-
 .../src/lib/workspace-session-patch.ts        |   3 +-
 .../src/store/terminals/terminal-actions.ts   |   2 +
 .../src/store/terminals/terminal-state.ts     |   1 +
 src/shared/agent-status-ipc-payload.ts        |   8 +
 src/shared/agent-status-types.ts              |   3 +-
 .../rpc-contract/terminal-unary-params.ts     |   2 +
 51 files changed, 965 insertions(+), 53 deletions(-)
 create mode 100644 src/main/ipc/pty-spawn-saved-resume-admission.test.ts
 create mode 100644 src/main/ipc/pty/host-env/saved-resume-admission.ts
 create mode 100644 src/main/ipc/pty/runtime/spawn-preflight-saved-resume.test.ts
 create mode 100644 src/renderer/src/lib/forget-refused-pane-resume.ts

diff --git a/src/main/agent-hooks/server/server-tab-cleanup.ts b/src/main/agent-hooks/server/server-tab-cleanup.ts
index 5966d2433687..cfe42b8198f0 100644
--- a/src/main/agent-hooks/server/server-tab-cleanup.ts
+++ b/src/main/agent-hooks/server/server-tab-cleanup.ts
@@ -3,8 +3,30 @@ import { paneCacheKeyMatchesTab } from './server-status-identity'
 import { AgentHookServerCleanup } from './server-cleanup'
 import type { EnrichedAgentHookEventPayload } from './server-types'
 import { releaseAgentExitKey } from './agent-exit-evidence'
+import type { RefusedPaneResume } from '../../../shared/agent-status-types'
+import { agentProviderSessionsEqual } from '../../../shared/agent-session-resume'
 
 export abstract class AgentHookServerTabCleanup extends AgentHookServerCleanup {
+  /** The host refused `paneKey`'s saved resume because a native chat is its conversation's home:
+   *  forget the pane's claim here, with no resumable remnant, and tell renderers to forget theirs. */
+  forgetRefusedPaneResume(paneKey: string, refused: RefusedPaneResume): void {
+    // A moved pane's row, and the renderer's state for it, live under its owner's key.
+    const ownerKey = this.resolvePaneKeyAlias(paneKey)
+    const row = this.state.lastStatusByPaneKey.get(ownerKey)
+    const clear = { paneKey: ownerKey, refusedResume: refused }
+    if (
+      row &&
+      row.payload.agentType === refused.agent &&
+      agentProviderSessionsEqual(refused.agent, row.providerSession, refused.providerSession)
+    ) {
+      this.dropStatusEntry(ownerKey, { preserveResumeIdentity: false })
+      this.emitPaneStatusCleared(clear)
+      return
+    }
+    // Renderers only: the pane's row is another conversation's, which other subscribers keep.
+    this.onPaneStatusCleared?.(clear)
+  }
+
   /** Drop every status/cache claim attributable to a closed tab prefix. */
   dropStatusEntriesByTabPrefix(tabId: string): void {
     this.markTabClosedForAgentStatus(tabId)
diff --git a/src/main/ipc/pty-codex-account-attribution.test.ts b/src/main/ipc/pty-codex-account-attribution.test.ts
index fd2c3ec3790c..18edf2bb5aa4 100644
--- a/src/main/ipc/pty-codex-account-attribution.test.ts
+++ b/src/main/ipc/pty-codex-account-attribution.test.ts
@@ -3,7 +3,8 @@ import { join } from 'node:path'
 import {
   readFileSyncMock,
   recordCodexPaneAccountMock,
-  forgetCodexPaneAccountMock
+  forgetCodexPaneAccountMock,
+  noChatsRuntimeMembers
 } from './pty-ipc-mock-registry'
 import { TEST_CODEX_HOME, TEST_CODEX_AUTH_JSON, TEST_MANAGED_ROOT } from './pty-ipc-test-constants'
 import { setupPtyIpcSuite } from './pty-ipc-test-harness'
@@ -291,6 +292,7 @@ describe('registerPtyHandlers', () => {
     } as never)
     const runtime = {
       setPtyController: vi.fn(),
+      ...noChatsRuntimeMembers(),
       registerPty: vi.fn(),
       noteTerminalSpawnCommand: vi.fn(),
       onPtySpawned: vi.fn(),
@@ -361,6 +363,7 @@ describe('registerPtyHandlers', () => {
     } as never)
     const runtime = {
       setPtyController: vi.fn(),
+      ...noChatsRuntimeMembers(),
       registerPty: vi.fn(),
       noteTerminalSpawnCommand: vi.fn(),
       onPtySpawned: vi.fn(),
diff --git a/src/main/ipc/pty-daemon-spawn-agent-home-env.test.ts b/src/main/ipc/pty-daemon-spawn-agent-home-env.test.ts
index 0ed742831814..1763e2c44a37 100644
--- a/src/main/ipc/pty-daemon-spawn-agent-home-env.test.ts
+++ b/src/main/ipc/pty-daemon-spawn-agent-home-env.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it, vi } from 'vitest'
-import { piBuildPtyEnvMock } from './pty-ipc-mock-registry'
+import { piBuildPtyEnvMock, noChatsRuntimeMembers } from './pty-ipc-mock-registry'
 import { setupPtyIpcSuite } from './pty-ipc-test-harness'
 import {
   type DaemonSpawnCall,
@@ -127,6 +127,7 @@ describe('registerPtyHandlers', () => {
         const daemonSpawn = setupDaemonAdapter()
         const runtime = {
           setPtyController: vi.fn(),
+          ...noChatsRuntimeMembers(),
           registerPty: vi.fn(),
           noteTerminalSpawnCommand: vi.fn(),
           onPtySpawned: vi.fn(),
@@ -518,6 +519,7 @@ describe('registerPtyHandlers', () => {
         const daemonSpawn = setupDaemonAdapter()
         const runtime = {
           setPtyController: vi.fn(),
+          ...noChatsRuntimeMembers(),
           registerPty: vi.fn(),
           noteTerminalSpawnCommand: vi.fn(),
           onPtySpawned: vi.fn(),
@@ -552,6 +554,7 @@ describe('registerPtyHandlers', () => {
         const daemonSpawn = setupDaemonAdapter()
         const runtime = {
           setPtyController: vi.fn(),
+          ...noChatsRuntimeMembers(),
           registerPty: vi.fn(),
           noteTerminalSpawnCommand: vi.fn(),
           onPtySpawned: vi.fn(),
@@ -586,6 +589,7 @@ describe('registerPtyHandlers', () => {
         const daemonSpawn = setupDaemonAdapter()
         const runtime = {
           setPtyController: vi.fn(),
+          ...noChatsRuntimeMembers(),
           registerPty: vi.fn(),
           noteTerminalSpawnCommand: vi.fn(),
           onPtySpawned: vi.fn(),
diff --git a/src/main/ipc/pty-ipc-mock-registry.ts b/src/main/ipc/pty-ipc-mock-registry.ts
index 4eba8d0b1641..1adcd9237ca5 100644
--- a/src/main/ipc/pty-ipc-mock-registry.ts
+++ b/src/main/ipc/pty-ipc-mock-registry.ts
@@ -31,6 +31,7 @@ export const openCodeClearPtyMock: Mock = vi.fn()
 export const buildAgentHookEnvMock: Mock = vi.fn()
 export const clearAgentHookPaneStateMock: Mock = vi.fn()
 export const registerPaneKeyAliasMock: Mock = vi.fn()
+export const forgetRefusedPaneResumeMock: Mock = vi.fn()
 export const piBuildPtyEnvMock: Mock = vi.fn()
 export const piClearPtyMock: Mock = vi.fn()
 export const trackMock: Mock = vi.fn()
@@ -129,11 +130,23 @@ export const mimoHookServiceModuleMock = () => ({
   }
 })
 
+/** What a spawn's resume admission reads from a fake runtime: no chats, so every resume runs. */
+export const noChatsRuntimeMembers = () => ({
+  openAgentSessionRecordStore: vi.fn(async () => ({
+    listRecords: () => [],
+    getVisibleSessionTabIndex: () => ({ present: true, sessionIds: [] })
+  })),
+  reserveManagedConversationStart: vi.fn(() => ({ bind: vi.fn(), drop: vi.fn() })),
+  bindManagedConversationStart: vi.fn()
+})
+
 export const agentHookServerModuleMock = () => ({
   agentHookServer: {
     buildPtyEnv: buildAgentHookEnvMock,
     clearPaneState: clearAgentHookPaneStateMock,
     registerPaneKeyAlias: registerPaneKeyAliasMock,
+    forgetRefusedPaneResume: forgetRefusedPaneResumeMock,
+    recordLaunchResumeIdentity: () => {},
     clearPaneKeyAliasesForPty: clearPaneKeyAliasesForPtyMock
   }
 })
diff --git a/src/main/ipc/pty-ipc-suite-environment.ts b/src/main/ipc/pty-ipc-suite-environment.ts
index 9c1409214f86..a7f4637f383a 100644
--- a/src/main/ipc/pty-ipc-suite-environment.ts
+++ b/src/main/ipc/pty-ipc-suite-environment.ts
@@ -28,6 +28,7 @@ import {
   buildAgentHookEnvMock,
   clearAgentHookPaneStateMock,
   registerPaneKeyAliasMock,
+  forgetRefusedPaneResumeMock,
   piBuildPtyEnvMock,
   piClearPtyMock,
   isPwshAvailableMock,
@@ -159,6 +160,7 @@ export function createPtyIpcSuiteEnvironment(): PtyIpcSuiteEnvironment {
     buildAgentHookEnvMock.mockReset()
     clearAgentHookPaneStateMock.mockReset()
     registerPaneKeyAliasMock.mockReset()
+    forgetRefusedPaneResumeMock.mockReset()
     piBuildPtyEnvMock.mockReset()
     piClearPtyMock.mockReset()
     isPwshAvailableMock.mockReset()
diff --git a/src/main/ipc/pty-spawn-codex-home-unavailable.test.ts b/src/main/ipc/pty-spawn-codex-home-unavailable.test.ts
index a76b37305b0a..b7e7b710a15a 100644
--- a/src/main/ipc/pty-spawn-codex-home-unavailable.test.ts
+++ b/src/main/ipc/pty-spawn-codex-home-unavailable.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it, vi } from 'vitest'
-import { readFileSyncMock } from './pty-ipc-mock-registry'
+import { readFileSyncMock, noChatsRuntimeMembers } from './pty-ipc-mock-registry'
 import { TEST_CODEX_HOME, TEST_CODEX_AUTH_JSON } from './pty-ipc-test-constants'
 import { setupPtyIpcSuite } from './pty-ipc-test-harness'
 import { createDaemonActiveProviderFixtures } from './pty-ipc-daemon-provider-fixtures'
@@ -87,6 +87,7 @@ describe('registerPtyHandlers Codex launch refusal on an unreadable managed home
   function makeRuntime() {
     return {
       setPtyController: vi.fn(),
+      ...noChatsRuntimeMembers(),
       createPreAllocatedTerminalHandle: vi.fn(() => null),
       registerPty: vi.fn(),
       noteTerminalSpawnCommand: vi.fn(),
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 1cecd3a2b37f..cbe5953f7ceb 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
@@ -1,6 +1,6 @@
 import { describe, expect, it, vi } from 'vitest'
 import { join } from 'node:path'
-import { spawnMock } from './pty-ipc-mock-registry'
+import { spawnMock, noChatsRuntimeMembers } from './pty-ipc-mock-registry'
 import { posixOnlyIt, TEST_MANAGED_ROOT } from './pty-ipc-test-constants'
 import { setupPtyIpcSuite } from './pty-ipc-test-harness'
 import { prepareCodexSessionResume } from '../codex/codex-session-resume-preparation'
@@ -360,6 +360,7 @@ describe('registerPtyHandlers', () => {
         const daemonSpawn = setupResumeDaemonProvider()
         const runtime = {
           setPtyController: vi.fn(),
+          ...noChatsRuntimeMembers(),
           registerPty: vi.fn(),
           noteTerminalSpawnCommand: vi.fn(),
           onPtySpawned: vi.fn(),
diff --git a/src/main/ipc/pty-spawn-saved-resume-admission.test.ts b/src/main/ipc/pty-spawn-saved-resume-admission.test.ts
new file mode 100644
index 000000000000..2a9a53ac3fcc
--- /dev/null
+++ b/src/main/ipc/pty-spawn-saved-resume-admission.test.ts
@@ -0,0 +1,169 @@
+import { describe, expect, vi } from 'vitest'
+import { forgetRefusedPaneResumeMock, spawnMock } from './pty-ipc-mock-registry'
+import { posixOnlyIt } from './pty-ipc-test-constants'
+import { setupPtyIpcSuite } from './pty-ipc-test-harness'
+import { POSIX_SHELL_STARTUP_COMMAND_ENV } from '../pty/posix-shell-startup-command'
+import { registerPtyHandlers } from './pty/register-handlers'
+import { OrcaRuntimeService } from '../runtime/orca-runtime'
+import { AgentSessionRecordStore } from '../runtime/agent-session-record-store'
+import {
+  agentSessionLeaseFixture,
+  agentSessionRecordFixture
+} from '../../shared/agent-session-record.test-fixture'
+
+vi.mock('electron', () => import('./pty-ipc-mock-registry').then((m) => m.electronModuleMock()))
+vi.mock('fs', () => import('./pty-ipc-mock-registry').then((m) => m.fsModuleMock()))
+vi.mock('node-pty', () => import('./pty-ipc-mock-registry').then((m) => m.nodePtyModuleMock()))
+vi.mock('node:child_process', async (importOriginal) =>
+  (await import('./pty-ipc-mock-registry')).childProcessModuleMock(await importOriginal())
+)
+vi.mock('../opencode/hook-service', () =>
+  import('./pty-ipc-mock-registry').then((m) => m.openCodeHookServiceModuleMock())
+)
+vi.mock('../mimo/hook-service', () =>
+  import('./pty-ipc-mock-registry').then((m) => m.mimoHookServiceModuleMock())
+)
+vi.mock('../agent-hooks/server', () =>
+  import('./pty-ipc-mock-registry').then((m) => m.agentHookServerModuleMock())
+)
+vi.mock('../pi/titlebar-extension-service', () =>
+  import('./pty-ipc-mock-registry').then((m) => m.piTitlebarExtensionModuleMock())
+)
+vi.mock('../pwsh', () => import('./pty-ipc-mock-registry').then((m) => m.pwshModuleMock()))
+vi.mock('../wsl', async (importOriginal) =>
+  (await import('./pty-ipc-mock-registry')).wslModuleMock(await importOriginal())
+)
+vi.mock('../telemetry/client', () =>
+  import('./pty-ipc-mock-registry').then((m) => m.telemetryClientModuleMock())
+)
+vi.mock('../telemetry/classify-error', () =>
+  import('./pty-ipc-mock-registry').then((m) => m.classifyErrorModuleMock())
+)
+vi.mock('../cli/linux-terminal-orca-cli-shim', () =>
+  import('./pty-ipc-mock-registry').then((m) => m.linuxCliShimModuleMock())
+)
+vi.mock('../memory/pty-registry', () =>
+  import('./pty-ipc-mock-registry').then((m) => m.ptyRegistryModuleMock())
+)
+vi.mock('../agent-hooks/migration-unsupported-pty-state', () =>
+  import('./pty-ipc-mock-registry').then((m) => m.migrationUnsupportedPtyModuleMock())
+)
+vi.mock('../codex/codex-pane-account-registry', () =>
+  import('./pty-ipc-mock-registry').then((m) => m.codexPaneAccountRegistryModuleMock())
+)
+vi.mock('../codex/codex-state-db-backfill-recovery', () =>
+  import('./pty-ipc-mock-registry').then((m) => m.codexBackfillRecoveryModuleMock())
+)
+
+// #26417: a pane that saved a chat's conversation must not resume it while the chat is its home.
+describe('a pane restore of a conversation a native chat continues', () => {
+  const { handlers, mainWindow, createMockProc } = setupPtyIpcSuite()
+  const chat = agentSessionRecordFixture(
+    agentSessionLeaseFixture({
+      claimStatus: 'released',
+      ownerProcess: null,
+      reservedSpawnToken: null,
+      deathEvidence: { kind: 'exit-observed', detail: 'closed', observedAt: 1 }
+    })
+  )
+  const C = 'provider-session-alpha-1'
+  const LEAF_ID = '11111111-1111-4111-8111-111111111111'
+
+  function register(openTabs: string[] | 'unreadable') {
+    const runtime = new OrcaRuntimeService()
+    vi.spyOn(runtime, 'openAgentSessionRecordStore').mockImplementation(async () => {
+      if (openTabs === 'unreadable') {
+        throw new Error('records unavailable')
+      }
+      const store: AgentSessionRecordStore = Object.create(AgentSessionRecordStore.prototype)
+      store.listRecords = () => [chat]
+      store.getVisibleSessionTabIndex = () => ({ present: true, sessionIds: openTabs })
+      return store
+    })
+    registerPtyHandlers(mainWindow, runtime)
+    return runtime
+  }
+
+  async function spawnResume(resumeOrigin?: 'saved', leafId = LEAF_ID) {
+    const mockProc = createMockProc()
+    spawnMock.mockReturnValue(mockProc.proc)
+    vi.useFakeTimers()
+    try {
+      const result = await handlers.get('pty:spawn')!(null, {
+        cols: 80,
+        rows: 24,
+        cwd: '/tmp',
+        worktreeId: 'wt-1',
+        tabId: 'tab-floating',
+        leafId,
+        command: `claude --resume '${C}'`,
+        launchAgent: 'claude',
+        resumeProviderSession: { key: 'session_id', id: C },
+        ...(resumeOrigin ? { resumeOrigin } : {})
+      })
+      for (let flush = 0; flush < 3; flush += 1) {
+        await Promise.resolve()
+        vi.runAllTimers()
+      }
+      const env: Record<string, string> = spawnMock.mock.calls.at(-1)![2].env
+      const typed = mockProc.proc.write.mock.calls.map((call) => String(call[0]))
+      const reported = typeof result === 'object' && result !== null ? result : {}
+      return {
+        refused: 'agentResumeRefused' in reported ? reported.agentResumeRefused : undefined,
+        notice: 'agentResumeUnavailable' in reported,
+        input: [env[POSIX_SHELL_STARTUP_COMMAND_ENV] ?? '', ...typed].join('\n')
+      }
+    } finally {
+      vi.useRealTimers()
+    }
+  }
+
+  posixOnlyIt(
+    'starts the plain shell with the notice and forgets the pane claim while the chat tab is open',
+    async () => {
+      register([chat.sessionId])
+      const restored = await spawnResume('saved')
+      expect(restored).toMatchObject({ refused: 'chat-home', notice: true })
+      expect(restored.input).not.toContain(C)
+      expect(forgetRefusedPaneResumeMock).toHaveBeenCalledWith(`tab-floating:${LEAF_ID}`, {
+        agent: 'claude',
+        providerSession: { key: 'session_id', id: C }
+      })
+    }
+  )
+
+  posixOnlyIt(
+    'resumes once the chat tab is closed, and the chat then refuses to start',
+    async () => {
+      const runtime = register([])
+      const restored = await spawnResume('saved')
+      expect(restored.refused).toBeUndefined()
+      expect(restored.input).toContain(`--resume '${C}'`)
+      await expect(runtime['assertStructuredChatAcquireAdmissible'](chat)).rejects.toMatchObject({
+        refusal: { details: { reason: 'conversationHeldElsewhere' } }
+      })
+    }
+  )
+
+  posixOnlyIt(
+    'with unreadable records refuses only a saved restore, and keeps its record',
+    async () => {
+      vi.spyOn(console, 'warn').mockImplementation(() => {})
+      register('unreadable')
+      const restored = await spawnResume('saved')
+      const asked = await spawnResume(undefined, '22222222-2222-4222-8222-222222222222')
+      expect(restored.refused).toBe('unverifiable')
+      expect(restored.input).not.toContain(C)
+      expect(asked.refused).toBeUndefined()
+      expect(asked.input).toContain(`--resume '${C}'`)
+      expect(forgetRefusedPaneResumeMock).not.toHaveBeenCalled()
+    }
+  )
+
+  posixOnlyIt('leaves an explicit resume of a chat at rest alone', async () => {
+    register([chat.sessionId])
+    const asked = await spawnResume()
+    expect(asked.refused).toBeUndefined()
+    expect(asked.input).toContain(`--resume '${C}'`)
+  })
+})
diff --git a/src/main/ipc/pty/host-env/saved-resume-admission.ts b/src/main/ipc/pty/host-env/saved-resume-admission.ts
new file mode 100644
index 000000000000..89db109a1059
--- /dev/null
+++ b/src/main/ipc/pty/host-env/saved-resume-admission.ts
@@ -0,0 +1,234 @@
+import type { TuiAgent } from '../../../../shared/tui-agent'
+import {
+  normalizeAgentProviderSession,
+  type AgentProviderSessionMetadata,
+  type SleepingAgentLaunchConfig,
+  type SleepingAgentSessionRecord
+} from '../../../../shared/agent-session-resume'
+import type {
+  AgentStatusIpcPayload,
+  RefusedPaneResume
+} from '../../../../shared/agent-status-types'
+import type { AgentSessionRecordStore } from '../../../runtime/agent-session-record-store'
+import type { ManagedConversationStart } from '../../../runtime/managed-conversation-starts'
+import {
+  agentSessionLeasePossiblyWriting,
+  listStructuredProviderSessionOwnership
+} from '../../../native-chat/agent-session-wire/structured-provider-session-ownership'
+import { agentHookServer } from '../../../agent-hooks/server'
+import { LOCAL_EXECUTION_HOST_ID, type ExecutionHostId } from '../../../../shared/execution-host'
+import type { WorkspaceSessionState } from '../../../../shared/workspace-session-state-types'
+import {
+  keysMayMatch,
+  terminalConversationKey,
+  type ConversationKey
+} from '../../../native-chat/structured-conversation-key'
+
+export type ResumeSpawnArgs = {
+  connectionId?: string | null
+  command?: string
+  launchAgent?: TuiAgent
+  launchConfig?: SleepingAgentLaunchConfig
+  launchToken?: unknown
+  resumeProviderSession?: AgentProviderSessionMetadata
+  /** `saved`: the resume was built from a pane's saved facts, not asked for by the user. */
+  resumeOrigin?: unknown
+  env?: Record<string, string>
+}
+
+type AdmissionRuntime = {
+  openAgentSessionRecordStore(): Promise<AgentSessionRecordStore>
+  reserveManagedConversationStart(keys: readonly ConversationKey[]): ManagedConversationStart
+}
+
+/** `chat-home`: an automatic restore of a conversation an open chat continues; `chat-writing`:
+ *  any start of one a chat may be writing; `unverifiable`: an automatic restore with no records. */
+export type ResumeSpawnRefusal = {
+  verdict: 'chat-home' | 'chat-writing' | 'unverifiable'
+  refused: RefusedPaneResume
+}
+
+export type ResumeSpawnAdmission =
+  | { verdict: 'admitted'; start: ManagedConversationStart }
+  | ResumeSpawnRefusal
+
+/**
+ * Decided on the execution host before any command is issued. An admitted start registers in the
+ * same step as the check, so a chat starting meanwhile sees it. Null: nothing here can be a chat's
+ * (no resume, a remote or WSL pane), so the spawn stays as it was.
+ */
+export async function admitResumeSpawn(
+  runtime: AdmissionRuntime | undefined,
+  args: ResumeSpawnArgs,
+  wslDistro: string | null
+): Promise<ResumeSpawnAdmission | null> {
+  const providerSession = normalizeAgentProviderSession(args.resumeProviderSession)
+  const agent = args.launchAgent
+  // Native chats run only natively, so a remote or WSL conversation is never a chat's.
+  if (!runtime || !providerSession || !agent || args.connectionId || wslDistro !== null) {
+    return null
+  }
+  return judgeResumes(runtime, [{ agent, providerSession }], args.resumeOrigin === 'saved')
+}
+
+/** A reattach that found its session gone returns a fresh shell its window then resumes from the
+ *  pane's saved facts; this decides that resume before the window can deliver it. */
+export async function admitColdRestoreReattach(
+  runtime:
+    | (AdmissionRuntime & { getAgentProviderSessionRows(): AgentStatusIpcPayload[] })
+    | undefined,
+  result: { coldRestore?: unknown; isReattach?: boolean },
+  pane: { paneKey: string | null; saved: SleepingAgentSessionRecord | undefined },
+  wslDistro: string | null
+): Promise<ResumeSpawnAdmission | null> {
+  const { paneKey, saved } = pane
+  if (!runtime || !result.coldRestore || result.isReattach || !paneKey || wslDistro !== null) {
+    return null
+  }
+  const resumes = [
+    ...runtime
+      .getAgentProviderSessionRows()
+      .flatMap((row) =>
+        row.paneKey === paneKey && !row.connectionId && row.providerSession
+          ? [{ agent: row.agentType, providerSession: row.providerSession }]
+          : []
+      ),
+    ...(saved && !saved.connectionId
+      ? [{ agent: saved.agent, providerSession: saved.providerSession }]
+      : [])
+  ]
+  const [first, ...rest] = resumes
+  return first ? judgeResumes(runtime, [first, ...rest], true) : null
+}
+
+async function judgeResumes(
+  runtime: AdmissionRuntime,
+  resumes: readonly [RefusedPaneResume, ...RefusedPaneResume[]],
+  saved: boolean
+): Promise<ResumeSpawnAdmission> {
+  const keysOf = ({ agent, providerSession }: RefusedPaneResume) =>
+    [providerSession.id, providerSession.transcriptPath].flatMap((id) =>
+      id?.trim() ? [terminalConversationKey(agent, id)] : []
+    )
+  const admitted = (): ResumeSpawnAdmission => ({
+    verdict: 'admitted',
+    start: runtime.reserveManagedConversationStart(resumes.flatMap(keysOf))
+  })
+  let store: AgentSessionRecordStore
+  try {
+    store = await runtime.openAgentSessionRecordStore()
+  } catch (error) {
+    console.warn(
+      "[pty] native chat records unreadable; cannot tell whether a resume is a chat's",
+      error
+    )
+    // Bookkeeping never gates a resume the user asked for.
+    return saved ? { verdict: 'unverifiable', refused: resumes[0] } : admitted()
+  }
+  const heads = listStructuredProviderSessionOwnership(store.listRecords()).filter(
+    (holding) => holding.role === 'head'
+  )
+  const tabs = saved ? store.getVisibleSessionTabIndex() : null
+  for (const refused of resumes) {
+    const holders = heads.filter((holding) =>
+      keysOf(refused).some((key) => keysMayMatch(holding.key, key))
+    )
+    if (holders.some((holding) => agentSessionLeasePossiblyWriting(holding.lease))) {
+      return { verdict: 'chat-writing', refused }
+    }
+    if (tabs && holders.length > 0 && !tabs.present) {
+      return { verdict: 'unverifiable', refused }
+    }
+    if (tabs && holders.some((holding) => tabs.sessionIds.includes(holding.sessionId))) {
+      return { verdict: 'chat-home', refused }
+    }
+  }
+  return admitted()
+}
+
+/** A refused resume becomes the pane's plain shell: nothing of the agent launch is left to run,
+ *  register, or mark the shell as an unattended agent's. */
+export function dropAgentLaunch(args: ResumeSpawnArgs): void {
+  const agentEnv = args.launchConfig?.agentEnv ?? {}
+  if (args.env) {
+    args.env = Object.fromEntries(
+      Object.entries(args.env).filter(
+        ([key, value]) => key !== 'ORCA_AGENT_LAUNCH_TOKEN' && agentEnv[key] !== value
+      )
+    )
+  }
+  delete args.command
+  delete args.launchAgent
+  delete args.launchConfig
+  delete args.launchToken
+  delete args.resumeProviderSession
+}
+
+/** The admission at a spawn step: a refused resume leaves the spawn its plain shell. */
+export async function applyResumeSpawnAdmission(
+  runtime: AdmissionRuntime | undefined,
+  args: ResumeSpawnArgs,
+  wslDistro: string | null
+): Promise<ResumeSpawnAdmission | null> {
+  const admission = await admitResumeSpawn(runtime, args, wslDistro)
+  if (admission && admission.verdict !== 'admitted') {
+    dropAgentLaunch(args)
+  }
+  return admission
+}
+
+export function resumeSpawnRefusal(
+  admission: ResumeSpawnAdmission | null
+): ResumeSpawnRefusal | null {
+  return admission && admission.verdict !== 'admitted' ? admission : null
+}
+
+/** An admitted start holds the PTY that runs it; a reattach never ran the launch. */
+export function bindResumeSpawnStart(
+  runtime:
+    | { bindManagedConversationStart(start: ManagedConversationStart, ptyId: string | null): void }
+    | undefined,
+  admission: ResumeSpawnAdmission | null,
+  result: { id: string; isReattach?: boolean }
+): void {
+  if (admission?.verdict === 'admitted') {
+    runtime?.bindManagedConversationStart(admission.start, result.isReattach ? null : result.id)
+  }
+}
+
+export function dropResumeSpawnStart(admission: ResumeSpawnAdmission | null): void {
+  if (admission?.verdict === 'admitted') {
+    admission.start.drop()
+  }
+}
+
+/** Retires a refused resume's claim at once, so the cleanup never waits on this spawn finishing or
+ *  a pane receiving its result. An unverifiable refusal keeps everything for the next try. */
+export function forgetRefusedResume(
+  paneKey: string | null,
+  refusal: ResumeSpawnRefusal | null
+): void {
+  if (!paneKey || !refusal || refusal.verdict === 'unverifiable') {
+    return
+  }
+  try {
+    agentHookServer.forgetRefusedPaneResume(paneKey, refusal.refused)
+  } catch (error) {
+    // The shell still starts, and the next restore refuses and retries the cleanup.
+    console.warn('[pty] could not forget a resume a native chat holds', error)
+  }
+}
+
+/** The pane's saved resume on this host, which its window resumes from after a cold restore. */
+export function savedResumeRecord(
+  store:
+    | { getWorkspaceSession?(hostId: ExecutionHostId): WorkspaceSessionState | undefined }
+    | undefined,
+  paneKey: string | null
+): SleepingAgentSessionRecord | undefined {
+  return paneKey
+    ? store?.getWorkspaceSession?.(LOCAL_EXECUTION_HOST_ID)?.sleepingAgentSessionsByPaneKey?.[
+        paneKey
+      ]
+    : undefined
+}
diff --git a/src/main/ipc/pty/ipc/spawn-commit.ts b/src/main/ipc/pty/ipc/spawn-commit.ts
index 666fcac2c738..bdf460e07825 100644
--- a/src/main/ipc/pty/ipc/spawn-commit.ts
+++ b/src/main/ipc/pty/ipc/spawn-commit.ts
@@ -23,11 +23,28 @@ import { reflowHeadlessTerminalToCommittedGrid } from '../delivery/attached-pty-
 import { seedHeadlessTerminalFromSpawnResult } from '../pane/terminal-spawn-restore'
 import { markNativeWindowsConptyPty } from '../../../runtime/terminal-model-query-authority'
 import { commitPtyWithOpenCodePromptIntent } from '../../../opencode/opencode-startup-prompt-owner'
+import { resumeSpawnRefusal } from '../host-env/saved-resume-admission'
 
 export async function commitPtyIpcSpawn(ctx: PtyIpcSpawnState): Promise<PtySpawnResult> {
   return commitPtyWithOpenCodePromptIntent(ctx, () => commitReservedPtyIpcSpawn(ctx))
 }
 
+/** What became of a requested resume, on every result the renderer receives. */
+function resumeDisposition(ctx: PtyIpcSpawnState) {
+  // Why: the pane asked to resume and got a fresh session instead; only the
+  // renderer can say so, and a reattach never ran this launch command.
+  if (ctx.result.isReattach) {
+    return {}
+  }
+  const refusal = resumeSpawnRefusal(ctx.resumeAdmission)
+  return {
+    ...(ctx.codexResumeLaunch.notifyResumeUnavailable || refusal
+      ? { agentResumeUnavailable: true as const }
+      : {}),
+    ...(refusal ? { agentResumeRefused: refusal.verdict } : {})
+  }
+}
+
 async function commitReservedPtyIpcSpawn(ctx: PtyIpcSpawnState): Promise<PtySpawnResult> {
   const args = ctx.args
   admitPtySpawnOwnership(ctx.deps.runtime, ctx.result)
@@ -89,11 +106,10 @@ async function commitReservedPtyIpcSpawn(ctx: PtyIpcSpawnState): Promise<PtySpaw
       ctx.pendingRegistrationPtyId = null
       ctx.exitedBeforeRegistration = true
       // The renderer drains this incarnation's buffered output and exit without publishing it live.
-      return resolvePaneSpawnReservation(
-        ctx.paneSpawnReservationKey,
-        ctx.paneSpawnReservation,
-        ctx.result
-      )
+      return resolvePaneSpawnReservation(ctx.paneSpawnReservationKey, ctx.paneSpawnReservation, {
+        ...ctx.result,
+        ...resumeDisposition(ctx)
+      })
     }
     ctx.pendingRegistrationPtyId = null
   } else if (ctx.pendingRegistrationPtyId) {
@@ -206,11 +222,7 @@ async function commitReservedPtyIpcSpawn(ctx: PtyIpcSpawnState): Promise<PtySpaw
     ...(ctx.startupCwdFallback && !ctx.result.isReattach
       ? { startupCwdFallback: ctx.startupCwdFallback }
       : {}),
-    // Why: the pane asked to resume and got a fresh session instead; only the
-    // renderer can say so, and a reattach never ran this launch command.
-    ...(ctx.codexResumeLaunch.notifyResumeUnavailable && !ctx.result.isReattach
-      ? { agentResumeUnavailable: true as const }
-      : {})
+    ...resumeDisposition(ctx)
   }
   // Why: renderer tab state cannot reliably infer background and reattached PTYs in the daemon inventory.
   ctx.deps.sendPtySpawnedToRenderer(ctx.result.id)
diff --git a/src/main/ipc/pty/ipc/spawn-preflight.ts b/src/main/ipc/pty/ipc/spawn-preflight.ts
index f791190a074c..a01d0cf0543d 100644
--- a/src/main/ipc/pty/ipc/spawn-preflight.ts
+++ b/src/main/ipc/pty/ipc/spawn-preflight.ts
@@ -10,6 +10,7 @@ import { getProvider } from '../provider/registry'
 import { resolvePtySpawnStartupTarget } from '../spawn-startup-target'
 import type { PtyIpcSpawnState } from './spawn-state'
 import { getConnectionExecutionHostId } from '../../../../shared/execution-host'
+import { applyResumeSpawnAdmission, resumeSpawnRefusal } from '../host-env/saved-resume-admission'
 
 export async function preparePtyIpcSpawnPreflight(ctx: PtyIpcSpawnState): Promise<void> {
   const args = ctx.args
@@ -107,6 +108,14 @@ export async function preparePtyIpcSpawnPreflight(ctx: PtyIpcSpawnState): Promis
   ctx.terminalRuntimeOptions = target.terminalRuntimeOptions
   ctx.expectedWslDistro = target.expectedWslDistro
   ctx.codexSelectionTarget = target.codexSelectionTarget
+  if (!ctx.preAdoptedStablePane) {
+    ctx.resumeAdmission = await applyResumeSpawnAdmission(
+      ctx.deps.runtime,
+      args,
+      ctx.expectedWslDistro
+    )
+    ctx.isClaudeLaunch = ctx.isClaudeLaunch && !resumeSpawnRefusal(ctx.resumeAdmission)
+  }
   ctx.spawnTiming.mark('preflight')
   args.env = withClaudeProfileTerminalEnv(args.env, ctx.codexSelectionTarget)
   ctx.claudeAuth =
diff --git a/src/main/ipc/pty/ipc/spawn-run.ts b/src/main/ipc/pty/ipc/spawn-run.ts
index fd25968b02dc..f15863cbbdc7 100644
--- a/src/main/ipc/pty/ipc/spawn-run.ts
+++ b/src/main/ipc/pty/ipc/spawn-run.ts
@@ -19,6 +19,14 @@ import { triggerPtySpawnPushTargetMaterialization } from './spawn-push-target-ma
 import type { PtySpawnIpcArgs, PtySpawnIpcDeps } from './spawn-types'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
 import { refuseClosedPaneSpawn } from './closed-pane-spawn-refusal'
+import {
+  admitColdRestoreReattach,
+  bindResumeSpawnStart,
+  dropResumeSpawnStart,
+  forgetRefusedResume,
+  resumeSpawnRefusal,
+  savedResumeRecord
+} from '../host-env/saved-resume-admission'
 
 function releaseAbandonedAgentTeamsLeader(ctx: PtyIpcSpawnState): void {
   if (!ctx.agentTeamsLeaderHandle) {
@@ -58,6 +66,7 @@ export async function runPtyIpcSpawn(deps: PtySpawnIpcDeps, args: PtySpawnIpcArg
     }
     await preparePtyIpcSpawnPreflight(ctx)
     await assemblePtyIpcSpawnEnv(ctx)
+    forgetRefusedResume(ctx.stablePaneKey, resumeSpawnRefusal(ctx.resumeAdmission))
     await preparePtyIpcQoderCommand(ctx)
     const earlyReserved = await buildPtyIpcSpawnOptions(ctx).catch((error: unknown) => {
       restoreProvisionalPtySize({
@@ -74,6 +83,7 @@ export async function runPtyIpcSpawn(deps: PtySpawnIpcDeps, args: PtySpawnIpcArg
       // evict the team env assembly created for it — exit/close cleanup keys
       // off handleByPtyId — so every lost race would leak one team forever.
       releaseAbandonedAgentTeamsLeader(ctx)
+      dropResumeSpawnStart(ctx.resumeAdmission)
       return earlyReserved
     }
     // Right before the provider spawn, with nothing awaited in between: a closed pane starts nothing.
@@ -83,7 +93,17 @@ export async function runPtyIpcSpawn(deps: PtySpawnIpcDeps, args: PtySpawnIpcArg
       refuseClosedPaneSpawn(deps.store, args.tabId, args.leafId)
     }
     await executePtyIpcSpawn(ctx)
+    if (!ctx.resumeAdmission) {
+      ctx.resumeAdmission = await admitColdRestoreReattach(
+        deps.runtime,
+        ctx.result,
+        { paneKey: ctx.stablePaneKey, saved: savedResumeRecord(deps.store, ctx.stablePaneKey) },
+        ctx.expectedWslDistro
+      )
+      forgetRefusedResume(ctx.stablePaneKey, resumeSpawnRefusal(ctx.resumeAdmission))
+    }
     const committed = await commitPtyIpcSpawn(ctx)
+    bindResumeSpawnStart(deps.runtime, ctx.resumeAdmission, ctx.result)
     endPaneAgentLaunch(
       ctx,
       ctx.exitedBeforeRegistration ? { exitedDuringStart: true } : { started: true }
@@ -91,6 +111,7 @@ export async function runPtyIpcSpawn(deps: PtySpawnIpcDeps, args: PtySpawnIpcArg
     return committed
   } catch (caught) {
     const err = endPaneAgentLaunch(ctx, { error: caught }) ?? caught
+    dropResumeSpawnStart(ctx.resumeAdmission)
     releaseAbandonedAgentTeamsLeader(ctx)
     if (ctx.preSpawnHiddenMarkId !== null) {
       ctx.deps.transitionSpawnHiddenRendererPtyDeliveryState(ctx.preSpawnHiddenMarkId, false)
diff --git a/src/main/ipc/pty/ipc/spawn-state.ts b/src/main/ipc/pty/ipc/spawn-state.ts
index 6b24c4d24b45..e7c82b057d19 100644
--- a/src/main/ipc/pty/ipc/spawn-state.ts
+++ b/src/main/ipc/pty/ipc/spawn-state.ts
@@ -6,6 +6,7 @@ import type {
 import type { CodexPaneHomeRoute } from '../../../codex/codex-pane-account-registry'
 import type { CodexAccountSelectionTarget } from '../../../codex-accounts/runtime-selection'
 import type { SleepingAgentLaunchConfig } from '../../../../shared/agent-session-resume'
+import type { ResumeSpawnAdmission } from '../host-env/saved-resume-admission'
 import type { ClaudeRuntimeAuthPreparation } from '../../../claude-accounts/runtime-auth-service'
 import type { PtySpawnTiming } from '../../pty-spawn-timing'
 import { createPtySpawnTiming } from '../../pty-spawn-timing'
@@ -80,6 +81,8 @@ export type PtyIpcSpawnState = {
   nativeWindowsConptySpawn: boolean
   codexSelectionTarget: CodexAccountSelectionTarget
   codexResumeLaunch: CodexResumeLaunch
+  /** The host's verdict on the spawn's resume; a refused one starts the pane's plain shell. */
+  resumeAdmission: ResumeSpawnAdmission | null
   launchCommand: string | undefined
   env: Record<string, string> | undefined
   selectedCodexHomePath: string | null
@@ -156,6 +159,7 @@ export function createPtyIpcSpawnState(
     nativeWindowsConptySpawn: false,
     codexSelectionTarget: { runtime: 'host' },
     codexResumeLaunch: noCodexResumeLaunch(undefined),
+    resumeAdmission: null,
     launchCommand: undefined,
     env: undefined,
     selectedCodexHomePath: null,
diff --git a/src/main/ipc/pty/ipc/spawn-types.ts b/src/main/ipc/pty/ipc/spawn-types.ts
index 4166cbd53998..6107526fb8af 100644
--- a/src/main/ipc/pty/ipc/spawn-types.ts
+++ b/src/main/ipc/pty/ipc/spawn-types.ts
@@ -32,6 +32,8 @@ export type PtySpawnIpcArgs = {
   commandDelivery?: 'renderer' | 'provider'
   launchConfig?: SleepingAgentLaunchConfig
   resumeProviderSession?: AgentProviderSessionMetadata
+  // Untyped on purpose: only `'saved'` marks a resume built from saved facts.
+  resumeOrigin?: unknown
   launchToken?: unknown
   launchAgent?: TuiAgent
   startupCommandDelivery?: StartupCommandDelivery
diff --git a/src/main/ipc/pty/runtime/spawn-preflight-saved-resume.test.ts b/src/main/ipc/pty/runtime/spawn-preflight-saved-resume.test.ts
new file mode 100644
index 000000000000..8a369852db6b
--- /dev/null
+++ b/src/main/ipc/pty/runtime/spawn-preflight-saved-resume.test.ts
@@ -0,0 +1,123 @@
+import { describe, expect, it, vi } from 'vitest'
+import type { BrowserWindow } from 'electron'
+import { getDefaultSettings } from '../../../../shared/constants'
+import {
+  agentSessionLeaseFixture,
+  agentSessionRecordFixture
+} from '../../../../shared/agent-session-record.test-fixture'
+import type { AgentSessionRecordStore } from '../../../runtime/agent-session-record-store'
+import { ManagedConversationStarts } from '../../../runtime/managed-conversation-starts'
+import type { OrcaRuntimeService } from '../../../runtime/orca-runtime'
+import { finishPtyShutdown } from '../provider/liveness'
+import { admitColdRestoreReattach } from '../host-env/saved-resume-admission'
+import type { PtyRuntimeControllerDeps } from './controller-deps'
+import { prepareRuntimePtySpawn } from './spawn-preflight'
+import { createRuntimePtySpawnState } from './spawn-state'
+
+const forgetRefusedPaneResume = vi.hoisted(() => vi.fn())
+vi.mock('../../../agent-hooks/server', () => ({ agentHookServer: { forgetRefusedPaneResume } }))
+
+const C = 'provider-session-alpha-1'
+const chat = agentSessionRecordFixture(
+  agentSessionLeaseFixture({
+    claimStatus: 'released',
+    ownerProcess: null,
+    reservedSpawnToken: null,
+    deathEvidence: { kind: 'exit-observed', detail: 'closed', observedAt: 1 }
+  })
+)
+
+const store = {
+  listRecords: () => [chat],
+  getVisibleSessionTabIndex: () => ({ present: true, sessionIds: [chat.sessionId] })
+}
+
+/** A host whose one chat continues C at rest, with its tab open. */
+function chatHost() {
+  const starts = new ManagedConversationStarts()
+  return {
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the admission reads only the two members `store` has.
+    openAgentSessionRecordStore: async () => store as unknown as AgentSessionRecordStore,
+    reserveManagedConversationStart: vi.fn(starts.reserve.bind(starts)),
+    forgetRefusedSavedResume: vi.fn(async () => {}),
+    getAgentProviderSessionRows: () => [
+      { paneKey: 'tab-1:leaf', agentType: 'claude', providerSession: { key: 'session_id', id: C } }
+    ]
+  }
+}
+
+function deps(runtime: ReturnType<typeof chatHost>): PtyRuntimeControllerDeps {
+  const noCodexResumeLaunch: PtyRuntimeControllerDeps['noCodexResumeLaunch'] = (command) => ({
+    codexResumeHome: null,
+    command,
+    notifyResumeUnavailable: false,
+    droppedResumeArgv: false,
+    providerSession: null
+  })
+  return {
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the preflight reads only the admission members `chatHost` provides.
+    runtime: runtime as unknown as OrcaRuntimeService,
+    store: undefined,
+    getSettings: () => getDefaultSettings('/tmp'),
+    adoptStablePane: async () => null,
+    getLocalPtyStartupPromise: () => undefined,
+    getLocalPtyProviderStartupPromise: () => undefined,
+    prepareCodexResumeHome: () => null,
+    resolveCodexResumeLaunch: async (command) => noCodexResumeLaunch(command),
+    noCodexResumeLaunch,
+    reconcileSharedRuntimeResumeHome: async (resumeHome) => resumeHome.codexHomePath,
+    stripSequencedStartupResumeArgv: (env) => env,
+    assertWorkspaceAcceptsNewPty: () => undefined,
+    resolvePtySpawnStartupCwd: (_worktreeId, cwd) => cwd,
+    requestSerializedBuffer: async () => null,
+    shutdownProviderAndDetectExit: async () => false,
+    rememberSyntheticKillExit: () => {},
+    rememberRetiredRejectedPty: () => {},
+    sendPtyExitToRenderer: () => {},
+    sendPtySpawnedToRenderer: () => {},
+    finishPtyShutdown,
+    trustedTerminalHandleEnv: new Set(),
+    retiredRejectedPtyIds: new Map(),
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the spawn preflight never touches `mainWindow`.
+    mainWindow: {} as BrowserWindow
+  }
+}
+
+describe('host-side saved resumes of a conversation an open chat continues', () => {
+  it('materializes a phone-restored pane as a plain shell and forgets its saved record', async () => {
+    const runtime = chatHost()
+    const ctx = createRuntimePtySpawnState(deps(runtime), {
+      cols: 80,
+      rows: 24,
+      worktreeId: 'wt-1',
+      tabId: 'tab-1',
+      leafId: '11111111-1111-4111-8111-111111111111',
+      command: `claude --resume ${C}`,
+      launchAgent: 'claude',
+      resumeProviderSession: { key: 'session_id', id: C },
+      resumeOrigin: 'saved'
+    })
+    await prepareRuntimePtySpawn(ctx)
+    ctx.finishTerminalInstall()
+    expect(ctx.args.command).toBeUndefined()
+    expect(ctx.launchCommand ?? '').not.toContain(C)
+    expect(runtime.forgetRefusedSavedResume).toHaveBeenCalledWith(
+      'wt-1',
+      'tab-1:11111111-1111-4111-8111-111111111111',
+      { agent: 'claude', providerSession: { key: 'session_id', id: C } }
+    )
+  })
+
+  it("refuses a late reattach's cold restore before its window can resume it", async () => {
+    const runtime = chatHost()
+    await expect(
+      admitColdRestoreReattach(
+        runtime,
+        { coldRestore: { scrollback: '', cwd: '/tmp' } },
+        { paneKey: 'tab-1:leaf', saved: undefined },
+        null
+      )
+    ).resolves.toMatchObject({ verdict: 'chat-home' })
+    expect(runtime.reserveManagedConversationStart).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/main/ipc/pty/runtime/spawn-preflight.ts b/src/main/ipc/pty/runtime/spawn-preflight.ts
index 0cb21c8b26a2..fb5b5b9c160b 100644
--- a/src/main/ipc/pty/runtime/spawn-preflight.ts
+++ b/src/main/ipc/pty/runtime/spawn-preflight.ts
@@ -19,6 +19,11 @@ import { resolvePtySpawnStartupTarget } from '../spawn-startup-target'
 import { resolvePtySpawnHostEnv } from '../spawn-host-env'
 import { ptySpawnPaneFromIds, stampPtySpawnPaneEnv } from '../spawn-pane-env'
 import { getConnectionExecutionHostId } from '../../../../shared/execution-host'
+import {
+  applyResumeSpawnAdmission,
+  forgetRefusedResume,
+  resumeSpawnRefusal
+} from '../host-env/saved-resume-admission'
 import {
   ensureJcodeRuntimeDir,
   JCODE_RUNTIME_DIR_ENV_KEY
@@ -76,6 +81,9 @@ export async function prepareRuntimePtySpawn(
   ctx.daemonShellOverride = ctx.terminalRuntimeOptions.shellOverride
   ctx.expectedWslDistro = target.expectedWslDistro
   ctx.codexSelectionTarget = target.codexSelectionTarget
+  if (!ctx.preAdoptedStablePane) {
+    await admitRuntimeResumeSpawn(ctx)
+  }
   args.env = withClaudeProfileTerminalEnv(args.env, ctx.codexSelectionTarget)
   ctx.claudeAuth =
     ctx.isClaudeLaunch && ctx.deps.prepareClaudeAuth
@@ -152,3 +160,32 @@ export async function prepareRuntimePtySpawn(
 
   return null
 }
+
+async function admitRuntimeResumeSpawn(ctx: RuntimePtySpawnState): Promise<void> {
+  const { args } = ctx
+  ctx.resumeAdmission = await applyResumeSpawnAdmission(
+    ctx.deps.runtime,
+    args,
+    ctx.expectedWslDistro
+  )
+  const refusal = resumeSpawnRefusal(ctx.resumeAdmission)
+  if (!refusal) {
+    return
+  }
+  ctx.isClaudeLaunch = false
+  const paneKey = ptySpawnPaneFromIds(args)?.paneKey ?? null
+  forgetRefusedResume(paneKey, refusal)
+  // A host with no window has no one else to forget the pane's saved record.
+  if (
+    paneKey &&
+    args.worktreeId &&
+    args.resumeOrigin === 'saved' &&
+    refusal.verdict !== 'unverifiable'
+  ) {
+    void ctx.deps.runtime
+      ?.forgetRefusedSavedResume(args.worktreeId, paneKey, refusal.refused)
+      .catch((error: unknown) =>
+        console.warn('[pty] could not forget a refused saved resume', error)
+      )
+  }
+}
diff --git a/src/main/ipc/pty/runtime/spawn-state.ts b/src/main/ipc/pty/runtime/spawn-state.ts
index 57a3ef2394a1..4de4db55ca4e 100644
--- a/src/main/ipc/pty/runtime/spawn-state.ts
+++ b/src/main/ipc/pty/runtime/spawn-state.ts
@@ -13,6 +13,7 @@ import type { PaneSpawnReservation } from '../pane/spawn-reservation'
 import type { AdoptStablePaneResult } from '../ipc/spawn-types'
 import type { PtyBindingSourceExpectation } from '../../../persistence'
 import type { TerminalPanePlacement } from '../../../../shared/terminal-pane-placement'
+import type { ResumeSpawnAdmission } from '../host-env/saved-resume-admission'
 import type { PtyRuntimeControllerDeps } from './controller-deps'
 import type { TuiAgent } from '../../../../shared/tui-agent'
 import type { AgentProviderSessionMetadata } from '../../../../shared/agent-session-resume'
@@ -42,6 +43,8 @@ export type RuntimePtySpawnState = {
   effectiveSessionAppId: string | undefined
   isNewDaemonSession: boolean
   expectedWslDistro: string | null
+  /** The host's verdict on the spawn's resume; a refused one starts the pane's plain shell. */
+  resumeAdmission: ResumeSpawnAdmission | null
   codexSelectionTarget: CodexAccountSelectionTarget
   launchCommand: string | undefined
   claudeAuth: ClaudeRuntimeAuthPreparation | null
@@ -105,6 +108,8 @@ export type RuntimePtySpawnArgs = {
   env?: Record<string, string>
   envToDelete?: string[]
   resumeProviderSession?: AgentProviderSessionMetadata
+  /** `saved`: built from a pane's saved facts, which the host refuses for a chat's conversation. */
+  resumeOrigin?: 'saved'
   connectionId?: string | null
   worktreeId?: string
   preAllocatedHandle?: string
@@ -167,6 +172,7 @@ export function createRuntimePtySpawnState(
     effectiveSessionAppId: undefined,
     isNewDaemonSession: false,
     expectedWslDistro: null,
+    resumeAdmission: null,
     codexSelectionTarget: { runtime: 'host' },
     launchCommand: undefined,
     claudeAuth: null,
diff --git a/src/main/ipc/pty/runtime/spawn.ts b/src/main/ipc/pty/runtime/spawn.ts
index 42e8a2764e54..4758518ab66a 100644
--- a/src/main/ipc/pty/runtime/spawn.ts
+++ b/src/main/ipc/pty/runtime/spawn.ts
@@ -16,6 +16,7 @@ import { buildRuntimePtySpawnOptions } from './spawn-options'
 import { executeRuntimePtySpawn } from './spawn-execute'
 import { commitRuntimePtySpawn } from './spawn-commit'
 import { createRuntimePtySpawnState, type RuntimePtySpawnArgs } from './spawn-state'
+import { bindResumeSpawnStart, dropResumeSpawnStart } from '../host-env/saved-resume-admission'
 import {
   commitRuntimeSpawnHiddenDelivery,
   releaseRuntimeSpawnPreSpawnHiddenMark
@@ -89,13 +90,16 @@ export async function spawnPtyFromRuntimeController(
       throw error
     })
     if (earlyReserved) {
+      dropResumeSpawnStart(ctx.resumeAdmission)
       return toRuntimeSpawnReply(earlyReserved)
     }
     await executeRuntimePtySpawn(ctx)
     const committed = await commitRuntimePtySpawn(ctx)
+    bindResumeSpawnStart(deps.runtime, ctx.resumeAdmission, ctx.result)
     commitRuntimeSpawnHiddenDelivery(ctx)
     return toRuntimeSpawnReply(committed)
   } catch (err) {
+    dropResumeSpawnStart(ctx.resumeAdmission)
     releaseRuntimeSpawnPreSpawnHiddenMark(ctx)
     if (ctx.pendingRegistrationPtyId) {
       deps.runtime?.cancelPendingPtyRegistration?.(
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-lifecycle-methods.ts b/src/main/runtime/rpc/methods/terminal/terminal-lifecycle-methods.ts
index 1cae7585db93..56439e190811 100644
--- a/src/main/runtime/rpc/methods/terminal/terminal-lifecycle-methods.ts
+++ b/src/main/runtime/rpc/methods/terminal/terminal-lifecycle-methods.ts
@@ -67,6 +67,7 @@ export const TERMINAL_LIFECYCLE_METHODS = [
             ...(params.resumeProviderSession
               ? { resumeProviderSession: params.resumeProviderSession }
               : {}),
+            ...(params.resumeOrigin ? { resumeOrigin: params.resumeOrigin } : {}),
             ...(params.launchToken ? { launchToken: params.launchToken } : {}),
             ...(params.launchAgent ? { launchAgent: params.launchAgent } : {}),
             ...(params.terminalKittyKeyboardProtocol === true
diff --git a/src/main/runtime/runtime-pty-controller-contract.ts b/src/main/runtime/runtime-pty-controller-contract.ts
index 5cc738eb6558..e29889032ecf 100644
--- a/src/main/runtime/runtime-pty-controller-contract.ts
+++ b/src/main/runtime/runtime-pty-controller-contract.ts
@@ -68,6 +68,7 @@ export type RuntimePtyController = {
     env?: Record<string, string>
     envToDelete?: string[]
     resumeProviderSession?: AgentProviderSessionMetadata
+    resumeOrigin?: 'saved'
     telemetry?: WorktreeStartupLaunch['telemetry']
     connectionId?: string | null
     worktreeId?: string
diff --git a/src/main/runtime/runtime-terminal-contracts.ts b/src/main/runtime/runtime-terminal-contracts.ts
index 289569e0bf07..e293e495a6bf 100644
--- a/src/main/runtime/runtime-terminal-contracts.ts
+++ b/src/main/runtime/runtime-terminal-contracts.ts
@@ -47,6 +47,8 @@ export type TerminalCreateOptions = {
   envToDelete?: string[]
   launchConfig?: WorktreeStartupLaunch['launchConfig']
   resumeProviderSession?: AgentProviderSessionMetadata
+  /** `saved`: built from a pane's saved facts, which the host refuses for a chat's conversation. */
+  resumeOrigin?: 'saved'
   launchToken?: string
   launchAgent?: TuiAgent
   startupAgent?: TuiAgent
diff --git a/src/main/runtime/session-lifecycle/projection/perform-mobile-session-pty-records-refresh.ts b/src/main/runtime/session-lifecycle/projection/perform-mobile-session-pty-records-refresh.ts
index 9a29a1ce2b59..d9cc54d46eb0 100644
--- a/src/main/runtime/session-lifecycle/projection/perform-mobile-session-pty-records-refresh.ts
+++ b/src/main/runtime/session-lifecycle/projection/perform-mobile-session-pty-records-refresh.ts
@@ -243,6 +243,7 @@ export abstract class OrcaRuntimeWithPerformMobileSessionPtyRecordsRefresh exten
             ...('resumeProviderSession' in agentStartup
               ? {
                   resumeProviderSession: agentStartup.resumeProviderSession,
+                  resumeOrigin: 'saved' as const,
                   spawnIntent: automatic ? 'automatic-restore' : 'user-resume'
                 }
               : {}),
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts b/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
index 0dfd6721690b..a78ded3413d2 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
@@ -44,6 +44,7 @@ export type OwnedMobileTerminalCreateOptions = {
   supportsSplitGroupPlacement?: boolean
   launchConfig?: SleepingAgentLaunchConfig
   resumeProviderSession?: AgentProviderSessionMetadata
+  resumeOrigin?: 'saved'
   spawnIntent?: SpawnIntent
   launchRuntime?: AgentLaunchRuntime
   signal?: AbortSignal
@@ -130,6 +131,7 @@ export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal ext
           ? { resumeProviderSession: opts.resumeProviderSession }
           : {}),
         ...(opts.spawnIntent ? { spawnIntent: opts.spawnIntent } : {}),
+        ...(opts.resumeOrigin ? { resumeOrigin: opts.resumeOrigin } : {}),
         ...(opts.launchAgent ? { launchAgent: opts.launchAgent } : {}),
         ...(opts.launchRuntime ? { launchRuntime: opts.launchRuntime } : {}),
         ...(opts.viewMode ? { viewMode: opts.viewMode } : {}),
diff --git a/src/main/runtime/terminal/launch/terminal-create.ts b/src/main/runtime/terminal/launch/terminal-create.ts
index a84dd7c6a0c6..aec82277045e 100644
--- a/src/main/runtime/terminal/launch/terminal-create.ts
+++ b/src/main/runtime/terminal/launch/terminal-create.ts
@@ -146,6 +146,7 @@ export abstract class OrcaRuntimeWithCreateTerminal extends OrcaRuntimeWithTermi
               agentTeamsPlan?.envToDelete
             ),
             resumeProviderSession: launchOpts.resumeProviderSession,
+            ...(launchOpts.resumeOrigin ? { resumeOrigin: launchOpts.resumeOrigin } : {}),
             telemetry: launchOpts.telemetry,
             connectionId: workspace.connectionId,
             worktreeId: workspace.id,
diff --git a/src/main/runtime/terminal/stop/worktree-sleep-resume-recording.ts b/src/main/runtime/terminal/stop/worktree-sleep-resume-recording.ts
index bd91aeb9fc5e..5d752821f85e 100644
--- a/src/main/runtime/terminal/stop/worktree-sleep-resume-recording.ts
+++ b/src/main/runtime/terminal/stop/worktree-sleep-resume-recording.ts
@@ -16,7 +16,11 @@ import type {
   AgentStatusClearIpcPayload,
   AgentStatusIpcPayload
 } from '../../../../shared/agent-status-ipc-payload'
-import type { SleepingAgentSessionRecord } from '../../../../shared/agent-session-resume'
+import {
+  agentProviderSessionsEqual,
+  type SleepingAgentSessionRecord
+} from '../../../../shared/agent-session-resume'
+import type { RefusedPaneResume } from '../../../../shared/agent-status-types'
 import type { ExecutionHostId } from '../../../../shared/execution-host'
 import { parseExecutionHostId } from '../../../../shared/execution-host'
 import { parsePaneKey } from '../../../../shared/stable-pane-id'
@@ -24,6 +28,29 @@ import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switc
 import type { WorkspaceSessionState } from '../../../../shared/workspace-session-state-types'
 
 export abstract class OrcaRuntimeWithWorktreeSleepResumeRecording extends OrcaRuntimeWithStopTerminalsForWorktree {
+  /** Forgets a pane's saved resume the host refused because a chat is its conversation's home,
+   *  as a window does for its own panes; a host with no window has no one else to. */
+  async forgetRefusedSavedResume(
+    worktreeId: string,
+    paneKey: string,
+    refused: RefusedPaneResume
+  ): Promise<void> {
+    await this.commitWorkspaceSessionEdit(
+      this.getWorkspaceSessionHostIdForWorktree(worktreeId),
+      (session) => {
+        const saved = session.sleepingAgentSessionsByPaneKey?.[paneKey]
+        if (
+          saved?.agent !== refused.agent ||
+          !agentProviderSessionsEqual(refused.agent, saved.providerSession, refused.providerSession)
+        ) {
+          return null
+        }
+        const { [paneKey]: _refused, ...kept } = session.sleepingAgentSessionsByPaneKey ?? {}
+        return { ...session, sleepingAgentSessionsByPaneKey: kept }
+      }
+    )
+  }
+
   protected readonly sleepResumeRecords: WorktreeSleepResumeRecorder = {
     capture: (worktreeId, ptyIds) =>
       captureWorktreeSleepResumeRecords({
diff --git a/src/preload/api/pty-api.ts b/src/preload/api/pty-api.ts
index 80a1d96d48b6..20039e7c0fa2 100644
--- a/src/preload/api/pty-api.ts
+++ b/src/preload/api/pty-api.ts
@@ -40,6 +40,7 @@ export type PtyApi = {
     commandDelivery?: 'renderer' | 'provider'
     launchConfig?: SleepingAgentLaunchConfig
     resumeProviderSession?: AgentProviderSessionMetadata
+    resumeOrigin?: 'saved'
     launchToken?: string
     launchAgent?: TuiAgent
     startupCommandDelivery?: StartupCommandDelivery
@@ -88,6 +89,7 @@ export type PtyApi = {
     coldRestore?: { scrollback: string; cwd: string; cols?: number; rows?: number }
     startupCwdFallback?: { kind: 'worktree'; cwd: string }
     agentResumeUnavailable?: true
+    agentResumeRefused?: 'chat-home' | 'chat-writing' | 'unverifiable'
     /** Host verdict on the shell-ready marker; absent when the execution host predates the field. */
     shellReadyArmed?: boolean
   }>
diff --git a/src/preload/api/pty-bridge-session-control.ts b/src/preload/api/pty-bridge-session-control.ts
index 1bd100352d04..872c560f98c1 100644
--- a/src/preload/api/pty-bridge-session-control.ts
+++ b/src/preload/api/pty-bridge-session-control.ts
@@ -36,6 +36,7 @@ export const ptySessionControlApi = {
     commandDelivery?: 'renderer' | 'provider'
     launchConfig?: SleepingAgentLaunchConfig
     resumeProviderSession?: AgentProviderSessionMetadata
+    resumeOrigin?: 'saved'
     launchToken?: string
     launchAgent?: TuiAgent
     startupCommandDelivery?: StartupCommandDelivery
@@ -82,6 +83,7 @@ export const ptySessionControlApi = {
     coldRestore?: { scrollback: string; cwd: string; cols?: number; rows?: number }
     startupCwdFallback?: { kind: 'worktree'; cwd: string }
     agentResumeUnavailable?: true
+    agentResumeRefused?: 'chat-home' | 'chat-writing' | 'unverifiable'
     /** Host verdict on the shell-ready marker; absent when the execution host predates the field. */
     shellReadyArmed?: boolean
   }> => ipcRenderer.invoke('pty:spawn', opts),
diff --git a/src/renderer/src/components/terminal-pane/ipc-pty-connect-result.ts b/src/renderer/src/components/terminal-pane/ipc-pty-connect-result.ts
index bcfc0d3f67c6..4d2df79e4753 100644
--- a/src/renderer/src/components/terminal-pane/ipc-pty-connect-result.ts
+++ b/src/renderer/src/components/terminal-pane/ipc-pty-connect-result.ts
@@ -37,7 +37,10 @@ export function projectIpcPtyConnectResult(
       coldRestore: spawnResult.coldRestore,
       replay: spawnResult.replay,
       pendingEscapeTailAnsi: spawnResult.pendingEscapeTailAnsi,
-      ...(spawnResult.agentResumeUnavailable ? { agentResumeUnavailable: true as const } : {})
+      ...(spawnResult.agentResumeUnavailable ? { agentResumeUnavailable: true as const } : {}),
+      ...(spawnResult.agentResumeRefused
+        ? { agentResumeRefused: spawnResult.agentResumeRefused }
+        : {})
     }
   }
   if (
@@ -53,7 +56,10 @@ export function projectIpcPtyConnectResult(
       ...(spawnResult.startupCwdFallback
         ? { startupCwdFallback: spawnResult.startupCwdFallback }
         : {}),
-      ...(spawnResult.agentResumeUnavailable ? { agentResumeUnavailable: true as const } : {})
+      ...(spawnResult.agentResumeUnavailable ? { agentResumeUnavailable: true as const } : {}),
+      ...(spawnResult.agentResumeRefused
+        ? { agentResumeRefused: spawnResult.agentResumeRefused }
+        : {})
     }
   }
   return spawnResult.id
diff --git a/src/renderer/src/components/terminal-pane/ipc-pty-connect.ts b/src/renderer/src/components/terminal-pane/ipc-pty-connect.ts
index d7394497f937..90bf58eab65c 100644
--- a/src/renderer/src/components/terminal-pane/ipc-pty-connect.ts
+++ b/src/renderer/src/components/terminal-pane/ipc-pty-connect.ts
@@ -137,7 +137,16 @@ export async function connectIpcPty(
       if (!context.isExpectedExitCurrent()) {
         return
       }
-      return { id: spawnResult.id, exitedBeforeAttach: true }
+      return {
+        id: spawnResult.id,
+        exitedBeforeAttach: true,
+        // Why kept: a shell that replaced a resume and then exited never resumed the agent, and a
+        // refused plan must still not be registered or consume the saved session.
+        ...(spawnResult.agentResumeUnavailable ? { agentResumeUnavailable: true as const } : {}),
+        ...(spawnResult.agentResumeRefused
+          ? { agentResumeRefused: spawnResult.agentResumeRefused }
+          : {})
+      }
     }
     if (context.isDestroyed()) {
       return
diff --git a/src/renderer/src/components/terminal-pane/ipc-pty-spawn-request.ts b/src/renderer/src/components/terminal-pane/ipc-pty-spawn-request.ts
index 2f622150e710..362eb11ac5e0 100644
--- a/src/renderer/src/components/terminal-pane/ipc-pty-spawn-request.ts
+++ b/src/renderer/src/components/terminal-pane/ipc-pty-spawn-request.ts
@@ -78,6 +78,7 @@ export async function spawnIpcPty(
     commandDelivery,
     launchConfig,
     resumeProviderSession,
+    resumeOrigin,
     launchToken,
     launchAgent,
     startupCommandDelivery,
@@ -119,6 +120,9 @@ export async function spawnIpcPty(
     ...((connectOptions.resumeProviderSession ?? resumeProviderSession)
       ? { resumeProviderSession: connectOptions.resumeProviderSession ?? resumeProviderSession }
       : {}),
+    ...(resumesAgent && (connectOptions.resumeOrigin ?? resumeOrigin)
+      ? { resumeOrigin: connectOptions.resumeOrigin ?? resumeOrigin }
+      : {}),
     ...((connectOptions.launchToken ?? launchToken)
       ? { launchToken: connectOptions.launchToken ?? launchToken }
       : {}),
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-types.ts b/src/renderer/src/components/terminal-pane/pty-connection-types.ts
index e7ce975cce87..c0dd05bf31c4 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-types.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-types.ts
@@ -29,6 +29,8 @@ export type PtyPaneStartup = {
   envToDelete?: string[]
   launchConfig?: SleepingAgentLaunchConfig
   resumeProviderSession?: AgentProviderSessionMetadata
+  /** `saved`: a resume built from saved facts, which the host refuses for a chat's conversation. */
+  resumeOrigin?: 'saved'
   launchToken?: string
   launchAgent?: TuiAgent
   /** The agent launch the pane's own spawn starts, instead of `command`. */
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/apply-reattach-payload.ts b/src/renderer/src/components/terminal-pane/pty-connection/apply-reattach-payload.ts
index b57101586441..9cefc7b9f62d 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/apply-reattach-payload.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/apply-reattach-payload.ts
@@ -263,16 +263,19 @@ export function createReattachPayloadHandlers(
       session.writeReplayData(
         `${RESET_GRAPHIC_RENDITION}${ctx.connectResult.coldRestore.scrollback}`
       )
-      const preparedStartup = ctx.coldRestoreStartup ?? session.buildColdRestoreAgentResumeStartup()
+      // Why not rebuilt when refused: main started a plain shell instead of that plan.
+      const preparedStartup = ctx.connectResult.agentResumeRefused
+        ? null
+        : (ctx.coldRestoreStartup ?? session.buildColdRestoreAgentResumeStartup())
       const didPrepareResume = session.applyColdRestoreAgentResumeStartup(preparedStartup)
+      if (ctx.connectResult.agentResumeUnavailable) {
+        // Why: main dropped the resume argv, so this pane is a NEW session —
+        // the plain restored banner would claim the old one came back.
+        session.showSessionRestoredBanner('resume-unavailable')
+      } else if (didPrepareResume && preparedStartup?.hasSleepingRecord) {
+        session.showSessionRestoredBanner()
+      }
       if (didPrepareResume) {
-        if (ctx.connectResult.agentResumeUnavailable) {
-          // Why: main dropped the resume argv, so this pane is a NEW session —
-          // the plain restored banner would claim the old one came back.
-          session.showSessionRestoredBanner('resume-unavailable')
-        } else if (preparedStartup?.hasSleepingRecord) {
-          session.showSessionRestoredBanner()
-        }
         session.clearSleepingRecordAfterColdRestoreSpawn(preparedStartup)
       }
       // Why: cold-restore spawned a fresh shell; reset mode bytes a crashed TUI (e.g. Claude's \e[?1004h) left in scrollback that no live TUI now consumes.
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/cold-restore-resume-startup.ts b/src/renderer/src/components/terminal-pane/pty-connection/cold-restore-resume-startup.ts
index 45eb6063920f..30e84152df53 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/cold-restore-resume-startup.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/cold-restore-resume-startup.ts
@@ -109,6 +109,7 @@ export function bindBuildColdRestoreAgentResumeStartup(session: ConnectPanePtySe
       },
       launchConfig: startupPlan.launchConfig,
       resumeProviderSession: providerSession,
+      resumeOrigin: 'saved',
       launchToken: coldRestoreLaunchToken,
       useLiveEntry: Boolean(useLiveEntry),
       hasSleepingRecord: Boolean(sleepingRecord),
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/deferred-session-reattach-connect.ts b/src/renderer/src/components/terminal-pane/pty-connection/deferred-session-reattach-connect.ts
index c16085dba048..5b29f012ac5f 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/deferred-session-reattach-connect.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/deferred-session-reattach-connect.ts
@@ -117,16 +117,23 @@ function connectDeferredSessionReattach(
     !session.disposed &&
     session.deps.paneTransportsRef.current.get(session.pane.id) === session.transport &&
     outputCallbacks.generation === session.transportStreamGeneration
-  const startFreshInstead = (): Promise<HeldPaneReopenOutcome> =>
-    session
-      .startFreshColdRestoreAgentResume(coldRestoreStartup, { forceBlankRestoredViewport: true })
+  const startFreshInstead = (): Promise<HeldPaneReopenOutcome> => {
+    let resumeUnavailable = false
+    return session
+      .startFreshColdRestoreAgentResume(coldRestoreStartup, {
+        forceBlankRestoredViewport: true,
+        onAgentResumeUnavailable: () => {
+          resumeUnavailable = true
+        }
+      })
       .then(
         (ptyId: string | null) => ({
           reopened: ptyId !== null,
-          agentResumed: ptyId !== null && Boolean(coldRestoreStartup)
+          agentResumed: ptyId !== null && Boolean(coldRestoreStartup) && !resumeUnavailable
         }),
         () => NOT_REOPENED
       )
+  }
 
   void Promise.resolve(reattachPromise)
     .catch(() => null)
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/fresh-spawn-start.ts b/src/renderer/src/components/terminal-pane/pty-connection/fresh-spawn-start.ts
index db1a271d3514..fb164d978e72 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/fresh-spawn-start.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/fresh-spawn-start.ts
@@ -105,7 +105,10 @@ export function bindStartFreshSpawn(session: ConnectPanePtySession): void {
         : {}),
       ...(coldRestoreOverride ? { launchConfig: coldRestoreOverride.launchConfig } : {}),
       ...(coldRestoreOverride
-        ? { resumeProviderSession: coldRestoreOverride.resumeProviderSession }
+        ? {
+            resumeProviderSession: coldRestoreOverride.resumeProviderSession,
+            resumeOrigin: coldRestoreOverride.resumeOrigin
+          }
         : {}),
       ...(coldRestoreOverride ? { launchToken: coldRestoreOverride.launchToken } : {}),
       ...(coldRestoreOverride ? { launchAgent: coldRestoreOverride.agent } : {}),
@@ -180,10 +183,20 @@ export function bindStartFreshSpawn(session: ConnectPanePtySession): void {
           }
           return accepted ? resolvedPtyId : null
         }
+        // Why: main started a plain shell instead, so nothing of the plan may stay registered over it.
+        const coldRestore = connectResult?.agentResumeRefused ? null : coldRestoreOverride
+        if (connectResult?.agentResumeRefused) {
+          session.clearRegisteredStartupLaunchConfig()
+          session.pendingStartupCommand = null
+        }
+        if (connectResult?.agentResumeRefused === 'unverifiable') {
+          // Why: the saved session may have been consumed before this spawn; keep it for the next try.
+          session.keepUnrunResumeHandle(startupOverride)
+        }
         if (spawnedPtyId && typeof spawnedPtyId === 'object' && 'id' in spawnedPtyId) {
           session.registerEffectiveLaunchConfig(spawnedPtyId.launchConfig, {
-            ...(coldRestoreOverride ? { launchToken: coldRestoreOverride.launchToken } : {}),
-            ...(coldRestoreOverride ? { launchAgent: coldRestoreOverride.agent } : {})
+            ...(coldRestore ? { launchToken: coldRestore.launchToken } : {}),
+            ...(coldRestore ? { launchAgent: coldRestore.agent } : {})
           })
         }
         if (resolvedPtyId) {
@@ -204,10 +217,11 @@ export function bindStartFreshSpawn(session: ConnectPanePtySession): void {
             // Why: main dropped the resume argv, so this pane is a NEW session —
             // the plain restored banner would claim the old one came back.
             session.showSessionRestoredBanner('resume-unavailable')
-          } else if (coldRestoreOverride?.hasSleepingRecord) {
+            options.onAgentResumeUnavailable?.()
+          } else if (coldRestore?.hasSleepingRecord) {
             session.showSessionRestoredBanner()
           }
-          session.clearSleepingRecordAfterColdRestoreSpawn(coldRestoreOverride)
+          session.clearSleepingRecordAfterColdRestoreSpawn(coldRestore)
         } else if (
           session.paneStartup?.launchConfig ||
           (startupOverride && 'launchConfig' in startupOverride)
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/fresh-spawn-types.ts b/src/renderer/src/components/terminal-pane/pty-connection/fresh-spawn-types.ts
index 4bb06f8dbde4..22dde900bf8b 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/fresh-spawn-types.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/fresh-spawn-types.ts
@@ -12,11 +12,15 @@ export type PendingStartupCommand = {
 
 export type FreshSpawnOptions = {
   forceBlankRestoredViewport?: boolean
+  /** Main started the pane without resuming the requested agent session. */
+  onAgentResumeUnavailable?: () => void
 }
 
 export type ColdRestoreAgentResumeStartup = PendingStartupCommand & {
   agent: ResumableTuiAgent
   resumeProviderSession: AgentProviderSessionMetadata
+  /** Built from the pane's saved facts, so the host refuses it for a chat's conversation. */
+  resumeOrigin: 'saved'
   launchConfig: NonNullable<ReturnType<typeof buildAgentResumeStartupPlan>>['launchConfig']
   launchToken: string
   useLiveEntry: boolean
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/pane-transport-options.ts b/src/renderer/src/components/terminal-pane/pty-connection/pane-transport-options.ts
index f11290c6b258..d6171e4b9f60 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/pane-transport-options.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/pane-transport-options.ts
@@ -50,6 +50,9 @@ export function buildPaneTransportOptions(session: ConnectPanePtySession): IpcPt
     ...(session.paneStartup?.resumeProviderSession
       ? { resumeProviderSession: session.paneStartup.resumeProviderSession }
       : {}),
+    ...(session.paneStartup?.resumeOrigin
+      ? { resumeOrigin: session.paneStartup.resumeOrigin }
+      : {}),
     ...((session.paneStartup?.initialAgentStatus?.prompt ?? session.paneStartup?.draftPrompt)
       ? {
           agentPrompt:
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/reattach-result-handler.ts b/src/renderer/src/components/terminal-pane/pty-connection/reattach-result-handler.ts
index 8dc18c453aff..067ae8c11b66 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/reattach-result-handler.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/reattach-result-handler.ts
@@ -95,10 +95,15 @@ export function bindHandleReattachResult(sessionBag: ConnectPanePtySession): voi
     }
 
     if (connectResult?.exitedBeforeAttach) {
+      if (connectResult.agentResumeUnavailable) {
+        session.showSessionRestoredBanner('resume-unavailable')
+      }
       // Why: the transport already delivered the dead session's final frame + exit; treat as terminal state, not a failed reattach.
       return true
     }
 
+    // Why: main started a plain shell instead, so nothing of the plan may be registered over it.
+    const startup = connectResult?.agentResumeRefused ? null : coldRestoreStartup
     const ptyId =
       connectResult?.id ?? (typeof result === 'string' ? result : session.transport.getPtyId())
     const hasExplicitPtyId = Boolean(connectResult?.id || typeof result === 'string')
@@ -125,11 +130,11 @@ export function bindHandleReattachResult(sessionBag: ConnectPanePtySession): voi
       return false
     }
     session.registerEffectiveLaunchConfig(connectResult?.launchConfig, {
-      ...(coldRestoreStartup ? { launchToken: coldRestoreStartup.launchToken } : {}),
+      ...(startup ? { launchToken: startup.launchToken } : {}),
       ...(connectResult?.launchAgent
         ? { launchAgent: connectResult.launchAgent }
-        : coldRestoreStartup
-          ? { launchAgent: coldRestoreStartup.agent }
+        : startup
+          ? { launchAgent: startup.agent }
           : {})
     })
     if (connectResult?.sessionExpired) {
@@ -142,7 +147,7 @@ export function bindHandleReattachResult(sessionBag: ConnectPanePtySession): voi
         session.deps.clearTabPtyId(session.deps.tabId, staleSessionId)
       }
       // Why: a host can invalidate the PTY while the tab stays mounted; replace it in place, not with a stale overlay.
-      session.startFreshColdRestoreAgentResume(coldRestoreStartup, {
+      session.startFreshColdRestoreAgentResume(startup, {
         forceBlankRestoredViewport: true
       })
       return false
@@ -166,11 +171,15 @@ export function bindHandleReattachResult(sessionBag: ConnectPanePtySession): voi
     const hasStructuralReplay = Boolean(
       connectResult?.snapshot || connectResult?.replay || connectResult?.coldRestore
     )
+    // Why here: a fresh result with no scrollback never reaches the cold-restore payload that says so.
+    if (connectResult?.agentResumeUnavailable && !connectResult.coldRestore) {
+      session.showSessionRestoredBanner('resume-unavailable')
+    }
     // Why: reattach drops startup commands; only real hibernation is authority to retire an empty adopted shell and resume its provider session.
     if (
       !hasStructuralReplay &&
       connectResult?.isReattach &&
-      hasEmptyReattachRetireEvidence(ptyId, coldRestoreStartup)
+      hasEmptyReattachRetireEvidence(ptyId, startup)
     ) {
       session.transport.disconnect()
       if (staleSessionId) {
@@ -179,7 +188,7 @@ export function bindHandleReattachResult(sessionBag: ConnectPanePtySession): voi
       } else {
         session.syncPanePtyLayoutBinding(null)
       }
-      session.startFreshColdRestoreAgentResume(coldRestoreStartup, {
+      session.startFreshColdRestoreAgentResume(startup, {
         forceBlankRestoredViewport: true
       })
       return false
@@ -278,7 +287,7 @@ export function bindHandleReattachResult(sessionBag: ConnectPanePtySession): voi
       prefetchedParkModelSnapshot,
       revealFollowsTerminalPark,
       shouldApplyStructuralPayload,
-      coldRestoreStartup,
+      coldRestoreStartup: startup,
       reattachPayloadApplied: !shouldApplyStructuralPayload,
       skippedAltFrameCaptureCols: null
     }
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/spawn-deferred-sleep.ts b/src/renderer/src/components/terminal-pane/pty-connection/spawn-deferred-sleep.ts
index 265a86785d0c..1abfc7ab1a52 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/spawn-deferred-sleep.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/spawn-deferred-sleep.ts
@@ -149,17 +149,24 @@ export function installSpawnDeferredSleep(session: ConnectPanePtySession): void
   session.pendingSpawnDeferral = null
   session.deferredSpawn = null
 
-  session.enterSpawnDeferredSleep = (
-    reason: SpawnDeferralReason,
-    startupOverride: PendingStartupCommand | null | undefined,
-    options: FreshSpawnOptions,
-    visibleAtSpawn: boolean
+  /** Keeps the resume handle of a restore the host did not run, so a later restore tries again. */
+  session.keepUnrunResumeHandle = (
+    startupOverride: PendingStartupCommand | null | undefined
   ): void => {
     const record = deferredResumeRecord(session, startupOverride)
     if (record) {
       // Why left after a later resume: the next quit capture replaces it, and a pane with a live PTY owns it.
       useAppStore.getState().rememberSleepingAgentSession(record)
     }
+  }
+
+  session.enterSpawnDeferredSleep = (
+    reason: SpawnDeferralReason,
+    startupOverride: PendingStartupCommand | null | undefined,
+    options: FreshSpawnOptions,
+    visibleAtSpawn: boolean
+  ): void => {
+    session.keepUnrunResumeHandle(startupOverride)
     session.deferredSpawn = { reason, startupOverride, options }
     const deferral = { reason, resume: () => void session.resumeDeferredSpawn() }
     setPaneSpawnDeferral(session.cacheKey, deferral)
diff --git a/src/renderer/src/components/terminal-pane/pty-transport-types.ts b/src/renderer/src/components/terminal-pane/pty-transport-types.ts
index a58a0465e30f..f4d0ebbef6b2 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport-types.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport-types.ts
@@ -124,6 +124,9 @@ export type PtyConnectResult = {
   startupCwdFallback?: { kind: 'worktree'; cwd: string }
   /** Main declined an unverifiable provider-session resume and launched fresh. */
   agentResumeUnavailable?: true
+  /** Main refused the resume and started the plain shell: a native chat is the conversation's home
+   *  or may be writing it, or no record could be checked (the saved session is kept to retry). */
+  agentResumeRefused?: 'chat-home' | 'chat-writing' | 'unverifiable'
   /** Trailing partial escape the daemon emulator held mid-parse; the reattach
    *  replay writes it LAST (after the reset) so a racing live continuation
    *  completes it instead of rendering literally (#7329). */
@@ -187,6 +190,7 @@ export type PtyTransport = {
     envToDelete?: string[]
     launchConfig?: SleepingAgentLaunchConfig
     resumeProviderSession?: AgentProviderSessionMetadata
+    resumeOrigin?: 'saved'
     launchToken?: string
     launchAgent?: TuiAgent
     startupCommandDelivery?: StartupCommandDelivery
@@ -292,6 +296,7 @@ export type IpcPtyTransportOptions = {
   commandDelivery?: 'renderer' | 'provider'
   launchConfig?: SleepingAgentLaunchConfig
   resumeProviderSession?: AgentProviderSessionMetadata
+  resumeOrigin?: 'saved'
   agentPrompt?: string
   agentPromptDelivery?: AgentPromptDelivery
   agentArgsOverride?: string | null
diff --git a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport.ts b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport.ts
index d8b164f696fd..8619c3ae68aa 100644
--- a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport.ts
+++ b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport.ts
@@ -205,6 +205,7 @@ export function createRemoteRuntimePtyTransport(
     envToDelete,
     launchConfig,
     resumeProviderSession,
+    resumeOrigin,
     launchToken,
     launchAgent,
     terminalColorQueryReplies,
@@ -3100,6 +3101,9 @@ export function createRemoteRuntimePtyTransport(
         ...(resumeProviderSessionToSend !== undefined
           ? { resumeProviderSession: resumeProviderSessionToSend }
           : {}),
+        ...(resumeProviderSessionToSend && (options.resumeOrigin ?? resumeOrigin)
+          ? { resumeOrigin: options.resumeOrigin ?? resumeOrigin }
+          : {}),
         ...(launchTokenToSend !== undefined ? { launchToken: launchTokenToSend } : {}),
         ...(launchAgentToSend !== undefined ? { launchAgent: launchAgentToSend } : {}),
         ...spawnIntentParams,
diff --git a/src/renderer/src/hooks/ipc-events/agent-status-listeners.ts b/src/renderer/src/hooks/ipc-events/agent-status-listeners.ts
index 16e50bce1b57..3e6a62c3c073 100644
--- a/src/renderer/src/hooks/ipc-events/agent-status-listeners.ts
+++ b/src/renderer/src/hooks/ipc-events/agent-status-listeners.ts
@@ -1,16 +1,45 @@
 import { CLOSE_TERMINAL_PANE_EVENT } from '@/constants/terminal'
 import type {
   AgentStatusClearIpcPayload,
-  AgentStatusIpcPayload
+  AgentStatusIpcPayload,
+  RefusedPaneResume
 } from '../../../../shared/agent-status-types'
 import {
   resolveLegacyWorkerTerminalRecoveryAction,
   rollbackLegacyWorkerTerminalSurfaceInStore
 } from '../legacy-worker-terminal-recovery-event'
 import { useAppStore } from '../../store'
+import { forgetRefusedPaneResume, namesRefusedResume } from '@/lib/forget-refused-pane-resume'
+import { resolveAgentPaneAuthorityKey } from '@/store/slices/agent-pane-authority'
 import { resolvePaneKey } from './agent-status-routing'
 import type { PendingAgentStatusEvent } from './agent-status-bridge-types'
 
+/** An already delivered event for the pane naming a refused conversation would restore it. */
+function dropEventsRestoringRefused(
+  paneKey: string,
+  refused: RefusedPaneResume,
+  queues: {
+    pendingAgentStatusEvents: PendingAgentStatusEvent[]
+    liveAgentStatusBurstQueue: AgentStatusIpcPayload[]
+  }
+): void {
+  const restores = (event: AgentStatusIpcPayload): boolean =>
+    resolveAgentPaneAuthorityKey(event.paneKey) === paneKey &&
+    namesRefusedResume(refused, { ...event, agent: event.agentType })
+  const pending = queues.pendingAgentStatusEvents
+  for (let index = pending.length - 1; index >= 0; index -= 1) {
+    if (restores(pending[index].data)) {
+      pending.splice(index, 1)
+    }
+  }
+  const burst = queues.liveAgentStatusBurstQueue
+  for (let index = burst.length - 1; index >= 0; index -= 1) {
+    if (restores(burst[index])) {
+      burst.splice(index, 1)
+    }
+  }
+}
+
 export function registerAgentStatusListeners(args: {
   unsubs: (() => void)[]
   enqueueLiveAgentStatus: (data: AgentStatusIpcPayload) => void
@@ -72,6 +101,14 @@ export function registerAgentStatusListeners(args: {
       if (!('paneKey' in data) || typeof data.paneKey !== 'string') {
         return
       }
+      if (data.refusedResume) {
+        dropEventsRestoringRefused(data.paneKey, data.refusedResume, {
+          pendingAgentStatusEvents,
+          liveAgentStatusBurstQueue
+        })
+        forgetRefusedPaneResume(useAppStore.getState(), data.paneKey, data.refusedResume)
+        return
+      }
       // Why: preserve set→clear FIFO so a queued completion still survives pane teardown.
       if (liveAgentStatusBurstQueue.some((queued) => queued.paneKey === data.paneKey)) {
         drainQueuedLiveAgentStatusesForPane(data.paneKey)
diff --git a/src/renderer/src/lib/forget-refused-pane-resume.ts b/src/renderer/src/lib/forget-refused-pane-resume.ts
new file mode 100644
index 000000000000..3576d463630f
--- /dev/null
+++ b/src/renderer/src/lib/forget-refused-pane-resume.ts
@@ -0,0 +1,75 @@
+import type { AppState } from '@/store/types'
+import type { RefusedPaneResume } from '../../../shared/agent-status-types'
+import {
+  agentProviderSessionsEqual,
+  type AgentProviderSessionMetadata
+} from '../../../shared/agent-session-resume'
+import { parseLegacyNumericPaneKey, parsePaneKey } from '../../../shared/stable-pane-id'
+
+/** Whether a saved claim names the refused conversation. Only local claims can: the host judged
+ *  its own chats, and a remote host's same id is a different conversation. */
+export function namesRefusedResume(
+  refused: RefusedPaneResume,
+  claim: {
+    agent?: string
+    providerSession?: AgentProviderSessionMetadata
+    connectionId?: string | null
+  }
+): boolean {
+  return (
+    !claim.connectionId &&
+    claim.agent === refused.agent &&
+    agentProviderSessionsEqual(refused.agent, claim.providerSession, refused.providerSession)
+  )
+}
+
+/**
+ * Main refused `paneKey`'s saved resume because a native chat owns that conversation. Forgets it as
+ * this pane's, whether or not the pane is mounted, so nothing offers or retries it here. Another
+ * pane holding the same conversation is refused and forgotten at its own restore. Main already
+ * forgot its own copy, so nothing is sent back.
+ */
+export function forgetRefusedPaneResume(
+  state: AppState,
+  paneKey: string,
+  refused: RefusedPaneResume
+): void {
+  const names = (claim: Parameters<typeof namesRefusedResume>[1]) =>
+    namesRefusedResume(refused, claim)
+  const retained = state.retainedAgentsByPaneKey[paneKey]
+  if (retained && names({ ...retained.entry, agent: retained.agentType })) {
+    state.dismissRetainedAgent(paneKey)
+  }
+  const live = state.agentStatusByPaneKey[paneKey]
+  // Why: a pane already on another conversation keeps that one's row, record, launch config and hint.
+  if (live && !names({ ...live, agent: live.agentType })) {
+    return
+  }
+  const tabId = parsePaneKey(paneKey)?.tabId ?? paneKey.split(':')[0]
+  // Why legacy numeric keys of this tab: they are this pane's older names, which its restore reads;
+  // a split sibling's current key is another pane.
+  const saved = Object.entries(state.sleepingAgentSessionsByPaneKey).flatMap(([key, record]) =>
+    (key === paneKey || parseLegacyNumericPaneKey(key)?.tabId === tabId) && names(record)
+      ? [key]
+      : []
+  )
+  if (saved.length > 0) {
+    state.clearSleepingAgentSessionsByPaneKey(saved)
+  }
+  // Why also with no row: the launch config the pane registered for the refused resume goes too.
+  state.removeAgentStatus(paneKey)
+  const hint = state.paneForegroundAgentByPaneKey[paneKey]
+  if (hint?.agentEvidence === 'launch-record' && hint.agent === refused.agent) {
+    state.clearPaneForegroundAgent(paneKey)
+  }
+  const tab = Object.values(state.tabsByWorktree)
+    .flat()
+    .find((candidate) => candidate.id === tabId)
+  // Why only this pane's tab: the chat's own tab carries the same conversation's title.
+  if (
+    tab?.aiVaultTitle?.agent === refused.agent &&
+    tab.aiVaultTitle.sessionId === refused.providerSession.id
+  ) {
+    state.setAiVaultTabTitle(tab.id, null)
+  }
+}
diff --git a/src/renderer/src/lib/sleeping-agent-session-launch.ts b/src/renderer/src/lib/sleeping-agent-session-launch.ts
index a1062932fe74..197cc670677f 100644
--- a/src/renderer/src/lib/sleeping-agent-session-launch.ts
+++ b/src/renderer/src/lib/sleeping-agent-session-launch.ts
@@ -81,6 +81,7 @@ export function launchSleepingAgentSession(
       ...(startupPlan.env ? { env: startupPlan.env } : {}),
       launchConfig: startupPlan.launchConfig,
       resumeProviderSession: record.providerSession,
+      resumeOrigin: 'saved',
       launchAgent: record.agent,
       ...(launchConfig ? { agentArgsOverride: launchConfig.agentArgs } : {}),
       ...(startupPlan.startupCommandDelivery
diff --git a/src/renderer/src/lib/workspace-session-patch.test.ts b/src/renderer/src/lib/workspace-session-patch.test.ts
index 00c47f208593..5ca1dfc8287a 100644
--- a/src/renderer/src/lib/workspace-session-patch.test.ts
+++ b/src/renderer/src/lib/workspace-session-patch.test.ts
@@ -411,14 +411,14 @@ describe('buildWorkspaceSessionPatch', () => {
     expect(patch.defaultTerminalTabsAppliedByWorktreeId).toBeUndefined()
   })
 
-  it('keeps sleeping agent session clearing keys in patches', () => {
+  it('clears the last sleeping agent session with an empty map the host split keeps', () => {
     const patch = buildWorkspaceSessionPatch(
       createSnapshot({ sleepingAgentSessionsByPaneKey: {} }),
       ['sleepingAgentSessionsByPaneKey']
     )
 
-    expect(Object.hasOwn(patch, 'sleepingAgentSessionsByPaneKey')).toBe(true)
-    expect(patch.sleepingAgentSessionsByPaneKey).toBeUndefined()
+    // undefined would be dropped before the write, leaving the record on disk until quit.
+    expect(patch.sleepingAgentSessionsByPaneKey).toEqual({})
   })
 
   it('keeps a staged browser tab out of incremental patches too', () => {
diff --git a/src/renderer/src/lib/workspace-session-patch.ts b/src/renderer/src/lib/workspace-session-patch.ts
index de1d76f30b62..96b28a81c213 100644
--- a/src/renderer/src/lib/workspace-session-patch.ts
+++ b/src/renderer/src/lib/workspace-session-patch.ts
@@ -204,8 +204,9 @@ export function buildWorkspaceSessionPatch(
         : undefined
   }
   if (changed.has('sleepingAgentSessionsByPaneKey')) {
+    // Why `{}`: the host split drops undefined, so clearing the last record never reached disk.
     patch.sleepingAgentSessionsByPaneKey =
-      buildSleepingAgentSessionData(snapshot).sleepingAgentSessionsByPaneKey
+      buildSleepingAgentSessionData(snapshot).sleepingAgentSessionsByPaneKey ?? {}
   }
 
   return patch
diff --git a/src/renderer/src/store/terminals/terminal-actions.ts b/src/renderer/src/store/terminals/terminal-actions.ts
index 43c63c9883a6..93c970532853 100644
--- a/src/renderer/src/store/terminals/terminal-actions.ts
+++ b/src/renderer/src/store/terminals/terminal-actions.ts
@@ -200,6 +200,7 @@ export type TerminalActions = {
       envToDelete?: string[]
       launchConfig?: SleepingAgentLaunchConfig
       resumeProviderSession?: AgentProviderSessionMetadata
+      resumeOrigin?: 'saved'
       launchToken?: string
       launchAgent?: TuiAgent
       agentArgsOverride?: string | null
@@ -226,6 +227,7 @@ export type TerminalActions = {
     envToDelete?: string[]
     launchConfig?: SleepingAgentLaunchConfig
     resumeProviderSession?: AgentProviderSessionMetadata
+    resumeOrigin?: 'saved'
     launchToken?: string
     launchAgent?: TuiAgent
     agentArgsOverride?: string | null
diff --git a/src/renderer/src/store/terminals/terminal-state.ts b/src/renderer/src/store/terminals/terminal-state.ts
index fae95a4cbbb9..2550334dd91c 100644
--- a/src/renderer/src/store/terminals/terminal-state.ts
+++ b/src/renderer/src/store/terminals/terminal-state.ts
@@ -56,6 +56,7 @@ export type TerminalState = {
       envToDelete?: string[]
       launchConfig?: SleepingAgentLaunchConfig
       resumeProviderSession?: AgentProviderSessionMetadata
+      resumeOrigin?: 'saved'
       launchToken?: string
       launchAgent?: TuiAgent
       /** The agent launch the pane's own spawn starts, instead of `command`. */
diff --git a/src/shared/agent-status-ipc-payload.ts b/src/shared/agent-status-ipc-payload.ts
index 95032db5f949..0a6d446af1a6 100644
--- a/src/shared/agent-status-ipc-payload.ts
+++ b/src/shared/agent-status-ipc-payload.ts
@@ -89,6 +89,12 @@ export type AgentStatusCacheIdentity = {
   stateStartedAt: number
 }
 
+/** A pane's saved resume the host refused because a native chat is that conversation's home. */
+export type RefusedPaneResume = {
+  agent: string
+  providerSession: AgentProviderSessionMetadata
+}
+
 /** Wire shape for ordinary pane teardown or a stamped SSH disconnect batch. */
 export type AgentStatusClearIpcPayload =
   | {
@@ -96,6 +102,8 @@ export type AgentStatusClearIpcPayload =
       statusUnavailable?: true
       /** An OSC 7501 program took back its own row, so even a `done` row goes. */
       programStatusRemoved?: true
+      /** Forget that conversation as this pane's resume target too, not only its status. */
+      refusedResume?: RefusedPaneResume
     }
   | {
       transient: true
diff --git a/src/shared/agent-status-types.ts b/src/shared/agent-status-types.ts
index 9e9827884fba..70269f0465ed 100644
--- a/src/shared/agent-status-types.ts
+++ b/src/shared/agent-status-types.ts
@@ -43,7 +43,8 @@ export type {
   AgentStatusCacheIdentity,
   AgentStatusClearIpcPayload,
   AgentStatusIpcPayload,
-  MigrationUnsupportedPtyEntry
+  MigrationUnsupportedPtyEntry,
+  RefusedPaneResume
 } from './agent-status-ipc-payload'
 export { mainAgentStatusEqual, type AgentMainAgentStatus } from './main-agent-status'
 export { AGENT_STATE_HISTORY_MAX, type AgentStateHistoryEntry } from './agent-state-history'
diff --git a/src/shared/rpc-contract/terminal-unary-params.ts b/src/shared/rpc-contract/terminal-unary-params.ts
index 1b043f70b526..8ff208a1696c 100644
--- a/src/shared/rpc-contract/terminal-unary-params.ts
+++ b/src/shared/rpc-contract/terminal-unary-params.ts
@@ -220,6 +220,8 @@ export const TerminalCreateParams = z.object({
     })
     .optional(),
   resumeProviderSession: ResumeProviderSessionParam.optional(),
+  // Older hosts drop it and resume as before.
+  resumeOrigin: z.literal('saved').optional(),
   launchToken: OptionalString,
   launchAgent: z.string().refine(isTuiAgent).optional(),
   terminalKittyKeyboardProtocol: z.boolean().optional(),

From 985ffc63c9e859d9bf2343c701ff241708f6a13f Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Mon, 19 Oct 2026 22:36:43 -0700
Subject: [PATCH 004/207] Fix saved terminal resume ownership and effective
 launch results

---
 .../agent-hooks/server/server-tab-cleanup.ts  |   3 +
 .../ai-vault/structured-session-ownership.ts  |  16 +-
 .../codex-structured-thread-open.test.ts      |  41 ++++
 .../codex/codex-structured-thread-open.ts     |  17 ++
 src/main/ipc/pty-ipc-mock-registry.ts         |   4 +-
 .../pty-spawn-saved-resume-admission.test.ts  |  22 +-
 .../pty/host-env/saved-resume-admission.ts    | 205 ++++++++++++-----
 src/main/ipc/pty/ipc/spawn-commit.ts          |  13 +-
 src/main/ipc/pty/ipc/spawn-env-codex.ts       |   6 +
 src/main/ipc/pty/ipc/spawn-execute.ts         |  54 ++++-
 src/main/ipc/pty/ipc/spawn-preflight.ts       |   9 -
 src/main/ipc/pty/ipc/spawn-run.ts             |  34 ++-
 src/main/ipc/pty/pane/stable-owner.ts         |   2 +
 src/main/ipc/pty/runtime/spawn-commit.ts      |   8 +-
 src/main/ipc/pty/runtime/spawn-early.ts       |   2 +
 src/main/ipc/pty/runtime/spawn-execute.ts     | 190 ++++++++++++----
 .../spawn-preflight-saved-resume.test.ts      | 208 ++++++++++++++++--
 src/main/ipc/pty/runtime/spawn-preflight.ts   |  46 +---
 src/main/ipc/pty/runtime/spawn-state.ts       |   9 +-
 src/main/ipc/pty/runtime/spawn.ts             |  84 ++++---
 ...red-agent-session-failed-create-refusal.ts |   6 +-
 .../structured-agent-session-failure-text.ts  |  27 ++-
 ...ctured-agent-session-provider-open.test.ts |  23 ++
 src/main/providers/pty-spawn-result.ts        |   3 +-
 ...rminal-create-host-session-binding.test.ts |  49 +++++
 .../hook-status-resume-sleep-ordering.test.ts |  39 ++++
 .../managed-conversation-starts.test.ts       |  60 -----
 .../runtime/managed-conversation-starts.ts    |  79 -------
 src/main/runtime/rpc/methods/session-tabs.ts  |  36 +--
 .../methods/terminal/terminal-send-method.ts  |  17 +-
 .../terminal/terminal-send-resume-starts.ts   |  72 ------
 .../runtime-pty-controller-contract.ts        |  16 +-
 .../runtime/runtime-terminal-state-records.ts |   7 +
 .../get-agent-session-execution-namespace.ts  |   1 +
 .../structured-session-cli-writer-host.ts     |  87 +++-----
 .../launch/mobile-terminal-owned-create.ts    |   4 +-
 .../terminal/launch/terminal-create.ts        |  63 +++---
 .../terminal/launch/terminal-launch-result.ts |  66 ++++++
 .../stop/worktree-sleep-resume-recording.ts   |  88 ++++++--
 src/preload/api/pty-api.ts                    |   5 +
 src/preload/api/pty-bridge-session-control.ts |   6 +
 .../agent-session-failure-words-text.ts       |   5 +
 .../terminal-pane/ipc-pty-connect-result.ts   |  11 +-
 .../terminal-pane/ipc-pty-connect.ts          |   2 +
 .../terminal-pane/pty-connection-types.ts     |   2 +
 .../pty-connection/apply-reattach-payload.ts  |  31 ++-
 .../cold-restore-resume-startup.ts            |  17 ++
 .../pty-connection/connect-pane-pty.ts        |   3 +
 .../deferred-cold-restore-and-snapshot.ts     |  39 +++-
 .../deferred-session-reattach-connect.ts      |   1 +
 .../pty-connection/fresh-spawn-start.ts       |  36 ++-
 .../pty-connection/fresh-spawn-types.ts       |   3 +
 .../hidden-agent-resume-deferral.ts           |   3 +
 .../pty-connection/pane-serializer-settle.ts  |  10 +-
 .../reattach-payload-context.test.ts          |  54 +++++
 .../reattach-payload-session.ts               |   1 +
 .../pty-connection/reattach-result-handler.ts |  23 +-
 .../saved-resume-cancellation.test.ts         | 129 +++++++++++
 .../saved-resume-startup-cancellation.ts      | 102 +++++++++
 .../pty-connection/sleeping-record-access.ts  |  30 ++-
 .../pty-connection/spawn-deferred-sleep.ts    |   6 +-
 .../pty-connection/title-spawn-bell.ts        |  19 +-
 .../terminal-pane/pty-transport-types.ts      |   3 +-
 ...-pty-transport-host-session-launch.test.ts |  58 +++++
 ...runtime-pty-transport-spawn-intent.test.ts |  48 +++-
 .../remote-runtime-pty-transport.ts           |  70 ++++--
 .../ipc-events/agent-status-listeners.ts      |   3 +
 .../src/i18n/en-runtime-required.json         |   1 +
 src/renderer/src/i18n/locales/en.json         |   1 +
 src/renderer/src/i18n/locales/es.json         |   1 +
 src/renderer/src/i18n/locales/fr.json         |   1 +
 src/renderer/src/i18n/locales/ja.json         |   1 +
 src/renderer/src/i18n/locales/ko.json         |   1 +
 src/renderer/src/i18n/locales/zh.json         |   1 +
 .../src/lib/forget-refused-pane-resume.ts     |  63 +++---
 .../src/lib/sleeping-agent-session-launch.ts  |  13 ++
 .../src/store/terminals/terminal-state.ts     |   2 +
 src/shared/agent-session-failure-copy.ts      |   2 +
 src/shared/agent-session-failure-words.ts     |   1 +
 src/shared/agent-session-failure.ts           |   1 +
 src/shared/agent-session-host-authority.ts    |   1 +
 src/shared/agent-session-refusal-details.ts   |   1 +
 .../agent-session-refusal-reason-words.ts     |   1 +
 src/shared/agent-session-resume.ts            |  43 ++++
 src/shared/agent-status-ipc-payload.ts        |   2 +
 src/shared/protocol-version.ts                |   3 +
 .../rpc-contract/agent-session-params.ts      |   1 +
 src/shared/runtime-terminal-contracts.ts      |   4 +-
 ...ctured-agent-session-dispatch-rejection.ts |   2 +
 89 files changed, 1886 insertions(+), 697 deletions(-)
 delete mode 100644 src/main/runtime/managed-conversation-starts.test.ts
 delete mode 100644 src/main/runtime/managed-conversation-starts.ts
 delete mode 100644 src/main/runtime/rpc/methods/terminal/terminal-send-resume-starts.ts
 create mode 100644 src/main/runtime/terminal/launch/terminal-launch-result.ts
 create mode 100644 src/renderer/src/components/terminal-pane/pty-connection/saved-resume-cancellation.test.ts
 create mode 100644 src/renderer/src/components/terminal-pane/pty-connection/saved-resume-startup-cancellation.ts

diff --git a/src/main/agent-hooks/server/server-tab-cleanup.ts b/src/main/agent-hooks/server/server-tab-cleanup.ts
index cfe42b8198f0..fb9c9be59691 100644
--- a/src/main/agent-hooks/server/server-tab-cleanup.ts
+++ b/src/main/agent-hooks/server/server-tab-cleanup.ts
@@ -16,6 +16,9 @@ export abstract class AgentHookServerTabCleanup extends AgentHookServerCleanup {
     const clear = { paneKey: ownerKey, refusedResume: refused }
     if (
       row &&
+      refused.expectedStatus &&
+      row.receivedAt <= refused.expectedStatus.receivedAt &&
+      row.stateStartedAt === refused.expectedStatus.stateStartedAt &&
       row.payload.agentType === refused.agent &&
       agentProviderSessionsEqual(refused.agent, row.providerSession, refused.providerSession)
     ) {
diff --git a/src/main/ai-vault/structured-session-ownership.ts b/src/main/ai-vault/structured-session-ownership.ts
index 2bd9640c3193..73e29edebaf0 100644
--- a/src/main/ai-vault/structured-session-ownership.ts
+++ b/src/main/ai-vault/structured-session-ownership.ts
@@ -163,20 +163,13 @@ export function assertLegacyAiVaultResumeAllowed(args: AiVaultPrepareSessionResu
   }
 }
 
-/** A terminal resume a command asks for: the chat agent whose conversations it names, and the
- *  conversation (null: any of that agent's). */
-export type AdmittedResumeInvocation = { provider: StructuredAgentId; target: string | null }
-
-/** Refuses a command resuming a conversation a chat holds; otherwise `register` runs in the same
- *  synchronous step as the check, so a chat starting meanwhile sees what it registered. */
-export async function assertLegacyAiVaultResumeCommandAllowed<T>(
+export async function assertLegacyAiVaultResumeCommandAllowed(
   command: string,
-  ensureHost: () => Promise<void>,
-  register?: (invocations: AdmittedResumeInvocation[]) => T
-): Promise<T | undefined> {
+  ensureHost: () => Promise<void>
+): Promise<void> {
   const invocations = parseResumeInvocations(command)
   if (invocations.length === 0) {
-    return undefined
+    return
   }
   // A terminal command is not a chat: with chats refused here there is no ownership to check.
   await ensureStructuredAgentSessionHostUnlessRefused(ensureHost)
@@ -188,7 +181,6 @@ export async function assertLegacyAiVaultResumeCommandAllowed<T>(
       refuseLegacyWriter(ownership)
     }
   }
-  return register?.(invocations.map(({ provider, target }) => ({ provider, target })))
 }
 
 /** Any chat whose chain ever held the row a resume or fork names; null when none did. */
diff --git a/src/main/codex/codex-structured-thread-open.test.ts b/src/main/codex/codex-structured-thread-open.test.ts
index 0508271d1880..ff3f8b2cfe88 100644
--- a/src/main/codex/codex-structured-thread-open.test.ts
+++ b/src/main/codex/codex-structured-thread-open.test.ts
@@ -1,3 +1,4 @@
+import { providerStartupFailureFact } from '../native-chat/agent-session-wire/structured-agent-session-failure-text'
 import { describe, expect, it, vi } from 'vitest'
 import {
   CodexAppServerFrameSizeError,
@@ -325,3 +326,43 @@ describe('openCodexThread', () => {
     })
   })
 })
+
+it('keeps an exact active-writer refusal typed through cleanup wrapping', async () => {
+  const error = new CodexAppServerRequestError(
+    'thread/resume',
+    -32600,
+    'thread C already has an active writer'
+  )
+  const request = vi.fn().mockRejectedValue(error)
+  let refused: unknown
+  try {
+    await openCodexThread(connectionFor(request), { cwd: '/workspace', resumeThreadId: 'C' }, 2_000)
+  } catch (caught) {
+    refused = caught
+  }
+  expect(refused).toMatchObject({ reason: 'conversationOpenElsewhere' })
+  expect(providerStartupFailureFact(new AggregateError([refused], 'cleanup failed'))).toMatchObject(
+    {
+      kind: 'conversationOpenElsewhere',
+      detail: { text: error.message, audience: 'log' }
+    }
+  )
+  expect(request).toHaveBeenCalledOnce()
+})
+
+it.each([
+  ['thread/resume', -32600, 'thread D already has an active writer'],
+  ['thread/start', -32600, 'thread C already has an active writer'],
+  ['thread/resume', -32600, 'thread C is archived'],
+  ['thread/resume', -32600, 'unrelated invalid request'],
+  ['thread/resume', -1, 'thread C already has an active writer']
+] as const)('does not broaden writer refusal for %s/%s/%s', async (method, code, message) => {
+  const error = new CodexAppServerRequestError(method, code, message)
+  await expect(
+    openCodexThread(
+      connectionFor(vi.fn().mockRejectedValue(error)),
+      { cwd: '/workspace', resumeThreadId: 'C' },
+      2_000
+    )
+  ).rejects.toBe(error)
+})
diff --git a/src/main/codex/codex-structured-thread-open.ts b/src/main/codex/codex-structured-thread-open.ts
index 2d2489094239..33e61bfa28b2 100644
--- a/src/main/codex/codex-structured-thread-open.ts
+++ b/src/main/codex/codex-structured-thread-open.ts
@@ -5,6 +5,8 @@
 // recording it would make the durable handle chain lie about what this session
 // actually proved.
 
+import { AgentSessionAcquisitionRefusal } from '../native-chat/agent-session-wire/structured-agent-session-adapter'
+import { providerDiagnostic, withProviderDiagnostic } from '../../shared/agent-session-failure'
 import { throwIfSignalAborted } from '../../shared/abort-signal-reason'
 import {
   isCodexAppServerRequestError,
@@ -113,6 +115,21 @@ export async function openCodexThread(
       )
     } catch (error) {
       throwIfSignalAborted(signal)
+      if (
+        isCodexAppServerRequestError(error) &&
+        error.method === 'thread/resume' &&
+        error.code === -32600 &&
+        /\bthread\s+(\S+)\s+already has an active writer\b/i.exec(error.message)?.[1] ===
+          resumeThreadId
+      ) {
+        throw withProviderDiagnostic(
+          Object.assign(
+            new AgentSessionAcquisitionRefusal(error.message, 'conversationOpenElsewhere'),
+            { cause: error }
+          ),
+          providerDiagnostic(error.providerDiagnostic?.text ?? error.message, 'log')
+        )
+      }
       if (!launch.supersedeIfUnsaved || !isCodexNoRolloutError(error, resumeThreadId)) {
         throw error
       }
diff --git a/src/main/ipc/pty-ipc-mock-registry.ts b/src/main/ipc/pty-ipc-mock-registry.ts
index 1adcd9237ca5..b9581a26c1f8 100644
--- a/src/main/ipc/pty-ipc-mock-registry.ts
+++ b/src/main/ipc/pty-ipc-mock-registry.ts
@@ -135,9 +135,7 @@ export const noChatsRuntimeMembers = () => ({
   openAgentSessionRecordStore: vi.fn(async () => ({
     listRecords: () => [],
     getVisibleSessionTabIndex: () => ({ present: true, sessionIds: [] })
-  })),
-  reserveManagedConversationStart: vi.fn(() => ({ bind: vi.fn(), drop: vi.fn() })),
-  bindManagedConversationStart: vi.fn()
+  }))
 })
 
 export const agentHookServerModuleMock = () => ({
diff --git a/src/main/ipc/pty-spawn-saved-resume-admission.test.ts b/src/main/ipc/pty-spawn-saved-resume-admission.test.ts
index 2a9a53ac3fcc..7143689445aa 100644
--- a/src/main/ipc/pty-spawn-saved-resume-admission.test.ts
+++ b/src/main/ipc/pty-spawn-saved-resume-admission.test.ts
@@ -132,16 +132,30 @@ describe('a pane restore of a conversation a native chat continues', () => {
     }
   )
 
+  posixOnlyIt('keeps a committed refused shell usable when status cleanup fails', async () => {
+    register([chat.sessionId])
+    const warning = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    forgetRefusedPaneResumeMock.mockImplementationOnce(() => {
+      throw new Error('cleanup failed')
+    })
+    try {
+      const restored = await spawnResume('saved')
+      expect(restored).toMatchObject({ refused: 'chat-home', notice: true })
+      expect(restored.input).not.toContain(C)
+      expect(warning).toHaveBeenCalled()
+    } finally {
+      warning.mockRestore()
+    }
+  })
+
   posixOnlyIt(
-    'resumes once the chat tab is closed, and the chat then refuses to start',
+    'resumes once the chat tab is closed, with the accepted pre-report interval',
     async () => {
       const runtime = register([])
       const restored = await spawnResume('saved')
       expect(restored.refused).toBeUndefined()
       expect(restored.input).toContain(`--resume '${C}'`)
-      await expect(runtime['assertStructuredChatAcquireAdmissible'](chat)).rejects.toMatchObject({
-        refusal: { details: { reason: 'conversationHeldElsewhere' } }
-      })
+      await expect(runtime['assertStructuredChatAcquireAdmissible'](chat)).resolves.toBeUndefined()
     }
   )
 
diff --git a/src/main/ipc/pty/host-env/saved-resume-admission.ts b/src/main/ipc/pty/host-env/saved-resume-admission.ts
index 89db109a1059..65296323394c 100644
--- a/src/main/ipc/pty/host-env/saved-resume-admission.ts
+++ b/src/main/ipc/pty/host-env/saved-resume-admission.ts
@@ -1,6 +1,7 @@
 import type { TuiAgent } from '../../../../shared/tui-agent'
 import {
   normalizeAgentProviderSession,
+  agentProviderSessionsEqual,
   type AgentProviderSessionMetadata,
   type SleepingAgentLaunchConfig,
   type SleepingAgentSessionRecord
@@ -10,7 +11,6 @@ import type {
   RefusedPaneResume
 } from '../../../../shared/agent-status-types'
 import type { AgentSessionRecordStore } from '../../../runtime/agent-session-record-store'
-import type { ManagedConversationStart } from '../../../runtime/managed-conversation-starts'
 import {
   agentSessionLeasePossiblyWriting,
   listStructuredProviderSessionOwnership
@@ -20,8 +20,7 @@ import { LOCAL_EXECUTION_HOST_ID, type ExecutionHostId } from '../../../../share
 import type { WorkspaceSessionState } from '../../../../shared/workspace-session-state-types'
 import {
   keysMayMatch,
-  terminalConversationKey,
-  type ConversationKey
+  terminalConversationKey
 } from '../../../native-chat/structured-conversation-key'
 
 export type ResumeSpawnArgs = {
@@ -37,26 +36,27 @@ export type ResumeSpawnArgs = {
 }
 
 type AdmissionRuntime = {
+  getAgentProviderSessionRows?(): AgentStatusIpcPayload[]
+  readSavedResumeSource?(
+    worktreeId: string,
+    paneKey: string
+  ): Promise<SleepingAgentSessionRecord | undefined>
   openAgentSessionRecordStore(): Promise<AgentSessionRecordStore>
-  reserveManagedConversationStart(keys: readonly ConversationKey[]): ManagedConversationStart
 }
 
 /** `chat-home`: an automatic restore of a conversation an open chat continues; `chat-writing`:
  *  any start of one a chat may be writing; `unverifiable`: an automatic restore with no records. */
 export type ResumeSpawnRefusal = {
+  sourceRecord?: SleepingAgentSessionRecord
   verdict: 'chat-home' | 'chat-writing' | 'unverifiable'
   refused: RefusedPaneResume
 }
 
 export type ResumeSpawnAdmission =
-  | { verdict: 'admitted'; start: ManagedConversationStart }
+  | { verdict: 'admitted'; refused: RefusedPaneResume; sourceRecord?: SleepingAgentSessionRecord }
   | ResumeSpawnRefusal
 
-/**
- * Decided on the execution host before any command is issued. An admitted start registers in the
- * same step as the check, so a chat starting meanwhile sees it. Null: nothing here can be a chat's
- * (no resume, a remote or WSL pane), so the spawn stays as it was.
- */
+/** Saved-home policy only; ordinary terminal starts remain hook-observed. */
 export async function admitResumeSpawn(
   runtime: AdmissionRuntime | undefined,
   args: ResumeSpawnArgs,
@@ -65,10 +65,19 @@ export async function admitResumeSpawn(
   const providerSession = normalizeAgentProviderSession(args.resumeProviderSession)
   const agent = args.launchAgent
   // Native chats run only natively, so a remote or WSL conversation is never a chat's.
-  if (!runtime || !providerSession || !agent || args.connectionId || wslDistro !== null) {
+  if (
+    args.resumeOrigin !== 'saved' ||
+    !providerSession ||
+    !agent ||
+    args.connectionId ||
+    wslDistro !== null
+  ) {
     return null
   }
-  return judgeResumes(runtime, [{ agent, providerSession }], args.resumeOrigin === 'saved')
+  if (!runtime) {
+    return { verdict: 'unverifiable', refused: { agent, providerSession } }
+  }
+  return judgeResumes(runtime, [{ agent, providerSession }])
 }
 
 /** A reattach that found its session gone returns a fresh shell its window then resumes from the
@@ -89,7 +98,11 @@ export async function admitColdRestoreReattach(
     ...runtime
       .getAgentProviderSessionRows()
       .flatMap((row) =>
-        row.paneKey === paneKey && !row.connectionId && row.providerSession
+        row.paneKey === paneKey &&
+        row.state !== 'done' &&
+        !row.structuredHost &&
+        !row.connectionId &&
+        row.providerSession
           ? [{ agent: row.agentType, providerSession: row.providerSession }]
           : []
       ),
@@ -97,14 +110,13 @@ export async function admitColdRestoreReattach(
       ? [{ agent: saved.agent, providerSession: saved.providerSession }]
       : [])
   ]
-  const [first, ...rest] = resumes
-  return first ? judgeResumes(runtime, [first, ...rest], true) : null
+  const [first] = resumes
+  return first ? judgeResumes(runtime, [first]) : null
 }
 
 async function judgeResumes(
   runtime: AdmissionRuntime,
-  resumes: readonly [RefusedPaneResume, ...RefusedPaneResume[]],
-  saved: boolean
+  resumes: readonly [RefusedPaneResume, ...RefusedPaneResume[]]
 ): Promise<ResumeSpawnAdmission> {
   const keysOf = ({ agent, providerSession }: RefusedPaneResume) =>
     [providerSession.id, providerSession.transcriptPath].flatMap((id) =>
@@ -112,7 +124,7 @@ async function judgeResumes(
     )
   const admitted = (): ResumeSpawnAdmission => ({
     verdict: 'admitted',
-    start: runtime.reserveManagedConversationStart(resumes.flatMap(keysOf))
+    refused: resumes[0]
   })
   let store: AgentSessionRecordStore
   try {
@@ -122,13 +134,12 @@ async function judgeResumes(
       "[pty] native chat records unreadable; cannot tell whether a resume is a chat's",
       error
     )
-    // Bookkeeping never gates a resume the user asked for.
-    return saved ? { verdict: 'unverifiable', refused: resumes[0] } : admitted()
+    return { verdict: 'unverifiable', refused: resumes[0] }
   }
   const heads = listStructuredProviderSessionOwnership(store.listRecords()).filter(
     (holding) => holding.role === 'head'
   )
-  const tabs = saved ? store.getVisibleSessionTabIndex() : null
+  const tabs = store.getVisibleSessionTabIndex()
   for (const refused of resumes) {
     const holders = heads.filter((holding) =>
       keysOf(refused).some((key) => keysMayMatch(holding.key, key))
@@ -136,7 +147,7 @@ async function judgeResumes(
     if (holders.some((holding) => agentSessionLeasePossiblyWriting(holding.lease))) {
       return { verdict: 'chat-writing', refused }
     }
-    if (tabs && holders.length > 0 && !tabs.present) {
+    if (holders.length > 0 && (!tabs || !tabs.present)) {
       return { verdict: 'unverifiable', refused }
     }
     if (tabs && holders.some((holding) => tabs.sessionIds.includes(holding.sessionId))) {
@@ -153,7 +164,11 @@ export function dropAgentLaunch(args: ResumeSpawnArgs): void {
   if (args.env) {
     args.env = Object.fromEntries(
       Object.entries(args.env).filter(
-        ([key, value]) => key !== 'ORCA_AGENT_LAUNCH_TOKEN' && agentEnv[key] !== value
+        ([key, value]) =>
+          key !== 'ORCA_AGENT_LAUNCH_TOKEN' &&
+          key !== 'ORCA_SEQUENCED_STARTUP_COMMAND' &&
+          key !== 'ORCA_SEQUENCED_STARTUP_SCRIPT' &&
+          agentEnv[key] !== value
       )
     )
   }
@@ -164,46 +179,20 @@ export function dropAgentLaunch(args: ResumeSpawnArgs): void {
   delete args.resumeProviderSession
 }
 
-/** The admission at a spawn step: a refused resume leaves the spawn its plain shell. */
-export async function applyResumeSpawnAdmission(
-  runtime: AdmissionRuntime | undefined,
-  args: ResumeSpawnArgs,
-  wslDistro: string | null
-): Promise<ResumeSpawnAdmission | null> {
-  const admission = await admitResumeSpawn(runtime, args, wslDistro)
-  if (admission && admission.verdict !== 'admitted') {
-    dropAgentLaunch(args)
-  }
-  return admission
-}
-
 export function resumeSpawnRefusal(
   admission: ResumeSpawnAdmission | null
 ): ResumeSpawnRefusal | null {
   return admission && admission.verdict !== 'admitted' ? admission : null
 }
 
-/** An admitted start holds the PTY that runs it; a reattach never ran the launch. */
-export function bindResumeSpawnStart(
-  runtime:
-    | { bindManagedConversationStart(start: ManagedConversationStart, ptyId: string | null): void }
-    | undefined,
-  admission: ResumeSpawnAdmission | null,
-  result: { id: string; isReattach?: boolean }
-): void {
-  if (admission?.verdict === 'admitted') {
-    runtime?.bindManagedConversationStart(admission.start, result.isReattach ? null : result.id)
-  }
-}
-
-export function dropResumeSpawnStart(admission: ResumeSpawnAdmission | null): void {
-  if (admission?.verdict === 'admitted') {
-    admission.start.drop()
+/** Unwinds only the claim whose fresh callback has issued no physical work. */
+export class SavedResumeFreshRefusal extends Error {
+  constructor(readonly admission: ResumeSpawnRefusal) {
+    super('saved_resume_fresh_refused')
   }
 }
 
-/** Retires a refused resume's claim at once, so the cleanup never waits on this spawn finishing or
- *  a pane receiving its result. An unverifiable refusal keeps everything for the next try. */
+/** Called only after a refused plain shell exists; uncertain evidence retains its recipe. */
 export function forgetRefusedResume(
   paneKey: string | null,
   refusal: ResumeSpawnRefusal | null
@@ -232,3 +221,111 @@ export function savedResumeRecord(
       ]
     : undefined
 }
+
+/** Runs only in the fresh branch, after stable/claimed owner adoption has settled. */
+export async function chooseSavedResumeFreshLaunch(
+  runtime: AdmissionRuntime | undefined,
+  args: ResumeSpawnArgs,
+  wslDistro: string | null,
+  options: ResumeSpawnArgs & { startupCommandDelivery?: unknown; startupIngress?: unknown }
+): Promise<ResumeSpawnAdmission | null> {
+  const admission = await admitResumeSpawn(runtime, args, wslDistro)
+  if (resumeSpawnRefusal(admission)) {
+    suppressSavedResumeLaunch(args, options)
+  }
+  return admission
+}
+
+/** A claim joiner uses the same suppression without reclassifying the settled request. */
+export function suppressSavedResumeLaunch(
+  args: ResumeSpawnArgs,
+  options: ResumeSpawnArgs & { startupCommandDelivery?: unknown; startupIngress?: unknown }
+): void {
+  options.launchConfig = args.launchConfig
+  dropAgentLaunch(options)
+  delete options.startupCommandDelivery
+  delete options.startupIngress
+  dropAgentLaunch(args)
+}
+
+export function savedResumeResult(admission: ResumeSpawnAdmission | null) {
+  if (!admission) {
+    return {}
+  }
+  const { agent, providerSession } = admission.refused
+  return {
+    savedResumeDecision: { agent, providerSession, verdict: admission.verdict },
+    ...(admission.verdict !== 'admitted'
+      ? {
+          agentResumeRefused: admission.verdict,
+          agentResumeUnavailable: true as const,
+          refusedResume: admission.refused
+        }
+      : {})
+  }
+}
+
+/** Capture before spawn; later same-conversation status and saved versions belong to later work. */
+export async function captureSavedResumeCleanup(
+  runtime: AdmissionRuntime | undefined,
+  store: Parameters<typeof savedResumeRecord>[0],
+  paneKey: string | null,
+  admission: ResumeSpawnAdmission | null,
+  worktreeId?: string
+): Promise<void> {
+  if (!paneKey || !admission) {
+    return
+  }
+  let candidate = savedResumeRecord(store, paneKey)
+  if (runtime?.readSavedResumeSource && worktreeId) {
+    try {
+      candidate = await runtime.readSavedResumeSource(worktreeId, paneKey)
+    } catch (error) {
+      console.warn('[pty] could not capture saved resume cleanup source', error)
+    }
+  }
+  const saved =
+    candidate &&
+    candidate.agent === admission.refused.agent &&
+    agentProviderSessionsEqual(
+      candidate.agent,
+      candidate.providerSession,
+      admission.refused.providerSession
+    )
+      ? candidate
+      : undefined
+  const row = runtime
+    ?.getAgentProviderSessionRows?.()
+    .find(
+      (entry) =>
+        entry.paneKey === paneKey &&
+        entry.agentType === admission.refused.agent &&
+        agentProviderSessionsEqual(
+          entry.agentType,
+          entry.providerSession,
+          admission.refused.providerSession
+        )
+    )
+  admission.sourceRecord = saved
+  admission.refused = {
+    ...admission.refused,
+    ...(row
+      ? {
+          expectedStatus: {
+            paneKey,
+            receivedAt: row.receivedAt,
+            stateStartedAt: row.stateStartedAt
+          }
+        }
+      : {}),
+    ...(saved
+      ? {
+          expectedSavedRecord: {
+            paneKey,
+            capturedAt: saved.capturedAt,
+            updatedAt: saved.updatedAt
+          }
+        }
+      : {})
+  }
+}
diff --git a/src/main/ipc/pty/ipc/spawn-commit.ts b/src/main/ipc/pty/ipc/spawn-commit.ts
index bdf460e07825..318915331061 100644
--- a/src/main/ipc/pty/ipc/spawn-commit.ts
+++ b/src/main/ipc/pty/ipc/spawn-commit.ts
@@ -23,7 +23,7 @@ import { reflowHeadlessTerminalToCommittedGrid } from '../delivery/attached-pty-
 import { seedHeadlessTerminalFromSpawnResult } from '../pane/terminal-spawn-restore'
 import { markNativeWindowsConptyPty } from '../../../runtime/terminal-model-query-authority'
 import { commitPtyWithOpenCodePromptIntent } from '../../../opencode/opencode-startup-prompt-owner'
-import { resumeSpawnRefusal } from '../host-env/saved-resume-admission'
+import { resumeSpawnRefusal, savedResumeResult } from '../host-env/saved-resume-admission'
 
 export async function commitPtyIpcSpawn(ctx: PtyIpcSpawnState): Promise<PtySpawnResult> {
   return commitPtyWithOpenCodePromptIntent(ctx, () => commitReservedPtyIpcSpawn(ctx))
@@ -41,7 +41,7 @@ function resumeDisposition(ctx: PtyIpcSpawnState) {
     ...(ctx.codexResumeLaunch.notifyResumeUnavailable || refusal
       ? { agentResumeUnavailable: true as const }
       : {}),
-    ...(refusal ? { agentResumeRefused: refusal.verdict } : {})
+    ...savedResumeResult(ctx.resumeAdmission)
   }
 }
 
@@ -208,6 +208,15 @@ async function commitReservedPtyIpcSpawn(ctx: PtyIpcSpawnState): Promise<PtySpaw
   }
   const response = {
     ...ctx.result,
+    ...(!ctx.result.isReattach && !resumeSpawnRefusal(ctx.resumeAdmission)
+      ? {
+          launchAgent: args.launchAgent,
+          launchToken: typeof args.launchToken === 'string' ? args.launchToken : undefined,
+          resumeProviderSession: ctx.codexResumeLaunch.droppedResumeArgv
+            ? undefined
+            : args.resumeProviderSession
+        }
+      : {}),
     // Why both or neither: a pane can only adopt proven kitty flags together
     // with the sequence boundary they describe.
     ...(typeof ctx.result.snapshotKittyKeyboardFlags === 'number' &&
diff --git a/src/main/ipc/pty/ipc/spawn-env-codex.ts b/src/main/ipc/pty/ipc/spawn-env-codex.ts
index 6deaf690eed3..c4c21359f318 100644
--- a/src/main/ipc/pty/ipc/spawn-env-codex.ts
+++ b/src/main/ipc/pty/ipc/spawn-env-codex.ts
@@ -32,6 +32,12 @@ export async function assemblePtyIpcSpawnCodexEnv(ctx: PtyIpcSpawnState): Promis
     mark: (phase) => ctx.spawnTiming.mark(phase)
   })
   ctx.codexResumeLaunch = hostEnv.codexResumeLaunch
+  if (hostEnv.codexResumeLaunch.droppedResumeArgv && ctx.effectiveLaunchConfig) {
+    ctx.effectiveLaunchConfig = {
+      ...ctx.effectiveLaunchConfig,
+      agentCommand: hostEnv.launchCommand ?? ctx.effectiveLaunchConfig.agentCommand
+    }
+  }
   ctx.launchCommand = hostEnv.launchCommand
   ctx.baseEnv = hostEnv.baseEnv
   ctx.env = hostEnv.env
diff --git a/src/main/ipc/pty/ipc/spawn-execute.ts b/src/main/ipc/pty/ipc/spawn-execute.ts
index e4b7fe2bb8ce..7832ee122ac7 100644
--- a/src/main/ipc/pty/ipc/spawn-execute.ts
+++ b/src/main/ipc/pty/ipc/spawn-execute.ts
@@ -1,3 +1,9 @@
+import {
+  captureSavedResumeCleanup,
+  chooseSavedResumeFreshLaunch,
+  type ResumeSpawnAdmission,
+  resumeSpawnRefusal
+} from '../host-env/saved-resume-admission'
 import { ensureWslHookRelayForReattach } from '../../../agent-hooks/wsl-hook-relay-reattach'
 import { noteWslDistrosRunning } from '../../../wsl-background-distro-gate'
 import { resolveStablePaneOwner, spawnForStablePane } from '../pane/stable-owner'
@@ -9,6 +15,42 @@ import type { PtyIpcSpawnState } from './spawn-state'
 
 export async function executePtyIpcSpawn(ctx: PtyIpcSpawnState): Promise<void> {
   const args = ctx.args
+  const captured: ResumeSpawnAdmission | null =
+    args.launchAgent && args.resumeProviderSession
+      ? {
+          verdict: 'admitted',
+          refused: { agent: args.launchAgent, providerSession: args.resumeProviderSession }
+        }
+      : null
+  if (args.resumeOrigin === 'saved') {
+    await captureSavedResumeCleanup(
+      ctx.deps.runtime,
+      ctx.deps.store,
+      ctx.stablePaneKey,
+      captured,
+      args.worktreeId
+    )
+  }
+  const chooseFresh = async (): Promise<void> => {
+    ctx.spawnOptions.env = { ...ctx.spawnOptions.env }
+    args.launchConfig = ctx.effectiveLaunchConfig
+    ctx.resumeAdmission = await chooseSavedResumeFreshLaunch(
+      ctx.deps.runtime,
+      args,
+      ctx.expectedWslDistro,
+      ctx.spawnOptions
+    )
+    if (captured && ctx.resumeAdmission) {
+      ctx.resumeAdmission.refused = captured.refused
+      ctx.resumeAdmission.sourceRecord = captured.sourceRecord
+    }
+    if (resumeSpawnRefusal(ctx.resumeAdmission)) {
+      ctx.launchCommand = undefined
+      ctx.env = ctx.spawnOptions.env
+      ctx.baseEnv = ctx.spawnOptions.env
+      ctx.spawnEnv = ctx.spawnOptions.env
+    }
+  }
   try {
     if (ctx.preAllocatedHandle) {
       ctx.deps.trustedTerminalHandleEnv.add(ctx.preAllocatedHandle)
@@ -56,9 +98,16 @@ export async function executePtyIpcSpawn(ctx: PtyIpcSpawnState): Promise<void> {
           owner: stablePaneOwnerCandidate,
           worktreeId: args.worktreeId,
           connectionId: args.connectionId,
-          resolveOwner
+          resolveOwner,
+          beforeFreshSpawn: chooseFresh
         })
     ctx.result = stablePaneSpawn.result
+    if (ctx.result.isReattach) {
+      ctx.resumeAdmission = null
+    }
+    if (resumeSpawnRefusal(ctx.resumeAdmission)) {
+      ctx.effectiveLaunchConfig = undefined
+    }
     ctx.stablePaneOwner = stablePaneSpawn.owner
     if (
       ctx.stablePaneOwner &&
@@ -68,6 +117,9 @@ export async function executePtyIpcSpawn(ctx: PtyIpcSpawnState): Promise<void> {
     ) {
       clearProviderPtyState(ctx.effectiveSessionAppId)
     }
+    if (ctx.result.isReattach) {
+      Object.assign(ctx.result, ctx.deps.runtime?.getTerminalLaunchResult?.(ctx.result.id))
+    }
     ctx.rejectedRegistrationCandidate = ctx.result
     if (ctx.pendingRegistrationPtyId !== ctx.result.id) {
       if (ctx.pendingRegistrationPtyId) {
diff --git a/src/main/ipc/pty/ipc/spawn-preflight.ts b/src/main/ipc/pty/ipc/spawn-preflight.ts
index a01d0cf0543d..f791190a074c 100644
--- a/src/main/ipc/pty/ipc/spawn-preflight.ts
+++ b/src/main/ipc/pty/ipc/spawn-preflight.ts
@@ -10,7 +10,6 @@ import { getProvider } from '../provider/registry'
 import { resolvePtySpawnStartupTarget } from '../spawn-startup-target'
 import type { PtyIpcSpawnState } from './spawn-state'
 import { getConnectionExecutionHostId } from '../../../../shared/execution-host'
-import { applyResumeSpawnAdmission, resumeSpawnRefusal } from '../host-env/saved-resume-admission'
 
 export async function preparePtyIpcSpawnPreflight(ctx: PtyIpcSpawnState): Promise<void> {
   const args = ctx.args
@@ -108,14 +107,6 @@ export async function preparePtyIpcSpawnPreflight(ctx: PtyIpcSpawnState): Promis
   ctx.terminalRuntimeOptions = target.terminalRuntimeOptions
   ctx.expectedWslDistro = target.expectedWslDistro
   ctx.codexSelectionTarget = target.codexSelectionTarget
-  if (!ctx.preAdoptedStablePane) {
-    ctx.resumeAdmission = await applyResumeSpawnAdmission(
-      ctx.deps.runtime,
-      args,
-      ctx.expectedWslDistro
-    )
-    ctx.isClaudeLaunch = ctx.isClaudeLaunch && !resumeSpawnRefusal(ctx.resumeAdmission)
-  }
   ctx.spawnTiming.mark('preflight')
   args.env = withClaudeProfileTerminalEnv(args.env, ctx.codexSelectionTarget)
   ctx.claudeAuth =
diff --git a/src/main/ipc/pty/ipc/spawn-run.ts b/src/main/ipc/pty/ipc/spawn-run.ts
index f15863cbbdc7..9bce2857788f 100644
--- a/src/main/ipc/pty/ipc/spawn-run.ts
+++ b/src/main/ipc/pty/ipc/spawn-run.ts
@@ -20,9 +20,8 @@ import type { PtySpawnIpcArgs, PtySpawnIpcDeps } from './spawn-types'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
 import { refuseClosedPaneSpawn } from './closed-pane-spawn-refusal'
 import {
+  captureSavedResumeCleanup,
   admitColdRestoreReattach,
-  bindResumeSpawnStart,
-  dropResumeSpawnStart,
   forgetRefusedResume,
   resumeSpawnRefusal,
   savedResumeRecord
@@ -58,7 +57,7 @@ export async function runPtyIpcSpawn(deps: PtySpawnIpcDeps, args: PtySpawnIpcArg
     triggerPtySpawnPushTargetMaterialization(deps, args)
     const early = await beginPtyIpcSpawn(ctx)
     if (early) {
-      return early
+      return { ...early, ...deps.runtime?.getTerminalLaunchResult?.(early.id) }
     }
     // Awaited only for a launch: an ordinary spawn reaches its provider in the same turn as before.
     if (ctx.args.agentLaunch !== undefined) {
@@ -66,7 +65,6 @@ export async function runPtyIpcSpawn(deps: PtySpawnIpcDeps, args: PtySpawnIpcArg
     }
     await preparePtyIpcSpawnPreflight(ctx)
     await assemblePtyIpcSpawnEnv(ctx)
-    forgetRefusedResume(ctx.stablePaneKey, resumeSpawnRefusal(ctx.resumeAdmission))
     await preparePtyIpcQoderCommand(ctx)
     const earlyReserved = await buildPtyIpcSpawnOptions(ctx).catch((error: unknown) => {
       restoreProvisionalPtySize({
@@ -83,8 +81,7 @@ export async function runPtyIpcSpawn(deps: PtySpawnIpcDeps, args: PtySpawnIpcArg
       // evict the team env assembly created for it — exit/close cleanup keys
       // off handleByPtyId — so every lost race would leak one team forever.
       releaseAbandonedAgentTeamsLeader(ctx)
-      dropResumeSpawnStart(ctx.resumeAdmission)
-      return earlyReserved
+      return { ...earlyReserved, ...deps.runtime?.getTerminalLaunchResult?.(earlyReserved.id) }
     }
     // Right before the provider spawn, with nothing awaited in between: a closed pane starts nothing.
     ctx.paneAgentLaunch?.refuseIfClosed()
@@ -100,18 +97,37 @@ export async function runPtyIpcSpawn(deps: PtySpawnIpcDeps, args: PtySpawnIpcArg
         { paneKey: ctx.stablePaneKey, saved: savedResumeRecord(deps.store, ctx.stablePaneKey) },
         ctx.expectedWslDistro
       )
-      forgetRefusedResume(ctx.stablePaneKey, resumeSpawnRefusal(ctx.resumeAdmission))
+      await captureSavedResumeCleanup(
+        deps.runtime,
+        deps.store,
+        ctx.stablePaneKey,
+        ctx.resumeAdmission,
+        args.worktreeId
+      )
     }
     const committed = await commitPtyIpcSpawn(ctx)
-    bindResumeSpawnStart(deps.runtime, ctx.resumeAdmission, ctx.result)
+    const refusal = resumeSpawnRefusal(ctx.resumeAdmission)
+    forgetRefusedResume(ctx.stablePaneKey, refusal)
+    if (args.worktreeId && ctx.stablePaneKey && refusal && refusal.verdict !== 'unverifiable') {
+      void deps.runtime
+        ?.forgetRefusedSavedResume?.(
+          args.worktreeId,
+          ctx.stablePaneKey,
+          refusal.refused,
+          refusal.sourceRecord
+        )
+        .catch((error: unknown) => console.warn('[pty] refused resume cleanup failed', error))
+    }
     endPaneAgentLaunch(
       ctx,
       ctx.exitedBeforeRegistration ? { exitedDuringStart: true } : { started: true }
     )
+    if (!ctx.result.isReattach) {
+      deps.runtime?.rememberSavedTerminalLaunchResult?.(committed.id, committed)
+    }
     return committed
   } catch (caught) {
     const err = endPaneAgentLaunch(ctx, { error: caught }) ?? caught
-    dropResumeSpawnStart(ctx.resumeAdmission)
     releaseAbandonedAgentTeamsLeader(ctx)
     if (ctx.preSpawnHiddenMarkId !== null) {
       ctx.deps.transitionSpawnHiddenRendererPtyDeliveryState(ctx.preSpawnHiddenMarkId, false)
diff --git a/src/main/ipc/pty/pane/stable-owner.ts b/src/main/ipc/pty/pane/stable-owner.ts
index f190e5ab2cd9..ef28cc4bbde3 100644
--- a/src/main/ipc/pty/pane/stable-owner.ts
+++ b/src/main/ipc/pty/pane/stable-owner.ts
@@ -178,6 +178,7 @@ export type StablePaneSpawnContext = {
   worktreeId?: string
   connectionId?: string | null
   resolveOwner?: () => StablePaneOwner | null
+  beforeFreshSpawn?: () => Promise<void>
   onFreshSpawn?: (result: PtySpawnResult) => void
 }
 
@@ -292,6 +293,7 @@ export async function spawnForStablePane(
       return attached
     }
   }
+  await args.beforeFreshSpawn?.()
   const result = await args.provider.spawn(args.spawnOptions)
   args.onFreshSpawn?.(result)
   return { result, owner: null }
diff --git a/src/main/ipc/pty/runtime/spawn-commit.ts b/src/main/ipc/pty/runtime/spawn-commit.ts
index 6a6bd59ee140..8f8bfef1b120 100644
--- a/src/main/ipc/pty/runtime/spawn-commit.ts
+++ b/src/main/ipc/pty/runtime/spawn-commit.ts
@@ -119,11 +119,7 @@ async function commitReservedRuntimePtySpawn(ctx: RuntimePtySpawnState) {
       ctx.paneSpawnReservation,
       adoptedResult
     )
-    return {
-      id: ctx.result.id,
-      ...(ctx.result.incarnationId ? { incarnationId: ctx.result.incarnationId } : {}),
-      agentSessionEnsure: ctx.result.agentSessionEnsure
-    }
+    return adoptedResult
   }
   if (ctx.hostSessionBinding && !ctx.stablePaneBindingPersisted) {
     try {
@@ -269,7 +265,7 @@ async function commitReservedRuntimePtySpawn(ctx: RuntimePtySpawnState) {
         : {})
   })
   const response = {
-    id: ctx.result.id,
+    ...ctx.result,
     ...(ctx.result.incarnationId ? { incarnationId: ctx.result.incarnationId } : {}),
     ...(ctx.stablePaneOwner && (ctx.stablePaneOwner.handle || args.preAllocatedHandle)
       ? {
diff --git a/src/main/ipc/pty/runtime/spawn-early.ts b/src/main/ipc/pty/runtime/spawn-early.ts
index 45b8f04a38a2..bddbf5fe406f 100644
--- a/src/main/ipc/pty/runtime/spawn-early.ts
+++ b/src/main/ipc/pty/runtime/spawn-early.ts
@@ -43,6 +43,8 @@ export function adoptMaterializedRuntimePtySpawn(
     throw new Error('terminal_pane_owner_unknown')
   }
   ctx.result = {
+    ...ctx.preAdoptedStablePane.result,
+    isReattach: true,
     id: ctx.preAdoptedStablePane.result.id,
     ...(ctx.preAdoptedStablePane.result.incarnationId
       ? { incarnationId: ctx.preAdoptedStablePane.result.incarnationId }
diff --git a/src/main/ipc/pty/runtime/spawn-execute.ts b/src/main/ipc/pty/runtime/spawn-execute.ts
index 91c2c58ec67e..64133237fc54 100644
--- a/src/main/ipc/pty/runtime/spawn-execute.ts
+++ b/src/main/ipc/pty/runtime/spawn-execute.ts
@@ -1,3 +1,12 @@
+import {
+  suppressSavedResumeLaunch,
+  captureSavedResumeCleanup,
+  chooseSavedResumeFreshLaunch,
+  type ResumeSpawnAdmission,
+  resumeSpawnRefusal,
+  SavedResumeFreshRefusal
+} from '../host-env/saved-resume-admission'
+import type { AgentSessionClaimedSpawnResult } from '../../../../shared/agent-session-host-authority'
 import type { PtySpawnResult } from '../../../providers/pty-provider-contract'
 import { spawnWorktreeTarget } from '../../../../shared/worktree/host-qualified-identity'
 import { ptyIncarnationById } from '../provider/ownership-state'
@@ -18,6 +27,39 @@ import { markRuntimeSpawnHiddenBeforeSpawn } from './spawn-hidden-delivery'
 
 export async function executeRuntimePtySpawn(ctx: RuntimePtySpawnState): Promise<void> {
   const args = ctx.args
+  const captured: ResumeSpawnAdmission | null =
+    args.launchAgent && args.resumeProviderSession
+      ? {
+          verdict: 'admitted',
+          refused: { agent: args.launchAgent, providerSession: args.resumeProviderSession }
+        }
+      : null
+  if (args.resumeOrigin === 'saved') {
+    await captureSavedResumeCleanup(
+      ctx.deps.runtime,
+      ctx.deps.store,
+      ctx.spawnIdentityPaneKey,
+      captured,
+      args.worktreeId
+    )
+  }
+  const chooseFresh = async (): Promise<void> => {
+    ctx.spawnOptions.env = { ...ctx.spawnOptions.env }
+    ctx.resumeAdmission = await chooseSavedResumeFreshLaunch(
+      ctx.deps.runtime,
+      args,
+      ctx.expectedWslDistro,
+      ctx.spawnOptions
+    )
+    if (captured && ctx.resumeAdmission) {
+      ctx.resumeAdmission.refused = captured.refused
+      ctx.resumeAdmission.sourceRecord = captured.sourceRecord
+    }
+    if (resumeSpawnRefusal(ctx.resumeAdmission)) {
+      ctx.launchCommand = undefined
+      ctx.env = ctx.spawnOptions.env
+    }
+  }
   const runtime = ctx.deps.runtime
   const acquireWorktreeSpawn = runtime?.acquireWorktreeTerminalSpawn
   ctx.releaseWorktreeSpawn = acquireWorktreeSpawn
@@ -83,57 +125,103 @@ export async function executeRuntimePtySpawn(ctx: RuntimePtySpawnState): Promise
         ctx.pendingRegistrationPtyId = recoveredOwner.ptyId
       }
       let providerResult: PtySpawnResult | null = null
-      const ensured = await agentSessionOwners.ensure({
-        claim: args.agentSessionEnsure.claim,
-        surface: args.agentSessionEnsure.surface,
-        spawn: async () => {
-          assertClientStillConnected()
-          providerResult = await ctx.provider.spawn(ctx.spawnOptions)
-          ctx.rejectedRegistrationCandidate = providerResult
-          // Why: a successful lower-owner return proves physical work committed even if admission sees an early exit.
-          ctx.reportPtySpawnCommitted()
-          assertSpawnReplyWasLive(providerResult)
-          ctx.deps.runtime?.assertPtyRegistrationAllowed?.(
-            providerResult.id,
-            providerResult.incarnationId
-          )
-          if (providerResult.incarnationId) {
-            // Why: local providers cannot serialize controller claims, so liveness proof
-            // needs the exact incarnation before the registry promotes the new owner.
-            ptyIncarnationById.set(providerResult.id, providerResult.incarnationId)
-          }
-          const providerEnsure = providerResult.agentSessionEnsure
-          return {
-            ptyId: providerResult.id,
-            ...(providerEnsure
-              ? {
-                  owner: providerEnsure.owner,
-                  disposition: providerEnsure.disposition
-                }
-              : {})
+      let ensured: AgentSessionClaimedSpawnResult | undefined
+      try {
+        ensured = await agentSessionOwners.ensure({
+          claim: args.agentSessionEnsure.claim,
+          surface: args.agentSessionEnsure.surface,
+          spawn: async () => {
+            assertClientStillConnected()
+            await chooseFresh()
+            const refusal = resumeSpawnRefusal(ctx.resumeAdmission)
+            if (refusal) {
+              throw new SavedResumeFreshRefusal(refusal)
+            }
+            providerResult = await ctx.provider.spawn(ctx.spawnOptions)
+            ctx.rejectedRegistrationCandidate = providerResult
+            // Why: a successful lower-owner return proves physical work committed even if admission sees an early exit.
+            ctx.reportPtySpawnCommitted()
+            assertSpawnReplyWasLive(providerResult)
+            ctx.deps.runtime?.assertPtyRegistrationAllowed?.(
+              providerResult.id,
+              providerResult.incarnationId
+            )
+            if (providerResult.incarnationId) {
+              // Why: local providers cannot serialize controller claims, so liveness proof
+              // needs the exact incarnation before the registry promotes the new owner.
+              ptyIncarnationById.set(providerResult.id, providerResult.incarnationId)
+            }
+            const providerEnsure = providerResult.agentSessionEnsure
+            return {
+              ptyId: providerResult.id,
+              ...(providerEnsure
+                ? {
+                    owner: providerEnsure.owner,
+                    disposition: providerEnsure.disposition
+                  }
+                : {})
+            }
+          },
+          isLive: async (owner) => {
+            const ownerProvider = tryGetProviderForPty(owner.ptyId)
+            if (!ownerProvider) {
+              // Why: an owner on a host this process cannot reach is unknown, never absent.
+              throw new Error('execution_owner_unavailable')
+            }
+            return await isProviderAgentSessionOwnerLive(ownerProvider, owner)
+          },
+          onJoin: () => {
+            awaitingAnotherStart = true
           }
-        },
-        isLive: async (owner) => {
-          const ownerProvider = tryGetProviderForPty(owner.ptyId)
-          if (!ownerProvider) {
-            // Why: an owner on a host this process cannot reach is unknown, never absent.
-            throw new Error('execution_owner_unavailable')
-          }
-          return await isProviderAgentSessionOwnerLive(ownerProvider, owner)
-        },
-        onJoin: () => {
-          awaitingAnotherStart = true
+        })
+      } catch (error) {
+        if (!(error instanceof SavedResumeFreshRefusal)) {
+          throw error
+        }
+        // The claim reservation rejected before spawn; this shell must never become its owner.
+        ctx.resumeAdmission = {
+          ...error.admission,
+          refused: captured?.refused ?? error.admission.refused,
+          sourceRecord: captured?.sourceRecord
         }
-      })
+        suppressSavedResumeLaunch(args, ctx.spawnOptions)
+        ctx.launchCommand = undefined
+        ctx.env = ctx.spawnOptions.env
+        delete args.agentSessionEnsure
+        ctx.spawnOptions.agentSessionEnsure = undefined
+        const shell = await spawnForStablePane({
+          runtime: ctx.deps.runtime,
+          store: ctx.deps.store,
+          provider: ctx.provider,
+          spawnOptions: ctx.spawnOptions,
+          owner: resolveStablePaneOwner(
+            ctx.deps.runtime,
+            ctx.deps.store,
+            ctx.spawnIdentityPaneKey,
+            args.worktreeId,
+            args.connectionId
+          ),
+          onFreshSpawn: ctx.reportPtySpawnCommitted
+        })
+        providerResult = shell.result
+        ctx.stablePaneOwner = shell.owner
+      }
       awaitingAnotherStart = false
-      ctx.result = providerResult ?? {
-        id: ensured.owner.ptyId,
-        isReattach: true,
-        // Why: adoption from an authoritative listing must preserve the
-        // incarnation proof used to reject a delayed exit from an older process.
-        incarnationId: ptyIncarnationById.get(ensured.owner.ptyId)
+      if (providerResult) {
+        ctx.result = providerResult
+      } else if (ensured) {
+        ctx.result = {
+          id: ensured.owner.ptyId,
+          isReattach: true,
+          // A listing's incarnation rejects delayed exits from an older process.
+          incarnationId: ptyIncarnationById.get(ensured.owner.ptyId)
+        }
+      } else {
+        throw new Error('agent_session_owner_missing')
+      }
+      if (ensured) {
+        ctx.result.agentSessionEnsure = ensured
       }
-      ctx.result.agentSessionEnsure = ensured
     } else {
       assertClientStillConnected()
       const stablePaneSpawn = ctx.preAdoptedStablePane
@@ -154,6 +242,7 @@ export async function executeRuntimePtySpawn(ctx: RuntimePtySpawnState): Promise
                 args.worktreeId,
                 args.connectionId
               ),
+            beforeFreshSpawn: chooseFresh,
             onFreshSpawn: ctx.reportPtySpawnCommitted
           })
       ctx.result = stablePaneSpawn.result
@@ -169,6 +258,13 @@ export async function executeRuntimePtySpawn(ctx: RuntimePtySpawnState): Promise
       ctx.rejectedRegistrationCandidate = ctx.result
       assertSpawnReplyWasLive(ctx.result)
     }
+    if (ctx.result.isReattach || ctx.result.agentSessionEnsure?.disposition === 'adopted') {
+      ctx.result.isReattach = true
+      ctx.resumeAdmission = null
+    }
+    if (ctx.result.isReattach) {
+      Object.assign(ctx.result, ctx.deps.runtime?.getTerminalLaunchResult?.(ctx.result.id))
+    }
     ctx.rejectedRegistrationCandidate ??= ctx.result
     if (ctx.pendingRegistrationPtyId !== ctx.result.id) {
       if (ctx.pendingRegistrationPtyId) {
diff --git a/src/main/ipc/pty/runtime/spawn-preflight-saved-resume.test.ts b/src/main/ipc/pty/runtime/spawn-preflight-saved-resume.test.ts
index 8a369852db6b..fd970427e24a 100644
--- a/src/main/ipc/pty/runtime/spawn-preflight-saved-resume.test.ts
+++ b/src/main/ipc/pty/runtime/spawn-preflight-saved-resume.test.ts
@@ -1,3 +1,6 @@
+import { localProvider } from '../provider/registry'
+import { spawnPtyFromRuntimeController } from './spawn'
+import * as owners from '../pane/agent-session-owners'
 import { describe, expect, it, vi } from 'vitest'
 import type { BrowserWindow } from 'electron'
 import { getDefaultSettings } from '../../../../shared/constants'
@@ -6,17 +9,32 @@ import {
   agentSessionRecordFixture
 } from '../../../../shared/agent-session-record.test-fixture'
 import type { AgentSessionRecordStore } from '../../../runtime/agent-session-record-store'
-import { ManagedConversationStarts } from '../../../runtime/managed-conversation-starts'
 import type { OrcaRuntimeService } from '../../../runtime/orca-runtime'
 import { finishPtyShutdown } from '../provider/liveness'
 import { admitColdRestoreReattach } from '../host-env/saved-resume-admission'
 import type { PtyRuntimeControllerDeps } from './controller-deps'
-import { prepareRuntimePtySpawn } from './spawn-preflight'
+import { executeRuntimePtySpawn } from './spawn-execute'
+import { savedResumeResult } from '../host-env/saved-resume-admission'
 import { createRuntimePtySpawnState } from './spawn-state'
 
 const forgetRefusedPaneResume = vi.hoisted(() => vi.fn())
 vi.mock('../../../agent-hooks/server', () => ({ agentHookServer: { forgetRefusedPaneResume } }))
 
+vi.mock('./spawn-preflight', () => ({ prepareRuntimePtySpawn: vi.fn(async () => null) }))
+vi.mock('./spawn-options', () => ({
+  buildRuntimePtySpawnOptions: vi.fn(async (ctx: ReturnType<typeof createRuntimePtySpawnState>) => {
+    ctx.spawnIdentityPaneKey = 'tab-1:leaf'
+    ctx.spawnOptions = {
+      cols: ctx.args.cols,
+      rows: ctx.args.rows,
+      command: ctx.args.command,
+      env: ctx.args.env,
+      launchAgent: ctx.args.launchAgent
+    }
+    return null
+  })
+}))
+
 const C = 'provider-session-alpha-1'
 const chat = agentSessionRecordFixture(
   agentSessionLeaseFixture({
@@ -34,14 +52,21 @@ const store = {
 
 /** A host whose one chat continues C at rest, with its tab open. */
 function chatHost() {
-  const starts = new ManagedConversationStarts()
   return {
     // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the admission reads only the two members `store` has.
     openAgentSessionRecordStore: async () => store as unknown as AgentSessionRecordStore,
-    reserveManagedConversationStart: vi.fn(starts.reserve.bind(starts)),
+    getTerminalLaunchResult: vi.fn(),
     forgetRefusedSavedResume: vi.fn(async () => {}),
     getAgentProviderSessionRows: () => [
-      { paneKey: 'tab-1:leaf', agentType: 'claude', providerSession: { key: 'session_id', id: C } }
+      {
+        paneKey: 'tab-1:leaf',
+        agentType: 'claude' as const,
+        state: 'working' as const,
+        prompt: '',
+        receivedAt: 1,
+        stateStartedAt: 1,
+        providerSession: { key: 'session_id' as const, id: C }
+      }
     ]
   }
 }
@@ -83,41 +108,178 @@ function deps(runtime: ReturnType<typeof chatHost>): PtyRuntimeControllerDeps {
   }
 }
 
-describe('host-side saved resumes of a conversation an open chat continues', () => {
-  it('materializes a phone-restored pane as a plain shell and forgets its saved record', async () => {
-    const runtime = chatHost()
+describe('actual runtime saved-resume outcomes', () => {
+  function freshContext(runtime = chatHost()) {
     const ctx = createRuntimePtySpawnState(deps(runtime), {
       cols: 80,
       rows: 24,
       worktreeId: 'wt-1',
       tabId: 'tab-1',
-      leafId: '11111111-1111-4111-8111-111111111111',
       command: `claude --resume ${C}`,
       launchAgent: 'claude',
       resumeProviderSession: { key: 'session_id', id: C },
-      resumeOrigin: 'saved'
+      resumeOrigin: 'saved',
+      launchConfig: { agentCommand: 'claude', agentArgs: '', agentEnv: { AGENT_ONLY: 'yes' } },
+      env: {
+        WORKSPACE: 'keep',
+        AGENT_ONLY: 'yes',
+        ORCA_AGENT_LAUNCH_TOKEN: 'rejected',
+        ORCA_SEQUENCED_STARTUP_COMMAND: `claude --resume ${C}`,
+        ORCA_SEQUENCED_STARTUP_SCRIPT: `fallback claude --resume ${C}`
+      }
     })
-    await prepareRuntimePtySpawn(ctx)
-    ctx.finishTerminalInstall()
-    expect(ctx.args.command).toBeUndefined()
-    expect(ctx.launchCommand ?? '').not.toContain(C)
-    expect(runtime.forgetRefusedSavedResume).toHaveBeenCalledWith(
-      'wt-1',
-      'tab-1:11111111-1111-4111-8111-111111111111',
-      { agent: 'claude', providerSession: { key: 'session_id', id: C } }
-    )
+    ctx.spawnOptions = {
+      cols: 80,
+      rows: 24,
+      command: ctx.args.command,
+      launchAgent: 'claude',
+      env: { ...ctx.args.env }
+    }
+    return ctx
+  }
+
+  it('chooses a plain shell only in the fresh callback and does not forget before commit', async () => {
+    const runtime = chatHost()
+    const ctx = freshContext(runtime)
+    const spawn = vi.spyOn(ctx.provider, 'spawn').mockResolvedValue({ id: 'plain-shell' })
+    try {
+      expect(ctx.args.command).toContain(C)
+      await executeRuntimePtySpawn(ctx)
+      expect(spawn).toHaveBeenCalledWith(
+        expect.objectContaining({
+          env: { WORKSPACE: 'keep' }
+        })
+      )
+      expect(ctx.spawnOptions.command).toBeUndefined()
+      expect(ctx.args.launchAgent).toBeUndefined()
+      expect(savedResumeResult(ctx.resumeAdmission)).toMatchObject({
+        agentResumeRefused: 'chat-home',
+        agentResumeUnavailable: true,
+        savedResumeDecision: { verdict: 'chat-home', providerSession: { id: C } }
+      })
+      expect(forgetRefusedPaneResume).not.toHaveBeenCalled()
+      expect(runtime.forgetRefusedSavedResume).not.toHaveBeenCalled()
+    } finally {
+      spawn.mockRestore()
+    }
+  })
+
+  it('lets the actual lower-owned live result override a tentative fresh refusal', async () => {
+    const runtime = chatHost()
+    const ctx = freshContext(runtime)
+    runtime.getTerminalLaunchResult.mockReturnValue({ launchAgent: 'codex' })
+    const spawn = vi.spyOn(ctx.provider, 'spawn').mockResolvedValue({
+      id: 'already-live',
+      isReattach: true,
+      launchAgent: 'codex'
+    })
+    try {
+      await executeRuntimePtySpawn(ctx)
+      expect(ctx.result).toMatchObject({
+        id: 'already-live',
+        isReattach: true,
+        launchAgent: 'codex'
+      })
+      expect(ctx.resumeAdmission).toBeNull()
+      expect(runtime.forgetRefusedSavedResume).not.toHaveBeenCalled()
+    } finally {
+      spawn.mockRestore()
+    }
   })
 
-  it("refuses a late reattach's cold restore before its window can resume it", async () => {
+  it('checks the selected late cold-shell candidate but never checks a real reattach', async () => {
     const runtime = chatHost()
+    const pane = { paneKey: 'tab-1:leaf', saved: undefined }
     await expect(
       admitColdRestoreReattach(
         runtime,
         { coldRestore: { scrollback: '', cwd: '/tmp' } },
-        { paneKey: 'tab-1:leaf', saved: undefined },
+        pane,
         null
       )
-    ).resolves.toMatchObject({ verdict: 'chat-home' })
-    expect(runtime.reserveManagedConversationStart).not.toHaveBeenCalled()
+    ).resolves.toMatchObject({ verdict: 'chat-home', refused: { providerSession: { id: C } } })
+    await expect(
+      admitColdRestoreReattach(runtime, { coldRestore: {}, isReattach: true }, pane, null)
+    ).resolves.toBeNull()
   })
 })
+
+it('unwinds a refused fresh claim before spawning an unclaimed shell', async () => {
+  const runtime = chatHost()
+  const ctx = createRuntimePtySpawnState(deps(runtime), {
+    cols: 80,
+    rows: 24,
+    launchAgent: 'claude',
+    command: `claude --resume ${C}`,
+    resumeOrigin: 'saved',
+    resumeProviderSession: { key: 'session_id', id: C },
+    agentSessionEnsure: {
+      claim: {
+        agent: 'claude',
+        digestVersion: 1,
+        keyId: 'key',
+        identityDigest: 'C',
+        worktreeScopeDigest: 'scope'
+      },
+      surface: { worktreeId: 'wt-1', tabId: 'tab-1', leafId: 'leaf', terminalHandle: 'terminal' }
+    }
+  })
+  const claim = ctx.args.agentSessionEnsure?.claim
+  if (!claim) {
+    throw new Error('missing fixture claim')
+  }
+  ctx.spawnOptions = {
+    cols: 80,
+    rows: 24,
+    command: ctx.args.command,
+    agentSessionEnsure: ctx.args.agentSessionEnsure
+  }
+  const inventory = vi.spyOn(owners, 'reconcileAgentSessionOwnerListings').mockResolvedValue()
+  const spawn = vi.spyOn(ctx.provider, 'spawn').mockResolvedValue({ id: 'refused-shell' })
+  try {
+    await executeRuntimePtySpawn(ctx)
+    expect(spawn).toHaveBeenCalledOnce()
+    expect(ctx.spawnOptions.command).toBeUndefined()
+    expect(ctx.result.agentSessionEnsure).toBeUndefined()
+    expect(owners.agentSessionOwners.find(claim)).toBeNull()
+    expect(ctx.resumeAdmission).toMatchObject({ verdict: 'chat-home' })
+  } finally {
+    inventory.mockRestore()
+    spawn.mockRestore()
+  }
+})
+
+it('returns the committed runtime shell when exact saved-record persistence fails', async () => {
+  const runtime = {
+    ...chatHost(),
+    registerPty: vi.fn(),
+    noteTerminalSpawnCommand: vi.fn(),
+    reflowHeadlessTerminalToPtyGrid: vi.fn(),
+    forgetRefusedSavedResume: vi.fn(async () => {
+      throw new Error('saved record disk full')
+    })
+  }
+  const warning = vi.spyOn(console, 'warn').mockImplementation(() => {})
+  const spawn = vi.spyOn(localProvider, 'spawn').mockResolvedValue({ id: 'cleanup-failed-shell' })
+  try {
+    const result = await spawnPtyFromRuntimeController(deps(runtime), {
+      cols: 80,
+      rows: 24,
+      worktreeId: 'wt-1',
+      tabId: 'tab-1',
+      command: `claude --resume ${C}`,
+      launchAgent: 'claude',
+      resumeOrigin: 'saved',
+      resumeProviderSession: { key: 'session_id', id: C }
+    })
+    expect(result).toMatchObject({ id: 'cleanup-failed-shell', agentResumeRefused: 'chat-home' })
+    expect(spawn.mock.calls[0]?.[0].command).toBeUndefined()
+    expect(runtime.registerPty).toHaveBeenCalled()
+    expect(runtime.forgetRefusedSavedResume).toHaveBeenCalledOnce()
+    await Promise.resolve()
+    expect(warning).toHaveBeenCalled()
+  } finally {
+    spawn.mockRestore()
+    warning.mockRestore()
+  }
+})
diff --git a/src/main/ipc/pty/runtime/spawn-preflight.ts b/src/main/ipc/pty/runtime/spawn-preflight.ts
index fb5b5b9c160b..9241e11e6a36 100644
--- a/src/main/ipc/pty/runtime/spawn-preflight.ts
+++ b/src/main/ipc/pty/runtime/spawn-preflight.ts
@@ -19,11 +19,6 @@ import { resolvePtySpawnStartupTarget } from '../spawn-startup-target'
 import { resolvePtySpawnHostEnv } from '../spawn-host-env'
 import { ptySpawnPaneFromIds, stampPtySpawnPaneEnv } from '../spawn-pane-env'
 import { getConnectionExecutionHostId } from '../../../../shared/execution-host'
-import {
-  applyResumeSpawnAdmission,
-  forgetRefusedResume,
-  resumeSpawnRefusal
-} from '../host-env/saved-resume-admission'
 import {
   ensureJcodeRuntimeDir,
   JCODE_RUNTIME_DIR_ENV_KEY
@@ -81,9 +76,6 @@ export async function prepareRuntimePtySpawn(
   ctx.daemonShellOverride = ctx.terminalRuntimeOptions.shellOverride
   ctx.expectedWslDistro = target.expectedWslDistro
   ctx.codexSelectionTarget = target.codexSelectionTarget
-  if (!ctx.preAdoptedStablePane) {
-    await admitRuntimeResumeSpawn(ctx)
-  }
   args.env = withClaudeProfileTerminalEnv(args.env, ctx.codexSelectionTarget)
   ctx.claudeAuth =
     ctx.isClaudeLaunch && ctx.deps.prepareClaudeAuth
@@ -128,8 +120,6 @@ export async function prepareRuntimePtySpawn(
       jcodeRuntimeDir: jcodeEnv?.[JCODE_RUNTIME_DIR_ENV_KEY]
     })
   }
-  // Why: a dropped resume still applies here, but this controller's result has no field for
-  // notifyResumeUnavailable — runtime/relay panes start fresh without the notice.
   const hostEnv = await resolvePtySpawnHostEnv({
     launchAgent: args.launchAgent,
     command: args.command,
@@ -150,6 +140,13 @@ export async function prepareRuntimePtySpawn(
     provider: ctx.provider,
     deps: ctx.deps
   })
+  ctx.agentResumeUnavailable = hostEnv.codexResumeLaunch.notifyResumeUnavailable
+  if (hostEnv.codexResumeLaunch.droppedResumeArgv && args.launchConfig) {
+    args.launchConfig = {
+      ...args.launchConfig,
+      agentCommand: hostEnv.launchCommand ?? args.launchConfig.agentCommand
+    }
+  }
   ctx.launchCommand = hostEnv.launchCommand
   ctx.codexResumeArgvDropped = hostEnv.codexResumeLaunch.droppedResumeArgv
   ctx.env = hostEnv.env
@@ -160,32 +157,3 @@ export async function prepareRuntimePtySpawn(
 
   return null
 }
-
-async function admitRuntimeResumeSpawn(ctx: RuntimePtySpawnState): Promise<void> {
-  const { args } = ctx
-  ctx.resumeAdmission = await applyResumeSpawnAdmission(
-    ctx.deps.runtime,
-    args,
-    ctx.expectedWslDistro
-  )
-  const refusal = resumeSpawnRefusal(ctx.resumeAdmission)
-  if (!refusal) {
-    return
-  }
-  ctx.isClaudeLaunch = false
-  const paneKey = ptySpawnPaneFromIds(args)?.paneKey ?? null
-  forgetRefusedResume(paneKey, refusal)
-  // A host with no window has no one else to forget the pane's saved record.
-  if (
-    paneKey &&
-    args.worktreeId &&
-    args.resumeOrigin === 'saved' &&
-    refusal.verdict !== 'unverifiable'
-  ) {
-    void ctx.deps.runtime
-      ?.forgetRefusedSavedResume(args.worktreeId, paneKey, refusal.refused)
-      .catch((error: unknown) =>
-        console.warn('[pty] could not forget a refused saved resume', error)
-      )
-  }
-}
diff --git a/src/main/ipc/pty/runtime/spawn-state.ts b/src/main/ipc/pty/runtime/spawn-state.ts
index 4de4db55ca4e..90c5a3d6a18d 100644
--- a/src/main/ipc/pty/runtime/spawn-state.ts
+++ b/src/main/ipc/pty/runtime/spawn-state.ts
@@ -16,7 +16,10 @@ import type { TerminalPanePlacement } from '../../../../shared/terminal-pane-pla
 import type { ResumeSpawnAdmission } from '../host-env/saved-resume-admission'
 import type { PtyRuntimeControllerDeps } from './controller-deps'
 import type { TuiAgent } from '../../../../shared/tui-agent'
-import type { AgentProviderSessionMetadata } from '../../../../shared/agent-session-resume'
+import type {
+  SleepingAgentLaunchConfig,
+  AgentProviderSessionMetadata
+} from '../../../../shared/agent-session-resume'
 import type { StartupCommandDelivery } from '../../../../shared/codex-startup-delivery'
 import type {
   AgentSessionExecutionClaim,
@@ -63,6 +66,7 @@ export type RuntimePtySpawnState = {
   requestedAgentTeamsPath: string | undefined
   selectedCodexHomePath: string | null
   codexResumeHomeSelected: boolean
+  agentResumeUnavailable: boolean
   codexResumeArgvDropped: boolean
   skipCodexHomeEnv: boolean
   stripInheritedOrcaCodexHome: boolean
@@ -98,6 +102,8 @@ export type RuntimePtySpawnArgs = {
   cwd?: string
   command?: string
   launchAgent?: TuiAgent
+  launchConfig?: SleepingAgentLaunchConfig
+  launchToken?: string
   commandDelivery?: 'renderer' | 'provider'
   startupCommandDelivery?: StartupCommandDelivery
   telemetry?: {
@@ -182,6 +188,7 @@ export function createRuntimePtySpawnState(
     requestedAgentTeamsPath: undefined,
     selectedCodexHomePath: null,
     codexResumeHomeSelected: false,
+    agentResumeUnavailable: false,
     codexResumeArgvDropped: false,
     skipCodexHomeEnv: false,
     stripInheritedOrcaCodexHome: false,
diff --git a/src/main/ipc/pty/runtime/spawn.ts b/src/main/ipc/pty/runtime/spawn.ts
index 4758518ab66a..e75366b4adc6 100644
--- a/src/main/ipc/pty/runtime/spawn.ts
+++ b/src/main/ipc/pty/runtime/spawn.ts
@@ -1,4 +1,11 @@
-import type { AgentSessionClaimedSpawnResult } from '../../../../shared/agent-session-host-authority'
+import {
+  captureSavedResumeCleanup,
+  admitColdRestoreReattach,
+  savedResumeRecord,
+  savedResumeResult,
+  resumeSpawnRefusal,
+  forgetRefusedResume
+} from '../host-env/saved-resume-admission'
 import { isTerminalLeafId, makePaneKey } from '../../../../shared/stable-pane-id'
 import { isValidTerminalTabId } from '../../../../shared/terminal-tab-id'
 import {
@@ -16,28 +23,11 @@ import { buildRuntimePtySpawnOptions } from './spawn-options'
 import { executeRuntimePtySpawn } from './spawn-execute'
 import { commitRuntimePtySpawn } from './spawn-commit'
 import { createRuntimePtySpawnState, type RuntimePtySpawnArgs } from './spawn-state'
-import { bindResumeSpawnStart, dropResumeSpawnStart } from '../host-env/saved-resume-admission'
 import {
   commitRuntimeSpawnHiddenDelivery,
   releaseRuntimeSpawnPreSpawnHiddenMark
 } from './spawn-hidden-delivery'
 
-function toRuntimeSpawnReply(result: {
-  id: string
-  incarnationId?: string
-  wslDistro?: string | null
-  stablePaneOwner?: { handle: string; tabId: string; leafId: string }
-  agentSessionEnsure?: AgentSessionClaimedSpawnResult
-}) {
-  return {
-    id: result.id,
-    ...(result.incarnationId ? { incarnationId: result.incarnationId } : {}),
-    ...(typeof result.wslDistro === 'string' ? { wslDistro: result.wslDistro } : {}),
-    ...(result.stablePaneOwner ? { stablePaneOwner: result.stablePaneOwner } : {}),
-    ...(result.agentSessionEnsure ? { agentSessionEnsure: result.agentSessionEnsure } : {})
-  }
-}
-
 export async function spawnPtyFromRuntimeController(
   deps: PtyRuntimeControllerDeps,
   args: RuntimePtySpawnArgs
@@ -74,11 +64,11 @@ export async function spawnPtyFromRuntimeController(
     const materialized =
       materializedOrPromise instanceof Promise ? await materializedOrPromise : materializedOrPromise
     if (materialized) {
-      return toRuntimeSpawnReply(materialized)
+      return { ...materialized, ...deps.runtime?.getTerminalLaunchResult?.(materialized.id) }
     }
     const earlyAdopt = await prepareRuntimePtySpawn(ctx)
     if (earlyAdopt) {
-      return toRuntimeSpawnReply(earlyAdopt)
+      return { ...earlyAdopt, ...deps.runtime?.getTerminalLaunchResult?.(earlyAdopt.id) }
     }
     const earlyReserved = await buildRuntimePtySpawnOptions(ctx).catch((error: unknown) => {
       restoreProvisionalPtySize({
@@ -90,16 +80,60 @@ export async function spawnPtyFromRuntimeController(
       throw error
     })
     if (earlyReserved) {
-      dropResumeSpawnStart(ctx.resumeAdmission)
-      return toRuntimeSpawnReply(earlyReserved)
+      return { ...earlyReserved, ...deps.runtime?.getTerminalLaunchResult?.(earlyReserved.id) }
     }
     await executeRuntimePtySpawn(ctx)
+    if (!ctx.resumeAdmission) {
+      ctx.resumeAdmission = await admitColdRestoreReattach(
+        deps.runtime,
+        ctx.result,
+        {
+          paneKey: ctx.spawnIdentityPaneKey,
+          saved: savedResumeRecord(deps.store, ctx.spawnIdentityPaneKey)
+        },
+        ctx.expectedWslDistro
+      )
+      await captureSavedResumeCleanup(
+        deps.runtime,
+        deps.store,
+        ctx.spawnIdentityPaneKey,
+        ctx.resumeAdmission,
+        args.worktreeId
+      )
+    }
+    if (!ctx.result.isReattach) {
+      Object.assign(ctx.result, savedResumeResult(ctx.resumeAdmission), {
+        ...(ctx.agentResumeUnavailable ? { agentResumeUnavailable: true as const } : {}),
+        launchConfig: args.launchConfig,
+        launchAgent: args.launchAgent,
+        launchToken: args.launchToken,
+        resumeProviderSession: ctx.codexResumeArgvDropped ? undefined : args.resumeProviderSession
+      })
+    }
     const committed = await commitRuntimePtySpawn(ctx)
-    bindResumeSpawnStart(deps.runtime, ctx.resumeAdmission, ctx.result)
+    const refusal = resumeSpawnRefusal(ctx.resumeAdmission)
+    forgetRefusedResume(ctx.spawnIdentityPaneKey, refusal)
+    if (
+      args.worktreeId &&
+      ctx.spawnIdentityPaneKey &&
+      refusal &&
+      refusal.verdict !== 'unverifiable'
+    ) {
+      void deps.runtime
+        ?.forgetRefusedSavedResume?.(
+          args.worktreeId,
+          ctx.spawnIdentityPaneKey,
+          refusal.refused,
+          refusal.sourceRecord
+        )
+        .catch((error: unknown) => console.warn('[pty] refused resume cleanup failed', error))
+    }
     commitRuntimeSpawnHiddenDelivery(ctx)
-    return toRuntimeSpawnReply(committed)
+    if (!ctx.result.isReattach) {
+      deps.runtime?.rememberSavedTerminalLaunchResult?.(committed.id, committed)
+    }
+    return committed
   } catch (err) {
-    dropResumeSpawnStart(ctx.resumeAdmission)
     releaseRuntimeSpawnPreSpawnHiddenMark(ctx)
     if (ctx.pendingRegistrationPtyId) {
       deps.runtime?.cancelPendingPtyRegistration?.(
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-failed-create-refusal.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-failed-create-refusal.ts
index d88997c46c63..b5d591b791cc 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-failed-create-refusal.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-failed-create-refusal.ts
@@ -24,6 +24,7 @@ import {
   isAgentSessionPreSpawnError
 } from './structured-agent-session-adapter'
 import {
+  startupAcquisitionRefusal,
   providerExitObserved,
   structuredAgentSessionStartFailure
 } from './structured-agent-session-failure-text'
@@ -122,8 +123,9 @@ function failedAcquisitionDetails(
   if (argumentProblem) {
     return { reason: 'attachFailed', argumentProblem }
   }
-  if (error instanceof AgentSessionAcquisitionRefusal) {
-    return { reason: error.reason, ...(error.account ? { account: error.account } : {}) }
+  const typed = startupAcquisitionRefusal(error)
+  if (typed) {
+    return { reason: typed.reason, ...(typed.account ? { account: typed.account } : {}) }
   }
   if (isAgentSessionPreSpawnError(error) && error.reason) {
     return { reason: error.reason }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-failure-text.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-failure-text.ts
index f4438f6e3a2c..82c33a5a467f 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-failure-text.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-failure-text.ts
@@ -38,7 +38,8 @@ const TYPED_START_REFUSALS = [
   'claudeAccountSetupFailed',
   'agentCommandNotRunnable',
   'runtimeNotInstalled',
-  'conversationOpenInTerminal'
+  'conversationOpenInTerminal',
+  'conversationOpenElsewhere'
 ] as const satisfies readonly (AgentSessionFailureKind &
   AgentSessionRefusalReason<'agent_session_operation_invalid'>)[]
 
@@ -71,10 +72,28 @@ export function providerExitObserved(error: unknown, depth = 0): boolean {
   return providerExitObserved(error.cause, depth + 1)
 }
 
-/** A start that did not land. A refusal the adapter typed keeps its situation, and an exit the
- *  adapter observed says the provider stopped; anything else blames no one — it may be Orca's, or
- *  a spawn that failed. Either keeps the provider's diagnostic when the error carried one. */
+/** Cleanup wrappers retain the provider's typed refusal without changing their exit proof. */
+export function startupAcquisitionRefusal(
+  error: unknown,
+  depth = 0
+): AgentSessionAcquisitionRefusal | undefined {
+  if (depth >= 6 || !(error instanceof Error)) {
+    return undefined
+  }
+  if (error instanceof AgentSessionAcquisitionRefusal) {
+    return error
+  }
+  return (
+    startupAcquisitionRefusal(error.cause, depth + 1) ??
+    (error instanceof AggregateError
+      ? error.errors.map((inner) => startupAcquisitionRefusal(inner, depth + 1)).find(Boolean)
+      : undefined)
+  )
+}
+
+/** A failed start keeps its typed refusal or observed exit and private provider diagnostic. */
 export function providerStartupFailureFact(cause?: unknown): SubmissionRejectionFact {
+  cause = startupAcquisitionRefusal(cause) ?? cause
   const codexInstallation = codexInstallationProblemOf(cause)
   if (codexInstallation) {
     return agentSessionFailureFact('startFailed', {
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-provider-open.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-provider-open.test.ts
index 501260915917..4c534eeb4c71 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-provider-open.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-provider-open.test.ts
@@ -1,3 +1,5 @@
+import { AgentSessionAcquisitionRefusal } from './structured-agent-session-adapter'
+import { HOST_TEST_SESSION } from './structured-agent-session-host-test-data'
 import { expect, it, vi } from 'vitest'
 import type {
   StructuredAgentSessionProviderOpen,
@@ -56,3 +58,24 @@ it('cancels the open on quit after a second client attach is refused', async ()
     await ended
   }
 })
+
+it('journals a typed writer refusal and cleans up the real starting child', async () => {
+  const { host, open, close, dispatch, pending, send } = awaitOpen()
+  await attach()
+  await send('continue C')
+  await vi.waitFor(() => expect(open).toHaveBeenCalledOnce())
+  pending.reject(
+    new AgentSessionAcquisitionRefusal(
+      'thread C already has an active writer',
+      'conversationOpenElsewhere'
+    )
+  )
+  await vi.waitFor(async () => {
+    const snapshot = await host.journalSnapshot(HOST_TEST_SESSION)
+    expect(
+      snapshot.submissions.some((entry) => entry.rejection?.kind === 'conversationOpenElsewhere')
+    ).toBe(true)
+  })
+  expect(close).toHaveBeenCalledOnce()
+  expect(dispatch).not.toHaveBeenCalled()
+})
diff --git a/src/main/providers/pty-spawn-result.ts b/src/main/providers/pty-spawn-result.ts
index 4bfce3084fe4..d4d1068a5db3 100644
--- a/src/main/providers/pty-spawn-result.ts
+++ b/src/main/providers/pty-spawn-result.ts
@@ -1,3 +1,4 @@
+import type { TerminalLaunchResult } from '../../shared/agent-session-resume'
 import type { TerminalOscLinkRange } from '../../shared/terminal-osc-link-ranges'
 import type { TuiAgent } from '../../shared/tui-agent'
 import type { AgentSessionClaimedSpawnResult } from '../../shared/agent-session-host-authority'
@@ -5,7 +6,7 @@ import type { PtyIncarnationId } from '../../shared/pty-incarnation'
 import type { TerminalOwner } from '../../shared/terminal-owner'
 import type { OpenCodeCliCapabilities } from '../../shared/opencode-cli-version'
 
-export type PtySpawnResult = {
+export type PtySpawnResult = TerminalLaunchResult & {
   /** Execution-host probe; absent on older hosts and reattachments. */
   openCodeCapabilities?: OpenCodeCliCapabilities
   agentSessionEnsure?: AgentSessionClaimedSpawnResult
diff --git a/src/main/runtime/cli-terminal-create-host-session-binding.test.ts b/src/main/runtime/cli-terminal-create-host-session-binding.test.ts
index 192e58c7a683..275b7caa1aad 100644
--- a/src/main/runtime/cli-terminal-create-host-session-binding.test.ts
+++ b/src/main/runtime/cli-terminal-create-host-session-binding.test.ts
@@ -70,3 +70,52 @@ describe('host-initiated terminal creation under an attached window', () => {
     expect(pty?.runtimeSessionOwned).toBe(true)
   })
 })
+
+it.each(['refused', 'adopted', 'fresh-unavailable'] as const)(
+  'publishes the effective %s terminal rather than the requested saved recipe',
+  async (kind) => {
+    const { runtime, spawn } = createRuntimeWithAttachedWindow()
+    const config = { agentCommand: 'codex', agentArgs: '', agentEnv: {} }
+    spawn.mockResolvedValue({
+      id: 'effective-pty',
+      ...(kind === 'adopted'
+        ? { isReattach: true, launchAgent: 'codex', launchConfig: config }
+        : {}),
+      ...(kind === 'refused'
+        ? {
+            agentResumeRefused: 'chat-home',
+            agentResumeUnavailable: true,
+            savedResumeDecision: {
+              agent: 'claude',
+              providerSession: { key: 'session_id', id: 'C' },
+              verdict: 'chat-home'
+            }
+          }
+        : {}),
+      ...(kind === 'fresh-unavailable'
+        ? {
+            agentResumeUnavailable: true,
+            launchAgent: 'codex',
+            launchConfig: config,
+            launchToken: 'actual-fresh-token'
+          }
+        : {})
+    })
+    const result = await runtime.createTerminal('id:repo-1::/tmp/wt-cli', {
+      launchAgent: 'claude',
+      title: 'Rejected C',
+      resumeOrigin: 'saved',
+      resumeProviderSession: { key: 'session_id', id: 'C' },
+      launchConfig: { agentCommand: 'claude', agentArgs: '', agentEnv: {} }
+    })
+    expect(result.agentResumeRefused).toBe(kind === 'refused' ? 'chat-home' : undefined)
+    expect(result.launchAgent).toBe(kind === 'refused' ? undefined : 'codex')
+    expect(result.launchConfig).toEqual(kind === 'refused' ? undefined : config)
+    if (kind === 'refused') {
+      expect(result.title).not.toBe('Rejected C')
+    }
+    if (kind === 'fresh-unavailable') {
+      expect(result.launchToken).toBe('actual-fresh-token')
+    }
+  }
+)
diff --git a/src/main/runtime/hook-status-resume-sleep-ordering.test.ts b/src/main/runtime/hook-status-resume-sleep-ordering.test.ts
index 6e03d15180bf..93efd99d7c83 100644
--- a/src/main/runtime/hook-status-resume-sleep-ordering.test.ts
+++ b/src/main/runtime/hook-status-resume-sleep-ordering.test.ts
@@ -166,3 +166,42 @@ describe('a queued hook status and a workspace sleep', () => {
     })
   })
 })
+
+it.each([false, true])(
+  'orders refused cleanup after queued status and preserves newer same-conversation recipe (%s)',
+  async (newer) => {
+    const { runtime, getSession, releaseFirstWrite } = makeRuntimeWithSlowFirstWrite()
+    runtime.recordHookStatusResume(codexRow())
+    await vi.waitFor(() =>
+      expect(getSession().sleepingAgentSessionsByPaneKey?.[PANE_KEY]).toBeDefined()
+    )
+    runtime.recordHookStatusResume(codexRow({ state: 'blocked', receivedAt: 11 }))
+    const sourcePromise = runtime.readSavedResumeSource(TEST_WORKTREE_ID, PANE_KEY)
+    releaseFirstWrite()
+    const source = await sourcePromise
+    if (!source) {
+      throw new Error('missing captured source')
+    }
+    const refused = {
+      agent: 'codex' as const,
+      providerSession: SESSION,
+      expectedStatus: { paneKey: PANE_KEY, receivedAt: 11, stateStartedAt: 10 },
+      expectedSavedRecord: {
+        paneKey: PANE_KEY,
+        capturedAt: source.capturedAt,
+        updatedAt: source.updatedAt
+      }
+    }
+    if (newer) {
+      runtime.recordHookStatusResume(codexRow({ receivedAt: 30, prompt: 'new explicit C' }))
+    }
+    await runtime.forgetRefusedSavedResume(TEST_WORKTREE_ID, PANE_KEY, refused, source)
+    await runtime['hookStatusResumeWrites']
+    const record = getSession().sleepingAgentSessionsByPaneKey?.[PANE_KEY]
+    if (newer) {
+      expect(record).toMatchObject({ prompt: 'new explicit C', updatedAt: 30 })
+    } else {
+      expect(getSession().sleepingAgentSessionsByPaneKey).toEqual({})
+    }
+  }
+)
diff --git a/src/main/runtime/managed-conversation-starts.test.ts b/src/main/runtime/managed-conversation-starts.test.ts
deleted file mode 100644
index 3b15c83d802e..000000000000
--- a/src/main/runtime/managed-conversation-starts.test.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-import { agentSessionRecordFixture } from '../../shared/agent-session-record.test-fixture'
-import type { AgentStatusIpcPayload } from '../../shared/agent-status-types'
-import { terminalConversationKey } from '../native-chat/structured-conversation-key'
-import { ManagedConversationStarts, type ManagedStartPty } from './managed-conversation-starts'
-import { OrcaRuntimeService } from './orca-runtime'
-
-const C = 'provider-session-alpha-1'
-const key = terminalConversationKey('claude', C)
-
-describe('managed conversation starts', () => {
-  it('holds a start until its terminal reports the conversation or its execution ends', () => {
-    const starts = new ManagedConversationStarts()
-    const pty: ManagedStartPty = { incarnationId: null, cliConversations: undefined, exited: false }
-    const read = vi.fn((): ManagedStartPty | null => pty)
-    const reported = starts.reserve([key])
-    expect(starts.live(key, read)).toBe(true)
-    reported.bind('pty-1', null)
-    expect(starts.live(key, read)).toBe(true)
-    pty.cliConversations = {
-      incarnationId: null,
-      byKey: new Map([['k', { agent: 'claude', id: C, paneOwned: true }]])
-    }
-    expect(starts.live(key, read)).toBe(false)
-
-    starts.reserve([terminalConversationKey('opencode2', null)]).bind('pty-2', null)
-    // A targetless resume holds the whole family; a gone PTY ends it.
-    expect(
-      starts.live(terminalConversationKey('opencode', 'ses_1'), () => ({
-        ...pty,
-        cliConversations: undefined
-      }))
-    ).toBe(true)
-    expect(starts.live(terminalConversationKey('opencode', 'ses_1'), () => null)).toBe(false)
-  })
-
-  it("refuses a chat's agent start while a start holds its conversation, never for its own hook row", async () => {
-    const runtime = new OrcaRuntimeService()
-    const record = agentSessionRecordFixture()
-    const ownRow = {
-      paneKey: 'chat',
-      agentType: 'claude',
-      structuredHost: 'owned',
-      providerSession: { key: 'claude', id: C }
-    }
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the census reads only these row fields.
-    const rows = [ownRow as unknown as AgentStatusIpcPayload]
-    vi.spyOn(runtime, 'getAgentProviderSessionRows').mockReturnValue(rows)
-    const admit = () => runtime['assertStructuredChatAcquireAdmissible'](record)
-    await expect(admit()).resolves.toBeUndefined()
-
-    const start = runtime.reserveManagedConversationStart([key])
-    await expect(admit()).rejects.toMatchObject({
-      refusal: { details: { reason: 'conversationHeldElsewhere' } }
-    })
-    // Bound to a PTY this host doesn't run, the start can't write here.
-    runtime.bindManagedConversationStart(start, 'pty-missing')
-    await expect(admit()).resolves.toBeUndefined()
-  })
-})
diff --git a/src/main/runtime/managed-conversation-starts.ts b/src/main/runtime/managed-conversation-starts.ts
deleted file mode 100644
index b2bb8a0ecab6..000000000000
--- a/src/main/runtime/managed-conversation-starts.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import type { PtyIncarnationId } from '../../shared/pty-incarnation'
-import type { RuntimePtyWorktreeRecord } from './runtime-terminal-state-records'
-import {
-  keysMayMatch,
-  terminalConversationKey,
-  type ConversationKey
-} from '../native-chat/structured-conversation-key'
-
-/** A terminal start of a conversation Orca issued itself, which a chat's agent start must not race. */
-export type ManagedConversationStart = {
-  /** Ties the start to the PTY execution running it; until then it holds unconditionally. */
-  bind: (ptyId: string, incarnationId: PtyIncarnationId | null) => void
-  drop: () => void
-}
-
-export type ManagedStartPty = Pick<
-  RuntimePtyWorktreeRecord,
-  'incarnationId' | 'cliConversations'
-> & {
-  exited: boolean
-}
-
-type Entry = {
-  keys: readonly ConversationKey[]
-  pty: { ptyId: string; incarnationId: PtyIncarnationId | null } | null
-}
-
-/**
- * In memory only: a host restart loses every entry, and a restored pane then goes through the
- * automatic-home guard instead. No timer ends an entry; only re-derived truth does: its terminal's
- * hooks reported the conversation (the census takes over), or its PTY execution is gone.
- */
-export class ManagedConversationStarts {
-  private readonly entries = new Set<Entry>()
-
-  /** Synchronous, so a caller's admission check and this registration are one step. */
-  reserve(keys: readonly ConversationKey[]): ManagedConversationStart {
-    const entry: Entry = { keys, pty: null }
-    this.entries.add(entry)
-    return {
-      bind: (ptyId, incarnationId) => {
-        if (this.entries.has(entry)) {
-          entry.pty = { ptyId, incarnationId }
-        }
-      },
-      drop: () => {
-        this.entries.delete(entry)
-      }
-    }
-  }
-
-  /** Whether a managed start may still be writing `key`'s conversation; ends those that can't. */
-  live(key: ConversationKey, readPty: (ptyId: string) => ManagedStartPty | null): boolean {
-    let live = false
-    for (const entry of this.entries) {
-      if (entry.pty && ended(entry, readPty(entry.pty.ptyId))) {
-        this.entries.delete(entry)
-      } else if (entry.keys.some((held) => keysMayMatch(held, key))) {
-        live = true
-      }
-    }
-    return live
-  }
-}
-
-function ended(entry: Entry, pty: ManagedStartPty | null): boolean {
-  if (!pty || pty.exited || pty.incarnationId !== entry.pty?.incarnationId) {
-    return true
-  }
-  const reported =
-    pty.cliConversations?.incarnationId === pty.incarnationId
-      ? [...pty.cliConversations.byKey.values()]
-      : []
-  return reported.some((conversation) =>
-    entry.keys.some((held) =>
-      keysMayMatch(terminalConversationKey(conversation.agent, conversation.id), held)
-    )
-  )
-}
diff --git a/src/main/runtime/rpc/methods/session-tabs.ts b/src/main/runtime/rpc/methods/session-tabs.ts
index 7eec6432b222..11440e01fe1b 100644
--- a/src/main/runtime/rpc/methods/session-tabs.ts
+++ b/src/main/runtime/rpc/methods/session-tabs.ts
@@ -19,7 +19,6 @@ import { SESSION_TAB_MUTATION_METHODS } from './session-tab-mutation-methods'
 import { createSessionTabsRetirementProofDelta } from './session-tabs-retirement-proof-delta'
 import { restoreStructuredTabsIfSupported } from './structured-session-tab-restore'
 import { assertLegacyAiVaultResumeCommandAllowed } from '../../../ai-vault/structured-session-ownership'
-import { terminalConversationKey } from '../../../native-chat/structured-conversation-key'
 import { SessionTabsUnsubscribeAllParams } from '../../../../shared/rpc-contract/session-tabs-params'
 import { SESSION_TABS_SPLIT_GROUP_PLACEMENT_RUNTIME_CAPABILITY } from '../../../../shared/protocol-version'
 import { createSessionTabsTabDeltaEncoder } from '../../../../shared/session-tabs-tab-delta'
@@ -58,22 +57,12 @@ export const SESSION_TAB_METHODS = [
     params: CreateTerminalTab,
     handler: async (params, context) => {
       const { runtime, signal, clientKind, pairedDeviceId, clientCapabilities } = context
-      // With a resume session the spawn step registers the start; a bare command registers here.
-      const start = params.command
-        ? await assertLegacyAiVaultResumeCommandAllowed(
-            params.command,
-            () => runtime.ensureStructuredAgentSessionHost(),
-            params.resumeProviderSession
-              ? undefined
-              : (invocations) =>
-                  runtime.reserveManagedConversationStart(
-                    invocations.map((invocation) =>
-                      terminalConversationKey(invocation.provider, invocation.target)
-                    )
-                  )
-          )
-        : undefined
-      const created = runtime.createMobileSessionTerminal(params.worktree, {
+      if (params.command) {
+        await assertLegacyAiVaultResumeCommandAllowed(params.command, () =>
+          runtime.ensureStructuredAgentSessionHost()
+        )
+      }
+      return runtime.createMobileSessionTerminal(params.worktree, {
         ...(params.sourceChatFork ? { sourceChatFork: params.sourceChatFork } : {}),
         terminalImageViewerSupported: terminalImageViewerSupported(context),
         afterTabId: params.afterTabId,
@@ -113,19 +102,6 @@ export const SESSION_TAB_METHODS = [
         // of running down the timeout and rolling back a live tab (#7718).
         signal
       })
-      // A renderer-backed create has no live PTY yet, so its start isn't held (a known gap).
-      return start
-        ? created.then(
-            (result) => {
-              runtime.bindManagedConversationStartToTerminal(start, result.tab.terminal)
-              return result
-            },
-            (error: unknown) => {
-              start.drop()
-              throw error
-            }
-          )
-        : created
     }
   }),
   defineStreamingMethod({
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-send-method.ts b/src/main/runtime/rpc/methods/terminal/terminal-send-method.ts
index 5a9e8d29568e..f162192474de 100644
--- a/src/main/runtime/rpc/methods/terminal/terminal-send-method.ts
+++ b/src/main/runtime/rpc/methods/terminal/terminal-send-method.ts
@@ -1,11 +1,12 @@
+import { assertLegacyAiVaultResumeCommandAllowed } from '../../../../ai-vault/structured-session-ownership'
 import { InvalidArgumentError, defineMethod } from '../../core'
 import { isTerminalQueryReply } from '../../../../../shared/terminal-query-reply'
 import { isUntypedTerminalInput } from '../../../../../shared/terminal-untyped-input'
 import { assertTerminalAgentSendable } from '../../terminal-agent-send-guard'
 import { TerminalSend } from '../../../../../shared/rpc-contract/terminal-unary-params'
-import { withTerminalSendResumeStarts } from './terminal-send-resume-starts'
 import {
   assertTerminalSendExactPtyBinding,
+  assertTerminalSendTextWithinLimit,
   commitMobileInputFloorClaim,
   getTerminalSendGuardRefusedReason,
   isTerminalInputLockedForClient,
@@ -36,6 +37,18 @@ export const TERMINAL_SEND_METHODS = [
         replayedMutationReceipt
       }
     ) => {
+      await assertTerminalSendTextWithinLimit(params.text)
+      await assertTerminalSendTextWithinLimit(params.resolvedLaunchDraft?.text)
+      if (params.text) {
+        await assertLegacyAiVaultResumeCommandAllowed(params.text, () =>
+          runtime.ensureStructuredAgentSessionHost()
+        )
+      }
+      if (params.resolvedLaunchDraft?.text) {
+        await assertLegacyAiVaultResumeCommandAllowed(params.resolvedLaunchDraft.text, () =>
+          runtime.ensureStructuredAgentSessionHost()
+        )
+      }
       const queryReplyClientId = clientId ?? params.client?.id
       if (
         params.inputKind === 'query-reply' &&
@@ -291,4 +304,4 @@ export const TERMINAL_SEND_METHODS = [
       return { send: result }
     }
   })
-].map(withTerminalSendResumeStarts)
+]
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-send-resume-starts.ts b/src/main/runtime/rpc/methods/terminal/terminal-send-resume-starts.ts
deleted file mode 100644
index f2192e6a38d4..000000000000
--- a/src/main/runtime/rpc/methods/terminal/terminal-send-resume-starts.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import { assertLegacyAiVaultResumeCommandAllowed } from '../../../../ai-vault/structured-session-ownership'
-import { terminalConversationKey } from '../../../../native-chat/structured-conversation-key'
-import type { TerminalSend } from '../../../../../shared/rpc-contract/terminal-unary-params'
-import type { ManagedConversationStart } from '../../../managed-conversation-starts'
-import type { RpcContext, RpcTypedMethod } from '../../core'
-import { assertTerminalSendTextWithinLimit } from './terminal-input-delivery'
-
-/** A send whose text resumes a conversation refuses one a chat holds; otherwise it registers the
- *  start in the same step, bound to the PTY it writes, and drops it when nothing was written. */
-export function withTerminalSendResumeStarts<TName extends string, TResult>(
-  method: RpcTypedMethod<TName, typeof TerminalSend, Promise<TResult>>
-): RpcTypedMethod<TName, typeof TerminalSend, Promise<TResult>> {
-  const send = method.handler
-  return {
-    ...method,
-    handler: async (params, context) => {
-      const { runtime } = context
-      await assertTerminalSendTextWithinLimit(params.text)
-      await assertTerminalSendTextWithinLimit(params.resolvedLaunchDraft?.text)
-      const starts: ManagedConversationStart[] = []
-      try {
-        for (const text of [params.text, params.resolvedLaunchDraft?.text]) {
-          const start = text
-            ? await assertLegacyAiVaultResumeCommandAllowed(
-                text,
-                () => runtime.ensureStructuredAgentSessionHost(),
-                (invocations) =>
-                  runtime.reserveManagedConversationStart(
-                    invocations.map((invocation) =>
-                      terminalConversationKey(invocation.provider, invocation.target)
-                    ),
-                    livePtyId(context, params.terminal)
-                  )
-              )
-            : undefined
-          if (start) {
-            starts.push(start)
-          }
-        }
-        const result = await send(params, context)
-        if (!sendAccepted(result)) {
-          starts.forEach((start) => start.drop())
-        }
-        return result
-      } catch (error) {
-        starts.forEach((start) => start.drop())
-        throw error
-      }
-    }
-  }
-}
-
-// The send itself reports a stale handle; here it only means nothing to bind.
-function livePtyId({ runtime }: RpcContext, handle: string): string | null {
-  try {
-    return runtime.resolveLiveLeafForHandle(handle)?.ptyId ?? null
-  } catch {
-    return null
-  }
-}
-
-function sendAccepted(result: unknown): boolean {
-  return (
-    typeof result === 'object' &&
-    result !== null &&
-    'send' in result &&
-    typeof result.send === 'object' &&
-    result.send !== null &&
-    'accepted' in result.send &&
-    result.send.accepted === true
-  )
-}
diff --git a/src/main/runtime/runtime-pty-controller-contract.ts b/src/main/runtime/runtime-pty-controller-contract.ts
index e29889032ecf..063463ae7374 100644
--- a/src/main/runtime/runtime-pty-controller-contract.ts
+++ b/src/main/runtime/runtime-pty-controller-contract.ts
@@ -5,7 +5,6 @@ import type {
   SpawnIntent
 } from '../../shared/host-spawn-admission'
 import type {
-  AgentSessionClaimedSpawnResult,
   AgentSessionExecutionClaim,
   AgentSessionSurfaceBinding
 } from '../../shared/agent-session-host-authority'
@@ -63,6 +62,8 @@ export type RuntimePtyController = {
     cwd?: string
     command?: string
     launchAgent?: TuiAgent
+    launchConfig?: WorktreeStartupLaunch['launchConfig']
+    launchToken?: string
     commandDelivery?: 'renderer' | 'provider'
     startupCommandDelivery?: WorktreeStartupLaunch['startupCommandDelivery']
     env?: Record<string, string>
@@ -108,14 +109,11 @@ export type RuntimePtyController = {
       }
       materialized?: true
     }
-  }): Promise<{
-    id: string
-    pid?: number | null
-    incarnationId?: PtyIncarnationId
-    wslDistro?: string
-    stablePaneOwner?: { handle: string; tabId: string; leafId: string }
-    agentSessionEnsure?: AgentSessionClaimedSpawnResult
-  }>
+  }): Promise<
+    PtySpawnResult & {
+      stablePaneOwner?: { handle: string; tabId: string; leafId: string }
+    }
+  >
   /** The local terminal owner's automatic-restore state; null when it has no fork gate. */
   getAutomaticWorkStatus?(): Promise<AutomaticWorkStatus | null>
   resumeAutomaticWork?(): Promise<AutomaticWorkResumeOutcome>
diff --git a/src/main/runtime/runtime-terminal-state-records.ts b/src/main/runtime/runtime-terminal-state-records.ts
index ec81bed136c9..2e1fd1a1fc96 100644
--- a/src/main/runtime/runtime-terminal-state-records.ts
+++ b/src/main/runtime/runtime-terminal-state-records.ts
@@ -1,3 +1,4 @@
+import type { TerminalLaunchResult } from '../../shared/agent-session-resume'
 import type { AgentStatus } from '../../shared/agent-detection'
 import type { AgentStatusState } from '../../shared/agent-status-types'
 import type { SleepingAgentLaunchConfig } from '../../shared/agent-session-resume'
@@ -64,6 +65,12 @@ export type RuntimePtyWorktreeRecord = RuntimeTerminalTailState & {
    * pty-recorded-surface-topology.ts.
    */
   surfaceRecordedAtGraphSequence: number
+  savedTerminalLaunchResult?: {
+    incarnationId: PtyIncarnationId | null
+    launchConfig: SleepingAgentLaunchConfig | null
+    launchToken: string | null
+    result: TerminalLaunchResult
+  }
   launchConfig: SleepingAgentLaunchConfig | null
   launchToken: string | null
   launchIncarnationId: PtyIncarnationId | null
diff --git a/src/main/runtime/session-construction/agent-session/get-agent-session-execution-namespace.ts b/src/main/runtime/session-construction/agent-session/get-agent-session-execution-namespace.ts
index cd2748e1cc31..16ef05a52d5c 100644
--- a/src/main/runtime/session-construction/agent-session/get-agent-session-execution-namespace.ts
+++ b/src/main/runtime/session-construction/agent-session/get-agent-session-execution-namespace.ts
@@ -164,6 +164,7 @@ export abstract class OrcaRuntimeWithGetAgentSessionExecutionNamespace extends O
       launchAgent: request.agent,
       // Why: like every host-built resume, the spawn names its session so readers can address it.
       resumeProviderSession: identity.providerSession,
+      ...(request.resumeOrigin ? { resumeOrigin: request.resumeOrigin } : {}),
       terminalImageViewerSupported: _caller.terminalImageViewerSupported,
       launchRuntime,
       terminalKittyKeyboardProtocol: request.terminalKittyKeyboardProtocol,
diff --git a/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts b/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts
index ada5f7b3f2aa..7d753d61c15c 100644
--- a/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts
+++ b/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts
@@ -1,3 +1,7 @@
+import {
+  terminalLaunchFacts,
+  type TerminalLaunchResult
+} from '../../../shared/agent-session-resume'
 import { LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host'
 import type { StructuredAgentId } from '../../../shared/agent-session-provider-handle'
 import { OrcaRuntimeWithGetWorktreePs } from '../workspaces/workspace-process-listing'
@@ -18,61 +22,37 @@ import {
 } from '../../agent-hooks/server/cli-writer-observation'
 import type { AgentSessionRecord } from '../../../shared/agent-session-record'
 import { CLI_CONVERSATION_ADOPTING_AGENTS } from '../../../shared/structured-agent-cli-conversation-adoption'
-import {
-  recordConversationKey,
-  type ConversationKey
-} from '../../native-chat/structured-conversation-key'
-import { agentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
-import {
-  ManagedConversationStarts,
-  type ManagedConversationStart,
-  type ManagedStartPty
-} from '../managed-conversation-starts'
+import { recordConversationKey } from '../../native-chat/structured-conversation-key'
 
 export abstract class OrcaRuntimeWithStructuredSessionCliWriterHost extends OrcaRuntimeWithGetWorktreePs {
-  private readonly managedConversationStarts = new ManagedConversationStarts()
-
-  /** Registers a terminal start Orca issues of `keys`; `ptyId` binds it now, else its spawn does. */
-  reserveManagedConversationStart(
-    keys: readonly ConversationKey[],
-    ptyId?: string | null
-  ): ManagedConversationStart {
-    const start = this.managedConversationStarts.reserve(keys)
-    if (ptyId !== undefined) {
-      this.bindManagedConversationStart(start, ptyId)
-    }
-    return start
-  }
-
-  bindManagedConversationStart(start: ManagedConversationStart, ptyId: string | null): void {
-    const pty = ptyId ? this.ptysById.get(ptyId) : undefined
-    // Only this host's own panes write its chats' conversations; a remote or WSL pane's is another's.
-    if (!pty || pty.connectionId || pty.isWsl) {
-      start.drop()
-      return
+  rememberSavedTerminalLaunchResult(ptyId: string, result: TerminalLaunchResult): void {
+    const pty = this.ptysById.get(ptyId)
+    if (pty && result.savedResumeDecision) {
+      pty.savedTerminalLaunchResult = {
+        incarnationId: pty.incarnationId,
+        launchConfig: pty.launchConfig,
+        launchToken: pty.launchToken,
+        result: terminalLaunchFacts(result)
+      }
     }
-    start.bind(pty.ptyId, pty.incarnationId)
   }
 
-  bindManagedConversationStartToTerminal(
-    start: ManagedConversationStart,
-    handle: string | null | undefined
-  ): void {
-    this.bindManagedConversationStart(
-      start,
-      (handle && this.getLivePtyForHandle(handle)?.pty.ptyId) || null
-    )
-  }
-
-  private managedStartPty(ptyId: string): ManagedStartPty | null {
+  getTerminalLaunchResult(ptyId: string): TerminalLaunchResult | undefined {
     const pty = this.ptysById.get(ptyId)
-    return pty
-      ? {
-          incarnationId: pty.incarnationId,
-          cliConversations: pty.cliConversations,
-          exited: this.getPtyLivenessVerdict(ptyId)?.status === 'exited'
-        }
-      : null
+    const saved = pty?.savedTerminalLaunchResult
+    if (!pty) {
+      return undefined
+    }
+    return terminalLaunchFacts({
+      ...(saved?.incarnationId === pty.incarnationId &&
+      saved.launchConfig === pty.launchConfig &&
+      saved.launchToken === pty.launchToken
+        ? saved.result
+        : {}),
+      launchAgent: pty.launchAgent ?? undefined,
+      launchToken: pty.launchToken ?? undefined,
+      launchConfig: pty.launchConfig ?? undefined
+    })
   }
 
   private cliWriterPtyPane(ptyId: string | null | undefined): CliWriterPane | null {
@@ -111,6 +91,9 @@ export abstract class OrcaRuntimeWithStructuredSessionCliWriterHost extends Orca
     if (!agent || !binding || !pty) {
       return
     }
+    if (event.agentPresence?.process) {
+      delete pty.savedTerminalLaunchResult
+    }
     if (pty.cliConversations?.incarnationId !== pty.incarnationId) {
       pty.cliConversations = { incarnationId: pty.incarnationId, byKey: new Map() }
     }
@@ -138,12 +121,6 @@ export abstract class OrcaRuntimeWithStructuredSessionCliWriterHost extends Orca
     if (!key?.id || !adopts) {
       return
     }
-    // A start Orca issued that its terminal's hooks haven't reported yet: the census can't see it.
-    if (this.managedConversationStarts.live(key, (ptyId) => this.managedStartPty(ptyId))) {
-      throw agentSessionRefusalError('agent_session_conflict', {
-        reason: 'conversationHeldElsewhere'
-      })
-    }
     await this.assertStructuredAdoptionTerminalWritersExited(record.provider, key.id)
   }
 
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts b/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
index a78ded3413d2..0718b0ae46dc 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
@@ -228,8 +228,8 @@ export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal ext
       incarnationId: livePty.pty.incarnationId,
       title: terminal.title ?? livePty.pty.title ?? 'Terminal',
       ...(cwd ? { startupCwd: cwd } : {}),
-      ...(opts.launchAgent ? { launchAgent: opts.launchAgent } : {}),
-      ...(opts.viewMode ? { viewMode: opts.viewMode } : {}),
+      ...(livePty.pty.launchAgent ? { launchAgent: livePty.pty.launchAgent } : {}),
+      ...(!terminal.agentResumeRefused && opts.viewMode ? { viewMode: opts.viewMode } : {}),
       parentLayout,
       isActive: activate
     }
diff --git a/src/main/runtime/terminal/launch/terminal-create.ts b/src/main/runtime/terminal/launch/terminal-create.ts
index aec82277045e..85b69952849b 100644
--- a/src/main/runtime/terminal/launch/terminal-create.ts
+++ b/src/main/runtime/terminal/launch/terminal-create.ts
@@ -1,3 +1,4 @@
+import { recordTerminalLaunchMetadata, resolveTerminalLaunchResult } from './terminal-launch-result'
 import { OrcaRuntimeWithTerminalCreateDeduplication } from './terminal-create-deduplication'
 import * as dependencies from '../../orca-runtime-create-terminal-dependencies'
 import { createDesktopTerminal } from '../../orca-runtime-create-terminal-desktop'
@@ -138,6 +139,8 @@ export abstract class OrcaRuntimeWithCreateTerminal extends OrcaRuntimeWithTermi
               ? launchOpts.command
               : (agentTeamsPlan?.command ?? launchOpts.command),
             launchAgent: launchOpts.launchAgent,
+            launchConfig: effectiveLaunchConfig,
+            ...(launchToken ? { launchToken } : {}),
             commandDelivery: 'provider',
             startupCommandDelivery: launchOpts.startupCommandDelivery,
             env,
@@ -193,17 +196,13 @@ export abstract class OrcaRuntimeWithCreateTerminal extends OrcaRuntimeWithTermi
         }
         restoreHint.consume()
         // Why here: refused before a handle, snapshot or reveal could pose the live PTY as new.
-        const adoptedStablePane = dependencies.admitStablePaneAdoption(result, launchOpts)
-        if (result.agentSessionEnsure) {
-          const canonicalSurface = result.agentSessionEnsure.owner.surface
-          preAllocatedHandle = canonicalSurface.terminalHandle
-          tabId = canonicalSurface.tabId
-          leafId = canonicalSurface.leafId
-          paneKey = dependencies.makePaneKey(tabId, leafId)
-        } else if (result.stablePaneOwner) {
-          preAllocatedHandle = result.stablePaneOwner.handle
-          tabId = result.stablePaneOwner.tabId
-          leafId = result.stablePaneOwner.leafId
+        const launch = resolveTerminalLaunchResult(result, {
+          ...launchOpts,
+          launchConfig: effectiveLaunchConfig,
+          launchToken
+        })
+        if (launch.surface) {
+          ;({ terminalHandle: preAllocatedHandle, tabId, leafId } = launch.surface)
           paneKey = dependencies.makePaneKey(tabId, leafId)
         }
         try {
@@ -227,34 +226,32 @@ export abstract class OrcaRuntimeWithCreateTerminal extends OrcaRuntimeWithTermi
         const pty = this.getOrCreatePtyWorktreeRecord(result.id)
         if (pty) {
           pty.runtimeSessionOwned = true
-          if (!adoptedStablePane) {
-            if (launchOpts.title) {
+          if (!launch.adoptedStablePane) {
+            if (launch.effectiveTitle) {
               const observedAt = this.nextTitleObservationSequence()
-              pty.title = launchOpts.title
+              pty.title = launch.effectiveTitle
               pty.titleUpdatedAt = observedAt
-              this.setPtyManagementTitleFromObservedTitle(pty, launchOpts.title, observedAt)
+              this.setPtyManagementTitleFromObservedTitle(pty, launch.effectiveTitle, observedAt)
             } else {
               pty.title = null
               pty.titleUpdatedAt = null
             }
-            pty.launchConfig = effectiveLaunchConfig
-              ? dependencies.copySleepingAgentLaunchConfig(effectiveLaunchConfig)
-              : null
-            pty.launchToken = launchToken ?? null
-            pty.launchIncarnationId = launchToken ? pty.incarnationId : null
-            pty.launchAgent = launchOpts.launchAgent ?? null
+          }
+          recordTerminalLaunchMetadata(pty, result, launch)
+          if (!launch.adoptedStablePane) {
+            this.rememberSavedTerminalLaunchResult(result.id, result)
           }
           recordPtySurface(pty, tabId, paneKey, spawnSurfaceClaimSequence(this.graphSequence))
         }
         const handle = pty ? this.issuePtyHandle(pty) : preAllocatedHandle
-        if (pty && !adoptedStablePane && launchOpts.deferMobileSessionPublish !== true) {
+        if (pty && !launch.adoptedStablePane && launchOpts.deferMobileSessionPublish !== true) {
           this.publishPtyBackedMobileSessionTerminal(workspace.id, pty, {
             tabId,
             leafId,
-            title: launchOpts.title ?? null,
+            title: launch.effectiveTitle ?? null,
             activate: presentation === 'focused',
             selectIfNoActiveTab: presentation !== 'background',
-            ...(launchOpts.viewMode ? { viewMode: launchOpts.viewMode } : {}),
+            ...(launch.effectiveViewMode ? { viewMode: launch.effectiveViewMode } : {}),
             ...(cwd !== workspace.path ? { startupCwd: cwd } : {})
           })
         }
@@ -264,12 +261,12 @@ export abstract class OrcaRuntimeWithCreateTerminal extends OrcaRuntimeWithTermi
           try {
             await this.notifier.revealTerminalSession(workspace.id, {
               ptyId: result.id,
-              title: launchOpts.title ?? null,
+              title: pty?.title ?? launch.effectiveTitle ?? null,
               ...(cwd !== workspace.path ? { cwd } : {}),
-              ...(effectiveLaunchConfig ? { launchConfig: effectiveLaunchConfig } : {}),
-              ...(launchToken ? { launchToken } : {}),
-              ...(launchOpts.launchAgent ? { launchAgent: launchOpts.launchAgent } : {}),
-              ...(launchOpts.viewMode ? { viewMode: launchOpts.viewMode } : {}),
+              ...(pty?.launchConfig ? { launchConfig: pty.launchConfig } : {}),
+              ...(pty?.launchToken ? { launchToken: pty.launchToken } : {}),
+              ...(pty?.launchAgent ? { launchAgent: pty.launchAgent } : {}),
+              ...(launch.effectiveViewMode ? { viewMode: launch.effectiveViewMode } : {}),
               activate: presentation === 'focused',
               ...(presentation ? { presentation } : {}),
               ...dependencies.terminalRevealViewerOptions(opts),
@@ -285,19 +282,23 @@ export abstract class OrcaRuntimeWithCreateTerminal extends OrcaRuntimeWithTermi
           warning = dependencies.createTerminalRevealWarning(handle)
         }
         return {
+          ...result,
           handle,
           tabId,
           paneKey,
           ptyId: result.id,
           worktreeId: workspace.id,
-          title: pty?.title ?? launchOpts.title ?? null,
+          title: pty?.title ?? launch.effectiveTitle ?? null,
+          launchConfig: pty?.launchConfig ?? undefined,
+          launchAgent: pty?.launchAgent ?? undefined,
+          launchToken: pty?.launchToken ?? undefined,
           ...this.getPtyExecutionHostMetadata(result.id),
           surface,
           ...(result.pid ? { processId: result.pid } : {}),
           ...(result.agentSessionEnsure
             ? { agentSessionDisposition: result.agentSessionEnsure.disposition }
             : {}),
-          ...(adoptedStablePane ? { isReattach: true as const } : {}),
+          ...(launch.adoptedStablePane ? { isReattach: true as const } : {}),
           ...(warning ? { warning } : {})
         }
       } finally {
diff --git a/src/main/runtime/terminal/launch/terminal-launch-result.ts b/src/main/runtime/terminal/launch/terminal-launch-result.ts
new file mode 100644
index 000000000000..815330ec115c
--- /dev/null
+++ b/src/main/runtime/terminal/launch/terminal-launch-result.ts
@@ -0,0 +1,66 @@
+import { admitStablePaneAdoption } from '../../runtime-terminal-pane-identity'
+import type { RuntimePtyController } from '../../runtime-pty-controller-contract'
+import type { TerminalCreateOptions } from '../../runtime-terminal-contracts'
+import type { RuntimePtyWorktreeRecord } from '../../runtime-terminal-state-records'
+import { copySleepingAgentLaunchConfig } from '../../runtime-agent-launch-resolution'
+
+type TerminalSpawnResult = Awaited<ReturnType<NonNullable<RuntimePtyController['spawn']>>>
+
+export function resolveTerminalLaunchResult(
+  result: TerminalSpawnResult,
+  requested: Pick<
+    TerminalCreateOptions,
+    'launchConfig' | 'launchAgent' | 'launchToken' | 'title' | 'viewMode' | 'requireFreshPane'
+  >
+) {
+  const stablePaneAdopted = admitStablePaneAdoption(result, requested)
+  const adoptedStablePane =
+    stablePaneAdopted ||
+    result.isReattach === true ||
+    result.agentSessionEnsure?.disposition === 'adopted'
+  const refused = Boolean(result.agentResumeRefused)
+  const owner = result.stablePaneOwner
+  const surface =
+    result.agentSessionEnsure?.owner.surface ??
+    (owner ? { terminalHandle: owner.handle, tabId: owner.tabId, leafId: owner.leafId } : undefined)
+  return {
+    adoptedStablePane,
+    surface,
+    launchAgent: refused
+      ? undefined
+      : (result.launchAgent ?? (adoptedStablePane ? undefined : requested.launchAgent)),
+    launchConfig: refused
+      ? undefined
+      : (result.launchConfig ?? (adoptedStablePane ? undefined : requested.launchConfig)),
+    launchToken: refused
+      ? undefined
+      : (result.launchToken ?? (adoptedStablePane ? undefined : requested.launchToken)),
+    effectiveTitle: refused || adoptedStablePane ? null : requested.title,
+    effectiveViewMode: refused || adoptedStablePane ? undefined : requested.viewMode
+  }
+}
+
+export function recordTerminalLaunchMetadata(
+  pty: RuntimePtyWorktreeRecord,
+  result: TerminalSpawnResult,
+  launch: ReturnType<typeof resolveTerminalLaunchResult>
+): void {
+  if (launch.adoptedStablePane) {
+    // A lower owner can supply facts before this runtime has a launch record.
+    if (!pty.launchConfig && result.launchConfig) {
+      pty.launchConfig = copySleepingAgentLaunchConfig(result.launchConfig)
+    }
+    pty.launchToken ??= result.launchToken ?? null
+    pty.launchAgent ??= result.launchAgent ?? null
+    if (pty.launchToken && !pty.launchIncarnationId) {
+      pty.launchIncarnationId = pty.incarnationId
+    }
+  } else {
+    pty.launchConfig = launch.launchConfig
+      ? copySleepingAgentLaunchConfig(launch.launchConfig)
+      : null
+    pty.launchToken = launch.launchToken ?? null
+    pty.launchIncarnationId = launch.launchToken ? pty.incarnationId : null
+    pty.launchAgent = launch.launchAgent ?? null
+  }
+}
diff --git a/src/main/runtime/terminal/stop/worktree-sleep-resume-recording.ts b/src/main/runtime/terminal/stop/worktree-sleep-resume-recording.ts
index 5d752821f85e..3c5206d37112 100644
--- a/src/main/runtime/terminal/stop/worktree-sleep-resume-recording.ts
+++ b/src/main/runtime/terminal/stop/worktree-sleep-resume-recording.ts
@@ -1,3 +1,4 @@
+import { sleepingRecordsEquivalentIgnoringCaptureTime } from '../../../../shared/agent-resume-record-equivalence'
 import { OrcaRuntimeWithStopTerminalsForWorktree } from './worktree-terminal-stop'
 import {
   applyWorktreeSleepResumeRecords,
@@ -28,27 +29,64 @@ import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switc
 import type { WorkspaceSessionState } from '../../../../shared/workspace-session-state-types'
 
 export abstract class OrcaRuntimeWithWorktreeSleepResumeRecording extends OrcaRuntimeWithStopTerminalsForWorktree {
+  /** Capture after earlier status writes so their saved copy participates in exact cleanup. */
+  readSavedResumeSource(
+    worktreeId: string,
+    paneKey: string
+  ): Promise<SleepingAgentSessionRecord | undefined> {
+    return this.inResumeRecordOrder(
+      async () =>
+        this.store?.getWorkspaceSession?.(this.getWorkspaceSessionHostIdForWorktree(worktreeId))
+          ?.sleepingAgentSessionsByPaneKey?.[paneKey]
+    )
+  }
+
   /** Forgets a pane's saved resume the host refused because a chat is its conversation's home,
    *  as a window does for its own panes; a host with no window has no one else to. */
   async forgetRefusedSavedResume(
     worktreeId: string,
     paneKey: string,
-    refused: RefusedPaneResume
+    refused: RefusedPaneResume,
+    source?: SleepingAgentSessionRecord
   ): Promise<void> {
-    await this.commitWorkspaceSessionEdit(
-      this.getWorkspaceSessionHostIdForWorktree(worktreeId),
-      (session) => {
-        const saved = session.sleepingAgentSessionsByPaneKey?.[paneKey]
-        if (
-          saved?.agent !== refused.agent ||
-          !agentProviderSessionsEqual(refused.agent, saved.providerSession, refused.providerSession)
-        ) {
-          return null
+    await this.inResumeRecordOrder(() =>
+      this.commitWorkspaceSessionEdit(
+        this.getWorkspaceSessionHostIdForWorktree(worktreeId),
+        (session) => {
+          const saved = session.sleepingAgentSessionsByPaneKey?.[paneKey]
+          if (
+            !source ||
+            !refused.expectedSavedRecord ||
+            saved?.paneKey !== refused.expectedSavedRecord.paneKey ||
+            saved.capturedAt !== refused.expectedSavedRecord.capturedAt ||
+            saved.updatedAt !== refused.expectedSavedRecord.updatedAt ||
+            saved.connectionId !== source.connectionId ||
+            !sleepingRecordsEquivalentIgnoringCaptureTime(saved, source) ||
+            saved.agent !== refused.agent ||
+            !agentProviderSessionsEqual(
+              refused.agent,
+              saved.providerSession,
+              refused.providerSession
+            )
+          ) {
+            return null
+          }
+          const { [paneKey]: _refused, ...kept } = session.sleepingAgentSessionsByPaneKey ?? {}
+          return { ...session, sleepingAgentSessionsByPaneKey: kept }
         }
-        const { [paneKey]: _refused, ...kept } = session.sleepingAgentSessionsByPaneKey ?? {}
-        return { ...session, sleepingAgentSessionsByPaneKey: kept }
-      }
+      )
     )
+    const previous = this.previousHookStatusByPaneKey.get(paneKey)
+    if (
+      previous &&
+      refused.expectedStatus &&
+      previous.updatedAt <= refused.expectedStatus.receivedAt &&
+      previous.stateStartedAt === refused.expectedStatus.stateStartedAt &&
+      previous.agentType === refused.agent &&
+      agentProviderSessionsEqual(refused.agent, previous.providerSession, refused.providerSession)
+    ) {
+      this.previousHookStatusByPaneKey.delete(paneKey)
+    }
   }
 
   protected readonly sleepResumeRecords: WorktreeSleepResumeRecorder = {
@@ -85,7 +123,10 @@ export abstract class OrcaRuntimeWithWorktreeSleepResumeRecording extends OrcaRu
   }
 
   /** Each pane's last hook status, which a status without a provider session inherits it from. */
-  private readonly previousHookStatusByPaneKey = new Map<string, ResumeRecordStatus>()
+  private readonly previousHookStatusByPaneKey = new Map<
+    string,
+    ResumeRecordStatus & { stateStartedAt?: number }
+  >()
   private hookStatusResumeWrites: Promise<void> = Promise.resolve()
 
   private readonly paneLaunchConfigOf: PaneLaunchConfigOf = (paneKey, agent) => {
@@ -107,7 +148,10 @@ export abstract class OrcaRuntimeWithWorktreeSleepResumeRecording extends OrcaRu
     if (!status) {
       return
     }
-    this.previousHookStatusByPaneKey.set(row.paneKey, status)
+    this.previousHookStatusByPaneKey.set(row.paneKey, {
+      ...status,
+      stateStartedAt: row.stateStartedAt
+    })
     this.inResumeRecordOrder(() => this.writeHookStatusResume(status)).catch((error) =>
       console.warn('[runtime] could not record an agent resume record', error)
     )
@@ -127,7 +171,19 @@ export abstract class OrcaRuntimeWithWorktreeSleepResumeRecording extends OrcaRu
   forgetHookStatusResume(clear: AgentStatusClearIpcPayload): void {
     for (const [paneKey, status] of this.previousHookStatusByPaneKey) {
       if (
-        'paneKey' in clear ? paneKey === clear.paneKey : status.connectionId === clear.connectionId
+        'paneKey' in clear
+          ? paneKey === clear.paneKey &&
+            (!clear.refusedResume ||
+              (!!clear.refusedResume.expectedStatus &&
+                status.updatedAt <= clear.refusedResume.expectedStatus.receivedAt &&
+                status.stateStartedAt === clear.refusedResume.expectedStatus.stateStartedAt &&
+                status.agentType === clear.refusedResume.agent &&
+                agentProviderSessionsEqual(
+                  status.agentType,
+                  status.providerSession,
+                  clear.refusedResume.providerSession
+                )))
+          : status.connectionId === clear.connectionId
       ) {
         this.previousHookStatusByPaneKey.delete(paneKey)
       }
diff --git a/src/preload/api/pty-api.ts b/src/preload/api/pty-api.ts
index 20039e7c0fa2..afa346330e7a 100644
--- a/src/preload/api/pty-api.ts
+++ b/src/preload/api/pty-api.ts
@@ -1,3 +1,4 @@
+import type { SavedResumeDecision, TerminalLaunchResult } from '../../shared/agent-session-resume'
 import type { SpawnIntent } from '../../shared/host-spawn-admission'
 import type {
   AgentProviderSessionMetadata,
@@ -90,6 +91,10 @@ export type PtyApi = {
     startupCwdFallback?: { kind: 'worktree'; cwd: string }
     agentResumeUnavailable?: true
     agentResumeRefused?: 'chat-home' | 'chat-writing' | 'unverifiable'
+    savedResumeDecision?: SavedResumeDecision
+    refusedResume?: TerminalLaunchResult['refusedResume']
+    launchToken?: string
+    resumeProviderSession?: TerminalLaunchResult['resumeProviderSession']
     /** Host verdict on the shell-ready marker; absent when the execution host predates the field. */
     shellReadyArmed?: boolean
   }>
diff --git a/src/preload/api/pty-bridge-session-control.ts b/src/preload/api/pty-bridge-session-control.ts
index 872c560f98c1..0a32ecaae9a2 100644
--- a/src/preload/api/pty-bridge-session-control.ts
+++ b/src/preload/api/pty-bridge-session-control.ts
@@ -1,3 +1,4 @@
+import type { SavedResumeDecision, TerminalLaunchResult } from '../../shared/agent-session-resume'
 import type { SpawnIntent } from '../../shared/host-spawn-admission'
 import { ipcRenderer } from 'electron'
 import type { ProjectExecutionRuntimeResolution } from '../../shared/project-execution-runtime'
@@ -67,6 +68,7 @@ export const ptySessionControlApi = {
     /** Which lifetime of `id` this reply named; absent when the execution host predates the field. */
     incarnationId?: string
     launchConfig?: SleepingAgentLaunchConfig
+    launchAgent?: TuiAgent
     snapshot?: string
     snapshotCols?: number
     snapshotRows?: number
@@ -84,6 +86,10 @@ export const ptySessionControlApi = {
     startupCwdFallback?: { kind: 'worktree'; cwd: string }
     agentResumeUnavailable?: true
     agentResumeRefused?: 'chat-home' | 'chat-writing' | 'unverifiable'
+    savedResumeDecision?: SavedResumeDecision
+    refusedResume?: TerminalLaunchResult['refusedResume']
+    launchToken?: string
+    resumeProviderSession?: TerminalLaunchResult['resumeProviderSession']
     /** Host verdict on the shell-ready marker; absent when the execution host predates the field. */
     shellReadyArmed?: boolean
   }> => ipcRenderer.invoke('pty:spawn', opts),
diff --git a/src/renderer/src/components/native-chat/agent-session-failure-words-text.ts b/src/renderer/src/components/native-chat/agent-session-failure-words-text.ts
index ccfb02113db0..5801e9b82d26 100644
--- a/src/renderer/src/components/native-chat/agent-session-failure-words-text.ts
+++ b/src/renderer/src/components/native-chat/agent-session-failure-words-text.ts
@@ -142,6 +142,11 @@ const PIECES: Record<AgentSessionFailureCopyId, (values: AgentSessionFailureCopy
         COPY.runtimeNotInstalled,
         values
       ),
+    conversationOpenElsewhere: () =>
+      translate(
+        'components.native-chat.failureWords.conversationOpenElsewhere',
+        COPY.conversationOpenElsewhere
+      ),
     conversationOpenInTerminal: (values) =>
       translate(
         'components.native-chat.failureWords.conversationOpenInTerminal',
diff --git a/src/renderer/src/components/terminal-pane/ipc-pty-connect-result.ts b/src/renderer/src/components/terminal-pane/ipc-pty-connect-result.ts
index 4d2df79e4753..ad2e995c3c3e 100644
--- a/src/renderer/src/components/terminal-pane/ipc-pty-connect-result.ts
+++ b/src/renderer/src/components/terminal-pane/ipc-pty-connect-result.ts
@@ -1,3 +1,4 @@
+import { terminalLaunchFacts } from '../../../../shared/agent-session-resume'
 import { isTuiAgent } from '../../../../shared/tui-agent-config'
 import type { PtyConnectResult } from './pty-transport-types'
 
@@ -6,9 +7,12 @@ type IpcPtySpawnResult = PtyConnectResult & { isReattach?: boolean }
 export function projectIpcPtyConnectResult(
   spawnResult: IpcPtySpawnResult
 ): string | PtyConnectResult {
+  const facts = terminalLaunchFacts(spawnResult)
   const launchAgent = isTuiAgent(spawnResult.launchAgent) ? spawnResult.launchAgent : undefined
   if (spawnResult.isReattach || spawnResult.coldRestore || spawnResult.sessionExpired) {
     return {
+      ...facts,
+      ...(spawnResult.incarnationId ? { incarnationId: spawnResult.incarnationId } : {}),
       id: spawnResult.id,
       ...(spawnResult.isReattach ? { isReattach: true } : {}),
       ...(launchAgent ? { launchAgent } : {}),
@@ -47,9 +51,14 @@ export function projectIpcPtyConnectResult(
     launchAgent ||
     spawnResult.launchConfig ||
     spawnResult.startupCwdFallback ||
-    spawnResult.agentResumeUnavailable
+    spawnResult.agentResumeUnavailable ||
+    spawnResult.savedResumeDecision ||
+    spawnResult.refusedResume ||
+    spawnResult.launchToken
   ) {
     return {
+      ...facts,
+      ...(spawnResult.incarnationId ? { incarnationId: spawnResult.incarnationId } : {}),
       id: spawnResult.id,
       ...(launchAgent ? { launchAgent } : {}),
       ...(spawnResult.launchConfig ? { launchConfig: spawnResult.launchConfig } : {}),
diff --git a/src/renderer/src/components/terminal-pane/ipc-pty-connect.ts b/src/renderer/src/components/terminal-pane/ipc-pty-connect.ts
index 90bf58eab65c..cc8202c5d135 100644
--- a/src/renderer/src/components/terminal-pane/ipc-pty-connect.ts
+++ b/src/renderer/src/components/terminal-pane/ipc-pty-connect.ts
@@ -1,3 +1,4 @@
+import { terminalLaunchFacts } from '../../../../shared/agent-session-resume'
 import { readTerminalSpawnDeferral } from '../../../../shared/host-spawn-admission'
 import { isRuntimeOwnedSshTargetId } from '../../../../shared/execution-host'
 import { readIpcErrorDetail } from '@/lib/ipc-error'
@@ -138,6 +139,7 @@ export async function connectIpcPty(
         return
       }
       return {
+        ...terminalLaunchFacts(spawnResult),
         id: spawnResult.id,
         exitedBeforeAttach: true,
         // Why kept: a shell that replaced a resume and then exited never resumed the agent, and a
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-types.ts b/src/renderer/src/components/terminal-pane/pty-connection-types.ts
index c0dd05bf31c4..6d2fb3583ffe 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-types.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-types.ts
@@ -1,3 +1,4 @@
+import type { SavedResumeStartupSource } from '../../../../shared/agent-session-resume'
 import type { WorkspaceAttentionSlice } from '@/store/slices/workspace-attention/workspace-attention-contract'
 import type { NotificationWorkspaceOwner } from '../../../../shared/notification-source'
 import type { PtyTransport, PtyTransportRecoveryState } from './pty-transport-types'
@@ -31,6 +32,7 @@ export type PtyPaneStartup = {
   resumeProviderSession?: AgentProviderSessionMetadata
   /** `saved`: a resume built from saved facts, which the host refuses for a chat's conversation. */
   resumeOrigin?: 'saved'
+  resumeSource?: SavedResumeStartupSource
   launchToken?: string
   launchAgent?: TuiAgent
   /** The agent launch the pane's own spawn starts, instead of `command`. */
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/apply-reattach-payload.ts b/src/renderer/src/components/terminal-pane/pty-connection/apply-reattach-payload.ts
index 9cefc7b9f62d..9e72b3a717e0 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/apply-reattach-payload.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/apply-reattach-payload.ts
@@ -1,3 +1,4 @@
+import { agentProviderSessionsEqual } from '../../../../../shared/agent-session-resume'
 import { isRemoteRuntimePtyId } from '../../../../../shared/remote-runtime-pty-id'
 import { waitForTerminalReplayWritesParsed } from '../replay-guard'
 import {
@@ -264,11 +265,33 @@ export function createReattachPayloadHandlers(
         `${RESET_GRAPHIC_RENDITION}${ctx.connectResult.coldRestore.scrollback}`
       )
       // Why not rebuilt when refused: main started a plain shell instead of that plan.
-      const preparedStartup = ctx.connectResult.agentResumeRefused
-        ? null
-        : (ctx.coldRestoreStartup ?? session.buildColdRestoreAgentResumeStartup())
+      let resumeUnavailable = Boolean(ctx.connectResult.agentResumeUnavailable)
+      let preparedStartup =
+        ctx.connectResult.agentResumeRefused || resumeUnavailable
+          ? null
+          : (ctx.coldRestoreStartup ?? session.buildColdRestoreAgentResumeStartup())
+      if (preparedStartup && !ctx.coldRestoreStartup) {
+        const decision = ctx.connectResult.savedResumeDecision
+        if (
+          !decision ||
+          decision.verdict !== 'admitted' ||
+          decision.agent !== preparedStartup.agent ||
+          !agentProviderSessionsEqual(
+            decision.agent,
+            decision.providerSession,
+            preparedStartup.resumeProviderSession
+          )
+        ) {
+          resumeUnavailable = true
+          session.cancelSavedResumeStartup(preparedStartup, {
+            ...ctx.connectResult,
+            agentResumeRefused: 'unverifiable'
+          })
+          preparedStartup = null
+        }
+      }
       const didPrepareResume = session.applyColdRestoreAgentResumeStartup(preparedStartup)
-      if (ctx.connectResult.agentResumeUnavailable) {
+      if (resumeUnavailable) {
         // Why: main dropped the resume argv, so this pane is a NEW session —
         // the plain restored banner would claim the old one came back.
         session.showSessionRestoredBanner('resume-unavailable')
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/cold-restore-resume-startup.ts b/src/renderer/src/components/terminal-pane/pty-connection/cold-restore-resume-startup.ts
index 30e84152df53..f6f11972f8c3 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/cold-restore-resume-startup.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/cold-restore-resume-startup.ts
@@ -110,6 +110,23 @@ export function bindBuildColdRestoreAgentResumeStartup(session: ConnectPanePtySe
       launchConfig: startupPlan.launchConfig,
       resumeProviderSession: providerSession,
       resumeOrigin: 'saved',
+      resumeSource: {
+        cancelled: false,
+        ...(sleepingRecord &&
+        sleepingRecord.agent === agent &&
+        agentProviderSessionsEqual(agent, sleepingRecord.providerSession, providerSession)
+          ? { record: sleepingRecord }
+          : {}),
+        ...(useLiveEntry && entry
+          ? {
+              expectedStatus: {
+                paneKey: session.cacheKey,
+                receivedAt: entry.updatedAt,
+                stateStartedAt: entry.stateStartedAt
+              }
+            }
+          : {})
+      },
       launchToken: coldRestoreLaunchToken,
       useLiveEntry: Boolean(useLiveEntry),
       hasSleepingRecord: Boolean(sleepingRecord),
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/connect-pane-pty.ts b/src/renderer/src/components/terminal-pane/pty-connection/connect-pane-pty.ts
index 8454831878ee..bd03d602da44 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/connect-pane-pty.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/connect-pane-pty.ts
@@ -150,6 +150,9 @@ export function connectPanePty(
   // own outer reference, since `deps` here is a shallow copy and our
   // mutation does not propagate back.
   session.paneStartup = session.deps.startup ?? null
+  if (session.paneStartup?.resumeOrigin === 'saved') {
+    session.paneStartup.resumeSource ??= { cancelled: false }
+  }
   session.deps.startup = undefined
   // Why the session holds it until a spawn request carries it: the pane already dropped every other
   // reference to this PTY, so the stop is owed until main takes it or dispose kills it.
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/deferred-cold-restore-and-snapshot.ts b/src/renderer/src/components/terminal-pane/pty-connection/deferred-cold-restore-and-snapshot.ts
index 3e7469b60927..928e135bd53c 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/deferred-cold-restore-and-snapshot.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/deferred-cold-restore-and-snapshot.ts
@@ -26,10 +26,16 @@ export function bindDeferredColdRestoreAndSnapshot(session: ConnectPanePtySessio
   session.applyColdRestoreAgentResumeStartup = (
     startup: ColdRestoreAgentResumeStartup | null
   ): boolean => {
-    if (!startup) {
+    if (!startup || startup.resumeSource?.cancelled) {
       return false
     }
     const state = useAppStore.getState()
+    if (!session.pendingStartupCommand && session.shouldDeliverStartupViaTerminalPaste) {
+      session.pendingStartupCommand = {
+        command: startup.command,
+        resumeSource: startup.resumeSource
+      }
+    }
     state.registerAgentLaunchConfig(session.cacheKey, startup.launchConfig, {
       agentType: startup.agent,
       launchToken: startup.launchToken,
@@ -74,6 +80,9 @@ export function bindDeferredColdRestoreAndSnapshot(session: ConnectPanePtySessio
     startup: ColdRestoreAgentResumeStartup | null = session.buildColdRestoreAgentResumeStartup(),
     options: FreshSpawnOptions = {}
   ): Promise<string | null> => {
+    if (startup?.resumeSource?.cancelled) {
+      return Promise.resolve(null)
+    }
     session.applyColdRestoreAgentResumeStartup(startup)
     const spawned = session.startFreshSpawn(startup, options)
     // Switch point: main's layout shows this pane unbound while the start runs.
@@ -96,7 +105,10 @@ export function bindDeferredColdRestoreAndSnapshot(session: ConnectPanePtySessio
     !session.disposed &&
     session.deps.paneTransportsRef.current.get(session.pane.id) === session.transport &&
     session.transport.getPtyId() === ptyId
-  const runTerminalPasteStartupCommand = async (command: string): Promise<boolean> => {
+  const runTerminalPasteStartupCommand = async (
+    command: string,
+    current: () => boolean
+  ): Promise<boolean> => {
     const ptyId = session.transport.getPtyId()
     const result = await executeTerminalStartupCommandPaste({
       command,
@@ -109,43 +121,52 @@ export function bindDeferredColdRestoreAndSnapshot(session: ConnectPanePtySessio
         isWindowsConpty: session.isNativeWindowsConpty
       }),
       transport: session.transport,
-      isTargetCurrent: isStartupPasteTargetCurrent
+      isTargetCurrent: (target) => current() && isStartupPasteTargetCurrent(target)
     })
-    if (result.status !== 'pasted' || !isStartupPasteTargetCurrent(ptyId)) {
+    if (result.status !== 'pasted' || !current() || !isStartupPasteTargetCurrent(ptyId)) {
       return false
     }
     return session.transport.sendInput('\r', 'launch')
   }
   session.schedulePendingStartupCommandDelivery = (): void => {
     const startup = session.pendingStartupCommand
-    if (!startup) {
+    if (!startup || startup.resumeSource?.cancelled) {
       return
     }
     if (session.startupInjectTimer !== null) {
       clearTimeout(session.startupInjectTimer)
     }
+    const generation = session.transportStreamGeneration
+    const isCurrent = (): boolean =>
+      !session.disposed &&
+      session.pendingStartupCommand === startup &&
+      !startup.resumeSource?.cancelled &&
+      generation === session.transportStreamGeneration &&
+      (startup.isCurrent?.() ?? true)
     session.startupInjectTimer = setTimeout(() => {
       session.startupInjectTimer = null
       void (async () => {
-        if (session.pendingStartupCommand !== startup || session.disposed) {
+        if (!isCurrent()) {
           return
         }
         if (session.shouldDeliverStartupViaTerminalPaste) {
           await waitForTerminalOutputParsed(session.pane.terminal)
         }
-        if (session.pendingStartupCommand !== startup || session.disposed) {
+        if (!isCurrent()) {
           return
         }
         const command = startup.command
         const submitted = session.shouldDeliverStartupViaTerminalPaste
-          ? await runTerminalPasteStartupCommand(command)
+          ? await runTerminalPasteStartupCommand(command, isCurrent)
           : session.transport.sendInput(`${command}\r`, 'launch')
         if (submitted) {
           session.armStartupDraftReadinessObservation()
         } else {
           session.releaseUnattemptedStartupDraftPasteDelivery()
         }
-        session.pendingStartupCommand = null
+        if (session.pendingStartupCommand === startup) {
+          session.pendingStartupCommand = null
+        }
       })()
     }, 50)
   }
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/deferred-session-reattach-connect.ts b/src/renderer/src/components/terminal-pane/pty-connection/deferred-session-reattach-connect.ts
index 5b29f012ac5f..8d56d0b6f0e5 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/deferred-session-reattach-connect.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/deferred-session-reattach-connect.ts
@@ -108,6 +108,7 @@ function connectDeferredSessionReattach(
     ...(coldRestoreStartup?.resumeProviderSession
       ? { resumeProviderSession: coldRestoreStartup.resumeProviderSession }
       : {}),
+    ...(coldRestoreStartup ? { resumeOrigin: coldRestoreStartup.resumeOrigin } : {}),
     ...(coldRestoreStartup?.launchToken ? { launchToken: coldRestoreStartup.launchToken } : {}),
     ...(coldRestoreStartup?.agent ? { launchAgent: coldRestoreStartup.agent } : {}),
     ...(session.shouldDeclareHiddenAtSpawn() ? { initiallyHidden: true } : {}),
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/fresh-spawn-start.ts b/src/renderer/src/components/terminal-pane/pty-connection/fresh-spawn-start.ts
index fb164d978e72..b28133297a6e 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/fresh-spawn-start.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/fresh-spawn-start.ts
@@ -50,6 +50,11 @@ export function bindStartFreshSpawn(session: ConnectPanePtySession): void {
       releaseDeferredCwdFence()
       return Promise.resolve(null)
     }
+    const effectiveStartup = startupOverride === undefined ? session.paneStartup : startupOverride
+    if (effectiveStartup?.resumeSource?.cancelled) {
+      releaseDeferredCwdFence()
+      return Promise.resolve(null)
+    }
     session.authoritativeReattachGeneration += 1
     // Every fresh connect creates or rebinds a PTY. Do not let a legacy
     // response that omits `incarnationId` inherit the predecessor's fence.
@@ -90,7 +95,6 @@ export function bindStartFreshSpawn(session: ConnectPanePtySession): void {
     session.transportConnectInFlightSince = Date.now()
     session.pendingSpawnDeferral = null
     const visibleAtSpawn = session.deps.isVisibleRef.current === true
-    const effectiveStartup = startupOverride === undefined ? session.paneStartup : startupOverride
     const outputCallbacks = session.captureTransportOutputCallbacks(
       session.reportError,
       toProcessExitStartup(coldRestoreOverride ?? effectiveStartup)
@@ -163,7 +167,13 @@ export function bindStartFreshSpawn(session: ConnectPanePtySession): void {
         // unverifiable until a stamped attach result arrives.
         session.remotePtyIncarnationId = connectResult?.incarnationId ?? null
         if (connectResult?.isReattach) {
-          session.pendingStartupCommand = null
+          if (
+            session.pendingStartupCommand?.resumeSource === effectiveStartup?.resumeSource &&
+            (effectiveStartup?.resumeSource ||
+              session.pendingStartupCommand?.command === effectiveStartup?.command)
+          ) {
+            session.pendingStartupCommand = null
+          }
           const accepted = await session.handleReattachResult(
             connectResult,
             null,
@@ -184,19 +194,23 @@ export function bindStartFreshSpawn(session: ConnectPanePtySession): void {
           return accepted ? resolvedPtyId : null
         }
         // Why: main started a plain shell instead, so nothing of the plan may stay registered over it.
-        const coldRestore = connectResult?.agentResumeRefused ? null : coldRestoreOverride
-        if (connectResult?.agentResumeRefused) {
-          session.clearRegisteredStartupLaunchConfig()
-          session.pendingStartupCommand = null
+        const rejectedSavedStartup =
+          connectResult?.agentResumeRefused ||
+          (connectResult?.agentResumeUnavailable && effectiveStartup?.resumeSource)
+        const coldRestore = rejectedSavedStartup ? null : coldRestoreOverride
+        if (connectResult && rejectedSavedStartup) {
+          session.cancelSavedResumeStartup(coldRestoreOverride ?? effectiveStartup, connectResult)
         }
         if (connectResult?.agentResumeRefused === 'unverifiable') {
           // Why: the saved session may have been consumed before this spawn; keep it for the next try.
-          session.keepUnrunResumeHandle(startupOverride)
+          if (!(coldRestoreOverride ?? effectiveStartup)?.resumeSource?.record) {
+            session.keepUnrunResumeHandle(startupOverride)
+          }
         }
         if (spawnedPtyId && typeof spawnedPtyId === 'object' && 'id' in spawnedPtyId) {
           session.registerEffectiveLaunchConfig(spawnedPtyId.launchConfig, {
-            ...(coldRestore ? { launchToken: coldRestore.launchToken } : {}),
-            ...(coldRestore ? { launchAgent: coldRestore.agent } : {})
+            ...(spawnedPtyId.launchToken ? { launchToken: spawnedPtyId.launchToken } : {}),
+            ...(spawnedPtyId.launchAgent ? { launchAgent: spawnedPtyId.launchAgent } : {})
           })
         }
         if (resolvedPtyId) {
@@ -229,7 +243,7 @@ export function bindStartFreshSpawn(session: ConnectPanePtySession): void {
           // Why: delayed draft/follow-up delivery keys off this launch
           // registry. If spawn produced no PTY, the launch is no longer a
           // viable delivery target and must not wait for a future pane.
-          session.clearRegisteredStartupLaunchConfig()
+          session.clearRegisteredStartupLaunchConfig(coldRestoreOverride ?? effectiveStartup)
         }
         if (
           resolvedPtyId &&
@@ -276,7 +290,7 @@ export function bindStartFreshSpawn(session: ConnectPanePtySession): void {
           session.paneStartup?.launchConfig ||
           (startupOverride && 'launchConfig' in startupOverride)
         ) {
-          session.clearRegisteredStartupLaunchConfig()
+          session.clearRegisteredStartupLaunchConfig(coldRestoreOverride ?? effectiveStartup)
         }
         clearPreSignaledSerializer()
         return null
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/fresh-spawn-types.ts b/src/renderer/src/components/terminal-pane/pty-connection/fresh-spawn-types.ts
index 22dde900bf8b..f360309d4618 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/fresh-spawn-types.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/fresh-spawn-types.ts
@@ -1,12 +1,15 @@
 import type {
   AgentProviderSessionMetadata,
   ResumableTuiAgent,
+  SavedResumeStartupSource,
   SleepingAgentSessionRecord
 } from '../../../../../shared/agent-session-resume'
 import type { buildAgentResumeStartupPlan } from '@/lib/tui-agent-startup'
 
 export type PendingStartupCommand = {
   command: string
+  resumeSource?: SavedResumeStartupSource
+  isCurrent?: () => boolean
   env?: Record<string, string>
 }
 
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/hidden-agent-resume-deferral.ts b/src/renderer/src/components/terminal-pane/pty-connection/hidden-agent-resume-deferral.ts
index b633e1fd300e..566aee044a7f 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/hidden-agent-resume-deferral.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/hidden-agent-resume-deferral.ts
@@ -36,6 +36,9 @@ export function deferHiddenAgentResume(
     ptyId: session.transport.getPtyId(),
     record: recordEntry.record,
     wake: (): Promise<string | null> => {
+      if (startup?.resumeSource?.cancelled) {
+        return Promise.resolve(null)
+      }
       session.hiddenAgentResumeReleased = true
       return start().then((ptyId) => {
         // Why the transport: a held reattach resolves before it binds, and the hold must cover its fallback.
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/pane-serializer-settle.ts b/src/renderer/src/components/terminal-pane/pty-connection/pane-serializer-settle.ts
index 0130d1f05198..a257cc3ca9be 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/pane-serializer-settle.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/pane-serializer-settle.ts
@@ -61,9 +61,10 @@ export function bindSettlePaneSerializer(session: ConnectPanePtySession): void {
   // replacement. Only explicit terminal-paste stays renderer-owned.
   session.pendingStartupCommand = session.shouldDeliverStartupViaTerminalPaste
     ? session.paneStartup?.command
-      ? { command: session.paneStartup.command }
+      ? { command: session.paneStartup.command, resumeSource: session.paneStartup.resumeSource }
       : null
     : null
+  const startupSource = session.paneStartup?.resumeSource
   const startupDraftReadyScanner = session.ownsStartupDraftPaste
     ? createDraftPasteReadyScanner(
         session.startupDraftAgentConfig?.draftPasteReadySignal ??
@@ -91,6 +92,7 @@ export function bindSettlePaneSerializer(session: ConnectPanePtySession): void {
     const ptyId = session.transport.getPtyId()
     if (
       !ptyId ||
+      startupSource?.cancelled ||
       session.disposed ||
       session.deps.paneTransportsRef.current.get(session.pane.id) !== session.transport
     ) {
@@ -118,6 +120,9 @@ export function bindSettlePaneSerializer(session: ConnectPanePtySession): void {
     // Why: xterm focus reports share this transport queue. Bypassing it can
     // race CSI I against the draft on ConPTY and expose a literal `[I` prefix.
     void sendAgentDraftPasteContent(ptyId, session.startupDraftPrompt, 'launch', async (data) => {
+      if (getStartupDraftPtyId() !== ptyId) {
+        return false
+      }
       const accepted = await writeTerminalPastePtyInput(session.transport, data, 'launch')
       if (accepted && !startupDraftInputRecorded) {
         // Why: this transport write bypasses xterm's user-input signal; keep
@@ -159,6 +164,9 @@ export function bindSettlePaneSerializer(session: ConnectPanePtySession): void {
     }
     startupDraftHardTimer = setTimeout(() => {
       startupDraftHardTimer = null
+      if (!getStartupDraftPtyId()) {
+        return
+      }
       if (session.startupDraftAgent === 'codex') {
         startupDraftPasteSettled = true
         // A timed-out launch stays consumed across pane disposal and remount.
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/reattach-payload-context.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/reattach-payload-context.test.ts
index 9a5385431835..19647f404c59 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/reattach-payload-context.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/reattach-payload-context.test.ts
@@ -109,3 +109,57 @@ describe('reattach payload context', () => {
     expect(context.reattachPayloadApplied).toBe(true)
   })
 })
+
+it.each(['missing', 'different', 'admitted'] as const)(
+  'authorizes only the checked late saved candidate (%s)',
+  async (kind) => {
+    await installTerminalTestGlobals()
+    try {
+      const startup: ColdRestoreAgentResumeStartup = {
+        command: 'codex resume C',
+        agent: 'codex',
+        resumeOrigin: 'saved',
+        resumeProviderSession: { key: 'session_id', id: 'C' },
+        launchConfig: { agentCommand: 'codex', agentArgs: '', agentEnv: {} },
+        launchToken: 'saved-C',
+        resumeSource: { cancelled: false },
+        useLiveEntry: false,
+        hasSleepingRecord: false,
+        sleepingRecordEntry: null
+      }
+      const apply = vi.fn((value) => Boolean(value))
+      const cancel = vi.fn()
+      const schedule = vi.fn()
+      const session = createSession({
+        buildColdRestoreAgentResumeStartup: () => startup,
+        applyColdRestoreAgentResumeStartup: apply,
+        cancelSavedResumeStartup: cancel,
+        schedulePendingStartupCommandDelivery: schedule,
+        clearSleepingRecordAfterColdRestoreSpawn: vi.fn(),
+        showSessionRestoredBanner: vi.fn(),
+        consumeRestoredViewportBlankingMarker: vi.fn(),
+        writeFreshShellViewportBlanking: vi.fn()
+      })
+      const context = createContext('', 1)
+      context.connectResult = {
+        id: 'pty-1',
+        coldRestore: { scrollback: '', cwd: '/workspace' },
+        ...(kind === 'missing'
+          ? {}
+          : {
+              savedResumeDecision: {
+                agent: 'codex',
+                providerSession: { key: 'session_id', id: kind === 'different' ? 'D' : 'C' },
+                verdict: 'admitted'
+              }
+            })
+      }
+      await createReattachPayloadHandlers(session, context).applyReattachPayload()
+      expect(apply).toHaveBeenCalledWith(kind === 'admitted' ? startup : null)
+      expect(schedule).toHaveBeenCalledTimes(kind === 'admitted' ? 1 : 0)
+      expect(cancel).toHaveBeenCalledTimes(kind === 'admitted' ? 0 : 1)
+    } finally {
+      await restoreTerminalTestGlobals()
+    }
+  }
+)
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/reattach-payload-session.ts b/src/renderer/src/components/terminal-pane/pty-connection/reattach-payload-session.ts
index b4c963d29f48..51bcec05157a 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/reattach-payload-session.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/reattach-payload-session.ts
@@ -17,6 +17,7 @@ export type ReattachPayloadSession = Pick<
   | 'recordRendererOrderedSeq'
   | 'rememberReattachPayloadAgentSignal'
   | 'schedulePendingStartupCommandDelivery'
+  | 'cancelSavedResumeStartup'
   | 'sendFocusedReattachFocusInAfterReplay'
   | 'setRestoredSnapshotBaseline'
   | 'shouldPreserveAgentReattachModes'
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/reattach-result-handler.ts b/src/renderer/src/components/terminal-pane/pty-connection/reattach-result-handler.ts
index 067ae8c11b66..9e21d8073aef 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/reattach-result-handler.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/reattach-result-handler.ts
@@ -40,6 +40,7 @@ type ReattachResultSession = ReattachPayloadSession &
     | 'handleReattachResult'
     | 'mountFollowsTerminalPark'
     | 'registerEffectiveLaunchConfig'
+    | 'cancelSavedResumeStartup'
     | 'registerPaneSerializerFor'
     | 'registerSideEffectFactConsumerForPty'
     | 'reportPanePtyVisibility'
@@ -94,6 +95,12 @@ export function bindHandleReattachResult(sessionBag: ConnectPanePtySession): voi
       session.remotePtyIncarnationId = null
     }
 
+    if (
+      connectResult?.agentResumeRefused ||
+      (connectResult?.agentResumeUnavailable && !connectResult.isReattach)
+    ) {
+      session.cancelSavedResumeStartup(coldRestoreStartup ?? sessionBag.paneStartup, connectResult)
+    }
     if (connectResult?.exitedBeforeAttach) {
       if (connectResult.agentResumeUnavailable) {
         session.showSessionRestoredBanner('resume-unavailable')
@@ -103,7 +110,12 @@ export function bindHandleReattachResult(sessionBag: ConnectPanePtySession): voi
     }
 
     // Why: main started a plain shell instead, so nothing of the plan may be registered over it.
-    const startup = connectResult?.agentResumeRefused ? null : coldRestoreStartup
+    const startup =
+      connectResult?.agentResumeRefused ||
+      connectResult?.agentResumeUnavailable ||
+      connectResult?.isReattach
+        ? null
+        : coldRestoreStartup
     const ptyId =
       connectResult?.id ?? (typeof result === 'string' ? result : session.transport.getPtyId())
     const hasExplicitPtyId = Boolean(connectResult?.id || typeof result === 'string')
@@ -130,7 +142,7 @@ export function bindHandleReattachResult(sessionBag: ConnectPanePtySession): voi
       return false
     }
     session.registerEffectiveLaunchConfig(connectResult?.launchConfig, {
-      ...(startup ? { launchToken: startup.launchToken } : {}),
+      ...(connectResult?.launchToken ? { launchToken: connectResult.launchToken } : {}),
       ...(connectResult?.launchAgent
         ? { launchAgent: connectResult.launchAgent }
         : startup
@@ -179,7 +191,10 @@ export function bindHandleReattachResult(sessionBag: ConnectPanePtySession): voi
     if (
       !hasStructuralReplay &&
       connectResult?.isReattach &&
-      hasEmptyReattachRetireEvidence(ptyId, startup)
+      hasEmptyReattachRetireEvidence(
+        ptyId,
+        connectResult.agentResumeRefused ? null : coldRestoreStartup
+      )
     ) {
       session.transport.disconnect()
       if (staleSessionId) {
@@ -188,7 +203,7 @@ export function bindHandleReattachResult(sessionBag: ConnectPanePtySession): voi
       } else {
         session.syncPanePtyLayoutBinding(null)
       }
-      session.startFreshColdRestoreAgentResume(startup, {
+      session.startFreshColdRestoreAgentResume(coldRestoreStartup, {
         forceBlankRestoredViewport: true
       })
       return false
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/saved-resume-cancellation.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/saved-resume-cancellation.test.ts
new file mode 100644
index 000000000000..4c1d029bc8df
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/pty-connection/saved-resume-cancellation.test.ts
@@ -0,0 +1,129 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import type { ConnectPanePtySession } from './connect-pane-pty-session'
+import { bindSettlePaneSerializer } from './pane-serializer-settle'
+import { bindDeferredColdRestoreAndSnapshot } from './deferred-cold-restore-and-snapshot'
+import { installSleepingRecordAccess } from './sleeping-record-access'
+
+const fixture = vi.hoisted(() => ({ state: {}, paste: vi.fn(), parsed: vi.fn(async () => {}) }))
+vi.mock('@/store', () => ({ useAppStore: { getState: () => fixture.state, setState: vi.fn() } }))
+vi.mock('@/lib/pane-manager/pane-terminal-output-scheduler', () => ({
+  waitForTerminalOutputParsed: fixture.parsed
+}))
+vi.mock('../terminal-startup-command-paste', () => ({
+  executeTerminalStartupCommandPaste: fixture.paste
+}))
+vi.mock('../terminal-paste-runtime', () => ({ resolveTerminalPasteRuntime: () => ({}) }))
+vi.mock('@/lib/new-workspace', () => ({ CLIENT_PLATFORM: 'win32' }))
+vi.mock('./command-inferred-pane-agent', () => ({ installCommandInferredPaneAgent: vi.fn() }))
+
+afterEach(() => {
+  vi.useRealTimers()
+  vi.clearAllMocks()
+})
+
+describe('a refused saved startup and its delayed paste', () => {
+  it.each(['original', 'same-C', 'different-D', 'unverifiable'] as const)(
+    'cancels only its captured source and keeps newer work (%s)',
+    async (kind) => {
+      vi.useFakeTimers()
+      const record = {
+        paneKey: 'tab:leaf',
+        tabId: 'tab',
+        worktreeId: 'wt',
+        agent: 'codex' as const,
+        providerSession: { key: 'session_id' as const, id: 'C' },
+        connectionId: null,
+        state: 'done' as const,
+        prompt: '',
+        capturedAt: 10,
+        updatedAt: 10,
+        origin: 'worktree-sleep' as const
+      }
+      const source = { cancelled: false, record }
+      const startup = {
+        command: 'codex resume C',
+        launchAgent: 'codex' as const,
+        resumeProviderSession: record.providerSession,
+        resumeOrigin: 'saved' as const,
+        resumeSource: source
+      }
+      const records = kind === 'unverifiable' ? {} : { [record.paneKey]: record }
+      const clear = vi.fn()
+      const remember = vi.fn()
+      fixture.state = {
+        sleepingAgentSessionsByPaneKey: records,
+        automaticAgentResumeClaimsByTabId: {},
+        agentLaunchConfigByPaneKey: {},
+        pendingStartupByTabId: {},
+        tabsByWorktree: {},
+        registerAgentLaunchConfig: vi.fn(),
+        clearAgentLaunchConfig: vi.fn(),
+        consumeTabStartupCommand: vi.fn(),
+        clearSleepingAgentSession: clear,
+        rememberSleepingAgentSession: remember
+      }
+      const sendInput = vi.fn(() => true)
+      const transport = { getPtyId: () => 'shell', sendInput }
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the installers' accessed session members are supplied here.
+      const session = {
+        pane: { id: 1, leafId: 'leaf', terminal: {} },
+        manager: {},
+        transport,
+        deps: {
+          worktreeId: 'wt',
+          tabId: 'tab',
+          paneTransportsRef: { current: new Map([[1, transport]]) }
+        },
+        cacheKey: record.paneKey,
+        paneStartup: startup,
+        startupInjectTimer: null,
+        disposed: false,
+        transportStreamGeneration: 1,
+        shouldDeliverStartupViaTerminalPaste: true,
+        releaseUnattemptedStartupDraftPasteDelivery: vi.fn()
+      } as unknown as ConnectPanePtySession
+      installSleepingRecordAccess(session)
+      bindSettlePaneSerializer(session)
+      bindDeferredColdRestoreAndSnapshot(session)
+      let finishPaste: (() => void) | undefined
+      fixture.paste.mockImplementation(
+        () =>
+          new Promise((resolve) => {
+            finishPaste = () => resolve({ status: 'pasted' })
+          })
+      )
+      session.schedulePendingStartupCommandDelivery()
+      await vi.advanceTimersByTimeAsync(50)
+      expect(fixture.paste).toHaveBeenCalledOnce()
+
+      const newer = { command: kind === 'different-D' ? 'codex resume D' : 'codex resume C' }
+      session.pendingStartupCommand = newer
+      if (kind === 'same-C' || kind === 'different-D') {
+        Object.assign(records, {
+          [record.paneKey]: {
+            ...record,
+            providerSession: { ...record.providerSession, id: kind === 'same-C' ? 'C' : 'D' },
+            updatedAt: 20
+          }
+        })
+      }
+      session.cancelSavedResumeStartup(startup, {
+        id: 'shell',
+        agentResumeRefused: kind === 'unverifiable' ? 'unverifiable' : 'chat-home'
+      })
+      expect(source.cancelled).toBe(true)
+      expect(session.pendingStartupCommand).toBe(newer)
+      finishPaste?.()
+      await vi.advanceTimersByTimeAsync(0)
+      expect(sendInput).not.toHaveBeenCalled()
+      expect(session.pendingStartupCommand).toBe(newer)
+      if (kind === 'unverifiable') {
+        expect(remember).toHaveBeenCalledWith(record)
+      } else if (kind === 'original') {
+        expect(clear).toHaveBeenCalledWith(record.paneKey)
+      } else {
+        expect(clear).not.toHaveBeenCalled()
+      }
+    }
+  )
+})
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/saved-resume-startup-cancellation.ts b/src/renderer/src/components/terminal-pane/pty-connection/saved-resume-startup-cancellation.ts
new file mode 100644
index 000000000000..ee0c0ed84d5c
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/pty-connection/saved-resume-startup-cancellation.ts
@@ -0,0 +1,102 @@
+import { forgetRefusedPaneResume } from '@/lib/forget-refused-pane-resume'
+import { useAppStore } from '@/store'
+import type { ColdRestoreAgentResumeStartup } from './fresh-spawn-types'
+import type { PtyPaneStartup } from '../pty-connection-types'
+import type { PtyConnectResult } from '../pty-transport-types'
+import type { ConnectPanePtySession } from './connect-pane-pty-session'
+import { clearStaleAgentTabTitleOnConfirmedShell } from './confirmed-shell-agent-title'
+
+export function installSavedResumeStartupCancellation(session: ConnectPanePtySession): void {
+  session.cancelSavedResumeStartup = (
+    startup: ColdRestoreAgentResumeStartup | PtyPaneStartup | null | undefined,
+    result: PtyConnectResult
+  ): void => {
+    const source = startup?.resumeSource
+    if (!startup || !source) {
+      return
+    }
+    source.cancelled = true
+    const state = useAppStore.getState()
+    state.consumeTabStartupCommand(session.deps.tabId, startup)
+    if (session.pendingStartupCommand?.resumeSource === source) {
+      session.pendingStartupCommand = null
+      if (session.startupInjectTimer !== null) {
+        clearTimeout(session.startupInjectTimer)
+      }
+      session.startupInjectTimer = null
+    }
+    if (session.deferredSpawn?.startupOverride?.resumeSource === source) {
+      session.deferredSpawn = null
+    }
+    session.clearRegisteredStartupLaunchConfig(startup)
+    const claim = state.automaticAgentResumeClaimsByTabId[session.deps.tabId]
+    if (
+      session.paneStartup?.resumeSource === source &&
+      claim &&
+      claim === session.savedStartupAutomaticClaim
+    ) {
+      useAppStore.setState((current) => {
+        if (current.automaticAgentResumeClaimsByTabId[session.deps.tabId] !== claim) {
+          return current
+        }
+        const next = { ...current.automaticAgentResumeClaimsByTabId }
+        delete next[session.deps.tabId]
+        return { automaticAgentResumeClaimsByTabId: next }
+      })
+    }
+    if (session.paneStartup?.resumeSource === source) {
+      const pending = state.pendingStartupByTabId[session.deps.tabId]
+      const installed = useAppStore.getState().agentLaunchConfigByPaneKey[session.cacheKey]
+      const replaced = pending && pending.resumeSource !== source
+      if (!replaced && !installed) {
+        const tab = (state.tabsByWorktree[session.deps.worktreeId] ?? []).find(
+          (entry) => entry.id === session.deps.tabId
+        )
+        if (
+          tab?.launchAgent === session.paneStartup.launchAgent &&
+          (tab?.generation ?? 0) === session.tabGeneration
+        ) {
+          state.clearTabLaunchAgent(session.deps.tabId)
+          clearStaleAgentTabTitleOnConfirmedShell(session)
+        }
+      }
+      const seeded = session.savedStartupStatus
+      if (seeded?.source === source) {
+        useAppStore.setState((current) => {
+          if (current.agentStatusByPaneKey[session.cacheKey] !== seeded.entry) {
+            return current
+          }
+          const next = { ...current.agentStatusByPaneKey }
+          delete next[session.cacheKey]
+          return { agentStatusByPaneKey: next }
+        })
+      }
+      session.paneStartup = null
+      session.startupDraftPrompt = null
+      session.cleanupStartupDraftPasteTimers?.()
+    }
+    if (
+      result.agentResumeRefused !== 'unverifiable' &&
+      source.expectedStatus &&
+      startup.resumeProviderSession
+    ) {
+      forgetRefusedPaneResume(state, source.expectedStatus.paneKey, {
+        agent: 'agent' in startup ? startup.agent : (startup.launchAgent ?? ''),
+        providerSession: startup.resumeProviderSession,
+        expectedStatus: source.expectedStatus
+      })
+    }
+    const captured = source.record
+    if (!captured) {
+      return
+    }
+    const current = state.sleepingAgentSessionsByPaneKey[captured.paneKey]
+    if (result.agentResumeRefused === 'unverifiable') {
+      if (!current) {
+        state.rememberSleepingAgentSession(captured)
+      }
+    } else if (current === captured) {
+      state.clearSleepingAgentSession(captured.paneKey)
+    }
+  }
+}
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/sleeping-record-access.ts b/src/renderer/src/components/terminal-pane/pty-connection/sleeping-record-access.ts
index 094dd825afca..e58dcc4616d6 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/sleeping-record-access.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/sleeping-record-access.ts
@@ -1,3 +1,5 @@
+import { installSavedResumeStartupCancellation } from './saved-resume-startup-cancellation'
+import { launchConfigsEqual } from '../../../../../shared/agent-resume-record-equivalence'
 import { useAppStore } from '@/store'
 import type { PtyConnectResult } from '../pty-transport-types'
 import { createBrowserUuid } from '@/lib/browser-uuid'
@@ -85,6 +87,9 @@ export function installSleepingRecordAccess(session: ConnectPanePtySession): voi
       }
     }
   }
+  session.savedStartupAutomaticClaim = session.paneStartup?.resumeSource
+    ? useAppStore.getState().automaticAgentResumeClaimsByTabId[session.deps.tabId]
+    : undefined
   session.launchToken = session.paneStartup?.launchConfig
     ? (session.paneStartup.launchToken ?? createBrowserUuid())
     : undefined
@@ -146,6 +151,12 @@ export function installSleepingRecordAccess(session: ConnectPanePtySession): voi
         tabId: session.deps.tabId,
         leafId: session.pane.leafId
       })
+    if (session.paneStartup.resumeSource) {
+      session.savedStartupLaunchRegistration = {
+        source: session.paneStartup.resumeSource,
+        entry: useAppStore.getState().agentLaunchConfigByPaneKey[session.cacheKey]
+      }
+    }
   } else if (session.paneStartup) {
     useAppStore.getState().clearAgentLaunchConfig(session.cacheKey)
   }
@@ -188,9 +199,24 @@ export function installSleepingRecordAccess(session: ConnectPanePtySession): voi
       leafId: session.pane.leafId
     })
   }
-  session.clearRegisteredStartupLaunchConfig = (): void => {
-    useAppStore.getState().clearAgentLaunchConfig(session.cacheKey)
+  session.clearRegisteredStartupLaunchConfig = (expected = session.paneStartup): void => {
+    const state = useAppStore.getState()
+    const installed = state.agentLaunchConfigByPaneKey[session.cacheKey]
+    const captured = session.savedStartupLaunchRegistration
+    const ownsRegistration = expected?.resumeSource
+      ? captured?.source === expected.resumeSource && captured.entry === installed
+      : true
+    if (
+      ownsRegistration &&
+      installed &&
+      expected?.launchConfig &&
+      installed.identity.launchToken === (expected.launchToken ?? session.launchToken) &&
+      launchConfigsEqual(installed.launchConfig, expected.launchConfig)
+    ) {
+      state.clearAgentLaunchConfig(session.cacheKey)
+    }
   }
+  installSavedResumeStartupCancellation(session)
   session.neutralTerminalTitle = (): string => {
     const state = useAppStore.getState()
     const tab = (state.tabsByWorktree[session.deps.worktreeId] ?? []).find(
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/spawn-deferred-sleep.ts b/src/renderer/src/components/terminal-pane/pty-connection/spawn-deferred-sleep.ts
index 1abfc7ab1a52..b6582f2121f3 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/spawn-deferred-sleep.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/spawn-deferred-sleep.ts
@@ -153,8 +153,10 @@ export function installSpawnDeferredSleep(session: ConnectPanePtySession): void
   session.keepUnrunResumeHandle = (
     startupOverride: PendingStartupCommand | null | undefined
   ): void => {
-    const record = deferredResumeRecord(session, startupOverride)
-    if (record) {
+    const captured =
+      startupOverride?.resumeSource?.record ?? session.paneStartup?.resumeSource?.record
+    const record = captured ?? deferredResumeRecord(session, startupOverride)
+    if (record && !useAppStore.getState().sleepingAgentSessionsByPaneKey[record.paneKey]) {
       // Why left after a later resume: the next quit capture replaces it, and a pane with a live PTY owns it.
       useAppStore.getState().rememberSleepingAgentSession(record)
     }
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/title-spawn-bell.ts b/src/renderer/src/components/terminal-pane/pty-connection/title-spawn-bell.ts
index f4d73993fb83..8b443aa5afda 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/title-spawn-bell.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/title-spawn-bell.ts
@@ -75,9 +75,10 @@ export function installTitleSpawnBell(session: ConnectPanePtySession): void {
   }
 
   session.applyInitialAgentStatus = (terminalTitle?: string): void => {
-    const initialStatus = session.paneStartup?.initialAgentStatus
+    const startup = session.paneStartup
+    const initialStatus = startup?.initialAgentStatus
     const routing = session.resolveCurrentAgentStatusRouting()
-    if (!initialStatus || !routing) {
+    if (!initialStatus || !routing || startup.resumeSource?.cancelled) {
       return
     }
     const statusPayload = {
@@ -100,11 +101,17 @@ export function installTitleSpawnBell(session: ConnectPanePtySession): void {
           launchConfig: session.paneStartup.launchConfig,
           ...(session.launchToken ? { launchToken: session.launchToken } : {})
         })
-      return
+    } else {
+      useAppStore
+        .getState()
+        .setAgentStatus(session.cacheKey, statusPayload, terminalTitle, undefined, routing)
+    }
+    if (startup.resumeSource) {
+      session.savedStartupStatus = {
+        source: startup.resumeSource,
+        entry: useAppStore.getState().agentStatusByPaneKey[session.cacheKey]
+      }
     }
-    useAppStore
-      .getState()
-      .setAgentStatus(session.cacheKey, statusPayload, terminalTitle, undefined, routing)
   }
 
   session.canApplyCommandCodeOutputStatus = (): boolean => {
diff --git a/src/renderer/src/components/terminal-pane/pty-transport-types.ts b/src/renderer/src/components/terminal-pane/pty-transport-types.ts
index f4d0ebbef6b2..b39253244082 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport-types.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport-types.ts
@@ -1,3 +1,4 @@
+import type { TerminalLaunchResult } from '../../../../shared/agent-session-resume'
 import type { AgentIdleEdgeMeta } from '../../../../shared/terminal-output-side-effects'
 import type {
   RestoreSpawnIntent,
@@ -90,7 +91,7 @@ export type LocalPtySessionMetadata = {
   shellOverride?: string
 }
 
-export type PtyConnectResult = {
+export type PtyConnectResult = TerminalLaunchResult & {
   id: string
   /** Host-owned PTY incarnation used to fence remote identity observations. */
   incarnationId?: string
diff --git a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-host-session-launch.test.ts b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-host-session-launch.test.ts
index 4cfd751cb17f..ec1cc1365ded 100644
--- a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-host-session-launch.test.ts
+++ b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-host-session-launch.test.ts
@@ -1,3 +1,4 @@
+import { ExplicitEnsure } from '../../../../shared/rpc-contract/agent-session-params'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 // These transport fixtures never read abandoned-launch ownership from the app store.
 const appStore = vi.hoisted(() => ({
@@ -127,6 +128,63 @@ describe('createRemoteRuntimePtyTransport', () => {
     return payload
   }
 
+  it('round-trips a strict saved ensure and its actual refused shell result', async () => {
+    const providerSession = { key: 'session_id' as const, id: 'C' }
+    const decision = { agent: 'codex' as const, providerSession, verdict: 'chat-home' as const }
+    runtimeCall.mockImplementation(async (args: { method?: string; params?: unknown }) => {
+      if (args.method === 'status.get') {
+        return {
+          ok: true,
+          result: {
+            runtimeProtocolVersion: 3,
+            minCompatibleRuntimeClientVersion: 2,
+            capabilities: [
+              'agent-session.host-authority.v1',
+              'agent-session.saved-resume-origin.v1'
+            ]
+          }
+        }
+      }
+      expect(args.method).toBe('terminal.ensureAgentSession')
+      expect(ExplicitEnsure.parse(args.params)).toMatchObject({
+        resumeOrigin: 'saved',
+        providerSession
+      })
+      return {
+        ok: true,
+        result: {
+          disposition: 'created',
+          terminal: {
+            handle: 'term-remote',
+            worktreeId: 'repo1::/remote/wt',
+            title: null,
+            savedResumeDecision: decision,
+            agentResumeRefused: 'chat-home',
+            agentResumeUnavailable: true
+          }
+        }
+      }
+    })
+    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
+    const transport = createRemoteRuntimePtyTransport('env-1', {
+      worktreeId: 'repo1::/remote/wt',
+      launchAgent: 'codex',
+      resumeOrigin: 'saved',
+      resumeProviderSession: providerSession,
+      tabId: 'tab-1',
+      leafId: '11111111-1111-4111-8111-111111111111'
+    })
+    const result = await transport.connect({ url: '', callbacks: {} })
+    expect(result).toMatchObject({
+      id: 'remote:env-1@@term-remote',
+      savedResumeDecision: decision,
+      agentResumeRefused: 'chat-home',
+      agentResumeUnavailable: true
+    })
+    expect(result).not.toHaveProperty('launchAgent')
+    transport.disconnect()
+  })
+
   it('creates and subscribes to a terminal on the active remote runtime', async () => {
     const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
     const onReplayData = vi.fn()
diff --git a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-spawn-intent.test.ts b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-spawn-intent.test.ts
index 9d55c0318df5..cec19002e953 100644
--- a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-spawn-intent.test.ts
+++ b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-spawn-intent.test.ts
@@ -22,7 +22,7 @@ function okResponse(result: unknown): unknown {
 }
 
 describe('createRemoteRuntimePtyTransport: restore spawn intent', () => {
-  const runtimeCall = vi.fn()
+  const runtimeCall = vi.fn<(args: RpcCall) => Promise<unknown>>()
   let capabilities: string[] = []
   let ensureResponse: unknown = null
 
@@ -66,12 +66,16 @@ describe('createRemoteRuntimePtyTransport: restore spawn intent', () => {
     vi.unstubAllGlobals()
   })
 
-  async function connectResume(callbacks: Record<string, unknown> = {}): Promise<unknown> {
+  async function connectResume(
+    callbacks: Record<string, unknown> = {},
+    saved = false
+  ): Promise<unknown> {
     const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
     const transport = createRemoteRuntimePtyTransport('env-1', {
       worktreeId: 'repo1::/remote/wt',
       launchAgent: 'claude',
       resumeProviderSession: RESUME,
+      ...(saved ? { resumeOrigin: 'saved' as const } : {}),
       tabId: 'tab-1',
       leafId: LEAF_ID
     })
@@ -104,6 +108,46 @@ describe('createRemoteRuntimePtyTransport: restore spawn intent', () => {
     expect(ensureParams()).not.toHaveProperty('spawnIntent')
   })
 
+  it.each([false, true])(
+    'keeps saved-origin negotiation stable through an unknown outcome (capability %s)',
+    async (modern) => {
+      if (modern) {
+        capabilities.push('agent-session.saved-resume-origin.v1')
+      }
+      let attempts = 0
+      runtimeCall.mockImplementation(async (args: RpcCall) => {
+        if (args.method === 'status.get') {
+          return okResponse({
+            runtimeProtocolVersion: 3,
+            minCompatibleRuntimeClientVersion: 2,
+            capabilities
+          })
+        }
+        if (args.method === 'terminal.ensureAgentSession' && attempts++ === 0) {
+          capabilities = [...capabilities, 'agent-session.saved-resume-origin.v1']
+          throw Object.assign(new Error('Timed out waiting for the remote Orca runtime.'), {
+            code: 'runtime_timeout'
+          })
+        }
+        return ensureResponse
+      })
+      const onSpawnDeferred = vi.fn()
+      await connectResume({ onSpawnDeferred }, true)
+      const requests = runtimeCall.mock.calls
+        .map(([call]) => call)
+        .filter((call) => call.method === 'terminal.ensureAgentSession')
+      expect(requests).toHaveLength(2)
+      expect(requests[1].params).toEqual(requests[0].params)
+      expect(requests[0].params).toMatchObject({ kind: 'explicit', providerSession: RESUME })
+      if (modern) {
+        expect(requests[0].params).toHaveProperty('resumeOrigin', 'saved')
+      } else {
+        expect(requests[0].params).not.toHaveProperty('resumeOrigin')
+      }
+      expect(onSpawnDeferred).toHaveBeenCalledWith('paused')
+    }
+  )
+
   it('reports a deferral to the pane instead of surfacing an error', async () => {
     capabilities.push('terminal.spawn-intent.v1')
     const onError = vi.fn()
diff --git a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport.ts b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport.ts
index 8619c3ae68aa..41cb3ca5539d 100644
--- a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport.ts
+++ b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport.ts
@@ -1,3 +1,7 @@
+import { terminalLaunchFacts } from '../../../../shared/agent-session-resume'
+import { isRuntimeCompatBlockError } from '@/runtime/runtime-protocol-compat'
+import { runtimeEnvironmentSupportsCapability } from '@/runtime/runtime-rpc-client'
+import { SAVED_RESUME_ORIGIN_RUNTIME_CAPABILITY } from '../../../../shared/protocol-version'
 import { readTerminalSpawnDeferral } from '../../../../shared/host-spawn-admission'
 import { remoteRestoreSpawnIntentParams } from '../../runtime/remote-restore-spawn-intent'
 import { createAgentSessionKeyboardOptions } from '@/runtime/agent-session-keyboard-capability'
@@ -532,6 +536,8 @@ export function createRemoteRuntimePtyTransport(
   }
   // Why: tab/leaf ids are shared by paired viewers; the instance suffix keeps one viewer's refresh off peer records.
   const clientId = `desktop:${tabId ?? 'tab'}:${leafId ?? 'leaf'}:${createBrowserUuid()}`
+  let replayLaunch: ((epoch: number) => Promise<RemoteAgentSessionLaunchResult | null>) | undefined
+  let savedOriginOptions: Promise<{ resumeOrigin?: 'saved' }> | undefined
   const terminalCreateMutationId = createBrowserUuid()
   // Why: reconnect retries must replay one host operation instead of creating
   // another fresh agent when the first response was lost.
@@ -3088,6 +3094,23 @@ export function createRemoteRuntimePtyTransport(
       if (restoreSpawnIntent && (destroyed || lifecycleEpoch !== connectLifecycleEpoch)) {
         return
       }
+      const originOptions =
+        (options.resumeOrigin ?? resumeOrigin) === 'saved'
+          ? await (savedOriginOptions ??= (async () => {
+              try {
+                const supported = await runtimeEnvironmentSupportsCapability(
+                  createEnvironmentId,
+                  SAVED_RESUME_ORIGIN_RUNTIME_CAPABILITY
+                )
+                return supported ? { resumeOrigin: 'saved' as const } : {}
+              } catch (error) {
+                if (isRuntimeCompatBlockError(error)) {
+                  throw error
+                }
+                return {}
+              }
+            })())
+          : {}
       const legacyCreateParams = {
         worktree: toRuntimeTerminalWorktreeSelector(worktreeId),
         clientMutationId: terminalCreateMutationId,
@@ -3101,9 +3124,7 @@ export function createRemoteRuntimePtyTransport(
         ...(resumeProviderSessionToSend !== undefined
           ? { resumeProviderSession: resumeProviderSessionToSend }
           : {}),
-        ...(resumeProviderSessionToSend && (options.resumeOrigin ?? resumeOrigin)
-          ? { resumeOrigin: options.resumeOrigin ?? resumeOrigin }
-          : {}),
+        ...originOptions,
         ...(launchTokenToSend !== undefined ? { launchToken: launchTokenToSend } : {}),
         ...(launchAgentToSend !== undefined ? { launchAgent: launchAgentToSend } : {}),
         ...spawnIntentParams,
@@ -3116,7 +3137,7 @@ export function createRemoteRuntimePtyTransport(
         presentation: 'background' as const,
         ...(activate === true ? { activate: true } : {})
       }
-      const legacyCreate = () =>
+      const legacyCreate = (epoch = connectLifecycleEpoch) =>
         createWithUnknownOutcomeRecovery(
           'terminal',
           (timeoutMs, reconcileExisting) =>
@@ -3130,9 +3151,9 @@ export function createRemoteRuntimePtyTransport(
               timeoutMs
             ),
           createEnvironmentId,
-          connectLifecycleEpoch
+          epoch
         )
-      const hostAuthorityCreate = async () => {
+      const hostAuthorityCreate = async (epoch = connectLifecycleEpoch) => {
         const keyboardOptions = await agentKeyboardOptions(createEnvironmentId)
         return createWithUnknownOutcomeRecovery(
           'agent-session',
@@ -3144,6 +3165,7 @@ export function createRemoteRuntimePtyTransport(
                   {
                     kind: 'explicit',
                     ...keyboardOptions,
+                    ...originOptions,
                     worktree: toRuntimeTerminalWorktreeSelector(worktreeId),
                     agent: launchAgentToSend!,
                     providerSession: resumeProviderSessionToSend,
@@ -3182,24 +3204,32 @@ export function createRemoteRuntimePtyTransport(
                   timeoutMs
                 ),
           createEnvironmentId,
-          connectLifecycleEpoch
+          epoch
         )
       }
       const resumeHostAuthorityCapability = resumeProviderSessionToSend
         ? agentResumeHostAuthorityCapability(launchAgentToSend)
         : undefined
-      const created = launchAgentToSend
-        ? agentSessionRequiresHostAuthorityReplay
-          ? await hostAuthorityCreate()
-          : await runRemoteAgentSessionLaunch<RemoteAgentSessionLaunchResult | null>({
-              environmentId: createEnvironmentId,
-              hostAuthority: hostAuthorityCreate,
-              ...(resumeHostAuthorityCapability
-                ? { hostAuthorityCapability: resumeHostAuthorityCapability }
-                : {}),
-              legacy: legacyCreate
-            })
-        : await legacyCreate()
+      const created = replayLaunch
+        ? await replayLaunch(connectLifecycleEpoch)
+        : launchAgentToSend
+          ? agentSessionRequiresHostAuthorityReplay
+            ? await hostAuthorityCreate()
+            : await runRemoteAgentSessionLaunch<RemoteAgentSessionLaunchResult | null>({
+                environmentId: createEnvironmentId,
+                hostAuthority: () => {
+                  replayLaunch = hostAuthorityCreate
+                  return hostAuthorityCreate()
+                },
+                ...(resumeHostAuthorityCapability
+                  ? { hostAuthorityCapability: resumeHostAuthorityCapability }
+                  : {}),
+                legacy: () => {
+                  replayLaunch = legacyCreate
+                  return legacyCreate()
+                }
+              })
+          : await (replayLaunch = legacyCreate)()
       if (!created) {
         if (!destroyed && lifecycleEpoch === connectLifecycleEpoch) {
           connecting = false
@@ -3267,6 +3297,8 @@ export function createRemoteRuntimePtyTransport(
       }
 
       return {
+        ...terminalLaunchFacts(createdTerminal),
+        ...(createdTerminal.coldRestore ? { coldRestore: createdTerminal.coldRestore } : {}),
         id: remotePtyId,
         replay: '',
         ...(authoritativePtyIncarnationId ? { incarnationId: authoritativePtyIncarnationId } : {}),
diff --git a/src/renderer/src/hooks/ipc-events/agent-status-listeners.ts b/src/renderer/src/hooks/ipc-events/agent-status-listeners.ts
index 3e6a62c3c073..fe9d365c748d 100644
--- a/src/renderer/src/hooks/ipc-events/agent-status-listeners.ts
+++ b/src/renderer/src/hooks/ipc-events/agent-status-listeners.ts
@@ -24,6 +24,9 @@ function dropEventsRestoringRefused(
   }
 ): void {
   const restores = (event: AgentStatusIpcPayload): boolean =>
+    !!refused.expectedStatus &&
+    event.receivedAt <= refused.expectedStatus.receivedAt &&
+    event.stateStartedAt === refused.expectedStatus.stateStartedAt &&
     resolveAgentPaneAuthorityKey(event.paneKey) === paneKey &&
     namesRefusedResume(refused, { ...event, agent: event.agentType })
   const pending = queues.pendingAgentStatusEvents
diff --git a/src/renderer/src/i18n/en-runtime-required.json b/src/renderer/src/i18n/en-runtime-required.json
index cfb2f0362c15..be251bdb1857 100644
--- a/src/renderer/src/i18n/en-runtime-required.json
+++ b/src/renderer/src/i18n/en-runtime-required.json
@@ -2969,6 +2969,7 @@
         "runCommandAgain": "Run /{{command}} again.",
         "runCommandWhenDone": "Run /{{command}} when it's done.",
         "runtimeNotInstalled": "{{agent}} isn't installed on the computer running this chat. Install it from the chat in a current version of Orca.",
+        "conversationOpenElsewhere": "Codex still has this conversation open somewhere else. Close it there, then try again.",
         "conversationOpenInTerminal": "Orca can't confirm {{agent}} has exited in its terminal. Stop what's running there or close the terminal, then try again.",
         "sendAgainToTryOnceMore": "Send your message again to try once more.",
         "sendToTryAgain": "Send your message to try again.",
diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index 6baed6a4e4fc..ae05c28d041a 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -18346,6 +18346,7 @@
         "claudeAccountSetupFailed": "The selected Claude account could not be set up. Try again or choose another account.",
         "agentCommandNotRunnable": "{{agent}}'s Command in Settings → Agents must be a program path or name Orca can find, with no arguments or variables. Change it or reset it.",
         "runtimeNotInstalled": "{{agent}} isn't installed on the computer running this chat. Install it from the chat in a current version of Orca.",
+        "conversationOpenElsewhere": "Codex still has this conversation open somewhere else. Close it there, then try again.",
         "conversationOpenInTerminal": "Orca can't confirm {{agent}} has exited in its terminal. Stop what's running there or close the terminal, then try again.",
         "chooseClaudeAccount": "Choose or add one in Claude Accounts settings.",
         "chooseClaudeAccountThenRunCommand": "Choose or add one in Claude Accounts settings, then run /{{command}} again.",
diff --git a/src/renderer/src/i18n/locales/es.json b/src/renderer/src/i18n/locales/es.json
index 6d425fd3aa2b..f232d4a69154 100644
--- a/src/renderer/src/i18n/locales/es.json
+++ b/src/renderer/src/i18n/locales/es.json
@@ -18060,6 +18060,7 @@
         "claudeAccountSetupFailed": "No se pudo configurar la cuenta de Claude seleccionada. Vuelva a intentarlo o elija otra cuenta.",
         "agentCommandNotRunnable": "{{agent}}: el Comando en Ajustes → Agentes debe ser la ruta o el nombre de un programa que Orca pueda encontrar, sin argumentos ni variables. Cámbielo o restablézcalo con Reiniciar.",
         "runtimeNotInstalled": "{{agent}} no está instalado en el equipo que ejecuta este chat. Instálelo desde el chat en una versión actual de Orca.",
+        "conversationOpenElsewhere": "Codex aún tiene esta conversación abierta en otro lugar. Ciérrela allí y vuelva a intentarlo.",
         "conversationOpenInTerminal": "Orca no puede confirmar que {{agent}} haya salido en su terminal. Detenga lo que se esté ejecutando allí o cierre la terminal y vuelva a intentarlo.",
         "chooseClaudeAccount": "Elija o agregue una en la configuración de Cuentas de Claude.",
         "chooseClaudeAccountThenRunCommand": "Elija o agregue una en la configuración de Cuentas de Claude y vuelva a ejecutar /{{command}}.",
diff --git a/src/renderer/src/i18n/locales/fr.json b/src/renderer/src/i18n/locales/fr.json
index bfcd4eaac1d2..1da9b09e2a39 100644
--- a/src/renderer/src/i18n/locales/fr.json
+++ b/src/renderer/src/i18n/locales/fr.json
@@ -18169,6 +18169,7 @@
         "claudeAccountSetupFailed": "Le compte Claude sélectionné n'a pas pu être configuré. Réessayez ou choisissez un autre compte.",
         "agentCommandNotRunnable": "{{agent}} : la Commande dans Paramètres → Agents doit être le chemin ou le nom d'un programme qu'Orca peut trouver, sans arguments ni variables. Modifiez-la ou réinitialisez-la.",
         "runtimeNotInstalled": "{{agent}} n'est pas installé sur l'ordinateur qui exécute ce chat. Installez-le depuis le chat dans une version récente d'Orca.",
+        "conversationOpenElsewhere": "Codex garde cette conversation ouverte ailleurs. Fermez-la à cet endroit, puis réessayez.",
         "conversationOpenInTerminal": "Orca ne peut pas confirmer que {{agent}} a quitté son terminal. Arrêtez ce qui s'y exécute ou fermez le terminal, puis réessayez.",
         "chooseClaudeAccount": "Choisissez-en un ou ajoutez-en un dans les paramètres Comptes Claude.",
         "chooseClaudeAccountThenRunCommand": "Choisissez-en un ou ajoutez-en un dans les paramètres Comptes Claude, puis relancez /{{command}}.",
diff --git a/src/renderer/src/i18n/locales/ja.json b/src/renderer/src/i18n/locales/ja.json
index ff8ec483edad..7f5f620fd4cd 100644
--- a/src/renderer/src/i18n/locales/ja.json
+++ b/src/renderer/src/i18n/locales/ja.json
@@ -18100,6 +18100,7 @@
         "claudeAccountSetupFailed": "選択した Claude アカウントを設定できませんでした。もう一度試すか、別のアカウントを選択してください。",
         "agentCommandNotRunnable": "[設定] → [Agent] にある {{agent}} の [コマンド] には、Orca が見つけられるプログラムのパスまたは名前を、引数や変数なしで指定する必要があります。変更するか、[リセット] してください。",
         "runtimeNotInstalled": "{{agent}} はこのチャットを実行しているコンピューターにインストールされていません。最新バージョンの Orca でチャットからインストールしてください。",
+        "conversationOpenElsewhere": "Codex はまだ別の場所でこの会話を開いています。そこで閉じてから、もう一度お試しください。",
         "conversationOpenInTerminal": "Orca は {{agent}} がターミナルで終了したことを確認できません。そこで実行中のものを停止するかターミナルを閉じてから、もう一度お試しください。",
         "chooseClaudeAccount": "Claude アカウントの設定で選択または追加してください。",
         "chooseClaudeAccountThenRunCommand": "Claude アカウントの設定で選択または追加してから、/{{command}} をもう一度実行してください。",
diff --git a/src/renderer/src/i18n/locales/ko.json b/src/renderer/src/i18n/locales/ko.json
index a2bf337d92a5..8489acc0e720 100644
--- a/src/renderer/src/i18n/locales/ko.json
+++ b/src/renderer/src/i18n/locales/ko.json
@@ -18100,6 +18100,7 @@
         "claudeAccountSetupFailed": "선택한 Claude 계정을 설정할 수 없습니다. 다시 시도하거나 다른 계정을 선택하세요.",
         "agentCommandNotRunnable": "{{agent}}의 설정 → 에이전트 → 명령은 Orca가 찾을 수 있는 프로그램 경로나 이름이어야 하며, 인수나 변수를 포함할 수 없습니다. 변경하거나 재설정하세요.",
         "runtimeNotInstalled": "{{agent}}이(가) 이 채팅을 실행하는 컴퓨터에 설치되어 있지 않습니다. 최신 버전의 Orca에서 채팅을 통해 설치하세요.",
+        "conversationOpenElsewhere": "Codex가 다른 곳에서 이 대화를 열어 두고 있습니다. 그곳에서 닫은 후 다시 시도하세요.",
         "conversationOpenInTerminal": "Orca에서 {{agent}}이(가) 터미널에서 종료되었는지 확인할 수 없습니다. 그곳에서 실행 중인 항목을 중지하거나 터미널을 닫은 후 다시 시도하세요.",
         "chooseClaudeAccount": "Claude 계정 설정에서 선택하거나 추가하세요.",
         "chooseClaudeAccountThenRunCommand": "Claude 계정 설정에서 선택하거나 추가한 다음 /{{command}}을(를) 다시 실행하세요.",
diff --git a/src/renderer/src/i18n/locales/zh.json b/src/renderer/src/i18n/locales/zh.json
index 7a8ec0fb5a7c..cbdf29ae07ab 100644
--- a/src/renderer/src/i18n/locales/zh.json
+++ b/src/renderer/src/i18n/locales/zh.json
@@ -18065,6 +18065,7 @@
         "claudeAccountSetupFailed": "无法设置所选 Claude 账户。请重试或选择其他账户。",
         "agentCommandNotRunnable": "{{agent}} 在设置 → 智能体中的命令必须是 Orca 能找到的程序路径或名称，且不能包含参数或变量。请修改或重置。",
         "runtimeNotInstalled": "运行此聊天的计算机上未安装 {{agent}}。请在最新版本的 Orca 中从聊天里安装。",
+        "conversationOpenElsewhere": "Codex 仍在其他地方打开着此对话。请在那里关闭后重试。",
         "conversationOpenInTerminal": "Orca 无法确认 {{agent}} 已在其终端中退出。请停止那里正在运行的内容或关闭终端，然后重试。",
         "chooseClaudeAccount": "请在 Claude 账户设置中选择或添加一个。",
         "chooseClaudeAccountThenRunCommand": "请在 Claude 账户设置中选择或添加一个，然后重新运行 /{{command}}。",
diff --git a/src/renderer/src/lib/forget-refused-pane-resume.ts b/src/renderer/src/lib/forget-refused-pane-resume.ts
index 3576d463630f..7372577bbcea 100644
--- a/src/renderer/src/lib/forget-refused-pane-resume.ts
+++ b/src/renderer/src/lib/forget-refused-pane-resume.ts
@@ -1,10 +1,10 @@
+import { useAppStore } from '@/store'
 import type { AppState } from '@/store/types'
 import type { RefusedPaneResume } from '../../../shared/agent-status-types'
 import {
   agentProviderSessionsEqual,
   type AgentProviderSessionMetadata
 } from '../../../shared/agent-session-resume'
-import { parseLegacyNumericPaneKey, parsePaneKey } from '../../../shared/stable-pane-id'
 
 /** Whether a saved claim names the refused conversation. Only local claims can: the host judged
  *  its own chats, and a remote host's same id is a different conversation. */
@@ -34,42 +34,33 @@ export function forgetRefusedPaneResume(
   paneKey: string,
   refused: RefusedPaneResume
 ): void {
-  const names = (claim: Parameters<typeof namesRefusedResume>[1]) =>
-    namesRefusedResume(refused, claim)
-  const retained = state.retainedAgentsByPaneKey[paneKey]
-  if (retained && names({ ...retained.entry, agent: retained.agentType })) {
-    state.dismissRetainedAgent(paneKey)
-  }
-  const live = state.agentStatusByPaneKey[paneKey]
-  // Why: a pane already on another conversation keeps that one's row, record, launch config and hint.
-  if (live && !names({ ...live, agent: live.agentType })) {
-    return
-  }
-  const tabId = parsePaneKey(paneKey)?.tabId ?? paneKey.split(':')[0]
-  // Why legacy numeric keys of this tab: they are this pane's older names, which its restore reads;
-  // a split sibling's current key is another pane.
-  const saved = Object.entries(state.sleepingAgentSessionsByPaneKey).flatMap(([key, record]) =>
-    (key === paneKey || parseLegacyNumericPaneKey(key)?.tabId === tabId) && names(record)
-      ? [key]
-      : []
-  )
-  if (saved.length > 0) {
-    state.clearSleepingAgentSessionsByPaneKey(saved)
-  }
-  // Why also with no row: the launch config the pane registered for the refused resume goes too.
-  state.removeAgentStatus(paneKey)
-  const hint = state.paneForegroundAgentByPaneKey[paneKey]
-  if (hint?.agentEvidence === 'launch-record' && hint.agent === refused.agent) {
-    state.clearPaneForegroundAgent(paneKey)
-  }
-  const tab = Object.values(state.tabsByWorktree)
-    .flat()
-    .find((candidate) => candidate.id === tabId)
-  // Why only this pane's tab: the chat's own tab carries the same conversation's title.
+  const expected = refused.expectedSavedRecord
+  const saved = expected && state.sleepingAgentSessionsByPaneKey[expected.paneKey]
   if (
-    tab?.aiVaultTitle?.agent === refused.agent &&
-    tab.aiVaultTitle.sessionId === refused.providerSession.id
+    expected &&
+    saved &&
+    saved.capturedAt === expected.capturedAt &&
+    saved.updatedAt === expected.updatedAt &&
+    namesRefusedResume(refused, saved)
   ) {
-    state.setAiVaultTabTitle(tab.id, null)
+    state.clearSleepingAgentSession(expected.paneKey)
+  }
+  const identity = refused.expectedStatus
+  if (!identity) {
+    return
   }
+  useAppStore.setState((current) => {
+    const live = current.agentStatusByPaneKey[paneKey]
+    if (
+      !live ||
+      live.updatedAt > identity.receivedAt ||
+      live.stateStartedAt !== identity.stateStartedAt ||
+      !namesRefusedResume(refused, { ...live, agent: live.agentType })
+    ) {
+      return current
+    }
+    const next = { ...current.agentStatusByPaneKey }
+    delete next[paneKey]
+    return { agentStatusByPaneKey: next }
+  })
 }
diff --git a/src/renderer/src/lib/sleeping-agent-session-launch.ts b/src/renderer/src/lib/sleeping-agent-session-launch.ts
index 197cc670677f..39c057f67b0a 100644
--- a/src/renderer/src/lib/sleeping-agent-session-launch.ts
+++ b/src/renderer/src/lib/sleeping-agent-session-launch.ts
@@ -82,6 +82,19 @@ export function launchSleepingAgentSession(
       launchConfig: startupPlan.launchConfig,
       resumeProviderSession: record.providerSession,
       resumeOrigin: 'saved',
+      resumeSource: {
+        cancelled: false,
+        record,
+        ...(state.agentStatusByPaneKey[record.paneKey]
+          ? {
+              expectedStatus: {
+                paneKey: record.paneKey,
+                receivedAt: state.agentStatusByPaneKey[record.paneKey].updatedAt,
+                stateStartedAt: state.agentStatusByPaneKey[record.paneKey].stateStartedAt
+              }
+            }
+          : {})
+      },
       launchAgent: record.agent,
       ...(launchConfig ? { agentArgsOverride: launchConfig.agentArgs } : {}),
       ...(startupPlan.startupCommandDelivery
diff --git a/src/renderer/src/store/terminals/terminal-state.ts b/src/renderer/src/store/terminals/terminal-state.ts
index 2550334dd91c..4c27bff02c43 100644
--- a/src/renderer/src/store/terminals/terminal-state.ts
+++ b/src/renderer/src/store/terminals/terminal-state.ts
@@ -1,3 +1,4 @@
+import type { SavedResumeStartupSource } from '../../../../shared/agent-session-resume'
 import type { ClosedTerminalTabTombstonesByTabId } from '../../../../shared/closed-terminal-tab-tombstones'
 import type { TerminalLayoutSnapshot, TerminalTab } from '../../../../shared/terminal-tab-types'
 import type { TuiAgent } from '../../../../shared/tui-agent'
@@ -57,6 +58,7 @@ export type TerminalState = {
       launchConfig?: SleepingAgentLaunchConfig
       resumeProviderSession?: AgentProviderSessionMetadata
       resumeOrigin?: 'saved'
+      resumeSource?: SavedResumeStartupSource
       launchToken?: string
       launchAgent?: TuiAgent
       /** The agent launch the pane's own spawn starts, instead of `command`. */
diff --git a/src/shared/agent-session-failure-copy.ts b/src/shared/agent-session-failure-copy.ts
index d0043aa466bc..b9b0f34ed90a 100644
--- a/src/shared/agent-session-failure-copy.ts
+++ b/src/shared/agent-session-failure-copy.ts
@@ -76,6 +76,8 @@ export const AGENT_SESSION_FAILURE_COPY = {
     "{{agent}}'s Command in Settings → Agents must be a program path or name Orca can find, with no arguments or variables. Change it or reset it.",
   runtimeNotInstalled:
     "{{agent}} isn't installed on the computer running this chat. Install it from the chat in a current version of Orca.",
+  conversationOpenElsewhere:
+    'Codex still has this conversation open somewhere else. Close it there, then try again.',
   conversationOpenInTerminal:
     "Orca can't confirm {{agent}} has exited in its terminal. Stop what's running there or close the terminal, then try again.",
   chooseClaudeAccount: 'Choose or add one in Claude Accounts settings.',
diff --git a/src/shared/agent-session-failure-words.ts b/src/shared/agent-session-failure-words.ts
index a6dc78b30004..ae538f21ff7f 100644
--- a/src/shared/agent-session-failure-words.ts
+++ b/src/shared/agent-session-failure-words.ts
@@ -183,6 +183,7 @@ const FAILURE_SENTENCES = {
   agentCommandNotRunnable: namingAgent('agentCommandNotRunnable'),
   runtimeNotInstalled: namingAgent('runtimeNotInstalled'),
   conversationOpenInTerminal: namingAgent('conversationOpenInTerminal'),
+  conversationOpenElsewhere: (_context, _fact, _surface, say) => say('conversationOpenElsewhere'),
   managedAccountUnsupported: (context, _fact, _surface, say) =>
     joinSentences([
       say('managedAccountUnsupported'),
diff --git a/src/shared/agent-session-failure.ts b/src/shared/agent-session-failure.ts
index 3237bbad826f..36957513964f 100644
--- a/src/shared/agent-session-failure.ts
+++ b/src/shared/agent-session-failure.ts
@@ -39,6 +39,7 @@ export const AGENT_SESSION_FAILURE_KINDS = [
   'agentCommandNotRunnable',
   'runtimeNotInstalled',
   'conversationOpenInTerminal',
+  'conversationOpenElsewhere',
   'providerExited',
   'restartFailed',
   'providerRejected',
diff --git a/src/shared/agent-session-host-authority.ts b/src/shared/agent-session-host-authority.ts
index 571cda3d6fb6..3f9eeed00bad 100644
--- a/src/shared/agent-session-host-authority.ts
+++ b/src/shared/agent-session-host-authority.ts
@@ -105,6 +105,7 @@ export type RuntimeEnsureAgentSessionRequest =
     }
   | {
       kind: 'explicit'
+      resumeOrigin?: 'saved'
       worktree: string
       agent: ResumableTuiAgent
       providerSession: AgentProviderSessionMetadata
diff --git a/src/shared/agent-session-refusal-details.ts b/src/shared/agent-session-refusal-details.ts
index d4e756e0ef6f..882b147257b4 100644
--- a/src/shared/agent-session-refusal-details.ts
+++ b/src/shared/agent-session-refusal-details.ts
@@ -88,6 +88,7 @@ export const AGENT_SESSION_REFUSAL_REASONS = {
     'runtimeNotInstalled',
     /** A terminal may still be writing the chat's conversation, so its agent did not start. */
     'conversationOpenInTerminal',
+    'conversationOpenElsewhere',
     /** The agent started, then Orca could not open the chat's conversation for it. */
     'attachFailed'
   ],
diff --git a/src/shared/agent-session-refusal-reason-words.ts b/src/shared/agent-session-refusal-reason-words.ts
index 8819bb4e7855..c00f0c995e3c 100644
--- a/src/shared/agent-session-refusal-reason-words.ts
+++ b/src/shared/agent-session-refusal-reason-words.ts
@@ -120,6 +120,7 @@ const REASON_WORDS = {
     agentCommandNotRunnable: { fact: 'agentCommandNotRunnable', action: 'actFirst' },
     runtimeNotInstalled: { fact: 'runtimeNotInstalled', action: 'actFirst' },
     conversationOpenInTerminal: { fact: 'conversationOpenInTerminal', action: 'actFirst' },
+    conversationOpenElsewhere: { fact: 'conversationOpenElsewhere', action: 'actFirst' },
     attachFailed: codeWords('retry')
   },
   agent_session_ownership_unknown: {
diff --git a/src/shared/agent-session-resume.ts b/src/shared/agent-session-resume.ts
index 515108693af1..91d3d75ae879 100644
--- a/src/shared/agent-session-resume.ts
+++ b/src/shared/agent-session-resume.ts
@@ -1,4 +1,5 @@
 import type { AgentHookSource } from './agent-hook-relay'
+import type { AgentStatusCacheIdentity, RefusedPaneResume } from './agent-status-ipc-payload'
 import type { AgentStatusState } from './agent-status-types'
 import type { AgentMainAgentStatus } from './main-agent-status'
 import type { TuiAgent } from './tui-agent'
@@ -290,3 +291,45 @@ export function extractAgentProviderSession(
 
 // Re-exported so the 18 existing call sites keep one import path.
 export { getAgentForkArgv, getAgentResumeArgv } from './agent-resume-argv'
+
+/** A host home check for this exact saved continuation, not a terminal writer claim. */
+export type SavedResumeDecision = {
+  agent: string
+  providerSession: AgentProviderSessionMetadata
+  verdict: 'admitted' | 'chat-home' | 'chat-writing' | 'unverifiable'
+}
+
+/** Effective facts of a terminal launch; a refused shell carries no rejected agent metadata. */
+export type TerminalLaunchResult = {
+  savedResumeDecision?: SavedResumeDecision
+  agentResumeUnavailable?: true
+  agentResumeRefused?: 'chat-home' | 'chat-writing' | 'unverifiable'
+  refusedResume?: RefusedPaneResume
+  launchConfig?: SleepingAgentLaunchConfig
+  launchAgent?: TuiAgent
+  launchToken?: string
+  resumeProviderSession?: AgentProviderSessionMetadata
+}
+
+/** Runtime-only source shared by copies of one saved startup. Never persisted or sent to a host. */
+export type SavedResumeStartupSource = {
+  cancelled: boolean
+  record?: SleepingAgentSessionRecord
+  expectedStatus?: AgentStatusCacheIdentity
+}
+
+/** Forward only effective launch facts through each existing terminal envelope. */
+export function terminalLaunchFacts(result: TerminalLaunchResult): TerminalLaunchResult {
+  return {
+    ...(result.savedResumeDecision ? { savedResumeDecision: result.savedResumeDecision } : {}),
+    ...(result.agentResumeUnavailable
+      ? { agentResumeUnavailable: result.agentResumeUnavailable }
+      : {}),
+    ...(result.agentResumeRefused ? { agentResumeRefused: result.agentResumeRefused } : {}),
+    ...(result.refusedResume ? { refusedResume: result.refusedResume } : {}),
+    ...(result.launchConfig ? { launchConfig: result.launchConfig } : {}),
+    ...(result.launchAgent ? { launchAgent: result.launchAgent } : {}),
+    ...(result.launchToken ? { launchToken: result.launchToken } : {}),
+    ...(result.resumeProviderSession ? { resumeProviderSession: result.resumeProviderSession } : {})
+  }
+}
diff --git a/src/shared/agent-status-ipc-payload.ts b/src/shared/agent-status-ipc-payload.ts
index 0a6d446af1a6..0efbc6d7f7a9 100644
--- a/src/shared/agent-status-ipc-payload.ts
+++ b/src/shared/agent-status-ipc-payload.ts
@@ -91,6 +91,8 @@ export type AgentStatusCacheIdentity = {
 
 /** A pane's saved resume the host refused because a native chat is that conversation's home. */
 export type RefusedPaneResume = {
+  expectedStatus?: AgentStatusCacheIdentity
+  expectedSavedRecord?: { paneKey: string; capturedAt: number; updatedAt: number }
   agent: string
   providerSession: AgentProviderSessionMetadata
 }
diff --git a/src/shared/protocol-version.ts b/src/shared/protocol-version.ts
index 1decc304744b..5624d9ad3327 100644
--- a/src/shared/protocol-version.ts
+++ b/src/shared/protocol-version.ts
@@ -1,3 +1,5 @@
+export const SAVED_RESUME_ORIGIN_RUNTIME_CAPABILITY =
+  'agent-session.saved-resume-origin.v1' as const
 import { AGENT_SESSION_CURRENT_REQUESTS_CLIENT_CAPABILITY } from './agent-session-current-requests-capability'
 import { AI_VAULT_CHAT_FORK_SOURCE_CAPABILITY } from './ai-vault-resume-preparation'
 import { PROGRAM_STATUS_RUNTIME_CAPABILITY } from './program-status/protocol'
@@ -245,6 +247,7 @@ export const RUNTIME_CAPABILITIES = [
   MANAGED_RUNTIME_INSTALL_RUNTIME_CAPABILITY,
   MANAGED_RUNTIME_REMOVE_RUNTIME_CAPABILITY,
   AGENT_SESSION_HOST_AUTHORITY_RUNTIME_CAPABILITY,
+  SAVED_RESUME_ORIGIN_RUNTIME_CAPABILITY,
   AGENT_SESSION_OMP_RESUME_PATH_RUNTIME_CAPABILITY,
   AGENT_SESSION_KEYBOARD_RUNTIME_CAPABILITY,
   STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY,
diff --git a/src/shared/rpc-contract/agent-session-params.ts b/src/shared/rpc-contract/agent-session-params.ts
index b93eaccfdea5..15a98d809e67 100644
--- a/src/shared/rpc-contract/agent-session-params.ts
+++ b/src/shared/rpc-contract/agent-session-params.ts
@@ -129,6 +129,7 @@ export const AutomaticEnsure = z
 export const ExplicitEnsure = z
   .object({
     kind: z.literal('explicit'),
+    resumeOrigin: z.literal('saved').optional(),
     worktree: WorktreeSelector,
     agent: z.enum(RESUMABLE_TUI_AGENTS),
     providerSession: ProviderSession,
diff --git a/src/shared/runtime-terminal-contracts.ts b/src/shared/runtime-terminal-contracts.ts
index 09ae886bf593..42fd21cbde3b 100644
--- a/src/shared/runtime-terminal-contracts.ts
+++ b/src/shared/runtime-terminal-contracts.ts
@@ -1,3 +1,4 @@
+import type { TerminalLaunchResult } from './agent-session-resume'
 import type {
   AgentProviderSessionMetadata,
   SleepingAgentLaunchConfig
@@ -271,7 +272,8 @@ export type RuntimeTerminalCreateRequestPayload =
       source: 'runtime-session'
     })
 
-export type RuntimeTerminalCreate = {
+export type RuntimeTerminalCreate = TerminalLaunchResult & {
+  coldRestore?: { scrollback: string; cwd: string; cols?: number; rows?: number }
   handle: string
   /** Host-owned PTY incarnation used to fence remote identity observations. */
   incarnationId?: string | null
diff --git a/src/shared/structured-agent-session-dispatch-rejection.ts b/src/shared/structured-agent-session-dispatch-rejection.ts
index d38686cc4c23..8eac0a500805 100644
--- a/src/shared/structured-agent-session-dispatch-rejection.ts
+++ b/src/shared/structured-agent-session-dispatch-rejection.ts
@@ -98,6 +98,7 @@ const KIND_CATEGORY = {
   agentCommandNotRunnable: 'startFailed',
   runtimeNotInstalled: 'startFailed',
   conversationOpenInTerminal: 'startFailed',
+  conversationOpenElsewhere: 'startFailed',
   restartFailed: 'startFailed',
   providerRejected: 'content',
   attachmentInvalid: 'content',
@@ -132,6 +133,7 @@ const KIND_VERDICT = {
   agentCommandNotRunnable: 'failure',
   runtimeNotInstalled: 'failure',
   conversationOpenInTerminal: 'failure',
+  conversationOpenElsewhere: 'failure',
   restartFailed: 'failure',
   providerRejected: 'failure',
   attachmentInvalid: 'failure',

From 3fb0bd6b242e784c630a7164188ba12cdaed9802 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Mon, 19 Oct 2026 22:57:46 -0700
Subject: [PATCH 005/207] Preserve conversation case and clear refused cold
 restore identity

---
 .../spawn-preflight-saved-resume.test.ts      | 42 +++++++-
 .../structured-conversation-key.ts            |  7 +-
 .../deferred-cold-restore-and-snapshot.ts     |  6 ++
 .../saved-resume-cancellation.test.ts         | 95 +++++++++++++++++++
 .../saved-resume-startup-cancellation.ts      | 12 ++-
 5 files changed, 156 insertions(+), 6 deletions(-)

diff --git a/src/main/ipc/pty/runtime/spawn-preflight-saved-resume.test.ts b/src/main/ipc/pty/runtime/spawn-preflight-saved-resume.test.ts
index fd970427e24a..b25197d6a90d 100644
--- a/src/main/ipc/pty/runtime/spawn-preflight-saved-resume.test.ts
+++ b/src/main/ipc/pty/runtime/spawn-preflight-saved-resume.test.ts
@@ -8,10 +8,11 @@ import {
   agentSessionLeaseFixture,
   agentSessionRecordFixture
 } from '../../../../shared/agent-session-record.test-fixture'
-import type { AgentSessionRecordStore } from '../../../runtime/agent-session-record-store'
+import { AgentSessionRecordStore } from '../../../runtime/agent-session-record-store'
 import type { OrcaRuntimeService } from '../../../runtime/orca-runtime'
 import { finishPtyShutdown } from '../provider/liveness'
-import { admitColdRestoreReattach } from '../host-env/saved-resume-admission'
+import { admitColdRestoreReattach, admitResumeSpawn } from '../host-env/saved-resume-admission'
+import { listStructuredProviderSessionOwnership } from '../../../native-chat/agent-session-wire/structured-provider-session-ownership'
 import type { PtyRuntimeControllerDeps } from './controller-deps'
 import { executeRuntimePtySpawn } from './spawn-execute'
 import { savedResumeResult } from '../host-env/saved-resume-admission'
@@ -283,3 +284,40 @@ it('returns the committed runtime shell when exact saved-record persistence fail
     warning.mockRestore()
   }
 })
+
+it('preserves case-distinct conversation heads and saved homes across the shared OpenCode family', async () => {
+  const ids = ['ses_000000000001AAAAAAAAAAAAAA', 'ses_000000000001aaaaaaaaaaaaaa']
+  const record = {
+    ...chat,
+    provider: 'opencode' as const,
+    providerHandleChain: ids.map((nativeId, index) => ({
+      ...chat.providerHandleChain[0]!,
+      linkId: `case-${index}`,
+      handle: { transport: 'acp' as const, agent: 'opencode' as const, nativeId }
+    }))
+  }
+  const opencodeStore: AgentSessionRecordStore = Object.create(AgentSessionRecordStore.prototype)
+  opencodeStore.listRecords = () => [record]
+  opencodeStore.getVisibleSessionTabIndex = () => ({
+    present: true,
+    sessionIds: [record.sessionId]
+  })
+  const runtime = { openAgentSessionRecordStore: async () => opencodeStore }
+  expect(listStructuredProviderSessionOwnership([record]).map((holding) => holding.role)).toEqual([
+    'earlier',
+    'head'
+  ])
+  for (const [index, id] of ids.entries()) {
+    await expect(
+      admitResumeSpawn(
+        runtime,
+        {
+          launchAgent: 'opencode2',
+          resumeOrigin: 'saved',
+          resumeProviderSession: { key: 'session_id', id }
+        },
+        null
+      )
+    ).resolves.toMatchObject({ verdict: index === 0 ? 'admitted' : 'chat-home' })
+  }
+})
diff --git a/src/main/native-chat/structured-conversation-key.ts b/src/main/native-chat/structured-conversation-key.ts
index ac1a7c3823e4..64dcc18d69de 100644
--- a/src/main/native-chat/structured-conversation-key.ts
+++ b/src/main/native-chat/structured-conversation-key.ts
@@ -48,7 +48,7 @@ export function terminalConversationKey(agent: string, id: string | null): Conve
 export function keysMayMatch(left: ConversationKey, right: ConversationKey): boolean {
   return (
     left.family === right.family &&
-    (left.id === null || right.id === null || sameConversationId(left.id, right.id)) &&
+    (left.id === null || right.id === null || sameConversationId(left.family, left.id, right.id)) &&
     (left.home === null ||
       right.home === null ||
       agentSessionAccountHomesEqual(left.home, right.home))
@@ -56,7 +56,10 @@ export function keysMayMatch(left: ConversationKey, right: ConversationKey): boo
 }
 
 // A session-file agent's terminal may name the file; Session History lists its file-name id.
-function sameConversationId(left: string, right: string): boolean {
+function sameConversationId(family: string, left: string, right: string): boolean {
+  if (family === 'opencode') {
+    return left === right
+  }
   const normalize = (id: string) =>
     (/[\\/]/.test(id) ? sessionIdFromFileName(id) : id).toLowerCase()
   return normalize(left) === normalize(right)
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/deferred-cold-restore-and-snapshot.ts b/src/renderer/src/components/terminal-pane/pty-connection/deferred-cold-restore-and-snapshot.ts
index 928e135bd53c..6679f5d9a8dc 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/deferred-cold-restore-and-snapshot.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/deferred-cold-restore-and-snapshot.ts
@@ -42,6 +42,12 @@ export function bindDeferredColdRestoreAndSnapshot(session: ConnectPanePtySessio
       tabId: session.deps.tabId,
       leafId: session.pane.leafId
     })
+    if (startup.resumeSource) {
+      session.savedStartupLaunchRegistration = {
+        source: startup.resumeSource,
+        entry: useAppStore.getState().agentLaunchConfigByPaneKey[session.cacheKey]
+      }
+    }
     return true
   }
   session.clearSleepingRecordAfterColdRestoreSpawn = (
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/saved-resume-cancellation.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/saved-resume-cancellation.test.ts
index 4c1d029bc8df..71e6164598b8 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/saved-resume-cancellation.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/saved-resume-cancellation.test.ts
@@ -1,4 +1,9 @@
 import { afterEach, describe, expect, it, vi } from 'vitest'
+import type {
+  AgentLaunchConfigRegistryEntry,
+  AgentLaunchConfigRegistrationMetadata
+} from '@/store/slices/agent-status-contract'
+import type { ColdRestoreAgentResumeStartup } from './fresh-spawn-types'
 import type { ConnectPanePtySession } from './connect-pane-pty-session'
 import { bindSettlePaneSerializer } from './pane-serializer-settle'
 import { bindDeferredColdRestoreAndSnapshot } from './deferred-cold-restore-and-snapshot'
@@ -127,3 +132,93 @@ describe('a refused saved startup and its delayed paste', () => {
     }
   )
 })
+
+it.each(['refused', 'same-C', 'different-D'] as const)(
+  'clears the real generated cold/wake registration and conditional tab identity only while owned (%s)',
+  (kind) => {
+    const cacheKey = 'tab:leaf'
+    const source = { cancelled: false }
+    const startup: ColdRestoreAgentResumeStartup = {
+      agent: 'codex',
+      command: 'codex resume C',
+      launchToken: 'saved-token',
+      launchConfig: { agentCommand: 'codex', agentArgs: 'resume C', agentEnv: {} },
+      resumeProviderSession: { key: 'session_id', id: 'C' },
+      resumeOrigin: 'saved',
+      resumeSource: source,
+      useLiveEntry: false,
+      hasSleepingRecord: false,
+      sleepingRecordEntry: null
+    }
+    const registry: Record<string, AgentLaunchConfigRegistryEntry> = {}
+    const pending: Record<string, object> = {}
+    const tab = { id: 'tab', title: 'Codex', launchAgent: 'codex', generation: 1 }
+    const clearTabLaunchAgent = vi.fn()
+    const registerAgentLaunchConfig = (
+      paneKey: string,
+      launchConfig: AgentLaunchConfigRegistryEntry['launchConfig'],
+      identity: AgentLaunchConfigRegistrationMetadata
+    ) => {
+      registry[paneKey] = { launchConfig, identity, registeredAt: 1 }
+    }
+    fixture.state = {
+      agentLaunchConfigByPaneKey: registry,
+      pendingStartupByTabId: pending,
+      automaticAgentResumeClaimsByTabId: {},
+      sleepingAgentSessionsByPaneKey: {},
+      tabsByWorktree: { wt: [tab] },
+      registerAgentLaunchConfig,
+      clearAgentLaunchConfig: (key: string) => {
+        delete registry[key]
+      },
+      consumeTabStartupCommand: vi.fn(),
+      clearTabLaunchAgent
+    }
+    const updateTabTitle = vi.fn()
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the real installers/cancellation access only the supplied session members in this contract.
+    const session = {
+      cacheKey,
+      paneStartup: null,
+      pane: { id: 1, leafId: 'leaf' },
+      manager: { getActivePane: () => ({ id: 1 }) },
+      deps: { tabId: 'tab', worktreeId: 'wt', setRuntimePaneTitle: vi.fn(), updateTabTitle },
+      tabGeneration: 1,
+      startupInjectTimer: null,
+      transport: {},
+      shouldDeliverStartupViaTerminalPaste: false
+    } as unknown as ConnectPanePtySession
+    installSleepingRecordAccess(session)
+    bindDeferredColdRestoreAndSnapshot(session)
+    expect(session.applyColdRestoreAgentResumeStartup(startup)).toBe(true)
+    const saved = registry[cacheKey]
+    expect(saved?.identity.launchToken).toBe('saved-token')
+    if (kind !== 'refused') {
+      const command = kind === 'same-C' ? 'resume C' : 'resume D'
+      registerAgentLaunchConfig(
+        cacheKey,
+        { ...startup.launchConfig, agentArgs: command },
+        {
+          agentType: 'codex',
+          launchToken: 'explicit-token'
+        }
+      )
+      pending.tab = { command }
+    }
+    const current = registry[cacheKey]
+    const newer = pending.tab
+    session.cancelSavedResumeStartup(startup, { id: 'shell', agentResumeRefused: 'chat-home' })
+    session.registerEffectiveLaunchConfig(undefined, {})
+    expect(source.cancelled).toBe(true)
+    expect(session.paneStartup).toBeNull()
+    if (kind === 'refused') {
+      expect(registry[cacheKey]).toBeUndefined()
+      expect(clearTabLaunchAgent).toHaveBeenCalledWith('tab')
+      expect(updateTabTitle).toHaveBeenCalledWith('tab', 'Terminal')
+    } else {
+      expect(registry[cacheKey]).toBe(current)
+      expect(pending.tab).toBe(newer)
+      expect(clearTabLaunchAgent).not.toHaveBeenCalled()
+      expect(updateTabTitle).not.toHaveBeenCalled()
+    }
+  }
+)
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/saved-resume-startup-cancellation.ts b/src/renderer/src/components/terminal-pane/pty-connection/saved-resume-startup-cancellation.ts
index ee0c0ed84d5c..5a14db5662bd 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/saved-resume-startup-cancellation.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/saved-resume-startup-cancellation.ts
@@ -28,6 +28,12 @@ export function installSavedResumeStartupCancellation(session: ConnectPanePtySes
     if (session.deferredSpawn?.startupOverride?.resumeSource === source) {
       session.deferredSpawn = null
     }
+    const ownsPaneStartup = session.paneStartup?.resumeSource === source
+    const registered = session.savedStartupLaunchRegistration
+    const ownsRegistration =
+      registered?.source === source &&
+      registered.entry !== undefined &&
+      registered.entry === state.agentLaunchConfigByPaneKey[session.cacheKey]
     session.clearRegisteredStartupLaunchConfig(startup)
     const claim = state.automaticAgentResumeClaimsByTabId[session.deps.tabId]
     if (
@@ -44,7 +50,7 @@ export function installSavedResumeStartupCancellation(session: ConnectPanePtySes
         return { automaticAgentResumeClaimsByTabId: next }
       })
     }
-    if (session.paneStartup?.resumeSource === source) {
+    if (ownsPaneStartup || ownsRegistration) {
       const pending = state.pendingStartupByTabId[session.deps.tabId]
       const installed = useAppStore.getState().agentLaunchConfigByPaneKey[session.cacheKey]
       const replaced = pending && pending.resumeSource !== source
@@ -53,13 +59,15 @@ export function installSavedResumeStartupCancellation(session: ConnectPanePtySes
           (entry) => entry.id === session.deps.tabId
         )
         if (
-          tab?.launchAgent === session.paneStartup.launchAgent &&
+          tab?.launchAgent === ('agent' in startup ? startup.agent : startup.launchAgent) &&
           (tab?.generation ?? 0) === session.tabGeneration
         ) {
           state.clearTabLaunchAgent(session.deps.tabId)
           clearStaleAgentTabTitleOnConfirmedShell(session)
         }
       }
+    }
+    if (ownsPaneStartup) {
       const seeded = session.savedStartupStatus
       if (seeded?.source === source) {
         useAppStore.setState((current) => {

From ef3282e0e6f481eee07e7006a5efb19a5893df20 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Tue, 20 Oct 2026 09:31:59 -0700
Subject: [PATCH 006/207] fix: publish effective terminal launch results on
 attachment

---
 ...rminal-create-host-session-binding.test.ts |  99 +++++++
 ...stream-extraction-characterization.test.ts |   3 +
 .../terminal-multiplex-initial-snapshot.ts    |  19 +-
 .../terminal-multiplex-subscribe-frame.ts     |   3 +-
 .../rpc/terminal-multiplex-test-harness.ts    |   2 +
 .../recovery/resolve-terminal-pane.ts         |   2 +
 .../pty-connection/apply-reattach-payload.ts  |  27 +-
 .../deferred-session-reattach-connect.ts      |   6 +-
 .../pty-connection/fresh-spawn-start.ts       |  39 ++-
 .../reattach-payload-session.ts               |   3 +
 ...result-handler-park-reveal-verdict.test.ts |  14 +-
 .../pty-connection/reattach-result-handler.ts |  33 +--
 .../reattach-success-settle.test.ts           |  14 +-
 .../saved-resume-startup-cancellation.ts      |  14 +-
 .../terminal-launch-result-policy.ts          | 100 +++++++
 .../transport-output-callbacks.ts             |  21 +-
 .../terminal-pane/pty-transport-types.ts      |   2 +
 .../remote-runtime-pty-transport.ts           |  35 ++-
 ...mote-runtime-saved-result-consumer.test.ts | 269 ++++++++++++++++++
 ...mote-runtime-terminal-multiplexer-types.ts |   5 +-
 ...te-runtime-terminal-response-controller.ts |   7 +-
 src/shared/runtime-terminal-contracts.ts      |   2 +-
 .../terminal-attachment-launch-result.ts      |  56 ++++
 .../workspace-session-sleeping-agents.ts      |   2 +-
 24 files changed, 697 insertions(+), 80 deletions(-)
 create mode 100644 src/renderer/src/components/terminal-pane/pty-connection/terminal-launch-result-policy.ts
 create mode 100644 src/renderer/src/components/terminal-pane/remote-runtime-saved-result-consumer.test.ts
 create mode 100644 src/shared/terminal-attachment-launch-result.ts

diff --git a/src/main/runtime/cli-terminal-create-host-session-binding.test.ts b/src/main/runtime/cli-terminal-create-host-session-binding.test.ts
index 275b7caa1aad..2091b9c8579f 100644
--- a/src/main/runtime/cli-terminal-create-host-session-binding.test.ts
+++ b/src/main/runtime/cli-terminal-create-host-session-binding.test.ts
@@ -2,6 +2,12 @@
  *  durable binding and runtime ownership keep graph sync from pruning the tab
  *  out from under a live agent — including when a window is attached. */
 import { describe, expect, it, vi } from 'vitest'
+import './rpc/unused-default-rpc-methods.test-fixture'
+import {
+  startDesktopMultiplexSubscribe,
+  sendDesktopMultiplexSubscribe
+} from './rpc/terminal-multiplex-test-harness'
+import type { RuntimePtyWorktreeRecord } from './runtime-terminal-state-records'
 import { OrcaRuntimeService } from './orca-runtime'
 
 vi.mock('electron', () => ({
@@ -119,3 +125,96 @@ it.each(['refused', 'adopted', 'fresh-unavailable'] as const)(
     }
   }
 )
+
+it.each(['unchanged', 'hook', 'config', 'incarnation', 'handle'] as const)(
+  'samples the actual created PTY after snapshot awaits and revalidates %s on reconnect',
+  async (change) => {
+    const { runtime, spawn } = createRuntimeWithAttachedWindow()
+    const providerSession = { key: 'session_id' as const, id: 'C' }
+    spawn.mockResolvedValue({
+      id: 'effective-pty',
+      incarnationId: 'i1',
+      agentResumeUnavailable: true,
+      agentResumeRefused: 'chat-home',
+      savedResumeDecision: { agent: 'claude', providerSession, verdict: 'chat-home' }
+    })
+    const terminal = await runtime.createTerminal('id:repo-1::/tmp/wt-cli', {
+      tabId: 'saved-tab',
+      leafId: '11111111-1111-4111-8111-111111111111',
+      launchAgent: 'claude',
+      resumeOrigin: 'saved',
+      resumeProviderSession: providerSession
+    })
+    let snapshotStarted = false
+    let finishSnapshot = () => {}
+    let handle = terminal.handle
+    const harness = startDesktopMultiplexSubscribe({
+      resolveLiveLeafForHandle: () => runtime.resolveLiveLeafForHandle(handle),
+      getPtyExecutionHostMetadata: runtime.getPtyExecutionHostMetadata.bind(runtime),
+      getTerminalLaunchResult: runtime.getTerminalLaunchResult.bind(runtime),
+      serializeTerminalBuffer: () =>
+        new Promise((resolve) => {
+          snapshotStarted = true
+          finishSnapshot = () => resolve({ data: 'shell$ ', cols: 80, rows: 24 })
+        })
+    })
+    try {
+      await vi.waitFor(() => expect(harness.handlers.has(0)).toBe(true))
+      sendDesktopMultiplexSubscribe(harness.handlers)
+      await vi.waitFor(() => expect(snapshotStarted).toBe(true))
+      if (change === 'hook') {
+        runtime.recordCliWriterConversation({
+          paneKey: 'saved-tab:11111111-1111-4111-8111-111111111111',
+          connectionId: null,
+          receivedAt: 1,
+          stateStartedAt: 1,
+          providerSession,
+          payload: { state: 'done', prompt: '', agentType: 'claude' },
+          agentPresence: {
+            agent: 'claude',
+            process: { pid: 12, platform: 'darwin', startTime: 's' }
+          }
+        })
+      } else if (change === 'config') {
+        // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the runtime owns this PTY map; mutate its actual record to model a replacement launch.
+        const records = (runtime as unknown as { ptysById: Map<string, RuntimePtyWorktreeRecord> })
+          .ptysById
+        const pty = records.get('effective-pty')!
+        pty.launchConfig = { agentCommand: 'codex', agentArgs: '', agentEnv: {} }
+      } else if (change === 'incarnation') {
+        runtime.registerPty('effective-pty', 'repo-1::/tmp/wt-cli', null, {
+          tabId: 'saved-tab',
+          leafId: '11111111-1111-4111-8111-111111111111',
+          incarnationId: 'i2'
+        })
+      } else if (change === 'handle') {
+        handle = 'stale-handle'
+      }
+      finishSnapshot()
+      const events = () => harness.messages.map((message) => JSON.parse(message).result)
+      const stale = change === 'handle' || change === 'incarnation'
+      await vi.waitFor(() =>
+        expect(events().some((event) => event?.type === (stale ? 'end' : 'subscribed'))).toBe(true)
+      )
+      if (stale) {
+        expect(events().some((event) => event?.type === 'subscribed')).toBe(false)
+      } else {
+        const result = events().find((event) => event?.type === 'subscribed').launchResult
+        expect(result).toMatchObject({ ptyId: 'effective-pty', incarnationId: 'i1' })
+        expect(result.agentResumeRefused).toBe(change === 'unchanged' ? 'chat-home' : undefined)
+        harness.messages.splice(0)
+        snapshotStarted = false
+        sendDesktopMultiplexSubscribe(harness.handlers)
+        await vi.waitFor(() => expect(snapshotStarted).toBe(true))
+        finishSnapshot()
+        await vi.waitFor(() =>
+          expect(events().some((event) => event?.type === 'subscribed')).toBe(true)
+        )
+        expect(events().find((event) => event?.type === 'subscribed').launchResult).toEqual(result)
+      }
+    } finally {
+      harness.registry.cleanupSubscription('terminal-multiplex:conn-desktop-first-paint')
+      await harness.dispatchPromise
+    }
+  }
+)
diff --git a/src/main/runtime/rpc/methods/terminal-stream-extraction-characterization.test.ts b/src/main/runtime/rpc/methods/terminal-stream-extraction-characterization.test.ts
index 041c4465d812..97a4b1100b65 100644
--- a/src/main/runtime/rpc/methods/terminal-stream-extraction-characterization.test.ts
+++ b/src/main/runtime/rpc/methods/terminal-stream-extraction-characterization.test.ts
@@ -121,6 +121,9 @@ describe('terminal stream extraction characterization', () => {
       outputBatcher: { push: vi.fn(), flush: vi.fn() }
     } as unknown as TerminalMultiplexStream
     const runtime = {
+      getPtyExecutionHostMetadata: () => ({}),
+      getTerminalLaunchResult: () => undefined,
+      resolveLiveLeafForHandle: () => ({ ptyId: stream.ptyId }),
       readTerminal: vi.fn(async () => {
         readCount += 1
         if (readCount === 2) {
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-multiplex-initial-snapshot.ts b/src/main/runtime/rpc/methods/terminal/terminal-multiplex-initial-snapshot.ts
index f027d5498dd1..e4ff1463d31d 100644
--- a/src/main/runtime/rpc/methods/terminal/terminal-multiplex-initial-snapshot.ts
+++ b/src/main/runtime/rpc/methods/terminal/terminal-multiplex-initial-snapshot.ts
@@ -20,7 +20,8 @@ export type MultiplexPublishedInitialState = {
 export async function publishMultiplexInitialSnapshot(
   state: TerminalMultiplexConnection,
   request: MultiplexSubscribeRequest,
-  stream: TerminalMultiplexStream
+  stream: TerminalMultiplexStream,
+  incarnationId = state.runtime.getPtyExecutionHostMetadata(stream.ptyId).incarnationId
 ): Promise<MultiplexPublishedInitialState | null> {
   const { runtime, emit } = state
   const { ptyId } = stream
@@ -54,7 +55,23 @@ export async function publishMultiplexInitialSnapshot(
   const layoutSeq = runtime.getLayout(ptyId)?.seq
   // Why: layout versions and output offsets are different sequence domains.
   const snapshotOutputSeq = serialized?.seq
+  // Snapshot awaits may outlive the handle binding or the physical shell.
+  if (
+    runtime.resolveLiveLeafForHandle(request.terminal).ptyId !== ptyId ||
+    runtime.getPtyExecutionHostMetadata(ptyId).incarnationId !== incarnationId
+  ) {
+    throw new Error('terminal_handle_stale')
+  }
+  let launchResult: ReturnType<typeof runtime.getTerminalLaunchResult>
+  try {
+    launchResult = runtime.getTerminalLaunchResult(ptyId)
+  } catch (error) {
+    console.warn('Terminal launch result unavailable', error)
+  }
   emit({
+    ...(incarnationId && launchResult
+      ? { launchResult: { ...launchResult, ptyId, incarnationId } }
+      : {}),
     type: 'subscribed',
     streamId: request.streamId,
     terminal: request.terminal,
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-multiplex-subscribe-frame.ts b/src/main/runtime/rpc/methods/terminal/terminal-multiplex-subscribe-frame.ts
index 3800fa08a056..345203f00ce5 100644
--- a/src/main/runtime/rpc/methods/terminal/terminal-multiplex-subscribe-frame.ts
+++ b/src/main/runtime/rpc/methods/terminal/terminal-multiplex-subscribe-frame.ts
@@ -21,6 +21,7 @@ export function installMultiplexSubscribeFrame(state: TerminalMultiplexConnectio
     if (!ptyId) {
       return
     }
+    const incarnationId = state.runtime.getPtyExecutionHostMetadata(ptyId).incarnationId
     let stream: TerminalMultiplexStream | null = null
     let installedStream: TerminalMultiplexStream | null = null
     try {
@@ -46,7 +47,7 @@ export function installMultiplexSubscribeFrame(state: TerminalMultiplexConnectio
       return
     }
     try {
-      const published = await publishMultiplexInitialSnapshot(state, request, stream)
+      const published = await publishMultiplexInitialSnapshot(state, request, stream, incarnationId)
       if (!published) {
         return
       }
diff --git a/src/main/runtime/rpc/terminal-multiplex-test-harness.ts b/src/main/runtime/rpc/terminal-multiplex-test-harness.ts
index c85e962d198a..b72a5295a3ba 100644
--- a/src/main/runtime/rpc/terminal-multiplex-test-harness.ts
+++ b/src/main/runtime/rpc/terminal-multiplex-test-harness.ts
@@ -25,6 +25,8 @@ export function stubRuntime(overrides: Partial<OrcaRuntimeService> = {}): OrcaRu
   // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: This partial runtime supplies the terminal RPC methods these tests invoke.
   return {
     getRuntimeId: () => 'test-runtime',
+    getPtyExecutionHostMetadata: () => ({}),
+    getTerminalLaunchResult: () => undefined,
     subscribeToPtyExit: vi.fn(() => vi.fn()),
     // Why: every multiplex stream registers as a remote view subscriber for
     // Phase-5 query-authority suppression (terminal-query-authority.md).
diff --git a/src/main/runtime/terminal/recovery/resolve-terminal-pane.ts b/src/main/runtime/terminal/recovery/resolve-terminal-pane.ts
index 65f2ff657ff6..6c82cebce155 100644
--- a/src/main/runtime/terminal/recovery/resolve-terminal-pane.ts
+++ b/src/main/runtime/terminal/recovery/resolve-terminal-pane.ts
@@ -1,3 +1,4 @@
+import { terminalLaunchFacts } from '../../../../shared/agent-session-resume'
 import type { OrcaRuntimeWithCreateTerminal } from '../launch/terminal-create'
 import { OrcaRuntimeWithGetTerminalInteractiveWait } from '../wait/terminal-interactive-wait'
 import type {
@@ -160,6 +161,7 @@ export abstract class OrcaRuntimeWithResolveTerminalPane extends OrcaRuntimeWith
       leafId: parsed.leafId,
       focus: false
     }).then((terminal) => ({
+      ...terminalLaunchFacts(terminal),
       handle: terminal.handle,
       tabId: parsed.tabId,
       leafId: parsed.leafId,
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/apply-reattach-payload.ts b/src/renderer/src/components/terminal-pane/pty-connection/apply-reattach-payload.ts
index 9e72b3a717e0..49eb05fede87 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/apply-reattach-payload.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/apply-reattach-payload.ts
@@ -1,4 +1,7 @@
-import { agentProviderSessionsEqual } from '../../../../../shared/agent-session-resume'
+import {
+  applyTerminalLaunchResult,
+  captureTerminalLaunchContext
+} from './terminal-launch-result-policy'
 import { isRemoteRuntimePtyId } from '../../../../../shared/remote-runtime-pty-id'
 import { waitForTerminalReplayWritesParsed } from '../replay-guard'
 import {
@@ -271,22 +274,14 @@ export function createReattachPayloadHandlers(
           ? null
           : (ctx.coldRestoreStartup ?? session.buildColdRestoreAgentResumeStartup())
       if (preparedStartup && !ctx.coldRestoreStartup) {
-        const decision = ctx.connectResult.savedResumeDecision
-        if (
-          !decision ||
-          decision.verdict !== 'admitted' ||
-          decision.agent !== preparedStartup.agent ||
-          !agentProviderSessionsEqual(
-            decision.agent,
-            decision.providerSession,
-            preparedStartup.resumeProviderSession
-          )
-        ) {
+        const rejected = applyTerminalLaunchResult(
+          session,
+          ctx.connectResult,
+          captureTerminalLaunchContext(session, preparedStartup),
+          'candidate'
+        )
+        if (rejected) {
           resumeUnavailable = true
-          session.cancelSavedResumeStartup(preparedStartup, {
-            ...ctx.connectResult,
-            agentResumeRefused: 'unverifiable'
-          })
           preparedStartup = null
         }
       }
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/deferred-session-reattach-connect.ts b/src/renderer/src/components/terminal-pane/pty-connection/deferred-session-reattach-connect.ts
index 8d56d0b6f0e5..cdb084d84a79 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/deferred-session-reattach-connect.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/deferred-session-reattach-connect.ts
@@ -91,7 +91,8 @@ function connectDeferredSessionReattach(
       }
       session.reportError(message)
     },
-    toProcessExitStartup(coldRestoreStartup ?? session.paneStartup)
+    toProcessExitStartup(coldRestoreStartup ?? session.paneStartup),
+    coldRestoreStartup ?? session.paneStartup
   )
   session.beginReattachLiveDataDeferral(outputCallbacks.generation)
   session.transportConnectInFlightSince = Date.now()
@@ -190,7 +191,8 @@ function connectDeferredSessionReattach(
         result,
         deferredReattachSessionId,
         coldRestoreStartup,
-        outputCallbacks.generation
+        outputCallbacks.generation,
+        outputCallbacks.launchContext
       )
       session.finishReattachLiveDataDeferral(accepted, outputCallbacks.generation)
       const gen = await preSignalPromise
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/fresh-spawn-start.ts b/src/renderer/src/components/terminal-pane/pty-connection/fresh-spawn-start.ts
index b28133297a6e..1073be09d973 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/fresh-spawn-start.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/fresh-spawn-start.ts
@@ -1,3 +1,4 @@
+import { applyTerminalLaunchResult } from './terminal-launch-result-policy'
 import type { SpawnDeferralReason } from '../../../../../shared/host-spawn-admission'
 import { isRemoteRuntimePtyId } from '../../../../../shared/remote-runtime-pty-id'
 import { useAppStore } from '@/store'
@@ -97,7 +98,8 @@ export function bindStartFreshSpawn(session: ConnectPanePtySession): void {
     const visibleAtSpawn = session.deps.isVisibleRef.current === true
     const outputCallbacks = session.captureTransportOutputCallbacks(
       session.reportError,
-      toProcessExitStartup(coldRestoreOverride ?? effectiveStartup)
+      toProcessExitStartup(coldRestoreOverride ?? effectiveStartup),
+      coldRestoreOverride ?? effectiveStartup
     )
     const spawnedRaw = session.transport.connect({
       url: '',
@@ -178,7 +180,8 @@ export function bindStartFreshSpawn(session: ConnectPanePtySession): void {
             connectResult,
             null,
             coldRestoreOverride,
-            outputCallbacks.generation
+            outputCallbacks.generation,
+            outputCallbacks.launchContext
           )
           session.finishReattachLiveDataDeferral(accepted, outputCallbacks.generation)
           const gen = await preSignalPromise
@@ -193,25 +196,20 @@ export function bindStartFreshSpawn(session: ConnectPanePtySession): void {
           }
           return accepted ? resolvedPtyId : null
         }
-        // Why: main started a plain shell instead, so nothing of the plan may stay registered over it.
-        const rejectedSavedStartup =
-          connectResult?.agentResumeRefused ||
-          (connectResult?.agentResumeUnavailable && effectiveStartup?.resumeSource)
+        const rejectedSavedStartup = connectResult
+          ? applyTerminalLaunchResult(
+              session,
+              connectResult,
+              outputCallbacks.launchContext,
+              'creator'
+            )
+          : false
         const coldRestore = rejectedSavedStartup ? null : coldRestoreOverride
-        if (connectResult && rejectedSavedStartup) {
-          session.cancelSavedResumeStartup(coldRestoreOverride ?? effectiveStartup, connectResult)
-        }
-        if (connectResult?.agentResumeRefused === 'unverifiable') {
-          // Why: the saved session may have been consumed before this spawn; keep it for the next try.
-          if (!(coldRestoreOverride ?? effectiveStartup)?.resumeSource?.record) {
-            session.keepUnrunResumeHandle(startupOverride)
-          }
-        }
-        if (spawnedPtyId && typeof spawnedPtyId === 'object' && 'id' in spawnedPtyId) {
-          session.registerEffectiveLaunchConfig(spawnedPtyId.launchConfig, {
-            ...(spawnedPtyId.launchToken ? { launchToken: spawnedPtyId.launchToken } : {}),
-            ...(spawnedPtyId.launchAgent ? { launchAgent: spawnedPtyId.launchAgent } : {})
-          })
+        if (
+          connectResult?.agentResumeRefused === 'unverifiable' &&
+          !(coldRestoreOverride ?? effectiveStartup)?.resumeSource?.record
+        ) {
+          session.keepUnrunResumeHandle(startupOverride)
         }
         if (resolvedPtyId) {
           if (
@@ -230,7 +228,6 @@ export function bindStartFreshSpawn(session: ConnectPanePtySession): void {
           ) {
             // Why: main dropped the resume argv, so this pane is a NEW session —
             // the plain restored banner would claim the old one came back.
-            session.showSessionRestoredBanner('resume-unavailable')
             options.onAgentResumeUnavailable?.()
           } else if (coldRestore?.hasSleepingRecord) {
             session.showSessionRestoredBanner()
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/reattach-payload-session.ts b/src/renderer/src/components/terminal-pane/pty-connection/reattach-payload-session.ts
index 51bcec05157a..eecd3b9f04f6 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/reattach-payload-session.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/reattach-payload-session.ts
@@ -2,6 +2,9 @@ import type { ConnectPanePtySession } from './connect-pane-pty-session'
 
 export type ReattachPayloadSession = Pick<
   ConnectPanePtySession,
+  | 'cacheKey'
+  | 'paneStartup'
+  | 'registerEffectiveLaunchConfig'
   | 'applyColdRestoreAgentResumeStartup'
   | 'applySnapshotKittyKeyboardModes'
   | 'buildColdRestoreAgentResumeStartup'
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/reattach-result-handler-park-reveal-verdict.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/reattach-result-handler-park-reveal-verdict.test.ts
index 73bb4ebba3f3..7d38b77b4864 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/reattach-result-handler-park-reveal-verdict.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/reattach-result-handler-park-reveal-verdict.test.ts
@@ -24,7 +24,12 @@ const REMOTE_PTY_ID = 'remote:env-1@@pty-1'
 const HOST_IMAGE = { data: 'PROMPT $ ', cols: 80, rows: 24, seq: 7, source: 'headless' as const }
 
 const mocks = vi.hoisted(() => {
-  const state: Record<string, unknown> = { tabsByWorktree: {}, terminalLayoutsByTabId: {} }
+  const state: Record<string, unknown> = {
+    tabsByWorktree: {},
+    terminalLayoutsByTabId: {},
+    agentLaunchConfigByPaneKey: {},
+    agentStatusByPaneKey: {}
+  }
   const capturedContexts: ReattachPayloadContext[] = []
   const callOrder: string[] = []
   return { state, capturedContexts, callOrder }
@@ -150,7 +155,12 @@ function decidedContext(): ReattachPayloadContext {
 
 beforeEach(() => {
   vi.clearAllMocks()
-  mocks.state = { tabsByWorktree: {}, terminalLayoutsByTabId: {} }
+  mocks.state = {
+    tabsByWorktree: {},
+    terminalLayoutsByTabId: {},
+    agentLaunchConfigByPaneKey: {},
+    agentStatusByPaneKey: {}
+  }
   mocks.capturedContexts = []
   mocks.callOrder = []
 })
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/reattach-result-handler.ts b/src/renderer/src/components/terminal-pane/pty-connection/reattach-result-handler.ts
index 9e21d8073aef..125ac464e057 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/reattach-result-handler.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/reattach-result-handler.ts
@@ -1,3 +1,8 @@
+import {
+  applyTerminalLaunchResult,
+  captureTerminalLaunchContext,
+  type TerminalLaunchContext
+} from './terminal-launch-result-policy'
 import { isRemoteRuntimePtyId } from '../../../../../shared/remote-runtime-pty-id'
 import { scheduleRuntimeGraphSync } from '@/runtime/sync-runtime-graph'
 import type { PtyBufferSnapshot, PtyConnectResult } from '../pty-transport-types'
@@ -65,7 +70,11 @@ export function bindHandleReattachResult(sessionBag: ConnectPanePtySession): voi
     result: PtyConnectResult | string | void,
     staleSessionId?: string | null,
     coldRestoreStartup?: ColdRestoreAgentResumeStartup | null,
-    attemptGeneration = session.transportStreamGeneration
+    attemptGeneration = session.transportStreamGeneration,
+    launchContext: TerminalLaunchContext = captureTerminalLaunchContext(
+      sessionBag,
+      coldRestoreStartup ?? sessionBag.paneStartup
+    )
   ): Promise<boolean> => {
     if (session.disposed) {
       return false
@@ -95,16 +104,10 @@ export function bindHandleReattachResult(sessionBag: ConnectPanePtySession): voi
       session.remotePtyIncarnationId = null
     }
 
-    if (
-      connectResult?.agentResumeRefused ||
-      (connectResult?.agentResumeUnavailable && !connectResult.isReattach)
-    ) {
-      session.cancelSavedResumeStartup(coldRestoreStartup ?? sessionBag.paneStartup, connectResult)
+    if (connectResult) {
+      applyTerminalLaunchResult(sessionBag, connectResult, launchContext, 'creator')
     }
     if (connectResult?.exitedBeforeAttach) {
-      if (connectResult.agentResumeUnavailable) {
-        session.showSessionRestoredBanner('resume-unavailable')
-      }
       // Why: the transport already delivered the dead session's final frame + exit; treat as terminal state, not a failed reattach.
       return true
     }
@@ -141,14 +144,6 @@ export function bindHandleReattachResult(sessionBag: ConnectPanePtySession): voi
       })
       return false
     }
-    session.registerEffectiveLaunchConfig(connectResult?.launchConfig, {
-      ...(connectResult?.launchToken ? { launchToken: connectResult.launchToken } : {}),
-      ...(connectResult?.launchAgent
-        ? { launchAgent: connectResult.launchAgent }
-        : startup
-          ? { launchAgent: startup.agent }
-          : {})
-    })
     if (connectResult?.sessionExpired) {
       if (staleSessionId) {
         session.clearExitedPanePtyLayoutBinding(staleSessionId)
@@ -183,10 +178,6 @@ export function bindHandleReattachResult(sessionBag: ConnectPanePtySession): voi
     const hasStructuralReplay = Boolean(
       connectResult?.snapshot || connectResult?.replay || connectResult?.coldRestore
     )
-    // Why here: a fresh result with no scrollback never reaches the cold-restore payload that says so.
-    if (connectResult?.agentResumeUnavailable && !connectResult.coldRestore) {
-      session.showSessionRestoredBanner('resume-unavailable')
-    }
     // Why: reattach drops startup commands; only real hibernation is authority to retire an empty adopted shell and resume its provider session.
     if (
       !hasStructuralReplay &&
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/reattach-success-settle.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/reattach-success-settle.test.ts
index efcbfda352a5..7e893b7f008b 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/reattach-success-settle.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/reattach-success-settle.test.ts
@@ -15,7 +15,12 @@ import type { ConnectPanePtySession } from './connect-pane-pty-session'
  * the positive one.
  */
 const mocks = vi.hoisted(() => ({
-  state: { tabsByWorktree: {}, terminalLayoutsByTabId: {} }
+  state: {
+    tabsByWorktree: {},
+    terminalLayoutsByTabId: {},
+    agentLaunchConfigByPaneKey: {},
+    agentStatusByPaneKey: {}
+  }
 }))
 
 vi.mock('@/store', () => ({
@@ -92,7 +97,12 @@ async function driveReattach(
 
 beforeEach(() => {
   vi.clearAllMocks()
-  mocks.state = { tabsByWorktree: {}, terminalLayoutsByTabId: {} }
+  mocks.state = {
+    tabsByWorktree: {},
+    terminalLayoutsByTabId: {},
+    agentLaunchConfigByPaneKey: {},
+    agentStatusByPaneKey: {}
+  }
 })
 
 describe('handleReattachResult recovery settle', () => {
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/saved-resume-startup-cancellation.ts b/src/renderer/src/components/terminal-pane/pty-connection/saved-resume-startup-cancellation.ts
index 5a14db5662bd..f995fadd0f2a 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/saved-resume-startup-cancellation.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/saved-resume-startup-cancellation.ts
@@ -17,7 +17,6 @@ export function installSavedResumeStartupCancellation(session: ConnectPanePtySes
     }
     source.cancelled = true
     const state = useAppStore.getState()
-    state.consumeTabStartupCommand(session.deps.tabId, startup)
     if (session.pendingStartupCommand?.resumeSource === source) {
       session.pendingStartupCommand = null
       if (session.startupInjectTimer !== null) {
@@ -29,6 +28,11 @@ export function installSavedResumeStartupCancellation(session: ConnectPanePtySes
       session.deferredSpawn = null
     }
     const ownsPaneStartup = session.paneStartup?.resumeSource === source
+    if (ownsPaneStartup) {
+      session.paneStartup = null
+      session.startupDraftPrompt = null
+    }
+    state.consumeTabStartupCommand(session.deps.tabId, startup)
     const registered = session.savedStartupLaunchRegistration
     const ownsRegistration =
       registered?.source === source &&
@@ -36,11 +40,7 @@ export function installSavedResumeStartupCancellation(session: ConnectPanePtySes
       registered.entry === state.agentLaunchConfigByPaneKey[session.cacheKey]
     session.clearRegisteredStartupLaunchConfig(startup)
     const claim = state.automaticAgentResumeClaimsByTabId[session.deps.tabId]
-    if (
-      session.paneStartup?.resumeSource === source &&
-      claim &&
-      claim === session.savedStartupAutomaticClaim
-    ) {
+    if (ownsPaneStartup && claim && claim === session.savedStartupAutomaticClaim) {
       useAppStore.setState((current) => {
         if (current.automaticAgentResumeClaimsByTabId[session.deps.tabId] !== claim) {
           return current
@@ -79,8 +79,6 @@ export function installSavedResumeStartupCancellation(session: ConnectPanePtySes
           return { agentStatusByPaneKey: next }
         })
       }
-      session.paneStartup = null
-      session.startupDraftPrompt = null
       session.cleanupStartupDraftPasteTimers?.()
     }
     if (
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/terminal-launch-result-policy.ts b/src/renderer/src/components/terminal-pane/pty-connection/terminal-launch-result-policy.ts
new file mode 100644
index 000000000000..82e3ab6a4a87
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/pty-connection/terminal-launch-result-policy.ts
@@ -0,0 +1,100 @@
+import {
+  agentProviderSessionsEqual,
+  type TerminalLaunchResult
+} from '../../../../../shared/agent-session-resume'
+import { useAppStore } from '@/store'
+import type { ConnectPanePtySession } from './connect-pane-pty-session'
+import type { ColdRestoreAgentResumeStartup } from './fresh-spawn-types'
+import type { PtyPaneStartup } from '../pty-connection-types'
+
+type LaunchResultSession = Pick<
+  ConnectPanePtySession,
+  | 'cacheKey'
+  | 'paneStartup'
+  | 'cancelSavedResumeStartup'
+  | 'registerEffectiveLaunchConfig'
+  | 'showSessionRestoredBanner'
+>
+
+type SavedStartup = ColdRestoreAgentResumeStartup | PtyPaneStartup
+
+export function captureTerminalLaunchContext(session: LaunchResultSession, startup: SavedStartup) {
+  const state = useAppStore.getState()
+  return {
+    startup,
+    registration: state.agentLaunchConfigByPaneKey[session.cacheKey],
+    status: state.agentStatusByPaneKey[session.cacheKey],
+    paneStartup: session.paneStartup
+  }
+}
+
+export type TerminalLaunchContext = ReturnType<typeof captureTerminalLaunchContext>
+
+export function applyTerminalLaunchResult(
+  session: LaunchResultSession,
+  result: TerminalLaunchResult & { isReattach?: boolean },
+  context: TerminalLaunchContext,
+  kind: 'creator' | 'observer' | 'candidate'
+): boolean {
+  const startup = context.startup
+  const decision = result.savedResumeDecision
+  const agent = startup && ('agent' in startup ? startup.agent : startup.launchAgent)
+  const matches = Boolean(
+    startup &&
+    decision &&
+    decision.agent === agent &&
+    agentProviderSessionsEqual(
+      decision.agent,
+      decision.providerSession,
+      startup.resumeProviderSession
+    )
+  )
+  const candidateRejected = kind === 'candidate' && (!matches || decision?.verdict !== 'admitted')
+  const rejected = Boolean(
+    result.agentResumeRefused || result.agentResumeUnavailable || candidateRejected
+  )
+  const state = useAppStore.getState()
+  const currentStartup = session.paneStartup
+  const currentRegistration = state.agentLaunchConfigByPaneKey[session.cacheKey]
+  const superseded =
+    (kind === 'observer' && startup && decision && !matches) ||
+    (currentStartup &&
+      currentStartup !== context.paneStartup &&
+      currentStartup.resumeSource !== startup?.resumeSource) ||
+    (currentRegistration && currentRegistration !== context.registration) ||
+    (state.agentStatusByPaneKey[session.cacheKey] &&
+      state.agentStatusByPaneKey[session.cacheKey] !== context.status)
+  try {
+    if (
+      rejected &&
+      (!result.isReattach || result.agentResumeRefused) &&
+      (kind !== 'observer' || matches)
+    ) {
+      session.cancelSavedResumeStartup(
+        startup,
+        candidateRejected ? { ...result, agentResumeRefused: 'unverifiable' } : result
+      )
+    }
+  } catch (error) {
+    console.warn('Terminal saved startup cancellation failed', error)
+  }
+  try {
+    if (!superseded && kind !== 'candidate') {
+      session.registerEffectiveLaunchConfig(result.launchConfig, {
+        launchToken: result.launchToken,
+        launchAgent:
+          result.launchAgent ??
+          (!rejected && !result.isReattach && startup && 'agent' in startup
+            ? startup.agent
+            : undefined)
+      })
+    }
+  } catch (error) {
+    // A bound shell remains usable even when exact-source bookkeeping fails.
+    console.warn('Terminal launch result bookkeeping failed', error)
+  }
+  if (rejected && !superseded) {
+    session.showSessionRestoredBanner('resume-unavailable')
+  }
+  return rejected
+}
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/transport-output-callbacks.ts b/src/renderer/src/components/terminal-pane/pty-connection/transport-output-callbacks.ts
index a217b2b66c49..99b594ed556d 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/transport-output-callbacks.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/transport-output-callbacks.ts
@@ -1,3 +1,9 @@
+import {
+  applyTerminalLaunchResult,
+  captureTerminalLaunchContext
+} from './terminal-launch-result-policy'
+import type { ColdRestoreAgentResumeStartup } from './fresh-spawn-types'
+import type { TerminalAttachmentLaunchResult } from '../../../../../shared/terminal-attachment-launch-result'
 import type { SpawnDeferralReason } from '../../../../../shared/host-spawn-admission'
 import { createTerminalStartupTiming } from '../terminal-startup-timing'
 import type { PtyReplayDataMeta, PtyTransportRecoveryState } from '../pty-transport-types'
@@ -10,8 +16,10 @@ import type { ConnectPanePtySession } from './connect-pane-pty-session'
 export function bindCaptureTransportOutputCallbacks(session: ConnectPanePtySession): void {
   session.captureTransportOutputCallbacks = (
     onError: (message: string) => void,
-    startup: PtyPaneStartup
+    startup: PtyPaneStartup,
+    savedStartup: ColdRestoreAgentResumeStartup | PtyPaneStartup = session.paneStartup
   ) => {
+    const launchContext = captureTerminalLaunchContext(session, savedStartup)
     // Why: a new stream generation cannot inherit an old replay's pending
     // destination-grid fit or keep its live-data waiter open.
     session.pendingHiddenSnapshotFit?.cancel()
@@ -39,7 +47,18 @@ export function bindCaptureTransportOutputCallbacks(session: ConnectPanePtySessi
     })
     return {
       generation,
+      launchContext,
       callbacks: {
+        onLaunchResult: (result: TerminalAttachmentLaunchResult): void => {
+          if (
+            isCurrent() &&
+            (!session.remotePtyIncarnationId ||
+              session.remotePtyIncarnationId === result.incarnationId)
+          ) {
+            session.remotePtyIncarnationId = result.incarnationId
+            applyTerminalLaunchResult(session, result, launchContext, 'observer')
+          }
+        },
         onReattachDetermined: (): void => {
           if (isCurrent()) {
             session.beginReattachLiveDataDeferralIfUnowned(generation)
diff --git a/src/renderer/src/components/terminal-pane/pty-transport-types.ts b/src/renderer/src/components/terminal-pane/pty-transport-types.ts
index b39253244082..b14f471f2394 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport-types.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport-types.ts
@@ -1,3 +1,4 @@
+import type { TerminalAttachmentLaunchResult } from '../../../../shared/terminal-attachment-launch-result'
 import type { TerminalLaunchResult } from '../../../../shared/agent-session-resume'
 import type { AgentIdleEdgeMeta } from '../../../../shared/terminal-output-side-effects'
 import type {
@@ -135,6 +136,7 @@ export type PtyConnectResult = TerminalLaunchResult & {
 }
 
 type PtyCallbacks = {
+  onLaunchResult?: (result: TerminalAttachmentLaunchResult) => void
   /** Called before an adopted PTY can publish buffered/live bytes. */
   onReattachDetermined?: () => void
   onConnect?: () => void
diff --git a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport.ts b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport.ts
index 41cb3ca5539d..0926193fe9f0 100644
--- a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport.ts
+++ b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport.ts
@@ -1,3 +1,4 @@
+import { parseTerminalAttachmentLaunchResult } from '../../../../shared/terminal-attachment-launch-result'
 import { terminalLaunchFacts } from '../../../../shared/agent-session-resume'
 import { isRuntimeCompatBlockError } from '@/runtime/runtime-protocol-compat'
 import { runtimeEnvironmentSupportsCapability } from '@/runtime/runtime-rpc-client'
@@ -1511,6 +1512,7 @@ export function createRemoteRuntimePtyTransport(
     if (!expiredHandle || !tabId || !leafId || !worktreeId || recoveringPaneHandle) {
       return
     }
+    const recoverySubscriptionGeneration = subscriptionGeneration
     recoveringPaneHandle = expiredHandle
     connected = false
     clearPendingViewportClaim()
@@ -1547,6 +1549,22 @@ export function createRemoteRuntimePtyTransport(
             onPtyRebind?.(remotePtyId, replacedPtyId)
           }
         }
+        const launchResult = parseTerminalAttachmentLaunchResult({
+          ...terminalLaunchFacts(terminal),
+          ptyId: terminal.ptyId,
+          incarnationId: terminal.incarnationId
+        })
+        if (
+          launchResult &&
+          recoverySubscriptionGeneration === subscriptionGeneration &&
+          currentPaneRevision() === getRuntimeEnvironmentRevision(currentRuntimeEnvironmentId)
+        ) {
+          try {
+            storedCallbacks.onLaunchResult?.(launchResult)
+          } catch (error) {
+            console.warn('Terminal launch result bookkeeping failed', error)
+          }
+        }
         await subscribeToHandle()
       })
       .catch((error) => {
@@ -2654,8 +2672,23 @@ export function createRemoteRuntimePtyTransport(
             storedCallbacks.onPausedOutputDropped?.()
           }
         },
-        onSubscribeAcknowledged: () => {
+        onSubscribeAcknowledged: (result) => {
           if (isCurrentSubscription()) {
+            if (
+              result &&
+              (!authoritativePtyIncarnationId ||
+                result.incarnationId === authoritativePtyIncarnationId)
+            ) {
+              authoritativePtyIncarnationId = result.incarnationId
+              try {
+                storedCallbacks.onLaunchResult?.(result)
+              } catch (error) {
+                console.warn('Terminal launch result bookkeeping failed', error)
+              }
+            }
+            if (!isCurrentSubscription()) {
+              return
+            }
             inputReadySubscription = generation
             if (
               installedStream &&
diff --git a/src/renderer/src/components/terminal-pane/remote-runtime-saved-result-consumer.test.ts b/src/renderer/src/components/terminal-pane/remote-runtime-saved-result-consumer.test.ts
new file mode 100644
index 000000000000..77b54143df2e
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/remote-runtime-saved-result-consumer.test.ts
@@ -0,0 +1,269 @@
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import type { TerminalAttachmentLaunchResult } from '../../../../shared/terminal-attachment-launch-result'
+import type { ConnectPanePtySession } from './pty-connection/connect-pane-pty-session'
+import type { AgentLaunchConfigRegistryEntry } from '@/store/slices/agent-status-contract'
+import { bindCaptureTransportOutputCallbacks } from './pty-connection/transport-output-callbacks'
+import { bindSettlePaneSerializer } from './pty-connection/pane-serializer-settle'
+import { applyTerminalLaunchResult } from './pty-connection/terminal-launch-result-policy'
+import {
+  TerminalStreamOpcode,
+  decodeTerminalStreamFrame
+} from '../../../../shared/terminal-stream-protocol'
+import { installSavedResumeStartupCancellation } from './pty-connection/saved-resume-startup-cancellation'
+import {
+  createRemoteRuntimeTransportMocks,
+  type MultiplexSubscriptionCallbacks
+} from './remote-runtime-pty-transport-test-harness'
+
+const fixture = vi.hoisted(() => ({ state: {} }))
+vi.mock('@/store', () => ({ useAppStore: { getState: () => fixture.state } }))
+let subscriptionCallbacks: MultiplexSubscriptionCallbacks = null
+let resolvedPaneHandle = 'terminal-1'
+const {
+  runtimeCall,
+  subscriptionSendBinary,
+  latestSubscribePayload,
+  emitSnapshot,
+  inputFrameTexts,
+  resetRemoteRuntimeTransport
+} = createRemoteRuntimeTransportMocks({
+  getCallbacks: () => subscriptionCallbacks,
+  setCallbacks: (callbacks) => {
+    subscriptionCallbacks = callbacks
+  },
+  getResolvedPaneHandle: () => resolvedPaneHandle,
+  setResolvedPaneHandle: (handle) => {
+    resolvedPaneHandle = handle
+  }
+})
+beforeEach(resetRemoteRuntimeTransport)
+afterEach(() => vi.clearAllMocks())
+
+it.each([
+  'refused',
+  'adopted',
+  'unavailable',
+  'legacy',
+  'malformed',
+  'bookkeeping-error',
+  'new-C',
+  'new-D',
+  'stale-generation'
+] as const)(
+  'delivers the actual mirror %s result to the pane without replaying or clearing newer work',
+  async (kind) => {
+    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
+    const transport = createRemoteRuntimePtyTransport('env-1', {
+      worktreeId: 'wt-1',
+      tabId: 'web-terminal-host-tab-1',
+      leafId: 'pane:1'
+    })
+    const record = {
+      paneKey: 'web-terminal-host-tab-1:pane:1',
+      tabId: 'web-terminal-host-tab-1',
+      worktreeId: 'wt-1',
+      agent: 'codex' as const,
+      providerSession: { key: 'session_id' as const, id: 'C' },
+      connectionId: null,
+      state: 'done' as const,
+      prompt: '',
+      capturedAt: 10,
+      updatedAt: 10,
+      origin: 'worktree-sleep' as const
+    }
+    const source = { cancelled: false, record }
+    const startup = {
+      command: 'codex resume C',
+      launchAgent: 'codex' as const,
+      resumeProviderSession: record.providerSession,
+      resumeOrigin: 'saved' as const,
+      resumeSource: source
+    }
+    const registry: Record<string, AgentLaunchConfigRegistryEntry> = {}
+    const records = { [record.paneKey]: record }
+    const clearRecord = vi.fn((key: string) => {
+      delete records[key]
+    })
+    fixture.state = {
+      agentLaunchConfigByPaneKey: registry,
+      agentStatusByPaneKey: {},
+      sleepingAgentSessionsByPaneKey: records,
+      automaticAgentResumeClaimsByTabId: {},
+      pendingStartupByTabId: {},
+      tabsByWorktree: {},
+      consumeTabStartupCommand: vi.fn(() => {
+        if (kind === 'bookkeeping-error') {
+          throw new Error('bookkeeping failed')
+        }
+      }),
+      clearSleepingAgentSession: clearRecord
+    }
+    const note = vi.fn()
+    const register = vi.fn()
+    const callbacksReady = vi.fn()
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the real callback and cancellation installers use the supplied session members.
+    const session = {
+      transport,
+      pane: { id: 1, leafId: 'pane:1', container: { dataset: {} }, terminal: {} },
+      deps: {
+        worktreeId: 'wt-1',
+        tabId: record.tabId,
+        isVisibleRef: { current: true },
+        onShowSessionRestoredBanner: note,
+        paneTransportsRef: { current: new Map([[1, transport]]) }
+      },
+      cacheKey: record.paneKey,
+      paneStartup: kind === 'observer-only' ? null : startup,
+      pendingStartupCommand: startup,
+      shouldDeliverStartupViaTerminalPaste: true,
+      startupInjectTimer: null,
+      transportStreamGeneration: 0,
+      disposed: false,
+      createProcessExitState: () => ({ detector: { observe: vi.fn() } }),
+      clearRegisteredStartupLaunchConfig: vi.fn(),
+      registerEffectiveLaunchConfig: register,
+      showSessionRestoredBanner: note,
+      reportRemoteRendererSerializerReady: callbacksReady,
+      syncHiddenRendererPtyDelivery: vi.fn(),
+      handleRemoteOutputPauseChanged: vi.fn(),
+      markHiddenOutputRestoreNeeded: vi.fn(),
+      beginReattachLiveDataDeferralIfUnowned: vi.fn(),
+      replayDataCallback: vi.fn(),
+      dataCallback: vi.fn()
+    } as unknown as ConnectPanePtySession
+    installSavedResumeStartupCancellation(session)
+    bindSettlePaneSerializer(session)
+    session.reportRemoteRendererSerializerReady = callbacksReady
+    bindCaptureTransportOutputCallbacks(session)
+    const output = session.captureTransportOutputCallbacks(vi.fn(), null)
+    const actualConfig = { agentCommand: 'codex', agentArgs: '--model actual', agentEnv: {} }
+    const launchResult: TerminalAttachmentLaunchResult = {
+      ptyId: 'physical-1',
+      incarnationId: 'incarnation-1',
+      ...(kind === 'adopted'
+        ? {}
+        : {
+            savedResumeDecision: {
+              agent: 'codex',
+              providerSession: record.providerSession,
+              verdict: kind === 'unavailable' ? 'admitted' : 'chat-home'
+            },
+            agentResumeUnavailable: true,
+            ...(kind === 'unavailable' ? {} : { agentResumeRefused: 'chat-home' })
+          }),
+      ...(kind === 'adopted' || kind === 'unavailable'
+        ? {
+            launchAgent: 'codex',
+            launchToken: 'actual-token',
+            launchConfig: actualConfig
+          }
+        : {})
+    }
+    subscriptionSendBinary.mockImplementation((bytes) => {
+      if (decodeTerminalStreamFrame(bytes)?.opcode !== TerminalStreamOpcode.Subscribe) {
+        return
+      }
+      if (kind === 'new-C' || kind === 'new-D') {
+        const newer = { ...startup, resumeSource: { cancelled: false } }
+        session.paneStartup = newer
+        session.pendingStartupCommand = newer
+        registry[record.paneKey] = { launchConfig: actualConfig, identity: {}, registeredAt: 20 }
+        records[record.paneKey] = { ...record, updatedAt: 20 }
+      }
+      if (kind === 'stale-generation') {
+        session.transportStreamGeneration += 1
+      }
+      const { streamId, terminal } = latestSubscribePayload()
+      // Arrive synchronously while subscribeTerminal is still installing the stream.
+      if (kind === 'ackless') {
+        return
+      }
+      subscriptionCallbacks?.onResponse({
+        ok: true,
+        result: {
+          type: 'subscribed',
+          streamId,
+          terminal,
+          ...(kind === 'legacy'
+            ? {}
+            : {
+                launchResult:
+                  kind === 'malformed'
+                    ? { ...launchResult, savedResumeDecision: { agent: 'codex' } }
+                    : launchResult
+              })
+        }
+      })
+    })
+    try {
+      transport.attach({ existingPtyId: 'remote:env-1@@terminal-1', callbacks: output.callbacks })
+      await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
+      await new Promise((resolve) => setTimeout(resolve, 0))
+      expect(callbacksReady).not.toHaveBeenCalled()
+      const { streamId } = latestSubscribePayload()
+      const resolvesBeforeSnapshot = runtimeCall.mock.calls.filter(
+        ([request]) => request.method === 'terminal.resolvePane'
+      ).length
+      transport.sendInput('ordinary-input', 'driving')
+      if (kind === 'refused' || kind === 'bookkeeping-error' || kind === 'unavailable') {
+        expect(session.pendingStartupCommand).toBeNull()
+      }
+      emitSnapshot(streamId, 'shell$ ')
+      await vi.waitFor(() => expect(inputFrameTexts().join('')).toContain('ordinary-input'))
+      if (kind !== 'stale-generation') {
+        expect(callbacksReady).toHaveBeenCalledTimes(1)
+      }
+      const refused =
+        kind === 'refused' || kind === 'bookkeeping-error' || kind === 'new-C' || kind === 'new-D'
+      expect(source.cancelled).toBe(refused || kind === 'unavailable')
+      expect(note).toHaveBeenCalledTimes(
+        kind === 'refused' ||
+          kind === 'bookkeeping-error' ||
+          kind === 'observer-only' ||
+          kind === 'unavailable'
+          ? 1
+          : 0
+      )
+      expect(clearRecord).toHaveBeenCalledTimes(
+        kind === 'refused' || kind === 'unavailable' ? 1 : 0
+      )
+      if (kind === 'new-C' || kind === 'new-D') {
+        expect(session.paneStartup?.resumeSource?.cancelled).toBe(false)
+        expect(session.pendingStartupCommand).toBe(session.paneStartup)
+        expect(records[record.paneKey].updatedAt).toBe(20)
+        expect(register).not.toHaveBeenCalled()
+      } else if (kind === 'adopted' || kind === 'unavailable') {
+        expect(register).toHaveBeenCalledWith(actualConfig, {
+          launchAgent: 'codex',
+          launchToken: 'actual-token'
+        })
+      } else if (kind === 'refused' || kind === 'observer-only') {
+        expect(session.pendingStartupCommand).toBeNull()
+        expect(session.paneStartup).toBeNull()
+        expect(register).toHaveBeenCalledWith(undefined, {
+          launchAgent: undefined,
+          launchToken: undefined
+        })
+      } else if (kind !== 'bookkeeping-error') {
+        expect(register).not.toHaveBeenCalled()
+      }
+      if (kind === 'refused' || kind === 'unavailable') {
+        // The returning creator repeats the acknowledgment; existing note idempotence survives.
+        applyTerminalLaunchResult(session, launchResult, output.launchContext, 'creator')
+        expect(note).toHaveBeenCalledTimes(1)
+      }
+      expect(inputFrameTexts().join('')).not.toContain('codex resume C')
+      expect(
+        runtimeCall.mock.calls.filter(([request]) => request.method === 'terminal.resolvePane')
+      ).toHaveLength(resolvesBeforeSnapshot)
+      expect(runtimeCall.mock.calls.some(([request]) => request.method === 'terminal.create')).toBe(
+        false
+      )
+      expect(runtimeCall.mock.calls.some(([request]) => request.method === 'terminal.send')).toBe(
+        false
+      )
+    } finally {
+      transport.disconnect()
+    }
+  }
+)
diff --git a/src/renderer/src/runtime/remote-runtime-terminal-multiplexer-types.ts b/src/renderer/src/runtime/remote-runtime-terminal-multiplexer-types.ts
index 9a6af8dc9c9b..3e652559679b 100644
--- a/src/renderer/src/runtime/remote-runtime-terminal-multiplexer-types.ts
+++ b/src/renderer/src/runtime/remote-runtime-terminal-multiplexer-types.ts
@@ -1,3 +1,4 @@
+import type { TerminalAttachmentLaunchResult } from '../../../shared/terminal-attachment-launch-result'
 import type { TerminalSnapshotUnavailableReason } from '../../../shared/terminal-snapshot-unavailability'
 import type { TerminalStreamEndVerdict } from '../../../shared/terminal-stream-end-verdict'
 import type { TerminalInputAckKind } from '../../../shared/terminal-stream-protocol'
@@ -12,6 +13,8 @@ export type TerminalMultiplexEvent =
   | { type: 'ready' }
   | {
       type: 'subscribed'
+      terminal?: string
+      launchResult?: unknown
       streamId: number
       streamGeneration?: string
       capabilities?: {
@@ -58,7 +61,7 @@ export type RemoteRuntimeMultiplexedTerminalCallbacks = {
   ) => void
   onSubscribed?: () => void
   /** The host installed the stream and named its capabilities; its initial snapshot is still on the way. */
-  onSubscribeAcknowledged?: () => void
+  onSubscribeAcknowledged?: (result?: TerminalAttachmentLaunchResult) => void
   onOutputPauseCapability?: () => void
   /** The host discarded output while this stream was paused (negotiated streams only). */
   onPausedOutputDropped?: () => void
diff --git a/src/renderer/src/runtime/remote-runtime-terminal-response-controller.ts b/src/renderer/src/runtime/remote-runtime-terminal-response-controller.ts
index 6a32666c261a..6ecea138c939 100644
--- a/src/renderer/src/runtime/remote-runtime-terminal-response-controller.ts
+++ b/src/renderer/src/runtime/remote-runtime-terminal-response-controller.ts
@@ -1,3 +1,4 @@
+import { parseTerminalAttachmentLaunchResult } from '../../../shared/terminal-attachment-launch-result'
 import type { RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope'
 import { TERMINAL_MULTIPLEX_STREAM_LIMIT_ERROR } from '../../../shared/terminal-multiplex-flow-control'
 import { parseTerminalStreamEndVerdict } from '../../../shared/terminal-stream-end-verdict'
@@ -99,7 +100,11 @@ export abstract class RemoteRuntimeTerminalResponseController extends RemoteRunt
         stream.callbacks.onOutputPauseCapability?.()
       }
       if (!stream.initialSnapshotReceived) {
-        stream.callbacks.onSubscribeAcknowledged?.()
+        stream.callbacks.onSubscribeAcknowledged?.(
+          event.terminal === stream.terminal
+            ? parseTerminalAttachmentLaunchResult(event.launchResult)
+            : undefined
+        )
       }
     } else if (event.type === 'end') {
       disposeRemoteTerminalStreamState(stream, 'Remote terminal stream ended.')
diff --git a/src/shared/runtime-terminal-contracts.ts b/src/shared/runtime-terminal-contracts.ts
index 42fd21cbde3b..30f161c9219e 100644
--- a/src/shared/runtime-terminal-contracts.ts
+++ b/src/shared/runtime-terminal-contracts.ts
@@ -300,7 +300,7 @@ export type RuntimeTerminalSplit = {
   leafId?: string
 }
 
-export type RuntimeTerminalResolvePane = {
+export type RuntimeTerminalResolvePane = TerminalLaunchResult & {
   handle: string
   /** Host-owned PTY incarnation used to fence remote identity observations. */
   incarnationId?: string | null
diff --git a/src/shared/terminal-attachment-launch-result.ts b/src/shared/terminal-attachment-launch-result.ts
new file mode 100644
index 000000000000..21a050d9b523
--- /dev/null
+++ b/src/shared/terminal-attachment-launch-result.ts
@@ -0,0 +1,56 @@
+import { z } from 'zod'
+import type { TerminalLaunchResult } from './agent-session-resume'
+import { isTuiAgent } from './tui-agent-config'
+import type { TuiAgent } from './tui-agent'
+import { ResumeProviderSessionParam } from './rpc-contract/terminal-unary-params'
+import { sleepingAgentLaunchConfigBaseSchema } from './workspace-session-sleeping-agents'
+
+export type TerminalAttachmentLaunchResult = TerminalLaunchResult & {
+  ptyId: string
+  incarnationId: string
+}
+
+const launchResultSchema = z.object({
+  ptyId: z.string().min(1),
+  incarnationId: z.string().min(1),
+  savedResumeDecision: z
+    .object({
+      agent: z.string().min(1),
+      providerSession: ResumeProviderSessionParam,
+      verdict: z.enum(['admitted', 'chat-home', 'chat-writing', 'unverifiable'])
+    })
+    .optional(),
+  agentResumeUnavailable: z.literal(true).optional(),
+  agentResumeRefused: z.enum(['chat-home', 'chat-writing', 'unverifiable']).optional(),
+  refusedResume: z
+    .object({
+      agent: z.string().min(1),
+      providerSession: ResumeProviderSessionParam,
+      expectedStatus: z
+        .object({
+          paneKey: z.string().min(1),
+          receivedAt: z.number().finite(),
+          stateStartedAt: z.number().finite()
+        })
+        .optional(),
+      expectedSavedRecord: z
+        .object({
+          paneKey: z.string().min(1),
+          capturedAt: z.number().finite(),
+          updatedAt: z.number().finite()
+        })
+        .optional()
+    })
+    .optional(),
+  launchConfig: sleepingAgentLaunchConfigBaseSchema.optional(),
+  launchAgent: z.custom<TuiAgent>(isTuiAgent).optional(),
+  launchToken: z.string().min(1).optional(),
+  resumeProviderSession: ResumeProviderSessionParam.optional()
+})
+
+export function parseTerminalAttachmentLaunchResult(
+  value: unknown
+): TerminalAttachmentLaunchResult | undefined {
+  const result = launchResultSchema.safeParse(value)
+  return result.success ? result.data : undefined
+}
diff --git a/src/shared/workspace-session-sleeping-agents.ts b/src/shared/workspace-session-sleeping-agents.ts
index f27b7c53823d..1f17e1e89d97 100644
--- a/src/shared/workspace-session-sleeping-agents.ts
+++ b/src/shared/workspace-session-sleeping-agents.ts
@@ -63,7 +63,7 @@ const sleepingAgentLaunchEnvSchema = z.preprocess(
   z.record(z.string(), z.string())
 )
 
-const sleepingAgentLaunchConfigBaseSchema = z.object({
+export const sleepingAgentLaunchConfigBaseSchema = z.object({
   agentCommand: z.string().optional(),
   agentArgs: z.string(),
   agentEnv: sleepingAgentLaunchEnvSchema,

From 772cd377f85a2d0fa50e525e3ca5a8fb996a7249 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Tue, 20 Oct 2026 09:42:11 -0700
Subject: [PATCH 007/207] fix: preserve terminal launch callback and candidate
 ownership

---
 ...rminal-create-host-session-binding.test.ts |   9 ++
 .../terminal-multiplex-initial-snapshot.ts    |   2 +-
 .../terminal-launch-result-policy.ts          |   2 +-
 .../remote-runtime-pty-transport.ts           |  28 +++-
 ...mote-runtime-saved-result-consumer.test.ts | 131 +++++++++++++++++-
 5 files changed, 159 insertions(+), 13 deletions(-)

diff --git a/src/main/runtime/cli-terminal-create-host-session-binding.test.ts b/src/main/runtime/cli-terminal-create-host-session-binding.test.ts
index 2091b9c8579f..9a87b49c1cae 100644
--- a/src/main/runtime/cli-terminal-create-host-session-binding.test.ts
+++ b/src/main/runtime/cli-terminal-create-host-session-binding.test.ts
@@ -9,6 +9,11 @@ import {
 } from './rpc/terminal-multiplex-test-harness'
 import type { RuntimePtyWorktreeRecord } from './runtime-terminal-state-records'
 import { OrcaRuntimeService } from './orca-runtime'
+import {
+  TerminalStreamOpcode,
+  decodeTerminalStreamFrame,
+  decodeTerminalStreamText
+} from '../../shared/terminal-stream-protocol'
 
 vi.mock('electron', () => ({
   BrowserWindow: { fromId: vi.fn(() => ({ isDestroyed: () => false })) },
@@ -198,6 +203,10 @@ it.each(['unchanged', 'hook', 'config', 'incarnation', 'handle'] as const)(
       )
       if (stale) {
         expect(events().some((event) => event?.type === 'subscribed')).toBe(false)
+        const error = harness.binaryFrames
+          .map(decodeTerminalStreamFrame)
+          .find((frame) => frame?.opcode === TerminalStreamOpcode.Error)
+        expect(error && decodeTerminalStreamText(error.payload)).toBe('terminal_handle_stale')
       } else {
         const result = events().find((event) => event?.type === 'subscribed').launchResult
         expect(result).toMatchObject({ ptyId: 'effective-pty', incarnationId: 'i1' })
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-multiplex-initial-snapshot.ts b/src/main/runtime/rpc/methods/terminal/terminal-multiplex-initial-snapshot.ts
index e4ff1463d31d..92a4966923ab 100644
--- a/src/main/runtime/rpc/methods/terminal/terminal-multiplex-initial-snapshot.ts
+++ b/src/main/runtime/rpc/methods/terminal/terminal-multiplex-initial-snapshot.ts
@@ -57,7 +57,7 @@ export async function publishMultiplexInitialSnapshot(
   const snapshotOutputSeq = serialized?.seq
   // Snapshot awaits may outlive the handle binding or the physical shell.
   if (
-    runtime.resolveLiveLeafForHandle(request.terminal).ptyId !== ptyId ||
+    runtime.resolveLiveLeafForHandle(request.terminal)?.ptyId !== ptyId ||
     runtime.getPtyExecutionHostMetadata(ptyId).incarnationId !== incarnationId
   ) {
     throw new Error('terminal_handle_stale')
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/terminal-launch-result-policy.ts b/src/renderer/src/components/terminal-pane/pty-connection/terminal-launch-result-policy.ts
index 82e3ab6a4a87..487be5006014 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/terminal-launch-result-policy.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/terminal-launch-result-policy.ts
@@ -68,7 +68,7 @@ export function applyTerminalLaunchResult(
     if (
       rejected &&
       (!result.isReattach || result.agentResumeRefused) &&
-      (kind !== 'observer' || matches)
+      (matches || kind === 'candidate' || (kind === 'creator' && !result.isReattach))
     ) {
       session.cancelSavedResumeStartup(
         startup,
diff --git a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport.ts b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport.ts
index 0926193fe9f0..8fdfd760e6e4 100644
--- a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport.ts
+++ b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport.ts
@@ -1513,6 +1513,10 @@ export function createRemoteRuntimePtyTransport(
       return
     }
     const recoverySubscriptionGeneration = subscriptionGeneration
+    const recoveryLifecycleEpoch = lifecycleEpoch
+    const recoveryCallbacks = storedCallbacks
+    const ownsRecoveryLifecycle = (): boolean =>
+      recoveryLifecycleEpoch === lifecycleEpoch && recoveryCallbacks === storedCallbacks
     recoveringPaneHandle = expiredHandle
     connected = false
     clearPendingViewportClaim()
@@ -1524,7 +1528,7 @@ export function createRemoteRuntimePtyTransport(
       expectedTerminal: expiredHandle
     })
       .then(async ({ terminal }) => {
-        if (destroyed || handle !== expiredHandle) {
+        if (destroyed || handle !== expiredHandle || !ownsRecoveryLifecycle()) {
           return
         }
         const previousIncarnationId = authoritativePtyIncarnationId
@@ -1549,6 +1553,9 @@ export function createRemoteRuntimePtyTransport(
             onPtyRebind?.(remotePtyId, replacedPtyId)
           }
         }
+        if (!ownsRecoveryLifecycle()) {
+          return
+        }
         const launchResult = parseTerminalAttachmentLaunchResult({
           ...terminalLaunchFacts(terminal),
           ptyId: terminal.ptyId,
@@ -1556,19 +1563,22 @@ export function createRemoteRuntimePtyTransport(
         })
         if (
           launchResult &&
+          ownsRecoveryLifecycle() &&
           recoverySubscriptionGeneration === subscriptionGeneration &&
           currentPaneRevision() === getRuntimeEnvironmentRevision(currentRuntimeEnvironmentId)
         ) {
           try {
-            storedCallbacks.onLaunchResult?.(launchResult)
+            recoveryCallbacks.onLaunchResult?.(launchResult)
           } catch (error) {
             console.warn('Terminal launch result bookkeeping failed', error)
           }
         }
-        await subscribeToHandle()
+        if (ownsRecoveryLifecycle()) {
+          await subscribeToHandle()
+        }
       })
       .catch((error) => {
-        if (!destroyed && handle === expiredHandle) {
+        if (!destroyed && handle === expiredHandle && ownsRecoveryLifecycle()) {
           surfaceErrorMessage(runtimeTerminalErrorMessage(error))
         }
       })
@@ -2585,6 +2595,10 @@ export function createRemoteRuntimePtyTransport(
     }
     const subscribedHandle = handle
     const subscribedPtyId = remotePtyId
+    const subscribedLifecycleEpoch = lifecycleEpoch
+    const subscribedCallbacks = storedCallbacks
+    const ownsSubscriptionLifecycle = (): boolean =>
+      subscribedLifecycleEpoch === lifecycleEpoch && subscribedCallbacks === storedCallbacks
     const generation = ++subscriptionGeneration
     setAttachmentReady(false)
     let transportClosed = false
@@ -2597,6 +2611,7 @@ export function createRemoteRuntimePtyTransport(
     const isCurrentSubscription = (): boolean =>
       !transportClosed &&
       generation === subscriptionGeneration &&
+      ownsSubscriptionLifecycle() &&
       (expectedRecoveryEpoch === undefined || recovery.ownsEpoch(expectedRecoveryEpoch)) &&
       isCurrentRemoteTerminal(subscribedHandle, subscribedPtyId)
     if (currentPaneRevision() !== getRuntimeEnvironmentRevision(currentRuntimeEnvironmentId)) {
@@ -2681,7 +2696,7 @@ export function createRemoteRuntimePtyTransport(
             ) {
               authoritativePtyIncarnationId = result.incarnationId
               try {
-                storedCallbacks.onLaunchResult?.(result)
+                subscribedCallbacks.onLaunchResult?.(result)
               } catch (error) {
                 console.warn('Terminal launch result bookkeeping failed', error)
               }
@@ -2818,7 +2833,7 @@ export function createRemoteRuntimePtyTransport(
         },
         onTransportClose: ({ recoverable, retryWithBackoff }) => {
           transportClosed = true
-          if (generation !== subscriptionGeneration) {
+          if (generation !== subscriptionGeneration || !ownsSubscriptionLifecycle()) {
             return
           }
           if (!isCurrentSubscription()) {
@@ -2849,6 +2864,7 @@ export function createRemoteRuntimePtyTransport(
     })
     if (
       transportClosed ||
+      !ownsSubscriptionLifecycle() ||
       generation !== subscriptionGeneration ||
       (expectedRecoveryEpoch !== undefined && !recovery.ownsEpoch(expectedRecoveryEpoch)) ||
       destroyed ||
diff --git a/src/renderer/src/components/terminal-pane/remote-runtime-saved-result-consumer.test.ts b/src/renderer/src/components/terminal-pane/remote-runtime-saved-result-consumer.test.ts
index 77b54143df2e..1418390a5989 100644
--- a/src/renderer/src/components/terminal-pane/remote-runtime-saved-result-consumer.test.ts
+++ b/src/renderer/src/components/terminal-pane/remote-runtime-saved-result-consumer.test.ts
@@ -42,8 +42,11 @@ afterEach(() => vi.clearAllMocks())
 it.each([
   'refused',
   'adopted',
+  'adopted-D',
+  'observer-only',
   'unavailable',
   'legacy',
+  'ackless',
   'malformed',
   'bookkeeping-error',
   'new-C',
@@ -114,7 +117,7 @@ it.each([
       },
       cacheKey: record.paneKey,
       paneStartup: kind === 'observer-only' ? null : startup,
-      pendingStartupCommand: startup,
+      pendingStartupCommand: kind === 'observer-only' ? null : startup,
       shouldDeliverStartupViaTerminalPaste: true,
       startupInjectTimer: null,
       transportStreamGeneration: 0,
@@ -145,13 +148,14 @@ it.each([
         : {
             savedResumeDecision: {
               agent: 'codex',
-              providerSession: record.providerSession,
+              providerSession:
+                kind === 'adopted-D' ? { key: 'session_id', id: 'D' } : record.providerSession,
               verdict: kind === 'unavailable' ? 'admitted' : 'chat-home'
             },
             agentResumeUnavailable: true,
             ...(kind === 'unavailable' ? {} : { agentResumeRefused: 'chat-home' })
           }),
-      ...(kind === 'adopted' || kind === 'unavailable'
+      ...(kind === 'adopted' || kind === 'adopted-D' || kind === 'unavailable'
         ? {
             launchAgent: 'codex',
             launchToken: 'actual-token',
@@ -164,11 +168,19 @@ it.each([
         return
       }
       if (kind === 'new-C' || kind === 'new-D') {
-        const newer = { ...startup, resumeSource: { cancelled: false } }
+        const providerSession = {
+          key: 'session_id' as const,
+          id: kind === 'new-D' ? 'D' : 'C'
+        }
+        const newer = {
+          ...startup,
+          resumeProviderSession: providerSession,
+          resumeSource: { cancelled: false }
+        }
         session.paneStartup = newer
         session.pendingStartupCommand = newer
         registry[record.paneKey] = { launchConfig: actualConfig, identity: {}, registeredAt: 20 }
-        records[record.paneKey] = { ...record, updatedAt: 20 }
+        records[record.paneKey] = { ...record, providerSession, updatedAt: 20 }
       }
       if (kind === 'stale-generation') {
         session.transportStreamGeneration += 1
@@ -205,6 +217,11 @@ it.each([
         ([request]) => request.method === 'terminal.resolvePane'
       ).length
       transport.sendInput('ordinary-input', 'driving')
+      if (kind === 'ackless') {
+        expect(inputFrameTexts().join('')).not.toContain('ordinary-input')
+      } else {
+        await vi.waitFor(() => expect(inputFrameTexts().join('')).toContain('ordinary-input'))
+      }
       if (kind === 'refused' || kind === 'bookkeeping-error' || kind === 'unavailable') {
         expect(session.pendingStartupCommand).toBeNull()
       }
@@ -247,6 +264,22 @@ it.each([
       } else if (kind !== 'bookkeeping-error') {
         expect(register).not.toHaveBeenCalled()
       }
+      if (kind === 'adopted-D') {
+        applyTerminalLaunchResult(
+          session,
+          { ...launchResult, isReattach: true },
+          output.launchContext,
+          'creator'
+        )
+        expect(source.cancelled).toBe(false)
+        expect(session.pendingStartupCommand?.resumeSource).toBe(source)
+        expect(records[record.paneKey]).toBe(record)
+        expect(clearRecord).not.toHaveBeenCalled()
+        expect(register).toHaveBeenCalledWith(actualConfig, {
+          launchAgent: 'codex',
+          launchToken: 'actual-token'
+        })
+      }
       if (kind === 'refused' || kind === 'unavailable') {
         // The returning creator repeats the acknowledgment; existing note idempotence survives.
         applyTerminalLaunchResult(session, launchResult, output.launchContext, 'creator')
@@ -267,3 +300,91 @@ it.each([
     }
   }
 )
+
+it.each(['subscription', 'recovery'] as const)(
+  'rejects predecessor %s facts while a successor connect owns the callback bundle',
+  async (operation) => {
+    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
+    const transport = createRemoteRuntimePtyTransport('env-1', {
+      worktreeId: 'wt-1',
+      tabId: 'web-terminal-host-tab-1',
+      leafId: 'pane:1'
+    })
+    const predecessorResult = vi.fn()
+    const successorResult = vi.fn()
+    const launchResult: TerminalAttachmentLaunchResult = {
+      ptyId: 'physical-1',
+      incarnationId: 'incarnation-1',
+      agentResumeRefused: 'chat-home',
+      savedResumeDecision: {
+        agent: 'codex',
+        providerSession: { key: 'session_id', id: 'C' },
+        verdict: 'chat-home'
+      }
+    }
+    let finishRecovery: (value: unknown) => void = () => {}
+    const recoveryResult = new Promise((resolve) => {
+      finishRecovery = resolve
+    })
+    let finishActivation: (value: unknown) => void = () => {}
+    const activationResult = new Promise((resolve) => {
+      finishActivation = resolve
+    })
+    try {
+      transport.attach({
+        existingPtyId: 'remote:env-1@@terminal-1',
+        callbacks: { onLaunchResult: predecessorResult }
+      })
+      await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
+      const { streamId, terminal } = latestSubscribePayload()
+      const defaultCall = runtimeCall.getMockImplementation()
+      runtimeCall.mockImplementation((request: { method: string }) => {
+        if (request.method === 'terminal.recoverPane') {
+          return recoveryResult
+        }
+        if (request.method === 'session.tabs.activate') {
+          return activationResult
+        }
+        return defaultCall?.(request)
+      })
+      if (operation === 'recovery') {
+        subscriptionCallbacks?.onResponse({
+          ok: true,
+          result: { type: 'error', streamId, message: 'SSH_SESSION_EXPIRED: relay changed' }
+        })
+        await vi.waitFor(() =>
+          expect(runtimeCall).toHaveBeenCalledWith(
+            expect.objectContaining({ method: 'terminal.recoverPane' })
+          )
+        )
+      }
+      const successor = transport.connect({
+        url: '',
+        callbacks: { onLaunchResult: successorResult }
+      })
+      await vi.waitFor(() =>
+        expect(runtimeCall).toHaveBeenCalledWith(
+          expect.objectContaining({ method: 'session.tabs.activate' })
+        )
+      )
+      subscriptionCallbacks?.onResponse({
+        ok: true,
+        result: { type: 'subscribed', streamId, terminal, launchResult }
+      })
+      finishRecovery({
+        ok: true,
+        result: { terminal: { handle: terminal, ...launchResult } }
+      })
+      await new Promise((resolve) => setTimeout(resolve, 0))
+      expect(predecessorResult).not.toHaveBeenCalled()
+      expect(successorResult).not.toHaveBeenCalled()
+      transport.disconnect()
+      finishActivation({ ok: true, result: {} })
+      await successor
+    } finally {
+      transport.disconnect()
+      finishRecovery({ ok: true, result: {} })
+      finishActivation({ ok: true, result: {} })
+    }
+  }
+)

From 08a9b6ae83e4fe411d611fa7b365e051ae6cf5f0 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Tue, 20 Oct 2026 11:34:54 -0700
Subject: [PATCH 008/207] feat(native-chat): host op and claim for switching a
 Codex chat to its terminal in place

One enablement source (Codex) drives same-id terminal resume, the per-agent
switch capability and History. agentSession.switchToTerminal admits only an
idle chat, registers the switch claim in the chat's ordered step, stops the
agent with proven exit while the tab stays, and returns the resume recipe.
The claim refuses a chat start until the switch terminal's own spawn binds it;
the bound proof ends only when the agent that terminal ran is proven exited
and the pane is shell alone.
---
 src/main/ai-vault/structured-chat-cli-fork.ts |  42 ++++-
 .../structured-session-ownership.test.ts      |  41 +++--
 .../ai-vault/structured-session-ownership.ts  |   8 +-
 .../pty/host-env/resume-spawn-judgement.ts    | 136 +++++++++++++++
 .../pty/host-env/saved-resume-admission.ts    | 119 +++----------
 src/main/ipc/pty/ipc/spawn-run.ts             |   3 +
 src/main/ipc/pty/runtime/spawn-state.ts       |   2 +-
 src/main/ipc/pty/runtime/spawn.ts             |   5 +-
 .../structured-agent-session-acquisition.ts   |   6 +-
 .../structured-agent-session-adapter.ts       |   1 +
 ...red-agent-session-conversation-lifetime.ts |  13 +-
 .../structured-agent-session-failure-text.ts  |   3 +-
 .../structured-agent-session-host.ts          |   2 +
 .../structured-agent-session-idle-sweep.ts    |   2 +-
 ...ructured-agent-session-switch-admission.ts |  43 +++++
 .../structured-provider-session-ownership.ts  |   5 +-
 src/main/runtime/rpc/methods/session-tabs.ts  |   1 +
 ...ession-gate-classification.test-fixture.ts |   1 +
 ...ctured-agent-session-switch-to-terminal.ts |  65 +++++++
 .../methods/structured-agent-session.test.ts  |   2 +-
 .../rpc/methods/structured-agent-session.ts   |   4 +-
 .../runtime-pty-controller-contract.ts        |   2 +-
 .../runtime/runtime-terminal-contracts.ts     |   2 +-
 .../runtime/runtime-terminal-state-records.ts |   3 +
 .../structured-session-cli-writer-host.ts     |  93 ++++++----
 .../structured-session-switch-claims.ts       | 162 ++++++++++++++++++
 .../structured-session-switch-observation.ts  |  68 ++++++++
 .../terminal/launch/mobile-terminal-create.ts |   1 +
 .../launch/mobile-terminal-owned-create.ts    |   2 +-
 .../launch/mobile-terminal-renderer-create.ts |  48 +++---
 .../agent-session-failure-words-text.ts       |   5 +
 src/shared/agent-session-failure-copy.ts      |   2 +
 src/shared/agent-session-failure-words.ts     |   2 +
 src/shared/agent-session-failure.ts           |   1 +
 src/shared/agent-session-refusal-details.ts   |   2 +
 .../agent-session-refusal-reason-words.ts     |   1 +
 src/shared/protocol-version.ts                |   2 +
 .../rpc-params-catalog.generated.ts           |   1 +
 .../session-tabs-schemas-params.ts            |   9 +
 ...uctured-agent-cli-conversation-adoption.ts |  19 ++
 ...ctured-agent-session-dispatch-rejection.ts |   2 +
 41 files changed, 743 insertions(+), 188 deletions(-)
 create mode 100644 src/main/ipc/pty/host-env/resume-spawn-judgement.ts
 create mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-switch-admission.ts
 create mode 100644 src/main/runtime/rpc/methods/structured-agent-session-switch-to-terminal.ts
 create mode 100644 src/main/runtime/session-tabs/structured-session-switch-claims.ts
 create mode 100644 src/main/runtime/session-tabs/structured-session-switch-observation.ts

diff --git a/src/main/ai-vault/structured-chat-cli-fork.ts b/src/main/ai-vault/structured-chat-cli-fork.ts
index de35351f6479..a7935d8cf0a2 100644
--- a/src/main/ai-vault/structured-chat-cli-fork.ts
+++ b/src/main/ai-vault/structured-chat-cli-fork.ts
@@ -70,13 +70,13 @@ export function isStructuredChatCliForkSourceCurrent(
   )
 }
 
-/** Prepares the record's current conversation on its execution host, without a History inventory. */
-export async function prepareStructuredChatCliFork(
-  args: AiVaultPrepareChatForkArgs,
-  prepare: AiVaultSessionResumePreparation
-): Promise<AiVaultPrepareSessionResumeResult> {
+/** The chat's current conversation on this host, as its CLI would open it; `fork` keeps its copy rules. */
+export async function resolveStructuredChatCliSource(
+  sourceChat: AiVaultPrepareChatForkArgs['sourceChat'],
+  fork: boolean
+) {
   const host = getStructuredAgentSessionHost()
-  const record = host?.deps.store.getRecord(args.sourceChat.sessionId)
+  const record = host?.deps.store.getRecord(sourceChat.sessionId)
   const registration = record && structuredAgentRuntimeRegistration(record.provider)
   const head = record && agentSessionProviderHandleChainHead(record.providerHandleChain)
   if (
@@ -84,13 +84,13 @@ export async function prepareStructuredChatCliFork(
     !record ||
     !registration ||
     !head ||
-    record.location.workspaceId !== args.sourceChat.workspaceId ||
+    record.location.workspaceId !== sourceChat.workspaceId ||
     record.location.executionHostId !== LOCAL_EXECUTION_HOST_ID ||
     record.location.wslDistro !== null ||
     // A typed locator has no CODEX_HOME path; forking would silently use the default account.
     (record.provider === 'codex' && !isLegacyAgentSessionAccountHome(record.accountHome)) ||
     !isAiVaultAgent(record.provider) ||
-    !agentForksConversations(record.provider)
+    (fork && !agentForksConversations(record.provider))
   ) {
     throw new Error('This chat has no saved conversation available on this host.')
   }
@@ -105,6 +105,16 @@ export async function prepareStructuredChatCliFork(
     throw new Error('This chat has no saved conversation to copy.')
   }
   assertNativeConversationContent(await host.journalSnapshot(record.sessionId))
+  return { host, record, registration, head, agent, cwd, providerSessionId }
+}
+
+/** Prepares the record's current conversation on its execution host, without a History inventory. */
+export async function prepareStructuredChatCliFork(
+  args: AiVaultPrepareChatForkArgs,
+  prepare: AiVaultSessionResumePreparation
+): Promise<AiVaultPrepareSessionResumeResult> {
+  const source = await resolveStructuredChatCliSource(args.sourceChat, true)
+  const { record, registration, agent, cwd, providerSessionId } = source
   if (agentForksThroughChat(agent)) {
     const result = await copyStructuredChatRecordConversation(record, providerSessionId)
     const copy = result.forkedSession
@@ -124,6 +134,17 @@ export async function prepareStructuredChatCliFork(
       }
     }
   }
+  return prepareStructuredChatCliTranscript(source, prepare, true)
+}
+
+/** The transcript a terminal resume (or `fork`) opens, under the account home the host prepared.
+ *  A same-id resume refuses a substituted home: another home is another conversation. */
+export async function prepareStructuredChatCliTranscript(
+  source: Awaited<ReturnType<typeof resolveStructuredChatCliSource>>,
+  prepare: AiVaultSessionResumePreparation,
+  fork: boolean
+): Promise<AiVaultPrepareSessionResumeResult> {
+  const { host, record, registration, head, agent, cwd, providerSessionId } = source
   const importer = registration.transcriptImport
   if (!importer) {
     throw new Error('This chat cannot be opened in the CLI.')
@@ -162,10 +183,13 @@ export async function prepareStructuredChatCliFork(
     filePath,
     codexHome,
     executionHostId: LOCAL_EXECUTION_HOST_ID,
-    fork: true
+    ...(fork ? { fork: true } : {})
   })
   const preparedHome = result.useRealCodexHome ? null : (result.substituteCodexHome ?? codexHome)
   if (codexHome && (result.useRealCodexHome || result.substituteCodexHome)) {
+    if (!fork) {
+      throw new Error('This conversation is saved under a different Codex account here.')
+    }
     filePath = join(
       preparedHome ?? getSystemCodexHomePath(),
       'sessions',
diff --git a/src/main/ai-vault/structured-session-ownership.test.ts b/src/main/ai-vault/structured-session-ownership.test.ts
index 53367be93765..4b9ea5e46296 100644
--- a/src/main/ai-vault/structured-session-ownership.test.ts
+++ b/src/main/ai-vault/structured-session-ownership.test.ts
@@ -4,7 +4,6 @@ import { setStructuredAgentSessionHost } from '../native-chat/agent-session-wire
 import {
   assertLegacyAiVaultResumeAllowed,
   assertLegacyAiVaultResumeCommandAllowed,
-  findResumeOwnership,
   OPENS_EVERY_STRUCTURED_CHAT,
   projectStructuredAiVaultSearchResponse,
   projectStructuredAiVaultSessions
@@ -111,37 +110,43 @@ describe('structured AI Vault ownership', () => {
     }
   )
 
-  it('names the chat continuing a conversation first, while every link still refuses a terminal', async () => {
+  it('lets a terminal resume a Codex conversation once no chat may be writing it', async () => {
     const movedOn = codexChatHolding('session-moved', [PROVIDER_SESSION, OTHER_SESSION])
     const owned = (records: ReturnType<typeof codexChatHolding>[]) => {
       installChats(records)
       return projectStructuredAiVaultSessions(listResult(), OPENS_EVERY_STRUCTURED_CHAT).sessions[0]
         ?.structuredSession?.sessionId
     }
+    const resume = {
+      agent: 'codex' as const,
+      filePath: `/sessions/rollout-${PROVIDER_SESSION}.jsonl`,
+      codexHome: null,
+      executionHostId: 'local'
+    }
     expect(owned([movedOn, codexChatHolding('session-now', [PROVIDER_SESSION])])).toBe(
       'session-now'
     )
-    expect(owned([movedOn])).toBe('session-moved')
-    expect(
-      findResumeOwnership({ agent: 'codex', sessionId: PROVIDER_SESSION, filePath: '' })
-    ).toMatchObject({
-      sessionId: 'session-moved',
-      role: 'earlier'
-    })
-    expect(() =>
-      assertLegacyAiVaultResumeAllowed({
-        agent: 'codex',
-        filePath: `/sessions/rollout-${PROVIDER_SESSION}.jsonl`,
-        codexHome: null,
-        executionHostId: 'local'
-      })
-    ).toThrow('agent_session_conflict')
+    // A link the chat moved on from is the terminal's: no owner row, and the resume is admitted.
+    expect(owned([movedOn])).toBeUndefined()
+    expect(() => assertLegacyAiVaultResumeAllowed(resume)).not.toThrow()
+    // The head refuses while its lease may admit a writer, and admits once its agent provably exited.
+    installChats([codexChatHolding('session-now', [PROVIDER_SESSION])])
+    expect(() => assertLegacyAiVaultResumeAllowed(resume)).toThrow('agent_session_conflict')
+    const exited = codexChatHolding('session-now', [PROVIDER_SESSION])
+    exited.lease = {
+      ...exited.lease,
+      claimStatus: 'released',
+      ownerProcess: null,
+      reservedSpawnToken: null,
+      deathEvidence: { kind: 'exit-observed', detail: 'switched to a terminal', observedAt: 1 }
+    }
+    installChats([exited])
     await expect(
       assertLegacyAiVaultResumeCommandAllowed(
         `codex resume ${PROVIDER_SESSION}`,
         async () => undefined
       )
-    ).rejects.toThrow('agent_session_conflict')
+    ).resolves.toBeUndefined()
   })
 
   it('derives typed refusals from the single writer predicate for live and proving leases', async () => {
diff --git a/src/main/ai-vault/structured-session-ownership.ts b/src/main/ai-vault/structured-session-ownership.ts
index 73e29edebaf0..7ae239743c47 100644
--- a/src/main/ai-vault/structured-session-ownership.ts
+++ b/src/main/ai-vault/structured-session-ownership.ts
@@ -9,6 +9,7 @@ import { getStructuredAgentSessionHost } from '../native-chat/agent-session-wire
 import { ensureStructuredAgentSessionHostUnlessRefused } from '../runtime/structured-agent-session-host-refusal'
 import {
   listStructuredProviderSessionOwnership,
+  sameIdTerminalResumeEnabled,
   terminalResumeBlocked,
   type StructuredProviderSessionOwnership
 } from '../native-chat/agent-session-wire/structured-provider-session-ownership'
@@ -117,7 +118,8 @@ function ownedRow(rowAgent: string, ownership: StructuredProviderSessionOwnershi
 }
 
 /** One index per projection: a list holds hundreds of rows, each once searched every record. A row
- *  names the chat continuing its conversation now, else one whose chain held it earlier. */
+ *  names the chat continuing its conversation now, else (agents not yet switching in place) one
+ *  whose chain held it earlier. */
 function ownershipLookup():
   | ((row: { agent: string; sessionId: string }) => StructuredProviderSessionOwnership | null)
   | null {
@@ -136,7 +138,9 @@ function ownershipLookup():
     const found = historyRowOwners(row.agent).flatMap(
       (owner) => byProviderSession.get(`${owner}\0${row.sessionId}`) ?? []
     )
-    return found.find((ownership) => ownership.role === 'head') ?? found[0] ?? null
+    // An agent that switches in place lists a conversation a chat held earlier as the terminal's.
+    const earlier = found.find((ownership) => !sameIdTerminalResumeEnabled(ownership.provider))
+    return found.find((ownership) => ownership.role === 'head') ?? earlier ?? null
   }
 }
 
diff --git a/src/main/ipc/pty/host-env/resume-spawn-judgement.ts b/src/main/ipc/pty/host-env/resume-spawn-judgement.ts
new file mode 100644
index 000000000000..31cd3075a894
--- /dev/null
+++ b/src/main/ipc/pty/host-env/resume-spawn-judgement.ts
@@ -0,0 +1,136 @@
+import type {
+  AgentProviderSessionMetadata,
+  SleepingAgentLaunchConfig,
+  SleepingAgentSessionRecord
+} from '../../../../shared/agent-session-resume'
+import { normalizeAgentProviderSession } from '../../../../shared/agent-session-resume'
+import type { TuiAgent } from '../../../../shared/tui-agent'
+import type {
+  AgentStatusIpcPayload,
+  RefusedPaneResume
+} from '../../../../shared/agent-status-types'
+import type { AgentSessionRecordStore } from '../../../runtime/agent-session-record-store'
+import type { SwitchClaim } from '../../../runtime/session-tabs/structured-session-switch-claims'
+import {
+  agentSessionLeasePossiblyWriting,
+  listStructuredProviderSessionOwnership
+} from '../../../native-chat/agent-session-wire/structured-provider-session-ownership'
+import {
+  keysMayMatch,
+  terminalConversationKey
+} from '../../../native-chat/structured-conversation-key'
+
+export type ResumeSpawnArgs = {
+  connectionId?: string | null
+  command?: string
+  launchAgent?: TuiAgent
+  launchConfig?: SleepingAgentLaunchConfig
+  launchToken?: unknown
+  resumeProviderSession?: AgentProviderSessionMetadata
+  /** `saved`: built from a pane's saved facts; `switch`: the terminal half of a chat's switch. */
+  resumeOrigin?: unknown
+  env?: Record<string, string>
+}
+
+export type AdmissionRuntime = {
+  getAgentProviderSessionRows?(): AgentStatusIpcPayload[]
+  readSavedResumeSource?(
+    worktreeId: string,
+    paneKey: string
+  ): Promise<SleepingAgentSessionRecord | undefined>
+  openAgentSessionRecordStore(): Promise<AgentSessionRecordStore>
+  acceptSwitchStart?(agent: string, id: string): SwitchClaim
+  settleSwitchStart?(claim: SwitchClaim, ptyId: string | null): void
+}
+
+/** `chat-home`: an automatic restore of a conversation an open chat continues; `chat-writing`:
+ *  any start of one a chat may be writing; `unverifiable`: an automatic restore with no records. */
+export type ResumeSpawnRefusal = {
+  sourceRecord?: SleepingAgentSessionRecord
+  verdict: 'chat-home' | 'chat-writing' | 'unverifiable'
+  refused: RefusedPaneResume
+}
+
+export type ResumeSpawnAdmission =
+  | {
+      verdict: 'admitted'
+      refused: RefusedPaneResume
+      sourceRecord?: SleepingAgentSessionRecord
+      /** The switch claim this spawn settles: bound to its PTY, or dropped when none started. */
+      switchClaim?: SwitchClaim
+    }
+  | ResumeSpawnRefusal
+
+export async function judgeResumes(
+  runtime: AdmissionRuntime,
+  resumes: readonly [RefusedPaneResume, ...RefusedPaneResume[]],
+  /** A switch's own start: its chat tab is still open on purpose, so only a writing chat refuses. */
+  switchStart = false
+): Promise<ResumeSpawnAdmission> {
+  const keysOf = ({ agent, providerSession }: RefusedPaneResume) =>
+    [providerSession.id, providerSession.transcriptPath].flatMap((id) =>
+      id?.trim() ? [terminalConversationKey(agent, id)] : []
+    )
+  const admitted = (): ResumeSpawnAdmission => ({
+    verdict: 'admitted',
+    refused: resumes[0]
+  })
+  let store: AgentSessionRecordStore
+  try {
+    store = await runtime.openAgentSessionRecordStore()
+  } catch (error) {
+    console.warn(
+      "[pty] native chat records unreadable; cannot tell whether a resume is a chat's",
+      error
+    )
+    return { verdict: 'unverifiable', refused: resumes[0] }
+  }
+  const heads = listStructuredProviderSessionOwnership(store.listRecords()).filter(
+    (holding) => holding.role === 'head'
+  )
+  const tabs = store.getVisibleSessionTabIndex()
+  for (const refused of resumes) {
+    const holders = heads.filter((holding) =>
+      keysOf(refused).some((key) => keysMayMatch(holding.key, key))
+    )
+    if (holders.some((holding) => agentSessionLeasePossiblyWriting(holding.lease))) {
+      return { verdict: 'chat-writing', refused }
+    }
+    if (switchStart) {
+      continue
+    }
+    if (holders.length > 0 && (!tabs || !tabs.present)) {
+      return { verdict: 'unverifiable', refused }
+    }
+    if (tabs && holders.some((holding) => tabs.sessionIds.includes(holding.sessionId))) {
+      return { verdict: 'chat-home', refused }
+    }
+  }
+  return admitted()
+}
+
+/** The terminal half of a chat's switch: refused into a plain shell where Orca can't judge the pane,
+ *  or while a chat may be writing the conversation; otherwise its claim settles with this spawn. */
+export async function admitSwitchResumeSpawn(
+  runtime: AdmissionRuntime | undefined,
+  args: ResumeSpawnArgs,
+  wslDistro: string | null
+): Promise<ResumeSpawnAdmission> {
+  const providerSession = normalizeAgentProviderSession(args.resumeProviderSession)
+  const agent = args.launchAgent
+  if (!providerSession || !agent) {
+    throw new Error('switch_start_missing_conversation')
+  }
+  const refused = { agent, providerSession }
+  if (args.connectionId || wslDistro !== null || !runtime?.acceptSwitchStart) {
+    return { verdict: 'unverifiable', refused }
+  }
+  // Before any await: a chat start whose census ends after this point sees the claim.
+  const switchClaim = runtime.acceptSwitchStart(agent, providerSession.id)
+  const admission = await judgeResumes(runtime, [refused], true)
+  if (admission.verdict !== 'admitted') {
+    runtime.settleSwitchStart?.(switchClaim, null)
+    return admission
+  }
+  return { ...admission, switchClaim }
+}
diff --git a/src/main/ipc/pty/host-env/saved-resume-admission.ts b/src/main/ipc/pty/host-env/saved-resume-admission.ts
index 65296323394c..ddb73a900854 100644
--- a/src/main/ipc/pty/host-env/saved-resume-admission.ts
+++ b/src/main/ipc/pty/host-env/saved-resume-admission.ts
@@ -1,67 +1,36 @@
-import type { TuiAgent } from '../../../../shared/tui-agent'
 import {
   normalizeAgentProviderSession,
   agentProviderSessionsEqual,
-  type AgentProviderSessionMetadata,
-  type SleepingAgentLaunchConfig,
   type SleepingAgentSessionRecord
 } from '../../../../shared/agent-session-resume'
-import type {
-  AgentStatusIpcPayload,
-  RefusedPaneResume
-} from '../../../../shared/agent-status-types'
-import type { AgentSessionRecordStore } from '../../../runtime/agent-session-record-store'
-import {
-  agentSessionLeasePossiblyWriting,
-  listStructuredProviderSessionOwnership
-} from '../../../native-chat/agent-session-wire/structured-provider-session-ownership'
+import type { AgentStatusIpcPayload } from '../../../../shared/agent-status-types'
 import { agentHookServer } from '../../../agent-hooks/server'
 import { LOCAL_EXECUTION_HOST_ID, type ExecutionHostId } from '../../../../shared/execution-host'
 import type { WorkspaceSessionState } from '../../../../shared/workspace-session-state-types'
 import {
-  keysMayMatch,
-  terminalConversationKey
-} from '../../../native-chat/structured-conversation-key'
-
-export type ResumeSpawnArgs = {
-  connectionId?: string | null
-  command?: string
-  launchAgent?: TuiAgent
-  launchConfig?: SleepingAgentLaunchConfig
-  launchToken?: unknown
-  resumeProviderSession?: AgentProviderSessionMetadata
-  /** `saved`: the resume was built from a pane's saved facts, not asked for by the user. */
-  resumeOrigin?: unknown
-  env?: Record<string, string>
-}
-
-type AdmissionRuntime = {
-  getAgentProviderSessionRows?(): AgentStatusIpcPayload[]
-  readSavedResumeSource?(
-    worktreeId: string,
-    paneKey: string
-  ): Promise<SleepingAgentSessionRecord | undefined>
-  openAgentSessionRecordStore(): Promise<AgentSessionRecordStore>
-}
-
-/** `chat-home`: an automatic restore of a conversation an open chat continues; `chat-writing`:
- *  any start of one a chat may be writing; `unverifiable`: an automatic restore with no records. */
-export type ResumeSpawnRefusal = {
-  sourceRecord?: SleepingAgentSessionRecord
-  verdict: 'chat-home' | 'chat-writing' | 'unverifiable'
-  refused: RefusedPaneResume
-}
+  admitSwitchResumeSpawn,
+  judgeResumes,
+  type AdmissionRuntime,
+  type ResumeSpawnAdmission,
+  type ResumeSpawnArgs,
+  type ResumeSpawnRefusal
+} from './resume-spawn-judgement'
 
-export type ResumeSpawnAdmission =
-  | { verdict: 'admitted'; refused: RefusedPaneResume; sourceRecord?: SleepingAgentSessionRecord }
-  | ResumeSpawnRefusal
+export type {
+  ResumeSpawnAdmission,
+  ResumeSpawnArgs,
+  ResumeSpawnRefusal
+} from './resume-spawn-judgement'
 
-/** Saved-home policy only; ordinary terminal starts remain hook-observed. */
+/** Saved-home policy and a switch's own start; other terminal starts remain hook-observed. */
 export async function admitResumeSpawn(
   runtime: AdmissionRuntime | undefined,
   args: ResumeSpawnArgs,
   wslDistro: string | null
 ): Promise<ResumeSpawnAdmission | null> {
+  if (args.resumeOrigin === 'switch') {
+    return admitSwitchResumeSpawn(runtime, args, wslDistro)
+  }
   const providerSession = normalizeAgentProviderSession(args.resumeProviderSession)
   const agent = args.launchAgent
   // Native chats run only natively, so a remote or WSL conversation is never a chat's.
@@ -114,49 +83,6 @@ export async function admitColdRestoreReattach(
   return first ? judgeResumes(runtime, [first]) : null
 }
 
-async function judgeResumes(
-  runtime: AdmissionRuntime,
-  resumes: readonly [RefusedPaneResume, ...RefusedPaneResume[]]
-): Promise<ResumeSpawnAdmission> {
-  const keysOf = ({ agent, providerSession }: RefusedPaneResume) =>
-    [providerSession.id, providerSession.transcriptPath].flatMap((id) =>
-      id?.trim() ? [terminalConversationKey(agent, id)] : []
-    )
-  const admitted = (): ResumeSpawnAdmission => ({
-    verdict: 'admitted',
-    refused: resumes[0]
-  })
-  let store: AgentSessionRecordStore
-  try {
-    store = await runtime.openAgentSessionRecordStore()
-  } catch (error) {
-    console.warn(
-      "[pty] native chat records unreadable; cannot tell whether a resume is a chat's",
-      error
-    )
-    return { verdict: 'unverifiable', refused: resumes[0] }
-  }
-  const heads = listStructuredProviderSessionOwnership(store.listRecords()).filter(
-    (holding) => holding.role === 'head'
-  )
-  const tabs = store.getVisibleSessionTabIndex()
-  for (const refused of resumes) {
-    const holders = heads.filter((holding) =>
-      keysOf(refused).some((key) => keysMayMatch(holding.key, key))
-    )
-    if (holders.some((holding) => agentSessionLeasePossiblyWriting(holding.lease))) {
-      return { verdict: 'chat-writing', refused }
-    }
-    if (holders.length > 0 && (!tabs || !tabs.present)) {
-      return { verdict: 'unverifiable', refused }
-    }
-    if (tabs && holders.some((holding) => tabs.sessionIds.includes(holding.sessionId))) {
-      return { verdict: 'chat-home', refused }
-    }
-  }
-  return admitted()
-}
-
 /** A refused resume becomes the pane's plain shell: nothing of the agent launch is left to run,
  *  register, or mark the shell as an unattended agent's. */
 export function dropAgentLaunch(args: ResumeSpawnArgs): void {
@@ -179,6 +105,17 @@ export function dropAgentLaunch(args: ResumeSpawnArgs): void {
   delete args.resumeProviderSession
 }
 
+/** Every exit of a switch spawn settles its claim: on the PTY it produced, or gone with none. */
+export function settleSwitchSpawn(
+  runtime: AdmissionRuntime | undefined,
+  admission: ResumeSpawnAdmission | null,
+  ptyId: string | null
+): void {
+  if (admission?.verdict === 'admitted' && admission.switchClaim) {
+    runtime?.settleSwitchStart?.(admission.switchClaim, ptyId)
+  }
+}
+
 export function resumeSpawnRefusal(
   admission: ResumeSpawnAdmission | null
 ): ResumeSpawnRefusal | null {
diff --git a/src/main/ipc/pty/ipc/spawn-run.ts b/src/main/ipc/pty/ipc/spawn-run.ts
index 9bce2857788f..9e5eda9b3dc5 100644
--- a/src/main/ipc/pty/ipc/spawn-run.ts
+++ b/src/main/ipc/pty/ipc/spawn-run.ts
@@ -23,6 +23,7 @@ import {
   captureSavedResumeCleanup,
   admitColdRestoreReattach,
   forgetRefusedResume,
+  settleSwitchSpawn,
   resumeSpawnRefusal,
   savedResumeRecord
 } from '../host-env/saved-resume-admission'
@@ -125,8 +126,10 @@ export async function runPtyIpcSpawn(deps: PtySpawnIpcDeps, args: PtySpawnIpcArg
     if (!ctx.result.isReattach) {
       deps.runtime?.rememberSavedTerminalLaunchResult?.(committed.id, committed)
     }
+    settleSwitchSpawn(deps.runtime, ctx.resumeAdmission, committed.id)
     return committed
   } catch (caught) {
+    settleSwitchSpawn(deps.runtime, ctx.resumeAdmission, ctx.result.id)
     const err = endPaneAgentLaunch(ctx, { error: caught }) ?? caught
     releaseAbandonedAgentTeamsLeader(ctx)
     if (ctx.preSpawnHiddenMarkId !== null) {
diff --git a/src/main/ipc/pty/runtime/spawn-state.ts b/src/main/ipc/pty/runtime/spawn-state.ts
index 90c5a3d6a18d..5ca761ba57ab 100644
--- a/src/main/ipc/pty/runtime/spawn-state.ts
+++ b/src/main/ipc/pty/runtime/spawn-state.ts
@@ -115,7 +115,7 @@ export type RuntimePtySpawnArgs = {
   envToDelete?: string[]
   resumeProviderSession?: AgentProviderSessionMetadata
   /** `saved`: built from a pane's saved facts, which the host refuses for a chat's conversation. */
-  resumeOrigin?: 'saved'
+  resumeOrigin?: 'saved' | 'switch'
   connectionId?: string | null
   worktreeId?: string
   preAllocatedHandle?: string
diff --git a/src/main/ipc/pty/runtime/spawn.ts b/src/main/ipc/pty/runtime/spawn.ts
index e75366b4adc6..fc49c3e8fcee 100644
--- a/src/main/ipc/pty/runtime/spawn.ts
+++ b/src/main/ipc/pty/runtime/spawn.ts
@@ -4,7 +4,8 @@ import {
   savedResumeRecord,
   savedResumeResult,
   resumeSpawnRefusal,
-  forgetRefusedResume
+  forgetRefusedResume,
+  settleSwitchSpawn
 } from '../host-env/saved-resume-admission'
 import { isTerminalLeafId, makePaneKey } from '../../../../shared/stable-pane-id'
 import { isValidTerminalTabId } from '../../../../shared/terminal-tab-id'
@@ -132,8 +133,10 @@ export async function spawnPtyFromRuntimeController(
     if (!ctx.result.isReattach) {
       deps.runtime?.rememberSavedTerminalLaunchResult?.(committed.id, committed)
     }
+    settleSwitchSpawn(deps.runtime, ctx.resumeAdmission, committed.id)
     return committed
   } catch (err) {
+    settleSwitchSpawn(deps.runtime, ctx.resumeAdmission, ctx.result.id)
     releaseRuntimeSpawnPreSpawnHiddenMark(ctx)
     if (ctx.pendingRegistrationPtyId) {
       deps.runtime?.cancelPendingPtyRegistration?.(
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition.ts
index 5a2028e82fc3..09ba39159c36 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition.ts
@@ -1,5 +1,6 @@
 import { isDeepStrictEqual } from 'node:util'
 import { abortSignalReason } from '../../../shared/abort-signal-reason'
+import { isAgentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
 import type {
   AgentSessionProcessIdentity,
   AgentSessionRecord
@@ -48,9 +49,12 @@ export async function acquireOwner(
     try {
       await input.assertNoTerminalWriter?.(record)
     } catch (error) {
+      const moving =
+        isAgentSessionRefusalError(error) &&
+        error.refusal.details?.reason === 'conversationMovingToTerminal'
       // Not a code: a code message would travel as the census's own conflict, not this reason.
       throw new AgentSessionPreSpawnError(error, {
-        reason: 'conversationOpenInTerminal',
+        reason: moving ? 'conversationMovingToTerminal' : 'conversationOpenInTerminal',
         message: 'a terminal may still be writing this conversation'
       })
     }
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 6af0c62364e2..58bcc6a02091 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
@@ -133,6 +133,7 @@ export type AgentSessionPreSpawnReason = Extract<
   | 'agentCommandNotRunnable'
   | 'runtimeNotInstalled'
   | 'conversationOpenInTerminal'
+  | 'conversationMovingToTerminal'
 >
 
 /** Acquisition failed with first-hand proof that no provider process existed. */
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-conversation-lifetime.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-conversation-lifetime.ts
index d9bab20d37ca..de5aaec41424 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-conversation-lifetime.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-conversation-lifetime.ts
@@ -40,6 +40,7 @@ import {
 } from './structured-agent-session-failure-text'
 import { recordStructuredAgentSessionStartFailure } from './structured-agent-session-start-failure-row'
 import { structuredAgentSessionFailureWordsContext } from './structured-agent-session-send-preparation'
+import * as switchAdmission from './structured-agent-session-switch-admission'
 
 export type StructuredAgentSessionConversationLifetime = ReturnType<
   typeof createStructuredAgentSessionConversationLifetime
@@ -330,6 +331,16 @@ export function createStructuredAgentSessionConversationLifetime(host: {
         host.context().runtimeState.acquireAborts.abort(sessionId, 'closed while starting')
         await holdStopClose(sessionId, () => stopAgent(sessionId, { cause }))
       })
-    }
+    },
+    /** Close's body behind an idle-only admission with no effect of its own; `admit` registers the
+     *  switch before the stop, in the same step. */
+    switchToTerminal: <T>(id: string, admit: () => T): Promise<T> =>
+      serialize(id, () =>
+        switchAdmission.stopIdleStructuredAgentSessionForSwitch(
+          { session: sessions.get(id), delivering: host.deliveryActive(id), idleSweep, admit },
+          () => holdStopClose(id, () => stopAgent(id, { cause: 'user-close' })),
+          () => deps().store.getRecord(id)
+        )
+      )
   }
 }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-failure-text.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-failure-text.ts
index 82c33a5a467f..bdcac83f0ecb 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-failure-text.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-failure-text.ts
@@ -39,7 +39,8 @@ const TYPED_START_REFUSALS = [
   'agentCommandNotRunnable',
   'runtimeNotInstalled',
   'conversationOpenInTerminal',
-  'conversationOpenElsewhere'
+  'conversationOpenElsewhere',
+  'conversationMovingToTerminal'
 ] as const satisfies readonly (AgentSessionFailureKind &
   AgentSessionRefusalReason<'agent_session_operation_invalid'>)[]
 
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
index b770dc4b6fcc..ea282faeba2a 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
@@ -212,6 +212,8 @@ export class StructuredAgentSessionHost {
    *  `user-close` makes a turn it cuts short the user's cancellation; an `evict` leaves it news. */
   close: StructuredAgentSessionConversationLifetime['close'] = (sessionId, cause) =>
     this.lifetime.close(sessionId, cause)
+  switchToTerminal: StructuredAgentSessionConversationLifetime['switchToTerminal'] = (id, admit) =>
+    this.lifetime.switchToTerminal(id, admit)
 
   /** One bounded host-owned snapshot; a tab need not be visible for its child to be stopped. */
   sleepWorkspace = (workspaceId: string): Promise<{ stoppedSessionIds: string[] }> =>
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-idle-sweep.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-idle-sweep.ts
index 6ab6e0aedccc..f8bfa9a3dbfe 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-idle-sweep.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-idle-sweep.ts
@@ -161,7 +161,7 @@ export class StructuredAgentSessionIdleSweep {
 
   /** Work the running child still owes. Scoped to the child: with none, nothing here can pin the
    *  handle, and a leftover prompt or turn row is only history. */
-  private owesWork(sessionId: string, session: StructuredAgentSessionHostSession): boolean {
+  owesWork(sessionId: string, session: StructuredAgentSessionHostSession): boolean {
     return (
       this.queuedOrDelivering(sessionId, session) ||
       structuredAgentSessionChildHasOpenWork({
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-admission.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-admission.ts
new file mode 100644
index 000000000000..2e1d44763137
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-admission.ts
@@ -0,0 +1,43 @@
+// The chat's half of a switch to its terminal. Unlike a tab close, a switch never cuts work short
+// (the user stops a reply first), so it is admitted only when the chat is idle, and its admission
+// has no effect of its own: no start is aborted and nothing is stopped before it passes.
+
+import { agentSessionLeaseOwnerVerdict } from '../../../shared/agent-session-lease-adjudication'
+import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission'
+import type { AgentSessionRecord } from '../../../shared/agent-session-record'
+import { agentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
+import type { StructuredAgentSessionHostSession } from './structured-agent-session-host-types'
+
+/** In the chat's ordered step: refuses unless nothing is running, starting, queued or owed, then
+ *  admits, stops through close's body, and proves the agent gone before anything starts elsewhere. */
+export async function stopIdleStructuredAgentSessionForSwitch<T>(
+  idle: {
+    session: StructuredAgentSessionHostSession | undefined
+    delivering: boolean
+    idleSweep: {
+      owesWork: (sessionId: string, session: StructuredAgentSessionHostSession) => boolean
+    }
+    admit: () => T
+  },
+  stop: () => Promise<unknown>,
+  record: () => AgentSessionRecord | null
+): Promise<T> {
+  const { session } = idle
+  if (
+    idle.delivering ||
+    (session !== undefined &&
+      (session.child?.phase === 'starting' ||
+        session.journal.submissions().some(isQueuedAgentJournalSubmission) ||
+        (session.child !== null &&
+          idle.idleSweep.owesWork(session.params.envelope.sessionId, session))))
+  ) {
+    throw agentSessionRefusalError('agent_session_operation_invalid', { reason: 'turnActive' })
+  }
+  const admitted = idle.admit()
+  await stop()
+  const lease = record()?.lease
+  if (!lease || agentSessionLeaseOwnerVerdict(lease) !== 'exited') {
+    throw agentSessionRefusalError('agent_session_ownership_unknown', { reason: 'ownerUnproven' })
+  }
+  return admitted
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-provider-session-ownership.ts b/src/main/native-chat/agent-session-wire/structured-provider-session-ownership.ts
index a7f34eb73fd0..4d7be05fe2ee 100644
--- a/src/main/native-chat/agent-session-wire/structured-provider-session-ownership.ts
+++ b/src/main/native-chat/agent-session-wire/structured-provider-session-ownership.ts
@@ -2,6 +2,7 @@ import type { AgentSessionLease, AgentSessionRecord } from '../../../shared/agen
 import type { StructuredAgentId } from '../../../shared/agent-session-provider-handle'
 import { agentSessionLeaseOwnerVerdict } from '../../../shared/agent-session-lease-adjudication'
 import { structuredAgentRuntimeMetadata } from '../../runtime/structured-agent-runtime-metadata'
+import { inPlaceSwitchEnabled } from '../../../shared/structured-agent-cli-conversation-adoption'
 import {
   keysMayMatch,
   recordConversationKey,
@@ -58,8 +59,8 @@ export function agentSessionLeasePossiblyWriting(lease: AgentSessionLease): bool
 }
 
 /** Agents whose chats let a terminal resume the same conversation once the chat stopped writing. */
-export function sameIdTerminalResumeEnabled(_provider: StructuredAgentId): boolean {
-  return false
+export function sameIdTerminalResumeEnabled(provider: StructuredAgentId): boolean {
+  return inPlaceSwitchEnabled(provider)
 }
 
 /** Whether a terminal resume of this link's conversation is refused. */
diff --git a/src/main/runtime/rpc/methods/session-tabs.ts b/src/main/runtime/rpc/methods/session-tabs.ts
index 11440e01fe1b..0cb9a50b4619 100644
--- a/src/main/runtime/rpc/methods/session-tabs.ts
+++ b/src/main/runtime/rpc/methods/session-tabs.ts
@@ -81,6 +81,7 @@ export const SESSION_TAB_METHODS = [
           ? { resumeProviderSession: params.resumeProviderSession }
           : {}),
         ...(params.launchAgent ? { launchAgent: params.launchAgent } : {}),
+        ...(params.resumeOrigin ? { resumeOrigin: params.resumeOrigin } : {}),
         ...(params.viewMode ? { viewMode: params.viewMode } : {}),
         activate: params.activate,
         select: params.select,
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-gate-classification.test-fixture.ts b/src/main/runtime/rpc/methods/structured-agent-session-gate-classification.test-fixture.ts
index f0e68d1ca2f1..9410bc5b055d 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-gate-classification.test-fixture.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-gate-classification.test-fixture.ts
@@ -98,5 +98,6 @@ export const WORK_METHODS = [
   { method: 'agentSession.subscribe', params: { sessionId: SESSION } },
   { method: 'agentSession.hold', params: { sessionId: SESSION, holderId: 'surface-1' } },
   { method: 'agentSession.reveal', params: { sessionId: SESSION } },
+  { method: 'agentSession.switchToTerminal', params: { sessionId: SESSION } },
   { method: 'agentSession.subscribeStatus', params: null }
 ] as const
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-to-terminal.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-to-terminal.ts
new file mode 100644
index 000000000000..d3ece1c07326
--- /dev/null
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-to-terminal.ts
@@ -0,0 +1,65 @@
+// `agentSession.switchToTerminal` — the chat's half of moving its conversation into a terminal on
+// the same id. In the chat's ordered step it refuses unless idle, registers the switch's claim,
+// stops the agent with proven exit while the tab stays, and answers the facts a terminal resume
+// needs. The claim refuses a chat start from any view until the terminal it names can be judged.
+// Gated per agent by `agent-session.structured.switch.v1:<agent>`; a client never falls back to close.
+
+import { inPlaceSwitchEnabled } from '../../../../shared/structured-agent-cli-conversation-adoption'
+import type { AiVaultChatForkSource } from '../../../../shared/ai-vault-resume-preparation'
+import {
+  prepareStructuredChatCliTranscript,
+  resolveStructuredChatCliSource
+} from '../../../ai-vault/structured-chat-cli-fork'
+import type { SwitchClaim } from '../../session-tabs/structured-session-switch-claims'
+import { defineMethod } from '../core'
+import {
+  ensureStructuredHostInstalled,
+  requireStructuredCapability,
+  requireStructuredSessionHost
+} from './structured-agent-session-gate'
+import { OptionsParams } from './structured-agent-session-schemas'
+
+export const STRUCTURED_AGENT_SESSION_SWITCH_TO_TERMINAL_METHODS = [
+  defineMethod({
+    name: 'agentSession.switchToTerminal',
+    permission: 'workspace',
+    params: OptionsParams,
+    handler: async (params, ctx): Promise<{ source: AiVaultChatForkSource }> => {
+      requireStructuredCapability(ctx)
+      await ensureStructuredHostInstalled(ctx)
+      const host = requireStructuredSessionHost(ctx, params.sessionId)
+      const record = host.deps.store.getRecord(params.sessionId)
+      if (!record || !inPlaceSwitchEnabled(record.provider)) {
+        throw new Error('This chat cannot switch to a terminal on this host.')
+      }
+      // Reads only: a chat that can't be resumed in a terminal is refused before anything stops.
+      const source = await resolveStructuredChatCliSource(
+        { sessionId: record.sessionId, workspaceId: record.location.workspaceId },
+        false
+      )
+      // A switch terminal whose agent provably ended no longer holds the conversation.
+      await ctx.runtime.releaseEndedSwitchStarts(source.agent, source.providerSessionId)
+      let claim: SwitchClaim | undefined
+      try {
+        await host.switchToTerminal(params.sessionId, () => {
+          claim = ctx.runtime.registerSwitchClaim(source.agent, source.providerSessionId)
+        })
+        const prepared = await prepareStructuredChatCliTranscript(
+          source,
+          (args) => ctx.runtime.prepareAiVaultSessionResume(args),
+          false
+        )
+        if (!prepared.cliForkSource) {
+          throw new Error('This chat has no saved conversation available on this host.')
+        }
+        return { source: prepared.cliForkSource }
+      } catch (error) {
+        // No recipe left this host, so nothing can start under the claim.
+        if (claim) {
+          ctx.runtime.dropSwitchClaim(claim)
+        }
+        throw error
+      }
+    }
+  })
+]
diff --git a/src/main/runtime/rpc/methods/structured-agent-session.test.ts b/src/main/runtime/rpc/methods/structured-agent-session.test.ts
index 535817b6a63f..f3b88b73c03f 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session.test.ts
@@ -175,7 +175,7 @@ describe('capability gating', () => {
     }
     // Bump deliberately: the whole agentSession.* surface is behind the structured capability,
     // so an additive method is invisible to old clients and needs no protocol bump.
-    expect(STRUCTURED_AGENT_SESSION_METHODS).toHaveLength(38)
+    expect(STRUCTURED_AGENT_SESSION_METHODS).toHaveLength(39)
   })
 
   it('hides the surface from a declared client that did not advertise it', async () => {
diff --git a/src/main/runtime/rpc/methods/structured-agent-session.ts b/src/main/runtime/rpc/methods/structured-agent-session.ts
index 1fe96d81d0b9..516c0bfad40b 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session.ts
@@ -52,6 +52,7 @@ import { STRUCTURED_AGENT_SESSION_TURN_COMPLETION_METHODS } from './structured-a
 import { STRUCTURED_AGENT_SESSION_THREAD_GOAL_METHODS } from './structured-agent-session-thread-goal'
 import { STRUCTURED_AGENT_SESSION_CONVERSATION_OUTLINE_METHODS } from './structured-agent-session-conversation-outline'
 import { STRUCTURED_AGENT_SESSION_OPTIONS_READ_METHODS } from './structured-agent-session-options-read'
+import { STRUCTURED_AGENT_SESSION_SWITCH_TO_TERMINAL_METHODS } from './structured-agent-session-switch-to-terminal'
 import {
   AttachParams,
   CancelParams,
@@ -299,5 +300,6 @@ export const STRUCTURED_AGENT_SESSION_METHODS = [
   ...STRUCTURED_AGENT_SESSION_THREAD_GOAL_METHODS,
   ...STRUCTURED_AGENT_SESSION_CONVERSATION_OUTLINE_METHODS,
   ...STRUCTURED_AGENT_SESSION_CURRENT_REQUESTS_METHODS,
-  ...STRUCTURED_AGENT_SESSION_OPTIONS_READ_METHODS
+  ...STRUCTURED_AGENT_SESSION_OPTIONS_READ_METHODS,
+  ...STRUCTURED_AGENT_SESSION_SWITCH_TO_TERMINAL_METHODS
 ]
diff --git a/src/main/runtime/runtime-pty-controller-contract.ts b/src/main/runtime/runtime-pty-controller-contract.ts
index 063463ae7374..36093a85c70a 100644
--- a/src/main/runtime/runtime-pty-controller-contract.ts
+++ b/src/main/runtime/runtime-pty-controller-contract.ts
@@ -69,7 +69,7 @@ export type RuntimePtyController = {
     env?: Record<string, string>
     envToDelete?: string[]
     resumeProviderSession?: AgentProviderSessionMetadata
-    resumeOrigin?: 'saved'
+    resumeOrigin?: 'saved' | 'switch'
     telemetry?: WorktreeStartupLaunch['telemetry']
     connectionId?: string | null
     worktreeId?: string
diff --git a/src/main/runtime/runtime-terminal-contracts.ts b/src/main/runtime/runtime-terminal-contracts.ts
index e293e495a6bf..1767dfb42e0e 100644
--- a/src/main/runtime/runtime-terminal-contracts.ts
+++ b/src/main/runtime/runtime-terminal-contracts.ts
@@ -48,7 +48,7 @@ export type TerminalCreateOptions = {
   launchConfig?: WorktreeStartupLaunch['launchConfig']
   resumeProviderSession?: AgentProviderSessionMetadata
   /** `saved`: built from a pane's saved facts, which the host refuses for a chat's conversation. */
-  resumeOrigin?: 'saved'
+  resumeOrigin?: 'saved' | 'switch'
   launchToken?: string
   launchAgent?: TuiAgent
   startupAgent?: TuiAgent
diff --git a/src/main/runtime/runtime-terminal-state-records.ts b/src/main/runtime/runtime-terminal-state-records.ts
index 2e1fd1a1fc96..3bc5ba90cc66 100644
--- a/src/main/runtime/runtime-terminal-state-records.ts
+++ b/src/main/runtime/runtime-terminal-state-records.ts
@@ -16,6 +16,7 @@ import type { RetainedTailRedrawCursor } from './terminal-tail-redraw-buffer'
 import type { TerminalTailWaitState } from './terminal-wait-tail-state'
 import type { TerminalCommandPaint } from './terminal-command-paint'
 import type { CliWriterConversation } from './structured-agent-cli-writers'
+import type { SwitchStartProof } from './session-tabs/structured-session-switch-claims'
 import type { PtyShellOwnershipMirror } from './pty-shell-ownership-mirror'
 import type { TerminalExitCause } from '../../shared/terminal-exit-cause'
 import type { AgentSessionOwnerBinding } from '../../shared/agent-session-host-authority'
@@ -81,6 +82,8 @@ export type RuntimePtyWorktreeRecord = RuntimeTerminalTailState & {
     incarnationId: PtyIncarnationId | null
     byKey: Map<string, CliWriterConversation>
   }
+  /** The switch's own start of a conversation in this execution; ends only on an observed exit. */
+  switchStart?: SwitchStartProof
   foregroundAgent: TerminalAgent | null
   connected: boolean
   disconnectedAt: number | null
diff --git a/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts b/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts
index 7d753d61c15c..59553952fcb1 100644
--- a/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts
+++ b/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts
@@ -4,7 +4,9 @@ import {
 } from '../../../shared/agent-session-resume'
 import { LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host'
 import type { StructuredAgentId } from '../../../shared/agent-session-provider-handle'
-import { OrcaRuntimeWithGetWorktreePs } from '../workspaces/workspace-process-listing'
+import { agentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
+import { OrcaRuntimeWithStructuredSessionSwitchClaims } from './structured-session-switch-claims'
+import { switchStartProcessVerdict } from './structured-session-switch-observation'
 import { getProviderForPty } from '../../ipc/pty/provider/registry'
 import { LocalPtyProvider } from '../../providers/local-pty-provider'
 import { inspectPtyProviderProcess } from '../../providers/pty-process-inspection'
@@ -24,7 +26,7 @@ import type { AgentSessionRecord } from '../../../shared/agent-session-record'
 import { CLI_CONVERSATION_ADOPTING_AGENTS } from '../../../shared/structured-agent-cli-conversation-adoption'
 import { recordConversationKey } from '../../native-chat/structured-conversation-key'
 
-export abstract class OrcaRuntimeWithStructuredSessionCliWriterHost extends OrcaRuntimeWithGetWorktreePs {
+export abstract class OrcaRuntimeWithStructuredSessionCliWriterHost extends OrcaRuntimeWithStructuredSessionSwitchClaims {
   rememberSavedTerminalLaunchResult(ptyId: string, result: TerminalLaunchResult): void {
     const pty = this.ptysById.get(ptyId)
     if (pty && result.savedResumeDecision) {
@@ -93,6 +95,7 @@ export abstract class OrcaRuntimeWithStructuredSessionCliWriterHost extends Orca
     }
     if (event.agentPresence?.process) {
       delete pty.savedTerminalLaunchResult
+      this.noteSwitchStartProcess(pty.ptyId, { agent, id: binding.id }, event.agentPresence.process)
     }
     if (pty.cliConversations?.incarnationId !== pty.incarnationId) {
       pty.cliConversations = { incarnationId: pty.incarnationId, byKey: new Map() }
@@ -129,6 +132,8 @@ export abstract class OrcaRuntimeWithStructuredSessionCliWriterHost extends Orca
     providerSessionId: string,
     source?: { workspaceId: string; paneKey: string }
   ): Promise<void> {
+    this.assertNoPendingSwitch(agent, providerSessionId)
+    await this.assertSwitchStartsEnded(agent, providerSessionId)
     await assertCliConversationWritersExited(
       {
         rows: () => this.getAgentProviderSessionRows(),
@@ -166,38 +171,66 @@ export abstract class OrcaRuntimeWithStructuredSessionCliWriterHost extends Orca
                 state.phase === 'partial' ||
                 state.phase === 'stopping')
           ),
-        shellAlone: async (pane) => {
-          if (process.platform === 'win32') {
-            const provider = getProviderForPty(pane.ptyId)
-            const inspection = await inspectPtyProviderProcess(provider, pane.ptyId, {
-              expectedIncarnationId: pane.incarnationId,
-              scanChildProcesses: true,
-              ignoreDetached: true
-            })
-            const evidence = inspection.foregroundProcessEvidence
-            return (
-              inspectionShowsShellAlone(inspection) &&
-              (provider instanceof LocalPtyProvider ||
-                (evidence?.ptyId === pane.ptyId &&
-                  evidence.ptyIncarnationId === pane.incarnationId &&
-                  evidence.verdict === 'unverifiable' &&
-                  evidence.reason === 'windows_ssh_foreground_unavailable'))
-            )
-          }
-          const processes = await this.ptyController?.listProcesses?.(LOCAL_EXECUTION_HOST_ID)
-          const entry = processes?.find((candidate) => candidate.id === pane.ptyId)
-          const pty = this.ptysById.get(pane.ptyId)
-          return (
-            !!entry?.rootProcessId &&
-            !!entry.incarnationId &&
-            entry.incarnationId === pty?.incarnationId &&
-            (await posixCliWriterShellAlone(entry.rootProcessId))
-          )
-        }
+        shellAlone: (pane) => this.cliWriterShellAlone(pane)
       },
       agent,
       providerSessionId,
       source && { paneKey: source.paneKey, worktreeId: source.workspaceId }
     )
+    // A switch spawn admitted during the census either registered first or read this chat's reservation.
+    this.assertNoPendingSwitch(agent, providerSessionId)
+  }
+
+  async releaseEndedSwitchStarts(agent: string, id: string): Promise<void> {
+    await this.assertSwitchStartsEnded(agent, id).catch(() => undefined)
+  }
+
+  /** A switch's terminal holds its conversation until the agent it started there is proven gone. */
+  private async assertSwitchStartsEnded(agent: string, id: string): Promise<void> {
+    for (const { ptyId, proof } of this.boundSwitchStarts(agent, id)) {
+      const pane = this.cliWriterPtyPane(ptyId)
+      const verdicts = await Promise.all(proof.processes.map(switchStartProcessVerdict))
+      if (
+        !pane ||
+        verdicts.length === 0 ||
+        verdicts.some((verdict) => verdict !== 'exited') ||
+        !(await this.cliWriterShellAlone(pane)) ||
+        this.ptysById.get(ptyId)?.switchStart !== proof
+      ) {
+        throw agentSessionRefusalError('agent_session_conflict', {
+          reason: 'conversationHeldElsewhere'
+        })
+      }
+      delete this.ptysById.get(ptyId)?.switchStart
+    }
+  }
+
+  private async cliWriterShellAlone(pane: CliWriterPane): Promise<boolean> {
+    if (process.platform === 'win32') {
+      const provider = getProviderForPty(pane.ptyId)
+      const inspection = await inspectPtyProviderProcess(provider, pane.ptyId, {
+        expectedIncarnationId: pane.incarnationId,
+        scanChildProcesses: true,
+        ignoreDetached: true
+      })
+      const evidence = inspection.foregroundProcessEvidence
+      return (
+        inspectionShowsShellAlone(inspection) &&
+        (provider instanceof LocalPtyProvider ||
+          (evidence?.ptyId === pane.ptyId &&
+            evidence.ptyIncarnationId === pane.incarnationId &&
+            evidence.verdict === 'unverifiable' &&
+            evidence.reason === 'windows_ssh_foreground_unavailable'))
+      )
+    }
+    const processes = await this.ptyController?.listProcesses?.(LOCAL_EXECUTION_HOST_ID)
+    const entry = processes?.find((candidate) => candidate.id === pane.ptyId)
+    const pty = this.ptysById.get(pane.ptyId)
+    return (
+      !!entry?.rootProcessId &&
+      !!entry.incarnationId &&
+      entry.incarnationId === pty?.incarnationId &&
+      (await posixCliWriterShellAlone(entry.rootProcessId))
+    )
   }
 }
diff --git a/src/main/runtime/session-tabs/structured-session-switch-claims.ts b/src/main/runtime/session-tabs/structured-session-switch-claims.ts
new file mode 100644
index 000000000000..db9de61926f5
--- /dev/null
+++ b/src/main/runtime/session-tabs/structured-session-switch-claims.ts
@@ -0,0 +1,162 @@
+import type { AgentProcessIdentity } from '../../../shared/agent-process-presence'
+import { isSameAgentProcess } from '../../../shared/agent-process-presence'
+import { LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host'
+import type { PtyIncarnationId } from '../../../shared/pty-incarnation'
+import { chatAgentsShareConversations } from '../../../shared/structured-agent-cli-conversation-adoption'
+import { agentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
+import { OrcaRuntimeWithGetWorktreePs } from '../workspaces/workspace-process-listing'
+import { readSwitchPaneAgentProcesses } from './structured-session-switch-observation'
+
+/** A recipe no terminal took yet may lapse; expiry only ends a refusal, the spawn re-checks the chat. */
+const UNACCEPTED_SWITCH_CLAIM_MS = 60_000
+const SWITCH_START_WATCH_POLLS = 120
+const SWITCH_START_WATCH_INTERVAL_MS = 1_000
+
+/** A chat → terminal switch from the chat's stop until its terminal execution exists. */
+export type SwitchClaim = {
+  agent: string
+  id: string
+  at: number
+  /** A spawn took it: it never lapses, and settles only with that spawn. */
+  accepted: boolean
+}
+
+/** The switch's start bound to the execution it spawned. */
+export type SwitchStartProof = {
+  incarnationId: PtyIncarnationId
+  agent: string
+  id: string
+  /** The agent processes seen in the pane; none seen keeps the proof until the pane goes. */
+  processes: AgentProcessIdentity[]
+}
+
+const moving = () =>
+  agentSessionRefusalError('agent_session_operation_invalid', {
+    reason: 'conversationMovingToTerminal'
+  })
+
+export abstract class OrcaRuntimeWithStructuredSessionSwitchClaims extends OrcaRuntimeWithGetWorktreePs {
+  private readonly switchClaims = new Set<SwitchClaim>()
+
+  private liveSwitchClaim(agent: string, id: string): SwitchClaim | undefined {
+    let live: SwitchClaim | undefined
+    for (const claim of this.switchClaims) {
+      if (!claim.accepted && Date.now() - claim.at >= UNACCEPTED_SWITCH_CLAIM_MS) {
+        this.switchClaims.delete(claim)
+      } else if (claim.id === id && chatAgentsShareConversations(claim.agent, agent)) {
+        live ??= claim
+      }
+    }
+    return live
+  }
+
+  /** Throws while a switch of this conversation has not started its terminal yet. */
+  protected assertNoPendingSwitch(agent: string, id: string): void {
+    if (this.liveSwitchClaim(agent, id)) {
+      throw moving()
+    }
+  }
+
+  protected boundSwitchStarts(agent: string, id: string) {
+    return [...this.ptysById.values()].flatMap((pty) => {
+      const proof = pty.switchStart
+      return proof &&
+        proof.incarnationId === pty.incarnationId &&
+        proof.id === id &&
+        chatAgentsShareConversations(proof.agent, agent) &&
+        this.getPtyLivenessVerdict(pty.ptyId)?.status !== 'exited'
+        ? [{ ptyId: pty.ptyId, proof }]
+        : []
+    })
+  }
+
+  /** Synchronous, in the chat's ordered step before its stop: a second switch of the same
+   *  conversation, from any client, refuses while the first may still hold it. */
+  registerSwitchClaim(agent: string, id: string): SwitchClaim {
+    if (this.liveSwitchClaim(agent, id) || this.boundSwitchStarts(agent, id).length > 0) {
+      throw agentSessionRefusalError('agent_session_conflict', {
+        reason: 'conversationHeldElsewhere'
+      })
+    }
+    const claim = { agent, id, at: Date.now(), accepted: false }
+    this.switchClaims.add(claim)
+    return claim
+  }
+
+  dropSwitchClaim(claim: SwitchClaim): void {
+    this.switchClaims.delete(claim)
+  }
+
+  /** Synchronous, before the switch spawn's first await, so a chat start censusing after it refuses. */
+  acceptSwitchStart(agent: string, id: string): SwitchClaim {
+    const claim = this.liveSwitchClaim(agent, id) ?? { agent, id, at: Date.now(), accepted: false }
+    claim.accepted = true
+    this.switchClaims.add(claim)
+    return claim
+  }
+
+  /** Ends this attempt's claim: bound to the execution its spawn produced, or gone when none exists. */
+  settleSwitchStart(claim: SwitchClaim, ptyId: string | null): void {
+    if (!this.switchClaims.delete(claim)) {
+      return
+    }
+    const pty = ptyId ? this.ptysById.get(ptyId) : undefined
+    if (!pty?.incarnationId) {
+      return
+    }
+    const key = `${claim.agent}\0${claim.id}`
+    const reported =
+      pty.cliConversations?.incarnationId === pty.incarnationId
+        ? pty.cliConversations.byKey.get(key)?.process
+        : undefined
+    const proof: SwitchStartProof = {
+      incarnationId: pty.incarnationId,
+      agent: claim.agent,
+      id: claim.id,
+      processes: reported ? [reported] : []
+    }
+    pty.switchStart = proof
+    void this.watchSwitchStart(pty.ptyId, proof).catch((error: unknown) =>
+      console.warn('[agent-session] could not watch a switched terminal start', error)
+    )
+  }
+
+  /** An authentic hook's process joins the proof; identity-only rows carry none. */
+  protected noteSwitchStartProcess(
+    ptyId: string,
+    conversation: { agent: string; id: string },
+    process: AgentProcessIdentity
+  ): void {
+    const pty = this.ptysById.get(ptyId)
+    const proof = pty?.switchStart
+    if (
+      proof &&
+      proof.incarnationId === pty.incarnationId &&
+      proof.id === conversation.id &&
+      chatAgentsShareConversations(proof.agent, conversation.agent) &&
+      !proof.processes.some((known) => isSameAgentProcess(known, process))
+    ) {
+      proof.processes.push(process)
+    }
+  }
+
+  /** Bounded evidence collection only: it records the agent's identity and never admits anything. */
+  private async watchSwitchStart(ptyId: string, proof: SwitchStartProof): Promise<void> {
+    for (let poll = 0; poll < SWITCH_START_WATCH_POLLS; poll++) {
+      await new Promise((resolve) => setTimeout(resolve, SWITCH_START_WATCH_INTERVAL_MS).unref?.())
+      if (this.ptysById.get(ptyId)?.switchStart !== proof || proof.processes.length > 0) {
+        return
+      }
+      const entry = (await this.ptyController?.listProcesses?.(LOCAL_EXECUTION_HOST_ID))?.find(
+        (candidate) => candidate.id === ptyId
+      )
+      if (!entry?.rootProcessId || entry.incarnationId !== proof.incarnationId) {
+        continue
+      }
+      const seen = await readSwitchPaneAgentProcesses(entry.rootProcessId, proof.id)
+      if (this.ptysById.get(ptyId)?.switchStart === proof && proof.processes.length === 0) {
+        proof.processes.push(...seen)
+      }
+    }
+  }
+}
diff --git a/src/main/runtime/session-tabs/structured-session-switch-observation.ts b/src/main/runtime/session-tabs/structured-session-switch-observation.ts
new file mode 100644
index 000000000000..f86af7b50c26
--- /dev/null
+++ b/src/main/runtime/session-tabs/structured-session-switch-observation.ts
@@ -0,0 +1,68 @@
+import type {
+  AgentProcessIdentity,
+  AgentProcessVerdict
+} from '../../../shared/agent-process-presence'
+import {
+  probeAgentProcessPresence,
+  readAgentProcess
+} from '../../../shared/agent-process-presence-probe'
+import {
+  buildProcessTableIndex,
+  collectDescendantsFromIndex
+} from '../../../shared/process-table-index'
+import { getFreshShellForegroundSnapshot } from '../../../shared/process-table-snapshot-reader'
+import {
+  isWindowsProcessStartTimeAvailable,
+  readWindowsProcessCreationTime,
+  readWindowsProcessTableFresh
+} from '../../windows/windows-process-table'
+
+/** The processes below a pane's shell whose command line names the conversation: what the switch
+ *  typed there. Session leaders left the terminal (a prompt's worker), so they are not its job. */
+export async function readSwitchPaneAgentProcesses(
+  rootPid: number,
+  conversationId: string
+): Promise<AgentProcessIdentity[]> {
+  if (process.platform === 'win32') {
+    if (!isWindowsProcessStartTimeAvailable()) {
+      return []
+    }
+    const index = buildProcessTableIndex(await readWindowsProcessTableFresh())
+    return collectDescendantsFromIndex(index, rootPid).flatMap((row) =>
+      row.command.includes(conversationId) && row.creationTimeMs
+        ? [{ pid: row.pid, platform: 'win32' as const, startTime: String(row.creationTimeMs) }]
+        : []
+    )
+  }
+  const platform = process.platform
+  if (platform !== 'darwin' && platform !== 'linux') {
+    return []
+  }
+  const index = buildProcessTableIndex(await getFreshShellForegroundSnapshot())
+  const named = collectDescendantsFromIndex(index, rootPid, (row) => row.stat.includes('s')).filter(
+    (row) => row.command.includes(conversationId)
+  )
+  const identities = await Promise.all(
+    named.map(async (row) => {
+      const observed = await readAgentProcess(row.pid)
+      return observed.verdict === 'live' && !observed.zombie
+        ? [{ pid: row.pid, platform, startTime: observed.startTime }]
+        : []
+    })
+  )
+  return identities.flat()
+}
+
+/** `exited` only on proof: the pid is gone or now names a different process. */
+export async function switchStartProcessVerdict(
+  identity: AgentProcessIdentity
+): Promise<AgentProcessVerdict> {
+  if (identity.platform !== 'win32') {
+    return probeAgentProcessPresence(identity)
+  }
+  if (process.platform !== 'win32' || !isWindowsProcessStartTimeAvailable()) {
+    return 'unverifiable'
+  }
+  const created = readWindowsProcessCreationTime(identity.pid)
+  return created !== null && String(created) === identity.startTime ? 'live' : 'exited'
+}
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-create.ts b/src/main/runtime/terminal/launch/mobile-terminal-create.ts
index 35a1ca0bbb90..6c0b915eb6ae 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-create.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-create.ts
@@ -46,6 +46,7 @@ export abstract class OrcaRuntimeWithCreateMobileSessionTerminal extends OrcaRun
       agentPrompt?: string
       launchConfig?: SleepingAgentLaunchConfig
       resumeProviderSession?: AgentProviderSessionMetadata
+      resumeOrigin?: 'switch'
       launchAgent?: TuiAgent
       terminalImageViewerSupported?: boolean
       viewMode?: 'terminal' | 'chat'
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts b/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
index 0718b0ae46dc..456d88e2eb46 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
@@ -44,7 +44,7 @@ export type OwnedMobileTerminalCreateOptions = {
   supportsSplitGroupPlacement?: boolean
   launchConfig?: SleepingAgentLaunchConfig
   resumeProviderSession?: AgentProviderSessionMetadata
-  resumeOrigin?: 'saved'
+  resumeOrigin?: 'saved' | 'switch'
   spawnIntent?: SpawnIntent
   launchRuntime?: AgentLaunchRuntime
   signal?: AbortSignal
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-renderer-create.ts b/src/main/runtime/terminal/launch/mobile-terminal-renderer-create.ts
index 8d848097efe4..c6ad23fd1e90 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-renderer-create.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-renderer-create.ts
@@ -5,7 +5,10 @@ import type { TerminalWorkspaceLaunchScope } from '../../runtime-legacy-worker-t
 import { OrcaRuntimeWithMobileChatForkCreate } from './mobile-terminal-chat-fork-create'
 import type { WorktreeStartupLaunch } from '../../../../shared/worktree/launch-types'
 import type { TuiAgent } from '../../../../shared/tui-agent'
-import type { SleepingAgentLaunchConfig } from '../../../../shared/agent-session-resume'
+import type {
+  AgentProviderSessionMetadata,
+  SleepingAgentLaunchConfig
+} from '../../../../shared/agent-session-resume'
 import type { RuntimeMobileSessionCreateTerminalResult } from '../../../../shared/runtime-types'
 import { randomUUID } from 'node:crypto'
 import { getRuntimeDesktopSurface } from '../../runtime-desktop-surface'
@@ -34,6 +37,9 @@ export type MobileTerminalCreateOptions = {
   agentPrompt?: string
   launchConfig?: SleepingAgentLaunchConfig
   launchAgent?: TuiAgent
+  /** A switch's start: its spawn admission judges and claims the conversation. */
+  resumeProviderSession?: AgentProviderSessionMetadata
+  resumeOrigin?: 'switch'
   viewMode?: 'terminal' | 'chat'
   activate?: boolean
   clientNavigationId?: string
@@ -150,9 +156,12 @@ export abstract class OrcaRuntimeWithRunCreateMobileSessionTerminal extends Orca
         }
       )
     }
-    const win = this.getAvailableAuthoritativeWindow()
-    if (!win) {
-      return await this.createRuntimeOwnedMobileSessionTerminal(
+    const switchStart =
+      opts.resumeOrigin === 'switch'
+        ? { resumeProviderSession: opts.resumeProviderSession, resumeOrigin: opts.resumeOrigin }
+        : {}
+    const createOwned = (identity?: { tabId: string; leafId: string }) =>
+      this.createRuntimeOwnedMobileSessionTerminal(
         worktreeId,
         opts.activate !== false,
         afterTabId,
@@ -163,15 +172,20 @@ export abstract class OrcaRuntimeWithRunCreateMobileSessionTerminal extends Orca
           env: startupCommand.env,
           envToDelete: startupCommand.envToDelete,
           startupCommandDelivery: startupCommand.startupCommandDelivery,
+          ...(identity ? { identity } : {}),
           launchAgent: startupCommand.launchAgent,
           viewMode: opts.viewMode,
           targetGroupId: opts.targetGroupId,
           supportsSplitGroupPlacement: opts.supportsSplitGroupPlacement,
           launchConfig: startupCommand.launchConfig,
           launchRuntime: startupCommand.launchRuntime,
+          ...switchStart,
           signal: opts.signal
         }
       )
+    const win = this.getAvailableAuthoritativeWindow()
+    if (!win) {
+      return await createOwned()
     }
     if (win.webContents.isDestroyed?.()) {
       throw new Error('runtime_unavailable')
@@ -225,6 +239,7 @@ export abstract class OrcaRuntimeWithRunCreateMobileSessionTerminal extends Orca
           ...(startupCommand.envToDelete ? { envToDelete: startupCommand.envToDelete } : {}),
           ...(startupCommand.launchConfig ? { launchConfig: startupCommand.launchConfig } : {}),
           ...(startupCommand.launchAgent ? { launchAgent: startupCommand.launchAgent } : {}),
+          ...switchStart,
           ...(opts.viewMode ? { viewMode: opts.viewMode } : {}),
           startupCommandDelivery: startupCommand.startupCommandDelivery,
           source: 'runtime-session',
@@ -280,27 +295,10 @@ export abstract class OrcaRuntimeWithRunCreateMobileSessionTerminal extends Orca
           throw new Error('Timed out waiting for terminal surface after creation')
         }
         // Why: a hidden renderer can publish the tab shell before the PTY spawns; reuse the same identity so later focus adopts instead of creating another tab.
-        return await this.createRuntimeOwnedMobileSessionTerminal(
-          worktreeId,
-          opts.activate !== false,
-          afterTabId,
-          {
-            command: startupCommand.command,
-            ...(opts.shellOverride ? { shellOverride: opts.shellOverride } : {}),
-            cwd,
-            env: startupCommand.env,
-            envToDelete: startupCommand.envToDelete,
-            startupCommandDelivery: startupCommand.startupCommandDelivery,
-            identity: { tabId: pendingSurface.tab.parentTabId, leafId: pendingSurface.tab.leafId },
-            launchAgent: startupCommand.launchAgent,
-            viewMode: opts.viewMode,
-            targetGroupId: opts.targetGroupId,
-            supportsSplitGroupPlacement: opts.supportsSplitGroupPlacement,
-            launchConfig: startupCommand.launchConfig,
-            launchRuntime: startupCommand.launchRuntime,
-            signal: opts.signal
-          }
-        )
+        return await createOwned({
+          tabId: pendingSurface.tab.parentTabId,
+          leafId: pendingSurface.tab.leafId
+        })
       } catch (error) {
         // Why: publication latency (hidden renderer) can trip the surface timeout; rescue only when a live PTY backs the tab, else a ghost tab skips rollback (#7587).
         if (this.findLiveRegisteredPtyForRendererTab(worktreeId, reply.tabId)) {
diff --git a/src/renderer/src/components/native-chat/agent-session-failure-words-text.ts b/src/renderer/src/components/native-chat/agent-session-failure-words-text.ts
index 5801e9b82d26..f7edcab8932e 100644
--- a/src/renderer/src/components/native-chat/agent-session-failure-words-text.ts
+++ b/src/renderer/src/components/native-chat/agent-session-failure-words-text.ts
@@ -147,6 +147,11 @@ const PIECES: Record<AgentSessionFailureCopyId, (values: AgentSessionFailureCopy
         'components.native-chat.failureWords.conversationOpenElsewhere',
         COPY.conversationOpenElsewhere
       ),
+    conversationMovingToTerminal: () =>
+      translate(
+        'components.native-chat.failureWords.conversationMovingToTerminal',
+        COPY.conversationMovingToTerminal
+      ),
     conversationOpenInTerminal: (values) =>
       translate(
         'components.native-chat.failureWords.conversationOpenInTerminal',
diff --git a/src/shared/agent-session-failure-copy.ts b/src/shared/agent-session-failure-copy.ts
index b9b0f34ed90a..0ee94080be9d 100644
--- a/src/shared/agent-session-failure-copy.ts
+++ b/src/shared/agent-session-failure-copy.ts
@@ -80,6 +80,8 @@ export const AGENT_SESSION_FAILURE_COPY = {
     'Codex still has this conversation open somewhere else. Close it there, then try again.',
   conversationOpenInTerminal:
     "Orca can't confirm {{agent}} has exited in its terminal. Stop what's running there or close the terminal, then try again.",
+  conversationMovingToTerminal:
+    'This conversation is moving to a terminal. Use it there, or wait a moment and try again.',
   chooseClaudeAccount: 'Choose or add one in Claude Accounts settings.',
   chooseClaudeAccountThenRunCommand:
     'Choose or add one in Claude Accounts settings, then run /{{command}} again.',
diff --git a/src/shared/agent-session-failure-words.ts b/src/shared/agent-session-failure-words.ts
index ae538f21ff7f..ae30b6dcbbc9 100644
--- a/src/shared/agent-session-failure-words.ts
+++ b/src/shared/agent-session-failure-words.ts
@@ -184,6 +184,8 @@ const FAILURE_SENTENCES = {
   runtimeNotInstalled: namingAgent('runtimeNotInstalled'),
   conversationOpenInTerminal: namingAgent('conversationOpenInTerminal'),
   conversationOpenElsewhere: (_context, _fact, _surface, say) => say('conversationOpenElsewhere'),
+  conversationMovingToTerminal: (_context, _fact, _surface, say) =>
+    say('conversationMovingToTerminal'),
   managedAccountUnsupported: (context, _fact, _surface, say) =>
     joinSentences([
       say('managedAccountUnsupported'),
diff --git a/src/shared/agent-session-failure.ts b/src/shared/agent-session-failure.ts
index 36957513964f..15529bb89703 100644
--- a/src/shared/agent-session-failure.ts
+++ b/src/shared/agent-session-failure.ts
@@ -40,6 +40,7 @@ export const AGENT_SESSION_FAILURE_KINDS = [
   'runtimeNotInstalled',
   'conversationOpenInTerminal',
   'conversationOpenElsewhere',
+  'conversationMovingToTerminal',
   'providerExited',
   'restartFailed',
   'providerRejected',
diff --git a/src/shared/agent-session-refusal-details.ts b/src/shared/agent-session-refusal-details.ts
index 882b147257b4..71be7706c5e3 100644
--- a/src/shared/agent-session-refusal-details.ts
+++ b/src/shared/agent-session-refusal-details.ts
@@ -89,6 +89,8 @@ export const AGENT_SESSION_REFUSAL_REASONS = {
     /** A terminal may still be writing the chat's conversation, so its agent did not start. */
     'conversationOpenInTerminal',
     'conversationOpenElsewhere',
+    /** The conversation is being switched into a terminal that hasn't started yet. */
+    'conversationMovingToTerminal',
     /** The agent started, then Orca could not open the chat's conversation for it. */
     'attachFailed'
   ],
diff --git a/src/shared/agent-session-refusal-reason-words.ts b/src/shared/agent-session-refusal-reason-words.ts
index c00f0c995e3c..20b15f0fa714 100644
--- a/src/shared/agent-session-refusal-reason-words.ts
+++ b/src/shared/agent-session-refusal-reason-words.ts
@@ -121,6 +121,7 @@ const REASON_WORDS = {
     runtimeNotInstalled: { fact: 'runtimeNotInstalled', action: 'actFirst' },
     conversationOpenInTerminal: { fact: 'conversationOpenInTerminal', action: 'actFirst' },
     conversationOpenElsewhere: { fact: 'conversationOpenElsewhere', action: 'actFirst' },
+    conversationMovingToTerminal: { fact: 'conversationMovingToTerminal', action: 'actFirst' },
     attachFailed: codeWords('retry')
   },
   agent_session_ownership_unknown: {
diff --git a/src/shared/protocol-version.ts b/src/shared/protocol-version.ts
index 5624d9ad3327..e541f6b84ab1 100644
--- a/src/shared/protocol-version.ts
+++ b/src/shared/protocol-version.ts
@@ -2,6 +2,7 @@ export const SAVED_RESUME_ORIGIN_RUNTIME_CAPABILITY =
   'agent-session.saved-resume-origin.v1' as const
 import { AGENT_SESSION_CURRENT_REQUESTS_CLIENT_CAPABILITY } from './agent-session-current-requests-capability'
 import { AI_VAULT_CHAT_FORK_SOURCE_CAPABILITY } from './ai-vault-resume-preparation'
+import { IN_PLACE_SWITCH_RUNTIME_CAPABILITIES } from './structured-agent-cli-conversation-adoption'
 import { PROGRAM_STATUS_RUNTIME_CAPABILITY } from './program-status/protocol'
 import { JIRA_AGENT_ACCESS_RUNTIME_CAPABILITY } from './jira-agent-capability'
 import { JIRA_STATUS_FILTER_RUNTIME_CAPABILITY } from './jira-quick-filters'
@@ -248,6 +249,7 @@ export const RUNTIME_CAPABILITIES = [
   MANAGED_RUNTIME_REMOVE_RUNTIME_CAPABILITY,
   AGENT_SESSION_HOST_AUTHORITY_RUNTIME_CAPABILITY,
   SAVED_RESUME_ORIGIN_RUNTIME_CAPABILITY,
+  ...IN_PLACE_SWITCH_RUNTIME_CAPABILITIES,
   AGENT_SESSION_OMP_RESUME_PATH_RUNTIME_CAPABILITY,
   AGENT_SESSION_KEYBOARD_RUNTIME_CAPABILITY,
   STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY,
diff --git a/src/shared/rpc-contract/rpc-params-catalog.generated.ts b/src/shared/rpc-contract/rpc-params-catalog.generated.ts
index fd232b39adfd..618cb2c55e9f 100644
--- a/src/shared/rpc-contract/rpc-params-catalog.generated.ts
+++ b/src/shared/rpc-contract/rpc-params-catalog.generated.ts
@@ -719,6 +719,7 @@ export const RPC_PARAMS_BY_METHOD = {
   'agentSession.subscribeAvailability': AvailabilityParams,
   'agentSession.subscribeStatus': null,
   'agentSession.subscribeTurnCompletions': SubscribeTurnCompletionsParams,
+  'agentSession.switchToTerminal': OptionsParams,
   'agentSession.threadGoal': ThreadGoalParams,
   'agentSession.unsubscribe': UnsubscribeParams,
   'agentSessionAttachment.read': AttachmentReadParams,
diff --git a/src/shared/rpc-contract/session-tabs-schemas-params.ts b/src/shared/rpc-contract/session-tabs-schemas-params.ts
index fd6b2d89d000..e1e4ca28b0f3 100644
--- a/src/shared/rpc-contract/session-tabs-schemas-params.ts
+++ b/src/shared/rpc-contract/session-tabs-schemas-params.ts
@@ -158,6 +158,8 @@ export const CreateTerminalTab = WorktreeTabSelector.extend({
   // Why: lets the host record which conversation the pane resumes before the agent reports it
   // (#10923); a malformed value drops the hint, never the create. Older hosts strip it.
   resumeProviderSession: ResumeProviderSessionParam.optional().catch(undefined),
+  // Sent only to hosts advertising the agent's switch capability: an older host strips it unprotected.
+  resumeOrigin: z.literal('switch').optional(),
   agent: z
     .custom<TuiAgent>(isTuiAgent, {
       message: 'Unknown agent preset'
@@ -186,6 +188,13 @@ export const CreateTerminalTab = WorktreeTabSelector.extend({
   // returns the in-flight operation instead of spawning a duplicate terminal.
   clientMutationId: z.string().min(1).max(128).optional()
 }).superRefine((value, context) => {
+  if (value.resumeOrigin === 'switch' && (!value.resumeProviderSession || !value.launchAgent)) {
+    context.addIssue({
+      code: 'custom',
+      path: ['resumeOrigin'],
+      message: 'A switch names its conversation and agent'
+    })
+  }
   if (value.sourceChatFork) {
     if (!value.clientMutationId) {
       context.addIssue({
diff --git a/src/shared/structured-agent-cli-conversation-adoption.ts b/src/shared/structured-agent-cli-conversation-adoption.ts
index 1bc9d8e4365f..11aad59da1d8 100644
--- a/src/shared/structured-agent-cli-conversation-adoption.ts
+++ b/src/shared/structured-agent-cli-conversation-adoption.ts
@@ -42,3 +42,22 @@ export function cliConversationRowsShareAgent(
   const rightAgents: readonly string[] = CLI_CONVERSATION_ADOPTING_AGENTS[right]
   return CLI_CONVERSATION_ADOPTING_AGENTS[left].some((agent) => rightAgents.includes(agent))
 }
+
+/** The one enablement source for moving a conversation between chat and terminal in place: the
+ *  agents whose chat catches up on turns made elsewhere and whose terminal start Orca can watch. */
+export const IN_PLACE_SWITCH_AGENTS: readonly CliConversationRowAgent[] = ['codex']
+
+export function inPlaceSwitchEnabled(agent: unknown): boolean {
+  return adoptsCliConversations(agent) && IN_PLACE_SWITCH_AGENTS.includes(agent)
+}
+
+/** What a host advertises per enabled agent; a peer without it never receives a switch. */
+export function inPlaceSwitchCapability(agent: string): string {
+  return `agent-session.structured.switch.v1:${agent}`
+}
+
+export const IN_PLACE_SWITCH_RUNTIME_CAPABILITIES =
+  IN_PLACE_SWITCH_AGENTS.map(inPlaceSwitchCapability)
+
+/** `saved`: built from a pane's saved facts; `switch`: the terminal half of a chat's switch. */
+export type TerminalResumeOrigin = 'saved' | 'switch'
diff --git a/src/shared/structured-agent-session-dispatch-rejection.ts b/src/shared/structured-agent-session-dispatch-rejection.ts
index 8eac0a500805..dd41caebff4f 100644
--- a/src/shared/structured-agent-session-dispatch-rejection.ts
+++ b/src/shared/structured-agent-session-dispatch-rejection.ts
@@ -99,6 +99,7 @@ const KIND_CATEGORY = {
   runtimeNotInstalled: 'startFailed',
   conversationOpenInTerminal: 'startFailed',
   conversationOpenElsewhere: 'startFailed',
+  conversationMovingToTerminal: 'startFailed',
   restartFailed: 'startFailed',
   providerRejected: 'content',
   attachmentInvalid: 'content',
@@ -134,6 +135,7 @@ const KIND_VERDICT = {
   runtimeNotInstalled: 'failure',
   conversationOpenInTerminal: 'failure',
   conversationOpenElsewhere: 'failure',
+  conversationMovingToTerminal: 'failure',
   restartFailed: 'failure',
   providerRejected: 'failure',
   attachmentInvalid: 'failure',

From 6bc59791bbd831f638114617b3e8dad10c4fe5f6 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Tue, 20 Oct 2026 11:51:14 -0700
Subject: [PATCH 009/207] feat(native-chat): switch a Codex conversation
 between chat and terminal in place

Switch to CLI (tab menu, hover card, chat top-right icon, History) asks the
chat's host to stop the idle chat and opens the same-id resume in the chat's
slot, then closes the chat tab. Switch to native chat opens the chat in the
terminal's slot, or reveals the chat that already holds the conversation, and
closes the terminal pane. Hosts without the agent's switch capability keep the
new-tab entries, worded Resume in New Chat / Resume in New Terminal; the view
toggle reads Show as chat / Show as terminal.
---
 src/preload/api/pty-api.ts                    |   2 +-
 src/preload/api/pty-bridge-session-control.ts |   2 +-
 .../NativeChatStructuredSession.tsx           |   4 +-
 .../NativeChatTopRightControls.tsx            |  90 ++++++++++++
 .../use-native-chat-context-menu.tsx          |   2 +-
 .../AiVaultSessionActionMenuItems.tsx         |   6 +-
 .../right-sidebar/AiVaultSessionDetails.tsx   |  63 +--------
 .../AiVaultSessionDetailsSwitchButtons.tsx    |  77 +++++++++++
 .../right-sidebar/AiVaultSessionRow.tsx       |   3 +
 .../AiVaultSessionSurfaceSwitchMenuItems.tsx  |  34 +++--
 .../SessionRowTrailingActions.tsx             |   3 +
 .../ai-vault-session-cli-fork-copy.tsx        |  14 ++
 .../ai-vault-session-in-place-switch.ts       |  55 ++++++++
 .../ai-vault-session-launch-actions.ts        |   9 +-
 .../tab-bar/NativeChatCliForkMenuItems.tsx    |  21 ++-
 .../src/components/tab-bar/SortableTab.tsx    |   2 +
 .../tab-bar/SortableTabContextMenu.tsx        |   2 +-
 .../src/components/tab-bar/TabHoverCard.tsx   |  72 +++++++---
 .../tab-bar/TabSessionSwitchHoverAction.tsx   |  91 ++++++++++++
 .../tab-bar/cli-chat-resume-feedback.ts       |  22 +--
 .../components/tab-bar/cli-chat-resume-run.ts |  50 +++++--
 .../tab-bar/cli-chat-resume-source.ts         |  27 +++-
 .../tab-bar/native-chat-cli-switch-run.ts     | 129 ++++++++++++++++++
 .../tab-bar/switched-terminal-conversation.ts |  29 ++++
 .../tab-bar/tab-session-history-switch.ts     |   5 +-
 .../terminal-pane/TerminalContextMenu.tsx     |   4 +-
 .../TerminalPaneResumeInChatButton.tsx        |  40 ++++--
 .../terminal-pane/pty-connection-types.ts     |   2 +-
 .../terminal-pane/pty-transport-types.ts      |   4 +-
 .../use-terminal-pane-projection.ts           |  10 +-
 src/renderer/src/components/ui/hover-card.tsx |   3 +-
 .../ipc-events/terminal-request-ipc-bridge.ts |   1 +
 .../src/i18n/en-runtime-required.json         |   1 +
 src/renderer/src/i18n/locales/en.json         |  15 +-
 src/renderer/src/i18n/locales/es.json         |  15 +-
 src/renderer/src/i18n/locales/fr.json         |  15 +-
 src/renderer/src/i18n/locales/ja.json         |  15 +-
 src/renderer/src/i18n/locales/ko.json         |  15 +-
 src/renderer/src/i18n/locales/zh.json         |  15 +-
 .../src/lib/ai-vault-tab-title-requests.ts    |  30 ++++
 .../src/lib/in-place-switch-support.ts        |  68 +++++++++
 .../src/lib/launch-ai-vault-session.ts        |  21 ++-
 .../structured-agent-session-client.ts        |  14 ++
 .../src/runtime/web-runtime-session-types.ts  |   2 +
 .../web-runtime-terminal-create-operation.ts  |   7 +-
 .../src/store/terminals/terminal-actions.ts   |   4 +-
 .../src/store/terminals/terminal-state.ts     |   2 +-
 src/shared/runtime-terminal-contracts.ts      |   7 +-
 48 files changed, 954 insertions(+), 170 deletions(-)
 create mode 100644 src/renderer/src/components/native-chat/NativeChatTopRightControls.tsx
 create mode 100644 src/renderer/src/components/right-sidebar/AiVaultSessionDetailsSwitchButtons.tsx
 create mode 100644 src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts
 create mode 100644 src/renderer/src/components/tab-bar/TabSessionSwitchHoverAction.tsx
 create mode 100644 src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts
 create mode 100644 src/renderer/src/components/tab-bar/switched-terminal-conversation.ts
 create mode 100644 src/renderer/src/lib/in-place-switch-support.ts

diff --git a/src/preload/api/pty-api.ts b/src/preload/api/pty-api.ts
index afa346330e7a..7fee6f2d283f 100644
--- a/src/preload/api/pty-api.ts
+++ b/src/preload/api/pty-api.ts
@@ -41,7 +41,7 @@ export type PtyApi = {
     commandDelivery?: 'renderer' | 'provider'
     launchConfig?: SleepingAgentLaunchConfig
     resumeProviderSession?: AgentProviderSessionMetadata
-    resumeOrigin?: 'saved'
+    resumeOrigin?: 'saved' | 'switch'
     launchToken?: string
     launchAgent?: TuiAgent
     startupCommandDelivery?: StartupCommandDelivery
diff --git a/src/preload/api/pty-bridge-session-control.ts b/src/preload/api/pty-bridge-session-control.ts
index 0a32ecaae9a2..fb1168a06d06 100644
--- a/src/preload/api/pty-bridge-session-control.ts
+++ b/src/preload/api/pty-bridge-session-control.ts
@@ -37,7 +37,7 @@ export const ptySessionControlApi = {
     commandDelivery?: 'renderer' | 'provider'
     launchConfig?: SleepingAgentLaunchConfig
     resumeProviderSession?: AgentProviderSessionMetadata
-    resumeOrigin?: 'saved'
+    resumeOrigin?: 'saved' | 'switch'
     launchToken?: string
     launchAgent?: TuiAgent
     startupCommandDelivery?: StartupCommandDelivery
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx
index bcd81ef62faf..43f82aebd0ce 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx
@@ -20,7 +20,7 @@ import { selectNativeChatViewState, structuredChatHistoryPhase } from './native-
 import { useNativeChatRootInputRouting } from './use-native-chat-root-input-routing'
 import { useNativeChatFontSize } from './use-native-chat-font-size'
 import { useNativeChatFind } from './use-native-chat-find'
-import { NativeChatFindBar } from './NativeChatFindBar'
+import { NativeChatTopRightControls } from './NativeChatTopRightControls'
 import { LinkActionPopover } from '@/components/link-actions/LinkActionPopover'
 import { useNativeChatLinkActions } from './use-native-chat-link-actions'
 import { useNativeChatFileLinkContext } from './use-native-chat-file-link-context'
@@ -291,7 +291,7 @@ export function NativeChatStructuredSession(
       data-native-chat-scheme={appearanceStyle.colorScheme}
     >
       <div className="relative flex min-h-0 flex-1 flex-col">
-        {find.isOpen ? <NativeChatFindBar find={find} isVisible={props.isVisible} /> : null}
+        <NativeChatTopRightControls find={find} session={props} working={controller.isWorking} />
         {viewState.kind === 'loading' || (viewState.kind === 'error' && !readFailure) ? (
           loadingPane
         ) : viewState.kind === 'error' ? (
diff --git a/src/renderer/src/components/native-chat/NativeChatTopRightControls.tsx b/src/renderer/src/components/native-chat/NativeChatTopRightControls.tsx
new file mode 100644
index 000000000000..1d544b074566
--- /dev/null
+++ b/src/renderer/src/components/native-chat/NativeChatTopRightControls.tsx
@@ -0,0 +1,90 @@
+import { SquareTerminal } from 'lucide-react'
+import { Button } from '@/components/ui/button'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
+import { translate } from '@/i18n/i18n'
+import { useAppStore } from '@/store'
+import { useInPlaceSwitchSupported } from '@/lib/in-place-switch-support'
+import { AI_VAULT_AGENTS } from '../../../../shared/ai-vault-types'
+import { SwitchToCliTooltipText } from '../right-sidebar/ai-vault-session-cli-fork-copy'
+import {
+  runNativeChatCliSwitch,
+  useNativeChatCliSwitchPending
+} from '../tab-bar/native-chat-cli-switch-run'
+import { resolveTabSessionHistorySubject } from '../tab-bar/tab-session-history-switch'
+import { NativeChatFindBar } from './NativeChatFindBar'
+import type { NativeChatFind } from './use-native-chat-find'
+import type { NativeChatStructuredViewProps } from './native-chat-view-types'
+import { useNativeChatTabOwnerWorktreeId } from './use-native-chat-tab-owner'
+
+/** The chat's top-right corner: its find bar while open, else its icon-only "Switch to CLI". */
+export function NativeChatTopRightControls({
+  find,
+  session,
+  working
+}: {
+  find: NativeChatFind
+  session: Pick<NativeChatStructuredViewProps, 'tabId' | 'sessionId' | 'agent' | 'isVisible'>
+  working: boolean
+}): React.JSX.Element | null {
+  const worktreeId = useNativeChatTabOwnerWorktreeId(session.tabId)
+  // A primitive, so the selector is stable; the chat's host is where its History row lives.
+  const hostId = useAppStore((state) => {
+    const subject = worktreeId
+      ? resolveTabSessionHistorySubject(state, {
+          tab: { id: session.tabId, worktreeId },
+          nativeChat: { sessionId: session.sessionId, agent: session.agent }
+        })
+      : null
+    return subject?.kind === 'chat' ? subject.request.executionHostScope : null
+  })
+  const agent = AI_VAULT_AGENTS.find((candidate) => candidate === session.agent)
+  const inPlace = useInPlaceSwitchSupported(hostId, agent)
+  const pending = useNativeChatCliSwitchPending(session.sessionId)
+  if (find.isOpen) {
+    return <NativeChatFindBar find={find} isVisible={session.isVisible} />
+  }
+  if (!worktreeId || !hostId || !agent || !inPlace) {
+    return null
+  }
+  const label = translate('components.tab.bar.switch.toCli', 'Switch to CLI')
+  return (
+    <div className="absolute top-2 right-4 z-20">
+      <Tooltip>
+        <TooltipTrigger asChild>
+          <Button
+            type="button"
+            variant="ghost"
+            size="icon-xs"
+            aria-label={label}
+            // Not `disabled` while a reply runs: the tooltip has to say why.
+            aria-disabled={working || undefined}
+            disabled={pending}
+            onClick={() => {
+              if (!working) {
+                void runNativeChatCliSwitch({
+                  sessionId: session.sessionId,
+                  workspaceId: worktreeId,
+                  executionHostId: hostId,
+                  agent,
+                  chatTabId: session.tabId
+                })
+              }
+            }}
+          >
+            <SquareTerminal />
+          </Button>
+        </TooltipTrigger>
+        <TooltipContent side="bottom" sideOffset={4}>
+          {working ? (
+            translate(
+              'components.tab.bar.switch.waitForReply',
+              'Wait for the reply to finish or stop it, then switch.'
+            )
+          ) : (
+            <SwitchToCliTooltipText agent={agent} />
+          )}
+        </TooltipContent>
+      </Tooltip>
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/native-chat/use-native-chat-context-menu.tsx b/src/renderer/src/components/native-chat/use-native-chat-context-menu.tsx
index 9c84b7d56f2e..bcbde501e96f 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-context-menu.tsx
+++ b/src/renderer/src/components/native-chat/use-native-chat-context-menu.tsx
@@ -289,7 +289,7 @@ export function useNativeChatContextMenu({
                   <SquareTerminal />
                   {translate(
                     'components.tab.bar.SortableTabContextMenu.switchToTerminalView',
-                    'Switch to Terminal'
+                    'Show as terminal'
                   )}
                   <DropdownMenuShortcut>{shortcutLabel}</DropdownMenuShortcut>
                 </DropdownMenuItem>
diff --git a/src/renderer/src/components/right-sidebar/AiVaultSessionActionMenuItems.tsx b/src/renderer/src/components/right-sidebar/AiVaultSessionActionMenuItems.tsx
index 533e3c7cfab0..d963dcb4ab6b 100644
--- a/src/renderer/src/components/right-sidebar/AiVaultSessionActionMenuItems.tsx
+++ b/src/renderer/src/components/right-sidebar/AiVaultSessionActionMenuItems.tsx
@@ -13,6 +13,7 @@ import { ContextMenuItem, ContextMenuSeparator } from '@/components/ui/context-m
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import { translate } from '@/i18n/i18n'
 import { AiVaultSessionSurfaceSwitchMenuItems } from './AiVaultSessionSurfaceSwitchMenuItems'
+import type { AiVaultAgent } from '../../../../shared/ai-vault-types'
 import { isAiVaultFolderWorkspaceId } from './ai-vault-session-worktree-affordances'
 
 export function SessionActionMenuItems({
@@ -35,7 +36,8 @@ export function SessionActionMenuItems({
   onRevealLog,
   onOpenCwd,
   deleteBlockedReason,
-  onDelete
+  onDelete,
+  inPlaceAgent
 }: {
   menuKind?: 'dropdown' | 'context'
   resumeDisabled: boolean
@@ -61,6 +63,7 @@ export function SessionActionMenuItems({
   // Null when Delete is offered; otherwise the tooltip explaining why it isn't.
   deleteBlockedReason: string | null
   onDelete?: () => void
+  inPlaceAgent?: AiVaultAgent
 }) {
   const Item = menuKind === 'context' ? ContextMenuItem : DropdownMenuItem
   const Separator = menuKind === 'context' ? ContextMenuSeparator : DropdownMenuSeparator
@@ -126,6 +129,7 @@ export function SessionActionMenuItems({
         tooltipSide={menuKind === 'context' ? 'right' : 'left'}
         onResumeInNewChat={onResumeInNewChat}
         onResumeInNewCli={onResumeInNewCli}
+        inPlaceAgent={inPlaceAgent}
       />
       {onCopyResume ? (
         <Item onSelect={onCopyResume}>
diff --git a/src/renderer/src/components/right-sidebar/AiVaultSessionDetails.tsx b/src/renderer/src/components/right-sidebar/AiVaultSessionDetails.tsx
index 21e6d56dff73..fd3e80fdc55f 100644
--- a/src/renderer/src/components/right-sidebar/AiVaultSessionDetails.tsx
+++ b/src/renderer/src/components/right-sidebar/AiVaultSessionDetails.tsx
@@ -1,16 +1,7 @@
 import { isAntigravityReferenceSession } from '../../../../shared/antigravity-session-origin'
 import type { AiVaultSubagentResumeActions } from './AiVaultSessionSubagents'
 import type React from 'react'
-import {
-  FileJson,
-  Folder,
-  FolderGit2,
-  MessageSquare,
-  MessageSquarePlus,
-  MessagesSquare,
-  Play,
-  SquareTerminal
-} from 'lucide-react'
+import { FileJson, Folder, FolderGit2, MessageSquare, MessageSquarePlus, Play } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import { cn } from '@/lib/utils'
@@ -21,7 +12,7 @@ import {
 } from '../../../../shared/ai-vault-types'
 import { translate } from '@/i18n/i18n'
 import { FirstPromptCard } from './ai-vault-first-prompt-card'
-import { ResumeInNewCliTooltipText } from './ai-vault-session-cli-fork-copy'
+import { AiVaultSessionDetailsSwitchButtons } from './AiVaultSessionDetailsSwitchButtons'
 import { sessionDetailConversationTurns, sessionPromptPreview } from './ai-vault-session-display'
 import { SessionSubagentsSection } from './AiVaultSessionSubagents'
 import { SessionUnsavedConversationNotice } from './AiVaultSessionUnsavedNotice'
@@ -141,51 +132,11 @@ export function SessionInlineDetails({
                   )}
             </Button>
           ) : null}
-          {onResumeInNewChat ? (
-            <Button
-              type="button"
-              variant="secondary"
-              size="xs"
-              draggable={false}
-              onClick={(event) => {
-                event.stopPropagation()
-                onResumeInNewChat()
-              }}
-              className="h-7 shrink-0 px-2.5 text-[11px]"
-            >
-              <MessagesSquare className="size-3.5" />
-              {translate(
-                'auto.components.right.sidebar.AiVaultSessionRow.resumeInNewNativeChat',
-                'Resume in New Chat'
-              )}
-            </Button>
-          ) : null}
-          {onResumeInNewCli ? (
-            <Tooltip>
-              <TooltipTrigger asChild>
-                <Button
-                  type="button"
-                  variant="secondary"
-                  size="xs"
-                  draggable={false}
-                  onClick={(event) => {
-                    event.stopPropagation()
-                    onResumeInNewCli()
-                  }}
-                  className="h-7 shrink-0 px-2.5 text-[11px]"
-                >
-                  <SquareTerminal className="size-3.5" />
-                  {translate(
-                    'auto.components.right.sidebar.AiVaultSessionRow.resumeInNewCli',
-                    'Resume in New Terminal'
-                  )}
-                </Button>
-              </TooltipTrigger>
-              <TooltipContent side="top" sideOffset={4}>
-                <ResumeInNewCliTooltipText />
-              </TooltipContent>
-            </Tooltip>
-          ) : null}
+          <AiVaultSessionDetailsSwitchButtons
+            session={session}
+            onResumeInNewChat={onResumeInNewChat}
+            onResumeInNewCli={onResumeInNewCli}
+          />
           {onContinueInNewSession ? (
             <Button
               type="button"
diff --git a/src/renderer/src/components/right-sidebar/AiVaultSessionDetailsSwitchButtons.tsx b/src/renderer/src/components/right-sidebar/AiVaultSessionDetailsSwitchButtons.tsx
new file mode 100644
index 000000000000..51bc820f6b18
--- /dev/null
+++ b/src/renderer/src/components/right-sidebar/AiVaultSessionDetailsSwitchButtons.tsx
@@ -0,0 +1,77 @@
+import { MessagesSquare, SquareTerminal } from 'lucide-react'
+import { Button } from '@/components/ui/button'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
+import { translate } from '@/i18n/i18n'
+import { useAiVaultInPlaceAgent } from '@/lib/in-place-switch-support'
+import type { AiVaultSession } from '../../../../shared/ai-vault-types'
+import { ResumeInNewCliTooltipText, SwitchToCliTooltipText } from './ai-vault-session-cli-fork-copy'
+
+/** The details bar's chat and CLI moves: in place where the row's host switches its agent. */
+export function AiVaultSessionDetailsSwitchButtons({
+  session,
+  onResumeInNewChat,
+  onResumeInNewCli
+}: {
+  session: Pick<AiVaultSession, 'agent' | 'executionHostId'>
+  onResumeInNewChat?: () => void
+  onResumeInNewCli?: () => void
+}): React.JSX.Element {
+  const inPlaceAgent = useAiVaultInPlaceAgent(session)
+  return (
+    <>
+      {onResumeInNewChat ? (
+        <Button
+          type="button"
+          variant="secondary"
+          size="xs"
+          draggable={false}
+          onClick={(event) => {
+            event.stopPropagation()
+            onResumeInNewChat()
+          }}
+          className="h-7 shrink-0 px-2.5 text-[11px]"
+        >
+          <MessagesSquare className="size-3.5" />
+          {inPlaceAgent
+            ? translate('components.tab.bar.switch.toNativeChat', 'Switch to native chat')
+            : translate(
+                'auto.components.right.sidebar.AiVaultSessionRow.resumeInNewNativeChat',
+                'Resume in New Chat'
+              )}
+        </Button>
+      ) : null}
+      {onResumeInNewCli ? (
+        <Tooltip>
+          <TooltipTrigger asChild>
+            <Button
+              type="button"
+              variant="secondary"
+              size="xs"
+              draggable={false}
+              onClick={(event) => {
+                event.stopPropagation()
+                onResumeInNewCli()
+              }}
+              className="h-7 shrink-0 px-2.5 text-[11px]"
+            >
+              <SquareTerminal className="size-3.5" />
+              {inPlaceAgent
+                ? translate('components.tab.bar.switch.toCli', 'Switch to CLI')
+                : translate(
+                    'auto.components.right.sidebar.AiVaultSessionRow.resumeInNewCli',
+                    'Resume in New Terminal'
+                  )}
+            </Button>
+          </TooltipTrigger>
+          <TooltipContent side="top" sideOffset={4}>
+            {inPlaceAgent ? (
+              <SwitchToCliTooltipText agent={inPlaceAgent} />
+            ) : (
+              <ResumeInNewCliTooltipText />
+            )}
+          </TooltipContent>
+        </Tooltip>
+      ) : null}
+    </>
+  )
+}
diff --git a/src/renderer/src/components/right-sidebar/AiVaultSessionRow.tsx b/src/renderer/src/components/right-sidebar/AiVaultSessionRow.tsx
index 9c69c72e5939..18aa403119ce 100644
--- a/src/renderer/src/components/right-sidebar/AiVaultSessionRow.tsx
+++ b/src/renderer/src/components/right-sidebar/AiVaultSessionRow.tsx
@@ -1,3 +1,4 @@
+import { useAiVaultInPlaceAgent } from '@/lib/in-place-switch-support'
 import { isAntigravityReferenceSession } from '../../../../shared/antigravity-session-origin'
 import type { AiVaultSubagentResumeActions } from './AiVaultSessionSubagents'
 import { useCallback } from 'react'
@@ -101,6 +102,7 @@ export function VaultSessionRow({
   const updatedAt = session.updatedAt ?? session.modifiedAt
   const title = useAiVaultSessionDisplayTitle(session)
   const detailsId = getSessionDetailsId(session.id)
+  const inPlaceAgent = useAiVaultInPlaceAgent(session)
   const latestTurn = latestSessionConversationTurn(session)
   // Computed once so the dropdown menu and the context menu never disagree.
   const deleteBlockedReason = onRequestDelete
@@ -286,6 +288,7 @@ export function VaultSessionRow({
           onContinueInNewSession={onContinueInNewSession}
           onResumeInNewChat={onResumeInNewChat}
           onResumeInNewCli={onResumeInNewCli}
+          inPlaceAgent={inPlaceAgent}
           onCopyResume={onCopyResume}
           onCopyId={onCopyId}
           onCopyPath={onCopyPath}
diff --git a/src/renderer/src/components/right-sidebar/AiVaultSessionSurfaceSwitchMenuItems.tsx b/src/renderer/src/components/right-sidebar/AiVaultSessionSurfaceSwitchMenuItems.tsx
index 7cb8d6b607c3..1fa66f84b6b4 100644
--- a/src/renderer/src/components/right-sidebar/AiVaultSessionSurfaceSwitchMenuItems.tsx
+++ b/src/renderer/src/components/right-sidebar/AiVaultSessionSurfaceSwitchMenuItems.tsx
@@ -3,10 +3,12 @@ import { DropdownMenuItem } from '@/components/ui/dropdown-menu'
 import { ContextMenuItem } from '@/components/ui/context-menu'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import { translate } from '@/i18n/i18n'
+import type { AiVaultAgent } from '../../../../shared/ai-vault-types'
 import { LoadingSpinner } from '@/components/LoadingSpinner'
-import { ResumeInNewCliTooltipText } from './ai-vault-session-cli-fork-copy'
+import { ResumeInNewCliTooltipText, SwitchToCliTooltipText } from './ai-vault-session-cli-fork-copy'
 
-/** History opens a new tab; active-tab controls switch surfaces. */
+/** A tab's terminal always switches in place; History and a chat do once the agent switches in
+ *  place on its host (`inPlace`), and otherwise open a new chat or fork into a new terminal. */
 export function AiVaultSessionSurfaceSwitchMenuItems({
   action,
   menuKind,
@@ -14,7 +16,8 @@ export function AiVaultSessionSurfaceSwitchMenuItems({
   chatPending,
   onResumeInNewChat,
   onResumeInNewCli,
-  cliPending = false
+  cliPending = false,
+  inPlaceAgent
 }: {
   action: 'resume' | 'switch'
   menuKind: 'dropdown' | 'context'
@@ -23,7 +26,10 @@ export function AiVaultSessionSurfaceSwitchMenuItems({
   onResumeInNewChat?: (event: Event) => void
   onResumeInNewCli?: (event: Event) => void
   cliPending?: boolean
+  /** The agent whose conversation switches in place on its host; unset keeps the new-tab entries. */
+  inPlaceAgent?: AiVaultAgent
 }): React.JSX.Element {
+  const inPlace = inPlaceAgent !== undefined
   const Item = menuKind === 'context' ? ContextMenuItem : DropdownMenuItem
   return (
     <>
@@ -34,15 +40,12 @@ export function AiVaultSessionSurfaceSwitchMenuItems({
           aria-busy={chatPending || undefined}
         >
           <MessagesSquare className="size-3.5" />
-          {action === 'resume'
+          {action === 'resume' && !inPlace
             ? translate(
                 'auto.components.right.sidebar.AiVaultSessionRow.resumeInNewNativeChat',
                 'Resume in New Chat'
               )
-            : translate(
-                'components.tab.bar.SortableTabContextMenu.switchToChatView',
-                'Switch to Chat'
-              )}
+            : translate('components.tab.bar.switch.toNativeChat', 'Switch to native chat')}
         </Item>
       ) : null}
       {onResumeInNewCli ? (
@@ -54,19 +57,20 @@ export function AiVaultSessionSurfaceSwitchMenuItems({
               ) : (
                 <SquareTerminal className="size-3.5" />
               )}
-              {action === 'resume'
-                ? translate(
+              {inPlace
+                ? translate('components.tab.bar.switch.toCli', 'Switch to CLI')
+                : translate(
                     'auto.components.right.sidebar.AiVaultSessionRow.resumeInNewCli',
                     'Resume in New Terminal'
-                  )
-                : translate(
-                    'components.tab.bar.SortableTabContextMenu.switchToTerminalView',
-                    'Switch to Terminal'
                   )}
             </Item>
           </TooltipTrigger>
           <TooltipContent side={tooltipSide} sideOffset={8}>
-            <ResumeInNewCliTooltipText />
+            {inPlaceAgent ? (
+              <SwitchToCliTooltipText agent={inPlaceAgent} />
+            ) : (
+              <ResumeInNewCliTooltipText />
+            )}
           </TooltipContent>
         </Tooltip>
       ) : null}
diff --git a/src/renderer/src/components/right-sidebar/SessionRowTrailingActions.tsx b/src/renderer/src/components/right-sidebar/SessionRowTrailingActions.tsx
index 9fb4e3e90a98..002ce322dc59 100644
--- a/src/renderer/src/components/right-sidebar/SessionRowTrailingActions.tsx
+++ b/src/renderer/src/components/right-sidebar/SessionRowTrailingActions.tsx
@@ -1,3 +1,4 @@
+import { useAiVaultInPlaceAgent } from '@/lib/in-place-switch-support'
 import type React from 'react'
 import {
   ChevronDown,
@@ -95,6 +96,7 @@ export function SessionRowTrailingActions({
   /** Only the details toggle shows. */
   actionsHidden?: boolean
 }) {
+  const inPlaceAgent = useAiVaultInPlaceAgent(session)
   const jumpToWorktreeTooltip = aiVaultWorktreeJumpTooltip(worktreeInfo)
 
   return (
@@ -274,6 +276,7 @@ export function SessionRowTrailingActions({
               onContinueInNewSession={onContinueInNewSession}
               onResumeInNewChat={onResumeInNewChat}
               onResumeInNewCli={onResumeInNewCli}
+              inPlaceAgent={inPlaceAgent}
               onJumpToOriginalPane={onJumpToOriginalPane}
               showJumpToWorktree={showJumpToWorktree}
               jumpWorkspaceId={worktreeInfo?.worktreeId}
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-session-cli-fork-copy.tsx b/src/renderer/src/components/right-sidebar/ai-vault-session-cli-fork-copy.tsx
index 09d39962455f..2cc5a6d6f316 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-session-cli-fork-copy.tsx
+++ b/src/renderer/src/components/right-sidebar/ai-vault-session-cli-fork-copy.tsx
@@ -1,5 +1,7 @@
 import type React from 'react'
 import { translate } from '@/i18n/i18n'
+import { agentLabel } from '../../../../shared/ai-vault-session-filters'
+import type { AiVaultAgent } from '../../../../shared/ai-vault-types'
 
 /** Shared by the row menus and the details button, which offer the same fork. Two block lines, not
  *  one wrapped string: the tooltip balances wrapped text inside a box sized before balancing, which
@@ -22,3 +24,15 @@ export function ResumeInNewCliTooltipText(): React.JSX.Element {
     </>
   )
 }
+
+export function SwitchToCliTooltipText({ agent }: { agent: AiVaultAgent }): React.JSX.Element {
+  return (
+    <>
+      {translate(
+        'components.tab.bar.switch.toCliTooltip',
+        'Switch to CLI: stops {{agent}} here and continues the same conversation in the terminal, in this tab.',
+        { agent: agentLabel(agent) }
+      )}
+    </>
+  )
+}
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts b/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts
new file mode 100644
index 000000000000..969c8253a9bb
--- /dev/null
+++ b/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts
@@ -0,0 +1,55 @@
+import { useAppStore } from '@/store'
+import { collectAgentPaneConversations } from '@/lib/ai-vault-tab-title-requests'
+import { inPlaceSwitchSupportedNow } from '@/lib/in-place-switch-support'
+import type { AiVaultSession } from '../../../../shared/ai-vault-types'
+import { adoptsCliConversations } from '../../../../shared/structured-agent-cli-conversation-adoption'
+import { resolveCliChatResumeSource } from '../tab-bar/cli-chat-resume-source'
+import { runCliChatResume } from '../tab-bar/cli-chat-resume-run'
+import { runNativeChatCliSwitch } from '../tab-bar/native-chat-cli-switch-run'
+
+/** History's "Switch to CLI": in the chat tab's slot when that tab is open in this window, else a
+ *  new tab. False when the row's host doesn't switch this agent in place, so the row forks. */
+export function switchAiVaultSessionToCli(session: AiVaultSession): boolean {
+  const chat = session.structuredSession
+  if (!chat || !inPlaceSwitchSupportedNow(session.executionHostId, session.agent)) {
+    return false
+  }
+  const chatTab = useAppStore
+    .getState()
+    .unifiedTabsByWorktree[chat.workspaceId]?.find(
+      (tab) => tab.contentType === 'agent-session' && tab.entityId === chat.sessionId
+    )
+  void runNativeChatCliSwitch({
+    sessionId: chat.sessionId,
+    workspaceId: chat.workspaceId,
+    executionHostId: session.executionHostId,
+    agent: session.agent,
+    chatTabId: chatTab?.id ?? null
+  })
+  return true
+}
+
+/** History's "Switch to native chat": in place when a pane in this window last reported the
+ *  conversation. False otherwise, so the row opens or reveals its chat in a new tab. */
+export function switchAiVaultSessionToNativeChat(session: AiVaultSession): boolean {
+  if (!inPlaceSwitchSupportedNow(session.executionHostId, session.agent)) {
+    return false
+  }
+  const state = useAppStore.getState()
+  const pane = collectAgentPaneConversations(state, adoptsCliConversations).find(
+    (candidate) =>
+      candidate.providerSession.id === session.sessionId &&
+      candidate.executionHostId === session.executionHostId
+  )
+  const source = pane
+    ? resolveCliChatResumeSource(state, {
+        tab: { id: pane.tabId, worktreeId: pane.worktreeId },
+        paneKey: pane.paneKey
+      })
+    : null
+  if (!source) {
+    return false
+  }
+  void runCliChatResume(source)
+  return true
+}
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 0f4bcae5b34e..ac117ce5e8f7 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
@@ -35,6 +35,10 @@ import { adoptsCliConversations } from '../../../../shared/structured-agent-cli-
 import { newAgentLaunchRequestId } from '@/lib/agent-launch-request-id'
 import { describeAiVaultResumeFailure } from '@/lib/ai-vault-resume-refusal'
 import { resumeAiVaultSessionInNewChat } from './ai-vault-session-resume-in-chat-launch'
+import {
+  switchAiVaultSessionToCli,
+  switchAiVaultSessionToNativeChat
+} from './ai-vault-session-in-place-switch'
 import { resolveAiVaultTargetWorkspacePath } from './ai-vault-session-launch-target'
 
 export function useAiVaultSessionLaunchActions({
@@ -147,6 +151,9 @@ export function useAiVaultSessionLaunchActions({
   // Native chat keeps the conversation it owns; the terminal gets a copy (see the fork builder).
   const handleResumeInNewCli = useCallback(
     (session: AiVaultSession, targetWorktreeId: string): void => {
+      if (switchAiVaultSessionToCli(session)) {
+        return
+      }
       const prepareStartup = async (worktreeId: string): Promise<AiVaultResumeStartup> => {
         assertAiVaultCopiedSessionLaunchAllowed({
           state: useAppStore.getState(),
@@ -190,7 +197,7 @@ export function useAiVaultSessionLaunchActions({
 
   const handleResumeInNewChat = useCallback(
     (session: AiVaultSession, targetWorktreeId?: string): void => {
-      if (!adoptsCliConversations(session.agent)) {
+      if (!adoptsCliConversations(session.agent) || switchAiVaultSessionToNativeChat(session)) {
         return
       }
       const worktreeId = targetWorktreeId ?? activeWorktreeId ?? activeWorktree?.id ?? null
diff --git a/src/renderer/src/components/tab-bar/NativeChatCliForkMenuItems.tsx b/src/renderer/src/components/tab-bar/NativeChatCliForkMenuItems.tsx
index 99a1c1e73e9d..b675664fc006 100644
--- a/src/renderer/src/components/tab-bar/NativeChatCliForkMenuItems.tsx
+++ b/src/renderer/src/components/tab-bar/NativeChatCliForkMenuItems.tsx
@@ -8,7 +8,10 @@ import {
   type NativeChatTabSession
 } from './tab-session-history-switch'
 import { runNativeChatCliFork, useNativeChatCliForkPending } from './native-chat-cli-fork-run'
+import { useInPlaceSwitchSupported } from '@/lib/in-place-switch-support'
+import { runNativeChatCliSwitch, useNativeChatCliSwitchPending } from './native-chat-cli-switch-run'
 
+/** "Switch to CLI" where the chat's host switches its agent in place; otherwise the fork. */
 export function NativeChatCliForkMenuItems({
   tab,
   nativeChat,
@@ -24,9 +27,11 @@ export function NativeChatCliForkMenuItems({
     resolveTabSessionHistorySubject(useAppStore.getState(), { tab, nativeChat })
   )
   const chat = subject?.kind === 'chat' ? subject : null
-  const pending = useNativeChatCliForkPending(chat)
+  const forkPending = useNativeChatCliForkPending(chat)
+  const switchPending = useNativeChatCliSwitchPending(chat?.sessionId)
   const commandOverrides = useAppStore((state) => state.settings?.agentCmdOverrides)
   const agent = AI_VAULT_AGENTS.find((candidate) => candidate === nativeChat.agent)
+  const inPlace = useInPlaceSwitchSupported(chat?.request.executionHostScope, agent)
   if (!chat || !agent) {
     return null
   }
@@ -37,10 +42,20 @@ export function NativeChatCliForkMenuItems({
         action="switch"
         menuKind="dropdown"
         tooltipSide="right"
-        cliPending={pending}
+        cliPending={inPlace ? switchPending : forkPending}
+        {...(inPlace ? { inPlaceAgent: agent } : {})}
         onResumeInNewCli={(event) => {
           event.preventDefault()
-          void runNativeChatCliFork({ subject: chat, tab, agent, commandOverrides, onComplete })
+          void (inPlace
+            ? runNativeChatCliSwitch({
+                sessionId: chat.sessionId,
+                workspaceId: chat.workspaceId,
+                executionHostId: chat.request.executionHostScope,
+                agent,
+                chatTabId: tab.id,
+                onComplete
+              })
+            : runNativeChatCliFork({ subject: chat, tab, agent, commandOverrides, onComplete }))
         }}
       />
     </>
diff --git a/src/renderer/src/components/tab-bar/SortableTab.tsx b/src/renderer/src/components/tab-bar/SortableTab.tsx
index 47daf01e46a3..35fe0991853f 100644
--- a/src/renderer/src/components/tab-bar/SortableTab.tsx
+++ b/src/renderer/src/components/tab-bar/SortableTab.tsx
@@ -7,6 +7,7 @@ import { basename } from '@/lib/path'
 import { isImeCompositionKeyDown } from '@/lib/ime-composition-keyboard-event'
 import { Input } from '@/components/ui/input'
 import { TabHoverCard } from './TabHoverCard'
+import { TabSessionSwitchHoverAction } from './TabSessionSwitchHoverAction'
 import type { TerminalTab } from '../../../../shared/terminal-tab-types'
 import type { TerminalAgent } from '../../../../shared/terminal-agent'
 import type { TabDragItemData } from '../tab-group/useTabDragSplit'
@@ -368,6 +369,7 @@ export default function SortableTab({
           tabRoot
         ) : (
           <TabHoverCard
+            action={<TabSessionSwitchHoverAction tab={tab} nativeChat={nativeChat} />}
             title={displayTitle}
             programName={
               tabAgent
diff --git a/src/renderer/src/components/tab-bar/SortableTabContextMenu.tsx b/src/renderer/src/components/tab-bar/SortableTabContextMenu.tsx
index 64ca27e0e9b3..68d5d91ff3f0 100644
--- a/src/renderer/src/components/tab-bar/SortableTabContextMenu.tsx
+++ b/src/renderer/src/components/tab-bar/SortableTabContextMenu.tsx
@@ -194,7 +194,7 @@ export function SortableTabContextMenu({
               <SquareTerminal className="size-3.5 shrink-0" />
               {translate(
                 'components.tab.bar.SortableTabContextMenu.switchToTerminalView',
-                'Switch to Terminal'
+                'Show as terminal'
               )}
             </DropdownMenuItem>
           </>
diff --git a/src/renderer/src/components/tab-bar/TabHoverCard.tsx b/src/renderer/src/components/tab-bar/TabHoverCard.tsx
index b116eb5b5cd2..b2eaa8fb91c4 100644
--- a/src/renderer/src/components/tab-bar/TabHoverCard.tsx
+++ b/src/renderer/src/components/tab-bar/TabHoverCard.tsx
@@ -1,19 +1,67 @@
 import type { ReactNode } from 'react'
+import { HoverCard, HoverCardContent, HoverCardTrigger } from '@/components/ui/hover-card'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 
-export function TabHoverCard({
-  children,
+function TabHoverCardBody({
   title,
   icon,
   programName,
-  description
+  description,
+  action
+}: {
+  title: string
+  icon: ReactNode
+  programName: string
+  description?: string
+  action?: ReactNode
+}): React.JSX.Element {
+  return (
+    <div className="space-y-2 text-left">
+      <div className="space-y-1">
+        <div className="break-words font-medium" data-tab-hover-card-title>
+          {title}
+        </div>
+        {description && <div className="break-all text-muted-foreground">{description}</div>}
+      </div>
+      <div className="flex items-center gap-2 text-muted-foreground" data-tab-hover-card-program>
+        <span className="flex size-4 shrink-0 items-center justify-center" aria-hidden>
+          {icon}
+        </span>
+        <span className="min-w-0 break-all">{programName}</span>
+      </div>
+      {action}
+    </div>
+  )
+}
+
+/** `action` makes the card a hover card the pointer can enter, so its control is clickable. */
+export function TabHoverCard({
+  children,
+  ...body
 }: {
   children: ReactNode
   title: string
   icon: ReactNode
   programName: string
   description?: string
+  action?: ReactNode
 }): React.JSX.Element {
+  if (body.action) {
+    return (
+      <HoverCard openDelay={500} closeDelay={100}>
+        <HoverCardTrigger asChild>{children}</HoverCardTrigger>
+        <HoverCardContent
+          variant="tab-preview"
+          side="bottom"
+          align="start"
+          sideOffset={0}
+          data-tab-hover-card="true"
+        >
+          <TabHoverCardBody {...body} />
+        </HoverCardContent>
+      </HoverCard>
+    )
+  }
   return (
     <Tooltip>
       <TooltipTrigger
@@ -35,23 +83,7 @@ export function TabHoverCard({
         sideOffset={0}
         data-tab-hover-card="true"
       >
-        <div className="space-y-2 text-left">
-          <div className="space-y-1">
-            <div className="break-words font-medium" data-tab-hover-card-title>
-              {title}
-            </div>
-            {description && <div className="break-all text-muted-foreground">{description}</div>}
-          </div>
-          <div
-            className="flex items-center gap-2 text-muted-foreground"
-            data-tab-hover-card-program
-          >
-            <span className="flex size-4 shrink-0 items-center justify-center" aria-hidden>
-              {icon}
-            </span>
-            <span className="min-w-0 break-all">{programName}</span>
-          </div>
-        </div>
+        <TabHoverCardBody {...body} />
       </TooltipContent>
     </Tooltip>
   )
diff --git a/src/renderer/src/components/tab-bar/TabSessionSwitchHoverAction.tsx b/src/renderer/src/components/tab-bar/TabSessionSwitchHoverAction.tsx
new file mode 100644
index 000000000000..b3c43402b831
--- /dev/null
+++ b/src/renderer/src/components/tab-bar/TabSessionSwitchHoverAction.tsx
@@ -0,0 +1,91 @@
+import { useState } from 'react'
+import { useShallow } from 'zustand/react/shallow'
+import { MessagesSquare, SquareTerminal } from 'lucide-react'
+import { Button } from '@/components/ui/button'
+import { translate } from '@/i18n/i18n'
+import { useAppStore } from '@/store'
+import { useInPlaceSwitchSupported } from '@/lib/in-place-switch-support'
+import { AI_VAULT_AGENTS } from '../../../../shared/ai-vault-types'
+import { resolveCliChatResumeSource } from './cli-chat-resume-source'
+import { runCliChatResume, useCliChatResumePending } from './cli-chat-resume-run'
+import { runNativeChatCliSwitch, useNativeChatCliSwitchPending } from './native-chat-cli-switch-run'
+import {
+  resolveTabSessionHistorySubject,
+  type NativeChatTabSession
+} from './tab-session-history-switch'
+
+/** The tab's in-place switch inside its hover card; mounted only while the card is open. */
+export function TabSessionSwitchHoverAction({
+  tab,
+  nativeChat
+}: {
+  tab: { id: string; worktreeId: string }
+  nativeChat?: NativeChatTabSession
+}): React.JSX.Element | null {
+  return nativeChat ? (
+    <ChatSwitchAction tab={tab} nativeChat={nativeChat} />
+  ) : (
+    <TerminalSwitchAction tab={tab} />
+  )
+}
+
+function ChatSwitchAction({
+  tab,
+  nativeChat
+}: {
+  tab: { id: string; worktreeId: string }
+  nativeChat: NativeChatTabSession
+}): React.JSX.Element | null {
+  const [subject] = useState(() =>
+    resolveTabSessionHistorySubject(useAppStore.getState(), { tab, nativeChat })
+  )
+  const chat = subject?.kind === 'chat' ? subject : null
+  const agent = AI_VAULT_AGENTS.find((candidate) => candidate === nativeChat.agent)
+  const inPlace = useInPlaceSwitchSupported(chat?.request.executionHostScope, agent)
+  const pending = useNativeChatCliSwitchPending(chat?.sessionId)
+  if (!chat || !agent || !inPlace) {
+    return null
+  }
+  return (
+    <Button
+      variant="ghost"
+      size="xs"
+      disabled={pending}
+      onClick={() =>
+        void runNativeChatCliSwitch({
+          sessionId: chat.sessionId,
+          workspaceId: chat.workspaceId,
+          executionHostId: chat.request.executionHostScope,
+          agent,
+          chatTabId: tab.id
+        })
+      }
+    >
+      <SquareTerminal />
+      {translate('components.tab.bar.switch.toCli', 'Switch to CLI')}
+    </Button>
+  )
+}
+
+function TerminalSwitchAction({
+  tab
+}: {
+  tab: { id: string; worktreeId: string }
+}): React.JSX.Element | null {
+  const source = useAppStore(useShallow((state) => resolveCliChatResumeSource(state, { tab })))
+  const pending = useCliChatResumePending(source)
+  if (!source) {
+    return null
+  }
+  return (
+    <Button
+      variant="ghost"
+      size="xs"
+      disabled={pending}
+      onClick={() => void runCliChatResume(source)}
+    >
+      <MessagesSquare />
+      {translate('components.tab.bar.switch.toNativeChat', 'Switch to native chat')}
+    </Button>
+  )
+}
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
index 1807c15f9c3f..15ef7c47435f 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
@@ -8,21 +8,22 @@ import type { RuntimeClientTarget } from '../../../../shared/runtime-client-targ
 import { cliConversationExitGuidance } from '@/lib/cli-conversation-exit-guidance'
 import type { CliChatResumeSource } from './cli-chat-resume-source'
 
+/** True when the chat that already holds the conversation was revealed instead: the switch's
+ *  writer check passed before the host named that chat. */
 export async function reportCliChatResumeFailure(
   source: CliChatResumeSource,
   error: unknown,
-  openOwner: boolean,
   target: RuntimeClientTarget
-): Promise<void> {
+): Promise<boolean> {
   const refusal = structuredLaunchFailure(error)
   if (
     refusal?.code === 'agent_session_conflict' ||
     refusal?.code === 'agent_session_ownership_unknown'
   ) {
     const owner = refusal.owner
-    if (openOwner && owner) {
+    if (owner) {
       await activateAiVaultStructuredSession({ structuredSession: owner }, undefined, target)
-      return
+      return true
     }
     toast.error(
       refusal.code === 'agent_session_conflict' &&
@@ -34,7 +35,7 @@ export async function reportCliChatResumeFailure(
             'Another chat is already holding this conversation.'
           )
     )
-    return
+    return false
   }
   // The chat's agent refused to start while the terminal may still write the conversation.
   if (
@@ -42,7 +43,11 @@ export async function reportCliChatResumeFailure(
     refusal.details?.reason === 'conversationOpenInTerminal'
   ) {
     toast.error(cliConversationExitGuidance(source.agent, true))
-    return
+    return false
+  }
+  if (refusal?.details?.reason === 'conversationMovingToTerminal') {
+    toast.error(agentSessionWriteFailureText(refusal, 'read-history'))
+    return false
   }
   if (refusal?.code === 'agent_session_identity_required') {
     if (refusal.details?.reason === 'transcriptNotFound') {
@@ -53,12 +58,12 @@ export async function reportCliChatResumeFailure(
           { agent: agentLabel(source.agent) }
         )
       )
-      return
+      return false
     }
     const failure = structuredLaunchFailure(error)
     if (failure) {
       toast.error(agentSessionWriteFailureText(failure, 'read-history'))
-      return
+      return false
     }
   }
   toast.error(
@@ -67,4 +72,5 @@ export async function reportCliChatResumeFailure(
       'Could not resume this session in a new chat.'
     )
   )
+  return false
 }
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
index 87a5e93246e8..032e45367f5c 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
@@ -3,13 +3,29 @@ import { useAppStore } from '@/store'
 import { newAgentLaunchRequestId } from '@/lib/agent-launch-request-id'
 import { adoptAgentSessionLaunchVerdict } from '@/lib/agent-session-launch-plan'
 import { beginStructuredAgentSessionProvisionalLaunch } from '@/lib/structured-agent-session-provisional-tab'
-import { supportsStructuredAgentSessionCliSource } from '@/runtime/structured-agent-session-client'
+import {
+  supportsInPlaceSwitch,
+  supportsStructuredAgentSessionCliSource
+} from '@/runtime/structured-agent-session-client'
+import { CLOSE_TERMINAL_PANE_EVENT, type CloseTerminalPaneDetail } from '@/constants/terminal'
+import { parsePaneKey } from '../../../../shared/stable-pane-id'
 import { structuredAgentSessionTargetForHost } from '@/runtime/structured-agent-session-owner'
 import { waitForPromiseWithSignal } from '../../../../shared/abort-signal-reason'
 import { CLI_CONVERSATION_ADOPTING_AGENTS } from '../../../../shared/structured-agent-cli-conversation-adoption'
 import { resolveCliChatResumeSource, type CliChatResumeSource } from './cli-chat-resume-source'
 import { reportCliChatResumeFailure } from './cli-chat-resume-feedback'
 import { adoptingAgentOnHost } from '../right-sidebar/ai-vault-session-resume-in-chat-launch'
+import { forgetSwitchedTerminalConversation } from './switched-terminal-conversation'
+
+/** The chat took the conversation, so the terminal pane it came from closes (its tab with it). */
+function retireSwitchedTerminalPane(source: CliChatResumeSource): void {
+  const pane = parsePaneKey(source.paneKey)
+  forgetSwitchedTerminalConversation(source.tabId)
+  if (pane) {
+    const detail: CloseTerminalPaneDetail = { tabId: pane.tabId, leafId: pane.leafId }
+    window.dispatchEvent(new CustomEvent(CLOSE_TERMINAL_PANE_EVENT, { detail }))
+  }
+}
 
 const pending = new Map<string, AbortController>()
 const listeners = new Set<() => void>()
@@ -33,16 +49,15 @@ export function useCliChatResumePending(source: CliChatResumeSource | null): boo
   )
 }
 
-export async function runCliChatResume(
-  source: CliChatResumeSource,
-  openOwner = false
-): Promise<void> {
+/** Switches a terminal's conversation into a chat in the terminal's slot: a new chat, or the chat
+ *  that already holds it, revealed. The terminal pane closes once the chat has it. */
+export async function runCliChatResume(source: CliChatResumeSource): Promise<void> {
   const key = keyFor(source)
   if (pending.has(key)) {
     return
   }
   const target = structuredAgentSessionTargetForHost(source.executionHostId)
-  if (!target || target.kind !== 'local') {
+  if (!target) {
     return
   }
   const controller = new AbortController()
@@ -97,6 +112,15 @@ export async function runCliChatResume(
     return true
   }
   try {
+    if (
+      target.kind !== 'local' &&
+      !(await waitForPromiseWithSignal(
+        supportsInPlaceSwitch(target, source.agent),
+        controller.signal
+      ))
+    ) {
+      return
+    }
     const cliSourceSupported = await waitForPromiseWithSignal(
       supportsStructuredAgentSessionCliSource(target),
       controller.signal
@@ -127,18 +151,26 @@ export async function runCliChatResume(
     const launch = beginStructuredAgentSessionProvisionalLaunch({
       plan,
       hooks: { beforeCreate: handoff },
+      afterTabId: source.tabId,
       deferPublication: true
     })
     if (!launch) {
       return
     }
     const result = await waitForPromiseWithSignal(launch.settlement, controller.signal)
-    if (result.kind === 'failed' && !result.notified && pending.get(key) === controller) {
-      await reportCliChatResumeFailure(source, result.error, openOwner, target)
+    if (result.kind === 'structured') {
+      retireSwitchedTerminalPane(source)
+    } else if (
+      result.kind === 'failed' &&
+      !result.notified &&
+      pending.get(key) === controller &&
+      (await reportCliChatResumeFailure(source, result.error, target))
+    ) {
+      retireSwitchedTerminalPane(source)
     }
   } catch (error) {
     if (pending.get(key) === controller) {
-      await reportCliChatResumeFailure(source, error, false, target)
+      await reportCliChatResumeFailure(source, error, target)
     }
   } finally {
     clearTimeout(timer)
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts
index beba57e98e09..a903e46429de 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts
@@ -1,14 +1,17 @@
 import type { AppState } from '@/store/types'
 import {
   collectAgentPaneConversations,
-  resolvePaneAgentConversation
+  resolvePaneLastAgentConversation
 } from '@/lib/ai-vault-tab-title-requests'
+import { inPlaceSwitchSupportedNow } from '@/lib/in-place-switch-support'
 import { LOCAL_EXECUTION_HOST_ID, type ExecutionHostId } from '../../../../shared/execution-host'
+import { makePaneKey } from '../../../../shared/stable-pane-id'
 import {
   adoptsCliConversations,
   type CliConversationRowAgent
 } from '../../../../shared/structured-agent-cli-conversation-adoption'
 import { canPaneOfferResumeInNewChat } from './tab-session-history-switch'
+import { switchedTerminalConversation } from './switched-terminal-conversation'
 
 export type CliChatResumeSource = {
   tabId: string
@@ -19,24 +22,34 @@ export type CliChatResumeSource = {
   executionHostId: ExecutionHostId
 }
 
+/** The pane's last reported conversation, else the one a switch just put in this tab. */
 export function resolveCliChatResumeSource(
   state: AppState,
   args: { tab: { id: string; worktreeId: string }; paneKey?: string }
 ): CliChatResumeSource | null {
   const conversation = args.paneKey
-    ? resolvePaneAgentConversation(
+    ? resolvePaneLastAgentConversation(
         state,
         { worktreeId: args.tab.worktreeId, paneKey: args.paneKey },
         adoptsCliConversations
       )
-    : collectAgentPaneConversations(state, adoptsCliConversations, {
-        runningAgentsOnly: true
-      }).find((candidate) => candidate.tabId === args.tab.id)
+    : collectAgentPaneConversations(state, adoptsCliConversations).find(
+        (candidate) => candidate.tabId === args.tab.id
+      )
+  const leafId = state.terminalLayoutsByTabId[args.tab.id]?.activeLeafId
+  const seeded = switchedTerminalConversation(args.tab.id)
+  const paneKey = args.paneKey ?? (leafId ? makePaneKey(args.tab.id, leafId) : null)
+  if (!conversation) {
+    return seeded && paneKey
+      ? { tabId: args.tab.id, workspaceId: args.tab.worktreeId, paneKey, ...seeded }
+      : null
+  }
   if (
-    !conversation ||
     conversation.tabId !== args.tab.id ||
     conversation.worktreeId !== args.tab.worktreeId ||
-    conversation.executionHostId !== LOCAL_EXECUTION_HOST_ID ||
+    // A paired host moves a terminal's conversation only once it switches that agent in place.
+    (conversation.executionHostId !== LOCAL_EXECUTION_HOST_ID &&
+      !inPlaceSwitchSupportedNow(conversation.executionHostId, conversation.agent)) ||
     !canPaneOfferResumeInNewChat(state, {
       worktreeId: conversation.worktreeId,
       paneKey: conversation.paneKey
diff --git a/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts b/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts
new file mode 100644
index 000000000000..af580d1f5a54
--- /dev/null
+++ b/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts
@@ -0,0 +1,129 @@
+import { useSyncExternalStore } from 'react'
+import { toast } from 'sonner'
+import { useAppStore } from '@/store'
+import { translate } from '@/i18n/i18n'
+import { readIpcErrorMessage } from '@/lib/ipc-error'
+import { buildAiVaultResumeStartupForWorktree } from '@/lib/ai-vault-resume-command'
+import { launchAiVaultSessionInNewTab } from '@/lib/launch-ai-vault-session'
+import { structuredLaunchFailure } from '@/lib/structured-agent-session-launch-failure'
+import {
+  callStructuredAgentSession,
+  supportsInPlaceSwitch
+} from '@/runtime/structured-agent-session-client'
+import { structuredAgentSessionTargetForHost } from '@/runtime/structured-agent-session-owner'
+import { AiVaultChatForkSourceSchema } from '../../../../shared/ai-vault-chat-fork-contract'
+import type { AiVaultAgent } from '../../../../shared/ai-vault-types'
+import { agentLabel } from '../../../../shared/ai-vault-session-filters'
+import { parseExecutionHostId } from '../../../../shared/execution-host'
+import { adoptsCliConversations } from '../../../../shared/structured-agent-cli-conversation-adoption'
+import { seedSwitchedTerminalConversation } from './switched-terminal-conversation'
+
+const pending = new Set<string>()
+const listeners = new Set<() => void>()
+const changed = () => listeners.forEach((listener) => listener())
+
+export function useNativeChatCliSwitchPending(sessionId: string | null | undefined): boolean {
+  return useSyncExternalStore(
+    (listener) => {
+      listeners.add(listener)
+      return () => listeners.delete(listener)
+    },
+    () => !!sessionId && pending.has(sessionId),
+    () => false
+  )
+}
+
+/** Why a switch to the CLI didn't happen, in words the chat's user can act on. */
+export function nativeChatCliSwitchFailureText(error: unknown, agent: AiVaultAgent): string {
+  const refusal = structuredLaunchFailure(error)
+  const reason = refusal?.details?.reason
+  if (reason === 'turnActive') {
+    return translate(
+      'components.tab.bar.switch.waitForReply',
+      'Wait for the reply to finish or stop it, then switch.'
+    )
+  }
+  if (reason === 'ownerUnproven') {
+    return translate(
+      'components.tab.bar.switch.stopUnconfirmed',
+      "Couldn't confirm {{agent}} stopped. Try again.",
+      { agent: agentLabel(agent) }
+    )
+  }
+  if (reason === 'conversationHeldElsewhere') {
+    return translate(
+      'components.native-chat.failureWords.conversationMovingToTerminal',
+      'This conversation is moving to a terminal. Use it there, or wait a moment and try again.'
+    )
+  }
+  return (
+    (refusal ? undefined : readIpcErrorMessage(error)) ||
+    translate('components.tab.bar.switch.failed', "Couldn't switch this conversation to the CLI.")
+  )
+}
+
+/** Moves a chat's conversation into a terminal on the same id: the host stops the idle chat, the
+ *  terminal opens in the chat's slot, then the chat tab closes. `chatTabId` null opens a new tab. */
+export async function runNativeChatCliSwitch(args: {
+  sessionId: string
+  workspaceId: string
+  executionHostId: string
+  agent: AiVaultAgent
+  chatTabId: string | null
+  onComplete?: () => void
+}): Promise<void> {
+  const target = structuredAgentSessionTargetForHost(args.executionHostId)
+  const hostId = parseExecutionHostId(args.executionHostId)?.id
+  if (pending.has(args.sessionId) || !target || !hostId) {
+    return
+  }
+  pending.add(args.sessionId)
+  changed()
+  try {
+    // Fail closed: a host that doesn't advertise the switch never receives it.
+    if (!(await supportsInPlaceSwitch(target, args.agent))) {
+      throw new Error(nativeChatCliSwitchFailureText(null, args.agent))
+    }
+    const answered = await callStructuredAgentSession<{ source: unknown }>(
+      target,
+      'agentSession.switchToTerminal',
+      { sessionId: args.sessionId }
+    )
+    const source = AiVaultChatForkSourceSchema.parse(answered.source)
+    const state = useAppStore.getState()
+    const startup = buildAiVaultResumeStartupForWorktree({
+      state,
+      worktreeId: args.workspaceId,
+      session: { ...source, executionHostId: hostId },
+      commandOverride: state.settings?.agentCmdOverrides?.[source.agent]
+    })
+    const launch = launchAiVaultSessionInNewTab({
+      agent: source.agent,
+      worktreeId: args.workspaceId,
+      ...startup,
+      ...(args.chatTabId ? { afterTabId: args.chatTabId } : {}),
+      resumeOrigin: 'switch'
+    })
+    const outcome = launch.tabId === null ? await launch.runtimeLaunch : null
+    if (outcome && outcome.status !== 'created') {
+      throw new Error(outcome.status === 'failed' ? outcome.message : undefined)
+    }
+    if (launch.tabId && adoptsCliConversations(source.agent)) {
+      seedSwitchedTerminalConversation(launch.tabId, {
+        agent: source.agent,
+        providerSessionId: source.sessionId,
+        executionHostId: hostId
+      })
+    }
+    // The terminal exists, so the chat tab retires; its host close finds the agent already stopped.
+    if (args.chatTabId) {
+      useAppStore.getState().closeUnifiedTab(args.chatTabId)
+    }
+  } catch (error) {
+    toast.error(nativeChatCliSwitchFailureText(error, args.agent))
+  } finally {
+    pending.delete(args.sessionId)
+    changed()
+    args.onComplete?.()
+  }
+}
diff --git a/src/renderer/src/components/tab-bar/switched-terminal-conversation.ts b/src/renderer/src/components/tab-bar/switched-terminal-conversation.ts
new file mode 100644
index 000000000000..3651a0afdd04
--- /dev/null
+++ b/src/renderer/src/components/tab-bar/switched-terminal-conversation.ts
@@ -0,0 +1,29 @@
+import type { ExecutionHostId } from '../../../../shared/execution-host'
+import type { CliConversationRowAgent } from '../../../../shared/structured-agent-cli-conversation-adoption'
+
+/** The conversation a switch put in a terminal tab, until its agent reports one. Presentation only:
+ *  an agent's first report comes with its first prompt, and the switch back is offered before it. */
+type SwitchedTerminalConversation = {
+  agent: CliConversationRowAgent
+  providerSessionId: string
+  executionHostId: ExecutionHostId
+}
+
+const byTabId = new Map<string, SwitchedTerminalConversation>()
+
+export function seedSwitchedTerminalConversation(
+  tabId: string,
+  conversation: SwitchedTerminalConversation
+): void {
+  byTabId.set(tabId, conversation)
+}
+
+export function switchedTerminalConversation(
+  tabId: string
+): SwitchedTerminalConversation | undefined {
+  return byTabId.get(tabId)
+}
+
+export function forgetSwitchedTerminalConversation(tabId: string): void {
+  byTabId.delete(tabId)
+}
diff --git a/src/renderer/src/components/tab-bar/tab-session-history-switch.ts b/src/renderer/src/components/tab-bar/tab-session-history-switch.ts
index 93abdfcd2900..d335de178ede 100644
--- a/src/renderer/src/components/tab-bar/tab-session-history-switch.ts
+++ b/src/renderer/src/components/tab-bar/tab-session-history-switch.ts
@@ -4,7 +4,8 @@ import type { AppState } from '@/store/types'
 import { getIndexedAllWorktrees } from '@/store/worktree-repo-index'
 import {
   collectAgentPaneConversations,
-  resolvePaneAgentConversation
+  resolvePaneAgentConversation,
+  resolvePaneLastAgentConversation
 } from '@/lib/ai-vault-tab-title-requests'
 import {
   isAiVaultSessionResumableContent,
@@ -82,7 +83,7 @@ export function canPaneOfferResumeInNewChat(
   state: AppState,
   pane: { worktreeId: string; paneKey: string }
 ): boolean {
-  const conversation = resolvePaneAgentConversation(state, pane, adoptsCliConversations)
+  const conversation = resolvePaneLastAgentConversation(state, pane, adoptsCliConversations)
   if (!conversation) {
     return false
   }
diff --git a/src/renderer/src/components/terminal-pane/TerminalContextMenu.tsx b/src/renderer/src/components/terminal-pane/TerminalContextMenu.tsx
index 51fdee846177..8f6989e3ea6a 100644
--- a/src/renderer/src/components/terminal-pane/TerminalContextMenu.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalContextMenu.tsx
@@ -233,11 +233,11 @@ function TerminalContextMenuItems({
           {isNativeChatView
             ? translate(
                 'components.tab.bar.SortableTabContextMenu.switchToTerminalView',
-                'Switch to Terminal'
+                'Show as terminal'
               )
             : translate(
                 'components.tab.bar.SortableTabContextMenu.switchToChatView',
-                'Switch to Chat'
+                'Show as chat'
               )}
           <DropdownMenuShortcut>{shortcuts.nativeChat}</DropdownMenuShortcut>
         </DropdownMenuItem>
diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx
index d012862a7658..9a980777e67f 100644
--- a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx
@@ -4,6 +4,7 @@ import { Button } from '@/components/ui/button'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import { translate } from '@/i18n/i18n'
 import { useAppStore } from '@/store'
+import { agentLabel } from '../../../../shared/ai-vault-session-filters'
 import { resolveCliChatResumeSource } from '../tab-bar/cli-chat-resume-source'
 import { runCliChatResume, useCliChatResumePending } from '../tab-bar/cli-chat-resume-run'
 
@@ -18,17 +19,32 @@ export function TerminalPaneResumeInChatButton({
 }): React.JSX.Element {
   const source = useAppStore(
     useShallow((state) =>
-      resolveCliChatResumeSource(state, {
-        tab: { id: tabId, worktreeId },
-        paneKey
-      })
+      resolveCliChatResumeSource(state, { tab: { id: tabId, worktreeId }, paneKey })
     )
   )
+  // The host's writer check decides; this only explains the refusal before the click.
+  const running = useAppStore((state) => {
+    const foreground = state.paneForegroundAgentByPaneKey[paneKey]
+    return (
+      state.agentStatusByPaneKey[paneKey] !== undefined ||
+      (!!foreground?.agent && !foreground.shellForeground)
+    )
+  })
   const pending = useCliChatResumePending(source)
-  const label = translate(
-    'components.tab.bar.SortableTabContextMenu.switchToChatView',
-    'Switch to Chat'
-  )
+  const label = translate('components.tab.bar.switch.toNativeChat', 'Switch to native chat')
+  const tooltip =
+    running && source
+      ? translate(
+          'components.tab.bar.switch.exitAgentFirst',
+          'Exit {{agent}} in this terminal to switch.',
+          {
+            agent: agentLabel(source.agent)
+          }
+        )
+      : translate(
+          'components.tab.bar.switch.toNativeChatTooltip',
+          'Switch to native chat: continues the same conversation in a chat, in this tab.'
+        )
 
   return (
     <Tooltip>
@@ -41,11 +57,13 @@ export function TerminalPaneResumeInChatButton({
           className="pane-title-split-trigger"
           aria-label={label}
           disabled={!source || pending}
+          // Not `disabled`: the tooltip has to say why.
+          aria-disabled={running || undefined}
           aria-busy={pending || undefined}
           onClick={(event) => {
             event.stopPropagation()
-            if (source) {
-              void runCliChatResume(source, true)
+            if (source && !running) {
+              void runCliChatResume(source)
             }
           }}
         >
@@ -53,7 +71,7 @@ export function TerminalPaneResumeInChatButton({
         </Button>
       </TooltipTrigger>
       <TooltipContent side="bottom" sideOffset={4}>
-        {label}
+        {tooltip}
       </TooltipContent>
     </Tooltip>
   )
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-types.ts b/src/renderer/src/components/terminal-pane/pty-connection-types.ts
index 6d2fb3583ffe..46c37197fab8 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-types.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-types.ts
@@ -31,7 +31,7 @@ export type PtyPaneStartup = {
   launchConfig?: SleepingAgentLaunchConfig
   resumeProviderSession?: AgentProviderSessionMetadata
   /** `saved`: a resume built from saved facts, which the host refuses for a chat's conversation. */
-  resumeOrigin?: 'saved'
+  resumeOrigin?: 'saved' | 'switch'
   resumeSource?: SavedResumeStartupSource
   launchToken?: string
   launchAgent?: TuiAgent
diff --git a/src/renderer/src/components/terminal-pane/pty-transport-types.ts b/src/renderer/src/components/terminal-pane/pty-transport-types.ts
index b14f471f2394..e81ef8adf48d 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport-types.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport-types.ts
@@ -193,7 +193,7 @@ export type PtyTransport = {
     envToDelete?: string[]
     launchConfig?: SleepingAgentLaunchConfig
     resumeProviderSession?: AgentProviderSessionMetadata
-    resumeOrigin?: 'saved'
+    resumeOrigin?: 'saved' | 'switch'
     launchToken?: string
     launchAgent?: TuiAgent
     startupCommandDelivery?: StartupCommandDelivery
@@ -299,7 +299,7 @@ export type IpcPtyTransportOptions = {
   commandDelivery?: 'renderer' | 'provider'
   launchConfig?: SleepingAgentLaunchConfig
   resumeProviderSession?: AgentProviderSessionMetadata
-  resumeOrigin?: 'saved'
+  resumeOrigin?: 'saved' | 'switch'
   agentPrompt?: string
   agentPromptDelivery?: AgentPromptDelivery
   agentArgsOverride?: string | null
diff --git a/src/renderer/src/components/terminal-pane/use-terminal-pane-projection.ts b/src/renderer/src/components/terminal-pane/use-terminal-pane-projection.ts
index e36be126e8a6..4d6998fff093 100644
--- a/src/renderer/src/components/terminal-pane/use-terminal-pane-projection.ts
+++ b/src/renderer/src/components/terminal-pane/use-terminal-pane-projection.ts
@@ -1,3 +1,4 @@
+import { switchedTerminalConversation } from '../tab-bar/switched-terminal-conversation'
 import { useCallback, useEffect } from 'react'
 import type { CSSProperties } from 'react'
 import {
@@ -188,10 +189,11 @@ export function useTerminalPaneProjection(controller: TerminalPaneMobileControll
       activePaneCanResumeInChat:
         !activePaneIsChatLeaf &&
         activeLeafId !== null &&
-        canPaneOfferResumeInNewChat(state, {
-          worktreeId,
-          paneKey: makePaneKey(tabId, activeLeafId)
-        })
+        (switchedTerminalConversation(tabId) !== undefined ||
+          canPaneOfferResumeInNewChat(state, {
+            worktreeId,
+            paneKey: makePaneKey(tabId, activeLeafId)
+          }))
     }))
   )
   const contextMenuIsChatView = effectiveChatViewMode && contextMenuLeafId === chatLeafId
diff --git a/src/renderer/src/components/ui/hover-card.tsx b/src/renderer/src/components/ui/hover-card.tsx
index 4ed28740cba3..479c5370c56e 100644
--- a/src/renderer/src/components/ui/hover-card.tsx
+++ b/src/renderer/src/components/ui/hover-card.tsx
@@ -19,7 +19,8 @@ const hoverCardContentVariants = cva('', {
     variant: {
       default: 'w-64 p-4',
       'workspace-details':
-        'w-[360px] max-w-[calc(100vw-2rem)] max-h-[28rem] overflow-y-auto p-3 text-xs scrollbar-sleek'
+        'w-[360px] max-w-[calc(100vw-2rem)] max-h-[28rem] overflow-y-auto p-3 text-xs scrollbar-sleek',
+      'tab-preview': 'w-64 max-w-[calc(100vw-1rem)] p-3 text-xs'
     }
   },
   defaultVariants: { variant: 'default' }
diff --git a/src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge.ts
index 64898b7ef134..eb5f52a9e8d9 100644
--- a/src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge.ts
@@ -71,6 +71,7 @@ export function registerTerminalRequestIpcBridge(unsubs: (() => void)[]): void {
               ...(data.resumeProviderSession
                 ? { resumeProviderSession: data.resumeProviderSession }
                 : {}),
+              ...(data.resumeOrigin ? { resumeOrigin: data.resumeOrigin } : {}),
               ...(data.launchToken ? { launchToken: data.launchToken } : {}),
               ...(data.launchAgent ? { launchAgent: data.launchAgent } : {}),
               ...(data.startupCommandDelivery
diff --git a/src/renderer/src/i18n/en-runtime-required.json b/src/renderer/src/i18n/en-runtime-required.json
index be251bdb1857..6cd30af0dc93 100644
--- a/src/renderer/src/i18n/en-runtime-required.json
+++ b/src/renderer/src/i18n/en-runtime-required.json
@@ -2971,6 +2971,7 @@
         "runtimeNotInstalled": "{{agent}} isn't installed on the computer running this chat. Install it from the chat in a current version of Orca.",
         "conversationOpenElsewhere": "Codex still has this conversation open somewhere else. Close it there, then try again.",
         "conversationOpenInTerminal": "Orca can't confirm {{agent}} has exited in its terminal. Stop what's running there or close the terminal, then try again.",
+        "conversationMovingToTerminal": "This conversation is moving to a terminal. Use it there, or wait a moment and try again.",
         "sendAgainToTryOnceMore": "Send your message again to try once more.",
         "sendToTryAgain": "Send your message to try again.",
         "sessionNotRestored": "{{agent}} couldn't reopen its earlier session, so this chat continues in a new one. {{agent}} doesn't remember the earlier messages.",
diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index ae05c28d041a..d0cee595676c 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -18348,6 +18348,7 @@
         "runtimeNotInstalled": "{{agent}} isn't installed on the computer running this chat. Install it from the chat in a current version of Orca.",
         "conversationOpenElsewhere": "Codex still has this conversation open somewhere else. Close it there, then try again.",
         "conversationOpenInTerminal": "Orca can't confirm {{agent}} has exited in its terminal. Stop what's running there or close the terminal, then try again.",
+        "conversationMovingToTerminal": "This conversation is moving to a terminal. Use it there, or wait a moment and try again.",
         "chooseClaudeAccount": "Choose or add one in Claude Accounts settings.",
         "chooseClaudeAccountThenRunCommand": "Choose or add one in Claude Accounts settings, then run /{{command}} again.",
         "chooseClaudeAccountThenSend": "Choose or add one in Claude Accounts settings, then send your message again.",
@@ -19065,10 +19066,20 @@
     "tab": {
       "bar": {
         "SortableTabContextMenu": {
-          "switchToTerminalView": "Switch to Terminal",
-          "switchToChatView": "Switch to Chat",
+          "switchToTerminalView": "Show as terminal",
+          "switchToChatView": "Show as chat",
           "closeTabsToLeft": "Close All Tabs To The Left"
         },
+        "switch": {
+          "toCli": "Switch to CLI",
+          "toNativeChat": "Switch to native chat",
+          "toCliTooltip": "Switch to CLI: stops {{agent}} here and continues the same conversation in the terminal, in this tab.",
+          "toNativeChatTooltip": "Switch to native chat: continues the same conversation in a chat, in this tab.",
+          "exitAgentFirst": "Exit {{agent}} in this terminal to switch.",
+          "waitForReply": "Wait for the reply to finish or stop it, then switch.",
+          "stopUnconfirmed": "Couldn't confirm {{agent}} stopped. Try again.",
+          "failed": "Couldn't switch this conversation to the CLI."
+        },
         "BrowserTab": {
           "closeOthers": "Close Others",
           "closeTabsToLeft": "Close All Tabs To The Left"
diff --git a/src/renderer/src/i18n/locales/es.json b/src/renderer/src/i18n/locales/es.json
index f232d4a69154..3cd8daac0e8d 100644
--- a/src/renderer/src/i18n/locales/es.json
+++ b/src/renderer/src/i18n/locales/es.json
@@ -18062,6 +18062,7 @@
         "runtimeNotInstalled": "{{agent}} no está instalado en el equipo que ejecuta este chat. Instálelo desde el chat en una versión actual de Orca.",
         "conversationOpenElsewhere": "Codex aún tiene esta conversación abierta en otro lugar. Ciérrela allí y vuelva a intentarlo.",
         "conversationOpenInTerminal": "Orca no puede confirmar que {{agent}} haya salido en su terminal. Detenga lo que se esté ejecutando allí o cierre la terminal y vuelva a intentarlo.",
+        "conversationMovingToTerminal": "Esta conversación se está trasladando a una terminal. Úsela allí o espere un momento y vuelva a intentarlo.",
         "chooseClaudeAccount": "Elija o agregue una en la configuración de Cuentas de Claude.",
         "chooseClaudeAccountThenRunCommand": "Elija o agregue una en la configuración de Cuentas de Claude y vuelva a ejecutar /{{command}}.",
         "chooseClaudeAccountThenSend": "Elija o agregue una en la configuración de Cuentas de Claude y vuelva a enviar su mensaje.",
@@ -18761,10 +18762,20 @@
     "tab": {
       "bar": {
         "SortableTabContextMenu": {
-          "switchToTerminalView": "Cambiar al terminal",
-          "switchToChatView": "Cambiar al chat",
+          "switchToTerminalView": "Mostrar como terminal",
+          "switchToChatView": "Mostrar como chat",
           "closeTabsToLeft": "Cerrar todas las pestañas a la izquierda"
         },
+        "switch": {
+          "toCli": "Cambiar a la CLI",
+          "toNativeChat": "Cambiar al chat nativo",
+          "toCliTooltip": "Cambiar a la CLI: detiene {{agent}} aquí y continúa la misma conversación en la terminal, en esta pestaña.",
+          "toNativeChatTooltip": "Cambiar al chat nativo: continúa la misma conversación en un chat, en esta pestaña.",
+          "exitAgentFirst": "Salga de {{agent}} en esta terminal para cambiar.",
+          "waitForReply": "Espere a que termine la respuesta o deténgala y luego cambie.",
+          "stopUnconfirmed": "No se pudo confirmar que {{agent}} se detuvo. Vuelva a intentarlo.",
+          "failed": "No se pudo cambiar esta conversación a la CLI."
+        },
         "BrowserTab": {
           "closeOthers": "Cerrar otras",
           "closeTabsToLeft": "Cerrar todas las pestañas a la izquierda"
diff --git a/src/renderer/src/i18n/locales/fr.json b/src/renderer/src/i18n/locales/fr.json
index 1da9b09e2a39..79b45c68fc1c 100644
--- a/src/renderer/src/i18n/locales/fr.json
+++ b/src/renderer/src/i18n/locales/fr.json
@@ -18171,6 +18171,7 @@
         "runtimeNotInstalled": "{{agent}} n'est pas installé sur l'ordinateur qui exécute ce chat. Installez-le depuis le chat dans une version récente d'Orca.",
         "conversationOpenElsewhere": "Codex garde cette conversation ouverte ailleurs. Fermez-la à cet endroit, puis réessayez.",
         "conversationOpenInTerminal": "Orca ne peut pas confirmer que {{agent}} a quitté son terminal. Arrêtez ce qui s'y exécute ou fermez le terminal, puis réessayez.",
+        "conversationMovingToTerminal": "Cette conversation est en cours de transfert vers un terminal. Utilisez-la là-bas, ou attendez un instant et réessayez.",
         "chooseClaudeAccount": "Choisissez-en un ou ajoutez-en un dans les paramètres Comptes Claude.",
         "chooseClaudeAccountThenRunCommand": "Choisissez-en un ou ajoutez-en un dans les paramètres Comptes Claude, puis relancez /{{command}}.",
         "chooseClaudeAccountThenSend": "Choisissez-en un ou ajoutez-en un dans les paramètres Comptes Claude, puis renvoyez votre message.",
@@ -18870,10 +18871,20 @@
     "tab": {
       "bar": {
         "SortableTabContextMenu": {
-          "switchToTerminalView": "Passer au terminal",
-          "switchToChatView": "Passer au chat",
+          "switchToTerminalView": "Afficher en terminal",
+          "switchToChatView": "Afficher en chat",
           "closeTabsToLeft": "Fermer tous les onglets à gauche"
         },
+        "switch": {
+          "toCli": "Passer à la CLI",
+          "toNativeChat": "Passer au chat natif",
+          "toCliTooltip": "Passer à la CLI : arrête {{agent}} ici et poursuit la même conversation dans le terminal, dans cet onglet.",
+          "toNativeChatTooltip": "Passer au chat natif : poursuit la même conversation dans un chat, dans cet onglet.",
+          "exitAgentFirst": "Quittez {{agent}} dans ce terminal pour basculer.",
+          "waitForReply": "Attendez la fin de la réponse ou arrêtez-la, puis basculez.",
+          "stopUnconfirmed": "Impossible de confirmer l'arrêt de {{agent}}. Réessayez.",
+          "failed": "Impossible de basculer cette conversation vers la CLI."
+        },
         "BrowserTab": {
           "closeOthers": "Fermer les autres",
           "closeTabsToLeft": "Fermer tous les onglets à gauche"
diff --git a/src/renderer/src/i18n/locales/ja.json b/src/renderer/src/i18n/locales/ja.json
index 7f5f620fd4cd..0466b3789f0d 100644
--- a/src/renderer/src/i18n/locales/ja.json
+++ b/src/renderer/src/i18n/locales/ja.json
@@ -18102,6 +18102,7 @@
         "runtimeNotInstalled": "{{agent}} はこのチャットを実行しているコンピューターにインストールされていません。最新バージョンの Orca でチャットからインストールしてください。",
         "conversationOpenElsewhere": "Codex はまだ別の場所でこの会話を開いています。そこで閉じてから、もう一度お試しください。",
         "conversationOpenInTerminal": "Orca は {{agent}} がターミナルで終了したことを確認できません。そこで実行中のものを停止するかターミナルを閉じてから、もう一度お試しください。",
+        "conversationMovingToTerminal": "この会話はターミナルに移動中です。そちらで使用するか、少し待ってからもう一度お試しください。",
         "chooseClaudeAccount": "Claude アカウントの設定で選択または追加してください。",
         "chooseClaudeAccountThenRunCommand": "Claude アカウントの設定で選択または追加してから、/{{command}} をもう一度実行してください。",
         "chooseClaudeAccountThenSend": "Claude アカウントの設定で選択または追加してから、メッセージをもう一度送信してください。",
@@ -18801,10 +18802,20 @@
     "tab": {
       "bar": {
         "SortableTabContextMenu": {
-          "switchToTerminalView": "ターミナルに切り替える",
-          "switchToChatView": "チャットに切り替える",
+          "switchToTerminalView": "ターミナルとして表示",
+          "switchToChatView": "チャットとして表示",
           "closeTabsToLeft": "左側のすべてのタブを閉じる"
         },
+        "switch": {
+          "toCli": "CLI に切り替える",
+          "toNativeChat": "ネイティブチャットに切り替える",
+          "toCliTooltip": "CLI に切り替え: ここで {{agent}} を停止し、このタブのターミナルで同じ会話を続けます。",
+          "toNativeChatTooltip": "ネイティブチャットに切り替え: このタブのチャットで同じ会話を続けます。",
+          "exitAgentFirst": "切り替えるには、このターミナルで {{agent}} を終了してください。",
+          "waitForReply": "応答が終わるまで待つか停止してから、切り替えてください。",
+          "stopUnconfirmed": "{{agent}} が停止したことを確認できませんでした。もう一度お試しください。",
+          "failed": "この会話を CLI に切り替えられませんでした。"
+        },
         "BrowserTab": {
           "closeOthers": "その他を閉じる",
           "closeTabsToLeft": "左側のすべてのタブを閉じる"
diff --git a/src/renderer/src/i18n/locales/ko.json b/src/renderer/src/i18n/locales/ko.json
index 8489acc0e720..6b4c10118f23 100644
--- a/src/renderer/src/i18n/locales/ko.json
+++ b/src/renderer/src/i18n/locales/ko.json
@@ -18102,6 +18102,7 @@
         "runtimeNotInstalled": "{{agent}}이(가) 이 채팅을 실행하는 컴퓨터에 설치되어 있지 않습니다. 최신 버전의 Orca에서 채팅을 통해 설치하세요.",
         "conversationOpenElsewhere": "Codex가 다른 곳에서 이 대화를 열어 두고 있습니다. 그곳에서 닫은 후 다시 시도하세요.",
         "conversationOpenInTerminal": "Orca에서 {{agent}}이(가) 터미널에서 종료되었는지 확인할 수 없습니다. 그곳에서 실행 중인 항목을 중지하거나 터미널을 닫은 후 다시 시도하세요.",
+        "conversationMovingToTerminal": "이 대화는 터미널로 이동하는 중입니다. 그곳에서 사용하거나 잠시 후 다시 시도하세요.",
         "chooseClaudeAccount": "Claude 계정 설정에서 선택하거나 추가하세요.",
         "chooseClaudeAccountThenRunCommand": "Claude 계정 설정에서 선택하거나 추가한 다음 /{{command}}을(를) 다시 실행하세요.",
         "chooseClaudeAccountThenSend": "Claude 계정 설정에서 선택하거나 추가한 다음 메시지를 다시 보내세요.",
@@ -18801,10 +18802,20 @@
     "tab": {
       "bar": {
         "SortableTabContextMenu": {
-          "switchToTerminalView": "터미널로 전환",
-          "switchToChatView": "채팅으로 전환",
+          "switchToTerminalView": "터미널로 표시",
+          "switchToChatView": "채팅으로 표시",
           "closeTabsToLeft": "왼쪽의 모든 탭 닫기"
         },
+        "switch": {
+          "toCli": "CLI로 전환",
+          "toNativeChat": "네이티브 채팅으로 전환",
+          "toCliTooltip": "CLI로 전환: 여기서 {{agent}}을(를) 중지하고 이 탭의 터미널에서 같은 대화를 이어갑니다.",
+          "toNativeChatTooltip": "네이티브 채팅으로 전환: 이 탭의 채팅에서 같은 대화를 이어갑니다.",
+          "exitAgentFirst": "전환하려면 이 터미널에서 {{agent}}을(를) 종료하세요.",
+          "waitForReply": "응답이 끝날 때까지 기다리거나 응답을 중지한 후 전환하세요.",
+          "stopUnconfirmed": "{{agent}}이(가) 중지되었는지 확인할 수 없습니다. 다시 시도하세요.",
+          "failed": "이 대화를 CLI로 전환할 수 없습니다."
+        },
         "BrowserTab": {
           "closeOthers": "다른 탭 닫기",
           "closeTabsToLeft": "왼쪽의 모든 탭 닫기"
diff --git a/src/renderer/src/i18n/locales/zh.json b/src/renderer/src/i18n/locales/zh.json
index cbdf29ae07ab..6d7091fe9fb3 100644
--- a/src/renderer/src/i18n/locales/zh.json
+++ b/src/renderer/src/i18n/locales/zh.json
@@ -18067,6 +18067,7 @@
         "runtimeNotInstalled": "运行此聊天的计算机上未安装 {{agent}}。请在最新版本的 Orca 中从聊天里安装。",
         "conversationOpenElsewhere": "Codex 仍在其他地方打开着此对话。请在那里关闭后重试。",
         "conversationOpenInTerminal": "Orca 无法确认 {{agent}} 已在其终端中退出。请停止那里正在运行的内容或关闭终端，然后重试。",
+        "conversationMovingToTerminal": "此对话正在转移到终端。请在那里使用，或稍等片刻后重试。",
         "chooseClaudeAccount": "请在 Claude 账户设置中选择或添加一个。",
         "chooseClaudeAccountThenRunCommand": "请在 Claude 账户设置中选择或添加一个，然后重新运行 /{{command}}。",
         "chooseClaudeAccountThenSend": "请在 Claude 账户设置中选择或添加一个，然后重新发送您的消息。",
@@ -18766,10 +18767,20 @@
     "tab": {
       "bar": {
         "SortableTabContextMenu": {
-          "switchToTerminalView": "切换到终端",
-          "switchToChatView": "切换到聊天",
+          "switchToTerminalView": "以终端显示",
+          "switchToChatView": "以聊天显示",
           "closeTabsToLeft": "关闭左侧的所有选项卡"
         },
+        "switch": {
+          "toCli": "切换到 CLI",
+          "toNativeChat": "切换到原生聊天",
+          "toCliTooltip": "切换到 CLI：在此停止 {{agent}}，并在此标签页的终端中继续同一对话。",
+          "toNativeChatTooltip": "切换到原生聊天：在此标签页的聊天中继续同一对话。",
+          "exitAgentFirst": "请先在此终端中退出 {{agent}}，然后再切换。",
+          "waitForReply": "请等待回复完成或停止回复，然后再切换。",
+          "stopUnconfirmed": "无法确认 {{agent}} 已停止。请重试。",
+          "failed": "无法将此对话切换到 CLI。"
+        },
         "BrowserTab": {
           "closeOthers": "关闭其他",
           "closeTabsToLeft": "关闭左侧的所有选项卡"
diff --git a/src/renderer/src/lib/ai-vault-tab-title-requests.ts b/src/renderer/src/lib/ai-vault-tab-title-requests.ts
index 600c223c8573..da315267f73b 100644
--- a/src/renderer/src/lib/ai-vault-tab-title-requests.ts
+++ b/src/renderer/src/lib/ai-vault-tab-title-requests.ts
@@ -167,3 +167,33 @@ export function resolvePaneAgentConversation<Agent extends AgentType>(
   const { priority: _priority, ...request } = candidate
   return request
 }
+
+/** As above, or the conversation the pane's agent last reported once it exited: a switch is
+ *  offered when the agent is gone, which is when it can succeed. */
+export function resolvePaneLastAgentConversation<Agent extends AgentType>(
+  state: AppState,
+  pane: { worktreeId: string; paneKey: string },
+  isAgent: (agent: AgentType | null | undefined) => agent is Agent
+): AgentPaneConversation<Agent> | null {
+  const live = resolvePaneAgentConversation(state, pane, isAgent)
+  const retained = state.retainedAgentsByPaneKey[pane.paneKey]
+  if (live || retained?.entry.paneKey !== pane.paneKey || retained.worktreeId !== pane.worktreeId) {
+    return live
+  }
+  const candidates = new Map<string, RequestCandidate<Agent>>()
+  registerCandidate(state, new Map([[retained.tab.id, retained.tab]]), candidates, isAgent, {
+    agent: retained.agentType,
+    paneKey: pane.paneKey,
+    priority: 10,
+    providerSession: retained.entry.providerSession,
+    refresh: false,
+    tabId: retained.tab.id,
+    worktreeId: retained.worktreeId
+  })
+  const [candidate] = candidates.values()
+  if (!candidate) {
+    return null
+  }
+  const { priority: _priority, ...request } = candidate
+  return request
+}
diff --git a/src/renderer/src/lib/in-place-switch-support.ts b/src/renderer/src/lib/in-place-switch-support.ts
new file mode 100644
index 000000000000..58febd83ed08
--- /dev/null
+++ b/src/renderer/src/lib/in-place-switch-support.ts
@@ -0,0 +1,68 @@
+import { useSyncExternalStore } from 'react'
+import { supportsInPlaceSwitch } from '@/runtime/structured-agent-session-client'
+import { structuredAgentSessionTargetForHost } from '@/runtime/structured-agent-session-owner'
+import {
+  onRuntimeEnvironmentRevisionsChanged,
+  onRuntimeEnvironmentsRetired
+} from '@/runtime/runtime-environment-revision'
+import { inPlaceSwitchEnabled } from '../../../shared/structured-agent-cli-conversation-adoption'
+import type { AiVaultAgent } from '../../../shared/ai-vault-types'
+
+// The answer per host and agent; a reconnect or retirement asks again.
+const known = new Map<string, boolean>()
+const asking = new Set<string>()
+const listeners = new Set<() => void>()
+const changed = () => listeners.forEach((listener) => listener())
+const forget = () => {
+  known.clear()
+  changed()
+}
+onRuntimeEnvironmentRevisionsChanged(forget)
+onRuntimeEnvironmentsRetired(forget)
+
+/** The cached answer, asking in the background when there is none yet. */
+export function inPlaceSwitchSupportedNow(
+  executionHostId: string | null | undefined,
+  agent: string
+): boolean {
+  if (!inPlaceSwitchEnabled(agent)) {
+    return false
+  }
+  const key = `${executionHostId ?? ''}\0${agent}`
+  const answer = known.get(key)
+  const target = structuredAgentSessionTargetForHost(executionHostId)
+  if (answer === undefined && target && !asking.has(key)) {
+    asking.add(key)
+    void supportsInPlaceSwitch(target, agent).then((supported) => {
+      asking.delete(key)
+      known.set(key, supported)
+      changed()
+    })
+  }
+  return answer === true
+}
+
+/** Whether the host running this conversation switches it in place; false until it answered yes. */
+export function useInPlaceSwitchSupported(
+  executionHostId: string | null | undefined,
+  agent: string | null | undefined
+): boolean {
+  return useSyncExternalStore(
+    (listener) => {
+      listeners.add(listener)
+      return () => listeners.delete(listener)
+    },
+    () => (agent ? inPlaceSwitchSupportedNow(executionHostId, agent) : false),
+    () => false
+  )
+}
+
+/** A History row's agent when its host switches it in place: the row offers the switch, not a copy. */
+export function useAiVaultInPlaceAgent(session: {
+  agent: AiVaultAgent
+  executionHostId?: string | null
+}): AiVaultAgent | undefined {
+  return useInPlaceSwitchSupported(session.executionHostId, session.agent)
+    ? session.agent
+    : undefined
+}
diff --git a/src/renderer/src/lib/launch-ai-vault-session.ts b/src/renderer/src/lib/launch-ai-vault-session.ts
index b630483e51aa..4646748c8793 100644
--- a/src/renderer/src/lib/launch-ai-vault-session.ts
+++ b/src/renderer/src/lib/launch-ai-vault-session.ts
@@ -27,8 +27,13 @@ export function launchAiVaultSessionInNewTab(args: {
   providerSession?: AgentProviderSessionMetadata
   targetGroupId?: string
   splitDirection?: TabSplitDirection
+  /** Opens in this tab's slot: the next tab in its group. */
+  afterTabId?: string
+  /** A chat's switch, whose spawn claims the conversation; set only for a capable host. */
+  resumeOrigin?: 'switch'
 }): LaunchAiVaultSessionInNewTabResult {
   const store = useAppStore.getState()
+  const switchStart = args.resumeOrigin ? { resumeOrigin: args.resumeOrigin } : {}
   // Why both paths split: the runtime path used to return first and drop the split (#22791).
   const split =
     args.splitDirection && args.targetGroupId
@@ -49,6 +54,8 @@ export function launchAiVaultSessionInNewTab(args: {
         worktreeId: args.worktreeId,
         environmentId: runtimeEnvironmentId,
         ...(targetGroupId ? { targetGroupId } : {}),
+        ...(args.afterTabId ? { afterTabId: args.afterTabId } : {}),
+        ...switchStart,
         agentSessionKind: 'resume',
         launchAgent: args.agent,
         command: args.command,
@@ -74,7 +81,10 @@ export function launchAiVaultSessionInNewTab(args: {
     return { tabId: null, runtimeLaunch: observedRuntimeLaunch }
   }
 
-  const tab = store.createTab(args.worktreeId, args.targetGroupId, undefined, {
+  const slot = args.afterTabId
+    ? store.unifiedTabsByWorktree[args.worktreeId]?.find((tab) => tab.id === args.afterTabId)
+    : undefined
+  const tab = store.createTab(args.worktreeId, slot?.groupId ?? args.targetGroupId, undefined, {
     ...(split ? { split } : {}),
     ...(args.cwd ? { startupCwd: args.cwd } : {}),
     pendingStartup: {
@@ -83,6 +93,7 @@ export function launchAiVaultSessionInNewTab(args: {
       ...(args.envToDelete ? { envToDelete: args.envToDelete } : {}),
       ...(args.launchConfig ? { launchConfig: args.launchConfig, launchAgent: args.agent } : {}),
       ...(args.providerSession ? { resumeProviderSession: args.providerSession } : {}),
+      ...(args.resumeOrigin ? { launchAgent: args.agent, ...switchStart } : {}),
       telemetry: {
         agent_kind: tuiAgentToAgentKind(args.agent),
         launch_source: 'sidebar',
@@ -93,6 +104,14 @@ export function launchAiVaultSessionInNewTab(args: {
   store.setActiveTabType('terminal', args.worktreeId)
 
   persistAgentLaunchTabOrder(args.worktreeId, tab.id)
+  if (slot) {
+    const order = (
+      useAppStore.getState().groupsByWorktree[args.worktreeId]?.find((g) => g.id === slot.groupId)
+        ?.tabOrder ?? []
+    ).filter((id) => id !== tab.id)
+    order.splice(order.indexOf(slot.id) + 1, 0, tab.id)
+    useAppStore.getState().reorderUnifiedTabs(slot.groupId, order)
+  }
 
   return { tabId: tab.id }
 }
diff --git a/src/renderer/src/runtime/structured-agent-session-client.ts b/src/renderer/src/runtime/structured-agent-session-client.ts
index 7ad8cff68ac2..19abbb987b3b 100644
--- a/src/renderer/src/runtime/structured-agent-session-client.ts
+++ b/src/renderer/src/runtime/structured-agent-session-client.ts
@@ -17,6 +17,10 @@ import {
   type RuntimeCapability
 } from '../../../shared/protocol-version'
 import { AGENT_SESSION_CREATE_MESSAGE_RUNTIME_CAPABILITY } from '../../../shared/agent-session-create-capabilities'
+import {
+  inPlaceSwitchCapability,
+  inPlaceSwitchEnabled
+} from '../../../shared/structured-agent-cli-conversation-adoption'
 import { callRuntimeRpc, runtimeEnvironmentSupportsCapability } from './runtime-rpc-client'
 import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
 import {
@@ -64,6 +68,16 @@ export function supportsStructuredAgentSessionCliSource(
   )
 }
 
+/** Whether the destination host switches this agent's conversations in place; unknown is no. */
+export function supportsInPlaceSwitch(
+  target: RuntimeClientTarget,
+  agent: string
+): Promise<boolean> {
+  return inPlaceSwitchEnabled(agent)
+    ? structuredAgentSessionHostSupports(target, inPlaceSwitchCapability(agent))
+    : Promise.resolve(false)
+}
+
 /** Whether the host writes no row for a Stop that stopped nothing, so a repeated Stop is quiet. */
 export function supportsStructuredAgentSessionQuietRepeatedStop(
   target: RuntimeClientTarget
diff --git a/src/renderer/src/runtime/web-runtime-session-types.ts b/src/renderer/src/runtime/web-runtime-session-types.ts
index aeb015419d91..a09629f34a61 100644
--- a/src/renderer/src/runtime/web-runtime-session-types.ts
+++ b/src/renderer/src/runtime/web-runtime-session-types.ts
@@ -39,6 +39,8 @@ export type CreateWebRuntimeSessionTerminalArgs = {
   agentArgs?: string | null
   launchPreferences?: AgentLaunchPreferences
   providerSession?: AgentProviderSessionMetadata
+  /** A chat's switch: sent only to a host advertising the agent's switch capability. */
+  resumeOrigin?: 'switch'
   viewMode?: 'terminal' | 'chat'
   activate?: boolean
   selectWorktree?: boolean
diff --git a/src/renderer/src/runtime/web-runtime-terminal-create-operation.ts b/src/renderer/src/runtime/web-runtime-terminal-create-operation.ts
index 955e51e9b086..5c6dffce2100 100644
--- a/src/renderer/src/runtime/web-runtime-terminal-create-operation.ts
+++ b/src/renderer/src/runtime/web-runtime-terminal-create-operation.ts
@@ -94,7 +94,9 @@ export async function createWebRuntimeSessionTerminalResult(
       // Why: structured creation cannot yet express afterTabId; keep the exact legacy placement contract until it can.
       // Why: focus belongs to the paired client; a headless execution host has no renderer to focus.
       // Why: rebuilding a prepared command through host authority can discard its embedded prompt and delivery flags.
-      const mustUseLegacyAgentCreate = args.preparedAgentCommand || args.afterTabId
+      // A switch keeps its prepared recipe and its claim, which only the prepared create carries.
+      const mustUseLegacyAgentCreate =
+        args.preparedAgentCommand || args.afterTabId || args.resumeOrigin === 'switch'
       const hostAuthority = mustUseLegacyAgentCreate
         ? undefined
         : args.agentSessionKind === 'resume'
@@ -182,6 +184,9 @@ export async function createWebRuntimeSessionTerminalResult(
               ...(args.launchToken ? { launchToken: args.launchToken } : {}),
               ...(args.agent ? { agent: args.agent } : {}),
               ...(args.launchAgent ? { launchAgent: args.launchAgent } : {}),
+              ...(args.resumeOrigin && args.providerSession
+                ? { resumeOrigin: args.resumeOrigin, resumeProviderSession: args.providerSession }
+                : {}),
               ...(args.viewMode ? { viewMode: args.viewMode } : {}),
               // Why: old hosts understand activate:false; new hosts use select/navigation for caller-local focus.
               activate: false,
diff --git a/src/renderer/src/store/terminals/terminal-actions.ts b/src/renderer/src/store/terminals/terminal-actions.ts
index 93c970532853..21665cdc9ec9 100644
--- a/src/renderer/src/store/terminals/terminal-actions.ts
+++ b/src/renderer/src/store/terminals/terminal-actions.ts
@@ -200,7 +200,7 @@ export type TerminalActions = {
       envToDelete?: string[]
       launchConfig?: SleepingAgentLaunchConfig
       resumeProviderSession?: AgentProviderSessionMetadata
-      resumeOrigin?: 'saved'
+      resumeOrigin?: 'saved' | 'switch'
       launchToken?: string
       launchAgent?: TuiAgent
       agentArgsOverride?: string | null
@@ -227,7 +227,7 @@ export type TerminalActions = {
     envToDelete?: string[]
     launchConfig?: SleepingAgentLaunchConfig
     resumeProviderSession?: AgentProviderSessionMetadata
-    resumeOrigin?: 'saved'
+    resumeOrigin?: 'saved' | 'switch'
     launchToken?: string
     launchAgent?: TuiAgent
     agentArgsOverride?: string | null
diff --git a/src/renderer/src/store/terminals/terminal-state.ts b/src/renderer/src/store/terminals/terminal-state.ts
index 4c27bff02c43..199565cb52a6 100644
--- a/src/renderer/src/store/terminals/terminal-state.ts
+++ b/src/renderer/src/store/terminals/terminal-state.ts
@@ -57,7 +57,7 @@ export type TerminalState = {
       envToDelete?: string[]
       launchConfig?: SleepingAgentLaunchConfig
       resumeProviderSession?: AgentProviderSessionMetadata
-      resumeOrigin?: 'saved'
+      resumeOrigin?: 'saved' | 'switch'
       resumeSource?: SavedResumeStartupSource
       launchToken?: string
       launchAgent?: TuiAgent
diff --git a/src/shared/runtime-terminal-contracts.ts b/src/shared/runtime-terminal-contracts.ts
index 30f161c9219e..5a4ffefaca7b 100644
--- a/src/shared/runtime-terminal-contracts.ts
+++ b/src/shared/runtime-terminal-contracts.ts
@@ -253,6 +253,8 @@ type RuntimeTerminalCreateBaseRequestPayload = {
   envToDelete?: string[]
   launchConfig?: SleepingAgentLaunchConfig
   resumeProviderSession?: AgentProviderSessionMetadata
+  /** A chat's switch: the pane's spawn admission claims the conversation. */
+  resumeOrigin?: 'switch'
   launchToken?: string
   launchAgent?: TuiAgent
   viewMode?: 'terminal' | 'chat'
@@ -267,10 +269,7 @@ type RuntimeTerminalCreateBaseRequestPayload = {
 
 export type RuntimeTerminalCreateRequestPayload =
   | (RuntimeTerminalCreateBaseRequestPayload & { source?: undefined })
-  | (RuntimeTerminalCreateBaseRequestPayload & {
-      worktreeId: string
-      source: 'runtime-session'
-    })
+  | (RuntimeTerminalCreateBaseRequestPayload & { worktreeId: string; source: 'runtime-session' })
 
 export type RuntimeTerminalCreate = TerminalLaunchResult & {
   coldRestore?: { scrollback: string; cwd: string; cols?: number; rows?: number }

From f09f7c612ba45ab81411cbda5b0b70593ade5b35 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Tue, 20 Oct 2026 12:00:07 -0700
Subject: [PATCH 010/207] test(native-chat): pin the in-place Codex switch in
 both directions

Covers the host op stopping an idle chat while a racing send is refused, the
switch claim lifetime (unaccepted lapse, accepted spawn past the window, bind,
identity-only replay, second switch refused), the switch spawn claiming before
its first await, and the renderer refusing hosts that do not advertise the
switch. Updates label and owner-reveal expectations for the new wording.
---
 ...nt-session-terminal-writer-acquire.test.ts |  44 ++++++
 .../structured-session-switch-claims.test.ts  | 143 ++++++++++++++++++
 .../use-native-chat-context-menu.test.tsx     |   6 +-
 .../SortableTab.rename-shortcut.test.tsx      |   1 +
 .../tab-bar/SortableTabContextMenu.test.tsx   |   8 +-
 .../tab-bar/cli-chat-resume-run.test.ts       |  19 ++-
 .../native-chat-cli-switch-run.test.ts        |  95 ++++++++++++
 .../tab-session-history-switch.test.ts        |   5 +-
 .../tab-bar/tab-title-tooltip.test.tsx        |  11 ++
 .../TerminalPaneResumeInChatButton.test.tsx   |   9 +-
 10 files changed, 321 insertions(+), 20 deletions(-)
 create mode 100644 src/main/runtime/session-tabs/structured-session-switch-claims.test.ts
 create mode 100644 src/renderer/src/components/tab-bar/native-chat-cli-switch-run.test.ts

diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts
index 001d926b0860..3431d6cd44d5 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts
@@ -4,6 +4,7 @@ import { join } from 'node:path'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope'
 import { agentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
+import { agentSessionLeaseOwnerVerdict } from '../../../shared/agent-session-lease-adjudication'
 import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding'
 import type { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
 import { openTestAgentSessionRecordStore } from '../../runtime/agent-session-record-store-test-harness'
@@ -136,3 +137,46 @@ it('refuses the chat agent start while a terminal writes its conversation, once
     timeout: 10_000
   })
 })
+
+// The switch to a terminal: admitted only when idle, registers before it stops, proves the stop.
+it('switches an idle chat to its terminal and a racing send starts no second writer', async () => {
+  const order: string[] = []
+  const closeSession = vi.mocked(host.deps.adapter.closeSession)
+  closeSession.mockImplementation(async () => {
+    order.push('stop')
+    return true
+  })
+  await host.switchToTerminal(SESSION, () => {
+    order.push('claim')
+    terminalWriting = true
+  })
+  expect(order).toEqual(['claim', 'stop'])
+  expect(agentSessionLeaseOwnerVerdict(store.getRecord(SESSION)!.lease)).toBe('exited')
+  const spawnsBefore = acquire.mock.calls.length
+  const raced = await rejection(await send('from another window'))
+  expect(raced?.rejection).toMatchObject({ kind: 'conversationOpenInTerminal' })
+  expect(acquire.mock.calls.length).toBe(spawnsBefore)
+})
+
+it('refuses a switch while the chat is starting, without aborting that start', async () => {
+  await host.close(SESSION, 'evict')
+  let release = (): void => undefined
+  const started = new Promise<void>((resolve) => {
+    release = resolve
+  })
+  let signal: AbortSignal | undefined
+  acquire.mockImplementationOnce(async (attempt) => {
+    signal = attempt.signal
+    await started
+    return acquire.getMockImplementation()!(attempt)
+  })
+  await send('starts the agent')
+  await vi.waitFor(() => expect(signal).toBeDefined())
+  const admit = vi.fn()
+  await expect(host.switchToTerminal(SESSION, admit)).rejects.toMatchObject({
+    refusal: { details: { reason: 'turnActive' } }
+  })
+  expect(admit).not.toHaveBeenCalled()
+  expect(signal?.aborted).toBe(false)
+  release()
+})
diff --git a/src/main/runtime/session-tabs/structured-session-switch-claims.test.ts b/src/main/runtime/session-tabs/structured-session-switch-claims.test.ts
new file mode 100644
index 000000000000..8a1f195a65a4
--- /dev/null
+++ b/src/main/runtime/session-tabs/structured-session-switch-claims.test.ts
@@ -0,0 +1,143 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import '../rpc/unused-default-rpc-methods.test-fixture'
+import { OrcaRuntimeService } from '../orca-runtime'
+import { admitSwitchResumeSpawn } from '../../ipc/pty/host-env/resume-spawn-judgement'
+import { switchStartProcessVerdict } from './structured-session-switch-observation'
+import type { AgentProcessVerdict } from '../../../shared/agent-process-presence'
+import { codexChatHolding } from '../../ai-vault/structured-session-ownership.test-support'
+import type { AdmissionRuntime } from '../../ipc/pty/host-env/resume-spawn-judgement'
+
+vi.mock('electron', () => ({
+  BrowserWindow: { fromId: vi.fn(() => null) },
+  webContents: { fromId: vi.fn(() => null) },
+  ipcMain: { on: vi.fn(), removeListener: vi.fn() },
+  app: { getPath: vi.fn(() => '/tmp') }
+}))
+vi.mock('./structured-session-switch-observation', () => ({
+  readSwitchPaneAgentProcesses: vi.fn(async () => []),
+  switchStartProcessVerdict: vi.fn(async (): Promise<AgentProcessVerdict> => 'live')
+}))
+
+const C = 'thread-c'
+const LEAF = '11111111-1111-4111-8111-111111111111'
+const AGENT = { pid: 999_991, platform: process.platform, startTime: 'started' } as const
+let runtime: OrcaRuntimeService
+let shellAlone: boolean
+
+const chatStart = () => runtime.assertStructuredAdoptionTerminalWritersExited('codex', C)
+const reason = (promise: Promise<unknown>) =>
+  promise.then(
+    () => 'admitted',
+    (error: { refusal?: { details?: { reason?: string } } }) => error.refusal?.details?.reason
+  )
+function hook(process?: typeof AGENT): void {
+  runtime.recordCliWriterConversation({
+    paneKey: `tab-1:${LEAF}`,
+    connectionId: null,
+    receivedAt: 1,
+    stateStartedAt: 1,
+    providerSession: { key: 'session_id', id: C },
+    payload: { state: 'done', prompt: '', agentType: 'codex' },
+    ...(process ? { agentPresence: { agent: 'codex', process } } : {})
+  })
+}
+
+beforeEach(() => {
+  shellAlone = true
+  runtime = new OrcaRuntimeService()
+  runtime.registerPty('pty-1', 'wt-1', null, { tabId: 'tab-1', leafId: LEAF, incarnationId: 'i1' })
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the census's one process-table read, replaced by the pane's modeled state.
+  vi.spyOn(
+    runtime as never as { cliWriterShellAlone: () => Promise<boolean> },
+    'cliWriterShellAlone'
+  ).mockImplementation(async () => shellAlone)
+  vi.mocked(switchStartProcessVerdict).mockResolvedValue('live')
+})
+afterEach(() => vi.useRealTimers())
+
+describe('the switch claim', () => {
+  it('refuses a chat start until a spawn takes it; an accepted start never lapses', async () => {
+    vi.useFakeTimers()
+    runtime.registerSwitchClaim('codex', C)
+    expect(await reason(chatStart())).toBe('conversationMovingToTerminal')
+    vi.advanceTimersByTime(61_000)
+    expect(await reason(chatStart())).toBe('admitted')
+
+    runtime.registerSwitchClaim('codex', C)
+    runtime.acceptSwitchStart('codex', C)
+    // A spawn slower than the window keeps refusing until it settles.
+    vi.advanceTimersByTime(120_000)
+    expect(await reason(chatStart())).toBe('conversationMovingToTerminal')
+  })
+
+  it('binds to the switch terminal, ignores identity-only replays, and ends on a proven exit', async () => {
+    const claim = runtime.acceptSwitchStart('codex', C)
+    runtime.settleSwitchStart(claim, 'pty-1')
+    expect(await reason(chatStart())).toBe('conversationHeldElsewhere')
+    // The launch identity names the conversation without proving a start or an exit.
+    hook()
+    expect(await reason(chatStart())).toBe('conversationHeldElsewhere')
+    hook(AGENT)
+    expect(await reason(chatStart())).toBe('conversationHeldElsewhere')
+    vi.mocked(switchStartProcessVerdict).mockResolvedValue('exited')
+    shellAlone = false
+    expect(await reason(chatStart())).toBe('conversationHeldElsewhere')
+    shellAlone = true
+    expect(await reason(chatStart())).toBe('admitted')
+  })
+
+  it('refuses a second switch of the conversation while the first terminal may hold it', () => {
+    const first = runtime.acceptSwitchStart('codex', C)
+    runtime.settleSwitchStart(first, 'pty-1')
+    expect(() => runtime.registerSwitchClaim('codex', C)).toThrow('agent_session_conflict')
+  })
+})
+
+describe('a switch spawn', () => {
+  const args = {
+    launchAgent: 'codex' as const,
+    resumeProviderSession: { key: 'session_id' as const, id: C },
+    resumeOrigin: 'switch'
+  }
+  const admission = (writing: boolean) =>
+    ({
+      acceptSwitchStart: vi.fn(() => ({ agent: 'codex', id: C, at: 0, accepted: true })),
+      settleSwitchStart: vi.fn(),
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: a switch spawn reads only the store's records and tab index.
+      openAgentSessionRecordStore: vi.fn(
+        async () =>
+          ({
+            listRecords: () => (writing ? [codexChatHolding('chat-1', [C])] : []),
+            getVisibleSessionTabIndex: () => ({ present: true, sessionIds: [] })
+          }) as never
+      )
+    }) satisfies AdmissionRuntime
+
+  it('claims before reading the chat, and a writing chat refuses it into a plain shell', async () => {
+    const quiet = admission(false)
+    expect(await admitSwitchResumeSpawn(quiet, args, null)).toMatchObject({
+      verdict: 'admitted',
+      switchClaim: { id: C }
+    })
+    const writing = admission(true)
+    const refused = admitSwitchResumeSpawn(writing, args, null)
+    expect(writing.acceptSwitchStart.mock.invocationCallOrder[0]).toBeLessThan(
+      writing.openAgentSessionRecordStore.mock.invocationCallOrder[0]!
+    )
+    expect(await refused).toMatchObject({ verdict: 'chat-writing' })
+    expect(writing.settleSwitchStart).toHaveBeenCalledWith(expect.anything(), null)
+  })
+
+  it('refuses where it cannot judge the pane, and a switch without its conversation', async () => {
+    const quiet = admission(false)
+    expect(
+      await admitSwitchResumeSpawn(quiet, { ...args, connectionId: 'ssh' }, null)
+    ).toMatchObject({ verdict: 'unverifiable' })
+    expect(await admitSwitchResumeSpawn(quiet, args, 'Ubuntu')).toMatchObject({
+      verdict: 'unverifiable'
+    })
+    await expect(
+      admitSwitchResumeSpawn(quiet, { ...args, resumeProviderSession: undefined }, null)
+    ).rejects.toThrow('switch_start_missing_conversation')
+  })
+})
diff --git a/src/renderer/src/components/native-chat/use-native-chat-context-menu.test.tsx b/src/renderer/src/components/native-chat/use-native-chat-context-menu.test.tsx
index 03ce68d99b86..d121c5f015fb 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-context-menu.test.tsx
+++ b/src/renderer/src/components/native-chat/use-native-chat-context-menu.test.tsx
@@ -385,9 +385,9 @@ describe('useNativeChatContextMenu', () => {
     // Keep the assertions tied to the mocked menu item's semantic children.
     const labels = items.list.map((candidate) => childrenText(candidate.children))
 
-    expect(labels.some((label) => label.startsWith('Switch to Terminal'))).toBe(true)
+    expect(labels.some((label) => label.startsWith('Show as terminal'))).toBe(true)
     const item = items.list.find((candidate) =>
-      childrenText(candidate.children).startsWith('Switch to Terminal')
+      childrenText(candidate.children).startsWith('Show as terminal')
     )
     expect(item).toBeDefined()
     item?.onSelect?.()
@@ -398,7 +398,7 @@ describe('useNativeChatContextMenu', () => {
     renderToStaticMarkup(<Harness />)
 
     expect(
-      items.list.some((candidate) => childrenText(candidate.children) === 'Switch to Terminal')
+      items.list.some((candidate) => childrenText(candidate.children) === 'Show as terminal')
     ).toBe(false)
   })
 
diff --git a/src/renderer/src/components/tab-bar/SortableTab.rename-shortcut.test.tsx b/src/renderer/src/components/tab-bar/SortableTab.rename-shortcut.test.tsx
index 3885b09578e0..ea920936a46e 100644
--- a/src/renderer/src/components/tab-bar/SortableTab.rename-shortcut.test.tsx
+++ b/src/renderer/src/components/tab-bar/SortableTab.rename-shortcut.test.tsx
@@ -66,6 +66,7 @@ vi.mock('react', async () => {
 vi.mock('./TabSessionSurfaceSwitchMenuItems', () => ({
   TabSessionSurfaceSwitchMenuItems: () => null
 }))
+vi.mock('./TabSessionSwitchHoverAction', () => ({ TabSessionSwitchHoverAction: () => null }))
 
 vi.mock('./use-tab-strip-slot-props', () => ({
   useTabStripSlotProps: () => ({ className: '', 'data-tab-strip-slot': '' })
diff --git a/src/renderer/src/components/tab-bar/SortableTabContextMenu.test.tsx b/src/renderer/src/components/tab-bar/SortableTabContextMenu.test.tsx
index 857c925fcae4..d548bee92469 100644
--- a/src/renderer/src/components/tab-bar/SortableTabContextMenu.test.tsx
+++ b/src/renderer/src/components/tab-bar/SortableTabContextMenu.test.tsx
@@ -264,8 +264,8 @@ describe('SortableTabContextMenu', () => {
   it('does not expose a native/terminal view switch', () => {
     const { container } = renderMenu()
 
-    expect(container.textContent).not.toContain('Switch to Terminal')
-    expect(container.textContent).not.toContain('Switch to Chat')
+    expect(container.textContent).not.toContain('Show as terminal')
+    expect(container.textContent).not.toContain('Show as chat')
   })
 
   it('hides switching a terminal-view tab into chat view', () => {
@@ -283,11 +283,11 @@ describe('SortableTabContextMenu', () => {
     })
     const marker = getSurfaceSwitchMarker(container)
 
-    expect(getButton(container, 'Switch to Terminal').compareDocumentPosition(marker)).toBe(
+    expect(getButton(container, 'Show as terminal').compareDocumentPosition(marker)).toBe(
       Node.DOCUMENT_POSITION_FOLLOWING
     )
     expect(marker.getAttribute('data-leading-separator')).toBe('false')
-    act(() => getButton(container, 'Switch to Terminal').click())
+    act(() => getButton(container, 'Show as terminal').click())
     expect(onToggleViewMode).toHaveBeenCalled()
   })
 
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
index 4b6e04dd2d8d..ae760b4b2e97 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
@@ -198,7 +198,7 @@ describe('CLI identity resume through the existing launch owner', () => {
       ok: false,
       refusal: { code: 'agent_session_conflict', message: 'old host' }
     })
-    await runCliChatResume(SOURCE, true)
+    await runCliChatResume(SOURCE)
     expect(mocks.call.mock.calls[0][2].resumeFrom).toEqual({ providerSessionId: 'provider-1' })
     expect(tabs()).toHaveLength(1)
     expect(mocks.activate).not.toHaveBeenCalled()
@@ -227,7 +227,7 @@ describe('CLI identity resume through the existing launch owner', () => {
         createAttemptRefusedBeforeCommit: true
       }
     })
-    await runCliChatResume(SOURCE, true)
+    await runCliChatResume(SOURCE)
     expect(mocks.toast).toHaveBeenCalledTimes(1)
     expect(mocks.toast.mock.calls[0]?.[0]).toMatch(
       /^Orca can't confirm Claude.* has exited in its terminal\. Stop what's running there or close the terminal, then open this conversation from Session History\.$/
@@ -237,7 +237,7 @@ describe('CLI identity resume through the existing launch owner', () => {
     expect([...structuredLaunchStates()]).toEqual([])
   })
 
-  it('opens a proved owner only for the header, on the initiating host, without importing', async () => {
+  it('reveals the chat that already holds the conversation in place and closes the terminal pane', async () => {
     const owner = { sessionId: 'owner-chat', workspaceId: 'owner-workspace' }
     mocks.call.mockResolvedValue({
       ok: false,
@@ -248,13 +248,18 @@ describe('CLI identity resume through the existing launch owner', () => {
         createAttemptRefusedBeforeCommit: true
       }
     })
-    await runCliChatResume(SOURCE)
-    expect(mocks.toast).toHaveBeenCalledWith('Another chat is already holding this conversation.')
-    expect(mocks.activate).not.toHaveBeenCalled()
-    await runCliChatResume(SOURCE, true)
+    const leafId = '11111111-1111-4111-8111-111111111111'
+    mocks.source = { ...SOURCE, paneKey: `tab-1:${leafId}` }
+    const closed = vi.fn()
+    window.addEventListener('orca-close-terminal-pane', closed)
+    await runCliChatResume(mocks.source)
+    window.removeEventListener('orca-close-terminal-pane', closed)
+    expect(mocks.toast).not.toHaveBeenCalled()
     expect(mocks.activate).toHaveBeenCalledWith({ structuredSession: owner }, undefined, {
       kind: 'local'
     })
+    expect(closed).toHaveBeenCalledOnce()
+    expect(closed.mock.calls[0]?.[0].detail).toEqual({ tabId: 'tab-1', leafId })
     expect(tabs()).toEqual([])
   })
 
diff --git a/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.test.ts b/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.test.ts
new file mode 100644
index 000000000000..72538d15253c
--- /dev/null
+++ b/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.test.ts
@@ -0,0 +1,95 @@
+import { beforeEach, expect, it, vi } from 'vitest'
+
+const mocks = vi.hoisted(() => ({
+  supported: true,
+  call: vi.fn(),
+  launch: vi.fn((_args: unknown) => ({ tabId: 'terminal-tab' })),
+  closeUnifiedTab: vi.fn(),
+  toast: vi.fn()
+}))
+vi.mock('sonner', () => ({ toast: { error: mocks.toast } }))
+vi.mock('@/store', () => ({
+  useAppStore: {
+    getState: () => ({ settings: {}, closeUnifiedTab: mocks.closeUnifiedTab })
+  }
+}))
+vi.mock('@/runtime/structured-agent-session-client', () => ({
+  supportsInPlaceSwitch: async () => mocks.supported,
+  callStructuredAgentSession: mocks.call
+}))
+vi.mock('@/lib/launch-ai-vault-session', () => ({ launchAiVaultSessionInNewTab: mocks.launch }))
+vi.mock('@/lib/ai-vault-resume-command', () => ({
+  buildAiVaultResumeStartupForWorktree: () => ({
+    command: 'codex resume thread-c',
+    env: { CODEX_HOME: '/accounts/a/home' },
+    providerSession: { key: 'session_id', id: 'thread-c' }
+  })
+}))
+
+import { runNativeChatCliSwitch } from './native-chat-cli-switch-run'
+
+const SWITCH = {
+  sessionId: 'chat-1',
+  workspaceId: 'wt-1',
+  executionHostId: 'local',
+  agent: 'codex' as const,
+  chatTabId: 'chat-tab'
+}
+const SOURCE = {
+  agent: 'codex',
+  sourceAgent: 'codex',
+  sessionId: 'thread-c',
+  filePath: '/accounts/a/home/sessions/rollout-thread-c.jsonl',
+  cwd: '/repo',
+  codexHome: '/accounts/a/home',
+  executionHostPlatform: 'darwin'
+}
+
+beforeEach(() => {
+  vi.clearAllMocks()
+  mocks.supported = true
+  mocks.call.mockResolvedValue({ source: SOURCE })
+})
+
+it('stops the chat on its host, opens the same-id resume in its slot, then closes the chat tab', async () => {
+  await runNativeChatCliSwitch(SWITCH)
+  expect(mocks.call).toHaveBeenCalledWith({ kind: 'local' }, 'agentSession.switchToTerminal', {
+    sessionId: 'chat-1'
+  })
+  expect(mocks.launch).toHaveBeenCalledWith(
+    expect.objectContaining({
+      agent: 'codex',
+      worktreeId: 'wt-1',
+      command: 'codex resume thread-c',
+      env: { CODEX_HOME: '/accounts/a/home' },
+      providerSession: { key: 'session_id', id: 'thread-c' },
+      afterTabId: 'chat-tab',
+      resumeOrigin: 'switch'
+    })
+  )
+  expect(mocks.closeUnifiedTab).toHaveBeenCalledWith('chat-tab')
+  expect(mocks.launch.mock.invocationCallOrder[0]).toBeLessThan(
+    mocks.closeUnifiedTab.mock.invocationCallOrder[0]!
+  )
+})
+
+it('never sends a switch to a host that does not advertise it', async () => {
+  mocks.supported = false
+  await runNativeChatCliSwitch(SWITCH)
+  expect(mocks.call).not.toHaveBeenCalled()
+  expect(mocks.launch).not.toHaveBeenCalled()
+  expect(mocks.closeUnifiedTab).not.toHaveBeenCalled()
+  expect(mocks.toast).toHaveBeenCalledOnce()
+})
+
+it('keeps the chat when the host refuses a busy chat, and says why', async () => {
+  mocks.call.mockRejectedValue({
+    data: {
+      refusal: { code: 'agent_session_operation_invalid', details: { reason: 'turnActive' } }
+    }
+  })
+  await runNativeChatCliSwitch(SWITCH)
+  expect(mocks.launch).not.toHaveBeenCalled()
+  expect(mocks.closeUnifiedTab).not.toHaveBeenCalled()
+  expect(mocks.toast).toHaveBeenCalledWith('Wait for the reply to finish or stop it, then switch.')
+})
diff --git a/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts b/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts
index 1b39afd447a8..694d60a403d1 100644
--- a/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts
+++ b/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts
@@ -442,13 +442,14 @@ describe('one pane of a terminal tab', () => {
   })
 
   it.each(Object.keys(exitedAgentRecords))(
-    'offers nothing once the agent exited and only a %s record remains, as the tab menu does',
+    'keeps the History move off once the agent exited and only a %s record remains',
     (kind) => {
       makeState()
       useAppStore.setState(exitedAgentRecords[kind])
       const exited = useAppStore.getState()
       expect(paneSubject(exited, claudePane)).toBeNull()
-      expect(paneGate(exited, claudePane)).toBe(false)
+      // The pane's switch to native chat stays offered after the agent exits: that is when it works.
+      expect(paneGate(exited, claudePane)).toBe(kind === 'retained')
       expect(
         resolveTabSessionHistorySubject(exited, { tab: { id: 'term-1', worktreeId: WORKTREE_ID } })
       ).toBeNull()
diff --git a/src/renderer/src/components/tab-bar/tab-title-tooltip.test.tsx b/src/renderer/src/components/tab-bar/tab-title-tooltip.test.tsx
index 273d45029724..e1228374f348 100644
--- a/src/renderer/src/components/tab-bar/tab-title-tooltip.test.tsx
+++ b/src/renderer/src/components/tab-bar/tab-title-tooltip.test.tsx
@@ -59,6 +59,17 @@ vi.mock('@/components/ui/tooltip', () => ({
   }
 }))
 
+// The tab card turns into a hover card when it carries the switch action; render it like the tooltip.
+vi.mock('@/components/ui/hover-card', async () => {
+  const tooltip = await import('@/components/ui/tooltip')
+  return {
+    HoverCard: tooltip.Tooltip,
+    HoverCardTrigger: tooltip.TooltipTrigger,
+    HoverCardContent: tooltip.TooltipContent
+  }
+})
+vi.mock('./TabSessionSwitchHoverAction', () => ({ TabSessionSwitchHoverAction: () => null }))
+
 vi.mock('@/components/ui/dropdown-menu', () => ({
   DropdownMenu: ({ children }: { children: ReactNode }) => <>{children}</>,
   DropdownMenuContent: () => null,
diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.test.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.test.tsx
index e7565c29928f..5b7ab7cc0f0f 100644
--- a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.test.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.test.tsx
@@ -18,7 +18,8 @@ const mocks = vi.hoisted(() => ({
   pending: false
 }))
 vi.mock('@/store', () => ({
-  useAppStore: (selector: (state: Record<string, unknown>) => unknown) => selector({})
+  useAppStore: (selector: (state: Record<string, unknown>) => unknown) =>
+    selector({ paneForegroundAgentByPaneKey: {}, agentStatusByPaneKey: {} })
 }))
 vi.mock('../tab-bar/cli-chat-resume-source', () => ({
   resolveCliChatResumeSource: (_state: unknown, args: unknown) => {
@@ -32,18 +33,18 @@ vi.mock('../tab-bar/cli-chat-resume-run', () => ({
 }))
 afterEach(cleanup)
 
-it('dispatches the exact pane with owner-opening intent and shares pending', () => {
+it('dispatches the exact pane and shares pending', () => {
   const { rerender } = render(
     <TooltipProvider>
       <TerminalPaneResumeInChatButton tabId="tab-1" worktreeId="wt-1" paneKey="tab-1:leaf" />
     </TooltipProvider>
   )
-  fireEvent.click(screen.getByRole('button', { name: 'Switch to Chat' }))
+  fireEvent.click(screen.getByRole('button', { name: 'Switch to native chat' }))
   expect(mocks.resolve).toHaveBeenCalledWith({
     tab: { id: 'tab-1', worktreeId: 'wt-1' },
     paneKey: 'tab-1:leaf'
   })
-  expect(mocks.run).toHaveBeenCalledWith(mocks.source, true)
+  expect(mocks.run).toHaveBeenCalledWith(mocks.source)
   mocks.pending = true
   rerender(
     <TooltipProvider>

From 5e785543afd25d31564336a87162188449be5f9b Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Tue, 20 Oct 2026 12:11:47 -0700
Subject: [PATCH 011/207] fix: keep existing terminal attachments observational

---
 ...rminal-create-host-session-binding.test.ts | 87 ++++++++++++++++++-
 .../terminal/launch/terminal-create.ts        | 13 ++-
 .../terminal/launch/terminal-launch-result.ts | 13 +++
 .../pty-connection/apply-reattach-payload.ts  | 10 ++-
 .../reattach-payload-context.test.ts          | 79 +++++++++++++++++
 ...ntime-pty-transport-create-handoff.test.ts | 76 +++++++++++++---
 .../remote-runtime-pty-transport.ts           |  4 +-
 7 files changed, 257 insertions(+), 25 deletions(-)

diff --git a/src/main/runtime/cli-terminal-create-host-session-binding.test.ts b/src/main/runtime/cli-terminal-create-host-session-binding.test.ts
index 9a87b49c1cae..afc41991b071 100644
--- a/src/main/runtime/cli-terminal-create-host-session-binding.test.ts
+++ b/src/main/runtime/cli-terminal-create-host-session-binding.test.ts
@@ -82,15 +82,66 @@ describe('host-initiated terminal creation under an attached window', () => {
   })
 })
 
-it.each(['refused', 'adopted', 'fresh-unavailable'] as const)(
+it.each(['refused', 'adopted', 'stable-adopted', 'ensure-adopted', 'fresh-unavailable'] as const)(
   'publishes the effective %s terminal rather than the requested saved recipe',
   async (kind) => {
     const { runtime, spawn } = createRuntimeWithAttachedWindow()
     const config = { agentCommand: 'codex', agentArgs: '', agentEnv: {} }
+    const adopted = kind === 'adopted' || kind === 'stable-adopted' || kind === 'ensure-adopted'
+    const ownerSurface = {
+      worktreeId: 'repo-1::/tmp/wt-cli',
+      terminalHandle: 'owner-handle',
+      tabId: 'owner-tab',
+      leafId: '11111111-1111-4111-8111-111111111111'
+    }
+    const coldRestore = { scrollback: 'checkpoint A', cwd: '/tmp/wt-cli', cols: 80, rows: 24 }
     spawn.mockResolvedValue({
       id: 'effective-pty',
-      ...(kind === 'adopted'
-        ? { isReattach: true, launchAgent: 'codex', launchConfig: config }
+      pid: 42,
+      incarnationId: 'physical-i1',
+      coldRestore,
+      snapshot: 'current image B',
+      snapshotCols: 80,
+      snapshotRows: 24,
+      snapshotSeq: 7,
+      providerSequence: { value: 7, generation: 'continued' },
+      attachedGrid: { cols: 80, rows: 24 },
+      isAlternateScreen: false,
+      replay: 'provider backlog',
+      shellReadyArmed: true,
+      openCodeCapabilities: { version: '2.0.16', pluginApi: 'v2', promptMode: 'prefill' },
+      ...(adopted
+        ? { launchAgent: 'codex', launchConfig: config, launchToken: 'owner-token' }
+        : {}),
+      ...(kind === 'adopted' ? { isReattach: true } : {}),
+      ...(kind === 'stable-adopted'
+        ? {
+            stablePaneOwner: {
+              handle: ownerSurface.terminalHandle,
+              tabId: ownerSurface.tabId,
+              leafId: ownerSurface.leafId
+            }
+          }
+        : {}),
+      ...(kind === 'ensure-adopted'
+        ? {
+            agentSessionEnsure: {
+              disposition: 'adopted',
+              owner: {
+                claim: {
+                  digestVersion: 1,
+                  keyId: 'key',
+                  identityDigest: 'C',
+                  worktreeScopeDigest: 'wt',
+                  agent: 'codex'
+                },
+                generation: 'owner-generation',
+                phase: 'live',
+                ptyId: 'effective-pty',
+                surface: ownerSurface
+              }
+            }
+          }
         : {}),
       ...(kind === 'refused'
         ? {
@@ -119,6 +170,36 @@ it.each(['refused', 'adopted', 'fresh-unavailable'] as const)(
       resumeProviderSession: { key: 'session_id', id: 'C' },
       launchConfig: { agentCommand: 'claude', agentArgs: '', agentEnv: {} }
     })
+    expect(result).toEqual({
+      handle: expect.any(String),
+      tabId: expect.any(String),
+      paneKey: expect.any(String),
+      ptyId: 'effective-pty',
+      worktreeId: 'repo-1::/tmp/wt-cli',
+      title: kind === 'fresh-unavailable' ? 'Rejected C' : null,
+      launchConfig: kind === 'refused' ? undefined : config,
+      launchAgent: kind === 'refused' ? undefined : 'codex',
+      launchToken: kind === 'refused' ? undefined : adopted ? 'owner-token' : 'actual-fresh-token',
+      executionHostId: 'local',
+      hostPlatform: process.platform,
+      incarnationId: 'physical-i1',
+      surface: 'background',
+      processId: 42,
+      ...(adopted ? { isReattach: true } : { coldRestore }),
+      ...(kind === 'ensure-adopted' ? { agentSessionDisposition: 'adopted' } : {}),
+      ...(!adopted ? { agentResumeUnavailable: true } : {}),
+      ...(kind === 'refused'
+        ? {
+            agentResumeRefused: 'chat-home',
+            savedResumeDecision: {
+              agent: 'claude',
+              providerSession: { key: 'session_id', id: 'C' },
+              verdict: 'chat-home'
+            }
+          }
+        : {}),
+      warning: expect.any(String)
+    })
     expect(result.agentResumeRefused).toBe(kind === 'refused' ? 'chat-home' : undefined)
     expect(result.launchAgent).toBe(kind === 'refused' ? undefined : 'codex')
     expect(result.launchConfig).toEqual(kind === 'refused' ? undefined : config)
diff --git a/src/main/runtime/terminal/launch/terminal-create.ts b/src/main/runtime/terminal/launch/terminal-create.ts
index 85b69952849b..3fa5abc02001 100644
--- a/src/main/runtime/terminal/launch/terminal-create.ts
+++ b/src/main/runtime/terminal/launch/terminal-create.ts
@@ -1,4 +1,8 @@
-import { recordTerminalLaunchMetadata, resolveTerminalLaunchResult } from './terminal-launch-result'
+import {
+  recordTerminalLaunchMetadata,
+  resolveTerminalLaunchResult,
+  terminalLaunchPublicFacts
+} from './terminal-launch-result'
 import { OrcaRuntimeWithTerminalCreateDeduplication } from './terminal-create-deduplication'
 import * as dependencies from '../../orca-runtime-create-terminal-dependencies'
 import { createDesktopTerminal } from '../../orca-runtime-create-terminal-desktop'
@@ -282,7 +286,7 @@ export abstract class OrcaRuntimeWithCreateTerminal extends OrcaRuntimeWithTermi
           warning = dependencies.createTerminalRevealWarning(handle)
         }
         return {
-          ...result,
+          ...terminalLaunchPublicFacts(result, launch.adoptedStablePane),
           handle,
           tabId,
           paneKey,
@@ -294,11 +298,6 @@ export abstract class OrcaRuntimeWithCreateTerminal extends OrcaRuntimeWithTermi
           launchToken: pty?.launchToken ?? undefined,
           ...this.getPtyExecutionHostMetadata(result.id),
           surface,
-          ...(result.pid ? { processId: result.pid } : {}),
-          ...(result.agentSessionEnsure
-            ? { agentSessionDisposition: result.agentSessionEnsure.disposition }
-            : {}),
-          ...(launch.adoptedStablePane ? { isReattach: true as const } : {}),
           ...(warning ? { warning } : {})
         }
       } finally {
diff --git a/src/main/runtime/terminal/launch/terminal-launch-result.ts b/src/main/runtime/terminal/launch/terminal-launch-result.ts
index 815330ec115c..4d33c732ee21 100644
--- a/src/main/runtime/terminal/launch/terminal-launch-result.ts
+++ b/src/main/runtime/terminal/launch/terminal-launch-result.ts
@@ -1,3 +1,4 @@
+import { terminalLaunchFacts } from '../../../../shared/agent-session-resume'
 import { admitStablePaneAdoption } from '../../runtime-terminal-pane-identity'
 import type { RuntimePtyController } from '../../runtime-pty-controller-contract'
 import type { TerminalCreateOptions } from '../../runtime-terminal-contracts'
@@ -64,3 +65,15 @@ export function recordTerminalLaunchMetadata(
     pty.launchAgent = launch.launchAgent ?? null
   }
 }
+
+export function terminalLaunchPublicFacts(result: TerminalSpawnResult, adoptedStablePane: boolean) {
+  return {
+    ...terminalLaunchFacts(result),
+    ...(!adoptedStablePane && result.coldRestore ? { coldRestore: result.coldRestore } : {}),
+    ...(result.pid ? { processId: result.pid } : {}),
+    ...(result.agentSessionEnsure
+      ? { agentSessionDisposition: result.agentSessionEnsure.disposition }
+      : {}),
+    ...(adoptedStablePane ? { isReattach: true as const } : {})
+  }
+}
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/apply-reattach-payload.ts b/src/renderer/src/components/terminal-pane/pty-connection/apply-reattach-payload.ts
index 49eb05fede87..860424376259 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/apply-reattach-payload.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/apply-reattach-payload.ts
@@ -267,10 +267,12 @@ export function createReattachPayloadHandlers(
       session.writeReplayData(
         `${RESET_GRAPHIC_RENDITION}${ctx.connectResult.coldRestore.scrollback}`
       )
-      // Why not rebuilt when refused: main started a plain shell instead of that plan.
+      // An existing owner permits history replay, not another saved continuation.
       let resumeUnavailable = Boolean(ctx.connectResult.agentResumeUnavailable)
       let preparedStartup =
-        ctx.connectResult.agentResumeRefused || resumeUnavailable
+        ctx.connectResult.isReattach === true ||
+        ctx.connectResult.agentResumeRefused ||
+        resumeUnavailable
           ? null
           : (ctx.coldRestoreStartup ?? session.buildColdRestoreAgentResumeStartup())
       if (preparedStartup && !ctx.coldRestoreStartup) {
@@ -285,7 +287,9 @@ export function createReattachPayloadHandlers(
           preparedStartup = null
         }
       }
-      const didPrepareResume = session.applyColdRestoreAgentResumeStartup(preparedStartup)
+      const didPrepareResume =
+        ctx.connectResult.isReattach !== true &&
+        session.applyColdRestoreAgentResumeStartup(preparedStartup)
       if (resumeUnavailable) {
         // Why: main dropped the resume argv, so this pane is a NEW session —
         // the plain restored banner would claim the old one came back.
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/reattach-payload-context.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/reattach-payload-context.test.ts
index 19647f404c59..1fc03ede1bd2 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/reattach-payload-context.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/reattach-payload-context.test.ts
@@ -1,4 +1,5 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { useAppStore } from '@/store'
 import { createPane } from '../pty-connection-test-pane-fixtures'
 import {
   installTerminalTestGlobals,
@@ -163,3 +164,81 @@ it.each(['missing', 'different', 'admitted'] as const)(
     }
   }
 )
+
+it.each(['missing', 'admitted', 'prepared'] as const)(
+  'observes a cached cold owner without consuming an uncorrelated newer recipe (%s)',
+  async (kind) => {
+    await installTerminalTestGlobals()
+    const record = {
+      paneKey: 'tab:leaf',
+      worktreeId: 'wt',
+      agent: 'codex' as const,
+      providerSession: { key: 'session_id' as const, id: 'C' },
+      state: 'done' as const,
+      prompt: '',
+      capturedAt: 20,
+      updatedAt: 20
+    }
+    const previousRecords = useAppStore.getState().sleepingAgentSessionsByPaneKey
+    useAppStore.setState({ sleepingAgentSessionsByPaneKey: { [record.paneKey]: record } })
+    try {
+      const startup: ColdRestoreAgentResumeStartup = {
+        command: 'codex resume C',
+        agent: 'codex',
+        resumeOrigin: 'saved',
+        resumeProviderSession: record.providerSession,
+        launchConfig: { agentCommand: 'codex', agentArgs: '', agentEnv: {} },
+        launchToken: 'replacement-token',
+        useLiveEntry: false,
+        hasSleepingRecord: true,
+        sleepingRecordEntry: { paneKey: record.paneKey, record }
+      }
+      const session = createSession({
+        cacheKey: record.paneKey,
+        buildColdRestoreAgentResumeStartup: vi.fn(() => startup),
+        applyColdRestoreAgentResumeStartup: vi.fn(() => true),
+        cancelSavedResumeStartup: vi.fn(),
+        schedulePendingStartupCommandDelivery: vi.fn(),
+        clearSleepingRecordAfterColdRestoreSpawn: vi.fn(),
+        showSessionRestoredBanner: vi.fn(),
+        consumeRestoredViewportBlankingMarker: vi.fn(),
+        writeFreshShellViewportBlanking: vi.fn()
+      })
+      const context: ReattachPayloadContext = {
+        ...createContext('', 1),
+        connectResult: {
+          id: 'pty-1',
+          isReattach: true,
+          coldRestore: { scrollback: 'cached history', cwd: '/workspace' },
+          ...(kind === 'admitted'
+            ? {
+                savedResumeDecision: {
+                  agent: 'codex',
+                  providerSession: record.providerSession,
+                  verdict: 'admitted'
+                }
+              }
+            : {})
+        },
+        coldRestoreStartup: kind === 'prepared' ? startup : null
+      }
+      await createReattachPayloadHandlers(session, context).applyReattachPayload()
+      expect(session.writeReplayData).toHaveBeenCalledWith(
+        expect.stringContaining('cached history')
+      )
+      expect(window.api.pty.ackColdRestore).toHaveBeenCalledWith('pty-1')
+      expect(context.reattachPayloadApplied).toBe(true)
+      expect(session.buildColdRestoreAgentResumeStartup).not.toHaveBeenCalled()
+      expect(session.applyColdRestoreAgentResumeStartup).not.toHaveBeenCalled()
+      expect(session.cancelSavedResumeStartup).not.toHaveBeenCalled()
+      expect(session.schedulePendingStartupCommandDelivery).not.toHaveBeenCalled()
+      expect(session.clearSleepingRecordAfterColdRestoreSpawn).not.toHaveBeenCalled()
+      expect(session.showSessionRestoredBanner).not.toHaveBeenCalled()
+      expect(useAppStore.getState().sleepingAgentSessionsByPaneKey[record.paneKey]).toBe(record)
+      expect(window.api.pty.write).not.toHaveBeenCalled()
+    } finally {
+      useAppStore.setState({ sleepingAgentSessionsByPaneKey: previousRecords })
+      await restoreTerminalTestGlobals()
+    }
+  }
+)
diff --git a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-create-handoff.test.ts b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-create-handoff.test.ts
index b512254b5ee9..2fe8fc0daf27 100644
--- a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-create-handoff.test.ts
+++ b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-create-handoff.test.ts
@@ -7,17 +7,23 @@ import {
 let subscriptionCallbacks: MultiplexSubscriptionCallbacks = null
 let resolvedPaneHandle = 'terminal-1'
 
-const { runtimeCall, refreshSessionTabsSnapshot, resetRemoteRuntimeTransport } =
-  createRemoteRuntimeTransportMocks({
-    getCallbacks: () => subscriptionCallbacks,
-    setCallbacks: (callbacks) => {
-      subscriptionCallbacks = callbacks
-    },
-    getResolvedPaneHandle: () => resolvedPaneHandle,
-    setResolvedPaneHandle: (handle) => {
-      resolvedPaneHandle = handle
-    }
-  })
+const {
+  runtimeCall,
+  refreshSessionTabsSnapshot,
+  resetRemoteRuntimeTransport,
+  latestSubscribePayload,
+  emitSnapshot,
+  inputFrameTexts
+} = createRemoteRuntimeTransportMocks({
+  getCallbacks: () => subscriptionCallbacks,
+  setCallbacks: (callbacks) => {
+    subscriptionCallbacks = callbacks
+  },
+  getResolvedPaneHandle: () => resolvedPaneHandle,
+  setResolvedPaneHandle: (handle) => {
+    resolvedPaneHandle = handle
+  }
+})
 
 describe('createRemoteRuntimePtyTransport', () => {
   it.each([
@@ -498,4 +504,52 @@ describe('createRemoteRuntimePtyTransport', () => {
       expect.objectContaining({ method: 'terminal.createAgentSession' })
     )
   })
+  it.each(['existing', 'fresh', 'legacy'] as const)(
+    'uses subscription image for an existing intermediate-host owner and keeps fresh cold data (%s)',
+    async (kind) => {
+      const coldRestore = { scrollback: 'old checkpoint A', cwd: '/workspace' }
+      runtimeCall.mockImplementation(async (args: { method: string }) => ({
+        ok: true,
+        result:
+          args.method === 'terminal.create'
+            ? {
+                terminal: {
+                  handle: 'terminal-1',
+                  ...(kind === 'existing' ? { isReattach: true, incarnationId: 'i1' } : {}),
+                  ...(kind !== 'legacy' ? { coldRestore } : {})
+                }
+              }
+            : {}
+      }))
+      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
+      const transport = createRemoteRuntimePtyTransport('env-1', {
+        worktreeId: 'wt-1',
+        tabId: 'tab-1',
+        leafId: 'pane:1'
+      })
+      const onReplayData = vi.fn()
+      const onConnect = vi.fn()
+      const result = await transport.connect({ url: '', callbacks: { onReplayData, onConnect } })
+      try {
+        expect(runtimeCall).toHaveBeenCalledWith(
+          expect.objectContaining({ method: 'terminal.create' })
+        )
+        expect(result?.coldRestore).toEqual(kind === 'fresh' ? coldRestore : undefined)
+        expect(result?.isReattach).toBe(kind === 'existing' ? true : undefined)
+        expect(result?.replay).toBe('')
+        const { streamId } = latestSubscribePayload()
+        emitSnapshot(streamId, 'actual owner image B')
+        expect(onReplayData.mock.calls).toEqual([
+          ['actual owner image B', { carriesNormalBuffer: true }]
+        ])
+        expect(onConnect).toHaveBeenCalled()
+        expect(inputFrameTexts()).toEqual([])
+        expect(runtimeCall).not.toHaveBeenCalledWith(
+          expect.objectContaining({ method: 'terminal.resolvePane' })
+        )
+      } finally {
+        transport.destroy?.()
+      }
+    }
+  )
 })
diff --git a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport.ts b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport.ts
index 8fdfd760e6e4..ce9a4a0a6c9d 100644
--- a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport.ts
+++ b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport.ts
@@ -3347,7 +3347,9 @@ export function createRemoteRuntimePtyTransport(
 
       return {
         ...terminalLaunchFacts(createdTerminal),
-        ...(createdTerminal.coldRestore ? { coldRestore: createdTerminal.coldRestore } : {}),
+        ...(createdTerminal.isReattach !== true && createdTerminal.coldRestore
+          ? { coldRestore: createdTerminal.coldRestore }
+          : {}),
         id: remotePtyId,
         replay: '',
         ...(authoritativePtyIncarnationId ? { incarnationId: authoritativePtyIncarnationId } : {}),

From a7d59ce1f200c5ff7af1717c9cded79dda4d6995 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Tue, 20 Oct 2026 12:24:43 -0700
Subject: [PATCH 012/207] feat(native-chat): start the existing chat when a
 Codex terminal switches back to it

Switching a terminal's conversation into the chat that already holds it now
starts that chat's agent on its host (agentSession.switchToChat), so the
provider open catches up on the terminal's turns before the user sends. The
host uses the ordinary operation start and answers success only when that
same child is ready; an ended child's typed failure, such as the conversation
still open elsewhere, is the answer. The renderer sends it only to hosts that
advertise the switch, retires the terminal pane only after the start succeeded
and the chat's tab is really active, and keeps the terminal on any refusal.
---
 .../structured-agent-session-failure-text.ts  |  2 +-
 ...structured-agent-session-host-mutations.ts |  4 +-
 .../structured-agent-session-host.ts          |  5 +-
 ...structured-agent-session-switch-to-chat.ts | 98 +++++++++++++++++++
 ...nt-session-terminal-writer-acquire.test.ts | 39 +++++++-
 ...ession-gate-classification.test-fixture.ts |  1 +
 ...structured-agent-session-switch-to-chat.ts | 46 +++++++++
 .../methods/structured-agent-session.test.ts  |  2 +-
 .../rpc/methods/structured-agent-session.ts   |  4 +-
 .../tab-bar/cli-chat-resume-feedback.ts       | 81 ++++++++++++---
 .../tab-bar/cli-chat-resume-run.test.ts       | 56 ++++++++---
 .../components/tab-bar/cli-chat-resume-run.ts |  7 +-
 .../activate-ai-vault-structured-session.ts   | 22 +++--
 .../rpc-params-catalog.generated.ts           |  1 +
 14 files changed, 325 insertions(+), 43 deletions(-)
 create mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-switch-to-chat.ts
 create mode 100644 src/main/runtime/rpc/methods/structured-agent-session-switch-to-chat.ts

diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-failure-text.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-failure-text.ts
index bdcac83f0ecb..91ef3c8c3e35 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-failure-text.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-failure-text.ts
@@ -44,7 +44,7 @@ const TYPED_START_REFUSALS = [
 ] as const satisfies readonly (AgentSessionFailureKind &
   AgentSessionRefusalReason<'agent_session_operation_invalid'>)[]
 
-function typedStartRefusal(
+export function typedStartRefusal(
   reason: string | undefined
 ): (typeof TYPED_START_REFUSALS)[number] | undefined {
   return TYPED_START_REFUSALS.find((typed) => typed === reason)
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 a324b34b7421..fbd08f045910 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
@@ -7,6 +7,7 @@
 // admitted without the writer lease; the delivery loop starts the provider child a send needs, and
 // an operation only the provider can perform starts it before admission.
 
+import { startStructuredAgentSessionForSwitch } from './structured-agent-session-switch-to-chat'
 import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types'
 import type {
   AgentSessionCancelResult,
@@ -282,6 +283,7 @@ export function structuredAgentSessionMutationDelegates(
       settleStructuredAgentSessionLateDispatch(context(), input),
     releaseUnansweredDispatches: (
       input: Parameters<typeof releaseStructuredAgentSessionUnansweredDispatches>[1]
-    ) => releaseStructuredAgentSessionUnansweredDispatches(context(), input)
+    ) => releaseStructuredAgentSessionUnansweredDispatches(context(), input),
+    switchToChat: (sessionId: string) => startStructuredAgentSessionForSwitch(context(), sessionId)
   }
 }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
index ea282faeba2a..475c69acfcc2 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
@@ -212,8 +212,7 @@ export class StructuredAgentSessionHost {
    *  `user-close` makes a turn it cuts short the user's cancellation; an `evict` leaves it news. */
   close: StructuredAgentSessionConversationLifetime['close'] = (sessionId, cause) =>
     this.lifetime.close(sessionId, cause)
-  switchToTerminal: StructuredAgentSessionConversationLifetime['switchToTerminal'] = (id, admit) =>
-    this.lifetime.switchToTerminal(id, admit)
+  switchToTerminal = <T>(id: string, admit: () => T) => this.lifetime.switchToTerminal(id, admit)
 
   /** One bounded host-owned snapshot; a tab need not be visible for its child to be stopped. */
   sleepWorkspace = (workspaceId: string): Promise<{ stoppedSessionIds: string[] }> =>
@@ -319,6 +318,8 @@ export class StructuredAgentSessionHost {
   setOption = this.mutations.setOption
   changeThreadGoal = this.mutations.changeThreadGoal
   readOptions = this.mutations.readOptions
+  /** A terminal's conversation moves into this chat: its agent starts and is ready, or why not. */
+  switchToChat = this.mutations.switchToChat
 
   rewind = (caller: HostTypes.StructuredAgentSessionCaller, params: AgentSessionRewindParams) =>
     rewindStructuredAgentSession(this.mutationContext(), this.attachContext(), caller, params)
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-to-chat.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-to-chat.ts
new file mode 100644
index 000000000000..810cc60b66f9
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-to-chat.ts
@@ -0,0 +1,98 @@
+// A terminal handing its conversation to the chat that already holds it: the chat's agent starts
+// through the one operation start (its provider open imports the terminal's turns), and only that
+// same child reaching ready is success. Its ended child's typed failure is the click's refusal.
+
+import {
+  agentSessionRefusalFromReference,
+  refuse,
+  refuseUnclassified
+} from '../../../shared/agent-session-wire-refusals'
+import type { AgentSessionWireRefusal } from '../../../shared/agent-session-wire'
+import type { StructuredAgentSessionMutationContext } from './structured-agent-session-mutation-context'
+import type { StructuredAgentSessionProviderChildIdentity } from './structured-agent-session-host-types'
+import {
+  operationDidNotRun,
+  selectStructuredAgentSessionOperationChild
+} from './structured-agent-session-operation-child'
+import { sameProviderChild } from './structured-agent-session-provider-child'
+import { structuredAgentSessionEndedChildFailure } from './structured-agent-session-ended-child-failure'
+import {
+  structuredAgentSessionStartFailure,
+  structuredAgentSessionStartFailureFact,
+  typedStartRefusal
+} from './structured-agent-session-failure-text'
+import { structuredAgentSessionFailureWordsContext } from './structured-agent-session-send-preparation'
+import { STRUCTURED_AGENT_SESSION_START_WAIT_MS } from './structured-agent-session-send-settlement'
+
+export type StructuredAgentSessionSwitchToChatOutcome =
+  | { ok: true }
+  | { ok: false; refusal: AgentSessionWireRefusal }
+
+export async function startStructuredAgentSessionForSwitch(
+  context: StructuredAgentSessionMutationContext,
+  sessionId: string
+): Promise<StructuredAgentSessionSwitchToChatOutcome> {
+  const selected = await context.serialize(sessionId, async () => {
+    if (!(await context.openConversation(sessionId))) {
+      return operationDidNotRun()
+    }
+    const selection = selectStructuredAgentSessionOperationChild(context, sessionId)
+    return selection.ok && !selection.child
+      ? { ...selection, start: context.claimAgent(sessionId) }
+      : { ...selection, start: null }
+  })
+  if (!selected.ok) {
+    return { ok: false, refusal: selected.refusal }
+  }
+  let { child, readiness } = selected
+  if (!child) {
+    const started = await (selected.start?.outcome ?? operationDidNotRun())
+    if (!started.ok) {
+      return { ok: false, refusal: started.refusal }
+    }
+    const selection = selectStructuredAgentSessionOperationChild(context, sessionId)
+    if (!selection.ok || !selection.child) {
+      return selection.ok ? operationDidNotRun() : selection
+    }
+    ;({ child, readiness } = selection)
+  }
+  const outcome = (await readiness?.wait(STRUCTURED_AGENT_SESSION_START_WAIT_MS)) ?? 'ready'
+  const awaited = child
+  return context.serialize(sessionId, async () =>
+    switchStartVerdict(context, sessionId, awaited, outcome)
+  )
+}
+
+/** Under the queue: the awaited child itself is ready, or its own end says why it is not. */
+function switchStartVerdict(
+  context: StructuredAgentSessionMutationContext,
+  sessionId: string,
+  awaited: StructuredAgentSessionProviderChildIdentity,
+  outcome: 'ready' | 'ended' | 'timeout'
+): StructuredAgentSessionSwitchToChatOutcome {
+  const session = context.sessions.get(sessionId)
+  const child = session?.child
+  if (outcome === 'ready' && child?.phase === 'ready' && !child.close) {
+    return sameProviderChild(child, awaited) ? { ok: true } : operationDidNotRun()
+  }
+  const ended = session?.lastEndedChild
+  const failure =
+    ended && sameProviderChild(ended, awaited)
+      ? structuredAgentSessionEndedChildFailure(ended)
+      : null
+  if (!failure) {
+    return operationDidNotRun(outcome === 'timeout')
+  }
+  const fact = structuredAgentSessionStartFailureFact(failure)
+  const { reason } = structuredAgentSessionStartFailure(
+    failure,
+    structuredAgentSessionFailureWordsContext(context.deps.store.getRecord(sessionId))
+  )
+  const typed = typedStartRefusal(fact.kind)
+  const refusal: AgentSessionWireRefusal = typed
+    ? refuse('agent_session_operation_invalid', { reason: typed }, reason)
+    : fact.refusal
+      ? agentSessionRefusalFromReference(fact.refusal, reason)
+      : refuseUnclassified('agent_session_owner_restart_failed', reason)
+  return { ok: false, refusal }
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts
index 3431d6cd44d5..7c7b9654cdae 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts
@@ -9,7 +9,10 @@ import { codexProviderHandle } from '../../../shared/agent-session-provider-hand
 import type { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
 import { openTestAgentSessionRecordStore } from '../../runtime/agent-session-record-store-test-harness'
 import { openTestJournalHostDatabase } from '../agent-session-journal/journal-host-database-test-support'
-import type { StructuredAgentSessionAdapter } from './structured-agent-session-adapter'
+import {
+  AgentSessionAcquisitionRefusal,
+  type StructuredAgentSessionAdapter
+} from './structured-agent-session-adapter'
 import { NO_STRUCTURED_AGENTS } from './structured-agent-session-adapter-router-test-support'
 import { StructuredAgentSessionHost } from './structured-agent-session-host'
 import {
@@ -39,6 +42,9 @@ const acquire = vi.fn<StructuredAgentSessionAdapter['acquire']>(async ({ fence,
     observedAt: NOW
   }
 }))
+const open = vi.fn<StructuredAgentSessionAdapter['open']>(async () => ({
+  reportedOptions: { model: '' }
+}))
 const assertNoTerminalWriter = vi.fn(async () => {
   if (terminalWriting) {
     throw agentSessionRefusalError('agent_session_conflict', {
@@ -52,6 +58,7 @@ beforeEach(async () => {
   resetHostTestOperationIds()
   terminalWriting = false
   acquire.mockClear()
+  open.mockClear()
   assertNoTerminalWriter.mockClear()
   store = await openTestAgentSessionRecordStore(root)
   host = new StructuredAgentSessionHost({
@@ -69,7 +76,7 @@ beforeEach(async () => {
       cancelTurn: vi.fn(async () => ({ cancelled: false })),
       answerPrompt: vi.fn(async () => undefined),
       setOption: vi.fn(async () => undefined),
-      open: async () => ({ reportedOptions: { model: '' } })
+      open
     },
     journalDatabase: openTestJournalHostDatabase(root),
     claimKeyId: 'key-1',
@@ -180,3 +187,31 @@ it('refuses a switch while the chat is starting, without aborting that start', a
   expect(signal?.aborted).toBe(false)
   release()
 })
+
+// Terminal to chat: the chat's agent starts with no send, and only its ready provider is success.
+it('starts the chat that holds the conversation for a switch from its terminal', async () => {
+  await host.close(SESSION, 'evict')
+  terminalWriting = true
+  const spawnsBefore = acquire.mock.calls.length
+  expect(await host.switchToChat(SESSION)).toMatchObject({
+    ok: false,
+    refusal: { details: { reason: 'conversationOpenInTerminal' } }
+  })
+  expect(acquire.mock.calls.length).toBe(spawnsBefore)
+
+  terminalWriting = false
+  open.mockRejectedValueOnce(
+    new AgentSessionAcquisitionRefusal('thread has an active writer', 'conversationOpenElsewhere')
+  )
+  expect(await host.switchToChat(SESSION)).toMatchObject({
+    ok: false,
+    refusal: {
+      code: 'agent_session_operation_invalid',
+      details: { reason: 'conversationOpenElsewhere' }
+    }
+  })
+
+  expect(await host.switchToChat(SESSION)).toEqual({ ok: true })
+  expect(host.collaboratorsForTests().sessions.get(SESSION)?.child?.phase).toBe('ready')
+  expect(vi.mocked(host.deps.adapter.dispatch)).not.toHaveBeenCalled()
+})
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-gate-classification.test-fixture.ts b/src/main/runtime/rpc/methods/structured-agent-session-gate-classification.test-fixture.ts
index 9410bc5b055d..a26c75601743 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-gate-classification.test-fixture.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-gate-classification.test-fixture.ts
@@ -99,5 +99,6 @@ export const WORK_METHODS = [
   { method: 'agentSession.hold', params: { sessionId: SESSION, holderId: 'surface-1' } },
   { method: 'agentSession.reveal', params: { sessionId: SESSION } },
   { method: 'agentSession.switchToTerminal', params: { sessionId: SESSION } },
+  { method: 'agentSession.switchToChat', params: { sessionId: SESSION } },
   { method: 'agentSession.subscribeStatus', params: null }
 ] as const
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-to-chat.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-to-chat.ts
new file mode 100644
index 000000000000..0e7623b6efec
--- /dev/null
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-to-chat.ts
@@ -0,0 +1,46 @@
+// `agentSession.switchToChat` — a terminal's conversation moving into the chat that already holds
+// it. The host resolves the record and starts its agent through the ordinary operation start, so the
+// provider open imports the terminal's turns; success is that agent ready. A refusal leaves the
+// terminal to the client. Gated per agent by `agent-session.structured.switch.v1:<agent>`.
+
+import { inPlaceSwitchEnabled } from '../../../../shared/structured-agent-cli-conversation-adoption'
+import { refuse } from '../../../../shared/agent-session-wire-refusals'
+import type { AgentSessionWireRefusal } from '../../../../shared/agent-session-wire'
+import { defineMethod } from '../core'
+import {
+  ensureStructuredHostInstalled,
+  requireStructuredCapability,
+  requireStructuredSessionHost
+} from './structured-agent-session-gate'
+import { OptionsParams } from './structured-agent-session-schemas'
+
+export const STRUCTURED_AGENT_SESSION_SWITCH_TO_CHAT_METHODS = [
+  defineMethod({
+    name: 'agentSession.switchToChat',
+    permission: 'workspace',
+    params: OptionsParams,
+    handler: async (
+      params,
+      ctx
+    ): Promise<
+      { ok: true; sessionId: string } | { ok: false; refusal: AgentSessionWireRefusal }
+    > => {
+      requireStructuredCapability(ctx)
+      await ensureStructuredHostInstalled(ctx)
+      const host = requireStructuredSessionHost(ctx, params.sessionId)
+      const record = host.deps.store.getRecord(params.sessionId)
+      if (!record || !inPlaceSwitchEnabled(record.provider)) {
+        return {
+          ok: false,
+          refusal: refuse(
+            'structured_agent_session_unsupported',
+            { reason: 'hostUnsupported' },
+            'This chat cannot take its conversation from a terminal on this host.'
+          )
+        }
+      }
+      const started = await host.switchToChat(params.sessionId)
+      return started.ok ? { ok: true, sessionId: params.sessionId } : started
+    }
+  })
+]
diff --git a/src/main/runtime/rpc/methods/structured-agent-session.test.ts b/src/main/runtime/rpc/methods/structured-agent-session.test.ts
index f3b88b73c03f..fdfebaef3857 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session.test.ts
@@ -175,7 +175,7 @@ describe('capability gating', () => {
     }
     // Bump deliberately: the whole agentSession.* surface is behind the structured capability,
     // so an additive method is invisible to old clients and needs no protocol bump.
-    expect(STRUCTURED_AGENT_SESSION_METHODS).toHaveLength(39)
+    expect(STRUCTURED_AGENT_SESSION_METHODS).toHaveLength(40)
   })
 
   it('hides the surface from a declared client that did not advertise it', async () => {
diff --git a/src/main/runtime/rpc/methods/structured-agent-session.ts b/src/main/runtime/rpc/methods/structured-agent-session.ts
index 516c0bfad40b..676087ea7d9d 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session.ts
@@ -53,6 +53,7 @@ import { STRUCTURED_AGENT_SESSION_THREAD_GOAL_METHODS } from './structured-agent
 import { STRUCTURED_AGENT_SESSION_CONVERSATION_OUTLINE_METHODS } from './structured-agent-session-conversation-outline'
 import { STRUCTURED_AGENT_SESSION_OPTIONS_READ_METHODS } from './structured-agent-session-options-read'
 import { STRUCTURED_AGENT_SESSION_SWITCH_TO_TERMINAL_METHODS } from './structured-agent-session-switch-to-terminal'
+import { STRUCTURED_AGENT_SESSION_SWITCH_TO_CHAT_METHODS } from './structured-agent-session-switch-to-chat'
 import {
   AttachParams,
   CancelParams,
@@ -301,5 +302,6 @@ export const STRUCTURED_AGENT_SESSION_METHODS = [
   ...STRUCTURED_AGENT_SESSION_CONVERSATION_OUTLINE_METHODS,
   ...STRUCTURED_AGENT_SESSION_CURRENT_REQUESTS_METHODS,
   ...STRUCTURED_AGENT_SESSION_OPTIONS_READ_METHODS,
-  ...STRUCTURED_AGENT_SESSION_SWITCH_TO_TERMINAL_METHODS
+  ...STRUCTURED_AGENT_SESSION_SWITCH_TO_TERMINAL_METHODS,
+  ...STRUCTURED_AGENT_SESSION_SWITCH_TO_CHAT_METHODS
 ]
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
index 15ef7c47435f..b37bc2f40333 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
@@ -1,41 +1,91 @@
 import { toast } from 'sonner'
 import { translate } from '@/i18n/i18n'
 import { structuredLaunchFailure } from '@/lib/structured-agent-session-launch-failure'
-import { activateAiVaultStructuredSession } from '@/lib/activate-ai-vault-structured-session'
+import {
+  activateAiVaultStructuredSession,
+  activateAiVaultStructuredSessionVerified
+} from '@/lib/activate-ai-vault-structured-session'
+import {
+  callStructuredAgentSession,
+  supportsInPlaceSwitch
+} from '@/runtime/structured-agent-session-client'
 import { agentSessionWriteFailureText } from '../native-chat/agent-session-write-notice-text'
 import { agentLabel } from '../../../../shared/ai-vault-session-filters'
+import type { AgentSessionWireRefusal } from '../../../../shared/agent-session-wire'
+import type { AiVaultSession } from '../../../../shared/ai-vault-types'
 import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import { cliConversationExitGuidance } from '@/lib/cli-conversation-exit-guidance'
 import type { CliChatResumeSource } from './cli-chat-resume-source'
 
-/** True when the chat that already holds the conversation was revealed instead: the switch's
- *  writer check passed before the host named that chat. */
+/** True only when the chat already holding the conversation took it over: the host started its
+ *  agent (catching up on the terminal's turns) and its tab is active. Otherwise the terminal stays. */
 export async function reportCliChatResumeFailure(
   source: CliChatResumeSource,
   error: unknown,
   target: RuntimeClientTarget
 ): Promise<boolean> {
+  const owner = structuredLaunchFailure(error)?.owner
+  if (owner) {
+    return switchIntoOwner(source, owner, target)
+  }
+  toastCliChatResumeFailure(source, error)
+  return false
+}
+
+async function switchIntoOwner(
+  source: CliChatResumeSource,
+  structuredSession: NonNullable<AiVaultSession['structuredSession']>,
+  target: RuntimeClientTarget
+): Promise<boolean> {
+  // A host without the switch keeps the earlier behaviour: the chat is shown, the terminal stays.
+  if (!(await supportsInPlaceSwitch(target, source.agent))) {
+    await activateAiVaultStructuredSession({ structuredSession }, undefined, target)
+    return false
+  }
+  const switched = await callStructuredAgentSession<
+    { ok: true } | { ok: false; refusal: AgentSessionWireRefusal }
+  >(target, 'agentSession.switchToChat', { sessionId: structuredSession.sessionId }).catch(
+    () => null
+  )
+  if (!switched?.ok) {
+    const failure = switched
+      ? structuredLaunchFailure(Object.assign(new Error(switched.refusal.message), switched))
+      : undefined
+    // Never the owner shortcut again: a refused start keeps the terminal and says why.
+    toast.error(
+      failure?.code === 'agent_session_operation_invalid' &&
+        failure.details?.reason === 'conversationOpenInTerminal'
+        ? cliConversationExitGuidance(source.agent, true)
+        : agentSessionWriteFailureText(failure ?? { kind: 'unconfirmed' }, 'read-history', {
+            agentName: agentLabel(source.agent)
+          })
+    )
+    return false
+  }
+  const shown = await activateAiVaultStructuredSessionVerified(
+    { structuredSession },
+    undefined,
+    target
+  )
+  return shown === 'activated'
+}
+
+function toastCliChatResumeFailure(source: CliChatResumeSource, error: unknown): void {
   const refusal = structuredLaunchFailure(error)
   if (
     refusal?.code === 'agent_session_conflict' ||
     refusal?.code === 'agent_session_ownership_unknown'
   ) {
-    const owner = refusal.owner
-    if (owner) {
-      await activateAiVaultStructuredSession({ structuredSession: owner }, undefined, target)
-      return true
-    }
     toast.error(
       refusal.code === 'agent_session_conflict' &&
-        refusal.details?.reason === 'conversationHeldElsewhere' &&
-        !owner
+        refusal.details?.reason === 'conversationHeldElsewhere'
         ? cliConversationExitGuidance(source.agent, true)
         : translate(
             'auto.components.right.sidebar.AiVaultPanel.resumeInChatConflict',
             'Another chat is already holding this conversation.'
           )
     )
-    return false
+    return
   }
   // The chat's agent refused to start while the terminal may still write the conversation.
   if (
@@ -43,11 +93,11 @@ export async function reportCliChatResumeFailure(
     refusal.details?.reason === 'conversationOpenInTerminal'
   ) {
     toast.error(cliConversationExitGuidance(source.agent, true))
-    return false
+    return
   }
   if (refusal?.details?.reason === 'conversationMovingToTerminal') {
     toast.error(agentSessionWriteFailureText(refusal, 'read-history'))
-    return false
+    return
   }
   if (refusal?.code === 'agent_session_identity_required') {
     if (refusal.details?.reason === 'transcriptNotFound') {
@@ -58,12 +108,12 @@ export async function reportCliChatResumeFailure(
           { agent: agentLabel(source.agent) }
         )
       )
-      return false
+      return
     }
     const failure = structuredLaunchFailure(error)
     if (failure) {
       toast.error(agentSessionWriteFailureText(failure, 'read-history'))
-      return false
+      return
     }
   }
   toast.error(
@@ -72,5 +122,4 @@ export async function reportCliChatResumeFailure(
       'Could not resume this session in a new chat.'
     )
   )
-  return false
 }
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
index ae760b4b2e97..0e8df40006d9 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
@@ -12,13 +12,16 @@ const mocks = vi.hoisted(() => {
     createCapability: vi.fn(),
     call: vi.fn(),
     toast: vi.fn(),
-    activate: vi.fn(async () => true)
+    activate: vi.fn(async () => true),
+    activateVerified: vi.fn(async () => 'activated'),
+    switchCapability: vi.fn(async () => false)
   }
 })
 vi.mock('./cli-chat-resume-source', () => ({ resolveCliChatResumeSource: () => mocks.source }))
 vi.mock('@/runtime/structured-agent-session-client', () => ({
   supportsStructuredAgentSessionCliSource: mocks.sourceCapability,
   supportsStructuredAgentSessionCreateMessage: mocks.createCapability,
+  supportsInPlaceSwitch: mocks.switchCapability,
   callStructuredAgentSession: (...args: unknown[]) =>
     args[1] === 'agentSession.createSupport'
       ? Promise.resolve({ supported: true })
@@ -34,7 +37,8 @@ vi.mock('@/lib/structured-agent-session-create-hydration', () => ({
 }))
 vi.mock('sonner', () => ({ toast: { error: mocks.toast } }))
 vi.mock('@/lib/activate-ai-vault-structured-session', () => ({
-  activateAiVaultStructuredSession: mocks.activate
+  activateAiVaultStructuredSession: mocks.activate,
+  activateAiVaultStructuredSessionVerified: mocks.activateVerified
 }))
 
 import { adoptAgentSessionLaunchVerdict } from '@/lib/agent-session-launch-plan'
@@ -237,27 +241,57 @@ describe('CLI identity resume through the existing launch owner', () => {
     expect([...structuredLaunchStates()]).toEqual([])
   })
 
-  it('reveals the chat that already holds the conversation in place and closes the terminal pane', async () => {
+  it('starts the chat that holds the conversation before the terminal closes; a refusal keeps it', async () => {
     const owner = { sessionId: 'owner-chat', workspaceId: 'owner-workspace' }
-    mocks.call.mockResolvedValue({
+    let switched: unknown = {
       ok: false,
       refusal: {
-        code: 'agent_session_conflict',
-        message: 'owner',
-        details: { reason: 'conversationHeldElsewhere', owner },
-        createAttemptRefusedBeforeCommit: true
+        code: 'agent_session_operation_invalid',
+        message: 'x',
+        details: { reason: 'conversationOpenElsewhere' }
       }
-    })
+    }
+    mocks.call.mockImplementation(async (_target, method) =>
+      method === 'agentSession.switchToChat'
+        ? switched
+        : {
+            ok: false,
+            refusal: {
+              code: 'agent_session_conflict',
+              message: 'owner',
+              details: { reason: 'conversationHeldElsewhere', owner },
+              createAttemptRefusedBeforeCommit: true
+            }
+          }
+    )
     const leafId = '11111111-1111-4111-8111-111111111111'
     mocks.source = { ...SOURCE, paneKey: `tab-1:${leafId}` }
     const closed = vi.fn()
     window.addEventListener('orca-close-terminal-pane', closed)
+    // A host without the switch only shows the chat; it never receives the switch.
     await runCliChatResume(mocks.source)
-    window.removeEventListener('orca-close-terminal-pane', closed)
-    expect(mocks.toast).not.toHaveBeenCalled()
     expect(mocks.activate).toHaveBeenCalledWith({ structuredSession: owner }, undefined, {
       kind: 'local'
     })
+    mocks.switchCapability.mockResolvedValue(true)
+    await runCliChatResume(mocks.source)
+    expect(mocks.toast).toHaveBeenCalledOnce()
+    expect(mocks.activateVerified).not.toHaveBeenCalled()
+    expect(closed).not.toHaveBeenCalled()
+
+    switched = { ok: true, sessionId: 'owner-chat' }
+    await runCliChatResume(mocks.source)
+    window.removeEventListener('orca-close-terminal-pane', closed)
+    const switches = mocks.call.mock.calls.filter(
+      ([, method]) => method === 'agentSession.switchToChat'
+    )
+    expect(switches).toEqual([
+      [{ kind: 'local' }, 'agentSession.switchToChat', { sessionId: 'owner-chat' }],
+      [{ kind: 'local' }, 'agentSession.switchToChat', { sessionId: 'owner-chat' }]
+    ])
+    expect(mocks.activateVerified).toHaveBeenCalledWith({ structuredSession: owner }, undefined, {
+      kind: 'local'
+    })
     expect(closed).toHaveBeenCalledOnce()
     expect(closed.mock.calls[0]?.[0].detail).toEqual({ tabId: 'tab-1', leafId })
     expect(tabs()).toEqual([])
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
index 032e45367f5c..5b02ef8065c0 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
@@ -169,8 +169,11 @@ export async function runCliChatResume(source: CliChatResumeSource): Promise<voi
       retireSwitchedTerminalPane(source)
     }
   } catch (error) {
-    if (pending.get(key) === controller) {
-      await reportCliChatResumeFailure(source, error, target)
+    if (
+      pending.get(key) === controller &&
+      (await reportCliChatResumeFailure(source, error, target))
+    ) {
+      retireSwitchedTerminalPane(source)
     }
   } finally {
     clearTimeout(timer)
diff --git a/src/renderer/src/lib/activate-ai-vault-structured-session.ts b/src/renderer/src/lib/activate-ai-vault-structured-session.ts
index 29013528a19a..1f4ed96e05f7 100644
--- a/src/renderer/src/lib/activate-ai-vault-structured-session.ts
+++ b/src/renderer/src/lib/activate-ai-vault-structured-session.ts
@@ -95,9 +95,19 @@ export async function activateAiVaultStructuredSession(
   deps: StructuredSessionActivationDeps = defaultDeps,
   target?: RuntimeClientTarget
 ): Promise<boolean> {
+  return (await activateAiVaultStructuredSessionVerified(session, deps, target)) !== 'none'
+}
+
+/** `activated` only when the chat's tab is really active; `reported` means the click's toast said why
+ *  not, which a caller retiring something on success must not read as success. */
+export async function activateAiVaultStructuredSessionVerified(
+  session: Pick<AiVaultSession, 'structuredSession'>,
+  deps: StructuredSessionActivationDeps = defaultDeps,
+  target?: RuntimeClientTarget
+): Promise<'activated' | 'reported' | 'none'> {
   const structured = session.structuredSession
   if (!structured) {
-    return false
+    return 'none'
   }
   // Why: the click can chain a refresh, a capability probe, a reveal and a second refresh, each
   // with its own timeout, and nothing on the row says it is working. Without this, an impatient
@@ -125,13 +135,13 @@ export async function activateAiVaultStructuredSession(
   }
 }
 
-const activationsInFlight = new Map<string, Promise<boolean>>()
+const activationsInFlight = new Map<string, Promise<'activated' | 'reported'>>()
 
 async function activateStructuredSession(
   structured: NonNullable<AiVaultSession['structuredSession']>,
   deps: StructuredSessionActivationDeps,
   host?: RuntimeClientTarget
-): Promise<boolean> {
+): Promise<'activated' | 'reported'> {
   const target = {
     worktreeId: structured.workspaceId,
     sessionId: structured.sessionId,
@@ -155,19 +165,19 @@ async function activateStructuredSession(
           // Unreachable: we never got an answer, so this is the one case waiting can still fix.
           deps.unavailable()
         }
-        return true
+        return 'reported'
       }
       await refreshedWithoutThrowing(deps, structured.workspaceId, host)
       if (!deps.activate(target)) {
         deps.unavailable()
-        return true
+        return 'reported'
       }
     }
   }
   if (useAppStore.getState().activeWorktreeId !== structured.workspaceId) {
     activateAndRevealWorktree(structured.workspaceId)
   }
-  return true
+  return 'activated'
 }
 
 /** The inventory refresh is advisory at every call site here, so its failure is a `false`, never a
diff --git a/src/shared/rpc-contract/rpc-params-catalog.generated.ts b/src/shared/rpc-contract/rpc-params-catalog.generated.ts
index 618cb2c55e9f..c42f0c739aa1 100644
--- a/src/shared/rpc-contract/rpc-params-catalog.generated.ts
+++ b/src/shared/rpc-contract/rpc-params-catalog.generated.ts
@@ -719,6 +719,7 @@ export const RPC_PARAMS_BY_METHOD = {
   'agentSession.subscribeAvailability': AvailabilityParams,
   'agentSession.subscribeStatus': null,
   'agentSession.subscribeTurnCompletions': SubscribeTurnCompletionsParams,
+  'agentSession.switchToChat': OptionsParams,
   'agentSession.switchToTerminal': OptionsParams,
   'agentSession.threadGoal': ThreadGoalParams,
   'agentSession.unsubscribe': UnsubscribeParams,

From 84175b1cb59582771fce1c19b28675eaafbb15e1 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Tue, 20 Oct 2026 12:50:49 -0700
Subject: [PATCH 013/207] fix(native-chat): tie each switch claim to the spawn
 attempt that took it

A switch claim is now owned by the terminal spawn attempt that accepted it
(its host session id, else its pane). Only one attempt may hold a
conversation: a different attempt is refused while one is accepted or a
switched terminal may still hold it, and a retry of the same attempt joins
it. Settlement follows the spawn's real result, including a reattach; a
spawn that ended without a reply keeps its claim until the host's own
session list proves that session absent, so a lost reply can no longer let
a chat start beside the terminal.

Also from review: a paired Orca server that switches the agent in place now
offers the switch back from its terminals, and the paired create names its
new tab so the switch back is offered before the first prompt; the
presentation seed binds to the switched pane's leaf and PTY and ends when
that PTY is replaced or the pane goes, so a split's plain shell is never
switched or closed; and an unreadable Windows process identity reads as
unverifiable, with only a fresh process table's absence or a different
start time proving exit.
---
 .../pty/host-env/resume-spawn-judgement.ts    | 31 +++++---
 .../pty/host-env/saved-resume-admission.ts    | 39 ++++++----
 src/main/ipc/pty/ipc/spawn-execute.ts         |  7 +-
 src/main/ipc/pty/ipc/spawn-run.ts             |  7 +-
 src/main/ipc/pty/ipc/spawn-state.ts           |  2 +
 src/main/ipc/pty/runtime/spawn-execute.ts     |  7 +-
 src/main/ipc/pty/runtime/spawn-state.ts       |  2 +
 src/main/ipc/pty/runtime/spawn.ts             |  7 +-
 .../structured-session-cli-writer-host.ts     |  2 +
 .../structured-session-switch-claims.test.ts  | 75 +++++++++++++++----
 .../structured-session-switch-claims.ts       | 65 +++++++++++++---
 ...uctured-session-switch-observation.test.ts | 35 +++++++++
 .../structured-session-switch-observation.ts  | 14 +++-
 .../tab-bar/cli-chat-resume-source.ts         | 19 +++--
 .../native-chat-cli-switch-run.test.ts        | 29 ++++++-
 .../tab-bar/native-chat-cli-switch-run.ts     |  6 +-
 .../tab-bar/switched-terminal-conversation.ts | 24 +++++-
 .../tab-session-history-switch.test.ts        | 30 +++++++-
 .../tab-bar/tab-session-history-switch.ts     |  7 +-
 .../use-terminal-pane-projection.ts           |  2 +-
 .../src/lib/launch-ai-vault-session.ts        |  2 +-
 .../src/runtime/web-runtime-session-types.ts  |  4 +-
 .../runtime/web-runtime-terminal-creation.ts  |  6 +-
 23 files changed, 338 insertions(+), 84 deletions(-)
 create mode 100644 src/main/runtime/session-tabs/structured-session-switch-observation.test.ts

diff --git a/src/main/ipc/pty/host-env/resume-spawn-judgement.ts b/src/main/ipc/pty/host-env/resume-spawn-judgement.ts
index 31cd3075a894..0046f85bde3f 100644
--- a/src/main/ipc/pty/host-env/resume-spawn-judgement.ts
+++ b/src/main/ipc/pty/host-env/resume-spawn-judgement.ts
@@ -10,7 +10,10 @@ import type {
   RefusedPaneResume
 } from '../../../../shared/agent-status-types'
 import type { AgentSessionRecordStore } from '../../../runtime/agent-session-record-store'
-import type { SwitchClaim } from '../../../runtime/session-tabs/structured-session-switch-claims'
+import type {
+  SwitchClaim,
+  SwitchSpawnOutcome
+} from '../../../runtime/session-tabs/structured-session-switch-claims'
 import {
   agentSessionLeasePossiblyWriting,
   listStructuredProviderSessionOwnership
@@ -39,8 +42,13 @@ export type AdmissionRuntime = {
     paneKey: string
   ): Promise<SleepingAgentSessionRecord | undefined>
   openAgentSessionRecordStore(): Promise<AgentSessionRecordStore>
-  acceptSwitchStart?(agent: string, id: string): SwitchClaim
-  settleSwitchStart?(claim: SwitchClaim, ptyId: string | null): void
+  acceptSwitchStart?(
+    agent: string,
+    id: string,
+    attempt: string,
+    sessionId?: string
+  ): SwitchClaim | null
+  settleSwitchAttempt?(attempt: string, outcome: SwitchSpawnOutcome): void
 }
 
 /** `chat-home`: an automatic restore of a conversation an open chat continues; `chat-writing`:
@@ -56,8 +64,6 @@ export type ResumeSpawnAdmission =
       verdict: 'admitted'
       refused: RefusedPaneResume
       sourceRecord?: SleepingAgentSessionRecord
-      /** The switch claim this spawn settles: bound to its PTY, or dropped when none started. */
-      switchClaim?: SwitchClaim
     }
   | ResumeSpawnRefusal
 
@@ -114,7 +120,8 @@ export async function judgeResumes(
 export async function admitSwitchResumeSpawn(
   runtime: AdmissionRuntime | undefined,
   args: ResumeSpawnArgs,
-  wslDistro: string | null
+  wslDistro: string | null,
+  spawn?: { attempt?: string; sessionId?: string }
 ): Promise<ResumeSpawnAdmission> {
   const providerSession = normalizeAgentProviderSession(args.resumeProviderSession)
   const agent = args.launchAgent
@@ -122,15 +129,17 @@ export async function admitSwitchResumeSpawn(
     throw new Error('switch_start_missing_conversation')
   }
   const refused = { agent, providerSession }
-  if (args.connectionId || wslDistro !== null || !runtime?.acceptSwitchStart) {
+  const attempt = spawn?.attempt
+  if (args.connectionId || wslDistro !== null || !runtime?.acceptSwitchStart || !attempt) {
     return { verdict: 'unverifiable', refused }
   }
   // Before any await: a chat start whose census ends after this point sees the claim.
-  const switchClaim = runtime.acceptSwitchStart(agent, providerSession.id)
+  if (!runtime.acceptSwitchStart(agent, providerSession.id, attempt, spawn.sessionId)) {
+    return { verdict: 'chat-writing', refused }
+  }
   const admission = await judgeResumes(runtime, [refused], true)
   if (admission.verdict !== 'admitted') {
-    runtime.settleSwitchStart?.(switchClaim, null)
-    return admission
+    runtime.settleSwitchAttempt?.(attempt, 'not-started')
   }
-  return { ...admission, switchClaim }
+  return admission
 }
diff --git a/src/main/ipc/pty/host-env/saved-resume-admission.ts b/src/main/ipc/pty/host-env/saved-resume-admission.ts
index ddb73a900854..b4f09a31fd06 100644
--- a/src/main/ipc/pty/host-env/saved-resume-admission.ts
+++ b/src/main/ipc/pty/host-env/saved-resume-admission.ts
@@ -7,6 +7,7 @@ import type { AgentStatusIpcPayload } from '../../../../shared/agent-status-type
 import { agentHookServer } from '../../../agent-hooks/server'
 import { LOCAL_EXECUTION_HOST_ID, type ExecutionHostId } from '../../../../shared/execution-host'
 import type { WorkspaceSessionState } from '../../../../shared/workspace-session-state-types'
+import type { SwitchSpawnOutcome } from '../../../runtime/session-tabs/structured-session-switch-claims'
 import {
   admitSwitchResumeSpawn,
   judgeResumes,
@@ -26,10 +27,11 @@ export type {
 export async function admitResumeSpawn(
   runtime: AdmissionRuntime | undefined,
   args: ResumeSpawnArgs,
-  wslDistro: string | null
+  wslDistro: string | null,
+  spawn?: { attempt?: string; sessionId?: string }
 ): Promise<ResumeSpawnAdmission | null> {
   if (args.resumeOrigin === 'switch') {
-    return admitSwitchResumeSpawn(runtime, args, wslDistro)
+    return admitSwitchResumeSpawn(runtime, args, wslDistro, spawn)
   }
   const providerSession = normalizeAgentProviderSession(args.resumeProviderSession)
   const agent = args.launchAgent
@@ -105,14 +107,14 @@ export function dropAgentLaunch(args: ResumeSpawnArgs): void {
   delete args.resumeProviderSession
 }
 
-/** Every exit of a switch spawn settles its claim: on the PTY it produced, or gone with none. */
+/** Every exit of a switch spawn settles its attempt's claim; `admitSwitchResumeSpawn` explains how. */
 export function settleSwitchSpawn(
   runtime: AdmissionRuntime | undefined,
-  admission: ResumeSpawnAdmission | null,
-  ptyId: string | null
+  attempt: string | undefined,
+  outcome: SwitchSpawnOutcome
 ): void {
-  if (admission?.verdict === 'admitted' && admission.switchClaim) {
-    runtime?.settleSwitchStart?.(admission.switchClaim, ptyId)
+  if (attempt) {
+    runtime?.settleSwitchAttempt?.(attempt, outcome)
   }
 }
 
@@ -159,16 +161,27 @@ export function savedResumeRecord(
     : undefined
 }
 
-/** Runs only in the fresh branch, after stable/claimed owner adoption has settled. */
+/** Runs only in the fresh branch, after stable/claimed owner adoption has settled. A switch's claim
+ *  is owned by this spawn attempt: its host session id, else its pane. */
 export async function chooseSavedResumeFreshLaunch(
-  runtime: AdmissionRuntime | undefined,
+  spawn: {
+    deps: { runtime?: AdmissionRuntime }
+    expectedWslDistro: string | null
+    spawnOptions: ResumeSpawnArgs & { startupCommandDelivery?: unknown; startupIngress?: unknown }
+    effectiveSessionAppId: string | undefined
+    switchAttempt?: string
+  },
   args: ResumeSpawnArgs,
-  wslDistro: string | null,
-  options: ResumeSpawnArgs & { startupCommandDelivery?: unknown; startupIngress?: unknown }
+  paneKey: string | null
 ): Promise<ResumeSpawnAdmission | null> {
-  const admission = await admitResumeSpawn(runtime, args, wslDistro)
+  const sessionId = spawn.effectiveSessionAppId
+  spawn.switchAttempt = sessionId ?? paneKey ?? undefined
+  const admission = await admitResumeSpawn(spawn.deps.runtime, args, spawn.expectedWslDistro, {
+    attempt: spawn.switchAttempt,
+    sessionId
+  })
   if (resumeSpawnRefusal(admission)) {
-    suppressSavedResumeLaunch(args, options)
+    suppressSavedResumeLaunch(args, spawn.spawnOptions)
   }
   return admission
 }
diff --git a/src/main/ipc/pty/ipc/spawn-execute.ts b/src/main/ipc/pty/ipc/spawn-execute.ts
index 7832ee122ac7..bf621daf495f 100644
--- a/src/main/ipc/pty/ipc/spawn-execute.ts
+++ b/src/main/ipc/pty/ipc/spawn-execute.ts
@@ -34,12 +34,7 @@ export async function executePtyIpcSpawn(ctx: PtyIpcSpawnState): Promise<void> {
   const chooseFresh = async (): Promise<void> => {
     ctx.spawnOptions.env = { ...ctx.spawnOptions.env }
     args.launchConfig = ctx.effectiveLaunchConfig
-    ctx.resumeAdmission = await chooseSavedResumeFreshLaunch(
-      ctx.deps.runtime,
-      args,
-      ctx.expectedWslDistro,
-      ctx.spawnOptions
-    )
+    ctx.resumeAdmission = await chooseSavedResumeFreshLaunch(ctx, args, ctx.stablePaneKey)
     if (captured && ctx.resumeAdmission) {
       ctx.resumeAdmission.refused = captured.refused
       ctx.resumeAdmission.sourceRecord = captured.sourceRecord
diff --git a/src/main/ipc/pty/ipc/spawn-run.ts b/src/main/ipc/pty/ipc/spawn-run.ts
index 9e5eda9b3dc5..de66664d88b5 100644
--- a/src/main/ipc/pty/ipc/spawn-run.ts
+++ b/src/main/ipc/pty/ipc/spawn-run.ts
@@ -126,10 +126,13 @@ export async function runPtyIpcSpawn(deps: PtySpawnIpcDeps, args: PtySpawnIpcArg
     if (!ctx.result.isReattach) {
       deps.runtime?.rememberSavedTerminalLaunchResult?.(committed.id, committed)
     }
-    settleSwitchSpawn(deps.runtime, ctx.resumeAdmission, committed.id)
+    settleSwitchSpawn(deps.runtime, ctx.switchAttempt, { ptyId: committed.id })
     return committed
   } catch (caught) {
-    settleSwitchSpawn(deps.runtime, ctx.resumeAdmission, ctx.result.id)
+    settleSwitchSpawn(deps.runtime, ctx.switchAttempt, {
+      // A daemon session may exist even with no reply; an in-process spawn that returned none made none.
+      unknown: ctx.result.id || ctx.effectiveSessionAppId
+    })
     const err = endPaneAgentLaunch(ctx, { error: caught }) ?? caught
     releaseAbandonedAgentTeamsLeader(ctx)
     if (ctx.preSpawnHiddenMarkId !== null) {
diff --git a/src/main/ipc/pty/ipc/spawn-state.ts b/src/main/ipc/pty/ipc/spawn-state.ts
index e7c82b057d19..1b7238cba217 100644
--- a/src/main/ipc/pty/ipc/spawn-state.ts
+++ b/src/main/ipc/pty/ipc/spawn-state.ts
@@ -59,6 +59,8 @@ export type PtyIpcSpawnState = {
   isMintedSessionId: boolean
   effectiveSessionId: string | undefined
   effectiveSessionAppId: string | undefined
+  /** A switch spawn's claim identity, kept apart from the admission a reattach clears. */
+  switchAttempt?: string
   expectedWslDistro: string | null
   baseEnv: Record<string, string> | undefined
   effectiveLaunchConfig: SleepingAgentLaunchConfig | undefined
diff --git a/src/main/ipc/pty/runtime/spawn-execute.ts b/src/main/ipc/pty/runtime/spawn-execute.ts
index 64133237fc54..89d32f016fdc 100644
--- a/src/main/ipc/pty/runtime/spawn-execute.ts
+++ b/src/main/ipc/pty/runtime/spawn-execute.ts
@@ -45,12 +45,7 @@ export async function executeRuntimePtySpawn(ctx: RuntimePtySpawnState): Promise
   }
   const chooseFresh = async (): Promise<void> => {
     ctx.spawnOptions.env = { ...ctx.spawnOptions.env }
-    ctx.resumeAdmission = await chooseSavedResumeFreshLaunch(
-      ctx.deps.runtime,
-      args,
-      ctx.expectedWslDistro,
-      ctx.spawnOptions
-    )
+    ctx.resumeAdmission = await chooseSavedResumeFreshLaunch(ctx, args, ctx.spawnIdentityPaneKey)
     if (captured && ctx.resumeAdmission) {
       ctx.resumeAdmission.refused = captured.refused
       ctx.resumeAdmission.sourceRecord = captured.sourceRecord
diff --git a/src/main/ipc/pty/runtime/spawn-state.ts b/src/main/ipc/pty/runtime/spawn-state.ts
index 5ca761ba57ab..9473741d3a1a 100644
--- a/src/main/ipc/pty/runtime/spawn-state.ts
+++ b/src/main/ipc/pty/runtime/spawn-state.ts
@@ -44,6 +44,8 @@ export type RuntimePtySpawnState = {
   requestedSessionId: string | undefined
   sessionId: string | undefined
   effectiveSessionAppId: string | undefined
+  /** A switch spawn's claim identity, kept apart from the admission a reattach clears. */
+  switchAttempt?: string
   isNewDaemonSession: boolean
   expectedWslDistro: string | null
   /** The host's verdict on the spawn's resume; a refused one starts the pane's plain shell. */
diff --git a/src/main/ipc/pty/runtime/spawn.ts b/src/main/ipc/pty/runtime/spawn.ts
index fc49c3e8fcee..90e82e81ea0a 100644
--- a/src/main/ipc/pty/runtime/spawn.ts
+++ b/src/main/ipc/pty/runtime/spawn.ts
@@ -133,10 +133,13 @@ export async function spawnPtyFromRuntimeController(
     if (!ctx.result.isReattach) {
       deps.runtime?.rememberSavedTerminalLaunchResult?.(committed.id, committed)
     }
-    settleSwitchSpawn(deps.runtime, ctx.resumeAdmission, committed.id)
+    settleSwitchSpawn(deps.runtime, ctx.switchAttempt, { ptyId: committed.id })
     return committed
   } catch (err) {
-    settleSwitchSpawn(deps.runtime, ctx.resumeAdmission, ctx.result.id)
+    settleSwitchSpawn(deps.runtime, ctx.switchAttempt, {
+      // A daemon session may exist even with no reply; an in-process spawn that returned none made none.
+      unknown: ctx.result.id || ctx.effectiveSessionAppId
+    })
     releaseRuntimeSpawnPreSpawnHiddenMark(ctx)
     if (ctx.pendingRegistrationPtyId) {
       deps.runtime?.cancelPendingPtyRegistration?.(
diff --git a/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts b/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts
index 59553952fcb1..8b8a8be6c98a 100644
--- a/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts
+++ b/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts
@@ -132,6 +132,7 @@ export abstract class OrcaRuntimeWithStructuredSessionCliWriterHost extends Orca
     providerSessionId: string,
     source?: { workspaceId: string; paneKey: string }
   ): Promise<void> {
+    await this.reconcileSwitchAttempts()
     this.assertNoPendingSwitch(agent, providerSessionId)
     await this.assertSwitchStartsEnded(agent, providerSessionId)
     await assertCliConversationWritersExited(
@@ -182,6 +183,7 @@ export abstract class OrcaRuntimeWithStructuredSessionCliWriterHost extends Orca
   }
 
   async releaseEndedSwitchStarts(agent: string, id: string): Promise<void> {
+    await this.reconcileSwitchAttempts()
     await this.assertSwitchStartsEnded(agent, id).catch(() => undefined)
   }
 
diff --git a/src/main/runtime/session-tabs/structured-session-switch-claims.test.ts b/src/main/runtime/session-tabs/structured-session-switch-claims.test.ts
index 8a1f195a65a4..03586a60123c 100644
--- a/src/main/runtime/session-tabs/structured-session-switch-claims.test.ts
+++ b/src/main/runtime/session-tabs/structured-session-switch-claims.test.ts
@@ -19,6 +19,7 @@ vi.mock('./structured-session-switch-observation', () => ({
 }))
 
 const C = 'thread-c'
+const SPAWN = { attempt: 'pane-1' }
 const LEAF = '11111111-1111-4111-8111-111111111111'
 const AGENT = { pid: 999_991, platform: process.platform, startTime: 'started' } as const
 let runtime: OrcaRuntimeService
@@ -64,15 +65,15 @@ describe('the switch claim', () => {
     expect(await reason(chatStart())).toBe('admitted')
 
     runtime.registerSwitchClaim('codex', C)
-    runtime.acceptSwitchStart('codex', C)
+    runtime.acceptSwitchStart('codex', C, 'pty-1', 'pty-1')
     // A spawn slower than the window keeps refusing until it settles.
     vi.advanceTimersByTime(120_000)
     expect(await reason(chatStart())).toBe('conversationMovingToTerminal')
   })
 
   it('binds to the switch terminal, ignores identity-only replays, and ends on a proven exit', async () => {
-    const claim = runtime.acceptSwitchStart('codex', C)
-    runtime.settleSwitchStart(claim, 'pty-1')
+    runtime.acceptSwitchStart('codex', C, 'pty-1', 'pty-1')
+    runtime.settleSwitchAttempt('pty-1', { ptyId: 'pty-1' })
     expect(await reason(chatStart())).toBe('conversationHeldElsewhere')
     // The launch identity names the conversation without proving a start or an exit.
     hook()
@@ -87,12 +88,58 @@ describe('the switch claim', () => {
   })
 
   it('refuses a second switch of the conversation while the first terminal may hold it', () => {
-    const first = runtime.acceptSwitchStart('codex', C)
-    runtime.settleSwitchStart(first, 'pty-1')
+    runtime.acceptSwitchStart('codex', C, 'pty-1', 'pty-1')
+    runtime.settleSwitchAttempt('pty-1', { ptyId: 'pty-1' })
     expect(() => runtime.registerSwitchClaim('codex', C)).toThrow('agent_session_conflict')
   })
 })
 
+describe('a switch spawn attempt owns its claim', () => {
+  const accept = (attempt: string) => runtime.acceptSwitchStart('codex', C, attempt, attempt)
+
+  it('binds a reattach result to its PTY, and that pane exiting releases the conversation', async () => {
+    expect(accept('pty-1')).not.toBeNull()
+    runtime.settleSwitchAttempt('pty-1', { ptyId: 'pty-1' })
+    expect(await reason(chatStart())).toBe('conversationHeldElsewhere')
+    await runtime.onPtyExit('pty-1', 0, 'i1')
+    expect(await reason(chatStart())).toBe('admitted')
+  })
+
+  it('keeps a lost spawn reply until the host proves its session absent', async () => {
+    let listed: { id: string }[] | Error = [{ id: 'lost' }]
+    runtime.setPtyController({
+      listProcesses: async () => {
+        if (listed instanceof Error) {
+          throw listed
+        }
+        return listed
+      }
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: reconciliation reads only listProcesses.
+    } as never)
+    accept('lost')
+    runtime.settleSwitchAttempt('lost', { unknown: 'lost' })
+    expect(await reason(chatStart())).toBe('conversationMovingToTerminal')
+    listed = new Error('host unreachable')
+    expect(await reason(chatStart())).toBe('conversationMovingToTerminal')
+    listed = []
+    expect(await reason(chatStart())).toBe('admitted')
+  })
+
+  it('refuses a delayed second client before and after the first binds; a retry joins', () => {
+    runtime.registerSwitchClaim('codex', C)
+    const b = accept('pty-b')
+    expect(accept('pty-a')).toBeNull()
+    expect(accept('pty-b')).toBe(b)
+    runtime.registerPty('pty-b', 'wt-1', null, {
+      tabId: 'tab-2',
+      leafId: LEAF,
+      incarnationId: 'i2'
+    })
+    runtime.settleSwitchAttempt('pty-b', { ptyId: 'pty-b' })
+    expect(accept('pty-a')).toBeNull()
+  })
+})
+
 describe('a switch spawn', () => {
   const args = {
     launchAgent: 'codex' as const,
@@ -102,7 +149,7 @@ describe('a switch spawn', () => {
   const admission = (writing: boolean) =>
     ({
       acceptSwitchStart: vi.fn(() => ({ agent: 'codex', id: C, at: 0, accepted: true })),
-      settleSwitchStart: vi.fn(),
+      settleSwitchAttempt: vi.fn(),
       // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: a switch spawn reads only the store's records and tab index.
       openAgentSessionRecordStore: vi.fn(
         async () =>
@@ -115,29 +162,29 @@ describe('a switch spawn', () => {
 
   it('claims before reading the chat, and a writing chat refuses it into a plain shell', async () => {
     const quiet = admission(false)
-    expect(await admitSwitchResumeSpawn(quiet, args, null)).toMatchObject({
-      verdict: 'admitted',
-      switchClaim: { id: C }
+    expect(await admitSwitchResumeSpawn(quiet, args, null, SPAWN)).toMatchObject({
+      verdict: 'admitted'
     })
+    expect(quiet.acceptSwitchStart).toHaveBeenCalledWith('codex', C, 'pane-1', undefined)
     const writing = admission(true)
-    const refused = admitSwitchResumeSpawn(writing, args, null)
+    const refused = admitSwitchResumeSpawn(writing, args, null, SPAWN)
     expect(writing.acceptSwitchStart.mock.invocationCallOrder[0]).toBeLessThan(
       writing.openAgentSessionRecordStore.mock.invocationCallOrder[0]!
     )
     expect(await refused).toMatchObject({ verdict: 'chat-writing' })
-    expect(writing.settleSwitchStart).toHaveBeenCalledWith(expect.anything(), null)
+    expect(writing.settleSwitchAttempt).toHaveBeenCalledWith('pane-1', 'not-started')
   })
 
   it('refuses where it cannot judge the pane, and a switch without its conversation', async () => {
     const quiet = admission(false)
     expect(
-      await admitSwitchResumeSpawn(quiet, { ...args, connectionId: 'ssh' }, null)
+      await admitSwitchResumeSpawn(quiet, { ...args, connectionId: 'ssh' }, null, SPAWN)
     ).toMatchObject({ verdict: 'unverifiable' })
-    expect(await admitSwitchResumeSpawn(quiet, args, 'Ubuntu')).toMatchObject({
+    expect(await admitSwitchResumeSpawn(quiet, args, 'Ubuntu', SPAWN)).toMatchObject({
       verdict: 'unverifiable'
     })
     await expect(
-      admitSwitchResumeSpawn(quiet, { ...args, resumeProviderSession: undefined }, null)
+      admitSwitchResumeSpawn(quiet, { ...args, resumeProviderSession: undefined }, null, SPAWN)
     ).rejects.toThrow('switch_start_missing_conversation')
   })
 })
diff --git a/src/main/runtime/session-tabs/structured-session-switch-claims.ts b/src/main/runtime/session-tabs/structured-session-switch-claims.ts
index db9de61926f5..42bac3577ff0 100644
--- a/src/main/runtime/session-tabs/structured-session-switch-claims.ts
+++ b/src/main/runtime/session-tabs/structured-session-switch-claims.ts
@@ -19,8 +19,16 @@ export type SwitchClaim = {
   at: number
   /** A spawn took it: it never lapses, and settles only with that spawn. */
   accepted: boolean
+  /** The accepting spawn's identity (its host session, else its pane); only it joins or settles. */
+  attempt?: string
+  /** The host session to reconcile when the spawn ended without a result. */
+  sessionId?: string
+  unsettled?: true
 }
 
+/** A switch spawn's end: its PTY, a proved non-start, or a session the host may still hold. */
+export type SwitchSpawnOutcome = { ptyId: string } | 'not-started' | { unknown: string | undefined }
+
 /** The switch's start bound to the execution it spawned. */
 export type SwitchStartProof = {
   incarnationId: PtyIncarnationId
@@ -87,23 +95,59 @@ export abstract class OrcaRuntimeWithStructuredSessionSwitchClaims extends OrcaR
     this.switchClaims.delete(claim)
   }
 
-  /** Synchronous, before the switch spawn's first await, so a chat start censusing after it refuses. */
-  acceptSwitchStart(agent: string, id: string): SwitchClaim {
-    const claim = this.liveSwitchClaim(agent, id) ?? { agent, id, at: Date.now(), accepted: false }
-    claim.accepted = true
+  /** Synchronous, before the switch spawn's first await, so a chat start censusing after it refuses.
+   *  Null refuses: another attempt took this conversation, or a switched terminal may hold it. */
+  acceptSwitchStart(
+    agent: string,
+    id: string,
+    attempt: string,
+    sessionId: string | undefined
+  ): SwitchClaim | null {
+    const live = this.liveSwitchClaim(agent, id)
+    if (live?.accepted ? live.attempt !== attempt : !live && this.boundSwitchStarts(agent, id)[0]) {
+      return null
+    }
+    const claim = live ?? { agent, id, at: Date.now(), accepted: true }
+    Object.assign(claim, { accepted: true, attempt, sessionId: sessionId ?? claim.sessionId })
+    delete claim.unsettled
     this.switchClaims.add(claim)
     return claim
   }
 
-  /** Ends this attempt's claim: bound to the execution its spawn produced, or gone when none exists. */
-  settleSwitchStart(claim: SwitchClaim, ptyId: string | null): void {
-    if (!this.switchClaims.delete(claim)) {
-      return
+  /** Only a PTY binds and only a proved non-start drops; an unknown end waits for the host. */
+  settleSwitchAttempt(attempt: string, outcome: SwitchSpawnOutcome): void {
+    const claim = [...this.switchClaims].find((c) => c.accepted && c.attempt === attempt)
+    const sessionId =
+      outcome === 'not-started' ? undefined : 'ptyId' in outcome ? outcome.ptyId : outcome.unknown
+    if (claim && !sessionId) {
+      this.switchClaims.delete(claim)
+    } else if (claim) {
+      Object.assign(claim, { sessionId, unsettled: true })
+      this.bindSwitchStart(claim)
     }
-    const pty = ptyId ? this.ptysById.get(ptyId) : undefined
-    if (!pty?.incarnationId) {
+  }
+
+  /** Unsettled attempts against the host's own session list; a failed read keeps them. */
+  protected async reconcileSwitchAttempts(): Promise<void> {
+    const open = [...this.switchClaims].filter((c) => c.unsettled && !this.bindSwitchStart(c))
+    if (open.length === 0) {
       return
     }
+    const listed = await this.ptyController
+      ?.listProcesses?.(LOCAL_EXECUTION_HOST_ID)
+      .catch(() => null)
+    for (const claim of open) {
+      if (listed && !this.bindSwitchStart(claim) && !listed.some((p) => p.id === claim.sessionId)) {
+        this.switchClaims.delete(claim)
+      }
+    }
+  }
+
+  private bindSwitchStart(claim: SwitchClaim): boolean {
+    const pty = claim.sessionId ? this.ptysById.get(claim.sessionId) : undefined
+    if (!pty?.incarnationId || !this.switchClaims.delete(claim)) {
+      return false
+    }
     const key = `${claim.agent}\0${claim.id}`
     const reported =
       pty.cliConversations?.incarnationId === pty.incarnationId
@@ -119,6 +163,7 @@ export abstract class OrcaRuntimeWithStructuredSessionSwitchClaims extends OrcaR
     void this.watchSwitchStart(pty.ptyId, proof).catch((error: unknown) =>
       console.warn('[agent-session] could not watch a switched terminal start', error)
     )
+    return true
   }
 
   /** An authentic hook's process joins the proof; identity-only rows carry none. */
diff --git a/src/main/runtime/session-tabs/structured-session-switch-observation.test.ts b/src/main/runtime/session-tabs/structured-session-switch-observation.test.ts
new file mode 100644
index 000000000000..21579eb6c2ae
--- /dev/null
+++ b/src/main/runtime/session-tabs/structured-session-switch-observation.test.ts
@@ -0,0 +1,35 @@
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { switchStartProcessVerdict } from './structured-session-switch-observation'
+
+const table = vi.hoisted(() => {
+  const state: {
+    created: number | null
+    rows: { pid: number; ppid: number; name: string; creationTimeMs?: number }[]
+  } = { created: null, rows: [] }
+  return state
+})
+vi.mock('../../windows/windows-process-table', () => ({
+  isWindowsProcessStartTimeAvailable: () => true,
+  readWindowsProcessCreationTime: () => table.created,
+  readWindowsProcessIdentityTableFresh: async () => table.rows,
+  readWindowsProcessTableFresh: async () => []
+}))
+
+const AGENT = { pid: 4242, platform: 'win32', startTime: '1000' } as const
+const platform = process.platform
+beforeEach(() => Object.defineProperty(process, 'platform', { value: 'win32' }))
+afterEach(() => Object.defineProperty(process, 'platform', { value: platform }))
+
+it('reads an unreadable Windows identity as unverifiable, and only absence or reuse as exited', async () => {
+  table.created = null
+  table.rows = [{ pid: 4242, ppid: 1, name: 'codex.exe' }]
+  expect(await switchStartProcessVerdict(AGENT)).toBe('unverifiable')
+  table.rows = []
+  expect(await switchStartProcessVerdict(AGENT)).toBe('unverifiable')
+  table.rows = [{ pid: 7, ppid: 1, name: 'other.exe' }]
+  expect(await switchStartProcessVerdict(AGENT)).toBe('exited')
+  table.rows = [{ pid: 4242, ppid: 1, name: 'codex.exe', creationTimeMs: 2000 }]
+  expect(await switchStartProcessVerdict(AGENT)).toBe('exited')
+  table.created = 1000
+  expect(await switchStartProcessVerdict(AGENT)).toBe('live')
+})
diff --git a/src/main/runtime/session-tabs/structured-session-switch-observation.ts b/src/main/runtime/session-tabs/structured-session-switch-observation.ts
index f86af7b50c26..8ab7ef5a843c 100644
--- a/src/main/runtime/session-tabs/structured-session-switch-observation.ts
+++ b/src/main/runtime/session-tabs/structured-session-switch-observation.ts
@@ -14,6 +14,7 @@ import { getFreshShellForegroundSnapshot } from '../../../shared/process-table-s
 import {
   isWindowsProcessStartTimeAvailable,
   readWindowsProcessCreationTime,
+  readWindowsProcessIdentityTableFresh,
   readWindowsProcessTableFresh
 } from '../../windows/windows-process-table'
 
@@ -64,5 +65,16 @@ export async function switchStartProcessVerdict(
     return 'unverifiable'
   }
   const created = readWindowsProcessCreationTime(identity.pid)
-  return created !== null && String(created) === identity.startTime ? 'live' : 'exited'
+  if (created !== null) {
+    return String(created) === identity.startTime ? 'live' : 'exited'
+  }
+  // An unreadable pid is not an absent one: only a fresh table's own listing proves it is gone.
+  const rows = await readWindowsProcessIdentityTableFresh().catch(() => [])
+  const row = rows.find((candidate) => candidate.pid === identity.pid)
+  if (rows.length > 0 && !row) {
+    return 'exited'
+  }
+  return row?.creationTimeMs && String(row.creationTimeMs) !== identity.startTime
+    ? 'exited'
+    : 'unverifiable'
 }
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts
index a903e46429de..e2d116b5ef9c 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts
@@ -5,7 +5,7 @@ import {
 } from '@/lib/ai-vault-tab-title-requests'
 import { inPlaceSwitchSupportedNow } from '@/lib/in-place-switch-support'
 import { LOCAL_EXECUTION_HOST_ID, type ExecutionHostId } from '../../../../shared/execution-host'
-import { makePaneKey } from '../../../../shared/stable-pane-id'
+import { makePaneKey, parsePaneKey } from '../../../../shared/stable-pane-id'
 import {
   adoptsCliConversations,
   type CliConversationRowAgent
@@ -36,12 +36,19 @@ export function resolveCliChatResumeSource(
     : collectAgentPaneConversations(state, adoptsCliConversations).find(
         (candidate) => candidate.tabId === args.tab.id
       )
-  const leafId = state.terminalLayoutsByTabId[args.tab.id]?.activeLeafId
-  const seeded = switchedTerminalConversation(args.tab.id)
-  const paneKey = args.paneKey ?? (leafId ? makePaneKey(args.tab.id, leafId) : null)
+  const layout = state.terminalLayoutsByTabId[args.tab.id]
+  const leafId = args.paneKey ? parsePaneKey(args.paneKey)?.leafId : layout?.activeLeafId
+  const seeded = switchedTerminalConversation(args.tab.id, leafId, layout)
   if (!conversation) {
-    return seeded && paneKey
-      ? { tabId: args.tab.id, workspaceId: args.tab.worktreeId, paneKey, ...seeded }
+    return seeded && leafId
+      ? {
+          tabId: args.tab.id,
+          workspaceId: args.tab.worktreeId,
+          paneKey: makePaneKey(args.tab.id, leafId),
+          agent: seeded.agent,
+          providerSessionId: seeded.providerSessionId,
+          executionHostId: seeded.executionHostId
+        }
       : null
   }
   if (
diff --git a/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.test.ts b/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.test.ts
index 72538d15253c..84959c59c2f5 100644
--- a/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.test.ts
+++ b/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.test.ts
@@ -3,7 +3,9 @@ import { beforeEach, expect, it, vi } from 'vitest'
 const mocks = vi.hoisted(() => ({
   supported: true,
   call: vi.fn(),
-  launch: vi.fn((_args: unknown) => ({ tabId: 'terminal-tab' })),
+  launch: vi.fn((_args: unknown): { tabId: string | null; runtimeLaunch?: Promise<unknown> } => ({
+    tabId: 'terminal-tab'
+  })),
   closeUnifiedTab: vi.fn(),
   toast: vi.fn()
 }))
@@ -27,6 +29,7 @@ vi.mock('@/lib/ai-vault-resume-command', () => ({
 }))
 
 import { runNativeChatCliSwitch } from './native-chat-cli-switch-run'
+import { switchedTerminalConversation } from './switched-terminal-conversation'
 
 const SWITCH = {
   sessionId: 'chat-1',
@@ -93,3 +96,27 @@ it('keeps the chat when the host refuses a busy chat, and says why', async () =>
   expect(mocks.closeUnifiedTab).not.toHaveBeenCalled()
   expect(mocks.toast).toHaveBeenCalledWith('Wait for the reply to finish or stop it, then switch.')
 })
+
+it('offers the switch back on a paired terminal before any prompt, for its own pane only', async () => {
+  mocks.launch.mockReturnValueOnce({
+    tabId: null,
+    runtimeLaunch: Promise.resolve({ status: 'created', tabId: 'web-terminal-t' })
+  })
+  await runNativeChatCliSwitch({ ...SWITCH, executionHostId: 'runtime:server-1' })
+  const layout = (ptyIdsByLeafId: Record<string, string>) => ({
+    root: null,
+    activeLeafId: 'L1',
+    expandedLeafId: null,
+    ptyIdsByLeafId
+  })
+  expect(switchedTerminalConversation('web-terminal-t', 'L1', layout({ L1: 'p1' }))).toMatchObject({
+    providerSessionId: 'thread-c'
+  })
+  // A split's new plain shell never takes the switched pane's conversation.
+  expect(switchedTerminalConversation('web-terminal-t', 'L2', layout({ L1: 'p1', L2: 'p2' }))).toBe(
+    undefined
+  )
+  // A replaced PTY in the switched pane ends it.
+  expect(switchedTerminalConversation('web-terminal-t', 'L1', layout({ L1: 'p9' }))).toBe(undefined)
+  expect(switchedTerminalConversation('web-terminal-t', 'L1', layout({ L1: 'p1' }))).toBe(undefined)
+})
diff --git a/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts b/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts
index af580d1f5a54..f3f228132951 100644
--- a/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts
+++ b/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts
@@ -108,8 +108,10 @@ export async function runNativeChatCliSwitch(args: {
     if (outcome && outcome.status !== 'created') {
       throw new Error(outcome.status === 'failed' ? outcome.message : undefined)
     }
-    if (launch.tabId && adoptsCliConversations(source.agent)) {
-      seedSwitchedTerminalConversation(launch.tabId, {
+    // A paired host's terminal is named by its create result, so the switch back works before a prompt.
+    const tabId = launch.tabId ?? (outcome?.status === 'created' ? outcome.tabId : undefined)
+    if (tabId && adoptsCliConversations(source.agent)) {
+      seedSwitchedTerminalConversation(tabId, {
         agent: source.agent,
         providerSessionId: source.sessionId,
         executionHostId: hostId
diff --git a/src/renderer/src/components/tab-bar/switched-terminal-conversation.ts b/src/renderer/src/components/tab-bar/switched-terminal-conversation.ts
index 3651a0afdd04..949be7bc75fc 100644
--- a/src/renderer/src/components/tab-bar/switched-terminal-conversation.ts
+++ b/src/renderer/src/components/tab-bar/switched-terminal-conversation.ts
@@ -1,4 +1,5 @@
 import type { ExecutionHostId } from '../../../../shared/execution-host'
+import type { TerminalLayoutSnapshot } from '../../../../shared/terminal-tab-types'
 import type { CliConversationRowAgent } from '../../../../shared/structured-agent-cli-conversation-adoption'
 
 /** The conversation a switch put in a terminal tab, until its agent reports one. Presentation only:
@@ -7,6 +8,9 @@ type SwitchedTerminalConversation = {
   agent: CliConversationRowAgent
   providerSessionId: string
   executionHostId: ExecutionHostId
+  /** The switch's own pane and PTY, latched when the new tab's only leaf first shows them. */
+  leafId?: string
+  ptyId?: string
 }
 
 const byTabId = new Map<string, SwitchedTerminalConversation>()
@@ -18,10 +22,26 @@ export function seedSwitchedTerminalConversation(
   byTabId.set(tabId, conversation)
 }
 
+/** Only for the switch's own leaf and PTY; a replaced PTY or a gone leaf ends the seed. */
 export function switchedTerminalConversation(
-  tabId: string
+  tabId: string,
+  leafId: string | null | undefined,
+  layout: TerminalLayoutSnapshot | undefined
 ): SwitchedTerminalConversation | undefined {
-  return byTabId.get(tabId)
+  const seed = byTabId.get(tabId)
+  const leaves = Object.keys(layout?.ptyIdsByLeafId ?? {})
+  if (seed && !seed.leafId && leaves.length === 1) {
+    seed.leafId = leaves[0]
+  }
+  const ptyId = seed?.leafId ? layout?.ptyIdsByLeafId?.[seed.leafId] : undefined
+  if (seed?.leafId && ptyId && seed.ptyId === undefined) {
+    seed.ptyId = ptyId
+  }
+  if (seed?.ptyId && ptyId !== seed.ptyId) {
+    byTabId.delete(tabId)
+    return undefined
+  }
+  return seed?.leafId && seed.leafId === leafId ? seed : undefined
 }
 
 export function forgetSwitchedTerminalConversation(tabId: string): void {
diff --git a/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts b/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts
index 694d60a403d1..2bd676760973 100644
--- a/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts
+++ b/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts
@@ -28,12 +28,14 @@ import {
   type TabSessionHistorySubject
 } from './tab-session-history-switch'
 
+import type * as LaunchPlan from '@/lib/agent-session-launch-plan'
+
 const mocks = vi.hoisted(() => {
   const state: {
     resumeState: { blocked: boolean; worktreeId: string | null }
     platform: string
   } = { resumeState: { blocked: false, worktreeId: 'repo-1::/repo/wt' }, platform: 'darwin' }
-  return { ...state, resumeInChat: vi.fn() }
+  return { ...state, resumeInChat: vi.fn(), inPlaceSwitch: false, remoteFeasible: false }
 })
 
 // Staged host answers: its capabilities arrive over IPC at boot, and the platform from preload.
@@ -53,6 +55,19 @@ vi.mock('@/runtime/host-structured-agents', async (importOriginal) => ({
     }))
 }))
 vi.mock('@/lib/renderer-app-platform', () => ({ getRendererAppPlatform: () => mocks.platform }))
+vi.mock('@/lib/in-place-switch-support', () => ({
+  inPlaceSwitchSupportedNow: () => mocks.inPlaceSwitch
+}))
+// A paired host's chat support arrives in its runtime status; staged here as the route's answer.
+vi.mock('@/lib/agent-session-launch-plan', async (importOriginal) => {
+  const actual = await importOriginal<typeof LaunchPlan>()
+  return {
+    ...actual,
+    structuredAgentSessionLaunchFeasible: (
+      ...args: Parameters<typeof actual.structuredAgentSessionLaunchFeasible>
+    ) => mocks.remoteFeasible || actual.structuredAgentSessionLaunchFeasible(...args)
+  }
+})
 
 // Parity with the panel's real composition is pinned in tab-session-history-switch.parity.test.ts.
 vi.mock('../right-sidebar/ai-vault-session-resume-in-chat-workspace', () => ({
@@ -471,6 +486,19 @@ describe('one pane of a terminal tab', () => {
     expect(paneGate(onWindows({ kind: 'wsl', distro: 'Ubuntu' }), claudePane)).toBe(false)
   })
 
+  it('offers the switch on a paired Orca server only once it switches that agent in place', () => {
+    const remote = () => makeState(liveClaudeEntry, { executionHostId: 'runtime:server-1' })
+    mocks.remoteFeasible = true
+    expect(paneGate(remote(), claudePane)).toBe(false)
+    mocks.inPlaceSwitch = true
+    expect(paneGate(remote(), claudePane)).toBe(true)
+    expect(paneGate(makeState(liveClaudeEntry, { connectionId: 'dev-box' }), claudePane)).toBe(
+      false
+    )
+    mocks.inPlaceSwitch = false
+    mocks.remoteFeasible = false
+  })
+
   it('offers nothing over SSH', () => {
     expect(paneGate(makeState(liveClaudeEntry, { connectionId: 'dev-box' }), claudePane)).toBe(
       false
diff --git a/src/renderer/src/components/tab-bar/tab-session-history-switch.ts b/src/renderer/src/components/tab-bar/tab-session-history-switch.ts
index d335de178ede..59c351ce6d89 100644
--- a/src/renderer/src/components/tab-bar/tab-session-history-switch.ts
+++ b/src/renderer/src/components/tab-bar/tab-session-history-switch.ts
@@ -1,5 +1,6 @@
 // Resolves a tab to its Agent Session History row so both menus offer the same surface switches.
 
+import { inPlaceSwitchSupportedNow } from '@/lib/in-place-switch-support'
 import type { AppState } from '@/store/types'
 import { getIndexedAllWorktrees } from '@/store/worktree-repo-index'
 import {
@@ -92,8 +93,12 @@ export function canPaneOfferResumeInNewChat(
     conversation.worktreeId
   ).defaultExecutionHostScope
   // The row gate's launch-route half, so a project the chat route refuses (WSL, repair) hides it.
+  // A runtime host that switches this agent in place hands a terminal's conversation over too.
+  const remoteSwitch =
+    parseExecutionHostId(hostScope)?.kind === 'runtime' &&
+    inPlaceSwitchSupportedNow(conversation.executionHostId, conversation.agent)
   return (
-    canHostOfferTabSessionMove('cli', hostScope) &&
+    (canHostOfferTabSessionMove('cli', hostScope) || remoteSwitch) &&
     CLI_CONVERSATION_ADOPTING_AGENTS[conversation.agent].some((agent) =>
       structuredAgentSessionLaunchFeasible(state, {
         agent,
diff --git a/src/renderer/src/components/terminal-pane/use-terminal-pane-projection.ts b/src/renderer/src/components/terminal-pane/use-terminal-pane-projection.ts
index 4d6998fff093..d944faa58cde 100644
--- a/src/renderer/src/components/terminal-pane/use-terminal-pane-projection.ts
+++ b/src/renderer/src/components/terminal-pane/use-terminal-pane-projection.ts
@@ -189,7 +189,7 @@ export function useTerminalPaneProjection(controller: TerminalPaneMobileControll
       activePaneCanResumeInChat:
         !activePaneIsChatLeaf &&
         activeLeafId !== null &&
-        (switchedTerminalConversation(tabId) !== undefined ||
+        (!!switchedTerminalConversation(tabId, activeLeafId, state.terminalLayoutsByTabId[tabId]) ||
           canPaneOfferResumeInNewChat(state, {
             worktreeId,
             paneKey: makePaneKey(tabId, activeLeafId)
diff --git a/src/renderer/src/lib/launch-ai-vault-session.ts b/src/renderer/src/lib/launch-ai-vault-session.ts
index 4646748c8793..0fac9335e160 100644
--- a/src/renderer/src/lib/launch-ai-vault-session.ts
+++ b/src/renderer/src/lib/launch-ai-vault-session.ts
@@ -67,7 +67,7 @@ export function launchAiVaultSessionInNewTab(args: {
         ...(args.launchConfig ? { agentArgs: args.launchConfig.agentArgs } : {}),
         activate: true
       },
-      { notifyFailure: false }
+      { notifyFailure: false, ...(args.resumeOrigin ? { withTabId: true } : {}) }
     )
     const observedRuntimeLaunch = runtimeLaunch.then((outcome) => {
       if (outcome.status === 'created') {
diff --git a/src/renderer/src/runtime/web-runtime-session-types.ts b/src/renderer/src/runtime/web-runtime-session-types.ts
index a09629f34a61..3287a64ec521 100644
--- a/src/renderer/src/runtime/web-runtime-session-types.ts
+++ b/src/renderer/src/runtime/web-runtime-session-types.ts
@@ -11,8 +11,8 @@ import type { RuntimeTerminalCreate } from '../../../shared/runtime-types'
 import type { TuiAgent } from '../../../shared/tui-agent'
 
 export type WebRuntimeTerminalCreateOutcome =
-  | { status: 'created' }
-  | { status: 'failed'; message: string }
+  /** `tabId`: this client's tab for the host's new terminal, when the host named it. */
+  { status: 'created'; tabId?: string } | { status: 'failed'; message: string }
 
 export type CreateWebRuntimeSessionTerminalArgs = {
   worktreeId: string
diff --git a/src/renderer/src/runtime/web-runtime-terminal-creation.ts b/src/renderer/src/runtime/web-runtime-terminal-creation.ts
index bde5df66a78c..1670bf75fef5 100644
--- a/src/renderer/src/runtime/web-runtime-terminal-creation.ts
+++ b/src/renderer/src/runtime/web-runtime-terminal-creation.ts
@@ -17,7 +17,7 @@ import type {
  */
 export async function createWebRuntimeSessionTerminal(
   args: CreateWebRuntimeSessionTerminalArgs,
-  options: { notifyFailure?: boolean } = {}
+  options: { notifyFailure?: boolean; withTabId?: boolean } = {}
 ): Promise<WebRuntimeTerminalCreateOutcome> {
   const created = await createWebRuntimeSessionTerminalResult(args)
   if (
@@ -30,7 +30,9 @@ export async function createWebRuntimeSessionTerminal(
       worktreeId: args.worktreeId
     })
   }
-  return created.outcome
+  return options.withTabId && created.outcome.status === 'created' && created.hostTabId
+    ? { status: 'created', tabId: toWebTerminalSurfaceTabId(created.hostTabId) }
+    : created.outcome
 }
 
 export async function createWebRuntimeAgentSessionTerminal(

From c2468c54b3b9d1f934c022b2efa7ea42b9a84a03 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Tue, 20 Oct 2026 14:05:26 -0700
Subject: [PATCH 014/207] fix(native-chat): let the terminal host own a switch
 start until it proves the start over

The chat to terminal switch now carries one generation and the owner that
creates the terminal. The daemon session and the local process are bound to
that generation before any later step can fail, and only their own end, or a
proved agent exit with that exact shell alone, releases the conversation.
The accepted start is saved on the chat it left, so a restart still knows
it may exist; a lost owner never speaks for it.

The caller-side settlement and the renderer's guessed tab seed are gone.
A switched terminal's conversation is presented from the host's launch
identity, stamped with the exact PTY and incarnation, and the switch back
retires only the pane that still holds that execution.
---
 .../server-launch-resume-identity.test.ts     |  21 ++
 .../server/server-ingest-terminal.ts          |   5 +-
 src/main/daemon/daemon-pty-adapter.ts         |  25 ++
 .../daemon/daemon-pty-owner-query-protocol.ts |   7 +
 src/main/daemon/daemon-pty-router.ts          |  17 +-
 src/main/daemon/daemon-pty-spawn-request.ts   |   3 +
 src/main/daemon/daemon-request-router.ts      |  19 +-
 src/main/daemon/daemon-terminal-admission.ts  |   3 +
 .../daemon/degraded-daemon-pty-provider.ts    |  18 +-
 .../terminal-host-concurrent-create.test.ts   |  39 +++
 .../daemon/terminal-host-create-contract.ts   |   2 +
 .../daemon/terminal-host-session-create.ts    |  46 ++-
 src/main/daemon/terminal-host-switches.ts     |  63 ++++
 src/main/daemon/terminal-host.ts              |  14 +-
 src/main/daemon/types.ts                      |   4 +
 .../pty/host-env/resume-spawn-judgement.ts    |  45 +--
 .../pty/host-env/saved-resume-admission.ts    |  31 +-
 src/main/ipc/pty/ipc/spawn-commit.ts          |   3 +-
 src/main/ipc/pty/ipc/spawn-run.ts             |   6 -
 src/main/ipc/pty/ipc/spawn-state.ts           |   2 -
 .../pty/pane/resume-launch-identity.test.ts   |   7 +
 .../ipc/pty/pane/resume-launch-identity.ts    |  11 +-
 src/main/ipc/pty/runtime/controller.ts        |   9 +-
 src/main/ipc/pty/runtime/spawn-commit.ts      |   3 +-
 src/main/ipc/pty/runtime/spawn-state.ts       |   2 -
 src/main/ipc/pty/runtime/spawn.ts             |   8 +-
 .../local-pty-provider-spawn-session.test.ts  |  19 ++
 src/main/providers/local-pty-provider.ts      |   5 +
 .../providers/local-pty-session-activation.ts |   6 +-
 .../local-pty-shell-ready-startup-command.ts  |   6 +-
 src/main/providers/local-pty-spawn.ts         |  21 +-
 .../providers/local-pty-terminal-switch.ts    | 101 ++++++
 src/main/providers/pty-provider-contract.ts   |   7 +
 src/main/providers/terminal-switch-owners.ts  |  22 ++
 .../runtime/agent-session-record-store.ts     |   5 +
 .../agent-session-record-terminal-switch.ts   |  20 ++
 ...ctured-agent-session-switch-to-terminal.ts |  48 ++-
 .../runtime-pty-controller-contract.ts        |   3 +
 .../runtime/runtime-terminal-state-records.ts |   3 -
 .../structured-session-cli-writer-host.ts     |  54 +--
 .../structured-session-switch-claims.test.ts  | 263 +++++++++------
 .../structured-session-switch-claims.ts       | 311 ++++++++++--------
 .../structured-session-switch-observation.ts  |  16 +
 src/main/startup/main-window-agent-status.ts  |   2 +
 .../tab-bar/cli-chat-resume-run.test.ts       |  34 +-
 .../components/tab-bar/cli-chat-resume-run.ts |  31 +-
 .../tab-bar/cli-chat-resume-source.ts         |  44 +--
 .../native-chat-cli-switch-run.test.ts        |  30 +-
 .../tab-bar/native-chat-cli-switch-run.ts     |  19 +-
 .../tab-bar/switched-terminal-conversation.ts |  49 ---
 .../tab-session-history-switch.test.ts        |  51 +++
 .../pty-connection/pty-exit-hibernate.ts      |   1 +
 .../use-terminal-pane-projection.ts           |  10 +-
 .../agent-status-partial-updates.ts           |   9 +-
 .../src/lib/ai-vault-tab-title-requests.ts    |  32 +-
 .../src/lib/launch-ai-vault-session.ts        |   2 +-
 .../src/runtime/web-runtime-session-types.ts  |   4 +-
 .../runtime/web-runtime-terminal-creation.ts  |   6 +-
 .../agent-status-provider-session-actions.ts  |  12 +-
 .../slices/agent-status-slice-contract.ts     |  14 +
 src/renderer/src/store/slices/agent-status.ts |   1 +
 .../agent-hook-listener/listener-event.ts     |   3 +
 src/shared/agent-session-record.ts            |  14 +-
 src/shared/agent-status-ipc-payload.ts        |   3 +
 src/shared/terminal-switch.ts                 |  69 ++++
 65 files changed, 1209 insertions(+), 554 deletions(-)
 create mode 100644 src/main/daemon/terminal-host-switches.ts
 create mode 100644 src/main/providers/local-pty-terminal-switch.ts
 create mode 100644 src/main/providers/terminal-switch-owners.ts
 create mode 100644 src/main/runtime/agent-session-record-terminal-switch.ts
 delete mode 100644 src/renderer/src/components/tab-bar/switched-terminal-conversation.ts
 create mode 100644 src/shared/terminal-switch.ts

diff --git a/src/main/agent-hooks/server-launch-resume-identity.test.ts b/src/main/agent-hooks/server-launch-resume-identity.test.ts
index 27afee0f2457..d241db1f418b 100644
--- a/src/main/agent-hooks/server-launch-resume-identity.test.ts
+++ b/src/main/agent-hooks/server-launch-resume-identity.test.ts
@@ -64,6 +64,27 @@ describe('a resume launch seeds the pane identity', () => {
     ])
   })
 
+  it('names a switch start’s exact execution, and a new incarnation there re-seeds it', async () => {
+    const server = await startServer()
+    const published = vi.fn()
+    server.setListener(published)
+    const seed = (incarnationId: string) =>
+      server.recordLaunchResumeIdentity({
+        paneKey: PANE,
+        agentType: 'codex',
+        providerSession: RESUMED,
+        launchedAt: Date.now(),
+        execution: { ptyId: 'pty-1', incarnationId }
+      })
+    seed('i1')
+    seed('i1')
+    seed('i2')
+    expect(published.mock.calls.map(([row]) => row.launchExecution)).toEqual([
+      { ptyId: 'pty-1', incarnationId: 'i1' },
+      { ptyId: 'pty-1', incarnationId: 'i2' }
+    ])
+  })
+
   it("yields to the agent's own report and is replaced by its first hook", async () => {
     const server = await startServer()
     const launchedAt = Date.now() - 1_000
diff --git a/src/main/agent-hooks/server/server-ingest-terminal.ts b/src/main/agent-hooks/server/server-ingest-terminal.ts
index ab621097860b..fd64bcfc4ad0 100644
--- a/src/main/agent-hooks/server/server-ingest-terminal.ts
+++ b/src/main/agent-hooks/server/server-ingest-terminal.ts
@@ -17,6 +17,7 @@ import {
   programStatusYieldsToHookRow
 } from './program-status/hook-precedence'
 import type { ProgramStatusFacet } from '../../../shared/program-status/facet'
+import type { TerminalExecutionStamp } from '../../../shared/terminal-switch'
 
 const PROGRAM_STATUS_FACET_REPUBLISH_MS = 250
 
@@ -33,6 +34,7 @@ export abstract class AgentHookServerIngestTerminal extends AgentHookServerInges
     providerSession: AgentProviderSessionMetadata
     /** When the pane's process launched; a row reported since then is the agent's own. */
     launchedAt: number
+    execution?: TerminalExecutionStamp
   }): void {
     const paneKey = this.resolvePaneKeyAlias(event.paneKey.trim())
     const parsedPaneKey = parsePaneKey(paneKey)
@@ -47,7 +49,7 @@ export abstract class AgentHookServerIngestTerminal extends AgentHookServerInges
             event.agentType,
             previous.providerSession,
             event.providerSession
-          )
+          ) && previous.launchExecution?.incarnationId === event.execution?.incarnationId
         : 'receivedAt' in previous &&
           typeof previous.receivedAt === 'number' &&
           previous.receivedAt >= event.launchedAt)
@@ -62,6 +64,7 @@ export abstract class AgentHookServerIngestTerminal extends AgentHookServerInges
       connectionId: null,
       providerSession: event.providerSession,
       providerSessionOnly: true,
+      ...(event.execution ? { launchExecution: event.execution } : {}),
       // Why: hydration keeps only marked identity rows; a host restart before the first turn must not lose it.
       retainedForLiveness: true,
       payload: { state: 'done', prompt: '', agentType: event.agentType }
diff --git a/src/main/daemon/daemon-pty-adapter.ts b/src/main/daemon/daemon-pty-adapter.ts
index 3ebccf283115..1593eee3ca78 100644
--- a/src/main/daemon/daemon-pty-adapter.ts
+++ b/src/main/daemon/daemon-pty-adapter.ts
@@ -1,4 +1,6 @@
 import { emitPtyListeners, createPtyExitPayload } from './daemon-pty-listener-emission'
+import { randomUUID } from 'node:crypto'
+import type { TerminalSwitchOwnerAnswer, TerminalSwitchOwners } from '../../shared/terminal-switch'
 import { DaemonPtyDaemonRecovery } from './daemon-pty-daemon-recovery'
 import type { DaemonPtyAdapterOptions } from './daemon-pty-runtime-state'
 import { supportsMode2031UnsubscribeFact, type DaemonEvent } from './types'
@@ -16,6 +18,29 @@ import type { AutomaticWorkRequestType } from './daemon-automatic-work-protocol'
 import type { DaemonAsyncIoStatus } from '../../shared/daemon-async-io-health'
 
 export class DaemonPtyAdapter extends DaemonPtyDaemonRecovery implements IPtyProvider {
+  /** Asked of this daemon only; a daemon without the request answers nothing, so it owns no switch. */
+  readonly terminalSwitches: TerminalSwitchOwners = {
+    owner: async () => (await this.terminalSwitches.observe(randomUUID(), false))[0]?.owner ?? null,
+    observe: async (generation, fence) => {
+      if (!this.client.isConnected()) {
+        return []
+      }
+      try {
+        const answer = await this.client.request<TerminalSwitchOwnerAnswer>(
+          'observeTerminalSwitch',
+          { generation, fence },
+          5_000
+        )
+        return typeof answer?.owner === 'string' ? [answer] : []
+      } catch (error) {
+        if (isUnknownRequestTypeError(error)) {
+          return []
+        }
+        throw error
+      }
+    }
+  }
+
   constructor(opts: DaemonPtyAdapterOptions) {
     super(opts)
     // Registered after the base listener, which marks the sessions awaiting recovery first.
diff --git a/src/main/daemon/daemon-pty-owner-query-protocol.ts b/src/main/daemon/daemon-pty-owner-query-protocol.ts
index 875f09c6c994..2242ff1c49c4 100644
--- a/src/main/daemon/daemon-pty-owner-query-protocol.ts
+++ b/src/main/daemon/daemon-pty-owner-query-protocol.ts
@@ -10,3 +10,10 @@ export type SetColorQueryReplyColorsRequest = {
   type: 'setColorQueryReplyColors'
   payload: { colors: unknown }
 }
+
+/** The daemon's own answer about one chat → terminal switch generation; an unseen one is fenced. */
+export type ObserveTerminalSwitchRequest = {
+  id: string
+  type: 'observeTerminalSwitch'
+  payload: { generation: string; fence?: boolean }
+}
diff --git a/src/main/daemon/daemon-pty-router.ts b/src/main/daemon/daemon-pty-router.ts
index 0009cb356bba..48bb1b06a07c 100644
--- a/src/main/daemon/daemon-pty-router.ts
+++ b/src/main/daemon/daemon-pty-router.ts
@@ -1,4 +1,5 @@
 import { reconcileDaemonRouterSessions } from './daemon-router-session-reconciliation'
+import { routedTerminalSwitchOwners } from '../providers/terminal-switch-owners'
 import type { DaemonPtyAdapter } from './daemon-pty-adapter'
 import { DaemonPtyAdapterSubscriptionFanout } from './daemon-pty-adapter-subscription-fanout'
 import type {
@@ -30,6 +31,10 @@ export class DaemonPtyRouter implements IPtyProvider {
   private readonly subscriptions: DaemonPtyAdapterSubscriptionFanout
   private readonly legacyExitProof = new LegacyDaemonExitProof()
   readonly retirement = new DaemonRouterRetirement(() => this.allAdapters())
+  readonly terminalSwitches = routedTerminalSwitchOwners(
+    () => this.current,
+    () => this.allAdapters()
+  )
 
   constructor(opts: { current: DaemonPtyAdapter; legacy: DaemonPtyAdapter[] }) {
     this.current = opts.current
@@ -110,9 +115,7 @@ export class DaemonPtyRouter implements IPtyProvider {
     return this.current.supportsAgentSessionCreateOperations()
   }
 
-  async attach(id: string): ReturnType<IPtyProvider['attach']> {
-    return await this.adapterFor(id).attach(id)
-  }
+  attach = (id: string): ReturnType<IPtyProvider['attach']> => this.adapterFor(id).attach(id)
 
   hasPty(id: string): boolean {
     const routed = this.sessionAdapters.get(id)
@@ -171,13 +174,9 @@ export class DaemonPtyRouter implements IPtyProvider {
     await this.adapterFor(id).sendSignal(id, signal)
   }
 
-  async getCwd(id: string): Promise<string> {
-    return this.adapterFor(id).getCwd(id)
-  }
+  getCwd = (id: string): Promise<string> => this.adapterFor(id).getCwd(id)
 
-  async getInitialCwd(id: string): Promise<string> {
-    return this.adapterFor(id).getInitialCwd(id)
-  }
+  getInitialCwd = (id: string): Promise<string> => this.adapterFor(id).getInitialCwd(id)
 
   async getAppliedSize(id: string): Promise<{ cols: number; rows: number } | null> {
     return (await this.adapterFor(id).getAppliedSize?.(id)) ?? null
diff --git a/src/main/daemon/daemon-pty-spawn-request.ts b/src/main/daemon/daemon-pty-spawn-request.ts
index 6c5fb0e35cac..acdbd47e8b0d 100644
--- a/src/main/daemon/daemon-pty-spawn-request.ts
+++ b/src/main/daemon/daemon-pty-spawn-request.ts
@@ -143,6 +143,9 @@ export abstract class DaemonPtySpawnRequest extends DaemonPtyRuntimeState {
           : {}),
         ...(!context.attachOnly && opts.agentSessionEnsure
           ? { agentSessionEnsure: opts.agentSessionEnsure }
+          : {}),
+        ...(!context.attachOnly && opts.switchGeneration
+          ? { switchGeneration: opts.switchGeneration, switchOwner: opts.switchOwner }
           : {})
       }
       return opts.signal
diff --git a/src/main/daemon/daemon-request-router.ts b/src/main/daemon/daemon-request-router.ts
index 73d7703592c2..f79a1379055c 100644
--- a/src/main/daemon/daemon-request-router.ts
+++ b/src/main/daemon/daemon-request-router.ts
@@ -62,15 +62,16 @@ export class DaemonRequestRouter {
         return {}
       case 'createOrAttach':
         return this.options.admission.createOrAttach(clientId, request)
-      case 'cancelCreateOrAttach':
-        return {
-          canceled: this.options.preparations.cancel(request.payload.sessionId, {
-            clientId,
-            ...(typeof request.payload.requestId === 'string'
-              ? { requestId: request.payload.requestId }
-              : {})
-          })
-        }
+      case 'cancelCreateOrAttach': {
+        const { sessionId, requestId } = request.payload
+        const scope = typeof requestId === 'string' ? { clientId, requestId } : { clientId }
+        return { canceled: this.options.preparations.cancel(sessionId, scope) }
+      }
+      case 'observeTerminalSwitch':
+        return this.options.host.switches.observe(
+          request.payload.generation,
+          request.payload.fence === true
+        )
       case 'closeStartupQueryAuthority':
         return {
           appliedSeq: this.options.host.closeStartupQueryAuthority(request.payload.sessionId)
diff --git a/src/main/daemon/daemon-terminal-admission.ts b/src/main/daemon/daemon-terminal-admission.ts
index 04daad020155..43a820b11ae0 100644
--- a/src/main/daemon/daemon-terminal-admission.ts
+++ b/src/main/daemon/daemon-terminal-admission.ts
@@ -128,6 +128,9 @@ export class DaemonTerminalAdmission {
           ? { shellReadyTimeoutMs: payload.shellReadyTimeoutMs }
           : {}),
         ...(payload.agentSessionEnsure ? { agentSessionEnsure: payload.agentSessionEnsure } : {}),
+        ...(typeof payload.switchGeneration === 'string'
+          ? { switchGeneration: payload.switchGeneration, switchOwner: payload.switchOwner }
+          : {}),
         spawnAdmission: {
           clientId,
           declaredIntent: isSpawnIntent(payload.spawnIntent) ? payload.spawnIntent : null,
diff --git a/src/main/daemon/degraded-daemon-pty-provider.ts b/src/main/daemon/degraded-daemon-pty-provider.ts
index bf021bce8f83..ae82d3ae4f15 100644
--- a/src/main/daemon/degraded-daemon-pty-provider.ts
+++ b/src/main/daemon/degraded-daemon-pty-provider.ts
@@ -1,4 +1,5 @@
 import type { DaemonPtyAdapter } from './daemon-pty-adapter'
+import { routedTerminalSwitchOwners } from '../providers/terminal-switch-owners'
 import { combineUnsubscribes } from './combine-unsubscribes'
 import { shutdownDegradedFallbackSessions } from './degraded-daemon-fallback-shutdown'
 import { inspectPtyProviderProcess } from '../providers/pty-process-inspection'
@@ -86,6 +87,10 @@ export class DegradedDaemonPtyProvider implements IPtyProvider {
     this.freshSpawns.canProvideSnapshot(id)
 
   spawn = (opts: PtySpawnOptions): Promise<PtySpawnResult> => this.ownerRecovery.spawn(opts)
+  readonly terminalSwitches = routedTerminalSwitchOwners(
+    () => (this.freshSpawns.routesToFallback ? this.fallback : this.current),
+    () => this.allProviders()
+  )
 
   // Why refuse the fallback route (unknown ids resolve to it): see attachDaemonOwnedSession.
   attach = (id: string): ReturnType<IPtyProvider['attach']> =>
@@ -144,17 +149,12 @@ export class DegradedDaemonPtyProvider implements IPtyProvider {
     }
   }
 
-  async sendSignal(id: string, signal: string): Promise<void> {
-    await this.providerFor(id).sendSignal(id, signal)
-  }
+  sendSignal = (id: string, signal: string): Promise<void> =>
+    this.providerFor(id).sendSignal(id, signal)
 
-  async getCwd(id: string): Promise<string> {
-    return this.providerFor(id).getCwd(id)
-  }
+  getCwd = (id: string): Promise<string> => this.providerFor(id).getCwd(id)
 
-  async getInitialCwd(id: string): Promise<string> {
-    return this.providerFor(id).getInitialCwd(id)
-  }
+  getInitialCwd = (id: string): Promise<string> => this.providerFor(id).getInitialCwd(id)
 
   async getAppliedSize(id: string): Promise<{ cols: number; rows: number } | null> {
     return (await this.providerFor(id).getAppliedSize?.(id)) ?? null
diff --git a/src/main/daemon/terminal-host-concurrent-create.test.ts b/src/main/daemon/terminal-host-concurrent-create.test.ts
index aa7b9fda956e..f144671f0feb 100644
--- a/src/main/daemon/terminal-host-concurrent-create.test.ts
+++ b/src/main/daemon/terminal-host-concurrent-create.test.ts
@@ -223,3 +223,42 @@ describe('concurrent createOrAttach across the async spawn', () => {
     expect(host.listSessions()).toEqual([])
   })
 })
+
+describe('a switch start owned by the terminal host', () => {
+  it('holds its generation from before spawn until its session exits, and never reuses it', async () => {
+    let releaseSpawn: () => void = () => {}
+    const gate = new Promise<void>((resolve) => {
+      releaseSpawn = resolve
+    })
+    const proc = mockSubprocess()
+    const host = new TerminalHost({
+      spawnSubprocess: vi.fn(async () => {
+        await gate
+        return proc
+      })
+    })
+    const { owner } = host.switches
+    const start = (sessionId: string, generation: string) =>
+      host.createOrAttach({
+        ...createOptions(sessionId),
+        switchGeneration: generation,
+        switchOwner: owner
+      })
+    const seen = (generation: string, fence = false) =>
+      host.switches.observe(generation, fence).observation
+
+    const created = start('switch-1', 'g1')
+    await vi.waitFor(() => expect(seen('g1')).toEqual({ state: 'pending' }))
+    // A lost reply's retry names the same generation and never starts a second terminal.
+    await expect(start('switch-2', 'g1')).rejects.toThrow('terminal_switch_generation_refused')
+    releaseSpawn()
+    await created
+    expect(seen('g1', true)).toMatchObject({ state: 'bound', ptyId: 'switch-1', shellPid: 4242 })
+    proc.emitExit(0)
+    await vi.waitFor(() => expect(seen('g1', true)).toEqual({ state: 'ended' }))
+    // An observation fences an unseen generation, so its late create refuses.
+    expect(seen('g2', true)).toEqual({ state: 'ended' })
+    await expect(start('switch-3', 'g2')).rejects.toThrow('terminal_switch_generation_refused')
+    await host.dispose()
+  })
+})
diff --git a/src/main/daemon/terminal-host-create-contract.ts b/src/main/daemon/terminal-host-create-contract.ts
index 9f6e6fbec1b1..3a17a9c86106 100644
--- a/src/main/daemon/terminal-host-create-contract.ts
+++ b/src/main/daemon/terminal-host-create-contract.ts
@@ -35,6 +35,8 @@ export type CreateOrAttachOptions = {
     claim: AgentSessionExecutionClaim
     surface: AgentSessionSurfaceBinding
   }
+  switchGeneration?: string
+  switchOwner?: string
   streamClient: {
     onData: (data: string, rawLength?: number, transformed?: boolean, seq?: number) => void
     onExit: (code: number, incarnationId: PtyIncarnationId, cause?: TerminalExitCause) => void
diff --git a/src/main/daemon/terminal-host-session-create.ts b/src/main/daemon/terminal-host-session-create.ts
index ed5a06372c24..e9f88329e475 100644
--- a/src/main/daemon/terminal-host-session-create.ts
+++ b/src/main/daemon/terminal-host-session-create.ts
@@ -1,4 +1,5 @@
 import { buildStartupCommandSubmission } from '../../shared/startup-command-submission'
+import type { TerminalHostSwitches } from './terminal-host-switches'
 import {
   discardStagedStartupCommand,
   stageStartupCommand,
@@ -32,6 +33,7 @@ type TerminalHostSessionCreateDependencies = {
   killedTombstones: TerminalHostTombstones
   spawnSubprocess: TerminalHostOptions['spawnSubprocess']
   spawnGate: TerminalSpawnGate | undefined
+  switches?: TerminalHostSwitches
   onDeadSessionRemoved: (sessionId: string) => void
   onSessionCreated: (sessionId: string, generation: string | undefined, isAlive: boolean) => void
   onSessionExit: (sessionId: string, generation: string | undefined) => void
@@ -151,23 +153,31 @@ async function spawnAndPublishSession(
   // Why before the fork: the shell's own cwd may already have fallen back, so probe the requested path.
   const cwdReadableByDaemon =
     opts.cwd && !wslDistro ? await isCwdReadableByThisProcess(opts.cwd) : null
-  const subprocess = await deps.spawnSubprocess({
-    sessionId: opts.sessionId,
-    cols: size.cols,
-    rows: size.rows,
-    cwd: opts.cwd,
-    env: opts.env,
-    envToDelete: opts.envToDelete,
-    command: opts.command,
-    startupCommandDelivery: opts.startupCommandDelivery,
-    ...(opts.launchAgent ? { launchAgent: opts.launchAgent } : {}),
-    shellOverride: opts.shellOverride,
-    terminalShellArgs: opts.terminalShellArgs,
-    terminalWindowsWslDistro: opts.terminalWindowsWslDistro,
-    terminalWindowsPowerShellImplementation: opts.terminalWindowsPowerShellImplementation,
-    isCanceled: opts.isCanceled,
-    ...(opts.cancelSignal ? { cancelSignal: opts.cancelSignal } : {})
-  })
+  deps.switches?.begin(opts.switchGeneration, opts.switchOwner)
+  let subprocess: Awaited<ReturnType<TerminalHostSessionCreateDependencies['spawnSubprocess']>>
+  try {
+    subprocess = await deps.spawnSubprocess({
+      sessionId: opts.sessionId,
+      cols: size.cols,
+      rows: size.rows,
+      cwd: opts.cwd,
+      env: opts.env,
+      envToDelete: opts.envToDelete,
+      command: opts.command,
+      startupCommandDelivery: opts.startupCommandDelivery,
+      ...(opts.launchAgent ? { launchAgent: opts.launchAgent } : {}),
+      shellOverride: opts.shellOverride,
+      terminalShellArgs: opts.terminalShellArgs,
+      terminalWindowsWslDistro: opts.terminalWindowsWslDistro,
+      terminalWindowsPowerShellImplementation: opts.terminalWindowsPowerShellImplementation,
+      isCanceled: opts.isCanceled,
+      ...(opts.cancelSignal ? { cancelSignal: opts.cancelSignal } : {})
+    })
+  } catch (error) {
+    // A spawn that threw left no subprocess, so nothing can start under this generation.
+    deps.switches?.endUnstarted(opts.switchGeneration)
+    throw error
+  }
 
   let staging: StartupCommandStaging | undefined
   // Why: a fallback shell does not emit the preferred shell's ready marker;
@@ -204,6 +214,8 @@ async function spawnAndPublishSession(
       ? { shellReadyTimeoutMs: opts.shellReadyTimeoutMs }
       : {})
   })
+  // From here only this session's own end ends the switch, canceled or not.
+  deps.switches?.bind(opts.switchGeneration, session)
 
   if (opts.isCanceled?.()) {
     // Retain cleanup ownership if the native child refuses to exit.
diff --git a/src/main/daemon/terminal-host-switches.ts b/src/main/daemon/terminal-host-switches.ts
new file mode 100644
index 000000000000..db8ba8c58663
--- /dev/null
+++ b/src/main/daemon/terminal-host-switches.ts
@@ -0,0 +1,63 @@
+// The daemon's ownership of chat → terminal switch starts. A generation is held from before its
+// subprocess spawns, bound to the session the moment it exists, and only that session ends it.
+import { randomUUID } from 'node:crypto'
+import type { TerminalSwitchOwnerAnswer } from '../../shared/terminal-switch'
+import type { Session } from './session'
+
+type HostSwitch = { state: 'pending' | 'ended' } | { state: 'bound'; session: Session }
+
+export class TerminalHostSwitches {
+  readonly owner = `daemon:${randomUUID()}`
+  private readonly entries = new Map<string, HostSwitch>()
+
+  /** Before the subprocess: a foreign owner or an already used or fenced generation refuses. */
+  begin(generation: string | undefined, owner: string | undefined): void {
+    if (generation === undefined) {
+      return
+    }
+    if (owner !== this.owner || this.entries.has(generation)) {
+      throw new Error('terminal_switch_generation_refused')
+    }
+    this.entries.set(generation, { state: 'pending' })
+  }
+
+  bind(generation: string | undefined, session: Session): void {
+    if (generation !== undefined) {
+      this.entries.set(generation, { state: 'bound', session })
+    }
+  }
+
+  /** The subprocess never spawned, so nothing can start or deliver under this generation. */
+  endUnstarted(generation: string | undefined): void {
+    if (generation !== undefined && this.entries.get(generation)?.state === 'pending') {
+      this.entries.set(generation, { state: 'ended' })
+    }
+  }
+
+  /** An unseen generation is fenced, so a late create carrying it refuses and absence means no start. */
+  observe(generation: string, fence: boolean): TerminalSwitchOwnerAnswer {
+    const entry: HostSwitch = this.entries.get(generation) ?? {
+      state: fence ? 'ended' : 'pending'
+    }
+    if (fence) {
+      this.entries.set(generation, entry)
+    }
+    if (entry.state !== 'bound') {
+      return { owner: this.owner, observation: { state: entry.state } }
+    }
+    const { session } = entry
+    return {
+      owner: this.owner,
+      observation: session.isAlive
+        ? {
+            state: 'bound',
+            ptyId: session.sessionId,
+            incarnationId: session.incarnationId,
+            shellPid: session.pid > 0 ? session.pid : null,
+            // The startup command is queued behind the shell-ready barrier until it settles.
+            startupSettled: session.shellState !== 'pending'
+          }
+        : { state: 'ended' }
+    }
+  }
+}
diff --git a/src/main/daemon/terminal-host.ts b/src/main/daemon/terminal-host.ts
index 9a6f5c21c9a8..6588ff785b61 100644
--- a/src/main/daemon/terminal-host.ts
+++ b/src/main/daemon/terminal-host.ts
@@ -1,4 +1,5 @@
 import type { Session } from './session'
+import { TerminalHostSwitches } from './terminal-host-switches'
 import type { PtyProcessInspectionOptions } from '../providers/pty-process-inspection'
 import { SessionNotFoundError } from './types'
 import type { SessionInfo, TakePendingOutputResult, TerminalSnapshot } from './types'
@@ -51,6 +52,7 @@ export class TerminalHost {
   private disposePromise: Promise<void> | null = null
   private readonly agentSessionOwners = new ClaimedAgentPtyOwnerRegistry()
   private readonly agentSessionGenerations = new TerminalHostAgentSessionGenerations()
+  readonly switches = new TerminalHostSwitches()
   private readonly authorityGeneration = randomUUID()
   private observationEpoch = 0
   private readonly retiredIncarnations = new Map<
@@ -81,13 +83,8 @@ export class TerminalHost {
     }
     this.assertCreateOrAttachAllowed(opts)
 
-    let settleCreation: () => void = () => {}
-    this.pendingCreations.set(
-      opts.sessionId,
-      new Promise<void>((resolve) => {
-        settleCreation = resolve
-      })
-    )
+    const creation = Promise.withResolvers<void>()
+    this.pendingCreations.set(opts.sessionId, creation.promise)
     try {
       return await createOrAttachClaimedAgentSession({
         options: opts,
@@ -109,6 +106,7 @@ export class TerminalHost {
             killedTombstones: this.killedTombstones,
             spawnSubprocess: this.spawnOptions.spawnSubprocess,
             spawnGate: this.spawnOptions.spawnGate,
+            switches: this.switches,
             onDeadSessionRemoved: (sessionId) => this.agentSessionGenerations.forget(sessionId),
             onSessionCreated: (sessionId, generation, isAlive) =>
               this.agentSessionGenerations.remember(sessionId, generation, isAlive),
@@ -121,7 +119,7 @@ export class TerminalHost {
       })
     } finally {
       this.pendingCreations.delete(opts.sessionId)
-      settleCreation()
+      creation.resolve()
     }
   }
 
diff --git a/src/main/daemon/types.ts b/src/main/daemon/types.ts
index 080c474ab033..05cee6524c64 100644
--- a/src/main/daemon/types.ts
+++ b/src/main/daemon/types.ts
@@ -107,6 +107,9 @@ export type CreateOrAttachRequest = {
       claim: AgentSessionExecutionClaim
       surface: AgentSessionSurfaceBinding
     }
+    /** A switch start; sent only to a daemon that answered `observeTerminalSwitch`. */
+    switchGeneration?: string
+    switchOwner?: string
   }
 }
 
@@ -324,6 +327,7 @@ export type DaemonRequest =
   | TakePendingOutputRequest
   | PtyOwnerQueryProtocol.CloseStartupQueryAuthorityRequest
   | PtyOwnerQueryProtocol.SetColorQueryReplyColorsRequest
+  | PtyOwnerQueryProtocol.ObserveTerminalSwitchRequest
 
 // ─── RPC Responses (Daemon → Client, on control socket) ────────────
 
diff --git a/src/main/ipc/pty/host-env/resume-spawn-judgement.ts b/src/main/ipc/pty/host-env/resume-spawn-judgement.ts
index 0046f85bde3f..1d9ccc79c36d 100644
--- a/src/main/ipc/pty/host-env/resume-spawn-judgement.ts
+++ b/src/main/ipc/pty/host-env/resume-spawn-judgement.ts
@@ -10,10 +10,8 @@ import type {
   RefusedPaneResume
 } from '../../../../shared/agent-status-types'
 import type { AgentSessionRecordStore } from '../../../runtime/agent-session-record-store'
-import type {
-  SwitchClaim,
-  SwitchSpawnOutcome
-} from '../../../runtime/session-tabs/structured-session-switch-claims'
+import type { SwitchClaim } from '../../../runtime/session-tabs/structured-session-switch-claims'
+import { TERMINAL_SWITCH_GENERATION_ENV } from '../../../../shared/terminal-switch'
 import {
   agentSessionLeasePossiblyWriting,
   listStructuredProviderSessionOwnership
@@ -42,13 +40,16 @@ export type AdmissionRuntime = {
     paneKey: string
   ): Promise<SleepingAgentSessionRecord | undefined>
   openAgentSessionRecordStore(): Promise<AgentSessionRecordStore>
-  acceptSwitchStart?(
-    agent: string,
-    id: string,
-    attempt: string,
-    sessionId?: string
-  ): SwitchClaim | null
-  settleSwitchAttempt?(attempt: string, outcome: SwitchSpawnOutcome): void
+  acceptSwitchStart?(generation: string, paneKey: string): SwitchClaim | null
+  saveSwitchClaim?(claim: SwitchClaim): Promise<boolean>
+  dispatchSwitchStart?(claim: SwitchClaim): { switchGeneration: string; switchOwner: string }
+}
+
+/** The spawn options a switch admission reads its generation from and hands its owner fields to. */
+export type SwitchSpawnOptions = {
+  env?: Record<string, string>
+  switchGeneration?: string
+  switchOwner?: string
 }
 
 /** `chat-home`: an automatic restore of a conversation an open chat continues; `chat-writing`:
@@ -115,31 +116,37 @@ export async function judgeResumes(
   return admitted()
 }
 
-/** The terminal half of a chat's switch: refused into a plain shell where Orca can't judge the pane,
- *  or while a chat may be writing the conversation; otherwise its claim settles with this spawn. */
+/** The terminal half of a chat's switch. Its generation takes this pane and is saved on the chat
+ *  before the owner gets it; a refusal sends nothing, and only the owner then says it never started. */
 export async function admitSwitchResumeSpawn(
   runtime: AdmissionRuntime | undefined,
   args: ResumeSpawnArgs,
   wslDistro: string | null,
-  spawn?: { attempt?: string; sessionId?: string }
+  spawn?: { paneKey: string | null; options: SwitchSpawnOptions }
 ): Promise<ResumeSpawnAdmission> {
+  const generation = args.env?.[TERMINAL_SWITCH_GENERATION_ENV]
+  delete args.env?.[TERMINAL_SWITCH_GENERATION_ENV]
+  delete spawn?.options.env?.[TERMINAL_SWITCH_GENERATION_ENV]
   const providerSession = normalizeAgentProviderSession(args.resumeProviderSession)
   const agent = args.launchAgent
   if (!providerSession || !agent) {
     throw new Error('switch_start_missing_conversation')
   }
   const refused = { agent, providerSession }
-  const attempt = spawn?.attempt
-  if (args.connectionId || wslDistro !== null || !runtime?.acceptSwitchStart || !attempt) {
+  if (args.connectionId || wslDistro !== null || !generation || !spawn?.paneKey) {
     return { verdict: 'unverifiable', refused }
   }
   // Before any await: a chat start whose census ends after this point sees the claim.
-  if (!runtime.acceptSwitchStart(agent, providerSession.id, attempt, spawn.sessionId)) {
+  const claim = runtime?.acceptSwitchStart?.(generation, spawn.paneKey)
+  if (!claim || claim.providerSessionId !== providerSession.id) {
     return { verdict: 'chat-writing', refused }
   }
+  if (!(await runtime?.saveSwitchClaim?.(claim))) {
+    return { verdict: 'unverifiable', refused }
+  }
   const admission = await judgeResumes(runtime, [refused], true)
-  if (admission.verdict !== 'admitted') {
-    runtime.settleSwitchAttempt?.(attempt, 'not-started')
+  if (admission.verdict === 'admitted' && runtime?.dispatchSwitchStart) {
+    Object.assign(spawn.options, runtime.dispatchSwitchStart(claim))
   }
   return admission
 }
diff --git a/src/main/ipc/pty/host-env/saved-resume-admission.ts b/src/main/ipc/pty/host-env/saved-resume-admission.ts
index b4f09a31fd06..4a3ff4715321 100644
--- a/src/main/ipc/pty/host-env/saved-resume-admission.ts
+++ b/src/main/ipc/pty/host-env/saved-resume-admission.ts
@@ -7,14 +7,14 @@ import type { AgentStatusIpcPayload } from '../../../../shared/agent-status-type
 import { agentHookServer } from '../../../agent-hooks/server'
 import { LOCAL_EXECUTION_HOST_ID, type ExecutionHostId } from '../../../../shared/execution-host'
 import type { WorkspaceSessionState } from '../../../../shared/workspace-session-state-types'
-import type { SwitchSpawnOutcome } from '../../../runtime/session-tabs/structured-session-switch-claims'
 import {
   admitSwitchResumeSpawn,
   judgeResumes,
   type AdmissionRuntime,
   type ResumeSpawnAdmission,
   type ResumeSpawnArgs,
-  type ResumeSpawnRefusal
+  type ResumeSpawnRefusal,
+  type SwitchSpawnOptions
 } from './resume-spawn-judgement'
 
 export type {
@@ -28,7 +28,7 @@ export async function admitResumeSpawn(
   runtime: AdmissionRuntime | undefined,
   args: ResumeSpawnArgs,
   wslDistro: string | null,
-  spawn?: { attempt?: string; sessionId?: string }
+  spawn?: { paneKey: string | null; options: SwitchSpawnOptions }
 ): Promise<ResumeSpawnAdmission | null> {
   if (args.resumeOrigin === 'switch') {
     return admitSwitchResumeSpawn(runtime, args, wslDistro, spawn)
@@ -107,17 +107,6 @@ export function dropAgentLaunch(args: ResumeSpawnArgs): void {
   delete args.resumeProviderSession
 }
 
-/** Every exit of a switch spawn settles its attempt's claim; `admitSwitchResumeSpawn` explains how. */
-export function settleSwitchSpawn(
-  runtime: AdmissionRuntime | undefined,
-  attempt: string | undefined,
-  outcome: SwitchSpawnOutcome
-): void {
-  if (attempt) {
-    runtime?.settleSwitchAttempt?.(attempt, outcome)
-  }
-}
-
 export function resumeSpawnRefusal(
   admission: ResumeSpawnAdmission | null
 ): ResumeSpawnRefusal | null {
@@ -161,24 +150,20 @@ export function savedResumeRecord(
     : undefined
 }
 
-/** Runs only in the fresh branch, after stable/claimed owner adoption has settled. A switch's claim
- *  is owned by this spawn attempt: its host session id, else its pane. */
+/** Runs only in the fresh branch, after stable/claimed owner adoption has settled. */
 export async function chooseSavedResumeFreshLaunch(
   spawn: {
     deps: { runtime?: AdmissionRuntime }
     expectedWslDistro: string | null
-    spawnOptions: ResumeSpawnArgs & { startupCommandDelivery?: unknown; startupIngress?: unknown }
-    effectiveSessionAppId: string | undefined
-    switchAttempt?: string
+    spawnOptions: ResumeSpawnArgs &
+      SwitchSpawnOptions & { startupCommandDelivery?: unknown; startupIngress?: unknown }
   },
   args: ResumeSpawnArgs,
   paneKey: string | null
 ): Promise<ResumeSpawnAdmission | null> {
-  const sessionId = spawn.effectiveSessionAppId
-  spawn.switchAttempt = sessionId ?? paneKey ?? undefined
   const admission = await admitResumeSpawn(spawn.deps.runtime, args, spawn.expectedWslDistro, {
-    attempt: spawn.switchAttempt,
-    sessionId
+    paneKey,
+    options: spawn.spawnOptions
   })
   if (resumeSpawnRefusal(admission)) {
     suppressSavedResumeLaunch(args, spawn.spawnOptions)
diff --git a/src/main/ipc/pty/ipc/spawn-commit.ts b/src/main/ipc/pty/ipc/spawn-commit.ts
index 318915331061..789d1047484c 100644
--- a/src/main/ipc/pty/ipc/spawn-commit.ts
+++ b/src/main/ipc/pty/ipc/spawn-commit.ts
@@ -177,7 +177,8 @@ async function commitReservedPtyIpcSpawn(ctx: PtyIpcSpawnState): Promise<PtySpaw
     worktreeId: args.worktreeId,
     launchedAt: ctx.codexHomeLaunchStartedAt,
     resumeArgvDropped: ctx.codexResumeLaunch.droppedResumeArgv,
-    result: ctx.result
+    result: ctx.result,
+    switchGeneration: ctx.spawnOptions.switchGeneration
   })
   // Why: record the spawn-result pid once here so the memory module needn't reach back into ipc/pty on a hot path (works for in-process and daemon-hosted PTYs).
   const spawnedPid = ctx.result.pid ?? null
diff --git a/src/main/ipc/pty/ipc/spawn-run.ts b/src/main/ipc/pty/ipc/spawn-run.ts
index de66664d88b5..9bce2857788f 100644
--- a/src/main/ipc/pty/ipc/spawn-run.ts
+++ b/src/main/ipc/pty/ipc/spawn-run.ts
@@ -23,7 +23,6 @@ import {
   captureSavedResumeCleanup,
   admitColdRestoreReattach,
   forgetRefusedResume,
-  settleSwitchSpawn,
   resumeSpawnRefusal,
   savedResumeRecord
 } from '../host-env/saved-resume-admission'
@@ -126,13 +125,8 @@ export async function runPtyIpcSpawn(deps: PtySpawnIpcDeps, args: PtySpawnIpcArg
     if (!ctx.result.isReattach) {
       deps.runtime?.rememberSavedTerminalLaunchResult?.(committed.id, committed)
     }
-    settleSwitchSpawn(deps.runtime, ctx.switchAttempt, { ptyId: committed.id })
     return committed
   } catch (caught) {
-    settleSwitchSpawn(deps.runtime, ctx.switchAttempt, {
-      // A daemon session may exist even with no reply; an in-process spawn that returned none made none.
-      unknown: ctx.result.id || ctx.effectiveSessionAppId
-    })
     const err = endPaneAgentLaunch(ctx, { error: caught }) ?? caught
     releaseAbandonedAgentTeamsLeader(ctx)
     if (ctx.preSpawnHiddenMarkId !== null) {
diff --git a/src/main/ipc/pty/ipc/spawn-state.ts b/src/main/ipc/pty/ipc/spawn-state.ts
index 1b7238cba217..e7c82b057d19 100644
--- a/src/main/ipc/pty/ipc/spawn-state.ts
+++ b/src/main/ipc/pty/ipc/spawn-state.ts
@@ -59,8 +59,6 @@ export type PtyIpcSpawnState = {
   isMintedSessionId: boolean
   effectiveSessionId: string | undefined
   effectiveSessionAppId: string | undefined
-  /** A switch spawn's claim identity, kept apart from the admission a reattach clears. */
-  switchAttempt?: string
   expectedWslDistro: string | null
   baseEnv: Record<string, string> | undefined
   effectiveLaunchConfig: SleepingAgentLaunchConfig | undefined
diff --git a/src/main/ipc/pty/pane/resume-launch-identity.test.ts b/src/main/ipc/pty/pane/resume-launch-identity.test.ts
index 782118dfc5a0..f6cd27f3612b 100644
--- a/src/main/ipc/pty/pane/resume-launch-identity.test.ts
+++ b/src/main/ipc/pty/pane/resume-launch-identity.test.ts
@@ -42,6 +42,13 @@ describe('seedResumeLaunchIdentityFromSpawn', () => {
     })
   })
 
+  it('names the exact execution only for a switch start', () => {
+    seed({ switchGeneration: 'g1', result: { id: 'pty-1', incarnationId: 'i1' } })
+    expect(recordLaunchResumeIdentity).toHaveBeenCalledWith(
+      expect.objectContaining({ execution: { ptyId: 'pty-1', incarnationId: 'i1' } })
+    )
+  })
+
   it.each([
     ['a reattached process', { result: { id: 'pty-1', isReattach: true } }],
     ['a Codex resume that fell back to a fresh session', { resumeArgvDropped: true }],
diff --git a/src/main/ipc/pty/pane/resume-launch-identity.ts b/src/main/ipc/pty/pane/resume-launch-identity.ts
index ab0945d0fdbb..0757be7c7ca1 100644
--- a/src/main/ipc/pty/pane/resume-launch-identity.ts
+++ b/src/main/ipc/pty/pane/resume-launch-identity.ts
@@ -4,6 +4,7 @@ import {
   normalizeAgentProviderSession
 } from '../../../../shared/agent-session-resume'
 import type { PtySpawnResult } from '../../../providers/pty-provider-contract'
+import type { TerminalExecutionStamp } from '../../../../shared/terminal-switch'
 
 /**
  * Record a fresh resume launch's provider session in the hook store, so every reader (phone tab
@@ -20,6 +21,8 @@ export function seedResumeLaunchIdentityFromSpawn(args: {
   /** The Codex resume fell back to a fresh session, so the pane does not hold this one. */
   resumeArgvDropped: boolean
   result: PtySpawnResult
+  /** Set on a chat → terminal switch start: its row then names the exact execution. */
+  switchGeneration?: string
 }): void {
   // Why: a reattached process already reported its own identity; an SSH pane's rows belong to
   // its relay, which owns that host's status.
@@ -32,10 +35,12 @@ export function seedResumeLaunchIdentityFromSpawn(args: {
   ) {
     return
   }
+  const { id: ptyId, incarnationId } = args.result
   seedResumeLaunchIdentity({
     ...args,
     paneKey: args.paneKey,
-    launchedAt: args.launchedAt.getTime()
+    launchedAt: args.launchedAt.getTime(),
+    ...(args.switchGeneration && incarnationId ? { execution: { ptyId, incarnationId } } : {})
   })
 }
 
@@ -49,6 +54,7 @@ export function seedResumeLaunchIdentity(args: {
   resumeProviderSession: unknown
   worktreeId: unknown
   launchedAt: number
+  execution?: TerminalExecutionStamp
 }): void {
   const agent = args.launchAgent
   const providerSession = normalizeAgentProviderSession(args.resumeProviderSession)
@@ -64,6 +70,7 @@ export function seedResumeLaunchIdentity(args: {
     ...(typeof args.worktreeId === 'string' ? { worktreeId: args.worktreeId } : {}),
     agentType: agent,
     providerSession,
-    launchedAt: args.launchedAt
+    launchedAt: args.launchedAt,
+    ...(args.execution ? { execution: args.execution } : {})
   })
 }
diff --git a/src/main/ipc/pty/runtime/controller.ts b/src/main/ipc/pty/runtime/controller.ts
index f80e78897bf9..52bb65941796 100644
--- a/src/main/ipc/pty/runtime/controller.ts
+++ b/src/main/ipc/pty/runtime/controller.ts
@@ -1,4 +1,6 @@
-import { localProvider } from '../provider/registry'
+import { getProvider, localProvider } from '../provider/registry'
+import { routedTerminalSwitchOwners } from '../../../providers/terminal-switch-owners'
+import { LOCAL_EXECUTION_HOST_ID } from '../../../../shared/execution-host'
 import {
   getLocalAutomaticWorkStatus,
   resumeLocalAutomaticWork
@@ -74,6 +76,11 @@ export function installPtyRuntimeController(deps: PtyRuntimeControllerDeps): voi
     clearBuffer: (ptyId) => clearBufferFromRuntimeController(deps, ptyId),
     resetInputModes: (ptyId) => resetInputModesFromRuntimeController(deps, ptyId),
     hasPty: (ptyId) => hasPtyFromRuntimeController(deps, ptyId),
+    // Resolved per call: the local route can move between the daemon and its in-process fallback.
+    terminalSwitches: routedTerminalSwitchOwners(
+      () => getProvider(LOCAL_EXECUTION_HOST_ID),
+      () => [getProvider(LOCAL_EXECUTION_HOST_ID)]
+    ),
     listProcesses: (hostId, opts) => listProcessesFromRuntimeController(deps, hostId, opts),
     listProcessesWithHostScope: (opts) =>
       listProcessesWithHostScopeFromRuntimeController(deps, opts),
diff --git a/src/main/ipc/pty/runtime/spawn-commit.ts b/src/main/ipc/pty/runtime/spawn-commit.ts
index 8f8bfef1b120..12f4cf4cd903 100644
--- a/src/main/ipc/pty/runtime/spawn-commit.ts
+++ b/src/main/ipc/pty/runtime/spawn-commit.ts
@@ -244,7 +244,8 @@ async function commitReservedRuntimePtySpawn(ctx: RuntimePtySpawnState) {
     worktreeId: args.worktreeId,
     launchedAt: ctx.codexHomeLaunchStartedAt,
     resumeArgvDropped: ctx.codexResumeArgvDropped,
-    result: ctx.result
+    result: ctx.result,
+    switchGeneration: ctx.spawnOptions.switchGeneration
   })
   // Why: runtime-owned/background spawns bypass mounted-pane state, so inventory consumers need an explicit signal.
   ctx.deps.sendPtySpawnedToRenderer(ctx.result.id)
diff --git a/src/main/ipc/pty/runtime/spawn-state.ts b/src/main/ipc/pty/runtime/spawn-state.ts
index 9473741d3a1a..5ca761ba57ab 100644
--- a/src/main/ipc/pty/runtime/spawn-state.ts
+++ b/src/main/ipc/pty/runtime/spawn-state.ts
@@ -44,8 +44,6 @@ export type RuntimePtySpawnState = {
   requestedSessionId: string | undefined
   sessionId: string | undefined
   effectiveSessionAppId: string | undefined
-  /** A switch spawn's claim identity, kept apart from the admission a reattach clears. */
-  switchAttempt?: string
   isNewDaemonSession: boolean
   expectedWslDistro: string | null
   /** The host's verdict on the spawn's resume; a refused one starts the pane's plain shell. */
diff --git a/src/main/ipc/pty/runtime/spawn.ts b/src/main/ipc/pty/runtime/spawn.ts
index 90e82e81ea0a..e75366b4adc6 100644
--- a/src/main/ipc/pty/runtime/spawn.ts
+++ b/src/main/ipc/pty/runtime/spawn.ts
@@ -4,8 +4,7 @@ import {
   savedResumeRecord,
   savedResumeResult,
   resumeSpawnRefusal,
-  forgetRefusedResume,
-  settleSwitchSpawn
+  forgetRefusedResume
 } from '../host-env/saved-resume-admission'
 import { isTerminalLeafId, makePaneKey } from '../../../../shared/stable-pane-id'
 import { isValidTerminalTabId } from '../../../../shared/terminal-tab-id'
@@ -133,13 +132,8 @@ export async function spawnPtyFromRuntimeController(
     if (!ctx.result.isReattach) {
       deps.runtime?.rememberSavedTerminalLaunchResult?.(committed.id, committed)
     }
-    settleSwitchSpawn(deps.runtime, ctx.switchAttempt, { ptyId: committed.id })
     return committed
   } catch (err) {
-    settleSwitchSpawn(deps.runtime, ctx.switchAttempt, {
-      // A daemon session may exist even with no reply; an in-process spawn that returned none made none.
-      unknown: ctx.result.id || ctx.effectiveSessionAppId
-    })
     releaseRuntimeSpawnPreSpawnHiddenMark(ctx)
     if (ctx.pendingRegistrationPtyId) {
       deps.runtime?.cancelPendingPtyRegistration?.(
diff --git a/src/main/providers/local-pty-provider-spawn-session.test.ts b/src/main/providers/local-pty-provider-spawn-session.test.ts
index a6eb775f461f..80b34937a253 100644
--- a/src/main/providers/local-pty-provider-spawn-session.test.ts
+++ b/src/main/providers/local-pty-provider-spawn-session.test.ts
@@ -610,5 +610,24 @@ describe('LocalPtyProvider', () => {
       expect(spawnMock).toHaveBeenCalledOnce()
       expect(committed).toHaveBeenCalledOnce()
     })
+
+    it('keeps a switch start bound to its process past a failed publication, until it exits', async () => {
+      spawnMock.mockClear()
+      const switchOwner = (await provider.terminalSwitches.owner()) ?? ''
+      const seen = async () => (await provider.terminalSwitches.observe('g-local', true))[0]
+      provider.configure({
+        onSpawned: () => {
+          throw new Error('post-spawn publication failed')
+        }
+      })
+      const start = () =>
+        provider.spawn({ cols: 80, rows: 24, switchGeneration: 'g-local', switchOwner })
+      await expect(start()).rejects.toThrow('post-spawn publication failed')
+      expect((await seen())?.observation).toMatchObject({ state: 'bound', shellPid: mockProc.pid })
+      await expect(start()).rejects.toThrow('terminal_switch_generation_refused')
+      expect(spawnMock).toHaveBeenCalledOnce()
+      exitCb?.({ exitCode: 0 })
+      expect((await seen())?.observation).toEqual({ state: 'ended' })
+    })
   })
 })
diff --git a/src/main/providers/local-pty-provider.ts b/src/main/providers/local-pty-provider.ts
index a0111670bfd9..6241d0aff92f 100644
--- a/src/main/providers/local-pty-provider.ts
+++ b/src/main/providers/local-pty-provider.ts
@@ -53,6 +53,7 @@ import {
 } from './local-pty-session-operations'
 import { spawnLocalPty } from './local-pty-spawn'
 import { cancelAllPendingLocalPtySpawns } from './local-pty-spawn-state'
+import { localTerminalSwitchOwner, observeLocalTerminalSwitch } from './local-pty-terminal-switch'
 import { killAllLocalPtys, killOrphanedLocalPtys, shutdownLocalPty } from './local-pty-termination'
 
 export type { LocalPtyProviderOptions } from './local-pty-provider-types'
@@ -82,6 +83,10 @@ export class LocalPtyProvider implements IPtyProvider {
   spawn(args: PtySpawnOptions): Promise<PtySpawnResult> {
     return spawnLocalPty(args, () => this.opts)
   }
+  readonly terminalSwitches = {
+    owner: async () => localTerminalSwitchOwner(),
+    observe: observeLocalTerminalSwitch
+  }
 
   // Local PTYs are always attached -- no-op. Remote providers use this to resubscribe.
   async attach(_id: string): Promise<void> {}
diff --git a/src/main/providers/local-pty-session-activation.ts b/src/main/providers/local-pty-session-activation.ts
index e7782b34bb8d..cdea1a8f881b 100644
--- a/src/main/providers/local-pty-session-activation.ts
+++ b/src/main/providers/local-pty-session-activation.ts
@@ -1,4 +1,5 @@
 import type * as pty from 'node-pty'
+import { settleLocalTerminalSwitchStartup } from './local-pty-terminal-switch'
 import { isBracketedPasteSafeShell } from '../../shared/startup-command-submission'
 import {
   discardStagedStartupCommand,
@@ -206,9 +207,12 @@ export function activateLocalPtySession(args: {
         readiness.setStartupCommandCleanup(cleanup)
       },
       {
-        bracketedPasteSafe
+        bracketedPasteSafe,
+        onSettled: () => settleLocalTerminalSwitchStartup(id)
       }
     )
+  } else {
+    settleLocalTerminalSwitchStartup(id)
   }
 
   // Why: publish the OS pid for the memory collector; proc.pid can be briefly 0/undefined before node-pty sees the child.
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 5fefb5db5fac..71b3b38c34cd 100644
--- a/src/main/providers/local-pty-shell-ready-startup-command.ts
+++ b/src/main/providers/local-pty-shell-ready-startup-command.ts
@@ -18,13 +18,16 @@ export function writeStartupCommandWhenShellReady(
   startupCommand: string,
   onExit: (cleanup: () => void) => void,
   // Why: only shells with bracketed-paste active (see isBracketedPasteSafeShell) accept the wrapper; others use the raw path so ESC[200~ isn't echoed.
-  options: { bracketedPasteSafe?: boolean } = {}
+  options: { bracketedPasteSafe?: boolean; onSettled?: () => void } = {}
 ): void {
   let sent = false
   let postReadyTimer: ReturnType<typeof setTimeout> | null = null
   let postReadyDataDisposable: { dispose: () => void } | null = null
 
   const cleanup = (): void => {
+    if (!sent) {
+      options.onSettled?.()
+    }
     sent = true
     if (postReadyTimer !== null) {
       clearTimeout(postReadyTimer)
@@ -52,6 +55,7 @@ export function writeStartupCommandWhenShellReady(
         bracketedPasteSafe: options.bracketedPasteSafe === true
       })
     )
+    options.onSettled?.()
   }
 
   const schedulePostReadyFlush = (): void => {
diff --git a/src/main/providers/local-pty-spawn.ts b/src/main/providers/local-pty-spawn.ts
index 50e01861b8a2..f8e6e75053e3 100644
--- a/src/main/providers/local-pty-spawn.ts
+++ b/src/main/providers/local-pty-spawn.ts
@@ -1,4 +1,9 @@
 import { randomUUID } from 'node:crypto'
+import {
+  beginLocalTerminalSwitch,
+  commitLocalTerminalSwitch,
+  endUnstartedLocalTerminalSwitch
+} from './local-pty-terminal-switch'
 import { win32 as pathWin32 } from 'node:path'
 import { mkdir } from 'node:fs/promises'
 import { JCODE_RUNTIME_DIR_ENV_KEY } from '../../shared/jcode-runtime-dir'
@@ -56,7 +61,9 @@ export async function spawnLocalPty(
     }
   }
   const id = allocatePtyId(reattachId ?? undefined)
-  return runCancelableLocalPtySpawn(id, async (throwIfCanceled, cancellation) => {
+  beginLocalTerminalSwitch(args.switchGeneration, args.switchOwner)
+  let committed = false
+  const spawned = runCancelableLocalPtySpawn(id, async (throwIfCanceled, cancellation) => {
     const incarnationId = randomUUID()
     let plan = createLocalPtyLaunchPlan(args, getOptions)
     if (plan instanceof DeferredLocalPtyLaunchPlan) {
@@ -137,6 +144,12 @@ export async function spawnLocalPty(
         throw error
       }
       args.onPtySpawnCommitted?.()
+      committed = true
+      commitLocalTerminalSwitch(args.switchGeneration, {
+        id,
+        incarnationId,
+        proc: spawnResult.process
+      })
       plan.shellPath = spawnResult.shellPath
       // Why: a Windows fallback embeds its startup command in argv; honor the winning shell's delivery flag to avoid a double write.
       if (spawnResult.startupCommandDeliveredInShellArgs !== undefined) {
@@ -172,4 +185,10 @@ export async function spawnLocalPty(
       })
     })
   })
+  // A spawn that never committed a process (thrown, canceled, or joined a winner) started nothing.
+  return spawned.finally(() => {
+    if (!committed) {
+      endUnstartedLocalTerminalSwitch(args.switchGeneration)
+    }
+  })
 }
diff --git a/src/main/providers/local-pty-terminal-switch.ts b/src/main/providers/local-pty-terminal-switch.ts
new file mode 100644
index 000000000000..2981f8ad66bd
--- /dev/null
+++ b/src/main/providers/local-pty-terminal-switch.ts
@@ -0,0 +1,101 @@
+// The in-process owner of a chat → terminal switch start. A generation is bound before any physical
+// work and to the process the moment it exists, so a publication that throws later cannot hide it.
+import { randomUUID } from 'node:crypto'
+import type { IPty } from 'node-pty'
+import type { TerminalSwitchOwnerAnswer } from '../../shared/terminal-switch'
+
+const OWNER = `local:${randomUUID()}`
+
+type LocalSwitch =
+  | { state: 'pending' | 'ended' }
+  | {
+      state: 'bound'
+      id: string
+      incarnationId: string
+      pid: number
+      exited: boolean
+      startupSettled: boolean
+    }
+
+const switches = new Map<string, LocalSwitch>()
+
+export function localTerminalSwitchOwner(): string {
+  return OWNER
+}
+
+/** Before any physical work: a foreign owner or an already used or fenced generation refuses. */
+export function beginLocalTerminalSwitch(generation: string | undefined, owner?: string): void {
+  if (generation === undefined) {
+    return
+  }
+  if (owner !== OWNER || switches.has(generation)) {
+    throw new Error('terminal_switch_generation_refused')
+  }
+  switches.set(generation, { state: 'pending' })
+}
+
+/** The process exists: from here only its own exit ends the switch. */
+export function commitLocalTerminalSwitch(
+  generation: string | undefined,
+  execution: { id: string; incarnationId: string; proc: IPty }
+): void {
+  if (generation === undefined) {
+    return
+  }
+  const bound: LocalSwitch = {
+    state: 'bound',
+    id: execution.id,
+    incarnationId: execution.incarnationId,
+    pid: execution.proc.pid,
+    exited: false,
+    startupSettled: false
+  }
+  switches.set(generation, bound)
+  execution.proc.onExit(() => {
+    bound.exited = true
+  })
+}
+
+/** A start that threw before its process existed started nothing. */
+export function endUnstartedLocalTerminalSwitch(generation: string | undefined): void {
+  if (generation !== undefined && switches.get(generation)?.state === 'pending') {
+    switches.set(generation, { state: 'ended' })
+  }
+}
+
+/** The startup command was written, revoked, or never owed: nothing can still deliver it. */
+export function settleLocalTerminalSwitchStartup(id: string): void {
+  for (const entry of switches.values()) {
+    if (entry.state === 'bound' && entry.id === id) {
+      entry.startupSettled = true
+    }
+  }
+}
+
+/** An unseen generation is fenced, so a late start carrying it refuses and absence means no start. */
+export async function observeLocalTerminalSwitch(
+  generation: string,
+  fence: boolean
+): Promise<TerminalSwitchOwnerAnswer[]> {
+  const entry: LocalSwitch = switches.get(generation) ?? { state: fence ? 'ended' : 'pending' }
+  if (fence) {
+    switches.set(generation, entry)
+  }
+  const observation =
+    entry.state !== 'bound'
+      ? { state: entry.state }
+      : entry.exited
+        ? { state: 'ended' as const }
+        : {
+            state: 'bound' as const,
+            ptyId: entry.id,
+            incarnationId: entry.incarnationId,
+            shellPid: entry.pid > 0 ? entry.pid : null,
+            startupSettled: entry.startupSettled
+          }
+  return [{ owner: OWNER, observation }]
+}
+
+export function resetLocalTerminalSwitchesForTest(): void {
+  switches.clear()
+}
diff --git a/src/main/providers/pty-provider-contract.ts b/src/main/providers/pty-provider-contract.ts
index cd68eb5df862..53522f753b4c 100644
--- a/src/main/providers/pty-provider-contract.ts
+++ b/src/main/providers/pty-provider-contract.ts
@@ -1,4 +1,5 @@
 import type { SpawnIntent } from '../../shared/host-spawn-admission'
+import type { TerminalSwitchOwners } from '../../shared/terminal-switch'
 import type { TuiAgent } from '../../shared/tui-agent'
 import type { AgentWorkspaceTrustSpawnRequest } from '../../shared/agent-workspace-trust-spawn-request'
 import type { PtyStartupIngressIntent } from '../../shared/pty-startup-ingress'
@@ -118,6 +119,10 @@ export type PtySpawnOptions = {
   onPtySpawnCommitted?: () => void
   /** Cancels only before physical dispatch; operation identity fences later ambiguity. */
   signal?: AbortSignal
+  /** A chat → terminal switch's start: the owner binds this generation to this one fresh spawn and
+   *  refuses it when `switchOwner` names another owner or the generation was already used. */
+  switchGeneration?: string
+  switchOwner?: string
 }
 
 export type { PtyProcessInfo, PtySpawnResult }
@@ -137,6 +142,8 @@ export type IPtyProvider = {
   /** Re-probes a degraded durable host before main commits to fallback spawn semantics. */
   recoverFreshSpawnRouting?: () => Promise<boolean>
   spawn(opts: PtySpawnOptions): Promise<PtySpawnResult>
+  /** Present only where an owner can hold and observe a chat → terminal switch start. */
+  terminalSwitches?: TerminalSwitchOwners
   /** Process-owner cleanup for history stored outside the workspace tree. */
   deleteWorktreeHistory?: (worktreeId: string) => Promise<void>
   /** Whether this spawn target can append the Git guard after its final env merge. */
diff --git a/src/main/providers/terminal-switch-owners.ts b/src/main/providers/terminal-switch-owners.ts
new file mode 100644
index 000000000000..37207763bd5a
--- /dev/null
+++ b/src/main/providers/terminal-switch-owners.ts
@@ -0,0 +1,22 @@
+import type { TerminalSwitchOwners } from '../../shared/terminal-switch'
+
+type Reach = { terminalSwitches?: TerminalSwitchOwners }
+
+/** A routing provider's owners: fresh starts go to one; any of them may hold an older start. */
+export function routedTerminalSwitchOwners(
+  fresh: () => Reach,
+  all: () => readonly Reach[]
+): TerminalSwitchOwners {
+  return {
+    owner: async () => (await fresh().terminalSwitches?.owner()) ?? null,
+    // An owner that cannot answer is left out, so the caller reads the start as unverifiable.
+    observe: async (generation, fence) =>
+      (
+        await Promise.all(
+          all().map(
+            (owner) => owner.terminalSwitches?.observe(generation, fence).catch(() => []) ?? []
+          )
+        )
+      ).flat()
+  }
+}
diff --git a/src/main/runtime/agent-session-record-store.ts b/src/main/runtime/agent-session-record-store.ts
index 849096dfceae..174d66f774bd 100644
--- a/src/main/runtime/agent-session-record-store.ts
+++ b/src/main/runtime/agent-session-record-store.ts
@@ -1,6 +1,8 @@
 /** Durable single-writer session records and their operation ledger, as rows in the host's chat
  *  journal database. */
 
+import { setAgentSessionRecordTerminalSwitch } from './agent-session-record-terminal-switch'
+import type { TerminalSwitchWrite } from '../../shared/terminal-switch'
 import { backfillAgentSessionPermissionModes } from './agent-session-permission-backfill'
 import { agentSessionRefusalError } from '../../shared/agent-session-wire-refusals'
 import { createAgentSessionConversationReceipts } from './agent-session-conversation-receipts'
@@ -181,6 +183,9 @@ export class AgentSessionRecordStore {
   compareAndSetConversationName: CompareAndSetConversationName = (sessionId, name, expected) =>
     compareAndSetAgentSessionRecordName((apply) => this.mutate(sessionId, apply), name, expected)
 
+  setTerminalSwitch = (sessionId: string, write: TerminalSwitchWrite) =>
+    this.mutate(sessionId, (r) => setAgentSessionRecordTerminalSwitch(r, write, Date.now()))
+
   /** Unfenced like the name: it records where a launch ran and never contends with the lease. */
   pinLaunchDirectory = (sessionId: string, launchDirectory: string): Promise<AgentSessionRecord> =>
     this.mutate(sessionId, (record) =>
diff --git a/src/main/runtime/agent-session-record-terminal-switch.ts b/src/main/runtime/agent-session-record-terminal-switch.ts
new file mode 100644
index 000000000000..8303517df198
--- /dev/null
+++ b/src/main/runtime/agent-session-record-terminal-switch.ts
@@ -0,0 +1,20 @@
+import type { AgentSessionRecord } from '../../shared/agent-session-record'
+import type { TerminalSwitchWrite } from '../../shared/terminal-switch'
+
+/** Unfenced like the name: the descriptor is the switch owner's obligation, not the writer lease.
+ *  A clear names its generation, so an old completion never clears a newer switch. */
+export function setAgentSessionRecordTerminalSwitch(
+  record: AgentSessionRecord,
+  descriptor: TerminalSwitchWrite,
+  now: number
+): AgentSessionRecord {
+  if ('clear' in descriptor) {
+    if (record.terminalSwitch?.generation !== descriptor.clear) {
+      return record
+    }
+    const next = { ...record, updatedAt: now }
+    delete next.terminalSwitch
+    return next
+  }
+  return { ...record, terminalSwitch: descriptor, updatedAt: now }
+}
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-to-terminal.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-to-terminal.ts
index d3ece1c07326..5c6680d970c2 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-to-terminal.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-to-terminal.ts
@@ -1,9 +1,10 @@
 // `agentSession.switchToTerminal` — the chat's half of moving its conversation into a terminal on
-// the same id. In the chat's ordered step it refuses unless idle, registers the switch's claim,
-// stops the agent with proven exit while the tab stays, and answers the facts a terminal resume
-// needs. The claim refuses a chat start from any view until the terminal it names can be judged.
+// the same id. Before any stop it checks the route can hold the start and prepares the recipe; then,
+// in the chat's ordered step, it refuses unless idle, registers one switch generation and stops the
+// agent with proven exit. Only that generation's terminal owner can later end the switch.
 // Gated per agent by `agent-session.structured.switch.v1:<agent>`; a client never falls back to close.
 
+import { agentSessionRefusalError } from '../../../../shared/agent-session-wire-refusals'
 import { inPlaceSwitchEnabled } from '../../../../shared/structured-agent-cli-conversation-adoption'
 import type { AiVaultChatForkSource } from '../../../../shared/ai-vault-resume-preparation'
 import {
@@ -24,7 +25,10 @@ export const STRUCTURED_AGENT_SESSION_SWITCH_TO_TERMINAL_METHODS = [
     name: 'agentSession.switchToTerminal',
     permission: 'workspace',
     params: OptionsParams,
-    handler: async (params, ctx): Promise<{ source: AiVaultChatForkSource }> => {
+    handler: async (
+      params,
+      ctx
+    ): Promise<{ source: AiVaultChatForkSource; generation: string }> => {
       requireStructuredCapability(ctx)
       await ensureStructuredHostInstalled(ctx)
       const host = requireStructuredSessionHost(ctx, params.sessionId)
@@ -32,27 +36,41 @@ export const STRUCTURED_AGENT_SESSION_SWITCH_TO_TERMINAL_METHODS = [
       if (!record || !inPlaceSwitchEnabled(record.provider)) {
         throw new Error('This chat cannot switch to a terminal on this host.')
       }
-      // Reads only: a chat that can't be resumed in a terminal is refused before anything stops.
+      // Before anything stops: the source, a route that can hold the start, and its recipe.
       const source = await resolveStructuredChatCliSource(
         { sessionId: record.sessionId, workspaceId: record.location.workspaceId },
         false
       )
-      // A switch terminal whose agent provably ended no longer holds the conversation.
+      const owner = await ctx.runtime.terminalSwitchOwner()
+      if (!owner) {
+        throw agentSessionRefusalError('structured_agent_session_unsupported', {
+          reason: 'hostUnsupported'
+        })
+      }
+      const prepared = await prepareStructuredChatCliTranscript(
+        source,
+        (args) => ctx.runtime.prepareAiVaultSessionResume(args),
+        false
+      )
+      if (!prepared.cliForkSource) {
+        throw new Error('This chat has no saved conversation available on this host.')
+      }
+      // A switch whose owner proved its start over no longer holds the conversation.
       await ctx.runtime.releaseEndedSwitchStarts(source.agent, source.providerSessionId)
       let claim: SwitchClaim | undefined
       try {
         await host.switchToTerminal(params.sessionId, () => {
-          claim = ctx.runtime.registerSwitchClaim(source.agent, source.providerSessionId)
+          claim = ctx.runtime.registerSwitchClaim(
+            source.agent,
+            source.providerSessionId,
+            record.sessionId,
+            owner
+          )
         })
-        const prepared = await prepareStructuredChatCliTranscript(
-          source,
-          (args) => ctx.runtime.prepareAiVaultSessionResume(args),
-          false
-        )
-        if (!prepared.cliForkSource) {
-          throw new Error('This chat has no saved conversation available on this host.')
+        if (!claim) {
+          throw new Error('This chat could not switch to a terminal.')
         }
-        return { source: prepared.cliForkSource }
+        return { source: prepared.cliForkSource, generation: claim.generation }
       } catch (error) {
         // No recipe left this host, so nothing can start under the claim.
         if (claim) {
diff --git a/src/main/runtime/runtime-pty-controller-contract.ts b/src/main/runtime/runtime-pty-controller-contract.ts
index 36093a85c70a..7183210b21c3 100644
--- a/src/main/runtime/runtime-pty-controller-contract.ts
+++ b/src/main/runtime/runtime-pty-controller-contract.ts
@@ -1,4 +1,5 @@
 import type { AgentLaunchRuntime } from '../../shared/agent-launch-runtime'
+import type { TerminalSwitchOwners } from '../../shared/terminal-switch'
 import type {
   AutomaticWorkResumeOutcome,
   AutomaticWorkStatus,
@@ -149,6 +150,8 @@ export type RuntimePtyController = {
   resize?(ptyId: string, cols: number, rows: number): boolean
   // Why: exact-id mobile polls should not enumerate every local and SSH PTY.
   hasPty?(ptyId: string): boolean | null
+  /** This machine's terminal owners, for a chat → terminal switch start. */
+  terminalSwitches?: TerminalSwitchOwners
   /** Omitting the host lists every registered host. */
   listProcesses?(
     hostId?: ExecutionHostId,
diff --git a/src/main/runtime/runtime-terminal-state-records.ts b/src/main/runtime/runtime-terminal-state-records.ts
index 3bc5ba90cc66..2e1fd1a1fc96 100644
--- a/src/main/runtime/runtime-terminal-state-records.ts
+++ b/src/main/runtime/runtime-terminal-state-records.ts
@@ -16,7 +16,6 @@ import type { RetainedTailRedrawCursor } from './terminal-tail-redraw-buffer'
 import type { TerminalTailWaitState } from './terminal-wait-tail-state'
 import type { TerminalCommandPaint } from './terminal-command-paint'
 import type { CliWriterConversation } from './structured-agent-cli-writers'
-import type { SwitchStartProof } from './session-tabs/structured-session-switch-claims'
 import type { PtyShellOwnershipMirror } from './pty-shell-ownership-mirror'
 import type { TerminalExitCause } from '../../shared/terminal-exit-cause'
 import type { AgentSessionOwnerBinding } from '../../shared/agent-session-host-authority'
@@ -82,8 +81,6 @@ export type RuntimePtyWorktreeRecord = RuntimeTerminalTailState & {
     incarnationId: PtyIncarnationId | null
     byKey: Map<string, CliWriterConversation>
   }
-  /** The switch's own start of a conversation in this execution; ends only on an observed exit. */
-  switchStart?: SwitchStartProof
   foregroundAgent: TerminalAgent | null
   connected: boolean
   disconnectedAt: number | null
diff --git a/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts b/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts
index 8b8a8be6c98a..677355129b6e 100644
--- a/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts
+++ b/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts
@@ -4,9 +4,12 @@ import {
 } from '../../../shared/agent-session-resume'
 import { LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host'
 import type { StructuredAgentId } from '../../../shared/agent-session-provider-handle'
-import { agentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
-import { OrcaRuntimeWithStructuredSessionSwitchClaims } from './structured-session-switch-claims'
 import { switchStartProcessVerdict } from './structured-session-switch-observation'
+import {
+  OrcaRuntimeWithStructuredSessionSwitchClaims,
+  switchHeldRefusal,
+  switchMovingRefusal
+} from './structured-session-switch-claims'
 import { getProviderForPty } from '../../ipc/pty/provider/registry'
 import { LocalPtyProvider } from '../../providers/local-pty-provider'
 import { inspectPtyProviderProcess } from '../../providers/pty-process-inspection'
@@ -132,7 +135,7 @@ export abstract class OrcaRuntimeWithStructuredSessionCliWriterHost extends Orca
     providerSessionId: string,
     source?: { workspaceId: string; paneKey: string }
   ): Promise<void> {
-    await this.reconcileSwitchAttempts()
+    await this.loadSwitchClaims()
     this.assertNoPendingSwitch(agent, providerSessionId)
     await this.assertSwitchStartsEnded(agent, providerSessionId)
     await assertCliConversationWritersExited(
@@ -179,31 +182,42 @@ export abstract class OrcaRuntimeWithStructuredSessionCliWriterHost extends Orca
       source && { paneKey: source.paneKey, worktreeId: source.workspaceId }
     )
     // A switch spawn admitted during the census either registered first or read this chat's reservation.
-    this.assertNoPendingSwitch(agent, providerSessionId)
+    this.assertNoPendingSwitch(agent, providerSessionId, true)
   }
 
   async releaseEndedSwitchStarts(agent: string, id: string): Promise<void> {
-    await this.reconcileSwitchAttempts()
+    await this.loadSwitchClaims()
     await this.assertSwitchStartsEnded(agent, id).catch(() => undefined)
   }
 
-  /** A switch's terminal holds its conversation until the agent it started there is proven gone. */
+  /** A switch's start holds its conversation until its owner proves it over, or its startup has
+   *  settled, every agent recorded there is proved exited and that exact shell is alone. */
   private async assertSwitchStartsEnded(agent: string, id: string): Promise<void> {
-    for (const { ptyId, proof } of this.boundSwitchStarts(agent, id)) {
-      const pane = this.cliWriterPtyPane(ptyId)
-      const verdicts = await Promise.all(proof.processes.map(switchStartProcessVerdict))
-      if (
-        !pane ||
-        verdicts.length === 0 ||
-        verdicts.some((verdict) => verdict !== 'exited') ||
-        !(await this.cliWriterShellAlone(pane)) ||
-        this.ptysById.get(ptyId)?.switchStart !== proof
-      ) {
-        throw agentSessionRefusalError('agent_session_conflict', {
-          reason: 'conversationHeldElsewhere'
-        })
+    for (const claim of this.switchClaimsFor(agent, id)) {
+      if (!claim.accepted) {
+        throw switchMovingRefusal()
+      }
+      const seen = await this.observeSwitch(claim, true)
+      if (seen.state === 'bound') {
+        await this.noteSwitchBound(claim, seen)
+      }
+      const pane = seen.state === 'bound' ? this.cliWriterPtyPane(seen.ptyId) : null
+      const agentsEnded =
+        seen.state === 'bound' &&
+        seen.startupSettled &&
+        claim.processes.length > 0 &&
+        pane?.incarnationId === seen.incarnationId &&
+        (await Promise.all(claim.processes.map(switchStartProcessVerdict))).every(
+          (verdict) => verdict === 'exited'
+        ) &&
+        (await this.cliWriterShellAlone(pane))
+      if (seen.state === 'ended' || agentsEnded) {
+        await this.releaseSwitchClaim(claim)
+        continue
       }
-      delete this.ptysById.get(ptyId)?.switchStart
+      throw seen.state === 'pending' || (seen.state === 'bound' && !seen.startupSettled)
+        ? switchMovingRefusal()
+        : switchHeldRefusal()
     }
   }
 
diff --git a/src/main/runtime/session-tabs/structured-session-switch-claims.test.ts b/src/main/runtime/session-tabs/structured-session-switch-claims.test.ts
index 03586a60123c..5f484e17ff90 100644
--- a/src/main/runtime/session-tabs/structured-session-switch-claims.test.ts
+++ b/src/main/runtime/session-tabs/structured-session-switch-claims.test.ts
@@ -1,11 +1,19 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
 import '../rpc/unused-default-rpc-methods.test-fixture'
 import { OrcaRuntimeService } from '../orca-runtime'
 import { admitSwitchResumeSpawn } from '../../ipc/pty/host-env/resume-spawn-judgement'
+import type { AdmissionRuntime } from '../../ipc/pty/host-env/resume-spawn-judgement'
+import { TerminalHostSwitches } from '../../daemon/terminal-host-switches'
+import type { Session } from '../../daemon/session'
 import { switchStartProcessVerdict } from './structured-session-switch-observation'
-import type { AgentProcessVerdict } from '../../../shared/agent-process-presence'
 import { codexChatHolding } from '../../ai-vault/structured-session-ownership.test-support'
-import type { AdmissionRuntime } from '../../ipc/pty/host-env/resume-spawn-judgement'
+import {
+  TERMINAL_SWITCH_GENERATION_ENV,
+  type TerminalSwitchDescriptor,
+  type TerminalSwitchWrite
+} from '../../../shared/terminal-switch'
+import type { AgentProcessVerdict } from '../../../shared/agent-process-presence'
+import type { SwitchClaim } from './structured-session-switch-claims'
 
 vi.mock('electron', () => ({
   BrowserWindow: { fromId: vi.fn(() => null) },
@@ -15,15 +23,25 @@ vi.mock('electron', () => ({
 }))
 vi.mock('./structured-session-switch-observation', () => ({
   readSwitchPaneAgentProcesses: vi.fn(async () => []),
+  readSwitchShellProcess: vi.fn(async (pid: number) => ({
+    pid,
+    platform: 'linux',
+    startTime: 's'
+  })),
   switchStartProcessVerdict: vi.fn(async (): Promise<AgentProcessVerdict> => 'live')
 }))
 
 const C = 'thread-c'
-const SPAWN = { attempt: 'pane-1' }
 const LEAF = '11111111-1111-4111-8111-111111111111'
-const AGENT = { pid: 999_991, platform: process.platform, startTime: 'started' } as const
+const PANE = `tab-1:${LEAF}`
+const SHELL = { pid: 4242, platform: 'linux', startTime: 's' } as const
+const AGENT = { pid: 999_991, platform: 'linux', startTime: 'started' } as const
 let runtime: OrcaRuntimeService
+let host: TerminalHostSwitches
 let shellAlone: boolean
+let ownerReachable: boolean
+/** The chat records' saved switch descriptors, keyed by chat session id. */
+let saved: Map<string, TerminalSwitchDescriptor>
 
 const chatStart = () => runtime.assertStructuredAdoptionTerminalWritersExited('codex', C)
 const reason = (promise: Promise<unknown>) =>
@@ -31,22 +49,42 @@ const reason = (promise: Promise<unknown>) =>
     () => 'admitted',
     (error: { refusal?: { details?: { reason?: string } } }) => error.refusal?.details?.reason
   )
-function hook(process?: typeof AGENT): void {
-  runtime.recordCliWriterConversation({
-    paneKey: `tab-1:${LEAF}`,
-    connectionId: null,
-    receivedAt: 1,
-    stateStartedAt: 1,
-    providerSession: { key: 'session_id', id: C },
-    payload: { state: 'done', prompt: '', agentType: 'codex' },
-    ...(process ? { agentPresence: { agent: 'codex', process } } : {})
-  })
-}
+// oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the owner reads only these four session facts.
+const session = (facts: Partial<Session>) => ({ ...facts }) as Session
 
 beforeEach(() => {
   shellAlone = true
+  ownerReachable = true
+  saved = new Map()
+  host = new TerminalHostSwitches()
   runtime = new OrcaRuntimeService()
   runtime.registerPty('pty-1', 'wt-1', null, { tabId: 'tab-1', leafId: LEAF, incarnationId: 'i1' })
+  runtime.setPtyController({
+    terminalSwitches: {
+      owner: async () => host.owner,
+      observe: async (generation, fence) => {
+        if (!ownerReachable) {
+          throw new Error('host unreachable')
+        }
+        return [host.observe(generation, fence)]
+      }
+    }
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the switch reads only its owner contract.
+  } as never)
+  vi.spyOn(runtime, 'openAgentSessionRecordStore').mockResolvedValue(
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the switch reads records and writes descriptors only.
+    {
+      listRecords: () =>
+        [...saved].map(([sessionId, terminalSwitch]) => ({ sessionId, terminalSwitch })),
+      setTerminalSwitch: async (sessionId: string, write: TerminalSwitchWrite) => {
+        if (!('clear' in write)) {
+          saved.set(sessionId, write)
+        } else if (saved.get(sessionId)?.generation === write.clear) {
+          saved.delete(sessionId)
+        }
+      }
+    } as never
+  )
   // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the census's one process-table read, replaced by the pane's modeled state.
   vi.spyOn(
     runtime as never as { cliWriterShellAlone: () => Promise<boolean> },
@@ -54,32 +92,51 @@ beforeEach(() => {
   ).mockImplementation(async () => shellAlone)
   vi.mocked(switchStartProcessVerdict).mockResolvedValue('live')
 })
-afterEach(() => vi.useRealTimers())
 
-describe('the switch claim', () => {
-  it('refuses a chat start until a spawn takes it; an accepted start never lapses', async () => {
-    vi.useFakeTimers()
-    runtime.registerSwitchClaim('codex', C)
-    expect(await reason(chatStart())).toBe('conversationMovingToTerminal')
-    vi.advanceTimersByTime(61_000)
-    expect(await reason(chatStart())).toBe('admitted')
+async function acceptedSwitch(): Promise<SwitchClaim> {
+  const claim = runtime.registerSwitchClaim('codex', C, 'chat-1', host.owner)
+  runtime.acceptSwitchStart(claim.generation, PANE)
+  await runtime.saveSwitchClaim(claim)
+  return claim
+}
 
-    runtime.registerSwitchClaim('codex', C)
-    runtime.acceptSwitchStart('codex', C, 'pty-1', 'pty-1')
-    // A spawn slower than the window keeps refusing until it settles.
-    vi.advanceTimersByTime(120_000)
+describe('a chat → terminal switch start', () => {
+  it('is held from the recipe until its owner proves the exact execution over', async () => {
+    const claim = runtime.registerSwitchClaim('codex', C, 'chat-1', host.owner)
     expect(await reason(chatStart())).toBe('conversationMovingToTerminal')
-  })
+    expect(() => runtime.registerSwitchClaim('codex', C, 'chat-1', host.owner)).toThrow(
+      'agent_session_conflict'
+    )
+    expect(runtime.acceptSwitchStart(claim.generation, PANE)).toBe(claim)
+    // One pane takes a generation; a retry there joins it.
+    expect(runtime.acceptSwitchStart(claim.generation, 'tab-2:other')).toBeNull()
+    expect(runtime.acceptSwitchStart(claim.generation, PANE)).toBe(claim)
+    await runtime.saveSwitchClaim(claim)
+    host.begin(claim.generation, host.owner)
+    expect(await reason(chatStart())).toBe('conversationMovingToTerminal')
+    expect(() => host.begin(claim.generation, host.owner)).toThrow(
+      'terminal_switch_generation_refused'
+    )
 
-  it('binds to the switch terminal, ignores identity-only replays, and ends on a proven exit', async () => {
-    runtime.acceptSwitchStart('codex', C, 'pty-1', 'pty-1')
-    runtime.settleSwitchAttempt('pty-1', { ptyId: 'pty-1' })
-    expect(await reason(chatStart())).toBe('conversationHeldElsewhere')
-    // The launch identity names the conversation without proving a start or an exit.
-    hook()
+    const shell = session({ isAlive: true, sessionId: 'pty-1', incarnationId: 'i1', pid: 4242 })
+    host.bind(claim.generation, shell)
+    // Bound with no agent recorded: only the owner's end releases it.
     expect(await reason(chatStart())).toBe('conversationHeldElsewhere')
-    hook(AGENT)
+    expect(saved.get('chat-1')).toMatchObject({ ptyId: 'pty-1', incarnationId: 'i1', shell: SHELL })
+    Object.assign(shell, { isAlive: false })
+    expect(await reason(chatStart())).toBe('admitted')
+    expect(saved.has('chat-1')).toBe(false)
+  })
+
+  it('releases on a proved agent exit with that exact shell alone, keeping the shell', async () => {
+    const claim = await acceptedSwitch()
+    host.begin(claim.generation, host.owner)
+    host.bind(
+      claim.generation,
+      session({ isAlive: true, sessionId: 'pty-1', incarnationId: 'i1', pid: 4242 })
+    )
     expect(await reason(chatStart())).toBe('conversationHeldElsewhere')
+    runtime['noteSwitchStartProcess']('pty-1', { agent: 'codex', id: C }, AGENT)
     vi.mocked(switchStartProcessVerdict).mockResolvedValue('exited')
     shellAlone = false
     expect(await reason(chatStart())).toBe('conversationHeldElsewhere')
@@ -87,69 +144,61 @@ describe('the switch claim', () => {
     expect(await reason(chatStart())).toBe('admitted')
   })
 
-  it('refuses a second switch of the conversation while the first terminal may hold it', () => {
-    runtime.acceptSwitchStart('codex', C, 'pty-1', 'pty-1')
-    runtime.settleSwitchAttempt('pty-1', { ptyId: 'pty-1' })
-    expect(() => runtime.registerSwitchClaim('codex', C)).toThrow('agent_session_conflict')
-  })
-})
-
-describe('a switch spawn attempt owns its claim', () => {
-  const accept = (attempt: string) => runtime.acceptSwitchStart('codex', C, attempt, attempt)
-
-  it('binds a reattach result to its PTY, and that pane exiting releases the conversation', async () => {
-    expect(accept('pty-1')).not.toBeNull()
-    runtime.settleSwitchAttempt('pty-1', { ptyId: 'pty-1' })
-    expect(await reason(chatStart())).toBe('conversationHeldElsewhere')
-    await runtime.onPtyExit('pty-1', 0, 'i1')
-    expect(await reason(chatStart())).toBe('admitted')
-  })
-
-  it('keeps a lost spawn reply until the host proves its session absent', async () => {
-    let listed: { id: string }[] | Error = [{ id: 'lost' }]
-    runtime.setPtyController({
-      listProcesses: async () => {
-        if (listed instanceof Error) {
-          throw listed
-        }
-        return listed
-      }
-      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: reconciliation reads only listProcesses.
-    } as never)
-    accept('lost')
-    runtime.settleSwitchAttempt('lost', { unknown: 'lost' })
-    expect(await reason(chatStart())).toBe('conversationMovingToTerminal')
-    listed = new Error('host unreachable')
-    expect(await reason(chatStart())).toBe('conversationMovingToTerminal')
-    listed = []
+  it('fences a saved start no terminal took, so it can never start later', async () => {
+    const claim = await acceptedSwitch()
     expect(await reason(chatStart())).toBe('admitted')
+    expect(() => host.begin(claim.generation, host.owner)).toThrow(
+      'terminal_switch_generation_refused'
+    )
   })
 
-  it('refuses a delayed second client before and after the first binds; a retry joins', () => {
-    runtime.registerSwitchClaim('codex', C)
-    const b = accept('pty-b')
-    expect(accept('pty-a')).toBeNull()
-    expect(accept('pty-b')).toBe(b)
-    runtime.registerPty('pty-b', 'wt-1', null, {
-      tabId: 'tab-2',
-      leafId: LEAF,
-      incarnationId: 'i2'
+  it('survives a restart: a lost owner never speaks, only the recorded execution can end it', async () => {
+    saved.set('chat-1', {
+      generation: 'g-old',
+      agent: 'codex',
+      providerSessionId: C,
+      owner: 'daemon:gone',
+      paneKey: PANE,
+      ptyId: 'pty-1',
+      incarnationId: 'i1',
+      shell: SHELL,
+      processes: [AGENT]
     })
-    runtime.settleSwitchAttempt('pty-b', { ptyId: 'pty-b' })
-    expect(accept('pty-a')).toBeNull()
+    ownerReachable = false
+    vi.mocked(switchStartProcessVerdict).mockResolvedValue('exited')
+    expect(await reason(chatStart())).toBe('conversationHeldElsewhere')
+    ownerReachable = true
+    vi.mocked(switchStartProcessVerdict).mockResolvedValue('live')
+    expect(await reason(chatStart())).toBe('conversationHeldElsewhere')
+    vi.mocked(switchStartProcessVerdict).mockResolvedValue('exited')
+    expect(await reason(chatStart())).toBe('admitted')
+    expect(saved.has('chat-1')).toBe(false)
   })
 })
 
 describe('a switch spawn', () => {
-  const args = {
+  const args = (generation = 'g1') => ({
     launchAgent: 'codex' as const,
     resumeProviderSession: { key: 'session_id' as const, id: C },
-    resumeOrigin: 'switch'
+    resumeOrigin: 'switch',
+    env: { [TERMINAL_SWITCH_GENERATION_ENV]: generation, KEEP: '1' }
+  })
+  const claim: SwitchClaim = {
+    generation: 'g1',
+    agent: 'codex',
+    providerSessionId: C,
+    owner: 'daemon:o',
+    paneKey: PANE,
+    processes: [],
+    chatSessionId: 'chat-1',
+    at: 0,
+    accepted: true
   }
-  const admission = (writing: boolean) =>
+  const admission = (writing: boolean, savedOk = true) =>
     ({
-      acceptSwitchStart: vi.fn(() => ({ agent: 'codex', id: C, at: 0, accepted: true })),
-      settleSwitchAttempt: vi.fn(),
+      acceptSwitchStart: vi.fn(() => claim),
+      saveSwitchClaim: vi.fn(async () => savedOk),
+      dispatchSwitchStart: vi.fn(() => ({ switchGeneration: 'g1', switchOwner: 'daemon:o' })),
       // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: a switch spawn reads only the store's records and tab index.
       openAgentSessionRecordStore: vi.fn(
         async () =>
@@ -160,31 +209,45 @@ describe('a switch spawn', () => {
       )
     }) satisfies AdmissionRuntime
 
-  it('claims before reading the chat, and a writing chat refuses it into a plain shell', async () => {
+  it('hands the owner its generation only once the start is saved and the chat is quiet', async () => {
     const quiet = admission(false)
-    expect(await admitSwitchResumeSpawn(quiet, args, null, SPAWN)).toMatchObject({
-      verdict: 'admitted'
-    })
-    expect(quiet.acceptSwitchStart).toHaveBeenCalledWith('codex', C, 'pane-1', undefined)
+    const spawnArgs = args()
+    const options: { env?: Record<string, string>; switchGeneration?: string } = {
+      env: { ...spawnArgs.env }
+    }
+    expect(
+      await admitSwitchResumeSpawn(quiet, spawnArgs, null, { paneKey: PANE, options })
+    ).toMatchObject({ verdict: 'admitted' })
+    expect(quiet.acceptSwitchStart).toHaveBeenCalledWith('g1', PANE)
+    expect(options).toEqual({ env: { KEEP: '1' }, switchGeneration: 'g1', switchOwner: 'daemon:o' })
+    expect(spawnArgs.env).toEqual({ KEEP: '1' })
+
     const writing = admission(true)
-    const refused = admitSwitchResumeSpawn(writing, args, null, SPAWN)
-    expect(writing.acceptSwitchStart.mock.invocationCallOrder[0]).toBeLessThan(
-      writing.openAgentSessionRecordStore.mock.invocationCallOrder[0]!
-    )
+    const refused = admitSwitchResumeSpawn(writing, args(), null, { paneKey: PANE, options: {} })
+    // Accepted before the first await, so a chat start's census sees it.
+    expect(writing.acceptSwitchStart).toHaveBeenCalledOnce()
     expect(await refused).toMatchObject({ verdict: 'chat-writing' })
-    expect(writing.settleSwitchAttempt).toHaveBeenCalledWith('pane-1', 'not-started')
+    expect(writing.dispatchSwitchStart).not.toHaveBeenCalled()
+
+    const unsaved = admission(false, false)
+    expect(
+      await admitSwitchResumeSpawn(unsaved, args(), null, { paneKey: PANE, options: {} })
+    ).toMatchObject({ verdict: 'unverifiable' })
+    expect(unsaved.dispatchSwitchStart).not.toHaveBeenCalled()
   })
 
   it('refuses where it cannot judge the pane, and a switch without its conversation', async () => {
     const quiet = admission(false)
+    const spawn = { paneKey: PANE, options: {} }
     expect(
-      await admitSwitchResumeSpawn(quiet, { ...args, connectionId: 'ssh' }, null, SPAWN)
+      await admitSwitchResumeSpawn(quiet, { ...args(), connectionId: 'ssh' }, null, spawn)
     ).toMatchObject({ verdict: 'unverifiable' })
-    expect(await admitSwitchResumeSpawn(quiet, args, 'Ubuntu', SPAWN)).toMatchObject({
+    expect(await admitSwitchResumeSpawn(quiet, args(), 'Ubuntu', spawn)).toMatchObject({
       verdict: 'unverifiable'
     })
     await expect(
-      admitSwitchResumeSpawn(quiet, { ...args, resumeProviderSession: undefined }, null, SPAWN)
+      admitSwitchResumeSpawn(quiet, { ...args(), resumeProviderSession: undefined }, null, spawn)
     ).rejects.toThrow('switch_start_missing_conversation')
+    expect(quiet.acceptSwitchStart).not.toHaveBeenCalled()
   })
 })
diff --git a/src/main/runtime/session-tabs/structured-session-switch-claims.ts b/src/main/runtime/session-tabs/structured-session-switch-claims.ts
index 42bac3577ff0..13f28ebf3c85 100644
--- a/src/main/runtime/session-tabs/structured-session-switch-claims.ts
+++ b/src/main/runtime/session-tabs/structured-session-switch-claims.ts
@@ -1,206 +1,239 @@
+// The conversation index of chat → terminal switch starts. It projects the owner's own answer and
+// never settles a start from a caller's success, exception or a session list's absence.
+import { randomUUID } from 'node:crypto'
 import type { AgentProcessIdentity } from '../../../shared/agent-process-presence'
 import { isSameAgentProcess } from '../../../shared/agent-process-presence'
-import { LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host'
-import type { PtyIncarnationId } from '../../../shared/pty-incarnation'
 import { chatAgentsShareConversations } from '../../../shared/structured-agent-cli-conversation-adoption'
 import { agentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
+import {
+  isTerminalSwitchDescriptor,
+  type TerminalSwitchDescriptor,
+  type TerminalSwitchObservation
+} from '../../../shared/terminal-switch'
 import { OrcaRuntimeWithGetWorktreePs } from '../workspaces/workspace-process-listing'
-import { readSwitchPaneAgentProcesses } from './structured-session-switch-observation'
+import {
+  readSwitchPaneAgentProcesses,
+  readSwitchShellProcess,
+  switchStartProcessVerdict
+} from './structured-session-switch-observation'
 
-/** A recipe no terminal took yet may lapse; expiry only ends a refusal, the spawn re-checks the chat. */
+/** A recipe no terminal took may lapse; once taken, only its owner ends it. */
 const UNACCEPTED_SWITCH_CLAIM_MS = 60_000
 const SWITCH_START_WATCH_POLLS = 120
 const SWITCH_START_WATCH_INTERVAL_MS = 1_000
 
-/** A chat → terminal switch from the chat's stop until its terminal execution exists. */
-export type SwitchClaim = {
-  agent: string
-  id: string
+/** One switch, from the chat's stop. Accepted, it is saved on the chat it left. */
+export type SwitchClaim = TerminalSwitchDescriptor & {
+  chatSessionId: string
   at: number
-  /** A spawn took it: it never lapses, and settles only with that spawn. */
   accepted: boolean
-  /** The accepting spawn's identity (its host session, else its pane); only it joins or settles. */
-  attempt?: string
-  /** The host session to reconcile when the spawn ended without a result. */
-  sessionId?: string
-  unsettled?: true
 }
 
-/** A switch spawn's end: its PTY, a proved non-start, or a session the host may still hold. */
-export type SwitchSpawnOutcome = { ptyId: string } | 'not-started' | { unknown: string | undefined }
-
-/** The switch's start bound to the execution it spawned. */
-export type SwitchStartProof = {
-  incarnationId: PtyIncarnationId
-  agent: string
-  id: string
-  /** The agent processes seen in the pane; none seen keeps the proof until the pane goes. */
-  processes: AgentProcessIdentity[]
-}
-
-const moving = () =>
+export const switchMovingRefusal = () =>
   agentSessionRefusalError('agent_session_operation_invalid', {
     reason: 'conversationMovingToTerminal'
   })
+export const switchHeldRefusal = () =>
+  agentSessionRefusalError('agent_session_conflict', { reason: 'conversationHeldElsewhere' })
 
 export abstract class OrcaRuntimeWithStructuredSessionSwitchClaims extends OrcaRuntimeWithGetWorktreePs {
-  private readonly switchClaims = new Set<SwitchClaim>()
+  private readonly switchClaims = new Map<string, SwitchClaim>()
+  private switchClaimsLoaded: Promise<void> | null = null
 
-  private liveSwitchClaim(agent: string, id: string): SwitchClaim | undefined {
-    let live: SwitchClaim | undefined
-    for (const claim of this.switchClaims) {
+  protected switchClaimsFor(agent: string, id: string): SwitchClaim[] {
+    return [...this.switchClaims.values()].filter((claim) => {
       if (!claim.accepted && Date.now() - claim.at >= UNACCEPTED_SWITCH_CLAIM_MS) {
-        this.switchClaims.delete(claim)
-      } else if (claim.id === id && chatAgentsShareConversations(claim.agent, agent)) {
-        live ??= claim
+        this.switchClaims.delete(claim.generation)
+        return false
       }
-    }
-    return live
+      return claim.providerSessionId === id && chatAgentsShareConversations(claim.agent, agent)
+    })
   }
 
-  /** Throws while a switch of this conversation has not started its terminal yet. */
-  protected assertNoPendingSwitch(agent: string, id: string): void {
-    if (this.liveSwitchClaim(agent, id)) {
-      throw moving()
+  /** Accepted switches saved before a restart stay owed until their owner proves them over. */
+  protected loadSwitchClaims(): Promise<void> {
+    this.switchClaimsLoaded ??= this.openAgentSessionRecordStore().then(
+      (store) => {
+        for (const { sessionId, terminalSwitch } of store.listRecords()) {
+          if (isTerminalSwitchDescriptor(terminalSwitch)) {
+            const claim = { ...terminalSwitch, chatSessionId: sessionId, at: 0, accepted: true }
+            this.switchClaims.set(
+              terminalSwitch.generation,
+              this.switchClaims.get(claim.generation) ?? claim
+            )
+          }
+        }
+      },
+      (error: unknown) => {
+        this.switchClaimsLoaded = null
+        throw error
+      }
+    )
+    return this.switchClaimsLoaded
+  }
+
+  /** Throws while a switch of this conversation exists: one no terminal took yet, or with `all`, any. */
+  protected assertNoPendingSwitch(agent: string, id: string, all = false): void {
+    if (this.switchClaimsFor(agent, id).some((claim) => all || !claim.accepted)) {
+      throw switchMovingRefusal()
     }
   }
 
-  protected boundSwitchStarts(agent: string, id: string) {
-    return [...this.ptysById.values()].flatMap((pty) => {
-      const proof = pty.switchStart
-      return proof &&
-        proof.incarnationId === pty.incarnationId &&
-        proof.id === id &&
-        chatAgentsShareConversations(proof.agent, agent) &&
-        this.getPtyLivenessVerdict(pty.ptyId)?.status !== 'exited'
-        ? [{ ptyId: pty.ptyId, proof }]
-        : []
-    })
+  /** The owner a fresh switch start here would go to; null when this route cannot hold one. */
+  async terminalSwitchOwner(): Promise<string | null> {
+    return (await this.ptyController?.terminalSwitches?.owner().catch(() => null)) ?? null
   }
 
-  /** Synchronous, in the chat's ordered step before its stop: a second switch of the same
-   *  conversation, from any client, refuses while the first may still hold it. */
-  registerSwitchClaim(agent: string, id: string): SwitchClaim {
-    if (this.liveSwitchClaim(agent, id) || this.boundSwitchStarts(agent, id).length > 0) {
-      throw agentSessionRefusalError('agent_session_conflict', {
-        reason: 'conversationHeldElsewhere'
-      })
+  /** In the chat's ordered step before its stop: one switch of a conversation at a time. */
+  registerSwitchClaim(
+    agent: string,
+    id: string,
+    chatSessionId: string,
+    owner: string
+  ): SwitchClaim {
+    if (this.switchClaimsFor(agent, id).length > 0) {
+      throw switchHeldRefusal()
+    }
+    const claim: SwitchClaim = {
+      generation: randomUUID(),
+      agent,
+      providerSessionId: id,
+      owner,
+      paneKey: '',
+      processes: [],
+      chatSessionId,
+      at: Date.now(),
+      accepted: false
     }
-    const claim = { agent, id, at: Date.now(), accepted: false }
-    this.switchClaims.add(claim)
+    this.switchClaims.set(claim.generation, claim)
     return claim
   }
 
+  /** Only a recipe no terminal took can be withdrawn. */
   dropSwitchClaim(claim: SwitchClaim): void {
-    this.switchClaims.delete(claim)
+    if (!claim.accepted) {
+      this.switchClaims.delete(claim.generation)
+    }
   }
 
-  /** Synchronous, before the switch spawn's first await, so a chat start censusing after it refuses.
-   *  Null refuses: another attempt took this conversation, or a switched terminal may hold it. */
-  acceptSwitchStart(
-    agent: string,
-    id: string,
-    attempt: string,
-    sessionId: string | undefined
-  ): SwitchClaim | null {
-    const live = this.liveSwitchClaim(agent, id)
-    if (live?.accepted ? live.attempt !== attempt : !live && this.boundSwitchStarts(agent, id)[0]) {
+  /** Synchronous, before the switch spawn's first await. A generation takes one pane; a retry there
+   *  joins it, and an expired or unknown recipe is refused, never reminted. */
+  acceptSwitchStart(generation: string, paneKey: string): SwitchClaim | null {
+    const claim = this.switchClaims.get(generation)
+    if (
+      !claim ||
+      (claim.accepted
+        ? claim.paneKey !== paneKey
+        : Date.now() - claim.at >= UNACCEPTED_SWITCH_CLAIM_MS)
+    ) {
       return null
     }
-    const claim = live ?? { agent, id, at: Date.now(), accepted: true }
-    Object.assign(claim, { accepted: true, attempt, sessionId: sessionId ?? claim.sessionId })
-    delete claim.unsettled
-    this.switchClaims.add(claim)
+    Object.assign(claim, { accepted: true, paneKey })
     return claim
   }
 
-  /** Only a PTY binds and only a proved non-start drops; an unknown end waits for the host. */
-  settleSwitchAttempt(attempt: string, outcome: SwitchSpawnOutcome): void {
-    const claim = [...this.switchClaims].find((c) => c.accepted && c.attempt === attempt)
-    const sessionId =
-      outcome === 'not-started' ? undefined : 'ptyId' in outcome ? outcome.ptyId : outcome.unknown
-    if (claim && !sessionId) {
-      this.switchClaims.delete(claim)
-    } else if (claim) {
-      Object.assign(claim, { sessionId, unsettled: true })
-      this.bindSwitchStart(claim)
+  /** Saved before dispatch, so a restart still knows the start may exist. */
+  async saveSwitchClaim(claim: SwitchClaim): Promise<boolean> {
+    const { chatSessionId, at: _at, accepted: _accepted, ...descriptor } = claim
+    const store = await this.openAgentSessionRecordStore()
+    return store.setTerminalSwitch(chatSessionId, descriptor).then(
+      () => true,
+      () => false
+    )
+  }
+
+  /** The owner's fields for the dispatch; evidence collection starts with it and decides nothing. */
+  dispatchSwitchStart(claim: SwitchClaim): { switchGeneration: string; switchOwner: string } {
+    void this.watchSwitchStart(claim).catch((error: unknown) =>
+      console.warn('[agent-session] could not watch a switched terminal start', error)
+    )
+    return { switchGeneration: claim.generation, switchOwner: claim.owner }
+  }
+
+  /** The owner's word; when it is gone, only the execution it recorded can prove the start over.
+   *  `fence` makes an unseen generation unusable, so its absence is a proved non-start. */
+  protected async observeSwitch(
+    claim: SwitchClaim,
+    fence: boolean
+  ): Promise<TerminalSwitchObservation> {
+    const answers = await this.ptyController?.terminalSwitches
+      ?.observe(claim.generation, fence)
+      .catch(() => null)
+    const own = answers?.find((answer) => answer.owner === claim.owner)
+    if (own || !answers) {
+      return own?.observation ?? { state: 'unverifiable' }
     }
+    const recorded = claim.shell ? [claim.shell, ...claim.processes] : []
+    const verdicts = await Promise.all(recorded.map(switchStartProcessVerdict))
+    return recorded.length > 0 && verdicts.every((verdict) => verdict === 'exited')
+      ? { state: 'ended' }
+      : { state: 'unverifiable' }
   }
 
-  /** Unsettled attempts against the host's own session list; a failed read keeps them. */
-  protected async reconcileSwitchAttempts(): Promise<void> {
-    const open = [...this.switchClaims].filter((c) => c.unsettled && !this.bindSwitchStart(c))
-    if (open.length === 0) {
+  /** The exact execution the owner bound, saved with its shell's identity. */
+  protected async noteSwitchBound(
+    claim: SwitchClaim,
+    bound: Extract<TerminalSwitchObservation, { state: 'bound' }>
+  ): Promise<void> {
+    if (claim.ptyId === bound.ptyId && claim.incarnationId === bound.incarnationId) {
       return
     }
-    const listed = await this.ptyController
-      ?.listProcesses?.(LOCAL_EXECUTION_HOST_ID)
-      .catch(() => null)
-    for (const claim of open) {
-      if (listed && !this.bindSwitchStart(claim) && !listed.some((p) => p.id === claim.sessionId)) {
-        this.switchClaims.delete(claim)
-      }
+    const shell = bound.shellPid ? await readSwitchShellProcess(bound.shellPid) : null
+    Object.assign(claim, { ptyId: bound.ptyId, incarnationId: bound.incarnationId })
+    if (shell) {
+      claim.shell = shell
     }
+    await this.saveSwitchClaim(claim)
   }
 
-  private bindSwitchStart(claim: SwitchClaim): boolean {
-    const pty = claim.sessionId ? this.ptysById.get(claim.sessionId) : undefined
-    if (!pty?.incarnationId || !this.switchClaims.delete(claim)) {
-      return false
-    }
-    const key = `${claim.agent}\0${claim.id}`
-    const reported =
-      pty.cliConversations?.incarnationId === pty.incarnationId
-        ? pty.cliConversations.byKey.get(key)?.process
-        : undefined
-    const proof: SwitchStartProof = {
-      incarnationId: pty.incarnationId,
-      agent: claim.agent,
-      id: claim.id,
-      processes: reported ? [reported] : []
+  protected async releaseSwitchClaim(claim: SwitchClaim): Promise<void> {
+    if (this.switchClaims.get(claim.generation) !== claim) {
+      return
     }
-    pty.switchStart = proof
-    void this.watchSwitchStart(pty.ptyId, proof).catch((error: unknown) =>
-      console.warn('[agent-session] could not watch a switched terminal start', error)
-    )
-    return true
+    this.switchClaims.delete(claim.generation)
+    const store = await this.openAgentSessionRecordStore()
+    await store
+      .setTerminalSwitch(claim.chatSessionId, { clear: claim.generation })
+      .catch((error: unknown) =>
+        console.warn('[agent-session] could not clear a finished switch', error)
+      )
   }
 
-  /** An authentic hook's process joins the proof; identity-only rows carry none. */
+  /** An authentic hook's process joins the evidence; identity-only rows carry none. */
   protected noteSwitchStartProcess(
     ptyId: string,
     conversation: { agent: string; id: string },
     process: AgentProcessIdentity
   ): void {
-    const pty = this.ptysById.get(ptyId)
-    const proof = pty?.switchStart
-    if (
-      proof &&
-      proof.incarnationId === pty.incarnationId &&
-      proof.id === conversation.id &&
-      chatAgentsShareConversations(proof.agent, conversation.agent) &&
-      !proof.processes.some((known) => isSameAgentProcess(known, process))
-    ) {
-      proof.processes.push(process)
+    for (const claim of this.switchClaimsFor(conversation.agent, conversation.id)) {
+      if (
+        claim.ptyId === ptyId &&
+        !claim.processes.some((known) => isSameAgentProcess(known, process))
+      ) {
+        claim.processes.push(process)
+        void this.saveSwitchClaim(claim)
+      }
     }
   }
 
-  /** Bounded evidence collection only: it records the agent's identity and never admits anything. */
-  private async watchSwitchStart(ptyId: string, proof: SwitchStartProof): Promise<void> {
-    for (let poll = 0; poll < SWITCH_START_WATCH_POLLS; poll++) {
+  /** Bounded evidence collection only: it records identities and never fences or releases. */
+  private async watchSwitchStart(claim: SwitchClaim): Promise<void> {
+    for (let poll = 0; poll < SWITCH_START_WATCH_POLLS && claim.processes.length === 0; poll++) {
       await new Promise((resolve) => setTimeout(resolve, SWITCH_START_WATCH_INTERVAL_MS).unref?.())
-      if (this.ptysById.get(ptyId)?.switchStart !== proof || proof.processes.length > 0) {
+      if (this.switchClaims.get(claim.generation) !== claim) {
         return
       }
-      const entry = (await this.ptyController?.listProcesses?.(LOCAL_EXECUTION_HOST_ID))?.find(
-        (candidate) => candidate.id === ptyId
-      )
-      if (!entry?.rootProcessId || entry.incarnationId !== proof.incarnationId) {
-        continue
+      const seen = await this.observeSwitch(claim, false)
+      if (seen.state === 'ended') {
+        return
       }
-      const seen = await readSwitchPaneAgentProcesses(entry.rootProcessId, proof.id)
-      if (this.ptysById.get(ptyId)?.switchStart === proof && proof.processes.length === 0) {
-        proof.processes.push(...seen)
+      if (seen.state === 'bound' && seen.shellPid) {
+        await this.noteSwitchBound(claim, seen)
+        const found = await readSwitchPaneAgentProcesses(seen.shellPid, claim.providerSessionId)
+        if (found.length > 0 && claim.processes.length === 0) {
+          claim.processes.push(...found)
+          await this.saveSwitchClaim(claim)
+        }
       }
     }
   }
diff --git a/src/main/runtime/session-tabs/structured-session-switch-observation.ts b/src/main/runtime/session-tabs/structured-session-switch-observation.ts
index 8ab7ef5a843c..b2968739d7bf 100644
--- a/src/main/runtime/session-tabs/structured-session-switch-observation.ts
+++ b/src/main/runtime/session-tabs/structured-session-switch-observation.ts
@@ -54,6 +54,22 @@ export async function readSwitchPaneAgentProcesses(
   return identities.flat()
 }
 
+/** The shell's own identity, so a later owner loss can still be judged by its process. */
+export async function readSwitchShellProcess(pid: number): Promise<AgentProcessIdentity | null> {
+  if (process.platform === 'win32') {
+    const created = isWindowsProcessStartTimeAvailable()
+      ? readWindowsProcessCreationTime(pid)
+      : null
+    return created === null ? null : { pid, platform: 'win32', startTime: String(created) }
+  }
+  const platform = process.platform
+  if (platform !== 'darwin' && platform !== 'linux') {
+    return null
+  }
+  const observed = await readAgentProcess(pid)
+  return observed.verdict === 'live' ? { pid, platform, startTime: observed.startTime } : null
+}
+
 /** `exited` only on proof: the pid is gone or now names a different process. */
 export async function switchStartProcessVerdict(
   identity: AgentProcessIdentity
diff --git a/src/main/startup/main-window-agent-status.ts b/src/main/startup/main-window-agent-status.ts
index fb4e94e2461b..749652e70918 100644
--- a/src/main/startup/main-window-agent-status.ts
+++ b/src/main/startup/main-window-agent-status.ts
@@ -25,6 +25,7 @@ export function installMainWindowAgentStatusListeners(options: MainWindowAgentSt
       launchToken,
       providerSession,
       providerSessionOnly,
+      launchExecution,
       promptInteractionKey,
       restoredUnconfirmed,
       observation,
@@ -56,6 +57,7 @@ export function installMainWindowAgentStatusListeners(options: MainWindowAgentSt
           stateStartedAt,
           ...(providerSession ? { providerSession } : {}),
           ...(observation ? { observation } : {}),
+          ...(launchExecution ? { launchExecution } : {}),
           providerSessionOnly: true
         })
         return
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
index 0e8df40006d9..9f796ea118bc 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
@@ -14,9 +14,16 @@ const mocks = vi.hoisted(() => {
     toast: vi.fn(),
     activate: vi.fn(async () => true),
     activateVerified: vi.fn(async () => 'activated'),
-    switchCapability: vi.fn(async () => false)
+    switchCapability: vi.fn(async () => false),
+    exitWatchers: new Map<string, () => void>()
   }
 })
+vi.mock('../terminal-pane/pty-dispatcher', () => ({
+  subscribeToPtyExit: (ptyId: string, watcher: () => void) => {
+    mocks.exitWatchers.set(ptyId, watcher)
+    return () => mocks.exitWatchers.delete(ptyId)
+  }
+}))
 vi.mock('./cli-chat-resume-source', () => ({ resolveCliChatResumeSource: () => mocks.source }))
 vi.mock('@/runtime/structured-agent-session-client', () => ({
   supportsStructuredAgentSessionCliSource: mocks.sourceCapability,
@@ -86,7 +93,8 @@ const SOURCE: CliChatResumeSource = {
   paneKey: 'tab-1:leaf',
   agent: 'claude',
   providerSessionId: 'provider-1',
-  executionHostId: 'local'
+  executionHostId: 'local',
+  ptyId: 'pty-1'
 }
 const tabs = () => useAppStore.getState().unifiedTabsByWorktree['wt-1'] ?? []
 afterEach(() => vi.unstubAllGlobals())
@@ -266,6 +274,16 @@ describe('CLI identity resume through the existing launch owner', () => {
     )
     const leafId = '11111111-1111-4111-8111-111111111111'
     mocks.source = { ...SOURCE, paneKey: `tab-1:${leafId}` }
+    useAppStore.setState({
+      terminalLayoutsByTabId: {
+        'tab-1': {
+          root: null,
+          activeLeafId: leafId,
+          expandedLeafId: null,
+          ptyIdsByLeafId: { [leafId]: 'pty-1' }
+        }
+      }
+    })
     const closed = vi.fn()
     window.addEventListener('orca-close-terminal-pane', closed)
     // A host without the switch only shows the chat; it never receives the switch.
@@ -280,15 +298,19 @@ describe('CLI identity resume through the existing launch owner', () => {
     expect(closed).not.toHaveBeenCalled()
 
     switched = { ok: true, sessionId: 'owner-chat' }
+    // The source PTY exits during the chat's readiness: a reused id is another execution, so it stays.
+    mocks.activateVerified.mockImplementationOnce(async () => {
+      mocks.exitWatchers.get('pty-1')?.()
+      return 'activated'
+    })
+    await runCliChatResume(mocks.source)
+    expect(closed).not.toHaveBeenCalled()
     await runCliChatResume(mocks.source)
     window.removeEventListener('orca-close-terminal-pane', closed)
     const switches = mocks.call.mock.calls.filter(
       ([, method]) => method === 'agentSession.switchToChat'
     )
-    expect(switches).toEqual([
-      [{ kind: 'local' }, 'agentSession.switchToChat', { sessionId: 'owner-chat' }],
-      [{ kind: 'local' }, 'agentSession.switchToChat', { sessionId: 'owner-chat' }]
-    ])
+    expect(switches).toHaveLength(3)
     expect(mocks.activateVerified).toHaveBeenCalledWith({ structuredSession: owner }, undefined, {
       kind: 'local'
     })
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
index 5b02ef8065c0..37729ff45ee2 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
@@ -15,13 +15,19 @@ import { CLI_CONVERSATION_ADOPTING_AGENTS } from '../../../../shared/structured-
 import { resolveCliChatResumeSource, type CliChatResumeSource } from './cli-chat-resume-source'
 import { reportCliChatResumeFailure } from './cli-chat-resume-feedback'
 import { adoptingAgentOnHost } from '../right-sidebar/ai-vault-session-resume-in-chat-launch'
-import { forgetSwitchedTerminalConversation } from './switched-terminal-conversation'
+import { panePtyId } from '@/lib/ai-vault-tab-title-requests'
+import { subscribeToPtyExit } from '../terminal-pane/pty-dispatcher'
 
-/** The chat took the conversation, so the terminal pane it came from closes (its tab with it). */
-function retireSwitchedTerminalPane(source: CliChatResumeSource): void {
+/** The chat took the conversation, so the terminal pane it came from closes (its tab with it):
+ *  only while that pane still holds the execution it came from, never a sibling or replacement. */
+function retireSwitchedTerminalPane(source: CliChatResumeSource, sourceExited: boolean): void {
   const pane = parsePaneKey(source.paneKey)
-  forgetSwitchedTerminalConversation(source.tabId)
-  if (pane) {
+  if (
+    pane &&
+    !sourceExited &&
+    source.ptyId &&
+    panePtyId(useAppStore.getState(), source.paneKey) === source.ptyId
+  ) {
     const detail: CloseTerminalPaneDetail = { tabId: pane.tabId, leafId: pane.leafId }
     window.dispatchEvent(new CustomEvent(CLOSE_TERMINAL_PANE_EVENT, { detail }))
   }
@@ -71,6 +77,7 @@ export async function runCliChatResume(source: CliChatResumeSource): Promise<voi
     })
     return (
       !!current &&
+      current.ptyId === source.ptyId &&
       current.executionHostId === source.executionHostId &&
       current.providerSessionId === source.providerSessionId &&
       CLI_CONVERSATION_ADOPTING_AGENTS[current.agent] ===
@@ -88,6 +95,13 @@ export async function runCliChatResume(source: CliChatResumeSource): Promise<voi
   }
   pending.set(key, controller)
   changed()
+  // Why any exit: a reused id's next incarnation starts only after this one exits.
+  let sourceExited = false
+  const stopExitWatch = source.ptyId
+    ? subscribeToPtyExit(source.ptyId, () => {
+        sourceExited = true
+      })
+    : () => {}
   const stopSource = useAppStore.subscribe(() => {
     if (!isCurrent()) {
       controller.abort()
@@ -159,25 +173,26 @@ export async function runCliChatResume(source: CliChatResumeSource): Promise<voi
     }
     const result = await waitForPromiseWithSignal(launch.settlement, controller.signal)
     if (result.kind === 'structured') {
-      retireSwitchedTerminalPane(source)
+      retireSwitchedTerminalPane(source, sourceExited)
     } else if (
       result.kind === 'failed' &&
       !result.notified &&
       pending.get(key) === controller &&
       (await reportCliChatResumeFailure(source, result.error, target))
     ) {
-      retireSwitchedTerminalPane(source)
+      retireSwitchedTerminalPane(source, sourceExited)
     }
   } catch (error) {
     if (
       pending.get(key) === controller &&
       (await reportCliChatResumeFailure(source, error, target))
     ) {
-      retireSwitchedTerminalPane(source)
+      retireSwitchedTerminalPane(source, sourceExited)
     }
   } finally {
     clearTimeout(timer)
     stopSource()
+    stopExitWatch()
     release()
   }
 }
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts
index e2d116b5ef9c..28f64b8f6315 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts
@@ -1,17 +1,17 @@
 import type { AppState } from '@/store/types'
 import {
   collectAgentPaneConversations,
+  panePtyId,
   resolvePaneLastAgentConversation
 } from '@/lib/ai-vault-tab-title-requests'
 import { inPlaceSwitchSupportedNow } from '@/lib/in-place-switch-support'
 import { LOCAL_EXECUTION_HOST_ID, type ExecutionHostId } from '../../../../shared/execution-host'
-import { makePaneKey, parsePaneKey } from '../../../../shared/stable-pane-id'
+import { makePaneKey } from '../../../../shared/stable-pane-id'
 import {
   adoptsCliConversations,
   type CliConversationRowAgent
 } from '../../../../shared/structured-agent-cli-conversation-adoption'
 import { canPaneOfferResumeInNewChat } from './tab-session-history-switch'
-import { switchedTerminalConversation } from './switched-terminal-conversation'
 
 export type CliChatResumeSource = {
   tabId: string
@@ -20,38 +20,29 @@ export type CliChatResumeSource = {
   agent: CliConversationRowAgent
   providerSessionId: string
   executionHostId: ExecutionHostId
+  /** The pane's PTY when this was resolved; only that execution may be retired. */
+  ptyId: string | undefined
 }
 
-/** The pane's last reported conversation, else the one a switch just put in this tab. */
+/** The pane's last reported conversation, or the one the host launched in its current PTY. */
 export function resolveCliChatResumeSource(
   state: AppState,
   args: { tab: { id: string; worktreeId: string }; paneKey?: string }
 ): CliChatResumeSource | null {
+  const activeLeafId = state.terminalLayoutsByTabId[args.tab.id]?.activeLeafId
+  const paneConversation = (paneKey: string) =>
+    resolvePaneLastAgentConversation(
+      state,
+      { worktreeId: args.tab.worktreeId, paneKey },
+      adoptsCliConversations
+    )
   const conversation = args.paneKey
-    ? resolvePaneLastAgentConversation(
-        state,
-        { worktreeId: args.tab.worktreeId, paneKey: args.paneKey },
-        adoptsCliConversations
-      )
-    : collectAgentPaneConversations(state, adoptsCliConversations).find(
+    ? paneConversation(args.paneKey)
+    : (collectAgentPaneConversations(state, adoptsCliConversations).find(
         (candidate) => candidate.tabId === args.tab.id
-      )
-  const layout = state.terminalLayoutsByTabId[args.tab.id]
-  const leafId = args.paneKey ? parsePaneKey(args.paneKey)?.leafId : layout?.activeLeafId
-  const seeded = switchedTerminalConversation(args.tab.id, leafId, layout)
-  if (!conversation) {
-    return seeded && leafId
-      ? {
-          tabId: args.tab.id,
-          workspaceId: args.tab.worktreeId,
-          paneKey: makePaneKey(args.tab.id, leafId),
-          agent: seeded.agent,
-          providerSessionId: seeded.providerSessionId,
-          executionHostId: seeded.executionHostId
-        }
-      : null
-  }
+      ) ?? (activeLeafId ? paneConversation(makePaneKey(args.tab.id, activeLeafId)) : null))
   if (
+    !conversation ||
     conversation.tabId !== args.tab.id ||
     conversation.worktreeId !== args.tab.worktreeId ||
     // A paired host moves a terminal's conversation only once it switches that agent in place.
@@ -70,6 +61,7 @@ export function resolveCliChatResumeSource(
     paneKey: conversation.paneKey,
     agent: conversation.agent,
     providerSessionId: conversation.providerSession.id,
-    executionHostId: conversation.executionHostId
+    executionHostId: conversation.executionHostId,
+    ptyId: panePtyId(state, conversation.paneKey)
   }
 }
diff --git a/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.test.ts b/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.test.ts
index 84959c59c2f5..997dafdc65b0 100644
--- a/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.test.ts
+++ b/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.test.ts
@@ -29,7 +29,6 @@ vi.mock('@/lib/ai-vault-resume-command', () => ({
 }))
 
 import { runNativeChatCliSwitch } from './native-chat-cli-switch-run'
-import { switchedTerminalConversation } from './switched-terminal-conversation'
 
 const SWITCH = {
   sessionId: 'chat-1',
@@ -51,7 +50,7 @@ const SOURCE = {
 beforeEach(() => {
   vi.clearAllMocks()
   mocks.supported = true
-  mocks.call.mockResolvedValue({ source: SOURCE })
+  mocks.call.mockResolvedValue({ source: SOURCE, generation: 'g1' })
 })
 
 it('stops the chat on its host, opens the same-id resume in its slot, then closes the chat tab', async () => {
@@ -64,7 +63,8 @@ it('stops the chat on its host, opens the same-id resume in its slot, then close
       agent: 'codex',
       worktreeId: 'wt-1',
       command: 'codex resume thread-c',
-      env: { CODEX_HOME: '/accounts/a/home' },
+      // The host's switch generation rides the launch to the owner that creates the terminal.
+      env: { CODEX_HOME: '/accounts/a/home', ORCA_TERMINAL_SWITCH_GENERATION: 'g1' },
       providerSession: { key: 'session_id', id: 'thread-c' },
       afterTabId: 'chat-tab',
       resumeOrigin: 'switch'
@@ -96,27 +96,3 @@ it('keeps the chat when the host refuses a busy chat, and says why', async () =>
   expect(mocks.closeUnifiedTab).not.toHaveBeenCalled()
   expect(mocks.toast).toHaveBeenCalledWith('Wait for the reply to finish or stop it, then switch.')
 })
-
-it('offers the switch back on a paired terminal before any prompt, for its own pane only', async () => {
-  mocks.launch.mockReturnValueOnce({
-    tabId: null,
-    runtimeLaunch: Promise.resolve({ status: 'created', tabId: 'web-terminal-t' })
-  })
-  await runNativeChatCliSwitch({ ...SWITCH, executionHostId: 'runtime:server-1' })
-  const layout = (ptyIdsByLeafId: Record<string, string>) => ({
-    root: null,
-    activeLeafId: 'L1',
-    expandedLeafId: null,
-    ptyIdsByLeafId
-  })
-  expect(switchedTerminalConversation('web-terminal-t', 'L1', layout({ L1: 'p1' }))).toMatchObject({
-    providerSessionId: 'thread-c'
-  })
-  // A split's new plain shell never takes the switched pane's conversation.
-  expect(switchedTerminalConversation('web-terminal-t', 'L2', layout({ L1: 'p1', L2: 'p2' }))).toBe(
-    undefined
-  )
-  // A replaced PTY in the switched pane ends it.
-  expect(switchedTerminalConversation('web-terminal-t', 'L1', layout({ L1: 'p9' }))).toBe(undefined)
-  expect(switchedTerminalConversation('web-terminal-t', 'L1', layout({ L1: 'p1' }))).toBe(undefined)
-})
diff --git a/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts b/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts
index f3f228132951..3e3cd3b67e74 100644
--- a/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts
+++ b/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts
@@ -15,8 +15,7 @@ import { AiVaultChatForkSourceSchema } from '../../../../shared/ai-vault-chat-fo
 import type { AiVaultAgent } from '../../../../shared/ai-vault-types'
 import { agentLabel } from '../../../../shared/ai-vault-session-filters'
 import { parseExecutionHostId } from '../../../../shared/execution-host'
-import { adoptsCliConversations } from '../../../../shared/structured-agent-cli-conversation-adoption'
-import { seedSwitchedTerminalConversation } from './switched-terminal-conversation'
+import { TERMINAL_SWITCH_GENERATION_ENV } from '../../../../shared/terminal-switch'
 
 const pending = new Set<string>()
 const listeners = new Set<() => void>()
@@ -84,12 +83,15 @@ export async function runNativeChatCliSwitch(args: {
     if (!(await supportsInPlaceSwitch(target, args.agent))) {
       throw new Error(nativeChatCliSwitchFailureText(null, args.agent))
     }
-    const answered = await callStructuredAgentSession<{ source: unknown }>(
+    const answered = await callStructuredAgentSession<{ source: unknown; generation?: unknown }>(
       target,
       'agentSession.switchToTerminal',
       { sessionId: args.sessionId }
     )
     const source = AiVaultChatForkSourceSchema.parse(answered.source)
+    if (typeof answered.generation !== 'string') {
+      throw new Error(nativeChatCliSwitchFailureText(null, args.agent))
+    }
     const state = useAppStore.getState()
     const startup = buildAiVaultResumeStartupForWorktree({
       state,
@@ -101,6 +103,8 @@ export async function runNativeChatCliSwitch(args: {
       agent: source.agent,
       worktreeId: args.workspaceId,
       ...startup,
+      // The host's terminal owner binds this generation to the one start it may protect.
+      env: { ...startup.env, [TERMINAL_SWITCH_GENERATION_ENV]: answered.generation },
       ...(args.chatTabId ? { afterTabId: args.chatTabId } : {}),
       resumeOrigin: 'switch'
     })
@@ -108,15 +112,6 @@ export async function runNativeChatCliSwitch(args: {
     if (outcome && outcome.status !== 'created') {
       throw new Error(outcome.status === 'failed' ? outcome.message : undefined)
     }
-    // A paired host's terminal is named by its create result, so the switch back works before a prompt.
-    const tabId = launch.tabId ?? (outcome?.status === 'created' ? outcome.tabId : undefined)
-    if (tabId && adoptsCliConversations(source.agent)) {
-      seedSwitchedTerminalConversation(tabId, {
-        agent: source.agent,
-        providerSessionId: source.sessionId,
-        executionHostId: hostId
-      })
-    }
     // The terminal exists, so the chat tab retires; its host close finds the agent already stopped.
     if (args.chatTabId) {
       useAppStore.getState().closeUnifiedTab(args.chatTabId)
diff --git a/src/renderer/src/components/tab-bar/switched-terminal-conversation.ts b/src/renderer/src/components/tab-bar/switched-terminal-conversation.ts
deleted file mode 100644
index 949be7bc75fc..000000000000
--- a/src/renderer/src/components/tab-bar/switched-terminal-conversation.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import type { ExecutionHostId } from '../../../../shared/execution-host'
-import type { TerminalLayoutSnapshot } from '../../../../shared/terminal-tab-types'
-import type { CliConversationRowAgent } from '../../../../shared/structured-agent-cli-conversation-adoption'
-
-/** The conversation a switch put in a terminal tab, until its agent reports one. Presentation only:
- *  an agent's first report comes with its first prompt, and the switch back is offered before it. */
-type SwitchedTerminalConversation = {
-  agent: CliConversationRowAgent
-  providerSessionId: string
-  executionHostId: ExecutionHostId
-  /** The switch's own pane and PTY, latched when the new tab's only leaf first shows them. */
-  leafId?: string
-  ptyId?: string
-}
-
-const byTabId = new Map<string, SwitchedTerminalConversation>()
-
-export function seedSwitchedTerminalConversation(
-  tabId: string,
-  conversation: SwitchedTerminalConversation
-): void {
-  byTabId.set(tabId, conversation)
-}
-
-/** Only for the switch's own leaf and PTY; a replaced PTY or a gone leaf ends the seed. */
-export function switchedTerminalConversation(
-  tabId: string,
-  leafId: string | null | undefined,
-  layout: TerminalLayoutSnapshot | undefined
-): SwitchedTerminalConversation | undefined {
-  const seed = byTabId.get(tabId)
-  const leaves = Object.keys(layout?.ptyIdsByLeafId ?? {})
-  if (seed && !seed.leafId && leaves.length === 1) {
-    seed.leafId = leaves[0]
-  }
-  const ptyId = seed?.leafId ? layout?.ptyIdsByLeafId?.[seed.leafId] : undefined
-  if (seed?.leafId && ptyId && seed.ptyId === undefined) {
-    seed.ptyId = ptyId
-  }
-  if (seed?.ptyId && ptyId !== seed.ptyId) {
-    byTabId.delete(tabId)
-    return undefined
-  }
-  return seed?.leafId && seed.leafId === leafId ? seed : undefined
-}
-
-export function forgetSwitchedTerminalConversation(tabId: string): void {
-  byTabId.delete(tabId)
-}
diff --git a/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts b/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts
index 2bd676760973..03166433fe50 100644
--- a/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts
+++ b/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts
@@ -5,6 +5,7 @@ import { makeRepo, makeTerminalTab, makeWorktree } from '../worktree-jump-palett
 import { makeAgentStatusEntry } from '@/runtime/sync-runtime-graph-test-harness'
 import { collectAiVaultTitleRequests } from '@/lib/ai-vault-tab-title-requests'
 import { resolveCliChatResumeSource } from './cli-chat-resume-source'
+import { applyProviderSessionOnlyUpdate } from '@/hooks/ipc-events/agent-status-partial-updates'
 import type { AiVaultListArgs, AiVaultSession } from '../../../../shared/ai-vault-types'
 import { getDefaultSettings } from '../../../../shared/constants'
 import {
@@ -504,6 +505,56 @@ describe('one pane of a terminal tab', () => {
       false
     )
   })
+  it('presents a switched terminal’s host identity before any prompt, for its own PTY only', () => {
+    makeState()
+    const [L1, L2] = [
+      '11111111-1111-4111-8111-111111111111',
+      '22222222-2222-4222-8222-222222222222'
+    ]
+    const pane = `term-1:${L1}`
+    const layout = (ptyIdsByLeafId: Record<string, string>) =>
+      useAppStore.setState({
+        terminalLayoutsByTabId: {
+          'term-1': { root: null, activeLeafId: L1, expandedLeafId: null, ptyIdsByLeafId }
+        }
+      })
+    layout({ [L1]: 'pty-1', [L2]: 'pty-2' })
+    applyProviderSessionOnlyUpdate({
+      store: useAppStore.getState(),
+      batch: undefined,
+      paneKey: pane,
+      routing: { tabId: 'term-1', worktreeId: WORKTREE_ID },
+      data: {
+        paneKey: pane,
+        connectionId: null,
+        receivedAt: 1,
+        stateStartedAt: 1,
+        state: 'done',
+        prompt: '',
+        agentType: 'codex',
+        providerSession: { key: 'session_id', id: 'thread-c' },
+        providerSessionOnly: true,
+        launchExecution: { ptyId: 'pty-1', incarnationId: 'i1' }
+      }
+    })
+    const state = useAppStore.getState()
+    // Presentation only: no status row and no sleeping recovery record.
+    expect(state.sleepingAgentSessionsByPaneKey).toEqual({})
+    expect(state.agentStatusByPaneKey).toEqual({})
+    expect(
+      resolveCliChatResumeSource(state, {
+        tab: { id: 'term-1', worktreeId: WORKTREE_ID },
+        paneKey: pane
+      })
+    ).toMatchObject({ agent: 'codex', providerSessionId: 'thread-c', ptyId: 'pty-1' })
+    expect(paneGate(state, `term-1:${L2}`)).toBe(false)
+    layout({ [L1]: 'pty-9' })
+    expect(paneGate(useAppStore.getState(), pane)).toBe(false)
+    // Its PTY exiting ends it, so a later incarnation under the same id never inherits it.
+    layout({ [L1]: 'pty-1' })
+    useAppStore.getState().setLaunchConversation(pane, null)
+    expect(paneGate(useAppStore.getState(), pane)).toBe(false)
+  })
 })
 
 describe('findTabSessionHistoryRow', () => {
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/pty-exit-hibernate.ts b/src/renderer/src/components/terminal-pane/pty-connection/pty-exit-hibernate.ts
index c86eb39ebab1..8132c951fe53 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/pty-exit-hibernate.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/pty-exit-hibernate.ts
@@ -257,6 +257,7 @@ export function installPtyExitHibernate(session: ConnectPanePtySession): void {
     // entry so the hover UI only shows what is running *now*.
     useAppStore.getState().removeAgentStatus(session.cacheKey)
     useAppStore.getState().clearPaneForegroundAgent(session.cacheKey)
+    useAppStore.getState().setLaunchConversation(session.cacheKey, null)
     // The runtime graph is the CLI's source for live terminal bindings, so
     // we must republish when a pane loses its PTY instead of waiting for a
     // broader layout change that may never happen.
diff --git a/src/renderer/src/components/terminal-pane/use-terminal-pane-projection.ts b/src/renderer/src/components/terminal-pane/use-terminal-pane-projection.ts
index d944faa58cde..e36be126e8a6 100644
--- a/src/renderer/src/components/terminal-pane/use-terminal-pane-projection.ts
+++ b/src/renderer/src/components/terminal-pane/use-terminal-pane-projection.ts
@@ -1,4 +1,3 @@
-import { switchedTerminalConversation } from '../tab-bar/switched-terminal-conversation'
 import { useCallback, useEffect } from 'react'
 import type { CSSProperties } from 'react'
 import {
@@ -189,11 +188,10 @@ export function useTerminalPaneProjection(controller: TerminalPaneMobileControll
       activePaneCanResumeInChat:
         !activePaneIsChatLeaf &&
         activeLeafId !== null &&
-        (!!switchedTerminalConversation(tabId, activeLeafId, state.terminalLayoutsByTabId[tabId]) ||
-          canPaneOfferResumeInNewChat(state, {
-            worktreeId,
-            paneKey: makePaneKey(tabId, activeLeafId)
-          }))
+        canPaneOfferResumeInNewChat(state, {
+          worktreeId,
+          paneKey: makePaneKey(tabId, activeLeafId)
+        })
     }))
   )
   const contextMenuIsChatView = effectiveChatViewMode && contextMenuLeafId === chatLeafId
diff --git a/src/renderer/src/hooks/ipc-events/agent-status-partial-updates.ts b/src/renderer/src/hooks/ipc-events/agent-status-partial-updates.ts
index f8dc3bd7815e..bf6ec09d2dce 100644
--- a/src/renderer/src/hooks/ipc-events/agent-status-partial-updates.ts
+++ b/src/renderer/src/hooks/ipc-events/agent-status-partial-updates.ts
@@ -1,5 +1,6 @@
 import type { AgentStatusIpcPayload } from '../../../../shared/agent-status-types'
 import type { ProgramStatusFacet } from '../../../../shared/program-status/facet'
+import { adoptsCliConversations } from '../../../../shared/structured-agent-cli-conversation-adoption'
 import type { AppState } from '@/store/types'
 import type {
   AgentProgramStatusUpdate,
@@ -49,7 +50,13 @@ export function applyProviderSessionOnlyUpdate(args: {
 }): AgentStatusApplyResult {
   const { store, batch, data, paneKey, routing } = args
   if (!data.providerSession || data.agentType !== 'pi') {
-    return 'dropped'
+    const { agentType: agent, providerSession, launchExecution: execution } = data
+    if (!providerSession || !execution || !adoptsCliConversations(agent)) {
+      return 'dropped'
+    }
+    // Why not a sleeping record: this identity only presents the switched terminal's conversation.
+    store.setLaunchConversation(paneKey, { agent, providerSession, execution })
+    return 'applied'
   }
   const update: AgentProviderSessionUpdate = {
     kind: 'providerSession',
diff --git a/src/renderer/src/lib/ai-vault-tab-title-requests.ts b/src/renderer/src/lib/ai-vault-tab-title-requests.ts
index da315267f73b..a1312a5a8ce4 100644
--- a/src/renderer/src/lib/ai-vault-tab-title-requests.ts
+++ b/src/renderer/src/lib/ai-vault-tab-title-requests.ts
@@ -168,8 +168,14 @@ export function resolvePaneAgentConversation<Agent extends AgentType>(
   return request
 }
 
-/** As above, or the conversation the pane's agent last reported once it exited: a switch is
- *  offered when the agent is gone, which is when it can succeed. */
+/** The PTY a pane is bound to now. */
+export function panePtyId(state: AppState, paneKey: string): string | undefined {
+  const pane = parsePaneKey(paneKey)
+  return pane ? state.terminalLayoutsByTabId[pane.tabId]?.ptyIdsByLeafId?.[pane.leafId] : undefined
+}
+
+/** As above, or the conversation the pane's agent last reported once it exited, or the one the
+ *  host launched in this exact PTY: a switch is offered when the agent is gone. */
 export function resolvePaneLastAgentConversation<Agent extends AgentType>(
   state: AppState,
   pane: { worktreeId: string; paneKey: string },
@@ -177,18 +183,28 @@ export function resolvePaneLastAgentConversation<Agent extends AgentType>(
 ): AgentPaneConversation<Agent> | null {
   const live = resolvePaneAgentConversation(state, pane, isAgent)
   const retained = state.retainedAgentsByPaneKey[pane.paneKey]
-  if (live || retained?.entry.paneKey !== pane.paneKey || retained.worktreeId !== pane.worktreeId) {
+  const launch = state.launchConversationByPaneKey[pane.paneKey]
+  const tab = (state.tabsByWorktree[pane.worktreeId] ?? []).find(
+    (candidate) => candidate.id === parsePaneKey(pane.paneKey)?.tabId
+  )
+  const source =
+    retained?.entry.paneKey === pane.paneKey && retained.worktreeId === pane.worktreeId
+      ? retained
+      : tab && launch && launch.execution.ptyId === panePtyId(state, pane.paneKey)
+        ? { tab, agentType: launch.agent, entry: launch }
+        : null
+  if (live || !source) {
     return live
   }
   const candidates = new Map<string, RequestCandidate<Agent>>()
-  registerCandidate(state, new Map([[retained.tab.id, retained.tab]]), candidates, isAgent, {
-    agent: retained.agentType,
+  registerCandidate(state, new Map([[source.tab.id, source.tab]]), candidates, isAgent, {
+    agent: source.agentType,
     paneKey: pane.paneKey,
     priority: 10,
-    providerSession: retained.entry.providerSession,
+    providerSession: source.entry.providerSession,
     refresh: false,
-    tabId: retained.tab.id,
-    worktreeId: retained.worktreeId
+    tabId: source.tab.id,
+    worktreeId: pane.worktreeId
   })
   const [candidate] = candidates.values()
   if (!candidate) {
diff --git a/src/renderer/src/lib/launch-ai-vault-session.ts b/src/renderer/src/lib/launch-ai-vault-session.ts
index 0fac9335e160..4646748c8793 100644
--- a/src/renderer/src/lib/launch-ai-vault-session.ts
+++ b/src/renderer/src/lib/launch-ai-vault-session.ts
@@ -67,7 +67,7 @@ export function launchAiVaultSessionInNewTab(args: {
         ...(args.launchConfig ? { agentArgs: args.launchConfig.agentArgs } : {}),
         activate: true
       },
-      { notifyFailure: false, ...(args.resumeOrigin ? { withTabId: true } : {}) }
+      { notifyFailure: false }
     )
     const observedRuntimeLaunch = runtimeLaunch.then((outcome) => {
       if (outcome.status === 'created') {
diff --git a/src/renderer/src/runtime/web-runtime-session-types.ts b/src/renderer/src/runtime/web-runtime-session-types.ts
index 3287a64ec521..a09629f34a61 100644
--- a/src/renderer/src/runtime/web-runtime-session-types.ts
+++ b/src/renderer/src/runtime/web-runtime-session-types.ts
@@ -11,8 +11,8 @@ import type { RuntimeTerminalCreate } from '../../../shared/runtime-types'
 import type { TuiAgent } from '../../../shared/tui-agent'
 
 export type WebRuntimeTerminalCreateOutcome =
-  /** `tabId`: this client's tab for the host's new terminal, when the host named it. */
-  { status: 'created'; tabId?: string } | { status: 'failed'; message: string }
+  | { status: 'created' }
+  | { status: 'failed'; message: string }
 
 export type CreateWebRuntimeSessionTerminalArgs = {
   worktreeId: string
diff --git a/src/renderer/src/runtime/web-runtime-terminal-creation.ts b/src/renderer/src/runtime/web-runtime-terminal-creation.ts
index 1670bf75fef5..bde5df66a78c 100644
--- a/src/renderer/src/runtime/web-runtime-terminal-creation.ts
+++ b/src/renderer/src/runtime/web-runtime-terminal-creation.ts
@@ -17,7 +17,7 @@ import type {
  */
 export async function createWebRuntimeSessionTerminal(
   args: CreateWebRuntimeSessionTerminalArgs,
-  options: { notifyFailure?: boolean; withTabId?: boolean } = {}
+  options: { notifyFailure?: boolean } = {}
 ): Promise<WebRuntimeTerminalCreateOutcome> {
   const created = await createWebRuntimeSessionTerminalResult(args)
   if (
@@ -30,9 +30,7 @@ export async function createWebRuntimeSessionTerminal(
       worktreeId: args.worktreeId
     })
   }
-  return options.withTabId && created.outcome.status === 'created' && created.hostTabId
-    ? { status: 'created', tabId: toWebTerminalSurfaceTabId(created.hostTabId) }
-    : created.outcome
+  return created.outcome
 }
 
 export async function createWebRuntimeAgentSessionTerminal(
diff --git a/src/renderer/src/store/slices/agent-status-provider-session-actions.ts b/src/renderer/src/store/slices/agent-status-provider-session-actions.ts
index 5a08e59b8edf..91b82a6afb8f 100644
--- a/src/renderer/src/store/slices/agent-status-provider-session-actions.ts
+++ b/src/renderer/src/store/slices/agent-status-provider-session-actions.ts
@@ -26,9 +26,19 @@ import { settleAttentionRemovedBy } from './workspace-attention/attention-remova
 
 export function createAgentStatusProviderSessionActions(
   runtime: AgentStatusRuntime
-): Pick<AgentStatusSlice, 'recordAgentProviderSession'> {
+): Pick<AgentStatusSlice, 'recordAgentProviderSession' | 'setLaunchConversation'> {
   const { get, set, requestFreshness } = runtime
   return {
+    setLaunchConversation: (paneKey, conversation) => {
+      if (conversation || paneKey in get().launchConversationByPaneKey) {
+        set((s) => {
+          const { [paneKey]: _old, ...rest } = s.launchConversationByPaneKey
+          return {
+            launchConversationByPaneKey: conversation ? { ...rest, [paneKey]: conversation } : rest
+          }
+        })
+      }
+    },
     recordAgentProviderSession: (
       paneKey: string,
       agent: ResumableTuiAgent,
diff --git a/src/renderer/src/store/slices/agent-status-slice-contract.ts b/src/renderer/src/store/slices/agent-status-slice-contract.ts
index bc6575c8e3eb..346f1e2e5b1e 100644
--- a/src/renderer/src/store/slices/agent-status-slice-contract.ts
+++ b/src/renderer/src/store/slices/agent-status-slice-contract.ts
@@ -29,6 +29,15 @@ import type {
   SleepingAgentSessionRecord
 } from '../../../../shared/agent-session-resume'
 import type { ProgramStatusFacet } from '../../../../shared/program-status/facet'
+import type { TerminalExecutionStamp } from '../../../../shared/terminal-switch'
+import type { CliConversationRowAgent } from '../../../../shared/structured-agent-cli-conversation-adoption'
+
+/** A switched terminal's conversation, before its agent reports one. Presentation only. */
+export type LaunchConversation = {
+  agent: CliConversationRowAgent
+  providerSession: AgentProviderSessionMetadata
+  execution: TerminalExecutionStamp
+}
 
 export type AgentStatusSlice = {
   /** Explicit agent status entries keyed by `${tabId}:${leafId}`; real-time only, not persisted. */
@@ -51,6 +60,11 @@ export type AgentStatusSlice = {
   /** Durable agent sessions captured on sleep (not live rows); power the one-click CLI resume on wake. */
   sleepingAgentSessionsByPaneKey: Record<string, SleepingAgentSessionRecord>
 
+  /** The host's switched-terminal identity rows; never a sleeping record or a status. */
+  launchConversationByPaneKey: Record<string, LaunchConversation>
+  /** Null when the pane's PTY exits: a later incarnation, even under the same id, is not it. */
+  setLaunchConversation: (paneKey: string, conversation: LaunchConversation | null) => void
+
   /** Ephemeral launch snapshots keyed by pane; hook payloads lack Orca launch settings, so the renderer supplies them from startup. */
   agentLaunchConfigByPaneKey: Record<string, AgentLaunchConfigRegistryEntry>
 
diff --git a/src/renderer/src/store/slices/agent-status.ts b/src/renderer/src/store/slices/agent-status.ts
index b08ed80b5ea2..d05a94f5851c 100644
--- a/src/renderer/src/store/slices/agent-status.ts
+++ b/src/renderer/src/store/slices/agent-status.ts
@@ -108,6 +108,7 @@ export const createAgentStatusSlice: StateCreator<AppState, [], [], AgentStatusS
     retainedAgentsByPaneKey: {},
     sleepingAgentSessionsByPaneKey: {},
     agentLaunchConfigByPaneKey: {},
+    launchConversationByPaneKey: {},
     retentionSuppressedPaneKeys: {},
     recentlyClosedAgentStatusTabIds: {},
     recentlyRetiredAgentStatusPaneKeys: {}
diff --git a/src/shared/agent-hook-listener/listener-event.ts b/src/shared/agent-hook-listener/listener-event.ts
index df67ac30ccbb..59da9b043374 100644
--- a/src/shared/agent-hook-listener/listener-event.ts
+++ b/src/shared/agent-hook-listener/listener-event.ts
@@ -3,6 +3,7 @@ import type { ParsedAgentStatusPayload } from '../agent-status-types'
 import type { AgentHookSource } from '../agent-hook-relay'
 import type { AgentProviderSessionMetadata } from '../agent-session-resume'
 import type { ClaudeSettledRequest } from './claude-settled-permission-requests'
+import type { TerminalExecutionStamp } from '../terminal-switch'
 
 export type AgentHookEventPayload = {
   paneKey: string
@@ -46,6 +47,8 @@ export type AgentHookEventPayload = {
   providerSession?: AgentProviderSessionMetadata
   /** Session identity update with no turn-state transition; refreshes durable resume metadata without a fake status row. */
   providerSessionOnly?: boolean
+  /** The switched terminal execution an identity-only row was seeded for. Never persisted. */
+  launchExecution?: TerminalExecutionStamp
   /** True when this event is a relay cache replay rather than a live hook. */
   isReplay?: boolean
   /** Claude live work the child list does not show (a shell, a cron, an owed task notification); rejects false input-based interrupts. */
diff --git a/src/shared/agent-session-record.ts b/src/shared/agent-session-record.ts
index 554630ee2412..23ee63f1852a 100644
--- a/src/shared/agent-session-record.ts
+++ b/src/shared/agent-session-record.ts
@@ -1,4 +1,5 @@
 import { isAgentSessionRewindRecord, type AgentSessionRewindRecord } from './agent-session-rewind'
+import { isTerminalSwitchDescriptor, type TerminalSwitchDescriptor } from './terminal-switch'
 import { isAgentSessionLaunchArgs } from './agent-session-launch-args'
 import { isAgentSessionConversationName } from './agent-session-conversation-name'
 import {
@@ -164,6 +165,8 @@ export type AgentSessionRecord = {
   /** The name Orca gave this conversation, so a later acquisition need not name it again. */
   conversationName?: string
   launchArgs?: AgentSessionLaunchArgs
+  /** A switch of this chat's conversation into a terminal whose start its owner has not proved over. */
+  terminalSwitch?: TerminalSwitchDescriptor
   lease: AgentSessionLease
   createdAt: number
   updatedAt: number
@@ -184,9 +187,8 @@ const MAX_LAUNCH_ENV_ENTRIES = 256
 const MAX_LAUNCH_ENV_VALUE_LENGTH = 65_536
 const SESSION_ID_PATTERN = /^[A-Za-z0-9_-]{8,128}$/
 
-function isBoundedString(value: unknown, max: number): value is string {
-  return typeof value === 'string' && value.length > 0 && value.length <= max
-}
+const isBoundedString = (value: unknown, max: number): value is string =>
+  typeof value === 'string' && value.length > 0 && value.length <= max
 
 export function isAgentSessionId(value: unknown): value is string {
   return typeof value === 'string' && SESSION_ID_PATTERN.test(value)
@@ -200,9 +202,8 @@ const SCOPE_KEY_SEPARATOR = '\u0000'
  * different sessions; collapsing them would let one host adjudicate another host's lease.
  */
 export function agentSessionScopeKey(location: AgentSessionExecutionLocation): string {
-  return [location.executionHostId, location.wslDistro ?? '', location.workspaceId].join(
-    SCOPE_KEY_SEPARATOR
-  )
+  const { executionHostId, wslDistro, workspaceId } = location
+  return [executionHostId, wslDistro ?? '', workspaceId].join(SCOPE_KEY_SEPARATOR)
 }
 
 export function agentSessionExecutionLocationsEqual(
@@ -373,6 +374,7 @@ export function isPersistedAgentSessionRecord(
     (record.conversationName === undefined ||
       isAgentSessionConversationName(record.conversationName)) &&
     (record.launchArgs === undefined || isAgentSessionLaunchArgs(record.launchArgs)) &&
+    (record.terminalSwitch === undefined || isTerminalSwitchDescriptor(record.terminalSwitch)) &&
     !Object.hasOwn(record, 'launchEnv') &&
     isPersistedAgentSessionLease(record.lease) &&
     record.lease.sessionId === record.sessionId &&
diff --git a/src/shared/agent-status-ipc-payload.ts b/src/shared/agent-status-ipc-payload.ts
index 0efbc6d7f7a9..5d7ab2c227ef 100644
--- a/src/shared/agent-status-ipc-payload.ts
+++ b/src/shared/agent-status-ipc-payload.ts
@@ -5,6 +5,7 @@
 
 import type { StructuredHostStatus } from './agent-hook-listener/listener-event'
 import type { ProgramStatusFacet } from './program-status/facet'
+import type { TerminalExecutionStamp } from './terminal-switch'
 import type { AgentProviderSessionMetadata } from './agent-session-resume'
 import type { WithAgentStatusObservation } from './agent-status-observation'
 import type {
@@ -64,6 +65,8 @@ export type AgentStatusIpcPayload = ParsedAgentStatusPayload & {
   providerSession?: AgentProviderSessionMetadata
   /** Resume identity update only; the status-shaped fields are transport placeholders. */
   providerSessionOnly?: boolean
+  /** The switched terminal execution an identity-only row describes. */
+  launchExecution?: TerminalExecutionStamp
   /** Live-only Command Code turn boundary key; not persisted to last-status.json. */
   promptInteractionKey?: string
   /** See AgentStatusEntry.programStatus. Live-only; older peers ignore it. */
diff --git a/src/shared/terminal-switch.ts b/src/shared/terminal-switch.ts
new file mode 100644
index 000000000000..0801c83ced9d
--- /dev/null
+++ b/src/shared/terminal-switch.ts
@@ -0,0 +1,69 @@
+// A chat → terminal switch's start, owned by the execution host that creates the terminal: the
+// recipe names one generation and that owner, and only the owner can say the start is over.
+import { readAgentProcessIdentity, type AgentProcessIdentity } from './agent-process-presence'
+
+/** Carries the generation from the recipe to the spawn that honours it; the spawn strips it. */
+export const TERMINAL_SWITCH_GENERATION_ENV = 'ORCA_TERMINAL_SWITCH_GENERATION'
+
+/** What the owner knows of one generation. `bound` is the exact execution it created. */
+export type TerminalSwitchObservation =
+  | { state: 'pending' }
+  | {
+      state: 'bound'
+      ptyId: string
+      incarnationId: string
+      shellPid: number | null
+      /** The startup command was written or revoked; no producer can still deliver it. */
+      startupSettled: boolean
+    }
+  | { state: 'ended' }
+  | { state: 'unverifiable' }
+
+/** The owner's answer, tagged with who answered: a different owner never speaks for this one. */
+export type TerminalSwitchOwnerAnswer = { owner: string; observation: TerminalSwitchObservation }
+
+/** The owners a provider reaches: who takes its next fresh start, and every owner's answer. */
+export type TerminalSwitchOwners = {
+  owner: () => Promise<string | null>
+  /** `fence`: an unseen generation becomes unusable and reads ended; without it, pending. */
+  observe: (generation: string, fence: boolean) => Promise<TerminalSwitchOwnerAnswer[]>
+}
+
+/** Saved on the chat a switch left, from acceptance until the owner proves the start over.
+ *  Identity only: never command text, environment, credentials or a running state. */
+export type TerminalSwitchDescriptor = {
+  generation: string
+  agent: string
+  providerSessionId: string
+  owner: string
+  paneKey: string
+  ptyId?: string
+  incarnationId?: string
+  shell?: AgentProcessIdentity
+  processes: AgentProcessIdentity[]
+}
+
+/** The exact execution a switch's launch identity row describes; presentation binds to it. */
+export type TerminalExecutionStamp = { ptyId: string; incarnationId: string }
+
+/** A save, or a clear that names the generation it ends. */
+export type TerminalSwitchWrite = TerminalSwitchDescriptor | { clear: string }
+
+const MAX = 512
+const bounded = (value: unknown): value is string =>
+  typeof value === 'string' && value.length > 0 && value.length <= MAX
+
+export function isTerminalSwitchDescriptor(value: unknown): value is TerminalSwitchDescriptor {
+  if (typeof value !== 'object' || value === null) {
+    return false
+  }
+  const d: Partial<Record<keyof TerminalSwitchDescriptor, unknown>> = value
+  return (
+    [d.generation, d.agent, d.providerSessionId, d.owner, d.paneKey].every(bounded) &&
+    [d.ptyId, d.incarnationId].every((field) => field === undefined || bounded(field)) &&
+    (d.shell === undefined || readAgentProcessIdentity(d.shell) !== undefined) &&
+    Array.isArray(d.processes) &&
+    d.processes.length <= 16 &&
+    d.processes.every((process) => readAgentProcessIdentity(process) !== undefined)
+  )
+}

From 96ed17893ea867513576d22746ad48428d4aaa4e Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Tue, 20 Oct 2026 14:08:06 -0700
Subject: [PATCH 015/207] test(native-chat): expect the switch menu's in-place
 and fork labels

---
 .../tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx b/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx
index 889722ee1034..7164bac2963a 100644
--- a/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx
+++ b/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx
@@ -115,7 +115,7 @@ describe('TabSessionSurfaceSwitchMenuItems', () => {
     mocks.subject = CHAT_SUBJECT
     renderItemsNow('orca-chat-1')
     expect(mocks.listSessions).not.toHaveBeenCalled()
-    fireEvent.click(screen.getByRole('menuitem', { name: 'Switch to Terminal' }))
+    fireEvent.click(screen.getByRole('menuitem', { name: 'Resume in New Terminal' }))
     expect(mocks.runNativeChatCliFork).toHaveBeenCalledWith(
       expect.objectContaining({
         subject: CHAT_SUBJECT,
@@ -136,7 +136,7 @@ describe('TabSessionSurfaceSwitchMenuItems', () => {
     }
     mocks.cliSource = source
     renderItemsNow()
-    fireEvent.click(screen.getByRole('menuitem', { name: 'Switch to Chat' }))
+    fireEvent.click(screen.getByRole('menuitem', { name: 'Switch to native chat' }))
     await act(async () => {})
     expect(mocks.runCliChatResume).toHaveBeenCalledWith(source)
     expect(mocks.listSessions).not.toHaveBeenCalled()
@@ -150,8 +150,8 @@ it('keeps an accepted native action visible with shared disabled spinner feedbac
     mocks.pendingListeners.forEach((listener) => listener())
   })
   await renderItems('orca-chat-1')
-  fireEvent.click(screen.getByRole('menuitem', { name: 'Switch to Terminal' }))
-  const item = screen.getByRole('menuitem', { name: 'Switch to Terminal' })
+  fireEvent.click(screen.getByRole('menuitem', { name: 'Resume in New Terminal' }))
+  const item = screen.getByRole('menuitem', { name: 'Resume in New Terminal' })
   expect(item.getAttribute('aria-busy')).toBe('true')
   expect(item.getAttribute('data-disabled')).not.toBeNull()
   expect(item.querySelector('.animate-spin')).not.toBeNull()

From 487db363367527eb2dfd9bcfadcc4fecd20b1d16 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Tue, 20 Oct 2026 14:12:21 -0700
Subject: [PATCH 016/207] fix: consolidate terminal launch imports

---
 .../ipc/pty/runtime/spawn-preflight-saved-resume.test.ts   | 7 +++++--
 .../structured-agent-session-provider-open.test.ts         | 3 +--
 src/main/runtime/runtime-terminal-state-records.ts         | 6 ++++--
 src/preload/api/pty-api.ts                                 | 3 ++-
 src/preload/api/pty-bridge-session-control.ts              | 3 ++-
 .../src/components/terminal-pane/pty-connection-types.ts   | 2 +-
 .../src/components/terminal-pane/pty-transport-types.ts    | 2 +-
 .../terminal-pane/remote-runtime-pty-transport.ts          | 6 ++++--
 src/renderer/src/store/terminals/terminal-state.ts         | 2 +-
 src/shared/runtime-terminal-contracts.ts                   | 2 +-
 10 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/main/ipc/pty/runtime/spawn-preflight-saved-resume.test.ts b/src/main/ipc/pty/runtime/spawn-preflight-saved-resume.test.ts
index b25197d6a90d..f83496bde996 100644
--- a/src/main/ipc/pty/runtime/spawn-preflight-saved-resume.test.ts
+++ b/src/main/ipc/pty/runtime/spawn-preflight-saved-resume.test.ts
@@ -11,11 +11,14 @@ import {
 import { AgentSessionRecordStore } from '../../../runtime/agent-session-record-store'
 import type { OrcaRuntimeService } from '../../../runtime/orca-runtime'
 import { finishPtyShutdown } from '../provider/liveness'
-import { admitColdRestoreReattach, admitResumeSpawn } from '../host-env/saved-resume-admission'
 import { listStructuredProviderSessionOwnership } from '../../../native-chat/agent-session-wire/structured-provider-session-ownership'
 import type { PtyRuntimeControllerDeps } from './controller-deps'
 import { executeRuntimePtySpawn } from './spawn-execute'
-import { savedResumeResult } from '../host-env/saved-resume-admission'
+import {
+  admitColdRestoreReattach,
+  admitResumeSpawn,
+  savedResumeResult
+} from '../host-env/saved-resume-admission'
 import { createRuntimePtySpawnState } from './spawn-state'
 
 const forgetRefusedPaneResume = vi.hoisted(() => vi.fn())
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-provider-open.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-provider-open.test.ts
index 4c534eeb4c71..26e66bfacb0f 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-provider-open.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-provider-open.test.ts
@@ -1,5 +1,4 @@
 import { AgentSessionAcquisitionRefusal } from './structured-agent-session-adapter'
-import { HOST_TEST_SESSION } from './structured-agent-session-host-test-data'
 import { expect, it, vi } from 'vitest'
 import type {
   StructuredAgentSessionProviderOpen,
@@ -12,7 +11,7 @@ import {
   envelope,
   hostTestState
 } from './structured-agent-session-host-test-harness'
-import { hostTestMessage } from './structured-agent-session-host-test-data'
+import { HOST_TEST_SESSION, hostTestMessage } from './structured-agent-session-host-test-data'
 
 const OPENED: StructuredAgentSessionProviderOpenResult = {
   reportedOptions: { model: 'gpt-test' }
diff --git a/src/main/runtime/runtime-terminal-state-records.ts b/src/main/runtime/runtime-terminal-state-records.ts
index 2e1fd1a1fc96..6b36edea7dd7 100644
--- a/src/main/runtime/runtime-terminal-state-records.ts
+++ b/src/main/runtime/runtime-terminal-state-records.ts
@@ -1,7 +1,9 @@
-import type { TerminalLaunchResult } from '../../shared/agent-session-resume'
 import type { AgentStatus } from '../../shared/agent-detection'
 import type { AgentStatusState } from '../../shared/agent-status-types'
-import type { SleepingAgentLaunchConfig } from '../../shared/agent-session-resume'
+import type {
+  TerminalLaunchResult,
+  SleepingAgentLaunchConfig
+} from '../../shared/agent-session-resume'
 import type { PtyIncarnationId } from '../../shared/pty-incarnation'
 import type { RuntimeSyncedLeaf } from '../../shared/runtime-types'
 import type { RuntimeTerminalRowMetadata } from '../../shared/runtime-terminal-contracts'
diff --git a/src/preload/api/pty-api.ts b/src/preload/api/pty-api.ts
index afa346330e7a..2f4aba50975a 100644
--- a/src/preload/api/pty-api.ts
+++ b/src/preload/api/pty-api.ts
@@ -1,6 +1,7 @@
-import type { SavedResumeDecision, TerminalLaunchResult } from '../../shared/agent-session-resume'
 import type { SpawnIntent } from '../../shared/host-spawn-admission'
 import type {
+  SavedResumeDecision,
+  TerminalLaunchResult,
   AgentProviderSessionMetadata,
   SleepingAgentLaunchConfig
 } from '../../shared/agent-session-resume'
diff --git a/src/preload/api/pty-bridge-session-control.ts b/src/preload/api/pty-bridge-session-control.ts
index 0a32ecaae9a2..89d0ef82d830 100644
--- a/src/preload/api/pty-bridge-session-control.ts
+++ b/src/preload/api/pty-bridge-session-control.ts
@@ -1,4 +1,3 @@
-import type { SavedResumeDecision, TerminalLaunchResult } from '../../shared/agent-session-resume'
 import type { SpawnIntent } from '../../shared/host-spawn-admission'
 import { ipcRenderer } from 'electron'
 import type { ProjectExecutionRuntimeResolution } from '../../shared/project-execution-runtime'
@@ -9,6 +8,8 @@ import type {
   TerminalLeafMoveResult
 } from '../../shared/terminal-leaf-move'
 import type {
+  SavedResumeDecision,
+  TerminalLaunchResult,
   AgentProviderSessionMetadata,
   SleepingAgentLaunchConfig
 } from '../../shared/agent-session-resume'
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-types.ts b/src/renderer/src/components/terminal-pane/pty-connection-types.ts
index 6d2fb3583ffe..a37bd3d835f4 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-types.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-types.ts
@@ -1,4 +1,3 @@
-import type { SavedResumeStartupSource } from '../../../../shared/agent-session-resume'
 import type { WorkspaceAttentionSlice } from '@/store/slices/workspace-attention/workspace-attention-contract'
 import type { NotificationWorkspaceOwner } from '../../../../shared/notification-source'
 import type { PtyTransport, PtyTransportRecoveryState } from './pty-transport-types'
@@ -12,6 +11,7 @@ import type { StartupCommandDelivery } from '../../../../shared/codex-startup-de
 import type { TuiAgent } from '../../../../shared/tui-agent'
 import type { TerminalPanePlacement } from '../../../../shared/terminal-pane-placement'
 import type {
+  SavedResumeStartupSource,
   AgentProviderSessionMetadata,
   SleepingAgentLaunchConfig
 } from '../../../../shared/agent-session-resume'
diff --git a/src/renderer/src/components/terminal-pane/pty-transport-types.ts b/src/renderer/src/components/terminal-pane/pty-transport-types.ts
index b14f471f2394..ba2ea6730a65 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport-types.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport-types.ts
@@ -1,5 +1,4 @@
 import type { TerminalAttachmentLaunchResult } from '../../../../shared/terminal-attachment-launch-result'
-import type { TerminalLaunchResult } from '../../../../shared/agent-session-resume'
 import type { AgentIdleEdgeMeta } from '../../../../shared/terminal-output-side-effects'
 import type {
   RestoreSpawnIntent,
@@ -7,6 +6,7 @@ import type {
 } from '../../../../shared/host-spawn-admission'
 import type { ParsedAgentStatusPayload } from '../../../../shared/agent-status-types'
 import type {
+  TerminalLaunchResult,
   AgentProviderSessionMetadata,
   SleepingAgentLaunchConfig
 } from '../../../../shared/agent-session-resume'
diff --git a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport.ts b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport.ts
index ce9a4a0a6c9d..2c62bc87fdc1 100644
--- a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport.ts
+++ b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport.ts
@@ -2,7 +2,6 @@ import { parseTerminalAttachmentLaunchResult } from '../../../../shared/terminal
 import { terminalLaunchFacts } from '../../../../shared/agent-session-resume'
 import { isRuntimeCompatBlockError } from '@/runtime/runtime-protocol-compat'
 import { runtimeEnvironmentSupportsCapability } from '@/runtime/runtime-rpc-client'
-import { SAVED_RESUME_ORIGIN_RUNTIME_CAPABILITY } from '../../../../shared/protocol-version'
 import { readTerminalSpawnDeferral } from '../../../../shared/host-spawn-admission'
 import { remoteRestoreSpawnIntentParams } from '../../runtime/remote-restore-spawn-intent'
 import { createAgentSessionKeyboardOptions } from '@/runtime/agent-session-keyboard-capability'
@@ -38,7 +37,10 @@ import type {
   RuntimeTerminalResolvePane,
   RuntimeTerminalSend
 } from '../../../../shared/runtime-types'
-import { TERMINAL_CREATE_IDEMPOTENCY_RUNTIME_CAPABILITY } from '../../../../shared/protocol-version'
+import {
+  SAVED_RESUME_ORIGIN_RUNTIME_CAPABILITY,
+  TERMINAL_CREATE_IDEMPOTENCY_RUNTIME_CAPABILITY
+} from '../../../../shared/protocol-version'
 import { agentResumeHostAuthorityCapability } from '../../runtime/agent-resume-host-authority-capability'
 import {
   isTerminalInputTooLargeWithDeferredMeasurement,
diff --git a/src/renderer/src/store/terminals/terminal-state.ts b/src/renderer/src/store/terminals/terminal-state.ts
index 4c27bff02c43..d7ca92d5ffdc 100644
--- a/src/renderer/src/store/terminals/terminal-state.ts
+++ b/src/renderer/src/store/terminals/terminal-state.ts
@@ -1,8 +1,8 @@
-import type { SavedResumeStartupSource } from '../../../../shared/agent-session-resume'
 import type { ClosedTerminalTabTombstonesByTabId } from '../../../../shared/closed-terminal-tab-tombstones'
 import type { TerminalLayoutSnapshot, TerminalTab } from '../../../../shared/terminal-tab-types'
 import type { TuiAgent } from '../../../../shared/tui-agent'
 import type {
+  SavedResumeStartupSource,
   AgentProviderSessionMetadata,
   SleepingAgentLaunchConfig
 } from '../../../../shared/agent-session-resume'
diff --git a/src/shared/runtime-terminal-contracts.ts b/src/shared/runtime-terminal-contracts.ts
index 30f161c9219e..4da42bb236ae 100644
--- a/src/shared/runtime-terminal-contracts.ts
+++ b/src/shared/runtime-terminal-contracts.ts
@@ -1,5 +1,5 @@
-import type { TerminalLaunchResult } from './agent-session-resume'
 import type {
+  TerminalLaunchResult,
   AgentProviderSessionMetadata,
   SleepingAgentLaunchConfig
 } from './agent-session-resume'

From 7969c0965c4acf8131a37662b84dbec19335ecaa Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Tue, 20 Oct 2026 14:30:15 -0700
Subject: [PATCH 017/207] fix(native-chat): keep a switch start protected until
 its agents, not just its shell, are proved over

- Every release needs each recorded agent proved exited; the owner's root exit alone no longer clears it, and the daemon reports startup settled only once its write gate flushes.
- Descriptor writes are compare-and-set on generation, so a retired switch's late evidence never replaces or resurrects one.
- After full owner loss, a host reboot since acceptance ends a start with no recorded identity; evidence a save missed is retried.
- An owner that cannot answer fails the routed read and holds; only every reachable owner answering without it counts as loss.
- The local owner binds the process before any callback or cancellation cleanup can throw.
- Snapshots carry the launch stamp, the paired projection drops a stamp naming a replaced incarnation, and the switch back retires a pane only while its host still reports the incarnation it started with.
---
 .../server-launch-resume-identity.test.ts     |  4 +
 .../server/server-status-identity.ts          |  1 +
 src/main/daemon/daemon-pty-adapter.ts         |  2 +-
 src/main/daemon/session.ts                    |  2 +-
 src/main/daemon/terminal-host-switches.ts     |  4 +-
 .../local-pty-provider-spawn-session.test.ts  | 19 ++--
 src/main/providers/local-pty-spawn.ts         | 13 +--
 src/main/providers/terminal-switch-owners.ts  |  6 +-
 .../agent-session-record-terminal-switch.ts   | 13 ++-
 .../runtime-mobile-session-projection.ts      | 17 ++--
 .../structured-session-cli-writer-host.ts     | 27 +++---
 .../structured-session-switch-claims.test.ts  | 96 +++++++++++++------
 .../structured-session-switch-claims.ts       | 48 ++++++++--
 .../tab-bar/cli-chat-resume-run.test.ts       | 32 ++++++-
 .../components/tab-bar/cli-chat-resume-run.ts | 31 ++++--
 src/shared/terminal-switch.ts                 | 11 ++-
 16 files changed, 233 insertions(+), 93 deletions(-)

diff --git a/src/main/agent-hooks/server-launch-resume-identity.test.ts b/src/main/agent-hooks/server-launch-resume-identity.test.ts
index d241db1f418b..60b6fee29b09 100644
--- a/src/main/agent-hooks/server-launch-resume-identity.test.ts
+++ b/src/main/agent-hooks/server-launch-resume-identity.test.ts
@@ -83,6 +83,10 @@ describe('a resume launch seeds the pane identity', () => {
       { ptyId: 'pty-1', incarnationId: 'i1' },
       { ptyId: 'pty-1', incarnationId: 'i2' }
     ])
+    // A reloaded renderer reads the same stamp from the snapshot.
+    expect(server.getStatusSnapshotForPane(PANE)).toEqual([
+      expect.objectContaining({ launchExecution: { ptyId: 'pty-1', incarnationId: 'i2' } })
+    ])
   })
 
   it("yields to the agent's own report and is replaced by its first hook", async () => {
diff --git a/src/main/agent-hooks/server/server-status-identity.ts b/src/main/agent-hooks/server/server-status-identity.ts
index 0e798e742302..d3dd3464d8f2 100644
--- a/src/main/agent-hooks/server/server-status-identity.ts
+++ b/src/main/agent-hooks/server/server-status-identity.ts
@@ -63,6 +63,7 @@ export function toAgentStatusIpcPayload(
     ...(entry.turnStartedAt !== undefined ? { turnStartedAt: entry.turnStartedAt } : {}),
     ...(entry.providerSession ? { providerSession: entry.providerSession } : {}),
     ...(entry.providerSessionOnly ? { providerSessionOnly: true } : {}),
+    ...(entry.launchExecution ? { launchExecution: entry.launchExecution } : {}),
     ...(entry.promptInteractionKey ? { promptInteractionKey: entry.promptInteractionKey } : {}),
     ...(entry.restoredUnconfirmed ? { restoredUnconfirmed: true } : {}),
     ...(entry.observation ? { observation: entry.observation } : {}),
diff --git a/src/main/daemon/daemon-pty-adapter.ts b/src/main/daemon/daemon-pty-adapter.ts
index 1593eee3ca78..c52792872dc1 100644
--- a/src/main/daemon/daemon-pty-adapter.ts
+++ b/src/main/daemon/daemon-pty-adapter.ts
@@ -23,7 +23,7 @@ export class DaemonPtyAdapter extends DaemonPtyDaemonRecovery implements IPtyPro
     owner: async () => (await this.terminalSwitches.observe(randomUUID(), false))[0]?.owner ?? null,
     observe: async (generation, fence) => {
       if (!this.client.isConnected()) {
-        return []
+        throw new Error('terminal_switch_owner_unreachable')
       }
       try {
         const answer = await this.client.request<TerminalSwitchOwnerAnswer>(
diff --git a/src/main/daemon/session.ts b/src/main/daemon/session.ts
index 845608425caa..d23c96066f62 100644
--- a/src/main/daemon/session.ts
+++ b/src/main/daemon/session.ts
@@ -34,7 +34,7 @@ export class Session {
   private readonly onSessionExit?: (code: number) => void
   private readonly output: SessionOutputPlane
   private readonly producerPause: SessionProducerPause
-  private readonly shellReady: SessionShellReadyBarrier
+  readonly shellReady: SessionShellReadyBarrier
   private readonly termination: SessionTerminationController
   /** Public so the creating host can print its own notice as terminal output. */
   readonly startupIngress: PtyStartupIngress
diff --git a/src/main/daemon/terminal-host-switches.ts b/src/main/daemon/terminal-host-switches.ts
index db8ba8c58663..0ea1edc94b4b 100644
--- a/src/main/daemon/terminal-host-switches.ts
+++ b/src/main/daemon/terminal-host-switches.ts
@@ -54,8 +54,8 @@ export class TerminalHostSwitches {
             ptyId: session.sessionId,
             incarnationId: session.incarnationId,
             shellPid: session.pid > 0 ? session.pid : null,
-            // The startup command is queued behind the shell-ready barrier until it settles.
-            startupSettled: session.shellState !== 'pending'
+            // The startup command is queued behind the shell-ready barrier until it flushes.
+            startupSettled: !session.shellReady.isGatingWrites
           }
         : { state: 'ended' }
     }
diff --git a/src/main/providers/local-pty-provider-spawn-session.test.ts b/src/main/providers/local-pty-provider-spawn-session.test.ts
index 80b34937a253..661b0f5ac250 100644
--- a/src/main/providers/local-pty-provider-spawn-session.test.ts
+++ b/src/main/providers/local-pty-provider-spawn-session.test.ts
@@ -611,18 +611,21 @@ describe('LocalPtyProvider', () => {
       expect(committed).toHaveBeenCalledOnce()
     })
 
-    it('keeps a switch start bound to its process past a failed publication, until it exits', async () => {
+    it('keeps a switch start bound to its process past a failed commit callback, until it exits', async () => {
       spawnMock.mockClear()
       const switchOwner = (await provider.terminalSwitches.owner()) ?? ''
       const seen = async () => (await provider.terminalSwitches.observe('g-local', true))[0]
-      provider.configure({
-        onSpawned: () => {
-          throw new Error('post-spawn publication failed')
-        }
-      })
       const start = () =>
-        provider.spawn({ cols: 80, rows: 24, switchGeneration: 'g-local', switchOwner })
-      await expect(start()).rejects.toThrow('post-spawn publication failed')
+        provider.spawn({
+          cols: 80,
+          rows: 24,
+          switchGeneration: 'g-local',
+          switchOwner,
+          onPtySpawnCommitted: () => {
+            throw new Error('commit callback failed')
+          }
+        })
+      await expect(start()).rejects.toThrow('commit callback failed')
       expect((await seen())?.observation).toMatchObject({ state: 'bound', shellPid: mockProc.pid })
       await expect(start()).rejects.toThrow('terminal_switch_generation_refused')
       expect(spawnMock).toHaveBeenCalledOnce()
diff --git a/src/main/providers/local-pty-spawn.ts b/src/main/providers/local-pty-spawn.ts
index f8e6e75053e3..a1fe6222a2ad 100644
--- a/src/main/providers/local-pty-spawn.ts
+++ b/src/main/providers/local-pty-spawn.ts
@@ -133,6 +133,13 @@ export async function spawnLocalPty(
         windowsFallbackAttempts: plan.windowsFallbackAttempts
       })
       const spawnResult = pendingSpawn instanceof Promise ? await pendingSpawn : pendingSpawn
+      // The process exists: from here only its own exit ends the switch, whatever throws next.
+      committed = true
+      commitLocalTerminalSwitch(args.switchGeneration, {
+        id,
+        incarnationId,
+        proc: spawnResult.process
+      })
       try {
         checkCanceled()
       } catch (error) {
@@ -144,12 +151,6 @@ export async function spawnLocalPty(
         throw error
       }
       args.onPtySpawnCommitted?.()
-      committed = true
-      commitLocalTerminalSwitch(args.switchGeneration, {
-        id,
-        incarnationId,
-        proc: spawnResult.process
-      })
       plan.shellPath = spawnResult.shellPath
       // Why: a Windows fallback embeds its startup command in argv; honor the winning shell's delivery flag to avoid a double write.
       if (spawnResult.startupCommandDeliveredInShellArgs !== undefined) {
diff --git a/src/main/providers/terminal-switch-owners.ts b/src/main/providers/terminal-switch-owners.ts
index 37207763bd5a..ca600b02e2ea 100644
--- a/src/main/providers/terminal-switch-owners.ts
+++ b/src/main/providers/terminal-switch-owners.ts
@@ -9,13 +9,11 @@ export function routedTerminalSwitchOwners(
 ): TerminalSwitchOwners {
   return {
     owner: async () => (await fresh().terminalSwitches?.owner()) ?? null,
-    // An owner that cannot answer is left out, so the caller reads the start as unverifiable.
+    // One owner that cannot answer fails the whole read: it may be the one that holds the start.
     observe: async (generation, fence) =>
       (
         await Promise.all(
-          all().map(
-            (owner) => owner.terminalSwitches?.observe(generation, fence).catch(() => []) ?? []
-          )
+          all().map((owner) => owner.terminalSwitches?.observe(generation, fence) ?? [])
         )
       ).flat()
   }
diff --git a/src/main/runtime/agent-session-record-terminal-switch.ts b/src/main/runtime/agent-session-record-terminal-switch.ts
index 8303517df198..77c53f801bd5 100644
--- a/src/main/runtime/agent-session-record-terminal-switch.ts
+++ b/src/main/runtime/agent-session-record-terminal-switch.ts
@@ -2,19 +2,22 @@ import type { AgentSessionRecord } from '../../shared/agent-session-record'
 import type { TerminalSwitchWrite } from '../../shared/terminal-switch'
 
 /** Unfenced like the name: the descriptor is the switch owner's obligation, not the writer lease.
- *  A clear names its generation, so an old completion never clears a newer switch. */
+ *  Compare-and-set on generation, so a stale collector never resurrects or replaces another. */
 export function setAgentSessionRecordTerminalSwitch(
   record: AgentSessionRecord,
-  descriptor: TerminalSwitchWrite,
+  write: TerminalSwitchWrite,
   now: number
 ): AgentSessionRecord {
-  if ('clear' in descriptor) {
-    if (record.terminalSwitch?.generation !== descriptor.clear) {
+  const current = record.terminalSwitch?.generation
+  if ('clear' in write) {
+    if (current !== write.clear) {
       return record
     }
     const next = { ...record, updatedAt: now }
     delete next.terminalSwitch
     return next
   }
-  return { ...record, terminalSwitch: descriptor, updatedAt: now }
+  const descriptor = 'accept' in write ? write.accept : write.update
+  const applies = current === descriptor.generation || ('accept' in write && current === undefined)
+  return applies ? { ...record, terminalSwitch: descriptor, updatedAt: now } : record
 }
diff --git a/src/main/runtime/runtime-mobile-session-projection.ts b/src/main/runtime/runtime-mobile-session-projection.ts
index f31994b57b29..ece53a621ef6 100644
--- a/src/main/runtime/runtime-mobile-session-projection.ts
+++ b/src/main/runtime/runtime-mobile-session-projection.ts
@@ -35,18 +35,21 @@ export function projectRuntimeMobileSessionTabs(
   // and embedders that have not adopted the narrow getter.
   let hookRowsByPaneKey: Map<string, AgentStatusIpcPayload[]> | null = null
   const hookRowsForPane = new Map<string, AgentStatusIpcPayload[]>()
+  // A switch's launch identity names one exact execution; a replacement there never wears it.
+  const current = ({ launchExecution: stamp }: AgentStatusIpcPayload) =>
+    !stamp || host.ptysById.get(stamp.ptyId)?.incarnationId === stamp.incarnationId
   const getHookRowsForPane = (paneKey: string): AgentStatusIpcPayload[] => {
     const cached = hookRowsForPane.get(paneKey)
     if (cached) {
       return cached
     }
-    const direct = host.getProviderSessionRows(paneKey)
-    if (direct) {
-      hookRowsForPane.set(paneKey, direct)
-      return direct
-    }
-    hookRowsByPaneKey ??= indexAgentStatusRowsByPaneKey(host.getProviderSessionSnapshot())
-    const rows = hookRowsByPaneKey.get(paneKey) ?? []
+    const rows = (
+      host.getProviderSessionRows(paneKey) ??
+      (hookRowsByPaneKey ??= indexAgentStatusRowsByPaneKey(host.getProviderSessionSnapshot())).get(
+        paneKey
+      ) ??
+      []
+    ).filter(current)
     hookRowsForPane.set(paneKey, rows)
     return rows
   }
diff --git a/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts b/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts
index 677355129b6e..4caaa68e404d 100644
--- a/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts
+++ b/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts
@@ -190,8 +190,8 @@ export abstract class OrcaRuntimeWithStructuredSessionCliWriterHost extends Orca
     await this.assertSwitchStartsEnded(agent, id).catch(() => undefined)
   }
 
-  /** A switch's start holds its conversation until its owner proves it over, or its startup has
-   *  settled, every agent recorded there is proved exited and that exact shell is alone. */
+  /** A switch's start holds its conversation until every agent recorded there is proved exited and
+   *  either its owner proves the execution ended, or its startup settled with that exact shell alone. */
   private async assertSwitchStartsEnded(agent: string, id: string): Promise<void> {
     for (const claim of this.switchClaimsFor(agent, id)) {
       if (!claim.accepted) {
@@ -202,16 +202,19 @@ export abstract class OrcaRuntimeWithStructuredSessionCliWriterHost extends Orca
         await this.noteSwitchBound(claim, seen)
       }
       const pane = seen.state === 'bound' ? this.cliWriterPtyPane(seen.ptyId) : null
-      const agentsEnded =
-        seen.state === 'bound' &&
-        seen.startupSettled &&
-        claim.processes.length > 0 &&
-        pane?.incarnationId === seen.incarnationId &&
-        (await Promise.all(claim.processes.map(switchStartProcessVerdict))).every(
-          (verdict) => verdict === 'exited'
-        ) &&
-        (await this.cliWriterShellAlone(pane))
-      if (seen.state === 'ended' || agentsEnded) {
+      // A root exit is not the agents' exit: a detached one outlives its shell.
+      const agentsExited = (
+        await Promise.all(claim.processes.map(switchStartProcessVerdict))
+      ).every((verdict) => verdict === 'exited')
+      const over =
+        agentsExited &&
+        (seen.state === 'ended' ||
+          (seen.state === 'bound' &&
+            seen.startupSettled &&
+            claim.processes.length > 0 &&
+            pane?.incarnationId === seen.incarnationId &&
+            (await this.cliWriterShellAlone(pane))))
+      if (over) {
         await this.releaseSwitchClaim(claim)
         continue
       }
diff --git a/src/main/runtime/session-tabs/structured-session-switch-claims.test.ts b/src/main/runtime/session-tabs/structured-session-switch-claims.test.ts
index 5f484e17ff90..a7de70be471a 100644
--- a/src/main/runtime/session-tabs/structured-session-switch-claims.test.ts
+++ b/src/main/runtime/session-tabs/structured-session-switch-claims.test.ts
@@ -12,6 +12,8 @@ import {
   type TerminalSwitchDescriptor,
   type TerminalSwitchWrite
 } from '../../../shared/terminal-switch'
+import { setAgentSessionRecordTerminalSwitch } from '../agent-session-record-terminal-switch'
+import { routedTerminalSwitchOwners } from '../../providers/terminal-switch-owners'
 import type { AgentProcessVerdict } from '../../../shared/agent-process-presence'
 import type { SwitchClaim } from './structured-session-switch-claims'
 
@@ -21,6 +23,9 @@ vi.mock('electron', () => ({
   ipcMain: { on: vi.fn(), removeListener: vi.fn() },
   app: { getPath: vi.fn(() => '/tmp') }
 }))
+vi.mock('../../agent-hooks/managed-hook-owner-identity', () => ({
+  readBootIdentity: async () => boot
+}))
 vi.mock('./structured-session-switch-observation', () => ({
   readSwitchPaneAgentProcesses: vi.fn(async () => []),
   readSwitchShellProcess: vi.fn(async (pid: number) => ({
@@ -40,6 +45,7 @@ let runtime: OrcaRuntimeService
 let host: TerminalHostSwitches
 let shellAlone: boolean
 let ownerReachable: boolean
+let boot = 'boot-1'
 /** The chat records' saved switch descriptors, keyed by chat session id. */
 let saved: Map<string, TerminalSwitchDescriptor>
 
@@ -49,44 +55,60 @@ const reason = (promise: Promise<unknown>) =>
     () => 'admitted',
     (error: { refusal?: { details?: { reason?: string } } }) => error.refusal?.details?.reason
   )
-// oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the owner reads only these four session facts.
-const session = (facts: Partial<Session>) => ({ ...facts }) as Session
+const session = (facts: Partial<Session>) =>
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the owner reads only these session facts.
+  ({ shellReady: { isGatingWrites: false }, ...facts }) as Session
+const live = () => session({ isAlive: true, sessionId: 'pty-1', incarnationId: 'i1', pid: 4242 })
 
 beforeEach(() => {
   shellAlone = true
   ownerReachable = true
+  boot = 'boot-1'
   saved = new Map()
   host = new TerminalHostSwitches()
   runtime = new OrcaRuntimeService()
   runtime.registerPty('pty-1', 'wt-1', null, { tabId: 'tab-1', leafId: LEAF, incarnationId: 'i1' })
-  runtime.setPtyController({
+  const reach = {
     terminalSwitches: {
       owner: async () => host.owner,
-      observe: async (generation, fence) => {
+      observe: async (generation: string, fence: boolean) => {
         if (!ownerReachable) {
-          throw new Error('host unreachable')
+          throw new Error('terminal_switch_owner_unreachable')
         }
         return [host.observe(generation, fence)]
       }
     }
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the switch reads only its owner contract.
-  } as never)
+  }
+  // The production routing: an unreachable owner must stay unreachable through it.
+  const terminalSwitches = routedTerminalSwitchOwners(
+    () => reach,
+    () => [reach, {}]
+  )
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the switch reads only its owner contract.
+  runtime.setPtyController({ terminalSwitches } as never)
   vi.spyOn(runtime, 'openAgentSessionRecordStore').mockResolvedValue(
     // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the switch reads records and writes descriptors only.
     {
       listRecords: () =>
         [...saved].map(([sessionId, terminalSwitch]) => ({ sessionId, terminalSwitch })),
       setTerminalSwitch: async (sessionId: string, write: TerminalSwitchWrite) => {
-        if (!('clear' in write)) {
-          saved.set(sessionId, write)
-        } else if (saved.get(sessionId)?.generation === write.clear) {
+        const current = saved.get(sessionId)
+        const record = {
+          ...codexChatHolding(sessionId, [C]),
+          ...(current ? { terminalSwitch: current } : {})
+        }
+        const next = setAgentSessionRecordTerminalSwitch(record, write, 0)
+        if (next.terminalSwitch) {
+          saved.set(sessionId, next.terminalSwitch)
+        } else {
           saved.delete(sessionId)
         }
+        return next
       }
     } as never
   )
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the census's one process-table read, replaced by the pane's modeled state.
   vi.spyOn(
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the census's one process-table read, replaced by the pane's modeled state.
     runtime as never as { cliWriterShellAlone: () => Promise<boolean> },
     'cliWriterShellAlone'
   ).mockImplementation(async () => shellAlone)
@@ -118,12 +140,16 @@ describe('a chat → terminal switch start', () => {
       'terminal_switch_generation_refused'
     )
 
-    const shell = session({ isAlive: true, sessionId: 'pty-1', incarnationId: 'i1', pid: 4242 })
+    const shell = live()
     host.bind(claim.generation, shell)
     // Bound with no agent recorded: only the owner's end releases it.
     expect(await reason(chatStart())).toBe('conversationHeldElsewhere')
     expect(saved.get('chat-1')).toMatchObject({ ptyId: 'pty-1', incarnationId: 'i1', shell: SHELL })
+    runtime['noteSwitchStartProcess']('pty-1', { agent: 'codex', id: C }, AGENT)
+    // The shell exiting is not its detached agent exiting.
     Object.assign(shell, { isAlive: false })
+    expect(await reason(chatStart())).toBe('conversationHeldElsewhere')
+    vi.mocked(switchStartProcessVerdict).mockResolvedValue('exited')
     expect(await reason(chatStart())).toBe('admitted')
     expect(saved.has('chat-1')).toBe(false)
   })
@@ -131,10 +157,7 @@ describe('a chat → terminal switch start', () => {
   it('releases on a proved agent exit with that exact shell alone, keeping the shell', async () => {
     const claim = await acceptedSwitch()
     host.begin(claim.generation, host.owner)
-    host.bind(
-      claim.generation,
-      session({ isAlive: true, sessionId: 'pty-1', incarnationId: 'i1', pid: 4242 })
-    )
+    host.bind(claim.generation, live())
     expect(await reason(chatStart())).toBe('conversationHeldElsewhere')
     runtime['noteSwitchStartProcess']('pty-1', { agent: 'codex', id: C }, AGENT)
     vi.mocked(switchStartProcessVerdict).mockResolvedValue('exited')
@@ -144,6 +167,15 @@ describe('a chat → terminal switch start', () => {
     expect(await reason(chatStart())).toBe('admitted')
   })
 
+  it('never lets a retired switch’s late evidence replace the next one', async () => {
+    const a = await acceptedSwitch()
+    expect(await reason(chatStart())).toBe('admitted')
+    const b = await acceptedSwitch()
+    a.processes.push(AGENT)
+    expect(await runtime.saveSwitchClaim(a)).toBe(false)
+    expect(saved.get('chat-1')?.generation).toBe(b.generation)
+  })
+
   it('fences a saved start no terminal took, so it can never start later', async () => {
     const claim = await acceptedSwitch()
     expect(await reason(chatStart())).toBe('admitted')
@@ -152,18 +184,19 @@ describe('a chat → terminal switch start', () => {
     )
   })
 
-  it('survives a restart: a lost owner never speaks, only the recorded execution can end it', async () => {
-    saved.set('chat-1', {
-      generation: 'g-old',
-      agent: 'codex',
-      providerSessionId: C,
-      owner: 'daemon:gone',
-      paneKey: PANE,
-      ptyId: 'pty-1',
-      incarnationId: 'i1',
-      shell: SHELL,
-      processes: [AGENT]
-    })
+  it('survives a restart: an unreachable owner holds; a lost one yields only to proof', async () => {
+    const lost = (extra: Partial<TerminalSwitchDescriptor>) =>
+      saved.set('chat-1', {
+        generation: 'g-old',
+        agent: 'codex',
+        providerSessionId: C,
+        owner: 'daemon:gone',
+        paneKey: PANE,
+        processes: [],
+        boot: 'boot-1',
+        ...extra
+      })
+    lost({ ptyId: 'pty-1', incarnationId: 'i1', shell: SHELL, processes: [AGENT] })
     ownerReachable = false
     vi.mocked(switchStartProcessVerdict).mockResolvedValue('exited')
     expect(await reason(chatStart())).toBe('conversationHeldElsewhere')
@@ -172,6 +205,13 @@ describe('a chat → terminal switch start', () => {
     expect(await reason(chatStart())).toBe('conversationHeldElsewhere')
     vi.mocked(switchStartProcessVerdict).mockResolvedValue('exited')
     expect(await reason(chatStart())).toBe('admitted')
+
+    // A crash before any identity was learned stays held until the host has rebooted.
+    lost({})
+    runtime['switchClaimsLoaded'] = null
+    expect(await reason(chatStart())).toBe('conversationHeldElsewhere')
+    boot = 'boot-2'
+    expect(await reason(chatStart())).toBe('admitted')
     expect(saved.has('chat-1')).toBe(false)
   })
 })
diff --git a/src/main/runtime/session-tabs/structured-session-switch-claims.ts b/src/main/runtime/session-tabs/structured-session-switch-claims.ts
index 13f28ebf3c85..b8533dd6fdd3 100644
--- a/src/main/runtime/session-tabs/structured-session-switch-claims.ts
+++ b/src/main/runtime/session-tabs/structured-session-switch-claims.ts
@@ -11,6 +11,7 @@ import {
   type TerminalSwitchObservation
 } from '../../../shared/terminal-switch'
 import { OrcaRuntimeWithGetWorktreePs } from '../workspaces/workspace-process-listing'
+import { readBootIdentity } from '../../agent-hooks/managed-hook-owner-identity'
 import {
   readSwitchPaneAgentProcesses,
   readSwitchShellProcess,
@@ -27,6 +28,10 @@ export type SwitchClaim = TerminalSwitchDescriptor & {
   chatSessionId: string
   at: number
   accepted: boolean
+  /** The descriptor holds this generation; later evidence only updates it. */
+  saved: boolean
+  /** Evidence learned but not yet saved; the next observation retries it. */
+  unsaved?: boolean
 }
 
 export const switchMovingRefusal = () =>
@@ -56,7 +61,13 @@ export abstract class OrcaRuntimeWithStructuredSessionSwitchClaims extends OrcaR
       (store) => {
         for (const { sessionId, terminalSwitch } of store.listRecords()) {
           if (isTerminalSwitchDescriptor(terminalSwitch)) {
-            const claim = { ...terminalSwitch, chatSessionId: sessionId, at: 0, accepted: true }
+            const claim = {
+              ...terminalSwitch,
+              chatSessionId: sessionId,
+              at: 0,
+              accepted: true,
+              saved: true
+            }
             this.switchClaims.set(
               terminalSwitch.generation,
               this.switchClaims.get(claim.generation) ?? claim
@@ -103,7 +114,8 @@ export abstract class OrcaRuntimeWithStructuredSessionSwitchClaims extends OrcaR
       processes: [],
       chatSessionId,
       at: Date.now(),
-      accepted: false
+      accepted: false,
+      saved: false
     }
     this.switchClaims.set(claim.generation, claim)
     return claim
@@ -132,14 +144,21 @@ export abstract class OrcaRuntimeWithStructuredSessionSwitchClaims extends OrcaR
     return claim
   }
 
-  /** Saved before dispatch, so a restart still knows the start may exist. */
+  /** Saved before dispatch, so a restart still knows the start may exist. A retired claim's
+   *  late evidence never writes, and the store only updates the generation it holds. */
   async saveSwitchClaim(claim: SwitchClaim): Promise<boolean> {
-    const { chatSessionId, at: _at, accepted: _accepted, ...descriptor } = claim
+    claim.boot ??= await readBootIdentity()
+    const { chatSessionId, at: _at, accepted: _a, saved, unsaved: _u, ...descriptor } = claim
+    if (saved && this.switchClaims.get(claim.generation) !== claim) {
+      return false
+    }
     const store = await this.openAgentSessionRecordStore()
-    return store.setTerminalSwitch(chatSessionId, descriptor).then(
-      () => true,
-      () => false
-    )
+    const next = await store
+      .setTerminalSwitch(chatSessionId, saved ? { update: descriptor } : { accept: descriptor })
+      .catch(() => null)
+    const ok = next?.terminalSwitch?.generation === claim.generation
+    Object.assign(claim, { saved: saved || ok, unsaved: !ok })
+    return ok
   }
 
   /** The owner's fields for the dispatch; evidence collection starts with it and decides nothing. */
@@ -160,9 +179,15 @@ export abstract class OrcaRuntimeWithStructuredSessionSwitchClaims extends OrcaR
       ?.observe(claim.generation, fence)
       .catch(() => null)
     const own = answers?.find((answer) => answer.owner === claim.owner)
+    // An owner that could not answer is not a lost one.
     if (own || !answers) {
       return own?.observation ?? { state: 'unverifiable' }
     }
+    // Every reachable owner answered and none is this one: only the execution can end it.
+    const boot = claim.boot ? await readBootIdentity() : undefined
+    if (boot && boot !== claim.boot) {
+      return { state: 'ended' }
+    }
     const recorded = claim.shell ? [claim.shell, ...claim.processes] : []
     const verdicts = await Promise.all(recorded.map(switchStartProcessVerdict))
     return recorded.length > 0 && verdicts.every((verdict) => verdict === 'exited')
@@ -175,7 +200,12 @@ export abstract class OrcaRuntimeWithStructuredSessionSwitchClaims extends OrcaR
     claim: SwitchClaim,
     bound: Extract<TerminalSwitchObservation, { state: 'bound' }>
   ): Promise<void> {
-    if (claim.ptyId === bound.ptyId && claim.incarnationId === bound.incarnationId) {
+    if (
+      claim.ptyId === bound.ptyId &&
+      claim.incarnationId === bound.incarnationId &&
+      (claim.shell || !bound.shellPid) &&
+      !claim.unsaved
+    ) {
       return
     }
     const shell = bound.shellPid ? await readSwitchShellProcess(bound.shellPid) : null
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
index 9f796ea118bc..c068e1f348e2 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
@@ -15,9 +15,13 @@ const mocks = vi.hoisted(() => {
     activate: vi.fn(async () => true),
     activateVerified: vi.fn(async () => 'activated'),
     switchCapability: vi.fn(async () => false),
-    exitWatchers: new Map<string, () => void>()
+    exitWatchers: new Map<string, () => void>(),
+    inspect: vi.fn(async (_ptyId: string): Promise<{ foregroundProcessEvidence?: unknown }> => ({}))
   }
 })
+vi.mock('@/runtime/runtime-terminal-inspection', () => ({
+  inspectRuntimeTerminalProcess: mocks.inspect
+}))
 vi.mock('../terminal-pane/pty-dispatcher', () => ({
   subscribeToPtyExit: (ptyId: string, watcher: () => void) => {
     mocks.exitWatchers.set(ptyId, watcher)
@@ -317,6 +321,32 @@ describe('CLI identity resume through the existing launch owner', () => {
     expect(closed).toHaveBeenCalledOnce()
     expect(closed.mock.calls[0]?.[0].detail).toEqual({ tabId: 'tab-1', leafId })
     expect(tabs()).toEqual([])
+
+    // A paired source retires only while its host still reports the incarnation it started with.
+    const remote = 'remote:env@@handle-1'
+    mocks.source = { ...mocks.source, ptyId: remote }
+    useAppStore.setState({
+      terminalLayoutsByTabId: {
+        'tab-1': {
+          root: null,
+          activeLeafId: leafId,
+          expandedLeafId: null,
+          ptyIdsByLeafId: { [leafId]: remote }
+        }
+      }
+    })
+    const host = (...incarnations: string[]) =>
+      incarnations.forEach((ptyIncarnationId) =>
+        mocks.inspect.mockResolvedValueOnce({ foregroundProcessEvidence: { ptyIncarnationId } })
+      )
+    window.addEventListener('orca-close-terminal-pane', closed)
+    host('i1', 'i2')
+    await runCliChatResume(mocks.source)
+    expect(closed).toHaveBeenCalledOnce()
+    host('i1', 'i1')
+    await runCliChatResume(mocks.source)
+    window.removeEventListener('orca-close-terminal-pane', closed)
+    expect(closed).toHaveBeenCalledTimes(2)
   })
 
   it('keeps the eager History joiner failed and retryable after the hidden starter is refused', async () => {
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
index 37729ff45ee2..f81b2b805921 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
@@ -17,15 +17,33 @@ import { reportCliChatResumeFailure } from './cli-chat-resume-feedback'
 import { adoptingAgentOnHost } from '../right-sidebar/ai-vault-session-resume-in-chat-launch'
 import { panePtyId } from '@/lib/ai-vault-tab-title-requests'
 import { subscribeToPtyExit } from '../terminal-pane/pty-dispatcher'
+import { inspectRuntimeTerminalProcess } from '@/runtime/runtime-terminal-inspection'
+import { isRemoteRuntimePtyId } from '../../../../shared/remote-runtime-pty-id'
+
+/** The incarnation the execution host reports for a PTY; null when it reports none. */
+const hostPtyIncarnation = (ptyId: string): Promise<string | null> =>
+  inspectRuntimeTerminalProcess(ptyId).then(
+    (inspection) => inspection.foregroundProcessEvidence?.ptyIncarnationId ?? null,
+    () => null
+  )
 
 /** The chat took the conversation, so the terminal pane it came from closes (its tab with it):
- *  only while that pane still holds the execution it came from, never a sibling or replacement. */
-function retireSwitchedTerminalPane(source: CliChatResumeSource, sourceExited: boolean): void {
+ *  only while the host still reports the execution it came from, never a sibling or replacement.
+ *  A local PTY whose host reports no incarnation is fenced by its exit, which precedes reuse. */
+async function retireSwitchedTerminalPane(
+  source: CliChatResumeSource,
+  sourceExited: () => boolean,
+  expected: Promise<string | null>
+): Promise<void> {
   const pane = parsePaneKey(source.paneKey)
+  const incarnation = await expected
   if (
     pane &&
-    !sourceExited &&
     source.ptyId &&
+    (incarnation
+      ? (await hostPtyIncarnation(source.ptyId)) === incarnation
+      : !isRemoteRuntimePtyId(source.ptyId)) &&
+    !sourceExited() &&
     panePtyId(useAppStore.getState(), source.paneKey) === source.ptyId
   ) {
     const detail: CloseTerminalPaneDetail = { tabId: pane.tabId, leafId: pane.leafId }
@@ -97,6 +115,7 @@ export async function runCliChatResume(source: CliChatResumeSource): Promise<voi
   changed()
   // Why any exit: a reused id's next incarnation starts only after this one exits.
   let sourceExited = false
+  const sourceIncarnation = source.ptyId ? hostPtyIncarnation(source.ptyId) : Promise.resolve(null)
   const stopExitWatch = source.ptyId
     ? subscribeToPtyExit(source.ptyId, () => {
         sourceExited = true
@@ -173,21 +192,21 @@ export async function runCliChatResume(source: CliChatResumeSource): Promise<voi
     }
     const result = await waitForPromiseWithSignal(launch.settlement, controller.signal)
     if (result.kind === 'structured') {
-      retireSwitchedTerminalPane(source, sourceExited)
+      await retireSwitchedTerminalPane(source, () => sourceExited, sourceIncarnation)
     } else if (
       result.kind === 'failed' &&
       !result.notified &&
       pending.get(key) === controller &&
       (await reportCliChatResumeFailure(source, result.error, target))
     ) {
-      retireSwitchedTerminalPane(source, sourceExited)
+      await retireSwitchedTerminalPane(source, () => sourceExited, sourceIncarnation)
     }
   } catch (error) {
     if (
       pending.get(key) === controller &&
       (await reportCliChatResumeFailure(source, error, target))
     ) {
-      retireSwitchedTerminalPane(source, sourceExited)
+      await retireSwitchedTerminalPane(source, () => sourceExited, sourceIncarnation)
     }
   } finally {
     clearTimeout(timer)
diff --git a/src/shared/terminal-switch.ts b/src/shared/terminal-switch.ts
index 0801c83ced9d..76596d545a5f 100644
--- a/src/shared/terminal-switch.ts
+++ b/src/shared/terminal-switch.ts
@@ -41,13 +41,18 @@ export type TerminalSwitchDescriptor = {
   incarnationId?: string
   shell?: AgentProcessIdentity
   processes: AgentProcessIdentity[]
+  /** The execution host's boot when accepted: a later boot proves its processes gone. */
+  boot?: string
 }
 
 /** The exact execution a switch's launch identity row describes; presentation binds to it. */
 export type TerminalExecutionStamp = { ptyId: string; incarnationId: string }
 
-/** A save, or a clear that names the generation it ends. */
-export type TerminalSwitchWrite = TerminalSwitchDescriptor | { clear: string }
+/** Each names its generation: an acceptance takes an empty slot, an update or a clear only its own. */
+export type TerminalSwitchWrite =
+  | { accept: TerminalSwitchDescriptor }
+  | { update: TerminalSwitchDescriptor }
+  | { clear: string }
 
 const MAX = 512
 const bounded = (value: unknown): value is string =>
@@ -60,7 +65,7 @@ export function isTerminalSwitchDescriptor(value: unknown): value is TerminalSwi
   const d: Partial<Record<keyof TerminalSwitchDescriptor, unknown>> = value
   return (
     [d.generation, d.agent, d.providerSessionId, d.owner, d.paneKey].every(bounded) &&
-    [d.ptyId, d.incarnationId].every((field) => field === undefined || bounded(field)) &&
+    [d.ptyId, d.incarnationId, d.boot].every((field) => field === undefined || bounded(field)) &&
     (d.shell === undefined || readAgentProcessIdentity(d.shell) !== undefined) &&
     Array.isArray(d.processes) &&
     d.processes.length <= 16 &&

From 0fd319b22e2a9729aa49bc566d5c067507af1816 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Tue, 20 Oct 2026 14:32:19 -0700
Subject: [PATCH 018/207] test: document snapshot runtime fixture boundary

---
 .../methods/terminal-stream-extraction-characterization.test.ts  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/runtime/rpc/methods/terminal-stream-extraction-characterization.test.ts b/src/main/runtime/rpc/methods/terminal-stream-extraction-characterization.test.ts
index 97a4b1100b65..1066394cbf8e 100644
--- a/src/main/runtime/rpc/methods/terminal-stream-extraction-characterization.test.ts
+++ b/src/main/runtime/rpc/methods/terminal-stream-extraction-characterization.test.ts
@@ -120,6 +120,7 @@ describe('terminal stream extraction characterization', () => {
       pendingOutputOverflowed: true,
       outputBatcher: { push: vi.fn(), flush: vi.fn() }
     } as unknown as TerminalMultiplexStream
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: this fixture supplies the runtime reads made by initial snapshot publication.
     const runtime = {
       getPtyExecutionHostMetadata: () => ({}),
       getTerminalLaunchResult: () => undefined,

From 839ff7f4630a14b908de6de53792641c34d11ed8 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Tue, 20 Oct 2026 14:38:43 -0700
Subject: [PATCH 019/207] fix(native-chat): prove a later boot on every
 platform and restamp a reattached switch terminal

The saved switch keeps the host boot as its id where the OS has one plus the boot time derived
from uptime, so Windows can also prove a later boot (by more than 60 seconds). A reattached
switch terminal regains its exact-execution stamp from the saved switch, without persisting it.
---
 .../structured-session-switch-boot.ts         | 23 ++++++++++
 .../structured-session-switch-claims.test.ts  | 44 ++++++++++++++++++-
 .../structured-session-switch-claims.ts       | 43 ++++++++++++++++--
 3 files changed, 105 insertions(+), 5 deletions(-)
 create mode 100644 src/main/runtime/session-tabs/structured-session-switch-boot.ts

diff --git a/src/main/runtime/session-tabs/structured-session-switch-boot.ts b/src/main/runtime/session-tabs/structured-session-switch-boot.ts
new file mode 100644
index 000000000000..301bba19f4e7
--- /dev/null
+++ b/src/main/runtime/session-tabs/structured-session-switch-boot.ts
@@ -0,0 +1,23 @@
+import { uptime } from 'node:os'
+import { readBootIdentity } from '../../agent-hooks/managed-hook-owner-identity'
+
+/** A later boot by more than this; clock steps and uptime rounding stay under it. */
+const LATER_BOOT_MARGIN_MS = 60_000
+
+/** The execution host's boot: its id where the OS has one, and the derived boot time everywhere. */
+export async function readSwitchHostBoot(): Promise<string> {
+  return `${(await readBootIdentity()) ?? ''}@${Math.round(Date.now() - uptime() * 1000)}`
+}
+
+const parse = (boot: string): [string, number] => {
+  const at = boot.lastIndexOf('@')
+  return at === -1 ? ['', Number.NaN] : [boot.slice(0, at), Number(boot.slice(at + 1))]
+}
+
+/** A later boot proves every process of the saved one gone; an unreadable value never does.
+ *  Windows Fast Startup keeps uptime across a shutdown, so that boot reads as the same one. */
+export function isLaterSwitchHostBoot(saved: string, current: string): boolean {
+  const [savedId, savedAt] = parse(saved)
+  const [id, at] = parse(current)
+  return savedId && id ? savedId !== id : at - savedAt > LATER_BOOT_MARGIN_MS
+}
diff --git a/src/main/runtime/session-tabs/structured-session-switch-claims.test.ts b/src/main/runtime/session-tabs/structured-session-switch-claims.test.ts
index a7de70be471a..152d4eed2408 100644
--- a/src/main/runtime/session-tabs/structured-session-switch-claims.test.ts
+++ b/src/main/runtime/session-tabs/structured-session-switch-claims.test.ts
@@ -14,6 +14,8 @@ import {
 } from '../../../shared/terminal-switch'
 import { setAgentSessionRecordTerminalSwitch } from '../agent-session-record-terminal-switch'
 import { routedTerminalSwitchOwners } from '../../providers/terminal-switch-owners'
+import { isLaterSwitchHostBoot } from './structured-session-switch-boot'
+import { seedResumeLaunchIdentity } from '../../ipc/pty/pane/resume-launch-identity'
 import type { AgentProcessVerdict } from '../../../shared/agent-process-presence'
 import type { SwitchClaim } from './structured-session-switch-claims'
 
@@ -26,6 +28,7 @@ vi.mock('electron', () => ({
 vi.mock('../../agent-hooks/managed-hook-owner-identity', () => ({
   readBootIdentity: async () => boot
 }))
+vi.mock('../../ipc/pty/pane/resume-launch-identity', () => ({ seedResumeLaunchIdentity: vi.fn() }))
 vi.mock('./structured-session-switch-observation', () => ({
   readSwitchPaneAgentProcesses: vi.fn(async () => []),
   readSwitchShellProcess: vi.fn(async (pid: number) => ({
@@ -193,7 +196,7 @@ describe('a chat → terminal switch start', () => {
         owner: 'daemon:gone',
         paneKey: PANE,
         processes: [],
-        boot: 'boot-1',
+        boot: 'boot-1@0',
         ...extra
       })
     lost({ ptyId: 'pty-1', incarnationId: 'i1', shell: SHELL, processes: [AGENT] })
@@ -214,6 +217,45 @@ describe('a chat → terminal switch start', () => {
     expect(await reason(chatStart())).toBe('admitted')
     expect(saved.has('chat-1')).toBe(false)
   })
+
+  it('reads a later boot from the id where there is one, else from the derived boot time', () => {
+    expect(isLaterSwitchHostBoot('a@0', 'a@999999')).toBe(false)
+    expect(isLaterSwitchHostBoot('a@0', 'b@0')).toBe(true)
+    // Windows: no id, so only a boot time clearly past rounding and clock steps counts.
+    expect(isLaterSwitchHostBoot('@1000', '@61000')).toBe(false)
+    expect(isLaterSwitchHostBoot('@1000', '@3600000')).toBe(true)
+    expect(isLaterSwitchHostBoot('unreadable', '@3600000')).toBe(false)
+  })
+
+  it('restamps a reattached switch terminal from the saved switch after a restart', async () => {
+    const claim = await acceptedSwitch()
+    Object.assign(claim, { ptyId: 'pty-1', incarnationId: 'i1' })
+    const providerSession = { key: 'session_id' as const, id: C }
+    vi.spyOn(runtime, 'getAgentProviderSessionRows').mockReturnValue([
+      {
+        paneKey: PANE,
+        connectionId: null,
+        receivedAt: 1,
+        stateStartedAt: 1,
+        state: 'done',
+        prompt: '',
+        providerSession
+      }
+    ])
+    const reattach = (incarnationId: string) =>
+      runtime.registerPty('pty-1', 'wt-1', null, {
+        tabId: 'tab-1',
+        leafId: LEAF,
+        incarnationId,
+        providerReattachLaunchIdentity: { incarnationId, launchAgent: 'codex' }
+      })
+    reattach('i2')
+    reattach('i1')
+    await vi.waitFor(() => expect(seedResumeLaunchIdentity).toHaveBeenCalledOnce())
+    expect(seedResumeLaunchIdentity).toHaveBeenCalledWith(
+      expect.objectContaining({ paneKey: PANE, execution: { ptyId: 'pty-1', incarnationId: 'i1' } })
+    )
+  })
 })
 
 describe('a switch spawn', () => {
diff --git a/src/main/runtime/session-tabs/structured-session-switch-claims.ts b/src/main/runtime/session-tabs/structured-session-switch-claims.ts
index b8533dd6fdd3..4f62f7ce8874 100644
--- a/src/main/runtime/session-tabs/structured-session-switch-claims.ts
+++ b/src/main/runtime/session-tabs/structured-session-switch-claims.ts
@@ -11,7 +11,9 @@ import {
   type TerminalSwitchObservation
 } from '../../../shared/terminal-switch'
 import { OrcaRuntimeWithGetWorktreePs } from '../workspaces/workspace-process-listing'
-import { readBootIdentity } from '../../agent-hooks/managed-hook-owner-identity'
+import { isLaterSwitchHostBoot, readSwitchHostBoot } from './structured-session-switch-boot'
+import { seedResumeLaunchIdentity } from '../../ipc/pty/pane/resume-launch-identity'
+import { adoptsCliConversations } from '../../../shared/structured-agent-cli-conversation-adoption'
 import {
   readSwitchPaneAgentProcesses,
   readSwitchShellProcess,
@@ -83,6 +85,40 @@ export abstract class OrcaRuntimeWithStructuredSessionSwitchClaims extends OrcaR
     return this.switchClaimsLoaded
   }
 
+  /** A reattached switch terminal regains its exact-execution stamp on the host's identity row,
+   *  rebuilt from the saved switch: the stamp itself is never persisted. */
+  override registerPty(...args: Parameters<OrcaRuntimeWithGetWorktreePs['registerPty']>): void {
+    super.registerPty(...args)
+    const [ptyId, worktreeId, , binding] = args
+    const reattached = binding?.providerReattachLaunchIdentity
+    if (!reattached || !adoptsCliConversations(reattached.launchAgent)) {
+      return
+    }
+    const { incarnationId } = reattached
+    void this.loadSwitchClaims().then(
+      () => {
+        for (const claim of this.switchClaims.values()) {
+          const row = this.getAgentProviderSessionRows().find(
+            (candidate) =>
+              candidate.paneKey === claim.paneKey &&
+              candidate.providerSession?.id === claim.providerSessionId
+          )
+          if (claim.ptyId === ptyId && claim.incarnationId === incarnationId && row) {
+            seedResumeLaunchIdentity({
+              paneKey: claim.paneKey,
+              launchAgent: claim.agent,
+              resumeProviderSession: row.providerSession,
+              worktreeId,
+              launchedAt: 0,
+              execution: { ptyId, incarnationId }
+            })
+          }
+        }
+      },
+      () => undefined
+    )
+  }
+
   /** Throws while a switch of this conversation exists: one no terminal took yet, or with `all`, any. */
   protected assertNoPendingSwitch(agent: string, id: string, all = false): void {
     if (this.switchClaimsFor(agent, id).some((claim) => all || !claim.accepted)) {
@@ -147,7 +183,7 @@ export abstract class OrcaRuntimeWithStructuredSessionSwitchClaims extends OrcaR
   /** Saved before dispatch, so a restart still knows the start may exist. A retired claim's
    *  late evidence never writes, and the store only updates the generation it holds. */
   async saveSwitchClaim(claim: SwitchClaim): Promise<boolean> {
-    claim.boot ??= await readBootIdentity()
+    claim.boot ??= await readSwitchHostBoot()
     const { chatSessionId, at: _at, accepted: _a, saved, unsaved: _u, ...descriptor } = claim
     if (saved && this.switchClaims.get(claim.generation) !== claim) {
       return false
@@ -184,8 +220,7 @@ export abstract class OrcaRuntimeWithStructuredSessionSwitchClaims extends OrcaR
       return own?.observation ?? { state: 'unverifiable' }
     }
     // Every reachable owner answered and none is this one: only the execution can end it.
-    const boot = claim.boot ? await readBootIdentity() : undefined
-    if (boot && boot !== claim.boot) {
+    if (claim.boot && isLaterSwitchHostBoot(claim.boot, await readSwitchHostBoot())) {
       return { state: 'ended' }
     }
     const recorded = claim.shell ? [claim.shell, ...claim.processes] : []

From 406b81930a5b4e5dcf09ff98ec122f5e2fbf8af9 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Tue, 20 Oct 2026 14:47:54 -0700
Subject: [PATCH 020/207] fix: preserve terminal launch identity types

---
 .../agent-hooks/server/server-tab-cleanup.ts     |  4 ++++
 .../ipc/pty/host-env/saved-resume-admission.ts   |  1 +
 src/main/ipc/pty/ipc/spawn-begin.ts              |  6 +++---
 src/main/ipc/pty/ipc/spawn-options.ts            |  5 +++--
 .../runtime/spawn-preflight-saved-resume.test.ts |  1 +
 .../empty-reattach-retire-evidence.test.ts       |  1 +
 ...ch-result-handler-park-reveal-verdict.test.ts |  1 +
 .../terminal-launch-result-policy.ts             | 16 +++++-----------
 ...-runtime-pty-transport-create-handoff.test.ts |  3 +++
 9 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/src/main/agent-hooks/server/server-tab-cleanup.ts b/src/main/agent-hooks/server/server-tab-cleanup.ts
index fb9c9be59691..c21177a8bca8 100644
--- a/src/main/agent-hooks/server/server-tab-cleanup.ts
+++ b/src/main/agent-hooks/server/server-tab-cleanup.ts
@@ -16,6 +16,10 @@ export abstract class AgentHookServerTabCleanup extends AgentHookServerCleanup {
     const clear = { paneKey: ownerKey, refusedResume: refused }
     if (
       row &&
+      'receivedAt' in row &&
+      typeof row.receivedAt === 'number' &&
+      'stateStartedAt' in row &&
+      typeof row.stateStartedAt === 'number' &&
       refused.expectedStatus &&
       row.receivedAt <= refused.expectedStatus.receivedAt &&
       row.stateStartedAt === refused.expectedStatus.stateStartedAt &&
diff --git a/src/main/ipc/pty/host-env/saved-resume-admission.ts b/src/main/ipc/pty/host-env/saved-resume-admission.ts
index 65296323394c..af11bc574e6e 100644
--- a/src/main/ipc/pty/host-env/saved-resume-admission.ts
+++ b/src/main/ipc/pty/host-env/saved-resume-admission.ts
@@ -102,6 +102,7 @@ export async function admitColdRestoreReattach(
         row.state !== 'done' &&
         !row.structuredHost &&
         !row.connectionId &&
+        row.agentType &&
         row.providerSession
           ? [{ agent: row.agentType, providerSession: row.providerSession }]
           : []
diff --git a/src/main/ipc/pty/ipc/spawn-begin.ts b/src/main/ipc/pty/ipc/spawn-begin.ts
index 716ef5852152..160843f771e4 100644
--- a/src/main/ipc/pty/ipc/spawn-begin.ts
+++ b/src/main/ipc/pty/ipc/spawn-begin.ts
@@ -3,7 +3,6 @@ import { resolveAgentLaunchPaneVerdict } from '../../../agent-launch/agent-launc
 import { AGENT_LAUNCH_PANE_REFUSED_CODE } from '../../../../shared/agent-launch-pane-verdict'
 import { agentLaunchPaneLiveness } from '../pane/agent-launch-pane-evidence'
 import { isValidTerminalTabId } from '../../../../shared/terminal-tab-id'
-import type { PtySpawnResult } from '../../../providers/pty-provider-contract'
 import type { CodexPaneHomeRoute } from '../../../codex/codex-pane-account-registry'
 import { createPtySpawnTiming } from '../../pty-spawn-timing'
 import { allocatePtyLifecycleSequence } from '../host-env/types'
@@ -13,7 +12,8 @@ import {
   makePaneSpawnReservationKey,
   reservePaneSpawn,
   paneSpawnReservationsByOwnerKey,
-  pendingRuntimePaneCreatesByOwnerKey
+  pendingRuntimePaneCreatesByOwnerKey,
+  type PaneSpawnReservationResult
 } from '../pane/spawn-reservation'
 import { resolveStablePaneOwner } from '../pane/stable-owner'
 import { excludeReplacedPaneOwner } from '../pane/replaced-pane-owner'
@@ -39,7 +39,7 @@ export function resolveEarlyPaneSpawnReservationKey(args: PtySpawnIpcArgs): stri
 
 export async function beginPtyIpcSpawn(
   ctx: PtyIpcSpawnState
-): Promise<PtySpawnResult | { isReattach: true } | null> {
+): Promise<PaneSpawnReservationResult | null> {
   const args = ctx.args
   // A pane an agent launch laid out attaches to its agent or says why it can't, never runs a shell.
   // A replacing spawn already holds the pane: the user restarted it, and that is theirs to run.
diff --git a/src/main/ipc/pty/ipc/spawn-options.ts b/src/main/ipc/pty/ipc/spawn-options.ts
index 31dfdfc6c177..db9ea2ddd49f 100644
--- a/src/main/ipc/pty/ipc/spawn-options.ts
+++ b/src/main/ipc/pty/ipc/spawn-options.ts
@@ -5,7 +5,8 @@ import {
   makePaneSpawnReservationKey,
   reservePaneSpawn,
   paneSpawnReservationsByOwnerKey,
-  pendingRuntimePaneCreatesByOwnerKey
+  pendingRuntimePaneCreatesByOwnerKey,
+  type PaneSpawnReservationResult
 } from '../pane/spawn-reservation'
 import {
   assemblePtySpawnEnvDeletions,
@@ -18,7 +19,7 @@ import type { PtyIpcSpawnState } from './spawn-state'
 /** Window lane: the shared spawn options plus this lane's pane reservation. */
 export async function buildPtyIpcSpawnOptions(
   ctx: PtyIpcSpawnState
-): Promise<{ isReattach: true } | null> {
+): Promise<PaneSpawnReservationResult | null> {
   const args = ctx.args
   const settings = ctx.deps.getSettings?.()
   const deletions = assemblePtySpawnEnvDeletions({
diff --git a/src/main/ipc/pty/runtime/spawn-preflight-saved-resume.test.ts b/src/main/ipc/pty/runtime/spawn-preflight-saved-resume.test.ts
index f83496bde996..d7be1bc34484 100644
--- a/src/main/ipc/pty/runtime/spawn-preflight-saved-resume.test.ts
+++ b/src/main/ipc/pty/runtime/spawn-preflight-saved-resume.test.ts
@@ -64,6 +64,7 @@ function chatHost() {
     getAgentProviderSessionRows: () => [
       {
         paneKey: 'tab-1:leaf',
+        connectionId: null,
         agentType: 'claude' as const,
         state: 'working' as const,
         prompt: '',
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/empty-reattach-retire-evidence.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/empty-reattach-retire-evidence.test.ts
index 086cfb820811..b264a057f118 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/empty-reattach-retire-evidence.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/empty-reattach-retire-evidence.test.ts
@@ -27,6 +27,7 @@ function resumeStartup(
   return {
     command: 'codex resume conv-1',
     agent: 'codex',
+    resumeOrigin: 'saved',
     resumeProviderSession: { key: 'session_id', id: 'conv-1' },
     launchConfig: { agentArgs: '', agentEnv: {} },
     launchToken: 'token-1',
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/reattach-result-handler-park-reveal-verdict.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/reattach-result-handler-park-reveal-verdict.test.ts
index 7d38b77b4864..f0f47c9867e8 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/reattach-result-handler-park-reveal-verdict.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/reattach-result-handler-park-reveal-verdict.test.ts
@@ -356,6 +356,7 @@ describe('handleReattachResult empty reattach under a hibernation note', () => {
   const startup: ColdRestoreAgentResumeStartup = {
     command: 'codex resume conv-1',
     agent: 'codex',
+    resumeOrigin: 'saved',
     resumeProviderSession: record.providerSession,
     launchConfig: { agentArgs: '', agentEnv: {} },
     launchToken: 'token-1',
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/terminal-launch-result-policy.ts b/src/renderer/src/components/terminal-pane/pty-connection/terminal-launch-result-policy.ts
index 487be5006014..49400e22ba4e 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/terminal-launch-result-policy.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/terminal-launch-result-policy.ts
@@ -7,18 +7,12 @@ import type { ConnectPanePtySession } from './connect-pane-pty-session'
 import type { ColdRestoreAgentResumeStartup } from './fresh-spawn-types'
 import type { PtyPaneStartup } from '../pty-connection-types'
 
-type LaunchResultSession = Pick<
-  ConnectPanePtySession,
-  | 'cacheKey'
-  | 'paneStartup'
-  | 'cancelSavedResumeStartup'
-  | 'registerEffectiveLaunchConfig'
-  | 'showSessionRestoredBanner'
->
-
 type SavedStartup = ColdRestoreAgentResumeStartup | PtyPaneStartup
 
-export function captureTerminalLaunchContext(session: LaunchResultSession, startup: SavedStartup) {
+export function captureTerminalLaunchContext(
+  session: ConnectPanePtySession,
+  startup: SavedStartup
+) {
   const state = useAppStore.getState()
   return {
     startup,
@@ -31,7 +25,7 @@ export function captureTerminalLaunchContext(session: LaunchResultSession, start
 export type TerminalLaunchContext = ReturnType<typeof captureTerminalLaunchContext>
 
 export function applyTerminalLaunchResult(
-  session: LaunchResultSession,
+  session: ConnectPanePtySession,
   result: TerminalLaunchResult & { isReattach?: boolean },
   context: TerminalLaunchContext,
   kind: 'creator' | 'observer' | 'candidate'
diff --git a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-create-handoff.test.ts b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-create-handoff.test.ts
index 2fe8fc0daf27..1cdd5cfc05c6 100644
--- a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-create-handoff.test.ts
+++ b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-create-handoff.test.ts
@@ -531,6 +531,9 @@ describe('createRemoteRuntimePtyTransport', () => {
       const onConnect = vi.fn()
       const result = await transport.connect({ url: '', callbacks: { onReplayData, onConnect } })
       try {
+        if (!result || typeof result === 'string') {
+          throw new Error('Expected a terminal connection result')
+        }
         expect(runtimeCall).toHaveBeenCalledWith(
           expect.objectContaining({ method: 'terminal.create' })
         )

From e8ce63031d7e54fa09ecf6aa88da38b1ba8c27c4 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Tue, 20 Oct 2026 14:54:18 -0700
Subject: [PATCH 021/207] fix(native-chat): no clock-only reboot release,
 host-fenced paired retirement, owner-recovered restamp

- Only a changed OS boot id proves a later boot; Windows (no id) never releases on a wall clock.
- A paired switch back closes its terminal through the host's terminal.close under the
  incarnation it started with; the host refuses a replacement under the same handle.
- After a restart, a reattached switch terminal asks the original owner for its binding, saves it,
  and restamps only while that exact execution is still the pane's.
- Saved evidence is a copy, so the frozen journal row never freezes the live claim's processes.
- A failed local commit callback stops that exact process; the switch ends only on its exit.
---
 .../local-pty-provider-spawn-session.test.ts  |  9 ++-
 src/main/providers/local-pty-spawn.ts         | 14 +++-
 ...-runtime-terminal-close-continuity.test.ts | 10 +++
 .../terminal/terminal-lifecycle-methods.ts    |  2 +-
 .../explicit-terminal-close-stops.ts          |  6 +-
 .../structured-session-switch-boot.ts         | 23 ------
 .../structured-session-switch-claims.test.ts  | 56 +++++++-------
 .../structured-session-switch-claims.ts       | 76 ++++++++++++-------
 .../tab-bar/cli-chat-resume-run.test.ts       | 34 ++++-----
 .../components/tab-bar/cli-chat-resume-run.ts | 19 +++--
 10 files changed, 137 insertions(+), 112 deletions(-)
 delete mode 100644 src/main/runtime/session-tabs/structured-session-switch-boot.ts

diff --git a/src/main/providers/local-pty-provider-spawn-session.test.ts b/src/main/providers/local-pty-provider-spawn-session.test.ts
index 661b0f5ac250..6795733230ea 100644
--- a/src/main/providers/local-pty-provider-spawn-session.test.ts
+++ b/src/main/providers/local-pty-provider-spawn-session.test.ts
@@ -611,8 +611,9 @@ describe('LocalPtyProvider', () => {
       expect(committed).toHaveBeenCalledOnce()
     })
 
-    it('keeps a switch start bound to its process past a failed commit callback, until it exits', async () => {
+    it('stops the process of a switch start whose commit callback fails, and ends on its exit', async () => {
       spawnMock.mockClear()
+      const { kill } = mockProc
       const switchOwner = (await provider.terminalSwitches.owner()) ?? ''
       const seen = async () => (await provider.terminalSwitches.observe('g-local', true))[0]
       const start = () =>
@@ -626,11 +627,11 @@ describe('LocalPtyProvider', () => {
           }
         })
       await expect(start()).rejects.toThrow('commit callback failed')
-      expect((await seen())?.observation).toMatchObject({ state: 'bound', shellPid: mockProc.pid })
+      // The failure stops that exact process, and its own exit (not the throw) ends the switch.
+      expect(kill).toHaveBeenCalledWith('SIGKILL')
+      expect((await seen())?.observation).toEqual({ state: 'ended' })
       await expect(start()).rejects.toThrow('terminal_switch_generation_refused')
       expect(spawnMock).toHaveBeenCalledOnce()
-      exitCb?.({ exitCode: 0 })
-      expect((await seen())?.observation).toEqual({ state: 'ended' })
     })
   })
 })
diff --git a/src/main/providers/local-pty-spawn.ts b/src/main/providers/local-pty-spawn.ts
index a1fe6222a2ad..7e2e903a60d9 100644
--- a/src/main/providers/local-pty-spawn.ts
+++ b/src/main/providers/local-pty-spawn.ts
@@ -150,7 +150,19 @@ export async function spawnLocalPty(
         }
         throw error
       }
-      args.onPtySpawnCommitted?.()
+      try {
+        args.onPtySpawnCommitted?.()
+      } catch (error) {
+        // A switch keeps its claim until this exact process exits; stop it so that exit comes.
+        if (args.switchGeneration !== undefined) {
+          try {
+            spawnResult.process.kill('SIGKILL')
+          } finally {
+            destroyPtyProcess(spawnResult.process)
+          }
+        }
+        throw error
+      }
       plan.shellPath = spawnResult.shellPath
       // Why: a Windows fallback embeds its startup command in argv; honor the winning shell's delivery flag to avoid a double write.
       if (spawnResult.startupCommandDeliveredInShellArgs !== undefined) {
diff --git a/src/main/runtime/orca-runtime-terminal-close-continuity.test.ts b/src/main/runtime/orca-runtime-terminal-close-continuity.test.ts
index 2e33b46e8512..e3bd90aef740 100644
--- a/src/main/runtime/orca-runtime-terminal-close-continuity.test.ts
+++ b/src/main/runtime/orca-runtime-terminal-close-continuity.test.ts
@@ -284,6 +284,16 @@ describe('terminal close and handle incarnation continuity', () => {
     expect(canary.ptyId).toBe(survivor.ptyId)
   })
 
+  it('closes nothing when its handle now runs a later incarnation than the caller expected', async () => {
+    const harness = createHarness()
+    const [{ handle }] = (await harness.runtime.listTerminals(`id:${WORKTREE_ID}`)).terminals
+    await expect(harness.runtime.closeTerminal(handle, 'earlier-incarnation')).rejects.toThrow(
+      'terminal_handle_stale'
+    )
+    expect(harness.kill).not.toHaveBeenCalled()
+    expect(harness.getSession().tabsByWorktree[WORKTREE_ID]).toHaveLength(1)
+  })
+
   it('does not kill the final PTY when durable tab retirement is rejected', async () => {
     const harness = createHarness()
     const [{ handle }] = (await harness.runtime.listTerminals(`id:${WORKTREE_ID}`)).terminals
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-lifecycle-methods.ts b/src/main/runtime/rpc/methods/terminal/terminal-lifecycle-methods.ts
index 56439e190811..0d0c11121726 100644
--- a/src/main/runtime/rpc/methods/terminal/terminal-lifecycle-methods.ts
+++ b/src/main/runtime/rpc/methods/terminal/terminal-lifecycle-methods.ts
@@ -213,7 +213,7 @@ export const TERMINAL_LIFECYCLE_METHODS = [
         context,
         'terminal',
         params.terminal,
-        () => context.runtime.closeTerminal(params.terminal)
+        () => context.runtime.closeTerminal(params.terminal, params.expectedIncarnationId)
       )
     })
   }),
diff --git a/src/main/runtime/session-tabs/explicit-terminal-close-stops.ts b/src/main/runtime/session-tabs/explicit-terminal-close-stops.ts
index 32c9fa839ea3..9ae667fbb600 100644
--- a/src/main/runtime/session-tabs/explicit-terminal-close-stops.ts
+++ b/src/main/runtime/session-tabs/explicit-terminal-close-stops.ts
@@ -130,8 +130,12 @@ export abstract class OrcaRuntimeWithStopExplicitlyClosedTabPtys extends OrcaRun
     })
   }
 
-  async closeTerminal(handle: string): Promise<RuntimeTerminalClose> {
+  async closeTerminal(handle: string, incarnation?: string): Promise<RuntimeTerminalClose> {
     const pty = this.getLivePtyForHandle(handle)
+    // The handle's fence: a replacement execution under the same handle is never closed.
+    if (incarnation && pty?.pty.incarnationId !== incarnation) {
+      throw new Error('terminal_handle_stale')
+    }
     this.claudeAgentTeams.removeTeamForLeaderHandle(handle)
     if (pty) {
       const closeAuthority: RuntimePtyTabCloseAuthority = {
diff --git a/src/main/runtime/session-tabs/structured-session-switch-boot.ts b/src/main/runtime/session-tabs/structured-session-switch-boot.ts
deleted file mode 100644
index 301bba19f4e7..000000000000
--- a/src/main/runtime/session-tabs/structured-session-switch-boot.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { uptime } from 'node:os'
-import { readBootIdentity } from '../../agent-hooks/managed-hook-owner-identity'
-
-/** A later boot by more than this; clock steps and uptime rounding stay under it. */
-const LATER_BOOT_MARGIN_MS = 60_000
-
-/** The execution host's boot: its id where the OS has one, and the derived boot time everywhere. */
-export async function readSwitchHostBoot(): Promise<string> {
-  return `${(await readBootIdentity()) ?? ''}@${Math.round(Date.now() - uptime() * 1000)}`
-}
-
-const parse = (boot: string): [string, number] => {
-  const at = boot.lastIndexOf('@')
-  return at === -1 ? ['', Number.NaN] : [boot.slice(0, at), Number(boot.slice(at + 1))]
-}
-
-/** A later boot proves every process of the saved one gone; an unreadable value never does.
- *  Windows Fast Startup keeps uptime across a shutdown, so that boot reads as the same one. */
-export function isLaterSwitchHostBoot(saved: string, current: string): boolean {
-  const [savedId, savedAt] = parse(saved)
-  const [id, at] = parse(current)
-  return savedId && id ? savedId !== id : at - savedAt > LATER_BOOT_MARGIN_MS
-}
diff --git a/src/main/runtime/session-tabs/structured-session-switch-claims.test.ts b/src/main/runtime/session-tabs/structured-session-switch-claims.test.ts
index 152d4eed2408..10f18d97986f 100644
--- a/src/main/runtime/session-tabs/structured-session-switch-claims.test.ts
+++ b/src/main/runtime/session-tabs/structured-session-switch-claims.test.ts
@@ -14,7 +14,6 @@ import {
 } from '../../../shared/terminal-switch'
 import { setAgentSessionRecordTerminalSwitch } from '../agent-session-record-terminal-switch'
 import { routedTerminalSwitchOwners } from '../../providers/terminal-switch-owners'
-import { isLaterSwitchHostBoot } from './structured-session-switch-boot'
 import { seedResumeLaunchIdentity } from '../../ipc/pty/pane/resume-launch-identity'
 import type { AgentProcessVerdict } from '../../../shared/agent-process-presence'
 import type { SwitchClaim } from './structured-session-switch-claims'
@@ -48,7 +47,7 @@ let runtime: OrcaRuntimeService
 let host: TerminalHostSwitches
 let shellAlone: boolean
 let ownerReachable: boolean
-let boot = 'boot-1'
+let boot: string | undefined = 'boot-1'
 /** The chat records' saved switch descriptors, keyed by chat session id. */
 let saved: Map<string, TerminalSwitchDescriptor>
 
@@ -100,7 +99,9 @@ beforeEach(() => {
           ...codexChatHolding(sessionId, [C]),
           ...(current ? { terminalSwitch: current } : {})
         }
-        const next = setAgentSessionRecordTerminalSwitch(record, write, 0)
+        // The journal store freezes what it commits.
+        const next = Object.freeze(setAgentSessionRecordTerminalSwitch(record, write, 0))
+        Object.freeze(next.terminalSwitch?.processes)
         if (next.terminalSwitch) {
           saved.set(sessionId, next.terminalSwitch)
         } else {
@@ -196,7 +197,7 @@ describe('a chat → terminal switch start', () => {
         owner: 'daemon:gone',
         paneKey: PANE,
         processes: [],
-        boot: 'boot-1@0',
+        boot: 'boot-1',
         ...extra
       })
     lost({ ptyId: 'pty-1', incarnationId: 'i1', shell: SHELL, processes: [AGENT] })
@@ -209,39 +210,22 @@ describe('a chat → terminal switch start', () => {
     vi.mocked(switchStartProcessVerdict).mockResolvedValue('exited')
     expect(await reason(chatStart())).toBe('admitted')
 
-    // A crash before any identity was learned stays held until the host has rebooted.
+    // A crash before any identity was learned stays held until an OS boot id changes; no id
+    // (Windows) never proves a reboot, however far the clock moves.
     lost({})
     runtime['switchClaimsLoaded'] = null
+    boot = undefined
     expect(await reason(chatStart())).toBe('conversationHeldElsewhere')
     boot = 'boot-2'
     expect(await reason(chatStart())).toBe('admitted')
     expect(saved.has('chat-1')).toBe(false)
   })
 
-  it('reads a later boot from the id where there is one, else from the derived boot time', () => {
-    expect(isLaterSwitchHostBoot('a@0', 'a@999999')).toBe(false)
-    expect(isLaterSwitchHostBoot('a@0', 'b@0')).toBe(true)
-    // Windows: no id, so only a boot time clearly past rounding and clock steps counts.
-    expect(isLaterSwitchHostBoot('@1000', '@61000')).toBe(false)
-    expect(isLaterSwitchHostBoot('@1000', '@3600000')).toBe(true)
-    expect(isLaterSwitchHostBoot('unreadable', '@3600000')).toBe(false)
-  })
-
-  it('restamps a reattached switch terminal from the saved switch after a restart', async () => {
+  it('rebuilds a reattached switch terminal’s stamp from its owner, never onto a replacement', async () => {
     const claim = await acceptedSwitch()
-    Object.assign(claim, { ptyId: 'pty-1', incarnationId: 'i1' })
-    const providerSession = { key: 'session_id' as const, id: C }
-    vi.spyOn(runtime, 'getAgentProviderSessionRows').mockReturnValue([
-      {
-        paneKey: PANE,
-        connectionId: null,
-        receivedAt: 1,
-        stateStartedAt: 1,
-        state: 'done',
-        prompt: '',
-        providerSession
-      }
-    ])
+    host.begin(claim.generation, host.owner)
+    host.bind(claim.generation, live())
+    vi.mocked(seedResumeLaunchIdentity).mockClear()
     const reattach = (incarnationId: string) =>
       runtime.registerPty('pty-1', 'wt-1', null, {
         tabId: 'tab-1',
@@ -249,11 +233,23 @@ describe('a chat → terminal switch start', () => {
         incarnationId,
         providerReattachLaunchIdentity: { incarnationId, launchAgent: 'codex' }
       })
-    reattach('i2')
+    // Replaced before the owner's answer lands: nothing is stamped onto i2.
+    reattach('i1')
+    runtime.registerPty('pty-1', 'wt-1', null, {
+      tabId: 'tab-1',
+      leafId: LEAF,
+      incarnationId: 'i2'
+    })
+    await vi.waitFor(() => expect(saved.get('chat-1')?.ptyId).toBe('pty-1'))
+    expect(seedResumeLaunchIdentity).not.toHaveBeenCalled()
     reattach('i1')
     await vi.waitFor(() => expect(seedResumeLaunchIdentity).toHaveBeenCalledOnce())
     expect(seedResumeLaunchIdentity).toHaveBeenCalledWith(
-      expect.objectContaining({ paneKey: PANE, execution: { ptyId: 'pty-1', incarnationId: 'i1' } })
+      expect.objectContaining({
+        paneKey: PANE,
+        resumeProviderSession: { key: 'session_id', id: C },
+        execution: { ptyId: 'pty-1', incarnationId: 'i1' }
+      })
     )
   })
 })
diff --git a/src/main/runtime/session-tabs/structured-session-switch-claims.ts b/src/main/runtime/session-tabs/structured-session-switch-claims.ts
index 4f62f7ce8874..61ceecd713ca 100644
--- a/src/main/runtime/session-tabs/structured-session-switch-claims.ts
+++ b/src/main/runtime/session-tabs/structured-session-switch-claims.ts
@@ -11,7 +11,7 @@ import {
   type TerminalSwitchObservation
 } from '../../../shared/terminal-switch'
 import { OrcaRuntimeWithGetWorktreePs } from '../workspaces/workspace-process-listing'
-import { isLaterSwitchHostBoot, readSwitchHostBoot } from './structured-session-switch-boot'
+import { readBootIdentity } from '../../agent-hooks/managed-hook-owner-identity'
 import { seedResumeLaunchIdentity } from '../../ipc/pty/pane/resume-launch-identity'
 import { adoptsCliConversations } from '../../../shared/structured-agent-cli-conversation-adoption'
 import {
@@ -65,6 +65,7 @@ export abstract class OrcaRuntimeWithStructuredSessionSwitchClaims extends OrcaR
           if (isTerminalSwitchDescriptor(terminalSwitch)) {
             const claim = {
               ...terminalSwitch,
+              processes: [...terminalSwitch.processes],
               chatSessionId: sessionId,
               at: 0,
               accepted: true,
@@ -85,38 +86,53 @@ export abstract class OrcaRuntimeWithStructuredSessionSwitchClaims extends OrcaR
     return this.switchClaimsLoaded
   }
 
-  /** A reattached switch terminal regains its exact-execution stamp on the host's identity row,
-   *  rebuilt from the saved switch: the stamp itself is never persisted. */
+  /** After a restart, a reattached switch terminal asks the original owner for its binding;
+   *  the stamp is rebuilt from the saved switch and that answer, never persisted itself. */
   override registerPty(...args: Parameters<OrcaRuntimeWithGetWorktreePs['registerPty']>): void {
     super.registerPty(...args)
-    const [ptyId, worktreeId, , binding] = args
-    const reattached = binding?.providerReattachLaunchIdentity
+    const reattached = args[3]?.providerReattachLaunchIdentity
     if (!reattached || !adoptsCliConversations(reattached.launchAgent)) {
       return
     }
-    const { incarnationId } = reattached
-    void this.loadSwitchClaims().then(
-      () => {
+    void this.loadSwitchClaims()
+      .then(async () => {
         for (const claim of this.switchClaims.values()) {
-          const row = this.getAgentProviderSessionRows().find(
-            (candidate) =>
-              candidate.paneKey === claim.paneKey &&
-              candidate.providerSession?.id === claim.providerSessionId
-          )
-          if (claim.ptyId === ptyId && claim.incarnationId === incarnationId && row) {
-            seedResumeLaunchIdentity({
-              paneKey: claim.paneKey,
-              launchAgent: claim.agent,
-              resumeProviderSession: row.providerSession,
-              worktreeId,
-              launchedAt: 0,
-              execution: { ptyId, incarnationId }
-            })
+          const seen = claim.accepted ? await this.observeSwitch(claim, false) : null
+          if (seen?.state === 'bound' && seen.ptyId === args[0]) {
+            await this.noteSwitchBound(claim, seen)
           }
         }
-      },
-      () => undefined
+      })
+      .catch(() => undefined)
+  }
+
+  /** Presents a switch's conversation on its pane, only while that pane runs its exact execution. */
+  private presentSwitchBinding(claim: SwitchClaim): void {
+    const pty = claim.ptyId ? this.ptysById.get(claim.ptyId) : undefined
+    if (
+      !pty?.incarnationId ||
+      pty.incarnationId !== claim.incarnationId ||
+      pty.paneKey !== claim.paneKey ||
+      this.switchClaims.get(claim.generation) !== claim
+    ) {
+      return
+    }
+    const row = this.getAgentProviderSessionRows().find(
+      (candidate) =>
+        candidate.paneKey === claim.paneKey &&
+        candidate.providerSession?.id === claim.providerSessionId
     )
+    seedResumeLaunchIdentity({
+      paneKey: claim.paneKey,
+      launchAgent: claim.agent,
+      resumeProviderSession: row?.providerSession ?? {
+        key: 'session_id',
+        id: claim.providerSessionId
+      },
+      worktreeId: pty.worktreeId,
+      launchedAt: 0,
+      execution: { ptyId: pty.ptyId, incarnationId: pty.incarnationId }
+    })
   }
 
   /** Throws while a switch of this conversation exists: one no terminal took yet, or with `all`, any. */
@@ -183,14 +199,16 @@ export abstract class OrcaRuntimeWithStructuredSessionSwitchClaims extends OrcaR
   /** Saved before dispatch, so a restart still knows the start may exist. A retired claim's
    *  late evidence never writes, and the store only updates the generation it holds. */
   async saveSwitchClaim(claim: SwitchClaim): Promise<boolean> {
-    claim.boot ??= await readSwitchHostBoot()
+    claim.boot ??= await readBootIdentity()
     const { chatSessionId, at: _at, accepted: _a, saved, unsaved: _u, ...descriptor } = claim
     if (saved && this.switchClaims.get(claim.generation) !== claim) {
       return false
     }
     const store = await this.openAgentSessionRecordStore()
+    // A copy: the store freezes what it commits, and this claim keeps collecting evidence.
+    const snapshot = { ...descriptor, processes: [...descriptor.processes] }
     const next = await store
-      .setTerminalSwitch(chatSessionId, saved ? { update: descriptor } : { accept: descriptor })
+      .setTerminalSwitch(chatSessionId, saved ? { update: snapshot } : { accept: snapshot })
       .catch(() => null)
     const ok = next?.terminalSwitch?.generation === claim.generation
     Object.assign(claim, { saved: saved || ok, unsaved: !ok })
@@ -220,7 +238,9 @@ export abstract class OrcaRuntimeWithStructuredSessionSwitchClaims extends OrcaR
       return own?.observation ?? { state: 'unverifiable' }
     }
     // Every reachable owner answered and none is this one: only the execution can end it.
-    if (claim.boot && isLaterSwitchHostBoot(claim.boot, await readSwitchHostBoot())) {
+    // Only an OS boot id proves a later boot; a wall clock can step without one (Windows has none).
+    const boot = claim.boot ? await readBootIdentity() : undefined
+    if (boot && boot !== claim.boot) {
       return { state: 'ended' }
     }
     const recorded = claim.shell ? [claim.shell, ...claim.processes] : []
@@ -241,6 +261,7 @@ export abstract class OrcaRuntimeWithStructuredSessionSwitchClaims extends OrcaR
       (claim.shell || !bound.shellPid) &&
       !claim.unsaved
     ) {
+      this.presentSwitchBinding(claim)
       return
     }
     const shell = bound.shellPid ? await readSwitchShellProcess(bound.shellPid) : null
@@ -249,6 +270,7 @@ export abstract class OrcaRuntimeWithStructuredSessionSwitchClaims extends OrcaR
       claim.shell = shell
     }
     await this.saveSwitchClaim(claim)
+    this.presentSwitchBinding(claim)
   }
 
   protected async releaseSwitchClaim(claim: SwitchClaim): Promise<void> {
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
index c068e1f348e2..36e029c0133b 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
@@ -16,12 +16,17 @@ const mocks = vi.hoisted(() => {
     activateVerified: vi.fn(async () => 'activated'),
     switchCapability: vi.fn(async () => false),
     exitWatchers: new Map<string, () => void>(),
+    rpc: vi.fn(async (..._args: unknown[]) => ({})),
     inspect: vi.fn(async (_ptyId: string): Promise<{ foregroundProcessEvidence?: unknown }> => ({}))
   }
 })
 vi.mock('@/runtime/runtime-terminal-inspection', () => ({
   inspectRuntimeTerminalProcess: mocks.inspect
 }))
+vi.mock('@/runtime/runtime-rpc-client', async (importOriginal) => ({
+  ...(await importOriginal<Record<string, unknown>>()),
+  callRuntimeRpc: mocks.rpc
+}))
 vi.mock('../terminal-pane/pty-dispatcher', () => ({
   subscribeToPtyExit: (ptyId: string, watcher: () => void) => {
     mocks.exitWatchers.set(ptyId, watcher)
@@ -322,31 +327,20 @@ describe('CLI identity resume through the existing launch owner', () => {
     expect(closed.mock.calls[0]?.[0].detail).toEqual({ tabId: 'tab-1', leafId })
     expect(tabs()).toEqual([])
 
-    // A paired source retires only while its host still reports the incarnation it started with.
+    // A paired source is closed by its host, fenced on the incarnation it started with, so a
+    // replacement under the same handle stays open; the renderer never closes it by tab.
     const remote = 'remote:env@@handle-1'
     mocks.source = { ...mocks.source, ptyId: remote }
-    useAppStore.setState({
-      terminalLayoutsByTabId: {
-        'tab-1': {
-          root: null,
-          activeLeafId: leafId,
-          expandedLeafId: null,
-          ptyIdsByLeafId: { [leafId]: remote }
-        }
-      }
-    })
-    const host = (...incarnations: string[]) =>
-      incarnations.forEach((ptyIncarnationId) =>
-        mocks.inspect.mockResolvedValueOnce({ foregroundProcessEvidence: { ptyIncarnationId } })
-      )
+    mocks.inspect.mockResolvedValueOnce({ foregroundProcessEvidence: { ptyIncarnationId: 'i1' } })
     window.addEventListener('orca-close-terminal-pane', closed)
-    host('i1', 'i2')
-    await runCliChatResume(mocks.source)
-    expect(closed).toHaveBeenCalledOnce()
-    host('i1', 'i1')
     await runCliChatResume(mocks.source)
     window.removeEventListener('orca-close-terminal-pane', closed)
-    expect(closed).toHaveBeenCalledTimes(2)
+    expect(closed).toHaveBeenCalledOnce()
+    expect(mocks.rpc).toHaveBeenCalledWith(
+      { kind: 'environment', environmentId: 'env' },
+      'terminal.close',
+      { terminal: 'handle-1', expectedIncarnationId: 'i1' }
+    )
   })
 
   it('keeps the eager History joiner failed and retryable after the hidden starter is refused', async () => {
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
index f81b2b805921..a53fe8c90e5d 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
@@ -18,6 +18,8 @@ import { adoptingAgentOnHost } from '../right-sidebar/ai-vault-session-resume-in
 import { panePtyId } from '@/lib/ai-vault-tab-title-requests'
 import { subscribeToPtyExit } from '../terminal-pane/pty-dispatcher'
 import { inspectRuntimeTerminalProcess } from '@/runtime/runtime-terminal-inspection'
+import { getRemoteRuntimePtyOwner } from '@/runtime/runtime-terminal-stream'
+import { callRuntimeRpc } from '@/runtime/runtime-rpc-client'
 import { isRemoteRuntimePtyId } from '../../../../shared/remote-runtime-pty-id'
 
 /** The incarnation the execution host reports for a PTY; null when it reports none. */
@@ -28,8 +30,9 @@ const hostPtyIncarnation = (ptyId: string): Promise<string | null> =>
   )
 
 /** The chat took the conversation, so the terminal pane it came from closes (its tab with it):
- *  only while the host still reports the execution it came from, never a sibling or replacement.
- *  A local PTY whose host reports no incarnation is fenced by its exit, which precedes reuse. */
+ *  only that execution, never a sibling or replacement. A paired host closes it under its own
+ *  incarnation fence; a local PTY, whose host may report none, is fenced by its exit, which
+ *  precedes any reuse of its id. */
 async function retireSwitchedTerminalPane(
   source: CliChatResumeSource,
   sourceExited: () => boolean,
@@ -37,12 +40,18 @@ async function retireSwitchedTerminalPane(
 ): Promise<void> {
   const pane = parsePaneKey(source.paneKey)
   const incarnation = await expected
+  const owner = source.ptyId ? getRemoteRuntimePtyOwner(source.ptyId) : null
+  if (owner || isRemoteRuntimePtyId(source.ptyId)) {
+    if (owner && incarnation) {
+      const params = { terminal: owner.terminal, expectedIncarnationId: incarnation }
+      await callRuntimeRpc(owner.target, 'terminal.close', params).catch(() => undefined)
+    }
+    return
+  }
   if (
     pane &&
     source.ptyId &&
-    (incarnation
-      ? (await hostPtyIncarnation(source.ptyId)) === incarnation
-      : !isRemoteRuntimePtyId(source.ptyId)) &&
+    (!incarnation || (await hostPtyIncarnation(source.ptyId)) === incarnation) &&
     !sourceExited() &&
     panePtyId(useAppStore.getState(), source.paneKey) === source.ptyId
   ) {

From f8527918a36c24dfb1fa3dff01509cb9c0631fbe Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Tue, 20 Oct 2026 14:58:24 -0700
Subject: [PATCH 022/207] fix(native-chat): end an owner-lost switch on a
 clock-free later boot on every platform

A saved switch records the host boot id (Linux boot_id, macOS boot session, or the Windows
BootId through one read-only reg.exe query) and the uptime at acceptance. After owner loss, a
different boot id or an uptime lower than recorded proves a reboot; wall-clock time never does,
and macOS uptime, which Node derives from the wall clock, is not used.
---
 .../structured-session-switch-boot.ts         | 43 +++++++++++++++++++
 .../structured-session-switch-claims.test.ts  | 34 +++++++++++++--
 .../structured-session-switch-claims.ts       |  9 ++--
 3 files changed, 77 insertions(+), 9 deletions(-)
 create mode 100644 src/main/runtime/session-tabs/structured-session-switch-boot.ts

diff --git a/src/main/runtime/session-tabs/structured-session-switch-boot.ts b/src/main/runtime/session-tabs/structured-session-switch-boot.ts
new file mode 100644
index 000000000000..0c811adc2dc4
--- /dev/null
+++ b/src/main/runtime/session-tabs/structured-session-switch-boot.ts
@@ -0,0 +1,43 @@
+import { uptime } from 'node:os'
+import { runProcess } from '@orca/process-host'
+import { windowsSystem32Binary } from '@orca/process-host/windows-system-binary'
+import { readBootIdentity } from '../../agent-hooks/managed-hook-owner-identity'
+
+const WINDOWS_BOOT_KEY =
+  'HKLM\\SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Memory Management\\PrefetchParameters'
+
+/** The OS's own boot counter or id; undefined when unreadable. Windows: one read-only reg.exe. */
+async function readOsBootId(): Promise<string | undefined> {
+  if (process.platform !== 'win32') {
+    return readBootIdentity()
+  }
+  const result = await runProcess({
+    program: windowsSystem32Binary('reg.exe'),
+    args: ['query', WINDOWS_BOOT_KEY, '/v', 'BootId'],
+    timeoutMs: 5_000
+  }).catch(() => null)
+  const id = result?.code === 0 ? /BootId\s+REG_DWORD\s+(0x[0-9a-f]+)/i.exec(result.stdout) : null
+  return id ? `win:${id[1].toLowerCase()}` : undefined
+}
+
+/** Read at acceptance and on owner-loss recovery only: the boot id, and uptime at reading. */
+export async function readSwitchHostBoot(): Promise<string> {
+  return `${(await readOsBootId()) ?? ''}@${uptime()}`
+}
+
+const parse = (boot: string): [string, number] => {
+  const at = boot.lastIndexOf('@')
+  return at === -1 ? ['', Number.NaN] : [boot.slice(0, at), Number(boot.slice(at + 1))]
+}
+
+/** A later boot, from clock-free facts only: a different boot id, or uptime lower than it was
+ *  (it only grows within a boot). macOS uptime is derived from the wall clock, so there only the
+ *  id counts. Anything unreadable proves nothing. */
+export function isLaterSwitchHostBoot(saved: string, current: string): boolean {
+  const [savedId, savedUptime] = parse(saved)
+  const [id, currentUptime] = parse(current)
+  if (savedId && id) {
+    return savedId !== id
+  }
+  return process.platform !== 'darwin' && currentUptime < savedUptime
+}
diff --git a/src/main/runtime/session-tabs/structured-session-switch-claims.test.ts b/src/main/runtime/session-tabs/structured-session-switch-claims.test.ts
index 10f18d97986f..0927ac946a58 100644
--- a/src/main/runtime/session-tabs/structured-session-switch-claims.test.ts
+++ b/src/main/runtime/session-tabs/structured-session-switch-claims.test.ts
@@ -15,6 +15,7 @@ import {
 import { setAgentSessionRecordTerminalSwitch } from '../agent-session-record-terminal-switch'
 import { routedTerminalSwitchOwners } from '../../providers/terminal-switch-owners'
 import { seedResumeLaunchIdentity } from '../../ipc/pty/pane/resume-launch-identity'
+import { isLaterSwitchHostBoot, readSwitchHostBoot } from './structured-session-switch-boot'
 import type { AgentProcessVerdict } from '../../../shared/agent-process-presence'
 import type { SwitchClaim } from './structured-session-switch-claims'
 
@@ -28,6 +29,13 @@ vi.mock('../../agent-hooks/managed-hook-owner-identity', () => ({
   readBootIdentity: async () => boot
 }))
 vi.mock('../../ipc/pty/pane/resume-launch-identity', () => ({ seedResumeLaunchIdentity: vi.fn() }))
+vi.mock('@orca/process-host', async (importOriginal) => ({
+  ...(await importOriginal<Record<string, unknown>>()),
+  runProcess: vi.fn(async () => ({
+    code: 0,
+    stdout: `    BootId    REG_DWORD    ${boot ?? ''}\r\n`
+  }))
+}))
 vi.mock('./structured-session-switch-observation', () => ({
   readSwitchPaneAgentProcesses: vi.fn(async () => []),
   readSwitchShellProcess: vi.fn(async (pid: number) => ({
@@ -47,7 +55,7 @@ let runtime: OrcaRuntimeService
 let host: TerminalHostSwitches
 let shellAlone: boolean
 let ownerReachable: boolean
-let boot: string | undefined = 'boot-1'
+let boot: string | undefined = '0x1'
 /** The chat records' saved switch descriptors, keyed by chat session id. */
 let saved: Map<string, TerminalSwitchDescriptor>
 
@@ -65,7 +73,7 @@ const live = () => session({ isAlive: true, sessionId: 'pty-1', incarnationId: '
 beforeEach(() => {
   shellAlone = true
   ownerReachable = true
-  boot = 'boot-1'
+  boot = '0x1'
   saved = new Map()
   host = new TerminalHostSwitches()
   runtime = new OrcaRuntimeService()
@@ -189,6 +197,7 @@ describe('a chat → terminal switch start', () => {
   })
 
   it('survives a restart: an unreachable owner holds; a lost one yields only to proof', async () => {
+    const sameBoot = await readSwitchHostBoot()
     const lost = (extra: Partial<TerminalSwitchDescriptor>) =>
       saved.set('chat-1', {
         generation: 'g-old',
@@ -197,7 +206,7 @@ describe('a chat → terminal switch start', () => {
         owner: 'daemon:gone',
         paneKey: PANE,
         processes: [],
-        boot: 'boot-1',
+        boot: sameBoot,
         ...extra
       })
     lost({ ptyId: 'pty-1', incarnationId: 'i1', shell: SHELL, processes: [AGENT] })
@@ -216,11 +225,28 @@ describe('a chat → terminal switch start', () => {
     runtime['switchClaimsLoaded'] = null
     boot = undefined
     expect(await reason(chatStart())).toBe('conversationHeldElsewhere')
-    boot = 'boot-2'
+    boot = '0x2'
     expect(await reason(chatStart())).toBe('admitted')
     expect(saved.has('chat-1')).toBe(false)
   })
 
+  it('proves a later boot only from a boot id or an uptime drop, never the wall clock', async () => {
+    const onPlatform = (platform: string) =>
+      Object.defineProperty(process, 'platform', { value: platform })
+    const real = process.platform
+    expect(isLaterSwitchHostBoot('a@100', 'a@1')).toBe(false)
+    expect(isLaterSwitchHostBoot('a@1', 'b@100')).toBe(true)
+    onPlatform('win32')
+    boot = '0x1A'
+    expect(await readSwitchHostBoot()).toMatch(/^win:0x1a@/)
+    expect(isLaterSwitchHostBoot('@100', '@5')).toBe(true)
+    expect(isLaterSwitchHostBoot('@100', '@500')).toBe(false)
+    // macOS derives uptime from the wall clock, so only its boot id counts there.
+    onPlatform('darwin')
+    expect(isLaterSwitchHostBoot('@100', '@5')).toBe(false)
+    onPlatform(real)
+  })
+
   it('rebuilds a reattached switch terminal’s stamp from its owner, never onto a replacement', async () => {
     const claim = await acceptedSwitch()
     host.begin(claim.generation, host.owner)
diff --git a/src/main/runtime/session-tabs/structured-session-switch-claims.ts b/src/main/runtime/session-tabs/structured-session-switch-claims.ts
index 61ceecd713ca..b639ca771233 100644
--- a/src/main/runtime/session-tabs/structured-session-switch-claims.ts
+++ b/src/main/runtime/session-tabs/structured-session-switch-claims.ts
@@ -11,7 +11,7 @@ import {
   type TerminalSwitchObservation
 } from '../../../shared/terminal-switch'
 import { OrcaRuntimeWithGetWorktreePs } from '../workspaces/workspace-process-listing'
-import { readBootIdentity } from '../../agent-hooks/managed-hook-owner-identity'
+import { isLaterSwitchHostBoot, readSwitchHostBoot } from './structured-session-switch-boot'
 import { seedResumeLaunchIdentity } from '../../ipc/pty/pane/resume-launch-identity'
 import { adoptsCliConversations } from '../../../shared/structured-agent-cli-conversation-adoption'
 import {
@@ -199,7 +199,7 @@ export abstract class OrcaRuntimeWithStructuredSessionSwitchClaims extends OrcaR
   /** Saved before dispatch, so a restart still knows the start may exist. A retired claim's
    *  late evidence never writes, and the store only updates the generation it holds. */
   async saveSwitchClaim(claim: SwitchClaim): Promise<boolean> {
-    claim.boot ??= await readBootIdentity()
+    claim.boot ??= await readSwitchHostBoot()
     const { chatSessionId, at: _at, accepted: _a, saved, unsaved: _u, ...descriptor } = claim
     if (saved && this.switchClaims.get(claim.generation) !== claim) {
       return false
@@ -238,9 +238,8 @@ export abstract class OrcaRuntimeWithStructuredSessionSwitchClaims extends OrcaR
       return own?.observation ?? { state: 'unverifiable' }
     }
     // Every reachable owner answered and none is this one: only the execution can end it.
-    // Only an OS boot id proves a later boot; a wall clock can step without one (Windows has none).
-    const boot = claim.boot ? await readBootIdentity() : undefined
-    if (boot && boot !== claim.boot) {
+    // Only clock-free facts prove a later boot; a wall clock can step without one.
+    if (claim.boot && isLaterSwitchHostBoot(claim.boot, await readSwitchHostBoot())) {
       return { state: 'ended' }
     }
     const recorded = claim.shell ? [claim.shell, ...claim.processes] : []

From d65f9cf51f71a887d54716b0f7f05d02c31a57a0 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Tue, 20 Oct 2026 14:58:28 -0700
Subject: [PATCH 023/207] fix: accept reattach payload policy sessions

---
 .../pty-connection/terminal-launch-result-policy.ts          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/renderer/src/components/terminal-pane/pty-connection/terminal-launch-result-policy.ts b/src/renderer/src/components/terminal-pane/pty-connection/terminal-launch-result-policy.ts
index 49400e22ba4e..3a62b60f9ac6 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/terminal-launch-result-policy.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/terminal-launch-result-policy.ts
@@ -4,13 +4,14 @@ import {
 } from '../../../../../shared/agent-session-resume'
 import { useAppStore } from '@/store'
 import type { ConnectPanePtySession } from './connect-pane-pty-session'
+import type { ReattachPayloadSession } from './reattach-payload-session'
 import type { ColdRestoreAgentResumeStartup } from './fresh-spawn-types'
 import type { PtyPaneStartup } from '../pty-connection-types'
 
 type SavedStartup = ColdRestoreAgentResumeStartup | PtyPaneStartup
 
 export function captureTerminalLaunchContext(
-  session: ConnectPanePtySession,
+  session: ConnectPanePtySession | ReattachPayloadSession,
   startup: SavedStartup
 ) {
   const state = useAppStore.getState()
@@ -25,7 +26,7 @@ export function captureTerminalLaunchContext(
 export type TerminalLaunchContext = ReturnType<typeof captureTerminalLaunchContext>
 
 export function applyTerminalLaunchResult(
-  session: ConnectPanePtySession,
+  session: ConnectPanePtySession | ReattachPayloadSession,
   result: TerminalLaunchResult & { isReattach?: boolean },
   context: TerminalLaunchContext,
   kind: 'creator' | 'observer' | 'candidate'

From 3568a5c435d9e580a9cacdfa14b8b080f7101484 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Tue, 20 Oct 2026 15:30:19 -0700
Subject: [PATCH 024/207] fix: preserve terminal result validation contracts

---
 config/scripts/vitest-node-runtime-files.mjs  |  1 +
 .../terminal-multiplex-escape-tail.test.ts    |  2 ++
 ...rminal-multiplex-pty-wait-capacity.test.ts | 20 ++++++++++++++-----
 .../terminal-multiplex-pty-wait-queue.test.ts | 11 ++++++++--
 ...minal-multiplex-resync-replay-trim.test.ts |  2 ++
 ...-requested-snapshot-unavailability.test.ts |  2 ++
 .../terminal-pane/ipc-pty-connect-result.ts   |  2 +-
 ...ty-connection-agent-session-resume.spec.ts | 13 ++++++++++++
 .../host-terminal-runtime-stub.ts             |  2 ++
 ...untime-rejected-input-remount.unit.test.ts |  2 ++
 10 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/config/scripts/vitest-node-runtime-files.mjs b/config/scripts/vitest-node-runtime-files.mjs
index 61e9c5314482..cf2ddb77ed0a 100644
--- a/config/scripts/vitest-node-runtime-files.mjs
+++ b/config/scripts/vitest-node-runtime-files.mjs
@@ -88,6 +88,7 @@ export const NODE_RUNTIME_INCLUDE = [
   'src/renderer/src/components/right-sidebar/parent-pr-checks-projection-selector.test.ts',
   'src/renderer/src/store/github/cache-persistence.test.ts',
   'src/main/native-chat/agent-session-journal/**/*.test.ts',
+  'src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-status-feed.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-status-feed-conversation-name.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-status-first-input-identity.test.ts',
diff --git a/src/main/runtime/rpc/terminal-multiplex-escape-tail.test.ts b/src/main/runtime/rpc/terminal-multiplex-escape-tail.test.ts
index 38f5d9e5cd51..3a5c2cea9106 100644
--- a/src/main/runtime/rpc/terminal-multiplex-escape-tail.test.ts
+++ b/src/main/runtime/rpc/terminal-multiplex-escape-tail.test.ts
@@ -22,6 +22,8 @@ import {
 function stubRuntime(overrides: Partial<OrcaRuntimeService> = {}): OrcaRuntimeService {
   return {
     getRuntimeId: () => 'test-runtime',
+    getPtyExecutionHostMetadata: () => ({ incarnationId: 'test-incarnation' }),
+    getTerminalLaunchResult: () => undefined,
     ...overrides
   } as OrcaRuntimeService
 }
diff --git a/src/main/runtime/rpc/terminal-multiplex-pty-wait-capacity.test.ts b/src/main/runtime/rpc/terminal-multiplex-pty-wait-capacity.test.ts
index 244c12557614..5bfc1c22cf41 100644
--- a/src/main/runtime/rpc/terminal-multiplex-pty-wait-capacity.test.ts
+++ b/src/main/runtime/rpc/terminal-multiplex-pty-wait-capacity.test.ts
@@ -108,14 +108,18 @@ describe('terminal multiplex RPC', () => {
   })
 
   it("waits for a desktop multiplex subscriber's PTY before retiring the terminal", async () => {
+    let ptyId: string | null = null
     let resolvePty: (ptyId: string) => void = () => {}
     const runtime = stubRuntime({
-      resolveLiveLeafForHandle: vi.fn().mockReturnValue({ ptyId: null }),
+      resolveLiveLeafForHandle: vi.fn(() => ({ ptyId })),
       requestRendererTerminalTabMount: vi.fn(),
       waitForLeafPtyId: vi.fn(
         () =>
           new Promise<string>((resolve) => {
-            resolvePty = resolve
+            resolvePty = (resolvedPtyId) => {
+              ptyId = resolvedPtyId
+              resolve(resolvedPtyId)
+            }
           })
       )
     })
@@ -359,17 +363,23 @@ describe('terminal multiplex RPC', () => {
     const activeStreamCount = 44
     const waitSignals: AbortSignal[] = []
     const resolveWaits: ((ptyId: string) => void)[] = []
+    const ptyIds = new Map<string, string>()
     const runtime = stubRuntime({
       resolveLiveLeafForHandle: vi.fn((terminal: string) =>
-        terminal.startsWith('pending-') ? { ptyId: null } : { ptyId: `pty-${terminal}` }
+        terminal.startsWith('pending-')
+          ? { ptyId: ptyIds.get(terminal) ?? null }
+          : { ptyId: `pty-${terminal}` }
       ),
       waitForLeafPtyId: vi.fn(
-        (_handle: string, _timeoutMs?: number, signal?: AbortSignal) =>
+        (handle: string, _timeoutMs?: number, signal?: AbortSignal) =>
           new Promise<string>((resolve, reject) => {
             if (signal) {
               waitSignals.push(signal)
             }
-            resolveWaits.push(resolve)
+            resolveWaits.push((ptyId) => {
+              ptyIds.set(handle, ptyId)
+              resolve(ptyId)
+            })
             signal?.addEventListener('abort', () => reject(new Error('request_aborted')), {
               once: true
             })
diff --git a/src/main/runtime/rpc/terminal-multiplex-pty-wait-queue.test.ts b/src/main/runtime/rpc/terminal-multiplex-pty-wait-queue.test.ts
index a50c2dc32cda..f08d549c5e86 100644
--- a/src/main/runtime/rpc/terminal-multiplex-pty-wait-queue.test.ts
+++ b/src/main/runtime/rpc/terminal-multiplex-pty-wait-queue.test.ts
@@ -15,15 +15,22 @@ import { startDesktopMultiplexSubscribe } from './terminal-multiplex-test-harnes
 
 function startPendingPtyHarness() {
   const waits = new Map<string, { signal: AbortSignal; resolve: (ptyId: string) => void }>()
+  const ptyIds = new Map<string, string>()
   const requestRendererTerminalTabMount = vi.fn()
   const harness = startDesktopMultiplexSubscribe({
-    resolveLiveLeafForHandle: vi.fn().mockReturnValue({ ptyId: null }),
+    resolveLiveLeafForHandle: vi.fn((handle: string) => ({ ptyId: ptyIds.get(handle) ?? null })),
     requestRendererTerminalTabMount,
     waitForLeafPtyId: vi.fn(
       (handle: string, _timeoutMs?: number, signal?: AbortSignal) =>
         new Promise<string>((resolve, reject) => {
           if (signal) {
-            waits.set(handle, { signal, resolve })
+            waits.set(handle, {
+              signal,
+              resolve: (ptyId) => {
+                ptyIds.set(handle, ptyId)
+                resolve(ptyId)
+              }
+            })
           }
           signal?.addEventListener('abort', () => reject(new Error('request_aborted')), {
             once: true
diff --git a/src/main/runtime/rpc/terminal-multiplex-resync-replay-trim.test.ts b/src/main/runtime/rpc/terminal-multiplex-resync-replay-trim.test.ts
index 266630280f15..89125a0713e1 100644
--- a/src/main/runtime/rpc/terminal-multiplex-resync-replay-trim.test.ts
+++ b/src/main/runtime/rpc/terminal-multiplex-resync-replay-trim.test.ts
@@ -55,6 +55,8 @@ async function setupMultiplexStream(): Promise<{
 
   const runtime = {
     getRuntimeId: () => 'test-runtime',
+    getPtyExecutionHostMetadata: () => ({ incarnationId: 'test-incarnation' }),
+    getTerminalLaunchResult: () => undefined,
     resolveLiveLeafForHandle: vi.fn().mockReturnValue({ ptyId: 'pty-1' }),
     readTerminal: vi.fn().mockResolvedValue({ tail: [], truncated: false }),
     serializeTerminalBuffer: serializeSnapshot,
diff --git a/src/main/runtime/rpc/terminal-requested-snapshot-unavailability.test.ts b/src/main/runtime/rpc/terminal-requested-snapshot-unavailability.test.ts
index dacf408900cb..edbdf1f77eec 100644
--- a/src/main/runtime/rpc/terminal-requested-snapshot-unavailability.test.ts
+++ b/src/main/runtime/rpc/terminal-requested-snapshot-unavailability.test.ts
@@ -52,6 +52,8 @@ async function requestSnapshotReply(options: {
   })
   const runtime = {
     getRuntimeId: () => 'test-runtime',
+    getPtyExecutionHostMetadata: () => ({ incarnationId: 'test-incarnation' }),
+    getTerminalLaunchResult: () => undefined,
     registerRemoteTerminalViewSubscriber: () => () => {},
     resolveLiveLeafForHandle: vi.fn().mockReturnValue({ ptyId: 'pty-1' }),
     requestRendererTerminalTabMount: vi.fn().mockReturnValue(true),
diff --git a/src/renderer/src/components/terminal-pane/ipc-pty-connect-result.ts b/src/renderer/src/components/terminal-pane/ipc-pty-connect-result.ts
index ad2e995c3c3e..da9c93585fe0 100644
--- a/src/renderer/src/components/terminal-pane/ipc-pty-connect-result.ts
+++ b/src/renderer/src/components/terminal-pane/ipc-pty-connect-result.ts
@@ -7,8 +7,8 @@ type IpcPtySpawnResult = PtyConnectResult & { isReattach?: boolean }
 export function projectIpcPtyConnectResult(
   spawnResult: IpcPtySpawnResult
 ): string | PtyConnectResult {
-  const facts = terminalLaunchFacts(spawnResult)
   const launchAgent = isTuiAgent(spawnResult.launchAgent) ? spawnResult.launchAgent : undefined
+  const facts = terminalLaunchFacts({ ...spawnResult, launchAgent })
   if (spawnResult.isReattach || spawnResult.coldRestore || spawnResult.sessionExpired) {
     return {
       ...facts,
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-agent-session-resume.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection-agent-session-resume.spec.ts
index fa741e8afe00..50c215331433 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-agent-session-resume.spec.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-agent-session-resume.spec.ts
@@ -13,6 +13,8 @@ import {
 import { buildPaneConnectionDeps } from './pty-connection-test-deps'
 import { createInitialStoreState } from './pty-connection-test-store-fixtures'
 import type { StoreState } from './pty-connection-test-store-state'
+import type { AgentStatusSlice } from '@/store/slices/agent-status-slice-contract'
+import { normalizeLaunchConfigRegistrationMetadata } from '@/store/slices/agent-status-launch-config'
 import type { MockTransport } from './pty-connection-test-pane-fixtures'
 import {
   installTerminalTestGlobals,
@@ -195,6 +197,17 @@ export function registerPtyConnectionAgentSessionResumeTests(): void {
       transportFactoryQueue.push(transport)
       const paneKey = makePaneKey('tab-1', LEAF_1)
       const launchConfig = { agentCommand: 'codex', agentArgs: '', agentEnv: {} }
+      const registerLaunchConfig: AgentStatusSlice['registerAgentLaunchConfig'] = (
+        key,
+        config,
+        metadata
+      ) => {
+        mockStoreState.agentLaunchConfigByPaneKey[key] = {
+          launchConfig: config,
+          identity: normalizeLaunchConfigRegistrationMetadata(key, metadata)
+        }
+      }
+      mockStoreState.registerAgentLaunchConfig.mockImplementation(registerLaunchConfig)
       mockStoreState = {
         ...mockStoreState,
         tabsByWorktree: { 'wt-1': [{ id: 'tab-1', ptyId: null }] },
diff --git a/tests/e2e/cross-version-wire/host-terminal-runtime-stub.ts b/tests/e2e/cross-version-wire/host-terminal-runtime-stub.ts
index 0f8625b60829..15f8c0202dac 100644
--- a/tests/e2e/cross-version-wire/host-terminal-runtime-stub.ts
+++ b/tests/e2e/cross-version-wire/host-terminal-runtime-stub.ts
@@ -117,6 +117,8 @@ export function createHostTerminalRuntimeStub(
 
   const runtime: Record<string, unknown> = {
     getRuntimeId: () => 'cross-version-host',
+    getPtyExecutionHostMetadata: () => ({ incarnationId: 'test-incarnation' }),
+    getTerminalLaunchResult: () => undefined,
     resolveLiveLeafForHandle: (handle: string) => (handle === terminalHandle ? { ptyId } : null),
     resolveLeafForHandle: (handle: string) => (handle === terminalHandle ? { ptyId } : null),
     registerRemoteTerminalViewSubscriber: () => () => {},
diff --git a/tests/e2e/paired-runtime-rejected-input-remount.unit.test.ts b/tests/e2e/paired-runtime-rejected-input-remount.unit.test.ts
index 0225f805c715..8820e405af0a 100644
--- a/tests/e2e/paired-runtime-rejected-input-remount.unit.test.ts
+++ b/tests/e2e/paired-runtime-rejected-input-remount.unit.test.ts
@@ -95,6 +95,8 @@ function startHost(): {
   const sendTerminal = vi.fn().mockResolvedValue({ accepted: false })
   const runtime = {
     getRuntimeId: () => 'test-runtime',
+    getPtyExecutionHostMetadata: () => ({ incarnationId: 'test-incarnation' }),
+    getTerminalLaunchResult: () => undefined,
     registerRemoteTerminalViewSubscriber: () => () => {},
     resolveLiveLeafForHandle: vi.fn().mockReturnValue({ ptyId: 'pty-1' }),
     requestRendererTerminalTabMount: vi.fn().mockReturnValue(true),

From fb309d064a5ef37edd044e3b8cf8fa58123b4e3d Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Tue, 20 Oct 2026 15:43:52 -0700
Subject: [PATCH 025/207] refactor: separate terminal create contract

---
 src/shared/runtime-terminal-contracts.ts      | 20 +----------------
 .../runtime-terminal-create-contract.ts       | 22 +++++++++++++++++++
 2 files changed, 23 insertions(+), 19 deletions(-)
 create mode 100644 src/shared/runtime-terminal-create-contract.ts

diff --git a/src/shared/runtime-terminal-contracts.ts b/src/shared/runtime-terminal-contracts.ts
index 4da42bb236ae..a0091a6e97d0 100644
--- a/src/shared/runtime-terminal-contracts.ts
+++ b/src/shared/runtime-terminal-contracts.ts
@@ -272,25 +272,7 @@ export type RuntimeTerminalCreateRequestPayload =
       source: 'runtime-session'
     })
 
-export type RuntimeTerminalCreate = TerminalLaunchResult & {
-  coldRestore?: { scrollback: string; cwd: string; cols?: number; rows?: number }
-  handle: string
-  /** Host-owned PTY incarnation used to fence remote identity observations. */
-  incarnationId?: string | null
-  tabId?: string
-  paneKey?: string | null
-  ptyId?: string | null
-  worktreeId: string
-  title: string | null
-  executionHostId?: ExecutionHostId
-  hostPlatform?: NodeJS.Platform
-  surface?: 'background' | 'visible'
-  warning?: string
-  agentSessionDisposition?: 'created' | 'adopted'
-  isReattach?: true
-  /** Spawn process identity for host-internal ownership proof. */
-  processId?: number
-}
+export type { RuntimeTerminalCreate } from './runtime-terminal-create-contract'
 
 export type RuntimeTerminalSplit = {
   handle: string
diff --git a/src/shared/runtime-terminal-create-contract.ts b/src/shared/runtime-terminal-create-contract.ts
new file mode 100644
index 000000000000..4552a97cf8e6
--- /dev/null
+++ b/src/shared/runtime-terminal-create-contract.ts
@@ -0,0 +1,22 @@
+import type { TerminalLaunchResult } from './agent-session-resume'
+import type { ExecutionHostId } from './execution-host'
+
+export type RuntimeTerminalCreate = TerminalLaunchResult & {
+  coldRestore?: { scrollback: string; cwd: string; cols?: number; rows?: number }
+  handle: string
+  /** Host-owned PTY incarnation used to fence remote identity observations. */
+  incarnationId?: string | null
+  tabId?: string
+  paneKey?: string | null
+  ptyId?: string | null
+  worktreeId: string
+  title: string | null
+  executionHostId?: ExecutionHostId
+  hostPlatform?: NodeJS.Platform
+  surface?: 'background' | 'visible'
+  warning?: string
+  agentSessionDisposition?: 'created' | 'adopted'
+  isReattach?: true
+  /** Spawn process identity for host-internal ownership proof. */
+  processId?: number
+}

From 58d108a19eb054f5d6412870e29bb3a7d09af85a Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Tue, 20 Oct 2026 16:00:09 -0700
Subject: [PATCH 026/207] test: document partial terminal runtime fixtures

---
 src/main/runtime/rpc/terminal-multiplex-escape-tail.test.ts      | 1 +
 .../runtime/rpc/terminal-multiplex-resync-replay-trim.test.ts    | 1 +
 .../rpc/terminal-requested-snapshot-unavailability.test.ts       | 1 +
 tests/e2e/paired-runtime-rejected-input-remount.unit.test.ts     | 1 +
 4 files changed, 4 insertions(+)

diff --git a/src/main/runtime/rpc/terminal-multiplex-escape-tail.test.ts b/src/main/runtime/rpc/terminal-multiplex-escape-tail.test.ts
index 3a5c2cea9106..8f8c6ee695d9 100644
--- a/src/main/runtime/rpc/terminal-multiplex-escape-tail.test.ts
+++ b/src/main/runtime/rpc/terminal-multiplex-escape-tail.test.ts
@@ -20,6 +20,7 @@ import {
 // literally ("colors/garbage around what I type").
 
 function stubRuntime(overrides: Partial<OrcaRuntimeService> = {}): OrcaRuntimeService {
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: This partial runtime supplies the terminal RPC methods these tests invoke.
   return {
     getRuntimeId: () => 'test-runtime',
     getPtyExecutionHostMetadata: () => ({ incarnationId: 'test-incarnation' }),
diff --git a/src/main/runtime/rpc/terminal-multiplex-resync-replay-trim.test.ts b/src/main/runtime/rpc/terminal-multiplex-resync-replay-trim.test.ts
index 89125a0713e1..649ffc02fc6b 100644
--- a/src/main/runtime/rpc/terminal-multiplex-resync-replay-trim.test.ts
+++ b/src/main/runtime/rpc/terminal-multiplex-resync-replay-trim.test.ts
@@ -53,6 +53,7 @@ async function setupMultiplexStream(): Promise<{
     return { data: snapshot.data, cols: 80, rows: 24, seq: snapshot.seq }
   })
 
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: This partial runtime supplies the terminal RPC methods these tests invoke.
   const runtime = {
     getRuntimeId: () => 'test-runtime',
     getPtyExecutionHostMetadata: () => ({ incarnationId: 'test-incarnation' }),
diff --git a/src/main/runtime/rpc/terminal-requested-snapshot-unavailability.test.ts b/src/main/runtime/rpc/terminal-requested-snapshot-unavailability.test.ts
index edbdf1f77eec..f2ee6d022b69 100644
--- a/src/main/runtime/rpc/terminal-requested-snapshot-unavailability.test.ts
+++ b/src/main/runtime/rpc/terminal-requested-snapshot-unavailability.test.ts
@@ -50,6 +50,7 @@ async function requestSnapshotReply(options: {
     options.duringSerialize?.(requestedAttempt, (data) => dataListenerRef.current?.(data))
     return options.serializeRequested(requestedAttempt)
   })
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: This partial runtime supplies the terminal RPC methods these tests invoke.
   const runtime = {
     getRuntimeId: () => 'test-runtime',
     getPtyExecutionHostMetadata: () => ({ incarnationId: 'test-incarnation' }),
diff --git a/tests/e2e/paired-runtime-rejected-input-remount.unit.test.ts b/tests/e2e/paired-runtime-rejected-input-remount.unit.test.ts
index 8820e405af0a..0b6715b22475 100644
--- a/tests/e2e/paired-runtime-rejected-input-remount.unit.test.ts
+++ b/tests/e2e/paired-runtime-rejected-input-remount.unit.test.ts
@@ -93,6 +93,7 @@ function startHost(): {
   const hostOpcodes: number[] = []
   // The host's whole reason to emit the opcode: the PTY refused the bytes.
   const sendTerminal = vi.fn().mockResolvedValue({ accepted: false })
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: This partial runtime supplies the terminal RPC methods these tests invoke.
   const runtime = {
     getRuntimeId: () => 'test-runtime',
     getPtyExecutionHostMetadata: () => ({ incarnationId: 'test-incarnation' }),

From 6eaa8684b581c0a0b06a5f23a457ab6156de1b23 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Tue, 20 Oct 2026 16:30:31 -0700
Subject: [PATCH 027/207] test: align sleeping resume store fixture

---
 .../lib/sleeping-agent-session-launch-windows-quoting.test.ts    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/renderer/src/lib/sleeping-agent-session-launch-windows-quoting.test.ts b/src/renderer/src/lib/sleeping-agent-session-launch-windows-quoting.test.ts
index 535946eb70a9..e6765b8b2b29 100644
--- a/src/renderer/src/lib/sleeping-agent-session-launch-windows-quoting.test.ts
+++ b/src/renderer/src/lib/sleeping-agent-session-launch-windows-quoting.test.ts
@@ -8,6 +8,7 @@ import type { SleepingAgentSessionRecord } from '../../../shared/agent-session-r
 const mockCreateTab = vi.fn()
 
 const store = {
+  agentStatusByPaneKey: {},
   settings: {
     agentCmdOverrides: {},
     agentDefaultArgs: {} as Record<string, string>,

From 977f31d70d8a4d2e03e5161d2d2f4d115a032a9f Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Wed, 21 Oct 2026 14:41:58 -0700
Subject: [PATCH 028/207] Simplify same-conversation chat and CLI switching

---
 .../server-launch-resume-identity.test.ts     |  50 ++-
 .../server/server-ingest-terminal.ts          |   5 +-
 .../server/server-status-identity.ts          |   1 -
 src/main/daemon/daemon-pty-adapter.ts         |  25 --
 .../daemon/daemon-pty-owner-query-protocol.ts |   7 -
 src/main/daemon/daemon-pty-router.ts          |  17 +-
 src/main/daemon/daemon-pty-session-control.ts |  28 +-
 src/main/daemon/daemon-pty-spawn-request.ts   |   3 -
 src/main/daemon/daemon-request-router.ts      |  19 +-
 ...n-final-checkpoint-caller-deadline.test.ts |  17 +
 src/main/daemon/daemon-terminal-admission.ts  |   3 -
 .../daemon/degraded-daemon-pty-provider.ts    |  18 +-
 src/main/daemon/session.ts                    |   2 +-
 .../terminal-host-concurrent-create.test.ts   |  39 --
 .../daemon/terminal-host-create-contract.ts   |   2 -
 .../daemon/terminal-host-session-create.ts    |  46 +--
 src/main/daemon/terminal-host-switches.ts     |  63 ---
 src/main/daemon/terminal-host.ts              |  14 +-
 src/main/daemon/types.ts                      |   4 -
 .../pty/host-env/resume-spawn-judgement.ts    | 152 --------
 .../pty/host-env/saved-resume-admission.ts    | 133 +++++--
 src/main/ipc/pty/ipc/renderer-kill.ts         |   7 +-
 src/main/ipc/pty/ipc/spawn-commit.ts          |   5 +-
 src/main/ipc/pty/ipc/spawn-execute.ts         |   7 +-
 .../pty/pane/resume-launch-identity.test.ts   |   7 -
 .../ipc/pty/pane/resume-launch-identity.ts    |  11 +-
 src/main/ipc/pty/provider/shutdown-detect.ts  |   9 +-
 src/main/ipc/pty/runtime/controller-deps.ts   |   7 +-
 src/main/ipc/pty/runtime/controller.ts        |   9 +-
 .../pty/runtime/kill-same-id-respawn.test.ts  |  17 +
 src/main/ipc/pty/runtime/kill.ts              |  11 +-
 src/main/ipc/pty/runtime/spawn-commit.ts      |   5 +-
 src/main/ipc/pty/runtime/spawn-execute.ts     |   7 +-
 src/main/ipc/pty/runtime/spawn-state.ts       |   2 +-
 src/main/ipc/pty/session.ts                   |   7 +-
 .../structured-agent-session-acquisition.ts   |   6 +-
 .../structured-agent-session-adapter.ts       |   1 -
 ...red-agent-session-conversation-lifetime.ts |   7 +-
 .../structured-agent-session-failure-text.ts  |   3 +-
 .../structured-agent-session-host.ts          |   2 +-
 ...ructured-agent-session-switch-admission.ts |   7 +-
 ...nt-session-terminal-writer-acquire.test.ts |  50 ++-
 .../local-pty-provider-shutdown.test.ts       |  11 +
 .../local-pty-provider-spawn-session.test.ts  |  23 --
 src/main/providers/local-pty-provider.ts      |  10 +-
 .../providers/local-pty-session-activation.ts |   6 +-
 .../local-pty-shell-ready-startup-command.ts  |   6 +-
 src/main/providers/local-pty-spawn.ts         |  36 +-
 .../providers/local-pty-terminal-switch.ts    | 101 -----
 src/main/providers/local-pty-termination.ts   |   6 +-
 src/main/providers/pty-provider-contract.ts   |   7 -
 src/main/providers/terminal-switch-owners.ts  |  20 -
 .../agent-session-record-terminal-switch.ts   |  23 --
 ...-runtime-terminal-close-continuity.test.ts |  23 ++
 ...ctured-agent-session-switch-to-terminal.ts |  45 +--
 .../runtime-mobile-session-projection.ts      |  17 +-
 .../runtime-pty-controller-contract.ts        |   5 +-
 .../explicit-terminal-close-outcome.ts        |  86 +++++
 .../explicit-terminal-close-stops.ts          | 125 ++----
 .../structured-session-cli-writer-host.ts     | 112 ++----
 .../structured-session-switch-boot.ts         |  43 ---
 .../structured-session-switch-claims.test.ts  | 359 ------------------
 .../structured-session-switch-claims.ts       | 339 -----------------
 ...uctured-session-switch-observation.test.ts |  35 --
 .../structured-session-switch-observation.ts  |  96 -----
 ...ured-session-terminal-launch-retirement.ts |  62 +++
 .../launch/mobile-terminal-renderer-create.ts |   2 +-
 src/main/startup/main-window-agent-status.ts  |   2 -
 .../NativeChatTopRightControls.tsx            |  18 +-
 .../agent-session-failure-words-text.ts       |   5 -
 .../AiVaultSessionActionMenuItems.tsx         |   5 +-
 .../AiVaultSessionDetailsSwitchButtons.tsx    |   6 +-
 .../right-sidebar/AiVaultSessionRow.tsx       |   5 +-
 .../AiVaultSessionSurfaceSwitchMenuItems.tsx  |  12 +-
 .../SessionRowTrailingActions.tsx             |   5 +-
 .../ai-vault-session-in-place-switch.ts       |  21 +-
 .../tab-bar/CliChatResumeMenuItems.tsx        |  10 +-
 .../tab-bar/NativeChatCliForkMenuItems.tsx    |  11 +-
 .../TabSessionSurfaceSwitchMenuItems.test.tsx |   6 +-
 .../tab-bar/TabSessionSwitchHoverAction.tsx   |  15 +-
 .../tab-bar/cli-chat-resume-feedback.ts       |  25 +-
 .../tab-bar/cli-chat-resume-run.test.ts       |  62 ++-
 .../components/tab-bar/cli-chat-resume-run.ts | 130 +++++--
 .../tab-bar/cli-chat-resume-source.ts         |  12 +
 .../native-chat-cli-switch-run.test.ts        |  13 +-
 .../tab-bar/native-chat-cli-switch-run.ts     |  20 +-
 .../tab-session-history-switch.test.ts        |  45 ++-
 .../TerminalPaneResumeInChatButton.test.tsx   |   1 +
 .../TerminalPaneResumeInChatButton.tsx        |  42 +-
 .../pty-connection/pty-exit-hibernate.ts      |   1 -
 .../agent-status-partial-updates.ts           |  15 +-
 .../src/i18n/en-runtime-required.json         |   1 -
 src/renderer/src/i18n/locales/en.json         |   5 +-
 src/renderer/src/i18n/locales/es.json         |   5 +-
 src/renderer/src/i18n/locales/fr.json         |   5 +-
 src/renderer/src/i18n/locales/ja.json         |   5 +-
 src/renderer/src/i18n/locales/ko.json         |   5 +-
 src/renderer/src/i18n/locales/zh.json         |   5 +-
 .../src/lib/ai-vault-tab-title-requests.ts    |   8 +-
 .../src/lib/in-place-switch-support.test.tsx  |  42 ++
 .../src/lib/in-place-switch-support.ts        |  63 ++-
 .../src/lib/launch-ai-vault-session.ts        |   2 +-
 .../agent-status-provider-session-actions.ts  |  12 +-
 .../slices/agent-status-slice-contract.ts     |  14 -
 src/renderer/src/store/slices/agent-status.ts |   1 -
 .../agent-hook-listener/listener-event.ts     |   3 -
 src/shared/agent-session-failure-copy.ts      |   2 -
 src/shared/agent-session-failure-words.ts     |   2 -
 src/shared/agent-session-failure.ts           |   1 -
 src/shared/agent-session-record.ts            |  14 +-
 src/shared/agent-session-refusal-details.ts   |   2 -
 .../agent-session-refusal-reason-words.ts     |   1 -
 src/shared/agent-status-ipc-payload.ts        |   3 -
 ...ctured-agent-session-dispatch-rejection.ts |   2 -
 src/shared/terminal-switch.ts                 |  74 ----
 115 files changed, 1076 insertions(+), 2121 deletions(-)
 delete mode 100644 src/main/daemon/terminal-host-switches.ts
 delete mode 100644 src/main/ipc/pty/host-env/resume-spawn-judgement.ts
 delete mode 100644 src/main/providers/local-pty-terminal-switch.ts
 delete mode 100644 src/main/providers/terminal-switch-owners.ts
 delete mode 100644 src/main/runtime/agent-session-record-terminal-switch.ts
 create mode 100644 src/main/runtime/session-tabs/explicit-terminal-close-outcome.ts
 delete mode 100644 src/main/runtime/session-tabs/structured-session-switch-boot.ts
 delete mode 100644 src/main/runtime/session-tabs/structured-session-switch-claims.test.ts
 delete mode 100644 src/main/runtime/session-tabs/structured-session-switch-claims.ts
 delete mode 100644 src/main/runtime/session-tabs/structured-session-switch-observation.test.ts
 delete mode 100644 src/main/runtime/session-tabs/structured-session-switch-observation.ts
 create mode 100644 src/main/runtime/session-tabs/structured-session-terminal-launch-retirement.ts
 create mode 100644 src/renderer/src/lib/in-place-switch-support.test.tsx
 delete mode 100644 src/shared/terminal-switch.ts

diff --git a/src/main/agent-hooks/server-launch-resume-identity.test.ts b/src/main/agent-hooks/server-launch-resume-identity.test.ts
index 60b6fee29b09..9fa53d041043 100644
--- a/src/main/agent-hooks/server-launch-resume-identity.test.ts
+++ b/src/main/agent-hooks/server-launch-resume-identity.test.ts
@@ -2,6 +2,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { mkdtempSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
+import { assertCliConversationWritersExited } from '../runtime/structured-agent-cli-writers'
 import { AgentHookServer, _internals } from './server'
 import { buildBody, postHookEvent, PANE } from './server.test-fixtures'
 
@@ -64,31 +65,6 @@ describe('a resume launch seeds the pane identity', () => {
     ])
   })
 
-  it('names a switch start’s exact execution, and a new incarnation there re-seeds it', async () => {
-    const server = await startServer()
-    const published = vi.fn()
-    server.setListener(published)
-    const seed = (incarnationId: string) =>
-      server.recordLaunchResumeIdentity({
-        paneKey: PANE,
-        agentType: 'codex',
-        providerSession: RESUMED,
-        launchedAt: Date.now(),
-        execution: { ptyId: 'pty-1', incarnationId }
-      })
-    seed('i1')
-    seed('i1')
-    seed('i2')
-    expect(published.mock.calls.map(([row]) => row.launchExecution)).toEqual([
-      { ptyId: 'pty-1', incarnationId: 'i1' },
-      { ptyId: 'pty-1', incarnationId: 'i2' }
-    ])
-    // A reloaded renderer reads the same stamp from the snapshot.
-    expect(server.getStatusSnapshotForPane(PANE)).toEqual([
-      expect.objectContaining({ launchExecution: { ptyId: 'pty-1', incarnationId: 'i2' } })
-    ])
-  })
-
   it("yields to the agent's own report and is replaced by its first hook", async () => {
     const server = await startServer()
     const launchedAt = Date.now() - 1_000
@@ -155,7 +131,7 @@ describe('a resume launch seeds the pane identity', () => {
     })
   })
 
-  it('keeps the seeded identity across a host restart', async () => {
+  it('keeps the no-prompt launch identity across restart and refuses idle Codex until its shell is alone', async () => {
     const server = await startServer()
     server.recordLaunchResumeIdentity({
       paneKey: PANE,
@@ -175,6 +151,28 @@ describe('a resume launch seeds the pane identity', () => {
         providerSessionOnly: true
       })
     ])
+    let shellAlone = false
+    const writers = {
+      rows: () => restarted.getStatusSnapshotForPane(PANE),
+      saved: () => [],
+      observation: (row: Parameters<AgentHookServer['readCliWriterObservation']>[0]) =>
+        restarted.readCliWriterObservation(row),
+      terminal: () => ({
+        pane: { ptyId: 'shell', incarnationId: 'shell-1', identity: 'shell:shell-1' }
+      }),
+      links: () => [],
+      sleeping: () => false,
+      shellAlone: async () => shellAlone
+    }
+    await expect(
+      assertCliConversationWritersExited(writers, 'codex', RESUMED.id)
+    ).rejects.toMatchObject({
+      refusal: { details: { reason: 'conversationHeldElsewhere' } }
+    })
+    shellAlone = true
+    await expect(
+      assertCliConversationWritersExited(writers, 'codex', RESUMED.id)
+    ).resolves.toBeUndefined()
   })
 
   it('ignores a pane key that is not a stable tab:leaf key', async () => {
diff --git a/src/main/agent-hooks/server/server-ingest-terminal.ts b/src/main/agent-hooks/server/server-ingest-terminal.ts
index fd64bcfc4ad0..ab621097860b 100644
--- a/src/main/agent-hooks/server/server-ingest-terminal.ts
+++ b/src/main/agent-hooks/server/server-ingest-terminal.ts
@@ -17,7 +17,6 @@ import {
   programStatusYieldsToHookRow
 } from './program-status/hook-precedence'
 import type { ProgramStatusFacet } from '../../../shared/program-status/facet'
-import type { TerminalExecutionStamp } from '../../../shared/terminal-switch'
 
 const PROGRAM_STATUS_FACET_REPUBLISH_MS = 250
 
@@ -34,7 +33,6 @@ export abstract class AgentHookServerIngestTerminal extends AgentHookServerInges
     providerSession: AgentProviderSessionMetadata
     /** When the pane's process launched; a row reported since then is the agent's own. */
     launchedAt: number
-    execution?: TerminalExecutionStamp
   }): void {
     const paneKey = this.resolvePaneKeyAlias(event.paneKey.trim())
     const parsedPaneKey = parsePaneKey(paneKey)
@@ -49,7 +47,7 @@ export abstract class AgentHookServerIngestTerminal extends AgentHookServerInges
             event.agentType,
             previous.providerSession,
             event.providerSession
-          ) && previous.launchExecution?.incarnationId === event.execution?.incarnationId
+          )
         : 'receivedAt' in previous &&
           typeof previous.receivedAt === 'number' &&
           previous.receivedAt >= event.launchedAt)
@@ -64,7 +62,6 @@ export abstract class AgentHookServerIngestTerminal extends AgentHookServerInges
       connectionId: null,
       providerSession: event.providerSession,
       providerSessionOnly: true,
-      ...(event.execution ? { launchExecution: event.execution } : {}),
       // Why: hydration keeps only marked identity rows; a host restart before the first turn must not lose it.
       retainedForLiveness: true,
       payload: { state: 'done', prompt: '', agentType: event.agentType }
diff --git a/src/main/agent-hooks/server/server-status-identity.ts b/src/main/agent-hooks/server/server-status-identity.ts
index d3dd3464d8f2..0e798e742302 100644
--- a/src/main/agent-hooks/server/server-status-identity.ts
+++ b/src/main/agent-hooks/server/server-status-identity.ts
@@ -63,7 +63,6 @@ export function toAgentStatusIpcPayload(
     ...(entry.turnStartedAt !== undefined ? { turnStartedAt: entry.turnStartedAt } : {}),
     ...(entry.providerSession ? { providerSession: entry.providerSession } : {}),
     ...(entry.providerSessionOnly ? { providerSessionOnly: true } : {}),
-    ...(entry.launchExecution ? { launchExecution: entry.launchExecution } : {}),
     ...(entry.promptInteractionKey ? { promptInteractionKey: entry.promptInteractionKey } : {}),
     ...(entry.restoredUnconfirmed ? { restoredUnconfirmed: true } : {}),
     ...(entry.observation ? { observation: entry.observation } : {}),
diff --git a/src/main/daemon/daemon-pty-adapter.ts b/src/main/daemon/daemon-pty-adapter.ts
index c52792872dc1..3ebccf283115 100644
--- a/src/main/daemon/daemon-pty-adapter.ts
+++ b/src/main/daemon/daemon-pty-adapter.ts
@@ -1,6 +1,4 @@
 import { emitPtyListeners, createPtyExitPayload } from './daemon-pty-listener-emission'
-import { randomUUID } from 'node:crypto'
-import type { TerminalSwitchOwnerAnswer, TerminalSwitchOwners } from '../../shared/terminal-switch'
 import { DaemonPtyDaemonRecovery } from './daemon-pty-daemon-recovery'
 import type { DaemonPtyAdapterOptions } from './daemon-pty-runtime-state'
 import { supportsMode2031UnsubscribeFact, type DaemonEvent } from './types'
@@ -18,29 +16,6 @@ import type { AutomaticWorkRequestType } from './daemon-automatic-work-protocol'
 import type { DaemonAsyncIoStatus } from '../../shared/daemon-async-io-health'
 
 export class DaemonPtyAdapter extends DaemonPtyDaemonRecovery implements IPtyProvider {
-  /** Asked of this daemon only; a daemon without the request answers nothing, so it owns no switch. */
-  readonly terminalSwitches: TerminalSwitchOwners = {
-    owner: async () => (await this.terminalSwitches.observe(randomUUID(), false))[0]?.owner ?? null,
-    observe: async (generation, fence) => {
-      if (!this.client.isConnected()) {
-        throw new Error('terminal_switch_owner_unreachable')
-      }
-      try {
-        const answer = await this.client.request<TerminalSwitchOwnerAnswer>(
-          'observeTerminalSwitch',
-          { generation, fence },
-          5_000
-        )
-        return typeof answer?.owner === 'string' ? [answer] : []
-      } catch (error) {
-        if (isUnknownRequestTypeError(error)) {
-          return []
-        }
-        throw error
-      }
-    }
-  }
-
   constructor(opts: DaemonPtyAdapterOptions) {
     super(opts)
     // Registered after the base listener, which marks the sessions awaiting recovery first.
diff --git a/src/main/daemon/daemon-pty-owner-query-protocol.ts b/src/main/daemon/daemon-pty-owner-query-protocol.ts
index 2242ff1c49c4..875f09c6c994 100644
--- a/src/main/daemon/daemon-pty-owner-query-protocol.ts
+++ b/src/main/daemon/daemon-pty-owner-query-protocol.ts
@@ -10,10 +10,3 @@ export type SetColorQueryReplyColorsRequest = {
   type: 'setColorQueryReplyColors'
   payload: { colors: unknown }
 }
-
-/** The daemon's own answer about one chat → terminal switch generation; an unseen one is fenced. */
-export type ObserveTerminalSwitchRequest = {
-  id: string
-  type: 'observeTerminalSwitch'
-  payload: { generation: string; fence?: boolean }
-}
diff --git a/src/main/daemon/daemon-pty-router.ts b/src/main/daemon/daemon-pty-router.ts
index 48bb1b06a07c..0009cb356bba 100644
--- a/src/main/daemon/daemon-pty-router.ts
+++ b/src/main/daemon/daemon-pty-router.ts
@@ -1,5 +1,4 @@
 import { reconcileDaemonRouterSessions } from './daemon-router-session-reconciliation'
-import { routedTerminalSwitchOwners } from '../providers/terminal-switch-owners'
 import type { DaemonPtyAdapter } from './daemon-pty-adapter'
 import { DaemonPtyAdapterSubscriptionFanout } from './daemon-pty-adapter-subscription-fanout'
 import type {
@@ -31,10 +30,6 @@ export class DaemonPtyRouter implements IPtyProvider {
   private readonly subscriptions: DaemonPtyAdapterSubscriptionFanout
   private readonly legacyExitProof = new LegacyDaemonExitProof()
   readonly retirement = new DaemonRouterRetirement(() => this.allAdapters())
-  readonly terminalSwitches = routedTerminalSwitchOwners(
-    () => this.current,
-    () => this.allAdapters()
-  )
 
   constructor(opts: { current: DaemonPtyAdapter; legacy: DaemonPtyAdapter[] }) {
     this.current = opts.current
@@ -115,7 +110,9 @@ export class DaemonPtyRouter implements IPtyProvider {
     return this.current.supportsAgentSessionCreateOperations()
   }
 
-  attach = (id: string): ReturnType<IPtyProvider['attach']> => this.adapterFor(id).attach(id)
+  async attach(id: string): ReturnType<IPtyProvider['attach']> {
+    return await this.adapterFor(id).attach(id)
+  }
 
   hasPty(id: string): boolean {
     const routed = this.sessionAdapters.get(id)
@@ -174,9 +171,13 @@ export class DaemonPtyRouter implements IPtyProvider {
     await this.adapterFor(id).sendSignal(id, signal)
   }
 
-  getCwd = (id: string): Promise<string> => this.adapterFor(id).getCwd(id)
+  async getCwd(id: string): Promise<string> {
+    return this.adapterFor(id).getCwd(id)
+  }
 
-  getInitialCwd = (id: string): Promise<string> => this.adapterFor(id).getInitialCwd(id)
+  async getInitialCwd(id: string): Promise<string> {
+    return this.adapterFor(id).getInitialCwd(id)
+  }
 
   async getAppliedSize(id: string): Promise<{ cols: number; rows: number } | null> {
     return (await this.adapterFor(id).getAppliedSize?.(id)) ?? null
diff --git a/src/main/daemon/daemon-pty-session-control.ts b/src/main/daemon/daemon-pty-session-control.ts
index f8cde245cb4d..5d5d94a078c9 100644
--- a/src/main/daemon/daemon-pty-session-control.ts
+++ b/src/main/daemon/daemon-pty-session-control.ts
@@ -99,7 +99,12 @@ export abstract class DaemonPtySessionControl extends DaemonPtySessionInput {
 
   async shutdown(
     id: string,
-    opts: { immediate?: boolean; keepHistory?: boolean; deadlineMs?: number }
+    opts: {
+      immediate?: boolean
+      keepHistory?: boolean
+      deadlineMs?: number
+      expectedIncarnationId?: string
+    }
   ): Promise<void> {
     if (opts.keepHistory && this.disconnectOnlyPromise) {
       throw new Error('Cannot keep history after daemon disconnect has started')
@@ -119,7 +124,12 @@ export abstract class DaemonPtySessionControl extends DaemonPtySessionInput {
 
   protected async shutdownWithHistoryLock(
     id: string,
-    opts: { immediate?: boolean; keepHistory?: boolean; deadlineMs?: number }
+    opts: {
+      immediate?: boolean
+      keepHistory?: boolean
+      deadlineMs?: number
+      expectedIncarnationId?: string
+    }
   ): Promise<void> {
     // Why: shutdown can be the first lazy-client operation after restart; connect
     // before killing so a healthy daemon session is not orphaned (#7742). Connect,
@@ -172,6 +182,20 @@ export abstract class DaemonPtySessionControl extends DaemonPtySessionInput {
         this.historyManager?.suspendSession(id)
       }
     }
+    if (opts.expectedIncarnationId) {
+      // Older daemons cannot fence kill: compare their fresh inventory immediately before it.
+      const { sessions } = await this.client.request<ListSessionsResult>(
+        'listSessions',
+        undefined,
+        remainingDaemonRequestTimeoutMs(opts.deadlineMs)
+      )
+      if (
+        sessions.find((session) => session.sessionId === id)?.incarnationId !==
+        opts.expectedIncarnationId
+      ) {
+        throw new Error('terminal_handle_stale')
+      }
+    }
     await this.client.request(
       'kill',
       { sessionId: id, immediate: opts.immediate ?? false },
diff --git a/src/main/daemon/daemon-pty-spawn-request.ts b/src/main/daemon/daemon-pty-spawn-request.ts
index acdbd47e8b0d..6c5fb0e35cac 100644
--- a/src/main/daemon/daemon-pty-spawn-request.ts
+++ b/src/main/daemon/daemon-pty-spawn-request.ts
@@ -143,9 +143,6 @@ export abstract class DaemonPtySpawnRequest extends DaemonPtyRuntimeState {
           : {}),
         ...(!context.attachOnly && opts.agentSessionEnsure
           ? { agentSessionEnsure: opts.agentSessionEnsure }
-          : {}),
-        ...(!context.attachOnly && opts.switchGeneration
-          ? { switchGeneration: opts.switchGeneration, switchOwner: opts.switchOwner }
           : {})
       }
       return opts.signal
diff --git a/src/main/daemon/daemon-request-router.ts b/src/main/daemon/daemon-request-router.ts
index f79a1379055c..73d7703592c2 100644
--- a/src/main/daemon/daemon-request-router.ts
+++ b/src/main/daemon/daemon-request-router.ts
@@ -62,16 +62,15 @@ export class DaemonRequestRouter {
         return {}
       case 'createOrAttach':
         return this.options.admission.createOrAttach(clientId, request)
-      case 'cancelCreateOrAttach': {
-        const { sessionId, requestId } = request.payload
-        const scope = typeof requestId === 'string' ? { clientId, requestId } : { clientId }
-        return { canceled: this.options.preparations.cancel(sessionId, scope) }
-      }
-      case 'observeTerminalSwitch':
-        return this.options.host.switches.observe(
-          request.payload.generation,
-          request.payload.fence === true
-        )
+      case 'cancelCreateOrAttach':
+        return {
+          canceled: this.options.preparations.cancel(request.payload.sessionId, {
+            clientId,
+            ...(typeof request.payload.requestId === 'string'
+              ? { requestId: request.payload.requestId }
+              : {})
+          })
+        }
       case 'closeStartupQueryAuthority':
         return {
           appliedSeq: this.options.host.closeStartupQueryAuthority(request.payload.sessionId)
diff --git a/src/main/daemon/daemon-shutdown-final-checkpoint-caller-deadline.test.ts b/src/main/daemon/daemon-shutdown-final-checkpoint-caller-deadline.test.ts
index f134a8c8f8cc..e563668b50f2 100644
--- a/src/main/daemon/daemon-shutdown-final-checkpoint-caller-deadline.test.ts
+++ b/src/main/daemon/daemon-shutdown-final-checkpoint-caller-deadline.test.ts
@@ -116,6 +116,23 @@ describe('STA-4228 keep-history stop bounds only the caller wait on the final ch
     rmSync(dir, { recursive: true, force: true })
   })
 
+  it('checks the execution-host inventory before an ordinary daemon kill', async () => {
+    const { id, incarnationId } = await adapter.spawn({
+      cols: 80,
+      rows: 24,
+      sessionId: 'fenced-shell',
+      cwd: '/tmp'
+    })
+    const child = subprocesses.at(-1)!
+    await expect(
+      adapter.shutdown(id, { immediate: true, expectedIncarnationId: 'earlier' })
+    ).rejects.toThrow('terminal_handle_stale')
+    expect(child.forceKill).not.toHaveBeenCalled()
+    expect(child.kill).not.toHaveBeenCalled()
+    await adapter.shutdown(id, { immediate: true, expectedIncarnationId: incarnationId })
+    expect((await adapter.listProcesses()).some((row) => row.id === id)).toBe(false)
+  })
+
   /** Wedges one session's checkpoint at the history-write layer until explicitly released. */
   function stallCheckpointFor(stalledSessionId: string): { release: () => void } {
     const manager = adapter.getHistoryManager()
diff --git a/src/main/daemon/daemon-terminal-admission.ts b/src/main/daemon/daemon-terminal-admission.ts
index 43a820b11ae0..04daad020155 100644
--- a/src/main/daemon/daemon-terminal-admission.ts
+++ b/src/main/daemon/daemon-terminal-admission.ts
@@ -128,9 +128,6 @@ export class DaemonTerminalAdmission {
           ? { shellReadyTimeoutMs: payload.shellReadyTimeoutMs }
           : {}),
         ...(payload.agentSessionEnsure ? { agentSessionEnsure: payload.agentSessionEnsure } : {}),
-        ...(typeof payload.switchGeneration === 'string'
-          ? { switchGeneration: payload.switchGeneration, switchOwner: payload.switchOwner }
-          : {}),
         spawnAdmission: {
           clientId,
           declaredIntent: isSpawnIntent(payload.spawnIntent) ? payload.spawnIntent : null,
diff --git a/src/main/daemon/degraded-daemon-pty-provider.ts b/src/main/daemon/degraded-daemon-pty-provider.ts
index ae82d3ae4f15..bf021bce8f83 100644
--- a/src/main/daemon/degraded-daemon-pty-provider.ts
+++ b/src/main/daemon/degraded-daemon-pty-provider.ts
@@ -1,5 +1,4 @@
 import type { DaemonPtyAdapter } from './daemon-pty-adapter'
-import { routedTerminalSwitchOwners } from '../providers/terminal-switch-owners'
 import { combineUnsubscribes } from './combine-unsubscribes'
 import { shutdownDegradedFallbackSessions } from './degraded-daemon-fallback-shutdown'
 import { inspectPtyProviderProcess } from '../providers/pty-process-inspection'
@@ -87,10 +86,6 @@ export class DegradedDaemonPtyProvider implements IPtyProvider {
     this.freshSpawns.canProvideSnapshot(id)
 
   spawn = (opts: PtySpawnOptions): Promise<PtySpawnResult> => this.ownerRecovery.spawn(opts)
-  readonly terminalSwitches = routedTerminalSwitchOwners(
-    () => (this.freshSpawns.routesToFallback ? this.fallback : this.current),
-    () => this.allProviders()
-  )
 
   // Why refuse the fallback route (unknown ids resolve to it): see attachDaemonOwnedSession.
   attach = (id: string): ReturnType<IPtyProvider['attach']> =>
@@ -149,12 +144,17 @@ export class DegradedDaemonPtyProvider implements IPtyProvider {
     }
   }
 
-  sendSignal = (id: string, signal: string): Promise<void> =>
-    this.providerFor(id).sendSignal(id, signal)
+  async sendSignal(id: string, signal: string): Promise<void> {
+    await this.providerFor(id).sendSignal(id, signal)
+  }
 
-  getCwd = (id: string): Promise<string> => this.providerFor(id).getCwd(id)
+  async getCwd(id: string): Promise<string> {
+    return this.providerFor(id).getCwd(id)
+  }
 
-  getInitialCwd = (id: string): Promise<string> => this.providerFor(id).getInitialCwd(id)
+  async getInitialCwd(id: string): Promise<string> {
+    return this.providerFor(id).getInitialCwd(id)
+  }
 
   async getAppliedSize(id: string): Promise<{ cols: number; rows: number } | null> {
     return (await this.providerFor(id).getAppliedSize?.(id)) ?? null
diff --git a/src/main/daemon/session.ts b/src/main/daemon/session.ts
index d23c96066f62..845608425caa 100644
--- a/src/main/daemon/session.ts
+++ b/src/main/daemon/session.ts
@@ -34,7 +34,7 @@ export class Session {
   private readonly onSessionExit?: (code: number) => void
   private readonly output: SessionOutputPlane
   private readonly producerPause: SessionProducerPause
-  readonly shellReady: SessionShellReadyBarrier
+  private readonly shellReady: SessionShellReadyBarrier
   private readonly termination: SessionTerminationController
   /** Public so the creating host can print its own notice as terminal output. */
   readonly startupIngress: PtyStartupIngress
diff --git a/src/main/daemon/terminal-host-concurrent-create.test.ts b/src/main/daemon/terminal-host-concurrent-create.test.ts
index f144671f0feb..aa7b9fda956e 100644
--- a/src/main/daemon/terminal-host-concurrent-create.test.ts
+++ b/src/main/daemon/terminal-host-concurrent-create.test.ts
@@ -223,42 +223,3 @@ describe('concurrent createOrAttach across the async spawn', () => {
     expect(host.listSessions()).toEqual([])
   })
 })
-
-describe('a switch start owned by the terminal host', () => {
-  it('holds its generation from before spawn until its session exits, and never reuses it', async () => {
-    let releaseSpawn: () => void = () => {}
-    const gate = new Promise<void>((resolve) => {
-      releaseSpawn = resolve
-    })
-    const proc = mockSubprocess()
-    const host = new TerminalHost({
-      spawnSubprocess: vi.fn(async () => {
-        await gate
-        return proc
-      })
-    })
-    const { owner } = host.switches
-    const start = (sessionId: string, generation: string) =>
-      host.createOrAttach({
-        ...createOptions(sessionId),
-        switchGeneration: generation,
-        switchOwner: owner
-      })
-    const seen = (generation: string, fence = false) =>
-      host.switches.observe(generation, fence).observation
-
-    const created = start('switch-1', 'g1')
-    await vi.waitFor(() => expect(seen('g1')).toEqual({ state: 'pending' }))
-    // A lost reply's retry names the same generation and never starts a second terminal.
-    await expect(start('switch-2', 'g1')).rejects.toThrow('terminal_switch_generation_refused')
-    releaseSpawn()
-    await created
-    expect(seen('g1', true)).toMatchObject({ state: 'bound', ptyId: 'switch-1', shellPid: 4242 })
-    proc.emitExit(0)
-    await vi.waitFor(() => expect(seen('g1', true)).toEqual({ state: 'ended' }))
-    // An observation fences an unseen generation, so its late create refuses.
-    expect(seen('g2', true)).toEqual({ state: 'ended' })
-    await expect(start('switch-3', 'g2')).rejects.toThrow('terminal_switch_generation_refused')
-    await host.dispose()
-  })
-})
diff --git a/src/main/daemon/terminal-host-create-contract.ts b/src/main/daemon/terminal-host-create-contract.ts
index 3a17a9c86106..9f6e6fbec1b1 100644
--- a/src/main/daemon/terminal-host-create-contract.ts
+++ b/src/main/daemon/terminal-host-create-contract.ts
@@ -35,8 +35,6 @@ export type CreateOrAttachOptions = {
     claim: AgentSessionExecutionClaim
     surface: AgentSessionSurfaceBinding
   }
-  switchGeneration?: string
-  switchOwner?: string
   streamClient: {
     onData: (data: string, rawLength?: number, transformed?: boolean, seq?: number) => void
     onExit: (code: number, incarnationId: PtyIncarnationId, cause?: TerminalExitCause) => void
diff --git a/src/main/daemon/terminal-host-session-create.ts b/src/main/daemon/terminal-host-session-create.ts
index e9f88329e475..ed5a06372c24 100644
--- a/src/main/daemon/terminal-host-session-create.ts
+++ b/src/main/daemon/terminal-host-session-create.ts
@@ -1,5 +1,4 @@
 import { buildStartupCommandSubmission } from '../../shared/startup-command-submission'
-import type { TerminalHostSwitches } from './terminal-host-switches'
 import {
   discardStagedStartupCommand,
   stageStartupCommand,
@@ -33,7 +32,6 @@ type TerminalHostSessionCreateDependencies = {
   killedTombstones: TerminalHostTombstones
   spawnSubprocess: TerminalHostOptions['spawnSubprocess']
   spawnGate: TerminalSpawnGate | undefined
-  switches?: TerminalHostSwitches
   onDeadSessionRemoved: (sessionId: string) => void
   onSessionCreated: (sessionId: string, generation: string | undefined, isAlive: boolean) => void
   onSessionExit: (sessionId: string, generation: string | undefined) => void
@@ -153,31 +151,23 @@ async function spawnAndPublishSession(
   // Why before the fork: the shell's own cwd may already have fallen back, so probe the requested path.
   const cwdReadableByDaemon =
     opts.cwd && !wslDistro ? await isCwdReadableByThisProcess(opts.cwd) : null
-  deps.switches?.begin(opts.switchGeneration, opts.switchOwner)
-  let subprocess: Awaited<ReturnType<TerminalHostSessionCreateDependencies['spawnSubprocess']>>
-  try {
-    subprocess = await deps.spawnSubprocess({
-      sessionId: opts.sessionId,
-      cols: size.cols,
-      rows: size.rows,
-      cwd: opts.cwd,
-      env: opts.env,
-      envToDelete: opts.envToDelete,
-      command: opts.command,
-      startupCommandDelivery: opts.startupCommandDelivery,
-      ...(opts.launchAgent ? { launchAgent: opts.launchAgent } : {}),
-      shellOverride: opts.shellOverride,
-      terminalShellArgs: opts.terminalShellArgs,
-      terminalWindowsWslDistro: opts.terminalWindowsWslDistro,
-      terminalWindowsPowerShellImplementation: opts.terminalWindowsPowerShellImplementation,
-      isCanceled: opts.isCanceled,
-      ...(opts.cancelSignal ? { cancelSignal: opts.cancelSignal } : {})
-    })
-  } catch (error) {
-    // A spawn that threw left no subprocess, so nothing can start under this generation.
-    deps.switches?.endUnstarted(opts.switchGeneration)
-    throw error
-  }
+  const subprocess = await deps.spawnSubprocess({
+    sessionId: opts.sessionId,
+    cols: size.cols,
+    rows: size.rows,
+    cwd: opts.cwd,
+    env: opts.env,
+    envToDelete: opts.envToDelete,
+    command: opts.command,
+    startupCommandDelivery: opts.startupCommandDelivery,
+    ...(opts.launchAgent ? { launchAgent: opts.launchAgent } : {}),
+    shellOverride: opts.shellOverride,
+    terminalShellArgs: opts.terminalShellArgs,
+    terminalWindowsWslDistro: opts.terminalWindowsWslDistro,
+    terminalWindowsPowerShellImplementation: opts.terminalWindowsPowerShellImplementation,
+    isCanceled: opts.isCanceled,
+    ...(opts.cancelSignal ? { cancelSignal: opts.cancelSignal } : {})
+  })
 
   let staging: StartupCommandStaging | undefined
   // Why: a fallback shell does not emit the preferred shell's ready marker;
@@ -214,8 +204,6 @@ async function spawnAndPublishSession(
       ? { shellReadyTimeoutMs: opts.shellReadyTimeoutMs }
       : {})
   })
-  // From here only this session's own end ends the switch, canceled or not.
-  deps.switches?.bind(opts.switchGeneration, session)
 
   if (opts.isCanceled?.()) {
     // Retain cleanup ownership if the native child refuses to exit.
diff --git a/src/main/daemon/terminal-host-switches.ts b/src/main/daemon/terminal-host-switches.ts
deleted file mode 100644
index 0ea1edc94b4b..000000000000
--- a/src/main/daemon/terminal-host-switches.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-// The daemon's ownership of chat → terminal switch starts. A generation is held from before its
-// subprocess spawns, bound to the session the moment it exists, and only that session ends it.
-import { randomUUID } from 'node:crypto'
-import type { TerminalSwitchOwnerAnswer } from '../../shared/terminal-switch'
-import type { Session } from './session'
-
-type HostSwitch = { state: 'pending' | 'ended' } | { state: 'bound'; session: Session }
-
-export class TerminalHostSwitches {
-  readonly owner = `daemon:${randomUUID()}`
-  private readonly entries = new Map<string, HostSwitch>()
-
-  /** Before the subprocess: a foreign owner or an already used or fenced generation refuses. */
-  begin(generation: string | undefined, owner: string | undefined): void {
-    if (generation === undefined) {
-      return
-    }
-    if (owner !== this.owner || this.entries.has(generation)) {
-      throw new Error('terminal_switch_generation_refused')
-    }
-    this.entries.set(generation, { state: 'pending' })
-  }
-
-  bind(generation: string | undefined, session: Session): void {
-    if (generation !== undefined) {
-      this.entries.set(generation, { state: 'bound', session })
-    }
-  }
-
-  /** The subprocess never spawned, so nothing can start or deliver under this generation. */
-  endUnstarted(generation: string | undefined): void {
-    if (generation !== undefined && this.entries.get(generation)?.state === 'pending') {
-      this.entries.set(generation, { state: 'ended' })
-    }
-  }
-
-  /** An unseen generation is fenced, so a late create carrying it refuses and absence means no start. */
-  observe(generation: string, fence: boolean): TerminalSwitchOwnerAnswer {
-    const entry: HostSwitch = this.entries.get(generation) ?? {
-      state: fence ? 'ended' : 'pending'
-    }
-    if (fence) {
-      this.entries.set(generation, entry)
-    }
-    if (entry.state !== 'bound') {
-      return { owner: this.owner, observation: { state: entry.state } }
-    }
-    const { session } = entry
-    return {
-      owner: this.owner,
-      observation: session.isAlive
-        ? {
-            state: 'bound',
-            ptyId: session.sessionId,
-            incarnationId: session.incarnationId,
-            shellPid: session.pid > 0 ? session.pid : null,
-            // The startup command is queued behind the shell-ready barrier until it flushes.
-            startupSettled: !session.shellReady.isGatingWrites
-          }
-        : { state: 'ended' }
-    }
-  }
-}
diff --git a/src/main/daemon/terminal-host.ts b/src/main/daemon/terminal-host.ts
index 6588ff785b61..9a6f5c21c9a8 100644
--- a/src/main/daemon/terminal-host.ts
+++ b/src/main/daemon/terminal-host.ts
@@ -1,5 +1,4 @@
 import type { Session } from './session'
-import { TerminalHostSwitches } from './terminal-host-switches'
 import type { PtyProcessInspectionOptions } from '../providers/pty-process-inspection'
 import { SessionNotFoundError } from './types'
 import type { SessionInfo, TakePendingOutputResult, TerminalSnapshot } from './types'
@@ -52,7 +51,6 @@ export class TerminalHost {
   private disposePromise: Promise<void> | null = null
   private readonly agentSessionOwners = new ClaimedAgentPtyOwnerRegistry()
   private readonly agentSessionGenerations = new TerminalHostAgentSessionGenerations()
-  readonly switches = new TerminalHostSwitches()
   private readonly authorityGeneration = randomUUID()
   private observationEpoch = 0
   private readonly retiredIncarnations = new Map<
@@ -83,8 +81,13 @@ export class TerminalHost {
     }
     this.assertCreateOrAttachAllowed(opts)
 
-    const creation = Promise.withResolvers<void>()
-    this.pendingCreations.set(opts.sessionId, creation.promise)
+    let settleCreation: () => void = () => {}
+    this.pendingCreations.set(
+      opts.sessionId,
+      new Promise<void>((resolve) => {
+        settleCreation = resolve
+      })
+    )
     try {
       return await createOrAttachClaimedAgentSession({
         options: opts,
@@ -106,7 +109,6 @@ export class TerminalHost {
             killedTombstones: this.killedTombstones,
             spawnSubprocess: this.spawnOptions.spawnSubprocess,
             spawnGate: this.spawnOptions.spawnGate,
-            switches: this.switches,
             onDeadSessionRemoved: (sessionId) => this.agentSessionGenerations.forget(sessionId),
             onSessionCreated: (sessionId, generation, isAlive) =>
               this.agentSessionGenerations.remember(sessionId, generation, isAlive),
@@ -119,7 +121,7 @@ export class TerminalHost {
       })
     } finally {
       this.pendingCreations.delete(opts.sessionId)
-      creation.resolve()
+      settleCreation()
     }
   }
 
diff --git a/src/main/daemon/types.ts b/src/main/daemon/types.ts
index 05cee6524c64..080c474ab033 100644
--- a/src/main/daemon/types.ts
+++ b/src/main/daemon/types.ts
@@ -107,9 +107,6 @@ export type CreateOrAttachRequest = {
       claim: AgentSessionExecutionClaim
       surface: AgentSessionSurfaceBinding
     }
-    /** A switch start; sent only to a daemon that answered `observeTerminalSwitch`. */
-    switchGeneration?: string
-    switchOwner?: string
   }
 }
 
@@ -327,7 +324,6 @@ export type DaemonRequest =
   | TakePendingOutputRequest
   | PtyOwnerQueryProtocol.CloseStartupQueryAuthorityRequest
   | PtyOwnerQueryProtocol.SetColorQueryReplyColorsRequest
-  | PtyOwnerQueryProtocol.ObserveTerminalSwitchRequest
 
 // ─── RPC Responses (Daemon → Client, on control socket) ────────────
 
diff --git a/src/main/ipc/pty/host-env/resume-spawn-judgement.ts b/src/main/ipc/pty/host-env/resume-spawn-judgement.ts
deleted file mode 100644
index 1d9ccc79c36d..000000000000
--- a/src/main/ipc/pty/host-env/resume-spawn-judgement.ts
+++ /dev/null
@@ -1,152 +0,0 @@
-import type {
-  AgentProviderSessionMetadata,
-  SleepingAgentLaunchConfig,
-  SleepingAgentSessionRecord
-} from '../../../../shared/agent-session-resume'
-import { normalizeAgentProviderSession } from '../../../../shared/agent-session-resume'
-import type { TuiAgent } from '../../../../shared/tui-agent'
-import type {
-  AgentStatusIpcPayload,
-  RefusedPaneResume
-} from '../../../../shared/agent-status-types'
-import type { AgentSessionRecordStore } from '../../../runtime/agent-session-record-store'
-import type { SwitchClaim } from '../../../runtime/session-tabs/structured-session-switch-claims'
-import { TERMINAL_SWITCH_GENERATION_ENV } from '../../../../shared/terminal-switch'
-import {
-  agentSessionLeasePossiblyWriting,
-  listStructuredProviderSessionOwnership
-} from '../../../native-chat/agent-session-wire/structured-provider-session-ownership'
-import {
-  keysMayMatch,
-  terminalConversationKey
-} from '../../../native-chat/structured-conversation-key'
-
-export type ResumeSpawnArgs = {
-  connectionId?: string | null
-  command?: string
-  launchAgent?: TuiAgent
-  launchConfig?: SleepingAgentLaunchConfig
-  launchToken?: unknown
-  resumeProviderSession?: AgentProviderSessionMetadata
-  /** `saved`: built from a pane's saved facts; `switch`: the terminal half of a chat's switch. */
-  resumeOrigin?: unknown
-  env?: Record<string, string>
-}
-
-export type AdmissionRuntime = {
-  getAgentProviderSessionRows?(): AgentStatusIpcPayload[]
-  readSavedResumeSource?(
-    worktreeId: string,
-    paneKey: string
-  ): Promise<SleepingAgentSessionRecord | undefined>
-  openAgentSessionRecordStore(): Promise<AgentSessionRecordStore>
-  acceptSwitchStart?(generation: string, paneKey: string): SwitchClaim | null
-  saveSwitchClaim?(claim: SwitchClaim): Promise<boolean>
-  dispatchSwitchStart?(claim: SwitchClaim): { switchGeneration: string; switchOwner: string }
-}
-
-/** The spawn options a switch admission reads its generation from and hands its owner fields to. */
-export type SwitchSpawnOptions = {
-  env?: Record<string, string>
-  switchGeneration?: string
-  switchOwner?: string
-}
-
-/** `chat-home`: an automatic restore of a conversation an open chat continues; `chat-writing`:
- *  any start of one a chat may be writing; `unverifiable`: an automatic restore with no records. */
-export type ResumeSpawnRefusal = {
-  sourceRecord?: SleepingAgentSessionRecord
-  verdict: 'chat-home' | 'chat-writing' | 'unverifiable'
-  refused: RefusedPaneResume
-}
-
-export type ResumeSpawnAdmission =
-  | {
-      verdict: 'admitted'
-      refused: RefusedPaneResume
-      sourceRecord?: SleepingAgentSessionRecord
-    }
-  | ResumeSpawnRefusal
-
-export async function judgeResumes(
-  runtime: AdmissionRuntime,
-  resumes: readonly [RefusedPaneResume, ...RefusedPaneResume[]],
-  /** A switch's own start: its chat tab is still open on purpose, so only a writing chat refuses. */
-  switchStart = false
-): Promise<ResumeSpawnAdmission> {
-  const keysOf = ({ agent, providerSession }: RefusedPaneResume) =>
-    [providerSession.id, providerSession.transcriptPath].flatMap((id) =>
-      id?.trim() ? [terminalConversationKey(agent, id)] : []
-    )
-  const admitted = (): ResumeSpawnAdmission => ({
-    verdict: 'admitted',
-    refused: resumes[0]
-  })
-  let store: AgentSessionRecordStore
-  try {
-    store = await runtime.openAgentSessionRecordStore()
-  } catch (error) {
-    console.warn(
-      "[pty] native chat records unreadable; cannot tell whether a resume is a chat's",
-      error
-    )
-    return { verdict: 'unverifiable', refused: resumes[0] }
-  }
-  const heads = listStructuredProviderSessionOwnership(store.listRecords()).filter(
-    (holding) => holding.role === 'head'
-  )
-  const tabs = store.getVisibleSessionTabIndex()
-  for (const refused of resumes) {
-    const holders = heads.filter((holding) =>
-      keysOf(refused).some((key) => keysMayMatch(holding.key, key))
-    )
-    if (holders.some((holding) => agentSessionLeasePossiblyWriting(holding.lease))) {
-      return { verdict: 'chat-writing', refused }
-    }
-    if (switchStart) {
-      continue
-    }
-    if (holders.length > 0 && (!tabs || !tabs.present)) {
-      return { verdict: 'unverifiable', refused }
-    }
-    if (tabs && holders.some((holding) => tabs.sessionIds.includes(holding.sessionId))) {
-      return { verdict: 'chat-home', refused }
-    }
-  }
-  return admitted()
-}
-
-/** The terminal half of a chat's switch. Its generation takes this pane and is saved on the chat
- *  before the owner gets it; a refusal sends nothing, and only the owner then says it never started. */
-export async function admitSwitchResumeSpawn(
-  runtime: AdmissionRuntime | undefined,
-  args: ResumeSpawnArgs,
-  wslDistro: string | null,
-  spawn?: { paneKey: string | null; options: SwitchSpawnOptions }
-): Promise<ResumeSpawnAdmission> {
-  const generation = args.env?.[TERMINAL_SWITCH_GENERATION_ENV]
-  delete args.env?.[TERMINAL_SWITCH_GENERATION_ENV]
-  delete spawn?.options.env?.[TERMINAL_SWITCH_GENERATION_ENV]
-  const providerSession = normalizeAgentProviderSession(args.resumeProviderSession)
-  const agent = args.launchAgent
-  if (!providerSession || !agent) {
-    throw new Error('switch_start_missing_conversation')
-  }
-  const refused = { agent, providerSession }
-  if (args.connectionId || wslDistro !== null || !generation || !spawn?.paneKey) {
-    return { verdict: 'unverifiable', refused }
-  }
-  // Before any await: a chat start whose census ends after this point sees the claim.
-  const claim = runtime?.acceptSwitchStart?.(generation, spawn.paneKey)
-  if (!claim || claim.providerSessionId !== providerSession.id) {
-    return { verdict: 'chat-writing', refused }
-  }
-  if (!(await runtime?.saveSwitchClaim?.(claim))) {
-    return { verdict: 'unverifiable', refused }
-  }
-  const admission = await judgeResumes(runtime, [refused], true)
-  if (admission.verdict === 'admitted' && runtime?.dispatchSwitchStart) {
-    Object.assign(spawn.options, runtime.dispatchSwitchStart(claim))
-  }
-  return admission
-}
diff --git a/src/main/ipc/pty/host-env/saved-resume-admission.ts b/src/main/ipc/pty/host-env/saved-resume-admission.ts
index 59fcc9b8c7f3..1f96ce843478 100644
--- a/src/main/ipc/pty/host-env/saved-resume-admission.ts
+++ b/src/main/ipc/pty/host-env/saved-resume-admission.ts
@@ -1,43 +1,72 @@
+import type { TuiAgent } from '../../../../shared/tui-agent'
 import {
   normalizeAgentProviderSession,
   agentProviderSessionsEqual,
+  type AgentProviderSessionMetadata,
+  type SleepingAgentLaunchConfig,
   type SleepingAgentSessionRecord
 } from '../../../../shared/agent-session-resume'
-import type { AgentStatusIpcPayload } from '../../../../shared/agent-status-types'
+import type {
+  AgentStatusIpcPayload,
+  RefusedPaneResume
+} from '../../../../shared/agent-status-types'
+import type { AgentSessionRecordStore } from '../../../runtime/agent-session-record-store'
+import {
+  agentSessionLeasePossiblyWriting,
+  listStructuredProviderSessionOwnership
+} from '../../../native-chat/agent-session-wire/structured-provider-session-ownership'
 import { agentHookServer } from '../../../agent-hooks/server'
 import { LOCAL_EXECUTION_HOST_ID, type ExecutionHostId } from '../../../../shared/execution-host'
 import type { WorkspaceSessionState } from '../../../../shared/workspace-session-state-types'
 import {
-  admitSwitchResumeSpawn,
-  judgeResumes,
-  type AdmissionRuntime,
-  type ResumeSpawnAdmission,
-  type ResumeSpawnArgs,
-  type ResumeSpawnRefusal,
-  type SwitchSpawnOptions
-} from './resume-spawn-judgement'
+  keysMayMatch,
+  terminalConversationKey
+} from '../../../native-chat/structured-conversation-key'
+
+export type ResumeSpawnArgs = {
+  connectionId?: string | null
+  command?: string
+  launchAgent?: TuiAgent
+  launchConfig?: SleepingAgentLaunchConfig
+  launchToken?: unknown
+  resumeProviderSession?: AgentProviderSessionMetadata
+  /** Saved pane restore or explicit same-id switch from a native chat. */
+  resumeOrigin?: unknown
+  env?: Record<string, string>
+}
+
+type AdmissionRuntime = {
+  getAgentProviderSessionRows?(): AgentStatusIpcPayload[]
+  readSavedResumeSource?(
+    worktreeId: string,
+    paneKey: string
+  ): Promise<SleepingAgentSessionRecord | undefined>
+  openAgentSessionRecordStore(): Promise<AgentSessionRecordStore>
+}
+
+/** `chat-home`: an automatic restore of a conversation an open chat continues; `chat-writing`:
+ *  any start of one a chat may be writing; `unverifiable`: an automatic restore with no records. */
+export type ResumeSpawnRefusal = {
+  sourceRecord?: SleepingAgentSessionRecord
+  verdict: 'chat-home' | 'chat-writing' | 'unverifiable'
+  refused: RefusedPaneResume
+}
 
-export type {
-  ResumeSpawnAdmission,
-  ResumeSpawnArgs,
-  ResumeSpawnRefusal
-} from './resume-spawn-judgement'
+export type ResumeSpawnAdmission =
+  | { verdict: 'admitted'; refused: RefusedPaneResume; sourceRecord?: SleepingAgentSessionRecord }
+  | ResumeSpawnRefusal
 
-/** Saved-home policy and a switch's own start; other terminal starts remain hook-observed. */
+/** Saved-home policy only; ordinary terminal starts remain hook-observed. */
 export async function admitResumeSpawn(
   runtime: AdmissionRuntime | undefined,
   args: ResumeSpawnArgs,
-  wslDistro: string | null,
-  spawn?: { paneKey: string | null; options: SwitchSpawnOptions }
+  wslDistro: string | null
 ): Promise<ResumeSpawnAdmission | null> {
-  if (args.resumeOrigin === 'switch') {
-    return admitSwitchResumeSpawn(runtime, args, wslDistro, spawn)
-  }
   const providerSession = normalizeAgentProviderSession(args.resumeProviderSession)
   const agent = args.launchAgent
   // Native chats run only natively, so a remote or WSL conversation is never a chat's.
   if (
-    args.resumeOrigin !== 'saved' ||
+    (args.resumeOrigin !== 'saved' && args.resumeOrigin !== 'switch') ||
     !providerSession ||
     !agent ||
     args.connectionId ||
@@ -48,7 +77,7 @@ export async function admitResumeSpawn(
   if (!runtime) {
     return { verdict: 'unverifiable', refused: { agent, providerSession } }
   }
-  return judgeResumes(runtime, [{ agent, providerSession }])
+  return judgeResumes(runtime, [{ agent, providerSession }], args.resumeOrigin === 'switch')
 }
 
 /** A reattach that found its session gone returns a fresh shell its window then resumes from the
@@ -86,6 +115,49 @@ export async function admitColdRestoreReattach(
   return first ? judgeResumes(runtime, [first]) : null
 }
 
+async function judgeResumes(
+  runtime: AdmissionRuntime,
+  resumes: readonly [RefusedPaneResume, ...RefusedPaneResume[]],
+  switchStart = false
+): Promise<ResumeSpawnAdmission> {
+  const keysOf = ({ agent, providerSession }: RefusedPaneResume) =>
+    [providerSession.id, providerSession.transcriptPath].flatMap((id) =>
+      id?.trim() ? [terminalConversationKey(agent, id)] : []
+    )
+  let store: AgentSessionRecordStore
+  try {
+    store = await runtime.openAgentSessionRecordStore()
+  } catch (error) {
+    console.warn(
+      "[pty] native chat records unreadable; cannot tell whether a resume is a chat's",
+      error
+    )
+    return { verdict: 'unverifiable', refused: resumes[0] }
+  }
+  const heads = listStructuredProviderSessionOwnership(store.listRecords()).filter(
+    (holding) => holding.role === 'head'
+  )
+  const tabs = store.getVisibleSessionTabIndex()
+  for (const refused of resumes) {
+    const holders = heads.filter((holding) =>
+      keysOf(refused).some((key) => keysMayMatch(holding.key, key))
+    )
+    if (holders.some((holding) => agentSessionLeasePossiblyWriting(holding.lease))) {
+      return { verdict: 'chat-writing', refused }
+    }
+    if (switchStart) {
+      continue
+    }
+    if (holders.length > 0 && (!tabs || !tabs.present)) {
+      return { verdict: 'unverifiable', refused }
+    }
+    if (tabs && holders.some((holding) => tabs.sessionIds.includes(holding.sessionId))) {
+      return { verdict: 'chat-home', refused }
+    }
+  }
+  return { verdict: 'admitted', refused: resumes[0] }
+}
+
 /** A refused resume becomes the pane's plain shell: nothing of the agent launch is left to run,
  *  register, or mark the shell as an unattended agent's. */
 export function dropAgentLaunch(args: ResumeSpawnArgs): void {
@@ -153,21 +225,14 @@ export function savedResumeRecord(
 
 /** Runs only in the fresh branch, after stable/claimed owner adoption has settled. */
 export async function chooseSavedResumeFreshLaunch(
-  spawn: {
-    deps: { runtime?: AdmissionRuntime }
-    expectedWslDistro: string | null
-    spawnOptions: ResumeSpawnArgs &
-      SwitchSpawnOptions & { startupCommandDelivery?: unknown; startupIngress?: unknown }
-  },
+  runtime: AdmissionRuntime | undefined,
   args: ResumeSpawnArgs,
-  paneKey: string | null
+  wslDistro: string | null,
+  options: ResumeSpawnArgs & { startupCommandDelivery?: unknown; startupIngress?: unknown }
 ): Promise<ResumeSpawnAdmission | null> {
-  const admission = await admitResumeSpawn(spawn.deps.runtime, args, spawn.expectedWslDistro, {
-    paneKey,
-    options: spawn.spawnOptions
-  })
+  const admission = await admitResumeSpawn(runtime, args, wslDistro)
   if (resumeSpawnRefusal(admission)) {
-    suppressSavedResumeLaunch(args, spawn.spawnOptions)
+    suppressSavedResumeLaunch(args, options)
   }
   return admission
 }
diff --git a/src/main/ipc/pty/ipc/renderer-kill.ts b/src/main/ipc/pty/ipc/renderer-kill.ts
index a69b92b2f007..a5c7b9a0d137 100644
--- a/src/main/ipc/pty/ipc/renderer-kill.ts
+++ b/src/main/ipc/pty/ipc/renderer-kill.ts
@@ -24,7 +24,12 @@ export type PtyKillIpcDeps = {
   shutdownProviderAndDetectExit: (
     provider: IPtyProvider,
     id: string,
-    opts: { immediate?: boolean; keepHistory?: boolean; deadlineMs?: number }
+    opts: {
+      immediate?: boolean
+      keepHistory?: boolean
+      deadlineMs?: number
+      expectedIncarnationId?: string
+    }
   ) => Promise<boolean>
   rememberSyntheticKillExit: (id: string, incarnationId?: string) => void
   sendPtyExitToRenderer: (payload: { id: string; code: number; incarnationId?: string }) => void
diff --git a/src/main/ipc/pty/ipc/spawn-commit.ts b/src/main/ipc/pty/ipc/spawn-commit.ts
index 789d1047484c..207c8c06c468 100644
--- a/src/main/ipc/pty/ipc/spawn-commit.ts
+++ b/src/main/ipc/pty/ipc/spawn-commit.ts
@@ -1,3 +1,4 @@
+import { retireChatForAdmittedTerminalLaunch } from '../../../runtime/session-tabs/structured-session-terminal-launch-retirement'
 import { isValidTerminalTabId } from '../../../../shared/terminal-tab-id'
 import { agentHookServer } from '../../../agent-hooks/server'
 import { registerPty } from '../../../memory/pty-registry'
@@ -177,8 +178,7 @@ async function commitReservedPtyIpcSpawn(ctx: PtyIpcSpawnState): Promise<PtySpaw
     worktreeId: args.worktreeId,
     launchedAt: ctx.codexHomeLaunchStartedAt,
     resumeArgvDropped: ctx.codexResumeLaunch.droppedResumeArgv,
-    result: ctx.result,
-    switchGeneration: ctx.spawnOptions.switchGeneration
+    result: ctx.result
   })
   // Why: record the spawn-result pid once here so the memory module needn't reach back into ipc/pty on a hot path (works for in-process and daemon-hosted PTYs).
   const spawnedPid = ctx.result.pid ?? null
@@ -252,6 +252,7 @@ async function commitReservedPtyIpcSpawn(ctx: PtyIpcSpawnState): Promise<PtySpaw
         ? { launchEnv: ctx.baseEnv }
         : {})
   })
+  await retireChatForAdmittedTerminalLaunch(ctx.deps.runtime, args, response)
   return resolvePaneSpawnReservation(
     ctx.paneSpawnReservationKey,
     ctx.paneSpawnReservation,
diff --git a/src/main/ipc/pty/ipc/spawn-execute.ts b/src/main/ipc/pty/ipc/spawn-execute.ts
index 2f6a701beba7..8106763a1d8f 100644
--- a/src/main/ipc/pty/ipc/spawn-execute.ts
+++ b/src/main/ipc/pty/ipc/spawn-execute.ts
@@ -35,7 +35,12 @@ export async function executePtyIpcSpawn(ctx: PtyIpcSpawnState): Promise<void> {
   const chooseFresh = async (): Promise<void> => {
     ctx.spawnOptions.env = { ...ctx.spawnOptions.env }
     args.launchConfig = ctx.effectiveLaunchConfig
-    ctx.resumeAdmission = await chooseSavedResumeFreshLaunch(ctx, args, ctx.stablePaneKey)
+    ctx.resumeAdmission = await chooseSavedResumeFreshLaunch(
+      ctx.deps.runtime,
+      args,
+      ctx.expectedWslDistro,
+      ctx.spawnOptions
+    )
     if (captured && ctx.resumeAdmission) {
       ctx.resumeAdmission.refused = captured.refused
       ctx.resumeAdmission.sourceRecord = captured.sourceRecord
diff --git a/src/main/ipc/pty/pane/resume-launch-identity.test.ts b/src/main/ipc/pty/pane/resume-launch-identity.test.ts
index f6cd27f3612b..782118dfc5a0 100644
--- a/src/main/ipc/pty/pane/resume-launch-identity.test.ts
+++ b/src/main/ipc/pty/pane/resume-launch-identity.test.ts
@@ -42,13 +42,6 @@ describe('seedResumeLaunchIdentityFromSpawn', () => {
     })
   })
 
-  it('names the exact execution only for a switch start', () => {
-    seed({ switchGeneration: 'g1', result: { id: 'pty-1', incarnationId: 'i1' } })
-    expect(recordLaunchResumeIdentity).toHaveBeenCalledWith(
-      expect.objectContaining({ execution: { ptyId: 'pty-1', incarnationId: 'i1' } })
-    )
-  })
-
   it.each([
     ['a reattached process', { result: { id: 'pty-1', isReattach: true } }],
     ['a Codex resume that fell back to a fresh session', { resumeArgvDropped: true }],
diff --git a/src/main/ipc/pty/pane/resume-launch-identity.ts b/src/main/ipc/pty/pane/resume-launch-identity.ts
index 0757be7c7ca1..ab0945d0fdbb 100644
--- a/src/main/ipc/pty/pane/resume-launch-identity.ts
+++ b/src/main/ipc/pty/pane/resume-launch-identity.ts
@@ -4,7 +4,6 @@ import {
   normalizeAgentProviderSession
 } from '../../../../shared/agent-session-resume'
 import type { PtySpawnResult } from '../../../providers/pty-provider-contract'
-import type { TerminalExecutionStamp } from '../../../../shared/terminal-switch'
 
 /**
  * Record a fresh resume launch's provider session in the hook store, so every reader (phone tab
@@ -21,8 +20,6 @@ export function seedResumeLaunchIdentityFromSpawn(args: {
   /** The Codex resume fell back to a fresh session, so the pane does not hold this one. */
   resumeArgvDropped: boolean
   result: PtySpawnResult
-  /** Set on a chat → terminal switch start: its row then names the exact execution. */
-  switchGeneration?: string
 }): void {
   // Why: a reattached process already reported its own identity; an SSH pane's rows belong to
   // its relay, which owns that host's status.
@@ -35,12 +32,10 @@ export function seedResumeLaunchIdentityFromSpawn(args: {
   ) {
     return
   }
-  const { id: ptyId, incarnationId } = args.result
   seedResumeLaunchIdentity({
     ...args,
     paneKey: args.paneKey,
-    launchedAt: args.launchedAt.getTime(),
-    ...(args.switchGeneration && incarnationId ? { execution: { ptyId, incarnationId } } : {})
+    launchedAt: args.launchedAt.getTime()
   })
 }
 
@@ -54,7 +49,6 @@ export function seedResumeLaunchIdentity(args: {
   resumeProviderSession: unknown
   worktreeId: unknown
   launchedAt: number
-  execution?: TerminalExecutionStamp
 }): void {
   const agent = args.launchAgent
   const providerSession = normalizeAgentProviderSession(args.resumeProviderSession)
@@ -70,7 +64,6 @@ export function seedResumeLaunchIdentity(args: {
     ...(typeof args.worktreeId === 'string' ? { worktreeId: args.worktreeId } : {}),
     agentType: agent,
     providerSession,
-    launchedAt: args.launchedAt,
-    ...(args.execution ? { execution: args.execution } : {})
+    launchedAt: args.launchedAt
   })
 }
diff --git a/src/main/ipc/pty/provider/shutdown-detect.ts b/src/main/ipc/pty/provider/shutdown-detect.ts
index b43928355aca..70828ff49c84 100644
--- a/src/main/ipc/pty/provider/shutdown-detect.ts
+++ b/src/main/ipc/pty/provider/shutdown-detect.ts
@@ -4,10 +4,15 @@ import { ptyIncarnationById } from './ownership-state'
 export async function shutdownProviderAndDetectExit(
   provider: IPtyProvider,
   id: string,
-  opts: { immediate?: boolean; keepHistory?: boolean; deadlineMs?: number }
+  opts: {
+    immediate?: boolean
+    keepHistory?: boolean
+    deadlineMs?: number
+    expectedIncarnationId?: string
+  }
 ): Promise<boolean> {
   let providerExitObserved = false
-  const expectedIncarnationId = ptyIncarnationById.get(id)
+  const expectedIncarnationId = opts.expectedIncarnationId ?? ptyIncarnationById.get(id)
   const unsubscribe = provider.onExit((payload) => {
     if (
       payload.id === id &&
diff --git a/src/main/ipc/pty/runtime/controller-deps.ts b/src/main/ipc/pty/runtime/controller-deps.ts
index 667900bf474c..44f39f37ab22 100644
--- a/src/main/ipc/pty/runtime/controller-deps.ts
+++ b/src/main/ipc/pty/runtime/controller-deps.ts
@@ -45,7 +45,12 @@ export type PtyRuntimeControllerDeps = PtySpawnCodexResumeDeps & {
   shutdownProviderAndDetectExit: (
     provider: IPtyProvider,
     id: string,
-    opts: { immediate?: boolean; keepHistory?: boolean; deadlineMs?: number }
+    opts: {
+      immediate?: boolean
+      keepHistory?: boolean
+      deadlineMs?: number
+      expectedIncarnationId?: string
+    }
   ) => Promise<boolean>
   rememberSyntheticKillExit: (id: string, incarnationId?: string) => void
   rememberRetiredRejectedPty: (id: string) => void
diff --git a/src/main/ipc/pty/runtime/controller.ts b/src/main/ipc/pty/runtime/controller.ts
index 52bb65941796..f80e78897bf9 100644
--- a/src/main/ipc/pty/runtime/controller.ts
+++ b/src/main/ipc/pty/runtime/controller.ts
@@ -1,6 +1,4 @@
-import { getProvider, localProvider } from '../provider/registry'
-import { routedTerminalSwitchOwners } from '../../../providers/terminal-switch-owners'
-import { LOCAL_EXECUTION_HOST_ID } from '../../../../shared/execution-host'
+import { localProvider } from '../provider/registry'
 import {
   getLocalAutomaticWorkStatus,
   resumeLocalAutomaticWork
@@ -76,11 +74,6 @@ export function installPtyRuntimeController(deps: PtyRuntimeControllerDeps): voi
     clearBuffer: (ptyId) => clearBufferFromRuntimeController(deps, ptyId),
     resetInputModes: (ptyId) => resetInputModesFromRuntimeController(deps, ptyId),
     hasPty: (ptyId) => hasPtyFromRuntimeController(deps, ptyId),
-    // Resolved per call: the local route can move between the daemon and its in-process fallback.
-    terminalSwitches: routedTerminalSwitchOwners(
-      () => getProvider(LOCAL_EXECUTION_HOST_ID),
-      () => [getProvider(LOCAL_EXECUTION_HOST_ID)]
-    ),
     listProcesses: (hostId, opts) => listProcessesFromRuntimeController(deps, hostId, opts),
     listProcessesWithHostScope: (opts) =>
       listProcessesWithHostScopeFromRuntimeController(deps, opts),
diff --git a/src/main/ipc/pty/runtime/kill-same-id-respawn.test.ts b/src/main/ipc/pty/runtime/kill-same-id-respawn.test.ts
index 42f92d03329d..499fef71b3fa 100644
--- a/src/main/ipc/pty/runtime/kill-same-id-respawn.test.ts
+++ b/src/main/ipc/pty/runtime/kill-same-id-respawn.test.ts
@@ -76,6 +76,23 @@ describe('a stop whose shutdown lands after a same-id respawn', () => {
     expect(ports.sendPtyExitToRenderer).not.toHaveBeenCalled()
   }
 
+  it('refuses a captured stop after provider startup replaced the same id', async () => {
+    const h = start()
+    const shutdown = vi.fn(async () => false)
+    const ports = {
+      ...h.ports,
+      shutdownProviderAndDetectExit: shutdown,
+      getLocalPtyProviderStartupPromise: () => Promise.resolve().then(respawn)
+    }
+    await expect(
+      stopAndWaitPtyFromRuntimeController(asControllerDeps(ports), PTY_ID, {
+        expectedIncarnationId: 'inc-stopped'
+      })
+    ).resolves.toBe(false)
+    expect(shutdown).not.toHaveBeenCalled()
+    expectRespawnUntouched(h)
+  })
+
   it('leaves the respawn alone after a runtime kill', async () => {
     const h = start()
     killPtyFromRuntimeController(asControllerDeps(h.ports), PTY_ID)
diff --git a/src/main/ipc/pty/runtime/kill.ts b/src/main/ipc/pty/runtime/kill.ts
index cc18dfa7002e..5f33778fa161 100644
--- a/src/main/ipc/pty/runtime/kill.ts
+++ b/src/main/ipc/pty/runtime/kill.ts
@@ -195,7 +195,7 @@ export function retireRejectedPtyFromRuntimeController(
 export async function stopAndWaitPtyFromRuntimeController(
   deps: PtyRuntimeControllerDeps,
   ptyId: string,
-  opts?: { keepHistory?: boolean; deadlineMs?: number }
+  opts?: { keepHistory?: boolean; deadlineMs?: number; expectedIncarnationId?: string }
 ): Promise<boolean> {
   const {
     runtime,
@@ -206,6 +206,9 @@ export async function stopAndWaitPtyFromRuntimeController(
   } = deps
   runtime?.markPtyStopRequested?.(ptyId)
   const connectionId = getPtySshConnectionId(ptyId)
+  if (opts?.expectedIncarnationId && ptyIncarnationById.get(ptyId) !== opts.expectedIncarnationId) {
+    return false
+  }
   if (connectionId && isLegacyRelayBridgedPty(ptyId)) {
     // A reversible stop must not leave the bridge's durable stop behind, so the pane stays live.
     if (opts?.keepHistory) {
@@ -252,6 +255,9 @@ export async function stopAndWaitPtyFromRuntimeController(
       await startupPromise
     }
   }
+  if (opts?.expectedIncarnationId && ptyIncarnationById.get(ptyId) !== opts.expectedIncarnationId) {
+    return false
+  }
   let provider: IPtyProvider
   try {
     provider = getProviderForPty(ptyId)
@@ -271,7 +277,8 @@ export async function stopAndWaitPtyFromRuntimeController(
     providerExitObserved = await shutdownProviderAndDetectExit(provider, ptyId, {
       immediate: true,
       keepHistory: opts?.keepHistory ?? false,
-      deadlineMs
+      deadlineMs,
+      ...(opts?.expectedIncarnationId ? { expectedIncarnationId: opts.expectedIncarnationId } : {})
     })
   } catch (err) {
     if (!isPtyAlreadyGoneError(err)) {
diff --git a/src/main/ipc/pty/runtime/spawn-commit.ts b/src/main/ipc/pty/runtime/spawn-commit.ts
index 12f4cf4cd903..8f0d43f4f1f9 100644
--- a/src/main/ipc/pty/runtime/spawn-commit.ts
+++ b/src/main/ipc/pty/runtime/spawn-commit.ts
@@ -1,3 +1,4 @@
+import { retireChatForAdmittedTerminalLaunch } from '../../../runtime/session-tabs/structured-session-terminal-launch-retirement'
 import { isValidTerminalTabId } from '../../../../shared/terminal-tab-id'
 import { ptySizes } from '../delivery/visibility-state'
 import { commitRuntimePtySize } from './spawn-commit-pty-size'
@@ -244,8 +245,7 @@ async function commitReservedRuntimePtySpawn(ctx: RuntimePtySpawnState) {
     worktreeId: args.worktreeId,
     launchedAt: ctx.codexHomeLaunchStartedAt,
     resumeArgvDropped: ctx.codexResumeArgvDropped,
-    result: ctx.result,
-    switchGeneration: ctx.spawnOptions.switchGeneration
+    result: ctx.result
   })
   // Why: runtime-owned/background spawns bypass mounted-pane state, so inventory consumers need an explicit signal.
   ctx.deps.sendPtySpawnedToRenderer(ctx.result.id)
@@ -288,5 +288,6 @@ async function commitReservedRuntimePtySpawn(ctx: RuntimePtySpawnState) {
       : { snapshotKittyKeyboardFlags: undefined }),
     isReattach: true
   })
+  await retireChatForAdmittedTerminalLaunch(ctx.deps.runtime, args, response)
   return response
 }
diff --git a/src/main/ipc/pty/runtime/spawn-execute.ts b/src/main/ipc/pty/runtime/spawn-execute.ts
index 89d32f016fdc..64133237fc54 100644
--- a/src/main/ipc/pty/runtime/spawn-execute.ts
+++ b/src/main/ipc/pty/runtime/spawn-execute.ts
@@ -45,7 +45,12 @@ export async function executeRuntimePtySpawn(ctx: RuntimePtySpawnState): Promise
   }
   const chooseFresh = async (): Promise<void> => {
     ctx.spawnOptions.env = { ...ctx.spawnOptions.env }
-    ctx.resumeAdmission = await chooseSavedResumeFreshLaunch(ctx, args, ctx.spawnIdentityPaneKey)
+    ctx.resumeAdmission = await chooseSavedResumeFreshLaunch(
+      ctx.deps.runtime,
+      args,
+      ctx.expectedWslDistro,
+      ctx.spawnOptions
+    )
     if (captured && ctx.resumeAdmission) {
       ctx.resumeAdmission.refused = captured.refused
       ctx.resumeAdmission.sourceRecord = captured.sourceRecord
diff --git a/src/main/ipc/pty/runtime/spawn-state.ts b/src/main/ipc/pty/runtime/spawn-state.ts
index 5ca761ba57ab..90c5a3d6a18d 100644
--- a/src/main/ipc/pty/runtime/spawn-state.ts
+++ b/src/main/ipc/pty/runtime/spawn-state.ts
@@ -115,7 +115,7 @@ export type RuntimePtySpawnArgs = {
   envToDelete?: string[]
   resumeProviderSession?: AgentProviderSessionMetadata
   /** `saved`: built from a pane's saved facts, which the host refuses for a chat's conversation. */
-  resumeOrigin?: 'saved' | 'switch'
+  resumeOrigin?: 'saved'
   connectionId?: string | null
   worktreeId?: string
   preAllocatedHandle?: string
diff --git a/src/main/ipc/pty/session.ts b/src/main/ipc/pty/session.ts
index 98a759b898e4..287c72f599c7 100644
--- a/src/main/ipc/pty/session.ts
+++ b/src/main/ipc/pty/session.ts
@@ -147,7 +147,12 @@ export type PtyIpcSession = {
   shutdownProviderAndDetectExit: (
     provider: IPtyProvider,
     id: string,
-    opts: { immediate?: boolean; keepHistory?: boolean; deadlineMs?: number }
+    opts: {
+      immediate?: boolean
+      keepHistory?: boolean
+      deadlineMs?: number
+      expectedIncarnationId?: string
+    }
   ) => Promise<boolean>
   rememberSyntheticKillExit: (id: string, incarnationId?: string) => void
   rememberRetiredRejectedPty: (id: string) => void
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition.ts
index 09ba39159c36..5a2028e82fc3 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition.ts
@@ -1,6 +1,5 @@
 import { isDeepStrictEqual } from 'node:util'
 import { abortSignalReason } from '../../../shared/abort-signal-reason'
-import { isAgentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
 import type {
   AgentSessionProcessIdentity,
   AgentSessionRecord
@@ -49,12 +48,9 @@ export async function acquireOwner(
     try {
       await input.assertNoTerminalWriter?.(record)
     } catch (error) {
-      const moving =
-        isAgentSessionRefusalError(error) &&
-        error.refusal.details?.reason === 'conversationMovingToTerminal'
       // Not a code: a code message would travel as the census's own conflict, not this reason.
       throw new AgentSessionPreSpawnError(error, {
-        reason: moving ? 'conversationMovingToTerminal' : 'conversationOpenInTerminal',
+        reason: 'conversationOpenInTerminal',
         message: 'a terminal may still be writing this conversation'
       })
     }
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 d970f207c7ba..7fd0a9513a2f 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
@@ -135,7 +135,6 @@ export type AgentSessionPreSpawnReason = Extract<
   | 'agentCommandNotRunnable'
   | 'runtimeNotInstalled'
   | 'conversationOpenInTerminal'
-  | 'conversationMovingToTerminal'
 >
 
 /** Acquisition failed with first-hand proof that no provider process existed. */
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-conversation-lifetime.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-conversation-lifetime.ts
index 906e29f89042..d272f5422c89 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-conversation-lifetime.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-conversation-lifetime.ts
@@ -331,12 +331,11 @@ export function createStructuredAgentSessionConversationLifetime(host: {
         await holdStopClose(sessionId, () => stopAgent(sessionId, { cause }))
       })
     },
-    /** Close's body behind an idle-only admission with no effect of its own; `admit` registers the
-     *  switch before the stop, in the same step. */
-    switchToTerminal: <T>(id: string, admit: () => T): Promise<T> =>
+    /** Idle admission and proven-exit stop share the session queue. */
+    switchToTerminal: (id: string): Promise<void> =>
       serialize(id, () =>
         switchAdmission.stopIdleStructuredAgentSessionForSwitch(
-          { session: sessions.get(id), delivering: host.deliveryActive(id), idleSweep, admit },
+          { session: sessions.get(id), delivering: host.deliveryActive(id), idleSweep },
           () => holdStopClose(id, () => stopAgent(id, { cause: 'user-close' })),
           () => deps().store.getRecord(id)
         )
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-failure-text.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-failure-text.ts
index c77dbe72321f..5f6a22005656 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-failure-text.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-failure-text.ts
@@ -41,8 +41,7 @@ const TYPED_START_REFUSALS = [
   'agentCommandNotRunnable',
   'runtimeNotInstalled',
   'conversationOpenInTerminal',
-  'conversationOpenElsewhere',
-  'conversationMovingToTerminal'
+  'conversationOpenElsewhere'
 ] as const satisfies readonly (AgentSessionFailureKind &
   AgentSessionRefusalReason<'agent_session_operation_invalid'>)[]
 
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
index a9fd067f10d4..2cd5f9cacdeb 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
@@ -212,7 +212,7 @@ export class StructuredAgentSessionHost {
    *  `user-close` makes a turn it cuts short the user's cancellation; an `evict` leaves it news. */
   close: StructuredAgentSessionConversationLifetime['close'] = (sessionId, cause) =>
     this.lifetime.close(sessionId, cause)
-  switchToTerminal = <T>(id: string, admit: () => T) => this.lifetime.switchToTerminal(id, admit)
+  switchToTerminal = (id: string) => this.lifetime.switchToTerminal(id)
 
   /** One bounded host-owned snapshot; a tab need not be visible for its child to be stopped. */
   sleepWorkspace = (workspaceId: string): Promise<{ stoppedSessionIds: string[] }> =>
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-admission.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-admission.ts
index 2e1d44763137..46d075a0f749 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-admission.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-admission.ts
@@ -10,18 +10,17 @@ import type { StructuredAgentSessionHostSession } from './structured-agent-sessi
 
 /** In the chat's ordered step: refuses unless nothing is running, starting, queued or owed, then
  *  admits, stops through close's body, and proves the agent gone before anything starts elsewhere. */
-export async function stopIdleStructuredAgentSessionForSwitch<T>(
+export async function stopIdleStructuredAgentSessionForSwitch(
   idle: {
     session: StructuredAgentSessionHostSession | undefined
     delivering: boolean
     idleSweep: {
       owesWork: (sessionId: string, session: StructuredAgentSessionHostSession) => boolean
     }
-    admit: () => T
   },
   stop: () => Promise<unknown>,
   record: () => AgentSessionRecord | null
-): Promise<T> {
+): Promise<void> {
   const { session } = idle
   if (
     idle.delivering ||
@@ -33,11 +32,9 @@ export async function stopIdleStructuredAgentSessionForSwitch<T>(
   ) {
     throw agentSessionRefusalError('agent_session_operation_invalid', { reason: 'turnActive' })
   }
-  const admitted = idle.admit()
   await stop()
   const lease = record()?.lease
   if (!lease || agentSessionLeaseOwnerVerdict(lease) !== 'exited') {
     throw agentSessionRefusalError('agent_session_ownership_unknown', { reason: 'ownerUnproven' })
   }
-  return admitted
 }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts
index 7c7b9654cdae..e8414016524e 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts
@@ -1,3 +1,5 @@
+import { retireChatForAdmittedTerminalLaunch } from '../../runtime/session-tabs/structured-session-terminal-launch-retirement'
+import { setStructuredAgentSessionHost } from './structured-agent-session-registry'
 import { mkdtemp, rm } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
@@ -88,6 +90,7 @@ beforeEach(async () => {
 })
 
 afterEach(async () => {
+  setStructuredAgentSessionHost(null)
   await host.flushAllStreamedEvents()
   await rm(root, { recursive: true, force: true })
 })
@@ -145,7 +148,7 @@ it('refuses the chat agent start while a terminal writes its conversation, once
   })
 })
 
-// The switch to a terminal: admitted only when idle, registers before it stops, proves the stop.
+// The switch is idle-only and proves the stop; subsequent sends use ordinary G-acquire.
 it('switches an idle chat to its terminal and a racing send starts no second writer', async () => {
   const order: string[] = []
   const closeSession = vi.mocked(host.deps.adapter.closeSession)
@@ -153,11 +156,9 @@ it('switches an idle chat to its terminal and a racing send starts no second wri
     order.push('stop')
     return true
   })
-  await host.switchToTerminal(SESSION, () => {
-    order.push('claim')
-    terminalWriting = true
-  })
-  expect(order).toEqual(['claim', 'stop'])
+  await host.switchToTerminal(SESSION)
+  expect(order).toEqual(['stop'])
+  terminalWriting = true
   expect(agentSessionLeaseOwnerVerdict(store.getRecord(SESSION)!.lease)).toBe('exited')
   const spawnsBefore = acquire.mock.calls.length
   const raced = await rejection(await send('from another window'))
@@ -179,11 +180,9 @@ it('refuses a switch while the chat is starting, without aborting that start', a
   })
   await send('starts the agent')
   await vi.waitFor(() => expect(signal).toBeDefined())
-  const admit = vi.fn()
-  await expect(host.switchToTerminal(SESSION, admit)).rejects.toMatchObject({
+  await expect(host.switchToTerminal(SESSION)).rejects.toMatchObject({
     refusal: { details: { reason: 'turnActive' } }
   })
-  expect(admit).not.toHaveBeenCalled()
   expect(signal?.aborted).toBe(false)
   release()
 })
@@ -215,3 +214,36 @@ it('starts the chat that holds the conversation for a switch from its terminal',
   expect(host.collaboratorsForTests().sessions.get(SESSION)?.child?.phase).toBe('ready')
   expect(vi.mocked(host.deps.adapter.dispatch)).not.toHaveBeenCalled()
 })
+
+// A delayed admitted launch retires presentation only, even if a later send already restarted the chat.
+it('retires only after an explicit admitted launch without stopping a later native child', async () => {
+  setStructuredAgentSessionHost(host)
+  await host.setSessionTabVisibility(SESSION, true)
+  await host.switchToTerminal(SESSION)
+  const runtime = { retireStructuredAgentSessionTabFromSnapshot: vi.fn(() => true) }
+  const args = {
+    resumeOrigin: 'switch',
+    worktreeId: store.getRecord(SESSION)?.location.workspaceId
+  }
+  const decision = {
+    agent: 'codex' as const,
+    providerSession: { key: 'session_id' as const, id: THREAD },
+    verdict: 'admitted' as const
+  }
+  for (const result of [
+    {},
+    { savedResumeDecision: { ...decision, verdict: 'unverifiable' as const } },
+    { savedResumeDecision: decision, isReattach: true }
+  ]) {
+    await retireChatForAdmittedTerminalLaunch(runtime, args, result)
+    expect(store.getVisibleSessionTabIndex()?.sessionIds).toContain(SESSION)
+  }
+  expect(await host.switchToChat(SESSION)).toEqual({ ok: true })
+  const laterChild = host.collaboratorsForTests().sessions.get(SESSION)?.child
+  const closes = vi.mocked(host.deps.adapter.closeSession).mock.calls.length
+  await retireChatForAdmittedTerminalLaunch(runtime, args, { savedResumeDecision: decision })
+  expect(store.getVisibleSessionTabIndex()?.sessionIds).not.toContain(SESSION)
+  expect(runtime.retireStructuredAgentSessionTabFromSnapshot).toHaveBeenCalledWith(SESSION)
+  expect(host.collaboratorsForTests().sessions.get(SESSION)?.child).toBe(laterChild)
+  expect(host.deps.adapter.closeSession).toHaveBeenCalledTimes(closes)
+})
diff --git a/src/main/providers/local-pty-provider-shutdown.test.ts b/src/main/providers/local-pty-provider-shutdown.test.ts
index a3b4021411b0..24a86a9997a9 100644
--- a/src/main/providers/local-pty-provider-shutdown.test.ts
+++ b/src/main/providers/local-pty-provider-shutdown.test.ts
@@ -163,6 +163,17 @@ describe('LocalPtyProvider', () => {
   })
 
   describe('shutdown', () => {
+    it('fences the actual local shutdown before cancelling or signalling a replacement', async () => {
+      const kill = mockProc.kill
+      const { id, incarnationId } = await provider.spawn({ cols: 80, rows: 24 })
+      await expect(
+        provider.shutdown(id, { immediate: true, expectedIncarnationId: 'earlier' })
+      ).rejects.toThrow('terminal_handle_stale')
+      expect(kill).not.toHaveBeenCalled()
+      await provider.shutdown(id, { immediate: true, expectedIncarnationId: incarnationId })
+      expect(kill).toHaveBeenCalled()
+    })
+
     it('kills the PTY process', async () => {
       // Why: capture the spy reference before shutdown triggers onExit →
       // POSIX kill neutralization. After neutralization, mockProc.kill is
diff --git a/src/main/providers/local-pty-provider-spawn-session.test.ts b/src/main/providers/local-pty-provider-spawn-session.test.ts
index 6795733230ea..a6eb775f461f 100644
--- a/src/main/providers/local-pty-provider-spawn-session.test.ts
+++ b/src/main/providers/local-pty-provider-spawn-session.test.ts
@@ -610,28 +610,5 @@ describe('LocalPtyProvider', () => {
       expect(spawnMock).toHaveBeenCalledOnce()
       expect(committed).toHaveBeenCalledOnce()
     })
-
-    it('stops the process of a switch start whose commit callback fails, and ends on its exit', async () => {
-      spawnMock.mockClear()
-      const { kill } = mockProc
-      const switchOwner = (await provider.terminalSwitches.owner()) ?? ''
-      const seen = async () => (await provider.terminalSwitches.observe('g-local', true))[0]
-      const start = () =>
-        provider.spawn({
-          cols: 80,
-          rows: 24,
-          switchGeneration: 'g-local',
-          switchOwner,
-          onPtySpawnCommitted: () => {
-            throw new Error('commit callback failed')
-          }
-        })
-      await expect(start()).rejects.toThrow('commit callback failed')
-      // The failure stops that exact process, and its own exit (not the throw) ends the switch.
-      expect(kill).toHaveBeenCalledWith('SIGKILL')
-      expect((await seen())?.observation).toEqual({ state: 'ended' })
-      await expect(start()).rejects.toThrow('terminal_switch_generation_refused')
-      expect(spawnMock).toHaveBeenCalledOnce()
-    })
   })
 })
diff --git a/src/main/providers/local-pty-provider.ts b/src/main/providers/local-pty-provider.ts
index 6241d0aff92f..5e7cccd8140e 100644
--- a/src/main/providers/local-pty-provider.ts
+++ b/src/main/providers/local-pty-provider.ts
@@ -53,7 +53,6 @@ import {
 } from './local-pty-session-operations'
 import { spawnLocalPty } from './local-pty-spawn'
 import { cancelAllPendingLocalPtySpawns } from './local-pty-spawn-state'
-import { localTerminalSwitchOwner, observeLocalTerminalSwitch } from './local-pty-terminal-switch'
 import { killAllLocalPtys, killOrphanedLocalPtys, shutdownLocalPty } from './local-pty-termination'
 
 export type { LocalPtyProviderOptions } from './local-pty-provider-types'
@@ -83,10 +82,6 @@ export class LocalPtyProvider implements IPtyProvider {
   spawn(args: PtySpawnOptions): Promise<PtySpawnResult> {
     return spawnLocalPty(args, () => this.opts)
   }
-  readonly terminalSwitches = {
-    owner: async () => localTerminalSwitchOwner(),
-    observe: observeLocalTerminalSwitch
-  }
 
   // Local PTYs are always attached -- no-op. Remote providers use this to resubscribe.
   async attach(_id: string): Promise<void> {}
@@ -117,7 +112,10 @@ export class LocalPtyProvider implements IPtyProvider {
     return getLocalPtyAppliedSize(id)
   }
 
-  shutdown(id: string, opts: { immediate?: boolean; keepHistory?: boolean }): Promise<void> {
+  shutdown(
+    id: string,
+    opts: { immediate?: boolean; keepHistory?: boolean; expectedIncarnationId?: string }
+  ): Promise<void> {
     return shutdownLocalPty(id, opts)
   }
 
diff --git a/src/main/providers/local-pty-session-activation.ts b/src/main/providers/local-pty-session-activation.ts
index cdea1a8f881b..e7782b34bb8d 100644
--- a/src/main/providers/local-pty-session-activation.ts
+++ b/src/main/providers/local-pty-session-activation.ts
@@ -1,5 +1,4 @@
 import type * as pty from 'node-pty'
-import { settleLocalTerminalSwitchStartup } from './local-pty-terminal-switch'
 import { isBracketedPasteSafeShell } from '../../shared/startup-command-submission'
 import {
   discardStagedStartupCommand,
@@ -207,12 +206,9 @@ export function activateLocalPtySession(args: {
         readiness.setStartupCommandCleanup(cleanup)
       },
       {
-        bracketedPasteSafe,
-        onSettled: () => settleLocalTerminalSwitchStartup(id)
+        bracketedPasteSafe
       }
     )
-  } else {
-    settleLocalTerminalSwitchStartup(id)
   }
 
   // Why: publish the OS pid for the memory collector; proc.pid can be briefly 0/undefined before node-pty sees the child.
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 71b3b38c34cd..5fefb5db5fac 100644
--- a/src/main/providers/local-pty-shell-ready-startup-command.ts
+++ b/src/main/providers/local-pty-shell-ready-startup-command.ts
@@ -18,16 +18,13 @@ export function writeStartupCommandWhenShellReady(
   startupCommand: string,
   onExit: (cleanup: () => void) => void,
   // Why: only shells with bracketed-paste active (see isBracketedPasteSafeShell) accept the wrapper; others use the raw path so ESC[200~ isn't echoed.
-  options: { bracketedPasteSafe?: boolean; onSettled?: () => void } = {}
+  options: { bracketedPasteSafe?: boolean } = {}
 ): void {
   let sent = false
   let postReadyTimer: ReturnType<typeof setTimeout> | null = null
   let postReadyDataDisposable: { dispose: () => void } | null = null
 
   const cleanup = (): void => {
-    if (!sent) {
-      options.onSettled?.()
-    }
     sent = true
     if (postReadyTimer !== null) {
       clearTimeout(postReadyTimer)
@@ -55,7 +52,6 @@ export function writeStartupCommandWhenShellReady(
         bracketedPasteSafe: options.bracketedPasteSafe === true
       })
     )
-    options.onSettled?.()
   }
 
   const schedulePostReadyFlush = (): void => {
diff --git a/src/main/providers/local-pty-spawn.ts b/src/main/providers/local-pty-spawn.ts
index 7e2e903a60d9..50e01861b8a2 100644
--- a/src/main/providers/local-pty-spawn.ts
+++ b/src/main/providers/local-pty-spawn.ts
@@ -1,9 +1,4 @@
 import { randomUUID } from 'node:crypto'
-import {
-  beginLocalTerminalSwitch,
-  commitLocalTerminalSwitch,
-  endUnstartedLocalTerminalSwitch
-} from './local-pty-terminal-switch'
 import { win32 as pathWin32 } from 'node:path'
 import { mkdir } from 'node:fs/promises'
 import { JCODE_RUNTIME_DIR_ENV_KEY } from '../../shared/jcode-runtime-dir'
@@ -61,9 +56,7 @@ export async function spawnLocalPty(
     }
   }
   const id = allocatePtyId(reattachId ?? undefined)
-  beginLocalTerminalSwitch(args.switchGeneration, args.switchOwner)
-  let committed = false
-  const spawned = runCancelableLocalPtySpawn(id, async (throwIfCanceled, cancellation) => {
+  return runCancelableLocalPtySpawn(id, async (throwIfCanceled, cancellation) => {
     const incarnationId = randomUUID()
     let plan = createLocalPtyLaunchPlan(args, getOptions)
     if (plan instanceof DeferredLocalPtyLaunchPlan) {
@@ -133,13 +126,6 @@ export async function spawnLocalPty(
         windowsFallbackAttempts: plan.windowsFallbackAttempts
       })
       const spawnResult = pendingSpawn instanceof Promise ? await pendingSpawn : pendingSpawn
-      // The process exists: from here only its own exit ends the switch, whatever throws next.
-      committed = true
-      commitLocalTerminalSwitch(args.switchGeneration, {
-        id,
-        incarnationId,
-        proc: spawnResult.process
-      })
       try {
         checkCanceled()
       } catch (error) {
@@ -150,19 +136,7 @@ export async function spawnLocalPty(
         }
         throw error
       }
-      try {
-        args.onPtySpawnCommitted?.()
-      } catch (error) {
-        // A switch keeps its claim until this exact process exits; stop it so that exit comes.
-        if (args.switchGeneration !== undefined) {
-          try {
-            spawnResult.process.kill('SIGKILL')
-          } finally {
-            destroyPtyProcess(spawnResult.process)
-          }
-        }
-        throw error
-      }
+      args.onPtySpawnCommitted?.()
       plan.shellPath = spawnResult.shellPath
       // Why: a Windows fallback embeds its startup command in argv; honor the winning shell's delivery flag to avoid a double write.
       if (spawnResult.startupCommandDeliveredInShellArgs !== undefined) {
@@ -198,10 +172,4 @@ export async function spawnLocalPty(
       })
     })
   })
-  // A spawn that never committed a process (thrown, canceled, or joined a winner) started nothing.
-  return spawned.finally(() => {
-    if (!committed) {
-      endUnstartedLocalTerminalSwitch(args.switchGeneration)
-    }
-  })
 }
diff --git a/src/main/providers/local-pty-terminal-switch.ts b/src/main/providers/local-pty-terminal-switch.ts
deleted file mode 100644
index 2981f8ad66bd..000000000000
--- a/src/main/providers/local-pty-terminal-switch.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-// The in-process owner of a chat → terminal switch start. A generation is bound before any physical
-// work and to the process the moment it exists, so a publication that throws later cannot hide it.
-import { randomUUID } from 'node:crypto'
-import type { IPty } from 'node-pty'
-import type { TerminalSwitchOwnerAnswer } from '../../shared/terminal-switch'
-
-const OWNER = `local:${randomUUID()}`
-
-type LocalSwitch =
-  | { state: 'pending' | 'ended' }
-  | {
-      state: 'bound'
-      id: string
-      incarnationId: string
-      pid: number
-      exited: boolean
-      startupSettled: boolean
-    }
-
-const switches = new Map<string, LocalSwitch>()
-
-export function localTerminalSwitchOwner(): string {
-  return OWNER
-}
-
-/** Before any physical work: a foreign owner or an already used or fenced generation refuses. */
-export function beginLocalTerminalSwitch(generation: string | undefined, owner?: string): void {
-  if (generation === undefined) {
-    return
-  }
-  if (owner !== OWNER || switches.has(generation)) {
-    throw new Error('terminal_switch_generation_refused')
-  }
-  switches.set(generation, { state: 'pending' })
-}
-
-/** The process exists: from here only its own exit ends the switch. */
-export function commitLocalTerminalSwitch(
-  generation: string | undefined,
-  execution: { id: string; incarnationId: string; proc: IPty }
-): void {
-  if (generation === undefined) {
-    return
-  }
-  const bound: LocalSwitch = {
-    state: 'bound',
-    id: execution.id,
-    incarnationId: execution.incarnationId,
-    pid: execution.proc.pid,
-    exited: false,
-    startupSettled: false
-  }
-  switches.set(generation, bound)
-  execution.proc.onExit(() => {
-    bound.exited = true
-  })
-}
-
-/** A start that threw before its process existed started nothing. */
-export function endUnstartedLocalTerminalSwitch(generation: string | undefined): void {
-  if (generation !== undefined && switches.get(generation)?.state === 'pending') {
-    switches.set(generation, { state: 'ended' })
-  }
-}
-
-/** The startup command was written, revoked, or never owed: nothing can still deliver it. */
-export function settleLocalTerminalSwitchStartup(id: string): void {
-  for (const entry of switches.values()) {
-    if (entry.state === 'bound' && entry.id === id) {
-      entry.startupSettled = true
-    }
-  }
-}
-
-/** An unseen generation is fenced, so a late start carrying it refuses and absence means no start. */
-export async function observeLocalTerminalSwitch(
-  generation: string,
-  fence: boolean
-): Promise<TerminalSwitchOwnerAnswer[]> {
-  const entry: LocalSwitch = switches.get(generation) ?? { state: fence ? 'ended' : 'pending' }
-  if (fence) {
-    switches.set(generation, entry)
-  }
-  const observation =
-    entry.state !== 'bound'
-      ? { state: entry.state }
-      : entry.exited
-        ? { state: 'ended' as const }
-        : {
-            state: 'bound' as const,
-            ptyId: entry.id,
-            incarnationId: entry.incarnationId,
-            shellPid: entry.pid > 0 ? entry.pid : null,
-            startupSettled: entry.startupSettled
-          }
-  return [{ owner: OWNER, observation }]
-}
-
-export function resetLocalTerminalSwitchesForTest(): void {
-  switches.clear()
-}
diff --git a/src/main/providers/local-pty-termination.ts b/src/main/providers/local-pty-termination.ts
index 426a7aad346e..af8c046514ed 100644
--- a/src/main/providers/local-pty-termination.ts
+++ b/src/main/providers/local-pty-termination.ts
@@ -11,6 +11,7 @@ import {
   ptyAgentSessionIds,
   ptyForceKillTimers,
   ptyPhysicalExits,
+  ptyIncarnations,
   ptyProcesses,
   ptyShutdownOperations,
   ptyTerminationMode,
@@ -189,8 +190,11 @@ async function shutdownTrackedPty(
 
 export async function shutdownLocalPty(
   id: string,
-  opts: { immediate?: boolean; keepHistory?: boolean }
+  opts: { immediate?: boolean; keepHistory?: boolean; expectedIncarnationId?: string }
 ): Promise<void> {
+  if (opts.expectedIncarnationId && ptyIncarnations.get(id) !== opts.expectedIncarnationId) {
+    throw new Error('terminal_handle_stale')
+  }
   cancelPendingLocalPtySpawns(id)
   const pending = ptyShutdownOperations.get(id)
   if (pending) {
diff --git a/src/main/providers/pty-provider-contract.ts b/src/main/providers/pty-provider-contract.ts
index 53522f753b4c..cd68eb5df862 100644
--- a/src/main/providers/pty-provider-contract.ts
+++ b/src/main/providers/pty-provider-contract.ts
@@ -1,5 +1,4 @@
 import type { SpawnIntent } from '../../shared/host-spawn-admission'
-import type { TerminalSwitchOwners } from '../../shared/terminal-switch'
 import type { TuiAgent } from '../../shared/tui-agent'
 import type { AgentWorkspaceTrustSpawnRequest } from '../../shared/agent-workspace-trust-spawn-request'
 import type { PtyStartupIngressIntent } from '../../shared/pty-startup-ingress'
@@ -119,10 +118,6 @@ export type PtySpawnOptions = {
   onPtySpawnCommitted?: () => void
   /** Cancels only before physical dispatch; operation identity fences later ambiguity. */
   signal?: AbortSignal
-  /** A chat → terminal switch's start: the owner binds this generation to this one fresh spawn and
-   *  refuses it when `switchOwner` names another owner or the generation was already used. */
-  switchGeneration?: string
-  switchOwner?: string
 }
 
 export type { PtyProcessInfo, PtySpawnResult }
@@ -142,8 +137,6 @@ export type IPtyProvider = {
   /** Re-probes a degraded durable host before main commits to fallback spawn semantics. */
   recoverFreshSpawnRouting?: () => Promise<boolean>
   spawn(opts: PtySpawnOptions): Promise<PtySpawnResult>
-  /** Present only where an owner can hold and observe a chat → terminal switch start. */
-  terminalSwitches?: TerminalSwitchOwners
   /** Process-owner cleanup for history stored outside the workspace tree. */
   deleteWorktreeHistory?: (worktreeId: string) => Promise<void>
   /** Whether this spawn target can append the Git guard after its final env merge. */
diff --git a/src/main/providers/terminal-switch-owners.ts b/src/main/providers/terminal-switch-owners.ts
deleted file mode 100644
index ca600b02e2ea..000000000000
--- a/src/main/providers/terminal-switch-owners.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import type { TerminalSwitchOwners } from '../../shared/terminal-switch'
-
-type Reach = { terminalSwitches?: TerminalSwitchOwners }
-
-/** A routing provider's owners: fresh starts go to one; any of them may hold an older start. */
-export function routedTerminalSwitchOwners(
-  fresh: () => Reach,
-  all: () => readonly Reach[]
-): TerminalSwitchOwners {
-  return {
-    owner: async () => (await fresh().terminalSwitches?.owner()) ?? null,
-    // One owner that cannot answer fails the whole read: it may be the one that holds the start.
-    observe: async (generation, fence) =>
-      (
-        await Promise.all(
-          all().map((owner) => owner.terminalSwitches?.observe(generation, fence) ?? [])
-        )
-      ).flat()
-  }
-}
diff --git a/src/main/runtime/agent-session-record-terminal-switch.ts b/src/main/runtime/agent-session-record-terminal-switch.ts
deleted file mode 100644
index 77c53f801bd5..000000000000
--- a/src/main/runtime/agent-session-record-terminal-switch.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import type { AgentSessionRecord } from '../../shared/agent-session-record'
-import type { TerminalSwitchWrite } from '../../shared/terminal-switch'
-
-/** Unfenced like the name: the descriptor is the switch owner's obligation, not the writer lease.
- *  Compare-and-set on generation, so a stale collector never resurrects or replaces another. */
-export function setAgentSessionRecordTerminalSwitch(
-  record: AgentSessionRecord,
-  write: TerminalSwitchWrite,
-  now: number
-): AgentSessionRecord {
-  const current = record.terminalSwitch?.generation
-  if ('clear' in write) {
-    if (current !== write.clear) {
-      return record
-    }
-    const next = { ...record, updatedAt: now }
-    delete next.terminalSwitch
-    return next
-  }
-  const descriptor = 'accept' in write ? write.accept : write.update
-  const applies = current === descriptor.generation || ('accept' in write && current === undefined)
-  return applies ? { ...record, terminalSwitch: descriptor, updatedAt: now } : record
-}
diff --git a/src/main/runtime/orca-runtime-terminal-close-continuity.test.ts b/src/main/runtime/orca-runtime-terminal-close-continuity.test.ts
index e3bd90aef740..35c2388b5d5f 100644
--- a/src/main/runtime/orca-runtime-terminal-close-continuity.test.ts
+++ b/src/main/runtime/orca-runtime-terminal-close-continuity.test.ts
@@ -284,6 +284,29 @@ describe('terminal close and handle incarnation continuity', () => {
     expect(canary.ptyId).toBe(survivor.ptyId)
   })
 
+  it('forwards the captured incarnation to the stop and never falls back after a refused stop', async () => {
+    const harness = createHarness({ registerPtyBacked: true })
+    const terminal = (await harness.runtime.listTerminals()).terminals.find(
+      (row) => row.ptyId === PTY_ID
+    )!
+    harness.setVerifiedStopResult(false)
+    await expect(harness.runtime.closeTerminal(terminal.handle, INCARNATION_ID)).rejects.toThrow(
+      'terminal_close_unverifiable'
+    )
+    expect(harness.stopAndWait).toHaveBeenCalledWith(
+      PTY_ID,
+      expect.objectContaining({ expectedIncarnationId: INCARNATION_ID })
+    )
+    expect(harness.kill).not.toHaveBeenCalled()
+    expect(harness.closeTerminalTab).not.toHaveBeenCalled()
+    expect(harness.closeTerminalPane).not.toHaveBeenCalled()
+    harness.setVerifiedStopResult(true)
+    harness.acknowledged.resolve()
+    await expect(
+      harness.runtime.closeTerminal(terminal.handle, INCARNATION_ID)
+    ).resolves.toMatchObject({ ptyKilled: true })
+  })
+
   it('closes nothing when its handle now runs a later incarnation than the caller expected', async () => {
     const harness = createHarness()
     const [{ handle }] = (await harness.runtime.listTerminals(`id:${WORKTREE_ID}`)).terminals
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-to-terminal.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-to-terminal.ts
index 5c6680d970c2..d734436c472f 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-to-terminal.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-to-terminal.ts
@@ -1,17 +1,10 @@
-// `agentSession.switchToTerminal` — the chat's half of moving its conversation into a terminal on
-// the same id. Before any stop it checks the route can hold the start and prepares the recipe; then,
-// in the chat's ordered step, it refuses unless idle, registers one switch generation and stops the
-// agent with proven exit. Only that generation's terminal owner can later end the switch.
-// Gated per agent by `agent-session.structured.switch.v1:<agent>`; a client never falls back to close.
-
-import { agentSessionRefusalError } from '../../../../shared/agent-session-wire-refusals'
+// Prepare the ordinary same-id resume recipe before the ordered idle-only, proven-exit stop.
 import { inPlaceSwitchEnabled } from '../../../../shared/structured-agent-cli-conversation-adoption'
 import type { AiVaultChatForkSource } from '../../../../shared/ai-vault-resume-preparation'
 import {
   prepareStructuredChatCliTranscript,
   resolveStructuredChatCliSource
 } from '../../../ai-vault/structured-chat-cli-fork'
-import type { SwitchClaim } from '../../session-tabs/structured-session-switch-claims'
 import { defineMethod } from '../core'
 import {
   ensureStructuredHostInstalled,
@@ -25,10 +18,7 @@ export const STRUCTURED_AGENT_SESSION_SWITCH_TO_TERMINAL_METHODS = [
     name: 'agentSession.switchToTerminal',
     permission: 'workspace',
     params: OptionsParams,
-    handler: async (
-      params,
-      ctx
-    ): Promise<{ source: AiVaultChatForkSource; generation: string }> => {
+    handler: async (params, ctx): Promise<{ source: AiVaultChatForkSource }> => {
       requireStructuredCapability(ctx)
       await ensureStructuredHostInstalled(ctx)
       const host = requireStructuredSessionHost(ctx, params.sessionId)
@@ -41,12 +31,6 @@ export const STRUCTURED_AGENT_SESSION_SWITCH_TO_TERMINAL_METHODS = [
         { sessionId: record.sessionId, workspaceId: record.location.workspaceId },
         false
       )
-      const owner = await ctx.runtime.terminalSwitchOwner()
-      if (!owner) {
-        throw agentSessionRefusalError('structured_agent_session_unsupported', {
-          reason: 'hostUnsupported'
-        })
-      }
       const prepared = await prepareStructuredChatCliTranscript(
         source,
         (args) => ctx.runtime.prepareAiVaultSessionResume(args),
@@ -55,29 +39,8 @@ export const STRUCTURED_AGENT_SESSION_SWITCH_TO_TERMINAL_METHODS = [
       if (!prepared.cliForkSource) {
         throw new Error('This chat has no saved conversation available on this host.')
       }
-      // A switch whose owner proved its start over no longer holds the conversation.
-      await ctx.runtime.releaseEndedSwitchStarts(source.agent, source.providerSessionId)
-      let claim: SwitchClaim | undefined
-      try {
-        await host.switchToTerminal(params.sessionId, () => {
-          claim = ctx.runtime.registerSwitchClaim(
-            source.agent,
-            source.providerSessionId,
-            record.sessionId,
-            owner
-          )
-        })
-        if (!claim) {
-          throw new Error('This chat could not switch to a terminal.')
-        }
-        return { source: prepared.cliForkSource, generation: claim.generation }
-      } catch (error) {
-        // No recipe left this host, so nothing can start under the claim.
-        if (claim) {
-          ctx.runtime.dropSwitchClaim(claim)
-        }
-        throw error
-      }
+      await host.switchToTerminal(params.sessionId)
+      return { source: prepared.cliForkSource }
     }
   })
 ]
diff --git a/src/main/runtime/runtime-mobile-session-projection.ts b/src/main/runtime/runtime-mobile-session-projection.ts
index ece53a621ef6..f31994b57b29 100644
--- a/src/main/runtime/runtime-mobile-session-projection.ts
+++ b/src/main/runtime/runtime-mobile-session-projection.ts
@@ -35,21 +35,18 @@ export function projectRuntimeMobileSessionTabs(
   // and embedders that have not adopted the narrow getter.
   let hookRowsByPaneKey: Map<string, AgentStatusIpcPayload[]> | null = null
   const hookRowsForPane = new Map<string, AgentStatusIpcPayload[]>()
-  // A switch's launch identity names one exact execution; a replacement there never wears it.
-  const current = ({ launchExecution: stamp }: AgentStatusIpcPayload) =>
-    !stamp || host.ptysById.get(stamp.ptyId)?.incarnationId === stamp.incarnationId
   const getHookRowsForPane = (paneKey: string): AgentStatusIpcPayload[] => {
     const cached = hookRowsForPane.get(paneKey)
     if (cached) {
       return cached
     }
-    const rows = (
-      host.getProviderSessionRows(paneKey) ??
-      (hookRowsByPaneKey ??= indexAgentStatusRowsByPaneKey(host.getProviderSessionSnapshot())).get(
-        paneKey
-      ) ??
-      []
-    ).filter(current)
+    const direct = host.getProviderSessionRows(paneKey)
+    if (direct) {
+      hookRowsForPane.set(paneKey, direct)
+      return direct
+    }
+    hookRowsByPaneKey ??= indexAgentStatusRowsByPaneKey(host.getProviderSessionSnapshot())
+    const rows = hookRowsByPaneKey.get(paneKey) ?? []
     hookRowsForPane.set(paneKey, rows)
     return rows
   }
diff --git a/src/main/runtime/runtime-pty-controller-contract.ts b/src/main/runtime/runtime-pty-controller-contract.ts
index 0f047c9b68dd..dca2af369c51 100644
--- a/src/main/runtime/runtime-pty-controller-contract.ts
+++ b/src/main/runtime/runtime-pty-controller-contract.ts
@@ -1,5 +1,4 @@
 import type { AgentLaunchRuntime } from '../../shared/agent-launch-runtime'
-import type { TerminalSwitchOwners } from '../../shared/terminal-switch'
 import type {
   AutomaticWorkResumeOutcome,
   AutomaticWorkStatus,
@@ -134,7 +133,7 @@ export type RuntimePtyController = {
   retireRejectedPty?(ptyId: string, stopConfirmed: boolean, incarnationId: string | undefined): void
   stopAndWait?(
     ptyId: string,
-    opts?: { keepHistory?: boolean; deadlineMs?: number }
+    opts?: { keepHistory?: boolean; deadlineMs?: number; expectedIncarnationId?: string }
   ): Promise<boolean>
   getCwd?(ptyId: string): Promise<string | null>
   getForegroundProcess(ptyId: string): Promise<string | null>
@@ -150,8 +149,6 @@ export type RuntimePtyController = {
   resize?(ptyId: string, cols: number, rows: number): boolean
   // Why: exact-id mobile polls should not enumerate every local and SSH PTY.
   hasPty?(ptyId: string): boolean | null
-  /** This machine's terminal owners, for a chat → terminal switch start. */
-  terminalSwitches?: TerminalSwitchOwners
   /** Omitting the host lists every registered host. */
   listProcesses?(
     hostId?: ExecutionHostId,
diff --git a/src/main/runtime/session-tabs/explicit-terminal-close-outcome.ts b/src/main/runtime/session-tabs/explicit-terminal-close-outcome.ts
new file mode 100644
index 000000000000..38447ccf2ca8
--- /dev/null
+++ b/src/main/runtime/session-tabs/explicit-terminal-close-outcome.ts
@@ -0,0 +1,86 @@
+import { OrcaRuntimeWithFocusTerminal } from '../terminal/focus/focus-terminal'
+import { EXPLICIT_TERMINAL_CLOSE_STOP_TIMEOUT_MS } from '../orca-runtime-core'
+import { SSH_PROVIDER_UNREGISTERED_REASON } from '../../../shared/pty-liveness-verdict'
+import type { RuntimeTerminalClose } from '../../../shared/runtime-types'
+import { errorMessage } from '../../../shared/error-message'
+
+/** How an explicit close's stop of its addressed PTY ended. */
+type ExplicitCloseStop = { stopped: boolean }
+
+const NO_STOP: ExplicitCloseStop = { stopped: false }
+
+export abstract class OrcaRuntimeWithExplicitTerminalCloseOutcome extends OrcaRuntimeWithFocusTerminal {
+  protected async stopExplicitlyClosedTabPtys(
+    ptyIds: readonly string[],
+    addressedPtyId: string,
+    capturedIncarnationId?: string
+  ): Promise<ExplicitCloseStop> {
+    let addressedPtyStop = NO_STOP
+    const deadlineMs = Date.now() + EXPLICIT_TERMINAL_CLOSE_STOP_TIMEOUT_MS
+    for (const ptyId of ptyIds) {
+      this.markPtyStopRequested(ptyId)
+      const expectedIncarnationId = capturedIncarnationId ?? this.ptysById.get(ptyId)?.incarnationId
+      let stopped = false
+      if (this.ptyController?.stopAndWait) {
+        try {
+          stopped = await this.ptyController.stopAndWait(ptyId, {
+            deadlineMs,
+            ...(capturedIncarnationId ? { expectedIncarnationId: capturedIncarnationId } : {})
+          })
+        } catch (error) {
+          this.markPtyLivenessUnverifiable(ptyId, errorMessage(error))
+        }
+        // Preserve an observed exit when a broader inventory check could not finish.
+        if (
+          !stopped &&
+          expectedIncarnationId &&
+          this.ptysById.get(ptyId)?.incarnationId === expectedIncarnationId &&
+          this.getPtyLivenessVerdict(ptyId)?.status === 'exited'
+        ) {
+          stopped = true
+        }
+        if (!stopped && !capturedIncarnationId) {
+          const verdict = this.getPtyLivenessVerdict(ptyId)
+          const providerAlreadyRetiredPty =
+            verdict?.status === 'unverifiable' &&
+            verdict.reason === SSH_PROVIDER_UNREGISTERED_REASON
+          if (!providerAlreadyRetiredPty) {
+            this.ptyController.kill(ptyId)
+            if (!verdict || verdict.status === 'live') {
+              this.markPtyLivenessUnverifiable(
+                ptyId,
+                'a follow-up stop was issued but its outcome could not be verified'
+              )
+            }
+          }
+        }
+      } else if (!capturedIncarnationId) {
+        stopped = this.ptyController?.kill(ptyId) ?? false
+      }
+      if (ptyId === addressedPtyId) {
+        addressedPtyStop = { stopped }
+      }
+    }
+    return addressedPtyStop
+  }
+
+  protected describeTerminalClose(
+    handle: string,
+    tabId: string,
+    ptyId: string | null,
+    stop: ExplicitCloseStop
+  ): RuntimeTerminalClose {
+    const close: RuntimeTerminalClose = { handle, tabId, ptyKilled: stop.stopped }
+    if (stop.stopped || !ptyId) {
+      return close
+    }
+    const verdict = this.getPtyLivenessVerdict(ptyId)
+    if (verdict?.status === 'unverifiable') {
+      return { ...close, ptyStopVerdict: 'unverifiable', ptyStopReason: verdict.reason }
+    }
+    if (verdict?.status === 'live') {
+      return { ...close, ptyStopVerdict: 'live' }
+    }
+    return close
+  }
+}
diff --git a/src/main/runtime/session-tabs/explicit-terminal-close-stops.ts b/src/main/runtime/session-tabs/explicit-terminal-close-stops.ts
index abffb82f48e8..0ad6ce3860ee 100644
--- a/src/main/runtime/session-tabs/explicit-terminal-close-stops.ts
+++ b/src/main/runtime/session-tabs/explicit-terminal-close-stops.ts
@@ -1,23 +1,17 @@
 import type { WorktreePtyHostFence } from '../worktree-pty-host-fence'
-import { OrcaRuntimeWithFocusTerminal } from '../terminal/focus/focus-terminal'
-import { EXPLICIT_TERMINAL_CLOSE_STOP_TIMEOUT_MS } from '../orca-runtime-core'
-import { SSH_PROVIDER_UNREGISTERED_REASON } from '../../../shared/pty-liveness-verdict'
+import { OrcaRuntimeWithExplicitTerminalCloseOutcome } from './explicit-terminal-close-outcome'
 import type { RuntimeTerminalClose } from '../../../shared/runtime-types'
 import type { RuntimePtyTabCloseAuthority } from '../runtime-terminal-state-records'
 import { parsePaneKey } from '../../../shared/stable-pane-id'
-import { errorMessage } from '../../../shared/error-message'
 import type { ResolvedWorktree } from '../runtime-worktree-path-identity'
 import {
   closePairedHostLeafFirst,
   isTerminalTabPinnedInSession
 } from './paired-host-terminal-close'
 
-/** How an explicit close's stop of its addressed PTY ended. */
-type ExplicitCloseStop = { stopped: boolean }
+const NO_STOP = { stopped: false }
 
-const NO_STOP: ExplicitCloseStop = { stopped: false }
-
-export abstract class OrcaRuntimeWithStopExplicitlyClosedTabPtys extends OrcaRuntimeWithFocusTerminal {
+export abstract class OrcaRuntimeWithStopExplicitlyClosedTabPtys extends OrcaRuntimeWithExplicitTerminalCloseOutcome {
   protected abstract getResolvedWorktreeMap(): Promise<Map<string, ResolvedWorktree>>
   protected abstract refreshPtyWorktreeRecordsFromController(
     resolvedWorktrees: ResolvedWorktree[],
@@ -43,76 +37,6 @@ export abstract class OrcaRuntimeWithStopExplicitlyClosedTabPtys extends OrcaRun
     terminalHandlesByPtyId: Readonly<Record<string, readonly string[]>>
   }): void
 
-  protected async stopExplicitlyClosedTabPtys(
-    ptyIds: readonly string[],
-    addressedPtyId: string
-  ): Promise<ExplicitCloseStop> {
-    let addressedPtyStop = NO_STOP
-    const deadlineMs = Date.now() + EXPLICIT_TERMINAL_CLOSE_STOP_TIMEOUT_MS
-    for (const ptyId of ptyIds) {
-      this.markPtyStopRequested(ptyId)
-      const expectedIncarnationId = this.ptysById.get(ptyId)?.incarnationId
-      let stopped = false
-      if (this.ptyController?.stopAndWait) {
-        try {
-          stopped = await this.ptyController.stopAndWait(ptyId, { deadlineMs })
-        } catch (error) {
-          this.markPtyLivenessUnverifiable(ptyId, errorMessage(error))
-        }
-        // Preserve an observed exit when a broader inventory check could not finish.
-        if (
-          !stopped &&
-          expectedIncarnationId &&
-          this.ptysById.get(ptyId)?.incarnationId === expectedIncarnationId &&
-          this.getPtyLivenessVerdict(ptyId)?.status === 'exited'
-        ) {
-          stopped = true
-        }
-        if (!stopped) {
-          const verdict = this.getPtyLivenessVerdict(ptyId)
-          const providerAlreadyRetiredPty =
-            verdict?.status === 'unverifiable' &&
-            verdict.reason === SSH_PROVIDER_UNREGISTERED_REASON
-          if (!providerAlreadyRetiredPty) {
-            this.ptyController.kill(ptyId)
-            if (!verdict || verdict.status === 'live') {
-              this.markPtyLivenessUnverifiable(
-                ptyId,
-                'a follow-up stop was issued but its outcome could not be verified'
-              )
-            }
-          }
-        }
-      } else {
-        stopped = this.ptyController?.kill(ptyId) ?? false
-      }
-      if (ptyId === addressedPtyId) {
-        addressedPtyStop = { stopped }
-      }
-    }
-    return addressedPtyStop
-  }
-
-  protected describeTerminalClose(
-    handle: string,
-    tabId: string,
-    ptyId: string | null,
-    stop: ExplicitCloseStop
-  ): RuntimeTerminalClose {
-    const close: RuntimeTerminalClose = { handle, tabId, ptyKilled: stop.stopped }
-    if (stop.stopped || !ptyId) {
-      return close
-    }
-    const verdict = this.getPtyLivenessVerdict(ptyId)
-    if (verdict?.status === 'unverifiable') {
-      return { ...close, ptyStopVerdict: 'unverifiable', ptyStopReason: verdict.reason }
-    }
-    if (verdict?.status === 'live') {
-      return { ...close, ptyStopVerdict: 'live' }
-    }
-    return close
-  }
-
   /** null when this machine owns the PTY; see `closePairedHostLeafFirst` otherwise. */
   private closeOnOwningPairedHost(
     handle: string,
@@ -134,10 +58,37 @@ export abstract class OrcaRuntimeWithStopExplicitlyClosedTabPtys extends OrcaRun
 
   async closeTerminal(handle: string, incarnation?: string): Promise<RuntimeTerminalClose> {
     const pty = this.getLivePtyForHandle(handle)
+    const addressedPty =
+      pty?.pty ??
+      (incarnation
+        ? this.ptysById.get(this.getLiveLeafForHandle(handle).leaf.ptyId ?? '')
+        : undefined)
     // The handle's fence: a replacement execution under the same handle is never closed.
-    if (incarnation && pty?.pty.incarnationId !== incarnation) {
+    if (incarnation && addressedPty?.incarnationId !== incarnation) {
       throw new Error('terminal_handle_stale')
     }
+    // A fenced switch stops its captured execution before any presentation await.
+    const capturedStop =
+      incarnation && addressedPty
+        ? await this.stopExplicitlyClosedTabPtys(
+            [addressedPty.ptyId],
+            addressedPty.ptyId,
+            incarnation
+          )
+        : null
+    if (
+      incarnation &&
+      (!capturedStop?.stopped ||
+        (addressedPty &&
+          this.ptysById.has(addressedPty.ptyId) &&
+          this.ptysById.get(addressedPty.ptyId)?.incarnationId !== incarnation))
+    ) {
+      throw new Error('terminal_close_unverifiable')
+    }
+    const stopCapturedOrCurrent = (ids: readonly string[], addressed: string) =>
+      capturedStop
+        ? Promise.resolve(capturedStop)
+        : this.stopExplicitlyClosedTabPtys(ids, addressed)
     this.claudeAgentTeams.removeTeamForLeaderHandle(handle)
     if (pty) {
       const closeAuthority: RuntimePtyTabCloseAuthority = {
@@ -175,7 +126,7 @@ export abstract class OrcaRuntimeWithStopExplicitlyClosedTabPtys extends OrcaRun
           }
           this.notifyRendererOfHeadlessTerminalClose(tabId)
         }
-        const stop = await this.stopExplicitlyClosedTabPtys(ptyIdsToKill, pty.pty.ptyId)
+        const stop = await stopCapturedOrCurrent(ptyIdsToKill, pty.pty.ptyId)
         return this.describeTerminalClose(handle, tabId, pty.pty.ptyId, stop)
       }
       if (closesTab && surface && ptyCloseAuthority && !this.tabs.has(surface.tab.parentTabId)) {
@@ -189,11 +140,11 @@ export abstract class OrcaRuntimeWithStopExplicitlyClosedTabPtys extends OrcaRun
           if (!(error instanceof Error) || error.message !== 'workspace_session_unavailable') {
             throw error
           }
-          const stop = await this.stopExplicitlyClosedTabPtys([pty.pty.ptyId], pty.pty.ptyId)
+          const stop = await stopCapturedOrCurrent([pty.pty.ptyId], pty.pty.ptyId)
           this.notifyRendererOfHeadlessTerminalClose(tabId)
           return this.describeTerminalClose(handle, tabId, pty.pty.ptyId, stop)
         }
-        const stop = await this.stopExplicitlyClosedTabPtys([pty.pty.ptyId], pty.pty.ptyId)
+        const stop = await stopCapturedOrCurrent([pty.pty.ptyId], pty.pty.ptyId)
         return this.describeTerminalClose(handle, tabId, pty.pty.ptyId, stop)
       }
       // Why the tabs guard: a headless host has no renderer tab to close through the notifier.
@@ -216,11 +167,11 @@ export abstract class OrcaRuntimeWithStopExplicitlyClosedTabPtys extends OrcaRun
           tabClosed = false
         }
         if (tabClosed) {
-          const stop = await this.stopExplicitlyClosedTabPtys(ptyIdsToKill, pty.pty.ptyId)
+          const stop = await stopCapturedOrCurrent(ptyIdsToKill, pty.pty.ptyId)
           return this.describeTerminalClose(handle, tabId, pty.pty.ptyId, stop)
         }
       }
-      const stop = await this.stopExplicitlyClosedTabPtys([pty.pty.ptyId], pty.pty.ptyId)
+      const stop = await stopCapturedOrCurrent([pty.pty.ptyId], pty.pty.ptyId)
       if (!closesTab) {
         // Why: the pane's removal is this close's own commit, not a side effect of its exit. An
         // unconfirmed stop is unverifiable, never a reason to close the live siblings with it.
@@ -273,9 +224,7 @@ export abstract class OrcaRuntimeWithStopExplicitlyClosedTabPtys extends OrcaRun
       }
       return { handle, tabId: leaf.tabId, ...hostClose.close }
     }
-    const stop = leaf.ptyId
-      ? await this.stopExplicitlyClosedTabPtys(ptyIdsToKill, leaf.ptyId)
-      : NO_STOP
+    const stop = leaf.ptyId ? await stopCapturedOrCurrent(ptyIdsToKill, leaf.ptyId) : NO_STOP
     if (!closesTab) {
       await this.closeTerminalPane(leaf.worktreeId, paneTarget)
     } else if (!this.notifier?.closeTerminalTab) {
diff --git a/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts b/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts
index 150f080bcdbf..5fe9dd7b78df 100644
--- a/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts
+++ b/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts
@@ -5,12 +5,7 @@ import {
 } from '../../../shared/agent-session-resume'
 import { LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host'
 import type { StructuredAgentId } from '../../../shared/agent-session-provider-handle'
-import { switchStartProcessVerdict } from './structured-session-switch-observation'
-import {
-  OrcaRuntimeWithStructuredSessionSwitchClaims,
-  switchHeldRefusal,
-  switchMovingRefusal
-} from './structured-session-switch-claims'
+import { OrcaRuntimeWithGetWorktreePs } from '../workspaces/workspace-process-listing'
 import { getProviderForPty } from '../../ipc/pty/provider/registry'
 import { LocalPtyProvider } from '../../providers/local-pty-provider'
 import { inspectPtyProviderProcess } from '../../providers/pty-process-inspection'
@@ -30,7 +25,7 @@ import type { AgentSessionRecord } from '../../../shared/agent-session-record'
 import { CLI_CONVERSATION_ADOPTING_AGENTS } from '../../../shared/structured-agent-cli-conversation-adoption'
 import { recordConversationKey } from '../../native-chat/structured-conversation-key'
 
-export abstract class OrcaRuntimeWithStructuredSessionCliWriterHost extends OrcaRuntimeWithStructuredSessionSwitchClaims {
+export abstract class OrcaRuntimeWithStructuredSessionCliWriterHost extends OrcaRuntimeWithGetWorktreePs {
   rememberSavedTerminalLaunchResult(ptyId: string, result: TerminalLaunchResult): void {
     const pty = this.ptysById.get(ptyId)
     if (pty && result.savedResumeDecision) {
@@ -99,7 +94,6 @@ export abstract class OrcaRuntimeWithStructuredSessionCliWriterHost extends Orca
     }
     if (event.agentPresence?.process) {
       delete pty.savedTerminalLaunchResult
-      this.noteSwitchStartProcess(pty.ptyId, { agent, id: binding.id }, event.agentPresence.process)
     }
     if (pty.cliConversations?.incarnationId !== pty.incarnationId) {
       pty.cliConversations = { incarnationId: pty.incarnationId, byKey: new Map() }
@@ -136,9 +130,6 @@ export abstract class OrcaRuntimeWithStructuredSessionCliWriterHost extends Orca
     providerSessionId: string,
     source?: { workspaceId: string; paneKey: string }
   ): Promise<void> {
-    await this.loadSwitchClaims()
-    this.assertNoPendingSwitch(agent, providerSessionId)
-    await this.assertSwitchStartsEnded(agent, providerSessionId)
     await assertCliConversationWritersExited(
       {
         rows: () => this.getAgentProviderSessionRows(),
@@ -172,81 +163,38 @@ export abstract class OrcaRuntimeWithStructuredSessionCliWriterHost extends Orca
           this.terminalSleepStateByHostWorktree.has(
             hostSleepKey(LOCAL_EXECUTION_HOST_ID, workspaceId)
           ),
-        shellAlone: (pane) => this.cliWriterShellAlone(pane)
+        shellAlone: async (pane) => {
+          if (process.platform === 'win32') {
+            const provider = getProviderForPty(pane.ptyId)
+            const inspection = await inspectPtyProviderProcess(provider, pane.ptyId, {
+              expectedIncarnationId: pane.incarnationId,
+              scanChildProcesses: true,
+              ignoreDetached: true
+            })
+            const evidence = inspection.foregroundProcessEvidence
+            return (
+              inspectionShowsShellAlone(inspection) &&
+              (provider instanceof LocalPtyProvider ||
+                (evidence?.ptyId === pane.ptyId &&
+                  evidence.ptyIncarnationId === pane.incarnationId &&
+                  evidence.verdict === 'unverifiable' &&
+                  evidence.reason === 'windows_ssh_foreground_unavailable'))
+            )
+          }
+          const processes = await this.ptyController?.listProcesses?.(LOCAL_EXECUTION_HOST_ID)
+          const entry = processes?.find((candidate) => candidate.id === pane.ptyId)
+          const pty = this.ptysById.get(pane.ptyId)
+          return (
+            !!entry?.rootProcessId &&
+            !!entry.incarnationId &&
+            entry.incarnationId === pty?.incarnationId &&
+            (await posixCliWriterShellAlone(entry.rootProcessId))
+          )
+        }
       },
       agent,
       providerSessionId,
       source && { paneKey: source.paneKey, worktreeId: source.workspaceId }
     )
-    // A switch spawn admitted during the census either registered first or read this chat's reservation.
-    this.assertNoPendingSwitch(agent, providerSessionId, true)
-  }
-
-  async releaseEndedSwitchStarts(agent: string, id: string): Promise<void> {
-    await this.loadSwitchClaims()
-    await this.assertSwitchStartsEnded(agent, id).catch(() => undefined)
-  }
-
-  /** A switch's start holds its conversation until every agent recorded there is proved exited and
-   *  either its owner proves the execution ended, or its startup settled with that exact shell alone. */
-  private async assertSwitchStartsEnded(agent: string, id: string): Promise<void> {
-    for (const claim of this.switchClaimsFor(agent, id)) {
-      if (!claim.accepted) {
-        throw switchMovingRefusal()
-      }
-      const seen = await this.observeSwitch(claim, true)
-      if (seen.state === 'bound') {
-        await this.noteSwitchBound(claim, seen)
-      }
-      const pane = seen.state === 'bound' ? this.cliWriterPtyPane(seen.ptyId) : null
-      // A root exit is not the agents' exit: a detached one outlives its shell.
-      const agentsExited = (
-        await Promise.all(claim.processes.map(switchStartProcessVerdict))
-      ).every((verdict) => verdict === 'exited')
-      const over =
-        agentsExited &&
-        (seen.state === 'ended' ||
-          (seen.state === 'bound' &&
-            seen.startupSettled &&
-            claim.processes.length > 0 &&
-            pane?.incarnationId === seen.incarnationId &&
-            (await this.cliWriterShellAlone(pane))))
-      if (over) {
-        await this.releaseSwitchClaim(claim)
-        continue
-      }
-      throw seen.state === 'pending' || (seen.state === 'bound' && !seen.startupSettled)
-        ? switchMovingRefusal()
-        : switchHeldRefusal()
-    }
-  }
-
-  private async cliWriterShellAlone(pane: CliWriterPane): Promise<boolean> {
-    if (process.platform === 'win32') {
-      const provider = getProviderForPty(pane.ptyId)
-      const inspection = await inspectPtyProviderProcess(provider, pane.ptyId, {
-        expectedIncarnationId: pane.incarnationId,
-        scanChildProcesses: true,
-        ignoreDetached: true
-      })
-      const evidence = inspection.foregroundProcessEvidence
-      return (
-        inspectionShowsShellAlone(inspection) &&
-        (provider instanceof LocalPtyProvider ||
-          (evidence?.ptyId === pane.ptyId &&
-            evidence.ptyIncarnationId === pane.incarnationId &&
-            evidence.verdict === 'unverifiable' &&
-            evidence.reason === 'windows_ssh_foreground_unavailable'))
-      )
-    }
-    const processes = await this.ptyController?.listProcesses?.(LOCAL_EXECUTION_HOST_ID)
-    const entry = processes?.find((candidate) => candidate.id === pane.ptyId)
-    const pty = this.ptysById.get(pane.ptyId)
-    return (
-      !!entry?.rootProcessId &&
-      !!entry.incarnationId &&
-      entry.incarnationId === pty?.incarnationId &&
-      (await posixCliWriterShellAlone(entry.rootProcessId))
-    )
   }
 }
diff --git a/src/main/runtime/session-tabs/structured-session-switch-boot.ts b/src/main/runtime/session-tabs/structured-session-switch-boot.ts
deleted file mode 100644
index 0c811adc2dc4..000000000000
--- a/src/main/runtime/session-tabs/structured-session-switch-boot.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { uptime } from 'node:os'
-import { runProcess } from '@orca/process-host'
-import { windowsSystem32Binary } from '@orca/process-host/windows-system-binary'
-import { readBootIdentity } from '../../agent-hooks/managed-hook-owner-identity'
-
-const WINDOWS_BOOT_KEY =
-  'HKLM\\SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Memory Management\\PrefetchParameters'
-
-/** The OS's own boot counter or id; undefined when unreadable. Windows: one read-only reg.exe. */
-async function readOsBootId(): Promise<string | undefined> {
-  if (process.platform !== 'win32') {
-    return readBootIdentity()
-  }
-  const result = await runProcess({
-    program: windowsSystem32Binary('reg.exe'),
-    args: ['query', WINDOWS_BOOT_KEY, '/v', 'BootId'],
-    timeoutMs: 5_000
-  }).catch(() => null)
-  const id = result?.code === 0 ? /BootId\s+REG_DWORD\s+(0x[0-9a-f]+)/i.exec(result.stdout) : null
-  return id ? `win:${id[1].toLowerCase()}` : undefined
-}
-
-/** Read at acceptance and on owner-loss recovery only: the boot id, and uptime at reading. */
-export async function readSwitchHostBoot(): Promise<string> {
-  return `${(await readOsBootId()) ?? ''}@${uptime()}`
-}
-
-const parse = (boot: string): [string, number] => {
-  const at = boot.lastIndexOf('@')
-  return at === -1 ? ['', Number.NaN] : [boot.slice(0, at), Number(boot.slice(at + 1))]
-}
-
-/** A later boot, from clock-free facts only: a different boot id, or uptime lower than it was
- *  (it only grows within a boot). macOS uptime is derived from the wall clock, so there only the
- *  id counts. Anything unreadable proves nothing. */
-export function isLaterSwitchHostBoot(saved: string, current: string): boolean {
-  const [savedId, savedUptime] = parse(saved)
-  const [id, currentUptime] = parse(current)
-  if (savedId && id) {
-    return savedId !== id
-  }
-  return process.platform !== 'darwin' && currentUptime < savedUptime
-}
diff --git a/src/main/runtime/session-tabs/structured-session-switch-claims.test.ts b/src/main/runtime/session-tabs/structured-session-switch-claims.test.ts
deleted file mode 100644
index 4c737b181c07..000000000000
--- a/src/main/runtime/session-tabs/structured-session-switch-claims.test.ts
+++ /dev/null
@@ -1,359 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import '../rpc/unused-default-rpc-methods.test-fixture'
-import { OrcaRuntimeService } from '../orca-runtime'
-import { admitSwitchResumeSpawn } from '../../ipc/pty/host-env/resume-spawn-judgement'
-import type { AdmissionRuntime } from '../../ipc/pty/host-env/resume-spawn-judgement'
-import { TerminalHostSwitches } from '../../daemon/terminal-host-switches'
-import type { Session } from '../../daemon/session'
-import { switchStartProcessVerdict } from './structured-session-switch-observation'
-import { codexChatHolding } from '../../ai-vault/structured-session-ownership.test-support'
-import {
-  TERMINAL_SWITCH_GENERATION_ENV,
-  type TerminalSwitchDescriptor
-} from '../../../shared/terminal-switch'
-import type { AgentSessionRecord } from '../../../shared/agent-session-record'
-import { routedTerminalSwitchOwners } from '../../providers/terminal-switch-owners'
-import { seedResumeLaunchIdentity } from '../../ipc/pty/pane/resume-launch-identity'
-import { isLaterSwitchHostBoot, readSwitchHostBoot } from './structured-session-switch-boot'
-import type { AgentProcessVerdict } from '../../../shared/agent-process-presence'
-import type { SwitchClaim } from './structured-session-switch-claims'
-
-vi.mock('electron', () => ({
-  BrowserWindow: { fromId: vi.fn(() => null) },
-  webContents: { fromId: vi.fn(() => null) },
-  ipcMain: { on: vi.fn(), removeListener: vi.fn() },
-  app: { getPath: vi.fn(() => '/tmp') }
-}))
-vi.mock('../../agent-hooks/managed-hook-owner-identity', () => ({
-  readBootIdentity: async () => boot
-}))
-vi.mock('../../ipc/pty/pane/resume-launch-identity', () => ({ seedResumeLaunchIdentity: vi.fn() }))
-vi.mock('@orca/process-host', async (importOriginal) => ({
-  ...(await importOriginal<Record<string, unknown>>()),
-  runProcess: vi.fn(async () => ({
-    code: 0,
-    stdout: `    BootId    REG_DWORD    ${boot ?? ''}\r\n`
-  }))
-}))
-vi.mock('./structured-session-switch-observation', () => ({
-  readSwitchPaneAgentProcesses: vi.fn(async () => []),
-  readSwitchShellProcess: vi.fn(async (pid: number) => ({
-    pid,
-    platform: 'linux',
-    startTime: 's'
-  })),
-  switchStartProcessVerdict: vi.fn(async (): Promise<AgentProcessVerdict> => 'live')
-}))
-
-const C = 'thread-c'
-const LEAF = '11111111-1111-4111-8111-111111111111'
-const PANE = `tab-1:${LEAF}`
-const SHELL = { pid: 4242, platform: 'linux', startTime: 's' } as const
-const AGENT = { pid: 999_991, platform: 'linux', startTime: 'started' } as const
-let runtime: OrcaRuntimeService
-let host: TerminalHostSwitches
-let shellAlone: boolean
-let ownerReachable: boolean
-let boot: string | undefined = '0x1'
-/** The chat records' saved switch descriptors, keyed by chat session id. */
-let saved: Map<string, TerminalSwitchDescriptor>
-
-const chatStart = () => runtime.assertStructuredAdoptionTerminalWritersExited('codex', C)
-const reason = (promise: Promise<unknown>) =>
-  promise.then(
-    () => 'admitted',
-    (error: { refusal?: { details?: { reason?: string } } }) => error.refusal?.details?.reason
-  )
-const session = (facts: Partial<Session>) =>
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the owner reads only these session facts.
-  ({ shellReady: { isGatingWrites: false }, ...facts }) as Session
-const live = () => session({ isAlive: true, sessionId: 'pty-1', incarnationId: 'i1', pid: 4242 })
-
-beforeEach(() => {
-  shellAlone = true
-  ownerReachable = true
-  boot = '0x1'
-  saved = new Map()
-  host = new TerminalHostSwitches()
-  runtime = new OrcaRuntimeService()
-  runtime.registerPty('pty-1', 'wt-1', null, { tabId: 'tab-1', leafId: LEAF, incarnationId: 'i1' })
-  const reach = {
-    terminalSwitches: {
-      owner: async () => host.owner,
-      observe: async (generation: string, fence: boolean) => {
-        if (!ownerReachable) {
-          throw new Error('terminal_switch_owner_unreachable')
-        }
-        return [host.observe(generation, fence)]
-      }
-    }
-  }
-  // The production routing: an unreachable owner must stay unreachable through it.
-  const terminalSwitches = routedTerminalSwitchOwners(
-    () => reach,
-    () => [reach, {}]
-  )
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the switch reads only its owner contract.
-  runtime.setPtyController({ terminalSwitches } as never)
-  vi.spyOn(runtime, 'openAgentSessionRecordStore').mockResolvedValue(
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the switch reads records and writes descriptors only.
-    {
-      listRecords: () =>
-        [...saved].map(([sessionId, terminalSwitch]) => ({ sessionId, terminalSwitch })),
-      transitionHandoff: async (
-        sessionId: string,
-        transition: (record: AgentSessionRecord) => AgentSessionRecord
-      ) => {
-        const current = saved.get(sessionId)
-        const record = {
-          ...codexChatHolding(sessionId, [C]),
-          ...(current ? { terminalSwitch: current } : {})
-        }
-        // The journal store freezes what it commits.
-        const next = Object.freeze(transition(record))
-        Object.freeze(next.terminalSwitch?.processes)
-        if (next.terminalSwitch) {
-          saved.set(sessionId, next.terminalSwitch)
-        } else {
-          saved.delete(sessionId)
-        }
-        return next
-      }
-    } as never
-  )
-  vi.spyOn(
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the census's one process-table read, replaced by the pane's modeled state.
-    runtime as never as { cliWriterShellAlone: () => Promise<boolean> },
-    'cliWriterShellAlone'
-  ).mockImplementation(async () => shellAlone)
-  vi.mocked(switchStartProcessVerdict).mockResolvedValue('live')
-})
-
-async function acceptedSwitch(): Promise<SwitchClaim> {
-  const claim = runtime.registerSwitchClaim('codex', C, 'chat-1', host.owner)
-  runtime.acceptSwitchStart(claim.generation, PANE)
-  await runtime.saveSwitchClaim(claim)
-  return claim
-}
-
-describe('a chat → terminal switch start', () => {
-  it('is held from the recipe until its owner proves the exact execution over', async () => {
-    const claim = runtime.registerSwitchClaim('codex', C, 'chat-1', host.owner)
-    expect(await reason(chatStart())).toBe('conversationMovingToTerminal')
-    expect(() => runtime.registerSwitchClaim('codex', C, 'chat-1', host.owner)).toThrow(
-      'agent_session_conflict'
-    )
-    expect(runtime.acceptSwitchStart(claim.generation, PANE)).toBe(claim)
-    // One pane takes a generation; a retry there joins it.
-    expect(runtime.acceptSwitchStart(claim.generation, 'tab-2:other')).toBeNull()
-    expect(runtime.acceptSwitchStart(claim.generation, PANE)).toBe(claim)
-    await runtime.saveSwitchClaim(claim)
-    host.begin(claim.generation, host.owner)
-    expect(await reason(chatStart())).toBe('conversationMovingToTerminal')
-    expect(() => host.begin(claim.generation, host.owner)).toThrow(
-      'terminal_switch_generation_refused'
-    )
-
-    const shell = live()
-    host.bind(claim.generation, shell)
-    // Bound with no agent recorded: only the owner's end releases it.
-    expect(await reason(chatStart())).toBe('conversationHeldElsewhere')
-    expect(saved.get('chat-1')).toMatchObject({ ptyId: 'pty-1', incarnationId: 'i1', shell: SHELL })
-    runtime['noteSwitchStartProcess']('pty-1', { agent: 'codex', id: C }, AGENT)
-    // The shell exiting is not its detached agent exiting.
-    Object.assign(shell, { isAlive: false })
-    expect(await reason(chatStart())).toBe('conversationHeldElsewhere')
-    vi.mocked(switchStartProcessVerdict).mockResolvedValue('exited')
-    expect(await reason(chatStart())).toBe('admitted')
-    expect(saved.has('chat-1')).toBe(false)
-  })
-
-  it('releases on a proved agent exit with that exact shell alone, keeping the shell', async () => {
-    const claim = await acceptedSwitch()
-    host.begin(claim.generation, host.owner)
-    host.bind(claim.generation, live())
-    expect(await reason(chatStart())).toBe('conversationHeldElsewhere')
-    runtime['noteSwitchStartProcess']('pty-1', { agent: 'codex', id: C }, AGENT)
-    vi.mocked(switchStartProcessVerdict).mockResolvedValue('exited')
-    shellAlone = false
-    expect(await reason(chatStart())).toBe('conversationHeldElsewhere')
-    shellAlone = true
-    expect(await reason(chatStart())).toBe('admitted')
-  })
-
-  it('never lets a retired switch’s late evidence replace the next one', async () => {
-    const a = await acceptedSwitch()
-    expect(await reason(chatStart())).toBe('admitted')
-    const b = await acceptedSwitch()
-    a.processes.push(AGENT)
-    expect(await runtime.saveSwitchClaim(a)).toBe(false)
-    expect(saved.get('chat-1')?.generation).toBe(b.generation)
-  })
-
-  it('fences a saved start no terminal took, so it can never start later', async () => {
-    const claim = await acceptedSwitch()
-    expect(await reason(chatStart())).toBe('admitted')
-    expect(() => host.begin(claim.generation, host.owner)).toThrow(
-      'terminal_switch_generation_refused'
-    )
-  })
-
-  it('survives a restart: an unreachable owner holds; a lost one yields only to proof', async () => {
-    const sameBoot = await readSwitchHostBoot()
-    const lost = (extra: Partial<TerminalSwitchDescriptor>) =>
-      saved.set('chat-1', {
-        generation: 'g-old',
-        agent: 'codex',
-        providerSessionId: C,
-        owner: 'daemon:gone',
-        paneKey: PANE,
-        processes: [],
-        boot: sameBoot,
-        ...extra
-      })
-    lost({ ptyId: 'pty-1', incarnationId: 'i1', shell: SHELL, processes: [AGENT] })
-    ownerReachable = false
-    vi.mocked(switchStartProcessVerdict).mockResolvedValue('exited')
-    expect(await reason(chatStart())).toBe('conversationHeldElsewhere')
-    ownerReachable = true
-    vi.mocked(switchStartProcessVerdict).mockResolvedValue('live')
-    expect(await reason(chatStart())).toBe('conversationHeldElsewhere')
-    vi.mocked(switchStartProcessVerdict).mockResolvedValue('exited')
-    expect(await reason(chatStart())).toBe('admitted')
-
-    // A crash before any identity was learned stays held until an OS boot id changes; no id
-    // (Windows) never proves a reboot, however far the clock moves.
-    lost({})
-    runtime['switchClaimsLoaded'] = null
-    boot = undefined
-    expect(await reason(chatStart())).toBe('conversationHeldElsewhere')
-    boot = '0x2'
-    expect(await reason(chatStart())).toBe('admitted')
-    expect(saved.has('chat-1')).toBe(false)
-  })
-
-  it('proves a later boot only from a boot id or an uptime drop, never the wall clock', async () => {
-    const onPlatform = (platform: string) =>
-      Object.defineProperty(process, 'platform', { value: platform })
-    const real = process.platform
-    expect(isLaterSwitchHostBoot('a@100', 'a@1')).toBe(false)
-    expect(isLaterSwitchHostBoot('a@1', 'b@100')).toBe(true)
-    onPlatform('win32')
-    boot = '0x1A'
-    expect(await readSwitchHostBoot()).toMatch(/^win:0x1a@/)
-    expect(isLaterSwitchHostBoot('@100', '@5')).toBe(true)
-    expect(isLaterSwitchHostBoot('@100', '@500')).toBe(false)
-    // macOS derives uptime from the wall clock, so only its boot id counts there.
-    onPlatform('darwin')
-    expect(isLaterSwitchHostBoot('@100', '@5')).toBe(false)
-    onPlatform(real)
-  })
-
-  it('rebuilds a reattached switch terminal’s stamp from its owner, never onto a replacement', async () => {
-    const claim = await acceptedSwitch()
-    host.begin(claim.generation, host.owner)
-    host.bind(claim.generation, live())
-    vi.mocked(seedResumeLaunchIdentity).mockClear()
-    const reattach = (incarnationId: string) =>
-      runtime.registerPty('pty-1', 'wt-1', null, {
-        tabId: 'tab-1',
-        leafId: LEAF,
-        incarnationId,
-        providerReattachLaunchIdentity: { incarnationId, launchAgent: 'codex' }
-      })
-    // Replaced before the owner's answer lands: nothing is stamped onto i2.
-    reattach('i1')
-    runtime.registerPty('pty-1', 'wt-1', null, {
-      tabId: 'tab-1',
-      leafId: LEAF,
-      incarnationId: 'i2'
-    })
-    await vi.waitFor(() => expect(saved.get('chat-1')?.ptyId).toBe('pty-1'))
-    expect(seedResumeLaunchIdentity).not.toHaveBeenCalled()
-    reattach('i1')
-    await vi.waitFor(() => expect(seedResumeLaunchIdentity).toHaveBeenCalledOnce())
-    expect(seedResumeLaunchIdentity).toHaveBeenCalledWith(
-      expect.objectContaining({
-        paneKey: PANE,
-        resumeProviderSession: { key: 'session_id', id: C },
-        execution: { ptyId: 'pty-1', incarnationId: 'i1' }
-      })
-    )
-  })
-})
-
-describe('a switch spawn', () => {
-  const args = (generation = 'g1') => ({
-    launchAgent: 'codex' as const,
-    resumeProviderSession: { key: 'session_id' as const, id: C },
-    resumeOrigin: 'switch',
-    env: { [TERMINAL_SWITCH_GENERATION_ENV]: generation, KEEP: '1' }
-  })
-  const claim: SwitchClaim = {
-    generation: 'g1',
-    agent: 'codex',
-    providerSessionId: C,
-    owner: 'daemon:o',
-    paneKey: PANE,
-    processes: [],
-    chatSessionId: 'chat-1',
-    at: 0,
-    accepted: true
-  }
-  const admission = (writing: boolean, savedOk = true) =>
-    ({
-      acceptSwitchStart: vi.fn(() => claim),
-      saveSwitchClaim: vi.fn(async () => savedOk),
-      dispatchSwitchStart: vi.fn(() => ({ switchGeneration: 'g1', switchOwner: 'daemon:o' })),
-      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: a switch spawn reads only the store's records and tab index.
-      openAgentSessionRecordStore: vi.fn(
-        async () =>
-          ({
-            listRecords: () => (writing ? [codexChatHolding('chat-1', [C])] : []),
-            getVisibleSessionTabIndex: () => ({ present: true, sessionIds: [] })
-          }) as never
-      )
-    }) satisfies AdmissionRuntime
-
-  it('hands the owner its generation only once the start is saved and the chat is quiet', async () => {
-    const quiet = admission(false)
-    const spawnArgs = args()
-    const options: { env?: Record<string, string>; switchGeneration?: string } = {
-      env: { ...spawnArgs.env }
-    }
-    expect(
-      await admitSwitchResumeSpawn(quiet, spawnArgs, null, { paneKey: PANE, options })
-    ).toMatchObject({ verdict: 'admitted' })
-    expect(quiet.acceptSwitchStart).toHaveBeenCalledWith('g1', PANE)
-    expect(options).toEqual({ env: { KEEP: '1' }, switchGeneration: 'g1', switchOwner: 'daemon:o' })
-    expect(spawnArgs.env).toEqual({ KEEP: '1' })
-
-    const writing = admission(true)
-    const refused = admitSwitchResumeSpawn(writing, args(), null, { paneKey: PANE, options: {} })
-    // Accepted before the first await, so a chat start's census sees it.
-    expect(writing.acceptSwitchStart).toHaveBeenCalledOnce()
-    expect(await refused).toMatchObject({ verdict: 'chat-writing' })
-    expect(writing.dispatchSwitchStart).not.toHaveBeenCalled()
-
-    const unsaved = admission(false, false)
-    expect(
-      await admitSwitchResumeSpawn(unsaved, args(), null, { paneKey: PANE, options: {} })
-    ).toMatchObject({ verdict: 'unverifiable' })
-    expect(unsaved.dispatchSwitchStart).not.toHaveBeenCalled()
-  })
-
-  it('refuses where it cannot judge the pane, and a switch without its conversation', async () => {
-    const quiet = admission(false)
-    const spawn = { paneKey: PANE, options: {} }
-    expect(
-      await admitSwitchResumeSpawn(quiet, { ...args(), connectionId: 'ssh' }, null, spawn)
-    ).toMatchObject({ verdict: 'unverifiable' })
-    expect(await admitSwitchResumeSpawn(quiet, args(), 'Ubuntu', spawn)).toMatchObject({
-      verdict: 'unverifiable'
-    })
-    await expect(
-      admitSwitchResumeSpawn(quiet, { ...args(), resumeProviderSession: undefined }, null, spawn)
-    ).rejects.toThrow('switch_start_missing_conversation')
-    expect(quiet.acceptSwitchStart).not.toHaveBeenCalled()
-  })
-})
diff --git a/src/main/runtime/session-tabs/structured-session-switch-claims.ts b/src/main/runtime/session-tabs/structured-session-switch-claims.ts
deleted file mode 100644
index 757b8dcc38b4..000000000000
--- a/src/main/runtime/session-tabs/structured-session-switch-claims.ts
+++ /dev/null
@@ -1,339 +0,0 @@
-// The conversation index of chat → terminal switch starts. It projects the owner's own answer and
-// never settles a start from a caller's success, exception or a session list's absence.
-import { randomUUID } from 'node:crypto'
-import type { AgentProcessIdentity } from '../../../shared/agent-process-presence'
-import { isSameAgentProcess } from '../../../shared/agent-process-presence'
-import { chatAgentsShareConversations } from '../../../shared/structured-agent-cli-conversation-adoption'
-import { agentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
-import {
-  isTerminalSwitchDescriptor,
-  type TerminalSwitchDescriptor,
-  type TerminalSwitchObservation,
-  type TerminalSwitchWrite
-} from '../../../shared/terminal-switch'
-import type { AgentSessionRecordStore } from '../agent-session-record-store'
-import { setAgentSessionRecordTerminalSwitch } from '../agent-session-record-terminal-switch'
-import { OrcaRuntimeWithGetWorktreePs } from '../workspaces/workspace-process-listing'
-import { isLaterSwitchHostBoot, readSwitchHostBoot } from './structured-session-switch-boot'
-import { seedResumeLaunchIdentity } from '../../ipc/pty/pane/resume-launch-identity'
-import { adoptsCliConversations } from '../../../shared/structured-agent-cli-conversation-adoption'
-import {
-  readSwitchPaneAgentProcesses,
-  readSwitchShellProcess,
-  switchStartProcessVerdict
-} from './structured-session-switch-observation'
-
-/** Unfenced: the descriptor is the switch owner's obligation, not the writer lease. */
-const writeTerminalSwitch = (
-  store: Pick<AgentSessionRecordStore, 'transitionHandoff'>,
-  sessionId: string,
-  write: TerminalSwitchWrite
-) =>
-  store.transitionHandoff(sessionId, (record) =>
-    setAgentSessionRecordTerminalSwitch(record, write, Date.now())
-  )
-
-/** A recipe no terminal took may lapse; once taken, only its owner ends it. */
-const UNACCEPTED_SWITCH_CLAIM_MS = 60_000
-const SWITCH_START_WATCH_POLLS = 120
-const SWITCH_START_WATCH_INTERVAL_MS = 1_000
-
-/** One switch, from the chat's stop. Accepted, it is saved on the chat it left. */
-export type SwitchClaim = TerminalSwitchDescriptor & {
-  chatSessionId: string
-  at: number
-  accepted: boolean
-  /** The descriptor holds this generation; later evidence only updates it. */
-  saved: boolean
-  /** Evidence learned but not yet saved; the next observation retries it. */
-  unsaved?: boolean
-}
-
-export const switchMovingRefusal = () =>
-  agentSessionRefusalError('agent_session_operation_invalid', {
-    reason: 'conversationMovingToTerminal'
-  })
-export const switchHeldRefusal = () =>
-  agentSessionRefusalError('agent_session_conflict', { reason: 'conversationHeldElsewhere' })
-
-export abstract class OrcaRuntimeWithStructuredSessionSwitchClaims extends OrcaRuntimeWithGetWorktreePs {
-  private readonly switchClaims = new Map<string, SwitchClaim>()
-  private switchClaimsLoaded: Promise<void> | null = null
-
-  protected switchClaimsFor(agent: string, id: string): SwitchClaim[] {
-    return [...this.switchClaims.values()].filter((claim) => {
-      if (!claim.accepted && Date.now() - claim.at >= UNACCEPTED_SWITCH_CLAIM_MS) {
-        this.switchClaims.delete(claim.generation)
-        return false
-      }
-      return claim.providerSessionId === id && chatAgentsShareConversations(claim.agent, agent)
-    })
-  }
-
-  /** Accepted switches saved before a restart stay owed until their owner proves them over. */
-  protected loadSwitchClaims(): Promise<void> {
-    this.switchClaimsLoaded ??= this.openAgentSessionRecordStore().then(
-      (store) => {
-        for (const { sessionId, terminalSwitch } of store.listRecords()) {
-          if (isTerminalSwitchDescriptor(terminalSwitch)) {
-            const claim = {
-              ...terminalSwitch,
-              processes: [...terminalSwitch.processes],
-              chatSessionId: sessionId,
-              at: 0,
-              accepted: true,
-              saved: true
-            }
-            this.switchClaims.set(
-              terminalSwitch.generation,
-              this.switchClaims.get(claim.generation) ?? claim
-            )
-          }
-        }
-      },
-      (error: unknown) => {
-        this.switchClaimsLoaded = null
-        throw error
-      }
-    )
-    return this.switchClaimsLoaded
-  }
-
-  /** After a restart, a reattached switch terminal asks the original owner for its binding;
-   *  the stamp is rebuilt from the saved switch and that answer, never persisted itself. */
-  override registerPty(...args: Parameters<OrcaRuntimeWithGetWorktreePs['registerPty']>): void {
-    super.registerPty(...args)
-    const reattached = args[3]?.providerReattachLaunchIdentity
-    if (!reattached || !adoptsCliConversations(reattached.launchAgent)) {
-      return
-    }
-    void this.loadSwitchClaims()
-      .then(async () => {
-        for (const claim of this.switchClaims.values()) {
-          const seen = claim.accepted ? await this.observeSwitch(claim, false) : null
-          if (seen?.state === 'bound' && seen.ptyId === args[0]) {
-            await this.noteSwitchBound(claim, seen)
-          }
-        }
-      })
-      .catch(() => undefined)
-  }
-
-  /** Presents a switch's conversation on its pane, only while that pane runs its exact execution. */
-  private presentSwitchBinding(claim: SwitchClaim): void {
-    const pty = claim.ptyId ? this.ptysById.get(claim.ptyId) : undefined
-    if (
-      !pty?.incarnationId ||
-      pty.incarnationId !== claim.incarnationId ||
-      pty.paneKey !== claim.paneKey ||
-      this.switchClaims.get(claim.generation) !== claim
-    ) {
-      return
-    }
-    const row = this.getAgentProviderSessionRows().find(
-      (candidate) =>
-        candidate.paneKey === claim.paneKey &&
-        candidate.providerSession?.id === claim.providerSessionId
-    )
-    seedResumeLaunchIdentity({
-      paneKey: claim.paneKey,
-      launchAgent: claim.agent,
-      resumeProviderSession: row?.providerSession ?? {
-        key: 'session_id',
-        id: claim.providerSessionId
-      },
-      worktreeId: pty.worktreeId,
-      launchedAt: 0,
-      execution: { ptyId: pty.ptyId, incarnationId: pty.incarnationId }
-    })
-  }
-
-  /** Throws while a switch of this conversation exists: one no terminal took yet, or with `all`, any. */
-  protected assertNoPendingSwitch(agent: string, id: string, all = false): void {
-    if (this.switchClaimsFor(agent, id).some((claim) => all || !claim.accepted)) {
-      throw switchMovingRefusal()
-    }
-  }
-
-  /** The owner a fresh switch start here would go to; null when this route cannot hold one. */
-  async terminalSwitchOwner(): Promise<string | null> {
-    return (await this.ptyController?.terminalSwitches?.owner().catch(() => null)) ?? null
-  }
-
-  /** In the chat's ordered step before its stop: one switch of a conversation at a time. */
-  registerSwitchClaim(
-    agent: string,
-    id: string,
-    chatSessionId: string,
-    owner: string
-  ): SwitchClaim {
-    if (this.switchClaimsFor(agent, id).length > 0) {
-      throw switchHeldRefusal()
-    }
-    const claim: SwitchClaim = {
-      generation: randomUUID(),
-      agent,
-      providerSessionId: id,
-      owner,
-      paneKey: '',
-      processes: [],
-      chatSessionId,
-      at: Date.now(),
-      accepted: false,
-      saved: false
-    }
-    this.switchClaims.set(claim.generation, claim)
-    return claim
-  }
-
-  /** Only a recipe no terminal took can be withdrawn. */
-  dropSwitchClaim(claim: SwitchClaim): void {
-    if (!claim.accepted) {
-      this.switchClaims.delete(claim.generation)
-    }
-  }
-
-  /** Synchronous, before the switch spawn's first await. A generation takes one pane; a retry there
-   *  joins it, and an expired or unknown recipe is refused, never reminted. */
-  acceptSwitchStart(generation: string, paneKey: string): SwitchClaim | null {
-    const claim = this.switchClaims.get(generation)
-    if (
-      !claim ||
-      (claim.accepted
-        ? claim.paneKey !== paneKey
-        : Date.now() - claim.at >= UNACCEPTED_SWITCH_CLAIM_MS)
-    ) {
-      return null
-    }
-    Object.assign(claim, { accepted: true, paneKey })
-    return claim
-  }
-
-  /** Saved before dispatch, so a restart still knows the start may exist. A retired claim's
-   *  late evidence never writes, and the store only updates the generation it holds. */
-  async saveSwitchClaim(claim: SwitchClaim): Promise<boolean> {
-    claim.boot ??= await readSwitchHostBoot()
-    const { chatSessionId, at: _at, accepted: _a, saved, unsaved: _u, ...descriptor } = claim
-    if (saved && this.switchClaims.get(claim.generation) !== claim) {
-      return false
-    }
-    const store = await this.openAgentSessionRecordStore()
-    // A copy: the store freezes what it commits, and this claim keeps collecting evidence.
-    const snapshot = { ...descriptor, processes: [...descriptor.processes] }
-    const next = await writeTerminalSwitch(
-      store,
-      chatSessionId,
-      saved ? { update: snapshot } : { accept: snapshot }
-    ).catch(() => null)
-    const ok = next?.terminalSwitch?.generation === claim.generation
-    Object.assign(claim, { saved: saved || ok, unsaved: !ok })
-    return ok
-  }
-
-  /** The owner's fields for the dispatch; evidence collection starts with it and decides nothing. */
-  dispatchSwitchStart(claim: SwitchClaim): { switchGeneration: string; switchOwner: string } {
-    void this.watchSwitchStart(claim).catch((error: unknown) =>
-      console.warn('[agent-session] could not watch a switched terminal start', error)
-    )
-    return { switchGeneration: claim.generation, switchOwner: claim.owner }
-  }
-
-  /** The owner's word; when it is gone, only the execution it recorded can prove the start over.
-   *  `fence` makes an unseen generation unusable, so its absence is a proved non-start. */
-  protected async observeSwitch(
-    claim: SwitchClaim,
-    fence: boolean
-  ): Promise<TerminalSwitchObservation> {
-    const answers = await this.ptyController?.terminalSwitches
-      ?.observe(claim.generation, fence)
-      .catch(() => null)
-    const own = answers?.find((answer) => answer.owner === claim.owner)
-    // An owner that could not answer is not a lost one.
-    if (own || !answers) {
-      return own?.observation ?? { state: 'unverifiable' }
-    }
-    // Every reachable owner answered and none is this one: only the execution can end it.
-    // Only clock-free facts prove a later boot; a wall clock can step without one.
-    if (claim.boot && isLaterSwitchHostBoot(claim.boot, await readSwitchHostBoot())) {
-      return { state: 'ended' }
-    }
-    const recorded = claim.shell ? [claim.shell, ...claim.processes] : []
-    const verdicts = await Promise.all(recorded.map(switchStartProcessVerdict))
-    return recorded.length > 0 && verdicts.every((verdict) => verdict === 'exited')
-      ? { state: 'ended' }
-      : { state: 'unverifiable' }
-  }
-
-  /** The exact execution the owner bound, saved with its shell's identity. */
-  protected async noteSwitchBound(
-    claim: SwitchClaim,
-    bound: Extract<TerminalSwitchObservation, { state: 'bound' }>
-  ): Promise<void> {
-    if (
-      claim.ptyId === bound.ptyId &&
-      claim.incarnationId === bound.incarnationId &&
-      (claim.shell || !bound.shellPid) &&
-      !claim.unsaved
-    ) {
-      this.presentSwitchBinding(claim)
-      return
-    }
-    const shell = bound.shellPid ? await readSwitchShellProcess(bound.shellPid) : null
-    Object.assign(claim, { ptyId: bound.ptyId, incarnationId: bound.incarnationId })
-    if (shell) {
-      claim.shell = shell
-    }
-    await this.saveSwitchClaim(claim)
-    this.presentSwitchBinding(claim)
-  }
-
-  protected async releaseSwitchClaim(claim: SwitchClaim): Promise<void> {
-    if (this.switchClaims.get(claim.generation) !== claim) {
-      return
-    }
-    this.switchClaims.delete(claim.generation)
-    const store = await this.openAgentSessionRecordStore()
-    await writeTerminalSwitch(store, claim.chatSessionId, { clear: claim.generation }).catch(
-      (error: unknown) => console.warn('[agent-session] could not clear a finished switch', error)
-    )
-  }
-
-  /** An authentic hook's process joins the evidence; identity-only rows carry none. */
-  protected noteSwitchStartProcess(
-    ptyId: string,
-    conversation: { agent: string; id: string },
-    process: AgentProcessIdentity
-  ): void {
-    for (const claim of this.switchClaimsFor(conversation.agent, conversation.id)) {
-      if (
-        claim.ptyId === ptyId &&
-        !claim.processes.some((known) => isSameAgentProcess(known, process))
-      ) {
-        claim.processes.push(process)
-        void this.saveSwitchClaim(claim)
-      }
-    }
-  }
-
-  /** Bounded evidence collection only: it records identities and never fences or releases. */
-  private async watchSwitchStart(claim: SwitchClaim): Promise<void> {
-    for (let poll = 0; poll < SWITCH_START_WATCH_POLLS && claim.processes.length === 0; poll++) {
-      await new Promise((resolve) => setTimeout(resolve, SWITCH_START_WATCH_INTERVAL_MS).unref?.())
-      if (this.switchClaims.get(claim.generation) !== claim) {
-        return
-      }
-      const seen = await this.observeSwitch(claim, false)
-      if (seen.state === 'ended') {
-        return
-      }
-      if (seen.state === 'bound' && seen.shellPid) {
-        await this.noteSwitchBound(claim, seen)
-        const found = await readSwitchPaneAgentProcesses(seen.shellPid, claim.providerSessionId)
-        if (found.length > 0 && claim.processes.length === 0) {
-          claim.processes.push(...found)
-          await this.saveSwitchClaim(claim)
-        }
-      }
-    }
-  }
-}
diff --git a/src/main/runtime/session-tabs/structured-session-switch-observation.test.ts b/src/main/runtime/session-tabs/structured-session-switch-observation.test.ts
deleted file mode 100644
index 21579eb6c2ae..000000000000
--- a/src/main/runtime/session-tabs/structured-session-switch-observation.test.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import { switchStartProcessVerdict } from './structured-session-switch-observation'
-
-const table = vi.hoisted(() => {
-  const state: {
-    created: number | null
-    rows: { pid: number; ppid: number; name: string; creationTimeMs?: number }[]
-  } = { created: null, rows: [] }
-  return state
-})
-vi.mock('../../windows/windows-process-table', () => ({
-  isWindowsProcessStartTimeAvailable: () => true,
-  readWindowsProcessCreationTime: () => table.created,
-  readWindowsProcessIdentityTableFresh: async () => table.rows,
-  readWindowsProcessTableFresh: async () => []
-}))
-
-const AGENT = { pid: 4242, platform: 'win32', startTime: '1000' } as const
-const platform = process.platform
-beforeEach(() => Object.defineProperty(process, 'platform', { value: 'win32' }))
-afterEach(() => Object.defineProperty(process, 'platform', { value: platform }))
-
-it('reads an unreadable Windows identity as unverifiable, and only absence or reuse as exited', async () => {
-  table.created = null
-  table.rows = [{ pid: 4242, ppid: 1, name: 'codex.exe' }]
-  expect(await switchStartProcessVerdict(AGENT)).toBe('unverifiable')
-  table.rows = []
-  expect(await switchStartProcessVerdict(AGENT)).toBe('unverifiable')
-  table.rows = [{ pid: 7, ppid: 1, name: 'other.exe' }]
-  expect(await switchStartProcessVerdict(AGENT)).toBe('exited')
-  table.rows = [{ pid: 4242, ppid: 1, name: 'codex.exe', creationTimeMs: 2000 }]
-  expect(await switchStartProcessVerdict(AGENT)).toBe('exited')
-  table.created = 1000
-  expect(await switchStartProcessVerdict(AGENT)).toBe('live')
-})
diff --git a/src/main/runtime/session-tabs/structured-session-switch-observation.ts b/src/main/runtime/session-tabs/structured-session-switch-observation.ts
deleted file mode 100644
index b2968739d7bf..000000000000
--- a/src/main/runtime/session-tabs/structured-session-switch-observation.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-import type {
-  AgentProcessIdentity,
-  AgentProcessVerdict
-} from '../../../shared/agent-process-presence'
-import {
-  probeAgentProcessPresence,
-  readAgentProcess
-} from '../../../shared/agent-process-presence-probe'
-import {
-  buildProcessTableIndex,
-  collectDescendantsFromIndex
-} from '../../../shared/process-table-index'
-import { getFreshShellForegroundSnapshot } from '../../../shared/process-table-snapshot-reader'
-import {
-  isWindowsProcessStartTimeAvailable,
-  readWindowsProcessCreationTime,
-  readWindowsProcessIdentityTableFresh,
-  readWindowsProcessTableFresh
-} from '../../windows/windows-process-table'
-
-/** The processes below a pane's shell whose command line names the conversation: what the switch
- *  typed there. Session leaders left the terminal (a prompt's worker), so they are not its job. */
-export async function readSwitchPaneAgentProcesses(
-  rootPid: number,
-  conversationId: string
-): Promise<AgentProcessIdentity[]> {
-  if (process.platform === 'win32') {
-    if (!isWindowsProcessStartTimeAvailable()) {
-      return []
-    }
-    const index = buildProcessTableIndex(await readWindowsProcessTableFresh())
-    return collectDescendantsFromIndex(index, rootPid).flatMap((row) =>
-      row.command.includes(conversationId) && row.creationTimeMs
-        ? [{ pid: row.pid, platform: 'win32' as const, startTime: String(row.creationTimeMs) }]
-        : []
-    )
-  }
-  const platform = process.platform
-  if (platform !== 'darwin' && platform !== 'linux') {
-    return []
-  }
-  const index = buildProcessTableIndex(await getFreshShellForegroundSnapshot())
-  const named = collectDescendantsFromIndex(index, rootPid, (row) => row.stat.includes('s')).filter(
-    (row) => row.command.includes(conversationId)
-  )
-  const identities = await Promise.all(
-    named.map(async (row) => {
-      const observed = await readAgentProcess(row.pid)
-      return observed.verdict === 'live' && !observed.zombie
-        ? [{ pid: row.pid, platform, startTime: observed.startTime }]
-        : []
-    })
-  )
-  return identities.flat()
-}
-
-/** The shell's own identity, so a later owner loss can still be judged by its process. */
-export async function readSwitchShellProcess(pid: number): Promise<AgentProcessIdentity | null> {
-  if (process.platform === 'win32') {
-    const created = isWindowsProcessStartTimeAvailable()
-      ? readWindowsProcessCreationTime(pid)
-      : null
-    return created === null ? null : { pid, platform: 'win32', startTime: String(created) }
-  }
-  const platform = process.platform
-  if (platform !== 'darwin' && platform !== 'linux') {
-    return null
-  }
-  const observed = await readAgentProcess(pid)
-  return observed.verdict === 'live' ? { pid, platform, startTime: observed.startTime } : null
-}
-
-/** `exited` only on proof: the pid is gone or now names a different process. */
-export async function switchStartProcessVerdict(
-  identity: AgentProcessIdentity
-): Promise<AgentProcessVerdict> {
-  if (identity.platform !== 'win32') {
-    return probeAgentProcessPresence(identity)
-  }
-  if (process.platform !== 'win32' || !isWindowsProcessStartTimeAvailable()) {
-    return 'unverifiable'
-  }
-  const created = readWindowsProcessCreationTime(identity.pid)
-  if (created !== null) {
-    return String(created) === identity.startTime ? 'live' : 'exited'
-  }
-  // An unreadable pid is not an absent one: only a fresh table's own listing proves it is gone.
-  const rows = await readWindowsProcessIdentityTableFresh().catch(() => [])
-  const row = rows.find((candidate) => candidate.pid === identity.pid)
-  if (rows.length > 0 && !row) {
-    return 'exited'
-  }
-  return row?.creationTimeMs && String(row.creationTimeMs) !== identity.startTime
-    ? 'exited'
-    : 'unverifiable'
-}
diff --git a/src/main/runtime/session-tabs/structured-session-terminal-launch-retirement.ts b/src/main/runtime/session-tabs/structured-session-terminal-launch-retirement.ts
new file mode 100644
index 000000000000..4d133cc7265f
--- /dev/null
+++ b/src/main/runtime/session-tabs/structured-session-terminal-launch-retirement.ts
@@ -0,0 +1,62 @@
+import { LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host'
+import type { TerminalLaunchResult } from '../../../shared/agent-session-resume'
+import { getStructuredAgentSessionHost } from '../../native-chat/agent-session-wire/structured-agent-session-registry'
+import { listStructuredProviderSessionOwnership } from '../../native-chat/agent-session-wire/structured-provider-session-ownership'
+import {
+  keysMayMatch,
+  terminalConversationKey
+} from '../../native-chat/structured-conversation-key'
+
+/** Presentation only: a delayed successful spawn must never close a newer native child. */
+export async function retireChatForAdmittedTerminalLaunch(
+  runtime: { retireStructuredAgentSessionTabFromSnapshot(sessionId: string): boolean } | undefined,
+  args: { resumeOrigin?: unknown; worktreeId?: unknown },
+  result: TerminalLaunchResult & { isReattach?: boolean }
+): Promise<void> {
+  const decision = result.savedResumeDecision
+  if (
+    args.resumeOrigin !== 'switch' ||
+    result.isReattach ||
+    decision?.verdict !== 'admitted' ||
+    result.agentResumeRefused ||
+    result.agentResumeUnavailable
+  ) {
+    return
+  }
+  const host = getStructuredAgentSessionHost()
+  if (!host) {
+    return
+  }
+  const key = terminalConversationKey(decision.agent, decision.providerSession.id)
+  const holders = listStructuredProviderSessionOwnership(host.deps.store.listRecords()).filter(
+    (holding) => holding.role === 'head' && keysMayMatch(holding.key, key)
+  )
+  for (const holding of holders) {
+    const record = host.deps.store.getRecord(holding.sessionId)
+    if (
+      record?.location.executionHostId !== LOCAL_EXECUTION_HOST_ID ||
+      record.location.workspaceId !== args.worktreeId
+    ) {
+      continue
+    }
+    try {
+      await host.setSessionTabVisibility(holding.sessionId, false)
+    } catch (error) {
+      // The terminal is admitted regardless of a failed visibility write; never stop another child.
+      host.deps.logger.warn('recording a switched chat tab retirement failed', {
+        scope: 'switch-tab-retirement',
+        sessionId: holding.sessionId,
+        error
+      })
+    }
+    try {
+      runtime?.retireStructuredAgentSessionTabFromSnapshot(holding.sessionId)
+    } catch (error) {
+      host.deps.logger.warn('publishing a switched chat tab retirement failed', {
+        scope: 'switch-tab-retirement',
+        sessionId: holding.sessionId,
+        error
+      })
+    }
+  }
+}
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-renderer-create.ts b/src/main/runtime/terminal/launch/mobile-terminal-renderer-create.ts
index c6ad23fd1e90..8bd9b5a60b8c 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-renderer-create.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-renderer-create.ts
@@ -37,7 +37,7 @@ export type MobileTerminalCreateOptions = {
   agentPrompt?: string
   launchConfig?: SleepingAgentLaunchConfig
   launchAgent?: TuiAgent
-  /** A switch's start: its spawn admission judges and claims the conversation. */
+  /** A switch's start: its ordinary spawn admission checks the conversation. */
   resumeProviderSession?: AgentProviderSessionMetadata
   resumeOrigin?: 'switch'
   viewMode?: 'terminal' | 'chat'
diff --git a/src/main/startup/main-window-agent-status.ts b/src/main/startup/main-window-agent-status.ts
index 749652e70918..fb4e94e2461b 100644
--- a/src/main/startup/main-window-agent-status.ts
+++ b/src/main/startup/main-window-agent-status.ts
@@ -25,7 +25,6 @@ export function installMainWindowAgentStatusListeners(options: MainWindowAgentSt
       launchToken,
       providerSession,
       providerSessionOnly,
-      launchExecution,
       promptInteractionKey,
       restoredUnconfirmed,
       observation,
@@ -57,7 +56,6 @@ export function installMainWindowAgentStatusListeners(options: MainWindowAgentSt
           stateStartedAt,
           ...(providerSession ? { providerSession } : {}),
           ...(observation ? { observation } : {}),
-          ...(launchExecution ? { launchExecution } : {}),
           providerSessionOnly: true
         })
         return
diff --git a/src/renderer/src/components/native-chat/NativeChatTopRightControls.tsx b/src/renderer/src/components/native-chat/NativeChatTopRightControls.tsx
index 1d544b074566..d37d5477a87c 100644
--- a/src/renderer/src/components/native-chat/NativeChatTopRightControls.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatTopRightControls.tsx
@@ -3,7 +3,7 @@ import { Button } from '@/components/ui/button'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import { translate } from '@/i18n/i18n'
 import { useAppStore } from '@/store'
-import { useInPlaceSwitchSupported } from '@/lib/in-place-switch-support'
+import { useInPlaceSwitchCapability } from '@/lib/in-place-switch-support'
 import { AI_VAULT_AGENTS } from '../../../../shared/ai-vault-types'
 import { SwitchToCliTooltipText } from '../right-sidebar/ai-vault-session-cli-fork-copy'
 import {
@@ -38,12 +38,12 @@ export function NativeChatTopRightControls({
     return subject?.kind === 'chat' ? subject.request.executionHostScope : null
   })
   const agent = AI_VAULT_AGENTS.find((candidate) => candidate === session.agent)
-  const inPlace = useInPlaceSwitchSupported(hostId, agent)
+  const inPlace = useInPlaceSwitchCapability(hostId, agent)
   const pending = useNativeChatCliSwitchPending(session.sessionId)
   if (find.isOpen) {
     return <NativeChatFindBar find={find} isVisible={session.isVisible} />
   }
-  if (!worktreeId || !hostId || !agent || !inPlace) {
+  if (!worktreeId || !hostId || !agent || (inPlace === false && agent !== 'omp')) {
     return null
   }
   const label = translate('components.tab.bar.switch.toCli', 'Switch to CLI')
@@ -58,9 +58,9 @@ export function NativeChatTopRightControls({
             aria-label={label}
             // Not `disabled` while a reply runs: the tooltip has to say why.
             aria-disabled={working || undefined}
-            disabled={pending}
+            disabled={pending || inPlace !== true}
             onClick={() => {
-              if (!working) {
+              if (!working && inPlace === true) {
                 void runNativeChatCliSwitch({
                   sessionId: session.sessionId,
                   workspaceId: worktreeId,
@@ -75,7 +75,13 @@ export function NativeChatTopRightControls({
           </Button>
         </TooltipTrigger>
         <TooltipContent side="bottom" sideOffset={4}>
-          {working ? (
+          {inPlace === false ? (
+            translate(
+              'components.tab.bar.switch.unavailable',
+              'Switching {{agent}} is not available yet.',
+              { agent: session.agent }
+            )
+          ) : working ? (
             translate(
               'components.tab.bar.switch.waitForReply',
               'Wait for the reply to finish or stop it, then switch.'
diff --git a/src/renderer/src/components/native-chat/agent-session-failure-words-text.ts b/src/renderer/src/components/native-chat/agent-session-failure-words-text.ts
index 6763d6fbdb6a..cc28ce185d28 100644
--- a/src/renderer/src/components/native-chat/agent-session-failure-words-text.ts
+++ b/src/renderer/src/components/native-chat/agent-session-failure-words-text.ts
@@ -155,11 +155,6 @@ const PIECES: Record<AgentSessionFailureCopyId, (values: AgentSessionFailureCopy
         'components.native-chat.failureWords.conversationOpenElsewhere',
         COPY.conversationOpenElsewhere
       ),
-    conversationMovingToTerminal: () =>
-      translate(
-        'components.native-chat.failureWords.conversationMovingToTerminal',
-        COPY.conversationMovingToTerminal
-      ),
     conversationOpenInTerminal: (values) =>
       translate(
         'components.native-chat.failureWords.conversationOpenInTerminal',
diff --git a/src/renderer/src/components/right-sidebar/AiVaultSessionActionMenuItems.tsx b/src/renderer/src/components/right-sidebar/AiVaultSessionActionMenuItems.tsx
index d963dcb4ab6b..4642d7ca8611 100644
--- a/src/renderer/src/components/right-sidebar/AiVaultSessionActionMenuItems.tsx
+++ b/src/renderer/src/components/right-sidebar/AiVaultSessionActionMenuItems.tsx
@@ -37,7 +37,8 @@ export function SessionActionMenuItems({
   onOpenCwd,
   deleteBlockedReason,
   onDelete,
-  inPlaceAgent
+  inPlaceAgent,
+  switchLoading
 }: {
   menuKind?: 'dropdown' | 'context'
   resumeDisabled: boolean
@@ -63,6 +64,7 @@ export function SessionActionMenuItems({
   // Null when Delete is offered; otherwise the tooltip explaining why it isn't.
   deleteBlockedReason: string | null
   onDelete?: () => void
+  switchLoading?: boolean
   inPlaceAgent?: AiVaultAgent
 }) {
   const Item = menuKind === 'context' ? ContextMenuItem : DropdownMenuItem
@@ -130,6 +132,7 @@ export function SessionActionMenuItems({
         onResumeInNewChat={onResumeInNewChat}
         onResumeInNewCli={onResumeInNewCli}
         inPlaceAgent={inPlaceAgent}
+        switchLoading={switchLoading}
       />
       {onCopyResume ? (
         <Item onSelect={onCopyResume}>
diff --git a/src/renderer/src/components/right-sidebar/AiVaultSessionDetailsSwitchButtons.tsx b/src/renderer/src/components/right-sidebar/AiVaultSessionDetailsSwitchButtons.tsx
index 51bc820f6b18..a871edbd9546 100644
--- a/src/renderer/src/components/right-sidebar/AiVaultSessionDetailsSwitchButtons.tsx
+++ b/src/renderer/src/components/right-sidebar/AiVaultSessionDetailsSwitchButtons.tsx
@@ -2,7 +2,7 @@ import { MessagesSquare, SquareTerminal } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import { translate } from '@/i18n/i18n'
-import { useAiVaultInPlaceAgent } from '@/lib/in-place-switch-support'
+import { useAiVaultInPlaceAgent, useInPlaceSwitchCapability } from '@/lib/in-place-switch-support'
 import type { AiVaultSession } from '../../../../shared/ai-vault-types'
 import { ResumeInNewCliTooltipText, SwitchToCliTooltipText } from './ai-vault-session-cli-fork-copy'
 
@@ -17,6 +17,8 @@ export function AiVaultSessionDetailsSwitchButtons({
   onResumeInNewCli?: () => void
 }): React.JSX.Element {
   const inPlaceAgent = useAiVaultInPlaceAgent(session)
+  const switchLoading =
+    useInPlaceSwitchCapability(session.executionHostId, session.agent) === undefined
   return (
     <>
       {onResumeInNewChat ? (
@@ -25,6 +27,7 @@ export function AiVaultSessionDetailsSwitchButtons({
           variant="secondary"
           size="xs"
           draggable={false}
+          disabled={switchLoading}
           onClick={(event) => {
             event.stopPropagation()
             onResumeInNewChat()
@@ -48,6 +51,7 @@ export function AiVaultSessionDetailsSwitchButtons({
               variant="secondary"
               size="xs"
               draggable={false}
+              disabled={switchLoading}
               onClick={(event) => {
                 event.stopPropagation()
                 onResumeInNewCli()
diff --git a/src/renderer/src/components/right-sidebar/AiVaultSessionRow.tsx b/src/renderer/src/components/right-sidebar/AiVaultSessionRow.tsx
index 18aa403119ce..83f0ed1f34be 100644
--- a/src/renderer/src/components/right-sidebar/AiVaultSessionRow.tsx
+++ b/src/renderer/src/components/right-sidebar/AiVaultSessionRow.tsx
@@ -1,4 +1,4 @@
-import { useAiVaultInPlaceAgent } from '@/lib/in-place-switch-support'
+import { useAiVaultInPlaceAgent, useInPlaceSwitchCapability } from '@/lib/in-place-switch-support'
 import { isAntigravityReferenceSession } from '../../../../shared/antigravity-session-origin'
 import type { AiVaultSubagentResumeActions } from './AiVaultSessionSubagents'
 import { useCallback } from 'react'
@@ -103,6 +103,8 @@ export function VaultSessionRow({
   const title = useAiVaultSessionDisplayTitle(session)
   const detailsId = getSessionDetailsId(session.id)
   const inPlaceAgent = useAiVaultInPlaceAgent(session)
+  const switchLoading =
+    useInPlaceSwitchCapability(session.executionHostId, session.agent) === undefined
   const latestTurn = latestSessionConversationTurn(session)
   // Computed once so the dropdown menu and the context menu never disagree.
   const deleteBlockedReason = onRequestDelete
@@ -289,6 +291,7 @@ export function VaultSessionRow({
           onResumeInNewChat={onResumeInNewChat}
           onResumeInNewCli={onResumeInNewCli}
           inPlaceAgent={inPlaceAgent}
+          switchLoading={switchLoading}
           onCopyResume={onCopyResume}
           onCopyId={onCopyId}
           onCopyPath={onCopyPath}
diff --git a/src/renderer/src/components/right-sidebar/AiVaultSessionSurfaceSwitchMenuItems.tsx b/src/renderer/src/components/right-sidebar/AiVaultSessionSurfaceSwitchMenuItems.tsx
index 1fa66f84b6b4..cc098ca995dd 100644
--- a/src/renderer/src/components/right-sidebar/AiVaultSessionSurfaceSwitchMenuItems.tsx
+++ b/src/renderer/src/components/right-sidebar/AiVaultSessionSurfaceSwitchMenuItems.tsx
@@ -17,7 +17,8 @@ export function AiVaultSessionSurfaceSwitchMenuItems({
   onResumeInNewChat,
   onResumeInNewCli,
   cliPending = false,
-  inPlaceAgent
+  inPlaceAgent,
+  switchLoading = false
 }: {
   action: 'resume' | 'switch'
   menuKind: 'dropdown' | 'context'
@@ -27,6 +28,7 @@ export function AiVaultSessionSurfaceSwitchMenuItems({
   onResumeInNewCli?: (event: Event) => void
   cliPending?: boolean
   /** The agent whose conversation switches in place on its host; unset keeps the new-tab entries. */
+  switchLoading?: boolean
   inPlaceAgent?: AiVaultAgent
 }): React.JSX.Element {
   const inPlace = inPlaceAgent !== undefined
@@ -36,7 +38,7 @@ export function AiVaultSessionSurfaceSwitchMenuItems({
       {onResumeInNewChat ? (
         <Item
           onSelect={onResumeInNewChat}
-          disabled={chatPending}
+          disabled={chatPending || switchLoading}
           aria-busy={chatPending || undefined}
         >
           <MessagesSquare className="size-3.5" />
@@ -51,7 +53,11 @@ export function AiVaultSessionSurfaceSwitchMenuItems({
       {onResumeInNewCli ? (
         <Tooltip>
           <TooltipTrigger asChild>
-            <Item onSelect={onResumeInNewCli} disabled={cliPending} aria-busy={cliPending}>
+            <Item
+              onSelect={onResumeInNewCli}
+              disabled={cliPending || switchLoading}
+              aria-busy={cliPending}
+            >
               {cliPending ? (
                 <LoadingSpinner className="size-3.5" />
               ) : (
diff --git a/src/renderer/src/components/right-sidebar/SessionRowTrailingActions.tsx b/src/renderer/src/components/right-sidebar/SessionRowTrailingActions.tsx
index 002ce322dc59..917607d34c7e 100644
--- a/src/renderer/src/components/right-sidebar/SessionRowTrailingActions.tsx
+++ b/src/renderer/src/components/right-sidebar/SessionRowTrailingActions.tsx
@@ -1,4 +1,4 @@
-import { useAiVaultInPlaceAgent } from '@/lib/in-place-switch-support'
+import { useAiVaultInPlaceAgent, useInPlaceSwitchCapability } from '@/lib/in-place-switch-support'
 import type React from 'react'
 import {
   ChevronDown,
@@ -97,6 +97,8 @@ export function SessionRowTrailingActions({
   actionsHidden?: boolean
 }) {
   const inPlaceAgent = useAiVaultInPlaceAgent(session)
+  const switchLoading =
+    useInPlaceSwitchCapability(session.executionHostId, session.agent) === undefined
   const jumpToWorktreeTooltip = aiVaultWorktreeJumpTooltip(worktreeInfo)
 
   return (
@@ -277,6 +279,7 @@ export function SessionRowTrailingActions({
               onResumeInNewChat={onResumeInNewChat}
               onResumeInNewCli={onResumeInNewCli}
               inPlaceAgent={inPlaceAgent}
+              switchLoading={switchLoading}
               onJumpToOriginalPane={onJumpToOriginalPane}
               showJumpToWorktree={showJumpToWorktree}
               jumpWorkspaceId={worktreeInfo?.worktreeId}
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts b/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts
index 969c8253a9bb..446245eaaf09 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts
@@ -1,3 +1,6 @@
+import { switchIntoOwner } from '../tab-bar/cli-chat-resume-feedback'
+import { structuredAgentSessionTargetForHost } from '@/runtime/structured-agent-session-owner'
+import { cliConversationRowsShareAgent } from '../../../../shared/structured-agent-cli-conversation-adoption'
 import { useAppStore } from '@/store'
 import { collectAgentPaneConversations } from '@/lib/ai-vault-tab-title-requests'
 import { inPlaceSwitchSupportedNow } from '@/lib/in-place-switch-support'
@@ -32,13 +35,18 @@ export function switchAiVaultSessionToCli(session: AiVaultSession): boolean {
 /** History's "Switch to native chat": in place when a pane in this window last reported the
  *  conversation. False otherwise, so the row opens or reveals its chat in a new tab. */
 export function switchAiVaultSessionToNativeChat(session: AiVaultSession): boolean {
-  if (!inPlaceSwitchSupportedNow(session.executionHostId, session.agent)) {
+  if (
+    !adoptsCliConversations(session.agent) ||
+    !inPlaceSwitchSupportedNow(session.executionHostId, session.agent)
+  ) {
     return false
   }
+  const agent = session.agent
   const state = useAppStore.getState()
   const pane = collectAgentPaneConversations(state, adoptsCliConversations).find(
     (candidate) =>
       candidate.providerSession.id === session.sessionId &&
+      cliConversationRowsShareAgent(candidate.agent, agent) &&
       candidate.executionHostId === session.executionHostId
   )
   const source = pane
@@ -48,7 +56,16 @@ export function switchAiVaultSessionToNativeChat(session: AiVaultSession): boole
       })
     : null
   if (!source) {
-    return false
+    const target = structuredAgentSessionTargetForHost(session.executionHostId)
+    if (!target || !session.structuredSession || !adoptsCliConversations(session.agent)) {
+      return false
+    }
+    void switchIntoOwner(
+      { agent: session.agent, tabId: '', workspaceId: session.structuredSession.workspaceId },
+      session.structuredSession,
+      target
+    )
+    return true
   }
   void runCliChatResume(source)
   return true
diff --git a/src/renderer/src/components/tab-bar/CliChatResumeMenuItems.tsx b/src/renderer/src/components/tab-bar/CliChatResumeMenuItems.tsx
index aef7714957c0..168e6c7659d2 100644
--- a/src/renderer/src/components/tab-bar/CliChatResumeMenuItems.tsx
+++ b/src/renderer/src/components/tab-bar/CliChatResumeMenuItems.tsx
@@ -1,9 +1,9 @@
-import { useState } from 'react'
+import { useShallow } from 'zustand/react/shallow'
 import { useAppStore } from '@/store'
 import { DropdownMenuSeparator } from '@/components/ui/dropdown-menu'
 import type { TerminalTab } from '../../../../shared/terminal-tab-types'
 import { AiVaultSessionSurfaceSwitchMenuItems } from '../right-sidebar/AiVaultSessionSurfaceSwitchMenuItems'
-import { resolveCliChatResumeSource } from './cli-chat-resume-source'
+import { resolveCliChatResumeSource, useCliChatResumeCapability } from './cli-chat-resume-source'
 import { runCliChatResume, useCliChatResumePending } from './cli-chat-resume-run'
 
 export function CliChatResumeMenuItems({
@@ -15,7 +15,8 @@ export function CliChatResumeMenuItems({
   leadingSeparator: boolean
   onComplete?: () => void
 }): React.JSX.Element | null {
-  const [source] = useState(() => resolveCliChatResumeSource(useAppStore.getState(), { tab }))
+  const source = useAppStore(useShallow((state) => resolveCliChatResumeSource(state, { tab })))
+  const capability = useCliChatResumeCapability(tab.worktreeId, source?.agent)
   const pending = useCliChatResumePending(source)
   if (!source) {
     return null
@@ -24,7 +25,8 @@ export function CliChatResumeMenuItems({
     <>
       {leadingSeparator ? <DropdownMenuSeparator /> : null}
       <AiVaultSessionSurfaceSwitchMenuItems
-        action="switch"
+        action={capability === false ? 'resume' : 'switch'}
+        switchLoading={capability === undefined}
         menuKind="dropdown"
         tooltipSide="right"
         chatPending={pending}
diff --git a/src/renderer/src/components/tab-bar/NativeChatCliForkMenuItems.tsx b/src/renderer/src/components/tab-bar/NativeChatCliForkMenuItems.tsx
index b675664fc006..9af7d09d2d22 100644
--- a/src/renderer/src/components/tab-bar/NativeChatCliForkMenuItems.tsx
+++ b/src/renderer/src/components/tab-bar/NativeChatCliForkMenuItems.tsx
@@ -8,7 +8,7 @@ import {
   type NativeChatTabSession
 } from './tab-session-history-switch'
 import { runNativeChatCliFork, useNativeChatCliForkPending } from './native-chat-cli-fork-run'
-import { useInPlaceSwitchSupported } from '@/lib/in-place-switch-support'
+import { useInPlaceSwitchCapability } from '@/lib/in-place-switch-support'
 import { runNativeChatCliSwitch, useNativeChatCliSwitchPending } from './native-chat-cli-switch-run'
 
 /** "Switch to CLI" where the chat's host switches its agent in place; otherwise the fork. */
@@ -31,7 +31,7 @@ export function NativeChatCliForkMenuItems({
   const switchPending = useNativeChatCliSwitchPending(chat?.sessionId)
   const commandOverrides = useAppStore((state) => state.settings?.agentCmdOverrides)
   const agent = AI_VAULT_AGENTS.find((candidate) => candidate === nativeChat.agent)
-  const inPlace = useInPlaceSwitchSupported(chat?.request.executionHostScope, agent)
+  const inPlace = useInPlaceSwitchCapability(chat?.request.executionHostScope, agent)
   if (!chat || !agent) {
     return null
   }
@@ -42,11 +42,12 @@ export function NativeChatCliForkMenuItems({
         action="switch"
         menuKind="dropdown"
         tooltipSide="right"
-        cliPending={inPlace ? switchPending : forkPending}
-        {...(inPlace ? { inPlaceAgent: agent } : {})}
+        cliPending={inPlace !== false ? switchPending : forkPending}
+        switchLoading={inPlace === undefined}
+        {...(inPlace !== false ? { inPlaceAgent: agent } : {})}
         onResumeInNewCli={(event) => {
           event.preventDefault()
-          void (inPlace
+          void (inPlace === true
             ? runNativeChatCliSwitch({
                 sessionId: chat.sessionId,
                 workspaceId: chat.workspaceId,
diff --git a/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx b/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx
index 7164bac2963a..436ab2399fa4 100644
--- a/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx
+++ b/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx
@@ -1,3 +1,4 @@
+vi.mock('@/lib/in-place-switch-support', () => ({ useInPlaceSwitchCapability: () => false }))
 // @vitest-environment happy-dom
 import { useSyncExternalStore } from 'react'
 import { act, cleanup, fireEvent, render, screen } from '@testing-library/react'
@@ -49,7 +50,10 @@ vi.mock('./tab-session-history-switch', async (importOriginal) => ({
   resolveTabSessionHistorySubject: () => mocks.subject
 }))
 
-vi.mock('./cli-chat-resume-source', () => ({ resolveCliChatResumeSource: () => mocks.cliSource }))
+vi.mock('./cli-chat-resume-source', () => ({
+  useCliChatResumeCapability: () => true,
+  resolveCliChatResumeSource: () => mocks.cliSource
+}))
 vi.mock('./cli-chat-resume-run', () => ({
   runCliChatResume: mocks.runCliChatResume,
   useCliChatResumePending: () => false
diff --git a/src/renderer/src/components/tab-bar/TabSessionSwitchHoverAction.tsx b/src/renderer/src/components/tab-bar/TabSessionSwitchHoverAction.tsx
index b3c43402b831..47c2fb5b8310 100644
--- a/src/renderer/src/components/tab-bar/TabSessionSwitchHoverAction.tsx
+++ b/src/renderer/src/components/tab-bar/TabSessionSwitchHoverAction.tsx
@@ -4,9 +4,9 @@ import { MessagesSquare, SquareTerminal } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import { translate } from '@/i18n/i18n'
 import { useAppStore } from '@/store'
-import { useInPlaceSwitchSupported } from '@/lib/in-place-switch-support'
+import { useInPlaceSwitchCapability } from '@/lib/in-place-switch-support'
 import { AI_VAULT_AGENTS } from '../../../../shared/ai-vault-types'
-import { resolveCliChatResumeSource } from './cli-chat-resume-source'
+import { resolveCliChatResumeSource, useCliChatResumeCapability } from './cli-chat-resume-source'
 import { runCliChatResume, useCliChatResumePending } from './cli-chat-resume-run'
 import { runNativeChatCliSwitch, useNativeChatCliSwitchPending } from './native-chat-cli-switch-run'
 import {
@@ -41,16 +41,16 @@ function ChatSwitchAction({
   )
   const chat = subject?.kind === 'chat' ? subject : null
   const agent = AI_VAULT_AGENTS.find((candidate) => candidate === nativeChat.agent)
-  const inPlace = useInPlaceSwitchSupported(chat?.request.executionHostScope, agent)
+  const inPlace = useInPlaceSwitchCapability(chat?.request.executionHostScope, agent)
   const pending = useNativeChatCliSwitchPending(chat?.sessionId)
-  if (!chat || !agent || !inPlace) {
+  if (!chat || !agent || inPlace === false) {
     return null
   }
   return (
     <Button
       variant="ghost"
       size="xs"
-      disabled={pending}
+      disabled={pending || inPlace === undefined}
       onClick={() =>
         void runNativeChatCliSwitch({
           sessionId: chat.sessionId,
@@ -73,15 +73,16 @@ function TerminalSwitchAction({
   tab: { id: string; worktreeId: string }
 }): React.JSX.Element | null {
   const source = useAppStore(useShallow((state) => resolveCliChatResumeSource(state, { tab })))
+  const capability = useCliChatResumeCapability(tab.worktreeId, source?.agent)
   const pending = useCliChatResumePending(source)
-  if (!source) {
+  if (!source || capability === false) {
     return null
   }
   return (
     <Button
       variant="ghost"
       size="xs"
-      disabled={pending}
+      disabled={pending || capability === undefined}
       onClick={() => void runCliChatResume(source)}
     >
       <MessagesSquare />
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
index b37bc2f40333..25f88ce7c571 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
@@ -1,3 +1,4 @@
+import { useAppStore } from '@/store'
 import { toast } from 'sonner'
 import { translate } from '@/i18n/i18n'
 import { structuredLaunchFailure } from '@/lib/structured-agent-session-launch-failure'
@@ -32,8 +33,8 @@ export async function reportCliChatResumeFailure(
   return false
 }
 
-async function switchIntoOwner(
-  source: CliChatResumeSource,
+export async function switchIntoOwner(
+  source: Pick<CliChatResumeSource, 'agent' | 'tabId' | 'workspaceId'>,
   structuredSession: NonNullable<AiVaultSession['structuredSession']>,
   target: RuntimeClientTarget
 ): Promise<boolean> {
@@ -67,6 +68,22 @@ async function switchIntoOwner(
     undefined,
     target
   )
+  if (shown === 'activated' && structuredSession.workspaceId === source.workspaceId) {
+    const state = useAppStore.getState()
+    const tabs = state.unifiedTabsByWorktree[source.workspaceId] ?? []
+    const chat = tabs.find(
+      (tab) => tab.contentType === 'agent-session' && tab.entityId === structuredSession.sessionId
+    )
+    const group = state.groupsByWorktree[source.workspaceId]?.find((g) =>
+      g.tabOrder.includes(source.tabId)
+    )
+    if (chat && group) {
+      state.moveUnifiedTabToGroup(chat.id, group.id, {
+        index: group.tabOrder.filter((id) => id !== chat.id).indexOf(source.tabId) + 1,
+        activate: true
+      })
+    }
+  }
   return shown === 'activated'
 }
 
@@ -95,10 +112,6 @@ function toastCliChatResumeFailure(source: CliChatResumeSource, error: unknown):
     toast.error(cliConversationExitGuidance(source.agent, true))
     return
   }
-  if (refusal?.details?.reason === 'conversationMovingToTerminal') {
-    toast.error(agentSessionWriteFailureText(refusal, 'read-history'))
-    return
-  }
   if (refusal?.code === 'agent_session_identity_required') {
     if (refusal.details?.reason === 'transcriptNotFound') {
       toast.error(
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
index 36e029c0133b..db6a95985d69 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
@@ -33,7 +33,10 @@ vi.mock('../terminal-pane/pty-dispatcher', () => ({
     return () => mocks.exitWatchers.delete(ptyId)
   }
 }))
-vi.mock('./cli-chat-resume-source', () => ({ resolveCliChatResumeSource: () => mocks.source }))
+vi.mock('./cli-chat-resume-source', () => ({
+  useCliChatResumeCapability: () => {},
+  resolveCliChatResumeSource: () => mocks.source
+}))
 vi.mock('@/runtime/structured-agent-session-client', () => ({
   supportsStructuredAgentSessionCliSource: mocks.sourceCapability,
   supportsStructuredAgentSessionCreateMessage: mocks.createCapability,
@@ -83,6 +86,7 @@ import { makeWorktree } from '@/store/slices/worktrees-slice-test-fixtures'
 import type { RuntimeMobileSessionTabsResult } from '../../../../shared/runtime-types'
 import { useAppStore } from '@/store'
 import { runCliChatResume } from './cli-chat-resume-run'
+import { switchIntoOwner } from './cli-chat-resume-feedback'
 import {
   resetStructuredAgentLaunchRegistryForTests,
   structuredLaunchStates
@@ -135,6 +139,12 @@ beforeEach(() => {
   useAppStore.setState(useAppStore.getInitialState(), true)
   useAppStore.setState({ activeWorktreeId: 'wt-1' })
   mocks.source = SOURCE
+  mocks.switchCapability.mockResolvedValue(false)
+  mocks.rpc.mockImplementation(async (_target, method) =>
+    method === 'terminal.resolvePane'
+      ? { terminal: { handle: 'handle-1', ptyId: 'pty-1', incarnationId: 'i1' } }
+      : { close: { ptyKilled: true } }
+  )
   mocks.sourceCapability.mockResolvedValue(true)
   mocks.createCapability.mockResolvedValue(true)
   mocks.call.mockImplementation(
@@ -197,6 +207,42 @@ describe('CLI identity resume through the existing launch owner', () => {
     expect(isEmptyWorkspaceDefaultSurfacePending('wt-1')).toBe(false)
   })
 
+  it('publishes the returning chat after its source in the source group even while another group is active', async () => {
+    const [source] = seedTabs()
+    const other = useAppStore.getState().createEmptySplitGroup('wt-1', source.groupId, 'right')!
+    useAppStore.getState().focusGroup('wt-1', other)
+    mocks.source = { ...SOURCE, tabId: source.id, paneKey: `${source.id}:leaf` }
+    await runCliChatResume(mocks.source)
+    const chat = tabs().find((tab) => tab.contentType === 'agent-session')!
+    const group = useAppStore
+      .getState()
+      .groupsByWorktree['wt-1'].find((g) => g.id === source.groupId)!
+    expect(chat.groupId).toBe(source.groupId)
+    expect(group.tabOrder[group.tabOrder.indexOf(source.id) + 1]).toBe(chat.id)
+  })
+
+  it('moves an existing owner back to the source group and position after readiness', async () => {
+    const [source] = seedTabs()
+    const other = useAppStore.getState().createEmptySplitGroup('wt-1', source.groupId, 'right')!
+    const chat = useAppStore
+      .getState()
+      .createUnifiedTab('wt-1', 'agent-session', { entityId: 'owner-chat', targetGroupId: other })
+    mocks.switchCapability.mockResolvedValue(true)
+    mocks.call.mockResolvedValue({ ok: true })
+    expect(
+      await switchIntoOwner(
+        { agent: 'codex', tabId: source.id, workspaceId: 'wt-1' },
+        { sessionId: 'owner-chat', workspaceId: 'wt-1' },
+        { kind: 'local' }
+      )
+    ).toBe(true)
+    const group = useAppStore
+      .getState()
+      .groupsByWorktree['wt-1'].find((g) => g.id === source.groupId)!
+    expect(group.tabOrder[group.tabOrder.indexOf(source.id) + 1]).toBe(chat.id)
+    expect(tabs().find((tab) => tab.id === chat.id)?.groupId).toBe(source.groupId)
+  })
+
   it('retires an unsent click during create capability waiting, even if the same source returns', async () => {
     const capability = deferred<boolean>()
     mocks.createCapability.mockReturnValue(capability.promise)
@@ -206,6 +252,12 @@ describe('CLI identity resume through the existing launch owner', () => {
     useAppStore.setState({})
     await running
     mocks.source = SOURCE
+    mocks.switchCapability.mockResolvedValue(false)
+    mocks.rpc.mockImplementation(async (_target, method) =>
+      method === 'terminal.resolvePane'
+        ? { terminal: { handle: 'handle-1', ptyId: 'pty-1', incarnationId: 'i1' } }
+        : { close: { ptyKilled: true } }
+    )
     capability.resolve(true)
     await vi.waitFor(() => expect([...structuredLaunchStates()]).toHaveLength(0))
     expect(mocks.call).not.toHaveBeenCalled()
@@ -324,7 +376,13 @@ describe('CLI identity resume through the existing launch owner', () => {
       kind: 'local'
     })
     expect(closed).toHaveBeenCalledOnce()
-    expect(closed.mock.calls[0]?.[0].detail).toEqual({ tabId: 'tab-1', leafId })
+    expect(closed.mock.calls[0]?.[0].detail).toEqual({
+      tabId: 'tab-1',
+      leafId,
+      expectedPtyId: 'pty-1',
+      preservePty: true,
+      retireSurface: true
+    })
     expect(tabs()).toEqual([])
 
     // A paired source is closed by its host, fenced on the incarnation it started with, so a
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
index a53fe8c90e5d..a2f0f005c5ae 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
@@ -17,46 +17,76 @@ import { reportCliChatResumeFailure } from './cli-chat-resume-feedback'
 import { adoptingAgentOnHost } from '../right-sidebar/ai-vault-session-resume-in-chat-launch'
 import { panePtyId } from '@/lib/ai-vault-tab-title-requests'
 import { subscribeToPtyExit } from '../terminal-pane/pty-dispatcher'
-import { inspectRuntimeTerminalProcess } from '@/runtime/runtime-terminal-inspection'
+import type { RuntimeTerminalResolvePane } from '../../../../shared/runtime-types'
 import { getRemoteRuntimePtyOwner } from '@/runtime/runtime-terminal-stream'
 import { callRuntimeRpc } from '@/runtime/runtime-rpc-client'
 import { isRemoteRuntimePtyId } from '../../../../shared/remote-runtime-pty-id'
 
-/** The incarnation the execution host reports for a PTY; null when it reports none. */
-const hostPtyIncarnation = (ptyId: string): Promise<string | null> =>
-  inspectRuntimeTerminalProcess(ptyId).then(
-    (inspection) => inspection.foregroundProcessEvidence?.ptyIncarnationId ?? null,
-    () => null
-  )
+/** Capture the existing host handle and incarnation before starting the destination. */
+async function captureSourceTerminal(source: CliChatResumeSource) {
+  const owner = source.ptyId ? getRemoteRuntimePtyOwner(source.ptyId) : null
+  if (isRemoteRuntimePtyId(source.ptyId) && !owner) {
+    return null
+  }
+  const target = owner?.target ?? { kind: 'local' as const }
+  try {
+    const { terminal } = await callRuntimeRpc<{ terminal: RuntimeTerminalResolvePane }>(
+      target,
+      'terminal.resolvePane',
+      {
+        paneKey: source.paneKey,
+        worktreeId: source.workspaceId
+      }
+    )
+    return terminal.incarnationId && (owner || terminal.ptyId === source.ptyId)
+      ? {
+          target,
+          handle: owner?.terminal ?? terminal.handle,
+          incarnationId: terminal.incarnationId
+        }
+      : null
+  } catch {
+    return null
+  }
+}
 
-/** The chat took the conversation, so the terminal pane it came from closes (its tab with it):
- *  only that execution, never a sibling or replacement. A paired host closes it under its own
- *  incarnation fence; a local PTY, whose host may report none, is fenced by its exit, which
- *  precedes any reuse of its id. */
+/** The execution host closes only the captured shell; refused or unknown closes leave it alone. */
 async function retireSwitchedTerminalPane(
   source: CliChatResumeSource,
   sourceExited: () => boolean,
-  expected: Promise<string | null>
+  expected: ReturnType<typeof captureSourceTerminal>
 ): Promise<void> {
-  const pane = parsePaneKey(source.paneKey)
-  const incarnation = await expected
-  const owner = source.ptyId ? getRemoteRuntimePtyOwner(source.ptyId) : null
-  if (owner || isRemoteRuntimePtyId(source.ptyId)) {
-    if (owner && incarnation) {
-      const params = { terminal: owner.terminal, expectedIncarnationId: incarnation }
-      await callRuntimeRpc(owner.target, 'terminal.close', params).catch(() => undefined)
-    }
+  const captured = await expected
+  if (!captured || sourceExited()) {
     return
   }
-  if (
-    pane &&
-    source.ptyId &&
-    (!incarnation || (await hostPtyIncarnation(source.ptyId)) === incarnation) &&
-    !sourceExited() &&
-    panePtyId(useAppStore.getState(), source.paneKey) === source.ptyId
-  ) {
-    const detail: CloseTerminalPaneDetail = { tabId: pane.tabId, leafId: pane.leafId }
-    window.dispatchEvent(new CustomEvent(CLOSE_TERMINAL_PANE_EVENT, { detail }))
+  try {
+    const { close } = await callRuntimeRpc<{ close: { ptyKilled: boolean } }>(
+      captured.target,
+      'terminal.close',
+      {
+        terminal: captured.handle,
+        expectedIncarnationId: captured.incarnationId
+      }
+    )
+    const pane = parsePaneKey(source.paneKey)
+    if (
+      captured.target.kind === 'local' &&
+      close.ptyKilled &&
+      pane &&
+      panePtyId(useAppStore.getState(), source.paneKey) === source.ptyId
+    ) {
+      const detail: CloseTerminalPaneDetail = {
+        tabId: pane.tabId,
+        leafId: pane.leafId,
+        expectedPtyId: source.ptyId,
+        preservePty: true,
+        retireSurface: true
+      }
+      window.dispatchEvent(new CustomEvent(CLOSE_TERMINAL_PANE_EVENT, { detail }))
+    }
+  } catch {
+    /* The source stays readable when its close is unconfirmed. */
   }
 }
 
@@ -124,7 +154,7 @@ export async function runCliChatResume(source: CliChatResumeSource): Promise<voi
   changed()
   // Why any exit: a reused id's next incarnation starts only after this one exits.
   let sourceExited = false
-  const sourceIncarnation = source.ptyId ? hostPtyIncarnation(source.ptyId) : Promise.resolve(null)
+  const sourceIncarnation = captureSourceTerminal(source)
   const stopExitWatch = source.ptyId
     ? subscribeToPtyExit(source.ptyId, () => {
         sourceExited = true
@@ -153,14 +183,17 @@ export async function runCliChatResume(source: CliChatResumeSource): Promise<voi
     clearTimeout(timer)
     return true
   }
+  let inPlace = false
   try {
-    if (
-      target.kind !== 'local' &&
-      !(await waitForPromiseWithSignal(
-        supportsInPlaceSwitch(target, source.agent),
-        controller.signal
-      ))
-    ) {
+    await waitForPromiseWithSignal(sourceIncarnation, controller.signal)
+    if (!isCurrent()) {
+      return
+    }
+    inPlace = await waitForPromiseWithSignal(
+      supportsInPlaceSwitch(target, source.agent),
+      controller.signal
+    )
+    if (target.kind !== 'local' && !inPlace) {
       return
     }
     const cliSourceSupported = await waitForPromiseWithSignal(
@@ -190,17 +223,30 @@ export async function runCliChatResume(source: CliChatResumeSource): Promise<voi
           : {})
       }
     })
+    const state = useAppStore.getState()
+    const group = state.groupsByWorktree[source.workspaceId]?.find((g) =>
+      g.tabOrder.includes(source.tabId)
+    )
     const launch = beginStructuredAgentSessionProvisionalLaunch({
       plan,
       hooks: { beforeCreate: handoff },
       afterTabId: source.tabId,
+      target: group
+        ? {
+            surfaceAddress: {
+              worktreeId: source.workspaceId,
+              targetGroupId: group.id,
+              precedingTabIds: group.tabOrder.slice(0, group.tabOrder.indexOf(source.tabId) + 1)
+            }
+          }
+        : undefined,
       deferPublication: true
     })
     if (!launch) {
       return
     }
     const result = await waitForPromiseWithSignal(launch.settlement, controller.signal)
-    if (result.kind === 'structured') {
+    if (result.kind === 'structured' && inPlace) {
       await retireSwitchedTerminalPane(source, () => sourceExited, sourceIncarnation)
     } else if (
       result.kind === 'failed' &&
@@ -208,14 +254,18 @@ export async function runCliChatResume(source: CliChatResumeSource): Promise<voi
       pending.get(key) === controller &&
       (await reportCliChatResumeFailure(source, result.error, target))
     ) {
-      await retireSwitchedTerminalPane(source, () => sourceExited, sourceIncarnation)
+      if (inPlace) {
+        await retireSwitchedTerminalPane(source, () => sourceExited, sourceIncarnation)
+      }
     }
   } catch (error) {
     if (
       pending.get(key) === controller &&
       (await reportCliChatResumeFailure(source, error, target))
     ) {
-      await retireSwitchedTerminalPane(source, () => sourceExited, sourceIncarnation)
+      if (inPlace) {
+        await retireSwitchedTerminalPane(source, () => sourceExited, sourceIncarnation)
+      }
     }
   } finally {
     clearTimeout(timer)
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts
index 28f64b8f6315..7871e5f81822 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts
@@ -1,3 +1,6 @@
+import { useAppStore } from '@/store'
+import { useInPlaceSwitchCapability } from '@/lib/in-place-switch-support'
+import { getExecutionHostIdForWorktree } from '@/lib/worktree-runtime-owner'
 import type { AppState } from '@/store/types'
 import {
   collectAgentPaneConversations,
@@ -65,3 +68,12 @@ export function resolveCliChatResumeSource(
     ptyId: panePtyId(state, conversation.paneKey)
   }
 }
+
+/** Capability settlement must re-render readers even when pane state did not change. */
+export function useCliChatResumeCapability(
+  worktreeId: string,
+  agent = 'codex'
+): boolean | undefined {
+  const host = useAppStore((state) => getExecutionHostIdForWorktree(state, worktreeId))
+  return useInPlaceSwitchCapability(host, agent)
+}
diff --git a/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.test.ts b/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.test.ts
index 997dafdc65b0..9c43406f5bba 100644
--- a/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.test.ts
+++ b/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.test.ts
@@ -50,10 +50,10 @@ const SOURCE = {
 beforeEach(() => {
   vi.clearAllMocks()
   mocks.supported = true
-  mocks.call.mockResolvedValue({ source: SOURCE, generation: 'g1' })
+  mocks.call.mockResolvedValue({ source: SOURCE })
 })
 
-it('stops the chat on its host, opens the same-id resume in its slot, then closes the chat tab', async () => {
+it('stops the chat on its host, opens the same-id resume in its slot, leaves retirement to the admitted host launch', async () => {
   await runNativeChatCliSwitch(SWITCH)
   expect(mocks.call).toHaveBeenCalledWith({ kind: 'local' }, 'agentSession.switchToTerminal', {
     sessionId: 'chat-1'
@@ -63,17 +63,14 @@ it('stops the chat on its host, opens the same-id resume in its slot, then close
       agent: 'codex',
       worktreeId: 'wt-1',
       command: 'codex resume thread-c',
-      // The host's switch generation rides the launch to the owner that creates the terminal.
-      env: { CODEX_HOME: '/accounts/a/home', ORCA_TERMINAL_SWITCH_GENERATION: 'g1' },
+      env: { CODEX_HOME: '/accounts/a/home' },
       providerSession: { key: 'session_id', id: 'thread-c' },
       afterTabId: 'chat-tab',
       resumeOrigin: 'switch'
     })
   )
-  expect(mocks.closeUnifiedTab).toHaveBeenCalledWith('chat-tab')
-  expect(mocks.launch.mock.invocationCallOrder[0]).toBeLessThan(
-    mocks.closeUnifiedTab.mock.invocationCallOrder[0]!
-  )
+  // The committed host launch hides the source; a client receipt never stops today's native child.
+  expect(mocks.closeUnifiedTab).not.toHaveBeenCalled()
 })
 
 it('never sends a switch to a host that does not advertise it', async () => {
diff --git a/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts b/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts
index 3e3cd3b67e74..ac599e2c9e17 100644
--- a/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts
+++ b/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts
@@ -15,7 +15,6 @@ import { AiVaultChatForkSourceSchema } from '../../../../shared/ai-vault-chat-fo
 import type { AiVaultAgent } from '../../../../shared/ai-vault-types'
 import { agentLabel } from '../../../../shared/ai-vault-session-filters'
 import { parseExecutionHostId } from '../../../../shared/execution-host'
-import { TERMINAL_SWITCH_GENERATION_ENV } from '../../../../shared/terminal-switch'
 
 const pending = new Set<string>()
 const listeners = new Set<() => void>()
@@ -49,12 +48,6 @@ export function nativeChatCliSwitchFailureText(error: unknown, agent: AiVaultAge
       { agent: agentLabel(agent) }
     )
   }
-  if (reason === 'conversationHeldElsewhere') {
-    return translate(
-      'components.native-chat.failureWords.conversationMovingToTerminal',
-      'This conversation is moving to a terminal. Use it there, or wait a moment and try again.'
-    )
-  }
   return (
     (refusal ? undefined : readIpcErrorMessage(error)) ||
     translate('components.tab.bar.switch.failed', "Couldn't switch this conversation to the CLI.")
@@ -83,15 +76,12 @@ export async function runNativeChatCliSwitch(args: {
     if (!(await supportsInPlaceSwitch(target, args.agent))) {
       throw new Error(nativeChatCliSwitchFailureText(null, args.agent))
     }
-    const answered = await callStructuredAgentSession<{ source: unknown; generation?: unknown }>(
+    const answered = await callStructuredAgentSession<{ source: unknown }>(
       target,
       'agentSession.switchToTerminal',
       { sessionId: args.sessionId }
     )
     const source = AiVaultChatForkSourceSchema.parse(answered.source)
-    if (typeof answered.generation !== 'string') {
-      throw new Error(nativeChatCliSwitchFailureText(null, args.agent))
-    }
     const state = useAppStore.getState()
     const startup = buildAiVaultResumeStartupForWorktree({
       state,
@@ -103,8 +93,6 @@ export async function runNativeChatCliSwitch(args: {
       agent: source.agent,
       worktreeId: args.workspaceId,
       ...startup,
-      // The host's terminal owner binds this generation to the one start it may protect.
-      env: { ...startup.env, [TERMINAL_SWITCH_GENERATION_ENV]: answered.generation },
       ...(args.chatTabId ? { afterTabId: args.chatTabId } : {}),
       resumeOrigin: 'switch'
     })
@@ -112,10 +100,8 @@ export async function runNativeChatCliSwitch(args: {
     if (outcome && outcome.status !== 'created') {
       throw new Error(outcome.status === 'failed' ? outcome.message : undefined)
     }
-    // The terminal exists, so the chat tab retires; its host close finds the agent already stopped.
-    if (args.chatTabId) {
-      useAppStore.getState().closeUnifiedTab(args.chatTabId)
-    }
+    // The execution host retires only the source presentation after its explicit admitted result.
+    // A tab allocation or generic create receipt says nothing about admission.
   } catch (error) {
     toast.error(nativeChatCliSwitchFailureText(error, args.agent))
   } finally {
diff --git a/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts b/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts
index 03166433fe50..4ae523f2c338 100644
--- a/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts
+++ b/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts
@@ -1,3 +1,4 @@
+import { switchAiVaultSessionToNativeChat } from '../right-sidebar/ai-vault-session-in-place-switch'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { useAppStore } from '@/store'
 import type { AppState } from '@/store/types'
@@ -36,9 +37,17 @@ const mocks = vi.hoisted(() => {
     resumeState: { blocked: boolean; worktreeId: string | null }
     platform: string
   } = { resumeState: { blocked: false, worktreeId: 'repo-1::/repo/wt' }, platform: 'darwin' }
-  return { ...state, resumeInChat: vi.fn(), inPlaceSwitch: false, remoteFeasible: false }
+  return {
+    ...state,
+    switchOwner: vi.fn(async () => true),
+    resumeInChat: vi.fn(),
+    inPlaceSwitch: false,
+    remoteFeasible: false
+  }
 })
 
+vi.mock('./cli-chat-resume-feedback', () => ({ switchIntoOwner: mocks.switchOwner }))
+
 // Staged host answers: its capabilities arrive over IPC at boot, and the platform from preload.
 vi.mock('@/runtime/local-runtime-capabilities', async (importOriginal) => ({
   ...(await importOriginal<Record<string, unknown>>()),
@@ -505,7 +514,7 @@ describe('one pane of a terminal tab', () => {
       false
     )
   })
-  it('presents a switched terminal’s host identity before any prompt, for its own PTY only', () => {
+  it('presents a switched terminal’s host identity before any prompt, without creating turn status', () => {
     makeState()
     const [L1, L2] = [
       '11111111-1111-4111-8111-111111111111',
@@ -533,13 +542,10 @@ describe('one pane of a terminal tab', () => {
         prompt: '',
         agentType: 'codex',
         providerSession: { key: 'session_id', id: 'thread-c' },
-        providerSessionOnly: true,
-        launchExecution: { ptyId: 'pty-1', incarnationId: 'i1' }
+        providerSessionOnly: true
       }
     })
     const state = useAppStore.getState()
-    // Presentation only: no status row and no sleeping recovery record.
-    expect(state.sleepingAgentSessionsByPaneKey).toEqual({})
     expect(state.agentStatusByPaneKey).toEqual({})
     expect(
       resolveCliChatResumeSource(state, {
@@ -548,12 +554,6 @@ describe('one pane of a terminal tab', () => {
       })
     ).toMatchObject({ agent: 'codex', providerSessionId: 'thread-c', ptyId: 'pty-1' })
     expect(paneGate(state, `term-1:${L2}`)).toBe(false)
-    layout({ [L1]: 'pty-9' })
-    expect(paneGate(useAppStore.getState(), pane)).toBe(false)
-    // Its PTY exiting ends it, so a later incarnation under the same id never inherits it.
-    layout({ [L1]: 'pty-1' })
-    useAppStore.getState().setLaunchConversation(pane, null)
-    expect(paneGate(useAppStore.getState(), pane)).toBe(false)
   })
 })
 
@@ -779,3 +779,24 @@ describe('lookupTabSessionHistoryRow', () => {
     expect(readCachedAiVaultSessionList(PANEL_REQUEST)).toBeNull()
   })
 })
+
+it.each(['local', 'runtime:paired-host'] as const)(
+  'History returns an owned same-id conversation on %s even with no local source pane',
+  (executionHostId) => {
+    makeState()
+    mocks.inPlaceSwitch = true
+    mocks.switchOwner.mockClear()
+    const structuredSession = { sessionId: 'owned-codex', workspaceId: WORKTREE_ID }
+    expect(
+      switchAiVaultSessionToNativeChat(row({ agent: 'codex', executionHostId, structuredSession }))
+    ).toBe(true)
+    expect(mocks.switchOwner).toHaveBeenCalledWith(
+      { agent: 'codex', tabId: '', workspaceId: WORKTREE_ID },
+      structuredSession,
+      executionHostId === 'local'
+        ? { kind: 'local' }
+        : { kind: 'environment', environmentId: 'paired-host' }
+    )
+    mocks.inPlaceSwitch = false
+  }
+)
diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.test.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.test.tsx
index 5b7ab7cc0f0f..0cf16cbe51d8 100644
--- a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.test.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.test.tsx
@@ -22,6 +22,7 @@ vi.mock('@/store', () => ({
     selector({ paneForegroundAgentByPaneKey: {}, agentStatusByPaneKey: {} })
 }))
 vi.mock('../tab-bar/cli-chat-resume-source', () => ({
+  useCliChatResumeCapability: () => true,
   resolveCliChatResumeSource: (_state: unknown, args: unknown) => {
     mocks.resolve(args)
     return mocks.source
diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx
index 9a980777e67f..08e9fdd1741a 100644
--- a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx
@@ -5,7 +5,10 @@ import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip
 import { translate } from '@/i18n/i18n'
 import { useAppStore } from '@/store'
 import { agentLabel } from '../../../../shared/ai-vault-session-filters'
-import { resolveCliChatResumeSource } from '../tab-bar/cli-chat-resume-source'
+import {
+  resolveCliChatResumeSource,
+  useCliChatResumeCapability
+} from '../tab-bar/cli-chat-resume-source'
 import { runCliChatResume, useCliChatResumePending } from '../tab-bar/cli-chat-resume-run'
 
 export function TerminalPaneResumeInChatButton({
@@ -22,6 +25,7 @@ export function TerminalPaneResumeInChatButton({
       resolveCliChatResumeSource(state, { tab: { id: tabId, worktreeId }, paneKey })
     )
   )
+  const capability = useCliChatResumeCapability(worktreeId, source?.agent)
   // The host's writer check decides; this only explains the refusal before the click.
   const running = useAppStore((state) => {
     const foreground = state.paneForegroundAgentByPaneKey[paneKey]
@@ -32,19 +36,29 @@ export function TerminalPaneResumeInChatButton({
   })
   const pending = useCliChatResumePending(source)
   const label = translate('components.tab.bar.switch.toNativeChat', 'Switch to native chat')
-  const tooltip =
-    running && source
+  const tooltip = !source
+    ? translate(
+        'components.tab.bar.switch.noConversation',
+        'No saved conversation is available in this terminal yet.'
+      )
+    : capability === false
       ? translate(
-          'components.tab.bar.switch.exitAgentFirst',
-          'Exit {{agent}} in this terminal to switch.',
-          {
-            agent: agentLabel(source.agent)
-          }
-        )
-      : translate(
-          'components.tab.bar.switch.toNativeChatTooltip',
-          'Switch to native chat: continues the same conversation in a chat, in this tab.'
+          'components.tab.bar.switch.unavailable',
+          'Switching {{agent}} is not available yet.',
+          { agent: agentLabel(source.agent) }
         )
+      : running && source
+        ? translate(
+            'components.tab.bar.switch.exitAgentFirst',
+            'Exit {{agent}} in this terminal to switch.',
+            {
+              agent: agentLabel(source.agent)
+            }
+          )
+        : translate(
+            'components.tab.bar.switch.toNativeChatTooltip',
+            'Switch to native chat: continues the same conversation in a chat, in this tab.'
+          )
 
   return (
     <Tooltip>
@@ -56,13 +70,13 @@ export function TerminalPaneResumeInChatButton({
           // Same class as split so it shares the hover/active reveal.
           className="pane-title-split-trigger"
           aria-label={label}
-          disabled={!source || pending}
+          disabled={!source || pending || capability !== true}
           // Not `disabled`: the tooltip has to say why.
           aria-disabled={running || undefined}
           aria-busy={pending || undefined}
           onClick={(event) => {
             event.stopPropagation()
-            if (source && !running) {
+            if (source && !running && capability === true) {
               void runCliChatResume(source)
             }
           }}
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/pty-exit-hibernate.ts b/src/renderer/src/components/terminal-pane/pty-connection/pty-exit-hibernate.ts
index b074e7f1fd92..9c013adfb3a9 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/pty-exit-hibernate.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/pty-exit-hibernate.ts
@@ -257,7 +257,6 @@ export function installPtyExitHibernate(session: ConnectPanePtySession): void {
     // entry so the hover UI only shows what is running *now*.
     useAppStore.getState().removeAgentStatus(session.cacheKey)
     useAppStore.getState().clearPaneForegroundAgent(session.cacheKey)
-    useAppStore.getState().setLaunchConversation(session.cacheKey, null)
     // The runtime graph is the CLI's source for live terminal bindings, so
     // we must republish when a pane loses its PTY instead of waiting for a
     // broader layout change that may never happen.
diff --git a/src/renderer/src/hooks/ipc-events/agent-status-partial-updates.ts b/src/renderer/src/hooks/ipc-events/agent-status-partial-updates.ts
index bf6ec09d2dce..fb77966d0d26 100644
--- a/src/renderer/src/hooks/ipc-events/agent-status-partial-updates.ts
+++ b/src/renderer/src/hooks/ipc-events/agent-status-partial-updates.ts
@@ -1,6 +1,6 @@
+import { RESUMABLE_TUI_AGENTS } from '../../../../shared/agent-session-resume'
 import type { AgentStatusIpcPayload } from '../../../../shared/agent-status-types'
 import type { ProgramStatusFacet } from '../../../../shared/program-status/facet'
-import { adoptsCliConversations } from '../../../../shared/structured-agent-cli-conversation-adoption'
 import type { AppState } from '@/store/types'
 import type {
   AgentProgramStatusUpdate,
@@ -49,19 +49,14 @@ export function applyProviderSessionOnlyUpdate(args: {
   routing: NonNullable<AgentProviderSessionUpdate['routing']>
 }): AgentStatusApplyResult {
   const { store, batch, data, paneKey, routing } = args
-  if (!data.providerSession || data.agentType !== 'pi') {
-    const { agentType: agent, providerSession, launchExecution: execution } = data
-    if (!providerSession || !execution || !adoptsCliConversations(agent)) {
-      return 'dropped'
-    }
-    // Why not a sleeping record: this identity only presents the switched terminal's conversation.
-    store.setLaunchConversation(paneKey, { agent, providerSession, execution })
-    return 'applied'
+  const agent = RESUMABLE_TUI_AGENTS.find((candidate) => candidate === data.agentType)
+  if (!data.providerSession || !agent) {
+    return 'dropped'
   }
   const update: AgentProviderSessionUpdate = {
     kind: 'providerSession',
     paneKey,
-    agent: 'pi',
+    agent,
     providerSession: data.providerSession,
     timing: { updatedAt: data.receivedAt },
     routing,
diff --git a/src/renderer/src/i18n/en-runtime-required.json b/src/renderer/src/i18n/en-runtime-required.json
index f14e0b60a19c..13c1a9b4166b 100644
--- a/src/renderer/src/i18n/en-runtime-required.json
+++ b/src/renderer/src/i18n/en-runtime-required.json
@@ -3116,7 +3116,6 @@
         "runtimeNotInstalled": "{{agent}} isn't installed on the computer running this chat. Install it from the chat in a current version of Orca.",
         "conversationOpenElsewhere": "Codex still has this conversation open somewhere else. Close it there, then try again.",
         "conversationOpenInTerminal": "Orca can't confirm {{agent}} has exited in its terminal. Stop what's running there or close the terminal, then try again.",
-        "conversationMovingToTerminal": "This conversation is moving to a terminal. Use it there, or wait a moment and try again.",
         "sendAgainToTryOnceMore": "Send your message again to try once more.",
         "sendToTryAgain": "Send your message to try again.",
         "sessionNotRestored": "{{agent}} couldn't reopen its earlier session, so this chat continues in a new one. {{agent}} doesn't remember the earlier messages.",
diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index f1ce8a1cf5fd..83882812605c 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -18655,7 +18655,6 @@
         "runtimeNotInstalled": "{{agent}} isn't installed on the computer running this chat. Install it from the chat in a current version of Orca.",
         "conversationOpenElsewhere": "Codex still has this conversation open somewhere else. Close it there, then try again.",
         "conversationOpenInTerminal": "Orca can't confirm {{agent}} has exited in its terminal. Stop what's running there or close the terminal, then try again.",
-        "conversationMovingToTerminal": "This conversation is moving to a terminal. Use it there, or wait a moment and try again.",
         "chooseClaudeAccount": "Choose or add one in Claude Accounts settings.",
         "chooseClaudeAccountThenRunCommand": "Choose or add one in Claude Accounts settings, then run /{{command}} again.",
         "chooseClaudeAccountThenSend": "Choose or add one in Claude Accounts settings, then send your message again.",
@@ -19411,7 +19410,9 @@
           "exitAgentFirst": "Exit {{agent}} in this terminal to switch.",
           "waitForReply": "Wait for the reply to finish or stop it, then switch.",
           "stopUnconfirmed": "Couldn't confirm {{agent}} stopped. Try again.",
-          "failed": "Couldn't switch this conversation to the CLI."
+          "failed": "Couldn't switch this conversation to the CLI.",
+          "noConversation": "No saved conversation is available in this terminal yet.",
+          "unavailable": "Switching {{agent}} is not available yet."
         },
         "BrowserTab": {
           "closeOthers": "Close Others",
diff --git a/src/renderer/src/i18n/locales/es.json b/src/renderer/src/i18n/locales/es.json
index e7780ad12d59..d5c3fd056dc1 100644
--- a/src/renderer/src/i18n/locales/es.json
+++ b/src/renderer/src/i18n/locales/es.json
@@ -18350,7 +18350,6 @@
         "runtimeNotInstalled": "{{agent}} no está instalado en el equipo que ejecuta este chat. Instálelo desde el chat en una versión actual de Orca.",
         "conversationOpenElsewhere": "Codex aún tiene esta conversación abierta en otro lugar. Ciérrela allí y vuelva a intentarlo.",
         "conversationOpenInTerminal": "Orca no puede confirmar que {{agent}} haya salido en su terminal. Detenga lo que se esté ejecutando allí o cierre la terminal y vuelva a intentarlo.",
-        "conversationMovingToTerminal": "Esta conversación se está trasladando a una terminal. Úsela allí o espere un momento y vuelva a intentarlo.",
         "chooseClaudeAccount": "Elija o agregue una en la configuración de Cuentas de Claude.",
         "chooseClaudeAccountThenRunCommand": "Elija o agregue una en la configuración de Cuentas de Claude y vuelva a ejecutar /{{command}}.",
         "chooseClaudeAccountThenSend": "Elija o agregue una en la configuración de Cuentas de Claude y vuelva a enviar su mensaje.",
@@ -19084,7 +19083,9 @@
           "exitAgentFirst": "Salga de {{agent}} en esta terminal para cambiar.",
           "waitForReply": "Espere a que termine la respuesta o deténgala y luego cambie.",
           "stopUnconfirmed": "No se pudo confirmar que {{agent}} se detuvo. Vuelva a intentarlo.",
-          "failed": "No se pudo cambiar esta conversación a la CLI."
+          "failed": "No se pudo cambiar esta conversación a la CLI.",
+          "noConversation": "Todavía no hay una conversación guardada disponible en este terminal.",
+          "unavailable": "Cambiar {{agent}} todavía no está disponible."
         },
         "BrowserTab": {
           "closeOthers": "Cerrar otras",
diff --git a/src/renderer/src/i18n/locales/fr.json b/src/renderer/src/i18n/locales/fr.json
index e4e95058692b..9c0638ee6f64 100644
--- a/src/renderer/src/i18n/locales/fr.json
+++ b/src/renderer/src/i18n/locales/fr.json
@@ -18459,7 +18459,6 @@
         "runtimeNotInstalled": "{{agent}} n'est pas installé sur l'ordinateur qui exécute ce chat. Installez-le depuis le chat dans une version récente d'Orca.",
         "conversationOpenElsewhere": "Codex garde cette conversation ouverte ailleurs. Fermez-la à cet endroit, puis réessayez.",
         "conversationOpenInTerminal": "Orca ne peut pas confirmer que {{agent}} a quitté son terminal. Arrêtez ce qui s'y exécute ou fermez le terminal, puis réessayez.",
-        "conversationMovingToTerminal": "Cette conversation est en cours de transfert vers un terminal. Utilisez-la là-bas, ou attendez un instant et réessayez.",
         "chooseClaudeAccount": "Choisissez-en un ou ajoutez-en un dans les paramètres Comptes Claude.",
         "chooseClaudeAccountThenRunCommand": "Choisissez-en un ou ajoutez-en un dans les paramètres Comptes Claude, puis relancez /{{command}}.",
         "chooseClaudeAccountThenSend": "Choisissez-en un ou ajoutez-en un dans les paramètres Comptes Claude, puis renvoyez votre message.",
@@ -19193,7 +19192,9 @@
           "exitAgentFirst": "Quittez {{agent}} dans ce terminal pour basculer.",
           "waitForReply": "Attendez la fin de la réponse ou arrêtez-la, puis basculez.",
           "stopUnconfirmed": "Impossible de confirmer l'arrêt de {{agent}}. Réessayez.",
-          "failed": "Impossible de basculer cette conversation vers la CLI."
+          "failed": "Impossible de basculer cette conversation vers la CLI.",
+          "noConversation": "Aucune conversation enregistrée n’est encore disponible dans ce terminal.",
+          "unavailable": "Le changement de {{agent}} n’est pas encore disponible."
         },
         "BrowserTab": {
           "closeOthers": "Fermer les autres",
diff --git a/src/renderer/src/i18n/locales/ja.json b/src/renderer/src/i18n/locales/ja.json
index de4005ea6eed..622113c6c23a 100644
--- a/src/renderer/src/i18n/locales/ja.json
+++ b/src/renderer/src/i18n/locales/ja.json
@@ -18390,7 +18390,6 @@
         "runtimeNotInstalled": "{{agent}} はこのチャットを実行しているコンピューターにインストールされていません。最新バージョンの Orca でチャットからインストールしてください。",
         "conversationOpenElsewhere": "Codex はまだ別の場所でこの会話を開いています。そこで閉じてから、もう一度お試しください。",
         "conversationOpenInTerminal": "Orca は {{agent}} がターミナルで終了したことを確認できません。そこで実行中のものを停止するかターミナルを閉じてから、もう一度お試しください。",
-        "conversationMovingToTerminal": "この会話はターミナルに移動中です。そちらで使用するか、少し待ってからもう一度お試しください。",
         "chooseClaudeAccount": "Claude アカウントの設定で選択または追加してください。",
         "chooseClaudeAccountThenRunCommand": "Claude アカウントの設定で選択または追加してから、/{{command}} をもう一度実行してください。",
         "chooseClaudeAccountThenSend": "Claude アカウントの設定で選択または追加してから、メッセージをもう一度送信してください。",
@@ -19124,7 +19123,9 @@
           "exitAgentFirst": "切り替えるには、このターミナルで {{agent}} を終了してください。",
           "waitForReply": "応答が終わるまで待つか停止してから、切り替えてください。",
           "stopUnconfirmed": "{{agent}} が停止したことを確認できませんでした。もう一度お試しください。",
-          "failed": "この会話を CLI に切り替えられませんでした。"
+          "failed": "この会話を CLI に切り替えられませんでした。",
+          "noConversation": "このターミナルには、保存された会話がまだありません。",
+          "unavailable": "{{agent}} の切り替えはまだ利用できません。"
         },
         "BrowserTab": {
           "closeOthers": "その他を閉じる",
diff --git a/src/renderer/src/i18n/locales/ko.json b/src/renderer/src/i18n/locales/ko.json
index 15aebf0fd0ac..b2e251e1c5cb 100644
--- a/src/renderer/src/i18n/locales/ko.json
+++ b/src/renderer/src/i18n/locales/ko.json
@@ -18390,7 +18390,6 @@
         "runtimeNotInstalled": "{{agent}}이(가) 이 채팅을 실행하는 컴퓨터에 설치되어 있지 않습니다. 최신 버전의 Orca에서 채팅을 통해 설치하세요.",
         "conversationOpenElsewhere": "Codex가 다른 곳에서 이 대화를 열어 두고 있습니다. 그곳에서 닫은 후 다시 시도하세요.",
         "conversationOpenInTerminal": "Orca에서 {{agent}}이(가) 터미널에서 종료되었는지 확인할 수 없습니다. 그곳에서 실행 중인 항목을 중지하거나 터미널을 닫은 후 다시 시도하세요.",
-        "conversationMovingToTerminal": "이 대화는 터미널로 이동하는 중입니다. 그곳에서 사용하거나 잠시 후 다시 시도하세요.",
         "chooseClaudeAccount": "Claude 계정 설정에서 선택하거나 추가하세요.",
         "chooseClaudeAccountThenRunCommand": "Claude 계정 설정에서 선택하거나 추가한 다음 /{{command}}을(를) 다시 실행하세요.",
         "chooseClaudeAccountThenSend": "Claude 계정 설정에서 선택하거나 추가한 다음 메시지를 다시 보내세요.",
@@ -19124,7 +19123,9 @@
           "exitAgentFirst": "전환하려면 이 터미널에서 {{agent}}을(를) 종료하세요.",
           "waitForReply": "응답이 끝날 때까지 기다리거나 응답을 중지한 후 전환하세요.",
           "stopUnconfirmed": "{{agent}}이(가) 중지되었는지 확인할 수 없습니다. 다시 시도하세요.",
-          "failed": "이 대화를 CLI로 전환할 수 없습니다."
+          "failed": "이 대화를 CLI로 전환할 수 없습니다.",
+          "noConversation": "이 터미널에는 아직 저장된 대화가 없습니다.",
+          "unavailable": "{{agent}} 전환은 아직 사용할 수 없습니다."
         },
         "BrowserTab": {
           "closeOthers": "다른 탭 닫기",
diff --git a/src/renderer/src/i18n/locales/zh.json b/src/renderer/src/i18n/locales/zh.json
index 8a25ca1605d1..623740bbe122 100644
--- a/src/renderer/src/i18n/locales/zh.json
+++ b/src/renderer/src/i18n/locales/zh.json
@@ -18355,7 +18355,6 @@
         "runtimeNotInstalled": "运行此聊天的计算机上未安装 {{agent}}。请在最新版本的 Orca 中从聊天里安装。",
         "conversationOpenElsewhere": "Codex 仍在其他地方打开着此对话。请在那里关闭后重试。",
         "conversationOpenInTerminal": "Orca 无法确认 {{agent}} 已在其终端中退出。请停止那里正在运行的内容或关闭终端，然后重试。",
-        "conversationMovingToTerminal": "此对话正在转移到终端。请在那里使用，或稍等片刻后重试。",
         "chooseClaudeAccount": "请在 Claude 账户设置中选择或添加一个。",
         "chooseClaudeAccountThenRunCommand": "请在 Claude 账户设置中选择或添加一个，然后重新运行 /{{command}}。",
         "chooseClaudeAccountThenSend": "请在 Claude 账户设置中选择或添加一个，然后重新发送您的消息。",
@@ -19089,7 +19088,9 @@
           "exitAgentFirst": "请先在此终端中退出 {{agent}}，然后再切换。",
           "waitForReply": "请等待回复完成或停止回复，然后再切换。",
           "stopUnconfirmed": "无法确认 {{agent}} 已停止。请重试。",
-          "failed": "无法将此对话切换到 CLI。"
+          "failed": "无法将此对话切换到 CLI。",
+          "noConversation": "此终端中尚无可用的已保存对话。",
+          "unavailable": "暂不支持切换 {{agent}}。"
         },
         "BrowserTab": {
           "closeOthers": "关闭其他",
diff --git a/src/renderer/src/lib/ai-vault-tab-title-requests.ts b/src/renderer/src/lib/ai-vault-tab-title-requests.ts
index a1312a5a8ce4..0436f1ed9e0d 100644
--- a/src/renderer/src/lib/ai-vault-tab-title-requests.ts
+++ b/src/renderer/src/lib/ai-vault-tab-title-requests.ts
@@ -175,7 +175,7 @@ export function panePtyId(state: AppState, paneKey: string): string | undefined
 }
 
 /** As above, or the conversation the pane's agent last reported once it exited, or the one the
- *  host launched in this exact PTY: a switch is offered when the agent is gone. */
+ *  host launched in the pane: its retained resume identity does not require a first prompt. */
 export function resolvePaneLastAgentConversation<Agent extends AgentType>(
   state: AppState,
   pane: { worktreeId: string; paneKey: string },
@@ -183,15 +183,15 @@ export function resolvePaneLastAgentConversation<Agent extends AgentType>(
 ): AgentPaneConversation<Agent> | null {
   const live = resolvePaneAgentConversation(state, pane, isAgent)
   const retained = state.retainedAgentsByPaneKey[pane.paneKey]
-  const launch = state.launchConversationByPaneKey[pane.paneKey]
+  const saved = state.sleepingAgentSessionsByPaneKey[pane.paneKey]
   const tab = (state.tabsByWorktree[pane.worktreeId] ?? []).find(
     (candidate) => candidate.id === parsePaneKey(pane.paneKey)?.tabId
   )
   const source =
     retained?.entry.paneKey === pane.paneKey && retained.worktreeId === pane.worktreeId
       ? retained
-      : tab && launch && launch.execution.ptyId === panePtyId(state, pane.paneKey)
-        ? { tab, agentType: launch.agent, entry: launch }
+      : tab && saved?.worktreeId === pane.worktreeId
+        ? { tab, agentType: saved.agent, entry: saved }
         : null
   if (live || !source) {
     return live
diff --git a/src/renderer/src/lib/in-place-switch-support.test.tsx b/src/renderer/src/lib/in-place-switch-support.test.tsx
new file mode 100644
index 000000000000..40385c61b136
--- /dev/null
+++ b/src/renderer/src/lib/in-place-switch-support.test.tsx
@@ -0,0 +1,42 @@
+// @vitest-environment happy-dom
+import { act, cleanup, render, screen, waitFor } from '@testing-library/react'
+import { afterEach, expect, it, vi } from 'vitest'
+import { useAppStore } from '@/store'
+import {
+  refreshLocalRuntimeCapabilities,
+  setLocalRuntimeCapabilitiesForTests
+} from '@/runtime/local-runtime-capabilities'
+import { useInPlaceSwitchCapability } from './in-place-switch-support'
+
+const { probe } = vi.hoisted(() => ({ probe: vi.fn<() => Promise<boolean>>() }))
+vi.mock('@/runtime/structured-agent-session-client', () => ({ supportsInPlaceSwitch: probe }))
+
+function Switch() {
+  const supported = useInPlaceSwitchCapability('local', 'codex')
+  return <button disabled={supported !== true}>Switch to CLI</button>
+}
+afterEach(cleanup)
+
+it('keeps the switch disabled while loading and re-reads capability changes without a pane update', async () => {
+  useAppStore.setState(useAppStore.getInitialState(), true)
+  setLocalRuntimeCapabilitiesForTests(null)
+  let answer = (_supported: boolean): void => {}
+  probe.mockImplementationOnce(
+    () =>
+      new Promise((resolve) => {
+        answer = resolve
+      })
+  )
+  render(<Switch />)
+  expect(screen.getByRole('button', { name: 'Switch to CLI' }).hasAttribute('disabled')).toBe(true)
+  await act(async () => {
+    answer(true)
+  })
+  await waitFor(() => expect(screen.getByRole('button').hasAttribute('disabled')).toBe(false))
+  probe.mockResolvedValue(false)
+  Object.assign(window, { api: { runtime: { getStatus: async () => ({ capabilities: [] }) } } })
+  await act(async () => {
+    await refreshLocalRuntimeCapabilities()
+  })
+  await waitFor(() => expect(screen.getByRole('button').hasAttribute('disabled')).toBe(true))
+})
diff --git a/src/renderer/src/lib/in-place-switch-support.ts b/src/renderer/src/lib/in-place-switch-support.ts
index 58febd83ed08..8e4f708db5bf 100644
--- a/src/renderer/src/lib/in-place-switch-support.ts
+++ b/src/renderer/src/lib/in-place-switch-support.ts
@@ -1,4 +1,6 @@
 import { useSyncExternalStore } from 'react'
+import { useAppStore } from '@/store'
+import { subscribeLocalRuntimeCapabilityObservation } from '@/runtime/local-runtime-capabilities'
 import { supportsInPlaceSwitch } from '@/runtime/structured-agent-session-client'
 import { structuredAgentSessionTargetForHost } from '@/runtime/structured-agent-session-owner'
 import {
@@ -10,21 +12,41 @@ import type { AiVaultAgent } from '../../../shared/ai-vault-types'
 
 // The answer per host and agent; a reconnect or retirement asks again.
 const known = new Map<string, boolean>()
-const asking = new Set<string>()
+const asking = new Map<string, Promise<boolean>>()
 const listeners = new Set<() => void>()
 const changed = () => listeners.forEach((listener) => listener())
 const forget = () => {
   known.clear()
+  asking.clear()
   changed()
 }
 onRuntimeEnvironmentRevisionsChanged(forget)
 onRuntimeEnvironmentsRetired(forget)
+subscribeLocalRuntimeCapabilityObservation(forget)
+let stopStatusSubscription: (() => void) | undefined
+const subscribe = (listener: () => void) => {
+  if (listeners.size === 0) {
+    stopStatusSubscription = useAppStore.subscribe((state, previous) => {
+      if (state.runtimeStatusByEnvironmentId !== previous.runtimeStatusByEnvironmentId) {
+        forget()
+      }
+    })
+  }
+  listeners.add(listener)
+  return () => {
+    listeners.delete(listener)
+    if (listeners.size === 0) {
+      stopStatusSubscription?.()
+      stopStatusSubscription = undefined
+    }
+  }
+}
 
 /** The cached answer, asking in the background when there is none yet. */
-export function inPlaceSwitchSupportedNow(
+export function inPlaceSwitchCapabilityNow(
   executionHostId: string | null | undefined,
   agent: string
-): boolean {
+): boolean | undefined {
   if (!inPlaceSwitchEnabled(agent)) {
     return false
   }
@@ -32,37 +54,50 @@ export function inPlaceSwitchSupportedNow(
   const answer = known.get(key)
   const target = structuredAgentSessionTargetForHost(executionHostId)
   if (answer === undefined && target && !asking.has(key)) {
-    asking.add(key)
-    void supportsInPlaceSwitch(target, agent).then((supported) => {
+    const attempt = supportsInPlaceSwitch(target, agent)
+    asking.set(key, attempt)
+    void attempt.then((supported) => {
+      if (asking.get(key) !== attempt) {
+        return
+      }
       asking.delete(key)
       known.set(key, supported)
       changed()
     })
   }
-  return answer === true
+  return answer
+}
+
+export function inPlaceSwitchSupportedNow(host: string | null | undefined, agent: string): boolean {
+  return inPlaceSwitchCapabilityNow(host, agent) === true
 }
 
 /** Whether the host running this conversation switches it in place; false until it answered yes. */
-export function useInPlaceSwitchSupported(
+export function useInPlaceSwitchCapability(
   executionHostId: string | null | undefined,
   agent: string | null | undefined
-): boolean {
+): boolean | undefined {
   return useSyncExternalStore(
-    (listener) => {
-      listeners.add(listener)
-      return () => listeners.delete(listener)
-    },
-    () => (agent ? inPlaceSwitchSupportedNow(executionHostId, agent) : false),
+    subscribe,
+    () => (agent ? inPlaceSwitchCapabilityNow(executionHostId, agent) : false),
     () => false
   )
 }
 
+export function useInPlaceSwitchSupported(
+  host: string | null | undefined,
+  agent: string | null | undefined
+): boolean {
+  return useInPlaceSwitchCapability(host, agent) === true
+}
+
 /** A History row's agent when its host switches it in place: the row offers the switch, not a copy. */
 export function useAiVaultInPlaceAgent(session: {
   agent: AiVaultAgent
   executionHostId?: string | null
 }): AiVaultAgent | undefined {
-  return useInPlaceSwitchSupported(session.executionHostId, session.agent)
+  return useInPlaceSwitchCapability(session.executionHostId, session.agent) !== false &&
+    inPlaceSwitchEnabled(session.agent)
     ? session.agent
     : undefined
 }
diff --git a/src/renderer/src/lib/launch-ai-vault-session.ts b/src/renderer/src/lib/launch-ai-vault-session.ts
index 4646748c8793..ab279af68d19 100644
--- a/src/renderer/src/lib/launch-ai-vault-session.ts
+++ b/src/renderer/src/lib/launch-ai-vault-session.ts
@@ -29,7 +29,7 @@ export function launchAiVaultSessionInNewTab(args: {
   splitDirection?: TabSplitDirection
   /** Opens in this tab's slot: the next tab in its group. */
   afterTabId?: string
-  /** A chat's switch, whose spawn claims the conversation; set only for a capable host. */
+  /** A chat's switch, whose ordinary spawn admits the resume; set only for a capable host. */
   resumeOrigin?: 'switch'
 }): LaunchAiVaultSessionInNewTabResult {
   const store = useAppStore.getState()
diff --git a/src/renderer/src/store/slices/agent-status-provider-session-actions.ts b/src/renderer/src/store/slices/agent-status-provider-session-actions.ts
index 91b82a6afb8f..5a08e59b8edf 100644
--- a/src/renderer/src/store/slices/agent-status-provider-session-actions.ts
+++ b/src/renderer/src/store/slices/agent-status-provider-session-actions.ts
@@ -26,19 +26,9 @@ import { settleAttentionRemovedBy } from './workspace-attention/attention-remova
 
 export function createAgentStatusProviderSessionActions(
   runtime: AgentStatusRuntime
-): Pick<AgentStatusSlice, 'recordAgentProviderSession' | 'setLaunchConversation'> {
+): Pick<AgentStatusSlice, 'recordAgentProviderSession'> {
   const { get, set, requestFreshness } = runtime
   return {
-    setLaunchConversation: (paneKey, conversation) => {
-      if (conversation || paneKey in get().launchConversationByPaneKey) {
-        set((s) => {
-          const { [paneKey]: _old, ...rest } = s.launchConversationByPaneKey
-          return {
-            launchConversationByPaneKey: conversation ? { ...rest, [paneKey]: conversation } : rest
-          }
-        })
-      }
-    },
     recordAgentProviderSession: (
       paneKey: string,
       agent: ResumableTuiAgent,
diff --git a/src/renderer/src/store/slices/agent-status-slice-contract.ts b/src/renderer/src/store/slices/agent-status-slice-contract.ts
index 346f1e2e5b1e..bc6575c8e3eb 100644
--- a/src/renderer/src/store/slices/agent-status-slice-contract.ts
+++ b/src/renderer/src/store/slices/agent-status-slice-contract.ts
@@ -29,15 +29,6 @@ import type {
   SleepingAgentSessionRecord
 } from '../../../../shared/agent-session-resume'
 import type { ProgramStatusFacet } from '../../../../shared/program-status/facet'
-import type { TerminalExecutionStamp } from '../../../../shared/terminal-switch'
-import type { CliConversationRowAgent } from '../../../../shared/structured-agent-cli-conversation-adoption'
-
-/** A switched terminal's conversation, before its agent reports one. Presentation only. */
-export type LaunchConversation = {
-  agent: CliConversationRowAgent
-  providerSession: AgentProviderSessionMetadata
-  execution: TerminalExecutionStamp
-}
 
 export type AgentStatusSlice = {
   /** Explicit agent status entries keyed by `${tabId}:${leafId}`; real-time only, not persisted. */
@@ -60,11 +51,6 @@ export type AgentStatusSlice = {
   /** Durable agent sessions captured on sleep (not live rows); power the one-click CLI resume on wake. */
   sleepingAgentSessionsByPaneKey: Record<string, SleepingAgentSessionRecord>
 
-  /** The host's switched-terminal identity rows; never a sleeping record or a status. */
-  launchConversationByPaneKey: Record<string, LaunchConversation>
-  /** Null when the pane's PTY exits: a later incarnation, even under the same id, is not it. */
-  setLaunchConversation: (paneKey: string, conversation: LaunchConversation | null) => void
-
   /** Ephemeral launch snapshots keyed by pane; hook payloads lack Orca launch settings, so the renderer supplies them from startup. */
   agentLaunchConfigByPaneKey: Record<string, AgentLaunchConfigRegistryEntry>
 
diff --git a/src/renderer/src/store/slices/agent-status.ts b/src/renderer/src/store/slices/agent-status.ts
index d05a94f5851c..b08ed80b5ea2 100644
--- a/src/renderer/src/store/slices/agent-status.ts
+++ b/src/renderer/src/store/slices/agent-status.ts
@@ -108,7 +108,6 @@ export const createAgentStatusSlice: StateCreator<AppState, [], [], AgentStatusS
     retainedAgentsByPaneKey: {},
     sleepingAgentSessionsByPaneKey: {},
     agentLaunchConfigByPaneKey: {},
-    launchConversationByPaneKey: {},
     retentionSuppressedPaneKeys: {},
     recentlyClosedAgentStatusTabIds: {},
     recentlyRetiredAgentStatusPaneKeys: {}
diff --git a/src/shared/agent-hook-listener/listener-event.ts b/src/shared/agent-hook-listener/listener-event.ts
index 59da9b043374..df67ac30ccbb 100644
--- a/src/shared/agent-hook-listener/listener-event.ts
+++ b/src/shared/agent-hook-listener/listener-event.ts
@@ -3,7 +3,6 @@ import type { ParsedAgentStatusPayload } from '../agent-status-types'
 import type { AgentHookSource } from '../agent-hook-relay'
 import type { AgentProviderSessionMetadata } from '../agent-session-resume'
 import type { ClaudeSettledRequest } from './claude-settled-permission-requests'
-import type { TerminalExecutionStamp } from '../terminal-switch'
 
 export type AgentHookEventPayload = {
   paneKey: string
@@ -47,8 +46,6 @@ export type AgentHookEventPayload = {
   providerSession?: AgentProviderSessionMetadata
   /** Session identity update with no turn-state transition; refreshes durable resume metadata without a fake status row. */
   providerSessionOnly?: boolean
-  /** The switched terminal execution an identity-only row was seeded for. Never persisted. */
-  launchExecution?: TerminalExecutionStamp
   /** True when this event is a relay cache replay rather than a live hook. */
   isReplay?: boolean
   /** Claude live work the child list does not show (a shell, a cron, an owed task notification); rejects false input-based interrupts. */
diff --git a/src/shared/agent-session-failure-copy.ts b/src/shared/agent-session-failure-copy.ts
index 940bf2f0b3da..0ca73a45890f 100644
--- a/src/shared/agent-session-failure-copy.ts
+++ b/src/shared/agent-session-failure-copy.ts
@@ -83,8 +83,6 @@ export const AGENT_SESSION_FAILURE_COPY = {
     'Codex still has this conversation open somewhere else. Close it there, then try again.',
   conversationOpenInTerminal:
     "Orca can't confirm {{agent}} has exited in its terminal. Stop what's running there or close the terminal, then try again.",
-  conversationMovingToTerminal:
-    'This conversation is moving to a terminal. Use it there, or wait a moment and try again.',
   chooseClaudeAccount: 'Choose or add one in Claude Accounts settings.',
   chooseClaudeAccountThenRunCommand:
     'Choose or add one in Claude Accounts settings, then run /{{command}} again.',
diff --git a/src/shared/agent-session-failure-words.ts b/src/shared/agent-session-failure-words.ts
index 3f2f4b25f25e..3c7d0142c4ab 100644
--- a/src/shared/agent-session-failure-words.ts
+++ b/src/shared/agent-session-failure-words.ts
@@ -203,8 +203,6 @@ const FAILURE_SENTENCES = {
   runtimeNotInstalled: namingAgent('runtimeNotInstalled'),
   conversationOpenInTerminal: namingAgent('conversationOpenInTerminal'),
   conversationOpenElsewhere: (_context, _fact, _surface, say) => say('conversationOpenElsewhere'),
-  conversationMovingToTerminal: (_context, _fact, _surface, say) =>
-    say('conversationMovingToTerminal'),
   managedAccountUnsupported: (context, _fact, _surface, say) =>
     joinSentences([
       say('managedAccountUnsupported'),
diff --git a/src/shared/agent-session-failure.ts b/src/shared/agent-session-failure.ts
index fd464a3ecb21..89736eb8eec5 100644
--- a/src/shared/agent-session-failure.ts
+++ b/src/shared/agent-session-failure.ts
@@ -48,7 +48,6 @@ export const AGENT_SESSION_FAILURE_KINDS = [
   'runtimeNotInstalled',
   'conversationOpenInTerminal',
   'conversationOpenElsewhere',
-  'conversationMovingToTerminal',
   'providerExited',
   'restartFailed',
   'providerRejected',
diff --git a/src/shared/agent-session-record.ts b/src/shared/agent-session-record.ts
index 23ee63f1852a..554630ee2412 100644
--- a/src/shared/agent-session-record.ts
+++ b/src/shared/agent-session-record.ts
@@ -1,5 +1,4 @@
 import { isAgentSessionRewindRecord, type AgentSessionRewindRecord } from './agent-session-rewind'
-import { isTerminalSwitchDescriptor, type TerminalSwitchDescriptor } from './terminal-switch'
 import { isAgentSessionLaunchArgs } from './agent-session-launch-args'
 import { isAgentSessionConversationName } from './agent-session-conversation-name'
 import {
@@ -165,8 +164,6 @@ export type AgentSessionRecord = {
   /** The name Orca gave this conversation, so a later acquisition need not name it again. */
   conversationName?: string
   launchArgs?: AgentSessionLaunchArgs
-  /** A switch of this chat's conversation into a terminal whose start its owner has not proved over. */
-  terminalSwitch?: TerminalSwitchDescriptor
   lease: AgentSessionLease
   createdAt: number
   updatedAt: number
@@ -187,8 +184,9 @@ const MAX_LAUNCH_ENV_ENTRIES = 256
 const MAX_LAUNCH_ENV_VALUE_LENGTH = 65_536
 const SESSION_ID_PATTERN = /^[A-Za-z0-9_-]{8,128}$/
 
-const isBoundedString = (value: unknown, max: number): value is string =>
-  typeof value === 'string' && value.length > 0 && value.length <= max
+function isBoundedString(value: unknown, max: number): value is string {
+  return typeof value === 'string' && value.length > 0 && value.length <= max
+}
 
 export function isAgentSessionId(value: unknown): value is string {
   return typeof value === 'string' && SESSION_ID_PATTERN.test(value)
@@ -202,8 +200,9 @@ const SCOPE_KEY_SEPARATOR = '\u0000'
  * different sessions; collapsing them would let one host adjudicate another host's lease.
  */
 export function agentSessionScopeKey(location: AgentSessionExecutionLocation): string {
-  const { executionHostId, wslDistro, workspaceId } = location
-  return [executionHostId, wslDistro ?? '', workspaceId].join(SCOPE_KEY_SEPARATOR)
+  return [location.executionHostId, location.wslDistro ?? '', location.workspaceId].join(
+    SCOPE_KEY_SEPARATOR
+  )
 }
 
 export function agentSessionExecutionLocationsEqual(
@@ -374,7 +373,6 @@ export function isPersistedAgentSessionRecord(
     (record.conversationName === undefined ||
       isAgentSessionConversationName(record.conversationName)) &&
     (record.launchArgs === undefined || isAgentSessionLaunchArgs(record.launchArgs)) &&
-    (record.terminalSwitch === undefined || isTerminalSwitchDescriptor(record.terminalSwitch)) &&
     !Object.hasOwn(record, 'launchEnv') &&
     isPersistedAgentSessionLease(record.lease) &&
     record.lease.sessionId === record.sessionId &&
diff --git a/src/shared/agent-session-refusal-details.ts b/src/shared/agent-session-refusal-details.ts
index 7ebef57c0f31..f7b6d9dd6d2f 100644
--- a/src/shared/agent-session-refusal-details.ts
+++ b/src/shared/agent-session-refusal-details.ts
@@ -90,8 +90,6 @@ export const AGENT_SESSION_REFUSAL_REASONS = {
     /** A terminal may still be writing the chat's conversation, so its agent did not start. */
     'conversationOpenInTerminal',
     'conversationOpenElsewhere',
-    /** The conversation is being switched into a terminal that hasn't started yet. */
-    'conversationMovingToTerminal',
     /** The agent started, then Orca could not open the chat's conversation for it. */
     'attachFailed'
   ],
diff --git a/src/shared/agent-session-refusal-reason-words.ts b/src/shared/agent-session-refusal-reason-words.ts
index 7161892db037..3d32e4e857b5 100644
--- a/src/shared/agent-session-refusal-reason-words.ts
+++ b/src/shared/agent-session-refusal-reason-words.ts
@@ -122,7 +122,6 @@ const REASON_WORDS = {
     runtimeNotInstalled: { fact: 'runtimeNotInstalled', action: 'actFirst' },
     conversationOpenInTerminal: { fact: 'conversationOpenInTerminal', action: 'actFirst' },
     conversationOpenElsewhere: { fact: 'conversationOpenElsewhere', action: 'actFirst' },
-    conversationMovingToTerminal: { fact: 'conversationMovingToTerminal', action: 'actFirst' },
     attachFailed: codeWords('retry')
   },
   agent_session_ownership_unknown: {
diff --git a/src/shared/agent-status-ipc-payload.ts b/src/shared/agent-status-ipc-payload.ts
index 5d7ab2c227ef..0efbc6d7f7a9 100644
--- a/src/shared/agent-status-ipc-payload.ts
+++ b/src/shared/agent-status-ipc-payload.ts
@@ -5,7 +5,6 @@
 
 import type { StructuredHostStatus } from './agent-hook-listener/listener-event'
 import type { ProgramStatusFacet } from './program-status/facet'
-import type { TerminalExecutionStamp } from './terminal-switch'
 import type { AgentProviderSessionMetadata } from './agent-session-resume'
 import type { WithAgentStatusObservation } from './agent-status-observation'
 import type {
@@ -65,8 +64,6 @@ export type AgentStatusIpcPayload = ParsedAgentStatusPayload & {
   providerSession?: AgentProviderSessionMetadata
   /** Resume identity update only; the status-shaped fields are transport placeholders. */
   providerSessionOnly?: boolean
-  /** The switched terminal execution an identity-only row describes. */
-  launchExecution?: TerminalExecutionStamp
   /** Live-only Command Code turn boundary key; not persisted to last-status.json. */
   promptInteractionKey?: string
   /** See AgentStatusEntry.programStatus. Live-only; older peers ignore it. */
diff --git a/src/shared/structured-agent-session-dispatch-rejection.ts b/src/shared/structured-agent-session-dispatch-rejection.ts
index dd41caebff4f..8eac0a500805 100644
--- a/src/shared/structured-agent-session-dispatch-rejection.ts
+++ b/src/shared/structured-agent-session-dispatch-rejection.ts
@@ -99,7 +99,6 @@ const KIND_CATEGORY = {
   runtimeNotInstalled: 'startFailed',
   conversationOpenInTerminal: 'startFailed',
   conversationOpenElsewhere: 'startFailed',
-  conversationMovingToTerminal: 'startFailed',
   restartFailed: 'startFailed',
   providerRejected: 'content',
   attachmentInvalid: 'content',
@@ -135,7 +134,6 @@ const KIND_VERDICT = {
   runtimeNotInstalled: 'failure',
   conversationOpenInTerminal: 'failure',
   conversationOpenElsewhere: 'failure',
-  conversationMovingToTerminal: 'failure',
   restartFailed: 'failure',
   providerRejected: 'failure',
   attachmentInvalid: 'failure',
diff --git a/src/shared/terminal-switch.ts b/src/shared/terminal-switch.ts
deleted file mode 100644
index 76596d545a5f..000000000000
--- a/src/shared/terminal-switch.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-// A chat → terminal switch's start, owned by the execution host that creates the terminal: the
-// recipe names one generation and that owner, and only the owner can say the start is over.
-import { readAgentProcessIdentity, type AgentProcessIdentity } from './agent-process-presence'
-
-/** Carries the generation from the recipe to the spawn that honours it; the spawn strips it. */
-export const TERMINAL_SWITCH_GENERATION_ENV = 'ORCA_TERMINAL_SWITCH_GENERATION'
-
-/** What the owner knows of one generation. `bound` is the exact execution it created. */
-export type TerminalSwitchObservation =
-  | { state: 'pending' }
-  | {
-      state: 'bound'
-      ptyId: string
-      incarnationId: string
-      shellPid: number | null
-      /** The startup command was written or revoked; no producer can still deliver it. */
-      startupSettled: boolean
-    }
-  | { state: 'ended' }
-  | { state: 'unverifiable' }
-
-/** The owner's answer, tagged with who answered: a different owner never speaks for this one. */
-export type TerminalSwitchOwnerAnswer = { owner: string; observation: TerminalSwitchObservation }
-
-/** The owners a provider reaches: who takes its next fresh start, and every owner's answer. */
-export type TerminalSwitchOwners = {
-  owner: () => Promise<string | null>
-  /** `fence`: an unseen generation becomes unusable and reads ended; without it, pending. */
-  observe: (generation: string, fence: boolean) => Promise<TerminalSwitchOwnerAnswer[]>
-}
-
-/** Saved on the chat a switch left, from acceptance until the owner proves the start over.
- *  Identity only: never command text, environment, credentials or a running state. */
-export type TerminalSwitchDescriptor = {
-  generation: string
-  agent: string
-  providerSessionId: string
-  owner: string
-  paneKey: string
-  ptyId?: string
-  incarnationId?: string
-  shell?: AgentProcessIdentity
-  processes: AgentProcessIdentity[]
-  /** The execution host's boot when accepted: a later boot proves its processes gone. */
-  boot?: string
-}
-
-/** The exact execution a switch's launch identity row describes; presentation binds to it. */
-export type TerminalExecutionStamp = { ptyId: string; incarnationId: string }
-
-/** Each names its generation: an acceptance takes an empty slot, an update or a clear only its own. */
-export type TerminalSwitchWrite =
-  | { accept: TerminalSwitchDescriptor }
-  | { update: TerminalSwitchDescriptor }
-  | { clear: string }
-
-const MAX = 512
-const bounded = (value: unknown): value is string =>
-  typeof value === 'string' && value.length > 0 && value.length <= MAX
-
-export function isTerminalSwitchDescriptor(value: unknown): value is TerminalSwitchDescriptor {
-  if (typeof value !== 'object' || value === null) {
-    return false
-  }
-  const d: Partial<Record<keyof TerminalSwitchDescriptor, unknown>> = value
-  return (
-    [d.generation, d.agent, d.providerSessionId, d.owner, d.paneKey].every(bounded) &&
-    [d.ptyId, d.incarnationId, d.boot].every((field) => field === undefined || bounded(field)) &&
-    (d.shell === undefined || readAgentProcessIdentity(d.shell) !== undefined) &&
-    Array.isArray(d.processes) &&
-    d.processes.length <= 16 &&
-    d.processes.every((process) => readAgentProcessIdentity(process) !== undefined)
-  )
-}

From 2eeb1828cdcfb6f20dd331835ad707f17eb253c5 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Wed, 21 Oct 2026 17:31:49 -0700
Subject: [PATCH 029/207] Complete native chat return readiness and placement
 contracts

---
 ...red-agent-session-conversation-lifetime.ts |  23 +-
 ...ured-agent-session-create-adoption.test.ts |  77 ++++-
 .../structured-agent-session-host-types.ts    |   2 +
 ...ructured-agent-session-switch-admission.ts |  14 +-
 ...nt-session-terminal-writer-acquire.test.ts |  45 +++
 .../mobile-session-layout-projection.ts       |  25 ++
 .../mobile-session-switch-placement.test.ts   |  86 +++++
 .../orchestration/chat-assignee.test.ts       |  42 ++-
 .../runtime/orchestration/chat-assignee.ts    |  25 ++
 .../structured-agent-session-runtime.ts       |   2 +
 ...-chat-coordinator-mail-rig.test-fixture.ts |   6 +-
 ...red-chat-dispatch-worker-lifecycle.test.ts |  42 +++
 .../launch/mobile-terminal-owned-create.ts    |  45 +--
 .../workspaces/workspace-process-listing.ts   |   5 +
 .../ai-vault-history-native-return.test.tsx   | 296 ++++++++++++++++++
 .../ai-vault-session-cli-fork-copy.tsx        |   2 +-
 .../ai-vault-session-in-place-switch.ts       |   6 +-
 ...t-session-resume-in-chat-workspace.test.ts |   2 +
 ...-vault-session-resume-in-chat-workspace.ts |  13 +-
 .../ai-vault-session-resume-in-chat.ts        |  10 +-
 .../use-ai-vault-panel-session-resume.ts      |  11 +-
 .../tab-bar/cli-chat-resume-feedback.ts       |  84 +++--
 .../tab-bar/cli-chat-resume-run.test.ts       |  88 +++++-
 .../components/tab-bar/cli-chat-resume-run.ts |   6 +-
 .../tab-bar/cli-chat-resume-source.ts         |   6 +-
 ...minal-request-ipc-bridge-placement.test.ts |  47 +++
 src/renderer/src/i18n/locales/en.json         |   3 +-
 src/renderer/src/i18n/locales/es.json         |   3 +-
 src/renderer/src/i18n/locales/fr.json         |   3 +-
 src/renderer/src/i18n/locales/ja.json         |   3 +-
 src/renderer/src/i18n/locales/ko.json         |   3 +-
 src/renderer/src/i18n/locales/zh.json         |   3 +-
 .../src/lib/in-place-switch-support.ts        |  14 +-
 .../src/lib/launch-ai-vault-session.test.ts   |  25 ++
 .../src/lib/launch-ai-vault-session.ts        |  13 +-
 .../web-runtime-terminal-create-operation.ts  |  15 +-
 ...b-runtime-terminal-placement-settlement.ts |  52 ++-
 ...-runtime-terminal-switch-placement.test.ts | 160 ++++++++++
 src/shared/session-tab-placement.ts           |  64 ++++
 39 files changed, 1255 insertions(+), 116 deletions(-)
 create mode 100644 src/main/runtime/mobile-session-switch-placement.test.ts
 create mode 100644 src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx
 create mode 100644 src/renderer/src/runtime/web-runtime-terminal-switch-placement.test.ts

diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-conversation-lifetime.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-conversation-lifetime.ts
index d272f5422c89..8c89eee41e40 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-conversation-lifetime.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-conversation-lifetime.ts
@@ -87,13 +87,6 @@ export function createStructuredAgentSessionConversationLifetime(host: {
     )
   }
 
-  const hasOpenDispatch = (sessionId: string): boolean => {
-    const record = deps().store.getRecord(sessionId)
-    return record !== null && deps().hasOpenDispatch?.(record) === true
-  }
-  const providerHoldsDispatch = (sessionId: string): boolean =>
-    deps().adapter.holdsDispatch?.(sessionId) === true
-
   const holdStopClose = async <T>(
     sessionId: string,
     stop: () => Promise<T>,
@@ -185,8 +178,11 @@ export function createStructuredAgentSessionConversationLifetime(host: {
       getRecord: (sessionId) => deps().store.getRecord(sessionId),
       replacedRuntime: (sessionId) => deps().store.replacedRuntime(sessionId)
     },
-    hasOpenDispatch,
-    providerHoldsDispatch,
+    hasOpenDispatch: (sessionId) => {
+      const record = deps().store.getRecord(sessionId)
+      return record !== null && deps().hasOpenDispatch?.(record) === true
+    },
+    providerHoldsDispatch: (sessionId) => deps().adapter.holdsDispatch?.(sessionId) === true,
     // The host puts an idle agent to rest: a turn it cuts short is news, not the user's Stop.
     stopAgent: (sessionId) => stopAgent(sessionId, { cause: 'evict', resting: true }),
     // A host stop: the child's end rejects what it was handed and writes the one error row, and
@@ -335,9 +331,14 @@ export function createStructuredAgentSessionConversationLifetime(host: {
     switchToTerminal: (id: string): Promise<void> =>
       serialize(id, () =>
         switchAdmission.stopIdleStructuredAgentSessionForSwitch(
-          { session: sessions.get(id), delivering: host.deliveryActive(id), idleSweep },
+          {
+            session: sessions.get(id),
+            delivering: host.deliveryActive(id),
+            idleSweep
+          },
           () => holdStopClose(id, () => stopAgent(id, { cause: 'user-close' })),
-          () => deps().store.getRecord(id)
+          deps(),
+          id
         )
       )
   }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-create-adoption.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-create-adoption.test.ts
index dc97dc6f89ac..bca23631a2b1 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-create-adoption.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-create-adoption.test.ts
@@ -20,6 +20,8 @@ import {
 import type { AgentSessionAttachParams } from './structured-agent-session-attach'
 import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../shared/constants'
 import { openTestJournalHostDatabase } from '../agent-session-journal/journal-host-database-test-support'
+import { adapterFor, fakeCodex } from '../../codex/codex-structured-session-adapter-fixture'
+import { createCodexStructuredLaunchResolver } from '../../runtime/structured-agent-launch-composition.test-support'
 import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding'
 
 let rig: RestTestRig
@@ -66,7 +68,38 @@ function anotherSession(params: AgentSessionAttachParams): AgentSessionAttachPar
 it('imports adoption at rest and resumes its original provider identity after its source disappears', async () => {
   const params = await adoptedParams()
   const history = vi.fn(async () => null)
-  rig.host.deps.adapter.providerHistoryWindow = history
+  const codex = fakeCodex({
+    // Codex 0.162 answers excludeTurns resumes with metadata, not historical turns.
+    'thread/resume': () => ({
+      thread: { id: THREAD, turns: [] },
+      model: 'gpt-5.4',
+      reasoningEffort: 'medium'
+    }),
+    'turn/start': () => ({ turn: { id: 'new-turn' } }),
+    'model/list': () => ({
+      data: [
+        {
+          model: 'gpt-5.4',
+          supportedReasoningEfforts: [{ reasoningEffort: 'medium' }],
+          defaultReasoningEffort: 'medium',
+          isDefault: true
+        }
+      ],
+      nextCursor: null
+    })
+  })
+  const adapter = adapterFor(codex, {}, [], {
+    resolveLaunch: createCodexStructuredLaunchResolver({
+      store: {
+        getRecord: (id) => rig.store.getRecord(id),
+        pinLaunchDirectory: (...args) => rig.store.pinLaunchDirectory(...args)
+      },
+      resolveWorkspacePath: async () => rig.root,
+      resolveCommand: () => 'codex',
+      resolveLaunchArgs: () => []
+    })
+  })
+  await rig.restart({ adapter: Object.assign(adapter, { providerHistoryWindow: history }) })
   expect(await rig.host.create(CALLER, params)).toMatchObject({
     ok: true,
     value: {
@@ -92,19 +125,39 @@ it('imports adoption at rest and resumes its original provider identity after it
       adopt: { providerHandle: codexProviderHandle(THREAD) }
     })
   ).toMatchObject({ ok: true, replayed: true })
-  expect(await rig.host.send(CALLER, restTestSend('new work'))).toMatchObject({ ok: true })
-  await vi.waitFor(() => expect(rig.adapter.dispatch).toHaveBeenCalledOnce())
-  expect(rig.adapter.acquire).toHaveBeenCalledWith(
-    expect.objectContaining({
-      identity: expect.objectContaining({
-        providerHandle: expect.objectContaining({ nativeId: THREAD })
-      })
-    })
-  )
+  expect(await rig.host.switchToChat(SESSION)).toEqual({ ok: true })
+  const caughtUp = await rig.host.journalSnapshot(SESSION)
+  expect(
+    caughtUp.items.filter((item) => item.body.kind === 'message' && item.body.role === 'user')
+  ).toHaveLength(1)
+  expect(codex.connections[0].calls.some((call) => call.method === 'turn/start')).toBe(false)
+  expect(await rig.host.switchToChat(SESSION)).toEqual({ ok: true })
+  expect(codex.connections).toHaveLength(1)
+  expect(codex.connections[0].calls.filter((call) => call.method === 'thread/resume')).toEqual([
+    {
+      method: 'thread/resume',
+      params: expect.objectContaining({ threadId: THREAD, excludeTurns: true })
+    }
+  ])
+  expect(
+    (await rig.host.journalSnapshot(SESSION)).items.filter(
+      (item) => item.body.kind === 'message' && item.body.role === 'user'
+    )
+  ).toHaveLength(1)
   expect(history).toHaveBeenCalledOnce()
-  expect(history.mock.invocationCallOrder[0]).toBeLessThan(
-    rig.adapter.acquire.mock.invocationCallOrder[0]
+  expect(
+    await rig.host.send(
+      CALLER,
+      restTestSend('new work', rig.store.getRecord(SESSION)?.lease.runtimeFence)
+    )
+  ).toMatchObject({ ok: true })
+  await vi.waitFor(() =>
+    expect(codex.connections[0].calls.filter((call) => call.method === 'turn/start')).toHaveLength(
+      1
+    )
   )
+  expect(history).toHaveBeenCalledOnce()
+  await adapter.closeAll()
   expect(rig.store.getRecord(SESSION)?.accountHome).toEqual(params.accountHome)
 })
 
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host-types.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host-types.ts
index 4a3caddd92da..65e1f5dae375 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-host-types.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host-types.ts
@@ -158,6 +158,8 @@ export type StructuredAgentSessionHostDeps = {
   startupLimits?: Partial<StructuredAgentSessionStartupLimits>
   /** Whether an orchestration dispatch still owns this session's worker; absent answers no. */
   hasOpenDispatch?: (record: AgentSessionRecord) => boolean
+  /** Explicit switch admission also includes direct chat assignments, even at rest. */
+  hasOwedSwitchWork?: (record: AgentSessionRecord) => boolean
   /** A chat tab left the screen: closed, or its workspace removed. Advisory; a throw is logged. */
   onSessionTabHidden?: (sessionId: string) => void
   /** Throws while a terminal may still write the record's head conversation; run before a spawn. */
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-admission.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-admission.ts
index 46d075a0f749..98e5c59130fc 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-admission.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-admission.ts
@@ -4,9 +4,11 @@
 
 import { agentSessionLeaseOwnerVerdict } from '../../../shared/agent-session-lease-adjudication'
 import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission'
-import type { AgentSessionRecord } from '../../../shared/agent-session-record'
 import { agentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
-import type { StructuredAgentSessionHostSession } from './structured-agent-session-host-types'
+import type {
+  StructuredAgentSessionHostDeps,
+  StructuredAgentSessionHostSession
+} from './structured-agent-session-host-types'
 
 /** In the chat's ordered step: refuses unless nothing is running, starting, queued or owed, then
  *  admits, stops through close's body, and proves the agent gone before anything starts elsewhere. */
@@ -19,11 +21,15 @@ export async function stopIdleStructuredAgentSessionForSwitch(
     }
   },
   stop: () => Promise<unknown>,
-  record: () => AgentSessionRecord | null
+  deps: StructuredAgentSessionHostDeps,
+  sessionId: string
 ): Promise<void> {
   const { session } = idle
+  const currentRecord = deps.store.getRecord(sessionId)
+  const owesWork = deps.hasOwedSwitchWork ?? deps.hasOpenDispatch
   if (
     idle.delivering ||
+    (currentRecord !== null && owesWork?.(currentRecord) === true) ||
     (session !== undefined &&
       (session.child?.phase === 'starting' ||
         session.journal.submissions().some(isQueuedAgentJournalSubmission) ||
@@ -33,7 +39,7 @@ export async function stopIdleStructuredAgentSessionForSwitch(
     throw agentSessionRefusalError('agent_session_operation_invalid', { reason: 'turnActive' })
   }
   await stop()
-  const lease = record()?.lease
+  const lease = deps.store.getRecord(sessionId)?.lease
   if (!lease || agentSessionLeaseOwnerVerdict(lease) !== 'exited') {
     throw agentSessionRefusalError('agent_session_ownership_unknown', { reason: 'ownerUnproven' })
   }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts
index e8414016524e..cf6af4ff7901 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts
@@ -247,3 +247,48 @@ it('retires only after an explicit admitted launch without stopping a later nati
   expect(host.collaboratorsForTests().sessions.get(SESSION)?.child).toBe(laterChild)
   expect(host.deps.adapter.closeSession).toHaveBeenCalledTimes(closes)
 })
+
+it.each(['ready', 'failed', 'closed', 'replaced'] as const)(
+  'awaits provider open for the selected child, whose result is %s',
+  async (ending) => {
+    await host.close(SESSION, 'evict')
+    const held = Promise.withResolvers<void>()
+    open.mockImplementationOnce(async () => {
+      await held.promise
+      if (ending === 'failed') {
+        throw new AgentSessionAcquisitionRefusal('provider failed')
+      }
+      return { reportedOptions: { model: '' } }
+    })
+    let settled = false
+    const switching = host.switchToChat(SESSION).then((result) => {
+      settled = true
+      return result
+    })
+    await vi.waitFor(() => expect(open).toHaveBeenCalledTimes(2))
+    const child = host.collaboratorsForTests().sessions.get(SESSION)?.child
+    expect(child?.phase).toBe('starting')
+    expect(settled).toBe(false)
+    let replacement = child
+    if (ending === 'closed' || ending === 'replaced') {
+      await host.close(SESSION, 'evict')
+    }
+    if (ending === 'replaced') {
+      expect(await host.switchToChat(SESSION)).toEqual({ ok: true })
+      replacement = host.collaboratorsForTests().sessions.get(SESSION)?.child
+      expect(replacement?.generation).not.toBe(child?.generation)
+    }
+    held.resolve()
+    expect(await switching).toMatchObject({ ok: ending === 'ready' })
+    expect(vi.mocked(host.deps.adapter.dispatch)).not.toHaveBeenCalled()
+    if (ending === 'replaced') {
+      expect(host.collaboratorsForTests().sessions.get(SESSION)?.child).toBe(replacement)
+    }
+    if (ending === 'closed') {
+      expect(await host.switchToChat(SESSION)).toEqual({ ok: true })
+      expect(host.collaboratorsForTests().sessions.get(SESSION)?.child?.generation).not.toBe(
+        child?.generation
+      )
+    }
+  }
+)
diff --git a/src/main/runtime/mobile-session-layout-projection.ts b/src/main/runtime/mobile-session-layout-projection.ts
index 60ab2aec3d1d..eed2e67efd73 100644
--- a/src/main/runtime/mobile-session-layout-projection.ts
+++ b/src/main/runtime/mobile-session-layout-projection.ts
@@ -1,3 +1,7 @@
+import {
+  placeUnpinnedSessionTabAtCapture,
+  type CapturedSessionTabPlacement
+} from '../../shared/session-tab-placement'
 import { createHash, randomUUID } from 'node:crypto'
 import { isTerminalLeafId } from '../../shared/stable-pane-id'
 import type {
@@ -301,3 +305,24 @@ export function buildMaterializedHeadlessParentLayout(
     }
   }
 }
+
+/** Captured neighbors settle into the current group through ordinary pin-aware insertion. */
+export function placeHeadlessSessionTabAtCapture(
+  groups: RuntimeMobileSessionTabGroup[],
+  tabs: readonly RuntimeMobileSessionSnapshotTab[],
+  tabId: string,
+  captured: CapturedSessionTabPlacement
+): void {
+  const group = groups.find((candidate) => candidate.tabOrder.includes(tabId))
+  if (group) {
+    group.tabOrder = placeUnpinnedSessionTabAtCapture(
+      group.tabOrder,
+      tabs.map((tab) => ({
+        id: tab.type === 'terminal' ? tab.parentTabId : tab.id,
+        isPinned: tab.isPinned === true
+      })),
+      tabId,
+      captured
+    )
+  }
+}
diff --git a/src/main/runtime/mobile-session-switch-placement.test.ts b/src/main/runtime/mobile-session-switch-placement.test.ts
new file mode 100644
index 000000000000..38a68850b2b8
--- /dev/null
+++ b/src/main/runtime/mobile-session-switch-placement.test.ts
@@ -0,0 +1,86 @@
+import { expect, it, vi } from 'vitest'
+import type {
+  RuntimeMobileSessionTabsSnapshot,
+  RuntimeMobileSessionSnapshotTab
+} from '../../shared/runtime-types'
+const { OrcaRuntimeService } = await import('./orca-runtime-test-mocks.spec')
+await import('./orca-runtime-test-lifecycle.spec')
+const { store, TEST_WORKTREE_ID: WT } = await import('./orca-runtime-test-fixtures.spec')
+
+it.each([
+  { only: false, pinned: false, retire: true },
+  { only: true, pinned: false, retire: true },
+  { only: false, pinned: true, retire: true },
+  { only: false, pinned: true, retire: false }
+])(
+  'preserves current headless placement and pin partitions ($only/$pinned/$retire)',
+  async ({ only, pinned, retire }) => {
+    const runtime = new OrcaRuntimeService(store)
+    const chat = (id: string): RuntimeMobileSessionSnapshotTab => ({
+      type: 'agent-session',
+      id,
+      sessionId: id,
+      agent: 'codex',
+      title: id,
+      isActive: false,
+      isPinned: pinned && ['A', 'C', 'B'].includes(id)
+    })
+    const source = only ? ['C'] : pinned ? ['A', 'C', 'B', 'U'] : ['A', 'C', 'B']
+    const initial: RuntimeMobileSessionTabsSnapshot = {
+      worktree: WT,
+      publicationEpoch: 'headless:test',
+      snapshotVersion: 1,
+      activeGroupId: 'R',
+      activeTabId: 'D',
+      activeTabType: 'agent-session',
+      tabs: [...source, 'D'].map(chat),
+      tabGroups: [
+        { id: 'L', activeTabId: 'C', tabOrder: source },
+        { id: 'R', activeTabId: 'D', tabOrder: ['D'] }
+      ]
+    }
+    runtime.syncWindowGraph(0, { tabs: [], leaves: [], mobileSessionTabs: [initial] })
+    runtime.setPtyController({
+      spawn: vi.fn(async () => {
+        if (retire) {
+          expect(runtime.retireStructuredAgentSessionTabFromSnapshot('C')).toBe(true)
+        }
+        await runtime.publishStructuredAgentSessionTab({
+          workspaceId: WT,
+          sessionId: 'concurrent',
+          agent: 'codex',
+          activate: false
+        })
+        return { id: 'pty-placement', incarnationId: '45454545-4545-4545-8545-454545454545' }
+      }),
+      write: () => true,
+      kill: () => true,
+      getForegroundProcess: async () => null
+    })
+    const created = await runtime.createMobileSessionTerminal(`id:${WT}`, {
+      afterTabId: 'C',
+      targetGroupId: 'L',
+      command: 'codex resume conversation',
+      activate: false
+    })
+    const result = await runtime.listMobileSessionTabs(`id:${WT}`)
+    expect(result.tabs.some((tab) => tab.id === 'C')).toBe(!retire)
+    expect(
+      result.tabs.some((tab) => tab.type === 'agent-session' && tab.sessionId === 'concurrent')
+    ).toBe(true)
+    if (!only) {
+      expect(result.tabGroups?.find((group) => group.id === 'L')?.tabOrder).toEqual(
+        pinned
+          ? ['A', ...(!retire ? ['C'] : []), 'B', created.tab.parentTabId, 'U']
+          : ['A', created.tab.parentTabId, 'B']
+      )
+      expect(result.tabGroups?.find((group) => group.id === 'R')?.tabOrder).toContain('D')
+    } else {
+      expect(
+        result.tabGroups?.some((group) => group.tabOrder.includes(created.tab.parentTabId))
+      ).toBe(true)
+    }
+    const refreshed = await runtime.listMobileSessionTabs(`id:${WT}`)
+    expect(refreshed.tabGroups).toEqual(result.tabGroups)
+  }
+)
diff --git a/src/main/runtime/orchestration/chat-assignee.test.ts b/src/main/runtime/orchestration/chat-assignee.test.ts
index 5b1ac6252a54..f3493a7ee680 100644
--- a/src/main/runtime/orchestration/chat-assignee.test.ts
+++ b/src/main/runtime/orchestration/chat-assignee.test.ts
@@ -2,7 +2,9 @@ import { describe, expect, it } from 'vitest'
 import type { AgentSessionRecord } from '../../../shared/agent-session-record'
 import { testOrcaSessionId } from '../../../shared/orca-session-address-test-fixture'
 import { sessionRecord } from '../rpc/orchestration-session-caller-test-fixture'
-import { chatAssigneeSessionId, observeChatAssignee } from './chat-assignee'
+import { chatAssigneeSessionId, observeChatAssignee, chatAssigneeOwesWork } from './chat-assignee'
+import { OrchestrationDb } from './db'
+import { createRootDispatch } from './db/root-dispatch-test-fixture'
 import type { AgentSessionRecordReader } from './structured-session-lineage'
 
 const CHAT = testOrcaSessionId('7e3b9d15-2c4a-4f86-a0b1-5c9e2d7f3b64')
@@ -64,3 +66,41 @@ describe('a chat assignee', () => {
     })
   })
 })
+
+it('derives direct debt through legacy clear lineage and stops pinning once that assignment settles', () => {
+  const db = new OrchestrationDb(':memory:')
+  try {
+    const successor = testOrcaSessionId('3f9a1c7e-6b2d-4e85-a0c4-9d1e7b3f5a26')
+    const root: AgentSessionRecord = {
+      ...sessionRecord(CHAT),
+      conversationCommand: {
+        command: 'clear',
+        state: 'completed',
+        replacementSessionId: successor,
+        operationId: 'clear',
+        callerKey: 'caller',
+        phase: 'committed'
+      }
+    }
+    const records = [root, sessionRecord(successor, { lease: { claimStatus: 'released' } })]
+    const reader = {
+      getRecord: (id: string) => records.find((record) => record.sessionId === id) ?? null,
+      listRecords: () => records
+    }
+    const task = db.createTask({ runId: 'run_legacy_local', spec: 'original work' })
+    const dispatch = createRootDispatch(db, task.id, `orca_session_id:${CHAT}`)
+    for (const status of ['pending', 'dispatched']) {
+      db.db.prepare('UPDATE dispatch_contexts SET status = ? WHERE id = ?').run(status, dispatch.id)
+      expect(chatAssigneeOwesWork(db, successor, reader)).toBe(true)
+      expect(chatAssigneeOwesWork(db, CHAT, reader)).toBe(false)
+      expect(chatAssigneeOwesWork(db, 'unrelated', reader)).toBe(false)
+    }
+    db.db
+      .prepare('UPDATE dispatch_contexts SET status = ? WHERE id = ?')
+      .run('completed', dispatch.id)
+    expect(chatAssigneeOwesWork(db, successor, reader)).toBe(false)
+    expect(chatAssigneeOwesWork(null, successor, reader)).toBe(false)
+  } finally {
+    db.close()
+  }
+})
diff --git a/src/main/runtime/orchestration/chat-assignee.ts b/src/main/runtime/orchestration/chat-assignee.ts
index 06aaeeeea7d4..8af28dcacaed 100644
--- a/src/main/runtime/orchestration/chat-assignee.ts
+++ b/src/main/runtime/orchestration/chat-assignee.ts
@@ -109,3 +109,28 @@ export function exitedChatDispatchesForSession(
     }
   )
 }
+
+/** Direct assignments outlive a provider child; /clear keeps their original assignee address. */
+export function chatAssigneeOwesWork(
+  db: OrchestrationDb | null,
+  sessionId: string,
+  store: AgentSessionRecordReader | null = readAgentSessionRecordStore()
+): boolean {
+  if (!db || !store) {
+    return false
+  }
+  const rows = db.db
+    .prepare(`SELECT DISTINCT assignee_handle FROM dispatch_contexts
+    WHERE status IN ('pending', 'dispatched') AND substr(assignee_handle, 1, ?) = ?`)
+    .all(ORCA_SESSION_ADDRESS_PREFIX.length, ORCA_SESSION_ADDRESS_PREFIX)
+  return rows.some((row) => {
+    const assignee =
+      typeof row === 'object' &&
+      row !== null &&
+      'assignee_handle' in row &&
+      typeof row.assignee_handle === 'string'
+        ? chatAssigneeSessionId(row.assignee_handle)
+        : null
+    return assignee !== null && lineageLiveSession(store, assignee)?.sessionId === sessionId
+  })
+}
diff --git a/src/main/runtime/structured-agent-session-runtime.ts b/src/main/runtime/structured-agent-session-runtime.ts
index 873893236ed3..d29dbc8f4655 100644
--- a/src/main/runtime/structured-agent-session-runtime.ts
+++ b/src/main/runtime/structured-agent-session-runtime.ts
@@ -124,6 +124,7 @@ export type StructuredAgentSessionRuntimeDeps = StructuredAgentSessionTransportO
   statusSink?: StructuredAgentSessionHostDeps['statusSink']
   /** See `StructuredAgentSessionHostDeps.hasOpenDispatch`. */
   hasOpenDispatch?: StructuredAgentSessionHostDeps['hasOpenDispatch']
+  hasOwedSwitchWork?: StructuredAgentSessionHostDeps['hasOwedSwitchWork']
   resolveCodexAccountKind?: (home: string) => AgentSessionAccountKind | undefined
   /** Launch prep's sync for a probed home; see `CodexModelCatalogProbeDeps.prepareHome`. */
   prepareCodexCatalogProbeHome?: (homePath: string) => void
@@ -315,6 +316,7 @@ async function installOnJournal(
     ...(deps.onSessionStatusChanged ? { onSessionStatusChanged: deps.onSessionStatusChanged } : {}),
     ...(deps.statusSink ? { statusSink: deps.statusSink } : {}),
     ...(deps.hasOpenDispatch ? { hasOpenDispatch: deps.hasOpenDispatch } : {}),
+    ...(deps.hasOwedSwitchWork ? { hasOwedSwitchWork: deps.hasOwedSwitchWork } : {}),
     ...(deps.startupLimits ? { startupLimits: deps.startupLimits } : {}),
     ...(deps.onSessionTabHidden ? { onSessionTabHidden: deps.onSessionTabHidden } : {}),
     ...(deps.assertNoTerminalWriter ? { assertNoTerminalWriter: deps.assertNoTerminalWriter } : {}),
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
index 0b5e99fdda81..530bcafc9fcd 100644
--- a/src/main/runtime/structured-chat-coordinator-mail-rig.test-fixture.ts
+++ b/src/main/runtime/structured-chat-coordinator-mail-rig.test-fixture.ts
@@ -16,6 +16,8 @@ import { ORCHESTRATION_CONTRACT_VERSION } from '../../shared/protocol-version'
 import type { StructuredAgentSessionHost } from '../native-chat/agent-session-wire/structured-agent-session-host'
 import { activeProviderContext } from '../../shared/agent-session-provider-context'
 import { OrcaRuntimeService } from './orca-runtime'
+import { chatAssigneeOwesWork } from './orchestration/chat-assignee'
+import { structuredWorkerOwesWork } from './structured-worker-custody'
 import { OrchestrationDb } from './orchestration/db'
 import { localOrchestrationCliCommand } from './orchestration/cli-command'
 import { formatMessagePointer } from './orchestration/formatter'
@@ -261,7 +263,9 @@ beforeEach(async () => {
     ...scriptedCodexTransport(codex.openConnection),
     // The same calls the runtime's own host install makes.
     onSessionStatusChanged: (summary) => runtime.onStructuredSessionStatusForMail(summary),
-    onSessionTabHidden: (sessionId) => runtime.onStructuredSessionTabHidden(sessionId)
+    onSessionTabHidden: (sessionId) => runtime.onStructuredSessionTabHidden(sessionId),
+    hasOwedSwitchWork: (record) =>
+      structuredWorkerOwesWork(db, record) || chatAssigneeOwesWork(db, record.sessionId)
   })
   dispatcher = new RpcDispatcher({ runtime, methods: ORCHESTRATION_METHODS })
 })
diff --git a/src/main/runtime/structured-chat-dispatch-worker-lifecycle.test.ts b/src/main/runtime/structured-chat-dispatch-worker-lifecycle.test.ts
index 044a73701661..f1f8f66d8f76 100644
--- a/src/main/runtime/structured-chat-dispatch-worker-lifecycle.test.ts
+++ b/src/main/runtime/structured-chat-dispatch-worker-lifecycle.test.ts
@@ -14,6 +14,7 @@ import {
   WAIT,
   call,
   clearChat,
+  connectionFor,
   coordinatorRunAndTask,
   db,
   dispatcher,
@@ -234,3 +235,44 @@ describe("a chat assignee's liveness, stop and close", () => {
     expect(JSON.stringify(read.transcript)).toContain('working on it')
   })
 })
+
+// An idle reply does not settle an assignment; the same chat/caller must still finish it.
+it.each(['pending', 'dispatched'] as const)(
+  'keeps %s direct work at rest through switch refusal and original completion',
+  async (status) => {
+    const { taskId, dispatchId } = await dispatchToChat()
+    await clearChat(PEER_CHAT)
+    await host.close(PEER_CHAT, 'evict')
+    db.db.prepare('UPDATE dispatch_contexts SET status = ? WHERE id = ?').run(status, dispatchId)
+    const before = db.getDispatchContextById(dispatchId)
+    const close = vi.spyOn(host.deps.adapter, 'closeSession')
+    const acquire = vi.spyOn(host.deps.adapter, 'acquire')
+    await expect(host.switchToTerminal(PEER_CHAT)).rejects.toMatchObject({
+      refusal: { details: { reason: 'turnActive' } }
+    })
+    expect(close).not.toHaveBeenCalled()
+    expect(acquire).not.toHaveBeenCalled()
+    expect(db.getDispatchContextById(dispatchId)).toEqual(before)
+    expect(host.deps.store.getVisibleSessionTabIndex().sessionIds).toContain(PEER_CHAT)
+    db.db
+      .prepare('UPDATE dispatch_contexts SET status = ? WHERE id = ?')
+      .run('dispatched', dispatchId)
+    await startClearedContext(PEER_CHAT)
+    await call(
+      'orchestration.send',
+      { to: WORKER, subject: 'follow up', body: 'finish original work' },
+      { sessionId: COORDINATOR }
+    )
+    const mail = await call('orchestration.check', {}, { sessionId: PEER_CHAT })
+    expect(JSON.stringify(mail)).toContain('follow up')
+    await vi.waitFor(() => expect(connectionFor(PEER_CHAT).turns).toHaveLength(2), WAIT)
+    await settleTurn(PEER_CHAT, 1)
+    await call('orchestration.send', workerDone(taskId, dispatchId), { sessionId: PEER_CHAT })
+    expect(db.getTask(taskId)?.status).toBe('completed')
+    expect(db.getDispatchContextById(dispatchId)?.status).toBe('completed')
+    await vi.waitFor(async () => {
+      await host.switchToTerminal(PEER_CHAT)
+    }, WAIT)
+    expect(host.deps.store.getRecord(PEER_CHAT)?.lease.claimStatus).toBe('released')
+  }
+)
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts b/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
index 456d88e2eb46..ec13b3cfacd6 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
@@ -17,10 +17,13 @@ import { randomUUID } from 'node:crypto'
 import { copySleepingAgentLaunchConfig } from '../../runtime-agent-launch-resolution'
 import { deriveRemoteRuntimeTerminalCreateHandle } from '../../remote-runtime-terminal-create-identity'
 import { parsePaneKey } from '../../../../shared/stable-pane-id'
-import { placeCreatedSessionTab } from '../../../../shared/session-tab-placement'
-import { insertTabIdIntoOrder } from '../../../../shared/workspace-layout/tab-order'
+import {
+  placeCreatedSessionTab,
+  captureSessionTabPlacement
+} from '../../../../shared/session-tab-placement'
 import {
   buildHeadlessMobileSessionTabGroups,
+  placeHeadlessSessionTabAtCapture,
   buildMaterializedHeadlessParentLayout,
   getHeadlessMobileSessionGroupId
 } from '../../mobile-session-layout-projection'
@@ -153,6 +156,19 @@ export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal ext
         signal: opts.signal,
         ...(opts.refuseSleptWorktree ? { refuseSleptWorktree: true } : {})
       })
+    const beforeCreate = this.mobileSessionTabsByWorktree.get(worktreeId)
+    const anchor = beforeCreate?.tabs.find((tab) => tab.id === afterTabId)
+    const anchorParentId =
+      opts.afterDesktopTabId ?? (anchor?.type === 'terminal' ? anchor.parentTabId : anchor?.id)
+    const sourceGroup = beforeCreate?.tabGroups?.find((group) =>
+      group.tabOrder.includes(anchorParentId ?? '')
+    )
+    const targetGroupId = opts.targetGroupId ?? sourceGroup?.id
+    const capturedOrder = captureSessionTabPlacement(sourceGroup?.tabOrder ?? [], anchorParentId)
+    const capturedTabs = captureSessionTabPlacement(
+      beforeCreate?.tabs.map((tab) => tab.id) ?? [],
+      afterTabId
+    )
     const terminal = opts.createMutation
       ? await this.dedupeTerminalCreate(
           opts.createMutation.clientIdentity,
@@ -243,30 +259,17 @@ export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal ext
       })),
       tab,
       afterTabId,
-      { afterParentGroup: opts.supportsSplitGroupPlacement !== false }
+      { afterParentGroup: opts.supportsSplitGroupPlacement !== false, captured: capturedTabs }
     )
     const tabGroups = buildHeadlessMobileSessionTabGroups(
       worktreeId,
       tabs,
       activate ? tab : null,
       existing?.tabGroups,
-      opts.targetGroupId ? { tabId: parentTabId, groupId: opts.targetGroupId } : undefined
+      targetGroupId ? { tabId: parentTabId, groupId: targetGroupId } : undefined
     )
-    if (opts.afterDesktopTabId) {
-      const group = tabGroups.find((candidate) => candidate.tabOrder.includes(parentTabId))
-      if (group?.tabOrder.includes(opts.afterDesktopTabId)) {
-        const topLevelTabs = tabs.map((candidate) => ({
-          id: candidate.type === 'terminal' ? candidate.parentTabId : candidate.id,
-          isPinned: candidate.isPinned === true
-        }))
-        group.tabOrder = insertTabIdIntoOrder(
-          group.tabOrder,
-          topLevelTabs,
-          parentTabId,
-          tab.isPinned === true,
-          opts.afterDesktopTabId
-        )
-      }
+    if (capturedOrder && (!opts.targetGroupId || opts.targetGroupId === sourceGroup?.id)) {
+      placeHeadlessSessionTabAtCapture(tabGroups, tabs, parentTabId, capturedOrder)
     }
     const next: RuntimeMobileSessionTabsSnapshot = {
       worktree: worktreeId,
@@ -275,8 +278,8 @@ export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal ext
       snapshotVersion: (existing?.snapshotVersion ?? 0) + 1,
       // Why: activating the new tab also focuses its group, so a "+" targeting a specific split group makes that group active too.
       activeGroupId:
-        activate && opts.targetGroupId
-          ? opts.targetGroupId
+        activate && targetGroupId && tabGroups.some((group) => group.id === targetGroupId)
+          ? targetGroupId
           : (existing?.activeGroupId ?? getHeadlessMobileSessionGroupId(worktreeId)),
       activeTabId: activate ? tab.id : (existing?.activeTabId ?? null),
       activeTabType: activate ? 'terminal' : (existing?.activeTabType ?? null),
diff --git a/src/main/runtime/workspaces/workspace-process-listing.ts b/src/main/runtime/workspaces/workspace-process-listing.ts
index 916ce04af7be..ed67881f900a 100644
--- a/src/main/runtime/workspaces/workspace-process-listing.ts
+++ b/src/main/runtime/workspaces/workspace-process-listing.ts
@@ -1,3 +1,4 @@
+import { chatAssigneeOwesWork } from '../orchestration/chat-assignee'
 import { resolveStructuredCodexAccountKind } from '../structured-agent-account-home'
 import { getStructuredAgentSessionHost } from '../../native-chat/agent-session-wire/structured-agent-session-registry'
 import { collectRuntimeWorktreeAgentSources } from '../runtime-worktree-agent-sources'
@@ -310,6 +311,10 @@ export abstract class OrcaRuntimeWithGetWorktreePs extends OrcaRuntimeWithWorktr
         reconcile: (state) => this.mobileNotifications.reconcileStructuredPromptAttention(state),
         now: () => Date.now()
       }),
+      hasOwedSwitchWork: (record) => {
+        const db = this.getOrchestrationDbIfAvailable?.() ?? null
+        return structuredWorkerOwesWork(db, record) || chatAssigneeOwesWork(db, record.sessionId)
+      },
       // Read per sweep tick from the orchestration database: a worker whose dispatch is open keeps
       // its agent running. No database answers no.
       hasOpenDispatch: (record) =>
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx b/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx
new file mode 100644
index 000000000000..5630ec11d3e9
--- /dev/null
+++ b/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx
@@ -0,0 +1,296 @@
+// @vitest-environment happy-dom
+import { act, cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { TooltipProvider } from '@/components/ui/tooltip'
+import { useAppStore } from '@/store'
+import { makeWorktree } from '@/store/slices/worktrees-slice-test-fixtures'
+import {
+  refreshLocalRuntimeCapabilities,
+  setLocalRuntimeCapabilitiesForTests
+} from '@/runtime/local-runtime-capabilities'
+import { STRUCTURED_AGENT_SESSION_RESUME_HISTORY_RUNTIME_CAPABILITY as HISTORY } from '../../../../shared/protocol-version'
+import type { AiVaultSession } from '../../../../shared/ai-vault-types'
+import { AiVaultVirtualRow } from './AiVaultVirtualRow'
+import { useAiVaultPanelSessionResume } from './use-ai-vault-panel-session-resume'
+import { useAiVaultSessionLaunchActions } from './ai-vault-session-launch-actions'
+
+const mocks = vi.hoisted(() => ({
+  probe: vi.fn<() => Promise<boolean>>(),
+  owner: vi.fn(() => 'local'),
+  newChat: vi.fn(),
+  fork: vi.fn(),
+  startOwner: vi.fn(async () => false),
+  run: vi.fn(),
+  source: vi.fn(),
+  panes: vi.fn<
+    () => {
+      providerSession: { id: string }
+      agent: 'codex'
+      executionHostId: 'runtime:paired'
+      tabId: string
+      worktreeId: string
+      paneKey: string
+    }[]
+  >(() => [])
+}))
+vi.mock('@/runtime/structured-agent-session-client', () => ({
+  supportsInPlaceSwitch: mocks.probe,
+  subscribeStructuredAgentSessionStatus: vi.fn(async () => ({ unsubscribe: vi.fn() }))
+}))
+vi.mock('@/runtime/structured-agent-session-owner', async (original) => ({
+  ...(await original<object>()),
+  resolveStructuredAgentSessionOwner: mocks.owner
+}))
+// Ordinary route feasibility has its own contracts; these tests exercise the History gates above it.
+vi.mock('@/lib/agent-session-launch-plan', async (original) => ({
+  ...(await original<object>()),
+  structuredAgentSessionLaunchFeasible: () => true
+}))
+vi.mock('./ai-vault-session-resume-in-chat-launch', () => ({
+  resumeAiVaultSessionInNewChat: mocks.newChat
+}))
+vi.mock('../tab-bar/cli-chat-resume-feedback', () => ({ switchIntoOwner: mocks.startOwner }))
+vi.mock('../tab-bar/cli-chat-resume-run', () => ({ runCliChatResume: mocks.run }))
+vi.mock('../tab-bar/cli-chat-resume-source', () => ({ resolveCliChatResumeSource: mocks.source }))
+vi.mock('@/lib/ai-vault-tab-title-requests', async (original) => ({
+  ...(await original<object>()),
+  collectAgentPaneConversations: mocks.panes
+}))
+
+const row: AiVaultSession = {
+  id: 'codex-history',
+  agent: 'codex',
+  sessionId: 'conversation',
+  executionHostId: 'local',
+  structuredSession: { sessionId: 'owner', workspaceId: 'workspace' },
+  title: 'Conversation',
+  cwd: '/repo',
+  branch: null,
+  model: null,
+  filePath: '/rollout.jsonl',
+  codexHome: null,
+  createdAt: null,
+  updatedAt: null,
+  modifiedAt: '2026-10-21T00:00:00Z',
+  messageCount: 1,
+  totalTokens: 0,
+  previewMessages: [{ role: 'user', text: 'hello', timestamp: null }],
+  queuedMessageCount: 0,
+  subagentTranscriptCount: 0,
+  resumeCommand: '',
+  subagent: null
+}
+function History({ session }: { session: AiVaultSession }) {
+  const state = useAppStore.getState()
+  const targetState = {
+    ...state,
+    repos: [],
+    worktreesByRepo: {
+      repo: [makeWorktree({ id: 'workspace', repoId: 'repo', path: '/repo', hostId: 'local' })]
+    },
+    folderWorkspaces: [],
+    projectGroups: []
+  }
+  const resume = useAiVaultPanelSessionResume({
+    sessions: [session],
+    repos: [],
+    allWorktrees: [],
+    workspaceId: 'workspace',
+    resumeTargetState: targetState,
+    settings: { ...state.settings, experimentalNativeChat: true }
+  })
+  const actions = useAiVaultSessionLaunchActions({
+    activeWorktree: null,
+    activeWorktreeId: 'workspace',
+    targetState
+  })
+  return (
+    <TooltipProvider>
+      <AiVaultVirtualRow
+        row={{ type: 'session', groupKey: 'today', session }}
+        index={0}
+        start={0}
+        activeStickyHeaderIndex={null}
+        measureElement={vi.fn()}
+        collapsedGroups={new Set()}
+        expandedSessionIds={new Set([session.id])}
+        vaultScope="all"
+        buildResumeStartup={actions.buildResumeStartup}
+        getOriginalPaneTarget={() => null}
+        isStructuredSessionOpen={() => false}
+        getSessionLiveState={() => null}
+        getWorktreeInfo={resume.getSessionWorktreeInfo}
+        getSessionResumeState={resume.getSessionResumeState}
+        getSessionResumeActions={resume.getSessionResumeActions}
+        getSessionResumeInChat={resume.getSessionResumeInChat}
+        onToggleGroup={vi.fn()}
+        onToggleSessionDetails={vi.fn()}
+        onJumpToOriginalPane={vi.fn()}
+        onJumpToWorktree={vi.fn()}
+        onResume={vi.fn()}
+        onContinueInNewSession={vi.fn()}
+        onResumeInNewChat={actions.handleResumeInNewChat}
+        onResumeInNewCli={mocks.fork}
+        onCopyResume={vi.fn()}
+        onCopyId={vi.fn()}
+        onCopyPath={vi.fn()}
+        onOpenLog={vi.fn()}
+        onRevealLog={vi.fn()}
+        onOpenCwd={vi.fn()}
+        onRequestDelete={vi.fn()}
+      />
+    </TooltipProvider>
+  )
+}
+beforeEach(async () => {
+  vi.clearAllMocks()
+  Object.assign(window, {
+    api: {
+      ...window.api,
+      aiVault: {},
+      runtime: { getStatus: async () => ({ capabilities: [HISTORY] }) }
+    }
+  })
+  useAppStore.setState(useAppStore.getInitialState(), true)
+  setLocalRuntimeCapabilitiesForTests([HISTORY])
+  await refreshLocalRuntimeCapabilities()
+  mocks.owner.mockReturnValue('local')
+  mocks.probe.mockResolvedValue(true)
+  mocks.source.mockReturnValue(null)
+  mocks.panes.mockReturnValue([])
+})
+afterEach(cleanup)
+
+it.each(['local', 'runtime:paired'] as const)(
+  'composes the owned %s row/details/menu and refreshes unknown capability',
+  async (host) => {
+    mocks.owner.mockReturnValue(host)
+    useAppStore.setState({
+      runtimeStatusByEnvironmentId: new Map([
+        ['paired', { status: { capabilities: [HISTORY] }, checkedAt: 1 }]
+      ])
+    })
+    let answer = (_value: boolean) => {}
+    mocks.probe.mockImplementationOnce(
+      () =>
+        new Promise((resolve) => {
+          answer = resolve
+        })
+    )
+    const session = { ...row, executionHostId: host }
+    render(<History session={session} />)
+    const button = screen.getByRole('button', { name: 'Switch to native chat' })
+    expect(button.hasAttribute('disabled')).toBe(true)
+    await act(async () => answer(true))
+    await waitFor(() => expect(button.hasAttribute('disabled')).toBe(false))
+    await userEvent.setup().click(button)
+    expect(mocks.startOwner).toHaveBeenCalledWith(
+      expect.objectContaining({ workspaceId: 'workspace' }),
+      row.structuredSession,
+      host === 'local' ? { kind: 'local' } : { kind: 'environment', environmentId: 'paired' }
+    )
+    await userEvent.setup().click(screen.getByTestId('ai-vault-session-more-actions'))
+    await userEvent
+      .setup()
+      .click(await screen.findByRole('menuitem', { name: 'Switch to native chat' }))
+    expect(mocks.startOwner).toHaveBeenCalledTimes(2)
+    fireEvent.contextMenu(screen.getByText('Conversation'))
+    await userEvent
+      .setup()
+      .click(await screen.findByRole('menuitem', { name: 'Switch to native chat' }))
+    expect(mocks.startOwner).toHaveBeenCalledTimes(3)
+  }
+)
+
+it('routes a capable paired unowned row with a matching terminal through the same return', async () => {
+  mocks.owner.mockReturnValue('runtime:paired')
+  useAppStore.setState({
+    runtimeStatusByEnvironmentId: new Map([
+      ['paired', { status: { capabilities: [HISTORY] }, checkedAt: 1 }]
+    ])
+  })
+  const session = {
+    ...row,
+    structuredSession: undefined,
+    executionHostId: 'runtime:paired' as const
+  }
+  const source = {
+    agent: 'codex',
+    tabId: 'terminal',
+    workspaceId: 'workspace',
+    paneKey: 'terminal:leaf',
+    executionHostId: 'runtime:paired',
+    providerSessionId: 'conversation'
+  }
+  mocks.panes.mockReturnValue([
+    {
+      providerSession: { id: 'conversation' },
+      agent: 'codex',
+      executionHostId: 'runtime:paired',
+      tabId: 'terminal',
+      worktreeId: 'workspace',
+      paneKey: 'terminal:leaf'
+    }
+  ])
+  mocks.source.mockReturnValue(source)
+  render(<History session={session} />)
+  await waitFor(() =>
+    expect(
+      screen.getByRole('button', { name: 'Switch to native chat' }).hasAttribute('disabled')
+    ).toBe(false)
+  )
+  await userEvent.setup().click(screen.getByRole('button', { name: 'Switch to native chat' }))
+  expect(mocks.run).toHaveBeenCalledExactlyOnceWith(source)
+})
+
+it.each([
+  {
+    executionHostId: 'runtime:paired' as const,
+    agent: 'codex' as const,
+    filePath: '/rollout.jsonl'
+  },
+  { executionHostId: 'ssh:box' as const, agent: 'codex' as const, filePath: '/rollout.jsonl' },
+  {
+    executionHostId: 'local' as const,
+    agent: 'codex' as const,
+    filePath: '//wsl.localhost/Ubuntu/rollout.jsonl'
+  },
+  { executionHostId: 'local' as const, agent: 'omp' as const, filePath: '/session.jsonl' }
+])('keeps ordinary restrictions for an unsupported owned row: %s', async (overrides) => {
+  mocks.probe.mockResolvedValue(false)
+  mocks.owner.mockReturnValue(
+    overrides.executionHostId.startsWith('ssh:') ? null : overrides.executionHostId
+  )
+  render(<History session={{ ...row, ...overrides }} />)
+  await waitFor(() =>
+    expect(screen.queryByRole('button', { name: 'Switch to native chat' })).toBeNull()
+  )
+  expect(mocks.run).not.toHaveBeenCalled()
+  expect(mocks.startOwner).not.toHaveBeenCalled()
+})
+
+it.each(['codex', 'claude', 'grok', 'omp', 'opencode', 'opencode2', 'pi'] as const)(
+  'keeps ordinary local History resume and owned fork usable for %s',
+  async (agent) => {
+    mocks.probe.mockResolvedValue(false)
+    const session = { ...row, agent, structuredSession: undefined }
+    const view = render(<History session={session} />)
+    const resume = await screen.findByRole('button', { name: 'Resume in New Chat' })
+    await userEvent.setup().click(resume)
+    expect(mocks.newChat).toHaveBeenCalledExactlyOnceWith(
+      session,
+      agent,
+      'workspace',
+      expect.any(String)
+    )
+    expect(mocks.run).not.toHaveBeenCalled()
+    expect(mocks.startOwner).not.toHaveBeenCalled()
+    view.rerender(<History session={{ ...session, structuredSession: row.structuredSession }} />)
+    await userEvent
+      .setup()
+      .click(await screen.findByRole('button', { name: 'Resume in New Terminal' }))
+    expect(mocks.fork).toHaveBeenCalledOnce()
+    expect(screen.queryByRole('button', { name: 'Switch to CLI' })).toBeNull()
+  }
+)
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-session-cli-fork-copy.tsx b/src/renderer/src/components/right-sidebar/ai-vault-session-cli-fork-copy.tsx
index 2cc5a6d6f316..7e2971f84e8d 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-session-cli-fork-copy.tsx
+++ b/src/renderer/src/components/right-sidebar/ai-vault-session-cli-fork-copy.tsx
@@ -30,7 +30,7 @@ export function SwitchToCliTooltipText({ agent }: { agent: AiVaultAgent }): Reac
     <>
       {translate(
         'components.tab.bar.switch.toCliTooltip',
-        'Switch to CLI: stops {{agent}} here and continues the same conversation in the terminal, in this tab.',
+        'Switch to CLI: stops {{agent}} in native chat and continues the same conversation in a terminal.',
         { agent: agentLabel(agent) }
       )}
     </>
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts b/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts
index 446245eaaf09..fdb957dddc24 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts
@@ -1,11 +1,13 @@
 import { switchIntoOwner } from '../tab-bar/cli-chat-resume-feedback'
 import { structuredAgentSessionTargetForHost } from '@/runtime/structured-agent-session-owner'
-import { cliConversationRowsShareAgent } from '../../../../shared/structured-agent-cli-conversation-adoption'
+import {
+  cliConversationRowsShareAgent,
+  adoptsCliConversations
+} from '../../../../shared/structured-agent-cli-conversation-adoption'
 import { useAppStore } from '@/store'
 import { collectAgentPaneConversations } from '@/lib/ai-vault-tab-title-requests'
 import { inPlaceSwitchSupportedNow } from '@/lib/in-place-switch-support'
 import type { AiVaultSession } from '../../../../shared/ai-vault-types'
-import { adoptsCliConversations } from '../../../../shared/structured-agent-cli-conversation-adoption'
 import { resolveCliChatResumeSource } from '../tab-bar/cli-chat-resume-source'
 import { runCliChatResume } from '../tab-bar/cli-chat-resume-run'
 import { runNativeChatCliSwitch } from '../tab-bar/native-chat-cli-switch-run'
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-workspace.test.ts b/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-workspace.test.ts
index d8387ddb90c0..890a137ba7c4 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-workspace.test.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-workspace.test.ts
@@ -8,6 +8,8 @@ const mocks = vi.hoisted(() => ({
   state: { runtimeStatusByEnvironmentId: new Map<string, unknown>() }
 }))
 
+vi.mock('@/lib/in-place-switch-support', () => ({ inPlaceSwitchCapabilityNow: () => false }))
+
 vi.mock('@/store', () => ({ useAppStore: { getState: () => mocks.state } }))
 vi.mock('@/runtime/structured-agent-session-owner', () => ({
   resolveStructuredAgentSessionOwner: mocks.owner
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-workspace.ts b/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-workspace.ts
index c07e1e886089..d7f125054eca 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-workspace.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-workspace.ts
@@ -1,3 +1,4 @@
+import { inPlaceSwitchCapabilityNow } from '@/lib/in-place-switch-support'
 import { resolveHostCapabilities, workspaceKindForWorktreeId } from '@/lib/agent-launch-route-input'
 import {
   structuredAgentSessionLaunchFeasible,
@@ -30,9 +31,11 @@ export function resolveAiVaultSessionResumeInChatForWorkspace(args: {
   targetState: AiVaultSessionResumeTargetState
   settings: AgentSessionStructuredFeasibilityRequest['settings']
 }): AiVaultResumeInChatEligibility {
-  const targetWorkspaceId = args.resumeState.usesSessionWorktree
-    ? args.resumeState.worktreeId
-    : (args.resumeState.worktreeId ?? args.activeWorkspaceId)
+  const targetWorkspaceId =
+    args.session.structuredSession?.workspaceId ??
+    (args.resumeState.usesSessionWorktree
+      ? args.resumeState.worktreeId
+      : (args.resumeState.worktreeId ?? args.activeWorkspaceId))
   const targetWorkspacePath = targetWorkspaceId
     ? resolveAiVaultTargetWorkspacePath(args.targetState, targetWorkspaceId)
     : null
@@ -46,6 +49,10 @@ export function resolveAiVaultSessionResumeInChatForWorkspace(args: {
     session: args.session,
     targetWorkspaceId,
     targetWorkspacePath,
+    inPlaceSwitchAvailable:
+      targetOwner !== null &&
+      targetOwner === normalizeExecutionHostId(args.session.executionHostId) &&
+      inPlaceSwitchCapabilityNow(targetOwner, args.session.agent) !== false,
     structuredRouteAvailable:
       adoptsCliConversations(args.session.agent) &&
       targetWorkspaceId !== null &&
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat.ts b/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat.ts
index 489715d1d880..18053c9ad990 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat.ts
@@ -78,18 +78,20 @@ export function resolveAiVaultSessionResumeInChatEligibility(args: {
    *  not apply. Reused rather than re-derived: it already encodes host capability, platform refusals
    *  and the WSL/repair refusal, and a second copy of those conditions would drift from it. */
   structuredRouteAvailable: boolean
+  /** Unknown switch capability keeps an eligible disabled action on its existing surface. */
+  inPlaceSwitchAvailable?: boolean
 }): AiVaultResumeInChatEligibility {
   const { session } = args
   if (isAntigravityReferenceSession(session) || !adoptsCliConversations(session.agent)) {
     return { available: false, reason: 'agent' }
   }
-  // An already-adopted row reopens its own chat instead; offering a second resume of it would ask
-  // for a conflict the host would rightly refuse.
-  if (session.structuredSession) {
+  const canSwitch =
+    args.inPlaceSwitchAvailable === true && !isWslStoredAiVaultSessionFile(session.filePath)
+  if (session.structuredSession && !canSwitch) {
     return { available: false, reason: 'already-structured' }
   }
   if (
-    session.executionHostId !== LOCAL_EXECUTION_HOST_ID ||
+    (session.executionHostId !== LOCAL_EXECUTION_HOST_ID && !canSwitch) ||
     isWslStoredAiVaultSessionFile(session.filePath)
   ) {
     return { available: false, reason: 'remote' }
diff --git a/src/renderer/src/components/right-sidebar/use-ai-vault-panel-session-resume.ts b/src/renderer/src/components/right-sidebar/use-ai-vault-panel-session-resume.ts
index 352c58ea95d1..4aa6519eda5a 100644
--- a/src/renderer/src/components/right-sidebar/use-ai-vault-panel-session-resume.ts
+++ b/src/renderer/src/components/right-sidebar/use-ai-vault-panel-session-resume.ts
@@ -1,4 +1,5 @@
 import { useCallback } from 'react'
+import { useInPlaceSwitchRevision } from '@/lib/in-place-switch-support'
 import type { AiVaultSession } from '../../../../shared/ai-vault-types'
 import type { Repo } from '../../../../shared/repo-types'
 import type { Worktree } from '../../../../shared/worktree/types'
@@ -26,6 +27,7 @@ export function useAiVaultPanelSessionResume(args: {
   settings: AppState['settings']
 }) {
   const { sessions, repos, allWorktrees, workspaceId, resumeTargetState, settings } = args
+  useInPlaceSwitchRevision()
   // Folder workspaces own their sessions by cwd too, so they resume and jump like a worktree.
   const ownerWorkspaces = useAiVaultSessionOwnerWorkspaces(allWorktrees, resumeTargetState)
   const sessionWorktreeById = useAiVaultSessionWorktreeMap({
@@ -68,12 +70,9 @@ export function useAiVaultPanelSessionResume(args: {
   // workspace host a PTY" but "will the provider still find this conversation from the workspace we
   // would run it in". The workspace it targets is the session's own when that is open, because
   // Claude looks its transcript up under a directory derived from the launch cwd.
-  const getSessionResumeInChat = useCallback(
-    (session: AiVaultSession): AiVaultResumeInChatEligibility =>
-      resolveAiVaultHistoryRowResume({ ...getSessionRowResumeArgs(session), settings })
-        .resumeInChat,
-    [getSessionRowResumeArgs, settings]
-  )
+  // Capability updates rerender this hook and refresh memoized row readers.
+  const getSessionResumeInChat = (session: AiVaultSession): AiVaultResumeInChatEligibility =>
+    resolveAiVaultHistoryRowResume({ ...getSessionRowResumeArgs(session), settings }).resumeInChat
   return {
     getSessionWorktreeInfo,
     getSessionResumeState,
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
index 25f88ce7c571..52e9ab59f884 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
@@ -1,4 +1,7 @@
 import { useAppStore } from '@/store'
+import { parseWorkspaceKey } from '../../../../shared/workspace-scope'
+import { getIndexedWorktreeById } from '@/store/worktree-repo-index'
+import { resolveWorktreeDisplayName } from '@/lib/worktree-default-display-name'
 import { toast } from 'sonner'
 import { translate } from '@/i18n/i18n'
 import { structuredLaunchFailure } from '@/lib/structured-agent-session-launch-failure'
@@ -43,24 +46,7 @@ export async function switchIntoOwner(
     await activateAiVaultStructuredSession({ structuredSession }, undefined, target)
     return false
   }
-  const switched = await callStructuredAgentSession<
-    { ok: true } | { ok: false; refusal: AgentSessionWireRefusal }
-  >(target, 'agentSession.switchToChat', { sessionId: structuredSession.sessionId }).catch(
-    () => null
-  )
-  if (!switched?.ok) {
-    const failure = switched
-      ? structuredLaunchFailure(Object.assign(new Error(switched.refusal.message), switched))
-      : undefined
-    // Never the owner shortcut again: a refused start keeps the terminal and says why.
-    toast.error(
-      failure?.code === 'agent_session_operation_invalid' &&
-        failure.details?.reason === 'conversationOpenInTerminal'
-        ? cliConversationExitGuidance(source.agent, true)
-        : agentSessionWriteFailureText(failure ?? { kind: 'unconfirmed' }, 'read-history', {
-            agentName: agentLabel(source.agent)
-          })
-    )
+  if (!(await startCliChatReturn(source, structuredSession.sessionId, target))) {
     return false
   }
   const shown = await activateAiVaultStructuredSessionVerified(
@@ -68,7 +54,28 @@ export async function switchIntoOwner(
     undefined,
     target
   )
-  if (shown === 'activated' && structuredSession.workspaceId === source.workspaceId) {
+  if (shown !== 'activated') {
+    return false
+  }
+  if (structuredSession.workspaceId !== source.workspaceId) {
+    const state = useAppStore.getState()
+    const scope = parseWorkspaceKey(structuredSession.workspaceId)
+    const folder =
+      scope?.type === 'folder'
+        ? state.folderWorkspaces.find((workspace) => workspace.id === scope.folderWorkspaceId)
+        : undefined
+    const worktree = getIndexedWorktreeById(state.worktreesByRepo, structuredSession.workspaceId)
+    const workspace =
+      folder?.name ??
+      (worktree ? resolveWorktreeDisplayName(worktree) : structuredSession.workspaceId)
+    toast.success(
+      translate('components.tab.bar.switch.openedInWorkspace', 'Opened chat in {{workspace}}.', {
+        workspace
+      })
+    )
+    return false
+  }
+  {
     const state = useAppStore.getState()
     const tabs = state.unifiedTabsByWorktree[source.workspaceId] ?? []
     const chat = tabs.find(
@@ -78,15 +85,46 @@ export async function switchIntoOwner(
       g.tabOrder.includes(source.tabId)
     )
     if (chat && group) {
-      state.moveUnifiedTabToGroup(chat.id, group.id, {
-        index: group.tabOrder.filter((id) => id !== chat.id).indexOf(source.tabId) + 1,
-        activate: true
-      })
+      const order = group.tabOrder.filter((id) => id !== chat.id)
+      const index = order.indexOf(source.tabId) + 1
+      if (chat.groupId === group.id) {
+        order.splice(index, 0, chat.id)
+        state.reorderUnifiedTabs(group.id, order)
+      } else {
+        state.moveUnifiedTabToGroup(chat.id, group.id, { index, activate: true })
+      }
     }
   }
   return shown === 'activated'
 }
 
+/** Explicit returns await the selected child; ordinary lazy creation remains unchanged. */
+export async function startCliChatReturn(
+  source: Pick<CliChatResumeSource, 'agent'>,
+  sessionId: string,
+  target: RuntimeClientTarget
+): Promise<boolean> {
+  const switched = await callStructuredAgentSession<
+    { ok: true } | { ok: false; refusal: AgentSessionWireRefusal }
+  >(target, 'agentSession.switchToChat', { sessionId }).catch(() => null)
+  if (!switched?.ok) {
+    const failure = switched
+      ? structuredLaunchFailure(Object.assign(new Error(switched.refusal.message), switched))
+      : undefined
+    // Never the owner shortcut again: a refused start keeps the terminal and says why.
+    toast.error(
+      failure?.code === 'agent_session_operation_invalid' &&
+        failure.details?.reason === 'conversationOpenInTerminal'
+        ? cliConversationExitGuidance(source.agent, true)
+        : agentSessionWriteFailureText(failure ?? { kind: 'unconfirmed' }, 'read-history', {
+            agentName: agentLabel(source.agent)
+          })
+    )
+    return false
+  }
+  return true
+}
+
 function toastCliChatResumeFailure(source: CliChatResumeSource, error: unknown): void {
   const refusal = structuredLaunchFailure(error)
   if (
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
index db6a95985d69..2d6082eeb6d1 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
@@ -12,6 +12,7 @@ const mocks = vi.hoisted(() => {
     createCapability: vi.fn(),
     call: vi.fn(),
     toast: vi.fn(),
+    success: vi.fn(),
     activate: vi.fn(async () => true),
     activateVerified: vi.fn(async () => 'activated'),
     switchCapability: vi.fn(async () => false),
@@ -54,7 +55,7 @@ vi.mock('@/runtime/structured-session-tab-inventory', () => ({
 vi.mock('@/lib/structured-agent-session-create-hydration', () => ({
   publishStructuredAgentSessionCreateHydration: vi.fn()
 }))
-vi.mock('sonner', () => ({ toast: { error: mocks.toast } }))
+vi.mock('sonner', () => ({ toast: { error: mocks.toast, success: mocks.success } }))
 vi.mock('@/lib/activate-ai-vault-structured-session', () => ({
   activateAiVaultStructuredSession: mocks.activate,
   activateAiVaultStructuredSessionVerified: mocks.activateVerified
@@ -243,6 +244,89 @@ describe('CLI identity resume through the existing launch owner', () => {
     expect(tabs().find((tab) => tab.id === chat.id)?.groupId).toBe(source.groupId)
   })
 
+  it('reorders an owner already in the source group and retains a cross-workspace source', async () => {
+    const [a, source, b] = seedTabs()
+    const chat = useAppStore
+      .getState()
+      .createUnifiedTab('wt-1', 'agent-session', { entityId: 'owner-chat' })
+    useAppStore.getState().reorderUnifiedTabs(source.groupId, [chat.id, a.id, source.id, b.id])
+    mocks.switchCapability.mockResolvedValue(true)
+    mocks.call.mockResolvedValue({ ok: true })
+    expect(
+      await switchIntoOwner(
+        { ...SOURCE, tabId: source.id },
+        { sessionId: 'owner-chat', workspaceId: 'wt-1' },
+        { kind: 'local' }
+      )
+    ).toBe(true)
+    useAppStore.getState().closeUnifiedTab(source.id)
+    expect(useAppStore.getState().groupsByWorktree['wt-1'][0].tabOrder).toEqual([
+      a.id,
+      chat.id,
+      b.id
+    ])
+    mocks.activateVerified.mockResolvedValueOnce('unconfirmed')
+    useAppStore.setState({
+      worktreesByRepo: {
+        repo: [
+          makeWorktree({ id: 'another-workspace', repoId: 'repo', displayName: 'Owner workspace' })
+        ]
+      }
+    })
+    const owner = { sessionId: 'owner-chat', workspaceId: 'another-workspace' }
+    expect(await switchIntoOwner(SOURCE, owner, { kind: 'local' })).toBe(false)
+    expect(mocks.success).not.toHaveBeenCalled()
+    expect(await switchIntoOwner(SOURCE, owner, { kind: 'local' })).toBe(false)
+    expect(mocks.success).toHaveBeenCalledExactlyOnceWith('Opened chat in Owner workspace.')
+    expect(mocks.rpc.mock.calls.filter(([, method]) => method === 'terminal.close')).toHaveLength(0)
+  })
+
+  it.each([true, false, null])(
+    'holds a new at-rest receipt until its selected child answers %s',
+    async (ready) => {
+      mocks.switchCapability.mockResolvedValue(true)
+      const start = deferred<unknown>()
+      mocks.call.mockImplementation(
+        async (_target, method, params: StructuredAgentSessionCreateParams) =>
+          method === 'agentSession.switchToChat'
+            ? start.promise
+            : { ok: true, value: { sessionId: params.envelope.sessionId, fence: 1 } }
+      )
+      const running = runCliChatResume(SOURCE)
+      await vi.waitFor(() =>
+        expect(
+          mocks.call.mock.calls.some(([, method]) => method === 'agentSession.switchToChat')
+        ).toBe(true)
+      )
+      expect(mocks.rpc.mock.calls.some(([, method]) => method === 'terminal.close')).toBe(false)
+      start.resolve(
+        ready === null
+          ? null
+          : ready
+            ? { ok: true }
+            : {
+                ok: false,
+                refusal: {
+                  code: 'agent_session_operation_invalid',
+                  details: { reason: 'conversationOpenElsewhere' },
+                  message: 'Cannot start'
+                }
+              }
+      )
+      await running
+      expect(mocks.rpc.mock.calls.filter(([, method]) => method === 'terminal.close')).toHaveLength(
+        ready ? 1 : 0
+      )
+      const created = mocks.call.mock.calls.find(
+        ([, method]) => method === 'agentSession.create'
+      )![2]
+      expect(created.firstMessage).toBeUndefined()
+      expect(
+        mocks.call.mock.calls.find(([, method]) => method === 'agentSession.switchToChat')![2]
+      ).toEqual({ sessionId: created.envelope.sessionId })
+    }
+  )
+
   it('retires an unsent click during create capability waiting, even if the same source returns', async () => {
     const capability = deferred<boolean>()
     mocks.createCapability.mockReturnValue(capability.promise)
@@ -311,7 +395,7 @@ describe('CLI identity resume through the existing launch owner', () => {
   })
 
   it('starts the chat that holds the conversation before the terminal closes; a refusal keeps it', async () => {
-    const owner = { sessionId: 'owner-chat', workspaceId: 'owner-workspace' }
+    const owner = { sessionId: 'owner-chat', workspaceId: 'wt-1' }
     let switched: unknown = {
       ok: false,
       refusal: {
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
index a2f0f005c5ae..a3ddd7601e54 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
@@ -13,7 +13,7 @@ import { structuredAgentSessionTargetForHost } from '@/runtime/structured-agent-
 import { waitForPromiseWithSignal } from '../../../../shared/abort-signal-reason'
 import { CLI_CONVERSATION_ADOPTING_AGENTS } from '../../../../shared/structured-agent-cli-conversation-adoption'
 import { resolveCliChatResumeSource, type CliChatResumeSource } from './cli-chat-resume-source'
-import { reportCliChatResumeFailure } from './cli-chat-resume-feedback'
+import { reportCliChatResumeFailure, startCliChatReturn } from './cli-chat-resume-feedback'
 import { adoptingAgentOnHost } from '../right-sidebar/ai-vault-session-resume-in-chat-launch'
 import { panePtyId } from '@/lib/ai-vault-tab-title-requests'
 import { subscribeToPtyExit } from '../terminal-pane/pty-dispatcher'
@@ -247,7 +247,9 @@ export async function runCliChatResume(source: CliChatResumeSource): Promise<voi
     }
     const result = await waitForPromiseWithSignal(launch.settlement, controller.signal)
     if (result.kind === 'structured' && inPlace) {
-      await retireSwitchedTerminalPane(source, () => sourceExited, sourceIncarnation)
+      if (await startCliChatReturn(source, result.sessionId, target)) {
+        await retireSwitchedTerminalPane(source, () => sourceExited, sourceIncarnation)
+      }
     } else if (
       result.kind === 'failed' &&
       !result.notified &&
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts
index 7871e5f81822..d285fc6c84ea 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts
@@ -1,5 +1,8 @@
 import { useAppStore } from '@/store'
-import { useInPlaceSwitchCapability } from '@/lib/in-place-switch-support'
+import {
+  useInPlaceSwitchCapability,
+  inPlaceSwitchSupportedNow
+} from '@/lib/in-place-switch-support'
 import { getExecutionHostIdForWorktree } from '@/lib/worktree-runtime-owner'
 import type { AppState } from '@/store/types'
 import {
@@ -7,7 +10,6 @@ import {
   panePtyId,
   resolvePaneLastAgentConversation
 } from '@/lib/ai-vault-tab-title-requests'
-import { inPlaceSwitchSupportedNow } from '@/lib/in-place-switch-support'
 import { LOCAL_EXECUTION_HOST_ID, type ExecutionHostId } from '../../../../shared/execution-host'
 import { makePaneKey } from '../../../../shared/stable-pane-id'
 import {
diff --git a/src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge-placement.test.ts b/src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge-placement.test.ts
index 4649c299bd85..8143855faee3 100644
--- a/src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge-placement.test.ts
+++ b/src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge-placement.test.ts
@@ -1,7 +1,9 @@
+// @vitest-environment happy-dom
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import type * as AgentStatusModule from '@/lib/agent-status'
 import { createTabsSliceMockApi } from '../../store/slices/tabs-slice-test-harness'
 import { createTestStore } from '../../store/slices/store-test-helpers'
+import { applyLocalStructuredSessionTabSnapshots } from '../../runtime/local-structured-session-tabs-sync/snapshot-apply'
 
 vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } }))
 vi.mock('@/lib/agent-status', async (importOriginal) => ({
@@ -40,6 +42,8 @@ type CreateRequest = {
   requestId: string
   worktreeId: string
   targetGroupId?: string
+  afterTabId?: string
+  source?: 'runtime-session'
   presentation?: 'focused' | 'background'
 }
 
@@ -53,6 +57,7 @@ beforeEach(() => {
   replyTerminalCreate.mockClear()
   vi.stubGlobal('window', {
     ...globalThis.window,
+    dispatchEvent: vi.fn(() => true),
     api: {
       ...globalThis.window?.api,
       ui: {
@@ -106,3 +111,45 @@ describe("a host's focused terminal create into a requested group", () => {
     expect(store.getState().sortEpoch).toBe(epoch + 1)
   })
 })
+
+it('uses the source group while another group is active and keeps the slot after early retirement', () => {
+  const a = store.getState().createTab(WT)
+  const c = store.getState().createUnifiedTab(WT, 'agent-session', { entityId: 'C' })
+  const b = store.getState().createTab(WT)
+  const left = c.groupId
+  const right = store.getState().createEmptySplitGroup(WT, left, 'right')!
+  store.getState().createTab(WT, right)
+  store.getState().focusGroup(WT, right)
+  replyTerminalCreate.mockImplementationOnce(() => {
+    // The admitted host removes presentation through its publication, never a generic close.
+    store.setState((state) =>
+      applyLocalStructuredSessionTabSnapshots(state, [
+        {
+          worktree: WT,
+          publicationEpoch: 'headless:bridge-test',
+          snapshotVersion: 1,
+          activeTabId: null,
+          activeTabType: null,
+          tabs: []
+        }
+      ])
+    )
+  })
+  request({
+    requestId: 'early-retire',
+    worktreeId: WT,
+    source: 'runtime-session',
+    targetGroupId: left,
+    afterTabId: c.id,
+    presentation: 'background'
+  })
+  const createdId = replyTerminalCreate.mock.calls[0][0].tabId
+  expect(replyTerminalCreate.mock.calls[0][0]).toMatchObject({ tabId: expect.any(String) })
+  expect(store.getState().unifiedTabsByWorktree[WT]?.some((tab) => tab.id === c.id)).toBe(false)
+  expect(
+    store.getState().groupsByWorktree[WT]?.find((group) => group.id === left)?.tabOrder
+  ).toEqual([a.id, createdId, b.id])
+  expect(
+    store.getState().groupsByWorktree[WT]?.find((group) => group.id === right)?.tabOrder
+  ).toHaveLength(1)
+})
diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index 83882812605c..be65f8a17b21 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -19405,7 +19405,8 @@
         "switch": {
           "toCli": "Switch to CLI",
           "toNativeChat": "Switch to native chat",
-          "toCliTooltip": "Switch to CLI: stops {{agent}} here and continues the same conversation in the terminal, in this tab.",
+          "toCliTooltip": "Switch to CLI: stops {{agent}} in native chat and continues the same conversation in a terminal.",
+          "openedInWorkspace": "Opened chat in {{workspace}}.",
           "toNativeChatTooltip": "Switch to native chat: continues the same conversation in a chat, in this tab.",
           "exitAgentFirst": "Exit {{agent}} in this terminal to switch.",
           "waitForReply": "Wait for the reply to finish or stop it, then switch.",
diff --git a/src/renderer/src/i18n/locales/es.json b/src/renderer/src/i18n/locales/es.json
index d5c3fd056dc1..fafdc15e6775 100644
--- a/src/renderer/src/i18n/locales/es.json
+++ b/src/renderer/src/i18n/locales/es.json
@@ -19078,7 +19078,8 @@
         "switch": {
           "toCli": "Cambiar a la CLI",
           "toNativeChat": "Cambiar al chat nativo",
-          "toCliTooltip": "Cambiar a la CLI: detiene {{agent}} aquí y continúa la misma conversación en la terminal, en esta pestaña.",
+          "toCliTooltip": "Cambiar a la CLI: detiene {{agent}} en el chat nativo y continúa la misma conversación en una terminal.",
+          "openedInWorkspace": "Chat abierto en {{workspace}}.",
           "toNativeChatTooltip": "Cambiar al chat nativo: continúa la misma conversación en un chat, en esta pestaña.",
           "exitAgentFirst": "Salga de {{agent}} en esta terminal para cambiar.",
           "waitForReply": "Espere a que termine la respuesta o deténgala y luego cambie.",
diff --git a/src/renderer/src/i18n/locales/fr.json b/src/renderer/src/i18n/locales/fr.json
index 9c0638ee6f64..02a300e92237 100644
--- a/src/renderer/src/i18n/locales/fr.json
+++ b/src/renderer/src/i18n/locales/fr.json
@@ -19187,7 +19187,8 @@
         "switch": {
           "toCli": "Passer à la CLI",
           "toNativeChat": "Passer au chat natif",
-          "toCliTooltip": "Passer à la CLI : arrête {{agent}} ici et poursuit la même conversation dans le terminal, dans cet onglet.",
+          "toCliTooltip": "Passer à la CLI : arrête {{agent}} dans le chat natif et poursuit la même conversation dans un terminal.",
+          "openedInWorkspace": "Chat ouvert dans {{workspace}}.",
           "toNativeChatTooltip": "Passer au chat natif : poursuit la même conversation dans un chat, dans cet onglet.",
           "exitAgentFirst": "Quittez {{agent}} dans ce terminal pour basculer.",
           "waitForReply": "Attendez la fin de la réponse ou arrêtez-la, puis basculez.",
diff --git a/src/renderer/src/i18n/locales/ja.json b/src/renderer/src/i18n/locales/ja.json
index 622113c6c23a..95bd701a0267 100644
--- a/src/renderer/src/i18n/locales/ja.json
+++ b/src/renderer/src/i18n/locales/ja.json
@@ -19118,7 +19118,8 @@
         "switch": {
           "toCli": "CLI に切り替える",
           "toNativeChat": "ネイティブチャットに切り替える",
-          "toCliTooltip": "CLI に切り替え: ここで {{agent}} を停止し、このタブのターミナルで同じ会話を続けます。",
+          "toCliTooltip": "CLI に切り替え: ネイティブチャットで {{agent}} を停止し、ターミナルで同じ会話を続けます。",
+          "openedInWorkspace": "{{workspace}} でチャットを開きました。",
           "toNativeChatTooltip": "ネイティブチャットに切り替え: このタブのチャットで同じ会話を続けます。",
           "exitAgentFirst": "切り替えるには、このターミナルで {{agent}} を終了してください。",
           "waitForReply": "応答が終わるまで待つか停止してから、切り替えてください。",
diff --git a/src/renderer/src/i18n/locales/ko.json b/src/renderer/src/i18n/locales/ko.json
index b2e251e1c5cb..e9016c8f1ca3 100644
--- a/src/renderer/src/i18n/locales/ko.json
+++ b/src/renderer/src/i18n/locales/ko.json
@@ -19118,7 +19118,8 @@
         "switch": {
           "toCli": "CLI로 전환",
           "toNativeChat": "네이티브 채팅으로 전환",
-          "toCliTooltip": "CLI로 전환: 여기서 {{agent}}을(를) 중지하고 이 탭의 터미널에서 같은 대화를 이어갑니다.",
+          "toCliTooltip": "CLI로 전환: 네이티브 채팅에서 {{agent}}을(를) 중지하고 터미널에서 같은 대화를 이어갑니다.",
+          "openedInWorkspace": "{{workspace}}에서 채팅을 열었습니다.",
           "toNativeChatTooltip": "네이티브 채팅으로 전환: 이 탭의 채팅에서 같은 대화를 이어갑니다.",
           "exitAgentFirst": "전환하려면 이 터미널에서 {{agent}}을(를) 종료하세요.",
           "waitForReply": "응답이 끝날 때까지 기다리거나 응답을 중지한 후 전환하세요.",
diff --git a/src/renderer/src/i18n/locales/zh.json b/src/renderer/src/i18n/locales/zh.json
index 623740bbe122..fe5b23b416dc 100644
--- a/src/renderer/src/i18n/locales/zh.json
+++ b/src/renderer/src/i18n/locales/zh.json
@@ -19083,7 +19083,8 @@
         "switch": {
           "toCli": "切换到 CLI",
           "toNativeChat": "切换到原生聊天",
-          "toCliTooltip": "切换到 CLI：在此停止 {{agent}}，并在此标签页的终端中继续同一对话。",
+          "toCliTooltip": "切换到 CLI：停止原生聊天中的 {{agent}}，并在终端中继续同一对话。",
+          "openedInWorkspace": "已在 {{workspace}} 中打开聊天。",
           "toNativeChatTooltip": "切换到原生聊天：在此标签页的聊天中继续同一对话。",
           "exitAgentFirst": "请先在此终端中退出 {{agent}}，然后再切换。",
           "waitForReply": "请等待回复完成或停止回复，然后再切换。",
diff --git a/src/renderer/src/lib/in-place-switch-support.ts b/src/renderer/src/lib/in-place-switch-support.ts
index 8e4f708db5bf..7f30f8449543 100644
--- a/src/renderer/src/lib/in-place-switch-support.ts
+++ b/src/renderer/src/lib/in-place-switch-support.ts
@@ -14,7 +14,11 @@ import type { AiVaultAgent } from '../../../shared/ai-vault-types'
 const known = new Map<string, boolean>()
 const asking = new Map<string, Promise<boolean>>()
 const listeners = new Set<() => void>()
-const changed = () => listeners.forEach((listener) => listener())
+let revision = 0
+const changed = () => {
+  revision += 1
+  listeners.forEach((listener) => listener())
+}
 const forget = () => {
   known.clear()
   asking.clear()
@@ -42,6 +46,14 @@ const subscribe = (listener: () => void) => {
   }
 }
 
+export function useInPlaceSwitchRevision(): number {
+  return useSyncExternalStore(
+    subscribe,
+    () => revision,
+    () => 0
+  )
+}
+
 /** The cached answer, asking in the background when there is none yet. */
 export function inPlaceSwitchCapabilityNow(
   executionHostId: string | null | undefined,
diff --git a/src/renderer/src/lib/launch-ai-vault-session.test.ts b/src/renderer/src/lib/launch-ai-vault-session.test.ts
index 5e8ed72b57fe..b911598e7b02 100644
--- a/src/renderer/src/lib/launch-ai-vault-session.test.ts
+++ b/src/renderer/src/lib/launch-ai-vault-session.test.ts
@@ -21,6 +21,7 @@ const mockState = {
   closeEmptyGroup: mockCloseEmptyGroup,
   setActiveTabType: mockSetActiveTabType,
   setTabBarOrder: mockSetTabBarOrder,
+  unifiedTabsByWorktree: {} as Record<string, { id: string; groupId: string }[]>,
   tabsByWorktree: {} as Record<string, { id: string }[]>,
   openFiles: [] as { id: string; worktreeId: string }[],
   browserTabsByWorktree: {} as Record<string, { id: string }[]>,
@@ -66,6 +67,7 @@ describe('launchAiVaultSessionInNewTab', () => {
     runtimeMocks.runtimeEnvironmentIdWithLegacyFallbackUnlessTwin.mockReturnValue(null)
     runtimeMocks.isWebRuntimeSessionActive.mockReturnValue(false)
     runtimeMocks.createWebRuntimeSessionTerminal.mockResolvedValue({ status: 'created' })
+    mockState.unifiedTabsByWorktree = {}
     mockState.tabsByWorktree = {}
     mockState.openFiles = []
     mockState.browserTabsByWorktree = {}
@@ -233,6 +235,29 @@ describe('launchAiVaultSessionInNewTab', () => {
     expect(mockCloseEmptyGroup).not.toHaveBeenCalled()
   })
 
+  it.each([undefined, 'explicit-group'])(
+    'derives the source group before the paired launch and preserves explicit target %s',
+    (targetGroupId) => {
+      runtimeMocks.runtimeEnvironmentIdWithLegacyFallbackUnlessTwin.mockReturnValue('env-1')
+      runtimeMocks.isWebRuntimeSessionActive.mockReturnValue(true)
+      mockState.unifiedTabsByWorktree['wt-1'] = [{ id: 'chat-C', groupId: 'source-group' }]
+      launchAiVaultSessionInNewTab({
+        agent: 'codex',
+        worktreeId: 'wt-1',
+        afterTabId: 'chat-C',
+        targetGroupId,
+        command: 'codex resume session-2'
+      })
+      expect(runtimeMocks.createWebRuntimeSessionTerminal).toHaveBeenCalledWith(
+        expect.objectContaining({
+          afterTabId: 'chat-C',
+          targetGroupId: targetGroupId ?? 'source-group'
+        }),
+        { notifyFailure: false }
+      )
+    }
+  )
+
   it('removes the still-empty split group when the runtime create does not succeed', async () => {
     runtimeMocks.runtimeEnvironmentIdWithLegacyFallbackUnlessTwin.mockReturnValue('env-1')
     runtimeMocks.isWebRuntimeSessionActive.mockReturnValue(true)
diff --git a/src/renderer/src/lib/launch-ai-vault-session.ts b/src/renderer/src/lib/launch-ai-vault-session.ts
index ab279af68d19..804452cd7fe0 100644
--- a/src/renderer/src/lib/launch-ai-vault-session.ts
+++ b/src/renderer/src/lib/launch-ai-vault-session.ts
@@ -33,6 +33,10 @@ export function launchAiVaultSessionInNewTab(args: {
   resumeOrigin?: 'switch'
 }): LaunchAiVaultSessionInNewTabResult {
   const store = useAppStore.getState()
+  const slot = args.afterTabId
+    ? store.unifiedTabsByWorktree[args.worktreeId]?.find((tab) => tab.id === args.afterTabId)
+    : undefined
+  const sourceGroupId = args.targetGroupId ?? slot?.groupId
   const switchStart = args.resumeOrigin ? { resumeOrigin: args.resumeOrigin } : {}
   // Why both paths split: the runtime path used to return first and drop the split (#22791).
   const split =
@@ -48,7 +52,7 @@ export function launchAiVaultSessionInNewTab(args: {
     const splitGroupId = split
       ? store.createEmptySplitGroup(args.worktreeId, split.sourceGroupId, split.splitDirection)
       : null
-    const targetGroupId = splitGroupId ?? args.targetGroupId
+    const targetGroupId = splitGroupId ?? sourceGroupId
     const runtimeLaunch = createWebRuntimeSessionTerminal(
       {
         worktreeId: args.worktreeId,
@@ -81,10 +85,7 @@ export function launchAiVaultSessionInNewTab(args: {
     return { tabId: null, runtimeLaunch: observedRuntimeLaunch }
   }
 
-  const slot = args.afterTabId
-    ? store.unifiedTabsByWorktree[args.worktreeId]?.find((tab) => tab.id === args.afterTabId)
-    : undefined
-  const tab = store.createTab(args.worktreeId, slot?.groupId ?? args.targetGroupId, undefined, {
+  const tab = store.createTab(args.worktreeId, sourceGroupId, undefined, {
     ...(split ? { split } : {}),
     ...(args.cwd ? { startupCwd: args.cwd } : {}),
     pendingStartup: {
@@ -104,7 +105,7 @@ export function launchAiVaultSessionInNewTab(args: {
   store.setActiveTabType('terminal', args.worktreeId)
 
   persistAgentLaunchTabOrder(args.worktreeId, tab.id)
-  if (slot) {
+  if (slot && !split && (!args.targetGroupId || args.targetGroupId === slot.groupId)) {
     const order = (
       useAppStore.getState().groupsByWorktree[args.worktreeId]?.find((g) => g.id === slot.groupId)
         ?.tabOrder ?? []
diff --git a/src/renderer/src/runtime/web-runtime-terminal-create-operation.ts b/src/renderer/src/runtime/web-runtime-terminal-create-operation.ts
index 5c6dffce2100..ea099a634a97 100644
--- a/src/renderer/src/runtime/web-runtime-terminal-create-operation.ts
+++ b/src/renderer/src/runtime/web-runtime-terminal-create-operation.ts
@@ -43,7 +43,10 @@ import {
   createdTerminalLeafId,
   readCreatedAgentTerminalIdentity
 } from './web-runtime-terminal-identity'
-import { settleWebRuntimeTerminalPlacement } from './web-runtime-terminal-placement-settlement'
+import {
+  captureWebRuntimeTerminalPlacement,
+  settleWebRuntimeTerminalPlacement
+} from './web-runtime-terminal-placement-settlement'
 import { buildPlainCreateTerminalParams } from './web-runtime-plain-terminal-create-params'
 
 export async function createWebRuntimeSessionTerminalResult(
@@ -79,6 +82,7 @@ export async function createWebRuntimeSessionTerminalResult(
       }
     }
   }
+  const { captured, placementGroupId } = captureWebRuntimeTerminalPlacement(args)
   let hostCreated = false
   let createdTabId: string | undefined
   let createdLeafId: string | undefined
@@ -94,7 +98,7 @@ export async function createWebRuntimeSessionTerminalResult(
       // Why: structured creation cannot yet express afterTabId; keep the exact legacy placement contract until it can.
       // Why: focus belongs to the paired client; a headless execution host has no renderer to focus.
       // Why: rebuilding a prepared command through host authority can discard its embedded prompt and delivery flags.
-      // A switch keeps its prepared recipe and its claim, which only the prepared create carries.
+      // A switch uses the ordinary prepared command and admission.
       const mustUseLegacyAgentCreate =
         args.preparedAgentCommand || args.afterTabId || args.resumeOrigin === 'switch'
       const hostAuthority = mustUseLegacyAgentCreate
@@ -237,14 +241,14 @@ export async function createWebRuntimeSessionTerminalResult(
       createdTabId = created.tab.id
       createdLeafId = created.tab.leafId
     }
-    if (args.targetGroupId && createdTabId) {
+    if (placementGroupId && createdTabId) {
       // Why: the host drops client-minted group ids, so this client's own record is what
       // lands the mirrored tab in the requested pane under client-owned placement.
       recordWebSessionTerminalPlacement({
         environmentId,
         worktreeId: args.worktreeId,
         hostTabId: webTerminalPlacementParentTabId(createdTabId),
-        groupId: args.targetGroupId
+        groupId: placementGroupId
       })
     }
     if (args.activate !== false && createdTabId && matchesWebSessionIntentOwner(intentOwner)) {
@@ -268,8 +272,9 @@ export async function createWebRuntimeSessionTerminalResult(
         args.worktreeId,
         webTerminalPlacementParentTabId(placementTabId),
         {
-          groupId: args.targetGroupId,
+          groupId: placementGroupId,
           afterTabId: args.afterTabId,
+          captured,
           activate: args.activate !== false
         }
       )
diff --git a/src/renderer/src/runtime/web-runtime-terminal-placement-settlement.ts b/src/renderer/src/runtime/web-runtime-terminal-placement-settlement.ts
index d82fdcfefc63..478e2fd15d44 100644
--- a/src/renderer/src/runtime/web-runtime-terminal-placement-settlement.ts
+++ b/src/renderer/src/runtime/web-runtime-terminal-placement-settlement.ts
@@ -1,3 +1,8 @@
+import {
+  captureSessionTabPlacement,
+  placeUnpinnedSessionTabAtCapture,
+  type CapturedSessionTabPlacement
+} from '../../../shared/session-tab-placement'
 import { insertUnifiedTabAfterAnchor } from '../lib/unified-tab-anchor-insertion'
 import { useAppStore } from '../store'
 import {
@@ -20,12 +25,37 @@ function anchorUnifiedTabId(worktreeId: string, afterTabId: string): string {
     : toWebTerminalSurfaceTabId(webTerminalPlacementParentTabId(toHostSessionTabId(afterTabId)))
 }
 
+/** Capture before creation can retire the anchor on the execution host. */
+export function captureWebRuntimeTerminalPlacement(args: {
+  worktreeId: string
+  afterTabId?: string
+  targetGroupId?: string
+}) {
+  const sourceGroup = useAppStore
+    .getState()
+    .groupsByWorktree[args.worktreeId]?.find(
+      (group) => args.afterTabId && group.tabOrder.includes(args.afterTabId)
+    )
+  return {
+    placementGroupId: args.targetGroupId ?? sourceGroup?.id,
+    captured:
+      !args.targetGroupId || args.targetGroupId === sourceGroup?.id
+        ? captureSessionTabPlacement(sourceGroup?.tabOrder ?? [], args.afterTabId)
+        : undefined
+  }
+}
+
 /** Settle the placement once the mirrored tab exists (bounded poll), then consume the record. */
 export async function settleWebRuntimeTerminalPlacement(
   environmentId: string,
   worktreeId: string,
   hostTabId: string,
-  placement: { groupId?: string; afterTabId?: string; activate: boolean }
+  placement: {
+    groupId?: string
+    afterTabId?: string
+    activate: boolean
+    captured?: CapturedSessionTabPlacement
+  }
 ): Promise<void> {
   const unifiedTabId = toWebTerminalSurfaceTabId(hostTabId)
   const findTab = () =>
@@ -64,9 +94,25 @@ export async function settleWebRuntimeTerminalPlacement(
         recordInteraction: false
       })
     }
-    if (anchorId) {
-      // The create caller owns this insertion; subsequent host snapshots preserve client order.
+    if (anchorId && targetGroup.tabOrder.includes(anchorId)) {
       insertUnifiedTabAfterAnchor(worktreeId, unifiedTabId, anchorId)
+    } else if (placement.captured) {
+      const current = useAppStore.getState()
+      const group = current.groupsByWorktree[worktreeId]?.find(
+        (group) => group.id === targetGroup.id
+      )
+      if (group) {
+        current.reorderUnifiedTabs(
+          group.id,
+          placeUnpinnedSessionTabAtCapture(
+            group.tabOrder,
+            current.unifiedTabsByWorktree[worktreeId] ?? [],
+            unifiedTabId,
+            placement.captured
+          ),
+          { recordInteraction: false }
+        )
+      }
     }
   } finally {
     forgetWebSessionTerminalPlacement({ environmentId, worktreeId, hostTabId })
diff --git a/src/renderer/src/runtime/web-runtime-terminal-switch-placement.test.ts b/src/renderer/src/runtime/web-runtime-terminal-switch-placement.test.ts
new file mode 100644
index 000000000000..a9f407faa3ee
--- /dev/null
+++ b/src/renderer/src/runtime/web-runtime-terminal-switch-placement.test.ts
@@ -0,0 +1,160 @@
+// @vitest-environment happy-dom
+import { beforeEach, expect, it, vi } from 'vitest'
+import { useAppStore } from '@/store'
+import type { RuntimeMobileSessionTabsResult } from '../../../shared/runtime-types'
+import { createWebRuntimeSessionTerminalResult } from './web-runtime-terminal-create-operation'
+import { refreshWebRuntimeSessionTabsSnapshot } from './web-runtime-session-snapshot'
+import { applyWebSessionTabsSnapshot } from './web-session-tabs-sync/snapshot-api'
+import { toWebTerminalSurfaceTabId } from '../../../shared/terminal-surface-id'
+import { resetWebSessionTabsSnapshotFreshnessForTests } from './web-session-tabs-sync/tracking-lifecycle'
+
+const ENV = 'paired-placement',
+  WT = 'repo::/repo'
+const chat = (id: string) => ({
+  type: 'agent-session' as const,
+  id: `agent-session:${id}`,
+  sessionId: id,
+  agent: 'codex' as const,
+  title: id,
+  isActive: false
+})
+let frame: RuntimeMobileSessionTabsResult
+beforeEach(() => {
+  resetWebSessionTabsSnapshotFreshnessForTests()
+  useAppStore.setState(useAppStore.getInitialState(), true)
+  useAppStore.setState({
+    activeWorktreeId: WT,
+    activeWorkspaceExecutionHostId: `runtime:${ENV}`,
+    settings: { ...useAppStore.getState().settings, activeRuntimeEnvironmentId: ENV }
+  })
+  frame = {
+    worktree: WT,
+    publicationEpoch: 'host-placement',
+    snapshotVersion: 1,
+    activeGroupId: 'R',
+    activeTabId: 'agent-session:D',
+    activeTabType: 'agent-session',
+    tabs: ['A', 'C', 'B', 'D'].map(chat),
+    tabGroups: [
+      {
+        id: 'L',
+        activeTabId: 'agent-session:C',
+        tabOrder: ['A', 'C', 'B'].map((id) => `agent-session:${id}`)
+      },
+      { id: 'R', activeTabId: 'agent-session:D', tabOrder: ['agent-session:D'] }
+    ]
+  }
+  useAppStore.setState((state) => applyWebSessionTabsSnapshot(state, frame, ENV))
+})
+it.each([false, true])(
+  'keeps client neighbors and pin partitions through early retirement and refresh (pinned: %s)',
+  async (pinned) => {
+    if (pinned) {
+      frame = {
+        ...frame,
+        snapshotVersion: frame.snapshotVersion + 1,
+        tabs: [
+          ...frame.tabs.map((tab) => ({
+            ...tab,
+            isPinned: ['agent-session:A', 'agent-session:C', 'agent-session:B'].includes(tab.id)
+          })),
+          chat('U')
+        ],
+        tabGroups: frame.tabGroups?.map((group) =>
+          group.id === 'L' ? { ...group, tabOrder: [...group.tabOrder, 'agent-session:U'] } : group
+        )
+      }
+      useAppStore.setState((state) => applyWebSessionTabsSnapshot(state, frame, ENV))
+    }
+    const before = useAppStore.getState()
+    const source = before.unifiedTabsByWorktree[WT].find((tab) => tab.entityId === 'C')!
+    const sourceGroup = source.groupId
+    const runtimeCall = vi.fn(async ({ method }: { method: string }) => {
+      if (method === 'session.tabs.createTerminal') {
+        frame = {
+          ...frame,
+          snapshotVersion: frame.snapshotVersion + 1,
+          tabs: [
+            ...frame.tabs.filter((tab) => tab.id !== 'agent-session:C'),
+            {
+              type: 'terminal',
+              id: 'T::leaf',
+              parentTabId: 'T',
+              leafId: 'leaf',
+              title: 'Terminal',
+              terminal: 'term_T',
+              isActive: false,
+              status: 'ready'
+            }
+          ],
+          tabGroups: [
+            {
+              id: 'L',
+              activeTabId: 'T',
+              tabOrder: [
+                'agent-session:A',
+                'agent-session:B',
+                'T',
+                ...(pinned ? ['agent-session:U'] : [])
+              ]
+            },
+            frame.tabGroups![1]
+          ]
+        }
+        // Publication beats the create response, with C already gone and T at the host's old fallback.
+        useAppStore.setState((state) => applyWebSessionTabsSnapshot(state, frame, ENV))
+        expect(
+          useAppStore.getState().unifiedTabsByWorktree[WT].some((tab) => tab.entityId === 'C')
+        ).toBe(false)
+        useAppStore.getState().createUnifiedTab(WT, 'editor', {
+          id: 'concurrent',
+          entityId: '/repo/concurrent',
+          targetGroupId: sourceGroup
+        })
+        return { id: 'create', ok: true as const, result: { tab: frame.tabs.at(-1) } }
+      }
+      if (method === 'session.tabs.list') {
+        return { id: 'list', ok: true as const, result: frame }
+      }
+      throw new Error(`Unexpected ${method}`)
+    })
+    Object.assign(window, {
+      api: {
+        ...window.api,
+        runtimeEnvironments: { ...window.api?.runtimeEnvironments, call: runtimeCall }
+      }
+    })
+    const result = await createWebRuntimeSessionTerminalResult({
+      environmentId: ENV,
+      worktreeId: WT,
+      afterTabId: source.id,
+      targetGroupId: sourceGroup,
+      launchAgent: 'codex',
+      command: 'codex resume conversation',
+      resumeOrigin: 'switch',
+      providerSession: { key: 'session_id', id: 'conversation' },
+      selectWorktree: false,
+      activate: true
+    })
+    expect(result.outcome.status).toBe('created')
+    const order = () =>
+      useAppStore.getState().groupsByWorktree[WT].find((group) => group.id === sourceGroup)!
+        .tabOrder
+    expect(order()).toEqual([
+      'structured-agent-session-A',
+      ...(pinned ? ['structured-agent-session-B'] : []),
+      toWebTerminalSurfaceTabId('T'),
+      ...(pinned ? ['structured-agent-session-U'] : ['structured-agent-session-B']),
+      'concurrent'
+    ])
+    expect(useAppStore.getState().activeGroupIdByWorktree[WT]).toBe(sourceGroup)
+    await refreshWebRuntimeSessionTabsSnapshot(ENV, WT, { acceptCurrentSnapshot: true })
+    expect(order()).toEqual([
+      'structured-agent-session-A',
+      ...(pinned ? ['structured-agent-session-B'] : []),
+      toWebTerminalSurfaceTabId('T'),
+      ...(pinned ? ['structured-agent-session-U'] : ['structured-agent-session-B']),
+      'concurrent'
+    ])
+  }
+)
diff --git a/src/shared/session-tab-placement.ts b/src/shared/session-tab-placement.ts
index 1b4729a6156b..f1bbcbec9dcb 100644
--- a/src/shared/session-tab-placement.ts
+++ b/src/shared/session-tab-placement.ts
@@ -1,5 +1,57 @@
+import { insertTabIdIntoOrder, partitionPinnedTabOrder } from './workspace-layout/tab-order'
+
+/** Call-local neighbors survive an anchor retiring while creation is awaited. */
+export type CapturedSessionTabPlacement = { preceding: string[]; following: string[] }
+
+export function captureSessionTabPlacement(
+  order: readonly string[],
+  afterTabId: string | null | undefined
+): CapturedSessionTabPlacement | undefined {
+  const index = afterTabId ? order.indexOf(afterTabId) : -1
+  return index < 0
+    ? undefined
+    : {
+        preceding: order.slice(0, index + 1),
+        following: order.slice(index + 1)
+      }
+}
+
+/** Apply only insertion to current order, keeping unrelated concurrent edits. */
+export function placeSessionTabAtCapture(
+  order: readonly string[],
+  createdId: string,
+  captured: CapturedSessionTabPlacement
+): string[] {
+  const next = order.filter((id) => id !== createdId)
+  const previous = captured.preceding.toReversed().find((id) => next.includes(id))
+  const following = captured.following.find((id) => next.includes(id))
+  const index =
+    following !== undefined
+      ? next.indexOf(following)
+      : previous !== undefined
+        ? next.indexOf(previous) + 1
+        : Math.min(captured.preceding.length, next.length)
+  next.splice(index, 0, createdId)
+  return next
+}
+
+/** Captured placement uses the same pin partitions as an ordinary tab insertion. */
+export function placeUnpinnedSessionTabAtCapture(
+  order: readonly string[],
+  tabs: readonly { id: string; isPinned?: boolean }[],
+  createdId: string,
+  captured: CapturedSessionTabPlacement
+): string[] {
+  const placed = placeSessionTabAtCapture(order, createdId, captured)
+  const preceding = placed[placed.indexOf(createdId) - 1]
+  return preceding
+    ? insertTabIdIntoOrder(placed, tabs, createdId, false, preceding)
+    : partitionPinnedTabOrder(placed, tabs, createdId)
+}
+
 export type SessionTabPlacementOptions = {
   afterParentGroup?: boolean
+  captured?: CapturedSessionTabPlacement
 }
 
 /** Places a created tab after the anchor, or after its parent group when enabled. */
@@ -12,6 +64,18 @@ export function placeCreatedSessionTab<T extends { id: string; parentTabId?: str
   const next = tabs.filter((tab) => tab.id !== created.id)
   const anchor = afterTabId ? next.findIndex((tab) => tab.id === afterTabId) : -1
   if (anchor < 0) {
+    if (options.captured) {
+      const order = placeSessionTabAtCapture(
+        next.map((tab) => tab.id),
+        created.id,
+        options.captured
+      )
+      const byId = new Map([...next, created].map((tab) => [tab.id, tab]))
+      return order.flatMap((id) => {
+        const tab = byId.get(id)
+        return tab ? [tab] : []
+      })
+    }
     next.push(created)
     return next
   }

From fdb0ddfeac896ff1be283cb663e382e7a682a1cb Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Wed, 21 Oct 2026 17:48:07 -0700
Subject: [PATCH 030/207] Align switch resume contracts and checked test
 fixtures

---
 .../structured-session-ownership.test.ts      |  5 +++--
 src/main/ipc/pty/runtime/spawn-state.ts       |  2 +-
 ...structured-agent-session-switch-to-chat.ts |  3 ++-
 ...nt-session-terminal-writer-acquire.test.ts |  9 ++++----
 .../ai-vault-history-native-return.test.tsx   | 22 ++++++++++++-------
 ...minal-request-ipc-bridge-placement.test.ts |  1 +
 .../src/lib/launch-ai-vault-session.test.ts   |  3 ++-
 ...-runtime-terminal-switch-placement.test.ts |  6 ++++-
 8 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/src/main/ai-vault/structured-session-ownership.test.ts b/src/main/ai-vault/structured-session-ownership.test.ts
index 4b9ea5e46296..fa2f00b4f3fa 100644
--- a/src/main/ai-vault/structured-session-ownership.test.ts
+++ b/src/main/ai-vault/structured-session-ownership.test.ts
@@ -9,6 +9,7 @@ import {
   projectStructuredAiVaultSessions
 } from './structured-session-ownership'
 import type { AiVaultSearchHit, AiVaultSearchResponse } from '../../shared/ai-vault-search-types'
+import type { AiVaultPrepareSessionResumeArgs } from '../../shared/ai-vault-resume-preparation'
 import {
   codexChatHolding,
   installChats,
@@ -117,8 +118,8 @@ describe('structured AI Vault ownership', () => {
       return projectStructuredAiVaultSessions(listResult(), OPENS_EVERY_STRUCTURED_CHAT).sessions[0]
         ?.structuredSession?.sessionId
     }
-    const resume = {
-      agent: 'codex' as const,
+    const resume: AiVaultPrepareSessionResumeArgs = {
+      agent: 'codex',
       filePath: `/sessions/rollout-${PROVIDER_SESSION}.jsonl`,
       codexHome: null,
       executionHostId: 'local'
diff --git a/src/main/ipc/pty/runtime/spawn-state.ts b/src/main/ipc/pty/runtime/spawn-state.ts
index 90c5a3d6a18d..5ca761ba57ab 100644
--- a/src/main/ipc/pty/runtime/spawn-state.ts
+++ b/src/main/ipc/pty/runtime/spawn-state.ts
@@ -115,7 +115,7 @@ export type RuntimePtySpawnArgs = {
   envToDelete?: string[]
   resumeProviderSession?: AgentProviderSessionMetadata
   /** `saved`: built from a pane's saved facts, which the host refuses for a chat's conversation. */
-  resumeOrigin?: 'saved'
+  resumeOrigin?: 'saved' | 'switch'
   connectionId?: string | null
   worktreeId?: string
   preAllocatedHandle?: string
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-to-chat.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-to-chat.ts
index 810cc60b66f9..7a7c9711c660 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-to-chat.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-to-chat.ts
@@ -54,7 +54,8 @@ export async function startStructuredAgentSessionForSwitch(
     if (!selection.ok || !selection.child) {
       return selection.ok ? operationDidNotRun() : selection
     }
-    ;({ child, readiness } = selection)
+    child = selection.child
+    readiness = selection.readiness
   }
   const outcome = (await readiness?.wait(STRUCTURED_AGENT_SESSION_START_WAIT_MS)) ?? 'ready'
   const awaited = child
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts
index cf6af4ff7901..87d58ca66087 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts
@@ -47,6 +47,7 @@ const acquire = vi.fn<StructuredAgentSessionAdapter['acquire']>(async ({ fence,
 const open = vi.fn<StructuredAgentSessionAdapter['open']>(async () => ({
   reportedOptions: { model: '' }
 }))
+const closeSession = vi.fn<NonNullable<StructuredAgentSessionAdapter['closeSession']>>()
 const assertNoTerminalWriter = vi.fn(async () => {
   if (terminalWriting) {
     throw agentSessionRefusalError('agent_session_conflict', {
@@ -61,6 +62,7 @@ beforeEach(async () => {
   terminalWriting = false
   acquire.mockClear()
   open.mockClear()
+  closeSession.mockReset().mockResolvedValue(true)
   assertNoTerminalWriter.mockClear()
   store = await openTestAgentSessionRecordStore(root)
   host = new StructuredAgentSessionHost({
@@ -73,7 +75,7 @@ beforeEach(async () => {
         state: 'accepted' as const,
         providerIdentity: { provider: 'codex' as const, threadId: THREAD, turnId: 't', ordinal: 1 }
       })),
-      closeSession: vi.fn(async () => true),
+      closeSession,
       releaseAcquisition: vi.fn(async () => true),
       cancelTurn: vi.fn(async () => ({ cancelled: false })),
       answerPrompt: vi.fn(async () => undefined),
@@ -151,7 +153,6 @@ it('refuses the chat agent start while a terminal writes its conversation, once
 // The switch is idle-only and proves the stop; subsequent sends use ordinary G-acquire.
 it('switches an idle chat to its terminal and a racing send starts no second writer', async () => {
   const order: string[] = []
-  const closeSession = vi.mocked(host.deps.adapter.closeSession)
   closeSession.mockImplementation(async () => {
     order.push('stop')
     return true
@@ -240,12 +241,12 @@ it('retires only after an explicit admitted launch without stopping a later nati
   }
   expect(await host.switchToChat(SESSION)).toEqual({ ok: true })
   const laterChild = host.collaboratorsForTests().sessions.get(SESSION)?.child
-  const closes = vi.mocked(host.deps.adapter.closeSession).mock.calls.length
+  const closes = closeSession.mock.calls.length
   await retireChatForAdmittedTerminalLaunch(runtime, args, { savedResumeDecision: decision })
   expect(store.getVisibleSessionTabIndex()?.sessionIds).not.toContain(SESSION)
   expect(runtime.retireStructuredAgentSessionTabFromSnapshot).toHaveBeenCalledWith(SESSION)
   expect(host.collaboratorsForTests().sessions.get(SESSION)?.child).toBe(laterChild)
-  expect(host.deps.adapter.closeSession).toHaveBeenCalledTimes(closes)
+  expect(closeSession).toHaveBeenCalledTimes(closes)
 })
 
 it.each(['ready', 'failed', 'closed', 'replaced'] as const)(
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx b/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx
index 5630ec11d3e9..d88e429ccfb1 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx
+++ b/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx
@@ -5,6 +5,8 @@ import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import { TooltipProvider } from '@/components/ui/tooltip'
 import { useAppStore } from '@/store'
 import { makeWorktree } from '@/store/slices/worktrees-slice-test-fixtures'
+import { createCompatibleRuntimeStatusResponse } from '@/runtime/runtime-compatibility-test-fixture'
+import { createGlobalSettingsFixture } from '../../../../shared/global-settings-test-fixture'
 import {
   refreshLocalRuntimeCapabilities,
   setLocalRuntimeCapabilitiesForTests
@@ -17,7 +19,7 @@ import { useAiVaultSessionLaunchActions } from './ai-vault-session-launch-action
 
 const mocks = vi.hoisted(() => ({
   probe: vi.fn<() => Promise<boolean>>(),
-  owner: vi.fn(() => 'local'),
+  owner: vi.fn<() => string | null>(() => 'local'),
   newChat: vi.fn(),
   fork: vi.fn(),
   startOwner: vi.fn(async () => false),
@@ -98,7 +100,7 @@ function History({ session }: { session: AiVaultSession }) {
     allWorktrees: [],
     workspaceId: 'workspace',
     resumeTargetState: targetState,
-    settings: { ...state.settings, experimentalNativeChat: true }
+    settings: createGlobalSettingsFixture({ ...state.settings, experimentalNativeChat: true })
   })
   const actions = useAiVaultSessionLaunchActions({
     activeWorktree: null,
@@ -162,14 +164,20 @@ beforeEach(async () => {
 })
 afterEach(cleanup)
 
+function pairedHistoryStatus() {
+  const response = createCompatibleRuntimeStatusResponse('paired')
+  if (!response.ok) {
+    throw new Error('Expected status fixture')
+  }
+  return { status: { ...response.result, capabilities: [HISTORY] }, checkedAt: 1 }
+}
+
 it.each(['local', 'runtime:paired'] as const)(
   'composes the owned %s row/details/menu and refreshes unknown capability',
   async (host) => {
     mocks.owner.mockReturnValue(host)
     useAppStore.setState({
-      runtimeStatusByEnvironmentId: new Map([
-        ['paired', { status: { capabilities: [HISTORY] }, checkedAt: 1 }]
-      ])
+      runtimeStatusByEnvironmentId: new Map([['paired', pairedHistoryStatus()]])
     })
     let answer = (_value: boolean) => {}
     mocks.probe.mockImplementationOnce(
@@ -206,9 +214,7 @@ it.each(['local', 'runtime:paired'] as const)(
 it('routes a capable paired unowned row with a matching terminal through the same return', async () => {
   mocks.owner.mockReturnValue('runtime:paired')
   useAppStore.setState({
-    runtimeStatusByEnvironmentId: new Map([
-      ['paired', { status: { capabilities: [HISTORY] }, checkedAt: 1 }]
-    ])
+    runtimeStatusByEnvironmentId: new Map([['paired', pairedHistoryStatus()]])
   })
   const session = {
     ...row,
diff --git a/src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge-placement.test.ts b/src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge-placement.test.ts
index 8143855faee3..f67d05bdbff1 100644
--- a/src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge-placement.test.ts
+++ b/src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge-placement.test.ts
@@ -128,6 +128,7 @@ it('uses the source group while another group is active and keeps the slot after
           worktree: WT,
           publicationEpoch: 'headless:bridge-test',
           snapshotVersion: 1,
+          activeGroupId: right,
           activeTabId: null,
           activeTabType: null,
           tabs: []
diff --git a/src/renderer/src/lib/launch-ai-vault-session.test.ts b/src/renderer/src/lib/launch-ai-vault-session.test.ts
index b911598e7b02..c1135bd4d70b 100644
--- a/src/renderer/src/lib/launch-ai-vault-session.test.ts
+++ b/src/renderer/src/lib/launch-ai-vault-session.test.ts
@@ -15,13 +15,14 @@ const runtimeMocks = vi.hoisted(() => ({
   isWebRuntimeSessionActive: vi.fn(() => false)
 }))
 
+const unifiedTabsByWorktree: Record<string, { id: string; groupId: string }[]> = {}
 const mockState = {
   createTab: mockCreateTab,
   createEmptySplitGroup: mockCreateEmptySplitGroup,
   closeEmptyGroup: mockCloseEmptyGroup,
   setActiveTabType: mockSetActiveTabType,
   setTabBarOrder: mockSetTabBarOrder,
-  unifiedTabsByWorktree: {} as Record<string, { id: string; groupId: string }[]>,
+  unifiedTabsByWorktree,
   tabsByWorktree: {} as Record<string, { id: string }[]>,
   openFiles: [] as { id: string; worktreeId: string }[],
   browserTabsByWorktree: {} as Record<string, { id: string }[]>,
diff --git a/src/renderer/src/runtime/web-runtime-terminal-switch-placement.test.ts b/src/renderer/src/runtime/web-runtime-terminal-switch-placement.test.ts
index a9f407faa3ee..a3346b1c9b03 100644
--- a/src/renderer/src/runtime/web-runtime-terminal-switch-placement.test.ts
+++ b/src/renderer/src/runtime/web-runtime-terminal-switch-placement.test.ts
@@ -2,6 +2,7 @@
 import { beforeEach, expect, it, vi } from 'vitest'
 import { useAppStore } from '@/store'
 import type { RuntimeMobileSessionTabsResult } from '../../../shared/runtime-types'
+import { createGlobalSettingsFixture } from '../../../shared/global-settings-test-fixture'
 import { createWebRuntimeSessionTerminalResult } from './web-runtime-terminal-create-operation'
 import { refreshWebRuntimeSessionTabsSnapshot } from './web-runtime-session-snapshot'
 import { applyWebSessionTabsSnapshot } from './web-session-tabs-sync/snapshot-api'
@@ -25,7 +26,10 @@ beforeEach(() => {
   useAppStore.setState({
     activeWorktreeId: WT,
     activeWorkspaceExecutionHostId: `runtime:${ENV}`,
-    settings: { ...useAppStore.getState().settings, activeRuntimeEnvironmentId: ENV }
+    settings: createGlobalSettingsFixture({
+      ...useAppStore.getState().settings,
+      activeRuntimeEnvironmentId: ENV
+    })
   })
   frame = {
     worktree: WT,

From ce282572b215b19d302dd052d925cb06a0b6a843 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Wed, 21 Oct 2026 18:04:48 -0700
Subject: [PATCH 031/207] Exercise both conversation switch methods in the wire
 contract

---
 ...ss-version-agent-session-wire.unit.test.ts |   4 +-
 .../structured-agent-session-host-fixture.ts  |  62 +++++-
 .../structured-agent-session-surface-calls.ts |  12 ++
 ...uctured-agent-session-surface-execution.ts | 191 ++++++++++++------
 ...ructured-agent-session-surface-manifest.ts |   2 +
 5 files changed, 211 insertions(+), 60 deletions(-)

diff --git a/tests/e2e/cross-version-wire/cross-version-agent-session-wire.unit.test.ts b/tests/e2e/cross-version-wire/cross-version-agent-session-wire.unit.test.ts
index 99cc52bd9a3c..8005d3d68b9f 100644
--- a/tests/e2e/cross-version-wire/cross-version-agent-session-wire.unit.test.ts
+++ b/tests/e2e/cross-version-wire/cross-version-agent-session-wire.unit.test.ts
@@ -39,7 +39,7 @@ import { resolveBaselineReleaseRef } from './release-checkout'
 import {
   callBuild,
   expectDeclaredSurfaceExecutes,
-  expectItemDetailNegotiation,
+  expectItemDetailAndSwitchNegotiation,
   runtimeStub
 } from './structured-agent-session-surface-execution'
 import {
@@ -301,7 +301,7 @@ describe('cross-version structured agent sessions', () => {
           build.capabilities.includes(AGENT_SESSION_CONVERSATION_OUTLINE_RUNTIME_CAPABILITY)
         ).toBe(build.methodNames.includes(CONVERSATION_OUTLINE_METHOD))
       }
-      expectItemDetailNegotiation([current, baseline])
+      expectItemDetailAndSwitchNegotiation([current, baseline])
       // Additive surface: bumping the protocol number would strand every paired
       // device on this release rather than degrade one feature.
       expect(current.protocolVersion).toBe(baseline.protocolVersion)
diff --git a/tests/e2e/cross-version-wire/structured-agent-session-host-fixture.ts b/tests/e2e/cross-version-wire/structured-agent-session-host-fixture.ts
index 2e6951632c75..084c5f13665f 100644
--- a/tests/e2e/cross-version-wire/structured-agent-session-host-fixture.ts
+++ b/tests/e2e/cross-version-wire/structured-agent-session-host-fixture.ts
@@ -1,4 +1,13 @@
 import { vi } from 'vitest'
+import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import {
+  agentSessionRecordFixture,
+  agentSessionLeaseFixture
+} from '../../../src/shared/agent-session-record.test-fixture'
+import type { AgentSessionRecord } from '../../../src/shared/agent-session-record'
+import type { AiVaultChatForkSource } from '../../../src/shared/ai-vault-resume-preparation'
 import type { StructuredAgentSessionAdapter } from '../../../src/main/native-chat/agent-session-wire/structured-agent-session-adapter'
 import { startsWhenPublished } from '../../../src/main/native-chat/agent-session-wire/structured-agent-session-instant-start.test-support'
 import type { AgentSessionRecordStore } from '../../../src/main/runtime/agent-session-record-store'
@@ -19,6 +28,9 @@ export function structuredHostStub(
   workspaceId: string
 ): Record<string, ReturnType<typeof vi.fn>> {
   return {
+    getRecord: vi.fn<(sessionId: string) => AgentSessionRecord | null>(() => null),
+    switchToTerminal: vi.fn<StructuredAgentSessionHost['switchToTerminal']>(async () => undefined),
+    switchToChat: vi.fn<StructuredAgentSessionHost['switchToChat']>(async () => ({ ok: true })),
     // The restart-resume surface hangs off a host MEMBER rather than the root, but its spies stay
     // flat here: callers iterate this map asserting every entry is a spy that did not run, and
     // `installableHost` below is what reassembles the member. Keeping them flat also lets the
@@ -127,7 +139,7 @@ export function installableHost(
     // The catalog read checks the session's record for a floating chat's own folder; none here.
     deps: {
       modelCatalog: { read: hostCalls.modelCatalog },
-      store: { getRecord: () => null, getOperationRow: () => null }
+      store: { getRecord: hostCalls.getRecord, getOperationRow: () => null }
     },
     restartResume: {
       list: hostCalls.restartResumableList,
@@ -142,6 +154,54 @@ export function installableHost(
   return host as unknown as StructuredAgentSessionHost
 }
 
+/** A saved conversation for the real switch handler's account and transcript checks. */
+export async function structuredSwitchSource(
+  sessionId: string,
+  workspaceId: string,
+  thread: string
+) {
+  const root = await mkdtemp(join(tmpdir(), 'orca-cross-version-switch-'))
+  const codexHome = join(root, 'codex-home')
+  const sessions = join(codexHome, 'sessions')
+  const filePath = join(sessions, `rollout-${thread}.jsonl`)
+  await mkdir(sessions, { recursive: true })
+  await writeFile(
+    filePath,
+    `${JSON.stringify({ type: 'session_meta', payload: { id: thread, cwd: root } })}\n`
+  )
+  const record: AgentSessionRecord = {
+    ...agentSessionRecordFixture(agentSessionLeaseFixture({ sessionId })),
+    provider: 'codex',
+    location: {
+      executionHostId: 'local',
+      wslDistro: null,
+      workspaceId,
+      workspaceKind: 'git-worktree'
+    },
+    accountHome: { variable: 'CODEX_HOME', path: codexHome },
+    launchDirectory: root,
+    providerHandleChain: [
+      {
+        linkId: 'link-1',
+        origin: 'created',
+        mintedAtFence: 7,
+        observedAt: 1_000,
+        handle: codexProviderHandle(thread)
+      }
+    ]
+  }
+  const source: AiVaultChatForkSource = {
+    agent: 'codex',
+    sourceAgent: 'codex',
+    sessionId: thread,
+    cwd: root,
+    codexHome,
+    filePath,
+    executionHostPlatform: process.platform
+  }
+  return { record, source, dispose: () => rm(root, { recursive: true, force: true }) }
+}
+
 const TURN = { turnId: 'turn-1', state: 'completed' as const, startedAt: 1, completedAt: 6 }
 const TURN_ROW = { itemId: 'legacy:codex:s:turn-1', revision: 1, sequence: 1, observedAt: 1 }
 
diff --git a/tests/e2e/cross-version-wire/structured-agent-session-surface-calls.ts b/tests/e2e/cross-version-wire/structured-agent-session-surface-calls.ts
index ed257aa92f55..1a1c0babdbe4 100644
--- a/tests/e2e/cross-version-wire/structured-agent-session-surface-calls.ts
+++ b/tests/e2e/cross-version-wire/structured-agent-session-surface-calls.ts
@@ -14,6 +14,8 @@ export const CONVERSATION_OUTLINE_METHOD = 'agentSession.conversationOutline'
 export const ITEM_DETAIL_METHOD = 'agentSession.item'
 export const STATUS_FEED_METHOD = 'agentSession.subscribeStatus'
 export const TURN_COMPLETION_FEED_METHOD = 'agentSession.subscribeTurnCompletions'
+export const SWITCH_TO_TERMINAL_METHOD = 'agentSession.switchToTerminal'
+export const SWITCH_TO_CHAT_METHOD = 'agentSession.switchToChat'
 
 /** Every method the structured surface publishes: the host method it must reach,
  *  and the result it must hand back. A gate that hides one method and leaks
@@ -228,5 +230,15 @@ export const STRUCTURED_CALLS: {
     method: 'agentSession.subscribeAvailability',
     hostMethod: null,
     result: { type: 'availability', agents: [] }
+  },
+  {
+    method: SWITCH_TO_TERMINAL_METHOD,
+    hostMethod: 'switchToTerminal',
+    result: { source: { agent: 'codex', sourceAgent: 'codex', sessionId: THREAD } }
+  },
+  {
+    method: SWITCH_TO_CHAT_METHOD,
+    hostMethod: 'switchToChat',
+    result: { ok: true, sessionId: SESSION }
   }
 ]
diff --git a/tests/e2e/cross-version-wire/structured-agent-session-surface-execution.ts b/tests/e2e/cross-version-wire/structured-agent-session-surface-execution.ts
index 92cb0939c129..b0203a17d198 100644
--- a/tests/e2e/cross-version-wire/structured-agent-session-surface-execution.ts
+++ b/tests/e2e/cross-version-wire/structured-agent-session-surface-execution.ts
@@ -2,10 +2,20 @@ import { expect, vi } from 'vitest'
 import { AGENT_SESSION_ITEM_DETAIL_RUNTIME_CAPABILITY } from '../../../src/shared/protocol-version'
 import { RuntimeSubscriptionRegistry } from '../../../src/main/runtime/runtime-subscription-registry'
 import { AGENT_SESSION_CREATE_MESSAGE_RUNTIME_CAPABILITY } from '../../../src/shared/agent-session-create-capabilities'
+import { inPlaceSwitchCapability } from '../../../src/shared/structured-agent-cli-conversation-adoption'
+import { agentJournalItemKey } from '../../../src/shared/agent-session-journal-item-key'
+import type { AgentJournalSnapshot } from '../../../src/shared/agent-session-journal-types'
+import type { AiVaultSessionResumePreparation } from '../../../src/shared/ai-vault-resume-preparation'
+import { structuredSwitchSource } from './structured-agent-session-host-fixture'
 import {
   attachParams,
   ATTENTION_READ,
   paramsFor,
+  SESSION,
+  WORKSPACE,
+  THREAD,
+  SWITCH_TO_TERMINAL_METHOD,
+  SWITCH_TO_CHAT_METHOD,
   STRUCTURED_CALLS
 } from './structured-agent-session-surface-manifest'
 import type {
@@ -77,74 +87,141 @@ export async function expectDeclaredSurfaceExecutes(
   clientCapabilities: readonly string[]
 ): Promise<void> {
   const retirement = vi.fn()
-  const runtime = runtimeStub({ retireStructuredAttention: retirement })
-  for (const { method, hostMethod, result, clientCapability } of STRUCTURED_CALLS) {
-    const atRestCreate =
-      method === 'agentSession.create' &&
-      build.capabilities.includes(AGENT_SESSION_CREATE_MESSAGE_RUNTIME_CAPABILITY) &&
-      clientCapabilities.includes(AGENT_SESSION_CREATE_MESSAGE_RUNTIME_CAPABILITY)
-    const expectedHostMethod = atRestCreate ? 'create' : hostMethod
-    const otherCreateMethod =
-      method === 'agentSession.create' ? (atRestCreate ? 'attach' : 'create') : null
-    // Two methods share one host method, so "has been called" would already be
-    // true from the earlier one: only this call's own delta pins the pairing.
-    const before = expectedHostMethod ? hostCalls[expectedHostMethod].mock.calls.length : 0
-    const otherBefore = otherCreateMethod ? hostCalls[otherCreateMethod].mock.calls.length : 0
-    const replies = await callBuild(
-      build,
-      method,
-      paramsFor(method),
-      { clientKind: 'runtime', clientCapabilities },
-      runtime
-    )
-    if (clientCapability && !clientCapabilities.includes(clientCapability)) {
-      expect(replies).toMatchObject([
-        {
-          ok: false,
-          error: { message: expect.stringContaining('structured_agent_session_unsupported') }
+  const saved = await structuredSwitchSource(SESSION, WORKSPACE, THREAD)
+  const preparation = vi.fn<AiVaultSessionResumePreparation>(async () => ({
+    useRealCodexHome: false
+  }))
+  const runtime = runtimeStub({
+    retireStructuredAttention: retirement,
+    prepareAiVaultSessionResume: preparation
+  })
+  try {
+    for (const { method, hostMethod, result, clientCapability } of STRUCTURED_CALLS) {
+      const switching = method === SWITCH_TO_TERMINAL_METHOD || method === SWITCH_TO_CHAT_METHOD
+      hostCalls.getRecord.mockImplementation((sessionId: string) =>
+        switching && sessionId === SESSION ? saved.record : null
+      )
+      if (method === SWITCH_TO_TERMINAL_METHOD) {
+        const snapshot: AgentJournalSnapshot = {
+          sessionId: SESSION,
+          cursor: { epoch: 'epoch-a', sequence: 1 },
+          submissions: [],
+          items: [
+            {
+              itemId: agentJournalItemKey({
+                provider: 'codex',
+                threadId: THREAD,
+                turnId: 'turn-1',
+                ordinal: 0
+              }),
+              revision: 1,
+              sequence: 1,
+              observedAt: 1_000,
+              body: {
+                kind: 'message',
+                role: 'user',
+                blocks: [{ type: 'text', text: 'Saved prompt' }]
+              }
+            }
+          ]
+        }
+        hostCalls.journalSnapshot.mockReturnValueOnce(snapshot)
+      }
+      const atRestCreate =
+        method === 'agentSession.create' &&
+        build.capabilities.includes(AGENT_SESSION_CREATE_MESSAGE_RUNTIME_CAPABILITY) &&
+        clientCapabilities.includes(AGENT_SESSION_CREATE_MESSAGE_RUNTIME_CAPABILITY)
+      const expectedHostMethod = atRestCreate ? 'create' : hostMethod
+      const otherCreateMethod =
+        method === 'agentSession.create' ? (atRestCreate ? 'attach' : 'create') : null
+      // Two methods share one host method, so "has been called" would already be
+      // true from the earlier one: only this call's own delta pins the pairing.
+      const before = expectedHostMethod ? hostCalls[expectedHostMethod].mock.calls.length : 0
+      const otherBefore = otherCreateMethod ? hostCalls[otherCreateMethod].mock.calls.length : 0
+      const replies = await callBuild(
+        build,
+        method,
+        paramsFor(method),
+        { clientKind: 'runtime', clientCapabilities },
+        runtime
+      )
+      if (clientCapability && !clientCapabilities.includes(clientCapability)) {
+        expect(replies).toMatchObject([
+          {
+            ok: false,
+            error: { message: expect.stringContaining('structured_agent_session_unsupported') }
+          }
+        ])
+        if (expectedHostMethod) {
+          expect(hostCalls[expectedHostMethod].mock.calls.length).toBe(before)
         }
-      ])
+        continue
+      }
       if (expectedHostMethod) {
-        expect(hostCalls[expectedHostMethod].mock.calls.length).toBe(before)
+        expect(
+          hostCalls[expectedHostMethod].mock.calls.length - before,
+          `${build.label}: ${method} did not reach the host: ${JSON.stringify(replies)}`
+        ).toBe(1)
+      }
+      if (otherCreateMethod) {
+        expect(hostCalls[otherCreateMethod].mock.calls.length - otherBefore).toBe(0)
+      }
+      if (method === 'agentSession.acknowledgeAttention') {
+        expect(retirement).toHaveBeenCalledExactlyOnceWith(ATTENTION_READ)
+      }
+      if (method === SWITCH_TO_CHAT_METHOD) {
+        expect(hostCalls.switchToChat).toHaveBeenLastCalledWith(SESSION)
+      }
+      if (method === SWITCH_TO_TERMINAL_METHOD) {
+        expect(hostCalls.switchToTerminal).toHaveBeenLastCalledWith(SESSION)
+        expect(preparation).toHaveBeenCalledExactlyOnceWith({
+          agent: 'codex',
+          sessionId: THREAD,
+          filePath: saved.source.filePath,
+          codexHome: saved.source.codexHome,
+          executionHostId: 'local'
+        })
+        expect(preparation.mock.invocationCallOrder[0]).toBeLessThan(
+          hostCalls.switchToTerminal.mock.invocationCallOrder[0]
+        )
+        expect(replies[0]).toMatchObject({ ok: true, result: { source: saved.source } })
+      }
+      for (const reply of replies) {
+        expect(
+          reply,
+          `${build.label}: ${method} was refused: ${JSON.stringify(reply)}`
+        ).toMatchObject({ ok: true })
+      }
+      if (result) {
+        // The declared answer, not merely a non-refusal: a handler that is
+        // registered and returns an execution error, or hands back someone else's
+        // envelope, fails here rather than passing as "reached the host".
+        expect(replies, `${build.label}: ${method} must answer exactly once`).toHaveLength(1)
+        expect(replies[0], `${build.label}: ${method} answered off-contract`).toMatchObject({
+          ok: true,
+          result
+        })
       }
-      continue
-    }
-    if (expectedHostMethod) {
-      expect(
-        hostCalls[expectedHostMethod].mock.calls.length - before,
-        `${build.label}: ${method} did not reach the host: ${JSON.stringify(replies)}`
-      ).toBe(1)
-    }
-    if (otherCreateMethod) {
-      expect(hostCalls[otherCreateMethod].mock.calls.length - otherBefore).toBe(0)
-    }
-    if (method === 'agentSession.acknowledgeAttention') {
-      expect(retirement).toHaveBeenCalledExactlyOnceWith(ATTENTION_READ)
-    }
-    for (const reply of replies) {
-      expect(
-        reply,
-        `${build.label}: ${method} was refused: ${JSON.stringify(reply)}`
-      ).toMatchObject({ ok: true })
-    }
-    if (result) {
-      // The declared answer, not merely a non-refusal: a handler that is
-      // registered and returns an execution error, or hands back someone else's
-      // envelope, fails here rather than passing as "reached the host".
-      expect(replies, `${build.label}: ${method} must answer exactly once`).toHaveLength(1)
-      expect(replies[0], `${build.label}: ${method} answered off-contract`).toMatchObject({
-        ok: true,
-        result
-      })
     }
+  } finally {
+    hostCalls.getRecord.mockReturnValue(null)
+    await saved.dispose()
   }
 }
 
-export function expectItemDetailNegotiation(builds: readonly AgentSessionWireBuild[]): void {
+export function expectItemDetailAndSwitchNegotiation(
+  builds: readonly AgentSessionWireBuild[]
+): void {
   expect(builds[0]?.capabilities).toContain(AGENT_SESSION_ITEM_DETAIL_RUNTIME_CAPABILITY)
+  expect(builds[0]?.capabilities).toContain(inPlaceSwitchCapability('codex'))
   for (const build of builds) {
     expect(build.capabilities.includes(AGENT_SESSION_ITEM_DETAIL_RUNTIME_CAPABILITY)).toBe(
       build.methodNames.includes('agentSession.item')
     )
+    for (const method of [SWITCH_TO_TERMINAL_METHOD, SWITCH_TO_CHAT_METHOD]) {
+      expect(build.capabilities.includes(inPlaceSwitchCapability('codex'))).toBe(
+        build.methodNames.includes(method)
+      )
+    }
   }
 }
diff --git a/tests/e2e/cross-version-wire/structured-agent-session-surface-manifest.ts b/tests/e2e/cross-version-wire/structured-agent-session-surface-manifest.ts
index 5cfaefd5605f..e2c78db34e67 100644
--- a/tests/e2e/cross-version-wire/structured-agent-session-surface-manifest.ts
+++ b/tests/e2e/cross-version-wire/structured-agent-session-surface-manifest.ts
@@ -37,6 +37,8 @@ export {
   ITEM_DETAIL_METHOD,
   STATUS_FEED_METHOD,
   TURN_COMPLETION_FEED_METHOD,
+  SWITCH_TO_TERMINAL_METHOD,
+  SWITCH_TO_CHAT_METHOD,
   STRUCTURED_CALLS
 } from './structured-agent-session-surface-calls'
 

From f9cb99da7ec60619cdb03a5dbe071043603f776f Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Wed, 21 Oct 2026 18:09:44 -0700
Subject: [PATCH 032/207] Complete existing runtime and History test fixtures

---
 config/scripts/vitest-sqlite-database-runtime-files.mjs  | 1 +
 src/main/runtime/rpc/runtime-close-attribution.test.ts   | 4 +++-
 .../right-sidebar/AiVaultPanel.legacy-filter.test.tsx    | 3 ++-
 .../AiVaultSessionRow.structured-title.test.tsx          | 9 +++++++--
 .../src/runtime/web-runtime-session-test-harness.ts      | 2 ++
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/config/scripts/vitest-sqlite-database-runtime-files.mjs b/config/scripts/vitest-sqlite-database-runtime-files.mjs
index 9af339e9cf7f..c260150f1206 100644
--- a/config/scripts/vitest-sqlite-database-runtime-files.mjs
+++ b/config/scripts/vitest-sqlite-database-runtime-files.mjs
@@ -55,6 +55,7 @@ export const SQLITE_DATABASE_RUNTIME_INCLUDE = [
   'src/main/runtime/orchestration/coordinator-escalation-triage.test.ts',
   'src/main/runtime/orchestration/coordinator-terminal-census-unavailable.test.ts',
   'src/main/runtime/orchestration/coordinator.test.ts',
+  'src/main/runtime/orchestration/chat-assignee.test.ts',
   'src/main/runtime/orchestration/db-empty-dispatch-shortcircuit.benchmark.test.ts',
   'src/main/runtime/orchestration/db-heartbeat-straggler-guard.test.ts',
   'src/main/runtime/orchestration/db-message-timestamp.test.ts',
diff --git a/src/main/runtime/rpc/runtime-close-attribution.test.ts b/src/main/runtime/rpc/runtime-close-attribution.test.ts
index 12290423a750..bf8ba2f50551 100644
--- a/src/main/runtime/rpc/runtime-close-attribution.test.ts
+++ b/src/main/runtime/rpc/runtime-close-attribution.test.ts
@@ -88,7 +88,9 @@ describe('runtime close attribution', () => {
       )
 
       expect(JSON.parse(replies[0]!)).toMatchObject({ ok: true })
-      expect(close).toHaveBeenCalledWith('term-1')
+      expect(close).toHaveBeenCalledWith(
+        ...(method === 'terminal.close' ? ['term-1', undefined] : ['term-1'])
+      )
       expect(sink.records).toEqual([
         expect.objectContaining({
           type: 'effect-span',
diff --git a/src/renderer/src/components/right-sidebar/AiVaultPanel.legacy-filter.test.tsx b/src/renderer/src/components/right-sidebar/AiVaultPanel.legacy-filter.test.tsx
index b4e6b09539e2..3476093dec44 100644
--- a/src/renderer/src/components/right-sidebar/AiVaultPanel.legacy-filter.test.tsx
+++ b/src/renderer/src/components/right-sidebar/AiVaultPanel.legacy-filter.test.tsx
@@ -26,7 +26,8 @@ const updateSettingsOrThrow = vi.fn(async (next: { aiVaultSearch: { enabled: boo
 
 vi.mock('@/store', () => ({
   useAppStore: Object.assign((select: (state: typeof mockState) => unknown) => select(mockState), {
-    getState: () => ({ ...mockState, updateSettingsOrThrow, markFeatureTipsSeen: vi.fn() })
+    getState: () => ({ ...mockState, updateSettingsOrThrow, markFeatureTipsSeen: vi.fn() }),
+    subscribe: vi.fn(() => vi.fn())
   })
 }))
 vi.mock('@/store/selectors', () => ({
diff --git a/src/renderer/src/components/right-sidebar/AiVaultSessionRow.structured-title.test.tsx b/src/renderer/src/components/right-sidebar/AiVaultSessionRow.structured-title.test.tsx
index f8507970523d..839c779daa7e 100644
--- a/src/renderer/src/components/right-sidebar/AiVaultSessionRow.structured-title.test.tsx
+++ b/src/renderer/src/components/right-sidebar/AiVaultSessionRow.structured-title.test.tsx
@@ -8,9 +8,14 @@ import type { AiVaultSearchHit } from '../../../../shared/ai-vault-search-types'
 import type { ExecutionHostId } from '../../../../shared/execution-host'
 import type { Tab } from '../../../../shared/tab-types'
 
-const mocks = vi.hoisted(() => ({ subscribe: vi.fn(), supports: vi.fn() }))
+const mocks = vi.hoisted(() => ({
+  subscribe: vi.fn(),
+  supports: vi.fn(),
+  supportsInPlaceSwitch: vi.fn(async () => false)
+}))
 vi.mock('@/runtime/structured-agent-session-client', () => ({
-  subscribeStructuredAgentSessionStatus: mocks.subscribe
+  subscribeStructuredAgentSessionStatus: mocks.subscribe,
+  supportsInPlaceSwitch: mocks.supportsInPlaceSwitch
 }))
 vi.mock('@/runtime/runtime-rpc-client', async (importOriginal) => ({
   ...(await importOriginal<Record<string, unknown>>()),
diff --git a/src/renderer/src/runtime/web-runtime-session-test-harness.ts b/src/renderer/src/runtime/web-runtime-session-test-harness.ts
index 1fb481cfb752..0c973664a39a 100644
--- a/src/renderer/src/runtime/web-runtime-session-test-harness.ts
+++ b/src/renderer/src/runtime/web-runtime-session-test-harness.ts
@@ -194,6 +194,8 @@ export function stubTerminalCreateEnvironment(mocks: WebRuntimeSessionMocks): vo
     },
     activeWorktreeId: WORKTREE_ID,
     tabsByWorktree: {},
+    groupsByWorktree: {},
+    unifiedTabsByWorktree: {},
     terminalLayoutsByTabId: {},
     activeTabIdByWorktree: {},
     activeGroupIdByWorktree: {},

From 5d4185ebe913eeb8c50adc4d01db6e985706bfe9 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Wed, 21 Oct 2026 19:29:48 -0700
Subject: [PATCH 033/207] Fix terminal create type contracts

---
 src/main/runtime/runtime-pty-controller-contract.ts | 2 ++
 src/main/runtime/terminal/launch/terminal-create.ts | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/runtime/runtime-pty-controller-contract.ts b/src/main/runtime/runtime-pty-controller-contract.ts
index 50f8691c2e1d..b31955730728 100644
--- a/src/main/runtime/runtime-pty-controller-contract.ts
+++ b/src/main/runtime/runtime-pty-controller-contract.ts
@@ -23,6 +23,7 @@ import type {
 } from '../providers/pty-provider-contract'
 import type { PtyProcessInspection } from '../providers/pty-process-inspection'
 import type { WriteSettlement } from '../../shared/pty-write-settlement'
+import type { StartupCwdFallback } from '../../shared/startup-cwd-fallback'
 import type { TerminalInputKind } from '../../shared/terminal-input-kind'
 
 export type PtyInventoryRefreshOptions = {
@@ -116,6 +117,7 @@ export type RuntimePtyController = {
   }): Promise<
     PtySpawnResult & {
       stablePaneOwner?: { handle: string; tabId: string; leafId: string }
+      startupCwdFallback?: StartupCwdFallback
       savedStartupCwd?: string
     }
   >
diff --git a/src/main/runtime/terminal/launch/terminal-create.ts b/src/main/runtime/terminal/launch/terminal-create.ts
index f4d65fea9ae7..7382082c410a 100644
--- a/src/main/runtime/terminal/launch/terminal-create.ts
+++ b/src/main/runtime/terminal/launch/terminal-create.ts
@@ -274,7 +274,7 @@ export abstract class OrcaRuntimeWithCreateTerminal extends OrcaRuntimeWithTermi
           cwd: savedStartupCwd,
           launchOpts: {
             ...launchOpts,
-            title: pty?.title ?? launch.effectiveTitle ?? null,
+            title: pty?.title ?? launch.effectiveTitle ?? undefined,
             launchAgent: pty?.launchAgent ?? undefined,
             viewMode: launch.effectiveViewMode
           },

From 1a37f704316f2023c05039d50555131f764a4f0d Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Wed, 21 Oct 2026 19:31:31 -0700
Subject: [PATCH 034/207] Align integrated terminal types and workspace readers

---
 src/main/ipc/pty/runtime/kill.ts                       |  2 +-
 src/main/runtime/runtime-pty-controller-contract.ts    |  2 ++
 .../runtime/terminal/launch/terminal-create-reveal.ts  |  3 ++-
 .../src/components/tab-bar/cli-chat-resume-feedback.ts | 10 ++++++++--
 src/renderer/src/lib/launch-ai-vault-session.test.ts   |  2 +-
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/main/ipc/pty/runtime/kill.ts b/src/main/ipc/pty/runtime/kill.ts
index 6744758a679e..0f9d63a63ecb 100644
--- a/src/main/ipc/pty/runtime/kill.ts
+++ b/src/main/ipc/pty/runtime/kill.ts
@@ -215,7 +215,7 @@ export async function stopAndWaitPtyFromRuntimeController(
 async function stopAndWaitPty(
   deps: PtyRuntimeControllerDeps,
   ptyId: string,
-  opts?: { keepHistory?: boolean; deadlineMs?: number }
+  opts?: Parameters<typeof stopAndWaitPtyFromRuntimeController>[2]
 ): Promise<boolean> {
   const {
     runtime,
diff --git a/src/main/runtime/runtime-pty-controller-contract.ts b/src/main/runtime/runtime-pty-controller-contract.ts
index 8972afc0a7ca..dbb3bcdae629 100644
--- a/src/main/runtime/runtime-pty-controller-contract.ts
+++ b/src/main/runtime/runtime-pty-controller-contract.ts
@@ -24,6 +24,7 @@ import type {
 import type { PtyProcessInspection } from '../providers/pty-process-inspection'
 import type { WriteSettlement } from '../../shared/pty-write-settlement'
 import type { TerminalInputKind } from '../../shared/terminal-input-kind'
+import type { StartupCwdFallback } from '../../shared/startup-cwd-fallback'
 
 export type PtyInventoryRefreshOptions = {
   includeForegroundProcessEvidence?: boolean
@@ -117,6 +118,7 @@ export type RuntimePtyController = {
     PtySpawnResult & {
       stablePaneOwner?: { handle: string; tabId: string; leafId: string }
       savedStartupCwd?: string
+      startupCwdFallback?: StartupCwdFallback
     }
   >
   /** The local terminal owner's automatic-restore state; null when it has no fork gate. */
diff --git a/src/main/runtime/terminal/launch/terminal-create-reveal.ts b/src/main/runtime/terminal/launch/terminal-create-reveal.ts
index 825e62dbb99b..8b997f021e54 100644
--- a/src/main/runtime/terminal/launch/terminal-create-reveal.ts
+++ b/src/main/runtime/terminal/launch/terminal-create-reveal.ts
@@ -9,7 +9,8 @@ export function revealCreatedTerminal(args: {
   ptyId: string
   handle: string
   cwd: string
-  launchOpts: dependencies.TerminalCreateOptions
+  launchOpts: Omit<dependencies.TerminalCreateOptions, 'title'> &
+    Pick<dependencies.RuntimeTerminalCreate, 'title'>
   effectiveLaunchConfig: dependencies.TerminalCreateOptions['launchConfig']
   launchToken: string | undefined
   presentation: RuntimeTerminalPresentation | undefined
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
index 52e9ab59f884..13a300b1e921 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
@@ -1,6 +1,7 @@
 import { useAppStore } from '@/store'
 import { parseWorkspaceKey } from '../../../../shared/workspace-scope'
 import { getIndexedWorktreeById } from '@/store/worktree-repo-index'
+import { selectFolderWorkspaces, selectWorktreesByRepo } from '@/store/workspace-record-selectors'
 import { resolveWorktreeDisplayName } from '@/lib/worktree-default-display-name'
 import { toast } from 'sonner'
 import { translate } from '@/i18n/i18n'
@@ -62,9 +63,14 @@ export async function switchIntoOwner(
     const scope = parseWorkspaceKey(structuredSession.workspaceId)
     const folder =
       scope?.type === 'folder'
-        ? state.folderWorkspaces.find((workspace) => workspace.id === scope.folderWorkspaceId)
+        ? selectFolderWorkspaces(state).find(
+            (workspace) => workspace.id === scope.folderWorkspaceId
+          )
         : undefined
-    const worktree = getIndexedWorktreeById(state.worktreesByRepo, structuredSession.workspaceId)
+    const worktree = getIndexedWorktreeById(
+      selectWorktreesByRepo(state),
+      structuredSession.workspaceId
+    )
     const workspace =
       folder?.name ??
       (worktree ? resolveWorktreeDisplayName(worktree) : structuredSession.workspaceId)
diff --git a/src/renderer/src/lib/launch-ai-vault-session.test.ts b/src/renderer/src/lib/launch-ai-vault-session.test.ts
index 691faa9bfd71..c06543b6d694 100644
--- a/src/renderer/src/lib/launch-ai-vault-session.test.ts
+++ b/src/renderer/src/lib/launch-ai-vault-session.test.ts
@@ -238,7 +238,7 @@ describe('launchAiVaultSessionInNewTab', () => {
   it.each([undefined, 'explicit-group'])(
     'derives the source group before the paired launch and preserves explicit target %s',
     (targetGroupId) => {
-      runtimeMocks.runtimeEnvironmentIdWithLegacyFallbackUnlessTwin.mockReturnValue('env-1')
+      runtimeMocks.runtimeEnvironmentIdOrLocalUnlessTwin.mockReturnValue('env-1')
       runtimeMocks.isWebRuntimeSessionActive.mockReturnValue(true)
       mockState.unifiedTabsByWorktree['wt-1'] = [{ id: 'chat-C', groupId: 'source-group' }]
       launchAiVaultSessionInNewTab({

From 043601ec4625f903effb8f5a9ed6f29cbf8942be Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Wed, 21 Oct 2026 19:59:06 -0700
Subject: [PATCH 035/207] Fix pinned switch placement and terminal resume
 fallback

---
 .../TabSessionSurfaceSwitchMenuItems.test.tsx |  4 +-
 .../TerminalPaneResumeInChatButton.test.tsx   | 40 ++++++---
 .../TerminalPaneResumeInChatButton.tsx        | 20 +++--
 .../launch-ai-vault-session-placement.test.ts | 87 +++++++++++++++++++
 .../src/lib/launch-ai-vault-session.ts        |  8 +-
 5 files changed, 129 insertions(+), 30 deletions(-)
 create mode 100644 src/renderer/src/lib/launch-ai-vault-session-placement.test.ts

diff --git a/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx b/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx
index 436ab2399fa4..e10e7dcbfe5a 100644
--- a/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx
+++ b/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx
@@ -51,7 +51,7 @@ vi.mock('./tab-session-history-switch', async (importOriginal) => ({
 }))
 
 vi.mock('./cli-chat-resume-source', () => ({
-  useCliChatResumeCapability: () => true,
+  useCliChatResumeCapability: (_worktreeId: string, agent: string) => agent === 'codex',
   resolveCliChatResumeSource: () => mocks.cliSource
 }))
 vi.mock('./cli-chat-resume-run', () => ({
@@ -140,7 +140,7 @@ describe('TabSessionSurfaceSwitchMenuItems', () => {
     }
     mocks.cliSource = source
     renderItemsNow()
-    fireEvent.click(screen.getByRole('menuitem', { name: 'Switch to native chat' }))
+    fireEvent.click(screen.getByRole('menuitem', { name: 'Resume in New Chat' }))
     await act(async () => {})
     expect(mocks.runCliChatResume).toHaveBeenCalledWith(source)
     expect(mocks.listSessions).not.toHaveBeenCalled()
diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.test.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.test.tsx
index 0cf16cbe51d8..fca1d1d8b496 100644
--- a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.test.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.test.tsx
@@ -1,28 +1,31 @@
 // @vitest-environment happy-dom
 import { cleanup, fireEvent, render, screen } from '@testing-library/react'
-import { afterEach, expect, it, vi } from 'vitest'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import { TooltipProvider } from '@/components/ui/tooltip'
+import type { CliChatResumeSource } from '../tab-bar/cli-chat-resume-source'
 import { TerminalPaneResumeInChatButton } from './TerminalPaneResumeInChatButton'
 
-const mocks = vi.hoisted(() => ({
-  source: {
+const mocks = vi.hoisted(() => {
+  const source: CliChatResumeSource = {
     tabId: 'tab-1',
     workspaceId: 'wt-1',
     paneKey: 'tab-1:leaf',
     agent: 'claude',
     providerSessionId: 'provider-1',
-    executionHostId: 'local'
-  },
-  resolve: vi.fn(),
-  run: vi.fn(),
-  pending: false
-}))
+    executionHostId: 'local',
+    ptyId: 'pty-1'
+  }
+  return { source, resolve: vi.fn(), run: vi.fn(), pending: false, running: true }
+})
 vi.mock('@/store', () => ({
   useAppStore: (selector: (state: Record<string, unknown>) => unknown) =>
-    selector({ paneForegroundAgentByPaneKey: {}, agentStatusByPaneKey: {} })
+    selector({
+      paneForegroundAgentByPaneKey: {},
+      agentStatusByPaneKey: mocks.running ? { 'tab-1:leaf': 'working' } : {}
+    })
 }))
 vi.mock('../tab-bar/cli-chat-resume-source', () => ({
-  useCliChatResumeCapability: () => true,
+  useCliChatResumeCapability: (_worktreeId: string, agent: string) => agent === 'codex',
   resolveCliChatResumeSource: (_state: unknown, args: unknown) => {
     mocks.resolve(args)
     return mocks.source
@@ -33,14 +36,25 @@ vi.mock('../tab-bar/cli-chat-resume-run', () => ({
   useCliChatResumePending: () => mocks.pending
 }))
 afterEach(cleanup)
+beforeEach(() => {
+  mocks.source.agent = 'claude'
+  mocks.pending = false
+  mocks.running = true
+  vi.clearAllMocks()
+})
 
-it('dispatches the exact pane and shares pending', () => {
+it.each([
+  ['claude', 'Resume in New Chat'],
+  ['codex', 'Switch to native chat']
+] as const)('offers the %s action for the exact pane and shares pending', (agent, label) => {
+  mocks.source.agent = agent
+  mocks.running = agent === 'claude'
   const { rerender } = render(
     <TooltipProvider>
       <TerminalPaneResumeInChatButton tabId="tab-1" worktreeId="wt-1" paneKey="tab-1:leaf" />
     </TooltipProvider>
   )
-  fireEvent.click(screen.getByRole('button', { name: 'Switch to native chat' }))
+  fireEvent.click(screen.getByRole('button', { name: label }))
   expect(mocks.resolve).toHaveBeenCalledWith({
     tab: { id: 'tab-1', worktreeId: 'wt-1' },
     paneKey: 'tab-1:leaf'
diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx
index 08e9fdd1741a..023c2c0d3736 100644
--- a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx
@@ -35,18 +35,20 @@ export function TerminalPaneResumeInChatButton({
     )
   })
   const pending = useCliChatResumePending(source)
-  const label = translate('components.tab.bar.switch.toNativeChat', 'Switch to native chat')
+  const label =
+    capability === false
+      ? translate(
+          'auto.components.right.sidebar.AiVaultSessionRow.resumeInNewNativeChat',
+          'Resume in New Chat'
+        )
+      : translate('components.tab.bar.switch.toNativeChat', 'Switch to native chat')
   const tooltip = !source
     ? translate(
         'components.tab.bar.switch.noConversation',
         'No saved conversation is available in this terminal yet.'
       )
     : capability === false
-      ? translate(
-          'components.tab.bar.switch.unavailable',
-          'Switching {{agent}} is not available yet.',
-          { agent: agentLabel(source.agent) }
-        )
+      ? label
       : running && source
         ? translate(
             'components.tab.bar.switch.exitAgentFirst',
@@ -70,13 +72,13 @@ export function TerminalPaneResumeInChatButton({
           // Same class as split so it shares the hover/active reveal.
           className="pane-title-split-trigger"
           aria-label={label}
-          disabled={!source || pending || capability !== true}
+          disabled={!source || pending || capability === undefined}
           // Not `disabled`: the tooltip has to say why.
-          aria-disabled={running || undefined}
+          aria-disabled={(capability === true && running) || undefined}
           aria-busy={pending || undefined}
           onClick={(event) => {
             event.stopPropagation()
-            if (source && !running && capability === true) {
+            if (source && capability !== undefined && (capability === false || !running)) {
               void runCliChatResume(source)
             }
           }}
diff --git a/src/renderer/src/lib/launch-ai-vault-session-placement.test.ts b/src/renderer/src/lib/launch-ai-vault-session-placement.test.ts
new file mode 100644
index 000000000000..2972fbc73348
--- /dev/null
+++ b/src/renderer/src/lib/launch-ai-vault-session-placement.test.ts
@@ -0,0 +1,87 @@
+import { expect, it, vi } from 'vitest'
+import type { Tab } from '../../../shared/tab-types'
+import { createTestStore } from '@/store/slices/store-test-helpers'
+import { createTabsSliceMockApi } from '@/store/slices/tabs-slice-test-harness'
+import { launchAiVaultSessionInNewTab } from './launch-ai-vault-session'
+
+const mocks = vi.hoisted(() => {
+  const held: { store: unknown } = { store: null }
+  return held
+})
+vi.mock('@/store', () => ({
+  get useAppStore() {
+    return mocks.store
+  }
+}))
+vi.mock('@/lib/worktree-runtime-owner', () => ({
+  runtimeEnvironmentIdOrLocalUnlessTwin: () => null
+}))
+vi.mock('@/runtime/structured-agent-session-tab-retirement', () => ({
+  beginStructuredAgentSessionTabClose: vi.fn()
+}))
+vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } }))
+
+createTabsSliceMockApi()
+
+it('keeps the pinned partition and neighbor order after a local switch retires its source', () => {
+  const worktreeId = 'repo1::/work/app'
+  const groupId = 'group-1'
+  const tab = (id: string, extra: Partial<Tab> = {}): Tab => ({
+    id,
+    entityId: id,
+    groupId,
+    worktreeId,
+    contentType: 'browser',
+    label: id,
+    customLabel: null,
+    color: null,
+    sortOrder: 0,
+    createdAt: 1,
+    ...extra
+  })
+  const source = tab('agent-session:chat', {
+    entityId: 'chat',
+    contentType: 'agent-session',
+    agentSessionAgent: 'codex',
+    executionHostId: 'local',
+    isPinned: true
+  })
+  const store = createTestStore()
+  mocks.store = store
+  store.setState({
+    unifiedTabsByWorktree: {
+      [worktreeId]: [source, tab('pinned', { isPinned: true }), tab('unpinned')]
+    },
+    groupsByWorktree: {
+      [worktreeId]: [
+        {
+          id: groupId,
+          worktreeId,
+          activeTabId: source.id,
+          tabOrder: [source.id, 'pinned', 'unpinned']
+        }
+      ]
+    },
+    activeGroupIdByWorktree: { [worktreeId]: groupId },
+    layoutByWorktree: { [worktreeId]: { type: 'leaf', groupId } }
+  })
+
+  const result = launchAiVaultSessionInNewTab({
+    agent: 'codex',
+    worktreeId,
+    command: 'codex resume provider-1',
+    afterTabId: source.id,
+    resumeOrigin: 'switch'
+  })
+  expect(result.tabId).toEqual(expect.any(String))
+  store.getState().closeUnifiedTab(source.id)
+
+  expect(store.getState().groupsByWorktree[worktreeId]?.[0]?.tabOrder).toEqual([
+    'pinned',
+    result.tabId,
+    'unpinned'
+  ])
+  expect(store.getState().unifiedTabsByWorktree[worktreeId]?.some((t) => t.id === source.id)).toBe(
+    false
+  )
+})
diff --git a/src/renderer/src/lib/launch-ai-vault-session.ts b/src/renderer/src/lib/launch-ai-vault-session.ts
index 13fa40e2838b..3f4200cdb66c 100644
--- a/src/renderer/src/lib/launch-ai-vault-session.ts
+++ b/src/renderer/src/lib/launch-ai-vault-session.ts
@@ -1,5 +1,6 @@
 import { useAppStore } from '@/store'
 import { persistAgentLaunchTabOrder } from '@/lib/launch-agent-tab-order'
+import { insertUnifiedTabAfterAnchor } from '@/lib/unified-tab-anchor-insertion'
 import { tuiAgentToAgentKind } from '@/lib/telemetry'
 import { runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/worktree-runtime-owner'
 import { createWebRuntimeSessionTerminal } from '@/runtime/web-runtime-terminal-creation'
@@ -103,12 +104,7 @@ export function launchAiVaultSessionInNewTab(args: {
 
   persistAgentLaunchTabOrder(args.worktreeId, tab.id)
   if (slot && !split && (!args.targetGroupId || args.targetGroupId === slot.groupId)) {
-    const order = (
-      useAppStore.getState().groupsByWorktree[args.worktreeId]?.find((g) => g.id === slot.groupId)
-        ?.tabOrder ?? []
-    ).filter((id) => id !== tab.id)
-    order.splice(order.indexOf(slot.id) + 1, 0, tab.id)
-    useAppStore.getState().reorderUnifiedTabs(slot.groupId, order)
+    insertUnifiedTabAfterAnchor(args.worktreeId, tab.id, slot.id)
   }
 
   return { tabId: tab.id }

From 79bcf113e341bea75b0063a6f842f97d34ab66ca Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Wed, 21 Oct 2026 21:20:21 -0700
Subject: [PATCH 036/207] fix: return the terminal main started to its waiting
 view

---
 src/main/ipc/pty-attach-view-joins-main-start.test.ts | 1 +
 src/main/ipc/pty/ipc/spawn-begin.ts                   | 7 +++++--
 src/main/ipc/pty/ipc/spawn-run.ts                     | 5 ++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/ipc/pty-attach-view-joins-main-start.test.ts b/src/main/ipc/pty-attach-view-joins-main-start.test.ts
index d300c857e872..169f4d68e4a6 100644
--- a/src/main/ipc/pty-attach-view-joins-main-start.test.ts
+++ b/src/main/ipc/pty-attach-view-joins-main-start.test.ts
@@ -106,6 +106,7 @@ describe('a window view of a pane main is starting', () => {
         controller = value
       }),
       createPreAllocatedTerminalHandle: vi.fn(() => 'term_main'),
+      getAgentProviderSessionRows: vi.fn(() => []),
       registerPreAllocatedHandleForPty: vi.fn(),
       registerPty: vi.fn(),
       onPtySpawned: vi.fn(),
diff --git a/src/main/ipc/pty/ipc/spawn-begin.ts b/src/main/ipc/pty/ipc/spawn-begin.ts
index daec13b22152..8c42ff43ef79 100644
--- a/src/main/ipc/pty/ipc/spawn-begin.ts
+++ b/src/main/ipc/pty/ipc/spawn-begin.ts
@@ -12,7 +12,8 @@ import { snapshotCodexPaneHomeRoutes } from '../host-env/codex-home'
 import { getAppPtyId } from '../provider/registry'
 import {
   makePaneSpawnReservationKey,
-  pendingRuntimePaneCreatesByOwnerKey
+  pendingRuntimePaneCreatesByOwnerKey,
+  type PaneSpawnReservationResult
 } from '../pane/spawn-reservation'
 import { resolveStablePaneOwner } from '../pane/stable-owner'
 import { excludeReplacedPaneOwner } from '../pane/replaced-pane-owner'
@@ -36,7 +37,9 @@ export function resolveEarlyPaneSpawnReservationKey(args: PtySpawnIpcArgs): stri
   return makePaneSpawnReservationKey(args.worktreeId, args.connectionId, resolveEarlyPaneKey(args))
 }
 
-export async function beginPtyIpcSpawn(ctx: PtyIpcSpawnState): Promise<void> {
+export async function beginPtyIpcSpawn(
+  ctx: PtyIpcSpawnState
+): Promise<PaneSpawnReservationResult | void> {
   const args = ctx.args
   // A pane an agent launch laid out attaches to its agent or says why it can't, never runs a shell.
   // A replacing spawn already holds the pane: the user restarted it, and that is theirs to run.
diff --git a/src/main/ipc/pty/ipc/spawn-run.ts b/src/main/ipc/pty/ipc/spawn-run.ts
index aa8dbf55e5ca..c3a81913c852 100644
--- a/src/main/ipc/pty/ipc/spawn-run.ts
+++ b/src/main/ipc/pty/ipc/spawn-run.ts
@@ -181,7 +181,10 @@ export async function runPtyIpcSpawn(deps: PtySpawnIpcDeps, args: PtySpawnIpcArg
       })
     }
     triggerPtySpawnPushTargetMaterialization(deps, args)
-    await beginPtyIpcSpawn(ctx)
+    const early = await beginPtyIpcSpawn(ctx)
+    if (early) {
+      return early
+    }
     const paneKey = resolveEarlyPaneKey(args)
     if (!paneKey || !args.worktreeId || !args.tabId || !args.leafId) {
       return await fresh({ mustExist: false })

From 60cc704982b4cebeaefa6854baaf463c5d11d221 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Wed, 21 Oct 2026 21:49:30 -0700
Subject: [PATCH 037/207] fix: register reattached terminals before publishing
 their handles

---
 src/main/ipc/pty-pane-materialization-race.test.ts       | 6 ++++++
 .../cli-terminal-create-host-session-binding.test.ts     | 9 +++++++--
 src/main/runtime/terminal/launch/terminal-create.ts      | 3 ++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/main/ipc/pty-pane-materialization-race.test.ts b/src/main/ipc/pty-pane-materialization-race.test.ts
index b04e02587eb4..4b9c77f5939f 100644
--- a/src/main/ipc/pty-pane-materialization-race.test.ts
+++ b/src/main/ipc/pty-pane-materialization-race.test.ts
@@ -390,6 +390,12 @@ describe('registerPtyHandlers', () => {
     expect(rendererResult).toEqual({ id: 'pty-renderer' })
     expect(runtimeResult).toEqual({
       id: 'pty-renderer',
+      isReattach: true,
+      launchAgent: undefined,
+      launchToken: undefined,
+      resumeProviderSession: undefined,
+      snapshotKittyKeyboardFlags: undefined,
+      wslDistro: undefined,
       stablePaneOwner: {
         handle: 'term_trusted',
         tabId: 'tab-race',
diff --git a/src/main/runtime/cli-terminal-create-host-session-binding.test.ts b/src/main/runtime/cli-terminal-create-host-session-binding.test.ts
index 96c9d85ed87e..d0ec13264909 100644
--- a/src/main/runtime/cli-terminal-create-host-session-binding.test.ts
+++ b/src/main/runtime/cli-terminal-create-host-session-binding.test.ts
@@ -94,8 +94,8 @@ it.each(['refused', 'adopted', 'stable-adopted', 'ensure-adopted', 'fresh-unavai
       tabId: 'owner-tab',
       leafId: '11111111-1111-4111-8111-111111111111'
     }
-    if (adopted) {
-      // The lower adopter registers its owner before returning the result.
+    if (adopted && kind !== 'adopted') {
+      // An adopted surface is registered; a bare provider reattach need not be.
       runtime.registerPty('effective-pty', ownerSurface.worktreeId, null, {
         tabId: ownerSurface.tabId,
         leafId: ownerSurface.leafId,
@@ -210,6 +210,11 @@ it.each(['refused', 'adopted', 'stable-adopted', 'ensure-adopted', 'fresh-unavai
         : {}),
       warning: expect.any(String)
     })
+    expect(runtime.resolveTerminalPane(result.paneKey ?? '', result.worktreeId)).toMatchObject({
+      handle: result.handle,
+      ptyId: 'effective-pty',
+      connected: true
+    })
     expect(result.agentResumeRefused).toBe(kind === 'refused' ? 'chat-home' : undefined)
     expect(result.launchAgent).toBe(kind === 'refused' ? undefined : 'codex')
     expect(result.launchConfig).toEqual(kind === 'refused' ? undefined : config)
diff --git a/src/main/runtime/terminal/launch/terminal-create.ts b/src/main/runtime/terminal/launch/terminal-create.ts
index 7382082c410a..b9e6739a41d5 100644
--- a/src/main/runtime/terminal/launch/terminal-create.ts
+++ b/src/main/runtime/terminal/launch/terminal-create.ts
@@ -222,7 +222,8 @@ export abstract class OrcaRuntimeWithCreateTerminal extends OrcaRuntimeWithTermi
           paneKey = dependencies.makePaneKey(tabId, leafId)
         }
         this.assertCreatedPtyRegistrationAllowed(result.id, result.incarnationId)
-        if (!launch.adoptedStablePane) {
+        // Provider reattachment still needs this runtime's handle and workspace binding.
+        if (!result.stablePaneOwner) {
           this.registerPreAllocatedHandleForPty(result.id, preAllocatedHandle)
           if (result.wslDistro) {
             this.preparePtyExecutionContext(result.id, result.wslDistro)

From 626429d6fc2dbcb90d79be45f4092a9456353066 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Wed, 21 Oct 2026 23:56:04 -0700
Subject: [PATCH 038/207] test: check the terminal return fixture session shape

---
 ...li-chat-resume-exit-return.test-fixture.ts | 69 ++++++++++++++++---
 1 file changed, 60 insertions(+), 9 deletions(-)

diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-exit-return.test-fixture.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-exit-return.test-fixture.ts
index e825f51a647b..22a8b236866a 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-exit-return.test-fixture.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-exit-return.test-fixture.ts
@@ -1,4 +1,10 @@
 import { expect, vi } from 'vitest'
+import { Terminal } from '@xterm/xterm'
+import { FitAddon } from '@xterm/addon-fit'
+import { SearchAddon } from '@xterm/addon-search'
+import { SerializeAddon } from '@xterm/addon-serialize'
+import { PaneManager } from '@/lib/pane-manager/pane-manager'
+import { isTerminalLeafId } from '../../../../shared/stable-pane-id'
 import { useAppStore } from '@/store'
 import {
   makeTerminalTab,
@@ -18,8 +24,6 @@ import { installSleepingRecordAccess } from '../terminal-pane/pty-connection/sle
 import type { ConnectPanePtySession } from '../terminal-pane/pty-connection/connect-pane-pty-session'
 import {
   createMockTransport,
-  createPane,
-  createManager,
   LEAF_1,
   LEAF_2
 } from '../terminal-pane/pty-connection-test-pane-fixtures'
@@ -103,16 +107,61 @@ export async function verifyExitedPaneHistoryReturn(
     agentEvidence: 'process-read',
     shellForeground: false
   })
-  // SAFETY: these installers exercise only the real process-exit cleanup, with inert terminal I/O.
-  const connection = {
+  if (!isTerminalLeafId(LEAF_1)) {
+    throw new Error('Expected a valid fixture leaf ID')
+  }
+  const terminal = new Terminal({ cols: 120, rows: 40 })
+  const manager = new PaneManager(document.createElement('div'), { linkOpenHint: () => '' })
+  const connection: ConnectPanePtySession = {
     cacheKey: paneKey,
-    pane: createPane(1),
-    manager: createManager(1),
-    deps: { tabId: 'shell', worktreeId: 'wt-1' },
-    transport: createMockTransport('pty-1'),
+    pane: {
+      id: 1,
+      leafId: LEAF_1,
+      stablePaneId: LEAF_1,
+      terminal,
+      container: document.createElement('div'),
+      linkTooltip: document.createElement('div'),
+      fitAddon: new FitAddon(),
+      searchAddon: new SearchAddon(),
+      serializeAddon: new SerializeAddon()
+    },
+    manager,
+    deps: {
+      tabId: 'shell',
+      worktreeId: 'wt-1',
+      mountFollowsTerminalPark: false,
+      paneTransportsRef: { current: new Map() },
+      paneMode2031Ref: { current: new Map() },
+      paneKittyKeyboardModesRef: { current: new Map() },
+      paneLastThemeModeRef: { current: new Map() },
+      replayingPanesRef: { current: new Map() },
+      isActiveRef: { current: true },
+      isVisibleRef: { current: true },
+      onPtyExitRef: { current: vi.fn() },
+      onAgentExitedRef: { current: vi.fn() },
+      clearTabPtyId: vi.fn(),
+      consumeSuppressedPtyExit: vi.fn(() => false),
+      isPtyShutdownPending: vi.fn(() => false),
+      updateTabTitle: vi.fn(),
+      setRuntimePaneTitle: vi.fn(),
+      clearRuntimePaneTitle: vi.fn(),
+      updateTabPtyId: vi.fn(),
+      markTerminalBell: vi.fn(),
+      onShowSessionRestoredBanner: vi.fn(),
+      dispatchNotification: vi.fn(),
+      setCacheTimerStartedAt: vi.fn(),
+      syncPanePtyLayoutBinding: vi.fn(),
+      clearExitedPanePtyLayoutBinding: vi.fn()
+    },
+    transport: {
+      ...createMockTransport('pty-1'),
+      connect: vi.fn(async () => {}),
+      isConnected: vi.fn(() => true)
+    },
+    hiddenOutputRestoreUnhideSeq: null,
     paneStartup: null,
     writeInputModeGround: vi.fn()
-  } as unknown as ConnectPanePtySession
+  }
   installSleepingRecordAccess(connection)
   installPaneAgentIdentity(connection)
   connection.paneForegroundAgentTracker.onProcessExitConfirmed({
@@ -245,5 +294,7 @@ export async function verifyExitedPaneHistoryReturn(
     window.removeEventListener(CLOSE_TERMINAL_PANE_EVENT, closed)
     connection.paneForegroundAgentTracker.dispose()
     connection.commandLifecycle.dispose()
+    manager.destroy()
+    terminal.dispose()
   }
 }

From d69cbec211294a48d1a7d767275f273cc4807711 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Thu, 22 Oct 2026 00:12:50 -0700
Subject: [PATCH 039/207] test: correct terminal return transport fixture
 typing

---
 ...li-chat-resume-exit-return.test-fixture.ts | 13 +++--------
 .../cli-chat-resume-transport.test-fixture.ts | 23 +++++++++++++++++++
 .../src/i18n/en-runtime-required.json         | 11 +++++++--
 3 files changed, 35 insertions(+), 12 deletions(-)
 create mode 100644 src/renderer/src/components/tab-bar/cli-chat-resume-transport.test-fixture.ts

diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-exit-return.test-fixture.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-exit-return.test-fixture.ts
index 22a8b236866a..ab0001e8b571 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-exit-return.test-fixture.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-exit-return.test-fixture.ts
@@ -22,11 +22,8 @@ import { switchAiVaultSessionToNativeChat } from '../right-sidebar/ai-vault-sess
 import { installPaneAgentIdentity } from '../terminal-pane/pty-connection/pane-agent-identity'
 import { installSleepingRecordAccess } from '../terminal-pane/pty-connection/sleeping-record-access'
 import type { ConnectPanePtySession } from '../terminal-pane/pty-connection/connect-pane-pty-session'
-import {
-  createMockTransport,
-  LEAF_1,
-  LEAF_2
-} from '../terminal-pane/pty-connection-test-pane-fixtures'
+import { LEAF_1, LEAF_2 } from '../terminal-pane/pty-connection-test-pane-fixtures'
+import { createExitReturnTransport } from './cli-chat-resume-transport.test-fixture'
 import type { AiVaultSession } from '../../../../shared/ai-vault-types'
 import { CLOSE_TERMINAL_PANE_EVENT, type CloseTerminalPaneDetail } from '@/constants/terminal'
 
@@ -153,11 +150,7 @@ export async function verifyExitedPaneHistoryReturn(
       syncPanePtyLayoutBinding: vi.fn(),
       clearExitedPanePtyLayoutBinding: vi.fn()
     },
-    transport: {
-      ...createMockTransport('pty-1'),
-      connect: vi.fn(async () => {}),
-      isConnected: vi.fn(() => true)
-    },
+    transport: createExitReturnTransport('pty-1'),
     hiddenOutputRestoreUnhideSeq: null,
     paneStartup: null,
     writeInputModeGround: vi.fn()
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-transport.test-fixture.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-transport.test-fixture.ts
new file mode 100644
index 000000000000..a8d06fbe46d2
--- /dev/null
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-transport.test-fixture.ts
@@ -0,0 +1,23 @@
+import { vi } from 'vitest'
+import type { PtyTransport } from '../terminal-pane/pty-transport-types'
+
+export function createExitReturnTransport(initialPtyId: string): PtyTransport {
+  let ptyId: string | null = initialPtyId
+  return {
+    attach: vi.fn(({ existingPtyId }: { existingPtyId: string }) => {
+      ptyId = existingPtyId
+    }),
+    connect: vi.fn(async () => {}),
+    disconnect: vi.fn(() => {
+      ptyId = null
+    }),
+    sendInput: vi.fn(() => true),
+    sendInputImmediate: vi.fn(() => true),
+    sendInputAccepted: vi.fn(async () => true),
+    claimViewport: vi.fn(() => true),
+    resize: vi.fn(() => true),
+    isConnected: vi.fn(() => true),
+    getPtyId: vi.fn(() => ptyId),
+    getConnectionId: vi.fn(() => null)
+  }
+}
diff --git a/src/renderer/src/i18n/en-runtime-required.json b/src/renderer/src/i18n/en-runtime-required.json
index e3a956f39c68..da916b8299cd 100644
--- a/src/renderer/src/i18n/en-runtime-required.json
+++ b/src/renderer/src/i18n/en-runtime-required.json
@@ -3084,6 +3084,8 @@
         "compactionFailed": "Compaction failed.",
         "compactionFailedQuoted": "Compaction failed: {{detail}}.",
         "compactionUnconfirmed": "Compaction completion is unconfirmed.",
+        "conversationOpenElsewhere": "Codex still has this conversation open somewhere else. Close it there, then try again.",
+        "conversationOpenInTerminal": "Orca can't confirm {{agent}} has exited in its terminal. Stop what's running there or close the terminal, then try again.",
         "couldNotRestart": "{{agent}} couldn't restart.",
         "couldNotStart": "{{agent}} couldn't start.",
         "couldNotStop": "Couldn't stop {{agent}}.",
@@ -3121,8 +3123,6 @@
         "runCommandAgain": "Run /{{command}} again.",
         "runCommandWhenDone": "Run /{{command}} when it's done.",
         "runtimeNotInstalled": "{{agent}} isn't installed on the computer running this chat. Install it from the chat in a current version of Orca.",
-        "conversationOpenElsewhere": "Codex still has this conversation open somewhere else. Close it there, then try again.",
-        "conversationOpenInTerminal": "Orca can't confirm {{agent}} has exited in its terminal. Stop what's running there or close the terminal, then try again.",
         "sendAgainToTryOnceMore": "Send your message again to try once more.",
         "sendToTryAgain": "Send your message to try again.",
         "sessionNotRestored": "{{agent}} couldn't reopen its earlier session, so this chat continues in a new one. {{agent}} doesn't remember the earlier messages.",
@@ -3325,6 +3325,13 @@
         }
       }
     },
+    "tab": {
+      "bar": {
+        "SortableTabContextMenu": {
+          "closeTabsToLeft": "Close All Tabs To The Left"
+        }
+      }
+    },
     "workspace": {
       "cleanup": {
         "browse": {

From 8dc0318ee9947b0e47bd745622484b72aa83e52e Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Thu, 22 Oct 2026 00:22:19 -0700
Subject: [PATCH 040/207] test: name the portable CLI resume mock contract

---
 .../tab-bar/cli-chat-resume-run.test.ts       | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
index b5b6cfb816b8..239eda206dfe 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
@@ -1,12 +1,28 @@
 // @vitest-environment happy-dom
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vitest'
 import type { CliChatResumeSource } from './cli-chat-resume-source'
 import type * as ResumeSourceModule from './cli-chat-resume-source'
 import type * as RuntimeRpcModule from '@/runtime/runtime-rpc-client'
 import type { AgentSessionWireRefusal } from '../../../../shared/agent-session-wire'
 import type { StructuredAgentSessionCreateParams } from '../../../../shared/structured-agent-session-create'
 
-const mocks = vi.hoisted(() => {
+export type CliChatResumeTestMocks = {
+  source: CliChatResumeSource | null
+  realSource: boolean
+  sourceCapability: Mock
+  createCapability: Mock
+  call: Mock
+  toast: Mock
+  success: Mock
+  activate: Mock<() => Promise<boolean>>
+  activateVerified: Mock<() => Promise<string>>
+  switchCapability: Mock<() => Promise<boolean>>
+  exitWatchers: Map<string, () => void>
+  rpc: Mock<(...args: unknown[]) => Promise<object>>
+  inspect: Mock<(ptyId: string) => Promise<{ foregroundProcessEvidence?: unknown }>>
+}
+
+const mocks: CliChatResumeTestMocks = vi.hoisted(() => {
   const state: { source: CliChatResumeSource | null } = { source: null }
   return {
     ...state,
@@ -24,7 +40,6 @@ const mocks = vi.hoisted(() => {
     inspect: vi.fn(async (_ptyId: string): Promise<{ foregroundProcessEvidence?: unknown }> => ({}))
   }
 })
-export type CliChatResumeTestMocks = typeof mocks
 
 vi.mock('@/runtime/runtime-terminal-inspection', () => ({
   inspectRuntimeTerminalProcess: mocks.inspect

From 7177cc1532917aeb9a358c38c908f2444910c646 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Thu, 22 Oct 2026 01:22:11 -0700
Subject: [PATCH 041/207] fix: show conversation switches only with Chat UI
 enabled

---
 .../NativeChatTopRightControls.tsx            |  4 +-
 .../AiVaultSessionActionMenuItems.tsx         | 27 ++++----
 .../AiVaultSessionDetailsSwitchButtons.tsx    |  8 ++-
 .../ai-vault-history-native-return.test.tsx   |  1 +
 .../tab-bar/CliChatResumeMenuItems.tsx        |  4 +-
 .../tab-bar/NativeChatCliForkMenuItems.tsx    |  4 +-
 .../TabSessionSurfaceSwitchMenuItems.test.tsx |  3 +-
 .../tab-bar/TabSessionSwitchHoverAction.tsx   |  5 ++
 .../TerminalPaneResumeInChatButton.test.tsx   | 66 +++++++++++++++----
 .../TerminalPaneResumeInChatButton.tsx        |  7 +-
 10 files changed, 101 insertions(+), 28 deletions(-)

diff --git a/src/renderer/src/components/native-chat/NativeChatTopRightControls.tsx b/src/renderer/src/components/native-chat/NativeChatTopRightControls.tsx
index d37d5477a87c..1a8db3af1e9b 100644
--- a/src/renderer/src/components/native-chat/NativeChatTopRightControls.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatTopRightControls.tsx
@@ -1,3 +1,4 @@
+import { isNativeChatEnabled } from '../../../../shared/structured-native-chat-launch-route'
 import { SquareTerminal } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
@@ -40,10 +41,11 @@ export function NativeChatTopRightControls({
   const agent = AI_VAULT_AGENTS.find((candidate) => candidate === session.agent)
   const inPlace = useInPlaceSwitchCapability(hostId, agent)
   const pending = useNativeChatCliSwitchPending(session.sessionId)
+  const enabled = useAppStore((state) => isNativeChatEnabled(state.settings))
   if (find.isOpen) {
     return <NativeChatFindBar find={find} isVisible={session.isVisible} />
   }
-  if (!worktreeId || !hostId || !agent || (inPlace === false && agent !== 'omp')) {
+  if (!enabled || !worktreeId || !hostId || !agent || (inPlace === false && agent !== 'omp')) {
     return null
   }
   const label = translate('components.tab.bar.switch.toCli', 'Switch to CLI')
diff --git a/src/renderer/src/components/right-sidebar/AiVaultSessionActionMenuItems.tsx b/src/renderer/src/components/right-sidebar/AiVaultSessionActionMenuItems.tsx
index 4642d7ca8611..386caa1e5eb8 100644
--- a/src/renderer/src/components/right-sidebar/AiVaultSessionActionMenuItems.tsx
+++ b/src/renderer/src/components/right-sidebar/AiVaultSessionActionMenuItems.tsx
@@ -15,6 +15,8 @@ import { translate } from '@/i18n/i18n'
 import { AiVaultSessionSurfaceSwitchMenuItems } from './AiVaultSessionSurfaceSwitchMenuItems'
 import type { AiVaultAgent } from '../../../../shared/ai-vault-types'
 import { isAiVaultFolderWorkspaceId } from './ai-vault-session-worktree-affordances'
+import { useAppStore } from '@/store'
+import { isNativeChatEnabled } from '../../../../shared/structured-native-chat-launch-route'
 
 export function SessionActionMenuItems({
   menuKind = 'dropdown',
@@ -67,6 +69,8 @@ export function SessionActionMenuItems({
   switchLoading?: boolean
   inPlaceAgent?: AiVaultAgent
 }) {
+  const enabled = useAppStore((state) => isNativeChatEnabled(state.settings))
+  const showSurfaceActions = enabled || (inPlaceAgent === undefined && !switchLoading)
   const Item = menuKind === 'context' ? ContextMenuItem : DropdownMenuItem
   const Separator = menuKind === 'context' ? ContextMenuSeparator : DropdownMenuSeparator
   const hasLocalPathActions = Boolean(onOpenLog || onRevealLog || onOpenCwd)
@@ -75,8 +79,7 @@ export function SessionActionMenuItems({
     onJumpToOriginalPane ||
     showJumpToWorktree ||
     !resumeHidden ||
-    onResumeInNewChat ||
-    onResumeInNewCli ||
+    (showSurfaceActions && (onResumeInNewChat || onResumeInNewCli)) ||
     onCopyResume
   )
   const deleteLabel = translate('auto.components.right.sidebar.AiVaultSessionRow.delete', 'Delete')
@@ -125,15 +128,17 @@ export function SessionActionMenuItems({
           {resumeLabel}
         </Item>
       ) : null}
-      <AiVaultSessionSurfaceSwitchMenuItems
-        action="resume"
-        menuKind={menuKind}
-        tooltipSide={menuKind === 'context' ? 'right' : 'left'}
-        onResumeInNewChat={onResumeInNewChat}
-        onResumeInNewCli={onResumeInNewCli}
-        inPlaceAgent={inPlaceAgent}
-        switchLoading={switchLoading}
-      />
+      {showSurfaceActions ? (
+        <AiVaultSessionSurfaceSwitchMenuItems
+          action="resume"
+          menuKind={menuKind}
+          tooltipSide={menuKind === 'context' ? 'right' : 'left'}
+          onResumeInNewChat={onResumeInNewChat}
+          onResumeInNewCli={onResumeInNewCli}
+          inPlaceAgent={inPlaceAgent}
+          switchLoading={switchLoading}
+        />
+      ) : null}
       {onCopyResume ? (
         <Item onSelect={onCopyResume}>
           <Copy className="size-3.5" />
diff --git a/src/renderer/src/components/right-sidebar/AiVaultSessionDetailsSwitchButtons.tsx b/src/renderer/src/components/right-sidebar/AiVaultSessionDetailsSwitchButtons.tsx
index a871edbd9546..92b8a385d72f 100644
--- a/src/renderer/src/components/right-sidebar/AiVaultSessionDetailsSwitchButtons.tsx
+++ b/src/renderer/src/components/right-sidebar/AiVaultSessionDetailsSwitchButtons.tsx
@@ -1,3 +1,5 @@
+import { useAppStore } from '@/store'
+import { isNativeChatEnabled } from '../../../../shared/structured-native-chat-launch-route'
 import { MessagesSquare, SquareTerminal } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
@@ -15,10 +17,14 @@ export function AiVaultSessionDetailsSwitchButtons({
   session: Pick<AiVaultSession, 'agent' | 'executionHostId'>
   onResumeInNewChat?: () => void
   onResumeInNewCli?: () => void
-}): React.JSX.Element {
+}): React.JSX.Element | null {
   const inPlaceAgent = useAiVaultInPlaceAgent(session)
   const switchLoading =
     useInPlaceSwitchCapability(session.executionHostId, session.agent) === undefined
+  const enabled = useAppStore((state) => isNativeChatEnabled(state.settings))
+  if (!enabled && (inPlaceAgent !== undefined || switchLoading)) {
+    return null
+  }
   return (
     <>
       {onResumeInNewChat ? (
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx b/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx
index d88e429ccfb1..9444e2e6a035 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx
+++ b/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx
@@ -155,6 +155,7 @@ beforeEach(async () => {
     }
   })
   useAppStore.setState(useAppStore.getInitialState(), true)
+  useAppStore.setState({ settings: createGlobalSettingsFixture({ experimentalNativeChat: true }) })
   setLocalRuntimeCapabilitiesForTests([HISTORY])
   await refreshLocalRuntimeCapabilities()
   mocks.owner.mockReturnValue('local')
diff --git a/src/renderer/src/components/tab-bar/CliChatResumeMenuItems.tsx b/src/renderer/src/components/tab-bar/CliChatResumeMenuItems.tsx
index 168e6c7659d2..dfc25f1f9cd4 100644
--- a/src/renderer/src/components/tab-bar/CliChatResumeMenuItems.tsx
+++ b/src/renderer/src/components/tab-bar/CliChatResumeMenuItems.tsx
@@ -1,3 +1,4 @@
+import { isNativeChatEnabled } from '../../../../shared/structured-native-chat-launch-route'
 import { useShallow } from 'zustand/react/shallow'
 import { useAppStore } from '@/store'
 import { DropdownMenuSeparator } from '@/components/ui/dropdown-menu'
@@ -18,7 +19,8 @@ export function CliChatResumeMenuItems({
   const source = useAppStore(useShallow((state) => resolveCliChatResumeSource(state, { tab })))
   const capability = useCliChatResumeCapability(tab.worktreeId, source?.agent)
   const pending = useCliChatResumePending(source)
-  if (!source) {
+  const enabled = useAppStore((state) => isNativeChatEnabled(state.settings))
+  if (!source || (!enabled && capability !== false)) {
     return null
   }
   return (
diff --git a/src/renderer/src/components/tab-bar/NativeChatCliForkMenuItems.tsx b/src/renderer/src/components/tab-bar/NativeChatCliForkMenuItems.tsx
index 9af7d09d2d22..09372f5561ae 100644
--- a/src/renderer/src/components/tab-bar/NativeChatCliForkMenuItems.tsx
+++ b/src/renderer/src/components/tab-bar/NativeChatCliForkMenuItems.tsx
@@ -1,3 +1,4 @@
+import { isNativeChatEnabled } from '../../../../shared/structured-native-chat-launch-route'
 import { useState } from 'react'
 import { DropdownMenuSeparator } from '@/components/ui/dropdown-menu'
 import { useAppStore } from '@/store'
@@ -32,7 +33,8 @@ export function NativeChatCliForkMenuItems({
   const commandOverrides = useAppStore((state) => state.settings?.agentCmdOverrides)
   const agent = AI_VAULT_AGENTS.find((candidate) => candidate === nativeChat.agent)
   const inPlace = useInPlaceSwitchCapability(chat?.request.executionHostScope, agent)
-  if (!chat || !agent) {
+  const enabled = useAppStore((state) => isNativeChatEnabled(state.settings))
+  if (!chat || !agent || (!enabled && inPlace !== false)) {
     return null
   }
   return (
diff --git a/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx b/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx
index e10e7dcbfe5a..3b7feed815d0 100644
--- a/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx
+++ b/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx
@@ -40,7 +40,8 @@ vi.mock('./native-chat-cli-fork-run', () => ({
 
 vi.mock('@/store', () => ({
   useAppStore: Object.assign(
-    (selector: (state: Record<string, unknown>) => unknown) => selector({ settings: null }),
+    (selector: (state: Record<string, unknown>) => unknown) =>
+      selector({ settings: { experimentalNativeChat: true } }),
     { getState: () => ({}) }
   )
 }))
diff --git a/src/renderer/src/components/tab-bar/TabSessionSwitchHoverAction.tsx b/src/renderer/src/components/tab-bar/TabSessionSwitchHoverAction.tsx
index 47c2fb5b8310..6f1b9555cdba 100644
--- a/src/renderer/src/components/tab-bar/TabSessionSwitchHoverAction.tsx
+++ b/src/renderer/src/components/tab-bar/TabSessionSwitchHoverAction.tsx
@@ -1,3 +1,4 @@
+import { isNativeChatEnabled } from '../../../../shared/structured-native-chat-launch-route'
 import { useState } from 'react'
 import { useShallow } from 'zustand/react/shallow'
 import { MessagesSquare, SquareTerminal } from 'lucide-react'
@@ -22,6 +23,10 @@ export function TabSessionSwitchHoverAction({
   tab: { id: string; worktreeId: string }
   nativeChat?: NativeChatTabSession
 }): React.JSX.Element | null {
+  const enabled = useAppStore((state) => isNativeChatEnabled(state.settings))
+  if (!enabled) {
+    return null
+  }
   return nativeChat ? (
     <ChatSwitchAction tab={tab} nativeChat={nativeChat} />
   ) : (
diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.test.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.test.tsx
index fca1d1d8b496..87a929374db0 100644
--- a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.test.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.test.tsx
@@ -1,7 +1,15 @@
 // @vitest-environment happy-dom
-import { cleanup, fireEvent, render, screen } from '@testing-library/react'
+import { act, cleanup, fireEvent, render, screen } from '@testing-library/react'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import { TooltipProvider } from '@/components/ui/tooltip'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuTrigger
+} from '@/components/ui/dropdown-menu'
+import { useAppStore } from '@/store'
+import { createGlobalSettingsFixture } from '../../../../shared/global-settings-test-fixture'
+import { CliChatResumeMenuItems } from '../tab-bar/CliChatResumeMenuItems'
 import type { CliChatResumeSource } from '../tab-bar/cli-chat-resume-source'
 import { TerminalPaneResumeInChatButton } from './TerminalPaneResumeInChatButton'
 
@@ -15,15 +23,8 @@ const mocks = vi.hoisted(() => {
     executionHostId: 'local',
     ptyId: 'pty-1'
   }
-  return { source, resolve: vi.fn(), run: vi.fn(), pending: false, running: true }
+  return { source, resolve: vi.fn(), run: vi.fn(), pending: false }
 })
-vi.mock('@/store', () => ({
-  useAppStore: (selector: (state: Record<string, unknown>) => unknown) =>
-    selector({
-      paneForegroundAgentByPaneKey: {},
-      agentStatusByPaneKey: mocks.running ? { 'tab-1:leaf': 'working' } : {}
-    })
-}))
 vi.mock('../tab-bar/cli-chat-resume-source', () => ({
   useCliChatResumeCapability: (_worktreeId: string, agent: string) => agent === 'codex',
   resolveCliChatResumeSource: (_state: unknown, args: unknown) => {
@@ -39,7 +40,8 @@ afterEach(cleanup)
 beforeEach(() => {
   mocks.source.agent = 'claude'
   mocks.pending = false
-  mocks.running = true
+  useAppStore.setState(useAppStore.getInitialState(), true)
+  useAppStore.setState({ settings: createGlobalSettingsFixture({ experimentalNativeChat: true }) })
   vi.clearAllMocks()
 })
 
@@ -48,7 +50,9 @@ it.each([
   ['codex', 'Switch to native chat']
 ] as const)('offers the %s action for the exact pane and shares pending', (agent, label) => {
   mocks.source.agent = agent
-  mocks.running = agent === 'claude'
+  if (agent === 'claude') {
+    useAppStore.getState().setPaneForegroundAgent('tab-1:leaf', { agent, shellForeground: false })
+  }
   const { rerender } = render(
     <TooltipProvider>
       <TerminalPaneResumeInChatButton tabId="tab-1" worktreeId="wt-1" paneKey="tab-1:leaf" />
@@ -69,3 +73,43 @@ it.each([
   expect(screen.getByRole('button').getAttribute('aria-busy')).toBe('true')
   expect(screen.getByRole('button').hasAttribute('disabled')).toBe(true)
 })
+
+it('hides header and menu switches while Chat UI is off and follows live setting changes', () => {
+  mocks.source.agent = 'codex'
+  useAppStore.setState({ settings: createGlobalSettingsFixture({ experimentalNativeChat: false }) })
+  render(
+    <TooltipProvider>
+      <TerminalPaneResumeInChatButton tabId="tab-1" worktreeId="wt-1" paneKey="tab-1:leaf" />
+      <DropdownMenu open>
+        <DropdownMenuTrigger>Open</DropdownMenuTrigger>
+        <DropdownMenuContent>
+          <CliChatResumeMenuItems tab={{ id: 'tab-1', worktreeId: 'wt-1' }} leadingSeparator />
+        </DropdownMenuContent>
+      </DropdownMenu>
+    </TooltipProvider>
+  )
+  expect(screen.queryByRole('button', { name: 'Switch to native chat' })).toBeNull()
+  expect(screen.queryByRole('menuitem')).toBeNull()
+  act(() => {
+    useAppStore.getState().setPaneForegroundAgent('tab-1:leaf', {
+      agent: 'codex',
+      shellForeground: false
+    })
+  })
+  expect(screen.queryByRole('button', { name: 'Switch to native chat', hidden: true })).toBeNull()
+  expect(screen.queryByRole('menuitem')).toBeNull()
+  act(() => {
+    useAppStore.setState({
+      settings: createGlobalSettingsFixture({ experimentalNativeChat: true })
+    })
+  })
+  expect(screen.getByRole('button', { name: 'Switch to native chat', hidden: true })).toBeTruthy()
+  expect(screen.getByRole('menuitem', { name: 'Switch to native chat' })).toBeTruthy()
+  act(() => {
+    useAppStore.setState({
+      settings: createGlobalSettingsFixture({ experimentalNativeChat: false })
+    })
+  })
+  expect(screen.queryByRole('button', { name: 'Switch to native chat', hidden: true })).toBeNull()
+  expect(screen.queryByRole('menuitem')).toBeNull()
+})
diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx
index 023c2c0d3736..f574cfebcb78 100644
--- a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx
@@ -1,3 +1,4 @@
+import { isNativeChatEnabled } from '../../../../shared/structured-native-chat-launch-route'
 import { useShallow } from 'zustand/react/shallow'
 import { MessagesSquare } from 'lucide-react'
 import { Button } from '@/components/ui/button'
@@ -19,7 +20,7 @@ export function TerminalPaneResumeInChatButton({
   tabId: string
   worktreeId: string
   paneKey: string
-}): React.JSX.Element {
+}): React.JSX.Element | null {
   const source = useAppStore(
     useShallow((state) =>
       resolveCliChatResumeSource(state, { tab: { id: tabId, worktreeId }, paneKey })
@@ -35,6 +36,10 @@ export function TerminalPaneResumeInChatButton({
     )
   })
   const pending = useCliChatResumePending(source)
+  const enabled = useAppStore((state) => isNativeChatEnabled(state.settings))
+  if (!enabled && capability !== false) {
+    return null
+  }
   const label =
     capability === false
       ? translate(

From 9b29e7dcbd50c6ff149e6f6d2f9bbd9fee6ad800 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Thu, 22 Oct 2026 03:55:14 -0700
Subject: [PATCH 042/207] Check unavailable-resume test fixture types

---
 .../pty-connection-cold-restore-agent-resume.spec.ts            | 2 +-
 .../components/terminal-pane/pty-connection-test-store-state.ts | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/renderer/src/components/terminal-pane/pty-connection-cold-restore-agent-resume.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection-cold-restore-agent-resume.spec.ts
index f0bd0a8d6cda..41ef4000de4e 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-cold-restore-agent-resume.spec.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-cold-restore-agent-resume.spec.ts
@@ -382,7 +382,7 @@ export function registerPtyConnectionColdRestoreAgentResumeTests(): void {
             updatedAt: 1
           }
         }
-      } as StoreState
+      }
 
       const pane = createPane(1)
       const manager = createManager(1)
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-test-store-state.ts b/src/renderer/src/components/terminal-pane/pty-connection-test-store-state.ts
index eda161456bac..c89990da68e2 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-test-store-state.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-test-store-state.ts
@@ -102,6 +102,7 @@ export type StoreState = {
   removeDeferredSshSessionId: ReturnType<typeof vi.fn>
   consumePendingColdRestore: ReturnType<typeof vi.fn>
   consumePendingSnapshot: ReturnType<typeof vi.fn>
+  consumeTabStartupCommand?: ReturnType<typeof vi.fn>
   runtimePaneTitlesByTabId: Record<string, Record<number, string>>
   agentStatusByPaneKey: Record<string, unknown>
   retainedAgentsByPaneKey: Record<string, { agentType: AgentType }>

From 65339e36c9cfd5827a3c77b8259e5b774569490b Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Thu, 22 Oct 2026 04:14:22 -0700
Subject: [PATCH 043/207] Complete sidebar resume test store fixture

---
 .../src/lib/sleeping-agent-session-launch-layout-owner.test.ts   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/renderer/src/lib/sleeping-agent-session-launch-layout-owner.test.ts b/src/renderer/src/lib/sleeping-agent-session-launch-layout-owner.test.ts
index 7725700d97ad..4bcc6f7015c8 100644
--- a/src/renderer/src/lib/sleeping-agent-session-launch-layout-owner.test.ts
+++ b/src/renderer/src/lib/sleeping-agent-session-launch-layout-owner.test.ts
@@ -22,6 +22,7 @@ vi.mock('@/store', () => ({
       sshConnectionStates: new Map(),
       sshStateByEnvironment: new Map(),
       runtimeStatusByEnvironmentId: new Map(),
+      agentStatusByPaneKey: {},
       tabsByWorktree: { 'wt-1': [{ id: 'tab-1' }] },
       openFiles: [],
       browserTabsByWorktree: {},

From 6d1fd572e424af5339648227065335ee2dda858c Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Thu, 22 Oct 2026 11:23:24 -0700
Subject: [PATCH 044/207] fix: complete original terminal owner retirement

---
 ...profile-state-delayed-authority-fixture.ts |   2 +-
 .../layout-command-persistence.ts             |  64 +++++
 .../original-terminal-close-store.test.ts     | 130 ++++++++++
 .../mobile-session-tab-close-outcome.ts       |  19 ++
 .../mobile-session-terminal-retirement.ts     |   2 +
 ...ca-runtime-original-terminal-close.test.ts | 196 ++++++++++++++
 src/main/runtime/orca-runtime.ts              |  27 +-
 .../terminal/terminal-lifecycle-methods.ts    |  10 +-
 src/main/runtime/runtime-layout-apply.ts      |  10 +-
 src/main/runtime/runtime-notifier-contract.ts |   7 +-
 .../session-graph/session-window-graph.ts     |   2 +-
 .../close/close-mobile-row-in-main-layout.ts  |  11 +
 .../close/close-mobile-session-tab.ts         |  55 ++--
 ...ld-headless-mobile-session-browser-tabs.ts | 241 +++++++++--------
 .../prune-mobile-session-tab-group-layout.ts  |   7 +-
 .../explicit-terminal-close-pty-stops.ts      |  86 ++++---
 .../explicit-terminal-close-stops.ts          | 219 ++++++++--------
 .../explicit-terminal-tab-close.ts            |  90 +++++++
 .../paired-host-terminal-close.ts             |  23 +-
 .../terminal-surface-close-commit.ts          | 153 +++++++++++
 .../runtime/terminal-intentional-stops.ts     |   5 +-
 src/main/runtime/terminal-surface-close.ts    |  61 ++++-
 .../identity/terminal-handle-bindings.ts      |  19 +-
 .../terminal/launch/failed-start-pane.ts      |  26 ++
 .../lifecycle/floating-session-liveness.ts    |   7 +-
 .../output/provider-buffer-capture.ts         |  21 ++
 .../terminal/query/pty-terminal-summary.ts    |   9 +
 .../recovery/resolve-terminal-pane.ts         |  75 ++++--
 ...ession-terminal-tab-retirement-identity.ts |  64 +++++
 .../terminal-tab-close-request-relay.ts       |   7 +-
 ...li-chat-resume-exit-return.test-fixture.ts |  39 +--
 .../tab-bar/cli-chat-resume-feedback.ts       |   2 +-
 .../cli-chat-resume-mocks.test-fixture.ts     |  18 ++
 ...t-resume-parked-retirement.test-fixture.ts |  66 +++++
 .../tab-bar/cli-chat-resume-run.test.ts       | 121 +++++----
 .../components/tab-bar/cli-chat-resume-run.ts | 221 +++++++---------
 .../tab-bar/cli-chat-resume-source.ts         |   7 +-
 .../tab-session-history-switch.test.ts        |  52 +++-
 .../terminal-pane-lifecycle-close.ts          |  11 +-
 .../terminal-pane-mount-cleanup.ts            |  45 ++--
 .../terminal-pane-mount-context.ts            |   3 +-
 .../terminal-pane-mount-preparation.ts        |  21 +-
 .../terminal-pane-mount-registration.ts       |  59 +++++
 .../terminal-pane-pane-closed.ts              |  16 +-
 .../terminal-parked-watcher-registry.ts       |  49 ++++
 ...al-presentation-retirement.test-fixture.ts | 212 +++++++++++++++
 .../terminal-presentation-retirement.test.ts  | 243 ++++++++++++++++++
 .../terminal-presentation-retirement.ts       |  79 ++++++
 .../use-terminal-pane-mount-lifecycle.ts      |  58 +++--
 .../mobile-terminal-close-ipc-bridge.ts       |  21 +-
 .../src/lib/ai-vault-tab-title-requests.ts    | 176 +++++++------
 .../pane-manager-tree-mutations.ts            |  35 ++-
 .../lib/pane-manager/pane-manager-types.ts    |   2 +-
 .../src/lib/pane-manager/pane-manager.ts      |   4 +-
 .../src/lib/pane-manager/pane-split-close.ts  |  17 +-
 .../runtime/mounted-terminal-tab-registry.ts  |   3 +
 .../rpc-params-catalog.generated.ts           |   3 +-
 .../rpc-contract/terminal-unary-params.ts     |  26 ++
 src/shared/runtime-terminal-contracts.ts      |   3 +
 src/shared/terminal-tab-close.ts              | 108 ++++++++
 60 files changed, 2622 insertions(+), 746 deletions(-)
 create mode 100644 src/main/persistence/terminal-topology/original-terminal-close-store.test.ts
 create mode 100644 src/main/runtime/orca-runtime-original-terminal-close.test.ts
 create mode 100644 src/main/runtime/session-tabs/explicit-terminal-tab-close.ts
 create mode 100644 src/main/runtime/session-tabs/terminal-surface-close-commit.ts
 create mode 100644 src/renderer/src/components/tab-bar/cli-chat-resume-mocks.test-fixture.ts
 create mode 100644 src/renderer/src/components/tab-bar/cli-chat-resume-parked-retirement.test-fixture.ts
 create mode 100644 src/renderer/src/components/terminal-pane/terminal-pane-mount-registration.ts
 create mode 100644 src/renderer/src/components/terminal-pane/terminal-presentation-retirement.test-fixture.ts
 create mode 100644 src/renderer/src/components/terminal-pane/terminal-presentation-retirement.test.ts
 create mode 100644 src/renderer/src/components/terminal-pane/terminal-presentation-retirement.ts

diff --git a/src/main/persistence/loading-store/profile-state-delayed-authority-fixture.ts b/src/main/persistence/loading-store/profile-state-delayed-authority-fixture.ts
index e2078f8b9182..9fbd9059e6eb 100644
--- a/src/main/persistence/loading-store/profile-state-delayed-authority-fixture.ts
+++ b/src/main/persistence/loading-store/profile-state-delayed-authority-fixture.ts
@@ -146,7 +146,7 @@ export async function fixture(legacyOpenCodeGoApiKey?: string) {
       reader.close()
     }
   }
-  return { store, authority, readState }
+  return { store, authority, readState, directory, path }
 }
 
 /** The runtime writes a pane before it spawns; a runtime spawn commit binds only that pane. */
diff --git a/src/main/persistence/terminal-topology/layout-command-persistence.ts b/src/main/persistence/terminal-topology/layout-command-persistence.ts
index 2ac27dc97550..0724015a0e73 100644
--- a/src/main/persistence/terminal-topology/layout-command-persistence.ts
+++ b/src/main/persistence/terminal-topology/layout-command-persistence.ts
@@ -1,3 +1,5 @@
+import type { TerminalSurfaceCloseCapture } from '../../../shared/terminal-tab-close'
+import { closeLeafOrTab } from './terminal-topology-commit'
 import type {
   CommandOf,
   LayoutApplyOutcome,
@@ -84,6 +86,8 @@ export class LayoutCommandPersistence {
     command: LayoutCommand,
     hostIds: readonly string[] = [],
     run: {
+      originalPresentation?: TerminalSurfaceCloseCapture
+      admit?: () => boolean
       live?: LayoutLiveContext
       stopBeforeWrite?: (ptyIds: readonly string[]) => boolean
       onEffects?: (effects: LayoutEffects) => void
@@ -91,6 +95,66 @@ export class LayoutCommandPersistence {
   ): Promise<LayoutApplyOutcome> {
     const context = this[layoutCommandPersistenceContext]
     const resolved = hostIds.length > 0 ? hostIds.map(resolveHostId) : [resolveHostId()]
+    if (run.originalPresentation && isTerminalClose(command)) {
+      const original = run.originalPresentation
+      const source = original.identity
+      const hostIds = () => [
+        ...new Set([
+          ...original.holders.map((holder) => holder.hostId),
+          ...context.sessions
+            .getWorkspaceSessionHostIds()
+            .filter((id) =>
+              context.sessions
+                .getWorkspaceSession(id)
+                ?.tabsByWorktree[source.worktreeId]?.some((row) => row.id === source.tabId)
+            )
+        ])
+      ]
+      return context.runtime
+        .runDurableMutation<Error | LayoutApplyOutcome>(() => {
+          let closedTab = false
+          const mutation = closeLeafOrTab({
+            worktreeId: command.workspace,
+            target: { kind: 'pane', tabId: source.tabId, leafId: source.leafId },
+            options: {
+              allowMissing: true,
+              originalPresentation: original,
+              onClosed: (tab) => {
+                closedTab = tab
+              }
+            },
+            requestedSession: context.sessions.getWorkspaceSession(resolved[0]),
+            ownerMatches: () =>
+              (run.admit?.() ?? true) &&
+              command.workspace === source.worktreeId &&
+              ('tabId' in command
+                ? command.tabId === source.tabId
+                : command.type === 'closeTabs' &&
+                  command.tabIds.length === 1 &&
+                  command.tabIds[0] === source.tabId),
+            hostIds,
+            getSession: (id) => context.sessions.getWorkspaceSession(id),
+            setSession: (session, id) =>
+              context.runtime.dirtyProfileStateDomains.add(
+                assignWorkspaceSessionPartition(context.runtime.state, id, session)
+              ),
+            onClosed: () => {}
+          })()
+          if (mutation.value) {
+            return mutation
+          }
+          return {
+            ...mutation,
+            value: { ok: true, result: { closed: closedTab ? [source.tabId] : [] } } as const
+          }
+        })
+        .then((outcome) => {
+          if (outcome instanceof Error) {
+            throw outcome
+          }
+          return outcome
+        })
+    }
     let effects: LayoutEffects | undefined
     const commit = raisingBindingGenerations(
       context.runtime,
diff --git a/src/main/persistence/terminal-topology/original-terminal-close-store.test.ts b/src/main/persistence/terminal-topology/original-terminal-close-store.test.ts
new file mode 100644
index 000000000000..eb1fd35edd2d
--- /dev/null
+++ b/src/main/persistence/terminal-topology/original-terminal-close-store.test.ts
@@ -0,0 +1,130 @@
+import { expect, it, vi } from 'vitest'
+import { join } from 'node:path'
+import {
+  fixture,
+  admitRuntimeSpawnPane
+} from '../loading-store/profile-state-delayed-authority-fixture'
+import { Store } from '../loading-store/store'
+import { ProfileStateSqliteAuthority } from '../profile-state/profile-state-sqlite-authority'
+import {
+  captureTerminalSurfaceIdentity,
+  type TerminalSurfaceCloseCapture
+} from '../../../shared/terminal-tab-close'
+import { applyWindowLayoutCommand } from '../../runtime/runtime-layout-apply'
+
+vi.mock('../../../shared/layout-owner-switch', () => ({ ORCA_LAYOUT_OWNER_IS_MAIN: true }))
+vi.mock('../../telemetry/client', () => ({ track: vi.fn() }))
+vi.mock('../../ssh/config/ssh-config-parser', () => ({
+  loadUserSshConfig: () => ({ hosts: [] }),
+  sshConfigHostsToTargets: () => []
+}))
+const pane = {
+  worktreeId: 'repo-local::/fixture/local',
+  tabId: 'aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa',
+  leafId: 'bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb'
+}
+const command = {
+  type: 'closePane' as const,
+  workspace: pane.worktreeId,
+  tabId: pane.tabId,
+  leafId: pane.leafId
+}
+async function opened() {
+  const opened = await fixture()
+  await admitRuntimeSpawnPane(opened.store, pane)
+  const identity = captureTerminalSurfaceIdentity(
+    opened.store.getWorkspaceSession(),
+    pane.worktreeId,
+    pane.tabId,
+    pane.leafId
+  )
+  if (!identity) {
+    throw new Error('Missing original owner')
+  }
+  const originalPresentation: TerminalSurfaceCloseCapture = {
+    identity,
+    holders: [{ hostId: 'local', identity }]
+  }
+  return { ...opened, originalPresentation }
+}
+
+it.each(['successor', 'new holder'] as const)(
+  'checks %s at queued admission, preserving membership and future commands',
+  async (change) => {
+    const { store, authority, originalPresentation } = await opened()
+    const pause = authority.pause()
+    const preceding = store.runDurableMutation(() => ({ value: undefined }))
+    await pause.started.promise
+    const closing = applyWindowLayoutCommand(store, () => ['local'], command, undefined, {
+      originalPresentation,
+      admit: () => true
+    })
+    // A replacement commits before the close is admitted, after its caller already dispatched it.
+    const state = store.getWorkspaceSession()
+    if (change === 'new holder') {
+      store.setWorkspaceSession(state, 'ssh:new-holder')
+    } else {
+      store.setWorkspaceSession({
+        ...state,
+        tabsByWorktree: {
+          ...state.tabsByWorktree,
+          [pane.worktreeId]: state.tabsByWorktree[pane.worktreeId].map((row) => ({
+            ...row,
+            generation: (row.generation ?? 0) + 1
+          }))
+        }
+      })
+    }
+    const refused = expect(closing).rejects.toThrow('terminal_pane_owner_changed')
+    pause.finish.resolve()
+    await preceding
+    await refused
+    expect(
+      store.getWorkspaceSession().tabsByWorktree[pane.worktreeId].map((row) => row.id)
+    ).toContain(pane.tabId)
+    await expect(
+      store.applyLayoutCommand({
+        type: 'renameTab',
+        workspace: pane.worktreeId,
+        tabId: pane.tabId,
+        kind: 'custom',
+        title: 'Still usable'
+      })
+    ).resolves.toMatchObject({ ok: true })
+  }
+)
+
+it('requires the captured close write, retains the applied removal on failure and reloads its later durable intent', async () => {
+  const { store, authority, originalPresentation, readState, directory, path } = await opened()
+  authority.failNextWrite()
+  await expect(
+    applyWindowLayoutCommand(store, () => ['local'], command, undefined, {
+      originalPresentation,
+      admit: () => true
+    })
+  ).rejects.toThrow('profile_state_write_failed')
+  expect(store.getWorkspaceSession().tabsByWorktree[pane.worktreeId].map((row) => row.id)).toEqual([
+    'tab-local'
+  ])
+  expect(
+    readState().workspaceSession.tabsByWorktree[pane.worktreeId].map(
+      (row: { id: string }) => row.id
+    )
+  ).toContain(pane.tabId)
+  await store.flushPendingOrThrowAsync()
+  await store.freezeWritesAsync()
+  const reloaded = new Store({
+    dataFile: join(directory, 'orca-data.json'),
+    profileStateAuthority: new ProfileStateSqliteAuthority(path, 'coordination-test')
+  })
+  try {
+    expect(
+      reloaded.getWorkspaceSession().tabsByWorktree[pane.worktreeId].map((row) => row.id)
+    ).toEqual(['tab-local'])
+    expect(
+      reloaded.getWorkspaceSession().closedTerminalTabTombstonesByTabId?.[pane.tabId]
+    ).toBeDefined()
+  } finally {
+    await reloaded.freezeWritesAsync()
+  }
+})
diff --git a/src/main/runtime/mobile-session-tab-close-outcome.ts b/src/main/runtime/mobile-session-tab-close-outcome.ts
index 214016b2c7b0..4da177919330 100644
--- a/src/main/runtime/mobile-session-tab-close-outcome.ts
+++ b/src/main/runtime/mobile-session-tab-close-outcome.ts
@@ -1,3 +1,9 @@
+import type { TerminalSurfaceCloseCapture } from '../../shared/terminal-tab-close'
+import type {
+  RuntimeMobileSessionRetiredTerminalSurface,
+  RuntimeSessionTabCloseReason
+} from '../../shared/runtime-types'
+import type { RuntimePtyTabCloseAuthority } from './runtime-terminal-state-records'
 import type { RuntimeMobileSessionTabCloseResult } from '../../shared/runtime-types'
 import type { ClientSessionTabSelectionStore } from './client-session-tab-selection'
 
@@ -56,3 +62,16 @@ export function refusedMobileSessionTabClose(
     ...(options.snapshotRepublished ? { snapshotRepublished: true as const } : {})
   } as MobileSessionTabCloseOutcome
 }
+
+export type MobileSessionTabCloseOptions = {
+  originalPresentation?: TerminalSurfaceCloseCapture
+  rendererOwnsPresentation?: boolean
+  retirementProofs?: RuntimeMobileSessionRetiredTerminalSurface[]
+  reason?: RuntimeSessionTabCloseReason
+  expectedPublicationEpoch?: string
+  expectedTerminalHandle?: string
+  clientNavigationId?: string
+  localPtyTeardownOwnedExternally?: boolean
+  expectedPtyCloseAuthority?: RuntimePtyTabCloseAuthority
+  force?: boolean
+}
diff --git a/src/main/runtime/mobile-session-terminal-retirement.ts b/src/main/runtime/mobile-session-terminal-retirement.ts
index cd9f8d2d3cb4..fb36909f5216 100644
--- a/src/main/runtime/mobile-session-terminal-retirement.ts
+++ b/src/main/runtime/mobile-session-terminal-retirement.ts
@@ -83,6 +83,8 @@ export function retireLeavesFromTerminalLayout(
       layout.expandedLeafId && retainedLeafIdSet.has(layout.expandedLeafId)
         ? layout.expandedLeafId
         : null,
+    chatLeafId:
+      layout.chatLeafId && !retiredLeafIds.has(layout.chatLeafId) ? layout.chatLeafId : undefined,
     ptyIdsByLeafId: omitLeafRecords(layout.ptyIdsByLeafId, retiredLeafIds),
     buffersByLeafId: omitLeafRecords(layout.buffersByLeafId, retiredLeafIds),
     scrollbackRefsByLeafId: omitLeafRecords(layout.scrollbackRefsByLeafId, retiredLeafIds),
diff --git a/src/main/runtime/orca-runtime-original-terminal-close.test.ts b/src/main/runtime/orca-runtime-original-terminal-close.test.ts
new file mode 100644
index 000000000000..a643d32fd704
--- /dev/null
+++ b/src/main/runtime/orca-runtime-original-terminal-close.test.ts
@@ -0,0 +1,196 @@
+import { describe, expect, it } from 'vitest'
+import { terminalTreeHasLeaf } from '../../shared/terminal-tab-close'
+import {
+  createHarness,
+  INCARNATION_ID,
+  LEAF_ID,
+  PTY_ID,
+  SIBLING_LEAF_ID,
+  SIBLING_PTY_ID,
+  TAB_ID,
+  WORKTREE_ID
+} from './__fixtures__/orca-runtime-terminal-close-continuity-fixtures'
+
+function captured(harness: ReturnType<typeof createHarness>) {
+  const source = harness.runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_ID}`, WORKTREE_ID)
+  if (!source.presentation || !source.incarnationId) {
+    throw new Error('Missing original source')
+  }
+  return {
+    source,
+    close: () =>
+      harness.runtime.closeTerminal(source.handle, source.incarnationId, source.presentation)
+  }
+}
+
+function addSibling(harness: ReturnType<typeof createHarness>) {
+  harness.editSession((state) => ({
+    ...state,
+    terminalLayoutsByTabId: {
+      ...state.terminalLayoutsByTabId,
+      [TAB_ID]: {
+        ...state.terminalLayoutsByTabId[TAB_ID],
+        root: {
+          type: 'split',
+          direction: 'horizontal',
+          ratio: 0.7,
+          first: { type: 'leaf', leafId: LEAF_ID },
+          second: { type: 'leaf', leafId: SIBLING_LEAF_ID }
+        },
+        ptyIdsByLeafId: { [LEAF_ID]: PTY_ID, [SIBLING_LEAF_ID]: SIBLING_PTY_ID },
+        activeLeafId: SIBLING_LEAF_ID,
+        expandedLeafId: SIBLING_LEAF_ID
+      }
+    }
+  }))
+}
+
+describe('original-aware terminal close owner transaction', () => {
+  it('stops only the source and keeps membership until explicit owner retirement', async () => {
+    const harness = createHarness({ registerPtyBacked: true, publishMobileSurface: true })
+    const { close } = captured(harness)
+    harness.setStopAndWaitAction(async () => {
+      await harness.runtime.onPtyExit(PTY_ID, 0, INCARNATION_ID, { hostExitConfirmed: true })
+      expect(
+        terminalTreeHasLeaf(harness.getSession().terminalLayoutsByTabId[TAB_ID]?.root, LEAF_ID)
+      ).toBe(true)
+    })
+    harness.setVerifiedStopResult(true)
+    harness.setCloseTerminalTabAction(() => {})
+    await expect(close()).resolves.toMatchObject({ ptyKilled: true })
+    expect(harness.stopAndWait).toHaveBeenCalledExactlyOnceWith(
+      PTY_ID,
+      expect.objectContaining({ expectedIncarnationId: INCARNATION_ID })
+    )
+    expect(harness.kill).not.toHaveBeenCalled()
+    expect(harness.getSession().tabsByWorktree[WORKTREE_ID]).toEqual([])
+    expect(harness.getSession().closedTerminalTabTombstonesByTabId?.[TAB_ID]).toBeDefined()
+  })
+
+  it.each([false, true])(
+    'accepts earned exit without another stop (readable=%s)',
+    async (readable) => {
+      const harness = createHarness({ registerPtyBacked: true, publishMobileSurface: true })
+      const { close, source } = captured(harness)
+      const settleSleep = readable
+        ? harness.runtime.intentionalPtyStops.mark(PTY_ID, 'reversible', INCARNATION_ID)
+        : null
+      await harness.runtime.onPtyExit(PTY_ID, 0, INCARNATION_ID, { hostExitConfirmed: true })
+      settleSleep?.(true)
+      expect(harness.runtime.getTerminalHandleForPaneKey(`${TAB_ID}:${LEAF_ID}`)).toBe(
+        source.handle
+      )
+      if (readable) {
+        harness.runtime.syncWindowGraph(1, {
+          tabs: [
+            {
+              tabId: TAB_ID,
+              worktreeId: WORKTREE_ID,
+              title: 'Ended source',
+              activeLeafId: LEAF_ID,
+              layout: { type: 'leaf', leafId: LEAF_ID }
+            }
+          ],
+          leaves: [
+            {
+              tabId: TAB_ID,
+              worktreeId: WORKTREE_ID,
+              leafId: LEAF_ID,
+              paneRuntimeId: 7,
+              ptyId: null
+            }
+          ]
+        })
+        expect(harness.runtime.getTerminalHandleForPaneKey(`${TAB_ID}:${LEAF_ID}`)).toBe(
+          source.handle
+        )
+        harness.editSession((state) => ({
+          ...state,
+          terminalLayoutsByTabId: {
+            ...state.terminalLayoutsByTabId,
+            [TAB_ID]: { ...state.terminalLayoutsByTabId[TAB_ID], ptyIdsByLeafId: {} }
+          }
+        }))
+      }
+      // SAFETY: this invokes the actual archive removal to exercise earned exit with no PTY record.
+      const archive = harness.runtime as unknown as { dropDisconnectedPtyRecord(id: string): void }
+      archive.dropDisconnectedPtyRecord(PTY_ID)
+      if (readable) {
+        expect(
+          harness.runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_ID}`, WORKTREE_ID).handle
+        ).toBe(source.handle)
+      }
+      harness.setCloseTerminalTabAction(() => {})
+      await expect(close()).resolves.toMatchObject({ ptyKilled: true })
+      expect(harness.stopAndWait).not.toHaveBeenCalled()
+      expect(harness.kill).not.toHaveBeenCalled()
+    }
+  )
+
+  it('does not retire a successor published during the required durable write', async () => {
+    const harness = createHarness({ registerPtyBacked: true, publishMobileSurface: true })
+    const { close } = captured(harness)
+    harness.setVerifiedStopResult(true)
+    harness.setCloseTerminalTabAction(() => {})
+    harness.flushOrThrow.mockImplementationOnce(() => {
+      harness.runtime.registerPty(PTY_ID, WORKTREE_ID, null, {
+        tabId: TAB_ID,
+        leafId: LEAF_ID,
+        incarnationId: 'successor-after-admission'
+      })
+    })
+    await expect(close()).rejects.toThrow('terminal_pane_owner_changed')
+    expect(harness.kill).not.toHaveBeenCalled()
+    expect(harness.stopAndWait).toHaveBeenCalledTimes(1)
+  })
+
+  it('retains an unknown source and refuses a pinned final tab before stopping', async () => {
+    const harness = createHarness({ registerPtyBacked: true })
+    const { close } = captured(harness)
+    await expect(close()).rejects.toThrow('terminal_close_unverifiable')
+    expect(harness.closeTerminalTab).not.toHaveBeenCalled()
+    expect(harness.kill).not.toHaveBeenCalled()
+    expect(harness.getSession().tabsByWorktree[WORKTREE_ID]).toHaveLength(1)
+    harness.editSession((state) => ({
+      ...state,
+      tabsByWorktree: {
+        ...state.tabsByWorktree,
+        [WORKTREE_ID]: state.tabsByWorktree[WORKTREE_ID].map((row) => ({ ...row, isPinned: true }))
+      }
+    }))
+    await expect(close()).rejects.toThrow('terminal_tab_pinned')
+    expect(harness.stopAndWait).toHaveBeenCalledTimes(1)
+  })
+
+  it.each(['sibling', 'successor', 'write failure'] as const)(
+    'revalidates %s after the acknowledged owner await',
+    async (change) => {
+      const harness = createHarness({ registerPtyBacked: true, publishMobileSurface: true })
+      const { close } = captured(harness)
+      harness.setVerifiedStopResult(true)
+      harness.setCloseTerminalTabAction(() => {
+        addSibling(harness)
+        if (change === 'successor') {
+          harness.replacePersistedIncarnation('incarnation-successor')
+        }
+        if (change === 'write failure') {
+          harness.rejectPersistenceFlush(new Error('required write failed'))
+        }
+      })
+      const result = close()
+      if (change === 'successor') {
+        await expect(result).rejects.toThrow('terminal_pane_owner_changed')
+      } else if (change === 'write failure') {
+        await expect(result).rejects.toThrow('required write failed')
+      } else {
+        await expect(result).resolves.toMatchObject({ ptyKilled: true })
+      }
+      const layout = harness.getSession().terminalLayoutsByTabId[TAB_ID]
+      expect(terminalTreeHasLeaf(layout?.root, SIBLING_LEAF_ID)).toBe(true)
+      expect(layout?.ptyIdsByLeafId?.[SIBLING_LEAF_ID]).toBe(SIBLING_PTY_ID)
+      expect(terminalTreeHasLeaf(layout?.root, LEAF_ID)).toBe(change === 'successor')
+      expect(harness.kill).not.toHaveBeenCalled()
+      expect(harness.stopAndWait).toHaveBeenCalledTimes(1)
+    }
+  )
+})
diff --git a/src/main/runtime/orca-runtime.ts b/src/main/runtime/orca-runtime.ts
index 3481cdb7d5ea..b1fe8f951e19 100644
--- a/src/main/runtime/orca-runtime.ts
+++ b/src/main/runtime/orca-runtime.ts
@@ -7,7 +7,6 @@ import {
 } from './sidebar-inputs/orca-runtime-sidebar-temporal'
 import { OrcaRuntimeWithAgentTransitions } from './orca-runtime-agent-transitions'
 import { ORCA_SIDEBAR_INPUTS_IS_MAIN } from '../../shared/sidebar-inputs-switch'
-import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../shared/layout-owner-switch'
 import type { RuntimeCommandSurfaceHost } from './orca-runtime-core'
 import type {
   AgentLaunchTabPublished,
@@ -34,8 +33,7 @@ import { createReferenceAgentIndex, referenceConnectionHosts } from './runtime-r
 import type { RuntimeReferenceFindParams } from '../../shared/runtime-reference-contracts'
 import { getRepoExecutionHostId } from '../../shared/execution-host'
 import type { LayoutApplyReply } from '../../shared/workspace-layout/workspace-layout-command-types'
-import { rekeyMovedPaneOwners } from './moved-pane-owner-rekey'
-import { applyWindowLayoutCommand, type WindowLayoutCommand } from './runtime-layout-apply'
+import type { WindowLayoutCommand, LayoutCommandRunOptions } from './runtime-layout-apply'
 import type { TerminalCreateOptions } from './runtime-terminal-contracts'
 import {
   installStructuredAgentAvailability,
@@ -271,24 +269,11 @@ class OrcaRuntimeService extends OrcaRuntimeSidebarBase {
   }
 
   /** A window's layout command (`layout.apply`), applied to the partitions that hold its tab. */
-  async applyLayoutCommand(command: WindowLayoutCommand): Promise<LayoutApplyReply> {
-    // A workspace's first surface comes after the live terminals main is placing.
-    const placing = this.livePlacementSettledFor(command)
-    const apply = (): Promise<LayoutApplyReply> =>
-      applyWindowLayoutCommand(
-        this.requireStore(),
-        (worktreeId, tabId) =>
-          tabId !== null
-            ? this.getWorkspaceSessionHostIdsForTab(worktreeId, tabId)
-            : [this.tryGetWorkspaceSessionHostIdForWorktree(worktreeId) ?? []].flat(),
-        command,
-        (move) => rekeyMovedPaneOwners(this, move),
-        this.layoutCommandRun(command)
-      )
-    // A window's sleep or wake lands after the hook statuses main accepted before it, as in the window.
-    const reply = await (ORCA_LAYOUT_OWNER_IS_MAIN && ['sleep', 'wake'].includes(command.type)
-      ? this.inResumeRecordOrder(apply)
-      : (placing?.then(apply) ?? apply()))
+  async applyLayoutCommand(
+    command: WindowLayoutCommand,
+    options?: LayoutCommandRunOptions
+  ): Promise<LayoutApplyReply> {
+    const reply = await this.applyOwnedWindowLayoutCommand(command, options)
     // Sent before the reply, so the window can wait for the frame that shows the change.
     return { ...reply, frameSeq: this.workspaceLayoutStream.settledSeq() }
   }
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-lifecycle-methods.ts b/src/main/runtime/rpc/methods/terminal/terminal-lifecycle-methods.ts
index 8ac99809cd3b..7f80896b51f1 100644
--- a/src/main/runtime/rpc/methods/terminal/terminal-lifecycle-methods.ts
+++ b/src/main/runtime/rpc/methods/terminal/terminal-lifecycle-methods.ts
@@ -13,6 +13,7 @@ import {
   TerminalCreateParams,
   TerminalFocus,
   TerminalHandle,
+  TerminalClose,
   TerminalReveal,
   TerminalSplit,
   TerminalWait
@@ -225,14 +226,19 @@ export const TERMINAL_LIFECYCLE_METHODS = [
   defineMethod({
     name: 'terminal.close',
     permission: 'workspace',
-    params: TerminalHandle,
+    params: TerminalClose,
     handler: async (params, context) => ({
       close: await withTerminalCloseAttribution(
         'terminal.close',
         context,
         'terminal',
         params.terminal,
-        () => context.runtime.closeTerminal(params.terminal, params.expectedIncarnationId)
+        () =>
+          context.runtime.closeTerminal(
+            params.terminal,
+            params.expectedIncarnationId,
+            params.originalPresentation
+          )
       )
     })
   }),
diff --git a/src/main/runtime/runtime-layout-apply.ts b/src/main/runtime/runtime-layout-apply.ts
index c9bba8572f88..77a0c5c2bf64 100644
--- a/src/main/runtime/runtime-layout-apply.ts
+++ b/src/main/runtime/runtime-layout-apply.ts
@@ -91,7 +91,8 @@ export async function applyWindowLayoutCommand(
     const terminalTabId = terminalIdOf(store, hostIds[0], command.workspace, command.tabIds[0])
     const reply = await store.applyLayoutCommand(
       { ...command, force: command.refusePinned ? command.force === true : true },
-      holders
+      holders,
+      run
     )
     // Only a tab the close took: a refused (pinned) tab's launches still finish into it.
     if (
@@ -148,10 +149,13 @@ export async function applyWindowLayoutCommand(
   }
   const { workspace, tabId, leafId } = command
   // A launch still starting in the pane the user closed stops, and says so (as the legacy close).
-  markAgentLaunchesClosedByUser(workspace, { kind: 'pane', tabId, leafId })
+  if (!run?.originalPresentation) {
+    markAgentLaunchesClosedByUser(workspace, { kind: 'pane', tabId, leafId })
+  }
   return store.applyLayoutCommand(
     { type: 'closePane', workspace, tabId, leafId, userPaneClose: true },
-    holders
+    holders,
+    run
   )
 }
 
diff --git a/src/main/runtime/runtime-notifier-contract.ts b/src/main/runtime/runtime-notifier-contract.ts
index ce5f8b1a994d..cc0feaa93811 100644
--- a/src/main/runtime/runtime-notifier-contract.ts
+++ b/src/main/runtime/runtime-notifier-contract.ts
@@ -1,3 +1,4 @@
+import type { TerminalSurfaceCloseIdentity } from '../../shared/terminal-tab-close'
 import type {
   RuntimeEditorTabReveal,
   RuntimeFileOpenPosition
@@ -156,7 +157,11 @@ export type RuntimeNotifier = {
   closeTerminalPane?(tabId: string, leafId: string): void
   closeTerminalTab?(
     tabId: string,
-    options?: { localPtyTeardownOwnedExternally?: boolean; force?: boolean }
+    options?: {
+      localPtyTeardownOwnedExternally?: boolean
+      force?: boolean
+      originalSurface?: TerminalSurfaceCloseIdentity
+    }
   ): Promise<void>
   sleepWorktree(worktreeId: string): void
   // Why: a phone opening a worktree wakes its slept agents by asking the host
diff --git a/src/main/runtime/session-graph/session-window-graph.ts b/src/main/runtime/session-graph/session-window-graph.ts
index 00455e310351..47db78312bca 100644
--- a/src/main/runtime/session-graph/session-window-graph.ts
+++ b/src/main/runtime/session-graph/session-window-graph.ts
@@ -206,7 +206,7 @@ export abstract class OrcaRuntimeWithSyncWindowGraph extends OrcaRuntimeWithAtta
         const adoptedFirstPty =
           existing.ptyId === null && this.adoptFirstPtyForLeafHandle(leafKey, ptyId, ptyGeneration)
         if (!adoptedFirstPty) {
-          this.invalidateLeafHandle(leafKey)
+          this.invalidateLeafHandle(leafKey, ptyId === null)
         }
       }
     }
diff --git a/src/main/runtime/session-lifecycle/close/close-mobile-row-in-main-layout.ts b/src/main/runtime/session-lifecycle/close/close-mobile-row-in-main-layout.ts
index dced249762f1..05e4fe0ba186 100644
--- a/src/main/runtime/session-lifecycle/close/close-mobile-row-in-main-layout.ts
+++ b/src/main/runtime/session-lifecycle/close/close-mobile-row-in-main-layout.ts
@@ -1,3 +1,4 @@
+import type { MobileSessionLifecycleCloseHost } from '../../mobile-session-lifecycle-close-adjudication'
 // Layout-owner builds: a phone's close of a terminal row in a workspace main owns is main's own
 // layout close, window or not, as the CLI's close by handle is.
 import { OrcaRuntimeWithRefuseUnattributedMobileSessionTabClose } from './refuse-unattributed-mobile-session-tab-close'
@@ -95,4 +96,14 @@ export abstract class OrcaRuntimeWithCloseMobileRowInMainLayout extends OrcaRunt
       this.notifyMobileSessionTabsChanged(worktreeId)
     }
   }
+  protected getMobileSessionLifecycleCloseHost(): MobileSessionLifecycleCloseHost {
+    return {
+      tabs: this.tabs,
+      leaves: this.leaves,
+      ptysById: this.ptysById,
+      findPtyForMobileTerminalTab: (worktreeId, tab) =>
+        this.findPtyForMobileTerminalTab(worktreeId, tab),
+      republishSnapshot: (worktreeId) => this.republishMobileSessionTabsSnapshot(worktreeId)
+    }
+  }
 }
diff --git a/src/main/runtime/session-lifecycle/close/close-mobile-session-tab.ts b/src/main/runtime/session-lifecycle/close/close-mobile-session-tab.ts
index 1418c0ca8cc3..ceb66b96a29f 100644
--- a/src/main/runtime/session-lifecycle/close/close-mobile-session-tab.ts
+++ b/src/main/runtime/session-lifecycle/close/close-mobile-session-tab.ts
@@ -1,15 +1,13 @@
 import { OrcaRuntimeWithCloseMobileRowInMainLayout } from './close-mobile-row-in-main-layout'
-import type {
-  RuntimeMobileSessionTerminalTab,
-  RuntimeSessionTabCloseReason
-} from '../../../../shared/runtime-types'
-import type { RuntimePtyTabCloseAuthority } from '../../runtime-terminal-state-records'
+import type { RuntimeMobileSessionTerminalTab } from '../../../../shared/runtime-types'
 import {
   adjudicateAbsentMobileSessionTabClose,
-  resolveMobileSessionLifecycleCloseContext,
-  type MobileSessionLifecycleCloseHost
+  resolveMobileSessionLifecycleCloseContext
 } from '../../mobile-session-lifecycle-close-adjudication'
-import type { MobileSessionTabCloseOutcome } from '../../mobile-session-tab-close-outcome'
+import type {
+  MobileSessionTabCloseOptions,
+  MobileSessionTabCloseOutcome
+} from '../../mobile-session-tab-close-outcome'
 import {
   committedMobileSessionTabClose,
   delegatedMobileSessionTabClose,
@@ -29,20 +27,32 @@ export abstract class OrcaRuntimeWithCloseMobileSessionTab extends OrcaRuntimeWi
   async closeMobileSessionTab(
     worktreeSelector: string,
     tabId: string,
-    options: {
-      reason?: RuntimeSessionTabCloseReason
-      expectedPublicationEpoch?: string
-      expectedTerminalHandle?: string
-      clientNavigationId?: string
-      localPtyTeardownOwnedExternally?: boolean
-      expectedPtyCloseAuthority?: RuntimePtyTabCloseAuthority
-      force?: boolean
-    } = {}
+    options: MobileSessionTabCloseOptions = {}
   ): Promise<MobileSessionTabCloseOutcome> {
     const graphEpoch = options.clientNavigationId ? this.captureReadyGraphEpoch() : null
     const explicitWorktreeId = this.getExplicitSessionWorktreeIdSelector(worktreeSelector)
     const worktreeId =
       explicitWorktreeId ?? (await this.resolveWorktreeSelector(worktreeSelector)).id
+    if (options.originalPresentation) {
+      const source = options.originalPresentation.identity
+      if (
+        source.worktreeId !== worktreeId ||
+        source.tabId !== tabId ||
+        !options.localPtyTeardownOwnedExternally
+      ) {
+        throw new Error('terminal_pane_owner_changed')
+      }
+      const closedTab = await this.closeTerminalPane(
+        worktreeId,
+        { kind: 'pane', tabId, leafId: source.leafId },
+        options
+      )
+      return committedMobileSessionTabClose(
+        this.clientSessionTabSelections,
+        worktreeId,
+        closedTab ? [tabId] : []
+      )
+    }
     this.hydrateHeadlessMobileSessionTabsFromWorkspaceSession(worktreeId)
     const observedPtyIds = await this.refreshMobileSessionPtyRecords()
     if (graphEpoch !== null) {
@@ -325,15 +335,4 @@ export abstract class OrcaRuntimeWithCloseMobileSessionTab extends OrcaRuntimeWi
     }
     return finishCommittedClose()
   }
-
-  protected getMobileSessionLifecycleCloseHost(): MobileSessionLifecycleCloseHost {
-    return {
-      tabs: this.tabs,
-      leaves: this.leaves,
-      ptysById: this.ptysById,
-      findPtyForMobileTerminalTab: (worktreeId, tab) =>
-        this.findPtyForMobileTerminalTab(worktreeId, tab),
-      republishSnapshot: (worktreeId) => this.republishMobileSessionTabsSnapshot(worktreeId)
-    }
-  }
 }
diff --git a/src/main/runtime/session-lifecycle/projection/build-headless-mobile-session-browser-tabs.ts b/src/main/runtime/session-lifecycle/projection/build-headless-mobile-session-browser-tabs.ts
index 1e2d923cafe3..4acc108a1b27 100644
--- a/src/main/runtime/session-lifecycle/projection/build-headless-mobile-session-browser-tabs.ts
+++ b/src/main/runtime/session-lifecycle/projection/build-headless-mobile-session-browser-tabs.ts
@@ -1,4 +1,7 @@
-import { OrcaRuntimeWithPersistTerminalSurfaceRetirements } from '../../session-tabs/terminal-surface-retirements'
+import { windowListsTab } from '../../terminal/surface/main-terminal-surfaces'
+import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
+import { matchesTerminalSurfaceCapture } from '../../../../shared/terminal-tab-close'
+import { OrcaRuntimeWithTerminalSurfaceCloseCommit } from '../../session-tabs/terminal-surface-close-commit'
 import type {
   RuntimeMobileSessionBrowserTab,
   RuntimeMobileSessionTabsResult,
@@ -9,25 +12,21 @@ import { parseAppSshPtyId } from '../../../../shared/ssh-pty-id'
 import { getRuntimeBrowserPageRegistry } from '../../runtime-browser-page-registry'
 import { holdAgentSessionInventory } from '../../structured-agent-session-inventory-hold'
 import type { Tab } from '../../../../shared/tab-types'
-import {
-  captureTerminalCloseRequest,
-  resolveTerminalCloseTarget,
-  type PaneCloseResolution,
-  type RendererTerminalClose,
-  type TerminalSurfaceCloseOptions
-} from '../../terminal-surface-close'
-import type {
-  TerminalPaneCloseTarget,
-  TerminalSurfaceCloseTarget
-} from '../../../../shared/terminal-surface-close-target'
+import type { RendererTerminalClose } from '../../terminal-surface-close'
+import type { TerminalPaneCloseTarget } from '../../../../shared/terminal-surface-close-target'
 import { retireTerminalSurfacesFromSnapshot } from '../../mobile-session-terminal-retirement'
 import type { PtyControllerInventory } from '../../runtime-pty-controller-contract'
 import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../shared/constants'
-import { captureAcknowledgedTerminalTabRetirement } from '../../workspace-session-terminal-tab-retirement-identity'
-import { closeLeafOrTab } from '../../../persistence/terminal-topology/terminal-topology-commit'
 import { markAgentLaunchesClosedByUser } from '../../../agent-launch/agent-launch-pane-attachment'
 
-export abstract class OrcaRuntimeWithBuildHeadlessMobileSessionBrowserTabs extends OrcaRuntimeWithPersistTerminalSurfaceRetirements {
+import type { MobileSessionTabCloseOptions } from '../../mobile-session-tab-close-outcome'
+
+type TerminalPaneRetirementOptions = Pick<
+  MobileSessionTabCloseOptions,
+  'originalPresentation' | 'rendererOwnsPresentation' | 'retirementProofs'
+>
+
+export abstract class OrcaRuntimeWithBuildHeadlessMobileSessionBrowserTabs extends OrcaRuntimeWithTerminalSurfaceCloseCommit {
   // Why: headless serve backs browser panes with offscreen WebContents that live
   // only in the BrowserManager, never in a renderer graph. Without surfacing them
   // as session tabs, a session.tabs snapshot (e.g. on terminal open) prunes the
@@ -99,128 +98,93 @@ export abstract class OrcaRuntimeWithBuildHeadlessMobileSessionBrowserTabs exten
     return tab ? { color: tab.color, isPinned: tab.isPinned } : null
   }
 
-  protected captureTerminalTabRetirement(worktreeId: string, tabId: string) {
-    const originalHostId = this.getWorkspaceSessionHostIdForTab(worktreeId, tabId)
-    return captureAcknowledgedTerminalTabRetirement(worktreeId, tabId, () => {
-      const resolvedHostId = this.getWorkspaceSessionHostIdForTab(worktreeId, tabId)
-      const resolvedSession = this.store?.getWorkspaceSession?.(resolvedHostId)
-      // Emptying the last tab may reroute the worktree to its catalog host.
-      const hostId = resolvedSession?.tabsByWorktree[worktreeId]?.some((tab) => tab.id === tabId)
-        ? resolvedHostId
-        : originalHostId
-      return {
-        hostId,
-        session: this.store?.getWorkspaceSession?.(hostId) ?? null,
-        snapshot: this.mobileSessionTabsByWorktree.get(worktreeId),
-        incarnationOf: (ptyId) => this.ptysById.get(ptyId)?.incarnationId
-      }
-    })
-  }
-
-  /**
-   * The one close transaction every explicit terminal close reaches: durably commits the membership
-   * removal in the owning host's partition. Callers publish and kill afterwards.
-   */
-  protected async closeTerminalSurface(
-    worktreeId: string,
-    target: TerminalSurfaceCloseTarget,
-    options: TerminalSurfaceCloseOptions = {}
-  ): Promise<string[]> {
-    const store = this.store
-    if (!store?.getWorkspaceSession || !store.setWorkspaceSession || !store.runDurableMutation) {
-      throw new Error('workspace_session_unavailable')
-    }
-    // Why: a tab its layout owner already removed has no newer owner; refusing would only strand it.
-    const acknowledgeTabRetirement =
-      target.kind === 'tab' && !options.closedByLayoutOwner
-        ? this.captureTerminalTabRetirement(worktreeId, target.tabId)
-        : null
-    let ptyIdsToKill: string[] = []
-    let refusal: Error | undefined
-    const hostIds = () => this.getWorkspaceSessionHostIdsForTab(worktreeId, target.tabId)
-    const fenced = acknowledgeTabRetirement !== null
-    try {
-      refusal = await store.runDurableMutation(
-        closeLeafOrTab({
-          worktreeId,
-          target,
-          options,
-          ...captureTerminalCloseRequest(
-            worktreeId,
-            target,
-            hostIds(),
-            // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: The existing guard requires this getter; preserve late-bound store access.
-            store as Parameters<typeof captureTerminalCloseRequest>[3],
-            fenced
-          ),
-          ownerMatches: () => !acknowledgeTabRetirement || acknowledgeTabRetirement().matches,
-          hostIds,
-          getSession: (hostId) => store.getWorkspaceSession!(hostId),
-          setSession: (session, hostId) => store.setWorkspaceSession!(session, hostId),
-          onClosed: (closedPtyIds) => {
-            ptyIdsToKill = closedPtyIds
-          }
-        })
-      )
-    } catch (error) {
-      console.error('[runtime] failed to persist terminal close:', error)
-    }
-    if (refusal) {
-      throw refusal
-    }
-    return ptyIdsToKill
-  }
-
   /** The desktop renderer's close intent: it already guarded, removed and killed; this only reports. */
   async closeTerminalSurfaceFromRenderer({ worktreeId, target, reason }: RendererTerminalClose) {
     const options = { allowMissing: true, force: true, closedByLayoutOwner: true, reason }
     await this.closeTerminalSurface(worktreeId, target, options)
   }
 
-  /** Resolves a close main started against the copy of the tab's panes its layout owner holds. */
-  protected resolveTerminalCloseTarget(
-    worktreeId: string,
-    target: TerminalSurfaceCloseTarget
-  ): PaneCloseResolution | 'tab' {
-    const graphLeafIds: string[] = []
-    for (const leaf of this.leaves.values()) {
-      if (leaf.tabId === target.tabId) {
-        graphLeafIds.push(leaf.leafId)
-      }
-    }
-    return resolveTerminalCloseTarget(target, {
-      rendererListsTab: this.tabs.has(target.tabId),
-      snapshotRows: (this.mobileSessionTabsByWorktree.get(worktreeId)?.tabs ?? []).filter(
-        (row): row is RuntimeMobileSessionTerminalTab =>
-          row.type === 'terminal' && row.parentTabId === target.tabId
-      ),
-      graphLeafIds,
-      sessionLayout:
-        this.getWorkspaceSessionForWorktree(worktreeId)?.terminalLayoutsByTabId?.[target.tabId]
-    })
-  }
-
   /**
    * Commits a split pane's close that main started, then tells the desktop renderer to drop that
    * pane. Never touches the tab: a pane the session no longer lists commits nothing.
    */
   protected async closeTerminalPane(
     worktreeId: string,
-    target: TerminalPaneCloseTarget
-  ): Promise<void> {
+    target: TerminalPaneCloseTarget,
+    options: TerminalPaneRetirementOptions = {}
+  ): Promise<boolean> {
+    let closedTab = false
+    if (
+      options.originalPresentation &&
+      !this.originalTerminalExecutionMatches(options.originalPresentation.identity)
+    ) {
+      throw new Error('terminal_pane_owner_changed')
+    }
+    if (
+      options.originalPresentation &&
+      (options.rendererOwnsPresentation || windowListsTab(this, this.tabs, target.tabId))
+    ) {
+      if (!this.notifier?.closeTerminalTab) {
+        throw new Error('runtime_unavailable')
+      }
+      await this.notifier.closeTerminalTab(target.tabId, {
+        localPtyTeardownOwnedExternally: true,
+        originalSurface: options.originalPresentation.identity
+      })
+    }
     // An explicit close (a phone's, the CLI's): a launch still starting or delivering there stops.
-    markAgentLaunchesClosedByUser(worktreeId, target)
+    if (!options.originalPresentation) {
+      markAgentLaunchesClosedByUser(worktreeId, target)
+    }
     try {
-      await this.closeTerminalSurface(worktreeId, target, { allowMissing: true })
+      if (ORCA_LAYOUT_OWNER_IS_MAIN && options.originalPresentation) {
+        const reply = await this.applyLayoutCommand(
+          {
+            type: 'closePane',
+            workspace: worktreeId,
+            tabId: target.tabId,
+            leafId: target.leafId
+          },
+          {
+            originalPresentation: options.originalPresentation,
+            admit: () =>
+              this.originalTerminalExecutionMatches(options.originalPresentation!.identity)
+          }
+        )
+        if (!reply.ok) {
+          throw new Error(reply.code)
+        }
+        closedTab = reply.result.closed?.includes(target.tabId) === true
+      } else {
+        await this.closeTerminalSurface(worktreeId, target, {
+          allowMissing: true,
+          ...options,
+          onClosed: (tab) => {
+            closedTab = tab
+          }
+        })
+      }
     } catch (error) {
-      if (!(error instanceof Error) || error.message !== 'workspace_session_unavailable') {
+      if (
+        options.originalPresentation ||
+        !(error instanceof Error) ||
+        error.message !== 'workspace_session_unavailable'
+      ) {
         throw error
       }
     }
     // Why: no exit may ever arrive to remove the pane. The notice is leaf-addressed, so it and the
     // renderer's exit handling are each a no-op after the other.
-    this.retireClosedTerminalLeafFromMobileSnapshot(worktreeId, target.tabId, target.leafId)
-    this.notifier?.closeTerminalPane?.(target.tabId, target.leafId)
+    this.retireClosedTerminalLeafFromMobileSnapshot(
+      worktreeId,
+      target.tabId,
+      target.leafId,
+      options
+    )
+    if (!options.originalPresentation) {
+      this.notifier?.closeTerminalPane?.(target.tabId, target.leafId)
+    }
+    return closedTab
   }
 
   /** A paired client's close of one pane: stops only that pane's process, commits only that pane. */
@@ -246,7 +210,8 @@ export abstract class OrcaRuntimeWithBuildHeadlessMobileSessionBrowserTabs exten
   private retireClosedTerminalLeafFromMobileSnapshot(
     worktreeId: string,
     tabId: string,
-    leafId: string
+    leafId: string,
+    options: TerminalPaneRetirementOptions = {}
   ): void {
     const snapshot = this.mobileSessionTabsByWorktree.get(worktreeId)
     const tab = snapshot?.tabs.find(
@@ -255,17 +220,47 @@ export abstract class OrcaRuntimeWithBuildHeadlessMobileSessionBrowserTabs exten
         candidate.parentTabId === tabId &&
         candidate.leafId === leafId
     )
-    // Why: a renderer that lists the tab republishes its own snapshot once it drops the pane.
-    if (!snapshot || !tab || this.tabs.has(tabId)) {
+    if (
+      options.originalPresentation &&
+      (!this.originalTerminalExecutionMatches(options.originalPresentation.identity) ||
+        !matchesTerminalSurfaceCapture(
+          options.originalPresentation,
+          this.getWorkspaceSessionHostIdsForTab(worktreeId, tabId),
+          (hostId) => this.store?.getWorkspaceSession?.(hostId)
+        ))
+    ) {
+      throw new Error('terminal_pane_owner_changed')
+    }
+    const original = options.originalPresentation?.identity
+    const bound = tab?.ptyId ?? tab?.parentLayout?.ptyIdsByLeafId?.[leafId]
+    if (
+      original &&
+      ((bound && bound !== original.ptyId) ||
+        (tab?.incarnationId && tab.incarnationId !== original.incarnationId))
+    ) {
+      throw new Error('terminal_pane_owner_changed')
+    }
+    if (original?.ptyId) {
+      const pty = this.ptysById.get(original.ptyId)
+      if (pty) {
+        pty.runtimeSessionOwned = false
+      }
+      this.setPairedRendererSessionOwnership(original.ptyId, false)
+    }
+    // A renderer can publish removal while its required durable close is awaiting completion.
+    if (!snapshot || !tab || (!original && this.tabs.has(tabId))) {
+      if (original) {
+        this.publishRetiredTerminalSurfaceProofs(worktreeId, options.retirementProofs ?? [])
+      }
       return
     }
-    const proof = this.getMobileSessionTerminalRetirementProof(worktreeId, tab)
+    const proof = !original && this.getMobileSessionTerminalRetirementProof(worktreeId, tab)
     const retired = retireTerminalSurfacesFromSnapshot({
       snapshot,
-      ptyId: tab.ptyId ?? tab.parentLayout?.ptyIdsByLeafId?.[leafId] ?? '',
+      ptyId: original?.ptyId ?? tab.ptyId ?? tab.parentLayout?.ptyIdsByLeafId?.[leafId] ?? '',
       exactSurfaces: [{ parentTabId: tabId, leafId }],
       exactOnly: true,
-      ...(proof ? { retirementProofs: [proof] } : {})
+      retirementProofs: options.retirementProofs ?? (proof ? [proof] : [])
     })
     if (retired) {
       this.storeMobileSessionSnapshot(worktreeId, retired.snapshot)
diff --git a/src/main/runtime/session-lifecycle/projection/prune-mobile-session-tab-group-layout.ts b/src/main/runtime/session-lifecycle/projection/prune-mobile-session-tab-group-layout.ts
index 798684ab2f2d..d16b5ef49414 100644
--- a/src/main/runtime/session-lifecycle/projection/prune-mobile-session-tab-group-layout.ts
+++ b/src/main/runtime/session-lifecycle/projection/prune-mobile-session-tab-group-layout.ts
@@ -317,6 +317,11 @@ export abstract class OrcaRuntimeWithPruneMobileSessionTabGroupLayout extends Or
     if (leaf?.ptyId) {
       return this.issueHandle(leaf)
     }
-    return panePty ? this.issuePtyHandle(panePty) : null
+    if (panePty) {
+      return this.issuePtyHandle(panePty)
+    }
+    const ended = leaf ? this.handleByLeafKey.get(this.getLeafKey(leaf.tabId, leaf.leafId)) : null
+    const ptyId = ended ? this.handles.get(ended)?.ptyId : null
+    return ptyId && this.getPtyLivenessVerdict(ptyId)?.status === 'exited' ? (ended ?? null) : null
   }
 }
diff --git a/src/main/runtime/session-tabs/explicit-terminal-close-pty-stops.ts b/src/main/runtime/session-tabs/explicit-terminal-close-pty-stops.ts
index aa8eac1964bd..f0fa321efa6c 100644
--- a/src/main/runtime/session-tabs/explicit-terminal-close-pty-stops.ts
+++ b/src/main/runtime/session-tabs/explicit-terminal-close-pty-stops.ts
@@ -20,42 +20,62 @@ export abstract class OrcaRuntimeWithExplicitCloseTabPtyStops extends OrcaRuntim
     for (const ptyId of ptyIds) {
       this.markPtyStopRequested(ptyId)
       const expectedIncarnationId = capturedIncarnationId ?? this.ptysById.get(ptyId)?.incarnationId
-      let stopped = false
-      if (this.ptyController?.stopAndWait) {
-        try {
-          stopped = await this.ptyController.stopAndWait(ptyId, {
-            deadlineMs,
-            ...(capturedIncarnationId ? { expectedIncarnationId: capturedIncarnationId } : {})
-          })
-        } catch (error) {
-          this.markPtyLivenessUnverifiable(ptyId, errorMessage(error))
-        }
-        // Preserve an observed exit when a broader inventory check could not finish.
-        if (
-          !stopped &&
-          expectedIncarnationId &&
-          this.ptysById.get(ptyId)?.incarnationId === expectedIncarnationId &&
-          this.getPtyLivenessVerdict(ptyId)?.status === 'exited'
-        ) {
-          stopped = true
-        }
-        if (!stopped && !capturedIncarnationId) {
-          const verdict = this.getPtyLivenessVerdict(ptyId)
-          const providerAlreadyRetiredPty =
-            verdict?.status === 'unverifiable' &&
-            verdict.reason === SSH_PROVIDER_UNREGISTERED_REASON
-          if (!providerAlreadyRetiredPty) {
-            this.ptyController.kill(ptyId)
-            if (!verdict || verdict.status === 'live') {
-              this.markPtyLivenessUnverifiable(
-                ptyId,
-                'a follow-up stop was issued but its outcome could not be verified'
-              )
+      const current = this.ptysById.get(ptyId)
+      const replacement = this.pendingPtyHandleReplacementFences.get(ptyId)
+      let stopped =
+        !!capturedIncarnationId &&
+        (!current || current.incarnationId === capturedIncarnationId) &&
+        (!replacement || replacement.incarnationId === capturedIncarnationId) &&
+        this.getPtyLivenessVerdict(ptyId)?.status === 'exited'
+      const settle = capturedIncarnationId
+        ? this.intentionalPtyStops.mark(ptyId, 'closing', capturedIncarnationId)
+        : null
+      try {
+        if (!stopped && this.ptyController?.stopAndWait) {
+          try {
+            stopped = await this.ptyController.stopAndWait(ptyId, {
+              deadlineMs,
+              ...(capturedIncarnationId ? { expectedIncarnationId: capturedIncarnationId } : {})
+            })
+          } catch (error) {
+            this.markPtyLivenessUnverifiable(ptyId, errorMessage(error))
+          }
+          // Preserve an observed exit when a broader inventory check could not finish.
+          if (
+            !stopped &&
+            expectedIncarnationId &&
+            (!this.ptysById.has(ptyId) ||
+              this.ptysById.get(ptyId)?.incarnationId === expectedIncarnationId) &&
+            (!this.pendingPtyHandleReplacementFences.has(ptyId) ||
+              this.pendingPtyHandleReplacementFences.get(ptyId)?.incarnationId ===
+                expectedIncarnationId) &&
+            this.getPtyLivenessVerdict(ptyId)?.status === 'exited'
+          ) {
+            stopped = true
+          }
+          if (!stopped && !capturedIncarnationId) {
+            const verdict = this.getPtyLivenessVerdict(ptyId)
+            const providerAlreadyRetiredPty =
+              verdict?.status === 'unverifiable' &&
+              verdict.reason === SSH_PROVIDER_UNREGISTERED_REASON
+            if (!providerAlreadyRetiredPty) {
+              this.ptyController.kill(ptyId)
+              if (!verdict || verdict.status === 'live') {
+                this.markPtyLivenessUnverifiable(
+                  ptyId,
+                  'a follow-up stop was issued but its outcome could not be verified'
+                )
+              }
             }
           }
+        } else if (!capturedIncarnationId) {
+          stopped = this.ptyController?.kill(ptyId) ?? false
+        }
+      } finally {
+        settle?.(stopped)
+        if (capturedIncarnationId && !stopped) {
+          this.clearPtyStopRequest(ptyId)
         }
-      } else if (!capturedIncarnationId) {
-        stopped = this.ptyController?.kill(ptyId) ?? false
       }
       if (ptyId === addressedPtyId) {
         addressedPtyStop = { stopped }
diff --git a/src/main/runtime/session-tabs/explicit-terminal-close-stops.ts b/src/main/runtime/session-tabs/explicit-terminal-close-stops.ts
index 7c0d94f92f2d..65388946a01d 100644
--- a/src/main/runtime/session-tabs/explicit-terminal-close-stops.ts
+++ b/src/main/runtime/session-tabs/explicit-terminal-close-stops.ts
@@ -1,3 +1,10 @@
+import { windowListsTab } from '../terminal/surface/main-terminal-surfaces'
+import { isOriginalTerminalHandle } from '../workspace-session-terminal-tab-retirement-identity'
+import { NO_STOP } from './explicit-terminal-close-pty-stops'
+import {
+  matchesTerminalSurfaceCapture,
+  type TerminalSurfaceCloseCapture
+} from '../../../shared/terminal-tab-close'
 import type { WorktreePtyHostFence } from '../worktree-pty-host-fence'
 import type { RuntimeTerminalClose } from '../../../shared/runtime-types'
 import type { RuntimePtyTabCloseAuthority } from '../runtime-terminal-state-records'
@@ -7,16 +14,14 @@ import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../shared/layout-owner-switch'
 import type { LayoutApplyReply } from '../../../shared/workspace-layout/workspace-layout-command-types'
 import type { WindowLayoutCommand } from '../runtime-layout-apply'
 import { closeMainOwnedPaneByHandle } from './main-handle-close'
+import { OrcaRuntimeWithExplicitTerminalTabClose } from './explicit-terminal-tab-close'
 import {
-  NO_STOP,
-  OrcaRuntimeWithExplicitCloseTabPtyStops
-} from './explicit-terminal-close-pty-stops'
-import {
-  closePairedHostLeafFirst,
+  closeTerminalOnPairedHost,
+  getPairedHostTerminal,
   isTerminalTabPinnedInSession
 } from './paired-host-terminal-close'
 
-export abstract class OrcaRuntimeWithStopExplicitlyClosedTabPtys extends OrcaRuntimeWithExplicitCloseTabPtyStops {
+export abstract class OrcaRuntimeWithStopExplicitlyClosedTabPtys extends OrcaRuntimeWithExplicitTerminalTabClose {
   protected abstract getResolvedWorktreeMap(): Promise<Map<string, ResolvedWorktree>>
   abstract applyLayoutCommand(command: WindowLayoutCommand): Promise<LayoutApplyReply>
   protected abstract refreshPtyWorktreeRecordsFromController(
@@ -43,58 +48,94 @@ export abstract class OrcaRuntimeWithStopExplicitlyClosedTabPtys extends OrcaRun
     terminalHandlesByPtyId: Readonly<Record<string, readonly string[]>>
   }): void
 
-  /** null when this machine owns the PTY; see `closePairedHostLeafFirst` otherwise. */
-  private closeOnOwningPairedHost(
+  async closeTerminal(
     handle: string,
-    leaf: { worktreeId: string; tabId: string; leafId: string; ptyId: string | null },
-    method: 'terminal.close' | 'terminal.closeTab',
-    closesTab: boolean
-  ): ReturnType<typeof closePairedHostLeafFirst> {
-    return closePairedHostLeafFirst(leaf, method, {
-      call: (environmentId, hostMethod, params, timeoutMs) =>
-        this.callOrchestrationWorkerServer(environmentId, hostMethod, params, timeoutMs),
-      isTabPinned: () =>
-        closesTab &&
-        this.getWorkspaceSessionHostIdsForTab(leaf.worktreeId, leaf.tabId).some((hostId) =>
-          isTerminalTabPinnedInSession(this.store?.getWorkspaceSession?.(hostId), leaf)
-        ),
-      readBoundLeaf: () => this.getLiveLeafForHandle(handle).leaf
-    })
-  }
-
-  async closeTerminal(handle: string, incarnation?: string): Promise<RuntimeTerminalClose> {
+    incarnation?: string,
+    originalPresentation?: TerminalSurfaceCloseCapture
+  ): Promise<RuntimeTerminalClose> {
     const pty = this.getLivePtyForHandle(handle)
-    const addressedPty =
-      pty?.pty ??
-      (incarnation
-        ? this.ptysById.get(this.getLiveLeafForHandle(handle).leaf.ptyId ?? '')
-        : undefined)
-    // The handle's fence: a replacement execution under the same handle is never closed.
-    if (incarnation && addressedPty?.incarnationId !== incarnation) {
-      throw new Error('terminal_handle_stale')
-    }
-    // A fenced switch stops its captured execution before any presentation await.
-    const capturedStop =
-      incarnation && addressedPty
-        ? await this.stopExplicitlyClosedTabPtys(
-            [addressedPty.ptyId],
-            addressedPty.ptyId,
-            incarnation
+    if (originalPresentation) {
+      const remote = getPairedHostTerminal(pty?.pty.ptyId ?? this.handles.get(handle)?.ptyId)
+      if (remote) {
+        const leaf = this.getLiveLeafForHandle(handle).leaf
+        const pane = { kind: 'pane' as const, tabId: leaf.tabId, leafId: leaf.leafId }
+        if (
+          this.resolveTerminalCloseTarget(leaf.worktreeId, pane) === 'last-pane' &&
+          this.getWorkspaceSessionHostIdsForTab(leaf.worktreeId, leaf.tabId).some((id) =>
+            isTerminalTabPinnedInSession(this.store?.getWorkspaceSession?.(id), leaf)
           )
-        : null
-    if (
-      incarnation &&
-      (!capturedStop?.stopped ||
-        (addressedPty &&
-          this.ptysById.has(addressedPty.ptyId) &&
-          this.ptysById.get(addressedPty.ptyId)?.incarnationId !== incarnation))
-    ) {
-      throw new Error('terminal_close_unverifiable')
+        ) {
+          throw new Error('terminal_tab_pinned')
+        }
+        const close = await closeTerminalOnPairedHost(
+          (...args) => this.callOrchestrationWorkerServer(...args),
+          remote,
+          'terminal.close',
+          { expectedIncarnationId: incarnation, originalPresentation }
+        )
+        return { handle, tabId: leaf.tabId, ...close }
+      }
+      const source = originalPresentation.identity
+      const record = this.handles.get(handle)
+      const currentPty = source.ptyId ? this.ptysById.get(source.ptyId) : null
+      const leaf = this.leaves.get(this.getLeafKey(source.tabId, source.leafId))
+      if (
+        !source.ptyId ||
+        !incarnation ||
+        !isOriginalTerminalHandle({
+          runtimeId: this.runtimeId,
+          record,
+          currentPty,
+          leaf,
+          source,
+          incarnation
+        }) ||
+        !matchesTerminalSurfaceCapture(
+          originalPresentation,
+          this.getWorkspaceSessionHostIdsForTab(source.worktreeId, source.tabId),
+          (hostId) => this.store?.getWorkspaceSession?.(hostId)
+        )
+      ) {
+        throw new Error('terminal_handle_stale')
+      }
+      const target = { kind: 'pane' as const, tabId: source.tabId, leafId: source.leafId }
+      const rendererOwnsPresentation = windowListsTab(this, this.tabs, source.tabId)
+      const proof = {
+        parentTabId: source.tabId,
+        leafId: source.leafId,
+        ptyId: source.ptyId,
+        terminal: handle,
+        incarnationId: incarnation
+      }
+      if (
+        this.resolveTerminalCloseTarget(source.worktreeId, target) === 'last-pane' &&
+        this.getWorkspaceSessionHostIdsForTab(source.worktreeId, source.tabId).some((hostId) =>
+          isTerminalTabPinnedInSession(this.store?.getWorkspaceSession?.(hostId), source)
+        )
+      ) {
+        throw new Error('terminal_tab_pinned')
+      }
+      const stop = await this.stopExplicitlyClosedTabPtys([source.ptyId], source.ptyId, incarnation)
+      if (!stop.stopped) {
+        throw new Error('terminal_close_unverifiable')
+      }
+      const outcome = await this.closeMobileSessionTab(`id:${source.worktreeId}`, source.tabId, {
+        originalPresentation,
+        rendererOwnsPresentation,
+        localPtyTeardownOwnedExternally: true,
+        retirementProofs: [proof]
+      })
+      if (outcome.refused) {
+        throw new Error('terminal_pane_close_failed')
+      }
+      this.claudeAgentTeams.removeTeamForLeaderHandle(handle)
+      return this.describeTerminalClose(handle, source.tabId, source.ptyId, stop)
+    }
+    if (incarnation && pty?.pty.incarnationId !== incarnation) {
+      throw new Error('terminal_handle_stale')
     }
-    const stopCapturedOrCurrent = (ids: readonly string[], addressed: string) =>
-      capturedStop
-        ? Promise.resolve(capturedStop)
-        : this.stopExplicitlyClosedTabPtys(ids, addressed)
+    const stopCurrent = (ids: readonly string[], addressed: string) =>
+      this.stopExplicitlyClosedTabPtys(ids, addressed)
     // Switch point: a pane main owns closes in main's layout, whatever the window lists.
     if (ORCA_LAYOUT_OWNER_IS_MAIN) {
       const mainClose = await closeMainOwnedPaneByHandle(
@@ -105,7 +146,7 @@ export abstract class OrcaRuntimeWithStopExplicitlyClosedTabPtys extends OrcaRun
           remoteSessionIdOf: (worktreeId, tabId) =>
             this.getWorkspaceSessionForWorktree(worktreeId)?.remoteSessionIdsByTabId?.[tabId],
           applyLayoutCommand: (command) => this.applyLayoutCommand(command),
-          stop: stopCapturedOrCurrent,
+          stop: stopCurrent,
           describe: (...args) => this.describeTerminalClose(...args)
         },
         handle,
@@ -153,7 +194,7 @@ export abstract class OrcaRuntimeWithStopExplicitlyClosedTabPtys extends OrcaRun
           }
           this.notifyRendererOfHeadlessTerminalClose(tabId)
         }
-        const stop = await stopCapturedOrCurrent(ptyIdsToKill, pty.pty.ptyId)
+        const stop = await stopCurrent(ptyIdsToKill, pty.pty.ptyId)
         return this.describeTerminalClose(handle, tabId, pty.pty.ptyId, stop)
       }
       if (closesTab && surface && ptyCloseAuthority && !this.tabs.has(surface.tab.parentTabId)) {
@@ -167,11 +208,11 @@ export abstract class OrcaRuntimeWithStopExplicitlyClosedTabPtys extends OrcaRun
           if (!(error instanceof Error) || error.message !== 'workspace_session_unavailable') {
             throw error
           }
-          const stop = await stopCapturedOrCurrent([pty.pty.ptyId], pty.pty.ptyId)
+          const stop = await stopCurrent([pty.pty.ptyId], pty.pty.ptyId)
           this.notifyRendererOfHeadlessTerminalClose(tabId)
           return this.describeTerminalClose(handle, tabId, pty.pty.ptyId, stop)
         }
-        const stop = await stopCapturedOrCurrent([pty.pty.ptyId], pty.pty.ptyId)
+        const stop = await stopCurrent([pty.pty.ptyId], pty.pty.ptyId)
         return this.describeTerminalClose(handle, tabId, pty.pty.ptyId, stop)
       }
       // Why the tabs guard: a headless host has no renderer tab to close through the notifier.
@@ -194,11 +235,11 @@ export abstract class OrcaRuntimeWithStopExplicitlyClosedTabPtys extends OrcaRun
           tabClosed = false
         }
         if (tabClosed) {
-          const stop = await stopCapturedOrCurrent(ptyIdsToKill, pty.pty.ptyId)
+          const stop = await stopCurrent(ptyIdsToKill, pty.pty.ptyId)
           return this.describeTerminalClose(handle, tabId, pty.pty.ptyId, stop)
         }
       }
-      const stop = await stopCapturedOrCurrent([pty.pty.ptyId], pty.pty.ptyId)
+      const stop = await stopCurrent([pty.pty.ptyId], pty.pty.ptyId)
       if (!closesTab) {
         // Why: the pane's removal is this close's own commit, not a side effect of its exit. An
         // unconfirmed stop is unverifiable, never a reason to close the live siblings with it.
@@ -251,7 +292,7 @@ export abstract class OrcaRuntimeWithStopExplicitlyClosedTabPtys extends OrcaRun
       }
       return { handle, tabId: leaf.tabId, ...hostClose.close }
     }
-    const stop = leaf.ptyId ? await stopCapturedOrCurrent(ptyIdsToKill, leaf.ptyId) : NO_STOP
+    const stop = leaf.ptyId ? await stopCurrent(ptyIdsToKill, leaf.ptyId) : NO_STOP
     if (!closesTab) {
       await this.closeTerminalPane(leaf.worktreeId, paneTarget)
     } else if (!this.notifier?.closeTerminalTab) {
@@ -259,60 +300,4 @@ export abstract class OrcaRuntimeWithStopExplicitlyClosedTabPtys extends OrcaRun
     }
     return this.describeTerminalClose(handle, leaf.tabId, leaf.ptyId ?? null, stop)
   }
-
-  async closeTerminalTab(handle: string): Promise<RuntimeTerminalClose> {
-    // Switch point: a pane main owns closes in main's layout, whatever the window lists.
-    if (ORCA_LAYOUT_OWNER_IS_MAIN) {
-      const mainClose = await closeMainOwnedPaneByHandle(
-        {
-          runtime: this,
-          livePty: () => this.getLivePtyForHandle(handle)?.pty ?? null,
-          liveLeaf: () => this.getLiveLeafForHandle(handle).leaf,
-          remoteSessionIdOf: (worktreeId, tabId) =>
-            this.getWorkspaceSessionForWorktree(worktreeId)?.remoteSessionIdsByTabId?.[tabId],
-          applyLayoutCommand: (command) => this.applyLayoutCommand(command),
-          stop: (ptyIds, addressed) => this.stopExplicitlyClosedTabPtys(ptyIds, addressed),
-          describe: (...args) => this.describeTerminalClose(...args)
-        },
-        handle,
-        true
-      )
-      if (mainClose) {
-        this.claudeAgentTeams.removeTeamForLeaderHandle(handle)
-        return mainClose
-      }
-    }
-    const pty = this.getLivePtyForHandle(handle)
-    if (pty) {
-      const closeAuthority: RuntimePtyTabCloseAuthority = {
-        handle,
-        ptyId: pty.pty.ptyId,
-        incarnationId: pty.pty.incarnationId,
-        worktreeId: pty.pty.worktreeId
-      }
-      const tabId =
-        this.resolvePtyTabCloseSurfaceAuthority(closeAuthority)?.surface.tab.parentTabId ??
-        pty.pty.tabId
-      if (!tabId) {
-        return this.closeTerminal(handle)
-      }
-      // Why: a handle-addressed CLI/automation close is an explicit intent, so
-      // it must stay destructive under the non-user close adjudication gate.
-      await this.closeMobileSessionTab(`id:${pty.pty.worktreeId}`, tabId, {
-        reason: 'user',
-        expectedPtyCloseAuthority: closeAuthority
-      })
-      this.claudeAgentTeams.removeTeamForLeaderHandle(handle)
-      return { handle, tabId, closeMode: 'tab', ptyKilled: false }
-    }
-    this.assertGraphReady()
-    const { leaf } = this.getLiveLeafForHandle(handle)
-    const hostClose = await this.closeOnOwningPairedHost(handle, leaf, 'terminal.closeTab', true)
-    if (hostClose && !hostClose.stillBound) {
-      return { handle, tabId: leaf.tabId, ...hostClose.close, closeMode: 'tab' }
-    }
-    await this.closeMobileSessionTab(`id:${leaf.worktreeId}`, leaf.tabId, { reason: 'user' })
-    this.claudeAgentTeams.removeTeamForLeaderHandle(handle)
-    return { handle, tabId: leaf.tabId, ptyKilled: false, ...hostClose?.close, closeMode: 'tab' }
-  }
 }
diff --git a/src/main/runtime/session-tabs/explicit-terminal-tab-close.ts b/src/main/runtime/session-tabs/explicit-terminal-tab-close.ts
new file mode 100644
index 000000000000..3de2e2a0eeff
--- /dev/null
+++ b/src/main/runtime/session-tabs/explicit-terminal-tab-close.ts
@@ -0,0 +1,90 @@
+import { OrcaRuntimeWithExplicitCloseTabPtyStops } from './explicit-terminal-close-pty-stops'
+export { NO_STOP } from './explicit-terminal-close-pty-stops'
+import type { RuntimeTerminalClose } from '../../../shared/runtime-types'
+import type { LayoutApplyReply } from '../../../shared/workspace-layout/workspace-layout-command-types'
+import type { WindowLayoutCommand } from '../runtime-layout-apply'
+import type { RuntimePtyTabCloseAuthority } from '../runtime-terminal-state-records'
+import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../shared/layout-owner-switch'
+import { closeMainOwnedPaneByHandle } from './main-handle-close'
+import {
+  closePairedHostLeafFirst,
+  isTerminalTabPinnedInSession
+} from './paired-host-terminal-close'
+
+export abstract class OrcaRuntimeWithExplicitTerminalTabClose extends OrcaRuntimeWithExplicitCloseTabPtyStops {
+  abstract applyLayoutCommand(command: WindowLayoutCommand): Promise<LayoutApplyReply>
+  /** null when this machine owns the PTY; see `closePairedHostLeafFirst` otherwise. */
+  protected closeOnOwningPairedHost(
+    handle: string,
+    leaf: { worktreeId: string; tabId: string; leafId: string; ptyId: string | null },
+    method: 'terminal.close' | 'terminal.closeTab',
+    closesTab: boolean
+  ): ReturnType<typeof closePairedHostLeafFirst> {
+    return closePairedHostLeafFirst(leaf, method, {
+      call: (environmentId, hostMethod, params, timeoutMs) =>
+        this.callOrchestrationWorkerServer(environmentId, hostMethod, params, timeoutMs),
+      isTabPinned: () =>
+        closesTab &&
+        this.getWorkspaceSessionHostIdsForTab(leaf.worktreeId, leaf.tabId).some((hostId) =>
+          isTerminalTabPinnedInSession(this.store?.getWorkspaceSession?.(hostId), leaf)
+        ),
+      readBoundLeaf: () => this.getLiveLeafForHandle(handle).leaf
+    })
+  }
+
+  async closeTerminalTab(handle: string): Promise<RuntimeTerminalClose> {
+    // Switch point: a pane main owns closes in main's layout, whatever the window lists.
+    if (ORCA_LAYOUT_OWNER_IS_MAIN) {
+      const mainClose = await closeMainOwnedPaneByHandle(
+        {
+          runtime: this,
+          livePty: () => this.getLivePtyForHandle(handle)?.pty ?? null,
+          liveLeaf: () => this.getLiveLeafForHandle(handle).leaf,
+          remoteSessionIdOf: (worktreeId, tabId) =>
+            this.getWorkspaceSessionForWorktree(worktreeId)?.remoteSessionIdsByTabId?.[tabId],
+          applyLayoutCommand: (command) => this.applyLayoutCommand(command),
+          stop: (ptyIds, addressed) => this.stopExplicitlyClosedTabPtys(ptyIds, addressed),
+          describe: (...args) => this.describeTerminalClose(...args)
+        },
+        handle,
+        true
+      )
+      if (mainClose) {
+        this.claudeAgentTeams.removeTeamForLeaderHandle(handle)
+        return mainClose
+      }
+    }
+    const pty = this.getLivePtyForHandle(handle)
+    if (pty) {
+      const closeAuthority: RuntimePtyTabCloseAuthority = {
+        handle,
+        ptyId: pty.pty.ptyId,
+        incarnationId: pty.pty.incarnationId,
+        worktreeId: pty.pty.worktreeId
+      }
+      const tabId =
+        this.resolvePtyTabCloseSurfaceAuthority(closeAuthority)?.surface.tab.parentTabId ??
+        pty.pty.tabId
+      if (!tabId) {
+        return this.closeTerminal(handle)
+      }
+      // Why: a handle-addressed CLI/automation close is an explicit intent, so
+      // it must stay destructive under the non-user close adjudication gate.
+      await this.closeMobileSessionTab(`id:${pty.pty.worktreeId}`, tabId, {
+        reason: 'user',
+        expectedPtyCloseAuthority: closeAuthority
+      })
+      this.claudeAgentTeams.removeTeamForLeaderHandle(handle)
+      return { handle, tabId, closeMode: 'tab', ptyKilled: false }
+    }
+    this.assertGraphReady()
+    const { leaf } = this.getLiveLeafForHandle(handle)
+    const hostClose = await this.closeOnOwningPairedHost(handle, leaf, 'terminal.closeTab', true)
+    if (hostClose && !hostClose.stillBound) {
+      return { handle, tabId: leaf.tabId, ...hostClose.close, closeMode: 'tab' }
+    }
+    await this.closeMobileSessionTab(`id:${leaf.worktreeId}`, leaf.tabId, { reason: 'user' })
+    this.claudeAgentTeams.removeTeamForLeaderHandle(handle)
+    return { handle, tabId: leaf.tabId, ptyKilled: false, ...hostClose?.close, closeMode: 'tab' }
+  }
+}
diff --git a/src/main/runtime/session-tabs/paired-host-terminal-close.ts b/src/main/runtime/session-tabs/paired-host-terminal-close.ts
index 6cf1d7b63797..a942ad82b7b0 100644
--- a/src/main/runtime/session-tabs/paired-host-terminal-close.ts
+++ b/src/main/runtime/session-tabs/paired-host-terminal-close.ts
@@ -1,3 +1,4 @@
+import type { TerminalSurfaceCloseCapture } from '../../../shared/terminal-tab-close'
 import { parseRemoteRuntimePtyId } from '../../../shared/remote-runtime-pty-id'
 import type { RuntimeTerminalClose } from '../../../shared/runtime-types'
 import type { WorkspaceSessionState } from '../../../shared/workspace-session-state-types'
@@ -10,7 +11,11 @@ export type PairedHostTerminal = { environmentId: string; handle: string }
 export type PairedHostTerminalCall = (
   environmentId: string,
   method: 'terminal.close' | 'terminal.closeTab',
-  params: { terminal: string },
+  params: {
+    terminal: string
+    expectedIncarnationId?: string
+    originalPresentation?: TerminalSurfaceCloseCapture
+  },
   timeoutMs: number
 ) => Promise<unknown>
 
@@ -58,19 +63,23 @@ function errorCode(error: unknown): string | null {
 export async function closeTerminalOnPairedHost(
   call: PairedHostTerminalCall,
   terminal: PairedHostTerminal,
-  method: 'terminal.close' | 'terminal.closeTab'
+  method: 'terminal.close' | 'terminal.closeTab',
+  original?: { expectedIncarnationId?: string; originalPresentation?: TerminalSurfaceCloseCapture }
 ): Promise<Omit<RuntimeTerminalClose, 'handle' | 'tabId'>> {
   let result: unknown
   try {
     result = await call(
       terminal.environmentId,
       method,
-      { terminal: terminal.handle },
+      { terminal: terminal.handle, ...original },
       PAIRED_HOST_TERMINAL_CLOSE_TIMEOUT_MS
     )
   } catch (error) {
     const code = errorCode(error)
-    if (code === 'terminal_not_found') {
+    if (original?.originalPresentation) {
+      throw error
+    }
+    if (code === 'terminal_not_found' && !original?.originalPresentation) {
       // The owner has no such terminal, so nothing runs there to stop.
       return { ptyKilled: false }
     }
@@ -86,6 +95,9 @@ export async function closeTerminalOnPairedHost(
   }
   const close = readHostClose(result)
   if (!close) {
+    if (original?.originalPresentation) {
+      throw new Error('terminal_close_unverifiable')
+    }
     // Why unverifiable: the owner answered, but not with a receipt this build can read.
     return {
       ptyKilled: false,
@@ -93,6 +105,9 @@ export async function closeTerminalOnPairedHost(
       ptyStopReason: 'its owning host returned no close receipt'
     }
   }
+  if (original?.originalPresentation && !close.ptyKilled) {
+    throw new Error('terminal_close_unverifiable')
+  }
   return close
 }
 
diff --git a/src/main/runtime/session-tabs/terminal-surface-close-commit.ts b/src/main/runtime/session-tabs/terminal-surface-close-commit.ts
new file mode 100644
index 000000000000..23beb61800f2
--- /dev/null
+++ b/src/main/runtime/session-tabs/terminal-surface-close-commit.ts
@@ -0,0 +1,153 @@
+import type { RuntimeMobileSessionTerminalTab } from '../../../shared/runtime-types'
+import { resolveTerminalCloseTarget, type PaneCloseResolution } from '../terminal-surface-close'
+import {
+  isRetainedTerminalSurfaceIdentity,
+  type TerminalSurfaceCloseIdentity
+} from '../../../shared/terminal-tab-close'
+import type { LayoutApplyReply } from '../../../shared/workspace-layout/workspace-layout-command-types'
+import type { WindowLayoutCommand, LayoutCommandRunOptions } from '../runtime-layout-apply'
+import { OrcaRuntimeWithPersistTerminalSurfaceRetirements } from './terminal-surface-retirements'
+import { captureAcknowledgedTerminalTabRetirement } from '../workspace-session-terminal-tab-retirement-identity'
+import { closeLeafOrTab } from '../../persistence/terminal-topology/terminal-topology-commit'
+import {
+  captureTerminalCloseRequest,
+  type TerminalSurfaceCloseOptions
+} from '../terminal-surface-close'
+import type { TerminalSurfaceCloseTarget } from '../../../shared/terminal-surface-close-target'
+
+export abstract class OrcaRuntimeWithTerminalSurfaceCloseCommit extends OrcaRuntimeWithPersistTerminalSurfaceRetirements {
+  abstract applyLayoutCommand(
+    command: WindowLayoutCommand,
+    options?: LayoutCommandRunOptions
+  ): Promise<LayoutApplyReply>
+  protected originalTerminalExecutionMatches(source: TerminalSurfaceCloseIdentity): boolean {
+    const current = source.ptyId ? this.ptysById.get(source.ptyId) : null
+    const replacing = source.ptyId ? this.pendingPtyHandleReplacementFences.get(source.ptyId) : null
+    const leaf = this.leaves.get(this.getLeafKey(source.tabId, source.leafId))
+    return (
+      (!current || current.incarnationId === source.incarnationId) &&
+      (!leaf ||
+        (leaf.worktreeId === source.worktreeId && (!leaf.ptyId || leaf.ptyId === source.ptyId))) &&
+      isRetainedTerminalSurfaceIdentity(source, {
+        ...source,
+        worktreeId: current?.worktreeId ?? source.worktreeId,
+        ptyId: current?.ptyId ?? null,
+        incarnationId: replacing?.incarnationId ?? current?.incarnationId ?? null
+      })
+    )
+  }
+
+  /** Resolves a close main started against the copy of the tab's panes its layout owner holds. */
+  protected resolveTerminalCloseTarget(
+    worktreeId: string,
+    target: TerminalSurfaceCloseTarget
+  ): PaneCloseResolution | 'tab' {
+    const graphLeafIds: string[] = []
+    for (const leaf of this.leaves.values()) {
+      if (leaf.tabId === target.tabId) {
+        graphLeafIds.push(leaf.leafId)
+      }
+    }
+    return resolveTerminalCloseTarget(target, {
+      rendererListsTab: this.tabs.has(target.tabId),
+      snapshotRows: (this.mobileSessionTabsByWorktree.get(worktreeId)?.tabs ?? []).filter(
+        (row): row is RuntimeMobileSessionTerminalTab =>
+          row.type === 'terminal' && row.parentTabId === target.tabId
+      ),
+      graphLeafIds,
+      sessionLayout:
+        this.getWorkspaceSessionForWorktree(worktreeId)?.terminalLayoutsByTabId?.[target.tabId]
+    })
+  }
+
+  protected captureTerminalTabRetirement(worktreeId: string, tabId: string) {
+    const originalHostId = this.getWorkspaceSessionHostIdForTab(worktreeId, tabId)
+    return captureAcknowledgedTerminalTabRetirement(worktreeId, tabId, () => {
+      const resolvedHostId = this.getWorkspaceSessionHostIdForTab(worktreeId, tabId)
+      const resolvedSession = this.store?.getWorkspaceSession?.(resolvedHostId)
+      // Emptying the last tab may reroute the worktree to its catalog host.
+      const hostId = resolvedSession?.tabsByWorktree[worktreeId]?.some((tab) => tab.id === tabId)
+        ? resolvedHostId
+        : originalHostId
+      return {
+        hostId,
+        session: this.store?.getWorkspaceSession?.(hostId) ?? null,
+        snapshot: this.mobileSessionTabsByWorktree.get(worktreeId),
+        incarnationOf: (ptyId) => this.ptysById.get(ptyId)?.incarnationId
+      }
+    })
+  }
+
+  /**
+   * The one close transaction every explicit terminal close reaches: durably commits the membership
+   * removal in the owning host's partition. Callers publish and kill afterwards.
+   */
+  protected async closeTerminalSurface(
+    worktreeId: string,
+    target: TerminalSurfaceCloseTarget,
+    options: TerminalSurfaceCloseOptions = {}
+  ): Promise<string[]> {
+    const store = this.store
+    if (!store?.getWorkspaceSession || !store.setWorkspaceSession || !store.runDurableMutation) {
+      throw new Error('workspace_session_unavailable')
+    }
+    // Why: a tab its layout owner already removed has no newer owner; refusing would only strand it.
+    const acknowledgeTabRetirement =
+      target.kind === 'tab' && !options.closedByLayoutOwner
+        ? this.captureTerminalTabRetirement(worktreeId, target.tabId)
+        : null
+    let ptyIdsToKill: string[] = []
+    let refusal: Error | undefined
+    const original = options.originalPresentation
+    const hostIds = () =>
+      original
+        ? [
+            ...new Set([
+              ...original.holders.map((holder) => holder.hostId),
+              ...this.getWorkspaceSessionHostIdsForTab(worktreeId, target.tabId).filter((id) =>
+                this.store
+                  ?.getWorkspaceSession?.(id)
+                  ?.tabsByWorktree[worktreeId]?.some((tab) => tab.id === target.tabId)
+              )
+            ])
+          ]
+        : this.getWorkspaceSessionHostIdsForTab(worktreeId, target.tabId)
+    const fenced = acknowledgeTabRetirement !== null && !original
+    try {
+      refusal = await store.runDurableMutation(
+        closeLeafOrTab({
+          worktreeId,
+          target,
+          options,
+          ...captureTerminalCloseRequest(
+            worktreeId,
+            target,
+            hostIds(),
+            // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: The existing guard requires this getter; preserve late-bound store access.
+            store as Parameters<typeof captureTerminalCloseRequest>[3],
+            fenced
+          ),
+          ownerMatches: () =>
+            original
+              ? this.originalTerminalExecutionMatches(original.identity)
+              : !acknowledgeTabRetirement || acknowledgeTabRetirement().matches,
+          hostIds,
+          getSession: (hostId) => store.getWorkspaceSession!(hostId),
+          setSession: (session, hostId) => store.setWorkspaceSession!(session, hostId),
+          onClosed: (closedPtyIds) => {
+            ptyIdsToKill = closedPtyIds
+          }
+        })
+      )
+    } catch (error) {
+      console.error('[runtime] failed to persist terminal close:', error)
+      if (original) {
+        throw error
+      }
+    }
+    if (refusal) {
+      throw refusal
+    }
+    return ptyIdsToKill
+  }
+}
diff --git a/src/main/runtime/terminal-intentional-stops.ts b/src/main/runtime/terminal-intentional-stops.ts
index 836743fde67f..2799d48d0cd1 100644
--- a/src/main/runtime/terminal-intentional-stops.ts
+++ b/src/main/runtime/terminal-intentional-stops.ts
@@ -1,12 +1,13 @@
 import { SYNTHETIC_KILL_EXIT_DUPLICATE_WINDOW_MS } from '../ipc/pty/delivery/visibility-state'
 
 /**
- * Why main stopped a PTY on purpose. Both kinds keep the pane's binding through the exit:
+ * Why main stopped a PTY on purpose. These kinds keep the pane's binding through the exit:
  * - `reversible`: sleep or hibernation; the binding is the wake hint.
+ * - `closing`: physical teardown is externally owned; explicit presentation removal follows.
  * - `replaced`: a restart stops the old process, or a reattach finds it gone; a new one takes over,
  *   at once or (after a daemon restart) when the pane next connects.
  */
-export type TerminalIntentionalStopKind = 'reversible' | 'replaced'
+export type TerminalIntentionalStopKind = 'reversible' | 'replaced' | 'closing'
 
 type IntentionalStopOwners = { inFlight: number; stopped: boolean }
 
diff --git a/src/main/runtime/terminal-surface-close.ts b/src/main/runtime/terminal-surface-close.ts
index b0c3e1f9337d..9b9a0bc54f87 100644
--- a/src/main/runtime/terminal-surface-close.ts
+++ b/src/main/runtime/terminal-surface-close.ts
@@ -1,3 +1,8 @@
+import { markAgentLaunchesClosedByUser } from '../agent-launch/agent-launch-pane-attachment'
+import {
+  matchesTerminalSurfaceCapture,
+  type TerminalSurfaceCloseCapture
+} from '../../shared/terminal-tab-close'
 import type { RuntimeSessionTabCloseReason } from '../../shared/runtime-session-contracts'
 import type { WorkspaceSessionState } from '../../shared/workspace-session-state-types'
 import {
@@ -172,6 +177,8 @@ export type TerminalSurfaceCloseOptions = {
   /** The desktop renderer's own close: its layout owner already removed the tab. Goes away with
    *  D1, once main owns the terminal layout. */
   closedByLayoutOwner?: boolean
+  originalPresentation?: TerminalSurfaceCloseCapture
+  onClosed?: (closedTab: boolean) => void
 }
 
 /** The desktop renderer's close intent as its IPC delivers it; main alone passes 'pty-exit'. */
@@ -231,7 +238,25 @@ export function terminalSurfaceCloseMutation(
         ]
       : undefined
   return () => {
-    if (!commit.ownerMatches()) {
+    const original = commit.options.originalPresentation
+    const hostIds = original
+      ? [
+          ...new Set([
+            ...original.holders.map((holder) => holder.hostId),
+            ...commit
+              .hostIds()
+              .filter((id) =>
+                commit
+                  .getSession(id)
+                  ?.tabsByWorktree[commit.worktreeId]?.some((row) => row.id === target.tabId)
+              )
+          ])
+        ]
+      : commit.hostIds()
+    if (
+      !commit.ownerMatches() ||
+      (original && !matchesTerminalSurfaceCapture(original, hostIds, commit.getSession))
+    ) {
       return { value: new Error('terminal_pane_owner_changed'), persist: false }
     }
     const results: {
@@ -239,16 +264,31 @@ export function terminalSurfaceCloseMutation(
       session: WorkspaceSessionState
       result: TerminalSurfaceCloseResult
     }[] = []
-    for (const hostId of commit.hostIds()) {
+    for (const hostId of hostIds) {
       const session = commit.getSession(hostId)
       if (!session) {
         return { value: new Error('workspace_session_unavailable'), persist: false }
       }
-      const result = closeTerminalSurfaceInWorkspaceSession(session, commit.worktreeId, target, {
-        force: commit.options.force,
-        paneIncarnationId,
-        reason: commit.options.reason ?? 'user'
-      })
+      const resolvedTarget =
+        commit.options.originalPresentation &&
+        target.kind === 'pane' &&
+        (resolvePaneClose(
+          collectTerminalLayoutLeafIds(session.terminalLayoutsByTabId[target.tabId]?.root),
+          target.leafId
+        ) === 'last-pane' ||
+          !session.tabsByWorktree[commit.worktreeId]?.some((row) => row.id === target.tabId))
+          ? { kind: 'tab' as const, tabId: target.tabId }
+          : target
+      const result = closeTerminalSurfaceInWorkspaceSession(
+        session,
+        commit.worktreeId,
+        resolvedTarget,
+        {
+          force: commit.options.force,
+          paneIncarnationId: original?.identity.incarnationId ?? paneIncarnationId,
+          reason: commit.options.reason ?? 'user'
+        }
+      )
       if (result.pinned) {
         return { value: new Error('terminal_tab_pinned'), persist: false }
       }
@@ -257,6 +297,7 @@ export function terminalSurfaceCloseMutation(
     const { requestedHolders } = commit
     const changedCopy =
       requestedHolders !== undefined &&
+      !commit.options.originalPresentation &&
       results
         .slice(1)
         .some(
@@ -271,6 +312,7 @@ export function terminalSurfaceCloseMutation(
       return { value: new Error('terminal_pane_owner_changed'), persist: false }
     }
     const closed = results.filter(({ result }) => result.closed)
+    commit.options.onClosed?.(results[0]?.result.resolution === 'tab')
     if (closed.length === 0) {
       const routed = results[0]
       if (!routed) {
@@ -281,7 +323,7 @@ export function terminalSurfaceCloseMutation(
       // spawn is refused; an existing record (an echo of that close) needs no second write.
       if (
         commit.options.allowMissing &&
-        target.kind === 'tab' &&
+        (target.kind === 'tab' || (original && routed.result.resolution === 'tab')) &&
         !hasClosedTerminalTabRecord(routed.session.closedTerminalTabTombstonesByTabId, target.tabId)
       ) {
         commit.setSession(routed.result.session, routed.hostId)
@@ -296,6 +338,9 @@ export function terminalSurfaceCloseMutation(
     for (const { hostId, result } of closed) {
       commit.setSession(result.session, hostId)
     }
+    if (original) {
+      markAgentLaunchesClosedByUser(commit.worktreeId, target)
+    }
     commit.onClosed([...new Set(closed.flatMap(({ result }) => result.ptyIdsToKill))])
     // Why no rollback: bookkeeping must not undo a user's close or skip its kill; a failed write
     // keeps the removal dirty in memory, so the next write persists it.
diff --git a/src/main/runtime/terminal/identity/terminal-handle-bindings.ts b/src/main/runtime/terminal/identity/terminal-handle-bindings.ts
index c86acb5cc8fa..67432f155e66 100644
--- a/src/main/runtime/terminal/identity/terminal-handle-bindings.ts
+++ b/src/main/runtime/terminal/identity/terminal-handle-bindings.ts
@@ -60,6 +60,15 @@ export abstract class OrcaRuntimeWithBindPtyIncarnationHandle extends OrcaRuntim
     for (const [ptyId, retained] of this.handleByPtyIncarnation) {
       const pty = this.ptysById.get(ptyId)
       const leaves = this.getLeavesForPty(ptyId)
+      const retainedLeaf = this.leaves.get(retained.leafKey)
+      if (
+        (!pty || (!pty.connected && pty.incarnationId === retained.incarnationId)) &&
+        this.getPtyLivenessVerdict(ptyId)?.status === 'exited' &&
+        retainedLeaf &&
+        (!retainedLeaf.ptyId || retainedLeaf.ptyId === ptyId)
+      ) {
+        continue
+      }
       // Why: a handle issued before the host reported the incarnation is un-fenced, so
       // learning it is not a replacement; only a known-to-different incarnation is.
       const incarnationReplaced =
@@ -155,12 +164,20 @@ export abstract class OrcaRuntimeWithBindPtyIncarnationHandle extends OrcaRuntim
     }
   }
 
-  protected invalidateLeafHandle(leafKey: string): void {
+  protected invalidateLeafHandle(leafKey: string, bindingCleared = false): void {
     const handle = this.handleByLeafKey.get(leafKey)
     if (!handle) {
       return
     }
     const record = this.handles.get(handle)
+    // A cleared binding after certified exit still addresses that readable ended process.
+    if (
+      bindingCleared &&
+      record?.ptyId &&
+      this.getPtyLivenessVerdict(record.ptyId)?.status === 'exited'
+    ) {
+      return
+    }
     if (record?.ptyId && this.handleByPtyIncarnation.get(record.ptyId)?.handle === handle) {
       this.handleByPtyIncarnation.delete(record.ptyId)
     }
diff --git a/src/main/runtime/terminal/launch/failed-start-pane.ts b/src/main/runtime/terminal/launch/failed-start-pane.ts
index 2c9e72eedd0f..7c9b14e17ece 100644
--- a/src/main/runtime/terminal/launch/failed-start-pane.ts
+++ b/src/main/runtime/terminal/launch/failed-start-pane.ts
@@ -1,3 +1,5 @@
+import { rekeyMovedPaneOwners } from '../../moved-pane-owner-rekey'
+import { applyWindowLayoutCommand } from '../../runtime-layout-apply'
 // Layout-owner build: main's starts publish their status on the pane, and a start main could not
 // make leaves its pane showing why, whether it failed before the pane was written or after.
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
@@ -43,8 +45,32 @@ export async function startKeepingFailedPane<T>(
 
 export abstract class OrcaRuntimeWithFailedStartPanes extends OrcaRuntimeWithCreateTerminal {
   protected abstract markPaneLiveTitlesDirty(): void
+  protected abstract inResumeRecordOrder<T>(write: () => Promise<T>): Promise<T>
   abstract applyLayoutCommand(command: WindowLayoutCommand): Promise<LayoutApplyReply>
 
+  protected async applyOwnedWindowLayoutCommand(
+    command: WindowLayoutCommand,
+    options?: LayoutCommandRunOptions
+  ): Promise<LayoutApplyReply> {
+    // A workspace's first surface comes after the live terminals main is placing.
+    const placing = this.livePlacementSettledFor(command)
+    const apply = (): Promise<LayoutApplyReply> =>
+      applyWindowLayoutCommand(
+        this.requireStore(),
+        (worktreeId, tabId) =>
+          tabId !== null
+            ? this.getWorkspaceSessionHostIdsForTab(worktreeId, tabId)
+            : [this.tryGetWorkspaceSessionHostIdForWorktree(worktreeId) ?? []].flat(),
+        command,
+        (move) => rekeyMovedPaneOwners(this, move),
+        { ...this.layoutCommandRun(command), ...options }
+      )
+    // A window's sleep or wake lands after the hook statuses main accepted before it, as in the window.
+    return await (ORCA_LAYOUT_OWNER_IS_MAIN && ['sleep', 'wake'].includes(command.type)
+      ? this.inResumeRecordOrder(apply)
+      : (placing?.then(apply) ?? apply()))
+  }
+
   /** Switch point: main's starts into panes it already holds, published until each binds. */
   protected readonly paneStartStatuses = ORCA_LAYOUT_OWNER_IS_MAIN
     ? new PaneStartStatuses(() => this.markPaneLiveTitlesDirty())
diff --git a/src/main/runtime/terminal/lifecycle/floating-session-liveness.ts b/src/main/runtime/terminal/lifecycle/floating-session-liveness.ts
index d753d69f73c5..4bb0ce64da42 100644
--- a/src/main/runtime/terminal/lifecycle/floating-session-liveness.ts
+++ b/src/main/runtime/terminal/lifecycle/floating-session-liveness.ts
@@ -133,7 +133,12 @@ export abstract class OrcaRuntimeWithRefreshFloatingWorkspacePtyLiveness extends
     this.terminalSpawnCommandsByPtyId.delete(ptyId)
     this.terminalRunFacts.delete(ptyId)
     this.disposePtyTitleTracker(ptyId)
-    this.invalidatePtyIncarnationHandle(ptyId)
+    const retained = this.handleByPtyIncarnation.get(ptyId)
+    const retainedLeaf = retained ? this.leaves.get(retained.leafKey) : null
+    // A certified exit may lose its PTY record while its readable pane still owns the handle.
+    if (this.getPtyLivenessVerdict(ptyId)?.status !== 'exited' || !retainedLeaf) {
+      this.invalidatePtyIncarnationHandle(ptyId)
+    }
     this.oscTitleScanTailByPtyId.delete(ptyId)
     this.osc7ScanTailByPtyId.delete(ptyId)
     this.terminalCwdByPtyId.delete(ptyId)
diff --git a/src/main/runtime/terminal/output/provider-buffer-capture.ts b/src/main/runtime/terminal/output/provider-buffer-capture.ts
index 8e4e5e02ad51..7d7d4c5a2bec 100644
--- a/src/main/runtime/terminal/output/provider-buffer-capture.ts
+++ b/src/main/runtime/terminal/output/provider-buffer-capture.ts
@@ -38,6 +38,27 @@ export abstract class OrcaRuntimeWithCaptureProviderTerminalBuffer extends OrcaR
     rows: number
   }): Promise<RuntimeTerminalProjection>
 
+  protected async readRenderedScreen(
+    ptyId: string,
+    read: RuntimeTerminalRead,
+    opts: { limit?: number } = {}
+  ): Promise<RuntimeTerminalRead> {
+    const visibleState = await this.readVisibleTerminalState(ptyId)
+    const projection =
+      visibleState ??
+      (await this.readProviderTerminalTailLines(ptyId, opts.limit, { visibleScreenOnly: true }))
+    if (projection.lines.length === 0) {
+      return { ...read, source: 'screen-unavailable' }
+    }
+    return buildVisibleSnapshotReadFallback(
+      read,
+      projection.lines,
+      opts.limit,
+      projection.draft,
+      projection.tailRows
+    )
+  }
+
   protected async captureProviderTerminalBuffer(
     ptyId: string,
     opts: { scrollbackRows?: number },
diff --git a/src/main/runtime/terminal/query/pty-terminal-summary.ts b/src/main/runtime/terminal/query/pty-terminal-summary.ts
index e2eb06034576..aff3bd523982 100644
--- a/src/main/runtime/terminal/query/pty-terminal-summary.ts
+++ b/src/main/runtime/terminal/query/pty-terminal-summary.ts
@@ -213,6 +213,15 @@ export abstract class OrcaRuntimeWithBuildPtyTerminalSummary extends OrcaRuntime
     const existingHandle = this.handleByLeafKey.get(leafKey)
     if (existingHandle) {
       const existingRecord = this.handles.get(existingHandle)
+      if (
+        existingRecord &&
+        existingRecord.worktreeId === leaf.worktreeId &&
+        existingRecord.ptyId &&
+        !leaf.ptyId &&
+        this.getPtyLivenessVerdict(existingRecord.ptyId)?.status === 'exited'
+      ) {
+        return existingHandle
+      }
       if (
         existingRecord &&
         existingRecord.rendererGraphEpoch === this.rendererGraphEpoch &&
diff --git a/src/main/runtime/terminal/recovery/resolve-terminal-pane.ts b/src/main/runtime/terminal/recovery/resolve-terminal-pane.ts
index 48470f21048c..d375367a3475 100644
--- a/src/main/runtime/terminal/recovery/resolve-terminal-pane.ts
+++ b/src/main/runtime/terminal/recovery/resolve-terminal-pane.ts
@@ -1,3 +1,7 @@
+import {
+  captureTerminalSurfaceCloseIdentity,
+  captureAddressedTerminalPresentation
+} from '../../workspace-session-terminal-tab-retirement-identity'
 import { terminalLaunchFacts } from '../../../../shared/agent-session-resume'
 import type { OrcaRuntimeWithCreateTerminal } from '../launch/terminal-create'
 import { OrcaRuntimeWithRestoredHandlePaneStart } from '../surface/restored-handle-pane-start'
@@ -20,11 +24,7 @@ import type {
 } from '../../runtime-terminal-state-records'
 import type { ResolvedWorktree } from '../../runtime-worktree-path-identity'
 import { parsePaneKey } from '../../../../shared/stable-pane-id'
-import {
-  buildVisibleSnapshotReadFallback,
-  labelTerminalReadSource,
-  readTerminalTail
-} from '../../terminal-tail-read'
+import { labelTerminalReadSource, readTerminalTail } from '../../terminal-tail-read'
 import { getTerminalState } from '../../terminal-wait-results'
 import { readStructuredWorkerTerminal } from '../../structured-worker-terminal-read'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
@@ -83,14 +83,54 @@ export abstract class OrcaRuntimeWithResolveTerminalPane extends OrcaRuntimeWith
       // Why: pane coordinates restored by a paired client must not cross workspace ownership.
       throw new Error('terminal_not_found')
     }
+    const holders =
+      worktreeId && parsed
+        ? this.getWorkspaceSessionHostIdsForTab(worktreeId, parsed.tabId).map((hostId) => ({
+            hostId,
+            identity: captureTerminalSurfaceCloseIdentity(
+              this.store?.getWorkspaceSession?.(hostId),
+              worktreeId,
+              parsed.tabId,
+              parsed.leafId
+            )
+          }))
+        : []
+    const routedHostId =
+      worktreeId && parsed ? this.getWorkspaceSessionHostIdForTab(worktreeId, parsed.tabId) : null
+    const rowIdentity = holders.find((holder) => holder.hostId === routedHostId)?.identity
+    const executionPtyId = pty?.ptyId ?? record?.ptyId ?? leaf?.ptyId ?? null
+    const retained = executionPtyId ? this.handleByPtyIncarnation.get(executionPtyId) : null
+    const execution = this.getPtyExecutionHostMetadata(executionPtyId)
+    if (
+      !execution.incarnationId &&
+      retained?.handle === handle &&
+      executionPtyId &&
+      this.getPtyLivenessVerdict(executionPtyId)?.status === 'exited'
+    ) {
+      execution.incarnationId = retained.incarnationId ?? undefined
+    }
+    const identity =
+      parsed && worktreeId
+        ? captureAddressedTerminalPresentation({
+            runtimeId: this.runtimeId,
+            record,
+            currentPty: pty,
+            leaf,
+            row: rowIdentity,
+            address: { worktreeId, ...parsed },
+            ptyId: executionPtyId,
+            incarnationId: execution.incarnationId
+          })
+        : null
     return {
+      ...(identity ? { presentation: { identity, holders } } : {}),
       handle,
       tabId: parsed?.tabId ?? record?.tabId ?? '',
       leafId: parsed?.leafId ?? record?.leafId ?? '',
-      ptyId: record?.ptyId ?? null,
+      ptyId: executionPtyId,
       connected: pty?.connected === true,
       ...(worktreeId ? { worktreeId } : {}),
-      ...this.getPtyExecutionHostMetadata(record?.ptyId ?? pty?.ptyId ?? null)
+      ...execution
     }
   }
 
@@ -276,25 +316,4 @@ export abstract class OrcaRuntimeWithResolveTerminalPane extends OrcaRuntimeWith
     this.assertLiveTerminalHandleTargetsPty(handle, leaf.ptyId)
     return labelTerminalReadSource(visibleRead)
   }
-
-  protected async readRenderedScreen(
-    ptyId: string,
-    read: RuntimeTerminalRead,
-    opts: { limit?: number } = {}
-  ): Promise<RuntimeTerminalRead> {
-    const visibleState = await this.readVisibleTerminalState(ptyId)
-    const projection =
-      visibleState ??
-      (await this.readProviderTerminalTailLines(ptyId, opts.limit, { visibleScreenOnly: true }))
-    if (projection.lines.length === 0) {
-      return { ...read, source: 'screen-unavailable' }
-    }
-    return buildVisibleSnapshotReadFallback(
-      read,
-      projection.lines,
-      opts.limit,
-      projection.draft,
-      projection.tailRows
-    )
-  }
 }
diff --git a/src/main/runtime/workspace-session-terminal-tab-retirement-identity.ts b/src/main/runtime/workspace-session-terminal-tab-retirement-identity.ts
index c0ffec68fba6..79262a599e3c 100644
--- a/src/main/runtime/workspace-session-terminal-tab-retirement-identity.ts
+++ b/src/main/runtime/workspace-session-terminal-tab-retirement-identity.ts
@@ -1,3 +1,6 @@
+import type { TerminalHandleRecord } from './runtime-terminal-contracts'
+import type { RuntimeLeafRecord, RuntimePtyWorktreeRecord } from './runtime-terminal-state-records'
+import type { TerminalSurfaceCloseIdentity } from '../../shared/terminal-tab-close'
 import type { RuntimeMobileSessionTabsSnapshot } from '../../shared/runtime-types'
 import type { WorkspaceSessionState } from '../../shared/workspace-session-state-types'
 import { collectPersistedTerminalLeafIds } from './mobile-session-layout-projection'
@@ -156,3 +159,64 @@ export function captureAcknowledgedTerminalTabRetirement(
     return { matches, hasPersistedTab: remaining !== null }
   }
 }
+
+export { captureTerminalSurfaceIdentity as captureTerminalSurfaceCloseIdentity } from '../../shared/terminal-tab-close'
+
+/** A captured source narrows the existing authenticated handle; it cannot address another owner. */
+export function isOriginalTerminalHandle(args: {
+  runtimeId: string
+  record: TerminalHandleRecord | undefined
+  currentPty: RuntimePtyWorktreeRecord | null | undefined
+  leaf: RuntimeLeafRecord | undefined
+  source: TerminalSurfaceCloseIdentity
+  incarnation: string | undefined
+}): boolean {
+  const { runtimeId, record, currentPty, leaf, source, incarnation } = args
+  return (
+    !!incarnation &&
+    !!source.ptyId &&
+    source.incarnationId === incarnation &&
+    !!record &&
+    record.runtimeId === runtimeId &&
+    record.worktreeId === source.worktreeId &&
+    record.ptyId === source.ptyId &&
+    (!currentPty ||
+      (currentPty.incarnationId === incarnation && currentPty.worktreeId === source.worktreeId)) &&
+    (!leaf ||
+      (leaf.worktreeId === source.worktreeId && (!leaf.ptyId || leaf.ptyId === source.ptyId))) &&
+    ((record.tabId === source.tabId && record.leafId === source.leafId) ||
+      currentPty?.paneKey === `${source.tabId}:${source.leafId}`)
+  )
+}
+
+/** Derives presentation from the authenticated addressed owner, retaining absent-row evidence. */
+export function captureAddressedTerminalPresentation(args: {
+  runtimeId: string
+  record: TerminalHandleRecord | undefined
+  currentPty: RuntimePtyWorktreeRecord | null | undefined
+  leaf: RuntimeLeafRecord | null | undefined
+  row: TerminalSurfaceCloseIdentity | null | undefined
+  address: { worktreeId: string; tabId: string; leafId: string }
+  ptyId: string | null
+  incarnationId: string | null | undefined
+}): TerminalSurfaceCloseIdentity | null {
+  const { row, address, leaf, ptyId, incarnationId } = args
+  const source: TerminalSurfaceCloseIdentity = {
+    ...address,
+    createdAt: row?.createdAt ?? null,
+    generation: row?.generation ?? 0,
+    hasLeaf: !!leaf || row?.hasLeaf === true,
+    ptyId,
+    incarnationId: incarnationId ?? null
+  }
+  return (!row?.ptyId || row.ptyId === ptyId) &&
+    (!row?.incarnationId || row.incarnationId === incarnationId) &&
+    isOriginalTerminalHandle({
+      ...args,
+      source,
+      leaf: leaf ?? undefined,
+      incarnation: incarnationId ?? undefined
+    })
+    ? source
+    : null
+}
diff --git a/src/main/window/terminal-tab-close-request-relay.ts b/src/main/window/terminal-tab-close-request-relay.ts
index d70f6d2525d2..575f11aa6852 100644
--- a/src/main/window/terminal-tab-close-request-relay.ts
+++ b/src/main/window/terminal-tab-close-request-relay.ts
@@ -1,3 +1,4 @@
+import type { TerminalSurfaceCloseIdentity } from '../../shared/terminal-tab-close'
 import { randomUUID } from 'node:crypto'
 
 import { ipcMain } from 'electron'
@@ -12,7 +13,11 @@ const TERMINAL_TAB_CLOSE_TIMEOUT_MS = 20_000
 export async function requestTerminalTabCloseFromRenderer(
   mainWindow: BrowserWindow,
   tabId: string,
-  options: { localPtyTeardownOwnedExternally?: boolean; force?: boolean } = {}
+  options: {
+    localPtyTeardownOwnedExternally?: boolean
+    force?: boolean
+    originalSurface?: TerminalSurfaceCloseIdentity
+  } = {}
 ): Promise<void> {
   if (mainWindow.isDestroyed()) {
     throw new Error('renderer_unavailable')
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-exit-return.test-fixture.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-exit-return.test-fixture.ts
index ab0001e8b571..09c5aceada2a 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-exit-return.test-fixture.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-exit-return.test-fixture.ts
@@ -12,7 +12,7 @@ import {
   makeWorktree
 } from '@/store/slices/worktrees-slice-test-fixtures'
 import type { StructuredAgentSessionCreateParams } from '../../../../shared/structured-agent-session-create'
-import type { CliChatResumeTestMocks } from './cli-chat-resume-run.test'
+import type { CliChatResumeTestMocks } from './cli-chat-resume-mocks.test-fixture'
 import { resolveCliChatResumeSource } from './cli-chat-resume-source'
 import { canPaneOfferResumeInNewChat } from './tab-session-history-switch'
 import { collectAgentPaneConversations } from '@/lib/ai-vault-tab-title-requests'
@@ -25,7 +25,11 @@ import type { ConnectPanePtySession } from '../terminal-pane/pty-connection/conn
 import { LEAF_1, LEAF_2 } from '../terminal-pane/pty-connection-test-pane-fixtures'
 import { createExitReturnTransport } from './cli-chat-resume-transport.test-fixture'
 import type { AiVaultSession } from '../../../../shared/ai-vault-types'
-import { CLOSE_TERMINAL_PANE_EVENT, type CloseTerminalPaneDetail } from '@/constants/terminal'
+import { installExitedPaneRetirement } from './cli-chat-resume-parked-retirement.test-fixture'
+import {
+  capturedPanesByTabId,
+  parkedWatchersByTabId
+} from '../terminal-pane/terminal-parked-watcher-registry'
 
 export async function verifyExitedPaneHistoryReturn(
   mocks: CliChatResumeTestMocks,
@@ -232,30 +236,7 @@ export async function verifyExitedPaneHistoryReturn(
         ? ready.promise
         : { ok: true, value: { sessionId: params.envelope.sessionId, fence: 1 } }
   )
-  const closed = vi.fn((event: Event) => {
-    if (!(event instanceof CustomEvent)) {
-      return
-    }
-    const detail: CloseTerminalPaneDetail = event.detail
-    expect(detail).toMatchObject({
-      tabId: 'shell',
-      leafId: LEAF_1,
-      expectedPtyId: 'pty-1',
-      retireSurface: true
-    })
-    useAppStore.getState().retireAgentPaneAuthority(paneKey)
-    useAppStore.setState({
-      terminalLayoutsByTabId: {
-        shell: {
-          root: { type: 'leaf', leafId: LEAF_2 },
-          activeLeafId: LEAF_2,
-          expandedLeafId: null,
-          ptyIdsByLeafId: { [LEAF_2]: 'pty-2' }
-        }
-      }
-    })
-  })
-  window.addEventListener(CLOSE_TERMINAL_PANE_EVENT, closed)
+  const { closed, siblingWatcher } = installExitedPaneRetirement(mocks)
   try {
     expect(switchAiVaultSessionToNativeChat(history)).toBe(true)
     await vi.waitFor(() =>
@@ -283,8 +264,12 @@ export async function verifyExitedPaneHistoryReturn(
       collectAgentPaneConversations(useAppStore.getState(), adoptsCliConversations)
     ).toMatchObject([{ paneKey: sibling }])
     expect(useAppStore.getState().agentConversationsByPaneKey[paneKey]).toBeUndefined()
+    expect(siblingWatcher).not.toHaveBeenCalled()
+    expect(capturedPanesByTabId.get('shell')?.panes.map((pane) => pane.leafId)).toEqual([LEAF_2])
+    expect([...parkedWatchersByTabId.get('shell')!.paneIdByPtyId.keys()]).toEqual(['pty-2'])
   } finally {
-    window.removeEventListener(CLOSE_TERMINAL_PANE_EVENT, closed)
+    capturedPanesByTabId.delete('shell')
+    parkedWatchersByTabId.delete('shell')
     connection.paneForegroundAgentTracker.dispose()
     connection.commandLifecycle.dispose()
     manager.destroy()
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
index 13a300b1e921..eacdd6e75646 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
@@ -131,7 +131,7 @@ export async function startCliChatReturn(
   return true
 }
 
-function toastCliChatResumeFailure(source: CliChatResumeSource, error: unknown): void {
+export function toastCliChatResumeFailure(source: CliChatResumeSource, error: unknown): void {
   const refusal = structuredLaunchFailure(error)
   if (
     refusal?.code === 'agent_session_conflict' ||
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-mocks.test-fixture.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-mocks.test-fixture.ts
new file mode 100644
index 000000000000..10e91f3775e3
--- /dev/null
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-mocks.test-fixture.ts
@@ -0,0 +1,18 @@
+import type { Mock } from 'vitest'
+import type { CliChatResumeSource } from './cli-chat-resume-source'
+
+export type CliChatResumeTestMocks = {
+  source: CliChatResumeSource | null
+  realSource: boolean
+  sourceCapability: Mock
+  createCapability: Mock
+  call: Mock
+  toast: Mock
+  success: Mock
+  activate: Mock<() => Promise<boolean>>
+  activateVerified: Mock<() => Promise<string>>
+  switchCapability: Mock<() => Promise<boolean>>
+  exitWatchers: Map<string, () => void>
+  rpc: Mock<(...args: unknown[]) => Promise<object>>
+  inspect: Mock<(ptyId: string) => Promise<{ foregroundProcessEvidence?: unknown }>>
+}
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-parked-retirement.test-fixture.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-parked-retirement.test-fixture.ts
new file mode 100644
index 000000000000..f9a35d6c45cd
--- /dev/null
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-parked-retirement.test-fixture.ts
@@ -0,0 +1,66 @@
+import { vi } from 'vitest'
+import { useAppStore } from '@/store'
+import type { CliChatResumeTestMocks } from './cli-chat-resume-mocks.test-fixture'
+import { LEAF_1, LEAF_2 } from '../terminal-pane/pty-connection-test-pane-fixtures'
+import {
+  captureTerminalSurfaceIdentity,
+  type TerminalSurfaceCloseCapture
+} from '../../../../shared/terminal-tab-close'
+import { retireTerminalPresentation } from '../terminal-pane/terminal-presentation-retirement'
+import {
+  capturedPanesByTabId,
+  parkedWatchersByTabId
+} from '../terminal-pane/terminal-parked-watcher-registry'
+
+export function installExitedPaneRetirement(mocks: CliChatResumeTestMocks) {
+  const closed = vi.fn()
+  const siblingWatcher = vi.fn()
+  capturedPanesByTabId.set('shell', {
+    worktreeId: 'wt-1',
+    panes: [
+      { paneId: 1, leafId: LEAF_1, ptyId: 'pty-1', drivesTabTitle: false },
+      { paneId: 2, leafId: LEAF_2, ptyId: 'pty-2', drivesTabTitle: true }
+    ]
+  })
+  parkedWatchersByTabId.set('shell', {
+    worktreeId: 'wt-1',
+    tabPtyId: 'pty-2',
+    paneIdByPtyId: new Map([
+      ['pty-1', 1],
+      ['pty-2', 2]
+    ]),
+    disposersByPtyId: new Map([
+      ['pty-1', closed],
+      ['pty-2', siblingWatcher]
+    ])
+  })
+  mocks.rpc.mockImplementation(
+    async (_target, method, params: { originalPresentation: TerminalSurfaceCloseCapture }) => {
+      if (method === 'terminal.resolvePane') {
+        const identity = captureTerminalSurfaceIdentity(
+          useAppStore.getState(),
+          'wt-1',
+          'shell',
+          LEAF_1
+        )
+        if (!identity) {
+          throw new Error('Missing original terminal')
+        }
+        return {
+          terminal: {
+            handle: 'handle-1',
+            ptyId: 'pty-1',
+            incarnationId: 'i1',
+            presentation: { identity: { ...identity, incarnationId: 'i1' }, holders: [] }
+          }
+        }
+      }
+      if (method !== 'terminal.close') {
+        throw new Error('Unexpected RPC')
+      }
+      retireTerminalPresentation(params.originalPresentation.identity)
+      return { close: { ptyKilled: true } }
+    }
+  )
+  return { closed, siblingWatcher }
+}
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
index 239eda206dfe..c2e4ded20c00 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
@@ -1,26 +1,12 @@
 // @vitest-environment happy-dom
-import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vitest'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type { CliChatResumeSource } from './cli-chat-resume-source'
 import type * as ResumeSourceModule from './cli-chat-resume-source'
 import type * as RuntimeRpcModule from '@/runtime/runtime-rpc-client'
 import type { AgentSessionWireRefusal } from '../../../../shared/agent-session-wire'
 import type { StructuredAgentSessionCreateParams } from '../../../../shared/structured-agent-session-create'
 
-export type CliChatResumeTestMocks = {
-  source: CliChatResumeSource | null
-  realSource: boolean
-  sourceCapability: Mock
-  createCapability: Mock
-  call: Mock
-  toast: Mock
-  success: Mock
-  activate: Mock<() => Promise<boolean>>
-  activateVerified: Mock<() => Promise<string>>
-  switchCapability: Mock<() => Promise<boolean>>
-  exitWatchers: Map<string, () => void>
-  rpc: Mock<(...args: unknown[]) => Promise<object>>
-  inspect: Mock<(ptyId: string) => Promise<{ foregroundProcessEvidence?: unknown }>>
-}
+import type { CliChatResumeTestMocks } from './cli-chat-resume-mocks.test-fixture'
 
 const mocks: CliChatResumeTestMocks = vi.hoisted(() => {
   const state: { source: CliChatResumeSource | null } = { source: null }
@@ -211,7 +197,26 @@ beforeEach(async () => {
   mocks.switchCapability.mockResolvedValue(false)
   mocks.rpc.mockImplementation(async (_target, method) =>
     method === 'terminal.resolvePane'
-      ? { terminal: { handle: 'handle-1', ptyId: 'pty-1', incarnationId: 'i1' } }
+      ? {
+          terminal: {
+            handle: 'handle-1',
+            ptyId: 'pty-1',
+            incarnationId: 'i1',
+            presentation: {
+              identity: {
+                worktreeId: 'wt-1',
+                tabId: mocks.source?.tabId ?? 'tab-1',
+                leafId: mocks.source?.paneKey.split(':')[1] ?? 'leaf-1',
+                createdAt: 1,
+                generation: 0,
+                hasLeaf: true,
+                ptyId: 'pty-1',
+                incarnationId: 'i1'
+              },
+              holders: []
+            }
+          }
+        }
       : { close: { ptyKilled: true } }
   )
   mocks.sourceCapability.mockResolvedValue(true)
@@ -427,7 +432,26 @@ describe('CLI identity resume through the existing launch owner', () => {
     mocks.switchCapability.mockResolvedValue(false)
     mocks.rpc.mockImplementation(async (_target, method) =>
       method === 'terminal.resolvePane'
-        ? { terminal: { handle: 'handle-1', ptyId: 'pty-1', incarnationId: 'i1' } }
+        ? {
+            terminal: {
+              handle: 'handle-1',
+              ptyId: 'pty-1',
+              incarnationId: 'i1',
+              presentation: {
+                identity: {
+                  worktreeId: 'wt-1',
+                  tabId: mocks.source?.tabId ?? 'tab-1',
+                  leafId: mocks.source?.paneKey.split(':')[1] ?? 'leaf-1',
+                  createdAt: 1,
+                  generation: 0,
+                  hasLeaf: true,
+                  ptyId: 'pty-1',
+                  incarnationId: 'i1'
+                },
+                holders: []
+              }
+            }
+          }
         : { close: { ptyKilled: true } }
     )
     capability.resolve(true)
@@ -531,46 +555,37 @@ describe('CLI identity resume through the existing launch owner', () => {
     expect(closed).not.toHaveBeenCalled()
 
     switched = { ok: true, sessionId: 'owner-chat' }
-    // The source PTY exits during the chat's readiness: a reused id is another execution, so it stays.
-    mocks.activateVerified.mockImplementationOnce(async () => {
-      mocks.exitWatchers.get('pty-1')?.()
-      return 'activated'
-    })
-    await runCliChatResume(mocks.source)
-    expect(closed).not.toHaveBeenCalled()
+    // A bookkeeping refusal after READY settles once and leaves the existing chat usable.
+    mocks.rpc
+      .mockImplementationOnce(async () => ({
+        terminal: {
+          handle: 'handle-1',
+          ptyId: 'pty-1',
+          incarnationId: 'i1',
+          presentation: {
+            identity: {
+              worktreeId: 'wt-1',
+              tabId: 'tab-1',
+              leafId,
+              createdAt: 1,
+              generation: 0,
+              hasLeaf: true,
+              ptyId: 'pty-1',
+              incarnationId: 'i1'
+            },
+            holders: []
+          }
+        }
+      }))
+      .mockRejectedValueOnce(new Error('required write failed'))
     await runCliChatResume(mocks.source)
-    window.removeEventListener('orca-close-terminal-pane', closed)
-    const switches = mocks.call.mock.calls.filter(
-      ([, method]) => method === 'agentSession.switchToChat'
-    )
-    expect(switches).toHaveLength(3)
+    expect(mocks.rpc.mock.calls.filter(([, method]) => method === 'terminal.close')).toHaveLength(1)
+    expect(mocks.toast).toHaveBeenCalledTimes(2)
     expect(mocks.activateVerified).toHaveBeenCalledWith({ structuredSession: owner }, undefined, {
       kind: 'local'
     })
-    expect(closed).toHaveBeenCalledOnce()
-    expect(closed.mock.calls[0]?.[0].detail).toEqual({
-      tabId: 'tab-1',
-      leafId,
-      expectedPtyId: 'pty-1',
-      preservePty: true,
-      retireSurface: true
-    })
-    expect(tabs()).toEqual([])
-
-    // A paired source is closed by its host, fenced on the incarnation it started with, so a
-    // replacement under the same handle stays open; the renderer never closes it by tab.
-    const remote = 'remote:env@@handle-1'
-    mocks.source = { ...mocks.source, ptyId: remote }
-    mocks.inspect.mockResolvedValueOnce({ foregroundProcessEvidence: { ptyIncarnationId: 'i1' } })
-    window.addEventListener('orca-close-terminal-pane', closed)
-    await runCliChatResume(mocks.source)
+    expect(closed).not.toHaveBeenCalled()
     window.removeEventListener('orca-close-terminal-pane', closed)
-    expect(closed).toHaveBeenCalledOnce()
-    expect(mocks.rpc).toHaveBeenCalledWith(
-      { kind: 'environment', environmentId: 'env' },
-      'terminal.close',
-      { terminal: 'handle-1', expectedIncarnationId: 'i1' }
-    )
   })
 
   it('keeps the eager History joiner failed and retryable after the hidden starter is refused', async () => {
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
index a3ddd7601e54..3517c0ac8068 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
@@ -7,16 +7,16 @@ import {
   supportsInPlaceSwitch,
   supportsStructuredAgentSessionCliSource
 } from '@/runtime/structured-agent-session-client'
-import { CLOSE_TERMINAL_PANE_EVENT, type CloseTerminalPaneDetail } from '@/constants/terminal'
-import { parsePaneKey } from '../../../../shared/stable-pane-id'
 import { structuredAgentSessionTargetForHost } from '@/runtime/structured-agent-session-owner'
 import { waitForPromiseWithSignal } from '../../../../shared/abort-signal-reason'
 import { CLI_CONVERSATION_ADOPTING_AGENTS } from '../../../../shared/structured-agent-cli-conversation-adoption'
 import { resolveCliChatResumeSource, type CliChatResumeSource } from './cli-chat-resume-source'
-import { reportCliChatResumeFailure, startCliChatReturn } from './cli-chat-resume-feedback'
+import {
+  reportCliChatResumeFailure,
+  startCliChatReturn,
+  toastCliChatResumeFailure
+} from './cli-chat-resume-feedback'
 import { adoptingAgentOnHost } from '../right-sidebar/ai-vault-session-resume-in-chat-launch'
-import { panePtyId } from '@/lib/ai-vault-tab-title-requests'
-import { subscribeToPtyExit } from '../terminal-pane/pty-dispatcher'
 import type { RuntimeTerminalResolvePane } from '../../../../shared/runtime-types'
 import { getRemoteRuntimePtyOwner } from '@/runtime/runtime-terminal-stream'
 import { callRuntimeRpc } from '@/runtime/runtime-rpc-client'
@@ -38,11 +38,13 @@ async function captureSourceTerminal(source: CliChatResumeSource) {
         worktreeId: source.workspaceId
       }
     )
-    return terminal.incarnationId && (owner || terminal.ptyId === source.ptyId)
+    return terminal.incarnationId &&
+      (owner ? terminal.handle === owner.terminal : terminal.ptyId === source.ptyId)
       ? {
           target,
           handle: owner?.terminal ?? terminal.handle,
-          incarnationId: terminal.incarnationId
+          incarnationId: terminal.incarnationId,
+          presentation: terminal.presentation
         }
       : null
   } catch {
@@ -52,42 +54,17 @@ async function captureSourceTerminal(source: CliChatResumeSource) {
 
 /** The execution host closes only the captured shell; refused or unknown closes leave it alone. */
 async function retireSwitchedTerminalPane(
-  source: CliChatResumeSource,
-  sourceExited: () => boolean,
   expected: ReturnType<typeof captureSourceTerminal>
 ): Promise<void> {
   const captured = await expected
-  if (!captured || sourceExited()) {
-    return
-  }
-  try {
-    const { close } = await callRuntimeRpc<{ close: { ptyKilled: boolean } }>(
-      captured.target,
-      'terminal.close',
-      {
-        terminal: captured.handle,
-        expectedIncarnationId: captured.incarnationId
-      }
-    )
-    const pane = parsePaneKey(source.paneKey)
-    if (
-      captured.target.kind === 'local' &&
-      close.ptyKilled &&
-      pane &&
-      panePtyId(useAppStore.getState(), source.paneKey) === source.ptyId
-    ) {
-      const detail: CloseTerminalPaneDetail = {
-        tabId: pane.tabId,
-        leafId: pane.leafId,
-        expectedPtyId: source.ptyId,
-        preservePty: true,
-        retireSurface: true
-      }
-      window.dispatchEvent(new CustomEvent(CLOSE_TERMINAL_PANE_EVENT, { detail }))
-    }
-  } catch {
-    /* The source stays readable when its close is unconfirmed. */
+  if (!captured?.presentation) {
+    throw new Error('terminal_close_unverifiable')
   }
+  await callRuntimeRpc(captured.target, 'terminal.close', {
+    terminal: captured.handle,
+    expectedIncarnationId: captured.incarnationId,
+    originalPresentation: captured.presentation
+  })
 }
 
 const pending = new Map<string, AbortController>()
@@ -152,14 +129,7 @@ export async function runCliChatResume(source: CliChatResumeSource): Promise<voi
   }
   pending.set(key, controller)
   changed()
-  // Why any exit: a reused id's next incarnation starts only after this one exits.
-  let sourceExited = false
   const sourceIncarnation = captureSourceTerminal(source)
-  const stopExitWatch = source.ptyId
-    ? subscribeToPtyExit(source.ptyId, () => {
-        sourceExited = true
-      })
-    : () => {}
   const stopSource = useAppStore.subscribe(() => {
     if (!isCurrent()) {
       controller.abort()
@@ -185,94 +155,97 @@ export async function runCliChatResume(source: CliChatResumeSource): Promise<voi
   }
   let inPlace = false
   try {
-    await waitForPromiseWithSignal(sourceIncarnation, controller.signal)
-    if (!isCurrent()) {
-      return
-    }
-    inPlace = await waitForPromiseWithSignal(
-      supportsInPlaceSwitch(target, source.agent),
-      controller.signal
-    )
-    if (target.kind !== 'local' && !inPlace) {
-      return
-    }
-    const cliSourceSupported = await waitForPromiseWithSignal(
-      supportsStructuredAgentSessionCliSource(target),
-      controller.signal
-    )
-    if (!isCurrent()) {
-      return
-    }
-    const agent = await waitForPromiseWithSignal(
-      adoptingAgentOnHost(source.agent, source.workspaceId),
-      controller.signal
-    )
-    if (!isCurrent()) {
-      return
-    }
-    const plan = adoptAgentSessionLaunchVerdict({
-      route: 'structured-native-chat',
-      requestId: newAgentLaunchRequestId(),
-      agent,
-      worktreeId: source.workspaceId,
-      executionHostId: source.executionHostId,
-      resumeFrom: {
-        providerSessionId: source.providerSessionId,
-        ...(cliSourceSupported
-          ? { cliSource: { workspaceId: source.workspaceId, paneKey: source.paneKey } }
-          : {})
+    let retireSource = false
+    try {
+      await waitForPromiseWithSignal(sourceIncarnation, controller.signal)
+      if (!isCurrent()) {
+        return
       }
-    })
-    const state = useAppStore.getState()
-    const group = state.groupsByWorktree[source.workspaceId]?.find((g) =>
-      g.tabOrder.includes(source.tabId)
-    )
-    const launch = beginStructuredAgentSessionProvisionalLaunch({
-      plan,
-      hooks: { beforeCreate: handoff },
-      afterTabId: source.tabId,
-      target: group
-        ? {
-            surfaceAddress: {
-              worktreeId: source.workspaceId,
-              targetGroupId: group.id,
-              precedingTabIds: group.tabOrder.slice(0, group.tabOrder.indexOf(source.tabId) + 1)
+      inPlace = await waitForPromiseWithSignal(
+        supportsInPlaceSwitch(target, source.agent),
+        controller.signal
+      )
+      if (target.kind !== 'local' && !inPlace) {
+        return
+      }
+      const cliSourceSupported = await waitForPromiseWithSignal(
+        supportsStructuredAgentSessionCliSource(target),
+        controller.signal
+      )
+      if (!isCurrent()) {
+        return
+      }
+      const agent = await waitForPromiseWithSignal(
+        adoptingAgentOnHost(source.agent, source.workspaceId),
+        controller.signal
+      )
+      if (!isCurrent()) {
+        return
+      }
+      const plan = adoptAgentSessionLaunchVerdict({
+        route: 'structured-native-chat',
+        requestId: newAgentLaunchRequestId(),
+        agent,
+        worktreeId: source.workspaceId,
+        executionHostId: source.executionHostId,
+        resumeFrom: {
+          providerSessionId: source.providerSessionId,
+          ...(cliSourceSupported
+            ? { cliSource: { workspaceId: source.workspaceId, paneKey: source.paneKey } }
+            : {})
+        }
+      })
+      const state = useAppStore.getState()
+      const group = state.groupsByWorktree[source.workspaceId]?.find((g) =>
+        g.tabOrder.includes(source.tabId)
+      )
+      const launch = beginStructuredAgentSessionProvisionalLaunch({
+        plan,
+        hooks: { beforeCreate: handoff },
+        afterTabId: source.tabId,
+        target: group
+          ? {
+              surfaceAddress: {
+                worktreeId: source.workspaceId,
+                targetGroupId: group.id,
+                precedingTabIds: group.tabOrder.slice(0, group.tabOrder.indexOf(source.tabId) + 1)
+              }
             }
-          }
-        : undefined,
-      deferPublication: true
-    })
-    if (!launch) {
-      return
-    }
-    const result = await waitForPromiseWithSignal(launch.settlement, controller.signal)
-    if (result.kind === 'structured' && inPlace) {
-      if (await startCliChatReturn(source, result.sessionId, target)) {
-        await retireSwitchedTerminalPane(source, () => sourceExited, sourceIncarnation)
+          : undefined,
+        deferPublication: true
+      })
+      if (!launch) {
+        return
+      }
+      const result = await waitForPromiseWithSignal(launch.settlement, controller.signal)
+      if (result.kind === 'structured' && inPlace) {
+        retireSource = await startCliChatReturn(source, result.sessionId, target)
+      } else if (
+        result.kind === 'failed' &&
+        !result.notified &&
+        pending.get(key) === controller &&
+        (await reportCliChatResumeFailure(source, result.error, target))
+      ) {
+        retireSource = inPlace
       }
-    } else if (
-      result.kind === 'failed' &&
-      !result.notified &&
-      pending.get(key) === controller &&
-      (await reportCliChatResumeFailure(source, result.error, target))
-    ) {
-      if (inPlace) {
-        await retireSwitchedTerminalPane(source, () => sourceExited, sourceIncarnation)
+    } catch (error) {
+      if (
+        pending.get(key) === controller &&
+        (await reportCliChatResumeFailure(source, error, target))
+      ) {
+        retireSource = inPlace
       }
     }
-  } catch (error) {
-    if (
-      pending.get(key) === controller &&
-      (await reportCliChatResumeFailure(source, error, target))
-    ) {
-      if (inPlace) {
-        await retireSwitchedTerminalPane(source, () => sourceExited, sourceIncarnation)
+    if (retireSource) {
+      try {
+        await retireSwitchedTerminalPane(sourceIncarnation)
+      } catch (error) {
+        toastCliChatResumeFailure(source, error)
       }
     }
   } finally {
     clearTimeout(timer)
     stopSource()
-    stopExitWatch()
     release()
   }
 }
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts
index d285fc6c84ea..dffa713c3a39 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts
@@ -43,9 +43,10 @@ export function resolveCliChatResumeSource(
     )
   const conversation = args.paneKey
     ? paneConversation(args.paneKey)
-    : (collectAgentPaneConversations(state, adoptsCliConversations).find(
-        (candidate) => candidate.tabId === args.tab.id
-      ) ?? (activeLeafId ? paneConversation(makePaneKey(args.tab.id, activeLeafId)) : null))
+    : (collectAgentPaneConversations(state, adoptsCliConversations, {
+        tab: { worktreeId: args.tab.worktreeId, tabId: args.tab.id }
+      }).find((candidate) => candidate.tabId === args.tab.id) ??
+      (activeLeafId ? paneConversation(makePaneKey(args.tab.id, activeLeafId)) : null))
   if (
     !conversation ||
     conversation.tabId !== args.tab.id ||
diff --git a/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts b/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts
index 4ae523f2c338..2a96998de6c8 100644
--- a/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts
+++ b/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts
@@ -4,7 +4,11 @@ import { useAppStore } from '@/store'
 import type { AppState } from '@/store/types'
 import { makeRepo, makeTerminalTab, makeWorktree } from '../worktree-jump-palette-test-fixtures'
 import { makeAgentStatusEntry } from '@/runtime/sync-runtime-graph-test-harness'
-import { collectAiVaultTitleRequests } from '@/lib/ai-vault-tab-title-requests'
+import {
+  collectAgentPaneConversations,
+  resolvePaneLastAgentConversation,
+  collectAiVaultTitleRequests
+} from '@/lib/ai-vault-tab-title-requests'
 import { resolveCliChatResumeSource } from './cli-chat-resume-source'
 import { applyProviderSessionOnlyUpdate } from '@/hooks/ipc-events/agent-status-partial-updates'
 import type { AiVaultListArgs, AiVaultSession } from '../../../../shared/ai-vault-types'
@@ -474,7 +478,7 @@ describe('one pane of a terminal tab', () => {
       const exited = useAppStore.getState()
       expect(paneSubject(exited, claudePane)).toBeNull()
       // The pane's switch to native chat stays offered after the agent exits: that is when it works.
-      expect(paneGate(exited, claudePane)).toBe(kind === 'retained')
+      expect(paneGate(exited, claudePane)).toBe(true)
       expect(
         resolveTabSessionHistorySubject(exited, { tab: { id: 'term-1', worktreeId: WORKTREE_ID } })
       ).toBeNull()
@@ -800,3 +804,47 @@ it.each(['local', 'runtime:paired-host'] as const)(
     mocks.inPlaceSwitch = false
   }
 )
+
+it('uses one same-pane evidence order in History, the pane action and its feasibility gate', () => {
+  makeState()
+  const paneKey = 'term-1:11111111-1111-4111-8111-111111111111'
+  const sleeping = exitedAgentRecords.sleeping.sleepingAgentSessionsByPaneKey!['term-1:leaf-1']
+  const retained = exitedAgentRecords.retained.retainedAgentsByPaneKey!['term-1:leaf-1']
+  useAppStore.setState({
+    sleepingAgentSessionsByPaneKey: {
+      [paneKey]: { ...sleeping, paneKey, providerSession: { key: 'session_id', id: 'C' } }
+    },
+    retainedAgentsByPaneKey: {
+      [paneKey]: {
+        ...retained,
+        entry: { ...retained.entry, paneKey, providerSession: { key: 'session_id', id: 'X' } }
+      }
+    }
+  })
+  const isClaude = (agent: unknown): agent is 'claude' => agent === 'claude'
+  const state = useAppStore.getState()
+  const pane = { worktreeId: WORKTREE_ID, paneKey }
+  const collected = collectAgentPaneConversations(state, isClaude, { allPanes: true })
+  expect(collected).toHaveLength(1)
+  expect(collected[0].providerSession.id).toBe('C')
+  const layouts = { ...state.terminalLayoutsByTabId }
+  Object.defineProperty(layouts, 'unrelated-tab', {
+    get: () => {
+      throw new Error('Exact-pane lookup scanned an unrelated layout')
+    }
+  })
+  const addressedState = {
+    ...state,
+    terminalLayoutsByTabId: layouts,
+    tabsByWorktree: {
+      ...state.tabsByWorktree,
+      [WORKTREE_ID]: [
+        ...state.tabsByWorktree[WORKTREE_ID],
+        { ...state.tabsByWorktree[WORKTREE_ID][0], id: 'unrelated-tab' }
+      ]
+    }
+  }
+  expect(resolvePaneLastAgentConversation(addressedState, pane, isClaude)).toEqual(collected[0])
+  expect(canPaneOfferResumeInNewChat(state, pane)).toBe(true)
+  expect(collectAgentPaneConversations(state, isClaude, { runningAgentsOnly: true })).toEqual([])
+})
diff --git a/src/renderer/src/components/terminal-pane/terminal-pane-lifecycle-close.ts b/src/renderer/src/components/terminal-pane/terminal-pane-lifecycle-close.ts
index 01c4b8c89862..4700454b88f5 100644
--- a/src/renderer/src/components/terminal-pane/terminal-pane-lifecycle-close.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-pane-lifecycle-close.ts
@@ -39,9 +39,13 @@ export function applyTerminalPaneCloseRequest(args: {
   }
   if (args.detail.preservePty) {
     if (args.detail.retireSurface) {
-      args.manager.retirePanePreservingPty(paneRuntimeId)
+      if (!args.manager.retirePanePreservingPty(paneRuntimeId)) {
+        return 'ignored'
+      }
     } else {
-      args.manager.detachPaneForExternalMove(paneRuntimeId)
+      if (!args.manager.detachPaneForExternalMove(paneRuntimeId)) {
+        return 'ignored'
+      }
     }
   } else {
     args.manager.closePane(paneRuntimeId)
@@ -78,13 +82,14 @@ export function retireMountedTerminalPaneSurface(args: {
   ) => void
   clearExitedPanePtyLayoutBindingForLeaf?: (leafId: string, exitedPtyId: string) => void
   clearTabPtyId: (tabId: string, ptyId: string) => void
+  permanent?: boolean
   transport?: {
     detach?: (options?: { preserveExitObserver?: boolean }) => void
     destroy?: () => void
   }
 }): void {
   args.retireAgentPaneAuthority(args.paneKey, {
-    preserveSleepingAgentSession: true
+    preserveSleepingAgentSession: !args.permanent
   })
   if (args.ptyId) {
     if (args.clearExitedPanePtyLayoutBindingForLeaf) {
diff --git a/src/renderer/src/components/terminal-pane/terminal-pane-mount-cleanup.ts b/src/renderer/src/components/terminal-pane/terminal-pane-mount-cleanup.ts
index ce0f06c681f8..c323a6730caa 100644
--- a/src/renderer/src/components/terminal-pane/terminal-pane-mount-cleanup.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-pane-mount-cleanup.ts
@@ -24,6 +24,7 @@ export function cleanupTerminalPaneMount(args: {
   expandedStyleSnapshots: Map<HTMLElement, { display: string; flex: string }>
   unregisterRuntimeTab: () => void
   cancelResize: () => void
+  permanent?: boolean
 }): void {
   const {
     manager,
@@ -42,13 +43,13 @@ export function cleanupTerminalPaneMount(args: {
   const tabRemainsInWorktree = Boolean(
     currentWorktreeTabs?.some((candidate) => candidate.id === tabId)
   )
-  if (!tabRemainsInWorktree) {
+  if (args.permanent || !tabRemainsInWorktree) {
     cancelQueuedTerminalPaneSplitRequests(tabId, worktreeId)
   }
   // Handoff retention is deliberately broader: a tab move removes the old
   // worktree bucket before the replacement surface mounts, so use the shared
   // global ownership check to let an ID-less deferred split survive a rehome.
-  const tabStillExists = isTerminalTabPresent(currentStore, tabId)
+  const tabStillExists = !args.permanent && isTerminalTabPresent(currentStore, tabId)
   unregisterRuntimeTab()
   cancelResize()
   restoreExpandedLayoutFrom(expandedStyleSnapshots)
@@ -71,24 +72,27 @@ export function cleanupTerminalPaneMount(args: {
   disposeAll(refs.imeCompositionDisposablesRef.current)
   disposeAll(refs.imeNativeTextForwarderDisposablesRef.current)
 
-  captureParkedTerminalPaneCandidates(
-    tabId,
-    worktreeId,
-    manager.getPanes().map((pane) => {
-      const ptyId = paneTransportsRef.current.get(pane.id)?.getPtyId() ?? null
-      const binding = panePtyBindingsRef.current.get(pane.id) as
-        | { isUntouchedFreshSpawnPty?: (candidate: string) => boolean }
-        | undefined
-      return {
-        ptyId,
-        workspaceOwner: captureNotificationTransportOwner(paneTransportsRef.current.get(pane.id)),
-        paneId: pane.id,
-        leafId: pane.leafId,
-        drivesTabTitle: manager.getActivePane()?.id === pane.id,
-        untouchedFreshSpawn: ptyId !== null && (binding?.isUntouchedFreshSpawnPty?.(ptyId) ?? false)
-      }
-    })
-  )
+  if (tabStillExists) {
+    captureParkedTerminalPaneCandidates(
+      tabId,
+      worktreeId,
+      manager.getPanes().map((pane) => {
+        const ptyId = paneTransportsRef.current.get(pane.id)?.getPtyId() ?? null
+        const binding = panePtyBindingsRef.current.get(pane.id) as
+          | { isUntouchedFreshSpawnPty?: (candidate: string) => boolean }
+          | undefined
+        return {
+          ptyId,
+          workspaceOwner: captureNotificationTransportOwner(paneTransportsRef.current.get(pane.id)),
+          paneId: pane.id,
+          leafId: pane.leafId,
+          drivesTabTitle: manager.getActivePane()?.id === pane.id,
+          untouchedFreshSpawn:
+            ptyId !== null && (binding?.isUntouchedFreshSpawnPty?.(ptyId) ?? false)
+        }
+      })
+    )
+  }
   for (const [paneId, transport] of paneTransportsRef.current) {
     const ptyId = transport.getPtyId()
     const deferredSplitHandoff = deferredSplitHandoffs.get(paneId)
@@ -103,6 +107,7 @@ export function cleanupTerminalPaneMount(args: {
       deferredSplitHandoffs.delete(paneId)
     }
     if (
+      args.permanent ||
       shouldDetachPaneTransportOnUnmount({
         tabStillExists,
         tabId,
diff --git a/src/renderer/src/components/terminal-pane/terminal-pane-mount-context.ts b/src/renderer/src/components/terminal-pane/terminal-pane-mount-context.ts
index d9baf8cfdd73..de7b89b5ff9d 100644
--- a/src/renderer/src/components/terminal-pane/terminal-pane-mount-context.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-pane-mount-context.ts
@@ -13,6 +13,7 @@ import type { resolveTerminalHttpLinkSourceOwner } from './terminal-http-link-so
 import type { SessionRestoredBannerReason } from './session-restored-banner-pane-state'
 
 export type TerminalPaneMountContext = {
+  getOwnedManager?: () => PaneManager | null
   deps: UseTerminalPaneLifecycleDeps
   refs: TerminalPaneLifecycleRefs
   ptyDeps: PtyConnectionDeps
@@ -54,5 +55,5 @@ export type PaneCreatedHandlerContext = TerminalPaneManagerOptionsContext
 
 export type PaneClosedHandlerContext = TerminalPaneMountContext & {
   paneId: number
-  closedPane?: { leafId: string; reason?: 'close' | 'detach' | 'retire' }
+  closedPane?: { leafId: string; reason?: 'close' | 'detach' | 'retire' | 'remove' }
 }
diff --git a/src/renderer/src/components/terminal-pane/terminal-pane-mount-preparation.ts b/src/renderer/src/components/terminal-pane/terminal-pane-mount-preparation.ts
index bb4c8b3c40d3..19bb3c1de5d1 100644
--- a/src/renderer/src/components/terminal-pane/terminal-pane-mount-preparation.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-pane-mount-preparation.ts
@@ -1,3 +1,4 @@
+import { registerTerminalPaneMount } from './terminal-pane-mount-registration'
 import type { PaneManager } from '@/lib/pane-manager/pane-manager'
 import { useAppStore } from '@/store'
 import { getConnectionId } from '@/lib/connection-context'
@@ -24,7 +25,6 @@ import type { PtyConnectionDeps } from './pty-connection-types'
 import type { UseTerminalPaneLifecycleDeps } from './terminal-pane-lifecycle-types'
 import type { TerminalPaneLifecycleRefs } from './use-terminal-pane-lifecycle-refs'
 import { fitAndFocusPanes, fitPanes } from './pane-helpers'
-import { registerRuntimeTerminalTab } from '@/runtime/mounted-terminal-tab-registry'
 import { normalizeTerminalLayoutSnapshot } from './layout-serialization'
 import { applyTerminalAppearance } from './terminal-appearance'
 import { terminalLinkClickBehaviorFor } from './terminal-link-click-behavior'
@@ -51,6 +51,8 @@ export type TerminalPaneMountPreparation = {
   ptyDeps: PtyConnectionDeps
   deferredSplitHandoffs: Map<number, DeferredSplitPaneHandoffHandle>
   unregisterRuntimeTab: () => void
+  setOwnedManager: (manager: PaneManager) => void
+  getOwnedManager: () => PaneManager | null
   fileOpenLinkHint: string
   getPaneLinkCwd: (paneId: number) => string
   getUrlOpenLinkHint: (paneId: number) => string
@@ -74,7 +76,8 @@ export type TerminalPaneMountPreparation = {
 export function prepareTerminalPaneMount(
   deps: UseTerminalPaneLifecycleDeps,
   refs: TerminalPaneLifecycleRefs,
-  mountFollowsTerminalPark: boolean
+  mountFollowsTerminalPark: boolean,
+  onEmpty: (manager: PaneManager) => void
 ): TerminalPaneMountPreparation | null {
   const { containerRef, expandedStyleSnapshotRef, paneTransportsRef, panePtyBindingsRef } = deps
   const container = containerRef.current
@@ -232,14 +235,10 @@ export function prepareTerminalPaneMount(
     restoredPtyIdByLeafId: deps.initialLayoutRef.current.ptyIdsByLeafId ?? {},
     deferredSplitHandoffs
   })
-  const unregisterRuntimeTab = registerRuntimeTerminalTab({
-    tabId: deps.tabId,
-    worktreeId: deps.worktreeId,
-    getManager: () => deps.managerRef.current,
-    getContainer: () => deps.containerRef.current,
-    getPtyIdForPane: (paneId) => paneTransports.get(paneId)?.getPtyId() ?? null,
-    getTabWideAgentHintLeafId: deps.getTabWideAgentHintLeafId
-  })
+  const { unregisterRuntimeTab, setOwnedManager, getOwnedManager } = registerTerminalPaneMount(
+    { deps, refs, deferredSplitHandoffs },
+    onEmpty
+  )
   const fileOpenLinkHint = getTerminalFileOpenHint()
   const getUrlOpenLinkHint = (paneId: number): string =>
     getTerminalUrlOpenHint({
@@ -263,6 +262,8 @@ export function prepareTerminalPaneMount(
     ptyDeps,
     deferredSplitHandoffs,
     unregisterRuntimeTab,
+    setOwnedManager,
+    getOwnedManager,
     fileOpenLinkHint,
     getPaneLinkCwd,
     getUrlOpenLinkHint,
diff --git a/src/renderer/src/components/terminal-pane/terminal-pane-mount-registration.ts b/src/renderer/src/components/terminal-pane/terminal-pane-mount-registration.ts
new file mode 100644
index 000000000000..f064a499bde8
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/terminal-pane-mount-registration.ts
@@ -0,0 +1,59 @@
+import type { PaneManager } from '@/lib/pane-manager/pane-manager'
+import { registerRuntimeTerminalTab } from '@/runtime/mounted-terminal-tab-registry'
+import { removeTerminalPresentation } from './terminal-presentation-retirement'
+import type { PaneClosedHandlerContext } from './terminal-pane-mount-context'
+
+/** The mount retains its actual manager even while the rendering ref is temporarily cleared. */
+export function registerTerminalPaneMount(
+  context: Pick<PaneClosedHandlerContext, 'deps' | 'refs' | 'deferredSplitHandoffs'>,
+  onEmpty: (manager: PaneManager) => void
+) {
+  const { deps } = context
+  let ownedManager: PaneManager | null = null
+  const unregisterRuntimeTab = registerRuntimeTerminalTab({
+    retirePresentation: (original) => {
+      const manager = ownedManager
+      const pane = manager?.getPanes().find((candidate) => candidate.leafId === original.leafId)
+      const transport = pane ? deps.paneTransportsRef.current.get(pane.id) : null
+      if (transport?.getPtyId() && transport.getPtyId() !== original.ptyId) {
+        throw new Error('terminal_pane_owner_changed')
+      }
+      if (
+        !pane &&
+        [...deps.paneTransportsRef.current.values()].some(
+          (candidate) => !manager || candidate.getPtyId() === original.ptyId
+        )
+      ) {
+        throw new Error('terminal_pane_owner_unavailable')
+      }
+      removeTerminalPresentation(original, () => {
+        if (pane && manager) {
+          if (!manager.retirePanePreservingPty(pane.id, true)) {
+            throw new Error('terminal_pane_close_failed')
+          }
+          if (manager.getPanes().length === 0) {
+            onEmpty(manager)
+            if (deps.managerRef.current === manager) {
+              deps.managerRef.current = null
+            }
+            ownedManager = null
+            unregisterRuntimeTab()
+          }
+        }
+      })
+    },
+    tabId: deps.tabId,
+    worktreeId: deps.worktreeId,
+    getManager: () => deps.managerRef.current,
+    getContainer: () => deps.containerRef.current,
+    getPtyIdForPane: (paneId) => deps.paneTransportsRef.current.get(paneId)?.getPtyId() ?? null,
+    getTabWideAgentHintLeafId: deps.getTabWideAgentHintLeafId
+  })
+  return {
+    unregisterRuntimeTab,
+    getOwnedManager: () => ownedManager,
+    setOwnedManager: (manager: PaneManager) => {
+      ownedManager = manager
+    }
+  }
+}
diff --git a/src/renderer/src/components/terminal-pane/terminal-pane-pane-closed.ts b/src/renderer/src/components/terminal-pane/terminal-pane-pane-closed.ts
index a70545c173c7..e1954ce0cc0b 100644
--- a/src/renderer/src/components/terminal-pane/terminal-pane-pane-closed.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-pane-pane-closed.ts
@@ -17,7 +17,10 @@ import {
 import type { PaneClosedHandlerContext } from './terminal-pane-mount-context'
 
 export function createTerminalPaneClosedHandler(
-  context: Omit<PaneClosedHandlerContext, 'paneId' | 'closedPane'>
+  context: Pick<
+    PaneClosedHandlerContext,
+    'deps' | 'refs' | 'deferredSplitHandoffs' | 'getOwnedManager'
+  >
 ): (paneId: number, closedPane?: PaneClosedHandlerContext['closedPane']) => void {
   return (paneId, closedPane) => {
     const { deps, refs } = context
@@ -47,7 +50,8 @@ export function createTerminalPaneClosedHandler(
     } = deps
     onPtyRecoveryStateRef?.current?.(paneId, null)
     const isDetachedToTab = closedPane?.reason === 'detach'
-    const isRetiredSurface = closedPane?.reason === 'retire'
+    const permanent = closedPane?.reason === 'remove'
+    const isRetiredSurface = closedPane?.reason === 'retire' || permanent
     disposeMapEntry(refs.linkProviderDisposablesRef.current, paneId)
     disposeMapEntry(refs.terminalHandleLinkDisposablesRef.current, paneId)
     disposeMapEntry(refs.linkifierClickPrimingDisposablesRef.current, paneId)
@@ -108,6 +112,7 @@ export function createTerminalPaneClosedHandler(
         syncPanePtyLayoutBindingForLeaf,
         clearExitedPanePtyLayoutBindingForLeaf,
         clearTabPtyId,
+        permanent,
         ...(transport ? { transport } : {})
       })
     } else if (leafId && !isDetachedToTab) {
@@ -133,6 +138,8 @@ export function createTerminalPaneClosedHandler(
         }
         transport.destroy?.()
       }
+    }
+    if (!isRetiredSurface || permanent) {
       paneTransportsRef.current.delete(paneId)
     }
     clearRuntimePaneTitle(tabId, paneId)
@@ -153,8 +160,9 @@ export function createTerminalPaneClosedHandler(
       paneTitlesRef.current = next
     }
     setRenamingPaneId((current) => (current === paneId ? null : current))
-    setPaneCount(managerRef.current?.getPanes().length ?? 0)
-    const activePane = managerRef.current?.getActivePane()
+    const manager = context.getOwnedManager?.() ?? managerRef.current
+    setPaneCount(manager?.getPanes().length ?? 0)
+    const activePane = manager?.getActivePane()
     if (activePane) {
       reportActiveRendererPtyForPane(paneTransportsRef.current, activePane.id)
       const paneTitles = useAppStore.getState().runtimePaneTitlesByTabId[tabId] ?? {}
diff --git a/src/renderer/src/components/terminal-pane/terminal-parked-watcher-registry.ts b/src/renderer/src/components/terminal-pane/terminal-parked-watcher-registry.ts
index c6f6e33eac58..682068f3f246 100644
--- a/src/renderer/src/components/terminal-pane/terminal-parked-watcher-registry.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-parked-watcher-registry.ts
@@ -236,3 +236,52 @@ export function pruneParkedTerminalWatchers(liveWorktreeIds: ReadonlySet<string>
     }
   }
 }
+
+/** Permanent removal consumes one leaf's sidecars, including ended watcher slots. */
+export function retireParkedTerminalLeaf(
+  original: { worktreeId: string; tabId: string; leafId: string; ptyId: string | null },
+  retainedPtyIds: ReadonlySet<string> = new Set()
+): number[] {
+  const { worktreeId, tabId, leafId, ptyId } = original
+  const capture = capturedPanesByTabId.get(tabId)
+  const entry = parkedWatchersByTabId.get(tabId)
+  if (
+    (capture && capture.worktreeId !== worktreeId) ||
+    (entry && entry.worktreeId !== worktreeId)
+  ) {
+    throw new Error('terminal_pane_owner_changed')
+  }
+  const panes = capture?.panes.filter((pane) => pane.leafId === leafId) ?? []
+  if (panes.some((pane) => pane.ptyId !== null && pane.ptyId !== ptyId)) {
+    throw new Error('terminal_pane_owner_changed')
+  }
+  const ids = new Set(panes.flatMap((pane) => (pane.ptyId ? [pane.ptyId] : [])))
+  if (ptyId) {
+    ids.add(ptyId)
+  }
+  const paneIds = new Set(panes.map((pane) => pane.paneId))
+  for (const id of ids) {
+    if (retainedPtyIds.has(id)) {
+      continue
+    }
+    const paneId = entry?.paneIdByPtyId.get(id)
+    if (paneId !== undefined) {
+      paneIds.add(paneId)
+    }
+    entry?.disposersByPtyId.get(id)?.()
+    entry?.disposersByPtyId.delete(id)
+    entry?.paneIdByPtyId.delete(id)
+    discardPreHandlerPtyState(id)
+  }
+  if (entry && entry.disposersByPtyId.size === 0 && entry.paneIdByPtyId.size === 0) {
+    parkedWatchersByTabId.delete(tabId)
+  }
+  if (capture) {
+    capture.panes = capture.panes.filter((pane) => pane.leafId !== leafId)
+    if (capture.panes.length === 0) {
+      capturedPanesByTabId.delete(tabId)
+    }
+  }
+  releaseTerminalScrollIntentKey(leafId)
+  return [...paneIds]
+}
diff --git a/src/renderer/src/components/terminal-pane/terminal-presentation-retirement.test-fixture.ts b/src/renderer/src/components/terminal-pane/terminal-presentation-retirement.test-fixture.ts
new file mode 100644
index 000000000000..d0b23c53352e
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/terminal-presentation-retirement.test-fixture.ts
@@ -0,0 +1,212 @@
+import { vi } from 'vitest'
+import type { ManagedPaneInternal } from '@/lib/pane-manager/pane-manager-types'
+import type { PaneManager } from '@/lib/pane-manager/pane-manager'
+import { retireManagedPanePreservingPty } from '@/lib/pane-manager/pane-split-close'
+import { createTerminalPaneClosedHandler } from './terminal-pane-pane-closed'
+import { registerTerminalPaneMount } from './terminal-pane-mount-registration'
+import { cleanupTerminalPaneMount } from './terminal-pane-mount-cleanup'
+import { installTerminalPaneMountEvents } from './terminal-pane-mount-events'
+import type { PaneClosedHandlerContext } from './terminal-pane-mount-context'
+import { useAppStore } from '@/store'
+
+export const LEAF = '11111111-1111-4111-8111-111111111111'
+export const SIBLING = '22222222-2222-4222-8222-222222222222'
+
+function pane(id: number, leafId: string): ManagedPaneInternal {
+  const terminal = {
+    dispose: vi.fn(),
+    clearSelection: vi.fn(),
+    focus: vi.fn(),
+    buffer: { active: { type: 'normal', viewportY: 0, baseY: 0 } }
+  }
+  const addon = () => ({ dispose: vi.fn() })
+  const container = document.createElement('div')
+  container.classList.add('pane')
+  container.dataset.leafId = leafId
+  // SAFETY: real disposal reads only the listed terminal/addon lifecycle and optional resources.
+  return {
+    id,
+    leafId,
+    stablePaneId: leafId,
+    terminal,
+    container,
+    searchAddon: addon(),
+    serializeAddon: addon(),
+    unicode11Addon: addon(),
+    webLinksAddon: addon(),
+    fitAddon: addon(),
+    webglAddon: null,
+    imageAddon: null,
+    ligaturesAddon: null,
+    fitResizeObserver: null,
+    pendingObservedFitRafId: null,
+    paneDragCleanup: vi.fn(),
+    focusClassSyncCleanup: vi.fn()
+  } as unknown as ManagedPaneInternal
+}
+
+/** Uses the production tree teardown, real pane disposer and real mount closure callback. */
+export function mountedOwner(
+  split: boolean,
+  address = {
+    tabId: 'terminal',
+    worktreeId: 'wt-1',
+    leafId: LEAF,
+    ptyId: 'pty-1'
+  }
+) {
+  const source = pane(1, address.leafId)
+  const other = pane(2, SIBLING)
+  const panes = new Map([[1, source], ...(split ? [[2, other] as const] : [])])
+  const sourceTransport = { getPtyId: () => address.ptyId, detach: vi.fn(), destroy: vi.fn() }
+  const transports = new Map([[1, sourceTransport]])
+  const binding = { dispose: vi.fn() }
+  const bindings = new Map([[1, binding]])
+  const ref = () => ({ current: new Map() })
+  const refs = Object.fromEntries(
+    [
+      'linkProviderDisposablesRef',
+      'terminalHandleLinkDisposablesRef',
+      'linkifierClickPrimingDisposablesRef',
+      'linkPointerGesturesRef',
+      'fileLinkClickFallbackDisposablesRef',
+      'httpLinkClickFallbackDisposablesRef',
+      'selectionDisposablesRef',
+      'nativeCopyDisposablesRef',
+      'imeCompositionDisposablesRef',
+      'imeNativeTextForwarderDisposablesRef',
+      'selectionCaptureTimersRef',
+      'osc52DisposablesRef',
+      'osc7DisposablesRef',
+      'mouseHideDisposablesRef',
+      'restoredViewportBlankingPanesRef'
+    ].map((name) => [name, ref()])
+  )
+  const link = { dispose: vi.fn() }
+  refs.linkProviderDisposablesRef.current.set(1, link)
+  const state = useAppStore.getState()
+  let manager: PaneManager
+  const managerRef: { current: PaneManager | null } = { current: null }
+  const deps = {
+    tabId: address.tabId,
+    worktreeId: address.worktreeId,
+    managerRef,
+    containerRef: { current: null },
+    paneTransportsRef: { current: transports },
+    panePtyBindingsRef: { current: bindings },
+    paneMode2031Ref: ref(),
+    paneKittyKeyboardModesRef: ref(),
+    paneLastThemeModeRef: ref(),
+    paneCwdRef: ref(),
+    paneFontSizesRef: ref(),
+    replayingPanesRef: ref(),
+    clearRuntimePaneTitle: state.clearRuntimePaneTitle,
+    syncPanePtyLayoutBinding: vi.fn(),
+    clearTabPtyId: state.clearTabPtyId,
+    setPaneTitles: vi.fn(),
+    paneTitlesRef: { current: {} },
+    setRenamingPaneId: vi.fn(),
+    setPaneCount: vi.fn(),
+    setTabPaneExpanded: state.setTabPaneExpanded,
+    setTabCanExpandPane: state.setTabCanExpandPane,
+    updateTabTitle: state.updateTabTitle,
+    persistLayoutSnapshot: vi.fn(),
+    getTabWideAgentHintLeafId: () => null
+  }
+  // SAFETY: this fixture exercises only registration and the concrete closure handler, using their dependencies above.
+  const context = {
+    deps,
+    refs,
+    deferredSplitHandoffs: new Map(),
+    getOwnedManager: () => manager
+  } as unknown as Pick<
+    PaneClosedHandlerContext,
+    'deps' | 'refs' | 'deferredSplitHandoffs' | 'getOwnedManager'
+  >
+  const onPaneClosed = createTerminalPaneClosedHandler(context)
+  const onLayoutChanged = vi.fn()
+  // SAFETY: the mount's manager adapter delegates its permanent removal to the production mutation/disposer.
+  manager = {
+    getPanes: () => [...panes.values()],
+    getActivePane: () => panes.get(2) ?? panes.get(1) ?? null,
+    retirePanePreservingPty: (id: number, permanent: boolean) =>
+      retireManagedPanePreservingPty(
+        {
+          paneId: id,
+          activePaneId: 1,
+          panes,
+          root: document.createElement('div'),
+          styleOptions: {},
+          managerOptions: { linkOpenHint: () => '', onPaneClosed, onLayoutChanged },
+          getDragCallbacks: () => ({
+            getPanes: () => panes,
+            getRoot: () => source.container,
+            getStyleOptions: () => ({}),
+            isDestroyed: () => false,
+            safeFit: vi.fn(),
+            applyPaneOpacity: vi.fn(),
+            applyDividerStyles: vi.fn(),
+            refitPanesUnder: vi.fn()
+          }),
+          releasePaneIdentity: vi.fn(),
+          setActivePaneId: vi.fn()
+        },
+        permanent
+      ),
+    destroy: vi.fn()
+  } as unknown as PaneManager
+  managerRef.current = manager
+  const cancelResize = vi.fn()
+  const expandedElement = document.createElement('div')
+  expandedElement.style.display = 'none'
+  const expandedStyleSnapshots = new Map([[expandedElement, { display: 'flex', flex: '1' }]])
+  const removeMountEvents = installTerminalPaneMountEvents({
+    manager,
+    deps: {
+      ...deps,
+      isActive: false,
+      showPaneTitle: vi.fn(),
+      syncCanExpandState: vi.fn(),
+      queueResizeAll: vi.fn()
+    },
+    // SAFETY: event installation only captures these dependencies; no split command is issued.
+    ptyDeps: {} as Parameters<typeof installTerminalPaneMountEvents>[0]['ptyDeps']
+  })
+  const empty = vi.fn(() => {
+    removeMountEvents()
+    cleanupTerminalPaneMount({
+      manager,
+      deps: context.deps,
+      refs: context.refs,
+      deferredSplitHandoffs: context.deferredSplitHandoffs,
+      expandedStyleSnapshots,
+      unregisterRuntimeTab: registration.unregisterRuntimeTab,
+      cancelResize,
+      permanent: true
+    })
+  })
+  const registration = registerTerminalPaneMount(context, empty)
+  registration.setOwnedManager(manager)
+  // A null rendering ref does not release the actual mounted owner.
+  managerRef.current = null
+  return {
+    source,
+    other,
+    panes,
+    sourceTransport,
+    transports,
+    binding,
+    bindings,
+    link,
+    onLayoutChanged,
+    manager,
+    empty,
+    cancelResize,
+    expandedElement,
+    setPaneCount: deps.setPaneCount,
+    unregister: () => {
+      removeMountEvents()
+      registration.unregisterRuntimeTab()
+    }
+  }
+}
diff --git a/src/renderer/src/components/terminal-pane/terminal-presentation-retirement.test.ts b/src/renderer/src/components/terminal-pane/terminal-presentation-retirement.test.ts
new file mode 100644
index 000000000000..f12fd3f5dea7
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/terminal-presentation-retirement.test.ts
@@ -0,0 +1,243 @@
+// @vitest-environment happy-dom
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { useAppStore } from '@/store'
+import { makeTerminalTab } from '@/store/slices/worktrees-slice-test-fixtures'
+import { captureTerminalSurfaceIdentity } from '../../../../shared/terminal-tab-close'
+import { retireTerminalPresentation } from './terminal-presentation-retirement'
+import { capturedPanesByTabId, parkedWatchersByTabId } from './terminal-parked-watcher-registry'
+import { LEAF, SIBLING, mountedOwner } from './terminal-presentation-retirement.test-fixture'
+import {
+  createHarness,
+  WORKTREE_ID,
+  TAB_ID,
+  LEAF_ID,
+  PTY_ID,
+  INCARNATION_ID
+} from '../../../../main/runtime/__fixtures__/orca-runtime-terminal-close-continuity-fixtures'
+import { hasRegisteredRuntimeTerminalTab } from '@/runtime/mounted-terminal-tab-registry'
+
+vi.mock('@/runtime/sync-runtime-graph', () => ({ scheduleRuntimeGraphSync: vi.fn() }))
+
+function prepare(split: boolean) {
+  useAppStore.setState({
+    tabsByWorktree: { 'wt-1': [makeTerminalTab({ id: 'terminal', worktreeId: 'wt-1' })] },
+    terminalLayoutsByTabId: {
+      terminal: {
+        root: split
+          ? {
+              type: 'split',
+              direction: 'horizontal',
+              ratio: 0.7,
+              first: { type: 'leaf', leafId: LEAF },
+              second: { type: 'leaf', leafId: SIBLING }
+            }
+          : { type: 'leaf', leafId: LEAF },
+        activeLeafId: split ? SIBLING : LEAF,
+        expandedLeafId: split ? SIBLING : null,
+        chatLeafId: LEAF,
+        ptyIdsByLeafId: { [LEAF]: 'pty-1', ...(split ? { [SIBLING]: 'pty-2' } : {}) }
+      }
+    }
+  })
+  useAppStore
+    .getState()
+    .createUnifiedTab('wt-1', 'terminal', { id: 'terminal', entityId: 'terminal' })
+  const identity = captureTerminalSurfaceIdentity(useAppStore.getState(), 'wt-1', 'terminal', LEAF)
+  if (!identity) {
+    throw new Error('Expected source identity')
+  }
+  return identity
+}
+
+beforeEach(() => {
+  localStorage.clear()
+  useAppStore.setState(useAppStore.getInitialState(), true)
+  capturedPanesByTabId.clear()
+  parkedWatchersByTabId.clear()
+})
+
+describe('direct permanent presentation owner', () => {
+  it.each([true, false])(
+    'disposes mounted resources and canonical membership (split=%s)',
+    (split) => {
+      const identity = prepare(split)
+      const owner = mountedOwner(split)
+      capturedPanesByTabId.set('terminal', {
+        worktreeId: 'wt-1',
+        panes: [{ paneId: 1, leafId: LEAF, ptyId: 'pty-1', drivesTabTitle: true }]
+      })
+      try {
+        retireTerminalPresentation(identity)
+        expect(owner.source.terminal.dispose).toHaveBeenCalledOnce()
+        expect(owner.source.searchAddon.dispose).toHaveBeenCalledOnce()
+        expect(owner.sourceTransport.detach).toHaveBeenCalledExactlyOnceWith({
+          preserveExitObserver: false
+        })
+        expect(owner.sourceTransport.destroy).not.toHaveBeenCalled()
+        expect(owner.transports.has(1)).toBe(false)
+        expect(owner.bindings.has(1)).toBe(false)
+        expect(capturedPanesByTabId.has('terminal')).toBe(false)
+        expect(owner.binding.dispose).toHaveBeenCalledOnce()
+        expect(owner.link.dispose).toHaveBeenCalledOnce()
+        expect(owner.panes.has(1)).toBe(false)
+        expect(owner.setPaneCount).toHaveBeenLastCalledWith(split ? 1 : 0)
+        const state = useAppStore.getState()
+        if (split) {
+          expect(owner.other.terminal.dispose).not.toHaveBeenCalled()
+          expect(state.terminalLayoutsByTabId.terminal).toMatchObject({
+            root: { type: 'leaf', leafId: SIBLING },
+            activeLeafId: SIBLING,
+            expandedLeafId: SIBLING,
+            ptyIdsByLeafId: { [SIBLING]: 'pty-2' }
+          })
+          expect(state.terminalLayoutsByTabId.terminal.chatLeafId).toBeUndefined()
+        } else {
+          expect(owner.manager.destroy).toHaveBeenCalledOnce()
+          expect(owner.cancelResize).toHaveBeenCalledOnce()
+          expect(owner.expandedElement.style.display).toBe('flex')
+          expect(capturedPanesByTabId.has('terminal')).toBe(false)
+          expect(owner.onLayoutChanged).not.toHaveBeenCalled()
+          expect(hasRegisteredRuntimeTerminalTab('terminal', 'wt-1')).toBe(false)
+          expect(state.tabsByWorktree['wt-1']).toEqual([])
+          expect(state.terminalLayoutsByTabId.terminal).toBeUndefined()
+        }
+      } finally {
+        owner.unregister()
+      }
+    }
+  )
+
+  it.each([true, false])(
+    'disposes exact parked captures, including empty watcher entries (split=%s)',
+    (split) => {
+      const identity = prepare(split)
+      const dispose = vi.fn()
+      const siblingDispose = vi.fn()
+      capturedPanesByTabId.set('terminal', {
+        worktreeId: 'wt-1',
+        panes: [
+          { paneId: 1, leafId: LEAF, ptyId: 'pty-1', drivesTabTitle: true },
+          ...(split ? [{ paneId: 2, leafId: SIBLING, ptyId: 'pty-2', drivesTabTitle: false }] : [])
+        ]
+      })
+      parkedWatchersByTabId.set('terminal', {
+        worktreeId: 'wt-1',
+        tabPtyId: 'pty-1',
+        paneIdByPtyId: new Map([['pty-1', 1], ...(split ? [['pty-2', 2] as const] : [])]),
+        disposersByPtyId: new Map(
+          split
+            ? [
+                ['pty-1', dispose],
+                ['pty-2', siblingDispose]
+              ]
+            : []
+        )
+      })
+      retireTerminalPresentation(identity)
+      expect(siblingDispose).not.toHaveBeenCalled()
+      if (split) {
+        expect(dispose).toHaveBeenCalledOnce()
+        expect(capturedPanesByTabId.get('terminal')?.panes.map((pane) => pane.leafId)).toEqual([
+          SIBLING
+        ])
+        expect([...parkedWatchersByTabId.get('terminal')!.paneIdByPtyId.keys()]).toEqual(['pty-2'])
+      } else {
+        expect(capturedPanesByTabId.has('terminal')).toBe(false)
+        expect(parkedWatchersByTabId.has('terminal')).toBe(false)
+      }
+    }
+  )
+
+  it('completes host stop, direct mounted disposal and explicit durable intent together', async () => {
+    const harness = createHarness({ registerPtyBacked: true, publishMobileSurface: true })
+    const session = harness.getSession()
+    useAppStore.setState({
+      tabsByWorktree: session.tabsByWorktree,
+      terminalLayoutsByTabId: session.terminalLayoutsByTabId
+    })
+    useAppStore
+      .getState()
+      .createUnifiedTab(WORKTREE_ID, 'terminal', { id: TAB_ID, entityId: TAB_ID })
+    const source = harness.runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_ID}`, WORKTREE_ID)
+    if (!source.presentation) {
+      throw new Error('Expected original presentation')
+    }
+    const owner = mountedOwner(false, {
+      tabId: TAB_ID,
+      worktreeId: WORKTREE_ID,
+      leafId: LEAF_ID,
+      ptyId: PTY_ID
+    })
+    harness.setVerifiedStopResult(true)
+    harness.setStopAndWaitAction(async () => {
+      await harness.runtime.onPtyExit(PTY_ID, 0, INCARNATION_ID, { hostExitConfirmed: true })
+      expect(owner.source.terminal.dispose).not.toHaveBeenCalled()
+      expect(useAppStore.getState().tabsByWorktree[WORKTREE_ID]).toHaveLength(1)
+    })
+    harness.setCloseTerminalTabAction(() =>
+      retireTerminalPresentation(source.presentation!.identity)
+    )
+    try {
+      await expect(
+        harness.runtime.closeTerminal(source.handle, source.incarnationId, source.presentation)
+      ).resolves.toMatchObject({ ptyKilled: true })
+      expect(owner.source.terminal.dispose).toHaveBeenCalledOnce()
+      expect(owner.transports.size).toBe(0)
+      expect(owner.bindings.size).toBe(0)
+      expect(owner.sourceTransport.destroy).not.toHaveBeenCalled()
+      expect(harness.getSession().tabsByWorktree[WORKTREE_ID]).toEqual([])
+      expect(harness.getSession().closedTerminalTabTombstonesByTabId?.[TAB_ID]).toBeDefined()
+      expect(harness.flushOrThrow).toHaveBeenCalled()
+      expect(harness.kill).not.toHaveBeenCalled()
+    } finally {
+      owner.unregister()
+    }
+  })
+
+  it('refuses a replacement or a newly pinned final tab before disposal', () => {
+    const identity = prepare(false)
+    const owner = mountedOwner(false)
+    try {
+      useAppStore.setState({
+        terminalLayoutsByTabId: {
+          terminal: {
+            ...useAppStore.getState().terminalLayoutsByTabId.terminal,
+            ptyIdsByLeafId: { [LEAF]: 'replacement' }
+          }
+        }
+      })
+      expect(() => retireTerminalPresentation(identity)).toThrow('terminal_pane_owner_changed')
+      expect(owner.source.terminal.dispose).not.toHaveBeenCalled()
+      useAppStore.setState({
+        terminalLayoutsByTabId: {
+          terminal: {
+            ...useAppStore.getState().terminalLayoutsByTabId.terminal,
+            ptyIdsByLeafId: { [LEAF]: 'pty-1' }
+          }
+        },
+        tabsByWorktree: {
+          'wt-1': [{ ...useAppStore.getState().tabsByWorktree['wt-1'][0], isPinned: true }]
+        }
+      })
+      expect(() => retireTerminalPresentation(identity)).toThrow('terminal_tab_pinned')
+      expect(owner.source.terminal.dispose).not.toHaveBeenCalled()
+    } finally {
+      owner.unregister()
+    }
+  })
+
+  it('reports a real disposer failure and retains source membership', () => {
+    const identity = prepare(false)
+    const owner = mountedOwner(false)
+    owner.source.paneDragCleanup = () => {
+      throw new Error('disposal failed')
+    }
+    try {
+      expect(() => retireTerminalPresentation(identity)).toThrow('disposal failed')
+      expect(useAppStore.getState().tabsByWorktree['wt-1']).toHaveLength(1)
+      expect(owner.sourceTransport.destroy).not.toHaveBeenCalled()
+    } finally {
+      owner.unregister()
+    }
+  })
+})
diff --git a/src/renderer/src/components/terminal-pane/terminal-presentation-retirement.ts b/src/renderer/src/components/terminal-pane/terminal-presentation-retirement.ts
new file mode 100644
index 000000000000..9702f0ee9c2d
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/terminal-presentation-retirement.ts
@@ -0,0 +1,79 @@
+import { useAppStore } from '@/store'
+import { findRegisteredTerminalTab } from '@/runtime/mounted-terminal-tab-registry'
+import { isUnifiedTabPinned } from '@/store/pinned-tab-close-guard'
+import {
+  captureTerminalSurfaceIdentity,
+  isRetainedTerminalSurfaceIdentity,
+  type TerminalSurfaceCloseIdentity
+} from '../../../../shared/terminal-tab-close'
+import { detachTerminalLayoutLeaf } from './terminal-layout-leaf-detach'
+import { retireParkedTerminalLeaf } from './terminal-parked-watcher-registry'
+import { collapseParkedTerminalLeaf } from './terminal-parked-pty-watcher'
+
+/** Admission and disposal share one synchronous owner action. */
+export function removeTerminalPresentation(
+  original: TerminalSurfaceCloseIdentity,
+  dispose: () => void
+): void {
+  const state = useAppStore.getState()
+  const current = captureTerminalSurfaceIdentity(
+    state,
+    original.worktreeId,
+    original.tabId,
+    original.leafId
+  )
+  if (!isRetainedTerminalSurfaceIdentity(original, current)) {
+    throw new Error('terminal_pane_owner_changed')
+  }
+  const layout = state.terminalLayoutsByTabId[original.tabId]
+  const split = detachTerminalLayoutLeaf(layout, original.leafId)
+  if (
+    current?.hasLeaf &&
+    !split &&
+    (isUnifiedTabPinned(state, original.worktreeId, original.tabId) ||
+      state.tabsByWorktree[original.worktreeId]?.some(
+        (tab) => tab.id === original.tabId && tab.isPinned
+      ))
+  ) {
+    throw new Error('terminal_tab_pinned')
+  }
+  const retainedPtyIds = new Set(
+    Object.entries(layout?.ptyIdsByLeafId ?? {})
+      .filter(([leafId]) => leafId !== original.leafId)
+      .map(([, ptyId]) => ptyId)
+  )
+  const paneIds = retireParkedTerminalLeaf(original, retainedPtyIds)
+  for (const paneId of paneIds) {
+    state.clearRuntimePaneTitle(original.tabId, paneId)
+  }
+  dispose()
+  if (!current?.hasLeaf) {
+    return
+  }
+  if (split) {
+    useAppStore.getState().setTabLayout(original.tabId, split.sourceLayout)
+  } else {
+    useAppStore.getState().closeTab(original.tabId, {
+      reason: 'user',
+      captureRecentlyClosed: false,
+      localPtyTeardownOwnedExternally: true,
+      remoteCloseOwnedByHost: true
+    })
+  }
+}
+
+export function retireTerminalPresentation(original: TerminalSurfaceCloseIdentity): void {
+  const mounted = findRegisteredTerminalTab(original.tabId, original.worktreeId)?.tab
+  if (mounted) {
+    if (!mounted.retirePresentation) {
+      throw new Error('runtime_unavailable')
+    }
+    mounted.retirePresentation(original)
+    return
+  }
+  removeTerminalPresentation(original, () => {
+    const state = useAppStore.getState()
+    state.retireAgentPaneAuthority(`${original.tabId}:${original.leafId}`)
+    collapseParkedTerminalLeaf(original.tabId, original.leafId, original.ptyId ?? undefined)
+  })
+}
diff --git a/src/renderer/src/components/terminal-pane/use-terminal-pane-mount-lifecycle.ts b/src/renderer/src/components/terminal-pane/use-terminal-pane-mount-lifecycle.ts
index 6adfab7015a6..78ad00f842ad 100644
--- a/src/renderer/src/components/terminal-pane/use-terminal-pane-mount-lifecycle.ts
+++ b/src/renderer/src/components/terminal-pane/use-terminal-pane-mount-lifecycle.ts
@@ -4,7 +4,10 @@ import { configureTerminalOutputBacklogCap } from '@/lib/pane-manager/pane-termi
 import { scheduleRuntimeGraphSync } from '@/runtime/sync-runtime-graph'
 import { e2eConfig } from '@/lib/e2e-config'
 import { useTerminalParkMountIntent } from './use-terminal-park-mount-intent'
-import { prepareTerminalPaneMount } from './terminal-pane-mount-preparation'
+import {
+  prepareTerminalPaneMount,
+  type TerminalPaneMountPreparation
+} from './terminal-pane-mount-preparation'
 import { createTerminalPaneManagerOptions } from './terminal-pane-manager-options'
 import { restoreTerminalPaneLayout } from './terminal-pane-layout-restore'
 import { runTerminalPaneBootstrapSplits } from './terminal-pane-mount-bootstrap'
@@ -24,7 +27,31 @@ export function useTerminalPaneMountLifecycle(
   configureTerminalOutputBacklogCap(deps.settings?.terminalScrollbackRows)
 
   useEffect(() => {
-    const preparation = prepareTerminalPaneMount(deps, refs, mountFollowsTerminalPark)
+    let removeMountEvents = (): void => {}
+    const releaseWebviewDragPassthrough: { current: (() => void) | null } = { current: null }
+    const preparation: TerminalPaneMountPreparation | null = prepareTerminalPaneMount(
+      deps,
+      refs,
+      mountFollowsTerminalPark,
+      (manager) => {
+        if (!preparation) {
+          throw new Error('terminal_pane_owner_unavailable')
+        }
+        removeMountEvents()
+        cleanupTerminalPaneMount({
+          manager,
+          deps,
+          refs,
+          deferredSplitHandoffs: preparation.deferredSplitHandoffs,
+          expandedStyleSnapshots: preparation.expandedStyleSnapshots,
+          unregisterRuntimeTab: preparation.unregisterRuntimeTab,
+          cancelResize: preparation.cancelResizeAll,
+          permanent: true
+        })
+        releaseWebviewDragPassthrough.current?.()
+        releaseWebviewDragPassthrough.current = null
+      }
+    )
     if (!preparation) {
       return
     }
@@ -36,11 +63,9 @@ export function useTerminalPaneMountLifecycle(
       unregisterRuntimeTab
     } = preparation
     let shouldPersistLayout = false
-    const releaseWebviewDragPassthrough: { current: (() => void) | null } = {
-      current: null
-    }
     const queueResizeAll = preparation.queueResizeAll
     const managerContext = {
+      getOwnedManager: preparation.getOwnedManager,
       deps,
       refs,
       ptyDeps,
@@ -74,6 +99,7 @@ export function useTerminalPaneMountLifecycle(
     }
     const manager = new PaneManager(container, createTerminalPaneManagerOptions(managerContext))
     deps.managerRef.current = manager
+    preparation.setOwnedManager(manager)
     if (e2eConfig.exposeStore) {
       window.__paneManagers = window.__paneManagers ?? new Map()
       window.__paneManagers.set(deps.tabId, manager)
@@ -110,7 +136,7 @@ export function useTerminalPaneMountLifecycle(
     queueResizeAll(deps.isActive)
     deps.persistLayoutSnapshot()
     scheduleRuntimeGraphSync()
-    const removeMountEvents = installTerminalPaneMountEvents({
+    removeMountEvents = installTerminalPaneMountEvents({
       manager,
       deps: {
         tabId: deps.tabId,
@@ -126,15 +152,17 @@ export function useTerminalPaneMountLifecycle(
     })
     return () => {
       removeMountEvents()
-      cleanupTerminalPaneMount({
-        manager,
-        deps,
-        refs,
-        deferredSplitHandoffs,
-        expandedStyleSnapshots,
-        unregisterRuntimeTab,
-        cancelResize: preparation.cancelResizeAll
-      })
+      if (preparation.getOwnedManager() === manager) {
+        cleanupTerminalPaneMount({
+          manager,
+          deps,
+          refs,
+          deferredSplitHandoffs,
+          expandedStyleSnapshots,
+          unregisterRuntimeTab,
+          cancelResize: preparation.cancelResizeAll
+        })
+      }
       releaseWebviewDragPassthrough.current?.()
       releaseWebviewDragPassthrough.current = null
     }
diff --git a/src/renderer/src/hooks/ipc-events/mobile-terminal-close-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/mobile-terminal-close-ipc-bridge.ts
index 24ed31b9ae16..d15236c0d9c2 100644
--- a/src/renderer/src/hooks/ipc-events/mobile-terminal-close-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/mobile-terminal-close-ipc-bridge.ts
@@ -1,3 +1,4 @@
+import { retireTerminalPresentation } from '@/components/terminal-pane/terminal-presentation-retirement'
 import { createRuntimeFilePositionQueue } from './runtime-file-position'
 import { applyClosedTerminalLeafNotice } from '@/components/terminal-pane/closed-terminal-leaf-notice'
 import { closeTerminalTab } from '@/components/terminal/terminal-tab-actions'
@@ -167,7 +168,7 @@ export function registerMobileAndTerminalCloseIpcBridge(
   if (window.api.ui.onTerminalTabCloseRequest) {
     unsubs.push(
       window.api.ui.onTerminalTabCloseRequest(
-        ({ requestId, tabId, localPtyTeardownOwnedExternally, force }) => {
+        ({ requestId, tabId, localPtyTeardownOwnedExternally, force, originalSurface }) => {
           let responded = false
           const respond = (error?: string): void => {
             if (responded) {
@@ -176,6 +177,24 @@ export function registerMobileAndTerminalCloseIpcBridge(
             responded = true
             window.api.ui.respondTerminalTabClose({ requestId, ...(error ? { error } : {}) })
           }
+          if (originalSurface) {
+            void (async () => {
+              if (originalSurface.tabId !== tabId || !localPtyTeardownOwnedExternally) {
+                throw new Error('terminal_pane_owner_changed')
+              }
+              retireTerminalPresentation(originalSurface)
+              const state = useAppStore.getState()
+              await persistWorkspaceSessionByHost(
+                window.api.session,
+                buildWorkspaceSessionPayload(state),
+                state
+              )
+              respond()
+            })().catch((error: unknown) =>
+              respond(error instanceof Error ? error.message : 'terminal_tab_close_failed')
+            )
+            return
+          }
           closeTerminalTab(tabId, {
             rejectPinned: true,
             ...(force ? { force: true } : {}),
diff --git a/src/renderer/src/lib/ai-vault-tab-title-requests.ts b/src/renderer/src/lib/ai-vault-tab-title-requests.ts
index 466939780214..55909304c56b 100644
--- a/src/renderer/src/lib/ai-vault-tab-title-requests.ts
+++ b/src/renderer/src/lib/ai-vault-tab-title-requests.ts
@@ -8,7 +8,9 @@ import type { TerminalTab } from '../../../shared/terminal-tab-types'
 import { getExecutionHostIdForWorktree } from '@/lib/worktree-runtime-owner'
 import type { AppState } from '@/store/types'
 import type { AgentPaneConversationIdentity } from '@/store/slices/agent-pane-conversation'
-import { resolvePaneKey } from './agent-status-pane-ownership'
+import { collectLeafIdsInOrder } from '@/components/terminal-pane/terminal-layout-leaf-ids'
+import { getIndexedRepoMap, getIndexedWorktreeMap } from '@/store/worktree-repo-index'
+import { selectWorktreesByRepo } from '@/store/workspace-record-selectors'
 
 /** The conversation a tab's pane runs, for an agent `isAgent` accepts. */
 export type AgentPaneConversation<Agent extends AgentType> = {
@@ -26,6 +28,8 @@ export type AiVaultTitleRequest = Omit<
   'paneKey'
 >
 
+type ConversationTab = TerminalTab & { worktreeId: string; leafIds?: ReadonlySet<string> }
+
 type RequestCandidate<Agent extends AgentType> = AgentPaneConversation<Agent> & {
   priority: number
 }
@@ -41,7 +45,7 @@ function activePaneKey(state: AppState, tabId: string): string | null {
 
 function registerCandidate<Agent extends AgentType>(
   state: AppState,
-  tabsById: ReadonlyMap<string, TerminalTab>,
+  tabsById: ReadonlyMap<string, ConversationTab>,
   candidates: Map<string, RequestCandidate<Agent>>,
   isAgent: (agent: AgentType | null | undefined) => agent is Agent,
   args: {
@@ -60,8 +64,15 @@ function registerCandidate<Agent extends AgentType>(
   }
   const tabId = tabIdFromPaneKey(args.paneKey, args.tabId)
   const tab = tabId ? tabsById.get(tabId) : undefined
-  const worktreeId = args.worktreeId ?? tab?.worktreeId
-  if (!tabId || !tab || !worktreeId) {
+  const worktreeId = tab?.worktreeId
+  const pane = parsePaneKey(args.paneKey)
+  if (
+    !tabId ||
+    !tab ||
+    !worktreeId ||
+    (pane && (pane.tabId !== tabId || (tab.leafIds && !tab.leafIds.has(pane.leafId)))) ||
+    (args.worktreeId !== undefined && args.worktreeId !== worktreeId)
+  ) {
     return
   }
   const priority = args.priority + (activePaneKey(state, tabId) === args.paneKey ? 100 : 0)
@@ -96,20 +107,30 @@ function liveCandidate(entry: AgentStatusEntry): Parameters<typeof registerCandi
 
 function lastReportedCandidate(
   state: AppState,
-  identity: AgentPaneConversationIdentity
+  identity: AgentPaneConversationIdentity,
+  tabsById: ReadonlyMap<string, ConversationTab>
 ): Parameters<typeof registerCandidate>[4] | null {
-  const owner = resolvePaneKey(state, identity.paneKey)
+  const pane = parsePaneKey(identity.paneKey)
+  const tab = pane ? tabsById.get(pane.tabId) : undefined
+  const worktree = getIndexedWorktreeMap(selectWorktreesByRepo(state)).get(identity.worktreeId)
+  const repo = worktree ? getIndexedRepoMap(state.repos).get(worktree.repoId) : undefined
   if (
-    !owner.exists ||
-    owner.owningWorktreeId !== identity.worktreeId ||
+    !pane ||
+    tab?.worktreeId !== identity.worktreeId ||
+    (tab.leafIds && !tab.leafIds.has(pane.leafId)) ||
     identity.executionHostId !== getExecutionHostIdForWorktree(state, identity.worktreeId) ||
-    (owner.repoConnectionResolved && identity.connectionId !== owner.repoConnectionId)
+    (repo !== undefined && identity.connectionId !== (repo.connectionId ?? null))
   ) {
     return null
   }
   return { ...identity, priority: 0, refresh: false }
 }
 
+function conversationRecords<T>(records: Record<string, T> | undefined, paneKey?: string): T[] {
+  const addressed = paneKey ? records?.[paneKey] : undefined
+  return paneKey ? (addressed ? [addressed] : []) : Object.values(records ?? {})
+}
+
 export function collectAiVaultTitleRequests(state: AppState): AiVaultTitleRequest[] {
   return collectAgentPaneConversations(state, isAiVaultTitleAgent).map(
     ({ paneKey: _paneKey, ...request }) => request
@@ -125,24 +146,60 @@ export function collectAgentPaneConversations<Agent extends AgentType>(
     runningAgentsOnly?: boolean
     /** History addresses a conversation in any pane, including an inactive split. */
     allPanes?: boolean
+    pane?: { worktreeId: string; paneKey: string }
+    tab?: { worktreeId: string; tabId: string }
   } = {}
 ): AgentPaneConversation<Agent>[] {
-  const tabsById = new Map(
-    Object.values(state.tabsByWorktree)
-      .flat()
-      .map((tab) => [tab.id, tab] as const)
-  )
+  const addressed = options.pane
+    ? {
+        worktreeId: options.pane.worktreeId,
+        tabId: tabIdFromPaneKey(
+          options.pane.paneKey,
+          state.agentStatusByPaneKey[options.pane.paneKey]?.tabId ??
+            state.sleepingAgentSessionsByPaneKey[options.pane.paneKey]?.tabId ??
+            state.retainedAgentsByPaneKey[options.pane.paneKey]?.entry.tabId
+        )
+      }
+    : options.tab
+  const partitions = addressed
+    ? [
+        [
+          addressed.worktreeId,
+          (state.tabsByWorktree[addressed.worktreeId] ?? []).filter(
+            (tab) => tab.id === addressed.tabId
+          )
+        ] as const
+      ]
+    : Object.entries(state.tabsByWorktree)
+  const tabsById = new Map<string, ConversationTab>()
+  for (const [worktreeId, tabs] of partitions) {
+    for (const tab of tabs) {
+      const root = state.terminalLayoutsByTabId[tab.id]?.root
+      tabsById.set(tab.id, {
+        ...tab,
+        worktreeId,
+        ...(root ? { leafIds: new Set(collectLeafIdsInOrder(root)) } : {})
+      })
+    }
+  }
+  const records = <T>(record: Record<string, T> | undefined) =>
+    conversationRecords(record, options.pane?.paneKey)
   const candidates = new Map<string, RequestCandidate<Agent>>()
-  const retained = options.runningAgentsOnly ? [] : Object.values(state.retainedAgentsByPaneKey)
-  const sleeping = options.runningAgentsOnly
-    ? []
-    : Object.values(state.sleepingAgentSessionsByPaneKey)
+  const retained = options.runningAgentsOnly ? [] : records(state.retainedAgentsByPaneKey)
+  const sleeping = options.runningAgentsOnly ? [] : records(state.sleepingAgentSessionsByPaneKey)
 
   if (!options.runningAgentsOnly) {
-    for (const identity of Object.values(state.agentConversationsByPaneKey ?? {})) {
-      const candidate = lastReportedCandidate(state, identity)
+    for (const identity of records(state.agentConversationsByPaneKey)) {
+      const candidate = lastReportedCandidate(state, identity, tabsById)
       if (candidate) {
-        registerCandidate(state, tabsById, candidates, isAgent, candidate, options.allPanes)
+        registerCandidate(
+          state,
+          tabsById,
+          candidates,
+          isAgent,
+          candidate,
+          options.allPanes || !!options.pane
+        )
       }
     }
   }
@@ -162,7 +219,7 @@ export function collectAgentPaneConversations<Agent extends AgentType>(
         tabId: entry.entry.tabId,
         worktreeId: entry.worktreeId
       },
-      options.allPanes
+      options.allPanes || !!options.pane
     )
   }
   for (const record of sleeping) {
@@ -180,14 +237,23 @@ export function collectAgentPaneConversations<Agent extends AgentType>(
         tabId: record.tabId,
         worktreeId: record.worktreeId
       },
-      options.allPanes
+      options.allPanes || !!options.pane
     )
   }
-  for (const entry of Object.values(state.agentStatusByPaneKey)) {
-    registerCandidate(state, tabsById, candidates, isAgent, liveCandidate(entry), options.allPanes)
+  for (const entry of records(state.agentStatusByPaneKey)) {
+    registerCandidate(
+      state,
+      tabsById,
+      candidates,
+      isAgent,
+      liveCandidate(entry),
+      options.allPanes || !!options.pane
+    )
   }
 
-  return [...candidates.values()].map(({ priority: _priority, ...request }) => request)
+  return [...candidates.values()]
+    .filter((candidate) => !options.pane || candidate.paneKey === options.pane.paneKey)
+    .map(({ priority: _priority, ...request }) => request)
 }
 
 /** One pane's running agent, mapped as above, so a pane's action finds that pane's own conversation. */
@@ -196,21 +262,7 @@ export function resolvePaneAgentConversation<Agent extends AgentType>(
   pane: { worktreeId: string; paneKey: string },
   isAgent: (agent: AgentType | null | undefined) => agent is Agent
 ): AgentPaneConversation<Agent> | null {
-  const live = state.agentStatusByPaneKey[pane.paneKey]
-  if (live?.paneKey !== pane.paneKey) {
-    return null
-  }
-  const tabsById = new Map(
-    (state.tabsByWorktree[pane.worktreeId] ?? []).map((tab) => [tab.id, tab] as const)
-  )
-  const candidates = new Map<string, RequestCandidate<Agent>>()
-  registerCandidate(state, tabsById, candidates, isAgent, liveCandidate(live))
-  const [candidate] = candidates.values()
-  if (!candidate) {
-    return null
-  }
-  const { priority: _priority, ...request } = candidate
-  return request
+  return collectAgentPaneConversations(state, isAgent, { pane, runningAgentsOnly: true })[0] ?? null
 }
 
 /** The PTY a pane is bound to now. */
@@ -225,45 +277,5 @@ export function resolvePaneLastAgentConversation<Agent extends AgentType>(
   pane: { worktreeId: string; paneKey: string },
   isAgent: (agent: AgentType | null | undefined) => agent is Agent
 ): AgentPaneConversation<Agent> | null {
-  const live = resolvePaneAgentConversation(state, pane, isAgent)
-  const retained = state.retainedAgentsByPaneKey[pane.paneKey]
-  const saved = state.sleepingAgentSessionsByPaneKey[pane.paneKey]
-  const tab = (state.tabsByWorktree[pane.worktreeId] ?? []).find(
-    (candidate) => candidate.id === parsePaneKey(pane.paneKey)?.tabId
-  )
-  const source =
-    retained?.entry.paneKey === pane.paneKey && retained.worktreeId === pane.worktreeId
-      ? retained
-      : tab && saved?.worktreeId === pane.worktreeId
-        ? { tab, agentType: saved.agent, entry: saved }
-        : null
-  if (live) {
-    return live
-  }
-  const candidates = new Map<string, RequestCandidate<Agent>>()
-  const tabsById = new Map(source ? [[source.tab.id, source.tab]] : tab ? [[tab.id, tab]] : [])
-  if (source) {
-    registerCandidate(state, tabsById, candidates, isAgent, {
-      agent: source.agentType,
-      paneKey: pane.paneKey,
-      priority: 10,
-      providerSession: source.entry.providerSession,
-      refresh: false,
-      tabId: source.tab.id,
-      worktreeId: pane.worktreeId
-    })
-  }
-  const identity = state.agentConversationsByPaneKey?.[pane.paneKey]
-  if (identity?.worktreeId === pane.worktreeId && identity.paneKey === pane.paneKey) {
-    const candidate = lastReportedCandidate(state, identity)
-    if (candidate) {
-      registerCandidate(state, tabsById, candidates, isAgent, candidate)
-    }
-  }
-  const [candidate] = candidates.values()
-  if (!candidate) {
-    return null
-  }
-  const { priority: _priority, ...request } = candidate
-  return request
+  return collectAgentPaneConversations(state, isAgent, { pane })[0] ?? null
 }
diff --git a/src/renderer/src/lib/pane-manager/pane-manager-tree-mutations.ts b/src/renderer/src/lib/pane-manager/pane-manager-tree-mutations.ts
index b3758730d596..52878604f87e 100644
--- a/src/renderer/src/lib/pane-manager/pane-manager-tree-mutations.ts
+++ b/src/renderer/src/lib/pane-manager/pane-manager-tree-mutations.ts
@@ -94,18 +94,25 @@ export function detachPaneForExternalMoveOnManager(host: PaneManagerHost, paneId
   })
 }
 
-export function retirePanePreservingPtyOnManager(host: PaneManagerHost, paneId: number): boolean {
-  return retireManagedPanePreservingPty({
-    paneId,
-    activePaneId: host.getActivePaneId(),
-    panes: host.panes,
-    root: host.root,
-    styleOptions: host.getStyleOptions(),
-    managerOptions: host.options,
-    getDragCallbacks: () => host.getDragCallbacks(),
-    releasePaneIdentity: (numericPaneId) => host.identities.release(numericPaneId),
-    setActivePaneId: (id) => {
-      host.setActivePaneId(id)
-    }
-  })
+export function retirePanePreservingPtyOnManager(
+  host: PaneManagerHost,
+  paneId: number,
+  permanent = false
+): boolean {
+  return retireManagedPanePreservingPty(
+    {
+      paneId,
+      activePaneId: host.getActivePaneId(),
+      panes: host.panes,
+      root: host.root,
+      styleOptions: host.getStyleOptions(),
+      managerOptions: host.options,
+      getDragCallbacks: () => host.getDragCallbacks(),
+      releasePaneIdentity: (numericPaneId) => host.identities.release(numericPaneId),
+      setActivePaneId: (id) => {
+        host.setActivePaneId(id)
+      }
+    },
+    permanent
+  )
 }
diff --git a/src/renderer/src/lib/pane-manager/pane-manager-types.ts b/src/renderer/src/lib/pane-manager/pane-manager-types.ts
index dc0357403194..8d7ee20cd0a1 100644
--- a/src/renderer/src/lib/pane-manager/pane-manager-types.ts
+++ b/src/renderer/src/lib/pane-manager/pane-manager-types.ts
@@ -38,7 +38,7 @@ export type PaneSplitOptions = Omit<PaneSpawnHints, 'placement'> & {
 export type ClosedPaneInfo = {
   paneId: number
   leafId: TerminalLeafId
-  reason?: 'close' | 'detach' | 'retire'
+  reason?: 'close' | 'detach' | 'retire' | 'remove'
 }
 
 export type PaneExternalDropTarget = {
diff --git a/src/renderer/src/lib/pane-manager/pane-manager.ts b/src/renderer/src/lib/pane-manager/pane-manager.ts
index e1febd2d0df3..a303a7674b22 100644
--- a/src/renderer/src/lib/pane-manager/pane-manager.ts
+++ b/src/renderer/src/lib/pane-manager/pane-manager.ts
@@ -155,8 +155,8 @@ export class PaneManager {
     return detachPaneForExternalMoveOnManager(this.host, paneId)
   }
 
-  retirePanePreservingPty(paneId: number): boolean {
-    return retirePanePreservingPtyOnManager(this.host, paneId)
+  retirePanePreservingPty(paneId: number, permanent = false): boolean {
+    return retirePanePreservingPtyOnManager(this.host, paneId, permanent)
   }
 
   getPanes(limit = Number.POSITIVE_INFINITY): ManagedPane[] {
diff --git a/src/renderer/src/lib/pane-manager/pane-split-close.ts b/src/renderer/src/lib/pane-manager/pane-split-close.ts
index 6cf53fe9a2df..32731cb76a91 100644
--- a/src/renderer/src/lib/pane-manager/pane-split-close.ts
+++ b/src/renderer/src/lib/pane-manager/pane-split-close.ts
@@ -185,7 +185,7 @@ type CloseManagedPaneArgs = {
 
 function teardownManagedPane(
   args: CloseManagedPaneArgs,
-  reason: 'close' | 'detach' | 'retire'
+  reason: 'close' | 'detach' | 'retire' | 'remove'
 ): void {
   const pane = args.panes.get(args.paneId)
   if (!pane) {
@@ -194,7 +194,7 @@ function teardownManagedPane(
   const closedLeafId = pane.leafId
   args.releasePaneIdentity(args.paneId)
   removePaneContainer(args, pane)
-  if (reason === 'close') {
+  if (reason === 'close' || reason === 'remove') {
     // Leaf ids are minted UUIDs and never reused, so a closed leaf's scroll
     // intent is unreachable. Detach/retire hand the leaf to a new host, which
     // must still be able to restore it.
@@ -211,7 +211,9 @@ function teardownManagedPane(
     leafId: closedLeafId,
     reason
   })
-  args.managerOptions.onLayoutChanged?.()
+  if (reason !== 'remove') {
+    args.managerOptions.onLayoutChanged?.()
+  }
 }
 
 export function closeManagedPane(args: CloseManagedPaneArgs): void {
@@ -230,11 +232,14 @@ export function detachManagedPaneForExternalMove(args: CloseManagedPaneArgs): bo
   return true
 }
 
-export function retireManagedPanePreservingPty(args: CloseManagedPaneArgs): boolean {
-  if (!args.panes.has(args.paneId) || args.panes.size <= 1) {
+export function retireManagedPanePreservingPty(
+  args: CloseManagedPaneArgs,
+  permanent = false
+): boolean {
+  if (!args.panes.has(args.paneId) || (!permanent && args.panes.size <= 1)) {
     return false
   }
-  teardownManagedPane(args, 'retire')
+  teardownManagedPane(args, permanent ? 'remove' : 'retire')
   return true
 }
 
diff --git a/src/renderer/src/runtime/mounted-terminal-tab-registry.ts b/src/renderer/src/runtime/mounted-terminal-tab-registry.ts
index 6f35bc24f292..30775c98bb8b 100644
--- a/src/renderer/src/runtime/mounted-terminal-tab-registry.ts
+++ b/src/renderer/src/runtime/mounted-terminal-tab-registry.ts
@@ -5,7 +5,10 @@ import {
 import type { PaneManager } from '@/lib/pane-manager/pane-manager'
 import { resolveLeafIdForManager } from '@/lib/pane-manager/pane-key-resolution'
 
+import type { TerminalSurfaceCloseIdentity } from '../../../shared/terminal-tab-close'
+
 export type RegisteredTerminalTab = {
+  retirePresentation?: (original: TerminalSurfaceCloseIdentity) => void
   tabId: string
   worktreeId: string
   getManager: () => PaneManager | null
diff --git a/src/shared/rpc-contract/rpc-params-catalog.generated.ts b/src/shared/rpc-contract/rpc-params-catalog.generated.ts
index d73d78f7eb48..6bf0b47a89ce 100644
--- a/src/shared/rpc-contract/rpc-params-catalog.generated.ts
+++ b/src/shared/rpc-contract/rpc-params-catalog.generated.ts
@@ -582,6 +582,7 @@ import {
 import {
   AgentTeamsPrepareLaunch,
   AgentTeamsTmuxCompat,
+  TerminalClose,
   TerminalCloseAll,
   TerminalCreateParams,
   TerminalFocus,
@@ -1352,7 +1353,7 @@ export const RPC_PARAMS_BY_METHOD = {
   'terminal.adoptOrphans': TerminalAdoptOrphans,
   'terminal.agentStatus': TerminalHandle,
   'terminal.clearBuffer': TerminalHandle,
-  'terminal.close': TerminalHandle,
+  'terminal.close': TerminalClose,
   'terminal.closeAll': TerminalCloseAll,
   'terminal.closeTab': TerminalHandle,
   'terminal.create': TerminalCreateParams,
diff --git a/src/shared/rpc-contract/terminal-unary-params.ts b/src/shared/rpc-contract/terminal-unary-params.ts
index b0c1cfc3ab0e..49b1ba6aaa45 100644
--- a/src/shared/rpc-contract/terminal-unary-params.ts
+++ b/src/shared/rpc-contract/terminal-unary-params.ts
@@ -22,12 +22,38 @@ export const WindowsShellOverrideParam = z
   // spawn path exact-matches `.exe` spellings and must never see `cmd` or `Git-Bash`.
   .transform((shell) => canonicalizeWindowsShellOverride(shell) ?? shell)
 
+const TerminalSurfaceCloseIdentity = z.object({
+  worktreeId: requiredString('Missing worktree id'),
+  tabId: requiredString('Missing tab id'),
+  leafId: requiredString('Missing leaf id'),
+  createdAt: z.number().finite().nullable(),
+  generation: z.number().int().nonnegative(),
+  hasLeaf: z.boolean(),
+  ptyId: z.string().nullable(),
+  incarnationId: z.string().nullable()
+})
+const TerminalSurfaceCloseCapture = z.object({
+  identity: TerminalSurfaceCloseIdentity,
+  holders: z
+    .array(
+      z.object({
+        hostId: OptionalExecutionHostId.unwrap(),
+        identity: TerminalSurfaceCloseIdentity.nullable()
+      })
+    )
+    .max(64)
+})
+
 export const TerminalHandle = z.object({
   terminal: requiredString('Missing terminal handle'),
   // Additive fence understood by newer hosts; legacy hosts safely ignore it.
   expectedIncarnationId: requiredString('Missing PTY incarnation').optional()
 })
 
+export const TerminalClose = TerminalHandle.extend({
+  originalPresentation: TerminalSurfaceCloseCapture.optional()
+})
+
 export const TerminalReadKittyFile = TerminalHandle.extend({
   path: z
     .string()
diff --git a/src/shared/runtime-terminal-contracts.ts b/src/shared/runtime-terminal-contracts.ts
index 4c6cf8d8bccb..fb0864b9d808 100644
--- a/src/shared/runtime-terminal-contracts.ts
+++ b/src/shared/runtime-terminal-contracts.ts
@@ -1,3 +1,4 @@
+import type { TerminalSurfaceCloseCapture } from './terminal-tab-close'
 import type { TerminalLaunchResult } from './agent-session-resume'
 import type * as AgentSessionResume from './agent-session-resume'
 import type { StartupCommandDelivery } from './codex-startup-delivery'
@@ -285,6 +286,8 @@ export type RuntimeTerminalSplit = {
 }
 
 export type RuntimeTerminalResolvePane = TerminalLaunchResult & {
+  presentation?: TerminalSurfaceCloseCapture
+
   handle: string
   /** Host-owned PTY incarnation used to fence remote identity observations. */
   incarnationId?: string | null
diff --git a/src/shared/terminal-tab-close.ts b/src/shared/terminal-tab-close.ts
index 75a77fbfc2bd..61f33b35ffe6 100644
--- a/src/shared/terminal-tab-close.ts
+++ b/src/shared/terminal-tab-close.ts
@@ -1,11 +1,119 @@
+import type { ExecutionHostId } from './execution-host'
+import type { WorkspaceSessionState } from './workspace-session-state-types'
+import type { TerminalPaneLayoutNode } from './terminal-tab-types'
+
 export type TerminalTabCloseRequest = {
   requestId: string
   tabId: string
   localPtyTeardownOwnedExternally?: boolean
   force?: boolean
+  originalSurface?: TerminalSurfaceCloseIdentity
 }
 
 export type TerminalTabCloseResponse = {
   requestId: string
   error?: string
 }
+
+/** Captured presentation facts only narrow the authenticated terminal close. */
+export type TerminalSurfaceCloseIdentity = {
+  worktreeId: string
+  tabId: string
+  leafId: string
+  createdAt: number | null
+  generation: number
+  hasLeaf: boolean
+  ptyId: string | null
+  incarnationId: string | null
+}
+
+export type TerminalSurfaceCloseCapture = {
+  identity: TerminalSurfaceCloseIdentity
+  holders: { hostId: ExecutionHostId; identity: TerminalSurfaceCloseIdentity | null }[]
+}
+
+export function isRetainedTerminalSurfaceIdentity(
+  original: TerminalSurfaceCloseIdentity,
+  current: TerminalSurfaceCloseIdentity | null
+): boolean {
+  return (
+    current === null ||
+    (current.worktreeId === original.worktreeId &&
+      current.tabId === original.tabId &&
+      current.leafId === original.leafId &&
+      current.createdAt === original.createdAt &&
+      current.generation === original.generation &&
+      (!current.hasLeaf || original.hasLeaf) &&
+      (current.ptyId === null || current.ptyId === original.ptyId) &&
+      (current.incarnationId === null || current.incarnationId === original.incarnationId))
+  )
+}
+
+export function terminalTreeHasLeaf(
+  node: TerminalPaneLayoutNode | null | undefined,
+  leafId: string
+): boolean {
+  return (
+    !!node &&
+    (node.type === 'leaf'
+      ? node.leafId === leafId
+      : terminalTreeHasLeaf(node.first, leafId) || terminalTreeHasLeaf(node.second, leafId))
+  )
+}
+
+export function captureTerminalSurfaceIdentity(
+  state:
+    | (Pick<WorkspaceSessionState, 'tabsByWorktree' | 'terminalLayoutsByTabId'> &
+        Partial<Pick<WorkspaceSessionState, 'terminalPtyIncarnationsByPaneKey'>>)
+    | null
+    | undefined,
+  worktreeId: string,
+  tabId: string,
+  leafId: string
+): TerminalSurfaceCloseIdentity | null {
+  const row = state?.tabsByWorktree[worktreeId]?.find((tab) => tab.id === tabId)
+  if (!row || !state) {
+    return null
+  }
+  const layout = state.terminalLayoutsByTabId[tabId]
+  return {
+    worktreeId,
+    tabId,
+    leafId,
+    createdAt: row.createdAt,
+    generation: row.generation ?? 0,
+    hasLeaf: terminalTreeHasLeaf(layout?.root, leafId),
+    ptyId: layout?.ptyIdsByLeafId?.[leafId] ?? null,
+    incarnationId: state.terminalPtyIncarnationsByPaneKey?.[`${tabId}:${leafId}`] ?? null
+  }
+}
+
+export function matchesTerminalSurfaceCapture(
+  original: TerminalSurfaceCloseCapture,
+  hostIds: readonly ExecutionHostId[],
+  read: (hostId: ExecutionHostId) => Parameters<typeof captureTerminalSurfaceIdentity>[0]
+): boolean {
+  return (
+    original.identity.hasLeaf &&
+    original.holders.length > 0 &&
+    original.holders.every((holder) =>
+      isRetainedTerminalSurfaceIdentity(original.identity, holder.identity)
+    ) &&
+    [...new Set([...original.holders.map((holder) => holder.hostId), ...hostIds])].every(
+      (hostId) => {
+        const holder = original.holders.find((entry) => entry.hostId === hostId)
+        const next = captureTerminalSurfaceIdentity(
+          read(hostId),
+          original.identity.worktreeId,
+          original.identity.tabId,
+          original.identity.leafId
+        )
+        return holder
+          ? holder.identity
+            ? isRetainedTerminalSurfaceIdentity(holder.identity, next)
+            : next === null
+          : next === null
+      }
+    )
+  )
+}

From e044d311ce84318f9996f5a2add3e998ea77dea7 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Thu, 22 Oct 2026 12:10:23 -0700
Subject: [PATCH 045/207] refactor: remove redundant terminal switch close
 logic

---
 src/main/ipc/pty/ipc/renderer-kill.ts           | 13 ++-----------
 src/main/ipc/pty/runtime/controller-deps.ts     | 13 ++-----------
 src/main/ipc/pty/session.ts                     | 13 ++-----------
 .../session-tabs/paired-host-terminal-close.ts  |  2 +-
 src/main/runtime/terminal-surface-close.ts      | 17 ++---------------
 .../tab-bar/cli-chat-resume-source.ts           |  7 ++-----
 6 files changed, 11 insertions(+), 54 deletions(-)

diff --git a/src/main/ipc/pty/ipc/renderer-kill.ts b/src/main/ipc/pty/ipc/renderer-kill.ts
index 464c80e7af2d..60407de974de 100644
--- a/src/main/ipc/pty/ipc/renderer-kill.ts
+++ b/src/main/ipc/pty/ipc/renderer-kill.ts
@@ -3,7 +3,7 @@ import { getPtyIpc } from '../../pty-host-bindings'
 import type { Store } from '../../../persistence'
 import type { OrcaRuntimeService } from '../../../runtime/orca-runtime'
 import type { TerminalIntentionalStopKind } from '../../../runtime/terminal-intentional-stops'
-import type { IPtyProvider } from '../../../providers/pty-provider-contract'
+import type { shutdownProviderAndDetectExit } from '../provider/shutdown-detect'
 import { SSH_PROVIDER_UNREGISTERED_REASON } from '../../../../shared/pty-liveness-verdict'
 import { ptyIncarnationById } from '../provider/ownership-state'
 import {
@@ -21,16 +21,7 @@ export type PtyKillIpcDeps = {
   store?: Store
   runtime?: OrcaRuntimeService
   getLocalPtyProviderStartupPromise: (hostId?: ResolvedPtyHost) => Promise<void> | undefined
-  shutdownProviderAndDetectExit: (
-    provider: IPtyProvider,
-    id: string,
-    opts: {
-      immediate?: boolean
-      keepHistory?: boolean
-      deadlineMs?: number
-      expectedIncarnationId?: string
-    }
-  ) => Promise<boolean>
+  shutdownProviderAndDetectExit: typeof shutdownProviderAndDetectExit
   rememberSyntheticKillExit: (id: string, incarnationId?: string) => void
   sendPtyExitToRenderer: (payload: { id: string; code: number; incarnationId?: string }) => void
 }
diff --git a/src/main/ipc/pty/runtime/controller-deps.ts b/src/main/ipc/pty/runtime/controller-deps.ts
index 44f39f37ab22..547fe37e1c17 100644
--- a/src/main/ipc/pty/runtime/controller-deps.ts
+++ b/src/main/ipc/pty/runtime/controller-deps.ts
@@ -1,7 +1,7 @@
 import type { PtyRendererDelivery } from '../session'
 import type { OrcaRuntimeService } from '../../../runtime/orca-runtime'
 import type { Store } from '../../../persistence'
-import type { IPtyProvider } from '../../../providers/pty-provider-contract'
+import type { shutdownProviderAndDetectExit } from '../provider/shutdown-detect'
 import type { GlobalSettings } from '../../../../shared/global-settings-types'
 import type { TerminalStartupCwdMissingDirFallback } from '../../../../shared/terminal-startup-cwd'
 import type {
@@ -42,16 +42,7 @@ export type PtyRuntimeControllerDeps = PtySpawnCodexResumeDeps & {
     lastTitle?: string
     kittyKeyboardFlags?: number
   } | null>
-  shutdownProviderAndDetectExit: (
-    provider: IPtyProvider,
-    id: string,
-    opts: {
-      immediate?: boolean
-      keepHistory?: boolean
-      deadlineMs?: number
-      expectedIncarnationId?: string
-    }
-  ) => Promise<boolean>
+  shutdownProviderAndDetectExit: typeof shutdownProviderAndDetectExit
   rememberSyntheticKillExit: (id: string, incarnationId?: string) => void
   rememberRetiredRejectedPty: (id: string) => void
   sendPtyExitToRenderer: (payload: { id: string; code: number; incarnationId?: string }) => void
diff --git a/src/main/ipc/pty/session.ts b/src/main/ipc/pty/session.ts
index 287c72f599c7..f9acd09864b7 100644
--- a/src/main/ipc/pty/session.ts
+++ b/src/main/ipc/pty/session.ts
@@ -2,7 +2,7 @@ import type { BrowserWindow, WebContents } from 'electron'
 import type { OrcaRuntimeService } from '../../runtime/orca-runtime'
 import type { Store } from '../../persistence'
 import type { GlobalSettings } from '../../../shared/global-settings-types'
-import type { IPtyProvider } from '../../providers/pty-provider-contract'
+import type { shutdownProviderAndDetectExit } from './provider/shutdown-detect'
 import type { PtyModelRestoreReason } from '../../../shared/pty-model-restore-marker'
 import type {
   PtyDeliveryWriteOff,
@@ -144,16 +144,7 @@ export type PtyIpcSession = {
     ptyId: string,
     opts?: { scrollbackRows?: number }
   ) => Promise<SerializeResult>
-  shutdownProviderAndDetectExit: (
-    provider: IPtyProvider,
-    id: string,
-    opts: {
-      immediate?: boolean
-      keepHistory?: boolean
-      deadlineMs?: number
-      expectedIncarnationId?: string
-    }
-  ) => Promise<boolean>
+  shutdownProviderAndDetectExit: typeof shutdownProviderAndDetectExit
   rememberSyntheticKillExit: (id: string, incarnationId?: string) => void
   rememberRetiredRejectedPty: (id: string) => void
   consumeSyntheticKillExit: (id: string, incarnationId?: string) => boolean
diff --git a/src/main/runtime/session-tabs/paired-host-terminal-close.ts b/src/main/runtime/session-tabs/paired-host-terminal-close.ts
index a942ad82b7b0..7f3fa10ea799 100644
--- a/src/main/runtime/session-tabs/paired-host-terminal-close.ts
+++ b/src/main/runtime/session-tabs/paired-host-terminal-close.ts
@@ -79,7 +79,7 @@ export async function closeTerminalOnPairedHost(
     if (original?.originalPresentation) {
       throw error
     }
-    if (code === 'terminal_not_found' && !original?.originalPresentation) {
+    if (code === 'terminal_not_found') {
       // The owner has no such terminal, so nothing runs there to stop.
       return { ptyKilled: false }
     }
diff --git a/src/main/runtime/terminal-surface-close.ts b/src/main/runtime/terminal-surface-close.ts
index 9b9a0bc54f87..8d75e65f86e1 100644
--- a/src/main/runtime/terminal-surface-close.ts
+++ b/src/main/runtime/terminal-surface-close.ts
@@ -197,7 +197,7 @@ export type TerminalSurfaceCloseCommit = {
   requestedSession: WorkspaceSessionState | null | undefined
   /** The tab's owner identity still matches the one the close was asked against. */
   ownerMatches: () => boolean
-  /** The partitions holding the tab, routed partition first; empty when unroutable. */
+  /** The tab's partitions, routed first; original-aware calls return captured and current holders. */
   hostIds: () => readonly ExecutionHostId[]
   /** Owner-fenced closes only: each holder's copy of the tab when the close was asked. A second
    *  copy that is new or rebound since refuses the close, since `ownerMatches` fences only the
@@ -239,20 +239,7 @@ export function terminalSurfaceCloseMutation(
       : undefined
   return () => {
     const original = commit.options.originalPresentation
-    const hostIds = original
-      ? [
-          ...new Set([
-            ...original.holders.map((holder) => holder.hostId),
-            ...commit
-              .hostIds()
-              .filter((id) =>
-                commit
-                  .getSession(id)
-                  ?.tabsByWorktree[commit.worktreeId]?.some((row) => row.id === target.tabId)
-              )
-          ])
-        ]
-      : commit.hostIds()
+    const hostIds = commit.hostIds()
     if (
       !commit.ownerMatches() ||
       (original && !matchesTerminalSurfaceCapture(original, hostIds, commit.getSession))
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts
index dffa713c3a39..7495c55f4598 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts
@@ -11,7 +11,6 @@ import {
   resolvePaneLastAgentConversation
 } from '@/lib/ai-vault-tab-title-requests'
 import { LOCAL_EXECUTION_HOST_ID, type ExecutionHostId } from '../../../../shared/execution-host'
-import { makePaneKey } from '../../../../shared/stable-pane-id'
 import {
   adoptsCliConversations,
   type CliConversationRowAgent
@@ -34,7 +33,6 @@ export function resolveCliChatResumeSource(
   state: AppState,
   args: { tab: { id: string; worktreeId: string }; paneKey?: string }
 ): CliChatResumeSource | null {
-  const activeLeafId = state.terminalLayoutsByTabId[args.tab.id]?.activeLeafId
   const paneConversation = (paneKey: string) =>
     resolvePaneLastAgentConversation(
       state,
@@ -43,10 +41,9 @@ export function resolveCliChatResumeSource(
     )
   const conversation = args.paneKey
     ? paneConversation(args.paneKey)
-    : (collectAgentPaneConversations(state, adoptsCliConversations, {
+    : collectAgentPaneConversations(state, adoptsCliConversations, {
         tab: { worktreeId: args.tab.worktreeId, tabId: args.tab.id }
-      }).find((candidate) => candidate.tabId === args.tab.id) ??
-      (activeLeafId ? paneConversation(makePaneKey(args.tab.id, activeLeafId)) : null))
+      }).find((candidate) => candidate.tabId === args.tab.id)
   if (
     !conversation ||
     conversation.tabId !== args.tab.id ||

From 658a6c9db8db6fa70a439b68ff8375a0595a8a37 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Thu, 22 Oct 2026 14:40:38 -0700
Subject: [PATCH 046/207] Fix switch capability ownership and required terminal
 close failures

---
 src/main/ipc/pty/spawn-commit-assembly.ts     |   3 +-
 .../layout-command-persistence.ts             |  12 +-
 .../mobile-session-tab-close-outcome.ts       |   2 +-
 ...ca-runtime-original-terminal-close.test.ts |   4 +-
 .../terminal-surface-close-commit.ts          |   3 +-
 .../terminal-tab-close-request-relay.ts       |   2 +-
 .../ai-vault-history-native-return.test.tsx   |  48 +++-
 ...t-resume-parked-retirement.test-fixture.ts |  58 ++---
 .../tab-bar/cli-chat-resume-run.test.ts       |  44 ++--
 .../components/tab-bar/cli-chat-resume-run.ts |  34 +--
 .../cli-chat-resume-terminal-capture.ts       |  89 ++++++++
 .../terminal-pane-mount-registration.ts       |  37 +++-
 ...al-presentation-retirement.test-fixture.ts |   7 +-
 .../terminal-presentation-retirement.test.ts  | 206 +++++++++++++-----
 .../terminal-presentation-retirement.ts       |  36 +--
 .../mobile-terminal-close-ipc-bridge.ts       |  29 ++-
 .../src/lib/in-place-switch-support.test.tsx  | 121 ++++++++--
 .../src/lib/in-place-switch-support.ts        |  71 +++---
 .../lib/pane-manager/pane-inline-images.ts    |   6 +-
 .../src/lib/pane-manager/pane-lifecycle.ts    |  51 ++---
 .../pane-manager-tree-mutations.ts            |   4 +-
 .../src/lib/pane-manager/pane-manager.ts      |   4 +-
 .../src/lib/pane-manager/pane-split-close.ts  |   3 +-
 .../lib/pane-manager/pane-webgl-renderer.ts   |   6 +-
 ...-chat-resume-terminal-capture.unit.test.ts | 165 ++++++++++++++
 ...minal-presentation-retirement.unit.test.ts | 144 ++++++++++++
 26 files changed, 901 insertions(+), 288 deletions(-)
 create mode 100644 src/renderer/src/components/tab-bar/cli-chat-resume-terminal-capture.ts
 create mode 100644 tests/e2e/cli-chat-resume-terminal-capture.unit.test.ts
 create mode 100644 tests/e2e/terminal-presentation-retirement.unit.test.ts

diff --git a/src/main/ipc/pty/spawn-commit-assembly.ts b/src/main/ipc/pty/spawn-commit-assembly.ts
index 6d35c4e5d090..67da85e04fdb 100644
--- a/src/main/ipc/pty/spawn-commit-assembly.ts
+++ b/src/main/ipc/pty/spawn-commit-assembly.ts
@@ -51,10 +51,9 @@ export type PtySpawnCommitState = {
     | 'tabId'
     | 'launchAgent'
     | 'resumeProviderSession'
-    | 'resumeOrigin'
     | 'onResumeOutcome'
     | 'telemetry'
-  >
+  > & { resumeOrigin?: unknown }
   result: PtySpawnResult
   provider: IPtyProvider
   cwd: string | undefined
diff --git a/src/main/persistence/terminal-topology/layout-command-persistence.ts b/src/main/persistence/terminal-topology/layout-command-persistence.ts
index 0724015a0e73..dceff378cc13 100644
--- a/src/main/persistence/terminal-topology/layout-command-persistence.ts
+++ b/src/main/persistence/terminal-topology/layout-command-persistence.ts
@@ -1,5 +1,4 @@
 import type { TerminalSurfaceCloseCapture } from '../../../shared/terminal-tab-close'
-import { closeLeafOrTab } from './terminal-topology-commit'
 import type {
   CommandOf,
   LayoutApplyOutcome,
@@ -18,6 +17,7 @@ import type {
 } from '../loading-store/store-runtime-state'
 import type { ExecutionHostId } from '../../../shared/execution-host'
 import {
+  closeLeafOrTab,
   applyLayout,
   applyEditorFileRenamesInPartitions,
   topologyCommitContext
@@ -134,14 +134,14 @@ export class LayoutCommandPersistence {
                   command.tabIds[0] === source.tabId),
             hostIds,
             getSession: (id) => context.sessions.getWorkspaceSession(id),
-            setSession: (session, id) =>
-              context.runtime.dirtyProfileStateDomains.add(
-                assignWorkspaceSessionPartition(context.runtime.state, id, session)
-              ),
+            setSession: (session, id) => {
+              const domain = assignWorkspaceSessionPartition(context.runtime.state, id, session)
+              context.runtime.dirtyProfileStateDomains?.add(domain)
+            },
             onClosed: () => {}
           })()
           if (mutation.value) {
-            return mutation
+            return { ...mutation, value: mutation.value }
           }
           return {
             ...mutation,
diff --git a/src/main/runtime/mobile-session-tab-close-outcome.ts b/src/main/runtime/mobile-session-tab-close-outcome.ts
index 4da177919330..ec1588342c80 100644
--- a/src/main/runtime/mobile-session-tab-close-outcome.ts
+++ b/src/main/runtime/mobile-session-tab-close-outcome.ts
@@ -1,10 +1,10 @@
 import type { TerminalSurfaceCloseCapture } from '../../shared/terminal-tab-close'
 import type {
+  RuntimeMobileSessionTabCloseResult,
   RuntimeMobileSessionRetiredTerminalSurface,
   RuntimeSessionTabCloseReason
 } from '../../shared/runtime-types'
 import type { RuntimePtyTabCloseAuthority } from './runtime-terminal-state-records'
-import type { RuntimeMobileSessionTabCloseResult } from '../../shared/runtime-types'
 import type { ClientSessionTabSelectionStore } from './client-session-tab-selection'
 
 // Why: a selection tombstone (ClientSessionTabSelectionStore.forgetTabs) is not a
diff --git a/src/main/runtime/orca-runtime-original-terminal-close.test.ts b/src/main/runtime/orca-runtime-original-terminal-close.test.ts
index a643d32fd704..3e4dee48a584 100644
--- a/src/main/runtime/orca-runtime-original-terminal-close.test.ts
+++ b/src/main/runtime/orca-runtime-original-terminal-close.test.ts
@@ -16,10 +16,10 @@ function captured(harness: ReturnType<typeof createHarness>) {
   if (!source.presentation || !source.incarnationId) {
     throw new Error('Missing original source')
   }
+  const { incarnationId, presentation } = source
   return {
     source,
-    close: () =>
-      harness.runtime.closeTerminal(source.handle, source.incarnationId, source.presentation)
+    close: () => harness.runtime.closeTerminal(source.handle, incarnationId, presentation)
   }
 }
 
diff --git a/src/main/runtime/session-tabs/terminal-surface-close-commit.ts b/src/main/runtime/session-tabs/terminal-surface-close-commit.ts
index 23beb61800f2..3e2309fc6f9c 100644
--- a/src/main/runtime/session-tabs/terminal-surface-close-commit.ts
+++ b/src/main/runtime/session-tabs/terminal-surface-close-commit.ts
@@ -1,5 +1,4 @@
 import type { RuntimeMobileSessionTerminalTab } from '../../../shared/runtime-types'
-import { resolveTerminalCloseTarget, type PaneCloseResolution } from '../terminal-surface-close'
 import {
   isRetainedTerminalSurfaceIdentity,
   type TerminalSurfaceCloseIdentity
@@ -10,6 +9,8 @@ import { OrcaRuntimeWithPersistTerminalSurfaceRetirements } from './terminal-sur
 import { captureAcknowledgedTerminalTabRetirement } from '../workspace-session-terminal-tab-retirement-identity'
 import { closeLeafOrTab } from '../../persistence/terminal-topology/terminal-topology-commit'
 import {
+  resolveTerminalCloseTarget,
+  type PaneCloseResolution,
   captureTerminalCloseRequest,
   type TerminalSurfaceCloseOptions
 } from '../terminal-surface-close'
diff --git a/src/main/window/terminal-tab-close-request-relay.ts b/src/main/window/terminal-tab-close-request-relay.ts
index 575f11aa6852..ecd0c47e00b4 100644
--- a/src/main/window/terminal-tab-close-request-relay.ts
+++ b/src/main/window/terminal-tab-close-request-relay.ts
@@ -1,9 +1,9 @@
-import type { TerminalSurfaceCloseIdentity } from '../../shared/terminal-tab-close'
 import { randomUUID } from 'node:crypto'
 
 import { ipcMain } from 'electron'
 import type { BrowserWindow } from 'electron'
 import type {
+  TerminalSurfaceCloseIdentity,
   TerminalTabCloseRequest,
   TerminalTabCloseResponse
 } from '../../shared/terminal-tab-close'
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx b/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx
index 9444e2e6a035..3a6d5402b0f6 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx
+++ b/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx
@@ -60,6 +60,19 @@ vi.mock('@/lib/ai-vault-tab-title-requests', async (original) => ({
   collectAgentPaneConversations: mocks.panes
 }))
 
+const SWITCH = 'agent-session.structured.switch.v1:codex'
+const paired = {
+  id: 'paired',
+  name: 'Paired',
+  createdAt: 1,
+  updatedAt: 1,
+  pairingRevision: 1,
+  lastUsedAt: null,
+  runtimeId: 'paired',
+  preferredEndpointId: 'endpoint',
+  endpoints: [{ id: 'endpoint', kind: 'websocket' as const, label: 'Host', endpoint: 'ws://host' }]
+}
+
 const row: AiVaultSession = {
   id: 'codex-history',
   agent: 'codex',
@@ -151,12 +164,12 @@ beforeEach(async () => {
     api: {
       ...window.api,
       aiVault: {},
-      runtime: { getStatus: async () => ({ capabilities: [HISTORY] }) }
+      runtime: { getStatus: async () => ({ capabilities: [HISTORY, SWITCH] }) }
     }
   })
   useAppStore.setState(useAppStore.getInitialState(), true)
   useAppStore.setState({ settings: createGlobalSettingsFixture({ experimentalNativeChat: true }) })
-  setLocalRuntimeCapabilitiesForTests([HISTORY])
+  setLocalRuntimeCapabilitiesForTests([HISTORY, SWITCH])
   await refreshLocalRuntimeCapabilities()
   mocks.owner.mockReturnValue('local')
   mocks.probe.mockResolvedValue(true)
@@ -170,7 +183,7 @@ function pairedHistoryStatus() {
   if (!response.ok) {
     throw new Error('Expected status fixture')
   }
-  return { status: { ...response.result, capabilities: [HISTORY] }, checkedAt: 1 }
+  return { status: { ...response.result, capabilities: [HISTORY, SWITCH] }, checkedAt: 1 }
 }
 
 it.each(['local', 'runtime:paired'] as const)(
@@ -178,21 +191,31 @@ it.each(['local', 'runtime:paired'] as const)(
   async (host) => {
     mocks.owner.mockReturnValue(host)
     useAppStore.setState({
+      runtimeEnvironments: [paired],
       runtimeStatusByEnvironmentId: new Map([['paired', pairedHistoryStatus()]])
     })
-    let answer = (_value: boolean) => {}
-    mocks.probe.mockImplementationOnce(
-      () =>
+    setLocalRuntimeCapabilitiesForTests(null)
+    useAppStore.setState({ runtimeStatusByEnvironmentId: new Map() })
+    let answer = (_value: { capabilities: string[] }) => {}
+    Object.assign(window.api.runtime, {
+      getStatus: () =>
         new Promise((resolve) => {
           answer = resolve
         })
-    )
+    })
     const session = { ...row, executionHostId: host }
     render(<History session={session} />)
-    const button = screen.getByRole('button', { name: 'Switch to native chat' })
-    expect(button.hasAttribute('disabled')).toBe(true)
-    await act(async () => answer(true))
-    await waitFor(() => expect(button.hasAttribute('disabled')).toBe(false))
+    expect(screen.queryByRole('button', { name: 'Switch to native chat' })).toBeNull()
+    await act(async () => {
+      answer({ capabilities: [HISTORY, SWITCH] })
+      if (host !== 'local') {
+        useAppStore.setState({
+          runtimeStatusByEnvironmentId: new Map([['paired', pairedHistoryStatus()]])
+        })
+      }
+    })
+    const button = await screen.findByRole('button', { name: 'Switch to native chat' })
+    expect(button.hasAttribute('disabled')).toBe(false)
     await userEvent.setup().click(button)
     expect(mocks.startOwner).toHaveBeenCalledWith(
       expect.objectContaining({ workspaceId: 'workspace' }),
@@ -215,6 +238,7 @@ it.each(['local', 'runtime:paired'] as const)(
 it('routes a capable paired unowned row with a matching terminal through the same return', async () => {
   mocks.owner.mockReturnValue('runtime:paired')
   useAppStore.setState({
+    runtimeEnvironments: [paired],
     runtimeStatusByEnvironmentId: new Map([['paired', pairedHistoryStatus()]])
   })
   const session = {
@@ -265,6 +289,7 @@ it.each([
   },
   { executionHostId: 'local' as const, agent: 'omp' as const, filePath: '/session.jsonl' }
 ])('keeps ordinary restrictions for an unsupported owned row: %s', async (overrides) => {
+  setLocalRuntimeCapabilitiesForTests([HISTORY])
   mocks.probe.mockResolvedValue(false)
   mocks.owner.mockReturnValue(
     overrides.executionHostId.startsWith('ssh:') ? null : overrides.executionHostId
@@ -280,6 +305,7 @@ it.each([
 it.each(['codex', 'claude', 'grok', 'omp', 'opencode', 'opencode2', 'pi'] as const)(
   'keeps ordinary local History resume and owned fork usable for %s',
   async (agent) => {
+    setLocalRuntimeCapabilitiesForTests([HISTORY])
     mocks.probe.mockResolvedValue(false)
     const session = { ...row, agent, structuredSession: undefined }
     const view = render(<History session={session} />)
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-parked-retirement.test-fixture.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-parked-retirement.test-fixture.ts
index f9a35d6c45cd..43b0a7540029 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-parked-retirement.test-fixture.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-parked-retirement.test-fixture.ts
@@ -2,10 +2,8 @@ import { vi } from 'vitest'
 import { useAppStore } from '@/store'
 import type { CliChatResumeTestMocks } from './cli-chat-resume-mocks.test-fixture'
 import { LEAF_1, LEAF_2 } from '../terminal-pane/pty-connection-test-pane-fixtures'
-import {
-  captureTerminalSurfaceIdentity,
-  type TerminalSurfaceCloseCapture
-} from '../../../../shared/terminal-tab-close'
+import { captureTerminalSurfaceIdentity } from '../../../../shared/terminal-tab-close'
+import { TerminalClose } from '../../../../shared/rpc-contract/terminal-unary-params'
 import { retireTerminalPresentation } from '../terminal-pane/terminal-presentation-retirement'
 import {
   capturedPanesByTabId,
@@ -34,33 +32,35 @@ export function installExitedPaneRetirement(mocks: CliChatResumeTestMocks) {
       ['pty-2', siblingWatcher]
     ])
   })
-  mocks.rpc.mockImplementation(
-    async (_target, method, params: { originalPresentation: TerminalSurfaceCloseCapture }) => {
-      if (method === 'terminal.resolvePane') {
-        const identity = captureTerminalSurfaceIdentity(
-          useAppStore.getState(),
-          'wt-1',
-          'shell',
-          LEAF_1
-        )
-        if (!identity) {
-          throw new Error('Missing original terminal')
-        }
-        return {
-          terminal: {
-            handle: 'handle-1',
-            ptyId: 'pty-1',
-            incarnationId: 'i1',
-            presentation: { identity: { ...identity, incarnationId: 'i1' }, holders: [] }
-          }
-        }
+  mocks.rpc.mockImplementation(async (_target, method, params: unknown) => {
+    if (method === 'terminal.resolvePane') {
+      const identity = captureTerminalSurfaceIdentity(
+        useAppStore.getState(),
+        'wt-1',
+        'shell',
+        LEAF_1
+      )
+      if (!identity) {
+        throw new Error('Missing original terminal')
       }
-      if (method !== 'terminal.close') {
-        throw new Error('Unexpected RPC')
+      return {
+        terminal: {
+          handle: 'handle-1',
+          ptyId: 'pty-1',
+          incarnationId: 'i1',
+          presentation: { identity: { ...identity, incarnationId: 'i1' }, holders: [] }
+        }
       }
-      retireTerminalPresentation(params.originalPresentation.identity)
-      return { close: { ptyKilled: true } }
     }
-  )
+    if (method !== 'terminal.close') {
+      throw new Error('Unexpected RPC')
+    }
+    const close = TerminalClose.parse(params)
+    if (!close.originalPresentation) {
+      throw new Error('Missing original presentation')
+    }
+    retireTerminalPresentation(close.originalPresentation.identity)
+    return { close: { ptyKilled: true } }
+  })
   return { closed, siblingWatcher }
 }
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
index c2e4ded20c00..9777705afdeb 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
@@ -57,7 +57,8 @@ vi.mock('@/runtime/local-runtime-capabilities', async (importOriginal) => ({
   ...(await importOriginal<Record<string, unknown>>()),
   readLocalRuntimeCapabilitiesOrUnknown: () => [
     STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY,
-    STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY
+    STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY,
+    'agent-session.structured.switch.v1:codex'
   ]
 }))
 vi.mock('@/runtime/host-structured-agents', async (importOriginal) => ({
@@ -124,7 +125,7 @@ import { resetLocalStructuredSessionVersionForTests } from '@/runtime/local-stru
 import { resetWebSessionTabsSnapshotFreshnessForTests } from '@/runtime/web-session-tabs-sync/tracking-lifecycle'
 import { buildWorkspaceSessionPayload } from '@/lib/workspace-session'
 import { buildHydratedTabState } from '@/store/slices/tabs-hydration'
-import { makeWorktree } from '@/store/slices/worktrees-slice-test-fixtures'
+import { makeTerminalTab, makeWorktree } from '@/store/slices/worktrees-slice-test-fixtures'
 import type { RuntimeMobileSessionTabsResult } from '../../../../shared/runtime-types'
 import { useAppStore } from '@/store'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
@@ -228,6 +229,19 @@ beforeEach(async () => {
     }
   )
   main = await drawTabsFromMain(useAppStore)
+  useAppStore.setState({
+    tabsByWorktree: {
+      'wt-1': [makeTerminalTab({ id: 'tab-1', worktreeId: 'wt-1', createdAt: 1 })]
+    },
+    terminalLayoutsByTabId: {
+      'tab-1': {
+        root: { type: 'leaf', leafId: 'leaf' },
+        activeLeafId: 'leaf',
+        expandedLeafId: null,
+        ptyIdsByLeafId: { leaf: 'pty-1' }
+      }
+    }
+  })
 })
 
 function snapshot(sessionId?: string): RuntimeMobileSessionTabsResult {
@@ -430,30 +444,6 @@ describe('CLI identity resume through the existing launch owner', () => {
     await running
     mocks.source = SOURCE
     mocks.switchCapability.mockResolvedValue(false)
-    mocks.rpc.mockImplementation(async (_target, method) =>
-      method === 'terminal.resolvePane'
-        ? {
-            terminal: {
-              handle: 'handle-1',
-              ptyId: 'pty-1',
-              incarnationId: 'i1',
-              presentation: {
-                identity: {
-                  worktreeId: 'wt-1',
-                  tabId: mocks.source?.tabId ?? 'tab-1',
-                  leafId: mocks.source?.paneKey.split(':')[1] ?? 'leaf-1',
-                  createdAt: 1,
-                  generation: 0,
-                  hasLeaf: true,
-                  ptyId: 'pty-1',
-                  incarnationId: 'i1'
-                },
-                holders: []
-              }
-            }
-          }
-        : { close: { ptyKilled: true } }
-    )
     capability.resolve(true)
     await vi.waitFor(() => expect([...structuredLaunchStates()]).toHaveLength(0))
     expect(mocks.call).not.toHaveBeenCalled()
@@ -534,7 +524,7 @@ describe('CLI identity resume through the existing launch owner', () => {
     useAppStore.setState({
       terminalLayoutsByTabId: {
         'tab-1': {
-          root: null,
+          root: { type: 'leaf', leafId },
           activeLeafId: leafId,
           expandedLeafId: null,
           ptyIdsByLeafId: { [leafId]: 'pty-1' }
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
index 3517c0ac8068..3d6788499a2d 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
@@ -17,40 +17,8 @@ import {
   toastCliChatResumeFailure
 } from './cli-chat-resume-feedback'
 import { adoptingAgentOnHost } from '../right-sidebar/ai-vault-session-resume-in-chat-launch'
-import type { RuntimeTerminalResolvePane } from '../../../../shared/runtime-types'
-import { getRemoteRuntimePtyOwner } from '@/runtime/runtime-terminal-stream'
 import { callRuntimeRpc } from '@/runtime/runtime-rpc-client'
-import { isRemoteRuntimePtyId } from '../../../../shared/remote-runtime-pty-id'
-
-/** Capture the existing host handle and incarnation before starting the destination. */
-async function captureSourceTerminal(source: CliChatResumeSource) {
-  const owner = source.ptyId ? getRemoteRuntimePtyOwner(source.ptyId) : null
-  if (isRemoteRuntimePtyId(source.ptyId) && !owner) {
-    return null
-  }
-  const target = owner?.target ?? { kind: 'local' as const }
-  try {
-    const { terminal } = await callRuntimeRpc<{ terminal: RuntimeTerminalResolvePane }>(
-      target,
-      'terminal.resolvePane',
-      {
-        paneKey: source.paneKey,
-        worktreeId: source.workspaceId
-      }
-    )
-    return terminal.incarnationId &&
-      (owner ? terminal.handle === owner.terminal : terminal.ptyId === source.ptyId)
-      ? {
-          target,
-          handle: owner?.terminal ?? terminal.handle,
-          incarnationId: terminal.incarnationId,
-          presentation: terminal.presentation
-        }
-      : null
-  } catch {
-    return null
-  }
-}
+import { captureSourceTerminal } from './cli-chat-resume-terminal-capture'
 
 /** The execution host closes only the captured shell; refused or unknown closes leave it alone. */
 async function retireSwitchedTerminalPane(
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-terminal-capture.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-terminal-capture.ts
new file mode 100644
index 000000000000..797537a565dd
--- /dev/null
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-terminal-capture.ts
@@ -0,0 +1,89 @@
+import { useAppStore } from '@/store'
+import { structuredAgentSessionTargetForHost } from '@/runtime/structured-agent-session-owner'
+import type { CliChatResumeSource } from './cli-chat-resume-source'
+import type { RuntimeTerminalResolvePane } from '../../../../shared/runtime-types'
+import { getRemoteRuntimePtyOwner } from '@/runtime/runtime-terminal-stream'
+import { callRuntimeRpc } from '@/runtime/runtime-rpc-client'
+import { isRemoteRuntimePtyId } from '../../../../shared/remote-runtime-pty-id'
+
+import { parseHostAuthorityKey } from '../../../../shared/host-authority'
+import { LOCAL_EXECUTION_HOST_ID } from '../../../../shared/execution-host'
+import {
+  captureTerminalSurfaceIdentity,
+  isRetainedTerminalSurfaceIdentity
+} from '../../../../shared/terminal-tab-close'
+
+/** Capture the existing host handle and incarnation before starting the destination. */
+export async function captureSourceTerminal(source: CliChatResumeSource) {
+  const owner = source.ptyId ? getRemoteRuntimePtyOwner(source.ptyId) : null
+  if (isRemoteRuntimePtyId(source.ptyId) && !owner) {
+    return null
+  }
+  if (!owner && source.executionHostId !== LOCAL_EXECUTION_HOST_ID) {
+    return null
+  }
+  const leafId = source.paneKey.slice(source.tabId.length + 1)
+  if (source.paneKey !== `${source.tabId}:${leafId}`) {
+    return null
+  }
+  const renderer = captureTerminalSurfaceIdentity(
+    useAppStore.getState(),
+    source.workspaceId,
+    source.tabId,
+    leafId
+  )
+  const sourceTarget = structuredAgentSessionTargetForHost(source.executionHostId)
+  if (
+    owner &&
+    (sourceTarget?.kind !== 'environment' ||
+      sourceTarget.environmentId !== owner.target.environmentId)
+  ) {
+    return null
+  }
+  const target = owner?.target ?? { kind: 'local' as const }
+  try {
+    const { terminal } = await callRuntimeRpc<{ terminal: RuntimeTerminalResolvePane }>(
+      target,
+      'terminal.resolvePane',
+      {
+        paneKey: source.paneKey,
+        worktreeId: source.workspaceId
+      }
+    )
+    const original = terminal.presentation?.identity
+    const authority = parseHostAuthorityKey(source.executionHostId)
+    if (
+      !renderer ||
+      !renderer.hasLeaf ||
+      !original ||
+      !terminal.incarnationId ||
+      (terminal.executionHostId != null && terminal.executionHostId !== authority?.at) ||
+      original.ptyId !== terminal.ptyId ||
+      original.incarnationId !== terminal.incarnationId
+    ) {
+      return null
+    }
+    const matches = owner
+      ? terminal.handle === owner.terminal &&
+        renderer.ptyId === source.ptyId &&
+        renderer.worktreeId === original.worktreeId &&
+        renderer.tabId === original.tabId &&
+        renderer.leafId === original.leafId &&
+        renderer.createdAt === original.createdAt &&
+        renderer.generation === original.generation &&
+        original.hasLeaf &&
+        (renderer.incarnationId === null || renderer.incarnationId === original.incarnationId)
+      : (source.ptyId === undefined || terminal.ptyId === source.ptyId) &&
+        isRetainedTerminalSurfaceIdentity(original, renderer)
+    return matches
+      ? {
+          target,
+          handle: owner?.terminal ?? terminal.handle,
+          incarnationId: terminal.incarnationId,
+          presentation: terminal.presentation
+        }
+      : null
+  } catch {
+    return null
+  }
+}
diff --git a/src/renderer/src/components/terminal-pane/terminal-pane-mount-registration.ts b/src/renderer/src/components/terminal-pane/terminal-pane-mount-registration.ts
index f064a499bde8..8b2b183ad184 100644
--- a/src/renderer/src/components/terminal-pane/terminal-pane-mount-registration.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-pane-mount-registration.ts
@@ -26,18 +26,35 @@ export function registerTerminalPaneMount(
       ) {
         throw new Error('terminal_pane_owner_unavailable')
       }
-      removeTerminalPresentation(original, () => {
+      removeTerminalPresentation(original, (failures) => {
         if (pane && manager) {
-          if (!manager.retirePanePreservingPty(pane.id, true)) {
-            throw new Error('terminal_pane_close_failed')
-          }
-          if (manager.getPanes().length === 0) {
-            onEmpty(manager)
-            if (deps.managerRef.current === manager) {
-              deps.managerRef.current = null
+          const structuralFailures: unknown[] = []
+          try {
+            if (!manager.retirePanePreservingPty(pane.id, true, failures)) {
+              throw new Error('terminal_pane_close_failed')
+            }
+          } catch (error) {
+            structuralFailures.push(error)
+          } finally {
+            if (manager.getPanes().length === 0) {
+              try {
+                onEmpty(manager)
+              } catch (error) {
+                structuralFailures.push(error)
+              } finally {
+                if (deps.managerRef.current === manager) {
+                  deps.managerRef.current = null
+                }
+                ownedManager = null
+                unregisterRuntimeTab()
+              }
             }
-            ownedManager = null
-            unregisterRuntimeTab()
+          }
+          if (structuralFailures.length === 1) {
+            throw structuralFailures[0]
+          }
+          if (structuralFailures.length > 1) {
+            throw new AggregateError(structuralFailures, 'terminal_tab_close_failed')
           }
         }
       })
diff --git a/src/renderer/src/components/terminal-pane/terminal-presentation-retirement.test-fixture.ts b/src/renderer/src/components/terminal-pane/terminal-presentation-retirement.test-fixture.ts
index d0b23c53352e..74a15a5d52c6 100644
--- a/src/renderer/src/components/terminal-pane/terminal-presentation-retirement.test-fixture.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-presentation-retirement.test-fixture.ts
@@ -35,8 +35,8 @@ function pane(id: number, leafId: string): ManagedPaneInternal {
     unicode11Addon: addon(),
     webLinksAddon: addon(),
     fitAddon: addon(),
-    webglAddon: null,
-    imageAddon: null,
+    webglAddon: addon(),
+    imageAddon: addon(),
     ligaturesAddon: null,
     fitResizeObserver: null,
     pendingObservedFitRafId: null,
@@ -129,10 +129,11 @@ export function mountedOwner(
   manager = {
     getPanes: () => [...panes.values()],
     getActivePane: () => panes.get(2) ?? panes.get(1) ?? null,
-    retirePanePreservingPty: (id: number, permanent: boolean) =>
+    retirePanePreservingPty: (id: number, permanent: boolean, failures?: unknown[]) =>
       retireManagedPanePreservingPty(
         {
           paneId: id,
+          failures,
           activePaneId: 1,
           panes,
           root: document.createElement('div'),
diff --git a/src/renderer/src/components/terminal-pane/terminal-presentation-retirement.test.ts b/src/renderer/src/components/terminal-pane/terminal-presentation-retirement.test.ts
index f12fd3f5dea7..2559a7ceef3d 100644
--- a/src/renderer/src/components/terminal-pane/terminal-presentation-retirement.test.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-presentation-retirement.test.ts
@@ -3,17 +3,12 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { useAppStore } from '@/store'
 import { makeTerminalTab } from '@/store/slices/worktrees-slice-test-fixtures'
 import { captureTerminalSurfaceIdentity } from '../../../../shared/terminal-tab-close'
-import { retireTerminalPresentation } from './terminal-presentation-retirement'
+import {
+  removeTerminalPresentation,
+  retireTerminalPresentation
+} from './terminal-presentation-retirement'
 import { capturedPanesByTabId, parkedWatchersByTabId } from './terminal-parked-watcher-registry'
 import { LEAF, SIBLING, mountedOwner } from './terminal-presentation-retirement.test-fixture'
-import {
-  createHarness,
-  WORKTREE_ID,
-  TAB_ID,
-  LEAF_ID,
-  PTY_ID,
-  INCARNATION_ID
-} from '../../../../main/runtime/__fixtures__/orca-runtime-terminal-close-continuity-fixtures'
 import { hasRegisteredRuntimeTerminalTab } from '@/runtime/mounted-terminal-tab-registry'
 
 vi.mock('@/runtime/sync-runtime-graph', () => ({ scheduleRuntimeGraphSync: vi.fn() }))
@@ -148,52 +143,6 @@ describe('direct permanent presentation owner', () => {
     }
   )
 
-  it('completes host stop, direct mounted disposal and explicit durable intent together', async () => {
-    const harness = createHarness({ registerPtyBacked: true, publishMobileSurface: true })
-    const session = harness.getSession()
-    useAppStore.setState({
-      tabsByWorktree: session.tabsByWorktree,
-      terminalLayoutsByTabId: session.terminalLayoutsByTabId
-    })
-    useAppStore
-      .getState()
-      .createUnifiedTab(WORKTREE_ID, 'terminal', { id: TAB_ID, entityId: TAB_ID })
-    const source = harness.runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_ID}`, WORKTREE_ID)
-    if (!source.presentation) {
-      throw new Error('Expected original presentation')
-    }
-    const owner = mountedOwner(false, {
-      tabId: TAB_ID,
-      worktreeId: WORKTREE_ID,
-      leafId: LEAF_ID,
-      ptyId: PTY_ID
-    })
-    harness.setVerifiedStopResult(true)
-    harness.setStopAndWaitAction(async () => {
-      await harness.runtime.onPtyExit(PTY_ID, 0, INCARNATION_ID, { hostExitConfirmed: true })
-      expect(owner.source.terminal.dispose).not.toHaveBeenCalled()
-      expect(useAppStore.getState().tabsByWorktree[WORKTREE_ID]).toHaveLength(1)
-    })
-    harness.setCloseTerminalTabAction(() =>
-      retireTerminalPresentation(source.presentation!.identity)
-    )
-    try {
-      await expect(
-        harness.runtime.closeTerminal(source.handle, source.incarnationId, source.presentation)
-      ).resolves.toMatchObject({ ptyKilled: true })
-      expect(owner.source.terminal.dispose).toHaveBeenCalledOnce()
-      expect(owner.transports.size).toBe(0)
-      expect(owner.bindings.size).toBe(0)
-      expect(owner.sourceTransport.destroy).not.toHaveBeenCalled()
-      expect(harness.getSession().tabsByWorktree[WORKTREE_ID]).toEqual([])
-      expect(harness.getSession().closedTerminalTabTombstonesByTabId?.[TAB_ID]).toBeDefined()
-      expect(harness.flushOrThrow).toHaveBeenCalled()
-      expect(harness.kill).not.toHaveBeenCalled()
-    } finally {
-      owner.unregister()
-    }
-  })
-
   it('refuses a replacement or a newly pinned final tab before disposal', () => {
     const identity = prepare(false)
     const owner = mountedOwner(false)
@@ -240,4 +189,151 @@ describe('direct permanent presentation owner', () => {
       owner.unregister()
     }
   })
+  it('reports nested actual addon/terminal failures after closure and layout, while ordinary callers remain best effort', () => {
+    const identity = prepare(false)
+    const owner = mountedOwner(false)
+    const image = owner.source.imageAddon
+    const webgl = owner.source.webglAddon
+    if (!image || !webgl) {
+      throw new Error('Expected actual addon owners')
+    }
+    vi.spyOn(image, 'dispose').mockImplementation(() => {
+      throw undefined
+    })
+    vi.spyOn(webgl, 'dispose').mockImplementation(() => {
+      throw false
+    })
+    vi.spyOn(owner.source.terminal, 'dispose').mockImplementation(() => {
+      throw new Error('terminal failed')
+    })
+    try {
+      let failure: unknown
+      try {
+        retireTerminalPresentation(identity)
+      } catch (error) {
+        failure = error
+      }
+      expect(failure).toBeInstanceOf(AggregateError)
+      if (!(failure instanceof AggregateError)) {
+        throw new Error('Expected failure')
+      }
+      expect(failure.errors).toEqual([undefined, false, new Error('terminal failed')])
+      expect(owner.source.searchAddon.dispose).toHaveBeenCalledOnce()
+      expect(owner.binding.dispose).toHaveBeenCalledOnce()
+      expect(owner.sourceTransport.detach).toHaveBeenCalledOnce()
+      expect(owner.manager.destroy).toHaveBeenCalledOnce()
+      expect(useAppStore.getState().terminalLayoutsByTabId.terminal).toBeUndefined()
+      expect(hasRegisteredRuntimeTerminalTab('terminal', 'wt-1')).toBe(false)
+    } finally {
+      owner.unregister()
+    }
+
+    prepare(false)
+    const ordinary = mountedOwner(false)
+    vi.spyOn(ordinary.source.searchAddon, 'dispose').mockImplementation(() => {
+      throw new Error('advisory')
+    })
+    try {
+      expect(() => ordinary.manager.retirePanePreservingPty(1, true)).not.toThrow()
+      expect(ordinary.source.terminal.dispose).toHaveBeenCalledOnce()
+    } finally {
+      ordinary.unregister()
+    }
+  })
+
+  it.each(['DOM', 'onPaneClosed'] as const)(
+    'retains caught and genuine %s and final-owner failures without claiming structural completion',
+    (stage) => {
+      const identity = prepare(false)
+      const owner = mountedOwner(false)
+      const caught = new Error('addon failed')
+      const structural = new Error(stage)
+      const final = new Error('onEmpty failed')
+      vi.spyOn(owner.source.searchAddon, 'dispose').mockImplementation(() => {
+        throw caught
+      })
+      if (stage === 'DOM') {
+        document.body.append(owner.source.container)
+        vi.spyOn(owner.source.container, 'remove').mockImplementation(() => {
+          throw structural
+        })
+      } else {
+        owner.link.dispose.mockImplementation(() => {
+          throw structural
+        })
+      }
+      owner.empty.mockImplementation(() => {
+        throw final
+      })
+      try {
+        let failure: unknown
+        try {
+          retireTerminalPresentation(identity)
+        } catch (error) {
+          failure = error
+        }
+        if (!(failure instanceof AggregateError)) {
+          throw new Error('Expected aggregate')
+        }
+        expect(failure.errors[0]).toBe(caught)
+        expect(failure.errors[1]).toBeInstanceOf(AggregateError)
+        expect(failure.errors[1].errors).toEqual([structural, final])
+        expect(owner.empty).toHaveBeenCalledOnce()
+        expect(owner.panes.size).toBe(0)
+        expect(useAppStore.getState().tabsByWorktree['wt-1']).toHaveLength(1)
+        expect(hasRegisteredRuntimeTerminalTab('terminal', 'wt-1')).toBe(false)
+      } finally {
+        owner.unregister()
+        document.body.replaceChildren()
+      }
+    }
+  )
+
+  it('preserves an ordinary previously unswallowed owner throw', () => {
+    prepare(false)
+    const owner = mountedOwner(false)
+    owner.source.paneDragCleanup = () => {
+      throw new Error('ordinary owner failed')
+    }
+    try {
+      expect(() => owner.manager.retirePanePreservingPty(1, true)).toThrow('ordinary owner failed')
+      expect(owner.panes.size).toBe(1)
+    } finally {
+      owner.unregister()
+    }
+  })
+
+  it('retains caught failures when layout throws, and rejects them even after an already-absent leaf', () => {
+    const identity = prepare(true)
+    const caught = new Error('caught disposal')
+    const layoutFailure = new Error('layout failed')
+    const originalSet = useAppStore.getState().setTabLayout
+    useAppStore.setState({
+      setTabLayout: () => {
+        throw layoutFailure
+      }
+    })
+    try {
+      let failure: unknown
+      try {
+        removeTerminalPresentation(identity, (failures) => {
+          failures.push(caught)
+        })
+      } catch (error) {
+        failure = error
+      }
+      if (!(failure instanceof AggregateError)) {
+        throw new Error('Expected aggregate')
+      }
+      expect(failure.errors).toEqual([caught, layoutFailure])
+    } finally {
+      useAppStore.setState({ setTabLayout: originalSet })
+    }
+    useAppStore.setState({ tabsByWorktree: {}, terminalLayoutsByTabId: {} })
+    expect(() =>
+      removeTerminalPresentation(identity, (failures) => {
+        failures.push(caught)
+      })
+    ).toThrow(AggregateError)
+  })
 })
diff --git a/src/renderer/src/components/terminal-pane/terminal-presentation-retirement.ts b/src/renderer/src/components/terminal-pane/terminal-presentation-retirement.ts
index 9702f0ee9c2d..8c024ae1aa9b 100644
--- a/src/renderer/src/components/terminal-pane/terminal-presentation-retirement.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-presentation-retirement.ts
@@ -13,7 +13,7 @@ import { collapseParkedTerminalLeaf } from './terminal-parked-pty-watcher'
 /** Admission and disposal share one synchronous owner action. */
 export function removeTerminalPresentation(
   original: TerminalSurfaceCloseIdentity,
-  dispose: () => void
+  dispose: (failures: unknown[]) => void
 ): void {
   const state = useAppStore.getState()
   const current = captureTerminalSurfaceIdentity(
@@ -46,19 +46,29 @@ export function removeTerminalPresentation(
   for (const paneId of paneIds) {
     state.clearRuntimePaneTitle(original.tabId, paneId)
   }
-  dispose()
-  if (!current?.hasLeaf) {
-    return
+  const failures: unknown[] = []
+  try {
+    dispose(failures)
+    if (current?.hasLeaf) {
+      if (split) {
+        useAppStore.getState().setTabLayout(original.tabId, split.sourceLayout)
+      } else {
+        useAppStore.getState().closeTab(original.tabId, {
+          reason: 'user',
+          captureRecentlyClosed: false,
+          localPtyTeardownOwnedExternally: true,
+          remoteCloseOwnedByHost: true
+        })
+      }
+    }
+  } catch (error) {
+    if (failures.length === 0) {
+      throw error
+    }
+    failures.push(error)
   }
-  if (split) {
-    useAppStore.getState().setTabLayout(original.tabId, split.sourceLayout)
-  } else {
-    useAppStore.getState().closeTab(original.tabId, {
-      reason: 'user',
-      captureRecentlyClosed: false,
-      localPtyTeardownOwnedExternally: true,
-      remoteCloseOwnedByHost: true
-    })
+  if (failures.length > 0) {
+    throw new AggregateError(failures, 'terminal_tab_close_failed')
   }
 }
 
diff --git a/src/renderer/src/hooks/ipc-events/mobile-terminal-close-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/mobile-terminal-close-ipc-bridge.ts
index d15236c0d9c2..39c317d566e8 100644
--- a/src/renderer/src/hooks/ipc-events/mobile-terminal-close-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/mobile-terminal-close-ipc-bridge.ts
@@ -182,13 +182,28 @@ export function registerMobileAndTerminalCloseIpcBridge(
               if (originalSurface.tabId !== tabId || !localPtyTeardownOwnedExternally) {
                 throw new Error('terminal_pane_owner_changed')
               }
-              retireTerminalPresentation(originalSurface)
-              const state = useAppStore.getState()
-              await persistWorkspaceSessionByHost(
-                window.api.session,
-                buildWorkspaceSessionPayload(state),
-                state
-              )
+              const failures: unknown[] = []
+              try {
+                retireTerminalPresentation(originalSurface)
+              } catch (error) {
+                failures.push(error)
+              }
+              try {
+                const state = useAppStore.getState()
+                await persistWorkspaceSessionByHost(
+                  window.api.session,
+                  buildWorkspaceSessionPayload(state),
+                  state
+                )
+              } catch (error) {
+                failures.push(error)
+              }
+              if (failures.length === 1) {
+                throw failures[0]
+              }
+              if (failures.length > 1) {
+                throw new AggregateError(failures, 'terminal_tab_close_failed')
+              }
               respond()
             })().catch((error: unknown) =>
               respond(error instanceof Error ? error.message : 'terminal_tab_close_failed')
diff --git a/src/renderer/src/lib/in-place-switch-support.test.tsx b/src/renderer/src/lib/in-place-switch-support.test.tsx
index 40385c61b136..81f235ad18f7 100644
--- a/src/renderer/src/lib/in-place-switch-support.test.tsx
+++ b/src/renderer/src/lib/in-place-switch-support.test.tsx
@@ -1,42 +1,123 @@
 // @vitest-environment happy-dom
-import { act, cleanup, render, screen, waitFor } from '@testing-library/react'
-import { afterEach, expect, it, vi } from 'vitest'
+import { act, cleanup, render, screen } from '@testing-library/react'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import { useAppStore } from '@/store'
 import {
   refreshLocalRuntimeCapabilities,
   setLocalRuntimeCapabilitiesForTests
 } from '@/runtime/local-runtime-capabilities'
-import { useInPlaceSwitchCapability } from './in-place-switch-support'
+import { createCompatibleRuntimeStatusResponse } from '@/runtime/runtime-compatibility-test-fixture'
+import type { RuntimeHostStatusSnapshot } from '../../../shared/runtime-host-status'
+import { inPlaceSwitchCapabilityNow, useInPlaceSwitchCapability } from './in-place-switch-support'
 
-const { probe } = vi.hoisted(() => ({ probe: vi.fn<() => Promise<boolean>>() }))
-vi.mock('@/runtime/structured-agent-session-client', () => ({ supportsInPlaceSwitch: probe }))
-
-function Switch() {
-  const supported = useInPlaceSwitchCapability('local', 'codex')
-  return <button disabled={supported !== true}>Switch to CLI</button>
+const SWITCH = 'agent-session.structured.switch.v1:codex'
+const environment = {
+  id: 'paired',
+  name: 'Host',
+  createdAt: 1,
+  updatedAt: 1,
+  pairingRevision: 1,
+  lastUsedAt: null,
+  runtimeId: 'paired',
+  preferredEndpointId: 'endpoint',
+  endpoints: [{ id: 'endpoint', kind: 'websocket' as const, label: 'Host', endpoint: 'ws://host' }]
 }
-afterEach(cleanup)
-
-it('keeps the switch disabled while loading and re-reads capability changes without a pane update', async () => {
+const getStatus = vi.fn()
+function Switch({ host = 'local' }: { host?: string }) {
+  const supported = useInPlaceSwitchCapability(host, 'codex')
+  return <button disabled={supported !== true}>{String(supported)}</button>
+}
+function snapshot(
+  sequence: number,
+  patch: Partial<RuntimeHostStatusSnapshot> = {}
+): RuntimeHostStatusSnapshot {
+  const response = createCompatibleRuntimeStatusResponse('paired')
+  if (!response.ok) {
+    throw new Error('Expected status')
+  }
+  return {
+    environmentId: 'paired',
+    pairingRevision: 1,
+    sequence,
+    checkedAt: sequence,
+    transport: 'ready',
+    verification: 'verified',
+    status: { ...response.result, capabilities: [SWITCH] },
+    ...patch
+  }
+}
+beforeEach(() => {
   useAppStore.setState(useAppStore.getInitialState(), true)
   setLocalRuntimeCapabilitiesForTests(null)
-  let answer = (_supported: boolean): void => {}
-  probe.mockImplementationOnce(
+  getStatus.mockReset()
+  Object.assign(window, { api: { ...window.api, runtime: { getStatus } } })
+})
+afterEach(cleanup)
+
+it('activates once after failed boot, observes local publication, and never probes from reads or notifications', async () => {
+  getStatus.mockRejectedValueOnce(new Error('boot unavailable'))
+  await refreshLocalRuntimeCapabilities()
+  expect(inPlaceSwitchCapabilityNow('local', 'codex')).toBeUndefined()
+  let answer = (_value: { capabilities: string[] }) => {}
+  getStatus.mockImplementationOnce(
     () =>
       new Promise((resolve) => {
         answer = resolve
       })
   )
   render(<Switch />)
-  expect(screen.getByRole('button', { name: 'Switch to CLI' }).hasAttribute('disabled')).toBe(true)
+  expect(screen.getByRole('button').hasAttribute('disabled')).toBe(true)
+  expect(getStatus).toHaveBeenCalledTimes(2)
   await act(async () => {
-    answer(true)
+    answer({ capabilities: [SWITCH] })
   })
-  await waitFor(() => expect(screen.getByRole('button').hasAttribute('disabled')).toBe(false))
-  probe.mockResolvedValue(false)
-  Object.assign(window, { api: { runtime: { getStatus: async () => ({ capabilities: [] }) } } })
+  expect(screen.getByRole('button').hasAttribute('disabled')).toBe(false)
+  for (let index = 0; index < 4; index++) {
+    expect(inPlaceSwitchCapabilityNow('local', 'codex')).toBe(true)
+    act(() => useAppStore.setState({ runtimeStatusByEnvironmentId: new Map() }))
+  }
+  expect(getStatus).toHaveBeenCalledTimes(2)
+  getStatus.mockResolvedValueOnce({ capabilities: [] })
   await act(async () => {
     await refreshLocalRuntimeCapabilities()
   })
-  await waitFor(() => expect(screen.getByRole('button').hasAttribute('disabled')).toBe(true))
+  expect(screen.getByRole('button').textContent).toBe('false')
+})
+
+it('derives only the addressed catalog owner across publication, lost contact, revocation, replacement and legacy verification', async () => {
+  setLocalRuntimeCapabilitiesForTests([])
+  useAppStore.getState().setRuntimeEnvironments([environment])
+  render(<Switch host="runtime:paired" />)
+  expect(screen.getByRole('button').textContent).toBe('undefined')
+  act(() => useAppStore.getState().applyRuntimeHostStatusSnapshot(snapshot(1)))
+  expect(screen.getByRole('button').hasAttribute('disabled')).toBe(false)
+  const learned = snapshot(2, { verification: 'unavailable', transport: 'disconnected' })
+  act(() => useAppStore.getState().applyRuntimeHostStatusSnapshot(learned))
+  expect(inPlaceSwitchCapabilityNow('runtime:paired', 'codex')).toBe(true)
+  expect(inPlaceSwitchCapabilityNow('runtime:other', 'codex')).toBeUndefined()
+  act(() =>
+    useAppStore.getState().applyRuntimeHostStatusSnapshot(snapshot(3, { verification: 'blocked' }))
+  )
+  expect(screen.getByRole('button').textContent).toBe('undefined')
+  act(() => useAppStore.getState().setRuntimeEnvironments([{ ...environment, pairingRevision: 2 }]))
+  act(() => useAppStore.getState().applyRuntimeHostStatusSnapshot(snapshot(10)))
+  expect(inPlaceSwitchCapabilityNow('runtime:paired', 'codex')).toBeUndefined()
+  const legacy = snapshot(11, { pairingRevision: 2 })
+  if (!legacy.status) {
+    throw new Error('Expected status')
+  }
+  delete legacy.status.capabilities
+  act(() => useAppStore.getState().applyRuntimeHostStatusSnapshot(legacy))
+  expect(screen.getByRole('button').textContent).toBe('false')
+  act(() =>
+    useAppStore.getState().applyRuntimeHostStatusSnapshot(snapshot(12, { pairingRevision: 2 }))
+  )
+  expect(screen.getByRole('button').textContent).toBe('true')
+  act(() =>
+    useAppStore
+      .getState()
+      .applyRuntimeHostStatusSnapshot(snapshot(13, { pairingRevision: 2, retired: true }))
+  )
+  expect(screen.getByRole('button').textContent).toBe('undefined')
+  expect(getStatus).not.toHaveBeenCalled()
 })
diff --git a/src/renderer/src/lib/in-place-switch-support.ts b/src/renderer/src/lib/in-place-switch-support.ts
index 7f30f8449543..ffea80b7b74b 100644
--- a/src/renderer/src/lib/in-place-switch-support.ts
+++ b/src/renderer/src/lib/in-place-switch-support.ts
@@ -1,42 +1,51 @@
 import { useSyncExternalStore } from 'react'
 import { useAppStore } from '@/store'
-import { subscribeLocalRuntimeCapabilityObservation } from '@/runtime/local-runtime-capabilities'
-import { supportsInPlaceSwitch } from '@/runtime/structured-agent-session-client'
+import {
+  ensureLocalRuntimeCapabilities,
+  readLocalRuntimeCapabilitiesOrUnknown,
+  subscribeLocalRuntimeCapabilityObservation
+} from '@/runtime/local-runtime-capabilities'
+import {
+  isRuntimeHostContactRevoked,
+  lastVerifiedRuntimeStatus
+} from '../../../shared/runtime-host-status'
 import { structuredAgentSessionTargetForHost } from '@/runtime/structured-agent-session-owner'
 import {
   onRuntimeEnvironmentRevisionsChanged,
   onRuntimeEnvironmentsRetired
 } from '@/runtime/runtime-environment-revision'
-import { inPlaceSwitchEnabled } from '../../../shared/structured-agent-cli-conversation-adoption'
+import {
+  inPlaceSwitchCapability,
+  inPlaceSwitchEnabled
+} from '../../../shared/structured-agent-cli-conversation-adoption'
 import type { AiVaultAgent } from '../../../shared/ai-vault-types'
 
-// The answer per host and agent; a reconnect or retirement asks again.
-const known = new Map<string, boolean>()
-const asking = new Map<string, Promise<boolean>>()
 const listeners = new Set<() => void>()
 let revision = 0
 const changed = () => {
   revision += 1
   listeners.forEach((listener) => listener())
 }
-const forget = () => {
-  known.clear()
-  asking.clear()
-  changed()
-}
-onRuntimeEnvironmentRevisionsChanged(forget)
-onRuntimeEnvironmentsRetired(forget)
-subscribeLocalRuntimeCapabilityObservation(forget)
+onRuntimeEnvironmentRevisionsChanged(changed)
+onRuntimeEnvironmentsRetired(changed)
+subscribeLocalRuntimeCapabilityObservation(changed)
 let stopStatusSubscription: (() => void) | undefined
 const subscribe = (listener: () => void) => {
-  if (listeners.size === 0) {
+  const activate = listeners.size === 0
+  if (activate) {
     stopStatusSubscription = useAppStore.subscribe((state, previous) => {
-      if (state.runtimeStatusByEnvironmentId !== previous.runtimeStatusByEnvironmentId) {
-        forget()
+      if (
+        state.runtimeStatusByEnvironmentId !== previous.runtimeStatusByEnvironmentId ||
+        state.runtimeEnvironments !== previous.runtimeEnvironments
+      ) {
+        changed()
       }
     })
   }
   listeners.add(listener)
+  if (activate) {
+    void ensureLocalRuntimeCapabilities()
+  }
   return () => {
     listeners.delete(listener)
     if (listeners.size === 0) {
@@ -54,7 +63,7 @@ export function useInPlaceSwitchRevision(): number {
   )
 }
 
-/** The cached answer, asking in the background when there is none yet. */
+/** The addressed runtime owner's learned answer; reading never starts a probe. */
 export function inPlaceSwitchCapabilityNow(
   executionHostId: string | null | undefined,
   agent: string
@@ -62,22 +71,20 @@ export function inPlaceSwitchCapabilityNow(
   if (!inPlaceSwitchEnabled(agent)) {
     return false
   }
-  const key = `${executionHostId ?? ''}\0${agent}`
-  const answer = known.get(key)
   const target = structuredAgentSessionTargetForHost(executionHostId)
-  if (answer === undefined && target && !asking.has(key)) {
-    const attempt = supportsInPlaceSwitch(target, agent)
-    asking.set(key, attempt)
-    void attempt.then((supported) => {
-      if (asking.get(key) !== attempt) {
-        return
-      }
-      asking.delete(key)
-      known.set(key, supported)
-      changed()
-    })
+  if (!target) {
+    return undefined
+  }
+  if (target.kind === 'local') {
+    return readLocalRuntimeCapabilitiesOrUnknown()?.includes(inPlaceSwitchCapability(agent))
+  }
+  const state = useAppStore.getState()
+  if (!state.runtimeEnvironments.some((environment) => environment.id === target.environmentId)) {
+    return undefined
   }
-  return answer
+  const entry = state.runtimeStatusByEnvironmentId.get(target.environmentId)
+  const status = isRuntimeHostContactRevoked(entry) ? null : lastVerifiedRuntimeStatus(entry)
+  return status ? (status.capabilities ?? []).includes(inPlaceSwitchCapability(agent)) : undefined
 }
 
 export function inPlaceSwitchSupportedNow(host: string | null | undefined, agent: string): boolean {
diff --git a/src/renderer/src/lib/pane-manager/pane-inline-images.ts b/src/renderer/src/lib/pane-manager/pane-inline-images.ts
index b0faf27631b2..cb16b37e0d30 100644
--- a/src/renderer/src/lib/pane-manager/pane-inline-images.ts
+++ b/src/renderer/src/lib/pane-manager/pane-inline-images.ts
@@ -87,7 +87,7 @@ export function attachInlineImages(pane: ManagedPaneInternal): void {
   }
 }
 
-export function detachInlineImages(pane: ManagedPaneInternal): void {
+export function detachInlineImages(pane: ManagedPaneInternal, failures?: unknown[]): void {
   panesAwaitingImageAddon.delete(pane)
   pane.imageAttachmentDeferred = false
   terminalsRenderingInlineImages.delete(pane.terminal)
@@ -96,8 +96,8 @@ export function detachInlineImages(pane: ManagedPaneInternal): void {
   if (pane.imageAddon) {
     try {
       pane.imageAddon.dispose()
-    } catch {
-      /* ignore */
+    } catch (error) {
+      failures?.push(error)
     }
     pane.imageAddon = null
   }
diff --git a/src/renderer/src/lib/pane-manager/pane-lifecycle.ts b/src/renderer/src/lib/pane-manager/pane-lifecycle.ts
index a301ab45ca14..9904fbf048c4 100644
--- a/src/renderer/src/lib/pane-manager/pane-lifecycle.ts
+++ b/src/renderer/src/lib/pane-manager/pane-lifecycle.ts
@@ -184,7 +184,8 @@ export function setLigaturesEnabled(pane: ManagedPaneInternal, enabled: boolean)
 
 export function disposePane(
   pane: ManagedPaneInternal,
-  panes: Map<number, ManagedPaneInternal>
+  panes: Map<number, ManagedPaneInternal>,
+  failures?: unknown[]
 ): void {
   cancelPendingTerminalViewportPresents(pane.terminal)
   if (pane.pendingInitialFitRafId != null) {
@@ -220,8 +221,8 @@ export function disposePane(
   // Deregister the RTL shaping joiner: terminal.dispose() below does not.
   try {
     pane.arabicShapingJoinerCleanup?.()
-  } catch {
-    /* ignore */
+  } catch (error) {
+    failures?.push(error)
   }
   pane.arabicShapingJoinerCleanup = null
   if (pane.compositionHandler) {
@@ -231,60 +232,60 @@ export function disposePane(
   }
   try {
     clearPendingSplitScrollRestore(pane)
-  } catch {
-    /* ignore */
+  } catch (error) {
+    failures?.push(error)
   }
   try {
     // Why: fit retries own xterm markers and frame callbacks independently of
     // split restoration; both must be released before terminal disposal.
     cancelDeferredScrollRestore(pane.terminal)
-  } catch {
-    /* ignore */
+  } catch (error) {
+    failures?.push(error)
   }
   try {
     pane.ligaturesAddon?.dispose()
-  } catch {
-    /* ignore */
+  } catch (error) {
+    failures?.push(error)
   }
   // Detach removes the pane from the deferred-attach set and disposes the addon
   // (canvas layers + parser handlers) before the terminal surface goes away.
-  detachInlineImages(pane)
-  disposeWebgl(pane)
+  detachInlineImages(pane, failures)
+  disposeWebgl(pane, { failures })
   try {
     pane.searchAddon.dispose()
-  } catch {
-    /* ignore */
+  } catch (error) {
+    failures?.push(error)
   }
   try {
     pane.serializeAddon.dispose()
-  } catch {
-    /* ignore */
+  } catch (error) {
+    failures?.push(error)
   }
   try {
     pane.unicode11Addon.dispose()
-  } catch {
-    /* ignore */
+  } catch (error) {
+    failures?.push(error)
   }
   try {
     pane.webLinksAddon.dispose()
-  } catch {
-    /* ignore */
+  } catch (error) {
+    failures?.push(error)
   }
   try {
     pane.fitAddon.dispose()
-  } catch {
-    /* ignore */
+  } catch (error) {
+    failures?.push(error)
   }
   try {
     // Drop renderer selection state before a recovery remount replaces the surface.
     pane.terminal.clearSelection()
-  } catch {
-    /* ignore */
+  } catch (error) {
+    failures?.push(error)
   }
   try {
     pane.terminal.dispose()
-  } catch {
-    /* ignore */
+  } catch (error) {
+    failures?.push(error)
   }
   panes.delete(pane.id)
 }
diff --git a/src/renderer/src/lib/pane-manager/pane-manager-tree-mutations.ts b/src/renderer/src/lib/pane-manager/pane-manager-tree-mutations.ts
index 52878604f87e..ded990b41990 100644
--- a/src/renderer/src/lib/pane-manager/pane-manager-tree-mutations.ts
+++ b/src/renderer/src/lib/pane-manager/pane-manager-tree-mutations.ts
@@ -97,11 +97,13 @@ export function detachPaneForExternalMoveOnManager(host: PaneManagerHost, paneId
 export function retirePanePreservingPtyOnManager(
   host: PaneManagerHost,
   paneId: number,
-  permanent = false
+  permanent = false,
+  failures?: unknown[]
 ): boolean {
   return retireManagedPanePreservingPty(
     {
       paneId,
+      failures,
       activePaneId: host.getActivePaneId(),
       panes: host.panes,
       root: host.root,
diff --git a/src/renderer/src/lib/pane-manager/pane-manager.ts b/src/renderer/src/lib/pane-manager/pane-manager.ts
index a303a7674b22..32ed7fc60719 100644
--- a/src/renderer/src/lib/pane-manager/pane-manager.ts
+++ b/src/renderer/src/lib/pane-manager/pane-manager.ts
@@ -155,8 +155,8 @@ export class PaneManager {
     return detachPaneForExternalMoveOnManager(this.host, paneId)
   }
 
-  retirePanePreservingPty(paneId: number, permanent = false): boolean {
-    return retirePanePreservingPtyOnManager(this.host, paneId, permanent)
+  retirePanePreservingPty(paneId: number, permanent = false, failures?: unknown[]): boolean {
+    return retirePanePreservingPtyOnManager(this.host, paneId, permanent, failures)
   }
 
   getPanes(limit = Number.POSITIVE_INFINITY): ManagedPane[] {
diff --git a/src/renderer/src/lib/pane-manager/pane-split-close.ts b/src/renderer/src/lib/pane-manager/pane-split-close.ts
index 32731cb76a91..bf7d94e27641 100644
--- a/src/renderer/src/lib/pane-manager/pane-split-close.ts
+++ b/src/renderer/src/lib/pane-manager/pane-split-close.ts
@@ -172,6 +172,7 @@ function openSplitPane(
 }
 
 type CloseManagedPaneArgs = {
+  failures?: unknown[]
   paneId: number
   activePaneId: number | null
   panes: Map<number, ManagedPaneInternal>
@@ -246,7 +247,7 @@ export function retireManagedPanePreservingPty(
 function removePaneContainer(args: CloseManagedPaneArgs, pane: ManagedPaneInternal): void {
   const paneContainer = pane.container
   const parent = paneContainer.parentElement
-  disposePane(pane, args.panes)
+  disposePane(pane, args.panes, args.failures)
   if (!parent) {
     return
   }
diff --git a/src/renderer/src/lib/pane-manager/pane-webgl-renderer.ts b/src/renderer/src/lib/pane-manager/pane-webgl-renderer.ts
index 23cf486cb6d4..93f3a6f268f4 100644
--- a/src/renderer/src/lib/pane-manager/pane-webgl-renderer.ts
+++ b/src/renderer/src/lib/pane-manager/pane-webgl-renderer.ts
@@ -127,7 +127,7 @@ export function isPaneWebglContextLost(pane: ManagedPaneInternal): boolean {
 
 export function disposeWebgl(
   pane: ManagedPaneInternal,
-  options?: { refreshDimensions?: boolean }
+  options?: { refreshDimensions?: boolean; failures?: unknown[] }
 ): void {
   cancelPendingWebglRefresh(pane)
   panesAwaitingWebglAddon.delete(pane)
@@ -137,8 +137,8 @@ export function disposeWebgl(
   releaseXtermWebglContext(pane.webglAddon)
   try {
     pane.webglAddon.dispose()
-  } catch {
-    /* ignore */
+  } catch (error) {
+    options?.failures?.push(error)
   }
   pane.webglAddon = null
   if (options?.refreshDimensions) {
diff --git a/tests/e2e/cli-chat-resume-terminal-capture.unit.test.ts b/tests/e2e/cli-chat-resume-terminal-capture.unit.test.ts
new file mode 100644
index 000000000000..522e0509f9fb
--- /dev/null
+++ b/tests/e2e/cli-chat-resume-terminal-capture.unit.test.ts
@@ -0,0 +1,165 @@
+// @vitest-environment happy-dom
+import { beforeEach, expect, it, vi } from 'vitest'
+import { useAppStore } from '@/store'
+import { captureSourceTerminal } from '@/components/tab-bar/cli-chat-resume-terminal-capture'
+import { toRemoteRuntimePtyId } from '../../src/shared/remote-runtime-pty-id'
+import {
+  createHarness,
+  WORKTREE_ID,
+  TAB_ID,
+  LEAF_ID,
+  PTY_ID,
+  INCARNATION_ID
+} from '../../src/main/runtime/__fixtures__/orca-runtime-terminal-close-continuity-fixtures'
+
+const { rpc } = vi.hoisted(() => ({ rpc: vi.fn() }))
+vi.mock('@/runtime/runtime-rpc-client', () => ({ callRuntimeRpc: rpc }))
+vi.mock('@/runtime/sync-runtime-graph', () => ({ scheduleRuntimeGraphSync: vi.fn() }))
+beforeEach(() => {
+  useAppStore.setState(useAppStore.getInitialState(), true)
+  rpc.mockReset()
+})
+function source(
+  ptyId: string | undefined = PTY_ID,
+  executionHostId: 'local' | 'runtime:paired' = 'local'
+) {
+  return {
+    workspaceId: WORKTREE_ID,
+    tabId: TAB_ID,
+    paneKey: `${TAB_ID}:${LEAF_ID}`,
+    agent: 'codex' as const,
+    providerSessionId: 'conversation',
+    executionHostId,
+    ptyId
+  }
+}
+function seed(harness: ReturnType<typeof createHarness>) {
+  const session = harness.getSession()
+  useAppStore.setState({
+    tabsByWorktree: session.tabsByWorktree,
+    terminalLayoutsByTabId: session.terminalLayoutsByTabId
+  })
+}
+
+it('captures the authenticated original after earned shell exit and cleared renderer binding, then closes without another stop', async () => {
+  const harness = createHarness({ registerPtyBacked: true, publishMobileSurface: true })
+  const retained = harness.runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_ID}`, WORKTREE_ID)
+  const settle = harness.runtime.intentionalPtyStops.mark(PTY_ID, 'reversible', INCARNATION_ID)
+  await harness.runtime.onPtyExit(PTY_ID, 0, INCARNATION_ID, { hostExitConfirmed: true })
+  settle(true)
+  harness.runtime.syncWindowGraph(1, {
+    tabs: [
+      {
+        tabId: TAB_ID,
+        worktreeId: WORKTREE_ID,
+        title: 'Ended',
+        activeLeafId: LEAF_ID,
+        layout: { type: 'leaf', leafId: LEAF_ID }
+      }
+    ],
+    leaves: [
+      { tabId: TAB_ID, worktreeId: WORKTREE_ID, leafId: LEAF_ID, paneRuntimeId: 7, ptyId: null }
+    ]
+  })
+  harness.editSession((state) => ({
+    ...state,
+    terminalLayoutsByTabId: {
+      ...state.terminalLayoutsByTabId,
+      [TAB_ID]: { ...state.terminalLayoutsByTabId[TAB_ID], ptyIdsByLeafId: {} }
+    }
+  }))
+  // SAFETY: exercise retained earned-exit authority after the actual archive owner releases its record.
+  const archive = harness.runtime as unknown as { dropDisconnectedPtyRecord(id: string): void }
+  archive.dropDisconnectedPtyRecord(PTY_ID)
+  seed(harness)
+  rpc.mockImplementation(async () => ({
+    terminal: harness.runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_ID}`, WORKTREE_ID)
+  }))
+  const captured = await captureSourceTerminal(source(undefined))
+  expect(captured?.handle).toBe(retained.handle)
+  if (!captured?.presentation) {
+    throw new Error('Expected authenticated original')
+  }
+  harness.setCloseTerminalTabAction(() => {})
+  await expect(
+    harness.runtime.closeTerminal(captured.handle, captured.incarnationId, captured.presentation)
+  ).resolves.toMatchObject({ ptyKilled: true })
+  expect(harness.stopAndWait).not.toHaveBeenCalled()
+  expect(harness.getSession().tabsByWorktree[WORKTREE_ID]).toEqual([])
+})
+
+it.each(['row', 'incarnation', 'pty', 'workspace', 'leaf', 'host'] as const)(
+  'refuses changed %s facts across resolve without recapturing',
+  async (change) => {
+    const harness = createHarness({ registerPtyBacked: true, publishMobileSurface: true })
+    seed(harness)
+    rpc.mockImplementation(async () => {
+      if (change === 'row') {
+        harness.editSession((state) => ({
+          ...state,
+          tabsByWorktree: {
+            ...state.tabsByWorktree,
+            [WORKTREE_ID]: state.tabsByWorktree[WORKTREE_ID].map((row) => ({
+              ...row,
+              generation: (row.generation ?? 0) + 1
+            }))
+          }
+        }))
+      }
+      if (change === 'incarnation') {
+        harness.runtime.registerPty(PTY_ID, WORKTREE_ID, null, {
+          tabId: TAB_ID,
+          leafId: LEAF_ID,
+          incarnationId: 'successor'
+        })
+      }
+      const terminal = harness.runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_ID}`, WORKTREE_ID)
+      if (change === 'host') {
+        terminal.executionHostId = 'ssh:successor'
+      }
+      if (change === 'pty') {
+        terminal.ptyId = 'successor'
+      }
+      if (change === 'workspace' && terminal.presentation) {
+        terminal.presentation.identity.worktreeId = 'other'
+      }
+      if (change === 'leaf' && terminal.presentation) {
+        terminal.presentation.identity.leafId = 'other'
+      }
+      return { terminal }
+    })
+    useAppStore.setState({
+      terminalPtyIncarnationsByPaneKey: { [`${TAB_ID}:${LEAF_ID}`]: INCARNATION_ID }
+    })
+    expect(await captureSourceTerminal(source())).toBeNull()
+  }
+)
+
+it('keeps remote proxy and host PTY namespaces distinct, and refuses absent or changed remote owners', async () => {
+  const harness = createHarness({ registerPtyBacked: true, publishMobileSurface: true })
+  seed(harness)
+  const terminal = harness.runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_ID}`, WORKTREE_ID)
+  const proxy = toRemoteRuntimePtyId(terminal.handle, 'paired')
+  useAppStore.setState({
+    terminalLayoutsByTabId: {
+      ...useAppStore.getState().terminalLayoutsByTabId,
+      [TAB_ID]: {
+        ...useAppStore.getState().terminalLayoutsByTabId[TAB_ID],
+        ptyIdsByLeafId: { [LEAF_ID]: proxy }
+      }
+    }
+  })
+  rpc.mockResolvedValue({ terminal })
+  expect(await captureSourceTerminal(source(proxy, 'runtime:paired'))).toMatchObject({
+    target: { kind: 'environment', environmentId: 'paired' },
+    handle: terminal.handle
+  })
+  expect(
+    await captureSourceTerminal(source(toRemoteRuntimePtyId(terminal.handle), 'runtime:paired'))
+  ).toBeNull()
+  expect(await captureSourceTerminal(source(undefined, 'runtime:paired'))).toBeNull()
+  expect(await captureSourceTerminal(source(proxy, 'local'))).toBeNull()
+  terminal.handle = 'different'
+  expect(await captureSourceTerminal(source(proxy, 'runtime:paired'))).toBeNull()
+  expect(rpc).toHaveBeenCalledTimes(2)
+})
diff --git a/tests/e2e/terminal-presentation-retirement.unit.test.ts b/tests/e2e/terminal-presentation-retirement.unit.test.ts
new file mode 100644
index 000000000000..7ddd1dda8b73
--- /dev/null
+++ b/tests/e2e/terminal-presentation-retirement.unit.test.ts
@@ -0,0 +1,144 @@
+// @vitest-environment happy-dom
+import { beforeEach, expect, it, vi } from 'vitest'
+import { useAppStore } from '@/store'
+import { retireTerminalPresentation } from '@/components/terminal-pane/terminal-presentation-retirement'
+import type { TerminalTabCloseRequest } from '../../src/shared/terminal-tab-close'
+import type { WorkspaceSessionState } from '../../src/shared/workspace-session-state-types'
+import { registerMobileAndTerminalCloseIpcBridge } from '@/hooks/ipc-events/mobile-terminal-close-ipc-bridge'
+import { mountedOwner } from '@/components/terminal-pane/terminal-presentation-retirement.test-fixture'
+import {
+  createHarness,
+  WORKTREE_ID,
+  TAB_ID,
+  LEAF_ID,
+  PTY_ID,
+  INCARNATION_ID
+} from '../../src/main/runtime/__fixtures__/orca-runtime-terminal-close-continuity-fixtures'
+
+vi.mock('@/runtime/sync-runtime-graph', () => ({ scheduleRuntimeGraphSync: vi.fn() }))
+beforeEach(() => {
+  localStorage.clear()
+  useAppStore.setState(useAppStore.getInitialState(), true)
+})
+
+it('completes host stop, direct mounted disposal and explicit durable intent together', async () => {
+  const harness = createHarness({ registerPtyBacked: true, publishMobileSurface: true })
+  const session = harness.getSession()
+  useAppStore.setState({
+    tabsByWorktree: session.tabsByWorktree,
+    terminalLayoutsByTabId: session.terminalLayoutsByTabId
+  })
+  useAppStore.getState().createUnifiedTab(WORKTREE_ID, 'terminal', { id: TAB_ID, entityId: TAB_ID })
+  const source = harness.runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_ID}`, WORKTREE_ID)
+  if (!source.presentation || !source.incarnationId) {
+    throw new Error('Expected original presentation')
+  }
+  const { presentation, incarnationId } = source
+  const owner = mountedOwner(false, {
+    tabId: TAB_ID,
+    worktreeId: WORKTREE_ID,
+    leafId: LEAF_ID,
+    ptyId: PTY_ID
+  })
+  harness.setVerifiedStopResult(true)
+  harness.setStopAndWaitAction(async () => {
+    await harness.runtime.onPtyExit(PTY_ID, 0, INCARNATION_ID, { hostExitConfirmed: true })
+    expect(owner.source.terminal.dispose).not.toHaveBeenCalled()
+    expect(useAppStore.getState().tabsByWorktree[WORKTREE_ID]).toHaveLength(1)
+  })
+  harness.setCloseTerminalTabAction(() => retireTerminalPresentation(presentation.identity))
+  try {
+    await expect(
+      harness.runtime.closeTerminal(source.handle, incarnationId, presentation)
+    ).resolves.toMatchObject({ ptyKilled: true })
+    expect(owner.source.terminal.dispose).toHaveBeenCalledOnce()
+    expect(owner.transports.size).toBe(0)
+    expect(owner.bindings.size).toBe(0)
+    expect(owner.sourceTransport.destroy).not.toHaveBeenCalled()
+    expect(harness.getSession().tabsByWorktree[WORKTREE_ID]).toEqual([])
+    expect(harness.getSession().closedTerminalTabTombstonesByTabId?.[TAB_ID]).toBeDefined()
+    expect(harness.flushOrThrow).toHaveBeenCalled()
+    expect(harness.kill).not.toHaveBeenCalled()
+  } finally {
+    owner.unregister()
+  }
+})
+
+it.each([false, true])(
+  'persists the actual renderer effects after caught disposal failure before one failed IPC receipt (write fails=%s)',
+  async (writeFails) => {
+    const harness = createHarness({ registerPtyBacked: true, publishMobileSurface: true })
+    const session = harness.getSession()
+    useAppStore.setState({
+      tabsByWorktree: session.tabsByWorktree,
+      terminalLayoutsByTabId: session.terminalLayoutsByTabId
+    })
+    const source = harness.runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_ID}`, WORKTREE_ID)
+    if (!source.presentation) {
+      throw new Error('Expected original')
+    }
+    const owner = mountedOwner(false, {
+      tabId: TAB_ID,
+      worktreeId: WORKTREE_ID,
+      leafId: LEAF_ID,
+      ptyId: PTY_ID
+    })
+    vi.spyOn(owner.source.terminal, 'dispose').mockImplementation(() => {
+      throw new Error('terminal dispose failed')
+    })
+    let request: ((value: TerminalTabCloseRequest) => void) | undefined
+    const respond = vi.fn()
+    const set = vi.fn(async (_state: WorkspaceSessionState) => {
+      expect(owner.manager.destroy).toHaveBeenCalledOnce()
+      expect(useAppStore.getState().terminalLayoutsByTabId[TAB_ID]).toBeUndefined()
+      if (writeFails) {
+        throw new Error('persistence failed')
+      }
+    })
+    const flush = vi.fn(async () => {})
+    Object.assign(window, {
+      api: {
+        ...window.api,
+        session: { set, flush },
+        ui: {
+          onOpenFileFromMobile: () => () => {},
+          onOpenDiffFromMobile: () => () => {},
+          onCloseTerminal: () => () => {},
+          onSleepWorktree: () => () => {},
+          onResumeSleepingAgents: () => () => {},
+          onTerminalTabCloseRequest: (listener: (value: TerminalTabCloseRequest) => void) => {
+            request = listener
+            return () => {}
+          },
+          respondTerminalTabClose: respond
+        }
+      }
+    })
+    const unsubs: (() => void)[] = []
+    registerMobileAndTerminalCloseIpcBridge(unsubs, vi.fn())
+    if (!request) {
+      throw new Error('Expected IPC listener')
+    }
+    try {
+      request({
+        requestId: 'close',
+        tabId: TAB_ID,
+        localPtyTeardownOwnedExternally: true,
+        originalSurface: source.presentation.identity
+      })
+      await vi.waitFor(() =>
+        expect(respond).toHaveBeenCalledExactlyOnceWith({
+          requestId: 'close',
+          error: 'terminal_tab_close_failed'
+        })
+      )
+      expect(set).toHaveBeenCalledOnce()
+      expect(set.mock.calls[0][0].tabsByWorktree[WORKTREE_ID]).toEqual([])
+      expect(flush).toHaveBeenCalledTimes(writeFails ? 0 : 1)
+      expect(owner.sourceTransport.detach).toHaveBeenCalledOnce()
+    } finally {
+      unsubs.forEach((unsubscribe) => unsubscribe())
+      owner.unregister()
+    }
+  }
+)

From 03fc6985d3b3deda8b838fdc181561904b3f67e9 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Thu, 22 Oct 2026 14:42:42 -0700
Subject: [PATCH 047/207] Verify failed renderer cleanup rejects the host close
 receipt

---
 ...minal-presentation-retirement.unit.test.ts | 32 +++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/tests/e2e/terminal-presentation-retirement.unit.test.ts b/tests/e2e/terminal-presentation-retirement.unit.test.ts
index 7ddd1dda8b73..da9796f44178 100644
--- a/tests/e2e/terminal-presentation-retirement.unit.test.ts
+++ b/tests/e2e/terminal-presentation-retirement.unit.test.ts
@@ -2,7 +2,10 @@
 import { beforeEach, expect, it, vi } from 'vitest'
 import { useAppStore } from '@/store'
 import { retireTerminalPresentation } from '@/components/terminal-pane/terminal-presentation-retirement'
-import type { TerminalTabCloseRequest } from '../../src/shared/terminal-tab-close'
+import type {
+  TerminalTabCloseRequest,
+  TerminalTabCloseResponse
+} from '../../src/shared/terminal-tab-close'
 import type { WorkspaceSessionState } from '../../src/shared/workspace-session-state-types'
 import { registerMobileAndTerminalCloseIpcBridge } from '@/hooks/ipc-events/mobile-terminal-close-ipc-bridge'
 import { mountedOwner } from '@/components/terminal-pane/terminal-presentation-retirement.test-fixture'
@@ -74,9 +77,10 @@ it.each([false, true])(
       terminalLayoutsByTabId: session.terminalLayoutsByTabId
     })
     const source = harness.runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_ID}`, WORKTREE_ID)
-    if (!source.presentation) {
+    if (!source.presentation || !source.incarnationId) {
       throw new Error('Expected original')
     }
+    const { presentation, incarnationId } = source
     const owner = mountedOwner(false, {
       tabId: TAB_ID,
       worktreeId: WORKTREE_ID,
@@ -87,7 +91,13 @@ it.each([false, true])(
       throw new Error('terminal dispose failed')
     })
     let request: ((value: TerminalTabCloseRequest) => void) | undefined
-    const respond = vi.fn()
+    let rejectReceipt = (_error: Error): void => {}
+    const receipt = new Promise<void>((_resolve, reject) => {
+      rejectReceipt = reject
+    })
+    const respond = vi.fn((response: TerminalTabCloseResponse) => {
+      rejectReceipt(new Error(response.error ?? 'Unexpected success'))
+    })
     const set = vi.fn(async (_state: WorkspaceSessionState) => {
       expect(owner.manager.destroy).toHaveBeenCalledOnce()
       expect(useAppStore.getState().terminalLayoutsByTabId[TAB_ID]).toBeUndefined()
@@ -119,13 +129,23 @@ it.each([false, true])(
     if (!request) {
       throw new Error('Expected IPC listener')
     }
-    try {
-      request({
+    const dispatch = request
+    harness.setVerifiedStopResult(true)
+    harness.setCloseTerminalTabAction(() => {
+      dispatch({
         requestId: 'close',
         tabId: TAB_ID,
         localPtyTeardownOwnedExternally: true,
-        originalSurface: source.presentation.identity
+        originalSurface: presentation.identity
       })
+      return receipt
+    })
+    try {
+      await expect(
+        harness.runtime.closeTerminal(source.handle, incarnationId, presentation)
+      ).rejects.toThrow('terminal_tab_close_failed')
+      expect(harness.flushOrThrow).not.toHaveBeenCalled()
+      expect(harness.getSession().closedTerminalTabTombstonesByTabId?.[TAB_ID]).toBeUndefined()
       await vi.waitFor(() =>
         expect(respond).toHaveBeenCalledExactlyOnceWith({
           requestId: 'close',

From e8e66992730417358a9958445df26437cb9d8b17 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Thu, 22 Oct 2026 14:47:37 -0700
Subject: [PATCH 048/207] Preserve existing terminal source admission alongside
 retained exit capture

---
 .../cli-chat-resume-terminal-capture.ts       | 20 +++++++++----------
 ...-chat-resume-terminal-capture.unit.test.ts | 19 +++++++++++++-----
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-terminal-capture.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-terminal-capture.ts
index 797537a565dd..660bfedeabdb 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-terminal-capture.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-terminal-capture.ts
@@ -53,10 +53,12 @@ export async function captureSourceTerminal(source: CliChatResumeSource) {
     const original = terminal.presentation?.identity
     const authority = parseHostAuthorityKey(source.executionHostId)
     if (
-      !renderer ||
-      !renderer.hasLeaf ||
+      (!owner && source.ptyId === undefined && !renderer?.hasLeaf) ||
       !original ||
       !terminal.incarnationId ||
+      original.worktreeId !== source.workspaceId ||
+      original.tabId !== source.tabId ||
+      original.leafId !== leafId ||
       (terminal.executionHostId != null && terminal.executionHostId !== authority?.at) ||
       original.ptyId !== terminal.ptyId ||
       original.incarnationId !== terminal.incarnationId
@@ -65,14 +67,12 @@ export async function captureSourceTerminal(source: CliChatResumeSource) {
     }
     const matches = owner
       ? terminal.handle === owner.terminal &&
-        renderer.ptyId === source.ptyId &&
-        renderer.worktreeId === original.worktreeId &&
-        renderer.tabId === original.tabId &&
-        renderer.leafId === original.leafId &&
-        renderer.createdAt === original.createdAt &&
-        renderer.generation === original.generation &&
-        original.hasLeaf &&
-        (renderer.incarnationId === null || renderer.incarnationId === original.incarnationId)
+        (renderer === null ||
+          ((renderer.ptyId === null || renderer.ptyId === source.ptyId) &&
+            renderer.createdAt === original.createdAt &&
+            renderer.generation === original.generation &&
+            (!renderer.hasLeaf || original.hasLeaf) &&
+            (renderer.incarnationId === null || renderer.incarnationId === original.incarnationId)))
       : (source.ptyId === undefined || terminal.ptyId === source.ptyId) &&
         isRetainedTerminalSurfaceIdentity(original, renderer)
     return matches
diff --git a/tests/e2e/cli-chat-resume-terminal-capture.unit.test.ts b/tests/e2e/cli-chat-resume-terminal-capture.unit.test.ts
index 522e0509f9fb..4a2a9f8cc569 100644
--- a/tests/e2e/cli-chat-resume-terminal-capture.unit.test.ts
+++ b/tests/e2e/cli-chat-resume-terminal-capture.unit.test.ts
@@ -19,10 +19,7 @@ beforeEach(() => {
   useAppStore.setState(useAppStore.getInitialState(), true)
   rpc.mockReset()
 })
-function source(
-  ptyId: string | undefined = PTY_ID,
-  executionHostId: 'local' | 'runtime:paired' = 'local'
-) {
+function source(ptyId: string | undefined, executionHostId: 'local' | 'runtime:paired' = 'local') {
   return {
     workspaceId: WORKTREE_ID,
     tabId: TAB_ID,
@@ -131,7 +128,7 @@ it.each(['row', 'incarnation', 'pty', 'workspace', 'leaf', 'host'] as const)(
     useAppStore.setState({
       terminalPtyIncarnationsByPaneKey: { [`${TAB_ID}:${LEAF_ID}`]: INCARNATION_ID }
     })
-    expect(await captureSourceTerminal(source())).toBeNull()
+    expect(await captureSourceTerminal(source(PTY_ID))).toBeNull()
   }
 )
 
@@ -163,3 +160,15 @@ it('keeps remote proxy and host PTY namespaces distinct, and refuses absent or c
   expect(await captureSourceTerminal(source(proxy, 'runtime:paired'))).toBeNull()
   expect(rpc).toHaveBeenCalledTimes(2)
 })
+
+it('requires a real row/leaf for the new missing-binding exception while retaining existing nonnull-source admission', async () => {
+  const harness = createHarness({ registerPtyBacked: true, publishMobileSurface: true })
+  const terminal = harness.runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_ID}`, WORKTREE_ID)
+  rpc.mockResolvedValue({ terminal })
+  expect(await captureSourceTerminal(source(undefined))).toBeNull()
+  expect(await captureSourceTerminal(source(PTY_ID))).toMatchObject({ handle: terminal.handle })
+  const proxy = toRemoteRuntimePtyId(terminal.handle, 'paired')
+  expect(await captureSourceTerminal(source(proxy, 'runtime:paired'))).toMatchObject({
+    handle: terminal.handle
+  })
+})

From c843e12a7c9f56d4e5da9e514c48fc77f7a08e78 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Thu, 22 Oct 2026 15:19:26 -0700
Subject: [PATCH 049/207] Exercise captured terminal stop contract in
 continuity test

---
 ...ca-runtime-terminal-close-continuity.test.ts | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/main/runtime/orca-runtime-terminal-close-continuity.test.ts b/src/main/runtime/orca-runtime-terminal-close-continuity.test.ts
index 7f62c196e080..87494fef9b52 100644
--- a/src/main/runtime/orca-runtime-terminal-close-continuity.test.ts
+++ b/src/main/runtime/orca-runtime-terminal-close-continuity.test.ts
@@ -405,13 +405,14 @@ describe('terminal close and handle incarnation continuity', () => {
 
   it('forwards the captured incarnation to the stop and never falls back after a refused stop', async () => {
     const harness = createHarness({ registerPtyBacked: true })
-    const terminal = (await harness.runtime.listTerminals()).terminals.find(
-      (row) => row.ptyId === PTY_ID
-    )!
+    const terminal = harness.runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_ID}`, WORKTREE_ID)
+    const presentation = terminal.presentation
+    if (!presentation) {
+      throw new Error('Missing original source')
+    }
+    const close = () => harness.runtime.closeTerminal(terminal.handle, INCARNATION_ID, presentation)
     harness.setVerifiedStopResult(false)
-    await expect(harness.runtime.closeTerminal(terminal.handle, INCARNATION_ID)).rejects.toThrow(
-      'terminal_close_unverifiable'
-    )
+    await expect(close()).rejects.toThrow('terminal_close_unverifiable')
     expect(harness.stopAndWait).toHaveBeenCalledWith(
       PTY_ID,
       expect.objectContaining({ expectedIncarnationId: INCARNATION_ID })
@@ -421,9 +422,7 @@ describe('terminal close and handle incarnation continuity', () => {
     expect(harness.closeTerminalPane).not.toHaveBeenCalled()
     harness.setVerifiedStopResult(true)
     harness.acknowledged.resolve()
-    await expect(
-      harness.runtime.closeTerminal(terminal.handle, INCARNATION_ID)
-    ).resolves.toMatchObject({ ptyKilled: true })
+    await expect(close()).resolves.toMatchObject({ ptyKilled: true })
   })
 
   it('closes nothing when its handle now runs a later incarnation than the caller expected', async () => {

From fca05afd160d12c92bd580413300b42c4fc64334 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Thu, 22 Oct 2026 15:58:46 -0700
Subject: [PATCH 050/207] Fix terminal retirement fixture types

---
 ...time-terminal-close-continuity-fixtures.ts | 14 ++++++-------
 .../terminal-close-runtime.test-fixture.ts    | 21 +++++++++++++++++++
 ...al-presentation-retirement.test-fixture.ts | 12 ++++++++++-
 3 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/src/main/runtime/__fixtures__/orca-runtime-terminal-close-continuity-fixtures.ts b/src/main/runtime/__fixtures__/orca-runtime-terminal-close-continuity-fixtures.ts
index 2c81beff7d0d..23584d925d49 100644
--- a/src/main/runtime/__fixtures__/orca-runtime-terminal-close-continuity-fixtures.ts
+++ b/src/main/runtime/__fixtures__/orca-runtime-terminal-close-continuity-fixtures.ts
@@ -3,7 +3,7 @@ import { vi, type Mock } from 'vitest'
 import { makePaneKey } from '../../../shared/stable-pane-id'
 import type { WorkspaceSessionState } from '../../../shared/workspace-session-state-types'
 import type { RuntimeTerminalListResult } from '../../../shared/runtime-types'
-import { TerminalCloseRuntime } from './terminal-close-runtime.test-fixture'
+import * as terminalClose from './terminal-close-runtime.test-fixture'
 import { withMainLayout } from './main-layout-close-fixture'
 import {
   CANARY_INCARNATION_ID,
@@ -49,7 +49,7 @@ export {
 } from './orca-runtime-terminal-close-continuity-state-fixture'
 
 export type CloseContinuityHarness = {
-  runtime: TerminalCloseRuntime
+  runtime: terminalClose.TerminalCloseRuntime
   acknowledged: ReturnType<typeof makeDeferred>
   closeTerminal: Mock<(...args: unknown[]) => unknown>
   closeTerminalPane: Mock<(...args: unknown[]) => unknown>
@@ -99,13 +99,13 @@ function createHarness(
     addedAt: 1
   }
   const store = withDurableRuntimeStore({
+    ...terminalClose.terminalCloseStoreDefaults(),
     getRepos: () => [repo],
     getRepo: (id: string) => (id === REPO_ID ? repo : undefined),
-    getAllWorktreeMeta: () => ({}),
-    getWorktreeMeta: () => undefined,
-    getSettings: () => ({ workspaceDir: '/tmp/workspaces' }),
     getProjects: () => [],
-    getWorkspaceSession: () => (sessionAvailable ? session : undefined),
+    get getWorkspaceSession() {
+      return sessionAvailable ? () => session : undefined
+    },
     setWorkspaceSession: (next: WorkspaceSessionState) => {
       session = next
     },
@@ -160,7 +160,7 @@ function createHarness(
       : []),
     ...(options.includeCanary ? [canaryProcess] : [])
   ])
-  const runtime = new TerminalCloseRuntime(store as never)
+  const runtime = new terminalClose.TerminalCloseRuntime(store)
   // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: these close paths call only the listed notifier methods.
   runtime.setNotifier({ closeTerminal, closeTerminalPane, closeTerminalTab } as never)
   runtime.setPtyController({
diff --git a/src/main/runtime/__fixtures__/terminal-close-runtime.test-fixture.ts b/src/main/runtime/__fixtures__/terminal-close-runtime.test-fixture.ts
index ad3dd90431c5..487958fb6810 100644
--- a/src/main/runtime/__fixtures__/terminal-close-runtime.test-fixture.ts
+++ b/src/main/runtime/__fixtures__/terminal-close-runtime.test-fixture.ts
@@ -1,7 +1,28 @@
+import { vi } from 'vitest'
 import { OrcaRuntimeService } from '../orca-runtime'
+import type { RuntimeStore } from '../runtime-store-contract'
 
 export class TerminalCloseRuntime extends OrcaRuntimeService {
   dropArchivedPtyRecord(ptyId: string): void {
     this.dropDisconnectedPtyRecord(ptyId)
   }
 }
+
+export function terminalCloseStoreDefaults() {
+  return {
+    addRepo: vi.fn<RuntimeStore['addRepo']>(),
+    updateRepo: vi.fn<RuntimeStore['updateRepo']>(),
+    getAllWorktreeMeta: () => ({}),
+    getWorktreeMeta: () => undefined,
+    setWorktreeMeta: vi.fn<RuntimeStore['setWorktreeMeta']>(),
+    removeWorktreeMeta: vi.fn<RuntimeStore['removeWorktreeMeta']>(),
+    getGitHubCache: () => ({ pr: {}, issue: {} }),
+    getSettings: () => ({
+      workspaceDir: '/tmp/workspaces',
+      nestWorkspaces: false,
+      refreshLocalBaseRefOnWorktreeCreate: false,
+      branchPrefix: 'none',
+      branchPrefixCustom: ''
+    })
+  }
+}
diff --git a/src/renderer/src/components/terminal-pane/terminal-presentation-retirement.test-fixture.ts b/src/renderer/src/components/terminal-pane/terminal-presentation-retirement.test-fixture.ts
index 7d76601c19d3..39d6c771b9d3 100644
--- a/src/renderer/src/components/terminal-pane/terminal-presentation-retirement.test-fixture.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-presentation-retirement.test-fixture.ts
@@ -8,6 +8,7 @@ import { WebLinksAddon } from '@xterm/addon-web-links'
 import { FitAddon } from '@xterm/addon-fit'
 import { WebglAddon } from '@xterm/addon-webgl'
 import { ImageAddon } from '@xterm/addon-image'
+import { isTerminalLeafId } from '../../../../shared/stable-pane-id'
 import type { ManagedPaneInternal } from '@/lib/pane-manager/pane-manager-types'
 import { PaneManager } from '@/lib/pane-manager/pane-manager'
 import { retireManagedPanePreservingPty } from '@/lib/pane-manager/pane-split-close'
@@ -29,6 +30,9 @@ function disposable<T extends { dispose(): void }>(value: T): T {
 }
 
 function pane(id: number, leafId: string): ManagedPaneInternal {
+  if (!isTerminalLeafId(leafId)) {
+    throw new Error('Expected a valid fixture leaf id')
+  }
   const terminal = disposable(new Terminal())
   vi.spyOn(terminal, 'clearSelection').mockImplementation(() => {})
   vi.spyOn(terminal, 'focus').mockImplementation(() => {})
@@ -154,7 +158,13 @@ export function mountedOwner(
     requestTerminalLinkAction: vi.fn(),
     effectiveMacOptionAsAlt: 'false',
     effectiveMacOptionAsAltRef: { current: 'false' },
-    initialLayoutRef: { current: { root: { type: 'leaf', leafId: address.leafId } } },
+    initialLayoutRef: {
+      current: {
+        root: { type: 'leaf', leafId: address.leafId },
+        activeLeafId: address.leafId,
+        expandedLeafId: null
+      }
+    },
     expandedStyleSnapshotRef: { current: new Map() },
     isActiveRef: { current: false },
     isVisibleRef: { current: false },

From 6e66bbacf0dfbcedc0a201b55a987a066da04617 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 23 Oct 2026 01:10:25 -0700
Subject: [PATCH 051/207] test: bound saved resume ownership and refusal work

---
 config/vitest.performance.config.ts           |   4 +
 .../spawn-preflight-saved-resume.test.ts      |  83 +++++++++
 ...nt-session-terminal-writer-acquire.test.ts | 172 +++++++++++++++++-
 .../hook-status-resume-sleep-ordering.test.ts |  73 ++++++++
 ...-status-refused-resume.performance.test.ts | 150 +++++++++++++++
 5 files changed, 480 insertions(+), 2 deletions(-)
 create mode 100644 src/renderer/src/hooks/ipc-events/agent-status-refused-resume.performance.test.ts

diff --git a/config/vitest.performance.config.ts b/config/vitest.performance.config.ts
index 8c0b623d4c74..fa2c1ddc0b90 100644
--- a/config/vitest.performance.config.ts
+++ b/config/vitest.performance.config.ts
@@ -5,6 +5,10 @@ import baseConfig from './vitest.config'
 import { nodeRuntimePool } from './scripts/vitest-node-runtime-pool'
 
 const contracts = [
+  'src/main/ipc/pty/runtime/spawn-preflight-saved-resume.test.ts',
+  'src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts',
+  'src/main/runtime/hook-status-resume-sleep-ordering.test.ts',
+  'src/renderer/src/hooks/ipc-events/agent-status-refused-resume.performance.test.ts',
   'src/main/sqlite/sync-database.test.ts',
   'src/main/runtime/orchestration/db/row-column-lists.test.ts',
   'src/shared/native-chat-tool-attribution-allocation.test.ts',
diff --git a/src/main/ipc/pty/runtime/spawn-preflight-saved-resume.test.ts b/src/main/ipc/pty/runtime/spawn-preflight-saved-resume.test.ts
index 007799dcdef2..afe5f1ad48f5 100644
--- a/src/main/ipc/pty/runtime/spawn-preflight-saved-resume.test.ts
+++ b/src/main/ipc/pty/runtime/spawn-preflight-saved-resume.test.ts
@@ -1,3 +1,4 @@
+import { CLAUDE_CLI_CONVERSATIONS } from '../../../claude/claude-cli-conversations'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
 import { localProvider } from '../provider/registry'
 import { spawnPtyFromRuntimeController } from './spawn'
@@ -144,6 +145,88 @@ describe('actual runtime saved-resume outcomes', () => {
     return ctx
   }
 
+  it.each([10, 100])(
+    'counts real saved-spawn projection and freshness across %i chats',
+    async (size) => {
+      const records = Array.from({ length: size }, (_, index) => ({
+        ...chat,
+        sessionId: `chat-${index}`,
+        providerHandleChain: chat.providerHandleChain.map((link) => ({
+          ...link,
+          handle: { ...link.handle, nativeId: `unrelated-${index}` }
+        }))
+      }))
+      const list = vi.spyOn(store, 'listRecords').mockImplementation(() => records)
+      const visible = vi.spyOn(store, 'getVisibleSessionTabIndex').mockReturnValue({
+        present: true,
+        sessionIds: records.map((record) => record.sessionId)
+      })
+      const read = vi.spyOn(CLAUDE_CLI_CONVERSATIONS.sessionHistory, 'rowSessionId')
+      const runtime = chatHost()
+      let rowReads = 0
+      const originalRow = runtime.getAgentProviderSessionRows()[0]!
+      const rows = Array.from({ length: size }, (_, index) => ({
+        ...originalRow,
+        get paneKey() {
+          rowReads += 1
+          return index === size - 1 ? 'tab-1:leaf' : `unrelated-pane-${index}`
+        }
+      }))
+      runtime.getAgentProviderSessionRows = () => rows
+      const run = async (ordinary = false) => {
+        const ctx = freshContext(runtime)
+        ctx.spawnIdentityPaneKey = 'tab-1:leaf'
+        if (ordinary) {
+          delete ctx.args.resumeOrigin
+        }
+        await executeRuntimePtySpawn(ctx)
+        return ctx
+      }
+      const spawn = vi.spyOn(localProvider, 'spawn').mockResolvedValue({ id: 'counted-shell' })
+      try {
+        await admitColdRestoreReattach(
+          runtime,
+          { coldRestore: {}, isReattach: true },
+          { paneKey: 'tab-1:leaf', saved: undefined },
+          null
+        )
+        await run(true)
+        expect([
+          list.mock.calls.length,
+          visible.mock.calls.length,
+          read.mock.calls.length,
+          rowReads
+        ]).toEqual([0, 0, 0, 0])
+        for (let pane = 0; pane < size; pane += 1) {
+          expect((await run()).resumeAdmission?.verdict).toBe('admitted')
+          if (pane === 0) {
+            expect([read.mock.calls.length, rowReads]).toEqual([3 * size, size])
+          }
+        }
+        // Each pane projects N heads and two handle reads per link; P=N exposes the aggregate cost.
+        expect(read.mock.calls.length).toBe(size * 3 * size)
+        expect([list.mock.calls.length, visible.mock.calls.length, rowReads]).toEqual([
+          size,
+          size,
+          size * size
+        ])
+        const target = records[0]!
+        target.providerHandleChain[0]!.handle.nativeId = C
+        const refused = await run()
+        expect(refused.resumeAdmission?.verdict).toBe('chat-home')
+        expect(refused.spawnOptions.command).toBeUndefined()
+        target.providerHandleChain[0]!.handle.nativeId = 'successor-conversation'
+        expect((await run()).resumeAdmission?.verdict).toBe('admitted')
+        expect(read.mock.calls.length).toBe((size + 2) * 3 * size)
+      } finally {
+        spawn.mockRestore()
+        read.mockRestore()
+        list.mockRestore()
+        visible.mockRestore()
+      }
+    }
+  )
+
   it('chooses a plain shell only in the fresh callback and does not forget before commit', async () => {
     const runtime = chatHost()
     const ctx = freshContext(runtime)
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts
index 001d926b0860..8ea92782f2f6 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts
@@ -1,3 +1,14 @@
+import {
+  assertCliConversationWritersExited,
+  posixCliWriterShellAlone
+} from '../../runtime/structured-agent-cli-writers'
+import type { AgentSessionRecord } from '../../../shared/agent-session-record'
+import type { SleepingAgentSessionRecord } from '../../../shared/agent-session-resume'
+const physicalSnapshot = vi.hoisted(() => vi.fn())
+vi.mock('../../../shared/process-table-snapshot-reader', async (importOriginal) => ({
+  ...(await importOriginal<object>()),
+  getFreshShellForegroundSnapshot: physicalSnapshot
+}))
 import { mkdtemp, rm } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
@@ -38,7 +49,7 @@ const acquire = vi.fn<StructuredAgentSessionAdapter['acquire']>(async ({ fence,
     observedAt: NOW
   }
 }))
-const assertNoTerminalWriter = vi.fn(async () => {
+const assertNoTerminalWriter = vi.fn(async (_record: AgentSessionRecord) => {
   if (terminalWriting) {
     throw agentSessionRefusalError('agent_session_conflict', {
       reason: 'conversationHeldElsewhere'
@@ -50,8 +61,15 @@ beforeEach(async () => {
   root = await mkdtemp(join(tmpdir(), 'orca-terminal-writer-acquire-'))
   resetHostTestOperationIds()
   terminalWriting = false
+  physicalSnapshot.mockReset()
   acquire.mockClear()
-  assertNoTerminalWriter.mockClear()
+  assertNoTerminalWriter.mockReset().mockImplementation(async () => {
+    if (terminalWriting) {
+      throw agentSessionRefusalError('agent_session_conflict', {
+        reason: 'conversationHeldElsewhere'
+      })
+    }
+  })
   store = await openTestAgentSessionRecordStore(root)
   host = new StructuredAgentSessionHost({
     agents: NO_STRUCTURED_AGENTS,
@@ -136,3 +154,153 @@ it('refuses the chat agent start while a terminal writes its conversation, once
     timeout: 10_000
   })
 })
+
+it.each([10, 100])(
+  'drives acquisition through the real census for %i matching/unrelated panes',
+  async (size) => {
+    let enumerated = 0
+    const saved: Record<string, SleepingAgentSessionRecord> = Object.fromEntries(
+      Array.from({ length: size }, (_, index) => [
+        `pane-${index}`,
+        {
+          paneKey: `pane-${index}`,
+          worktreeId: 'workspace-1',
+          agent: 'codex' as const,
+          providerSession: { key: 'session_id' as const, id: THREAD },
+          state: 'done' as const,
+          prompt: '',
+          capturedAt: 1,
+          updatedAt: 1,
+          origin: 'live' as const
+        }
+      ])
+    )
+    const population = new Proxy(saved, {
+      ownKeys(target) {
+        const keys = Reflect.ownKeys(target)
+        enumerated += keys.length
+        return keys
+      }
+    })
+    let rowVisits = 0
+    let linkVisits = 0
+    const rows = new Proxy(
+      Array.from({ length: size }, (_, index) => ({
+        paneKey: `unrelated-${index}`,
+        connectionId: null,
+        agentType: 'codex',
+        providerSession: { key: 'session_id' as const, id: 'unrelated' },
+        state: 'done' as const,
+        prompt: '',
+        receivedAt: 1,
+        stateStartedAt: 1
+      })),
+      {
+        get(target, key, receiver) {
+          if (typeof key === 'string' && /^\d+$/.test(key)) {
+            rowVisits += 1
+          }
+          return Reflect.get(target, key, receiver)
+        }
+      }
+    )
+    const links = new Proxy(
+      rows.map(() => ({
+        agent: 'codex',
+        id: 'unrelated',
+        paneOwned: true,
+        worktreeId: 'workspace-1',
+        terminal: () => null
+      })),
+      {
+        get(target, key, receiver) {
+          if (typeof key === 'string' && /^\d+$/.test(key)) {
+            linkVisits += 1
+          }
+          return Reflect.get(target, key, receiver)
+        }
+      }
+    )
+    rowVisits = 0
+    const shell = [{ pid: 10, ppid: 1, stat: 'Ss+', command: '/bin/zsh' }]
+    physicalSnapshot.mockResolvedValue(shell)
+    const physical = vi.fn(() => posixCliWriterShellAlone(10))
+    assertNoTerminalWriter.mockImplementation((record) =>
+      assertCliConversationWritersExited(
+        {
+          saved: () => Object.values(population),
+          rows: () => rows,
+          links: () => links,
+          observation: () => null,
+          sleeping: () => false,
+          terminal: () => ({ pane: { ptyId: 'shell', incarnationId: 'i1', identity: 'shell:i1' } }),
+          shellAlone: physical
+        },
+        record.provider,
+        record.providerHandleChain.at(-1)?.handle.nativeId ?? ''
+      )
+    )
+    const start = async () => {
+      await host.close(SESSION, 'evict')
+      await host.revealSession(SESSION)
+      const before = acquire.mock.calls.length
+      await send('acquire after census')
+      await vi.waitFor(() => expect(acquire.mock.calls.length).toBe(before + 1))
+    }
+    for (const record of Object.values(saved)) {
+      record.providerSession.id = 'unrelated'
+    }
+    await start()
+    expect([enumerated, physical.mock.calls.length]).toEqual([2 * size, 0])
+    expect([rowVisits, linkVisits]).toEqual([size, size])
+    for (const record of Object.values(saved)) {
+      record.providerSession.id = THREAD
+    }
+    enumerated = 0
+    rowVisits = 0
+    linkVisits = 0
+    await start()
+    // Across each physical await, existing saved-membership and final coverage revalidate the population.
+    expect(enumerated).toBe((6 * size + 2) * size)
+    expect([rowVisits, linkVisits]).toEqual([(4 * size + 1) * size, size])
+    expect(physical).toHaveBeenCalledTimes(size)
+    expect(physicalSnapshot).toHaveBeenCalledTimes(size)
+
+    await host.close(SESSION, 'evict')
+    await host.revealSession(SESSION)
+    physicalSnapshot.mockResolvedValue([
+      ...shell,
+      { pid: 11, ppid: 10, stat: 'T', command: 'codex' }
+    ])
+    physical.mockClear()
+    const before = acquire.mock.calls.length
+    await rejection(await send('live terminal witness'))
+    expect(acquire).toHaveBeenCalledTimes(before)
+    expect(physical).toHaveBeenCalledTimes(1)
+
+    let finish = () => {}
+    physicalSnapshot.mockResolvedValue(shell)
+    physicalSnapshot.mockImplementationOnce(
+      () =>
+        new Promise((resolve) => {
+          finish = () => resolve(shell)
+        })
+    )
+    physical.mockClear()
+    await send('cancel during physical proof')
+    await vi.waitFor(() => expect(physical).toHaveBeenCalledTimes(1))
+    const closed = host.close(SESSION, 'evict')
+    finish()
+    await closed
+    await assertNoTerminalWriter.mock.results.at(-1)?.value
+    // Closing prevents the late spawn; this inherited census still finishes every physical proof.
+    expect(physical).toHaveBeenCalledTimes(size)
+    expect(acquire).toHaveBeenCalledTimes(before)
+    physicalSnapshot.mockResolvedValue(shell)
+    enumerated = 0
+    await host.revealSession(SESSION)
+    await send('successful successor')
+    await vi.waitFor(() => expect(acquire).toHaveBeenCalledTimes(before + 1))
+    expect(enumerated).toBeLessThanOrEqual((6 * size + 2) * size)
+  }
+)
diff --git a/src/main/runtime/hook-status-resume-sleep-ordering.test.ts b/src/main/runtime/hook-status-resume-sleep-ordering.test.ts
index 93efd99d7c83..40ced350f759 100644
--- a/src/main/runtime/hook-status-resume-sleep-ordering.test.ts
+++ b/src/main/runtime/hook-status-resume-sleep-ordering.test.ts
@@ -205,3 +205,76 @@ it.each([false, true])(
     }
   }
 )
+
+it.each([10, 100])(
+  'counts actual refused cleanup copies/writes over %i saved panes',
+  async (size) => {
+    const session = makeWorkspaceSessionWithHeadlessTerminal()
+    const source = sleepCapture(11).get(PTY_ID)!.records[0]!
+    session.sleepingAgentSessionsByPaneKey = Object.fromEntries(
+      Array.from({ length: size }, (_, index) => [
+        `pane-${index}`,
+        { ...source, paneKey: `pane-${index}` }
+      ])
+    )
+    const { runtimeStore, getSession } = makeRuntimeStoreWithWorkspaceSession(session)
+    const runtime = new OrcaRuntimeService(runtimeStore)
+    const originalClone = globalThis.structuredClone
+    let copied = 0
+    let clones = 0
+    const clone = vi.spyOn(globalThis, 'structuredClone').mockImplementation((value, options) => {
+      if (value && typeof value === 'object' && 'sleepingAgentSessionsByPaneKey' in value) {
+        copied += Object.keys(value.sleepingAgentSessionsByPaneKey ?? {}).length
+        clones += 1
+      }
+      return originalClone(value, options)
+    })
+    const clear = (index: number, stale = false) => {
+      const paneKey = `pane-${index}`
+      const record = { ...source, paneKey }
+      return runtime.forgetRefusedSavedResume(
+        TEST_WORKTREE_ID,
+        paneKey,
+        {
+          agent: 'codex',
+          providerSession: SESSION,
+          expectedSavedRecord: {
+            paneKey,
+            capturedAt: stale ? -1 : record.capturedAt,
+            updatedAt: record.updatedAt
+          }
+        },
+        record
+      )
+    }
+    try {
+      await clear(0, true)
+      expect([clones, copied, runtimeStore.flushOrThrow.mock.calls.length]).toEqual([1, size, 0])
+      // The durable fixture executes the real mutation/rollback, failing only its disk-write primitive.
+      runtimeStore.flushOrThrow.mockImplementationOnce(() => {
+        throw new Error('disk full')
+      })
+      await expect(clear(0)).rejects.toThrow('disk full')
+      expect(getSession().sleepingAgentSessionsByPaneKey?.['pane-0']).toBeDefined()
+      clones = 0
+      copied = 0
+      runtimeStore.flushOrThrow.mockClear()
+      await Promise.all(Array.from({ length: size }, (_, index) => clear(index)))
+      // Each accepted edit clones before deleting, then stages one smaller map: sum(2k-1)=N².
+      expect([clones, copied, runtimeStore.flushOrThrow.mock.calls.length]).toEqual([
+        2 * size,
+        size * size,
+        size
+      ])
+      expect(getSession().sleepingAgentSessionsByPaneKey).toEqual({})
+      await clear(0)
+      expect([clones, copied, runtimeStore.flushOrThrow.mock.calls.length]).toEqual([
+        2 * size + 1,
+        size * size,
+        size
+      ])
+    } finally {
+      clone.mockRestore()
+    }
+  }
+)
diff --git a/src/renderer/src/hooks/ipc-events/agent-status-refused-resume.performance.test.ts b/src/renderer/src/hooks/ipc-events/agent-status-refused-resume.performance.test.ts
new file mode 100644
index 000000000000..00f532251f77
--- /dev/null
+++ b/src/renderer/src/hooks/ipc-events/agent-status-refused-resume.performance.test.ts
@@ -0,0 +1,150 @@
+import { afterEach, expect, it, vi } from 'vitest'
+import type {
+  AgentStatusIpcPayload,
+  RefusedPaneResume
+} from '../../../../shared/agent-status-types'
+import { createTestStore } from '@/store/slices/store-test-helpers'
+import { createStoreSessionMockApi } from '@/store/slices/store-session-test-harness'
+import { registerAgentStatusListeners } from './agent-status-listeners'
+
+const bridge = vi.hoisted(() => ({ getState: vi.fn(), setState: vi.fn() }))
+vi.mock('@/store', () => ({ useAppStore: bridge }))
+
+afterEach(() => vi.unstubAllGlobals())
+
+it.each([10, 100])(
+  'counts refused-clear queue moves and real store notifications at %i entries',
+  (size) => {
+    vi.stubGlobal('window', undefined)
+    createStoreSessionMockApi()
+    const store = createTestStore()
+    bridge.getState.mockImplementation(store.getState)
+    bridge.setState.mockImplementation(store.setState)
+    const refused: RefusedPaneResume = {
+      agent: 'codex',
+      providerSession: { key: 'session_id', id: 'conversation' },
+      expectedStatus: { paneKey: 'tab:leaf', receivedAt: 10, stateStartedAt: 1 },
+      expectedSavedRecord: { paneKey: 'tab:leaf', capturedAt: 1, updatedAt: 1 }
+    }
+    const event = (index: number): AgentStatusIpcPayload => ({
+      paneKey: index % 2 ? `other-${index}` : 'tab:leaf',
+      connectionId: null,
+      agentType: 'codex',
+      providerSession: refused.providerSession,
+      state: 'done',
+      prompt: '',
+      receivedAt: 10,
+      stateStartedAt: 1
+    })
+    let reads = 0
+    let writes = 0
+    const countQueue = <T>(entries: T[]): T[] =>
+      new Proxy(entries, {
+        get(target, key, receiver) {
+          if (typeof key === 'string' && /^\d+$/.test(key)) {
+            reads += 1
+          }
+          return Reflect.get(target, key, receiver)
+        },
+        set(target, key, value, receiver) {
+          if (typeof key === 'string' && /^\d+$/.test(key)) {
+            writes += 1
+          }
+          return Reflect.set(target, key, value, receiver)
+        }
+      })
+    let copied = 0
+    const countMap = <T extends object>(entries: T): T =>
+      new Proxy(entries, {
+        ownKeys(target) {
+          const keys = Reflect.ownKeys(target)
+          copied += keys.length
+          return keys
+        }
+      })
+    store.setState({
+      agentStatusByPaneKey: countMap(
+        Object.fromEntries(
+          Array.from({ length: size }, (_, index) => {
+            const row = event(index)
+            return [index === 0 ? 'tab:leaf' : `other-${index}`, { ...row, updatedAt: 10 }]
+          })
+        )
+      ),
+      sleepingAgentSessionsByPaneKey: countMap(
+        Object.fromEntries(
+          Array.from({ length: size }, (_, index) => [
+            index === 0 ? 'tab:leaf' : `other-${index}`,
+            {
+              paneKey: index === 0 ? 'tab:leaf' : `other-${index}`,
+              worktreeId: 'wt',
+              agent: 'codex',
+              providerSession: refused.providerSession,
+              prompt: '',
+              state: 'done' as const,
+              capturedAt: 1,
+              updatedAt: 1
+            }
+          ])
+        )
+      )
+    })
+    const notifications = vi.fn()
+    const unsubscribe = store.subscribe(notifications)
+    const pending = countQueue(
+      Array.from({ length: size }, (_, index) => ({
+        data: event(index),
+        firstSeenAt: 0,
+        replay: false
+      }))
+    )
+    const burst = countQueue(Array.from({ length: size }, (_, index) => event(index)))
+    // Newer same-conversation work must survive the old refusal too.
+    burst[size - 1] = { ...event(0), receivedAt: 11 }
+    const onClear = vi.fn<NonNullable<typeof window.api.agentStatus.onClear>>(() => () => {})
+    vi.stubGlobal('window', {
+      ...window,
+      api: {
+        ...window.api,
+        agentStatus: {
+          onSet: vi.fn(() => () => {}),
+          onClear
+        }
+      }
+    })
+    const unsubs: (() => void)[] = []
+    registerAgentStatusListeners({
+      unsubs,
+      pendingAgentStatusEvents: pending,
+      liveAgentStatusBurstQueue: burst,
+      transientClearWatermarkByConnectionId: new Map(),
+      enqueueLiveAgentStatus: vi.fn(),
+      drainQueuedLiveAgentStatusesForPane: vi.fn()
+    })
+    const clear = onClear.mock.calls[0]![0]
+    reads = 0
+    writes = 0
+    copied = 0
+    try {
+      clear({ paneKey: 'tab:leaf', refusedResume: refused })
+      const removed = size / 2
+      // Reverse splice shifts 1+…+m surviving entries in EACH queue, besides one predicate read per row.
+      expect([reads, writes]).toEqual([3 * size + removed * (removed + 1), removed * (removed + 1)])
+      expect(copied).toBe(2 * size)
+      expect(notifications).toHaveBeenCalledTimes(2)
+      expect([pending.length, burst.length]).toEqual([removed, removed])
+      expect(burst.at(-1)?.receivedAt).toBe(11)
+      expect(store.getState().agentStatusByPaneKey['tab:leaf']).toBeUndefined()
+      expect(Object.keys(store.getState().sleepingAgentSessionsByPaneKey)).toHaveLength(size - 1)
+      notifications.mockClear()
+      copied = 0
+      clear({ paneKey: 'tab:leaf', refusedResume: refused })
+      expect(notifications).not.toHaveBeenCalled()
+      expect(copied).toBe(0)
+    } finally {
+      unsubs.forEach((dispose) => dispose())
+      unsubscribe()
+      onClear.mockRestore()
+    }
+  }
+)

From ab7f01df276885a5df1943cda51d9ae4023f326b Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 23 Oct 2026 01:56:32 -0700
Subject: [PATCH 052/207] Align retirement fixture with workspace sleep
 subscription

---
 tests/e2e/terminal-presentation-retirement.unit.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/e2e/terminal-presentation-retirement.unit.test.ts b/tests/e2e/terminal-presentation-retirement.unit.test.ts
index da9796f44178..85f16ba3f4cc 100644
--- a/tests/e2e/terminal-presentation-retirement.unit.test.ts
+++ b/tests/e2e/terminal-presentation-retirement.unit.test.ts
@@ -114,7 +114,7 @@ it.each([false, true])(
           onOpenFileFromMobile: () => () => {},
           onOpenDiffFromMobile: () => () => {},
           onCloseTerminal: () => () => {},
-          onSleepWorktree: () => () => {},
+          onWorkspaceSleep: () => () => {},
           onResumeSleepingAgents: () => () => {},
           onTerminalTabCloseRequest: (listener: (value: TerminalTabCloseRequest) => void) => {
             request = listener

From dfb4cb88e0d9a19e6ce58bae971d1a7d8e696f2d Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 23 Oct 2026 02:40:33 -0700
Subject: [PATCH 053/207] Settle refused saved resume claims from actual launch
 results

---
 .github/workflows/performance-contracts.yml   |  4 ++
 ...nt-session-terminal-writer-acquire.test.ts | 72 ++++++++++---------
 ...session-tabs-targeted-agent-resume.spec.ts | 72 ++++++++++++++++++-
 .../agent-session-resume-claims.test.ts       |  6 ++
 .../projection/agent-session-resume-claims.ts | 11 ++-
 .../terminal/launch/mobile-terminal-create.ts |  3 +-
 .../launch/mobile-terminal-owned-create.ts    |  2 +-
 ...-status-refused-resume.performance.test.ts | 26 +++----
 8 files changed, 144 insertions(+), 52 deletions(-)

diff --git a/.github/workflows/performance-contracts.yml b/.github/workflows/performance-contracts.yml
index e76ba2981c77..c4f71fd43094 100644
--- a/.github/workflows/performance-contracts.yml
+++ b/.github/workflows/performance-contracts.yml
@@ -17,6 +17,10 @@ on:
       - '!config/scripts/mobile-pairing-qrcode-import-plugin.test.mjs'
       # Keep in sync with the contract list in config/vitest.performance.config.ts;
       # without these a rename lands green and only breaks the next nightly.
+      - 'src/main/ipc/pty/runtime/spawn-preflight-saved-resume.test.ts'
+      - 'src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts'
+      - 'src/main/runtime/hook-status-resume-sleep-ordering.test.ts'
+      - 'src/renderer/src/hooks/ipc-events/agent-status-refused-resume.performance.test.ts'
       - 'src/main/sqlite/sync-database.test.ts'
       - 'src/main/runtime/orchestration/db/row-column-lists.test.ts'
       - 'src/shared/native-chat-tool-attribution-allocation.test.ts'
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts
index 8ea92782f2f6..a85e86432f3a 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts
@@ -18,7 +18,10 @@ import { agentSessionRefusalError } from '../../../shared/agent-session-wire-ref
 import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding'
 import type { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
 import { openTestAgentSessionRecordStore } from '../../runtime/agent-session-record-store-test-harness'
-import { openTestJournalHostDatabase } from '../agent-session-journal/journal-host-database-test-support'
+import {
+  closeTestJournalHostDatabase,
+  openTestJournalHostDatabase
+} from '../agent-session-journal/journal-host-database-test-support'
 import type { StructuredAgentSessionAdapter } from './structured-agent-session-adapter'
 import { NO_STRUCTURED_AGENTS } from './structured-agent-session-adapter-router-test-support'
 import { StructuredAgentSessionHost } from './structured-agent-session-host'
@@ -99,6 +102,7 @@ beforeEach(async () => {
 
 afterEach(async () => {
   await host.flushAllStreamedEvents()
+  closeTestJournalHostDatabase(root)
   await rm(root, { recursive: true, force: true })
 })
 
@@ -184,42 +188,42 @@ it.each([10, 100])(
     })
     let rowVisits = 0
     let linkVisits = 0
-    const rows = new Proxy(
-      Array.from({ length: size }, (_, index) => ({
-        paneKey: `unrelated-${index}`,
-        connectionId: null,
-        agentType: 'codex',
-        providerSession: { key: 'session_id' as const, id: 'unrelated' },
-        state: 'done' as const,
-        prompt: '',
-        receivedAt: 1,
-        stateStartedAt: 1
-      })),
-      {
-        get(target, key, receiver) {
-          if (typeof key === 'string' && /^\d+$/.test(key)) {
-            rowVisits += 1
-          }
-          return Reflect.get(target, key, receiver)
+    const rows = Array.from({ length: size }, (_, index) => ({
+      paneKey: `unrelated-${index}`,
+      connectionId: null,
+      agentType: 'codex',
+      providerSession: { key: 'session_id' as const, id: 'unrelated' },
+      state: 'done' as const,
+      prompt: '',
+      receivedAt: 1,
+      stateStartedAt: 1
+    }))
+    const links = rows.map(() => ({
+      agent: 'codex',
+      id: 'unrelated',
+      paneOwned: true,
+      worktreeId: 'workspace-1',
+      terminal: () => null
+    }))
+    rows.forEach((row, index) =>
+      Object.defineProperty(rows, index, {
+        configurable: true,
+        enumerable: true,
+        get: () => {
+          rowVisits += 1
+          return row
         }
-      }
+      })
     )
-    const links = new Proxy(
-      rows.map(() => ({
-        agent: 'codex',
-        id: 'unrelated',
-        paneOwned: true,
-        worktreeId: 'workspace-1',
-        terminal: () => null
-      })),
-      {
-        get(target, key, receiver) {
-          if (typeof key === 'string' && /^\d+$/.test(key)) {
-            linkVisits += 1
-          }
-          return Reflect.get(target, key, receiver)
+    links.forEach((link, index) =>
+      Object.defineProperty(links, index, {
+        configurable: true,
+        enumerable: true,
+        get: () => {
+          linkVisits += 1
+          return link
         }
-      }
+      })
     )
     rowVisits = 0
     const shell = [{ pid: 10, ppid: 1, stat: 'Ss+', command: '/bin/zsh' }]
diff --git a/src/main/runtime/orca-runtime-tests/mobile-session-tabs-targeted-agent-resume.spec.ts b/src/main/runtime/orca-runtime-tests/mobile-session-tabs-targeted-agent-resume.spec.ts
index e5973a5e39ea..02f7a5883ba6 100644
--- a/src/main/runtime/orca-runtime-tests/mobile-session-tabs-targeted-agent-resume.spec.ts
+++ b/src/main/runtime/orca-runtime-tests/mobile-session-tabs-targeted-agent-resume.spec.ts
@@ -14,6 +14,16 @@ import type { AgentStatusIpcPayload } from '../../../shared/agent-status-types'
 import type { PtyProcessInfo } from '../../providers/pty-provider-contract'
 import { deterministicAgentSessionUuid } from '../runtime-agent-launch-resolution'
 import { deriveRemoteRuntimeTerminalCreateHandle } from '../remote-runtime-terminal-create-identity'
+import type { RuntimePtyController } from '../runtime-pty-controller-contract'
+import { AgentSessionRecordStore } from '../agent-session-record-store'
+import {
+  agentSessionLeaseFixture,
+  agentSessionRecordFixture
+} from '../../../shared/agent-session-record.test-fixture'
+import {
+  chooseSavedResumeFreshLaunch,
+  savedResumeResult
+} from '../../ipc/pty/host-env/saved-resume-admission'
 
 const PANE_KEY = `host-tab:${HEADLESS_LEAF_ID}`
 const SESSION = { key: 'session_id', id: 'provider-session-1' } as const
@@ -73,7 +83,7 @@ function sessionRow(paneKey: string, receivedAt = 0): AgentStatusIpcPayload {
 function makeRuntime(
   fixture: Fixture,
   opts: {
-    spawn?: () => Promise<{ id: string }>
+    spawn?: NonNullable<RuntimePtyController['spawn']>
     rows?: () => AgentStatusIpcPayload[]
     checkHookAgentPresence?: () => Promise<'live' | 'unverifiable' | 'exited' | null>
     listProcesses?: () => Promise<PtyProcessInfo[]>
@@ -82,7 +92,7 @@ function makeRuntime(
     ) => () => void
   } = {}
 ) {
-  const spawn = vi.fn<(args: unknown) => Promise<{ id: string }>>(
+  const spawn = vi.fn<NonNullable<RuntimePtyController['spawn']>>(
     opts.spawn ?? (() => Promise.resolve({ id: 'resumed-pty' }))
   )
   // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the fixture store implements the runtime store methods these tests reach.
@@ -149,6 +159,64 @@ function storedRecord(fixture: Fixture) {
 }
 
 describe('resumeAgentSessionInWorkspace', () => {
+  it('releases a saved resume claim when actual admission creates a plain shell', async () => {
+    const fixture = makeSleptWorkspace()
+    const saved = storedRecord(fixture)
+    if (!saved) {
+      throw new Error('missing saved conversation')
+    }
+    saved.origin = 'live'
+    const chat = agentSessionRecordFixture(
+      agentSessionLeaseFixture({
+        claimStatus: 'released',
+        ownerProcess: null,
+        reservedSpawnToken: null,
+        deathEvidence: { kind: 'exit-observed', detail: 'closed', observedAt: 1 }
+      })
+    )
+    chat.providerHandleChain[0]!.handle.nativeId = SESSION.id
+    let nativeOpen = true
+    const store: AgentSessionRecordStore = Object.create(AgentSessionRecordStore.prototype)
+    store.listRecords = () => [chat]
+    store.getVisibleSessionTabIndex = () => ({
+      present: true,
+      sessionIds: nativeOpen ? [chat.sessionId] : []
+    })
+    const effectiveCommands: (string | undefined)[] = []
+    const { runtime, spawn, openOldPane, resume } = makeRuntime(fixture, {
+      spawn: async (args) => {
+        const admission = await chooseSavedResumeFreshLaunch(
+          { openAgentSessionRecordStore: async () => store },
+          args,
+          null,
+          args
+        )
+        effectiveCommands.push(args.command)
+        return {
+          id: effectiveCommands.length === 1 ? 'refused-shell' : 'resumed-C',
+          launchAgent: args.launchAgent,
+          launchConfig: args.launchConfig,
+          ...savedResumeResult(admission)
+        }
+      }
+    })
+    await openOldPane()
+    expect(runtime.getTerminalLaunchResult('refused-shell')).toMatchObject({
+      agentResumeRefused: 'chat-home',
+      savedResumeDecision: { agent: 'claude', providerSession: SESSION, verdict: 'chat-home' }
+    })
+    expect(runtime.getTerminalLaunchResult('refused-shell')?.launchAgent).toBeUndefined()
+    expect(effectiveCommands).toEqual([undefined])
+    nativeOpen = false
+    await expect(resume({ mutationId: 'after-native-close' })).resolves.toMatchObject({
+      ok: true,
+      ptyId: 'resumed-C'
+    })
+    expect(effectiveCommands[1]).toContain(SESSION.id)
+    expect(spawn).toHaveBeenCalledTimes(2)
+    expect(runtime.getTerminalLaunchResult('refused-shell')).toBeDefined()
+  })
+
   // Review repro, on the runtime-owned path: the spawn started but its reply was lost.
   it('retains ownership after an ambiguous create with a running resume', async () => {
     const fixture = makeSleptWorkspace()
diff --git a/src/main/runtime/session-lifecycle/projection/agent-session-resume-claims.test.ts b/src/main/runtime/session-lifecycle/projection/agent-session-resume-claims.test.ts
index a9761c36ad3b..b70a3a96d2b6 100644
--- a/src/main/runtime/session-lifecycle/projection/agent-session-resume-claims.test.ts
+++ b/src/main/runtime/session-lifecycle/projection/agent-session-resume-claims.test.ts
@@ -41,6 +41,12 @@ describe('AgentSessionResumeClaims', () => {
   it('keeps a lost-reply attempt held unless a retry of the same request binds', () => {
     const { claims, exits } = makeClaims()
     claims.claim(SESSION, 'tab:a', 'request-1')?.settleFailure(true, new Error('reply lost'))
+    // A retry's known refusal cannot account for its earlier ambiguous dispatch.
+    claims
+      .claim(SESSION, 'tab:a', 'request-1')
+      ?.bind('plain-shell', { agentResumeRefused: 'chat-home' })
+    expect(exits.has('plain-shell')).toBe(false)
+    expect(claims.claim(SESSION, 'tab:b')).toBeNull()
     // Another request's spawn accounts only for itself.
     claims.claim(SESSION, 'tab:a', 'request-2')?.bind('pty-2')
     exits.get('pty-2')?.()
diff --git a/src/main/runtime/session-lifecycle/projection/agent-session-resume-claims.ts b/src/main/runtime/session-lifecycle/projection/agent-session-resume-claims.ts
index b4489e3ab221..d22c842b50d5 100644
--- a/src/main/runtime/session-lifecycle/projection/agent-session-resume-claims.ts
+++ b/src/main/runtime/session-lifecycle/projection/agent-session-resume-claims.ts
@@ -1,5 +1,6 @@
 import {
   agentProviderSessionsEqual,
+  type TerminalLaunchResult,
   type AgentProviderSessionMetadata
 } from '../../../../shared/agent-session-resume'
 import type { TuiAgent } from '../../../../shared/tui-agent'
@@ -28,7 +29,7 @@ type Hold = AgentSessionResumeHold & {
 /** A resumer's share of a hold, settled only from its own create's evidence. */
 export type AgentSessionResumeClaim = {
   /** The exact PTY this resumer's create produced; the hold ends once every such PTY exits. */
-  bind: (ptyId: string) => void
+  bind: (ptyId: string, result?: TerminalLaunchResult) => void
   /** Releases when nothing was dispatched or the spawn proved its exit; otherwise stays held. */
   settleFailure: (dispatched: boolean, error?: unknown) => void
 }
@@ -137,11 +138,17 @@ export class AgentSessionResumeClaims {
   private share(hold: Hold, request: string | undefined): AgentSessionResumeClaim {
     let open = true
     return {
-      bind: (ptyId) => {
+      bind: (ptyId, result) => {
         if (!open) {
           return
         }
         open = false
+        if (result?.agentResumeRefused) {
+          // A known plain shell settles only this share, never another uncertain dispatch.
+          hold.unsettled -= 1
+          this.endIfSettled(hold)
+          return
+        }
         hold.unsettled -= 1 + (request ? (hold.ambiguous.get(request) ?? 0) : 0)
         if (request) {
           hold.ambiguous.delete(request)
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-create.ts b/src/main/runtime/terminal/launch/mobile-terminal-create.ts
index 7fc297d94b78..059c7e9eab02 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-create.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-create.ts
@@ -4,6 +4,7 @@ import { OrcaRuntimeWithFailedStartPanes } from './failed-start-pane'
 import type { WorktreeStartupLaunch } from '../../../../shared/worktree/launch-types'
 import type { TuiAgent } from '../../../../shared/tui-agent'
 import type {
+  TerminalLaunchResult,
   AgentProviderSessionMetadata,
   SleepingAgentLaunchConfig
 } from '../../../../shared/agent-session-resume'
@@ -44,7 +45,7 @@ export type OwnedMobileTerminalCreateOptions = {
   /** See TerminalCreateOptions; a create that throws before it proves nothing spawned. */
   onPtySpawnDispatched?: () => void
   /** The PTY this create produced, reported before publication can fail. */
-  onPtyCreated?: (ptyId: string) => void
+  onPtyCreated?: (ptyId: string, result?: TerminalLaunchResult) => void
 }
 
 export abstract class OrcaRuntimeWithCreateMobileSessionTerminal extends OrcaRuntimeWithFailedStartPanes {
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts b/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
index 31d8f94ac61b..797f57ca2b94 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
@@ -131,7 +131,7 @@ export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal ext
         )
       : await create()
     if (terminal.ptyId) {
-      opts.onPtyCreated?.(terminal.ptyId)
+      opts.onPtyCreated?.(terminal.ptyId, terminal)
     }
     const livePty = this.getLivePtyForHandle(terminal.handle)
     if (!livePty) {
diff --git a/src/renderer/src/hooks/ipc-events/agent-status-refused-resume.performance.test.ts b/src/renderer/src/hooks/ipc-events/agent-status-refused-resume.performance.test.ts
index 00f532251f77..f3deefcb70be 100644
--- a/src/renderer/src/hooks/ipc-events/agent-status-refused-resume.performance.test.ts
+++ b/src/renderer/src/hooks/ipc-events/agent-status-refused-resume.performance.test.ts
@@ -38,21 +38,23 @@ it.each([10, 100])(
     })
     let reads = 0
     let writes = 0
-    const countQueue = <T>(entries: T[]): T[] =>
-      new Proxy(entries, {
-        get(target, key, receiver) {
-          if (typeof key === 'string' && /^\d+$/.test(key)) {
+    const countQueue = <T>(entries: T[]): T[] => {
+      entries.forEach((entry, index) =>
+        Object.defineProperty(entries, index, {
+          configurable: true,
+          enumerable: true,
+          get: () => {
             reads += 1
-          }
-          return Reflect.get(target, key, receiver)
-        },
-        set(target, key, value, receiver) {
-          if (typeof key === 'string' && /^\d+$/.test(key)) {
+            return entry
+          },
+          set: (next: T) => {
             writes += 1
+            entry = next
           }
-          return Reflect.set(target, key, value, receiver)
-        }
-      })
+        })
+      )
+      return entries
+    }
     let copied = 0
     const countMap = <T extends object>(entries: T): T =>
       new Proxy(entries, {

From 35039057b4e56db5bf2145a2cbb07a4104bb6084 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 23 Oct 2026 06:23:41 -0700
Subject: [PATCH 054/207] Correct capture fixture owner facts and relocated
 writer accounting

---
 config/main-layout-writer-baseline.txt           |  2 +-
 ...cli-chat-resume-terminal-capture.unit.test.ts | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/config/main-layout-writer-baseline.txt b/config/main-layout-writer-baseline.txt
index ea882afe8c79..29fc2ea849f2 100644
--- a/config/main-layout-writer-baseline.txt
+++ b/config/main-layout-writer-baseline.txt
@@ -59,10 +59,10 @@
 1 src/main/runtime/runtime-workspace-session-controller.ts
 2 src/main/runtime/session-graph/session-graph-promotion.ts
 2 src/main/runtime/session-lifecycle/projection/apply-mobile-session-tab-navigation.ts
-2 src/main/runtime/session-lifecycle/projection/build-headless-mobile-session-browser-tabs.ts
 2 src/main/runtime/session-tabs/headless-tab-group-moves.ts
 6 src/main/runtime/session-tabs/headless-tab-properties.ts
 1 src/main/runtime/session-tabs/structured-session-tab-close.ts
+2 src/main/runtime/session-tabs/terminal-surface-close-commit.ts
 1 src/main/runtime/session-tabs/terminal-surface-retirements.ts
 2 src/main/runtime/terminal/adoption/adopt-terminal-orphans-from-inventory.ts
 1 src/main/runtime/terminal/driver/terminal-driver-resources.ts
diff --git a/tests/e2e/cli-chat-resume-terminal-capture.unit.test.ts b/tests/e2e/cli-chat-resume-terminal-capture.unit.test.ts
index 516983fe4d1c..db082c55474a 100644
--- a/tests/e2e/cli-chat-resume-terminal-capture.unit.test.ts
+++ b/tests/e2e/cli-chat-resume-terminal-capture.unit.test.ts
@@ -88,6 +88,7 @@ it.each(['row', 'incarnation', 'pty', 'workspace', 'leaf', 'host'] as const)(
   async (change) => {
     const harness = createHarness({ registerPtyBacked: true, publishMobileSurface: true })
     seed(harness)
+    let resolvedTerminal: ReturnType<typeof harness.runtime.resolveTerminalPane> | undefined
     rpc.mockImplementation(async () => {
       if (change === 'row') {
         harness.editSession((state) => ({
@@ -102,13 +103,10 @@ it.each(['row', 'incarnation', 'pty', 'workspace', 'leaf', 'host'] as const)(
         }))
       }
       if (change === 'incarnation') {
-        harness.runtime.registerPty(PTY_ID, WORKTREE_ID, null, {
-          tabId: TAB_ID,
-          leafId: LEAF_ID,
-          incarnationId: 'successor'
-        })
+        harness.replacePersistedIncarnation('successor')
       }
       const terminal = harness.runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_ID}`, WORKTREE_ID)
+      resolvedTerminal = terminal
       if (change === 'host') {
         terminal.executionHostId = 'ssh:successor'
       }
@@ -123,10 +121,12 @@ it.each(['row', 'incarnation', 'pty', 'workspace', 'leaf', 'host'] as const)(
       }
       return { terminal }
     })
-    useAppStore.setState({
-      terminalPtyIncarnationsByPaneKey: { [`${TAB_ID}:${LEAF_ID}`]: INCARNATION_ID }
-    })
     expect(await captureSourceTerminal(source(PTY_ID))).toBeNull()
+    if (change === 'incarnation') {
+      expect(rpc).toHaveResolvedWith({ terminal: resolvedTerminal })
+      expect(resolvedTerminal).toMatchObject({ ptyId: PTY_ID, incarnationId: INCARNATION_ID })
+      expect(resolvedTerminal).not.toHaveProperty('presentation')
+    }
   }
 )
 

From ec8b66fc6b289e19d962794e08a516add7061271 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 23 Oct 2026 06:30:26 -0700
Subject: [PATCH 055/207] Fix saved resume test type contracts

---
 .../mobile-session-tabs-targeted-agent-resume.spec.ts        | 3 ++-
 .../pty-connection/saved-resume-cancellation.test.ts         | 2 +-
 .../agent-status-refused-resume.performance.test.ts          | 5 ++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/runtime/orca-runtime-tests/mobile-session-tabs-targeted-agent-resume.spec.ts b/src/main/runtime/orca-runtime-tests/mobile-session-tabs-targeted-agent-resume.spec.ts
index 73d7c1ffbac7..651fea8c6ed5 100644
--- a/src/main/runtime/orca-runtime-tests/mobile-session-tabs-targeted-agent-resume.spec.ts
+++ b/src/main/runtime/orca-runtime-tests/mobile-session-tabs-targeted-agent-resume.spec.ts
@@ -11,6 +11,7 @@ import {
   makeWorkspaceSessionWithHeadlessTerminal
 } from '../orca-runtime-test-fixtures.spec'
 import type { AgentStatusIpcPayload } from '../../../shared/agent-status-types'
+import type { TerminalLaunchResult } from '../../../shared/agent-session-resume'
 import type { PtyProcessInfo } from '../../providers/pty-provider-contract'
 import { deterministicAgentSessionUuid } from '../runtime-agent-launch-resolution'
 import { deriveRemoteRuntimeTerminalCreateHandle } from '../remote-runtime-terminal-create-identity'
@@ -231,7 +232,7 @@ describe('resumeAgentSessionInWorkspace', () => {
       const fixture = makeSleptWorkspace()
       const record = storedRecord(fixture)!
       record.origin = 'live'
-      const matching = savedResumeResult({
+      const matching: TerminalLaunchResult = savedResumeResult({
         verdict: kind === 'unverifiable' ? 'unverifiable' : 'chat-home',
         refused: { agent: 'claude', providerSession: SESSION }
       })
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/saved-resume-cancellation.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/saved-resume-cancellation.test.ts
index 72e3b6e2fee2..6291ea78499b 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/saved-resume-cancellation.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/saved-resume-cancellation.test.ts
@@ -1,5 +1,5 @@
 import { afterEach, describe, expect, it, vi } from 'vitest'
-import type { AgentStatusEntry } from '@shared/agent-status-types'
+import type { AgentStatusEntry } from '../../../../../shared/agent-status-types'
 import type {
   AgentLaunchConfigRegistryEntry,
   AgentLaunchConfigRegistrationMetadata
diff --git a/src/renderer/src/hooks/ipc-events/agent-status-refused-resume.performance.test.ts b/src/renderer/src/hooks/ipc-events/agent-status-refused-resume.performance.test.ts
index f3deefcb70be..e9cc5a5dd128 100644
--- a/src/renderer/src/hooks/ipc-events/agent-status-refused-resume.performance.test.ts
+++ b/src/renderer/src/hooks/ipc-events/agent-status-refused-resume.performance.test.ts
@@ -69,7 +69,10 @@ it.each([10, 100])(
         Object.fromEntries(
           Array.from({ length: size }, (_, index) => {
             const row = event(index)
-            return [index === 0 ? 'tab:leaf' : `other-${index}`, { ...row, updatedAt: 10 }]
+            return [
+              index === 0 ? 'tab:leaf' : `other-${index}`,
+              { ...row, updatedAt: 10, stateHistory: [] }
+            ]
           })
         )
       ),

From 872f19999d5d781e97694d1fa16a11e04039c048 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 23 Oct 2026 06:36:25 -0700
Subject: [PATCH 056/207] Pin authenticated final-pane retirement through the
 real Store

---
 ...time-original-terminal-close-store.test.ts | 107 ++++++++++++++++++
 1 file changed, 107 insertions(+)
 create mode 100644 src/main/runtime/orca-runtime-original-terminal-close-store.test.ts

diff --git a/src/main/runtime/orca-runtime-original-terminal-close-store.test.ts b/src/main/runtime/orca-runtime-original-terminal-close-store.test.ts
new file mode 100644
index 000000000000..da071243f3f6
--- /dev/null
+++ b/src/main/runtime/orca-runtime-original-terminal-close-store.test.ts
@@ -0,0 +1,107 @@
+import { expect, it, vi } from 'vitest'
+import { fixture } from '../persistence/loading-store/profile-state-delayed-authority-fixture'
+import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../shared/layout-owner-switch'
+import { ClientSessionTabSelectionStore } from './client-session-tab-selection'
+import { TerminalCloseRuntime } from './__fixtures__/terminal-close-runtime.test-fixture'
+import { createCloseContinuityGraphFixture } from './__fixtures__/orca-runtime-terminal-close-continuity-graph-fixture'
+import {
+  INCARNATION_ID,
+  LEAF_ID,
+  PTY_ID,
+  REPO_ID,
+  TAB_ID,
+  WORKTREE_ID,
+  WORKTREE_PATH,
+  makeSession
+} from './__fixtures__/orca-runtime-terminal-close-continuity-state-fixture'
+
+it('retires the authenticated final pane through the real Store and forgets its tab selection', async () => {
+  const { store, readState } = await fixture()
+  store.addRepo({
+    id: REPO_ID,
+    path: WORKTREE_PATH,
+    displayName: 'Original retirement',
+    badgeColor: '#000000',
+    addedAt: 1
+  })
+  store.setWorkspaceSession(makeSession())
+  await store.flushPendingOrThrowAsync()
+  const runtime = new TerminalCloseRuntime(store)
+  const kill = vi.fn(() => true)
+  const closeTerminalTab = vi.fn(async () => {})
+  runtime.setNotifier({
+    worktreesChanged: vi.fn(),
+    reposChanged: vi.fn(),
+    activateWorktree: vi.fn(),
+    createTerminal: vi.fn(),
+    splitTerminal: vi.fn(),
+    renameTerminal: vi.fn(),
+    focusTerminal: vi.fn(),
+    closeTerminal: vi.fn(),
+    terminalFitOverrideChanged: vi.fn(),
+    terminalDriverChanged: vi.fn(),
+    closeTerminalTab
+  })
+  const stopAndWait = vi.fn(async () => {
+    await runtime.onPtyExit(PTY_ID, 0, INCARNATION_ID, { hostExitConfirmed: true })
+    expect(store.getWorkspaceSession().terminalLayoutsByTabId[TAB_ID]).toBeDefined()
+    return true
+  })
+  runtime.setPtyController({
+    write: () => true,
+    kill,
+    stopAndWait,
+    getForegroundProcess: async () => null
+  })
+  runtime.attachWindow(1)
+  runtime.registerPty(PTY_ID, WORKTREE_ID, null, {
+    tabId: TAB_ID,
+    leafId: LEAF_ID,
+    incarnationId: INCARNATION_ID
+  })
+  createCloseContinuityGraphFixture({
+    runtime,
+    ptyId: PTY_ID,
+    publishMobileSurface: true,
+    getSession: () => store.getWorkspaceSession(),
+    setSession: (session) => store.setWorkspaceSession(session),
+    markSiblingPtyIncluded: () => {}
+  }).syncFixtureGraph()
+  const command = {
+    type: 'closePane',
+    workspace: WORKTREE_ID,
+    tabId: TAB_ID,
+    leafId: LEAF_ID
+  } as const
+  await expect(runtime.applyLayoutCommand(command)).resolves.toMatchObject({
+    ok: false,
+    code: 'last_pane'
+  })
+  const source = runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_ID}`, WORKTREE_ID)
+  expect(source.presentation).toBeDefined()
+  expect(source.incarnationId).toBe(INCARNATION_ID)
+  if (!source.presentation || !source.incarnationId) {
+    throw new Error('Missing authenticated original')
+  }
+  const apply = vi.spyOn(store, 'applyLayoutCommand')
+  const forget = vi.spyOn(ClientSessionTabSelectionStore.prototype, 'forgetTabs')
+  await expect(
+    runtime.closeTerminal(source.handle, source.incarnationId, source.presentation)
+  ).resolves.toMatchObject({ ptyKilled: true })
+  if (ORCA_LAYOUT_OWNER_IS_MAIN) {
+    expect(apply).toHaveResolvedWith({ ok: true, result: { closed: [TAB_ID] } })
+  }
+  expect(forget).toHaveBeenCalledWith(WORKTREE_ID, [TAB_ID])
+  expect(stopAndWait).toHaveBeenCalledExactlyOnceWith(
+    PTY_ID,
+    expect.objectContaining({ expectedIncarnationId: INCARNATION_ID })
+  )
+  expect(kill).not.toHaveBeenCalled()
+  expect(closeTerminalTab).toHaveBeenCalledExactlyOnceWith(TAB_ID, {
+    localPtyTeardownOwnedExternally: true,
+    originalSurface: source.presentation.identity
+  })
+  expect(store.getWorkspaceSession().tabsByWorktree[WORKTREE_ID]).toEqual([])
+  expect(readState().workspaceSession.tabsByWorktree[WORKTREE_ID]).toEqual([])
+  expect(store.getWorkspaceSession().closedTerminalTabTombstonesByTabId?.[TAB_ID]).toBeDefined()
+})

From 25094d90cc790b708b1358172f0c181d1f107ac6 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 23 Oct 2026 07:04:49 -0700
Subject: [PATCH 057/207] Pin status identity preservation across published
 owner transitions

---
 ...Events-agent-status-owner-ordering.test.ts | 286 ++++++++++++++++++
 1 file changed, 286 insertions(+)
 create mode 100644 src/renderer/src/hooks/useIpcEvents-agent-status-owner-ordering.test.ts

diff --git a/src/renderer/src/hooks/useIpcEvents-agent-status-owner-ordering.test.ts b/src/renderer/src/hooks/useIpcEvents-agent-status-owner-ordering.test.ts
new file mode 100644
index 000000000000..c6931b221e9d
--- /dev/null
+++ b/src/renderer/src/hooks/useIpcEvents-agent-status-owner-ordering.test.ts
@@ -0,0 +1,286 @@
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import type { AgentStatusIpcPayload } from '../../../shared/agent-status-types'
+import type {
+  TerminalLayoutSnapshot,
+  TerminalPaneLayoutNode
+} from '../../../shared/terminal-tab-types'
+import { getDefaultWorkspaceSession } from '../../../shared/constants'
+import { makePaneKey } from '../../../shared/stable-pane-id'
+import { collectLeafIds } from '../../../shared/terminal-pane-layout-tree'
+import {
+  createTestStore,
+  makeTab,
+  makeWorktree,
+  TEST_REPO
+} from '../store/slices/store-test-helpers'
+import { classifyPaneKeyLiveness } from '../store/slices/agent-status-capacity-eviction'
+import {
+  resetAgentPaneAuthorityAliasesForTests,
+  resolveAgentPaneAuthorityKey
+} from '../store/slices/agent-pane-authority'
+import { buildWindowApi } from './ipc-events-agent-status-window-test-fixtures'
+
+const holder = vi.hoisted(() => ({
+  getStore: (): ReturnType<typeof createTestStore> => {
+    throw new Error('Witness store not initialized')
+  }
+}))
+vi.mock('../store', () => ({
+  useAppStore: {
+    getState: () => holder.getStore().getState(),
+    subscribe: (...args: Parameters<ReturnType<typeof createTestStore>['subscribe']>) =>
+      holder.getStore().subscribe(...args)
+  }
+}))
+vi.mock('./agent-hook-completion-notifications', () => ({
+  observeAgentHookCompletionForNotification: vi.fn(),
+  syncAgentHookCompletionNotificationsForStoreUpdate: vi.fn()
+}))
+vi.mock('@/lib/telemetry', () => ({ track: vi.fn() }))
+
+const A = '11111111-1111-4111-8111-111111111111'
+const B = '22222222-2222-4222-8222-222222222222'
+const R = '33333333-3333-4333-8333-333333333333'
+const TAB = 'tab-ordering'
+const WT = 'wt-ordering'
+const key = (leaf: string): string => makePaneKey(TAB, leaf)
+const layout = (...leaves: string[]): TerminalLayoutSnapshot => ({
+  root: leaves.slice(1).reduce<TerminalPaneLayoutNode>(
+    (first, leafId) => ({
+      type: 'split',
+      direction: 'vertical',
+      first,
+      second: { type: 'leaf', leafId }
+    }),
+    { type: 'leaf', leafId: leaves[0]! }
+  ),
+  activeLeafId: leaves[0]!,
+  expandedLeafId: null
+})
+const cleanups: (() => void)[] = []
+beforeEach(() => {
+  vi.useFakeTimers()
+  vi.setSystemTime(1_800_000_000_000)
+  resetAgentPaneAuthorityAliasesForTests()
+})
+afterEach(() => {
+  cleanups
+    .splice(0)
+    .toReversed()
+    .forEach((cleanup) => cleanup())
+  vi.restoreAllMocks()
+  vi.useRealTimers()
+  vi.unstubAllGlobals()
+})
+
+async function witness() {
+  const store = createTestStore()
+  holder.getStore = () => store
+  const tab = makeTab({ id: TAB, worktreeId: WT, ptyId: 'pty-A', title: 'Shell' })
+  store.setState({
+    workspaceSessionReady: true,
+    repos: [TEST_REPO],
+    worktreesByRepo: { [TEST_REPO.id]: [makeWorktree({ id: WT, repoId: TEST_REPO.id })] },
+    tabsByWorktree: { [WT]: [tab] },
+    terminalLayoutsByTabId: { [TAB]: layout(R) }
+  })
+  let phase = 'mount'
+  const publications: unknown[] = []
+  const removals: { phase: string; incoming: string; keys: string[]; owner: string }[] = []
+  const capture = (): void => {
+    const state = store.getState()
+    publications.push({
+      phase,
+      layouts: state.terminalLayoutsByTabId,
+      aliases: [A, B, R].map((leaf) => [key(leaf), resolveAgentPaneAuthorityKey(key(leaf))]),
+      projection: state.agentConversationsByPaneKey,
+      live: Object.keys(state.agentStatusByPaneKey),
+      sleeping: Object.keys(state.sleepingAgentSessionsByPaneKey)
+    })
+  }
+  cleanups.push(
+    store.subscribe((state, previous) => {
+      capture()
+      for (const incoming of [key(A), key(B)]) {
+        if (
+          state.agentConversationsByPaneKey[incoming] &&
+          !previous.agentConversationsByPaneKey[incoming]
+        ) {
+          // Observational only: exercise the candidate's classifier, never remove a production key.
+          const classify = classifyPaneKeyLiveness(state)
+          removals.push({
+            phase,
+            incoming,
+            owner: resolveAgentPaneAuthorityKey(key(A)),
+            keys: Object.keys(state.agentConversationsByPaneKey).filter(
+              (candidate) => candidate !== incoming && classify(candidate) === 'dead'
+            )
+          })
+        }
+      }
+    })
+  )
+  let onSet: ((data: AgentStatusIpcPayload) => void) | undefined
+  vi.stubGlobal(
+    'window',
+    buildWindowApi({
+      onSet: (callback) => {
+        onSet = callback
+        return () => {}
+      }
+    })
+  )
+  const { registerAgentStatusIpcBridge } = await import('./ipc-events/agent-status-ipc-bridge')
+  const unsubs: (() => void)[] = []
+  const bridge = registerAgentStatusIpcBridge(unsubs)
+  cleanups.push(bridge.disposeAsyncState, bridge.unsubscribeStore, ...unsubs)
+  await Promise.resolve()
+  const transaction = vi.spyOn(store.getState(), 'transactAgentStatuses')
+  const timer = vi.spyOn(globalThis, 'setTimeout')
+  const event = (
+    leaf: string,
+    providerSessionOnly = false,
+    runtimeBacked = true
+  ): AgentStatusIpcPayload => ({
+    paneKey: key(leaf),
+    state: 'working',
+    prompt: '',
+    agentType: 'claude',
+    receivedAt: Date.now(),
+    stateStartedAt: Date.now(),
+    providerSession: { key: 'session_id', id: `conversation-${leaf}` },
+    ...(providerSessionOnly ? { providerSessionOnly: true } : {}),
+    ...(runtimeBacked ? { worktreeId: WT, terminalHandle: `term-${leaf}` } : {})
+  })
+  return {
+    store,
+    tab,
+    publications,
+    removals,
+    transaction,
+    timer,
+    event,
+    stage: (name: string) => {
+      phase = name
+      capture()
+    },
+    emit: (data: AgentStatusIpcPayload) => {
+      if (!onSet) {
+        throw new Error('Missing production onSet')
+      }
+      onSet(data)
+    },
+    settle: async () => {
+      await vi.advanceTimersByTimeAsync(150)
+      phase = 'settled'
+      capture()
+    }
+  }
+}
+
+it.each([
+  ['live', A, B],
+  ['live', B, A],
+  ['provider-only', A, B],
+  ['provider-only', B, A]
+])(
+  'preserves two %s source-before-layout identities in order %s then %s',
+  async (route, first, second) => {
+    const w = await witness()
+    for (const leaf of [first, second]) {
+      w.stage(`source-${leaf}`)
+      w.emit(w.event(leaf, route === 'provider-only'))
+      await vi.advanceTimersByTimeAsync(34)
+    }
+    expect(w.removals.at(-1)?.keys).toEqual([key(first)])
+    for (const leaf of [A, B]) {
+      w.stage(`ordinary-cleanup-${leaf}`)
+      w.store.getState().removeAgentStatus(key(leaf))
+      w.store.getState().clearSleepingAgentSession(key(leaf))
+    }
+    expect(w.store.getState().agentStatusByPaneKey).toEqual({})
+    expect(w.store.getState().sleepingAgentSessionsByPaneKey).toEqual({})
+    w.stage('later-layout')
+    w.store.getState().setTabLayout(TAB, layout(A, B))
+    await w.settle()
+    expect(Object.keys(w.store.getState().agentConversationsByPaneKey).sort()).toEqual(
+      [key(A), key(B)].sort()
+    )
+    console.info(
+      'OWNER_ORDERING_TRACE',
+      JSON.stringify({
+        route,
+        first,
+        second,
+        publications: w.publications,
+        wouldRemove: w.removals
+      })
+    )
+  }
+)
+
+it.each(['normalization', 'scoped-hydration'])(
+  'replays pending B before projection-only A transfers during %s',
+  async (operation) => {
+    const w = await witness()
+    w.store.getState().setTabLayout(TAB, layout(A))
+    w.stage('source-A')
+    w.emit(w.event(A, true))
+    w.store.getState().clearSleepingAgentSession(key(A))
+    expect(w.store.getState().agentStatusByPaneKey).toEqual({})
+    expect(w.store.getState().sleepingAgentSessionsByPaneKey).toEqual({})
+    await vi.advanceTimersByTimeAsync(34)
+    w.stage('pending-B')
+    w.emit(w.event(B, false, false))
+    expect(w.store.getState().agentConversationsByPaneKey[key(B)]).toBeUndefined()
+    expect(w.timer.mock.calls.filter((call) => call[1] === 100)).toHaveLength(1)
+    const batchesBefore = w.transaction.mock.calls.length
+    const duplicate = {
+      ...layout(A, R, B),
+      activeLeafId: R,
+      ptyIdsByLeafId: { [A]: 'pty-A', [R]: 'pty-A', [B]: 'pty-B' }
+    }
+    w.stage(operation)
+    if (operation === 'normalization') {
+      w.store.getState().setTabLayout(TAB, duplicate)
+    } else {
+      w.store.getState().hydrateWorkspaceSession(
+        {
+          ...getDefaultWorkspaceSession(),
+          activeRepoId: TEST_REPO.id,
+          activeWorktreeId: WT,
+          activeTabId: TAB,
+          tabsByWorktree: { [WT]: [w.tab] },
+          terminalLayoutsByTabId: { [TAB]: duplicate }
+        },
+        { replaceWorkspaceKeys: [WT] }
+      )
+    }
+    expect(w.transaction.mock.calls.length - batchesBefore).toBe(1)
+    expect(w.removals.find((row) => row.incoming === key(B))).toEqual({
+      phase: operation,
+      incoming: key(B),
+      owner: key(A),
+      keys: [key(A)]
+    })
+    expect(collectLeafIds(w.store.getState().terminalLayoutsByTabId[TAB].root)).toEqual([R, B])
+    expect(resolveAgentPaneAuthorityKey(key(A))).toBe(key(R))
+    expect(w.store.getState().agentConversationsByPaneKey[key(R)]?.providerSession.id).toBe(
+      `conversation-${A}`
+    )
+    expect(w.store.getState().agentConversationsByPaneKey[key(A)]).toBeUndefined()
+    await w.settle()
+    expect(w.store.getState().agentConversationsByPaneKey[key(B)]).toBeDefined()
+    expect(w.store.getState().agentConversationsByPaneKey[key(R)]).toBeDefined()
+    console.info(
+      'OWNER_ORDERING_TRACE',
+      JSON.stringify({
+        operation,
+        synchronousPendingBatches: w.transaction.mock.calls.length - batchesBefore,
+        pendingRetryTimers: w.timer.mock.calls.filter((call) => call[1] === 100).length,
+        publications: w.publications,
+        wouldRemove: w.removals
+      })
+    )
+  }
+)

From bcb0a68851ba7870912cb5f6f2d525a86f9cfcd8 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 23 Oct 2026 07:32:04 -0700
Subject: [PATCH 058/207] test(e2e): capture exact terminal parking diagnostics

---
 ...terminal-materialization-reconnect.spec.ts | 28 ++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/tests/e2e/paired-remote-terminal-materialization-reconnect.spec.ts b/tests/e2e/paired-remote-terminal-materialization-reconnect.spec.ts
index 395f06dbf56a..e436e86e55e3 100644
--- a/tests/e2e/paired-remote-terminal-materialization-reconnect.spec.ts
+++ b/tests/e2e/paired-remote-terminal-materialization-reconnect.spec.ts
@@ -144,6 +144,7 @@ async function parkHostTerminal(
 ): Promise<void> {
   let lastError = 'terminal.stopExact was never attempted'
   for (let attempt = 0; attempt < 10; attempt += 1) {
+    const stopStartedAt = Date.now()
     const stop = await callRuntime<{
       stopped: number
       stoppedPtyIds: string[]
@@ -158,7 +159,32 @@ async function parkHostTerminal(
       return null
     })
     if (stop) {
-      expect(stop.postStopVerified).toBe(true)
+      const diagnostic: Record<string, unknown> = {
+        expectedPtyId: options.expectedPtyId,
+        elapsedMs: Date.now() - stopStartedAt,
+        stop
+      }
+      if (stop.postStopVerified === false) {
+        diagnostic.inventory = await readFreshTerminalInventory(() =>
+          callRuntime<RuntimeTerminalListResult>(page, environmentId, 'terminal.list', {
+            worktree: `id:${worktreeId}`,
+            requireFreshPtyLiveness: true
+          })
+        ).catch((error: unknown) => ({ error: String(error) }))
+        diagnostic.surface = await hostSurfaceStatus(page, environmentId, worktreeId, parentTabId)
+          .then((status) => ({ parentTabId, status }))
+          .catch((error: unknown) => ({ parentTabId, error: String(error) }))
+      }
+      await test
+        .info()
+        .attach('host-terminal-park', {
+          body: JSON.stringify(diagnostic, null, 2),
+          contentType: 'application/json'
+        })
+        .catch((error: unknown) => {
+          diagnostic.attachmentError = String(error)
+        })
+      expect(stop.postStopVerified, JSON.stringify(diagnostic, null, 2)).toBe(true)
       expect(stop.stopped).toBe(1)
       expect(stop.stoppedPtyIds).toEqual([options.expectedPtyId])
       return

From 914747fd34746ed6466a01bf60fcf948841e0a12 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 23 Oct 2026 08:00:02 -0700
Subject: [PATCH 059/207] Restore optional terminal presentation contracts

---
 .../terminal/terminal-lifecycle-methods.ts    | 12 +++---
 src/main/runtime/runtime-layout-apply.test.ts | 40 ++++++++++++++++++-
 src/main/runtime/runtime-layout-apply.ts      | 18 ++++-----
 .../explicit-terminal-close-stops.ts          |  1 +
 .../terminal/launch/failed-start-pane.ts      |  2 +-
 .../recovery/resolve-terminal-pane.ts         |  5 +--
 ...ession-terminal-tab-retirement-identity.ts |  7 +++-
 .../right-sidebar/AiVaultVirtualRow.test.tsx  |  5 ++-
 8 files changed, 67 insertions(+), 23 deletions(-)

diff --git a/src/main/runtime/rpc/methods/terminal/terminal-lifecycle-methods.ts b/src/main/runtime/rpc/methods/terminal/terminal-lifecycle-methods.ts
index 7f80896b51f1..43b22ae8c596 100644
--- a/src/main/runtime/rpc/methods/terminal/terminal-lifecycle-methods.ts
+++ b/src/main/runtime/rpc/methods/terminal/terminal-lifecycle-methods.ts
@@ -234,11 +234,13 @@ export const TERMINAL_LIFECYCLE_METHODS = [
         'terminal',
         params.terminal,
         () =>
-          context.runtime.closeTerminal(
-            params.terminal,
-            params.expectedIncarnationId,
-            params.originalPresentation
-          )
+          params.originalPresentation
+            ? context.runtime.closeTerminal(
+                params.terminal,
+                params.expectedIncarnationId,
+                params.originalPresentation
+              )
+            : context.runtime.closeTerminal(params.terminal, params.expectedIncarnationId)
       )
     })
   }),
diff --git a/src/main/runtime/runtime-layout-apply.test.ts b/src/main/runtime/runtime-layout-apply.test.ts
index 2c601490a9d3..300844f64a05 100644
--- a/src/main/runtime/runtime-layout-apply.test.ts
+++ b/src/main/runtime/runtime-layout-apply.test.ts
@@ -1,5 +1,9 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { applyWindowLayoutCommand, type WindowLayoutCommand } from './runtime-layout-apply'
+import {
+  applyWindowLayoutCommand,
+  type WindowLayoutCommand,
+  type LayoutCommandRunOptions
+} from './runtime-layout-apply'
 import type { RuntimeStore } from './runtime-store-contract'
 import type { ExecutionHostId } from '../../shared/execution-host'
 import type { LayoutApplyOutcome } from '../../shared/workspace-layout/workspace-layout-command-types'
@@ -52,6 +56,40 @@ describe('applyWindowLayoutCommand', () => {
     })
   })
 
+  it('forwards present close options intact to the owning Store', async () => {
+    const { store, applyLayoutCommand } = storeWith()
+    const run: LayoutCommandRunOptions = {
+      originalPresentation: {
+        identity: {
+          ...CLOSE,
+          worktreeId: CLOSE.workspace,
+          createdAt: 1,
+          generation: 0,
+          hasLeaf: true,
+          ptyId: 'pty-1',
+          incarnationId: 'i1'
+        },
+        holders: []
+      },
+      admit: () => true,
+      live: { isBindingLive: () => true },
+      stopBeforeWrite: () => true,
+      onEffects: vi.fn()
+    }
+    const tabClose: WindowLayoutCommand = {
+      type: 'closeTabs',
+      workspace: CLOSE.workspace,
+      tabIds: [CLOSE.tabId]
+    }
+    await applyWindowLayoutCommand(store, () => ['local'], CLOSE, undefined, run)
+    await applyWindowLayoutCommand(store, () => ['local'], tabClose, undefined, run)
+    expect(applyLayoutCommand.mock.calls).toEqual([
+      [{ ...CLOSE, userPaneClose: true }, ['local'], run],
+      [{ ...tabClose, force: true }, ['local'], run]
+    ])
+    expect(mocks.markAgentLaunchesClosedByUser).not.toHaveBeenCalled()
+  })
+
   it('applies other commands to the routed partition only', async () => {
     const { store, applyLayoutCommand } = storeWith()
     const rename = { ...CLOSE, type: 'renamePane', title: 'Pane' } as const
diff --git a/src/main/runtime/runtime-layout-apply.ts b/src/main/runtime/runtime-layout-apply.ts
index 77a0c5c2bf64..7df6a146dedd 100644
--- a/src/main/runtime/runtime-layout-apply.ts
+++ b/src/main/runtime/runtime-layout-apply.ts
@@ -89,11 +89,10 @@ export async function applyWindowLayoutCommand(
     // that asks main to refuse pinned tabs (the CLI, new phones) gets that refusal, not the force.
     // Read before the close drops the tab's record.
     const terminalTabId = terminalIdOf(store, hostIds[0], command.workspace, command.tabIds[0])
-    const reply = await store.applyLayoutCommand(
-      { ...command, force: command.refusePinned ? command.force === true : true },
-      holders,
-      run
-    )
+    const close = { ...command, force: command.refusePinned ? command.force === true : true }
+    const reply = await (run
+      ? store.applyLayoutCommand(close, holders, run)
+      : store.applyLayoutCommand(close, holders))
     // Only a tab the close took: a refused (pinned) tab's launches still finish into it.
     if (
       command.recordClose === 'user' &&
@@ -152,11 +151,10 @@ export async function applyWindowLayoutCommand(
   if (!run?.originalPresentation) {
     markAgentLaunchesClosedByUser(workspace, { kind: 'pane', tabId, leafId })
   }
-  return store.applyLayoutCommand(
-    { type: 'closePane', workspace, tabId, leafId, userPaneClose: true },
-    holders,
-    run
-  )
+  const close = { type: 'closePane' as const, workspace, tabId, leafId, userPaneClose: true }
+  return run
+    ? store.applyLayoutCommand(close, holders, run)
+    : store.applyLayoutCommand(close, holders)
 }
 
 /**
diff --git a/src/main/runtime/session-tabs/explicit-terminal-close-stops.ts b/src/main/runtime/session-tabs/explicit-terminal-close-stops.ts
index 49ea9f944b98..b7a315b2db8c 100644
--- a/src/main/runtime/session-tabs/explicit-terminal-close-stops.ts
+++ b/src/main/runtime/session-tabs/explicit-terminal-close-stops.ts
@@ -86,6 +86,7 @@ export abstract class OrcaRuntimeWithStopExplicitlyClosedTabPtys extends OrcaRun
           runtimeId: this.runtimeId,
           record,
           currentPty,
+          paneOfPty: (current) => this.paneOfPty(current),
           leaf,
           source,
           incarnation
diff --git a/src/main/runtime/terminal/launch/failed-start-pane.ts b/src/main/runtime/terminal/launch/failed-start-pane.ts
index 7c9b14e17ece..e31626cf86dc 100644
--- a/src/main/runtime/terminal/launch/failed-start-pane.ts
+++ b/src/main/runtime/terminal/launch/failed-start-pane.ts
@@ -63,7 +63,7 @@ export abstract class OrcaRuntimeWithFailedStartPanes extends OrcaRuntimeWithCre
             : [this.tryGetWorkspaceSessionHostIdForWorktree(worktreeId) ?? []].flat(),
         command,
         (move) => rekeyMovedPaneOwners(this, move),
-        { ...this.layoutCommandRun(command), ...options }
+        options ? { ...this.layoutCommandRun(command), ...options } : this.layoutCommandRun(command)
       )
     // A window's sleep or wake lands after the hook statuses main accepted before it, as in the window.
     return await (ORCA_LAYOUT_OWNER_IS_MAIN && ['sleep', 'wake'].includes(command.type)
diff --git a/src/main/runtime/terminal/recovery/resolve-terminal-pane.ts b/src/main/runtime/terminal/recovery/resolve-terminal-pane.ts
index 9ebe22a7623b..2fcfc9594c58 100644
--- a/src/main/runtime/terminal/recovery/resolve-terminal-pane.ts
+++ b/src/main/runtime/terminal/recovery/resolve-terminal-pane.ts
@@ -89,9 +89,7 @@ export abstract class OrcaRuntimeWithResolveTerminalPane extends OrcaRuntimeWith
             )
           }))
         : []
-    const routedHostId =
-      worktreeId && parsed ? this.getWorkspaceSessionHostIdForTab(worktreeId, parsed.tabId) : null
-    const rowIdentity = holders.find((holder) => holder.hostId === routedHostId)?.identity
+    const rowIdentity = holders[0]?.identity
     const executionPtyId = pty?.ptyId ?? record?.ptyId ?? leaf?.ptyId ?? null
     const retained = executionPtyId ? this.handleByPtyIncarnation.get(executionPtyId) : null
     const execution = this.getPtyExecutionHostMetadata(executionPtyId)
@@ -109,6 +107,7 @@ export abstract class OrcaRuntimeWithResolveTerminalPane extends OrcaRuntimeWith
             runtimeId: this.runtimeId,
             record,
             currentPty: pty,
+            paneOfPty: (current) => this.paneOfPty(current),
             leaf,
             row: rowIdentity,
             address: { worktreeId, ...parsed },
diff --git a/src/main/runtime/workspace-session-terminal-tab-retirement-identity.ts b/src/main/runtime/workspace-session-terminal-tab-retirement-identity.ts
index 79262a599e3c..25d085c5a94f 100644
--- a/src/main/runtime/workspace-session-terminal-tab-retirement-identity.ts
+++ b/src/main/runtime/workspace-session-terminal-tab-retirement-identity.ts
@@ -1,3 +1,4 @@
+import type { PtyPaneOf } from './terminal/surface/pty-pane-query'
 import type { TerminalHandleRecord } from './runtime-terminal-contracts'
 import type { RuntimeLeafRecord, RuntimePtyWorktreeRecord } from './runtime-terminal-state-records'
 import type { TerminalSurfaceCloseIdentity } from '../../shared/terminal-tab-close'
@@ -167,11 +168,12 @@ export function isOriginalTerminalHandle(args: {
   runtimeId: string
   record: TerminalHandleRecord | undefined
   currentPty: RuntimePtyWorktreeRecord | null | undefined
+  paneOfPty: PtyPaneOf
   leaf: RuntimeLeafRecord | undefined
   source: TerminalSurfaceCloseIdentity
   incarnation: string | undefined
 }): boolean {
-  const { runtimeId, record, currentPty, leaf, source, incarnation } = args
+  const { runtimeId, record, currentPty, paneOfPty, leaf, source, incarnation } = args
   return (
     !!incarnation &&
     !!source.ptyId &&
@@ -185,7 +187,7 @@ export function isOriginalTerminalHandle(args: {
     (!leaf ||
       (leaf.worktreeId === source.worktreeId && (!leaf.ptyId || leaf.ptyId === source.ptyId))) &&
     ((record.tabId === source.tabId && record.leafId === source.leafId) ||
-      currentPty?.paneKey === `${source.tabId}:${source.leafId}`)
+      (!!currentPty && paneOfPty(currentPty).paneKey === `${source.tabId}:${source.leafId}`))
   )
 }
 
@@ -194,6 +196,7 @@ export function captureAddressedTerminalPresentation(args: {
   runtimeId: string
   record: TerminalHandleRecord | undefined
   currentPty: RuntimePtyWorktreeRecord | null | undefined
+  paneOfPty: PtyPaneOf
   leaf: RuntimeLeafRecord | null | undefined
   row: TerminalSurfaceCloseIdentity | null | undefined
   address: { worktreeId: string; tabId: string; leafId: string }
diff --git a/src/renderer/src/components/right-sidebar/AiVaultVirtualRow.test.tsx b/src/renderer/src/components/right-sidebar/AiVaultVirtualRow.test.tsx
index 8b127eac276e..f763a4416936 100644
--- a/src/renderer/src/components/right-sidebar/AiVaultVirtualRow.test.tsx
+++ b/src/renderer/src/components/right-sidebar/AiVaultVirtualRow.test.tsx
@@ -7,6 +7,7 @@ import { TooltipProvider } from '@/components/ui/tooltip'
 import type { AiVaultSession } from '../../../../shared/ai-vault-types'
 import type { AiVaultSearchHit } from '../../../../shared/ai-vault-search-types'
 import { AiVaultVirtualRow } from './AiVaultVirtualRow'
+import { setLocalRuntimeCapabilitiesForTests } from '@/runtime/local-runtime-capabilities'
 
 const cliSession: AiVaultSession = {
   id: 'local:codex:session-1:/tmp/session-1.jsonl',
@@ -33,6 +34,7 @@ const cliSession: AiVaultSession = {
 
 afterEach(() => {
   cleanup()
+  setLocalRuntimeCapabilitiesForTests(null)
 })
 
 function renderSession(
@@ -196,8 +198,9 @@ describe('AiVaultVirtualRow Resume in New Terminal', () => {
   const owner = { sessionId: 'chat-1', workspaceId: 'worktree-1' }
 
   it.each(['claude', 'codex'] as const)(
-    'offers the fork on a chat-owned %s row from both menus',
+    'offers the fork on an unsupported host for a chat-owned %s row from both menus',
     async (agent) => {
+      setLocalRuntimeCapabilitiesForTests([])
       const session: AiVaultSession = { ...cliSession, agent, structuredSession: owner }
       const { onResumeInNewCli, onResume } = renderSession(session)
       const user = userEvent.setup()

From 3b79d19c31053f2efc8c4e6c492e6a92ba75022b Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 23 Oct 2026 08:30:07 -0700
Subject: [PATCH 060/207] test: verify parked terminal with fresh host
 inventory

---
 ...terminal-materialization-reconnect.spec.ts | 55 ++++++++++++++-----
 1 file changed, 40 insertions(+), 15 deletions(-)

diff --git a/tests/e2e/paired-remote-terminal-materialization-reconnect.spec.ts b/tests/e2e/paired-remote-terminal-materialization-reconnect.spec.ts
index e436e86e55e3..8f22f50d1375 100644
--- a/tests/e2e/paired-remote-terminal-materialization-reconnect.spec.ts
+++ b/tests/e2e/paired-remote-terminal-materialization-reconnect.spec.ts
@@ -117,7 +117,8 @@ async function hostSurfaceStatus(
   page: Page,
   environmentId: string,
   worktreeId: string,
-  parentTabId: string
+  parentTabId: string,
+  expectedLeafId?: string
 ): Promise<string | null> {
   const snapshot = await callRuntime<RuntimeMobileSessionTabsResult>(
     page,
@@ -126,21 +127,20 @@ async function hostSurfaceStatus(
     { worktree: `id:${worktreeId}` }
   )
   const surface = snapshot.tabs.find(
-    (candidate) => candidate.type === 'terminal' && candidate.parentTabId === parentTabId
+    (candidate) =>
+      candidate.type === 'terminal' &&
+      candidate.parentTabId === parentTabId &&
+      (expectedLeafId === undefined || candidate.leafId === expectedLeafId)
   )
   return surface?.type === 'terminal' ? surface.status : null
 }
 
-/** Park the fixture PTY so the host republishes its pane as a pending handle.
- *  Why: exact stop only confirms when it observes the fixture exit inside its verification
- *  window, and a loaded headless host can miss that window even though the PTY is going away.
- *  The precondition this journey needs is the parked surface, so retry until the host shows it. */
 async function parkHostTerminal(
   page: Page,
   environmentId: string,
   worktreeId: string,
   parentTabId: string,
-  options: { expectedPtyId: string }
+  options: { expectedPtyId: string; original: RuntimeTerminalShow }
 ): Promise<void> {
   let lastError = 'terminal.stopExact was never attempted'
   for (let attempt = 0; attempt < 10; attempt += 1) {
@@ -149,6 +149,7 @@ async function parkHostTerminal(
       stopped: number
       stoppedPtyIds: string[]
       postStopVerified: boolean
+      postStopFailure?: string
     }>(page, environmentId, 'terminal.stopExact', {
       worktree: `id:${worktreeId}`,
       expectedPtyIds: [options.expectedPtyId],
@@ -161,19 +162,41 @@ async function parkHostTerminal(
     if (stop) {
       const diagnostic: Record<string, unknown> = {
         expectedPtyId: options.expectedPtyId,
+        expectedHostId: options.original.executionHostId ?? null,
+        expectedLeafId: options.original.leafId,
         elapsedMs: Date.now() - stopStartedAt,
         stop
       }
+      let parked = stop.postStopVerified === true
       if (stop.postStopVerified === false) {
-        diagnostic.inventory = await readFreshTerminalInventory(() =>
+        const inventory = await readFreshTerminalInventory(() =>
           callRuntime<RuntimeTerminalListResult>(page, environmentId, 'terminal.list', {
-            worktree: `id:${worktreeId}`,
             requireFreshPtyLiveness: true
           })
         ).catch((error: unknown) => ({ error: String(error) }))
-        diagnostic.surface = await hostSurfaceStatus(page, environmentId, worktreeId, parentTabId)
-          .then((status) => ({ parentTabId, status }))
+        const surface = await hostSurfaceStatus(
+          page,
+          environmentId,
+          worktreeId,
+          parentTabId,
+          options.original.leafId
+        )
+          .then((status) => ({ parentTabId, leafId: options.original.leafId, status }))
           .catch((error: unknown) => ({ parentTabId, error: String(error) }))
+        Object.assign(diagnostic, { inventory, surface })
+        parked =
+          stop.postStopFailure === 'terminal_liveness_unavailable' &&
+          inventory !== null &&
+          'terminals' in inventory &&
+          inventory.truncated === false &&
+          inventory.totalCount === inventory.terminals.length &&
+          options.original.executionHostId !== undefined &&
+          inventory.hostScope?.hostIds.includes(options.original.executionHostId) === true &&
+          inventory.hostScope.omittedHostIds.length === 0 &&
+          !inventory.terminals.some((terminal) => terminal.ptyId === options.expectedPtyId) &&
+          options.original.tabId === parentTabId &&
+          'status' in surface &&
+          surface.status === 'pending-handle'
       }
       await test
         .info()
@@ -184,9 +207,10 @@ async function parkHostTerminal(
         .catch((error: unknown) => {
           diagnostic.attachmentError = String(error)
         })
-      expect(stop.postStopVerified, JSON.stringify(diagnostic, null, 2)).toBe(true)
-      expect(stop.stopped).toBe(1)
-      expect(stop.stoppedPtyIds).toEqual([options.expectedPtyId])
+      const evidence = JSON.stringify(diagnostic, null, 2)
+      expect(stop.stopped, evidence).toBe(1)
+      expect(stop.stoppedPtyIds, evidence).toEqual([options.expectedPtyId])
+      expect(parked, evidence).toBe(true)
       return
     }
     // Why: the host reports a set mismatch once the target PTY is no longer live, which is the
@@ -254,7 +278,8 @@ async function runMaterializationJourney(
     gate.holdEnd([terminal])
   }, originalHandle)
   await parkHostTerminal(page, environmentId, worktreeId, created.tab.parentTabId, {
-    expectedPtyId: originalTerminal.terminal.ptyId
+    expectedPtyId: originalTerminal.terminal.ptyId,
+    original: originalTerminal.terminal
   })
   // Why: the stale error must land on an already-parked surface, or the journey proves nothing
   // about materializing a pending handle.

From 8e3d6d10ff33fc320d2a1dcab62fe2d2dc928883 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 23 Oct 2026 09:38:54 -0700
Subject: [PATCH 061/207] fix: check close command and ordering witness types

---
 src/main/runtime/runtime-layout-apply.ts                  | 8 +++++++-
 .../useIpcEvents-agent-status-owner-ordering.test.ts      | 8 +++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/runtime/runtime-layout-apply.ts b/src/main/runtime/runtime-layout-apply.ts
index 7df6a146dedd..7ba31a15a6c7 100644
--- a/src/main/runtime/runtime-layout-apply.ts
+++ b/src/main/runtime/runtime-layout-apply.ts
@@ -151,7 +151,13 @@ export async function applyWindowLayoutCommand(
   if (!run?.originalPresentation) {
     markAgentLaunchesClosedByUser(workspace, { kind: 'pane', tabId, leafId })
   }
-  const close = { type: 'closePane' as const, workspace, tabId, leafId, userPaneClose: true }
+  const close: CommandOf<'closePane'> = {
+    type: 'closePane',
+    workspace,
+    tabId,
+    leafId,
+    userPaneClose: true
+  }
   return run
     ? store.applyLayoutCommand(close, holders, run)
     : store.applyLayoutCommand(close, holders)
diff --git a/src/renderer/src/hooks/useIpcEvents-agent-status-owner-ordering.test.ts b/src/renderer/src/hooks/useIpcEvents-agent-status-owner-ordering.test.ts
index c6931b221e9d..c9320ecf8918 100644
--- a/src/renderer/src/hooks/useIpcEvents-agent-status-owner-ordering.test.ts
+++ b/src/renderer/src/hooks/useIpcEvents-agent-status-owner-ordering.test.ts
@@ -19,6 +19,7 @@ import {
   resolveAgentPaneAuthorityKey
 } from '../store/slices/agent-pane-authority'
 import { buildWindowApi } from './ipc-events-agent-status-window-test-fixtures'
+import type { AgentStatusSetData } from './ipc-events-agent-status-store-test-fixtures'
 
 const holder = vi.hoisted(() => ({
   getStore: (): ReturnType<typeof createTestStore> => {
@@ -120,7 +121,7 @@ async function witness() {
       }
     })
   )
-  let onSet: ((data: AgentStatusIpcPayload) => void) | undefined
+  let onSet: ((data: AgentStatusSetData) => void) | undefined
   vi.stubGlobal(
     'window',
     buildWindowApi({
@@ -141,8 +142,9 @@ async function witness() {
     leaf: string,
     providerSessionOnly = false,
     runtimeBacked = true
-  ): AgentStatusIpcPayload => ({
+  ): AgentStatusIpcPayload & AgentStatusSetData => ({
     paneKey: key(leaf),
+    connectionId: null,
     state: 'working',
     prompt: '',
     agentType: 'claude',
@@ -164,7 +166,7 @@ async function witness() {
       phase = name
       capture()
     },
-    emit: (data: AgentStatusIpcPayload) => {
+    emit: (data: ReturnType<typeof event>) => {
       if (!onSet) {
         throw new Error('Missing production onSet')
       }

From 05e87b91760bc40c7a5584d0c4669c7734eaaa2d Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 23 Oct 2026 12:08:24 -0700
Subject: [PATCH 062/207] Bound terminal conversation projection residency

---
 .../components/tab-bar/cli-chat-resume-run.ts |  55 ++-
 .../native-chat-cli-switch-run.test.ts        |   1 +
 .../tab-bar/native-chat-cli-switch-run.ts     |  19 +-
 ...seIpcEvents-agent-conversation-cap.test.ts | 376 ++++++++++++++++++
 .../pending-conversation-surface-switches.ts  |  45 +++
 .../src/store/agent-conversation-retention.ts |  77 ++++
 src/renderer/src/store/index.ts               |   6 +-
 .../src/store/slices/store-test-helpers.ts    |   8 +-
 8 files changed, 558 insertions(+), 29 deletions(-)
 create mode 100644 src/renderer/src/hooks/useIpcEvents-agent-conversation-cap.test.ts
 create mode 100644 src/renderer/src/lib/pending-conversation-surface-switches.ts
 create mode 100644 src/renderer/src/store/agent-conversation-retention.ts

diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
index 3d6788499a2d..92b72ea46974 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
@@ -19,6 +19,10 @@ import {
 import { adoptingAgentOnHost } from '../right-sidebar/ai-vault-session-resume-in-chat-launch'
 import { callRuntimeRpc } from '@/runtime/runtime-rpc-client'
 import { captureSourceTerminal } from './cli-chat-resume-terminal-capture'
+import {
+  isCliChatResumePending,
+  pendingCliChatResumes as pending
+} from '@/lib/pending-conversation-surface-switches'
 
 /** The execution host closes only the captured shell; refused or unknown closes leave it alone. */
 async function retireSwitchedTerminalPane(
@@ -35,7 +39,6 @@ async function retireSwitchedTerminalPane(
   })
 }
 
-const pending = new Map<string, AbortController>()
 const listeners = new Set<() => void>()
 const changed = () => listeners.forEach((listener) => listener())
 const keyFor = (source: CliChatResumeSource) =>
@@ -52,7 +55,7 @@ const subscribe = (listener: () => void) => {
 export function useCliChatResumePending(source: CliChatResumeSource | null): boolean {
   return useSyncExternalStore(
     subscribe,
-    () => !!source && pending.has(keyFor(source)),
+    () => !!source && isCliChatResumePending(keyFor(source)),
     () => false
   )
 }
@@ -61,7 +64,7 @@ export function useCliChatResumePending(source: CliChatResumeSource | null): boo
  *  that already holds it, revealed. The terminal pane closes once the chat has it. */
 export async function runCliChatResume(source: CliChatResumeSource): Promise<void> {
   const key = keyFor(source)
-  if (pending.has(key)) {
+  if (isCliChatResumePending(key)) {
     return
   }
   const target = structuredAgentSessionTargetForHost(source.executionHostId)
@@ -90,24 +93,15 @@ export async function runCliChatResume(source: CliChatResumeSource): Promise<voi
     return
   }
   const release = () => {
-    if (pending.get(key) === controller) {
-      pending.delete(key)
+    const operation = pending.get(controller)
+    if (operation?.key === key) {
+      operation.key = null
       changed()
     }
   }
-  pending.set(key, controller)
-  changed()
-  const sourceIncarnation = captureSourceTerminal(source)
-  const stopSource = useAppStore.subscribe(() => {
-    if (!isCurrent()) {
-      controller.abort()
-      release()
-    }
-  })
-  const timer = setTimeout(
-    () => controller.abort(new Error('Conversation preparation timed out.')),
-    30_000
-  )
+  pending.set(controller, { key, source })
+  let stopSource = () => {}
+  let timer: ReturnType<typeof setTimeout> | undefined
   let dispatched = false
   const handoff = () => {
     if (dispatched) {
@@ -123,6 +117,18 @@ export async function runCliChatResume(source: CliChatResumeSource): Promise<voi
   }
   let inPlace = false
   try {
+    changed()
+    const sourceIncarnation = captureSourceTerminal(source)
+    stopSource = useAppStore.subscribe(() => {
+      if (!isCurrent()) {
+        controller.abort()
+        release()
+      }
+    })
+    timer = setTimeout(
+      () => controller.abort(new Error('Conversation preparation timed out.')),
+      30_000
+    )
     let retireSource = false
     try {
       await waitForPromiseWithSignal(sourceIncarnation, controller.signal)
@@ -191,14 +197,14 @@ export async function runCliChatResume(source: CliChatResumeSource): Promise<voi
       } else if (
         result.kind === 'failed' &&
         !result.notified &&
-        pending.get(key) === controller &&
+        pending.get(controller)?.key === key &&
         (await reportCliChatResumeFailure(source, result.error, target))
       ) {
         retireSource = inPlace
       }
     } catch (error) {
       if (
-        pending.get(key) === controller &&
+        pending.get(controller)?.key === key &&
         (await reportCliChatResumeFailure(source, error, target))
       ) {
         retireSource = inPlace
@@ -214,6 +220,13 @@ export async function runCliChatResume(source: CliChatResumeSource): Promise<voi
   } finally {
     clearTimeout(timer)
     stopSource()
-    release()
+    try {
+      release()
+    } finally {
+      pending.delete(controller)
+      useAppStore.setState((state) => ({
+        agentConversationsByPaneKey: state.agentConversationsByPaneKey
+      }))
+    }
   }
 }
diff --git a/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.test.ts b/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.test.ts
index 9c43406f5bba..71a086d74d0c 100644
--- a/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.test.ts
+++ b/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.test.ts
@@ -12,6 +12,7 @@ const mocks = vi.hoisted(() => ({
 vi.mock('sonner', () => ({ toast: { error: mocks.toast } }))
 vi.mock('@/store', () => ({
   useAppStore: {
+    setState: vi.fn(),
     getState: () => ({ settings: {}, closeUnifiedTab: mocks.closeUnifiedTab })
   }
 }))
diff --git a/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts b/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts
index ac599e2c9e17..57f61bedbb23 100644
--- a/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts
+++ b/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts
@@ -15,8 +15,8 @@ import { AiVaultChatForkSourceSchema } from '../../../../shared/ai-vault-chat-fo
 import type { AiVaultAgent } from '../../../../shared/ai-vault-types'
 import { agentLabel } from '../../../../shared/ai-vault-session-filters'
 import { parseExecutionHostId } from '../../../../shared/execution-host'
+import { pendingNativeChatCliSwitches as pending } from '@/lib/pending-conversation-surface-switches'
 
-const pending = new Set<string>()
 const listeners = new Set<() => void>()
 const changed = () => listeners.forEach((listener) => listener())
 
@@ -69,9 +69,9 @@ export async function runNativeChatCliSwitch(args: {
   if (pending.has(args.sessionId) || !target || !hostId) {
     return
   }
-  pending.add(args.sessionId)
-  changed()
+  pending.set(args.sessionId, args)
   try {
+    changed()
     // Fail closed: a host that doesn't advertise the switch never receives it.
     if (!(await supportsInPlaceSwitch(target, args.agent))) {
       throw new Error(nativeChatCliSwitchFailureText(null, args.agent))
@@ -106,7 +106,16 @@ export async function runNativeChatCliSwitch(args: {
     toast.error(nativeChatCliSwitchFailureText(error, args.agent))
   } finally {
     pending.delete(args.sessionId)
-    changed()
-    args.onComplete?.()
+    try {
+      useAppStore.setState((state) => ({
+        agentConversationsByPaneKey: state.agentConversationsByPaneKey
+      }))
+    } finally {
+      try {
+        changed()
+      } finally {
+        args.onComplete?.()
+      }
+    }
   }
 }
diff --git a/src/renderer/src/hooks/useIpcEvents-agent-conversation-cap.test.ts b/src/renderer/src/hooks/useIpcEvents-agent-conversation-cap.test.ts
new file mode 100644
index 000000000000..b06cf2a53bc0
--- /dev/null
+++ b/src/renderer/src/hooks/useIpcEvents-agent-conversation-cap.test.ts
@@ -0,0 +1,376 @@
+import { afterEach, expect, it, vi } from 'vitest'
+import type { UseBoundStore, StoreApi } from 'zustand'
+import type { AppState } from '../store/types'
+import type { AgentStatusIpcPayload } from '../../../shared/agent-status-types'
+import { agentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
+import type { AgentStatusSetData } from './ipc-events-agent-status-store-test-fixtures'
+import {
+  createTestStore,
+  makeTab,
+  makeWorktree,
+  TEST_REPO
+} from '../store/slices/store-test-helpers'
+import { buildWindowApi } from './ipc-events-agent-status-window-test-fixtures'
+import { collectLeafIds } from '../../../shared/terminal-pane-layout-tree'
+import { captureTerminalSurfaceIdentity } from '../../../shared/terminal-tab-close'
+import { adoptsCliConversations } from '../../../shared/structured-agent-cli-conversation-adoption'
+import {
+  collectAgentPaneConversations,
+  resolvePaneLastAgentConversation
+} from '@/lib/ai-vault-tab-title-requests'
+import {
+  transferAgentPaneAuthorityAlias,
+  resetAgentPaneAuthorityAliasesForTests
+} from '../store/slices/agent-pane-authority'
+import * as capacity from '../store/slices/agent-status-capacity-eviction'
+import * as switches from '../lib/pending-conversation-surface-switches'
+
+const mocks = vi.hoisted(() => {
+  const store: { current?: UseBoundStore<StoreApi<AppState>> } = {}
+  return {
+    store,
+    support: vi.fn(async () => true),
+    call: vi.fn(),
+    rpc: vi.fn(),
+    launch: vi.fn(),
+    toast: vi.fn()
+  }
+})
+vi.mock('@/store', () => ({
+  get useAppStore() {
+    return mocks.store.current
+  }
+}))
+vi.mock('@/runtime/structured-agent-session-client', () => ({
+  supportsInPlaceSwitch: mocks.support,
+  supportsStructuredAgentSessionCliSource: async () => true,
+  callStructuredAgentSession: mocks.call
+}))
+vi.mock('@/runtime/runtime-rpc-client', () => ({ callRuntimeRpc: mocks.rpc }))
+vi.mock('@/lib/launch-ai-vault-session', () => ({ launchAiVaultSessionInNewTab: mocks.launch }))
+vi.mock('@/runtime/local-runtime-capabilities', async (original) => ({
+  ...(await original<Record<string, unknown>>()),
+  readLocalRuntimeCapabilitiesOrUnknown: () => [
+    'agent-session.structured.v1',
+    'agent-session.structured.agents.v1',
+    'agent-session.structured.switch.v1:codex'
+  ]
+}))
+vi.mock('@/runtime/host-structured-agents', async (original) => ({
+  ...(await original<Record<string, unknown>>()),
+  readHostStructuredAgents: () => [{ agent: 'codex', capabilities: {} }]
+}))
+vi.mock('./agent-hook-completion-notifications', () => ({
+  observeAgentHookCompletionForNotification: vi.fn(),
+  syncAgentHookCompletionNotificationsForStoreUpdate: vi.fn()
+}))
+vi.mock('sonner', () => ({ toast: { error: mocks.toast } }))
+const cleanup: (() => void)[] = []
+const running: Promise<void>[] = []
+afterEach(async () => {
+  cleanup
+    .splice(0)
+    .toReversed()
+    .forEach((close) => close())
+  await Promise.allSettled(running.splice(0))
+  resetAgentPaneAuthorityAliasesForTests()
+  vi.restoreAllMocks()
+  vi.useRealTimers()
+  vi.unstubAllGlobals()
+})
+const leaf = (n: number) => `00000000-0000-4000-8000-${String(n).padStart(12, '0')}`
+const pane = (tab: string, n = 1) => `${tab}:${leaf(n)}`
+const layout = (n: number) => ({
+  root: { type: 'leaf' as const, leafId: leaf(n) },
+  activeLeafId: leaf(n),
+  expandedLeafId: null
+})
+it.each([600, 6000])(
+  'bounds real publications across held switches and retries at %i callbacks',
+  async (n) => {
+    vi.useFakeTimers()
+    vi.setSystemTime(1_800_000_000_000)
+    vi.clearAllMocks()
+    const store = createTestStore()
+    mocks.store.current = store
+    const tabs = ['cli', 'retry', 'root-b', 'root-c', 'rootless'].map((id) =>
+      makeTab({ id, worktreeId: 'wt', createdAt: 1 })
+    )
+    const roots = [pane('retry'), pane('root-b'), pane('root-c')]
+    store.setState({
+      workspaceSessionReady: true,
+      repos: [TEST_REPO],
+      worktreesByRepo: { [TEST_REPO.id]: [makeWorktree({ id: 'wt', repoId: TEST_REPO.id })] },
+      tabsByWorktree: { wt: tabs },
+      terminalLayoutsByTabId: {
+        ...Object.fromEntries(
+          tabs.filter((tab) => tab.id !== 'rootless').map((tab) => [tab.id, layout(1)])
+        ),
+        rootless: { root: null, activeLeafId: null, expandedLeafId: null }
+      }
+    })
+    let onSet: ((data: AgentStatusSetData) => void) | undefined
+    vi.stubGlobal(
+      'window',
+      buildWindowApi({
+        onSet: (callback) => {
+          onSet = callback
+          return () => {}
+        }
+      })
+    )
+    const { registerAgentStatusIpcBridge } = await import('./ipc-events/agent-status-ipc-bridge')
+    const { runCliChatResume } = await import('../components/tab-bar/cli-chat-resume-run')
+    const { resolveCliChatResumeSource } =
+      await import('../components/tab-bar/cli-chat-resume-source')
+    const { runNativeChatCliSwitch } =
+      await import('../components/tab-bar/native-chat-cli-switch-run')
+    const unsubs: (() => void)[] = []
+    const bridge = registerAgentStatusIpcBridge(unsubs)
+    cleanup.push(bridge.disposeAsyncState, bridge.unsubscribeStore, ...unsubs)
+    await Promise.resolve()
+    let callbacks = 0
+    const emit = async (key: string, id = key) => {
+      const data: AgentStatusIpcPayload & AgentStatusSetData = {
+        paneKey: key,
+        state: 'done',
+        prompt: '',
+        agentType: 'codex',
+        providerSessionOnly: true,
+        worktreeId: 'wt',
+        terminalHandle: `term-${key}`,
+        providerSession: { key: 'session_id', id },
+        connectionId: null,
+        receivedAt: Date.now(),
+        stateStartedAt: Date.now()
+      }
+      if (!onSet) {
+        throw new Error('Missing bridge callback')
+      }
+      onSet(data)
+      callbacks += 1
+      await vi.advanceTimersByTimeAsync(34)
+      expect(store.getState().agentConversationsByPaneKey[key]?.providerSession.id).toBe(id)
+      store.getState().clearSleepingAgentSession(key)
+    }
+    for (const key of [
+      pane('cli'),
+      ...roots,
+      pane('cli', 2),
+      pane('retry', 2),
+      pane('native'),
+      pane('alias-old'),
+      pane('alias-new')
+    ]) {
+      await emit(key, key === pane('cli') || key === pane('retry') ? 'conversation' : key)
+    }
+    const first = resolveCliChatResumeSource(store.getState(), {
+      tab: { id: 'cli', worktreeId: 'wt' },
+      paneKey: pane('cli')
+    })!
+    const retry = resolveCliChatResumeSource(store.getState(), {
+      tab: { id: 'retry', worktreeId: 'wt' },
+      paneKey: pane('retry')
+    })!
+    expect(first.providerSessionId).toBe('conversation')
+    expect(retry.providerSessionId).toBe('conversation')
+    mocks.rpc.mockImplementation(async (_target, method, args) => {
+      expect(method).toBe('terminal.resolvePane')
+      const tabId = args.paneKey.split(':')[0]
+      const identity = captureTerminalSurfaceIdentity(store.getState(), 'wt', tabId, leaf(1))!
+      return {
+        terminal: {
+          handle: `handle-${tabId}`,
+          ptyId: identity.ptyId,
+          incarnationId: 'incarnation',
+          presentation: { identity: { ...identity, incarnationId: 'incarnation' }, holders: [] }
+        }
+      }
+    })
+    const refusal = {
+      ok: false as const,
+      refusal: { code: 'agent_session_operation_invalid', message: 'Not admitted' }
+    }
+    const oldAnswer = Promise.withResolvers<typeof refusal>()
+    const newAnswer = Promise.withResolvers<typeof refusal>()
+    const nativeAnswer = Promise.withResolvers<{ source: unknown }>()
+    const nativeLaunch = Promise.withResolvers<{ status: 'created' }>()
+    cleanup.push(() => {
+      oldAnswer.resolve(refusal)
+      newAnswer.resolve(refusal)
+      nativeAnswer.resolve({ source: null })
+      nativeLaunch.resolve({ status: 'created' })
+    })
+    const returns = [oldAnswer, newAnswer]
+    mocks.call.mockImplementation((_target, method) =>
+      method === 'agentSession.switchToChat' ? returns.shift()!.promise : nativeAnswer.promise
+    )
+    mocks.launch.mockReturnValue({ tabId: null, runtimeLaunch: nativeLaunch.promise })
+    const ownerRefusal = agentSessionRefusalError('agent_session_conflict', {
+      reason: 'conversationHeldElsewhere',
+      owner: { sessionId: 'existing', workspaceId: 'wt' }
+    })
+    mocks.support.mockRejectedValueOnce(ownerRefusal)
+    const old = runCliChatResume(first)
+    running.push(old)
+    await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(1))
+    const native = runNativeChatCliSwitch({
+      sessionId: 'native-session',
+      workspaceId: 'wt',
+      executionHostId: 'local',
+      agent: 'codex',
+      chatTabId: 'native'
+    })
+    running.push(native)
+    await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(2))
+    transferAgentPaneAuthorityAlias({ fromPaneKey: first.paneKey, toPaneKey: pane('alias-old') })
+    const { cli: _removed, ...withoutCli } = store.getState().terminalLayoutsByTabId
+    store.setState({
+      terminalLayoutsByTabId: withoutCli,
+      tabsByWorktree: { wt: tabs.filter((tab) => tab.id !== 'cli') }
+    })
+    mocks.support.mockRejectedValueOnce(ownerRefusal)
+    const newer = runCliChatResume(retry)
+    running.push(newer)
+    await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(3))
+    transferAgentPaneAuthorityAlias({ fromPaneKey: retry.paneKey, toPaneKey: pane('alias-new') })
+    let protectedKeys = [
+      first.paneKey,
+      pane('cli', 2),
+      retry.paneKey,
+      pane('retry', 2),
+      pane('alias-old'),
+      pane('alias-new'),
+      pane('native')
+    ]
+    let publications = 0
+    const assertBound = () => {
+      const state = store.getState()
+      const rooted = new Set(
+        Object.entries(state.terminalLayoutsByTabId).flatMap(([tab, tree]) =>
+          collectLeafIds(tree.root).map((id) => `${tab}:${id}`)
+        )
+      )
+      const keys = Object.keys(state.agentConversationsByPaneKey)
+      expect(
+        keys.filter((key) => !rooted.has(key) && !protectedKeys.includes(key)).length
+      ).toBeLessThanOrEqual(500)
+      expect(keys.length).toBeLessThanOrEqual(
+        rooted.size + 500 + protectedKeys.filter((key) => !rooted.has(key)).length
+      )
+      for (const key of [...roots, ...protectedKeys]) {
+        expect(state.agentConversationsByPaneKey[key]).toBeDefined()
+      }
+      publications += 1
+    }
+    cleanup.push(store.subscribe(assertBound))
+    const batches = vi.spyOn(store.getState(), 'transactAgentStatuses')
+    const records = vi.spyOn(store.getState(), 'recordAgentProviderSession')
+    let classifiedKeys = 0
+    let protectionEntries = 0
+    const classify = capacity.classifyPaneKeyLiveness
+    const protect = switches.protectedConversationPaneKeys
+    const classifier = vi.spyOn(capacity, 'classifyPaneKeyLiveness').mockImplementation((state) => {
+      const lookup = classify(state)
+      return (key) => {
+        classifiedKeys += 1
+        return lookup(key)
+      }
+    })
+    vi.spyOn(switches, 'protectedConversationPaneKeys').mockImplementation((entries) => {
+      protectionEntries += Object.keys(entries).length
+      return protect(entries)
+    })
+    const deliveredBefore = callbacks
+    for (let index = 0; index < n; index += 1) {
+      await emit(pane(index % 2 ? 'unknown' : 'rootless', index + 10))
+    }
+    expect(callbacks - deliveredBefore).toBe(n)
+    expect(records).toHaveBeenCalledTimes(n)
+    expect(batches).toHaveBeenCalledTimes(0)
+    expect(publications).toBeGreaterThanOrEqual(n)
+    expect(publications).toBeLessThanOrEqual(3 * n)
+    expect(classifier.mock.calls.length).toBeLessThanOrEqual(publications)
+    expect(classifiedKeys).toBeLessThanOrEqual(510 * publications)
+    expect(Object.keys(store.getState().agentConversationsByPaneKey)).toHaveLength(509)
+    const oldest = pane(n % 2 ? 'unknown' : 'rootless', n - 500 + 10)
+    await emit(oldest, 'replacement-does-not-refresh-residency')
+    store.setState(
+      {
+        ...store.getState(),
+        agentConversationsByPaneKey: Object.fromEntries(
+          Object.entries(store.getState().agentConversationsByPaneKey).toReversed()
+        )
+      },
+      true
+    )
+    await emit(pane('unknown', n + 10))
+    expect(store.getState().agentConversationsByPaneKey[oldest]).toBeUndefined()
+    let nestedWrites = 0
+    const stopNested = store.subscribe(() => {
+      if (nestedWrites++ === 0) {
+        store.setState((state) => ({
+          agentConversationsByPaneKey: state.agentConversationsByPaneKey
+        }))
+      }
+    })
+    store.setState({ activeWorktreeId: 'wt' })
+    stopNested()
+    expect(nestedWrites).toBe(2)
+    protectedKeys = [retry.paneKey, pane('retry', 2), pane('alias-new'), pane('native')]
+    oldAnswer.resolve(refusal)
+    await old
+    expect(Object.keys(store.getState().agentConversationsByPaneKey)).toHaveLength(506)
+    expect(store.getState().agentConversationsByPaneKey[pane('alias-new')]).toBeDefined()
+    expect(mocks.call).toHaveBeenCalledTimes(3)
+    protectedKeys = [pane('native')]
+    newAnswer.resolve(refusal)
+    await newer
+    expect(Object.keys(store.getState().agentConversationsByPaneKey)).toHaveLength(504)
+    nativeAnswer.resolve({
+      source: {
+        agent: 'codex',
+        sourceAgent: 'codex',
+        sessionId: 'native-provider',
+        filePath: '/repo/rollout.jsonl',
+        cwd: '/repo',
+        codexHome: null,
+        executionHostPlatform: 'darwin'
+      }
+    })
+    await vi.waitFor(() => expect(mocks.launch).toHaveBeenCalledOnce())
+    await emit(pane('pressure-after-native-receipt', n + 11))
+    protectedKeys = []
+    nativeLaunch.resolve({ status: 'created' })
+    await native
+    expect(Object.keys(store.getState().agentConversationsByPaneKey)).toHaveLength(503)
+    for (const key of roots) {
+      expect(
+        resolvePaneLastAgentConversation(
+          store.getState(),
+          { worktreeId: 'wt', paneKey: key },
+          adoptsCliConversations
+        )?.providerSession.id
+      ).toBe(key === pane('retry') ? 'conversation' : key)
+    }
+    expect(
+      collectAgentPaneConversations(store.getState(), adoptsCliConversations, { allPanes: true })
+    ).toEqual(expect.arrayContaining(roots.map((paneKey) => expect.objectContaining({ paneKey }))))
+    expect(mocks.rpc.mock.calls.every(([, method]) => method !== 'terminal.close')).toBe(true)
+    expect(classifier.mock.calls.length).toBeLessThanOrEqual(publications)
+    expect(classifiedKeys).toBeLessThanOrEqual(510 * publications)
+    expect(publications).toBeLessThanOrEqual(3 * n + 64)
+    console.info('CAP_COUNTS', {
+      n,
+      callbacks,
+      batches: batches.mock.calls.length,
+      records: records.mock.calls.length,
+      publications,
+      classifierBuilds: classifier.mock.calls.length,
+      classifiedKeys,
+      protectionEntries,
+      retained: Object.keys(store.getState().agentConversationsByPaneKey).length
+    })
+  },
+  120_000
+)
diff --git a/src/renderer/src/lib/pending-conversation-surface-switches.ts b/src/renderer/src/lib/pending-conversation-surface-switches.ts
new file mode 100644
index 000000000000..810867f167c9
--- /dev/null
+++ b/src/renderer/src/lib/pending-conversation-surface-switches.ts
@@ -0,0 +1,45 @@
+import type { CliChatResumeSource } from '@/components/tab-bar/cli-chat-resume-source'
+import type { AgentPaneConversationIdentity } from '@/store/slices/agent-pane-conversation'
+import { resolveAgentPaneAuthorityKey } from '@/store/slices/agent-pane-authority'
+import { getTabIdFromPaneKey } from '@/store/slices/agent-status-pane-key-tab-binding'
+
+export const pendingCliChatResumes = new Map<
+  AbortController,
+  { key: string | null; source: CliChatResumeSource }
+>()
+export const pendingNativeChatCliSwitches = new Map<
+  string,
+  { chatTabId: string | null; workspaceId: string; executionHostId: string }
+>()
+
+export function isCliChatResumePending(key: string): boolean {
+  return Array.from(pendingCliChatResumes.values()).some((operation) => operation.key === key)
+}
+
+export function protectedConversationPaneKeys(
+  entries: Record<string, AgentPaneConversationIdentity>
+): Set<string> {
+  const protectedKeys = new Set<string>()
+  for (const { source } of pendingCliChatResumes.values()) {
+    protectedKeys.add(source.paneKey)
+    protectedKeys.add(resolveAgentPaneAuthorityKey(source.paneKey))
+  }
+  const sources = [
+    ...Array.from(pendingCliChatResumes.values(), ({ source }) => source),
+    ...pendingNativeChatCliSwitches.values()
+  ]
+  for (const [key, entry] of Object.entries(entries)) {
+    for (const source of sources) {
+      const tabId = 'tabId' in source ? source.tabId : source.chatTabId
+      if (
+        tabId !== null &&
+        getTabIdFromPaneKey(key) === tabId &&
+        entry.worktreeId === source.workspaceId &&
+        entry.executionHostId === source.executionHostId
+      ) {
+        protectedKeys.add(key)
+      }
+    }
+  }
+  return protectedKeys
+}
diff --git a/src/renderer/src/store/agent-conversation-retention.ts b/src/renderer/src/store/agent-conversation-retention.ts
new file mode 100644
index 000000000000..4dd0d46633c7
--- /dev/null
+++ b/src/renderer/src/store/agent-conversation-retention.ts
@@ -0,0 +1,77 @@
+import type { StateCreator } from 'zustand'
+import type { AppState } from './types'
+import type { StoreSetArgs } from './react-commit-cascade-write-probe'
+import { protectedConversationPaneKeys } from '@/lib/pending-conversation-surface-switches'
+import {
+  classifyPaneKeyLiveness,
+  MAX_LIVE_AGENT_STATUSES
+} from './slices/agent-status-capacity-eviction'
+
+type Conversations = AppState['agentConversationsByPaneKey']
+
+function cappedConversations(state: AppState, previous: Conversations): Conversations {
+  const entries = state.agentConversationsByPaneKey
+  const incoming = Object.keys(entries)
+  const keys = [
+    ...Object.keys(previous).filter((key) => Object.hasOwn(entries, key)),
+    ...incoming.filter((key) => !Object.hasOwn(previous, key))
+  ]
+  let evicted: string[] = []
+  if (keys.length > MAX_LIVE_AGENT_STATUSES) {
+    const classify = classifyPaneKeyLiveness(state)
+    const protectedKeys = protectedConversationPaneKeys(entries)
+    const eligible = keys.filter((key) => classify(key) !== 'live' && !protectedKeys.has(key))
+    evicted = eligible.slice(0, Math.max(0, eligible.length - MAX_LIVE_AGENT_STATUSES))
+  }
+  if (evicted.length === 0 && keys.every((key, index) => key === incoming[index])) {
+    return entries
+  }
+  const removed = new Set(evicted)
+  return Object.fromEntries(
+    keys.filter((key) => !removed.has(key)).map((key) => [key, entries[key]])
+  )
+}
+
+export function withAgentConversationRetention(
+  createState: StateCreator<AppState, [], []>
+): StateCreator<AppState, [], []> {
+  return (set, get, api) => {
+    const wrap =
+      (write: typeof set): typeof set =>
+      (...args: StoreSetArgs<AppState>): void => {
+        if (args[1] === true) {
+          const [partial] = args
+          write((state) => {
+            const requested = typeof partial === 'function' ? partial(state) : partial
+            const entries = cappedConversations(requested, get().agentConversationsByPaneKey)
+            return entries === requested.agentConversationsByPaneKey
+              ? requested
+              : { ...requested, agentConversationsByPaneKey: entries }
+          }, true)
+        } else {
+          const [partial] = args
+          write((state) => {
+            const requested = typeof partial === 'function' ? partial(state) : partial
+            if (
+              !Object.hasOwn(requested, 'agentConversationsByPaneKey') &&
+              !Object.hasOwn(requested, 'terminalLayoutsByTabId')
+            ) {
+              return requested
+            }
+            const current = get()
+            const candidate = { ...current, ...requested }
+            const entries = cappedConversations(candidate, current.agentConversationsByPaneKey)
+            return entries === candidate.agentConversationsByPaneKey
+              ? requested
+              : { ...requested, agentConversationsByPaneKey: entries }
+          })
+        }
+      }
+    api.setState = wrap(api.setState)
+    const initial = createState(wrap(set), get, api)
+    const entries = cappedConversations(initial, {})
+    return entries === initial.agentConversationsByPaneKey
+      ? initial
+      : { ...initial, agentConversationsByPaneKey: entries }
+  }
+}
diff --git a/src/renderer/src/store/index.ts b/src/renderer/src/store/index.ts
index f9b0498a146d..5c0d1ada8579 100644
--- a/src/renderer/src/store/index.ts
+++ b/src/renderer/src/store/index.ts
@@ -63,6 +63,7 @@ import { ORCA_SIDEBAR_INPUTS_IS_MAIN } from '../../../shared/sidebar-inputs-swit
 import { withReactCommitCascadeWriteProbe } from './react-commit-cascade-write-probe'
 import { withStoreIdentityChurnProbe } from './store-identity-churn-probe'
 import { withEditorBufferRecords } from './editor-buffer-record-lifecycle'
+import { withAgentConversationRetention } from './agent-conversation-retention'
 import { attachEditorBufferIdentityEvents } from './editor-buffer-identity-events'
 import {
   registerRendererMemoryProfileContributor,
@@ -79,11 +80,14 @@ const withDevelopmentStoreProbes = (createState: StateCreator<AppState, [], []>)
     ? withStoreIdentityChurnProbe(createState)
     : createState
 
+const withAppStoreWritePolicies = (createState: StateCreator<AppState, [], []>) =>
+  withAgentConversationRetention(withDevelopmentStoreProbes(createState))
+
 // Why buffer records outermost: the probes must see each caller's own partial and frame.
 // Why e2e checks the buffer invariant too: a writer that skips the record must fail there, not drift.
 export const useAppStore = create<AppState>()(
   withEditorBufferRecords(
-    withDevelopmentStoreProbes(
+    withAppStoreWritePolicies(
       withReactCommitCascadeWriteProbe((...a) => {
         // Why first: settling inside the bump's own notify means hook subscribers never see it unsettled.
         // Switch point: the stamp-sorted list reads no settled epoch.
diff --git a/src/renderer/src/store/slices/store-test-helpers.ts b/src/renderer/src/store/slices/store-test-helpers.ts
index c299e7eccfa5..691ed0c4c5d6 100644
--- a/src/renderer/src/store/slices/store-test-helpers.ts
+++ b/src/renderer/src/store/slices/store-test-helpers.ts
@@ -1,4 +1,4 @@
-import { create } from 'zustand'
+import { create, type StateCreator } from 'zustand'
 import type { AppState } from '../types'
 import type { Worktree } from '../../../../shared/worktree/types'
 import { createRepoSlice } from './repos'
@@ -54,6 +54,7 @@ import { createStructuredChatSleptAtSlice } from './structured-chat-slept-at'
 import { createWorkspaceAttentionSlice } from './workspace-attention/workspace-attention-slice'
 import '@/i18n/i18n'
 import { withEditorBufferRecords } from '../editor-buffer-record-lifecycle'
+import { withAgentConversationRetention } from '../agent-conversation-retention'
 import { makeWorktree, TEST_REPO } from './worktrees-slice-test-fixtures'
 export { makeWorktree, TEST_REPO } from './worktrees-slice-test-fixtures'
 export {
@@ -64,10 +65,13 @@ export {
   makeTabGroup
 } from './store-session-test-harness'
 
+const withTestStorePolicies = (creator: StateCreator<AppState, [], []>, check: boolean) =>
+  withEditorBufferRecords(withAgentConversationRetention(creator), check)
+
 export function createTestStore() {
   // Why the record middleware: views of one file share a record only through it, as in the app.
   return create<AppState>()(
-    withEditorBufferRecords<AppState>(
+    withTestStorePolicies(
       (...a) => ({
         ...createRepoSlice(...a),
         ...createSparsePresetsSlice(...a),

From 10ee6df13bf5e48fdb3ee74d27114425d06e0ba0 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 23 Oct 2026 16:46:38 -0700
Subject: [PATCH 063/207] Avoid repeated conversation projection and placement
 scans

Copy conversation associations once per transaction and reuse call-local tab membership. Qualify component work through actual bridge, placement, retirement and recorded-output contracts; classify the existing own-property presence read correctly.
---
 .../scripts/check-layout-writer-ratchets.mjs  |  18 +-
 .../check-layout-writer-ratchets.test.mjs     |  11 ++
 ...ile-session-tab-application-launch.test.ts |  35 +++-
 .../mobile-session-switch-placement.test.ts   | 129 ++++++++++----
 ...ent-session-windowless-layout-host.test.ts | 160 +++++++++++++++++-
 ...ucturedSession.history-read-state.test.tsx |  56 +++++-
 ...ents-agent-status-batch-projection.test.ts | 124 +++++++++++++-
 ...-runtime-terminal-switch-placement.test.ts |  78 ++++++---
 .../store/slices/agent-pane-conversation.ts   |  21 ++-
 .../store/slices/agent-status-live-actions.ts |   3 +-
 .../store/slices/agent-status-live-reducer.ts |   5 +-
 .../agent-status-provider-session-actions.ts  |   5 +-
 .../agent-status-provider-session.test.ts     |  39 +++++
 .../src/store/slices/agent-status-runtime.ts  |  18 ++
 ...session-tab-placement-work.test-fixture.ts |  54 ++++++
 src/shared/session-tab-placement.ts           |   5 +-
 16 files changed, 680 insertions(+), 81 deletions(-)
 create mode 100644 src/shared/session-tab-placement-work.test-fixture.ts

diff --git a/config/scripts/check-layout-writer-ratchets.mjs b/config/scripts/check-layout-writer-ratchets.mjs
index 73c338a320e1..de60e7d72471 100644
--- a/config/scripts/check-layout-writer-ratchets.mjs
+++ b/config/scripts/check-layout-writer-ratchets.mjs
@@ -328,6 +328,21 @@ function isSameNameCopy(property, name) {
   return ts.isPropertyAccessExpression(value) && value.name.text === name
 }
 
+/** Only the property-name argument of the standard presence read is a read. */
+function isOwnPresenceRead(node) {
+  const call = node.parent
+  if (!ts.isCallExpression(call) || call.arguments[1] !== node) {
+    return false
+  }
+  const callee = call.expression
+  return (
+    ts.isPropertyAccessExpression(callee) &&
+    callee.name.text === 'hasOwn' &&
+    ts.isIdentifier(callee.expression) &&
+    callee.expression.text === 'Object'
+  )
+}
+
 /** Layout writes in one file under one ratchet's rules. */
 export function countLayoutWrites(sourceText, ratchet, fileName = 'file.tsx') {
   const names = [...ratchet.writerNames, ...ratchet.assignedFields]
@@ -389,7 +404,8 @@ export function countLayoutWrites(sourceText, ratchet, fileName = 'file.tsx') {
       !(ts.isPropertyAssignment(node.parent) && node.parent.name === node) &&
       !ts.isComputedPropertyName(node.parent) &&
       !(ts.isElementAccessExpression(node.parent) && node.parent.argumentExpression === node) &&
-      !ts.isLiteralTypeNode(node.parent)
+      !ts.isLiteralTypeNode(node.parent) &&
+      !isOwnPresenceRead(node)
     ) {
       count += 1
     }
diff --git a/config/scripts/check-layout-writer-ratchets.test.mjs b/config/scripts/check-layout-writer-ratchets.test.mjs
index 126e33260120..9c5be29cfbbd 100644
--- a/config/scripts/check-layout-writer-ratchets.test.mjs
+++ b/config/scripts/check-layout-writer-ratchets.test.mjs
@@ -52,6 +52,17 @@ describe('renderer layout writes', () => {
     expect(countLayoutWrites(src, rendererRatchet, 'a.tsx')).toBe(3)
   })
 
+  it('reads Object.hasOwn property names while retaining computed and direct writes', () => {
+    expect(
+      countLayoutWrites("Object.hasOwn(requested, 'terminalLayoutsByTabId')", rendererRatchet)
+    ).toBe(0)
+    const writes = "patch.terminalLayoutsByTabId = next; patch['terminalLayoutsByTabId'] = next"
+    expect(countLayoutWrites(writes, rendererRatchet)).toBe(2)
+    const other =
+      "Object.hasOwn('terminalLayoutsByTabId', key); other.hasOwn(state, 'terminalLayoutsByTabId'); Object.other(state, 'terminalLayoutsByTabId')"
+    expect(countLayoutWrites(other, rendererRatchet)).toBe(3)
+  })
+
   it('allows only the frozen mirror writers', () => {
     expect(rendererRatchet.allowed('src/renderer/src/store/workspace-layout-cache.ts')).toBe(true)
     expect(
diff --git a/mobile/src/session/use-mobile-session-tab-application-launch.test.ts b/mobile/src/session/use-mobile-session-tab-application-launch.test.ts
index 9cfb0ad2e473..d6fea1e5d4e4 100644
--- a/mobile/src/session/use-mobile-session-tab-application-launch.test.ts
+++ b/mobile/src/session/use-mobile-session-tab-application-launch.test.ts
@@ -1,4 +1,4 @@
-import { createElement } from 'react'
+import { createElement, type SetStateAction } from 'react'
 import { act, create, type ReactTestRenderer } from 'react-test-renderer'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import type { RpcClient } from '../transport/rpc-client'
@@ -212,3 +212,36 @@ describe('landing on a launched tab', () => {
     expect(state.creatingTerminalRef.current).toBeNull()
   })
 })
+
+it('applies desktop retirement and replacement in host order without a phone activation', () => {
+  const { state, sendRequest } = scope(null)
+  let published: MobileSessionTab[] = []
+  state.setSessionTabs.mockImplementation((next: SetStateAction<MobileSessionTab[]>) => {
+    published = typeof next === 'function' ? next(published) : next
+  })
+  state.selectedSessionTabIdRef.current = 'C'
+  state.activeSessionTabIdRef.current = 'C'
+  state.activeHandleRef.current = null
+  const apply = mount(state)
+  const a = terminalTab('A', 'term_A')
+  const b = terminalTab('B', 'term_B')
+  const c = { ...chatTab('C', 'conversation'), agent: 'codex' as const, isActive: true }
+  const t = terminalTab('T', 'term_T', true)
+  apply(snapshot([a, c, b]))
+  expect(published.map((tab) => tab.id)).toEqual(['A', 'C', 'B'])
+  expect(state.activeSessionTabIdRef.current).toBe('C')
+  apply(snapshot([{ ...a, isActive: true }, b]))
+  expect(published.map((tab) => tab.id)).toEqual(['A', 'B'])
+  expect(state.activeSessionTabIdRef.current).toBe('A')
+  apply(snapshot([a, t, b]))
+  expect(published.map((tab) => tab.id)).toEqual(['A', 'T', 'B'])
+  expect(published.find((tab) => tab.id === state.activeSessionTabIdRef.current)).toEqual(t)
+  expect(state.setActiveSessionTabId).toHaveBeenLastCalledWith('T')
+  expect(state.activeSessionTabTypeRef.current).toBe('terminal')
+  expect(state.setActiveHandle).toHaveBeenLastCalledWith('term_T')
+  expect(state.activeHandleRef.current).toBe('term_T')
+  expect(state.subscribeToTerminal).toHaveBeenLastCalledWith('term_T')
+  expect(state.unsubscribeTerminal).toHaveBeenCalledWith('term_A')
+  expect(state.selectedSessionTabIdRef.current).toBe('C')
+  expect(activations(sendRequest)).toEqual([])
+})
diff --git a/src/main/runtime/mobile-session-switch-placement.test.ts b/src/main/runtime/mobile-session-switch-placement.test.ts
index 38a68850b2b8..f35f9db8a463 100644
--- a/src/main/runtime/mobile-session-switch-placement.test.ts
+++ b/src/main/runtime/mobile-session-switch-placement.test.ts
@@ -1,49 +1,101 @@
-import { expect, it, vi } from 'vitest'
-import type {
-  RuntimeMobileSessionTabsSnapshot,
-  RuntimeMobileSessionSnapshotTab
-} from '../../shared/runtime-types'
+import { withRuntimePaneAdmission } from './runtime-durable-store-fixture'
+import { addWorkspace } from '../../shared/workspace-layout/workspace-layout-session.test-fixture'
+import { withChatTabChanges } from './agent-session-tab-layout'
+import { observeSessionTabPlacementWork } from '../../shared/session-tab-placement-work.test-fixture'
+import * as profile from './profile-session-store.test-fixture'
+import { afterEach, expect, it, vi } from 'vitest'
+import type { RuntimeMobileSessionTabsSnapshot } from '../../shared/runtime-types'
 const { OrcaRuntimeService } = await import('./orca-runtime-test-mocks.spec')
 await import('./orca-runtime-test-lifecycle.spec')
 const { store, TEST_WORKTREE_ID: WT } = await import('./orca-runtime-test-fixtures.spec')
 
+afterEach(() => vi.restoreAllMocks())
+
 it.each([
-  { only: false, pinned: false, retire: true },
-  { only: true, pinned: false, retire: true },
-  { only: false, pinned: true, retire: true },
-  { only: false, pinned: true, retire: false }
+  { only: false, pinned: false, retire: true, n: 0 },
+  { only: true, pinned: false, retire: true, n: 0 },
+  { only: false, pinned: true, retire: true, n: 0 },
+  { only: false, pinned: true, retire: false, n: 0 },
+  ...[32, 320].map((n) => ({ only: false, pinned: false, retire: true, n }))
 ])(
-  'preserves current headless placement and pin partitions ($only/$pinned/$retire)',
-  async ({ only, pinned, retire }) => {
-    const runtime = new OrcaRuntimeService(store)
-    const chat = (id: string): RuntimeMobileSessionSnapshotTab => ({
-      type: 'agent-session',
+  'preserves current headless placement and pin partitions ($only/$pinned/$retire/$n)',
+  async ({ only, pinned, retire, n }) => {
+    const runtimeStore: typeof store & Parameters<typeof withRuntimePaneAdmission>[0] = { ...store }
+    profile.announceSessionWrites(runtimeStore)
+    const session = profile.asProfileSessionStore(runtimeStore, 'local')
+    withRuntimePaneAdmission(runtimeStore)
+    const runtime = new OrcaRuntimeService(runtimeStore)
+    const [A, C, B, U, D] = ['A', 'C', 'B', 'U', 'D'].map((id) => `agent-session:${id}`)
+    const chat = (id: string) => ({
+      type: 'agent-session' as const,
       id,
-      sessionId: id,
-      agent: 'codex',
+      sessionId: id.slice(14),
+      agent: 'codex' as const,
       title: id,
       isActive: false,
-      isPinned: pinned && ['A', 'C', 'B'].includes(id)
+      isPinned: pinned && [A, C, B].includes(id)
     })
-    const source = only ? ['C'] : pinned ? ['A', 'C', 'B', 'U'] : ['A', 'C', 'B']
-    const initial: RuntimeMobileSessionTabsSnapshot = {
+    const source = n
+      ? Array.from({ length: n }, (_, i) => (i === n / 2 ? C : `agent-session:old-${i}`))
+      : only
+        ? [C]
+        : pinned
+          ? [A, C, B, U]
+          : [A, C, B]
+    const current = Array.from({ length: n }, (_, i) => `agent-session:current-${i}`)
+    const work = observeSessionTabPlacementWork()
+    const snapshot = (left = source, snapshotVersion = 1): RuntimeMobileSessionTabsSnapshot => ({
       worktree: WT,
       publicationEpoch: 'headless:test',
-      snapshotVersion: 1,
+      snapshotVersion,
       activeGroupId: 'R',
-      activeTabId: 'D',
+      activeTabId: D,
       activeTabType: 'agent-session',
-      tabs: [...source, 'D'].map(chat),
+      tabs: [...left, D].map(chat),
       tabGroups: [
-        { id: 'L', activeTabId: 'C', tabOrder: source },
-        { id: 'R', activeTabId: 'D', tabOrder: ['D'] }
+        { id: 'L', activeTabId: left.includes(C) ? C : left[0], tabOrder: left },
+        { id: 'R', activeTabId: D, tabOrder: [D] }
       ]
-    }
-    runtime.syncWindowGraph(0, { tabs: [], leaves: [], mobileSessionTabs: [initial] })
+    })
+    const savedChat = (id: string) => ({
+      id,
+      entityId: chat(id).sessionId,
+      kind: 'agent-session' as const,
+      entry: { agentSessionAgent: 'codex' as const, isPinned: chat(id).isPinned }
+    })
+    const saved = addWorkspace(session.get('local'), WT, [
+      { id: 'L', tabs: source.map(savedChat), activeTabId: C },
+      { id: 'R', tabs: [savedChat(D)] }
+    ])
+    saved.activeGroupIdByWorktree![WT] = 'R'
+    session.set(saved, 'local')
+    runtime.syncWindowGraph(0, { tabs: [], leaves: [], mobileSessionTabs: [snapshot()] })
     runtime.setPtyController({
       spawn: vi.fn(async () => {
-        if (retire) {
-          expect(runtime.retireStructuredAgentSessionTabFromSnapshot('C')).toBe(true)
+        const closed = (n ? source : retire ? [C] : []).map(chat)
+        const changed = withChatTabChanges('local', session.get('local'), WT, [
+          ...current.map((id, i) => ({
+            open: {
+              sessionId: chat(id).sessionId,
+              agent: 'codex' as const,
+              tabId: id,
+              placement: { groupId: 'L', afterTabId: source[i] }
+            }
+          })),
+          ...closed.map(({ sessionId: close }) => ({ close }))
+        ])
+        if (changed) {
+          session.set(changed, 'local')
+        }
+        for (const { sessionId } of closed) {
+          expect(runtime.retireStructuredAgentSessionTabFromSnapshot(sessionId)).toBe(true)
+        }
+        if (n) {
+          runtime.syncWindowGraph(0, {
+            tabs: [],
+            leaves: [],
+            mobileSessionTabs: [snapshot(current, n + 2)]
+          })
         }
         await runtime.publishStructuredAgentSessionTab({
           workspaceId: WT,
@@ -58,23 +110,25 @@ it.each([
       getForegroundProcess: async () => null
     })
     const created = await runtime.createMobileSessionTerminal(`id:${WT}`, {
-      afterTabId: 'C',
+      afterTabId: C,
       targetGroupId: 'L',
       command: 'codex resume conversation',
       activate: false
     })
     const result = await runtime.listMobileSessionTabs(`id:${WT}`)
-    expect(result.tabs.some((tab) => tab.id === 'C')).toBe(!retire)
+    expect(result.tabs.some((tab) => tab.id === C)).toBe(!retire)
     expect(
       result.tabs.some((tab) => tab.type === 'agent-session' && tab.sessionId === 'concurrent')
     ).toBe(true)
     if (!only) {
       expect(result.tabGroups?.find((group) => group.id === 'L')?.tabOrder).toEqual(
-        pinned
-          ? ['A', ...(!retire ? ['C'] : []), 'B', created.tab.parentTabId, 'U']
-          : ['A', created.tab.parentTabId, 'B']
+        n
+          ? [...current.slice(0, n / 2 + 1), created.tab.parentTabId, ...current.slice(n / 2 + 1)]
+          : pinned
+            ? [A, ...(!retire ? [C] : []), B, created.tab.parentTabId, U]
+            : [A, created.tab.parentTabId, B]
       )
-      expect(result.tabGroups?.find((group) => group.id === 'R')?.tabOrder).toContain('D')
+      expect(result.tabGroups?.find((group) => group.id === 'R')?.tabOrder).toContain(D)
     } else {
       expect(
         result.tabGroups?.some((group) => group.tabOrder.includes(created.tab.parentTabId))
@@ -82,5 +136,12 @@ it.each([
     }
     const refreshed = await runtime.listMobileSessionTabs(`id:${WT}`)
     expect(refreshed.tabGroups).toEqual(result.tabGroups)
+    if (n) {
+      console.info('HOST_PLACEMENT_WORK', JSON.stringify({ n, samples: work.samples }))
+      expect(work.samples.length).toBeGreaterThan(0)
+      for (const sample of work.samples) {
+        expect(sample.reads + sample.adds + sample.has).toBeLessThanOrEqual(12 * n + 32)
+      }
+    }
   }
 )
diff --git a/src/main/runtime/structured-agent-session-windowless-layout-host.test.ts b/src/main/runtime/structured-agent-session-windowless-layout-host.test.ts
index a6c94c612496..a9a5ffb09577 100644
--- a/src/main/runtime/structured-agent-session-windowless-layout-host.test.ts
+++ b/src/main/runtime/structured-agent-session-windowless-layout-host.test.ts
@@ -1,9 +1,19 @@
+import { isAgentSessionProviderHandleChain } from '../../shared/agent-session-provider-handle'
+import { codexProviderHandle } from '../../shared/agent-session-provider-handle-encoding'
+import { publishCommittedPtySpawn } from '../ipc/pty/spawn-commit-publication'
+import type { PtySpawnCommitInput } from '../ipc/pty/spawn-commit-assembly'
+import { createRuntimePtySpawnState } from '../ipc/pty/runtime/spawn-state'
+import type { PtyRuntimeControllerDeps } from '../ipc/pty/runtime/controller-deps'
+import { unregisterPty } from '../memory/pty-registry'
+import { AgentSessionStoreTransactions } from './agent-session-store-transactions'
+import * as storeDraft from './agent-session-store-draft'
+import * as storeRows from './agent-session-record-rows'
 // A windowless host's saved chat tab against a real chat host: the index hiding a chat reaches the
 // runtime and takes the tab out of the layout, and a chat whose record is gone loses its tab.
 import { mkdtemp, rm } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
-import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import {
   agentSessionLeaseFixture,
   agentSessionRecordFixture
@@ -12,7 +22,10 @@ import { structuredAgentSessionTabId } from '../../shared/structured-agent-sessi
 import type { WorkspaceSessionState } from '../../shared/workspace-session-state-types'
 import { closeTestJournalHostDatabases } from '../native-chat/agent-session-journal/journal-host-database-test-support'
 import { recordingStructuredAgentSessionLogger } from '../native-chat/agent-session-wire/structured-agent-session-logger-test-support'
-import { seedTestAgentSessionRecordStore } from './agent-session-record-store-test-harness'
+import {
+  readPersistedTestAgentSessionStore,
+  seedTestAgentSessionRecordStore
+} from './agent-session-record-store-test-harness'
 import { OrcaRuntimeService } from './orca-runtime'
 import { withChatTabChanges } from './agent-session-tab-layout'
 import {
@@ -106,7 +119,7 @@ async function runtimeWithSavedChats(
     })
   }
   await settled()
-  return { runtime, state }
+  return { runtime, state, store }
 }
 
 function installHost(runtime: OrcaRuntimeService) {
@@ -284,3 +297,144 @@ describe('a windowless chat tab against the chat host', () => {
     expect(savedChatIds(state)).toEqual([CHAT_GONE, CHAT_B])
   })
 })
+
+it.each([
+  [8, 1],
+  [80, 1],
+  [256, 1],
+  [8, 10]
+])('measures retirement at %i links/%i sessions', async (k, sessions) => {
+  const record = released(CHAT_A)
+  record.provider = 'codex'
+  const handle = codexProviderHandle('88888888-8888-4888-8888-888888888888')
+  record.providerHandleChain = Array.from({ length: k }, (_, index) => ({
+    linkId: `link-${index}`,
+    origin: index === 0 ? 'created' : 'resumed',
+    mintedAtFence: index + 1,
+    observedAt: index + 1,
+    handle
+  }))
+  record.lease = { ...record.lease, runtimeFence: k, provenHandleLinkId: `link-${k - 1}` }
+  expect(isAgentSessionProviderHandleChain(record.providerHandleChain)).toBe(true)
+  const ids = Array.from({ length: sessions }, (_, i) => (i ? `chat-matching-${i}` : CHAT_A))
+  const records = ids.map((sessionId) => ({
+    ...record,
+    sessionId,
+    lease: { ...record.lease, sessionId }
+  }))
+  await seedTestAgentSessionRecordStore(root, {
+    records: [...records, released(CHAT_B)],
+    sessionTabs: shown(...ids, CHAT_B)
+  })
+  const { runtime, state, store } = await runtimeWithSavedChats([...ids, CHAT_B])
+  for (let index = 0; index < 3; index += 1) {
+    await runtime.publishStructuredAgentSessionTab({
+      workspaceId: `other-${index}`,
+      sessionId: CHAT_B,
+      agent: 'codex',
+      activate: false
+    })
+  }
+  const host = await installHost(runtime)
+  const probes = {
+    visibility: vi.spyOn(host, 'setSessionTabVisibility'),
+    transactions: vi.spyOn(AgentSessionStoreTransactions.prototype, 'transact'),
+    drafts: vi.spyOn(storeDraft, 'draftAgentSessionStoreState'),
+    differences: vi.spyOn(storeDraft, 'agentSessionStoreDraftRowWrites'),
+    changedRowCommits: vi.spyOn(storeRows, 'writeAgentSessionStoreRows'),
+    hidden: vi.spyOn(runtime, 'onStructuredSessionTabHidden'),
+    savedWrites: vi.spyOn(store, 'setWorkspaceSession'),
+    layoutCommands: vi.spyOn(store, 'applyLayoutCommand'),
+    retirement: vi.spyOn(runtime, 'retireStructuredAgentSessionTabFromSnapshot')
+  }
+  const publications = vi.fn()
+  const unsubscribe = runtime.onMobileSessionTabsChanged(publications)
+  const dismissals = vi.spyOn(host.restartResume, 'dismiss')
+  const visits = { recordVisits: 0, snapshotVisits: 0, findVisits: 0 }
+  for (const method of [Symbol.iterator, 'values'] as const) {
+    const original = Map.prototype[method]
+    vi.spyOn(Map.prototype, method).mockImplementation(function* (this: Map<unknown, unknown>) {
+      for (const item of original.call(this)) {
+        const value = method === 'values' ? item : item[1]
+        if (typeof value === 'object' && value !== null) {
+          if ('providerHandleChain' in value) {
+            visits.recordVisits += 1
+          }
+          if ('snapshotVersion' in value && 'tabs' in value) {
+            visits.snapshotVisits += 1
+          }
+        }
+        yield item
+      }
+    })
+  }
+  const find = Array.prototype.find
+  vi.spyOn(Array.prototype, 'find').mockImplementation(function (this: object, predicate, thisArg) {
+    return find.call(this, (value, index, array) => {
+      visits.findVisits += 1
+      return predicate.call(thisArg, value, index, array)
+    })
+  })
+  const reply = {
+    id: `perf-retirement-${k}`,
+    savedResumeDecision: {
+      agent: 'codex' as const,
+      providerSession: { key: 'session_id' as const, id: handle.nativeId },
+      verdict: 'admitted' as const
+    }
+  }
+  const ports = { runtime, sendPtySpawnedToRenderer: vi.fn() }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: this publication uses only these ports; it never starts a process.
+  const spawnState = createRuntimePtySpawnState(ports as PtyRuntimeControllerDeps, {
+    cols: 80,
+    rows: 24,
+    resumeOrigin: 'switch',
+    worktreeId: WT
+  })
+  spawnState.result = reply
+  const commit: PtySpawnCommitInput<typeof reply> = {
+    state: spawnState,
+    nativeWindowsConptySpawn: false,
+    seedPaneKey: null,
+    registration: {
+      store: undefined,
+      worktreeId: WT,
+      shellOverride: undefined,
+      rendererLaunchAuthority: null
+    },
+    preAllocatedHandle: null,
+    paneKey: null,
+    memorySessionId: null,
+    resumeArgvDropped: false,
+    codexLaunchEnv: undefined,
+    initiallyHidden: false,
+    hiddenDelivery: 'runtime-owned',
+    earlyExit: 'throw',
+    joinPayload: { reservation: reply, reply }
+  }
+  const counts = () => ({
+    ...Object.fromEntries(Object.entries(probes).map(([key, spy]) => [key, spy.mock.calls.length])),
+    dismissals: dismissals.mock.calls.length,
+    publications: publications.mock.calls.length,
+    ...visits
+  })
+  try {
+    expect(await publishCommittedPtySpawn(commit)).toBe(reply)
+    const beforeDrain = counts()
+    await Promise.all(dismissals.mock.results.map(({ value }) => value))
+    await settled()
+    const afterDrain = counts()
+    console.info('RETIREMENT_WORK', JSON.stringify({ k, sessions, beforeDrain, afterDrain }))
+    expect(
+      afterDrain.recordVisits + afterDrain.snapshotVisits + afterDrain.findVisits
+    ).toBeLessThanOrEqual(128 * k * sessions * sessions)
+    expect(host.deps.store.getVisibleSessionTabIndex().sessionIds).toEqual([CHAT_B])
+    expect(savedChatIds(state)).toEqual([CHAT_B])
+    expect((await readPersistedTestAgentSessionStore(root)).sessionTabs).toEqual(shown(CHAT_B))
+    expect(host.collaboratorsForTests().sessions.size).toBe(0)
+  } finally {
+    unsubscribe()
+    unregisterPty(reply.id)
+    vi.restoreAllMocks()
+  }
+})
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx
index 3a759d092221..e3ddababfb16 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx
@@ -1,6 +1,12 @@
+import recordedOmpReply from '../../../../main/acp/fixtures/omp-v17-reply-without-thought.jsonl?raw'
+import { SessionNotificationSchema } from '../../../../main/acp/generated/acp-protocol.generated'
+import { makeRepo, makeWorktree } from '../worktree-jump-palette-test-fixtures'
+import { agentSessionTabFixture } from './native-chat-workspace-test-fixtures'
+import * as cliSwitch from '../tab-bar/native-chat-cli-switch-run'
+import { useAppStore } from '@/store'
 // @vitest-environment happy-dom
 
-import { cleanup, render, screen } from '@testing-library/react'
+import { cleanup, fireEvent, render, screen } from '@testing-library/react'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { TooltipProvider } from '@/components/ui/tooltip'
 import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types'
@@ -29,6 +35,7 @@ afterEach(() => {
   cleanup()
   localStorage.clear()
   resetStructuredSessionMocks()
+  vi.restoreAllMocks()
 })
 
 {
@@ -237,3 +244,50 @@ afterEach(() => {
     expect(document.querySelector('[data-native-chat-background-tasks]')).not.toBeNull()
   })
 }
+
+it('keeps the recorded OMP reply readable with its CLI switch unavailable', () => {
+  const frames = recordedOmpReply
+    .trim()
+    .split('\n')
+    .map((line) => SessionNotificationSchema.safeParse(JSON.parse(line).message.params))
+    .flatMap((result) => (result.success ? [result.data] : []))
+  const text = frames
+    .flatMap(({ update }) =>
+      update.sessionUpdate === 'agent_message_chunk' && update.content.type === 'text'
+        ? [update.content.text]
+        : []
+    )
+    .join('')
+  expect(text).toContain('marker recorded')
+  const tab = agentSessionTabFixture('omp-capture', 'wt-1', {
+    agentSessionAgent: 'omp',
+    entityId: frames[0].sessionId
+  })
+  mocks.messages = [{ id: 'recorded-omp', role: 'assistant', blocks: [{ type: 'text', text }] }]
+  useAppStore.setState({
+    settings: { ...useAppStore.getState().settings, experimentalNativeChat: true },
+    repos: [makeRepo()],
+    worktreesByRepo: { 'repo-1': [makeWorktree('wt-1', 'recorded', { path: '/repo' })] },
+    tabsByWorktree: {},
+    unifiedTabsByWorktree: { 'wt-1': [tab] }
+  })
+  const invoke = vi.spyOn(cliSwitch, 'runNativeChatCliSwitch')
+  render(
+    <NativeChatStructuredSession
+      isVisible
+      isFocusedGroup
+      tabId={tab.id}
+      sessionId={tab.entityId}
+      target={{ kind: 'local' }}
+      agent="omp"
+    />,
+    { wrapper: TooltipProvider }
+  )
+  const button = screen.getByRole('button', { name: 'Switch to CLI' })
+  expect(button.hasAttribute('disabled')).toBe(true)
+  fireEvent.click(button)
+  expect(invoke).not.toHaveBeenCalled()
+  expect(mocks.messageListProps).toMatchObject({
+    session: { sessionId: frames[0].sessionId, messages: mocks.messages }
+  })
+})
diff --git a/src/renderer/src/hooks/useIpcEvents-agent-status-batch-projection.test.ts b/src/renderer/src/hooks/useIpcEvents-agent-status-batch-projection.test.ts
index 29e1834d4b71..ef28c30f4265 100644
--- a/src/renderer/src/hooks/useIpcEvents-agent-status-batch-projection.test.ts
+++ b/src/renderer/src/hooks/useIpcEvents-agent-status-batch-projection.test.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import {
   createTestStore,
   makeTab,
@@ -619,4 +619,126 @@ describe('useIpcEvents agent status snapshot integration', () => {
       vi.useRealTimers()
     }
   })
+
+  it.each([16, 160])(
+    'copies startup association entries linearly at %i events with immutable reentry',
+    async (n) => {
+      vi.useFakeTimers()
+      const store = createTestStore()
+      const pane = (i: number) => `rootless:00000000-0000-4000-8000-${String(i).padStart(12, '0')}`
+      store.setState({
+        workspaceSessionReady: true,
+        repos: [TEST_REPO],
+        worktreesByRepo: { [TEST_REPO.id]: [makeWorktree({ id: 'wt', repoId: TEST_REPO.id })] },
+        tabsByWorktree: { wt: [makeTab({ id: 'rootless', worktreeId: 'wt' })] },
+        terminalLayoutsByTabId: {
+          rootless: { root: null, activeLeafId: null, expandedLeafId: null }
+        }
+      })
+      const record = store.getState().recordAgentProviderSession
+      for (let i = 0; i < n; i++) {
+        record(pane(i), 'codex', { key: 'session_id', id: `seed-${i}` }, undefined, {
+          worktreeId: 'wt'
+        })
+      }
+      const initial = Object.freeze(store.getState().agentConversationsByPaneKey)
+      const entries: AgentStatusSetData[] = Array.from({ length: n }, (_, i) => ({
+        paneKey: pane(n + i),
+        state: 'working',
+        prompt: '',
+        agentType: 'codex',
+        providerSessionOnly: i % 2 === 0,
+        worktreeId: 'wt',
+        terminalHandle: `term-${i}`,
+        providerSession: { key: 'session_id', id: `startup-${i}` },
+        receivedAt: 1000,
+        stateStartedAt: 1000
+      }))
+      let copied = 0,
+        enumerated = 0
+      const assign = Object.assign
+      const association = (source: unknown): source is Record<PropertyKey, unknown> =>
+        typeof source === 'object' && source !== null && Object.hasOwn(source, pane(0))
+      vi.spyOn(Object, 'assign').mockImplementation((target, ...sources) =>
+        assign(
+          target,
+          ...sources.map((source) =>
+            association(source)
+              ? new Proxy(source, {
+                  ownKeys(value) {
+                    const found = Reflect.ownKeys(value)
+                    enumerated += found.length
+                    return found
+                  },
+                  get(value, key) {
+                    copied += 1
+                    return value[key]
+                  }
+                })
+              : source
+          )
+        )
+      )
+      const snapshots: (typeof initial)[] = [],
+        order: string[] = []
+      cleanup.push(
+        store.subscribe((state, previous) => {
+          if (state.agentConversationsByPaneKey === previous.agentConversationsByPaneKey) {
+            return
+          }
+          snapshots.push(Object.freeze(state.agentConversationsByPaneKey))
+          order.push('published')
+          if (snapshots.length === 1) {
+            store.getState().transactAgentStatuses((outer) => {
+              store.getState().transactAgentStatuses((inner) => {
+                inner.apply({
+                  kind: 'providerSession',
+                  paneKey: pane(2 * n - 1),
+                  agent: 'codex',
+                  providerSession: { key: 'session_id', id: 'reentered' },
+                  timing: { updatedAt: 2000 },
+                  routing: { worktreeId: 'wt' }
+                })
+                inner.afterCommit(() => order.push('inner'))
+              })
+              outer.afterCommit(() => order.push('outer'))
+            })
+          }
+        })
+      )
+      const snapshot = vi.fn(async () => entries)
+      vi.doMock('../store', () => ({
+        useAppStore: { getState: store.getState, subscribe: store.subscribe }
+      }))
+      stubAuxiliaryModules()
+      vi.stubGlobal('window', buildWindowApi({ onSet: () => () => {}, getSnapshot: snapshot }))
+      const { registerAgentStatusIpcBridge } = await import('./ipc-events/agent-status-ipc-bridge')
+      const unsubs: (() => void)[] = []
+      const bridge = registerAgentStatusIpcBridge(unsubs)
+      cleanup.push(bridge.disposeAsyncState, bridge.unsubscribeStore, ...unsubs)
+      await vi.advanceTimersByTimeAsync(0)
+      console.info('STARTUP_ASSOCIATION_WORK', { n, copied, enumerated })
+      expect(snapshot).toHaveBeenCalledOnce()
+      expect(snapshots).toHaveLength(2)
+      expect(order).toEqual(['published', 'published', 'inner', 'outer'])
+      expect(Object.keys(initial)).toEqual(Array.from({ length: n }, (_, i) => pane(i)))
+      expect(Object.keys(snapshots[0])).toEqual(Array.from({ length: 2 * n }, (_, i) => pane(i)))
+      expect(snapshots[0][pane(2 * n - 1)].providerSession.id).toBe(`startup-${n - 1}`)
+      expect(snapshots[1][pane(2 * n - 1)].providerSession.id).toBe('reentered')
+      expect(snapshots[0]).not.toBe(snapshots[1])
+      expect(Object.keys(snapshots[1])).toEqual(Object.keys(snapshots[0]))
+      expect(copied).toBe(3 * n)
+      expect(enumerated).toBe(3 * n)
+    }
+  )
+})
+
+const cleanup: (() => void)[] = []
+afterEach(() => {
+  for (const close of cleanup.splice(0).toReversed()) {
+    close()
+  }
+  vi.restoreAllMocks()
+  vi.useRealTimers()
+  vi.unstubAllGlobals()
 })
diff --git a/src/renderer/src/runtime/web-runtime-terminal-switch-placement.test.ts b/src/renderer/src/runtime/web-runtime-terminal-switch-placement.test.ts
index a3346b1c9b03..f6d2300c6e1d 100644
--- a/src/renderer/src/runtime/web-runtime-terminal-switch-placement.test.ts
+++ b/src/renderer/src/runtime/web-runtime-terminal-switch-placement.test.ts
@@ -1,5 +1,6 @@
+import { observeSessionTabPlacementWork } from '../../../shared/session-tab-placement-work.test-fixture'
 // @vitest-environment happy-dom
-import { beforeEach, expect, it, vi } from 'vitest'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import { useAppStore } from '@/store'
 import type { RuntimeMobileSessionTabsResult } from '../../../shared/runtime-types'
 import { createGlobalSettingsFixture } from '../../../shared/global-settings-test-fixture'
@@ -20,7 +21,7 @@ const chat = (id: string) => ({
   isActive: false
 })
 let frame: RuntimeMobileSessionTabsResult
-beforeEach(() => {
+function resetFrame(n = 0) {
   resetWebSessionTabsSnapshotFreshnessForTests()
   useAppStore.setState(useAppStore.getInitialState(), true)
   useAppStore.setState({
@@ -31,6 +32,9 @@ beforeEach(() => {
       activeRuntimeEnvironmentId: ENV
     })
   })
+  const source = n
+    ? Array.from({ length: n }, (_, i) => (i === n / 2 ? 'C' : `old-${i}`))
+    : ['A', 'C', 'B']
   frame = {
     worktree: WT,
     publicationEpoch: 'host-placement',
@@ -38,21 +42,33 @@ beforeEach(() => {
     activeGroupId: 'R',
     activeTabId: 'agent-session:D',
     activeTabType: 'agent-session',
-    tabs: ['A', 'C', 'B', 'D'].map(chat),
+    tabs: [...source, 'D'].map(chat),
     tabGroups: [
       {
         id: 'L',
         activeTabId: 'agent-session:C',
-        tabOrder: ['A', 'C', 'B'].map((id) => `agent-session:${id}`)
+        tabOrder: source.map((id) => `agent-session:${id}`)
       },
       { id: 'R', activeTabId: 'agent-session:D', tabOrder: ['agent-session:D'] }
     ]
   }
   useAppStore.setState((state) => applyWebSessionTabsSnapshot(state, frame, ENV))
-})
-it.each([false, true])(
-  'keeps client neighbors and pin partitions through early retirement and refresh (pinned: %s)',
-  async (pinned) => {
+}
+beforeEach(() => resetFrame())
+afterEach(() => vi.restoreAllMocks())
+it.each([
+  { pinned: false, n: 0 },
+  { pinned: true, n: 0 },
+  { pinned: false, n: 32 },
+  { pinned: false, n: 320 }
+])(
+  'keeps client neighbors and pin partitions through early retirement and refresh (pinned: $pinned/$n)',
+  async ({ pinned, n }) => {
+    const current = Array.from({ length: n }, (_, i) => `current-${i}`)
+    if (n) {
+      resetFrame(n)
+    }
+    const work = observeSessionTabPlacementWork()
     if (pinned) {
       frame = {
         ...frame,
@@ -79,7 +95,9 @@ it.each([false, true])(
           ...frame,
           snapshotVersion: frame.snapshotVersion + 1,
           tabs: [
-            ...frame.tabs.filter((tab) => tab.id !== 'agent-session:C'),
+            ...(n
+              ? [...current, 'D'].map(chat)
+              : frame.tabs.filter((tab) => tab.id !== 'agent-session:C')),
             {
               type: 'terminal',
               id: 'T::leaf',
@@ -96,8 +114,9 @@ it.each([false, true])(
               id: 'L',
               activeTabId: 'T',
               tabOrder: [
-                'agent-session:A',
-                'agent-session:B',
+                ...(n
+                  ? current.map((id) => `agent-session:${id}`)
+                  : ['agent-session:A', 'agent-session:B']),
                 'T',
                 ...(pinned ? ['agent-session:U'] : [])
               ]
@@ -144,21 +163,30 @@ it.each([false, true])(
     const order = () =>
       useAppStore.getState().groupsByWorktree[WT].find((group) => group.id === sourceGroup)!
         .tabOrder
-    expect(order()).toEqual([
-      'structured-agent-session-A',
-      ...(pinned ? ['structured-agent-session-B'] : []),
-      toWebTerminalSurfaceTabId('T'),
-      ...(pinned ? ['structured-agent-session-U'] : ['structured-agent-session-B']),
-      'concurrent'
-    ])
+    const expected = n
+      ? [
+          ...current.slice(0, n / 2 + 1).map((id) => `structured-agent-session-${id}`),
+          toWebTerminalSurfaceTabId('T'),
+          ...current.slice(n / 2 + 1).map((id) => `structured-agent-session-${id}`),
+          'concurrent'
+        ]
+      : [
+          'structured-agent-session-A',
+          ...(pinned ? ['structured-agent-session-B'] : []),
+          toWebTerminalSurfaceTabId('T'),
+          ...(pinned ? ['structured-agent-session-U'] : ['structured-agent-session-B']),
+          'concurrent'
+        ]
+    expect(order()).toEqual(expected)
     expect(useAppStore.getState().activeGroupIdByWorktree[WT]).toBe(sourceGroup)
+    if (n) {
+      console.info('PAIRED_PLACEMENT_WORK', JSON.stringify({ n, samples: work.samples }))
+      expect(work.samples.length).toBeGreaterThan(0)
+      for (const sample of work.samples) {
+        expect(sample.reads + sample.adds + sample.has).toBeLessThanOrEqual(12 * n + 32)
+      }
+    }
     await refreshWebRuntimeSessionTabsSnapshot(ENV, WT, { acceptCurrentSnapshot: true })
-    expect(order()).toEqual([
-      'structured-agent-session-A',
-      ...(pinned ? ['structured-agent-session-B'] : []),
-      toWebTerminalSurfaceTabId('T'),
-      ...(pinned ? ['structured-agent-session-U'] : ['structured-agent-session-B']),
-      'concurrent'
-    ])
+    expect(order()).toEqual(expected)
   }
 )
diff --git a/src/renderer/src/store/slices/agent-pane-conversation.ts b/src/renderer/src/store/slices/agent-pane-conversation.ts
index 7c4bc5664496..5e32cac8bccb 100644
--- a/src/renderer/src/store/slices/agent-pane-conversation.ts
+++ b/src/renderer/src/store/slices/agent-pane-conversation.ts
@@ -21,7 +21,10 @@ export function projectAgentPaneConversation(
   entry: Pick<
     AgentStatusEntry,
     'paneKey' | 'agentType' | 'providerSession' | 'worktreeId' | 'connectionId'
-  >
+  >,
+  copy: (
+    entries: AppState['agentConversationsByPaneKey']
+  ) => AppState['agentConversationsByPaneKey'] = (entries) => ({ ...entries })
 ): AppState['agentConversationsByPaneKey'] {
   const current = state.agentConversationsByPaneKey
   const previous = current[entry.paneKey]
@@ -34,7 +37,7 @@ export function projectAgentPaneConversation(
     if (!previous || previous.agent === agent) {
       return current
     }
-    const next = { ...current }
+    const next = copy(current)
     delete next[entry.paneKey]
     return next
   }
@@ -49,15 +52,19 @@ export function projectAgentPaneConversation(
   ) {
     return current
   }
-  return {
-    ...current,
-    [entry.paneKey]: {
+  const next = copy(current)
+  Object.defineProperty(next, entry.paneKey, {
+    value: {
       paneKey: entry.paneKey,
       worktreeId,
       executionHostId,
       connectionId,
       agent,
       providerSession: entry.providerSession
-    }
-  }
+    },
+    writable: true,
+    enumerable: true,
+    configurable: true
+  })
+  return next
 }
diff --git a/src/renderer/src/store/slices/agent-status-live-actions.ts b/src/renderer/src/store/slices/agent-status-live-actions.ts
index 03b64af2dbbd..b307a2ba8ecb 100644
--- a/src/renderer/src/store/slices/agent-status-live-actions.ts
+++ b/src/renderer/src/store/slices/agent-status-live-actions.ts
@@ -32,6 +32,7 @@ export function createAgentStatusLiveActions(
   runtime: AgentStatusRuntime
 ): Pick<AgentStatusSlice, 'setAgentStatus' | 'setAgentStatuses' | 'transactAgentStatuses'> {
   const {
+    projectConversation,
     get,
     set,
     applyGeneratedTabTitleUpdate,
@@ -105,7 +106,7 @@ export function createAgentStatusLiveActions(
         return state
       }
       const previousEntries = state.agentStatusByPaneKey
-      const reduction = reduceAgentStatusLiveUpdate(state, built, updatedAt)
+      const reduction = reduceAgentStatusLiveUpdate(state, built, updatedAt, projectConversation)
       liveEntryDelta = {
         previousEntries,
         nextEntries: reduction.patch.agentStatusByPaneKey ?? previousEntries,
diff --git a/src/renderer/src/store/slices/agent-status-live-reducer.ts b/src/renderer/src/store/slices/agent-status-live-reducer.ts
index c3696cf1e9b7..1bcd35252e8e 100644
--- a/src/renderer/src/store/slices/agent-status-live-reducer.ts
+++ b/src/renderer/src/store/slices/agent-status-live-reducer.ts
@@ -22,7 +22,8 @@ export type AgentStatusLiveUpdateReduction = {
 export function reduceAgentStatusLiveUpdate(
   state: AppState,
   build: AgentStatusLiveEntryBuild,
-  updatedAt: number
+  updatedAt: number,
+  projectConversation = projectAgentPaneConversation
 ): AgentStatusLiveUpdateReduction {
   const {
     entry,
@@ -111,7 +112,7 @@ export function reduceAgentStatusLiveUpdate(
   }
   const patch: Partial<AppState> = {
     agentStatusByPaneKey: nextLive,
-    agentConversationsByPaneKey: projectAgentPaneConversation(state, entry),
+    agentConversationsByPaneKey: projectConversation(state, entry),
     retainedAgentsByPaneKey: nextRetainedAgents,
     sleepingAgentSessionsByPaneKey: nextSleepingAgentSessions,
     agentLaunchConfigByPaneKey: nextLaunchConfigs,
diff --git a/src/renderer/src/store/slices/agent-status-provider-session-actions.ts b/src/renderer/src/store/slices/agent-status-provider-session-actions.ts
index 821c84e8c1ff..7cce49353d00 100644
--- a/src/renderer/src/store/slices/agent-status-provider-session-actions.ts
+++ b/src/renderer/src/store/slices/agent-status-provider-session-actions.ts
@@ -1,4 +1,3 @@
-import { projectAgentPaneConversation } from './agent-pane-conversation'
 import type { AgentStatusSlice } from './agent-status-slice-contract'
 import type { AgentStatusRuntime } from './agent-status-runtime'
 import type {
@@ -28,7 +27,7 @@ import { settleAttentionRemovedBy } from './workspace-attention/attention-remova
 export function createAgentStatusProviderSessionActions(
   runtime: AgentStatusRuntime
 ): Pick<AgentStatusSlice, 'recordAgentProviderSession'> {
-  const { get, set, requestFreshness } = runtime
+  const { get, set, requestFreshness, projectConversation } = runtime
   return {
     recordAgentProviderSession: (
       paneKey: string,
@@ -152,7 +151,7 @@ export function createAgentStatusProviderSessionActions(
           }
           return {
             agentStatusByPaneKey: nextLive,
-            agentConversationsByPaneKey: projectAgentPaneConversation(s, {
+            agentConversationsByPaneKey: projectConversation(s, {
               ...record,
               agentType: agent
             }),
diff --git a/src/renderer/src/store/slices/agent-status-provider-session.test.ts b/src/renderer/src/store/slices/agent-status-provider-session.test.ts
index ece019e97107..e2e44fea3411 100644
--- a/src/renderer/src/store/slices/agent-status-provider-session.test.ts
+++ b/src/renderer/src/store/slices/agent-status-provider-session.test.ts
@@ -1,3 +1,6 @@
+import { normalizeHookPayload } from '../../../../shared/agent-hook-listener'
+import { createHookListenerState } from '../../../../shared/agent-hook-listener/listener-state'
+import { applyProviderSessionOnlyUpdate } from '../../hooks/ipc-events/agent-status-partial-updates'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import type { SleepingAgentSessionRecord } from '../../../../shared/agent-session-resume'
 import type { AppState } from '../types'
@@ -803,3 +806,39 @@ describe('sleepingAgentSessionsByPaneKey after reminted-hook settlement', () =>
     )
   })
 })
+
+it('retains recorded Jcode session-start identity without a status row', () => {
+  const store = createTestStore()
+  seedStore(store, { tabsByWorktree: { 'wt-1': [makeTab({ id: 'tab-1', worktreeId: 'wt-1' })] } })
+  const paneKey = 'tab-1:11111111-1111-4111-8111-111111111111'
+  // Jcode 0.87.1 captured input; agent-hook-listener-jcode.test.ts pins provenance.
+  const payload = {
+    hook_event_name: 'session_start',
+    event: 'session_start',
+    session_id: 'session_jc_5',
+    model: 'claude-haiku-4-5',
+    source: 'create'
+  }
+  const event = normalizeHookPayload(
+    createHookListenerState(),
+    'jcode',
+    { paneKey, payload },
+    'production'
+  )
+  if (!event) {
+    throw new Error('Recorded session_start was rejected')
+  }
+  expect(event.providerSessionOnly).toBe(true)
+  applyProviderSessionOnlyUpdate({
+    store: store.getState(),
+    batch: undefined,
+    paneKey,
+    routing: { tabId: 'tab-1', worktreeId: 'wt-1' },
+    data: { ...event, ...event.payload, receivedAt: 1, stateStartedAt: 1 }
+  })
+  expect(store.getState().agentStatusByPaneKey).toEqual({})
+  expect(store.getState().agentConversationsByPaneKey[paneKey]).toMatchObject({
+    agent: 'jcode',
+    providerSession: { key: 'session_id', id: 'session_jc_5' }
+  })
+})
diff --git a/src/renderer/src/store/slices/agent-status-runtime.ts b/src/renderer/src/store/slices/agent-status-runtime.ts
index 9e6a37a312ce..a4184e9120c3 100644
--- a/src/renderer/src/store/slices/agent-status-runtime.ts
+++ b/src/renderer/src/store/slices/agent-status-runtime.ts
@@ -1,3 +1,4 @@
+import { projectAgentPaneConversation } from './agent-pane-conversation'
 import type { StateCreator } from 'zustand'
 import type { AppState } from '../types'
 import type { AgentStatusBatchTransaction, AgentStatusBatchUpdate } from './agent-status-contract'
@@ -11,6 +12,7 @@ export type AgentStatusStateUpdate =
   | ((state: AppState) => AppState | Partial<AppState>)
 
 export type AgentStatusRuntime = {
+  projectConversation: typeof projectAgentPaneConversation
   get: () => AppState
   set: (update: AgentStatusStateUpdate) => void
   runAfterCommit: (effect: () => void) => void
@@ -40,6 +42,19 @@ export function createAgentStatusRuntime(
   let batchedGeneratedTabTitleUpdates: GeneratedTabTitleUpdate[] | null = null
   let batchedAgentStatusFreshnessRequested = false
   const get = (): AppState => batchedAgentStatusState ?? storeGet()
+  let conversationDraft: AppState['agentConversationsByPaneKey'] | null = null
+  const projectConversation: typeof projectAgentPaneConversation = (state, entry) =>
+    projectAgentPaneConversation(state, entry, (entries) => {
+      if (!batchedAgentStatusState) {
+        return { ...entries }
+      }
+      const next =
+        entries === conversationDraft
+          ? entries
+          : Object.setPrototypeOf(Object.assign(Object.create(null), entries), Object.prototype)
+      conversationDraft = next
+      return next
+    })
 
   // Deliberately narrower than zustand's `set`: no `replace` parameter, so no call site in
   // this slice can compile into a REPLACE the batch commit is unable to express.
@@ -148,6 +163,7 @@ export function createAgentStatusRuntime(
       const generatedTabTitleUpdates = batchedGeneratedTabTitleUpdates
       const freshnessRequested = batchedAgentStatusFreshnessRequested
       const hasStagedWrites = batchedAgentStatusRevision !== revisionAtStart
+      conversationDraft = null
       batchedAgentStatusState = null
       batchedAgentStatusTouchedKeys = null
       batchedAgentStatusEffects = null
@@ -167,6 +183,7 @@ export function createAgentStatusRuntime(
       }
       return result
     } finally {
+      conversationDraft = null
       batchedAgentStatusState = null
       batchedAgentStatusTouchedKeys = null
       batchedAgentStatusEffects = null
@@ -223,6 +240,7 @@ export function createAgentStatusRuntime(
   }
 
   return {
+    projectConversation,
     get,
     set,
     runAfterCommit,
diff --git a/src/shared/session-tab-placement-work.test-fixture.ts b/src/shared/session-tab-placement-work.test-fixture.ts
new file mode 100644
index 000000000000..7f769ca80cdb
--- /dev/null
+++ b/src/shared/session-tab-placement-work.test-fixture.ts
@@ -0,0 +1,54 @@
+import { vi } from 'vitest'
+import * as placement from './session-tab-placement'
+
+export function observeSessionTabPlacementWork() {
+  const samples: { reads: number; adds: number; has: number }[] = []
+  function measure<T>(work: () => T): T {
+    const count = { reads: 0, adds: 0, has: 0 }
+    const { includes, indexOf } = Array.prototype
+    const { add, has } = Set.prototype
+    const receiver = (array: unknown[]) =>
+      new Proxy(array, {
+        get(target, key) {
+          if (key === 'length') {
+            return target.length
+          }
+          if (typeof key !== 'string' || !/^\d+$/.test(key)) {
+            return undefined
+          }
+          count.reads += 1
+          return target[Number(key)]
+        }
+      })
+    Array.prototype.includes = function (value, from) {
+      return includes.call(receiver(this), value, from)
+    }
+    Array.prototype.indexOf = function (value, from) {
+      return indexOf.call(receiver(this), value, from)
+    }
+    Set.prototype.add = function (value) {
+      count.adds += 1
+      return add.call(this, value)
+    }
+    Set.prototype.has = function (value) {
+      count.has += 1
+      return has.call(this, value)
+    }
+    try {
+      return work()
+    } finally {
+      Object.assign(Array.prototype, { includes, indexOf })
+      Object.assign(Set.prototype, { add, has })
+      samples.push(count)
+    }
+  }
+  const created = placement.placeCreatedSessionTab
+  const unpinned = placement.placeUnpinnedSessionTabAtCapture
+  vi.spyOn(placement, 'placeCreatedSessionTab').mockImplementation((...args) =>
+    measure(() => created(...args))
+  )
+  vi.spyOn(placement, 'placeUnpinnedSessionTabAtCapture').mockImplementation((...args) =>
+    measure(() => unpinned(...args))
+  )
+  return { samples }
+}
diff --git a/src/shared/session-tab-placement.ts b/src/shared/session-tab-placement.ts
index f1bbcbec9dcb..0727f809675c 100644
--- a/src/shared/session-tab-placement.ts
+++ b/src/shared/session-tab-placement.ts
@@ -23,8 +23,9 @@ export function placeSessionTabAtCapture(
   captured: CapturedSessionTabPlacement
 ): string[] {
   const next = order.filter((id) => id !== createdId)
-  const previous = captured.preceding.toReversed().find((id) => next.includes(id))
-  const following = captured.following.find((id) => next.includes(id))
+  const present = new Set(next)
+  const previous = captured.preceding.toReversed().find((id) => present.has(id))
+  const following = captured.following.find((id) => present.has(id))
   const index =
     following !== undefined
       ? next.indexOf(following)

From c646ee027de8a1eb27c81568570457ff8398b9d8 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 23 Oct 2026 17:07:12 -0700
Subject: [PATCH 064/207] Use an array-like receiver in retirement
 instrumentation

Describe the native find observer receiver with ArrayLike<unknown> while preserving its forwarding, counters and assertions.
---
 .../structured-agent-session-windowless-layout-host.test.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/runtime/structured-agent-session-windowless-layout-host.test.ts b/src/main/runtime/structured-agent-session-windowless-layout-host.test.ts
index a9a5ffb09577..5a7bb325fe3d 100644
--- a/src/main/runtime/structured-agent-session-windowless-layout-host.test.ts
+++ b/src/main/runtime/structured-agent-session-windowless-layout-host.test.ts
@@ -369,7 +369,11 @@ it.each([
     })
   }
   const find = Array.prototype.find
-  vi.spyOn(Array.prototype, 'find').mockImplementation(function (this: object, predicate, thisArg) {
+  vi.spyOn(Array.prototype, 'find').mockImplementation(function (
+    this: ArrayLike<unknown>,
+    predicate,
+    thisArg
+  ) {
     return find.call(this, (value, index, array) => {
       visits.findVisits += 1
       return predicate.call(thisArg, value, index, array)

From d007f3373ebcf04027314f5686a22ec6e073e25c Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 23 Oct 2026 17:42:22 -0700
Subject: [PATCH 065/207] Correct types and fixtures in conversation contract
 tests

Return the native iterator completion explicitly, reuse complete publication dependencies, and validate recorded text at the renderer consumer boundary with complete settings.
---
 .../pty-spawn-commit-dependencies-fixture.ts  |  2 +-
 ...ent-session-windowless-layout-host.test.ts |  8 ++---
 ...ucturedSession.history-read-state.test.tsx | 30 +++++++++----------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/main/persistence/loading-store/pty-spawn-commit-dependencies-fixture.ts b/src/main/persistence/loading-store/pty-spawn-commit-dependencies-fixture.ts
index e45b6350842e..52dd633fd83d 100644
--- a/src/main/persistence/loading-store/pty-spawn-commit-dependencies-fixture.ts
+++ b/src/main/persistence/loading-store/pty-spawn-commit-dependencies-fixture.ts
@@ -9,7 +9,7 @@ function unexpectedPreflight(): never {
 
 export function createPtySpawnCommitDependencies(
   runtime: OrcaRuntimeService,
-  store: Store
+  store?: Store
 ): PtySpawnIpcDeps & PtyRuntimeControllerDeps {
   return {
     runtime,
diff --git a/src/main/runtime/structured-agent-session-windowless-layout-host.test.ts b/src/main/runtime/structured-agent-session-windowless-layout-host.test.ts
index 5a7bb325fe3d..a72617dbce78 100644
--- a/src/main/runtime/structured-agent-session-windowless-layout-host.test.ts
+++ b/src/main/runtime/structured-agent-session-windowless-layout-host.test.ts
@@ -3,7 +3,7 @@ import { codexProviderHandle } from '../../shared/agent-session-provider-handle-
 import { publishCommittedPtySpawn } from '../ipc/pty/spawn-commit-publication'
 import type { PtySpawnCommitInput } from '../ipc/pty/spawn-commit-assembly'
 import { createRuntimePtySpawnState } from '../ipc/pty/runtime/spawn-state'
-import type { PtyRuntimeControllerDeps } from '../ipc/pty/runtime/controller-deps'
+import { createPtySpawnCommitDependencies } from '../persistence/loading-store/pty-spawn-commit-dependencies-fixture'
 import { unregisterPty } from '../memory/pty-registry'
 import { AgentSessionStoreTransactions } from './agent-session-store-transactions'
 import * as storeDraft from './agent-session-store-draft'
@@ -366,6 +366,7 @@ it.each([
         }
         yield item
       }
+      return undefined
     })
   }
   const find = Array.prototype.find
@@ -387,9 +388,8 @@ it.each([
       verdict: 'admitted' as const
     }
   }
-  const ports = { runtime, sendPtySpawnedToRenderer: vi.fn() }
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: this publication uses only these ports; it never starts a process.
-  const spawnState = createRuntimePtySpawnState(ports as PtyRuntimeControllerDeps, {
+  const ports = createPtySpawnCommitDependencies(runtime)
+  const spawnState = createRuntimePtySpawnState(ports, {
     cols: 80,
     rows: 24,
     resumeOrigin: 'switch',
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx
index e3ddababfb16..444a6322d0e4 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx
@@ -1,5 +1,6 @@
 import recordedOmpReply from '../../../../main/acp/fixtures/omp-v17-reply-without-thought.jsonl?raw'
-import { SessionNotificationSchema } from '../../../../main/acp/generated/acp-protocol.generated'
+import { z } from 'zod'
+import { createGlobalSettingsFixture } from '../../../../shared/global-settings-test-fixture'
 import { makeRepo, makeWorktree } from '../worktree-jump-palette-test-fixtures'
 import { agentSessionTabFixture } from './native-chat-workspace-test-fixtures'
 import * as cliSwitch from '../tab-bar/native-chat-cli-switch-run'
@@ -246,29 +247,30 @@ afterEach(() => {
 }
 
 it('keeps the recorded OMP reply readable with its CLI switch unavailable', () => {
+  const chunk = z.object({
+    sessionId: z.string(),
+    update: z.object({
+      sessionUpdate: z.literal('agent_message_chunk'),
+      content: z.object({ type: z.literal('text'), text: z.string() })
+    })
+  })
   const frames = recordedOmpReply
     .trim()
     .split('\n')
-    .map((line) => SessionNotificationSchema.safeParse(JSON.parse(line).message.params))
+    .map((line) => chunk.safeParse(JSON.parse(line).message.params))
     .flatMap((result) => (result.success ? [result.data] : []))
-  const text = frames
-    .flatMap(({ update }) =>
-      update.sessionUpdate === 'agent_message_chunk' && update.content.type === 'text'
-        ? [update.content.text]
-        : []
-    )
-    .join('')
+  const text = frames.map(({ update }) => update.content.text).join('')
   expect(text).toContain('marker recorded')
+  const { sessionId } = frames[0]
   const tab = agentSessionTabFixture('omp-capture', 'wt-1', {
     agentSessionAgent: 'omp',
-    entityId: frames[0].sessionId
+    entityId: sessionId
   })
   mocks.messages = [{ id: 'recorded-omp', role: 'assistant', blocks: [{ type: 'text', text }] }]
   useAppStore.setState({
-    settings: { ...useAppStore.getState().settings, experimentalNativeChat: true },
+    settings: createGlobalSettingsFixture({ experimentalNativeChat: true }),
     repos: [makeRepo()],
     worktreesByRepo: { 'repo-1': [makeWorktree('wt-1', 'recorded', { path: '/repo' })] },
-    tabsByWorktree: {},
     unifiedTabsByWorktree: { 'wt-1': [tab] }
   })
   const invoke = vi.spyOn(cliSwitch, 'runNativeChatCliSwitch')
@@ -287,7 +289,5 @@ it('keeps the recorded OMP reply readable with its CLI switch unavailable', () =
   expect(button.hasAttribute('disabled')).toBe(true)
   fireEvent.click(button)
   expect(invoke).not.toHaveBeenCalled()
-  expect(mocks.messageListProps).toMatchObject({
-    session: { sessionId: frames[0].sessionId, messages: mocks.messages }
-  })
+  expect(mocks.messageListProps?.session).toMatchObject({ sessionId, messages: mocks.messages })
 })

From fa85b6758970d3d006cc683e387f5cde3a5f9b33 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 24 Oct 2026 02:52:10 -0700
Subject: [PATCH 066/207] Test native switch visibility during Chat UI updates

Cover capability hydration and live settings updates across native header, hover and tab-menu controls.
---
 ...ucturedSession.history-read-state.test.tsx | 101 +++++++++++++++++-
 1 file changed, 100 insertions(+), 1 deletion(-)

diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx
index 444a6322d0e4..222b7371fc19 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx
@@ -7,11 +7,24 @@ import * as cliSwitch from '../tab-bar/native-chat-cli-switch-run'
 import { useAppStore } from '@/store'
 // @vitest-environment happy-dom
 
-import { cleanup, fireEvent, render, screen } from '@testing-library/react'
+import { act, cleanup, fireEvent, render, screen } from '@testing-library/react'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { TooltipProvider } from '@/components/ui/tooltip'
 import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types'
 import { NativeChatStructuredSession } from './NativeChatStructuredSession'
+import { TabSessionSwitchHoverAction } from '../tab-bar/TabSessionSwitchHoverAction'
+import { TabSessionSurfaceSwitchMenuItems } from '../tab-bar/TabSessionSurfaceSwitchMenuItems'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuTrigger
+} from '@/components/ui/dropdown-menu'
+import {
+  readLocalRuntimeCapabilitiesOrUnknown,
+  setLocalRuntimeCapabilitiesForTests
+} from '@/runtime/local-runtime-capabilities'
+import { createCompatibleRuntimeStatusResponse } from '@/runtime/runtime-compatibility-test-fixture'
+import type { RuntimeStatus } from '../../../../shared/runtime-types'
 
 const { mocks, moduleFactories, resetStructuredSessionMocks } = await vi.hoisted(async () =>
   (await import('./NativeChatStructuredSession.test-harness')).createStructuredSessionMocks()
@@ -291,3 +304,89 @@ it('keeps the recorded OMP reply readable with its CLI switch unavailable', () =
   expect(invoke).not.toHaveBeenCalled()
   expect(mocks.messageListProps?.session).toMatchObject({ sessionId, messages: mocks.messages })
 })
+
+it('gates eligible native header hover and menu switches through capability hydration and live Chat UI updates', async () => {
+  const tab = agentSessionTabFixture('native-controls', 'wt-1', {
+    entityId: '019fd532-7c11-7a90-b6de-4e1a2c3d5f60'
+  })
+  const nativeChat = { sessionId: tab.entityId, agent: 'codex' as const }
+  useAppStore.setState(useAppStore.getInitialState(), true)
+  useAppStore.setState({
+    settings: createGlobalSettingsFixture({ experimentalNativeChat: false }),
+    repos: [makeRepo()],
+    worktreesByRepo: { 'repo-1': [makeWorktree('wt-1', 'native', { path: '/repo' })] },
+    unifiedTabsByWorktree: { 'wt-1': [tab] }
+  })
+  mocks.status = 'ready'
+  setLocalRuntimeCapabilitiesForTests(null)
+  let answer: (status: RuntimeStatus) => void = () => {
+    throw new Error('Capability probe did not start')
+  }
+  const status = new Promise<RuntimeStatus>((resolve) => {
+    answer = resolve
+  })
+  const getStatus = vi.fn(() => status)
+  Object.assign(window, { api: { ...window.api, runtime: { getStatus } } })
+  const switchToCli = vi.spyOn(cliSwitch, 'runNativeChatCliSwitch')
+  render(
+    <TooltipProvider>
+      <NativeChatStructuredSession
+        isVisible
+        isFocusedGroup
+        tabId={tab.id}
+        sessionId={tab.entityId}
+        target={{ kind: 'local' }}
+        agent="codex"
+      />
+      <TabSessionSwitchHoverAction tab={tab} nativeChat={nativeChat} />
+      <DropdownMenu open modal={false}>
+        <DropdownMenuTrigger>Open native tab menu</DropdownMenuTrigger>
+        <DropdownMenuContent>
+          <TabSessionSurfaceSwitchMenuItems tab={tab} nativeChat={nativeChat} leadingSeparator />
+        </DropdownMenuContent>
+      </DropdownMenu>
+    </TooltipProvider>
+  )
+  const expectHidden = () => {
+    expect(screen.queryAllByRole('button', { name: 'Switch to CLI', hidden: true })).toHaveLength(0)
+    expect(screen.queryByRole('menuitem', { name: 'Switch to CLI' })).toBeNull()
+    expect(screen.queryByRole('separator')).toBeNull()
+    expect(screen.queryByText('Resume in New Terminal')).toBeNull()
+    expect(screen.getByTestId('message-list')).toBeTruthy()
+  }
+  expect(readLocalRuntimeCapabilitiesOrUnknown()).toBeNull()
+  expectHidden()
+  const response = createCompatibleRuntimeStatusResponse('local')
+  if (!response.ok) {
+    throw new Error('Expected status fixture')
+  }
+  await act(async () => {
+    answer({ ...response.result, capabilities: ['agent-session.structured.switch.v1:codex'] })
+    await status
+  })
+  expect(readLocalRuntimeCapabilitiesOrUnknown()).toContain(
+    'agent-session.structured.switch.v1:codex'
+  )
+  expectHidden()
+  act(() => {
+    useAppStore.setState({
+      settings: createGlobalSettingsFixture({ experimentalNativeChat: true })
+    })
+  })
+  const buttons = screen.getAllByRole('button', { name: 'Switch to CLI', hidden: true })
+  expect(buttons).toHaveLength(2)
+  for (const button of buttons) {
+    expect(button.hasAttribute('disabled')).toBe(false)
+  }
+  expect(
+    screen.getByRole('menuitem', { name: 'Switch to CLI' }).getAttribute('data-disabled')
+  ).toBeNull()
+  act(() => {
+    useAppStore.setState({
+      settings: createGlobalSettingsFixture({ experimentalNativeChat: false })
+    })
+  })
+  expectHidden()
+  expect(getStatus).toHaveBeenCalledOnce()
+  expect(switchToCli).not.toHaveBeenCalled()
+})

From 68904f71c984d2e32678a1f80e6ec0ce90772b7c Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 24 Oct 2026 03:35:42 -0700
Subject: [PATCH 067/207] Restore canonical terminal-view label in runtime
 catalog

Ship the existing English catalog value when imported callers provide a different fallback.
---
 src/renderer/src/i18n/en-runtime-required.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/renderer/src/i18n/en-runtime-required.json b/src/renderer/src/i18n/en-runtime-required.json
index b62c493d633b..877e0bcbf8a5 100644
--- a/src/renderer/src/i18n/en-runtime-required.json
+++ b/src/renderer/src/i18n/en-runtime-required.json
@@ -3373,7 +3373,8 @@
     "tab": {
       "bar": {
         "SortableTabContextMenu": {
-          "closeTabsToLeft": "Close All Tabs To The Left"
+          "closeTabsToLeft": "Close All Tabs To The Left",
+          "switchToTerminalView": "Show as terminal"
         }
       }
     },

From 2ae8accee99839ea8cd943ad68844c553332f290 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 24 Oct 2026 04:24:38 -0700
Subject: [PATCH 068/207] Show one terminal control in native chat headers

Keep the legacy action when Chat UI is off or the host is unsupported, and use the existing switch while capabilities load or are available.
---
 .../NativeChatResumeInCliButton.tsx           |  6 +-
 ...ucturedSession.history-read-state.test.tsx | 64 ++++++++++++++++---
 2 files changed, 60 insertions(+), 10 deletions(-)

diff --git a/src/renderer/src/components/native-chat/NativeChatResumeInCliButton.tsx b/src/renderer/src/components/native-chat/NativeChatResumeInCliButton.tsx
index cd9b9f70d43a..6ac5ed20bd81 100644
--- a/src/renderer/src/components/native-chat/NativeChatResumeInCliButton.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatResumeInCliButton.tsx
@@ -3,6 +3,8 @@ import { SquareTerminal } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import { useAppStore } from '@/store'
+import { useInPlaceSwitchCapability } from '@/lib/in-place-switch-support'
+import { isNativeChatEnabled } from '../../../../shared/structured-native-chat-launch-route'
 import type { AppState } from '@/store/types'
 import { selectFolderWorkspaces, selectWorktreesByRepo } from '@/store/workspace-record-selectors'
 import { translate } from '@/i18n/i18n'
@@ -73,11 +75,13 @@ export function NativeChatResumeInCliButton({
   )
   const commandOverrides = useAppStore((state) => state.settings?.agentCmdOverrides)
   const agent = AI_VAULT_AGENTS.find((candidate) => candidate === nativeChat.agent)
+  const inPlace = useInPlaceSwitchCapability(executionHostScope, agent)
+  const enabled = useAppStore((state) => isNativeChatEnabled(state.settings))
   const label = translate(
     'components.tab.bar.SortableTabContextMenu.switchToTerminalView',
     'Continue with Terminal Agent'
   )
-  if (!executionHostScope || !agent) {
+  if (!executionHostScope || !agent || (enabled && (inPlace !== false || agent === 'omp'))) {
     return null
   }
   return (
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx
index 222b7371fc19..5e3719b50a66 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx
@@ -5,6 +5,8 @@ import { makeRepo, makeWorktree } from '../worktree-jump-palette-test-fixtures'
 import { agentSessionTabFixture } from './native-chat-workspace-test-fixtures'
 import * as cliSwitch from '../tab-bar/native-chat-cli-switch-run'
 import { useAppStore } from '@/store'
+import { makeTabGroup } from '@/store/slices/store-test-helpers'
+import * as cliFork from '../tab-bar/native-chat-cli-fork-run'
 // @vitest-environment happy-dom
 
 import { act, cleanup, fireEvent, render, screen } from '@testing-library/react'
@@ -21,6 +23,7 @@ import {
 } from '@/components/ui/dropdown-menu'
 import {
   readLocalRuntimeCapabilitiesOrUnknown,
+  refreshLocalRuntimeCapabilities,
   setLocalRuntimeCapabilitiesForTests
 } from '@/runtime/local-runtime-capabilities'
 import { createCompatibleRuntimeStatusResponse } from '@/runtime/runtime-compatibility-test-fixture'
@@ -315,7 +318,18 @@ it('gates eligible native header hover and menu switches through capability hydr
     settings: createGlobalSettingsFixture({ experimentalNativeChat: false }),
     repos: [makeRepo()],
     worktreesByRepo: { 'repo-1': [makeWorktree('wt-1', 'native', { path: '/repo' })] },
-    unifiedTabsByWorktree: { 'wt-1': [tab] }
+    unifiedTabsByWorktree: { 'wt-1': [tab] },
+    groupsByWorktree: {
+      'wt-1': [
+        makeTabGroup({
+          id: tab.groupId,
+          worktreeId: 'wt-1',
+          tabOrder: [tab.id],
+          activeTabId: tab.id
+        })
+      ]
+    },
+    activeGroupIdByWorktree: { 'wt-1': tab.groupId }
   })
   mocks.status = 'ready'
   setLocalRuntimeCapabilitiesForTests(null)
@@ -328,11 +342,13 @@ it('gates eligible native header hover and menu switches through capability hydr
   const getStatus = vi.fn(() => status)
   Object.assign(window, { api: { ...window.api, runtime: { getStatus } } })
   const switchToCli = vi.spyOn(cliSwitch, 'runNativeChatCliSwitch')
+  const forkToCli = vi.spyOn(cliFork, 'runNativeChatCliFork')
   render(
     <TooltipProvider>
       <NativeChatStructuredSession
         isVisible
         isFocusedGroup
+        groupId={tab.groupId}
         tabId={tab.id}
         sessionId={tab.entityId}
         target={{ kind: 'local' }}
@@ -347,15 +363,33 @@ it('gates eligible native header hover and menu switches through capability hydr
       </DropdownMenu>
     </TooltipProvider>
   )
+  expect(screen.getByRole('button', { name: 'Split Chat Right', hidden: true })).toBeTruthy()
+  const transcript = screen.getByTestId('message-list')
+  const legacyName = 'Show as terminal'
   const expectHidden = () => {
     expect(screen.queryAllByRole('button', { name: 'Switch to CLI', hidden: true })).toHaveLength(0)
     expect(screen.queryByRole('menuitem', { name: 'Switch to CLI' })).toBeNull()
     expect(screen.queryByRole('separator')).toBeNull()
     expect(screen.queryByText('Resume in New Terminal')).toBeNull()
-    expect(screen.getByTestId('message-list')).toBeTruthy()
+    expect(screen.getByTestId('message-list')).toBe(transcript)
+    expect(screen.getAllByRole('button', { name: legacyName, hidden: true })).toHaveLength(1)
   }
   expect(readLocalRuntimeCapabilitiesOrUnknown()).toBeNull()
   expectHidden()
+  act(() => {
+    useAppStore.setState({
+      settings: createGlobalSettingsFixture({ experimentalNativeChat: true })
+    })
+  })
+  const loadingButtons = screen.getAllByRole('button', { name: 'Switch to CLI', hidden: true })
+  expect(loadingButtons).toHaveLength(2)
+  for (const button of loadingButtons) {
+    expect(button.hasAttribute('disabled')).toBe(true)
+  }
+  expect(screen.queryByRole('button', { name: legacyName, hidden: true })).toBeNull()
+  expect(
+    screen.getByRole('menuitem', { name: 'Switch to CLI' }).hasAttribute('data-disabled')
+  ).toBe(true)
   const response = createCompatibleRuntimeStatusResponse('local')
   if (!response.ok) {
     throw new Error('Expected status fixture')
@@ -367,14 +401,9 @@ it('gates eligible native header hover and menu switches through capability hydr
   expect(readLocalRuntimeCapabilitiesOrUnknown()).toContain(
     'agent-session.structured.switch.v1:codex'
   )
-  expectHidden()
-  act(() => {
-    useAppStore.setState({
-      settings: createGlobalSettingsFixture({ experimentalNativeChat: true })
-    })
-  })
   const buttons = screen.getAllByRole('button', { name: 'Switch to CLI', hidden: true })
   expect(buttons).toHaveLength(2)
+  expect(screen.queryByRole('button', { name: legacyName, hidden: true })).toBeNull()
   for (const button of buttons) {
     expect(button.hasAttribute('disabled')).toBe(false)
   }
@@ -387,6 +416,23 @@ it('gates eligible native header hover and menu switches through capability hydr
     })
   })
   expectHidden()
-  expect(getStatus).toHaveBeenCalledOnce()
+  act(() => {
+    useAppStore.setState({
+      settings: createGlobalSettingsFixture({ experimentalNativeChat: true })
+    })
+  })
+  getStatus.mockResolvedValue({ ...response.result, capabilities: [] })
+  await act(async () => {
+    await refreshLocalRuntimeCapabilities()
+  })
+  expect(screen.queryAllByRole('button', { name: 'Switch to CLI', hidden: true })).toHaveLength(0)
+  expect(screen.queryByRole('menuitem', { name: 'Switch to CLI' })).toBeNull()
+  expect(screen.getAllByRole('button', { name: legacyName, hidden: true })).toHaveLength(1)
+  expect(screen.getByRole('menuitem', { name: 'Resume in New Terminal' })).toBeTruthy()
+  expect(screen.getByRole('separator')).toBeTruthy()
+  expect(screen.getByTestId('message-list')).toBe(transcript)
+  expect(readLocalRuntimeCapabilitiesOrUnknown()).toEqual([])
+  expect(getStatus).toHaveBeenCalledTimes(2)
+  expect(forkToCli).not.toHaveBeenCalled()
   expect(switchToCli).not.toHaveBeenCalled()
 })

From f46428b2e834987ec18ac22958736d532d32259a Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 24 Oct 2026 04:30:28 -0700
Subject: [PATCH 069/207] Align test observers and capture hook timeout
 diagnostics

Use canonical header labels and the current provider history request route, retaining existing assertions. Capture invocation and pipe state before timeout cleanup.
---
 .../managed-hook-stdin-lifecycle.test.ts      | 33 ++++++++++++++++++-
 ...ured-agent-session-create-adoption.test.ts |  5 +--
 .../native-chat/NativeChatPaneHeader.test.tsx |  6 ++--
 .../native-chat-header-ownership.test.tsx     |  2 +-
 4 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/src/main/agent-hooks/managed-hook-stdin-lifecycle.test.ts b/src/main/agent-hooks/managed-hook-stdin-lifecycle.test.ts
index 30d0d04abaf1..f17ad655cc9e 100644
--- a/src/main/agent-hooks/managed-hook-stdin-lifecycle.test.ts
+++ b/src/main/agent-hooks/managed-hook-stdin-lifecycle.test.ts
@@ -201,9 +201,40 @@ function runHookProcess(
     let stderr = ''
     let stdout = ''
     const timeout = setTimeout(() => {
+      const diagnostic = JSON.stringify({
+        executable,
+        args,
+        spawnfile: child.spawnfile,
+        spawnargs: child.spawnargs,
+        inPane: Boolean(env.ORCA_PANE_KEY),
+        pid: child.pid ?? null,
+        exitCode: child.exitCode,
+        signalCode: child.signalCode,
+        killed: child.killed,
+        stdout,
+        stderr,
+        stdinErrors: stdinErrors.map(({ code, message }) => ({ code, message })),
+        stdin: {
+          destroyed: child.stdin.destroyed,
+          writableEnded: child.stdin.writableEnded,
+          writableFinished: child.stdin.writableFinished,
+          writableLength: child.stdin.writableLength,
+          writableNeedDrain: child.stdin.writableNeedDrain
+        },
+        stdoutPipe: {
+          destroyed: child.stdout.destroyed,
+          readableEnded: child.stdout.readableEnded,
+          readableLength: child.stdout.readableLength
+        },
+        stderrPipe: {
+          destroyed: child.stderr.destroyed,
+          readableEnded: child.stderr.readableEnded,
+          readableLength: child.stderr.readableLength
+        }
+      })
       child.stdin.destroy()
       child.kill('SIGKILL')
-      reject(new Error(`hook did not finish with stdin ${stdin}d`))
+      reject(new Error(`hook did not finish with stdin ${stdin}d\n${diagnostic}`))
     }, 10_000)
     child.on('error', (error) => {
       clearTimeout(timeout)
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-create-adoption.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-create-adoption.test.ts
index 8377abd8709d..e26f3d221c62 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-create-adoption.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-create-adoption.test.ts
@@ -67,9 +67,10 @@ function anotherSession(params: AgentSessionAttachParams): AgentSessionAttachPar
 
 it('imports adoption at rest and resumes its original provider identity after its source disappears', async () => {
   const params = await adoptedParams()
-  const history = vi.fn(async () => null)
+  const history = vi.fn(async () => ({ data: [], nextCursor: null }))
   const codex = fakeCodex({
     // Codex 0.162 answers excludeTurns resumes with metadata, not historical turns.
+    'thread/turns/list': history,
     'thread/resume': () => ({
       thread: { id: THREAD, turns: [] },
       model: 'gpt-5.4',
@@ -99,7 +100,7 @@ it('imports adoption at rest and resumes its original provider identity after it
       resolveLaunchArgs: () => []
     })
   })
-  await rig.restart({ adapter: Object.assign(adapter, { providerHistoryWindow: history }) })
+  await rig.restart({ adapter })
   expect(await rig.host.create(CALLER, params)).toMatchObject({
     ok: true,
     value: {
diff --git a/src/renderer/src/components/native-chat/NativeChatPaneHeader.test.tsx b/src/renderer/src/components/native-chat/NativeChatPaneHeader.test.tsx
index 4834ea2b983b..9645930b2da2 100644
--- a/src/renderer/src/components/native-chat/NativeChatPaneHeader.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatPaneHeader.test.tsx
@@ -58,16 +58,16 @@ function renderHeader() {
 it('offers the terminal header action order and targets Resume and Close at the displayed chat', () => {
   const source = renderHeader()
   expect(screen.getAllByRole('button').map((button) => button.getAttribute('aria-label'))).toEqual([
-    'Continue with Terminal Agent',
+    'Show as terminal',
     'Split Chat Right',
     'Close tab'
   ])
   const folder = useAppStore.getState().folderWorkspaces[0]
   act(() => useAppStore.setState({ folderWorkspaces: [{ ...folder, executionHostId: 'ssh:dev' }] }))
-  expect(screen.queryByRole('button', { name: 'Continue with Terminal Agent' })).toBeNull()
+  expect(screen.queryByRole('button', { name: 'Show as terminal' })).toBeNull()
   act(() => useAppStore.setState({ folderWorkspaces: [folder] }))
   expect(fullRequest).not.toHaveBeenCalled()
-  fireEvent.click(screen.getByRole('button', { name: 'Continue with Terminal Agent' }))
+  fireEvent.click(screen.getByRole('button', { name: 'Show as terminal' }))
   expect(fullRequest).toHaveBeenCalledTimes(1)
   expect(mocks.resume).toHaveBeenCalledExactlyOnceWith(
     expect.objectContaining({
diff --git a/src/renderer/src/components/native-chat/native-chat-header-ownership.test.tsx b/src/renderer/src/components/native-chat/native-chat-header-ownership.test.tsx
index a22c5f8d57f6..0f7fc2182318 100644
--- a/src/renderer/src/components/native-chat/native-chat-header-ownership.test.tsx
+++ b/src/renderer/src/components/native-chat/native-chat-header-ownership.test.tsx
@@ -356,7 +356,7 @@ it('keeps the real Continue pending operation disabled across header hide/reveal
   mocks.launch.mockResolvedValue(undefined)
   const view = render(overlay(true))
   const source = chat(view.container, 'chat-0')
-  const button = () => within(source).getByRole('button', { name: 'Continue with Terminal Agent' })
+  const button = () => within(source).getByRole('button', { name: 'Show as terminal' })
   expect(fullRequest).not.toHaveBeenCalled()
   fireEvent.click(button())
   expect(button().hasAttribute('disabled')).toBe(true)

From da4b3e03fab2ec22899a97ff87be0cdeea039d65 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 24 Oct 2026 06:06:40 -0700
Subject: [PATCH 070/207] Place grouped chat terminal controls beside pane
 actions

Place the existing switch beside split and close while retaining floating controls for ungrouped chats and Find priority.
---
 .../native-chat/NativeChatPaneHeader.tsx      | 22 ++++++++++++++++--
 ...ucturedSession.history-read-state.test.tsx | 13 +++++++++--
 .../NativeChatStructuredSession.tsx           | 23 +++++++++----------
 .../NativeChatTopRightControls.tsx            |  8 ++++---
 4 files changed, 47 insertions(+), 19 deletions(-)

diff --git a/src/renderer/src/components/native-chat/NativeChatPaneHeader.tsx b/src/renderer/src/components/native-chat/NativeChatPaneHeader.tsx
index ab301fb84a5e..50d88a513512 100644
--- a/src/renderer/src/components/native-chat/NativeChatPaneHeader.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatPaneHeader.tsx
@@ -20,7 +20,8 @@ export function NativeChatPaneHeader({
   groupId,
   nativeChat,
   focused,
-  colorScheme
+  colorScheme,
+  topRightAction
 }: {
   tabId: string
   worktreeId: string
@@ -28,6 +29,7 @@ export function NativeChatPaneHeader({
   nativeChat: NativeChatTabSession
   focused: boolean
   colorScheme: React.CSSProperties['colorScheme']
+  topRightAction?: React.ReactNode
 }): React.JSX.Element {
   const actions = useStructuredChatPaneActions(tabId, worktreeId, groupId)
   const theme = useAppStore((state) => state.settings?.theme)
@@ -45,6 +47,7 @@ export function NativeChatPaneHeader({
       style={HEADER_STYLE}
     >
       <div className="pane-title-actions ml-auto flex shrink-0 items-center gap-0">
+        {topRightAction}
         {nativeChat.agent && agentForksConversations(nativeChat.agent) ? (
           <NativeChatResumeInCliButton
             tabId={tabId}
@@ -109,7 +112,8 @@ export function nativeChatPaneHeader(
     | 'contextMenuActions'
   >,
   worktreeId: string | null,
-  colorScheme: React.CSSProperties['colorScheme']
+  colorScheme: React.CSSProperties['colorScheme'],
+  topRightAction?: React.ReactNode
 ): React.JSX.Element | null {
   return view.isVisible && worktreeId && view.groupId && !view.contextMenuActions ? (
     <NativeChatPaneHeader
@@ -119,6 +123,20 @@ export function nativeChatPaneHeader(
       nativeChat={{ sessionId: view.sessionId, agent: view.agent }}
       focused={view.isFocusedGroup}
       colorScheme={colorScheme}
+      topRightAction={topRightAction}
     />
   ) : null
 }
+
+export function nativeChatPaneCaptureHandlers(
+  ...handlers: React.DOMAttributes<HTMLDivElement>[]
+): React.DOMAttributes<HTMLDivElement> {
+  return {
+    onPointerDownCapture: (event) => {
+      handlers.forEach((handler) => handler.onPointerDownCapture?.(event))
+    },
+    onKeyDownCapture: (event) => {
+      handlers.forEach((handler) => handler.onKeyDownCapture?.(event))
+    }
+  }
+}
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx
index 5e3719b50a66..e75982d9f4fc 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx
@@ -9,7 +9,7 @@ import { makeTabGroup } from '@/store/slices/store-test-helpers'
 import * as cliFork from '../tab-bar/native-chat-cli-fork-run'
 // @vitest-environment happy-dom
 
-import { act, cleanup, fireEvent, render, screen } from '@testing-library/react'
+import { act, cleanup, fireEvent, render, screen, within } from '@testing-library/react'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { TooltipProvider } from '@/components/ui/tooltip'
 import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types'
@@ -363,7 +363,14 @@ it('gates eligible native header hover and menu switches through capability hydr
       </DropdownMenu>
     </TooltipProvider>
   )
-  expect(screen.getByRole('button', { name: 'Split Chat Right', hidden: true })).toBeTruthy()
+  const actions = screen
+    .getByRole('button', { name: 'Split Chat Right', hidden: true })
+    .closest('.pane-title-actions')
+  if (!(actions instanceof HTMLElement)) {
+    throw new Error('Expected the grouped pane actions row')
+  }
+  const row = within(actions)
+  expect(row.getByRole('button', { name: 'Close tab', hidden: true })).toBeTruthy()
   const transcript = screen.getByTestId('message-list')
   const legacyName = 'Show as terminal'
   const expectHidden = () => {
@@ -383,6 +390,7 @@ it('gates eligible native header hover and menu switches through capability hydr
   })
   const loadingButtons = screen.getAllByRole('button', { name: 'Switch to CLI', hidden: true })
   expect(loadingButtons).toHaveLength(2)
+  expect(row.getAllByRole('button', { name: 'Switch to CLI', hidden: true })).toHaveLength(1)
   for (const button of loadingButtons) {
     expect(button.hasAttribute('disabled')).toBe(true)
   }
@@ -403,6 +411,7 @@ it('gates eligible native header hover and menu switches through capability hydr
   )
   const buttons = screen.getAllByRole('button', { name: 'Switch to CLI', hidden: true })
   expect(buttons).toHaveLength(2)
+  expect(row.getAllByRole('button', { name: 'Switch to CLI', hidden: true })).toHaveLength(1)
   expect(screen.queryByRole('button', { name: legacyName, hidden: true })).toBeNull()
   for (const button of buttons) {
     expect(button.hasAttribute('disabled')).toBe(false)
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx
index 53919e0e8fcc..54e16747b0b8 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx
@@ -51,7 +51,7 @@ import { useAppStore } from '../../store'
 import { structuredAgentLabel } from '@/lib/structured-agent-session-launch-label'
 import { useNativeChatStructuredComposerTransport } from './use-native-chat-structured-composer-transport'
 import { NativeChatStructuredGoalStrip } from './NativeChatStructuredGoalStrip'
-import { nativeChatPaneHeader } from './NativeChatPaneHeader'
+import { nativeChatPaneHeader, nativeChatPaneCaptureHandlers } from './NativeChatPaneHeader'
 import { structuredAgentSessionReadFailureNotice } from './structured-agent-session-read-failure-notice'
 import { useStructuredAgentSessionDeliveryNotices } from './use-structured-agent-session-delivery-notices'
 import { dispatchWasWithdrawn } from '../../../../shared/structured-agent-session-dispatch-rejection'
@@ -266,21 +266,20 @@ export function NativeChatStructuredSession(
   if (hostNotice) {
     notices.push(hostNotice)
   }
+  const controls = { find, session: props, working: controller.isWorking }
+  const paneHeader = nativeChatPaneHeader(
+    props,
+    ownerWorktreeId,
+    appearanceStyle.colorScheme,
+    !find.isOpen && <NativeChatTopRightControls {...controls} inline />
+  )
   return (
     <div
       ref={rootRef}
       data-native-chat-root="true"
       data-native-chat-working={controller.isWorking ? 'true' : 'false'}
       tabIndex={-1}
-      onPointerDownCapture={(event) => {
-        paneCommands.onPointerDownCapture(event)
-        rootInput.onPointerDownCapture(event)
-      }}
-      onKeyDownCapture={(event) => {
-        find.onKeyDownCapture(event)
-        paneCommands.onKeyDownCapture(event)
-        rootInput.onKeyDownCapture(event)
-      }}
+      {...nativeChatPaneCaptureHandlers(find, paneCommands, rootInput)}
       onContextMenuCapture={paneCommands.onContextMenuCapture}
       className={cn(
         NATIVE_CHAT_APPEARANCE_ROOT_CLASS,
@@ -289,9 +288,9 @@ export function NativeChatStructuredSession(
       style={appearanceStyle}
       data-native-chat-scheme={appearanceStyle.colorScheme}
     >
-      {nativeChatPaneHeader(props, ownerWorktreeId, appearanceStyle.colorScheme)}
+      {paneHeader}
       <NativeChatContextClearFade clearing={controller.contextClear.clearing}>
-        <NativeChatTopRightControls find={find} session={props} working={controller.isWorking} />
+        {(find.isOpen || !paneHeader) && <NativeChatTopRightControls {...controls} />}
         {viewState.kind === 'loading' || (viewState.kind === 'error' && !readFailure) ? (
           historyPhase !== 'unread' && <NativeChatLoadingCue />
         ) : viewState.kind === 'error' ? (
diff --git a/src/renderer/src/components/native-chat/NativeChatTopRightControls.tsx b/src/renderer/src/components/native-chat/NativeChatTopRightControls.tsx
index 1a8db3af1e9b..5a83ed41b23a 100644
--- a/src/renderer/src/components/native-chat/NativeChatTopRightControls.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatTopRightControls.tsx
@@ -21,11 +21,13 @@ import { useNativeChatTabOwnerWorktreeId } from './use-native-chat-tab-owner'
 export function NativeChatTopRightControls({
   find,
   session,
-  working
+  working,
+  inline = false
 }: {
   find: NativeChatFind
   session: Pick<NativeChatStructuredViewProps, 'tabId' | 'sessionId' | 'agent' | 'isVisible'>
   working: boolean
+  inline?: boolean
 }): React.JSX.Element | null {
   const worktreeId = useNativeChatTabOwnerWorktreeId(session.tabId)
   // A primitive, so the selector is stable; the chat's host is where its History row lives.
@@ -50,12 +52,12 @@ export function NativeChatTopRightControls({
   }
   const label = translate('components.tab.bar.switch.toCli', 'Switch to CLI')
   return (
-    <div className="absolute top-2 right-4 z-20">
+    <div className={inline ? 'flex' : 'absolute top-2 right-4 z-20'}>
       <Tooltip>
         <TooltipTrigger asChild>
           <Button
             type="button"
-            variant="ghost"
+            variant={inline ? 'pane-title' : 'ghost'}
             size="icon-xs"
             aria-label={label}
             // Not `disabled` while a reply runs: the tooltip has to say why.

From 7a688b82caf3d1bc60175e1193f43b1ca538bc0b Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sun, 25 Oct 2026 11:35:50 -0700
Subject: [PATCH 071/207] Consolidate agent session imports in remote terminal
 transport

---
 .../terminal-pane/remote-runtime-pty-transport.ts           | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport.ts b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport.ts
index c73bffaf0c6b..b2133318648a 100644
--- a/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport.ts
+++ b/src/renderer/src/components/terminal-pane/remote-runtime-pty-transport.ts
@@ -1,9 +1,11 @@
 import { parseTerminalAttachmentLaunchResult } from '../../../../shared/terminal-attachment-launch-result'
-import { terminalLaunchFacts } from '../../../../shared/agent-session-resume'
+import {
+  terminalLaunchFacts,
+  agentProviderSessionForEnsure
+} from '../../../../shared/agent-session-resume'
 import { isRuntimeCompatBlockError } from '@/runtime/runtime-protocol-compat'
 import { runtimeEnvironmentSupportsCapability } from '@/runtime/runtime-rpc-client'
 import { readTerminalSpawnDeferral } from '../../../../shared/host-spawn-admission'
-import { agentProviderSessionForEnsure } from '../../../../shared/agent-session-resume'
 import { remoteRestoreSpawnIntentParams } from '../../runtime/remote-restore-spawn-intent'
 import { createAgentSessionKeyboardOptions } from '@/runtime/agent-session-keyboard-capability'
 import { createRemoteRuntimeDisconnectedInputGrace } from './remote-runtime-disconnected-input-grace'

From 686cb02507b6cd52d1850f9bb1d9be0ece41551c Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sun, 25 Oct 2026 12:23:52 -0700
Subject: [PATCH 072/207] Clarify terminal conversation refusal guidance

---
 .../mobile-native-chat-unsent-notices.test.ts | 16 +++++++++++
 ...ession.approval-and-start-failure.test.tsx | 10 +++++++
 .../agent-session-failure-words-text.test.ts  | 28 +++++++++++++++++++
 ...ault-session-resume-in-chat-launch.test.ts |  2 +-
 .../tab-bar/cli-chat-resume-run.test.ts       |  4 +--
 .../src/i18n/en-runtime-required.json         |  4 +--
 src/renderer/src/i18n/locales/en.json         |  8 +++---
 src/renderer/src/i18n/locales/es.json         |  8 +++---
 src/renderer/src/i18n/locales/fr.json         |  8 +++---
 src/renderer/src/i18n/locales/ja.json         |  8 +++---
 src/renderer/src/i18n/locales/ko.json         |  8 +++---
 src/renderer/src/i18n/locales/pt.json         |  4 +--
 src/renderer/src/i18n/locales/zh.json         |  8 +++---
 .../src/lib/cli-conversation-exit-guidance.ts |  4 +--
 src/shared/agent-session-failure-copy.ts      |  4 +--
 15 files changed, 89 insertions(+), 35 deletions(-)

diff --git a/mobile/src/session/mobile-native-chat-unsent-notices.test.ts b/mobile/src/session/mobile-native-chat-unsent-notices.test.ts
index edc920a84dc4..74a2574046cd 100644
--- a/mobile/src/session/mobile-native-chat-unsent-notices.test.ts
+++ b/mobile/src/session/mobile-native-chat-unsent-notices.test.ts
@@ -48,6 +48,22 @@ const startRow: AgentJournalRenderItem = {
 }
 
 describe("the phone's line under a not-sent message", () => {
+  it.each([
+    ['claude', 'Claude'],
+    ['codex', 'Codex']
+  ])('names %s when its terminal holds the conversation', (agent, name) => {
+    const notices = mobileNativeChatUnsentNotices(
+      {
+        items: [],
+        submissions: [submission('held', { rejection: { kind: 'conversationOpenInTerminal' } })]
+      },
+      agent
+    )
+    expect(notices.get(agentJournalSubmissionKey('held'))).toBe(
+      `${name} is already running this conversation in another terminal. Quit ${name} there or close that terminal to continue here.`
+    )
+  })
+
   it("words each rejected message as the desktop does, naming the chat's agent", () => {
     const notices = mobileNativeChatUnsentNotices(
       {
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.approval-and-start-failure.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.approval-and-start-failure.test.tsx
index b8c47c437463..26db39993030 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.approval-and-start-failure.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.approval-and-start-failure.test.tsx
@@ -228,6 +228,16 @@ afterEach(() => {
     })
   }
 
+  it('renders the terminal refusal once beside the rejected message', async () => {
+    const fact: AgentSessionFailureFact = { kind: 'conversationOpenInTerminal' }
+    renderPane([rejected('terminal-held', 'Host fallback words.', fact)])
+    const row = await notice('terminal-held')
+    expect(row.textContent).toContain(
+      'Claude is already running this conversation in another terminal. Quit Claude there or close that terminal to continue here.'
+    )
+    expect(within(row).queryByRole('button', { name: 'Retry' })).toBeNull()
+  })
+
   // The start row owns the failure reason; resending a rejected message creates a new message.
   it("says only 'not sent', with no Retry, on each message the failed start's row explains", async () => {
     mocks.journalItems = [startFailureRow(START_FAILED)]
diff --git a/src/renderer/src/components/native-chat/agent-session-failure-words-text.test.ts b/src/renderer/src/components/native-chat/agent-session-failure-words-text.test.ts
index 75916328e7f2..0b38825b0c70 100644
--- a/src/renderer/src/components/native-chat/agent-session-failure-words-text.test.ts
+++ b/src/renderer/src/components/native-chat/agent-session-failure-words-text.test.ts
@@ -89,6 +89,34 @@ afterEach(async () => {
 })
 
 describe('desktop words for a failure fact', () => {
+  it.each(['Claude', 'Codex'])(
+    'names %s in terminal refusals on every failure surface',
+    (agentName) => {
+      for (const surface of ['row', 'rejection', 'answer'] as const) {
+        expect(
+          agentSessionFailureSentence(
+            { kind: 'conversationOpenInTerminal' },
+            surface,
+            { agentName },
+            sayAgentSessionFailureTranslated
+          )
+        ).toBe(
+          `${agentName} is already running this conversation in another terminal. Quit ${agentName} there or close that terminal to continue here.`
+        )
+      }
+      expect(
+        agentSessionFailureSentence(
+          { kind: 'conversationOpenElsewhere' },
+          'row',
+          { agentName: 'Codex' },
+          sayAgentSessionFailureTranslated
+        )
+      ).toBe(
+        'Codex is still holding this conversation open. Try again in a moment, or close other Codex terminals.'
+      )
+    }
+  )
+
   it.each([
     ['en', 'Then send your message again.'],
     ['es', 'Después, envía tu mensaje de nuevo.'],
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.test.ts b/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.test.ts
index f2f8d396285d..7d70bc5eb569 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.test.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.test.ts
@@ -173,7 +173,7 @@ describe('resumeAiVaultSessionInNewChat', () => {
     [
       'agent_session_conflict',
       'conversationHeldElsewhere',
-      "Orca can't confirm Codex has exited in its terminal. Stop what's running there or close the terminal, then try again."
+      'Codex is already running this conversation in another terminal. Quit Codex there or close that terminal, then open this conversation from Session History.'
     ],
     [
       'agent_session_identity_required',
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
index f1c50273ec8e..b7e4c5f60535 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
@@ -276,8 +276,8 @@ describe('CLI identity resume through the existing launch owner', () => {
     })
     await runCliChatResume(SOURCE, true)
     expect(mocks.toast).toHaveBeenCalledTimes(1)
-    expect(mocks.toast.mock.calls[0]?.[0]).toMatch(
-      /^Orca can't confirm Claude.* has exited in its terminal\. Stop what's running there or close the terminal, then open this conversation from Session History\.$/
+    expect(mocks.toast.mock.calls[0]?.[0]).toBe(
+      'Claude is already running this conversation in another terminal. Quit Claude there or close that terminal, then open this conversation from Session History.'
     )
     expect(mocks.activate).not.toHaveBeenCalled()
     expect(tabs()).toEqual([])
diff --git a/src/renderer/src/i18n/en-runtime-required.json b/src/renderer/src/i18n/en-runtime-required.json
index e905cbb61368..fb6f0d302773 100644
--- a/src/renderer/src/i18n/en-runtime-required.json
+++ b/src/renderer/src/i18n/en-runtime-required.json
@@ -3164,8 +3164,8 @@
         "runCommandAgain": "Run /{{command}} again.",
         "runCommandWhenDone": "Run /{{command}} when it's done.",
         "runtimeNotInstalled": "{{agent}} isn't installed on the computer running this chat. Install it from the chat in a current version of Orca.",
-        "conversationOpenElsewhere": "Codex still has this conversation open somewhere else. Close it there, then try again.",
-        "conversationOpenInTerminal": "Orca can't confirm {{agent}} has exited in its terminal. Stop what's running there or close the terminal, then try again.",
+        "conversationOpenElsewhere": "Codex is still holding this conversation open. Try again in a moment, or close other Codex terminals.",
+        "conversationOpenInTerminal": "{{agent}} is already running this conversation in another terminal. Quit {{agent}} there or close that terminal to continue here.",
         "sendAgainToTryOnceMore": "Send your message again to try once more.",
         "sendToTryAgain": "Send your message to try again.",
         "sessionNotRestored": "{{agent}} couldn't reopen its earlier session, so this chat continues in a new one. {{agent}} doesn't remember the earlier messages.",
diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index fa264699563b..1cdf2910cc9b 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -18974,8 +18974,8 @@
         "claudeAccountSetupFailed": "The selected Claude account could not be set up. Try again or choose another account.",
         "agentCommandNotRunnable": "{{agent}}'s Command in Settings → Agents must be a program path or name Orca can find, with no arguments or variables. Change it or reset it.",
         "runtimeNotInstalled": "{{agent}} isn't installed on the computer running this chat. Install it from the chat in a current version of Orca.",
-        "conversationOpenElsewhere": "Codex still has this conversation open somewhere else. Close it there, then try again.",
-        "conversationOpenInTerminal": "Orca can't confirm {{agent}} has exited in its terminal. Stop what's running there or close the terminal, then try again.",
+        "conversationOpenElsewhere": "Codex is still holding this conversation open. Try again in a moment, or close other Codex terminals.",
+        "conversationOpenInTerminal": "{{agent}} is already running this conversation in another terminal. Quit {{agent}} there or close that terminal to continue here.",
         "chooseClaudeAccount": "Choose or add one in Claude Accounts settings.",
         "chooseClaudeAccountThenRunCommand": "Choose or add one in Claude Accounts settings, then run /{{command}} again.",
         "chooseClaudeAccountThenSend": "Choose or add one in Claude Accounts settings, then send your message again.",
@@ -19465,8 +19465,8 @@
         "showTerminal": "Show terminal"
       },
       "resumeInNewChat": {
-        "exitUnconfirmedFromTerminal": "Orca can't confirm {{agent}} has exited in its terminal. Stop what's running there or close the terminal, then open this conversation from Session History.",
-        "exitUnconfirmed": "Orca can't confirm {{agent}} has exited in its terminal. Stop what's running there or close the terminal, then try again.",
+        "exitUnconfirmedFromTerminal": "{{agent}} is already running this conversation in another terminal. Quit {{agent}} there or close that terminal, then open this conversation from Session History.",
+        "exitUnconfirmed": "{{agent}} is already running this conversation in another terminal. Quit {{agent}} there or close that terminal, then open this conversation from Session History.",
         "notSavedYet": "{{agent}} hasn't saved this conversation yet. Try again after it replies.",
         "cannotResume": "This {{agent}} conversation can't be resumed in a native chat."
       },
diff --git a/src/renderer/src/i18n/locales/es.json b/src/renderer/src/i18n/locales/es.json
index 4163fa1db522..d368f6f47939 100644
--- a/src/renderer/src/i18n/locales/es.json
+++ b/src/renderer/src/i18n/locales/es.json
@@ -18644,8 +18644,8 @@
         "claudeAccountSetupFailed": "No se pudo configurar la cuenta de Claude seleccionada. Vuelva a intentarlo o elija otra cuenta.",
         "agentCommandNotRunnable": "{{agent}}: el Comando en Ajustes → Agentes debe ser la ruta o el nombre de un programa que Orca pueda encontrar, sin argumentos ni variables. Cámbielo o restablézcalo con Reiniciar.",
         "runtimeNotInstalled": "{{agent}} no está instalado en el equipo que ejecuta este chat. Instálelo desde el chat en una versión actual de Orca.",
-        "conversationOpenElsewhere": "Codex aún tiene esta conversación abierta en otro lugar. Ciérrela allí y vuelva a intentarlo.",
-        "conversationOpenInTerminal": "Orca no puede confirmar que {{agent}} haya salido en su terminal. Detenga lo que se esté ejecutando allí o cierre la terminal y vuelva a intentarlo.",
+        "conversationOpenElsewhere": "Codex sigue manteniendo abierta esta conversación. Inténtalo de nuevo en un momento o cierra otras terminales de Codex.",
+        "conversationOpenInTerminal": "{{agent}} ya está ejecutando esta conversación en otra terminal. Sal de {{agent}} allí o cierra esa terminal para continuar aquí.",
         "chooseClaudeAccount": "Elija o agregue una en la configuración de Cuentas de Claude.",
         "chooseClaudeAccountThenRunCommand": "Elija o agregue una en la configuración de Cuentas de Claude y vuelva a ejecutar /{{command}}.",
         "chooseClaudeAccountThenSend": "Elija o agregue una en la configuración de Cuentas de Claude y vuelva a enviar su mensaje.",
@@ -19037,8 +19037,8 @@
       "resumeInNewChat": {
         "notSavedYet": "{{agent}} aún no ha guardado esta conversación. Inténtalo de nuevo cuando responda.",
         "cannotResume": "Esta conversación de {{agent}} no se puede reanudar en un chat nativo.",
-        "exitUnconfirmed": "Orca no puede confirmar que {{agent}} haya salido de su terminal. Detenga lo que se está ejecutando allí o cierre la terminal y vuelva a intentarlo.",
-        "exitUnconfirmedFromTerminal": "Orca no puede confirmar que {{agent}} haya salido de su terminal. Detenga lo que se está ejecutando allí o cierre la terminal, luego abra esta conversación desde el Historial de sesiones."
+        "exitUnconfirmed": "{{agent}} ya está ejecutando esta conversación en otra terminal. Sal de {{agent}} allí o cierra esa terminal; luego abre esta conversación desde el Historial de sesiones.",
+        "exitUnconfirmedFromTerminal": "{{agent}} ya está ejecutando esta conversación en otra terminal. Sal de {{agent}} allí o cierra esa terminal; luego abre esta conversación desde el Historial de sesiones."
       },
       "state": {
         "loading": {
diff --git a/src/renderer/src/i18n/locales/fr.json b/src/renderer/src/i18n/locales/fr.json
index fc4f748e2c5f..ea851d6eb743 100644
--- a/src/renderer/src/i18n/locales/fr.json
+++ b/src/renderer/src/i18n/locales/fr.json
@@ -18784,8 +18784,8 @@
         "claudeAccountSetupFailed": "Le compte Claude sélectionné n'a pas pu être configuré. Réessayez ou choisissez un autre compte.",
         "agentCommandNotRunnable": "{{agent}} : la Commande dans Paramètres → Agents doit être le chemin ou le nom d'un programme qu'Orca peut trouver, sans arguments ni variables. Modifiez-la ou réinitialisez-la.",
         "runtimeNotInstalled": "{{agent}} n'est pas installé sur l'ordinateur qui exécute ce chat. Installez-le depuis le chat dans une version récente d'Orca.",
-        "conversationOpenElsewhere": "Codex garde cette conversation ouverte ailleurs. Fermez-la à cet endroit, puis réessayez.",
-        "conversationOpenInTerminal": "Orca ne peut pas confirmer que {{agent}} a quitté son terminal. Arrêtez ce qui s'y exécute ou fermez le terminal, puis réessayez.",
+        "conversationOpenElsewhere": "Codex maintient encore cette conversation ouverte. Réessayez dans un instant ou fermez les autres terminaux Codex.",
+        "conversationOpenInTerminal": "{{agent}} exécute déjà cette conversation dans un autre terminal. Quittez {{agent}} là-bas ou fermez ce terminal pour continuer ici.",
         "chooseClaudeAccount": "Choisissez-en un ou ajoutez-en un dans les paramètres Comptes Claude.",
         "chooseClaudeAccountThenRunCommand": "Choisissez-en un ou ajoutez-en un dans les paramètres Comptes Claude, puis relancez /{{command}}.",
         "chooseClaudeAccountThenSend": "Choisissez-en un ou ajoutez-en un dans les paramètres Comptes Claude, puis renvoyez votre message.",
@@ -19177,8 +19177,8 @@
       "resumeInNewChat": {
         "notSavedYet": "{{agent}} n'a pas encore enregistré cette conversation. Réessayez après sa réponse.",
         "cannotResume": "Cette conversation {{agent}} ne peut pas être reprise dans un chat natif.",
-        "exitUnconfirmedFromTerminal": "Orca ne peut pas confirmer que {{agent}} s’est arrêté dans son terminal. Arrêtez ce qui s’y exécute ou fermez le terminal, puis ouvrez cette conversation depuis l’historique des sessions.",
-        "exitUnconfirmed": "Orca ne peut pas confirmer que {{agent}} s’est arrêté dans son terminal. Arrêtez ce qui s’y exécute ou fermez le terminal, puis réessayez."
+        "exitUnconfirmedFromTerminal": "{{agent}} exécute déjà cette conversation dans un autre terminal. Quittez {{agent}} là-bas ou fermez ce terminal, puis ouvrez cette conversation depuis l’historique des sessions.",
+        "exitUnconfirmed": "{{agent}} exécute déjà cette conversation dans un autre terminal. Quittez {{agent}} là-bas ou fermez ce terminal, puis ouvrez cette conversation depuis l’historique des sessions."
       },
       "state": {
         "loading": {
diff --git a/src/renderer/src/i18n/locales/ja.json b/src/renderer/src/i18n/locales/ja.json
index c4ed0d765a06..f585825430ea 100644
--- a/src/renderer/src/i18n/locales/ja.json
+++ b/src/renderer/src/i18n/locales/ja.json
@@ -18674,8 +18674,8 @@
         "claudeAccountSetupFailed": "選択した Claude アカウントを設定できませんでした。もう一度試すか、別のアカウントを選択してください。",
         "agentCommandNotRunnable": "[設定] → [Agent] にある {{agent}} の [コマンド] には、Orca が見つけられるプログラムのパスまたは名前を、引数や変数なしで指定する必要があります。変更するか、[リセット] してください。",
         "runtimeNotInstalled": "{{agent}} はこのチャットを実行しているコンピューターにインストールされていません。最新バージョンの Orca でチャットからインストールしてください。",
-        "conversationOpenElsewhere": "Codex はまだ別の場所でこの会話を開いています。そこで閉じてから、もう一度お試しください。",
-        "conversationOpenInTerminal": "Orca は {{agent}} がターミナルで終了したことを確認できません。そこで実行中のものを停止するかターミナルを閉じてから、もう一度お試しください。",
+        "conversationOpenElsewhere": "Codex がまだこの会話を開いたままにしています。少し待ってからもう一度試すか、ほかの Codex ターミナルを閉じてください。",
+        "conversationOpenInTerminal": "{{agent}} は別のターミナルですでにこの会話を実行しています。そちらの {{agent}} を終了するか、そのターミナルを閉じて、ここで続けてください。",
         "chooseClaudeAccount": "Claude アカウントの設定で選択または追加してください。",
         "chooseClaudeAccountThenRunCommand": "Claude アカウントの設定で選択または追加してから、/{{command}} をもう一度実行してください。",
         "chooseClaudeAccountThenSend": "Claude アカウントの設定で選択または追加してから、メッセージをもう一度送信してください。",
@@ -19067,8 +19067,8 @@
       "resumeInNewChat": {
         "notSavedYet": "{{agent}} はまだこの会話を保存していません。応答してから再度お試しください。",
         "cannotResume": "この {{agent}} の会話はネイティブチャットで再開できません。",
-        "exitUnconfirmedFromTerminal": "Orca は {{agent}} がターミナルで終了したことを確認できません。実行中の処理を停止するかターミナルを閉じてから、セッション履歴でこの会話を開いてください。",
-        "exitUnconfirmed": "Orca は、{{agent}} がターミナルで終了したことを確認できません。そこで実行されているものを停止するか、ターミナルを閉じてから、もう一度試してください。"
+        "exitUnconfirmedFromTerminal": "{{agent}} は別のターミナルですでにこの会話を実行しています。そちらの {{agent}} を終了するか、そのターミナルを閉じてから、セッション履歴でこの会話を開いてください。",
+        "exitUnconfirmed": "{{agent}} は別のターミナルですでにこの会話を実行しています。そちらの {{agent}} を終了するか、そのターミナルを閉じてから、セッション履歴でこの会話を開いてください。"
       },
       "state": {
         "loading": {
diff --git a/src/renderer/src/i18n/locales/ko.json b/src/renderer/src/i18n/locales/ko.json
index bcc7a3b5033e..86797cd62153 100644
--- a/src/renderer/src/i18n/locales/ko.json
+++ b/src/renderer/src/i18n/locales/ko.json
@@ -18674,8 +18674,8 @@
         "claudeAccountSetupFailed": "선택한 Claude 계정을 설정할 수 없습니다. 다시 시도하거나 다른 계정을 선택하세요.",
         "agentCommandNotRunnable": "{{agent}}의 설정 → 에이전트 → 명령은 Orca가 찾을 수 있는 프로그램 경로나 이름이어야 하며, 인수나 변수를 포함할 수 없습니다. 변경하거나 재설정하세요.",
         "runtimeNotInstalled": "{{agent}}이(가) 이 채팅을 실행하는 컴퓨터에 설치되어 있지 않습니다. 최신 버전의 Orca에서 채팅을 통해 설치하세요.",
-        "conversationOpenElsewhere": "Codex가 다른 곳에서 이 대화를 열어 두고 있습니다. 그곳에서 닫은 후 다시 시도하세요.",
-        "conversationOpenInTerminal": "Orca에서 {{agent}}이(가) 터미널에서 종료되었는지 확인할 수 없습니다. 그곳에서 실행 중인 항목을 중지하거나 터미널을 닫은 후 다시 시도하세요.",
+        "conversationOpenElsewhere": "Codex가 아직 이 대화를 열어 두고 있습니다. 잠시 후 다시 시도하거나 다른 Codex 터미널을 닫으세요.",
+        "conversationOpenInTerminal": "{{agent}}이(가) 다른 터미널에서 이미 이 대화를 실행 중입니다. 그곳에서 {{agent}}을(를) 종료하거나 해당 터미널을 닫은 후 여기서 계속하세요.",
         "chooseClaudeAccount": "Claude 계정 설정에서 선택하거나 추가하세요.",
         "chooseClaudeAccountThenRunCommand": "Claude 계정 설정에서 선택하거나 추가한 다음 /{{command}}을(를) 다시 실행하세요.",
         "chooseClaudeAccountThenSend": "Claude 계정 설정에서 선택하거나 추가한 다음 메시지를 다시 보내세요.",
@@ -19067,8 +19067,8 @@
       "resumeInNewChat": {
         "notSavedYet": "{{agent}}이(가) 아직 이 대화를 저장하지 않았습니다. 응답한 후 다시 시도하세요.",
         "cannotResume": "이 {{agent}} 대화는 기본 채팅에서 재개할 수 없습니다.",
-        "exitUnconfirmedFromTerminal": "Orca가 터미널에서 {{agent}} 종료 여부를 확인할 수 없습니다. 실행 중인 프로세스를 중지하거나 터미널을 닫은 후 세션 기록에서 이 대화를 여세요.",
-        "exitUnconfirmed": "Orca가 터미널에서 {{agent}} 종료 여부를 확인할 수 없습니다. 실행 중인 프로세스를 중지하거나 터미널을 닫은 후 다시 시도하세요."
+        "exitUnconfirmedFromTerminal": "{{agent}}이(가) 다른 터미널에서 이미 이 대화를 실행 중입니다. 그곳에서 {{agent}}을(를) 종료하거나 해당 터미널을 닫은 다음 세션 기록에서 이 대화를 여세요.",
+        "exitUnconfirmed": "{{agent}}이(가) 다른 터미널에서 이미 이 대화를 실행 중입니다. 그곳에서 {{agent}}을(를) 종료하거나 해당 터미널을 닫은 다음 세션 기록에서 이 대화를 여세요."
       },
       "state": {
         "loading": {
diff --git a/src/renderer/src/i18n/locales/pt.json b/src/renderer/src/i18n/locales/pt.json
index fd27fe41c4c8..270469846fcb 100644
--- a/src/renderer/src/i18n/locales/pt.json
+++ b/src/renderer/src/i18n/locales/pt.json
@@ -19779,8 +19779,8 @@
       },
       "transcriptLabel": "Conversa",
       "resumeInNewChat": {
-        "exitUnconfirmedFromTerminal": "O Orca não consegue confirmar se o {{agent}} foi encerrado no terminal. Pare o que estiver em execução lá ou feche o terminal e abra esta conversa no Histórico de sessões.",
-        "exitUnconfirmed": "O Orca não consegue confirmar se o {{agent}} foi encerrado no terminal. Pare o que estiver em execução lá ou feche o terminal e tente novamente.",
+        "exitUnconfirmedFromTerminal": "{{agent}} já está executando esta conversa em outro terminal. Encerre o {{agent}} lá ou feche esse terminal e abra esta conversa no Histórico de sessões.",
+        "exitUnconfirmed": "{{agent}} já está executando esta conversa em outro terminal. Encerre o {{agent}} lá ou feche esse terminal e abra esta conversa no Histórico de sessões.",
         "notSavedYet": "O {{agent}} ainda não salvou esta conversa. Tente novamente depois que ele responder.",
         "cannotResume": "Esta conversa do {{agent}} não pode ser retomada em um chat nativo."
       },
diff --git a/src/renderer/src/i18n/locales/zh.json b/src/renderer/src/i18n/locales/zh.json
index 0cd45cd0bd6f..db06d6b09a0a 100644
--- a/src/renderer/src/i18n/locales/zh.json
+++ b/src/renderer/src/i18n/locales/zh.json
@@ -18639,8 +18639,8 @@
         "claudeAccountSetupFailed": "无法设置所选 Claude 账户。请重试或选择其他账户。",
         "agentCommandNotRunnable": "{{agent}} 在设置 → 智能体中的命令必须是 Orca 能找到的程序路径或名称，且不能包含参数或变量。请修改或重置。",
         "runtimeNotInstalled": "运行此聊天的计算机上未安装 {{agent}}。请在最新版本的 Orca 中从聊天里安装。",
-        "conversationOpenElsewhere": "Codex 仍在其他地方打开着此对话。请在那里关闭后重试。",
-        "conversationOpenInTerminal": "Orca 无法确认 {{agent}} 已在其终端中退出。请停止那里正在运行的内容或关闭终端，然后重试。",
+        "conversationOpenElsewhere": "Codex 仍在保持此对话打开。请稍后重试，或关闭其他 Codex 终端。",
+        "conversationOpenInTerminal": "{{agent}} 已在另一个终端中运行此对话。请退出那里的 {{agent}} 或关闭该终端，然后在这里继续。",
         "chooseClaudeAccount": "请在 Claude 账户设置中选择或添加一个。",
         "chooseClaudeAccountThenRunCommand": "请在 Claude 账户设置中选择或添加一个，然后重新运行 /{{command}}。",
         "chooseClaudeAccountThenSend": "请在 Claude 账户设置中选择或添加一个，然后重新发送您的消息。",
@@ -19032,8 +19032,8 @@
       "resumeInNewChat": {
         "notSavedYet": "{{agent}} 尚未保存此对话。请在它回复后重试。",
         "cannotResume": "此 {{agent}} 对话无法在本机聊天中恢复。",
-        "exitUnconfirmed": "Orca 无法确认 {{agent}} 已在其终端中退出。停止那里正在运行的程序或关闭终端，然后重试。",
-        "exitUnconfirmedFromTerminal": "Orca 无法确认 {{agent}} 已在其终端中退出。停止那里正在运行的程序或关闭终端，然后从会话历史记录中打开此对话。"
+        "exitUnconfirmed": "{{agent}} 已在另一个终端中运行此对话。请退出那里的 {{agent}} 或关闭该终端，然后从会话历史记录中打开此对话。",
+        "exitUnconfirmedFromTerminal": "{{agent}} 已在另一个终端中运行此对话。请退出那里的 {{agent}} 或关闭该终端，然后从会话历史记录中打开此对话。"
       },
       "state": {
         "loading": {
diff --git a/src/renderer/src/lib/cli-conversation-exit-guidance.ts b/src/renderer/src/lib/cli-conversation-exit-guidance.ts
index 41da962ac58f..fd50d3cb552a 100644
--- a/src/renderer/src/lib/cli-conversation-exit-guidance.ts
+++ b/src/renderer/src/lib/cli-conversation-exit-guidance.ts
@@ -11,12 +11,12 @@ export function cliConversationExitGuidance(
   return fromTerminal
     ? translate(
         'components.native-chat.resumeInNewChat.exitUnconfirmedFromTerminal',
-        "Orca can't confirm {{agent}} has exited in its terminal. Stop what's running there or close the terminal, then open this conversation from Session History.",
+        '{{agent}} is already running this conversation in another terminal. Quit {{agent}} there or close that terminal, then open this conversation from Session History.',
         values
       )
     : translate(
         'components.native-chat.resumeInNewChat.exitUnconfirmed',
-        "Orca can't confirm {{agent}} has exited in its terminal. Stop what's running there or close the terminal, then try again.",
+        '{{agent}} is already running this conversation in another terminal. Quit {{agent}} there or close that terminal, then open this conversation from Session History.',
         values
       )
 }
diff --git a/src/shared/agent-session-failure-copy.ts b/src/shared/agent-session-failure-copy.ts
index 9e9a1e703ac8..1c935d6d911d 100644
--- a/src/shared/agent-session-failure-copy.ts
+++ b/src/shared/agent-session-failure-copy.ts
@@ -79,9 +79,9 @@ export const AGENT_SESSION_FAILURE_COPY = {
   runtimeNotInstalled:
     "{{agent}} isn't installed on the computer running this chat. Install it from the chat in a current version of Orca.",
   conversationOpenElsewhere:
-    'Codex still has this conversation open somewhere else. Close it there, then try again.',
+    'Codex is still holding this conversation open. Try again in a moment, or close other Codex terminals.',
   conversationOpenInTerminal:
-    "Orca can't confirm {{agent}} has exited in its terminal. Stop what's running there or close the terminal, then try again.",
+    '{{agent}} is already running this conversation in another terminal. Quit {{agent}} there or close that terminal to continue here.',
   chooseClaudeAccount: 'Choose or add one in Claude Accounts settings.',
   chooseClaudeAccountThenRunCommand:
     'Choose or add one in Claude Accounts settings, then run /{{command}} again.',

From 43a1712b0a8479d642cc2c05eeb7910edf156e2e Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sun, 25 Oct 2026 12:49:38 -0700
Subject: [PATCH 073/207] Admit note-only saved conversations without hiding
 live writers

---
 .../mobile-native-chat-unsent-notices.test.ts |  17 ++
 .../structured-agent-session-acquisition.ts   |   7 +-
 ...structured-agent-session-adapter-errors.ts |   1 +
 .../structured-agent-session-failure-text.ts  |   1 +
 ...nt-session-terminal-writer-acquire.test.ts | 148 ++++++++++++++++--
 ...session-tabs-targeted-agent-resume.spec.ts | 113 ++++++-------
 ...ed-agent-session-precommit-refusal.test.ts |  27 ++++
 ...uctured-agent-session-precommit-refusal.ts |   7 +-
 .../structured-agent-cli-writers.test.ts      | 145 ++++++++++++++++-
 .../runtime/structured-agent-cli-writers.ts   |  53 +++++--
 .../agent-session-failure-words-text.test.ts  |  33 ++++
 .../agent-session-failure-words-text.ts       |   5 +
 ...ault-session-resume-in-chat-launch.test.ts |   5 +
 .../ai-vault-session-resume-in-chat-launch.ts |   8 +
 .../tab-bar/cli-chat-resume-feedback.ts       |   8 +
 .../tab-bar/cli-chat-resume-run.test.ts       |  21 ++-
 .../src/i18n/en-runtime-required.json         |   1 +
 src/renderer/src/i18n/locales/en.json         |   1 +
 src/renderer/src/i18n/locales/es.json         |   1 +
 src/renderer/src/i18n/locales/fr.json         |   1 +
 src/renderer/src/i18n/locales/ja.json         |   1 +
 src/renderer/src/i18n/locales/ko.json         |   1 +
 src/renderer/src/i18n/locales/pt.json         |   1 +
 src/renderer/src/i18n/locales/zh.json         |   1 +
 .../agent-session-definitive-refusal.ts       |   2 +
 src/shared/agent-session-failure-copy.ts      |   2 +
 src/shared/agent-session-failure-words.ts     |   2 +
 src/shared/agent-session-failure.ts           |   1 +
 src/shared/agent-session-refusal-details.ts   |   1 +
 .../agent-session-refusal-reason-words.ts     |   4 +
 ...ctured-agent-session-dispatch-rejection.ts |   2 +
 31 files changed, 535 insertions(+), 86 deletions(-)

diff --git a/mobile/src/session/mobile-native-chat-unsent-notices.test.ts b/mobile/src/session/mobile-native-chat-unsent-notices.test.ts
index 74a2574046cd..513ab2698c6c 100644
--- a/mobile/src/session/mobile-native-chat-unsent-notices.test.ts
+++ b/mobile/src/session/mobile-native-chat-unsent-notices.test.ts
@@ -64,6 +64,23 @@ describe("the phone's line under a not-sent message", () => {
     )
   })
 
+  it('keeps the background-server cause in the phone recorded-message notice', () => {
+    const notices = mobileNativeChatUnsentNotices(
+      {
+        items: [],
+        submissions: [
+          submission('held', {
+            rejection: { kind: 'conversationOpenInBackgroundServer' }
+          })
+        ]
+      },
+      'opencode'
+    )
+    expect(notices.get(agentJournalSubmissionKey('held'))).toBe(
+      'OpenCode may still be running this conversation in its background server. Stop that OpenCode server, then try again.'
+    )
+  })
+
   it("words each rejected message as the desktop does, naming the chat's agent", () => {
     const notices = mobileNativeChatUnsentNotices(
       {
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition.ts
index 2ddef409a533..4d3c532df326 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition.ts
@@ -1,4 +1,5 @@
 import { isDeepStrictEqual } from 'node:util'
+import { isAgentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
 import { abortSignalReason } from '../../../shared/abort-signal-reason'
 import type {
   AgentSessionProcessIdentity,
@@ -48,7 +49,11 @@ export async function acquireOwner(
     } catch (error) {
       // Not a code: a code message would travel as the census's own conflict, not this reason.
       throw new AgentSessionPreSpawnError(error, {
-        reason: 'conversationOpenInTerminal',
+        reason:
+          isAgentSessionRefusalError(error) &&
+          error.refusal.details?.reason === 'conversationOpenInBackgroundServer'
+            ? 'conversationOpenInBackgroundServer'
+            : 'conversationOpenInTerminal',
         message: 'a terminal may still be writing this conversation'
       })
     }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-adapter-errors.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-adapter-errors.ts
index 5c4447b76a22..8d8616d8be47 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-adapter-errors.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-adapter-errors.ts
@@ -46,6 +46,7 @@ export type AgentSessionPreSpawnReason = Extract<
   | 'agentCommandNotRunnable'
   | 'runtimeNotInstalled'
   | 'conversationOpenInTerminal'
+  | 'conversationOpenInBackgroundServer'
 >
 
 /** First-hand proof that acquisition spawned no process. */
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-failure-text.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-failure-text.ts
index 643f6d1d0d50..5606024dcf22 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-failure-text.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-failure-text.ts
@@ -38,6 +38,7 @@ const TYPED_START_REFUSALS = [
   'agentCommandNotRunnable',
   'runtimeNotInstalled',
   'conversationOpenInTerminal',
+  'conversationOpenInBackgroundServer',
   'conversationOpenElsewhere'
 ] as const satisfies readonly (AgentSessionFailureKind &
   AgentSessionRefusalReason<'agent_session_operation_invalid'>)[]
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts
index a85e86432f3a..3d9b2ac9b65e 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts
@@ -23,7 +23,10 @@ import {
   openTestJournalHostDatabase
 } from '../agent-session-journal/journal-host-database-test-support'
 import type { StructuredAgentSessionAdapter } from './structured-agent-session-adapter'
-import { NO_STRUCTURED_AGENTS } from './structured-agent-session-adapter-router-test-support'
+import {
+  NO_STRUCTURED_AGENTS,
+  structuredAgentsDeclaringNothing
+} from './structured-agent-session-adapter-router-test-support'
 import { StructuredAgentSessionHost } from './structured-agent-session-host'
 import {
   HOST_TEST_NOW as NOW,
@@ -34,6 +37,8 @@ import {
   hostTestOperationId,
   resetHostTestOperationIds
 } from './structured-agent-session-host-test-data'
+import { structuredAgentRuntimeRegistration } from '../../runtime/structured-agent-runtime-registrations'
+import { attachFingerprintFields } from './structured-agent-session-attach'
 import { createStructuredAgentSessionLogger } from './structured-agent-session-logger'
 
 let root: string
@@ -73,9 +78,16 @@ beforeEach(async () => {
       })
     }
   })
+  const openCode = structuredAgentRuntimeRegistration('opencode')
+  if (!openCode) {
+    throw new Error('OpenCode is not registered')
+  }
   store = await openTestAgentSessionRecordStore(root)
   host = new StructuredAgentSessionHost({
-    agents: NO_STRUCTURED_AGENTS,
+    agents: structuredAgentsDeclaringNothing([
+      ...NO_STRUCTURED_AGENTS.definitions(),
+      openCode.definition
+    ]),
     logger: createStructuredAgentSessionLogger(),
     store,
     adapter: {
@@ -106,15 +118,15 @@ afterEach(async () => {
   await rm(root, { recursive: true, force: true })
 })
 
-async function send(text: string): Promise<string> {
+async function send(text: string, sessionId = SESSION): Promise<string> {
   const body = hostTestMessage(text)
   const envelope = {
-    sessionId: SESSION,
+    sessionId,
     clientOperationId: hostTestOperationId(),
     expectedRuntimeFence: 1,
     payloadFingerprint: computeAgentSessionPayloadFingerprint({
       method: 'agentSession.send',
-      sessionId: SESSION,
+      sessionId,
       fields: { body }
     })
   }
@@ -122,16 +134,16 @@ async function send(text: string): Promise<string> {
   return envelope.clientOperationId
 }
 
-async function rejection(id: string) {
+async function rejection(id: string, sessionId = SESSION) {
   await vi.waitFor(
     async () =>
       expect(
-        (await host.journalSnapshot(SESSION)).submissions.find((s) => s.clientMessageId === id)
+        (await host.journalSnapshot(sessionId)).submissions.find((s) => s.clientMessageId === id)
           ?.dispatchState
       ).toBe('rejected'),
     { timeout: 10_000 }
   )
-  return (await host.journalSnapshot(SESSION)).submissions.find((s) => s.clientMessageId === id)
+  return (await host.journalSnapshot(sessionId)).submissions.find((s) => s.clientMessageId === id)
 }
 
 // H10: a chat reopened while its conversation runs in a terminal starts no second writer.
@@ -144,7 +156,9 @@ it('refuses the chat agent start while a terminal writes its conversation, once
 
   const first = await rejection(await send('first'))
   expect(first?.rejection).toMatchObject({ kind: 'conversationOpenInTerminal' })
-  expect(first?.reason).toContain('has exited in its terminal')
+  expect(first?.reason).toBe(
+    'Codex is already running this conversation in another terminal. Quit Codex there or close that terminal to continue here.'
+  )
   expect(acquire.mock.calls.length).toBe(spawnsBefore)
   expect(store.getRecord(SESSION)?.lease.reservedSpawnToken).toBeNull()
 
@@ -159,6 +173,122 @@ it('refuses the chat agent start while a terminal writes its conversation, once
   })
 })
 
+it('acquires when only a saved Sleep note remains, but refuses an existing unknown terminal', async () => {
+  const saved: SleepingAgentSessionRecord = {
+    paneKey: 'slept',
+    worktreeId: 'workspace-1',
+    agent: 'codex',
+    providerSession: { key: 'session_id', id: THREAD },
+    prompt: '',
+    state: 'done',
+    origin: 'worktree-sleep',
+    capturedAt: 1,
+    updatedAt: 1
+  }
+  let terminalExists = true
+  assertNoTerminalWriter.mockImplementation((record) =>
+    assertCliConversationWritersExited(
+      {
+        saved: () => [saved],
+        rows: () => [],
+        links: () => [],
+        observation: () => null,
+        sleeping: () => true,
+        terminal: () => (terminalExists ? { pane: null } : null),
+        shellAlone: vi.fn(async () => false)
+      },
+      record.provider,
+      record.providerHandleChain.at(-1)?.handle.nativeId ?? ''
+    )
+  )
+  await host.close(SESSION, 'evict')
+  await host.revealSession(SESSION)
+  const before = acquire.mock.calls.length
+  expect((await rejection(await send('unknown physical terminal')))?.rejection).toMatchObject({
+    kind: 'conversationOpenInTerminal'
+  })
+  expect(acquire).toHaveBeenCalledTimes(before)
+  terminalExists = false
+  const id = await send('saved note only')
+  await vi.waitFor(() => expect(acquire).toHaveBeenCalledTimes(before + 1))
+  await vi.waitFor(async () =>
+    expect(
+      (await host.journalSnapshot(SESSION)).submissions.find((s) => s.clientMessageId === id)
+        ?.dispatchState
+    ).toBe('accepted')
+  )
+})
+
+it('preserves actual saved OpenCode background refusal through acquisition and the recorded send', async () => {
+  const sessionId = `${SESSION}-opencode`
+  const definition = structuredAgentRuntimeRegistration('opencode')?.definition
+  if (!definition) {
+    throw new Error('OpenCode is not registered')
+  }
+  const handle = { transport: definition.handleTransport, agent: 'opencode', nativeId: THREAD }
+  acquire.mockImplementationOnce(async ({ fence, spawnToken }) => ({
+    process: { hostId: 'local', pid: 4243, processStartTimeMs: NOW, spawnToken },
+    acquisitionGeneration: `generation-${fence}`,
+    link: {
+      linkId: `link-${fence}`,
+      handle,
+      origin: 'created',
+      mintedAtFence: fence,
+      observedAt: NOW
+    }
+  }))
+  const params = hostTestAttachParams(null, {
+    provider: 'opencode',
+    agent: 'opencode',
+    accountHome: { kind: 'opencode', locator: { kind: 'unmanaged' } },
+    providerHandle: undefined
+  })
+  params.envelope.sessionId = sessionId
+  params.envelope.payloadFingerprint = computeAgentSessionPayloadFingerprint({
+    method: 'agentSession.attach',
+    sessionId,
+    fields: attachFingerprintFields(params)
+  })
+  const attached = await host.attach(CALLER, params)
+  expect(attached).toMatchObject({ ok: true })
+  await host.close(sessionId, 'evict')
+  const saved: SleepingAgentSessionRecord = {
+    paneKey: 'slept',
+    worktreeId: 'workspace-1',
+    agent: 'opencode',
+    providerSession: { key: 'session_id', id: THREAD },
+    prompt: '',
+    state: 'done',
+    origin: 'worktree-sleep',
+    capturedAt: 1,
+    updatedAt: 1
+  }
+  assertNoTerminalWriter.mockImplementation((record) =>
+    assertCliConversationWritersExited(
+      {
+        saved: () => [saved],
+        rows: () => [],
+        links: () => [],
+        observation: () => null,
+        sleeping: () => true,
+        terminal: () => null,
+        shellAlone: vi.fn(async () => false)
+      },
+      record.provider,
+      record.providerHandleChain.at(-1)?.handle.nativeId ?? ''
+    )
+  )
+  await host.revealSession(sessionId)
+  const before = acquire.mock.calls.length
+  const rejected = await rejection(await send('resume saved OpenCode', sessionId), sessionId)
+  expect(rejected?.rejection).toMatchObject({ kind: 'conversationOpenInBackgroundServer' })
+  expect(rejected?.reason).toBe(
+    'OpenCode may still be running this conversation in its background server. Stop that OpenCode server, then try again.'
+  )
+  expect(acquire).toHaveBeenCalledTimes(before)
+  expect(store.getRecord(sessionId)?.lease.reservedSpawnToken).toBeNull()
+})
+
 it.each([10, 100])(
   'drives acquisition through the real census for %i matching/unrelated panes',
   async (size) => {
diff --git a/src/main/runtime/orca-runtime-tests/mobile-session-tabs-targeted-agent-resume.spec.ts b/src/main/runtime/orca-runtime-tests/mobile-session-tabs-targeted-agent-resume.spec.ts
index f0ffa6e1f75a..fb949ea83858 100644
--- a/src/main/runtime/orca-runtime-tests/mobile-session-tabs-targeted-agent-resume.spec.ts
+++ b/src/main/runtime/orca-runtime-tests/mobile-session-tabs-targeted-agent-resume.spec.ts
@@ -158,63 +158,66 @@ function storedRecord(fixture: Fixture) {
 }
 
 describe('resumeAgentSessionInWorkspace', () => {
-  it('releases a saved resume claim when actual admission creates a plain shell', async () => {
-    const fixture = makeSleptWorkspace()
-    const saved = storedRecord(fixture)
-    if (!saved) {
-      throw new Error('missing saved conversation')
-    }
-    saved.origin = 'live'
-    const chat = agentSessionRecordFixture(
-      agentSessionLeaseFixture({
-        claimStatus: 'released',
-        ownerProcess: null,
-        reservedSpawnToken: null,
-        deathEvidence: { kind: 'exit-observed', detail: 'closed', observedAt: 1 }
+  it.each(['live', 'worktree-sleep'] as const)(
+    'releases a %s saved resume claim when actual admission creates a plain shell',
+    async (origin) => {
+      const fixture = makeSleptWorkspace()
+      const saved = storedRecord(fixture)
+      if (!saved) {
+        throw new Error('missing saved conversation')
+      }
+      saved.origin = origin
+      const chat = agentSessionRecordFixture(
+        agentSessionLeaseFixture({
+          claimStatus: 'released',
+          ownerProcess: null,
+          reservedSpawnToken: null,
+          deathEvidence: { kind: 'exit-observed', detail: 'closed', observedAt: 1 }
+        })
+      )
+      chat.providerHandleChain[0]!.handle.nativeId = SESSION.id
+      let nativeOpen = true
+      const store: AgentSessionRecordStore = Object.create(AgentSessionRecordStore.prototype)
+      store.listRecords = () => [chat]
+      store.getVisibleSessionTabIndex = () => ({
+        present: true,
+        sessionIds: nativeOpen ? [chat.sessionId] : []
       })
-    )
-    chat.providerHandleChain[0]!.handle.nativeId = SESSION.id
-    let nativeOpen = true
-    const store: AgentSessionRecordStore = Object.create(AgentSessionRecordStore.prototype)
-    store.listRecords = () => [chat]
-    store.getVisibleSessionTabIndex = () => ({
-      present: true,
-      sessionIds: nativeOpen ? [chat.sessionId] : []
-    })
-    const effectiveCommands: (string | undefined)[] = []
-    const { runtime, spawn, openOldPane, resume } = makeRuntime(fixture, {
-      spawn: async (args) => {
-        const admission = await chooseSavedResumeFreshLaunch(
-          { openAgentSessionRecordStore: async () => store },
-          args,
-          null,
-          args
-        )
-        effectiveCommands.push(args.command)
-        return {
-          id: effectiveCommands.length === 1 ? 'refused-shell' : 'resumed-C',
-          launchAgent: args.launchAgent,
-          launchConfig: args.launchConfig,
-          ...savedResumeResult(admission)
+      const effectiveCommands: (string | undefined)[] = []
+      const { runtime, spawn, openOldPane, resume } = makeRuntime(fixture, {
+        spawn: async (args) => {
+          const admission = await chooseSavedResumeFreshLaunch(
+            { openAgentSessionRecordStore: async () => store },
+            args,
+            null,
+            args
+          )
+          effectiveCommands.push(args.command)
+          return {
+            id: effectiveCommands.length === 1 ? 'refused-shell' : 'resumed-C',
+            launchAgent: args.launchAgent,
+            launchConfig: args.launchConfig,
+            ...savedResumeResult(admission)
+          }
         }
-      }
-    })
-    await openOldPane()
-    expect(runtime.getTerminalLaunchResult('refused-shell')).toMatchObject({
-      agentResumeRefused: 'chat-home',
-      savedResumeDecision: { agent: 'claude', providerSession: SESSION, verdict: 'chat-home' }
-    })
-    expect(runtime.getTerminalLaunchResult('refused-shell')?.launchAgent).toBeUndefined()
-    expect(effectiveCommands).toEqual([undefined])
-    nativeOpen = false
-    await expect(resume({ mutationId: 'after-native-close' })).resolves.toMatchObject({
-      ok: true,
-      ptyId: 'resumed-C'
-    })
-    expect(effectiveCommands[1]).toContain(SESSION.id)
-    expect(spawn).toHaveBeenCalledTimes(2)
-    expect(runtime.getTerminalLaunchResult('refused-shell')).toBeDefined()
-  })
+      })
+      await openOldPane()
+      expect(runtime.getTerminalLaunchResult('refused-shell')).toMatchObject({
+        agentResumeRefused: 'chat-home',
+        savedResumeDecision: { agent: 'claude', providerSession: SESSION, verdict: 'chat-home' }
+      })
+      expect(runtime.getTerminalLaunchResult('refused-shell')?.launchAgent).toBeUndefined()
+      expect(effectiveCommands).toEqual([undefined])
+      nativeOpen = false
+      await expect(resume({ mutationId: 'after-native-close' })).resolves.toMatchObject({
+        ok: true,
+        ptyId: 'resumed-C'
+      })
+      expect(effectiveCommands[1]).toContain(SESSION.id)
+      expect(spawn).toHaveBeenCalledTimes(2)
+      expect(runtime.getTerminalLaunchResult('refused-shell')).toBeDefined()
+    }
+  )
 
   it('settles only fresh matching saved results and binds unproven or observed results until exit', async () => {
     for (const kind of [
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-precommit-refusal.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-precommit-refusal.test.ts
index e0366dea1855..71fdfb8e6d60 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-precommit-refusal.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-precommit-refusal.test.ts
@@ -128,6 +128,33 @@ afterEach(() => {
   vi.restoreAllMocks()
 })
 
+it('retains the saved OpenCode refusal and no-effects proof before attach', async () => {
+  const words =
+    'OpenCode may still be running this conversation in its background server. Stop that OpenCode server, then try again.'
+  const result = await create({
+    resolveStructuredAgentSessionCreateIntent: async () => {
+      throw agentSessionRefusalError(
+        'agent_session_operation_invalid',
+        { reason: 'conversationOpenInBackgroundServer' },
+        words
+      )
+    }
+  })
+  expect(result).toMatchObject({
+    ok: true,
+    result: {
+      ok: false,
+      refusal: {
+        code: 'agent_session_operation_invalid',
+        details: { reason: 'conversationOpenInBackgroundServer' },
+        message: words,
+        createAttemptRefusedBeforeCommit: true
+      }
+    }
+  })
+  expect(attach).not.toHaveBeenCalled()
+})
+
 describe('a create refused before it commits', () => {
   it('answers an ownership refusal before commit as a definite failed attempt', async () => {
     const code = 'agent_session_conflict'
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-precommit-refusal.ts b/src/main/runtime/rpc/methods/structured-agent-session-precommit-refusal.ts
index c5425f7935f7..05d94cb97eaa 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-precommit-refusal.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-precommit-refusal.ts
@@ -38,7 +38,12 @@ const PRECOMMIT_REFUSAL_MESSAGE = 'Orca cannot open a structured agent chat for
 function precommitRefusal(error: unknown): AgentSessionWireRefusal {
   // A refusal the host raised keeps its situation; a bare code names none.
   if (isAgentSessionRefusalError(error)) {
-    return agentSessionRefusalFromReference(error.refusal, PRECOMMIT_REFUSAL_MESSAGE)
+    return agentSessionRefusalFromReference(
+      error.refusal,
+      error.refusal.details?.reason === 'conversationOpenInBackgroundServer'
+        ? error.refusal.message
+        : PRECOMMIT_REFUSAL_MESSAGE
+    )
   }
   const code = wireRefusalCode(error)
   if (code) {
diff --git a/src/main/runtime/structured-agent-cli-writers.test.ts b/src/main/runtime/structured-agent-cli-writers.test.ts
index 3400dad6de40..9dff8c536304 100644
--- a/src/main/runtime/structured-agent-cli-writers.test.ts
+++ b/src/main/runtime/structured-agent-cli-writers.test.ts
@@ -67,6 +67,14 @@ function inspection(verdict: AgentProcessVerdict | null = null) {
     run: () => assertCliConversationWritersExited(host, 'codex', 'conversation')
   }
 }
+const backgroundRefusal = {
+  refusal: {
+    message:
+      'OpenCode may still be running this conversation in its background server. Stop that OpenCode server, then try again.',
+    code: 'agent_session_operation_invalid',
+    details: { reason: 'conversationOpenInBackgroundServer' }
+  }
+}
 const refusal = {
   refusal: { code: 'agent_session_conflict', details: { reason: 'conversationHeldElsewhere' } }
 }
@@ -132,6 +140,141 @@ describe('execution-host conversation writer inspection', () => {
     }
   })
 
+  it.each(['claude', 'codex', 'pi', 'opencode', 'opencode2'] as const)(
+    'classifies the saved %s note separately from a physical terminal',
+    async (agent) => {
+      const check = inspection()
+      const record: SleepingAgentSessionRecord = {
+        paneKey: 'source',
+        worktreeId: 'workspace',
+        agent,
+        providerSession: { key: 'session_id', id: 'conversation' },
+        prompt: '',
+        state: 'done',
+        origin: 'worktree-sleep',
+        capturedAt: 1,
+        updatedAt: 1
+      }
+      check.host.saved = () => [record]
+      check.host.rows = () => []
+      check.host.sleeping = () => true
+      check.host.terminal = () => null
+      const run = () =>
+        assertCliConversationWritersExited(
+          check.host,
+          agent === 'opencode2' ? 'opencode' : agent,
+          'conversation',
+          { paneKey: record.paneKey, worktreeId: record.worktreeId }
+        )
+      await (agent === 'opencode' || agent === 'opencode2'
+        ? expect(run()).rejects.toMatchObject(backgroundRefusal)
+        : expect(run()).resolves.toBeUndefined())
+      check.host.terminal = () => ({ pane: null })
+      await expect(run()).rejects.toMatchObject(refusal)
+      expect(check.host.shellAlone).not.toHaveBeenCalled()
+    }
+  )
+
+  it('uses normal physical proof for conclusively pane-owned OpenCode, not background-server copy', async () => {
+    const check = inspection()
+    check.host.rows = () => [{ ...row, agentType: 'opencode' }]
+    const saved: SleepingAgentSessionRecord = {
+      paneKey: row.paneKey,
+      worktreeId: 'workspace',
+      agent: 'opencode',
+      providerSession: { key: 'session_id', id: 'conversation' },
+      prompt: '',
+      state: 'done',
+      origin: 'live',
+      capturedAt: 1,
+      updatedAt: 1
+    }
+    check.host.saved = () => [saved]
+    const run = () => assertCliConversationWritersExited(check.host, 'opencode', 'conversation')
+    await expect(run()).resolves.toBeUndefined()
+    check.observation.presence = async () => 'live'
+    await expect(run()).rejects.toMatchObject(refusal)
+  })
+
+  it('probes a current row before admitting physical absence, even for a sleeping identity', async () => {
+    for (const verdict of [null, 'exited', 'live', 'unverifiable'] as const) {
+      const check = inspection(verdict)
+      check.host.terminal = () => null
+      check.host.sleeping = () => true
+      check.observation.topology = 'unverifiable'
+      const result = expect(check.run())
+      await (verdict === null || verdict === 'exited'
+        ? result.resolves.toBeUndefined()
+        : result.rejects.toMatchObject(refusal))
+      expect(check.observation.presence).toHaveBeenCalledOnce()
+    }
+    const replaced = inspection()
+    replaced.host.terminal = () => null
+    replaced.observation.presence = async () => {
+      replaced.replaceRow()
+      return null
+    }
+    await expect(replaced.run()).rejects.toMatchObject(refusal)
+  })
+
+  it('rechecks an absent saved pane and captured identity after another candidate awaits', async () => {
+    for (const changed of ['terminal', 'capture'] as const) {
+      const check = inspection()
+      const record: SleepingAgentSessionRecord = {
+        paneKey: 'absent',
+        worktreeId: 'workspace',
+        agent: 'codex',
+        providerSession: { key: 'session_id', id: 'conversation' },
+        prompt: '',
+        state: 'done',
+        origin: 'worktree-sleep',
+        capturedAt: 1,
+        updatedAt: 1
+      }
+      const other = { ...record, paneKey: 'other' }
+      check.host.saved = () => [record, other]
+      check.host.rows = () => []
+      const terminal = check.host.terminal
+      let appeared = false
+      check.host.terminal = (coordinates) =>
+        coordinates.paneKey === 'absent' && !appeared ? null : terminal(coordinates)
+      check.host.shellAlone = async () => {
+        if (changed === 'terminal') {
+          appeared = true
+        } else {
+          record.updatedAt += 1
+        }
+        return true
+      }
+      await expect(check.run()).rejects.toMatchObject(refusal)
+    }
+  })
+
+  it('retains a matching absent row observation across another saved candidate await', async () => {
+    const check = inspection()
+    const record: SleepingAgentSessionRecord = {
+      paneKey: row.paneKey,
+      worktreeId: 'workspace',
+      agent: 'codex',
+      providerSession: { key: 'session_id', id: 'conversation' },
+      prompt: '',
+      state: 'done',
+      origin: 'worktree-sleep',
+      capturedAt: 1,
+      updatedAt: 1
+    }
+    const other = { ...record, paneKey: 'other' }
+    check.host.saved = () => [record, other]
+    const terminal = check.host.terminal
+    check.host.terminal = (coordinates) =>
+      coordinates.paneKey === row.paneKey ? null : terminal(coordinates)
+    check.host.shellAlone = async () => {
+      check.replaceRow()
+      return true
+    }
+    await expect(check.run()).rejects.toMatchObject(refusal)
+  })
+
   it('requires current owned shell proof for saved resumes, including done checkpoints', async () => {
     const record: SleepingAgentSessionRecord = {
       paneKey: 'source',
@@ -162,7 +305,7 @@ describe('execution-host conversation writer inspection', () => {
         'opencode',
         'conversation'
       )
-    ).rejects.toMatchObject(refusal)
+    ).rejects.toMatchObject(backgroundRefusal)
     saved = [{ ...record, connectionId: 'ssh-A' }]
     await expect(check.run()).resolves.toBeUndefined()
     saved = [record]
diff --git a/src/main/runtime/structured-agent-cli-writers.ts b/src/main/runtime/structured-agent-cli-writers.ts
index 0cf3524279bb..aff0332fca91 100644
--- a/src/main/runtime/structured-agent-cli-writers.ts
+++ b/src/main/runtime/structured-agent-cli-writers.ts
@@ -5,7 +5,11 @@ import {
   chatAgentsShareConversations,
   CLI_CONVERSATION_ADOPTING_AGENTS
 } from '../../shared/structured-agent-cli-conversation-adoption'
-import { agentSessionRefusalError } from '../../shared/agent-session-wire-refusals'
+import {
+  agentSessionRefusalError,
+  isAgentSessionRefusalError
+} from '../../shared/agent-session-wire-refusals'
+import { AGENT_SESSION_FAILURE_COPY } from '../../shared/agent-session-failure-copy'
 import type { CliWriterObservation } from '../agent-hooks/server/cli-writer-observation'
 import { getFreshShellForegroundSnapshot } from '../../shared/process-table-snapshot-reader'
 import { collectDescendantsFromIndex, getProcessTableIndex } from '../../shared/process-table-index'
@@ -97,7 +101,7 @@ export async function assertCliConversationWritersExited(
   }
   try {
     if (source) {
-      await censusPane(() => host.terminal(source), source.worktreeId, false)
+      await censusPane(() => host.terminal(source), source.worktreeId, true)
     }
     const savedCandidates = () =>
       host
@@ -143,12 +147,7 @@ export async function assertCliConversationWritersExited(
         record.providerSession.id === row.providerSession?.id
       const matching = saved.filter(matches)
       const observed = host.observation(row)
-      if (
-        !observed ||
-        !observed.current() ||
-        observed.topology !== 'pane-owned' ||
-        host.sleeping(row.worktreeId ?? '')
-      ) {
+      if (!observed || !observed.current()) {
         throw refuse()
       }
       const pane = paneOf(row)
@@ -157,11 +156,24 @@ export async function assertCliConversationWritersExited(
         !observed.current() ||
         presence === 'live' ||
         presence === 'unverifiable' ||
-        (pane && paneOf(row)?.identity !== pane.identity) ||
-        host.sleeping(row.worktreeId ?? '')
+        (pane && paneOf(row)?.identity !== pane.identity)
       ) {
         throw refuse()
       }
+      if (!host.terminal(row)) {
+        if (row.agentType !== 'opencode' && row.agentType !== 'opencode2') {
+          for (const record of matching) {
+            covered.set(
+              record,
+              () => savedCurrent(record) && observed.current() && !host.terminal(row)
+            )
+          }
+        }
+        continue
+      }
+      if (observed.topology !== 'pane-owned' || host.sleeping(row.worktreeId ?? '')) {
+        throw refuse()
+      }
       if (presence === 'exited' && matching.length === 0) {
         await censusPane(() => host.terminal(row), row.worktreeId, true)
         if (!observed.current()) {
@@ -210,10 +222,19 @@ export async function assertCliConversationWritersExited(
       }
       const [paneKey, worktreeId, , savedAgent] = identity
       if (savedAgent === 'opencode' || savedAgent === 'opencode2') {
-        throw refuse()
+        throw agentSessionRefusalError(
+          'agent_session_operation_invalid',
+          { reason: 'conversationOpenInBackgroundServer' },
+          AGENT_SESSION_FAILURE_COPY.conversationOpenInBackgroundServer
+        )
       }
       const coordinates = { paneKey, worktreeId }
-      const pane = paneOf(coordinates)
+      const terminal = host.terminal(coordinates)
+      if (!terminal) {
+        covered.set(record, () => savedCurrent(record) && !host.terminal(coordinates))
+        continue
+      }
+      const pane = terminal.pane
       if (!pane) {
         throw refuse()
       }
@@ -234,7 +255,13 @@ export async function assertCliConversationWritersExited(
     ) {
       throw refuse()
     }
-  } catch {
+  } catch (error) {
+    if (
+      isAgentSessionRefusalError(error) &&
+      error.refusal.details?.reason === 'conversationOpenInBackgroundServer'
+    ) {
+      throw error
+    }
     throw refuse()
   }
 }
diff --git a/src/renderer/src/components/native-chat/agent-session-failure-words-text.test.ts b/src/renderer/src/components/native-chat/agent-session-failure-words-text.test.ts
index 0b38825b0c70..029784bd271a 100644
--- a/src/renderer/src/components/native-chat/agent-session-failure-words-text.test.ts
+++ b/src/renderer/src/components/native-chat/agent-session-failure-words-text.test.ts
@@ -138,6 +138,39 @@ describe('desktop words for a failure fact', () => {
     ).toBe(`${row}. ${retry}`)
   })
 
+  it('projects the exact background-server refusal without replacing host text for unknown facts', () => {
+    const words =
+      'OpenCode may still be running this conversation in its background server. Stop that OpenCode server, then try again.'
+    expect(
+      agentSessionWriteNoticeText(
+        agentSessionWriteNoticeParts(
+          agentSessionRefusalFailure({
+            code: 'agent_session_operation_invalid',
+            details: { reason: 'conversationOpenInBackgroundServer' }
+          }),
+          'composer-send'
+        )
+      )
+    ).toBe(`Your message was not sent. ${words}`)
+    const unknown = {
+      kind: 'fromTheFuture',
+      refusal: {
+        code: 'agent_session_operation_invalid',
+        details: { reason: 'conversationOpenInBackgroundServer' }
+      }
+    }
+    expect(readWholeAgentSessionFailureFact(unknown)).toBeUndefined()
+    expect(
+      agentSessionWriteNoticeText(
+        structuredAgentSessionRejectionParts(
+          words,
+          'send',
+          readWholeAgentSessionFailureFact(unknown)
+        )
+      )
+    ).toBe(words)
+  })
+
   it('has a key for every piece, whose English default is the shared sentence', () => {
     for (const id of IDS) {
       expect([id, sayAgentSessionFailureTranslated(id, VALUES)]).toEqual([
diff --git a/src/renderer/src/components/native-chat/agent-session-failure-words-text.ts b/src/renderer/src/components/native-chat/agent-session-failure-words-text.ts
index b1214aaa2000..f3623fb591cd 100644
--- a/src/renderer/src/components/native-chat/agent-session-failure-words-text.ts
+++ b/src/renderer/src/components/native-chat/agent-session-failure-words-text.ts
@@ -149,6 +149,11 @@ const PIECES: Record<AgentSessionFailureCopyId, (values: AgentSessionFailureCopy
         COPY.runtimeNotInstalled,
         values
       ),
+    conversationOpenInBackgroundServer: () =>
+      translate(
+        'components.native-chat.failureWords.conversationOpenInBackgroundServer',
+        COPY.conversationOpenInBackgroundServer
+      ),
     conversationOpenElsewhere: () =>
       translate(
         'components.native-chat.failureWords.conversationOpenElsewhere',
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.test.ts b/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.test.ts
index 7d70bc5eb569..2ccc99a05b5f 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.test.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.test.ts
@@ -169,6 +169,11 @@ describe('resumeAiVaultSessionInNewChat', () => {
   )
 
   it.each([
+    [
+      'agent_session_operation_invalid',
+      'conversationOpenInBackgroundServer',
+      'OpenCode may still be running this conversation in its background server. Stop that OpenCode server, then try again.'
+    ],
     ['agent_session_conflict', undefined, 'Another chat is already holding this conversation.'],
     [
       'agent_session_conflict',
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.ts b/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.ts
index 29520c52c09e..b0b7b859e4ac 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.ts
@@ -1,3 +1,4 @@
+import { sayAgentSessionFailureTranslated } from '../native-chat/agent-session-failure-words-text'
 import { toast } from 'sonner'
 import { translate } from '@/i18n/i18n'
 import { useAppStore } from '@/store'
@@ -135,6 +136,13 @@ function notifyAiVaultSessionResumeInChatFailure(
   rowAgent: CliConversationRowAgent
 ): void {
   const failure = structuredLaunchFailure(error)
+  if (
+    failure?.code === 'agent_session_operation_invalid' &&
+    failure.details?.reason === 'conversationOpenInBackgroundServer'
+  ) {
+    toast.error(sayAgentSessionFailureTranslated('conversationOpenInBackgroundServer'))
+    return
+  }
   if (
     hasRuntimeRpcErrorCode(error, 'agent_session_conflict') ||
     failure?.code === 'agent_session_conflict'
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
index 1807c15f9c3f..b4e853cbd23a 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
@@ -1,3 +1,4 @@
+import { sayAgentSessionFailureTranslated } from '../native-chat/agent-session-failure-words-text'
 import { toast } from 'sonner'
 import { translate } from '@/i18n/i18n'
 import { structuredLaunchFailure } from '@/lib/structured-agent-session-launch-failure'
@@ -15,6 +16,13 @@ export async function reportCliChatResumeFailure(
   target: RuntimeClientTarget
 ): Promise<void> {
   const refusal = structuredLaunchFailure(error)
+  if (
+    refusal?.code === 'agent_session_operation_invalid' &&
+    refusal.details?.reason === 'conversationOpenInBackgroundServer'
+  ) {
+    toast.error(sayAgentSessionFailureTranslated('conversationOpenInBackgroundServer'))
+    return
+  }
   if (
     refusal?.code === 'agent_session_conflict' ||
     refusal?.code === 'agent_session_ownership_unknown'
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
index b7e4c5f60535..20f2d6c402cb 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
@@ -264,21 +264,30 @@ describe('CLI identity resume through the existing launch owner', () => {
     }
   })
 
-  it('keeps the terminal and directs a refused terminal writer to Session History', async () => {
+  it.each([
+    [
+      'agent_session_conflict',
+      'conversationHeldElsewhere',
+      'Claude is already running this conversation in another terminal. Quit Claude there or close that terminal, then open this conversation from Session History.'
+    ],
+    [
+      'agent_session_operation_invalid',
+      'conversationOpenInBackgroundServer',
+      'OpenCode may still be running this conversation in its background server. Stop that OpenCode server, then try again.'
+    ]
+  ])('keeps the terminal and words the actual %s refusal', async (code, reason, words) => {
     mocks.call.mockResolvedValue({
       ok: false,
       refusal: {
-        code: 'agent_session_conflict',
+        code,
         message: 'private host evidence',
-        details: { reason: 'conversationHeldElsewhere' },
+        details: { reason },
         createAttemptRefusedBeforeCommit: true
       }
     })
     await runCliChatResume(SOURCE, true)
     expect(mocks.toast).toHaveBeenCalledTimes(1)
-    expect(mocks.toast.mock.calls[0]?.[0]).toBe(
-      'Claude is already running this conversation in another terminal. Quit Claude there or close that terminal, then open this conversation from Session History.'
-    )
+    expect(mocks.toast.mock.calls[0]?.[0]).toBe(words)
     expect(mocks.activate).not.toHaveBeenCalled()
     expect(tabs()).toEqual([])
     expect([...structuredLaunchStates()]).toEqual([])
diff --git a/src/renderer/src/i18n/en-runtime-required.json b/src/renderer/src/i18n/en-runtime-required.json
index fb6f0d302773..dd5ba1f92cbb 100644
--- a/src/renderer/src/i18n/en-runtime-required.json
+++ b/src/renderer/src/i18n/en-runtime-required.json
@@ -3164,6 +3164,7 @@
         "runCommandAgain": "Run /{{command}} again.",
         "runCommandWhenDone": "Run /{{command}} when it's done.",
         "runtimeNotInstalled": "{{agent}} isn't installed on the computer running this chat. Install it from the chat in a current version of Orca.",
+        "conversationOpenInBackgroundServer": "OpenCode may still be running this conversation in its background server. Stop that OpenCode server, then try again.",
         "conversationOpenElsewhere": "Codex is still holding this conversation open. Try again in a moment, or close other Codex terminals.",
         "conversationOpenInTerminal": "{{agent}} is already running this conversation in another terminal. Quit {{agent}} there or close that terminal to continue here.",
         "sendAgainToTryOnceMore": "Send your message again to try once more.",
diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index 1cdf2910cc9b..0e125b7c20b7 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -18974,6 +18974,7 @@
         "claudeAccountSetupFailed": "The selected Claude account could not be set up. Try again or choose another account.",
         "agentCommandNotRunnable": "{{agent}}'s Command in Settings → Agents must be a program path or name Orca can find, with no arguments or variables. Change it or reset it.",
         "runtimeNotInstalled": "{{agent}} isn't installed on the computer running this chat. Install it from the chat in a current version of Orca.",
+        "conversationOpenInBackgroundServer": "OpenCode may still be running this conversation in its background server. Stop that OpenCode server, then try again.",
         "conversationOpenElsewhere": "Codex is still holding this conversation open. Try again in a moment, or close other Codex terminals.",
         "conversationOpenInTerminal": "{{agent}} is already running this conversation in another terminal. Quit {{agent}} there or close that terminal to continue here.",
         "chooseClaudeAccount": "Choose or add one in Claude Accounts settings.",
diff --git a/src/renderer/src/i18n/locales/es.json b/src/renderer/src/i18n/locales/es.json
index d368f6f47939..0b56087195ff 100644
--- a/src/renderer/src/i18n/locales/es.json
+++ b/src/renderer/src/i18n/locales/es.json
@@ -18644,6 +18644,7 @@
         "claudeAccountSetupFailed": "No se pudo configurar la cuenta de Claude seleccionada. Vuelva a intentarlo o elija otra cuenta.",
         "agentCommandNotRunnable": "{{agent}}: el Comando en Ajustes → Agentes debe ser la ruta o el nombre de un programa que Orca pueda encontrar, sin argumentos ni variables. Cámbielo o restablézcalo con Reiniciar.",
         "runtimeNotInstalled": "{{agent}} no está instalado en el equipo que ejecuta este chat. Instálelo desde el chat en una versión actual de Orca.",
+        "conversationOpenInBackgroundServer": "OpenCode podría seguir ejecutando esta conversación en su servidor en segundo plano. Detén ese servidor de OpenCode y vuelve a intentarlo.",
         "conversationOpenElsewhere": "Codex sigue manteniendo abierta esta conversación. Inténtalo de nuevo en un momento o cierra otras terminales de Codex.",
         "conversationOpenInTerminal": "{{agent}} ya está ejecutando esta conversación en otra terminal. Sal de {{agent}} allí o cierra esa terminal para continuar aquí.",
         "chooseClaudeAccount": "Elija o agregue una en la configuración de Cuentas de Claude.",
diff --git a/src/renderer/src/i18n/locales/fr.json b/src/renderer/src/i18n/locales/fr.json
index ea851d6eb743..9a29ec996799 100644
--- a/src/renderer/src/i18n/locales/fr.json
+++ b/src/renderer/src/i18n/locales/fr.json
@@ -18784,6 +18784,7 @@
         "claudeAccountSetupFailed": "Le compte Claude sélectionné n'a pas pu être configuré. Réessayez ou choisissez un autre compte.",
         "agentCommandNotRunnable": "{{agent}} : la Commande dans Paramètres → Agents doit être le chemin ou le nom d'un programme qu'Orca peut trouver, sans arguments ni variables. Modifiez-la ou réinitialisez-la.",
         "runtimeNotInstalled": "{{agent}} n'est pas installé sur l'ordinateur qui exécute ce chat. Installez-le depuis le chat dans une version récente d'Orca.",
+        "conversationOpenInBackgroundServer": "OpenCode exécute peut-être encore cette conversation sur son serveur en arrière-plan. Arrêtez ce serveur OpenCode, puis réessayez.",
         "conversationOpenElsewhere": "Codex maintient encore cette conversation ouverte. Réessayez dans un instant ou fermez les autres terminaux Codex.",
         "conversationOpenInTerminal": "{{agent}} exécute déjà cette conversation dans un autre terminal. Quittez {{agent}} là-bas ou fermez ce terminal pour continuer ici.",
         "chooseClaudeAccount": "Choisissez-en un ou ajoutez-en un dans les paramètres Comptes Claude.",
diff --git a/src/renderer/src/i18n/locales/ja.json b/src/renderer/src/i18n/locales/ja.json
index f585825430ea..e333e7070c64 100644
--- a/src/renderer/src/i18n/locales/ja.json
+++ b/src/renderer/src/i18n/locales/ja.json
@@ -18674,6 +18674,7 @@
         "claudeAccountSetupFailed": "選択した Claude アカウントを設定できませんでした。もう一度試すか、別のアカウントを選択してください。",
         "agentCommandNotRunnable": "[設定] → [Agent] にある {{agent}} の [コマンド] には、Orca が見つけられるプログラムのパスまたは名前を、引数や変数なしで指定する必要があります。変更するか、[リセット] してください。",
         "runtimeNotInstalled": "{{agent}} はこのチャットを実行しているコンピューターにインストールされていません。最新バージョンの Orca でチャットからインストールしてください。",
+        "conversationOpenInBackgroundServer": "OpenCode のバックグラウンドサーバーで、この会話がまだ実行されている可能性があります。その OpenCode サーバーを停止してから、もう一度試してください。",
         "conversationOpenElsewhere": "Codex がまだこの会話を開いたままにしています。少し待ってからもう一度試すか、ほかの Codex ターミナルを閉じてください。",
         "conversationOpenInTerminal": "{{agent}} は別のターミナルですでにこの会話を実行しています。そちらの {{agent}} を終了するか、そのターミナルを閉じて、ここで続けてください。",
         "chooseClaudeAccount": "Claude アカウントの設定で選択または追加してください。",
diff --git a/src/renderer/src/i18n/locales/ko.json b/src/renderer/src/i18n/locales/ko.json
index 86797cd62153..29808571c49d 100644
--- a/src/renderer/src/i18n/locales/ko.json
+++ b/src/renderer/src/i18n/locales/ko.json
@@ -18674,6 +18674,7 @@
         "claudeAccountSetupFailed": "선택한 Claude 계정을 설정할 수 없습니다. 다시 시도하거나 다른 계정을 선택하세요.",
         "agentCommandNotRunnable": "{{agent}}의 설정 → 에이전트 → 명령은 Orca가 찾을 수 있는 프로그램 경로나 이름이어야 하며, 인수나 변수를 포함할 수 없습니다. 변경하거나 재설정하세요.",
         "runtimeNotInstalled": "{{agent}}이(가) 이 채팅을 실행하는 컴퓨터에 설치되어 있지 않습니다. 최신 버전의 Orca에서 채팅을 통해 설치하세요.",
+        "conversationOpenInBackgroundServer": "OpenCode가 백그라운드 서버에서 이 대화를 계속 실행 중일 수 있습니다. 해당 OpenCode 서버를 중지한 후 다시 시도하세요.",
         "conversationOpenElsewhere": "Codex가 아직 이 대화를 열어 두고 있습니다. 잠시 후 다시 시도하거나 다른 Codex 터미널을 닫으세요.",
         "conversationOpenInTerminal": "{{agent}}이(가) 다른 터미널에서 이미 이 대화를 실행 중입니다. 그곳에서 {{agent}}을(를) 종료하거나 해당 터미널을 닫은 후 여기서 계속하세요.",
         "chooseClaudeAccount": "Claude 계정 설정에서 선택하거나 추가하세요.",
diff --git a/src/renderer/src/i18n/locales/pt.json b/src/renderer/src/i18n/locales/pt.json
index 270469846fcb..463088d47b22 100644
--- a/src/renderer/src/i18n/locales/pt.json
+++ b/src/renderer/src/i18n/locales/pt.json
@@ -19616,6 +19616,7 @@
         "claudeAccountFolderMissing": "A pasta da conta do Claude selecionada não foi encontrada. Entre nela novamente ou escolha outra conta.",
         "claudeAccountSetupFailed": "Não foi possível configurar a conta do Claude selecionada. Tente novamente ou escolha outra conta.",
         "agentCommandNotRunnable": "O Comando de {{agent}} em Configurações → Agentes deve ser o caminho ou nome de um programa que o Orca possa encontrar, sem argumentos nem variáveis. Altere-o ou redefina-o.",
+        "conversationOpenInBackgroundServer": "O OpenCode pode ainda estar executando esta conversa no servidor em segundo plano. Pare esse servidor do OpenCode e tente novamente.",
         "runtimeNotInstalled": "{{agent}} não está instalado no computador que executa este chat. Instale-o pelo chat em uma versão atual do Orca.",
         "chooseClaudeAccount": "Escolha ou adicione uma nas configurações de Contas do Claude.",
         "chooseClaudeAccountThenRunCommand": "Escolha ou adicione uma nas configurações de Contas do Claude e execute /{{command}} novamente.",
diff --git a/src/renderer/src/i18n/locales/zh.json b/src/renderer/src/i18n/locales/zh.json
index db06d6b09a0a..083edd0f4a30 100644
--- a/src/renderer/src/i18n/locales/zh.json
+++ b/src/renderer/src/i18n/locales/zh.json
@@ -18639,6 +18639,7 @@
         "claudeAccountSetupFailed": "无法设置所选 Claude 账户。请重试或选择其他账户。",
         "agentCommandNotRunnable": "{{agent}} 在设置 → 智能体中的命令必须是 Orca 能找到的程序路径或名称，且不能包含参数或变量。请修改或重置。",
         "runtimeNotInstalled": "运行此聊天的计算机上未安装 {{agent}}。请在最新版本的 Orca 中从聊天里安装。",
+        "conversationOpenInBackgroundServer": "OpenCode 可能仍在其后台服务器中运行此对话。请停止该 OpenCode 服务器，然后重试。",
         "conversationOpenElsewhere": "Codex 仍在保持此对话打开。请稍后重试，或关闭其他 Codex 终端。",
         "conversationOpenInTerminal": "{{agent}} 已在另一个终端中运行此对话。请退出那里的 {{agent}} 或关闭该终端，然后在这里继续。",
         "chooseClaudeAccount": "请在 Claude 账户设置中选择或添加一个。",
diff --git a/src/shared/agent-session-definitive-refusal.ts b/src/shared/agent-session-definitive-refusal.ts
index abc6db954c39..af1461e7e72b 100644
--- a/src/shared/agent-session-definitive-refusal.ts
+++ b/src/shared/agent-session-definitive-refusal.ts
@@ -10,6 +10,8 @@ export function isAgentSessionCreateAdmissionRefusal(
     ((refusal.code === 'agent_session_conflict' ||
       refusal.code === 'agent_session_ownership_unknown') &&
       refusal.details?.reason === 'conversationHeldElsewhere') ||
+    (refusal.code === 'agent_session_operation_invalid' &&
+      refusal.details?.reason === 'conversationOpenInBackgroundServer') ||
     (refusal.code === 'agent_session_identity_required' &&
       (refusal.details?.reason === 'transcriptNotFound' ||
         refusal.details?.reason === 'transcriptUnreadable'))
diff --git a/src/shared/agent-session-failure-copy.ts b/src/shared/agent-session-failure-copy.ts
index 1c935d6d911d..9ba9df879a01 100644
--- a/src/shared/agent-session-failure-copy.ts
+++ b/src/shared/agent-session-failure-copy.ts
@@ -78,6 +78,8 @@ export const AGENT_SESSION_FAILURE_COPY = {
     "{{agent}}'s Command in Settings → Agents must be a program path or name Orca can find, with no arguments or variables. Change it or reset it.",
   runtimeNotInstalled:
     "{{agent}} isn't installed on the computer running this chat. Install it from the chat in a current version of Orca.",
+  conversationOpenInBackgroundServer:
+    'OpenCode may still be running this conversation in its background server. Stop that OpenCode server, then try again.',
   conversationOpenElsewhere:
     'Codex is still holding this conversation open. Try again in a moment, or close other Codex terminals.',
   conversationOpenInTerminal:
diff --git a/src/shared/agent-session-failure-words.ts b/src/shared/agent-session-failure-words.ts
index c9bd5cd5189a..237116b70502 100644
--- a/src/shared/agent-session-failure-words.ts
+++ b/src/shared/agent-session-failure-words.ts
@@ -189,6 +189,8 @@ const FAILURE_SENTENCES = {
   agentCommandNotRunnable: namingAgent('agentCommandNotRunnable'),
   runtimeNotInstalled: namingAgent('runtimeNotInstalled'),
   conversationOpenInTerminal: namingAgent('conversationOpenInTerminal'),
+  conversationOpenInBackgroundServer: (_context, _fact, _surface, say) =>
+    say('conversationOpenInBackgroundServer'),
   conversationOpenElsewhere: (_context, _fact, _surface, say) => say('conversationOpenElsewhere'),
   managedAccountUnsupported: (context, _fact, _surface, say) =>
     joinSentences([
diff --git a/src/shared/agent-session-failure.ts b/src/shared/agent-session-failure.ts
index 13705c9c1d11..654b2459afba 100644
--- a/src/shared/agent-session-failure.ts
+++ b/src/shared/agent-session-failure.ts
@@ -41,6 +41,7 @@ export const AGENT_SESSION_FAILURE_KINDS = [
   'agentCommandNotRunnable',
   'runtimeNotInstalled',
   'conversationOpenInTerminal',
+  'conversationOpenInBackgroundServer',
   'conversationOpenElsewhere',
   'providerExited',
   'restartFailed',
diff --git a/src/shared/agent-session-refusal-details.ts b/src/shared/agent-session-refusal-details.ts
index 6f9b6734161d..77a339e7ef00 100644
--- a/src/shared/agent-session-refusal-details.ts
+++ b/src/shared/agent-session-refusal-details.ts
@@ -87,6 +87,7 @@ export const AGENT_SESSION_REFUSAL_REASONS = {
     'runtimeNotInstalled',
     /** A terminal may still be writing the chat's conversation, so its agent did not start. */
     'conversationOpenInTerminal',
+    'conversationOpenInBackgroundServer',
     'conversationOpenElsewhere',
     /** The agent started, then Orca could not open the chat's conversation for it. */
     'attachFailed'
diff --git a/src/shared/agent-session-refusal-reason-words.ts b/src/shared/agent-session-refusal-reason-words.ts
index 8a5b597e4113..71752b80888d 100644
--- a/src/shared/agent-session-refusal-reason-words.ts
+++ b/src/shared/agent-session-refusal-reason-words.ts
@@ -117,6 +117,10 @@ const REASON_WORDS = {
     agentCommandNotRunnable: { fact: 'agentCommandNotRunnable', action: 'actFirst' },
     runtimeNotInstalled: { fact: 'runtimeNotInstalled', action: 'actFirst' },
     conversationOpenInTerminal: { fact: 'conversationOpenInTerminal', action: 'actFirst' },
+    conversationOpenInBackgroundServer: {
+      fact: 'conversationOpenInBackgroundServer',
+      action: 'actFirst'
+    },
     conversationOpenElsewhere: { fact: 'conversationOpenElsewhere', action: 'actFirst' },
     attachFailed: codeWords('retry')
   },
diff --git a/src/shared/structured-agent-session-dispatch-rejection.ts b/src/shared/structured-agent-session-dispatch-rejection.ts
index 2ca8308cac67..dde3dbc0126c 100644
--- a/src/shared/structured-agent-session-dispatch-rejection.ts
+++ b/src/shared/structured-agent-session-dispatch-rejection.ts
@@ -81,6 +81,7 @@ const KIND_CATEGORY = {
   agentCommandNotRunnable: 'startFailed',
   runtimeNotInstalled: 'startFailed',
   conversationOpenInTerminal: 'startFailed',
+  conversationOpenInBackgroundServer: 'startFailed',
   conversationOpenElsewhere: 'startFailed',
   restartFailed: 'startFailed',
   providerRejected: 'content',
@@ -116,6 +117,7 @@ const KIND_VERDICT = {
   agentCommandNotRunnable: 'failure',
   runtimeNotInstalled: 'failure',
   conversationOpenInTerminal: 'failure',
+  conversationOpenInBackgroundServer: 'failure',
   conversationOpenElsewhere: 'failure',
   restartFailed: 'failure',
   providerRejected: 'failure',

From 71e0d77c592c6861d324abd2f9e7a434939122c1 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sun, 25 Oct 2026 12:59:05 -0700
Subject: [PATCH 074/207] Retain terminal writer proofs through final admission

---
 .../mobile-native-chat-unsent-notices.test.ts | 17 -----
 .../structured-agent-session-acquisition.ts   |  7 +-
 ...structured-agent-session-adapter-errors.ts |  1 -
 .../structured-agent-session-failure-text.ts  |  1 -
 ...nt-session-terminal-writer-acquire.test.ts |  6 +-
 ...ed-agent-session-precommit-refusal.test.ts | 27 --------
 ...uctured-agent-session-precommit-refusal.ts |  7 +-
 .../structured-agent-cli-writers.test.ts      | 69 ++++++++++++++++---
 .../runtime/structured-agent-cli-writers.ts   | 39 ++++-------
 .../agent-session-failure-words-text.test.ts  | 33 ---------
 .../agent-session-failure-words-text.ts       |  5 --
 ...ault-session-resume-in-chat-launch.test.ts |  5 --
 .../ai-vault-session-resume-in-chat-launch.ts |  8 ---
 .../tab-bar/cli-chat-resume-feedback.ts       |  8 ---
 .../tab-bar/cli-chat-resume-run.test.ts       | 21 ++----
 .../src/i18n/en-runtime-required.json         |  1 -
 src/renderer/src/i18n/locales/en.json         |  1 -
 src/renderer/src/i18n/locales/es.json         |  1 -
 src/renderer/src/i18n/locales/fr.json         |  1 -
 src/renderer/src/i18n/locales/ja.json         |  1 -
 src/renderer/src/i18n/locales/ko.json         |  1 -
 src/renderer/src/i18n/locales/pt.json         |  1 -
 src/renderer/src/i18n/locales/zh.json         |  1 -
 .../agent-session-definitive-refusal.ts       |  2 -
 src/shared/agent-session-failure-copy.ts      |  2 -
 src/shared/agent-session-failure-words.ts     |  2 -
 src/shared/agent-session-failure.ts           |  1 -
 src/shared/agent-session-refusal-details.ts   |  1 -
 .../agent-session-refusal-reason-words.ts     |  4 --
 ...ctured-agent-session-dispatch-rejection.ts |  2 -
 30 files changed, 82 insertions(+), 194 deletions(-)

diff --git a/mobile/src/session/mobile-native-chat-unsent-notices.test.ts b/mobile/src/session/mobile-native-chat-unsent-notices.test.ts
index 513ab2698c6c..74a2574046cd 100644
--- a/mobile/src/session/mobile-native-chat-unsent-notices.test.ts
+++ b/mobile/src/session/mobile-native-chat-unsent-notices.test.ts
@@ -64,23 +64,6 @@ describe("the phone's line under a not-sent message", () => {
     )
   })
 
-  it('keeps the background-server cause in the phone recorded-message notice', () => {
-    const notices = mobileNativeChatUnsentNotices(
-      {
-        items: [],
-        submissions: [
-          submission('held', {
-            rejection: { kind: 'conversationOpenInBackgroundServer' }
-          })
-        ]
-      },
-      'opencode'
-    )
-    expect(notices.get(agentJournalSubmissionKey('held'))).toBe(
-      'OpenCode may still be running this conversation in its background server. Stop that OpenCode server, then try again.'
-    )
-  })
-
   it("words each rejected message as the desktop does, naming the chat's agent", () => {
     const notices = mobileNativeChatUnsentNotices(
       {
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition.ts
index 4d3c532df326..2ddef409a533 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition.ts
@@ -1,5 +1,4 @@
 import { isDeepStrictEqual } from 'node:util'
-import { isAgentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
 import { abortSignalReason } from '../../../shared/abort-signal-reason'
 import type {
   AgentSessionProcessIdentity,
@@ -49,11 +48,7 @@ export async function acquireOwner(
     } catch (error) {
       // Not a code: a code message would travel as the census's own conflict, not this reason.
       throw new AgentSessionPreSpawnError(error, {
-        reason:
-          isAgentSessionRefusalError(error) &&
-          error.refusal.details?.reason === 'conversationOpenInBackgroundServer'
-            ? 'conversationOpenInBackgroundServer'
-            : 'conversationOpenInTerminal',
+        reason: 'conversationOpenInTerminal',
         message: 'a terminal may still be writing this conversation'
       })
     }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-adapter-errors.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-adapter-errors.ts
index 8d8616d8be47..5c4447b76a22 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-adapter-errors.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-adapter-errors.ts
@@ -46,7 +46,6 @@ export type AgentSessionPreSpawnReason = Extract<
   | 'agentCommandNotRunnable'
   | 'runtimeNotInstalled'
   | 'conversationOpenInTerminal'
-  | 'conversationOpenInBackgroundServer'
 >
 
 /** First-hand proof that acquisition spawned no process. */
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-failure-text.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-failure-text.ts
index 5606024dcf22..643f6d1d0d50 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-failure-text.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-failure-text.ts
@@ -38,7 +38,6 @@ const TYPED_START_REFUSALS = [
   'agentCommandNotRunnable',
   'runtimeNotInstalled',
   'conversationOpenInTerminal',
-  'conversationOpenInBackgroundServer',
   'conversationOpenElsewhere'
 ] as const satisfies readonly (AgentSessionFailureKind &
   AgentSessionRefusalReason<'agent_session_operation_invalid'>)[]
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts
index 3d9b2ac9b65e..a66804cd1a05 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts
@@ -219,7 +219,7 @@ it('acquires when only a saved Sleep note remains, but refuses an existing unkno
   )
 })
 
-it('preserves actual saved OpenCode background refusal through acquisition and the recorded send', async () => {
+it('preserves the saved OpenCode guard through acquisition and the recorded send', async () => {
   const sessionId = `${SESSION}-opencode`
   const definition = structuredAgentRuntimeRegistration('opencode')?.definition
   if (!definition) {
@@ -281,9 +281,9 @@ it('preserves actual saved OpenCode background refusal through acquisition and t
   await host.revealSession(sessionId)
   const before = acquire.mock.calls.length
   const rejected = await rejection(await send('resume saved OpenCode', sessionId), sessionId)
-  expect(rejected?.rejection).toMatchObject({ kind: 'conversationOpenInBackgroundServer' })
+  expect(rejected?.rejection).toMatchObject({ kind: 'conversationOpenInTerminal' })
   expect(rejected?.reason).toBe(
-    'OpenCode may still be running this conversation in its background server. Stop that OpenCode server, then try again.'
+    'OpenCode is already running this conversation in another terminal. Quit OpenCode there or close that terminal to continue here.'
   )
   expect(acquire).toHaveBeenCalledTimes(before)
   expect(store.getRecord(sessionId)?.lease.reservedSpawnToken).toBeNull()
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-precommit-refusal.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-precommit-refusal.test.ts
index 71fdfb8e6d60..e0366dea1855 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-precommit-refusal.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-precommit-refusal.test.ts
@@ -128,33 +128,6 @@ afterEach(() => {
   vi.restoreAllMocks()
 })
 
-it('retains the saved OpenCode refusal and no-effects proof before attach', async () => {
-  const words =
-    'OpenCode may still be running this conversation in its background server. Stop that OpenCode server, then try again.'
-  const result = await create({
-    resolveStructuredAgentSessionCreateIntent: async () => {
-      throw agentSessionRefusalError(
-        'agent_session_operation_invalid',
-        { reason: 'conversationOpenInBackgroundServer' },
-        words
-      )
-    }
-  })
-  expect(result).toMatchObject({
-    ok: true,
-    result: {
-      ok: false,
-      refusal: {
-        code: 'agent_session_operation_invalid',
-        details: { reason: 'conversationOpenInBackgroundServer' },
-        message: words,
-        createAttemptRefusedBeforeCommit: true
-      }
-    }
-  })
-  expect(attach).not.toHaveBeenCalled()
-})
-
 describe('a create refused before it commits', () => {
   it('answers an ownership refusal before commit as a definite failed attempt', async () => {
     const code = 'agent_session_conflict'
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-precommit-refusal.ts b/src/main/runtime/rpc/methods/structured-agent-session-precommit-refusal.ts
index 05d94cb97eaa..c5425f7935f7 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-precommit-refusal.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-precommit-refusal.ts
@@ -38,12 +38,7 @@ const PRECOMMIT_REFUSAL_MESSAGE = 'Orca cannot open a structured agent chat for
 function precommitRefusal(error: unknown): AgentSessionWireRefusal {
   // A refusal the host raised keeps its situation; a bare code names none.
   if (isAgentSessionRefusalError(error)) {
-    return agentSessionRefusalFromReference(
-      error.refusal,
-      error.refusal.details?.reason === 'conversationOpenInBackgroundServer'
-        ? error.refusal.message
-        : PRECOMMIT_REFUSAL_MESSAGE
-    )
+    return agentSessionRefusalFromReference(error.refusal, PRECOMMIT_REFUSAL_MESSAGE)
   }
   const code = wireRefusalCode(error)
   if (code) {
diff --git a/src/main/runtime/structured-agent-cli-writers.test.ts b/src/main/runtime/structured-agent-cli-writers.test.ts
index 9dff8c536304..d39ca3493b6c 100644
--- a/src/main/runtime/structured-agent-cli-writers.test.ts
+++ b/src/main/runtime/structured-agent-cli-writers.test.ts
@@ -67,14 +67,6 @@ function inspection(verdict: AgentProcessVerdict | null = null) {
     run: () => assertCliConversationWritersExited(host, 'codex', 'conversation')
   }
 }
-const backgroundRefusal = {
-  refusal: {
-    message:
-      'OpenCode may still be running this conversation in its background server. Stop that OpenCode server, then try again.',
-    code: 'agent_session_operation_invalid',
-    details: { reason: 'conversationOpenInBackgroundServer' }
-  }
-}
 const refusal = {
   refusal: { code: 'agent_session_conflict', details: { reason: 'conversationHeldElsewhere' } }
 }
@@ -167,7 +159,7 @@ describe('execution-host conversation writer inspection', () => {
           { paneKey: record.paneKey, worktreeId: record.worktreeId }
         )
       await (agent === 'opencode' || agent === 'opencode2'
-        ? expect(run()).rejects.toMatchObject(backgroundRefusal)
+        ? expect(run()).rejects.toMatchObject(refusal)
         : expect(run()).resolves.toBeUndefined())
       check.host.terminal = () => ({ pane: null })
       await expect(run()).rejects.toMatchObject(refusal)
@@ -175,7 +167,7 @@ describe('execution-host conversation writer inspection', () => {
     }
   )
 
-  it('uses normal physical proof for conclusively pane-owned OpenCode, not background-server copy', async () => {
+  it('uses normal physical proof for conclusively pane-owned OpenCode, retaining its saved-note guard', async () => {
     const check = inspection()
     check.host.rows = () => [{ ...row, agentType: 'opencode' }]
     const saved: SleepingAgentSessionRecord = {
@@ -275,6 +267,61 @@ describe('execution-host conversation writer inspection', () => {
     await expect(check.run()).rejects.toMatchObject(refusal)
   })
 
+  it.each(['absent', 'shell'] as const)(
+    'retains %s current-row proof without a saved match across a later saved census',
+    async (physical) => {
+      for (const changed of ['unchanged', 'row', 'terminal'] as const) {
+        const check = inspection()
+        const other: SleepingAgentSessionRecord = {
+          paneKey: 'other',
+          worktreeId: 'workspace',
+          agent: 'codex',
+          providerSession: { key: 'session_id', id: 'conversation' },
+          prompt: '',
+          state: 'done',
+          origin: 'worktree-sleep',
+          capturedAt: 1,
+          updatedAt: 1
+        }
+        check.host.saved = () => [other]
+        const terminal = check.host.terminal
+        const otherTerminal = terminal(other)
+        let appeared = false
+        check.host.terminal = (coordinates) =>
+          coordinates.paneKey !== row.paneKey
+            ? otherTerminal
+            : physical === 'absent' && !appeared
+              ? null
+              : terminal(coordinates)
+        const entered = Promise.withResolvers<void>()
+        const released = Promise.withResolvers<boolean>()
+        let scans = 0
+        check.host.shellAlone = async () => {
+          scans += 1
+          if (physical === 'shell' && scans === 1) {
+            return true
+          }
+          entered.resolve()
+          return released.promise
+        }
+        const result = check.run()
+        const assertion =
+          changed === 'unchanged'
+            ? expect(result).resolves.toBeUndefined()
+            : expect(result).rejects.toMatchObject(refusal)
+        await entered.promise
+        if (changed === 'row') {
+          check.replaceRow()
+        } else if (changed === 'terminal') {
+          appeared = true
+          check.replacePty()
+        }
+        released.resolve(true)
+        await assertion
+      }
+    }
+  )
+
   it('requires current owned shell proof for saved resumes, including done checkpoints', async () => {
     const record: SleepingAgentSessionRecord = {
       paneKey: 'source',
@@ -305,7 +352,7 @@ describe('execution-host conversation writer inspection', () => {
         'opencode',
         'conversation'
       )
-    ).rejects.toMatchObject(backgroundRefusal)
+    ).rejects.toMatchObject(refusal)
     saved = [{ ...record, connectionId: 'ssh-A' }]
     await expect(check.run()).resolves.toBeUndefined()
     saved = [record]
diff --git a/src/main/runtime/structured-agent-cli-writers.ts b/src/main/runtime/structured-agent-cli-writers.ts
index aff0332fca91..7435c86085ff 100644
--- a/src/main/runtime/structured-agent-cli-writers.ts
+++ b/src/main/runtime/structured-agent-cli-writers.ts
@@ -5,11 +5,7 @@ import {
   chatAgentsShareConversations,
   CLI_CONVERSATION_ADOPTING_AGENTS
 } from '../../shared/structured-agent-cli-conversation-adoption'
-import {
-  agentSessionRefusalError,
-  isAgentSessionRefusalError
-} from '../../shared/agent-session-wire-refusals'
-import { AGENT_SESSION_FAILURE_COPY } from '../../shared/agent-session-failure-copy'
+import { agentSessionRefusalError } from '../../shared/agent-session-wire-refusals'
 import type { CliWriterObservation } from '../agent-hooks/server/cli-writer-observation'
 import { getFreshShellForegroundSnapshot } from '../../shared/process-table-snapshot-reader'
 import { collectDescendantsFromIndex, getProcessTableIndex } from '../../shared/process-table-index'
@@ -78,6 +74,7 @@ export async function assertCliConversationWritersExited(
       chatAgentsShareConversations(rowChat, agent)
     ) &&
     id === providerSessionId
+  const proofs: (() => boolean)[] = []
   const paneOf = (coordinates: CliWriterCoordinates) => host.terminal(coordinates)?.pane ?? null
   // The pane's PTY itself, not a recorded pid: a wrapper pid can read exited beside a paused agent.
   const censusPane = async (
@@ -87,6 +84,7 @@ export async function assertCliConversationWritersExited(
   ) => {
     const terminal = read()
     if (!terminal && absentAdmits) {
+      proofs.push(() => !read())
       return
     }
     const pane = terminal?.pane
@@ -98,6 +96,7 @@ export async function assertCliConversationWritersExited(
     ) {
       throw refuse()
     }
+    proofs.push(() => !host.sleeping(worktreeId ?? '') && read()?.pane?.identity === pane.identity)
   }
   try {
     if (source) {
@@ -150,6 +149,7 @@ export async function assertCliConversationWritersExited(
       if (!observed || !observed.current()) {
         throw refuse()
       }
+      proofs.push(() => observed.current())
       const pane = paneOf(row)
       const presence = await observed.presence()
       if (
@@ -161,6 +161,7 @@ export async function assertCliConversationWritersExited(
         throw refuse()
       }
       if (!host.terminal(row)) {
+        proofs.push(() => !host.terminal(row))
         if (row.agentType !== 'opencode' && row.agentType !== 'opencode2') {
           for (const record of matching) {
             covered.set(
@@ -191,16 +192,11 @@ export async function assertCliConversationWritersExited(
       ) {
         throw refuse()
       }
+      const current = () =>
+        paneOf(row)?.identity === pane.identity && !host.sleeping(row.worktreeId ?? '')
+      proofs.push(current)
       for (const record of matching) {
-        covered.set(
-          record,
-          () =>
-            observed.current() &&
-            paneOf(row)?.identity === pane.identity &&
-            !host.sleeping(row.worktreeId ?? '') &&
-            matches(record) &&
-            host.saved().includes(record)
-        )
+        covered.set(record, () => current() && savedCurrent(record) && matches(record))
       }
     }
     for (const link of host.links()) {
@@ -222,11 +218,7 @@ export async function assertCliConversationWritersExited(
       }
       const [paneKey, worktreeId, , savedAgent] = identity
       if (savedAgent === 'opencode' || savedAgent === 'opencode2') {
-        throw agentSessionRefusalError(
-          'agent_session_operation_invalid',
-          { reason: 'conversationOpenInBackgroundServer' },
-          AGENT_SESSION_FAILURE_COPY.conversationOpenInBackgroundServer
-        )
+        throw refuse()
       }
       const coordinates = { paneKey, worktreeId }
       const terminal = host.terminal(coordinates)
@@ -249,19 +241,14 @@ export async function assertCliConversationWritersExited(
       covered.set(record, current)
     }
     if (
+      proofs.some((current) => !current()) ||
       [...saved, ...savedCandidates()].some(
         (record) => !savedCurrent(record) || !covered.get(record)?.()
       )
     ) {
       throw refuse()
     }
-  } catch (error) {
-    if (
-      isAgentSessionRefusalError(error) &&
-      error.refusal.details?.reason === 'conversationOpenInBackgroundServer'
-    ) {
-      throw error
-    }
+  } catch {
     throw refuse()
   }
 }
diff --git a/src/renderer/src/components/native-chat/agent-session-failure-words-text.test.ts b/src/renderer/src/components/native-chat/agent-session-failure-words-text.test.ts
index 029784bd271a..0b38825b0c70 100644
--- a/src/renderer/src/components/native-chat/agent-session-failure-words-text.test.ts
+++ b/src/renderer/src/components/native-chat/agent-session-failure-words-text.test.ts
@@ -138,39 +138,6 @@ describe('desktop words for a failure fact', () => {
     ).toBe(`${row}. ${retry}`)
   })
 
-  it('projects the exact background-server refusal without replacing host text for unknown facts', () => {
-    const words =
-      'OpenCode may still be running this conversation in its background server. Stop that OpenCode server, then try again.'
-    expect(
-      agentSessionWriteNoticeText(
-        agentSessionWriteNoticeParts(
-          agentSessionRefusalFailure({
-            code: 'agent_session_operation_invalid',
-            details: { reason: 'conversationOpenInBackgroundServer' }
-          }),
-          'composer-send'
-        )
-      )
-    ).toBe(`Your message was not sent. ${words}`)
-    const unknown = {
-      kind: 'fromTheFuture',
-      refusal: {
-        code: 'agent_session_operation_invalid',
-        details: { reason: 'conversationOpenInBackgroundServer' }
-      }
-    }
-    expect(readWholeAgentSessionFailureFact(unknown)).toBeUndefined()
-    expect(
-      agentSessionWriteNoticeText(
-        structuredAgentSessionRejectionParts(
-          words,
-          'send',
-          readWholeAgentSessionFailureFact(unknown)
-        )
-      )
-    ).toBe(words)
-  })
-
   it('has a key for every piece, whose English default is the shared sentence', () => {
     for (const id of IDS) {
       expect([id, sayAgentSessionFailureTranslated(id, VALUES)]).toEqual([
diff --git a/src/renderer/src/components/native-chat/agent-session-failure-words-text.ts b/src/renderer/src/components/native-chat/agent-session-failure-words-text.ts
index f3623fb591cd..b1214aaa2000 100644
--- a/src/renderer/src/components/native-chat/agent-session-failure-words-text.ts
+++ b/src/renderer/src/components/native-chat/agent-session-failure-words-text.ts
@@ -149,11 +149,6 @@ const PIECES: Record<AgentSessionFailureCopyId, (values: AgentSessionFailureCopy
         COPY.runtimeNotInstalled,
         values
       ),
-    conversationOpenInBackgroundServer: () =>
-      translate(
-        'components.native-chat.failureWords.conversationOpenInBackgroundServer',
-        COPY.conversationOpenInBackgroundServer
-      ),
     conversationOpenElsewhere: () =>
       translate(
         'components.native-chat.failureWords.conversationOpenElsewhere',
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.test.ts b/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.test.ts
index 2ccc99a05b5f..7d70bc5eb569 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.test.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.test.ts
@@ -169,11 +169,6 @@ describe('resumeAiVaultSessionInNewChat', () => {
   )
 
   it.each([
-    [
-      'agent_session_operation_invalid',
-      'conversationOpenInBackgroundServer',
-      'OpenCode may still be running this conversation in its background server. Stop that OpenCode server, then try again.'
-    ],
     ['agent_session_conflict', undefined, 'Another chat is already holding this conversation.'],
     [
       'agent_session_conflict',
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.ts b/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.ts
index b0b7b859e4ac..29520c52c09e 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.ts
@@ -1,4 +1,3 @@
-import { sayAgentSessionFailureTranslated } from '../native-chat/agent-session-failure-words-text'
 import { toast } from 'sonner'
 import { translate } from '@/i18n/i18n'
 import { useAppStore } from '@/store'
@@ -136,13 +135,6 @@ function notifyAiVaultSessionResumeInChatFailure(
   rowAgent: CliConversationRowAgent
 ): void {
   const failure = structuredLaunchFailure(error)
-  if (
-    failure?.code === 'agent_session_operation_invalid' &&
-    failure.details?.reason === 'conversationOpenInBackgroundServer'
-  ) {
-    toast.error(sayAgentSessionFailureTranslated('conversationOpenInBackgroundServer'))
-    return
-  }
   if (
     hasRuntimeRpcErrorCode(error, 'agent_session_conflict') ||
     failure?.code === 'agent_session_conflict'
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
index b4e853cbd23a..1807c15f9c3f 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
@@ -1,4 +1,3 @@
-import { sayAgentSessionFailureTranslated } from '../native-chat/agent-session-failure-words-text'
 import { toast } from 'sonner'
 import { translate } from '@/i18n/i18n'
 import { structuredLaunchFailure } from '@/lib/structured-agent-session-launch-failure'
@@ -16,13 +15,6 @@ export async function reportCliChatResumeFailure(
   target: RuntimeClientTarget
 ): Promise<void> {
   const refusal = structuredLaunchFailure(error)
-  if (
-    refusal?.code === 'agent_session_operation_invalid' &&
-    refusal.details?.reason === 'conversationOpenInBackgroundServer'
-  ) {
-    toast.error(sayAgentSessionFailureTranslated('conversationOpenInBackgroundServer'))
-    return
-  }
   if (
     refusal?.code === 'agent_session_conflict' ||
     refusal?.code === 'agent_session_ownership_unknown'
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
index 20f2d6c402cb..b7e4c5f60535 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
@@ -264,30 +264,21 @@ describe('CLI identity resume through the existing launch owner', () => {
     }
   })
 
-  it.each([
-    [
-      'agent_session_conflict',
-      'conversationHeldElsewhere',
-      'Claude is already running this conversation in another terminal. Quit Claude there or close that terminal, then open this conversation from Session History.'
-    ],
-    [
-      'agent_session_operation_invalid',
-      'conversationOpenInBackgroundServer',
-      'OpenCode may still be running this conversation in its background server. Stop that OpenCode server, then try again.'
-    ]
-  ])('keeps the terminal and words the actual %s refusal', async (code, reason, words) => {
+  it('keeps the terminal and directs a refused terminal writer to Session History', async () => {
     mocks.call.mockResolvedValue({
       ok: false,
       refusal: {
-        code,
+        code: 'agent_session_conflict',
         message: 'private host evidence',
-        details: { reason },
+        details: { reason: 'conversationHeldElsewhere' },
         createAttemptRefusedBeforeCommit: true
       }
     })
     await runCliChatResume(SOURCE, true)
     expect(mocks.toast).toHaveBeenCalledTimes(1)
-    expect(mocks.toast.mock.calls[0]?.[0]).toBe(words)
+    expect(mocks.toast.mock.calls[0]?.[0]).toBe(
+      'Claude is already running this conversation in another terminal. Quit Claude there or close that terminal, then open this conversation from Session History.'
+    )
     expect(mocks.activate).not.toHaveBeenCalled()
     expect(tabs()).toEqual([])
     expect([...structuredLaunchStates()]).toEqual([])
diff --git a/src/renderer/src/i18n/en-runtime-required.json b/src/renderer/src/i18n/en-runtime-required.json
index dd5ba1f92cbb..fb6f0d302773 100644
--- a/src/renderer/src/i18n/en-runtime-required.json
+++ b/src/renderer/src/i18n/en-runtime-required.json
@@ -3164,7 +3164,6 @@
         "runCommandAgain": "Run /{{command}} again.",
         "runCommandWhenDone": "Run /{{command}} when it's done.",
         "runtimeNotInstalled": "{{agent}} isn't installed on the computer running this chat. Install it from the chat in a current version of Orca.",
-        "conversationOpenInBackgroundServer": "OpenCode may still be running this conversation in its background server. Stop that OpenCode server, then try again.",
         "conversationOpenElsewhere": "Codex is still holding this conversation open. Try again in a moment, or close other Codex terminals.",
         "conversationOpenInTerminal": "{{agent}} is already running this conversation in another terminal. Quit {{agent}} there or close that terminal to continue here.",
         "sendAgainToTryOnceMore": "Send your message again to try once more.",
diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index 0e125b7c20b7..1cdf2910cc9b 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -18974,7 +18974,6 @@
         "claudeAccountSetupFailed": "The selected Claude account could not be set up. Try again or choose another account.",
         "agentCommandNotRunnable": "{{agent}}'s Command in Settings → Agents must be a program path or name Orca can find, with no arguments or variables. Change it or reset it.",
         "runtimeNotInstalled": "{{agent}} isn't installed on the computer running this chat. Install it from the chat in a current version of Orca.",
-        "conversationOpenInBackgroundServer": "OpenCode may still be running this conversation in its background server. Stop that OpenCode server, then try again.",
         "conversationOpenElsewhere": "Codex is still holding this conversation open. Try again in a moment, or close other Codex terminals.",
         "conversationOpenInTerminal": "{{agent}} is already running this conversation in another terminal. Quit {{agent}} there or close that terminal to continue here.",
         "chooseClaudeAccount": "Choose or add one in Claude Accounts settings.",
diff --git a/src/renderer/src/i18n/locales/es.json b/src/renderer/src/i18n/locales/es.json
index 0b56087195ff..d368f6f47939 100644
--- a/src/renderer/src/i18n/locales/es.json
+++ b/src/renderer/src/i18n/locales/es.json
@@ -18644,7 +18644,6 @@
         "claudeAccountSetupFailed": "No se pudo configurar la cuenta de Claude seleccionada. Vuelva a intentarlo o elija otra cuenta.",
         "agentCommandNotRunnable": "{{agent}}: el Comando en Ajustes → Agentes debe ser la ruta o el nombre de un programa que Orca pueda encontrar, sin argumentos ni variables. Cámbielo o restablézcalo con Reiniciar.",
         "runtimeNotInstalled": "{{agent}} no está instalado en el equipo que ejecuta este chat. Instálelo desde el chat en una versión actual de Orca.",
-        "conversationOpenInBackgroundServer": "OpenCode podría seguir ejecutando esta conversación en su servidor en segundo plano. Detén ese servidor de OpenCode y vuelve a intentarlo.",
         "conversationOpenElsewhere": "Codex sigue manteniendo abierta esta conversación. Inténtalo de nuevo en un momento o cierra otras terminales de Codex.",
         "conversationOpenInTerminal": "{{agent}} ya está ejecutando esta conversación en otra terminal. Sal de {{agent}} allí o cierra esa terminal para continuar aquí.",
         "chooseClaudeAccount": "Elija o agregue una en la configuración de Cuentas de Claude.",
diff --git a/src/renderer/src/i18n/locales/fr.json b/src/renderer/src/i18n/locales/fr.json
index 9a29ec996799..ea851d6eb743 100644
--- a/src/renderer/src/i18n/locales/fr.json
+++ b/src/renderer/src/i18n/locales/fr.json
@@ -18784,7 +18784,6 @@
         "claudeAccountSetupFailed": "Le compte Claude sélectionné n'a pas pu être configuré. Réessayez ou choisissez un autre compte.",
         "agentCommandNotRunnable": "{{agent}} : la Commande dans Paramètres → Agents doit être le chemin ou le nom d'un programme qu'Orca peut trouver, sans arguments ni variables. Modifiez-la ou réinitialisez-la.",
         "runtimeNotInstalled": "{{agent}} n'est pas installé sur l'ordinateur qui exécute ce chat. Installez-le depuis le chat dans une version récente d'Orca.",
-        "conversationOpenInBackgroundServer": "OpenCode exécute peut-être encore cette conversation sur son serveur en arrière-plan. Arrêtez ce serveur OpenCode, puis réessayez.",
         "conversationOpenElsewhere": "Codex maintient encore cette conversation ouverte. Réessayez dans un instant ou fermez les autres terminaux Codex.",
         "conversationOpenInTerminal": "{{agent}} exécute déjà cette conversation dans un autre terminal. Quittez {{agent}} là-bas ou fermez ce terminal pour continuer ici.",
         "chooseClaudeAccount": "Choisissez-en un ou ajoutez-en un dans les paramètres Comptes Claude.",
diff --git a/src/renderer/src/i18n/locales/ja.json b/src/renderer/src/i18n/locales/ja.json
index e333e7070c64..f585825430ea 100644
--- a/src/renderer/src/i18n/locales/ja.json
+++ b/src/renderer/src/i18n/locales/ja.json
@@ -18674,7 +18674,6 @@
         "claudeAccountSetupFailed": "選択した Claude アカウントを設定できませんでした。もう一度試すか、別のアカウントを選択してください。",
         "agentCommandNotRunnable": "[設定] → [Agent] にある {{agent}} の [コマンド] には、Orca が見つけられるプログラムのパスまたは名前を、引数や変数なしで指定する必要があります。変更するか、[リセット] してください。",
         "runtimeNotInstalled": "{{agent}} はこのチャットを実行しているコンピューターにインストールされていません。最新バージョンの Orca でチャットからインストールしてください。",
-        "conversationOpenInBackgroundServer": "OpenCode のバックグラウンドサーバーで、この会話がまだ実行されている可能性があります。その OpenCode サーバーを停止してから、もう一度試してください。",
         "conversationOpenElsewhere": "Codex がまだこの会話を開いたままにしています。少し待ってからもう一度試すか、ほかの Codex ターミナルを閉じてください。",
         "conversationOpenInTerminal": "{{agent}} は別のターミナルですでにこの会話を実行しています。そちらの {{agent}} を終了するか、そのターミナルを閉じて、ここで続けてください。",
         "chooseClaudeAccount": "Claude アカウントの設定で選択または追加してください。",
diff --git a/src/renderer/src/i18n/locales/ko.json b/src/renderer/src/i18n/locales/ko.json
index 29808571c49d..86797cd62153 100644
--- a/src/renderer/src/i18n/locales/ko.json
+++ b/src/renderer/src/i18n/locales/ko.json
@@ -18674,7 +18674,6 @@
         "claudeAccountSetupFailed": "선택한 Claude 계정을 설정할 수 없습니다. 다시 시도하거나 다른 계정을 선택하세요.",
         "agentCommandNotRunnable": "{{agent}}의 설정 → 에이전트 → 명령은 Orca가 찾을 수 있는 프로그램 경로나 이름이어야 하며, 인수나 변수를 포함할 수 없습니다. 변경하거나 재설정하세요.",
         "runtimeNotInstalled": "{{agent}}이(가) 이 채팅을 실행하는 컴퓨터에 설치되어 있지 않습니다. 최신 버전의 Orca에서 채팅을 통해 설치하세요.",
-        "conversationOpenInBackgroundServer": "OpenCode가 백그라운드 서버에서 이 대화를 계속 실행 중일 수 있습니다. 해당 OpenCode 서버를 중지한 후 다시 시도하세요.",
         "conversationOpenElsewhere": "Codex가 아직 이 대화를 열어 두고 있습니다. 잠시 후 다시 시도하거나 다른 Codex 터미널을 닫으세요.",
         "conversationOpenInTerminal": "{{agent}}이(가) 다른 터미널에서 이미 이 대화를 실행 중입니다. 그곳에서 {{agent}}을(를) 종료하거나 해당 터미널을 닫은 후 여기서 계속하세요.",
         "chooseClaudeAccount": "Claude 계정 설정에서 선택하거나 추가하세요.",
diff --git a/src/renderer/src/i18n/locales/pt.json b/src/renderer/src/i18n/locales/pt.json
index 463088d47b22..270469846fcb 100644
--- a/src/renderer/src/i18n/locales/pt.json
+++ b/src/renderer/src/i18n/locales/pt.json
@@ -19616,7 +19616,6 @@
         "claudeAccountFolderMissing": "A pasta da conta do Claude selecionada não foi encontrada. Entre nela novamente ou escolha outra conta.",
         "claudeAccountSetupFailed": "Não foi possível configurar a conta do Claude selecionada. Tente novamente ou escolha outra conta.",
         "agentCommandNotRunnable": "O Comando de {{agent}} em Configurações → Agentes deve ser o caminho ou nome de um programa que o Orca possa encontrar, sem argumentos nem variáveis. Altere-o ou redefina-o.",
-        "conversationOpenInBackgroundServer": "O OpenCode pode ainda estar executando esta conversa no servidor em segundo plano. Pare esse servidor do OpenCode e tente novamente.",
         "runtimeNotInstalled": "{{agent}} não está instalado no computador que executa este chat. Instale-o pelo chat em uma versão atual do Orca.",
         "chooseClaudeAccount": "Escolha ou adicione uma nas configurações de Contas do Claude.",
         "chooseClaudeAccountThenRunCommand": "Escolha ou adicione uma nas configurações de Contas do Claude e execute /{{command}} novamente.",
diff --git a/src/renderer/src/i18n/locales/zh.json b/src/renderer/src/i18n/locales/zh.json
index 083edd0f4a30..db06d6b09a0a 100644
--- a/src/renderer/src/i18n/locales/zh.json
+++ b/src/renderer/src/i18n/locales/zh.json
@@ -18639,7 +18639,6 @@
         "claudeAccountSetupFailed": "无法设置所选 Claude 账户。请重试或选择其他账户。",
         "agentCommandNotRunnable": "{{agent}} 在设置 → 智能体中的命令必须是 Orca 能找到的程序路径或名称，且不能包含参数或变量。请修改或重置。",
         "runtimeNotInstalled": "运行此聊天的计算机上未安装 {{agent}}。请在最新版本的 Orca 中从聊天里安装。",
-        "conversationOpenInBackgroundServer": "OpenCode 可能仍在其后台服务器中运行此对话。请停止该 OpenCode 服务器，然后重试。",
         "conversationOpenElsewhere": "Codex 仍在保持此对话打开。请稍后重试，或关闭其他 Codex 终端。",
         "conversationOpenInTerminal": "{{agent}} 已在另一个终端中运行此对话。请退出那里的 {{agent}} 或关闭该终端，然后在这里继续。",
         "chooseClaudeAccount": "请在 Claude 账户设置中选择或添加一个。",
diff --git a/src/shared/agent-session-definitive-refusal.ts b/src/shared/agent-session-definitive-refusal.ts
index af1461e7e72b..abc6db954c39 100644
--- a/src/shared/agent-session-definitive-refusal.ts
+++ b/src/shared/agent-session-definitive-refusal.ts
@@ -10,8 +10,6 @@ export function isAgentSessionCreateAdmissionRefusal(
     ((refusal.code === 'agent_session_conflict' ||
       refusal.code === 'agent_session_ownership_unknown') &&
       refusal.details?.reason === 'conversationHeldElsewhere') ||
-    (refusal.code === 'agent_session_operation_invalid' &&
-      refusal.details?.reason === 'conversationOpenInBackgroundServer') ||
     (refusal.code === 'agent_session_identity_required' &&
       (refusal.details?.reason === 'transcriptNotFound' ||
         refusal.details?.reason === 'transcriptUnreadable'))
diff --git a/src/shared/agent-session-failure-copy.ts b/src/shared/agent-session-failure-copy.ts
index 9ba9df879a01..1c935d6d911d 100644
--- a/src/shared/agent-session-failure-copy.ts
+++ b/src/shared/agent-session-failure-copy.ts
@@ -78,8 +78,6 @@ export const AGENT_SESSION_FAILURE_COPY = {
     "{{agent}}'s Command in Settings → Agents must be a program path or name Orca can find, with no arguments or variables. Change it or reset it.",
   runtimeNotInstalled:
     "{{agent}} isn't installed on the computer running this chat. Install it from the chat in a current version of Orca.",
-  conversationOpenInBackgroundServer:
-    'OpenCode may still be running this conversation in its background server. Stop that OpenCode server, then try again.',
   conversationOpenElsewhere:
     'Codex is still holding this conversation open. Try again in a moment, or close other Codex terminals.',
   conversationOpenInTerminal:
diff --git a/src/shared/agent-session-failure-words.ts b/src/shared/agent-session-failure-words.ts
index 237116b70502..c9bd5cd5189a 100644
--- a/src/shared/agent-session-failure-words.ts
+++ b/src/shared/agent-session-failure-words.ts
@@ -189,8 +189,6 @@ const FAILURE_SENTENCES = {
   agentCommandNotRunnable: namingAgent('agentCommandNotRunnable'),
   runtimeNotInstalled: namingAgent('runtimeNotInstalled'),
   conversationOpenInTerminal: namingAgent('conversationOpenInTerminal'),
-  conversationOpenInBackgroundServer: (_context, _fact, _surface, say) =>
-    say('conversationOpenInBackgroundServer'),
   conversationOpenElsewhere: (_context, _fact, _surface, say) => say('conversationOpenElsewhere'),
   managedAccountUnsupported: (context, _fact, _surface, say) =>
     joinSentences([
diff --git a/src/shared/agent-session-failure.ts b/src/shared/agent-session-failure.ts
index 654b2459afba..13705c9c1d11 100644
--- a/src/shared/agent-session-failure.ts
+++ b/src/shared/agent-session-failure.ts
@@ -41,7 +41,6 @@ export const AGENT_SESSION_FAILURE_KINDS = [
   'agentCommandNotRunnable',
   'runtimeNotInstalled',
   'conversationOpenInTerminal',
-  'conversationOpenInBackgroundServer',
   'conversationOpenElsewhere',
   'providerExited',
   'restartFailed',
diff --git a/src/shared/agent-session-refusal-details.ts b/src/shared/agent-session-refusal-details.ts
index 77a339e7ef00..6f9b6734161d 100644
--- a/src/shared/agent-session-refusal-details.ts
+++ b/src/shared/agent-session-refusal-details.ts
@@ -87,7 +87,6 @@ export const AGENT_SESSION_REFUSAL_REASONS = {
     'runtimeNotInstalled',
     /** A terminal may still be writing the chat's conversation, so its agent did not start. */
     'conversationOpenInTerminal',
-    'conversationOpenInBackgroundServer',
     'conversationOpenElsewhere',
     /** The agent started, then Orca could not open the chat's conversation for it. */
     'attachFailed'
diff --git a/src/shared/agent-session-refusal-reason-words.ts b/src/shared/agent-session-refusal-reason-words.ts
index 71752b80888d..8a5b597e4113 100644
--- a/src/shared/agent-session-refusal-reason-words.ts
+++ b/src/shared/agent-session-refusal-reason-words.ts
@@ -117,10 +117,6 @@ const REASON_WORDS = {
     agentCommandNotRunnable: { fact: 'agentCommandNotRunnable', action: 'actFirst' },
     runtimeNotInstalled: { fact: 'runtimeNotInstalled', action: 'actFirst' },
     conversationOpenInTerminal: { fact: 'conversationOpenInTerminal', action: 'actFirst' },
-    conversationOpenInBackgroundServer: {
-      fact: 'conversationOpenInBackgroundServer',
-      action: 'actFirst'
-    },
     conversationOpenElsewhere: { fact: 'conversationOpenElsewhere', action: 'actFirst' },
     attachFailed: codeWords('retry')
   },
diff --git a/src/shared/structured-agent-session-dispatch-rejection.ts b/src/shared/structured-agent-session-dispatch-rejection.ts
index dde3dbc0126c..2ca8308cac67 100644
--- a/src/shared/structured-agent-session-dispatch-rejection.ts
+++ b/src/shared/structured-agent-session-dispatch-rejection.ts
@@ -81,7 +81,6 @@ const KIND_CATEGORY = {
   agentCommandNotRunnable: 'startFailed',
   runtimeNotInstalled: 'startFailed',
   conversationOpenInTerminal: 'startFailed',
-  conversationOpenInBackgroundServer: 'startFailed',
   conversationOpenElsewhere: 'startFailed',
   restartFailed: 'startFailed',
   providerRejected: 'content',
@@ -117,7 +116,6 @@ const KIND_VERDICT = {
   agentCommandNotRunnable: 'failure',
   runtimeNotInstalled: 'failure',
   conversationOpenInTerminal: 'failure',
-  conversationOpenInBackgroundServer: 'failure',
   conversationOpenElsewhere: 'failure',
   restartFailed: 'failure',
   providerRejected: 'failure',

From 5906f374e07527a1147c38cf2d5489857cb48890 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sun, 25 Oct 2026 15:20:29 -0700
Subject: [PATCH 075/207] test: initialize idle cursor reset in history return
 fixture

---
 .../tab-bar/cli-chat-resume-exit-return.test-fixture.ts         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-exit-return.test-fixture.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-exit-return.test-fixture.ts
index 09c5aceada2a..e11e86f4ab3a 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-exit-return.test-fixture.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-exit-return.test-fixture.ts
@@ -22,6 +22,7 @@ import { switchAiVaultSessionToNativeChat } from '../right-sidebar/ai-vault-sess
 import { installPaneAgentIdentity } from '../terminal-pane/pty-connection/pane-agent-identity'
 import { installSleepingRecordAccess } from '../terminal-pane/pty-connection/sleeping-record-access'
 import type { ConnectPanePtySession } from '../terminal-pane/pty-connection/connect-pane-pty-session'
+import { TerminalIdleCursorReset } from '../terminal-pane/terminal-idle-cursor-reset'
 import { LEAF_1, LEAF_2 } from '../terminal-pane/pty-connection-test-pane-fixtures'
 import { createExitReturnTransport } from './cli-chat-resume-transport.test-fixture'
 import type { AiVaultSession } from '../../../../shared/ai-vault-types'
@@ -156,6 +157,7 @@ export async function verifyExitedPaneHistoryReturn(
     },
     transport: createExitReturnTransport('pty-1'),
     hiddenOutputRestoreUnhideSeq: null,
+    idleCursorReset: new TerminalIdleCursorReset(),
     paneStartup: null,
     writeInputModeGround: vi.fn()
   }

From b5e75c7b4a2522b88df1526bb471dba33df6e5b5 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sun, 25 Oct 2026 16:25:19 -0700
Subject: [PATCH 076/207] Preserve typed refusals when returning conversations
 to chat

---
 .../structured-agent-session-switch-to-chat.ts  | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-to-chat.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-to-chat.ts
index 7a7c9711c660..ea21e2425d0e 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-to-chat.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-to-chat.ts
@@ -8,6 +8,7 @@ import {
   refuseUnclassified
 } from '../../../shared/agent-session-wire-refusals'
 import type { AgentSessionWireRefusal } from '../../../shared/agent-session-wire'
+import type { StructuredAgentSessionResumeOutcome } from './structured-agent-session-agent-start'
 import type { StructuredAgentSessionMutationContext } from './structured-agent-session-mutation-context'
 import type { StructuredAgentSessionProviderChildIdentity } from './structured-agent-session-host-types'
 import {
@@ -17,6 +18,7 @@ import {
 import { sameProviderChild } from './structured-agent-session-provider-child'
 import { structuredAgentSessionEndedChildFailure } from './structured-agent-session-ended-child-failure'
 import {
+  type StructuredAgentSessionStartFailureCause,
   structuredAgentSessionStartFailure,
   structuredAgentSessionStartFailureFact,
   typedStartRefusal
@@ -46,9 +48,12 @@ export async function startStructuredAgentSessionForSwitch(
   }
   let { child, readiness } = selected
   if (!child) {
-    const started = await (selected.start?.outcome ?? operationDidNotRun())
+    const started: StructuredAgentSessionResumeOutcome = await (selected.start?.outcome ??
+      operationDidNotRun())
     if (!started.ok) {
-      return { ok: false, refusal: started.refusal }
+      return started.failure
+        ? switchStartFailure(context, sessionId, { failure: started.failure })
+        : { ok: false, refusal: started.refusal }
     }
     const selection = selectStructuredAgentSessionOperationChild(context, sessionId)
     if (!selection.ok || !selection.child) {
@@ -84,6 +89,14 @@ function switchStartVerdict(
   if (!failure) {
     return operationDidNotRun(outcome === 'timeout')
   }
+  return switchStartFailure(context, sessionId, failure)
+}
+
+function switchStartFailure(
+  context: StructuredAgentSessionMutationContext,
+  sessionId: string,
+  failure: StructuredAgentSessionStartFailureCause
+): StructuredAgentSessionSwitchToChatOutcome {
   const fact = structuredAgentSessionStartFailureFact(failure)
   const { reason } = structuredAgentSessionStartFailure(
     failure,

From 4856835df0611548e100d5192f6175f7e697e595 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sun, 25 Oct 2026 17:26:56 -0700
Subject: [PATCH 077/207] Fix inherited CI file limits and test import

---
 ...agent-session-startup-attempt-host.test.ts | 74 ++++------------
 ...nt-session-startup-reports.test-support.ts | 88 +++++++++++++++++++
 .../structured-agent-session-status-feed.ts   |  6 +-
 .../legacy-chat-rename-migration.test.tsx     |  2 +-
 4 files changed, 109 insertions(+), 61 deletions(-)
 create mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-startup-reports.test-support.ts

diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-startup-attempt-host.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-startup-attempt-host.test.ts
index 059ac09eaf50..490dc570e3ff 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-startup-attempt-host.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-startup-attempt-host.test.ts
@@ -38,6 +38,7 @@ import {
 } from './structured-agent-session-host-test-data'
 import { createStructuredAgentSessionLogger } from './structured-agent-session-logger'
 import type { StructuredAgentSessionStartupLimits } from './structured-agent-session-startup-attempt-contract'
+import { registerStartupReports } from './structured-agent-session-startup-reports.test-support'
 
 const CALLER = { callerKey: 'client-1' }
 
@@ -486,62 +487,23 @@ describe('a start that ends before it proves itself', () => {
   })
 })
 
-describe('what a started child reports', () => {
-  it('keeps provider reports out of the saved next-message choice', async () => {
-    await restartWith(publishFirst)
-    const id = await heldBehindStart('hello')
-    await proveOpen('reported')
-    await eventually(async () => expect((await submission(id))?.dispatchState).toBe('accepted'))
-    await host.handleAdapterEvent({
-      type: 'options-reported',
-      sessionId: SESSION,
-      fence: store.getRecord(SESSION)!.lease.runtimeFence,
-      acquisitionGeneration: `generation-${acquire.mock.calls.length}`,
-      reportedOptions: { model: 'from-settings' }
-    })
-    await host.flushStreamedEvents(SESSION)
-    expect(store.getRecord(SESSION)?.options).toBeUndefined()
-  })
-
-  it('preserves a later accepted pick when an older child reports options', async () => {
-    await restartWith(publishFirst)
-    const id = await heldBehindStart('hello')
-    await store.replaceSessionOptions({
-      sessionId: SESSION,
-      fence: store.getRecord(SESSION)!.lease.runtimeFence,
-      options: { model: 'picked' },
-      now: NOW
-    })
-    await proveOpen('reported')
-    await eventually(async () => expect((await submission(id))?.dispatchState).toBe('accepted'))
-    await host.handleAdapterEvent({
-      type: 'options-reported',
-      sessionId: SESSION,
-      fence: store.getRecord(SESSION)!.lease.runtimeFence,
-      acquisitionGeneration: `generation-${acquire.mock.calls.length}`,
-      reportedOptions: { model: 'from-settings' }
-    })
-    await host.flushStreamedEvents(SESSION)
-    expect(store.getRecord(SESSION)?.options).toEqual({ model: 'picked' })
-  })
-
-  it('saves a settings readback that arrives before open proves the start', async () => {
-    await restartWith(publishFirst)
-    await heldBehindStart('hello')
-    const listing = { models: [], configuredDefault: { modelId: 'opus' } }
-    const reported = host.handleAdapterEvent({
-      type: 'options-reported',
-      sessionId: SESSION,
-      fence: store.getRecord(SESSION)!.lease.runtimeFence,
-      acquisitionGeneration: `generation-${acquire.mock.calls.length}`,
-      reportedOptions: { model: 'opus' },
-      catalogListing: listing
-    })
-    await proveOpen()
-    await reported
-
-    await eventually(() => expect(recordLiveListing).toHaveBeenCalledWith(SESSION, listing))
-  })
+registerStartupReports({
+  get host() {
+    return host
+  },
+  get store() {
+    return store
+  },
+  get acquire() {
+    return acquire
+  },
+  restartWith,
+  publishFirst,
+  heldBehindStart,
+  proveOpen,
+  eventually,
+  submission,
+  recordLiveListing
 })
 
 function startupAttemptOpen(): boolean {
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-startup-reports.test-support.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-startup-reports.test-support.ts
new file mode 100644
index 000000000000..03f14f2b290a
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-startup-reports.test-support.ts
@@ -0,0 +1,88 @@
+import { describe, expect, it, type Mock } from 'vitest'
+import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types'
+import type { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
+import type { StructuredAgentSessionAdapter } from './structured-agent-session-adapter'
+import type { StructuredAgentSessionHost } from './structured-agent-session-host'
+import {
+  HOST_TEST_NOW as NOW,
+  HOST_TEST_SESSION as SESSION
+} from './structured-agent-session-host-test-data'
+
+type StartupReportsFixture = {
+  host: StructuredAgentSessionHost
+  store: AgentSessionRecordStore
+  acquire: Mock<StructuredAgentSessionAdapter['acquire']>
+  restartWith: (next: StructuredAgentSessionAdapter['acquire']) => Promise<void>
+  publishFirst: StructuredAgentSessionAdapter['acquire']
+  heldBehindStart: (text: string) => Promise<string>
+  proveOpen: (model?: string) => Promise<void>
+  eventually: (assertion: () => void | Promise<void>) => Promise<void>
+  submission: (id: string) => Promise<AgentJournalSubmission | undefined>
+  recordLiveListing: Mock
+}
+
+export function registerStartupReports(fixture: StartupReportsFixture): void {
+  describe('what a started child reports', () => {
+    it('keeps provider reports out of the saved next-message choice', async () => {
+      await fixture.restartWith(fixture.publishFirst)
+      const id = await fixture.heldBehindStart('hello')
+      await fixture.proveOpen('reported')
+      await fixture.eventually(async () =>
+        expect((await fixture.submission(id))?.dispatchState).toBe('accepted')
+      )
+      await fixture.host.handleAdapterEvent({
+        type: 'options-reported',
+        sessionId: SESSION,
+        fence: fixture.store.getRecord(SESSION)!.lease.runtimeFence,
+        acquisitionGeneration: `generation-${fixture.acquire.mock.calls.length}`,
+        reportedOptions: { model: 'from-settings' }
+      })
+      await fixture.host.flushStreamedEvents(SESSION)
+      expect(fixture.store.getRecord(SESSION)?.options).toBeUndefined()
+    })
+
+    it('preserves a later accepted pick when an older child reports options', async () => {
+      await fixture.restartWith(fixture.publishFirst)
+      const id = await fixture.heldBehindStart('hello')
+      await fixture.store.replaceSessionOptions({
+        sessionId: SESSION,
+        fence: fixture.store.getRecord(SESSION)!.lease.runtimeFence,
+        options: { model: 'picked' },
+        now: NOW
+      })
+      await fixture.proveOpen('reported')
+      await fixture.eventually(async () =>
+        expect((await fixture.submission(id))?.dispatchState).toBe('accepted')
+      )
+      await fixture.host.handleAdapterEvent({
+        type: 'options-reported',
+        sessionId: SESSION,
+        fence: fixture.store.getRecord(SESSION)!.lease.runtimeFence,
+        acquisitionGeneration: `generation-${fixture.acquire.mock.calls.length}`,
+        reportedOptions: { model: 'from-settings' }
+      })
+      await fixture.host.flushStreamedEvents(SESSION)
+      expect(fixture.store.getRecord(SESSION)?.options).toEqual({ model: 'picked' })
+    })
+
+    it('saves a settings readback that arrives before open proves the start', async () => {
+      await fixture.restartWith(fixture.publishFirst)
+      await fixture.heldBehindStart('hello')
+      const listing = { models: [], configuredDefault: { modelId: 'opus' } }
+      const reported = fixture.host.handleAdapterEvent({
+        type: 'options-reported',
+        sessionId: SESSION,
+        fence: fixture.store.getRecord(SESSION)!.lease.runtimeFence,
+        acquisitionGeneration: `generation-${fixture.acquire.mock.calls.length}`,
+        reportedOptions: { model: 'opus' },
+        catalogListing: listing
+      })
+      await fixture.proveOpen()
+      await reported
+
+      await fixture.eventually(() =>
+        expect(fixture.recordLiveListing).toHaveBeenCalledWith(SESSION, listing)
+      )
+    })
+  })
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-status-feed.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-status-feed.ts
index 2e2740263173..5e7e7787d3d9 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-status-feed.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-status-feed.ts
@@ -280,10 +280,8 @@ export class StructuredAgentSessionStatusFeed {
 
   childWorkOpen = (sessionId: string): boolean => this.ownership.childWorkOpen(sessionId)
 
-  captureChildWorkStops = (
-    sessionId: string,
-    handleIds: readonly string[]
-  ): CapturedChildWorkStops => this.ownership.captureChildWorkStops(sessionId, handleIds)
+  captureChildWorkStops = (sessionId: string, ids: readonly string[]): CapturedChildWorkStops =>
+    this.ownership.captureChildWorkStops(sessionId, ids)
 
   childWorkIncomplete = (sessionId: string): boolean => {
     try {
diff --git a/src/renderer/src/runtime/legacy-chat-rename-migration.test.tsx b/src/renderer/src/runtime/legacy-chat-rename-migration.test.tsx
index 18ee4cded613..d7762d35e978 100644
--- a/src/renderer/src/runtime/legacy-chat-rename-migration.test.tsx
+++ b/src/renderer/src/runtime/legacy-chat-rename-migration.test.tsx
@@ -41,7 +41,7 @@ import type { RuntimeMobileSessionTabsResult } from '../../../shared/runtime-typ
 import { applyWebSessionTabsSnapshot } from './web-session-tabs-sync/snapshot-api'
 import { applyWebSessionTabsStorePatch } from './web-session-tabs-sync/store-patch'
 import { applyLocalStructuredSessionTabSnapshots } from './local-structured-session-tabs-sync/snapshot-apply'
-import { readStructuredAgentLaunchRecord } from '@/lib/structured-agent-session-launch-persistence'
+import { readStructuredAgentLaunchRecord } from '@/lib/agent-session/launch/structured-agent-session-launch-persistence'
 
 const mock = vi.hoisted(() => ({
   rpc: vi.fn(),

From 9a4c52746fd5d1e07477fa6daca285cc228257c4 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Mon, 26 Oct 2026 19:12:59 -0700
Subject: [PATCH 078/207] Make conversation switching use one bounded operation

---
 .../agent-launch-pane-attachment.ts           |  34 +-
 src/main/ai-vault/structured-chat-cli-fork.ts |  28 ++
 src/main/codex/codex-history-journal-view.ts  |  15 +-
 .../codex/codex-structured-session-acquire.ts |   5 +
 .../daemon/daemon-client-rpc-request.test.ts  |  23 +
 src/main/daemon/daemon-client-rpc-request.ts  |  16 +
 .../daemon/daemon-create-or-attach-result.ts  |   3 +
 src/main/daemon/daemon-fenced-termination.ts  |  10 +-
 .../daemon-foreground-process-protocol.ts     |   1 +
 src/main/daemon/daemon-protocol-version.ts    |   5 +-
 src/main/daemon/daemon-pty-adapter.ts         |  13 +-
 .../daemon/daemon-pty-process-inspection.ts   |   5 +
 .../daemon-pty-spawn-preparations.test.ts     |  31 ++
 .../daemon/daemon-pty-spawn-preparations.ts   |  69 ++-
 src/main/daemon/daemon-pty-spawn-request.ts   |  35 +-
 src/main/daemon/daemon-request-router.ts      |   3 +
 .../daemon/daemon-spawn-result-identity.ts    |  11 +-
 src/main/daemon/daemon-terminal-admission.ts  |  46 +-
 src/main/daemon/pty-subprocess.ts             |   4 +
 .../conpty-startup-input-reader.ts            |  54 ++-
 .../native-pty-spawn-windows.test.ts          |  47 +-
 .../daemon/pty-subprocess/native-pty-spawn.ts |   5 +
 .../spawn-file-foreground-process.ts          |   3 +
 .../pty-subprocess/subprocess-handle.ts       |  27 +-
 src/main/daemon/session-input-path.ts         |   5 +-
 src/main/daemon/session-process-inspection.ts |  48 ++
 .../daemon/session-shell-ready-barrier.ts     |   9 +-
 .../daemon/session-subprocess.test-fixture.ts |  78 ++++
 src/main/daemon/session-switch-use.ts         |  54 +++
 src/main/daemon/session.test.ts               | 151 +++----
 src/main/daemon/session.ts                    |  74 ++--
 .../terminal-host-agent-session-claim.ts      |  12 +-
 .../daemon/terminal-host-create-contract.ts   |   3 +
 .../terminal-host-fenced-termination.ts       |  30 +-
 src/main/daemon/terminal-host-inspection.ts   |  60 +++
 src/main/daemon/terminal-host-options.ts      |   2 +
 .../terminal-host-process-inspection.ts       |  10 +-
 .../daemon/terminal-host-session-create.ts    |  89 ++--
 .../daemon/terminal-host-session-process.ts   |  56 +++
 src/main/daemon/terminal-host.ts              | 101 ++---
 src/main/daemon/terminal-session-teardown.ts  |  40 +-
 src/main/daemon/types.ts                      |  27 +-
 .../ipc/pty/pane/resume-launch-identity.ts    |   2 +
 src/main/ipc/pty/runtime/controller.ts        |   5 +-
 src/main/ipc/pty/runtime/spawn-execute.ts     |  31 +-
 src/main/ipc/pty/runtime/spawn-options.ts     |   5 +-
 .../ipc/pty/runtime/spawn-saved-resume.ts     |  28 ++
 src/main/ipc/pty/runtime/spawn-state.ts       |   2 +
 .../ipc/pty/spawn-commit-adopted-session.ts   |  90 ++++
 src/main/ipc/pty/spawn-commit-assembly.ts     | 101 ++---
 src/main/ipc/pty/spawn-commit-binding.test.ts |  72 +++
 src/main/ipc/pty/spawn-commit-binding.ts      |  91 +++-
 src/main/ipc/pty/spawn-commit-publication.ts  |  34 +-
 ...runtime-environment-request-connections.ts |   1 +
 ...ntime-environment-subscription-controls.ts |  57 +++
 ...ntime-environment-subscription-handlers.ts | 106 +++--
 .../runtime-environment-support-routing.ts    |  26 +-
 .../runtime-environment-transport-routing.ts  |   2 +
 .../structured-agent-session-acquisition.ts   |   6 +
 .../structured-agent-session-adapter.ts       |   1 +
 ...tured-agent-session-adopted-import.test.ts |   8 +-
 ...structured-agent-session-adopted-import.ts |   3 +-
 .../structured-agent-session-agent-start.ts   |  28 +-
 ...red-agent-session-at-rest-catch-up.test.ts | 133 ++++++
 ...ructured-agent-session-at-rest-catch-up.ts | 181 ++++++++
 ...structured-agent-session-attach-context.ts |   1 +
 .../structured-agent-session-attach-flow.ts   |  11 +-
 ...structured-agent-session-attach-options.ts |  22 +
 ...ured-agent-session-attach-orchestration.ts |  26 +-
 .../structured-agent-session-child-close.ts   |   4 +-
 ...red-agent-session-conversation-lifetime.ts | 101 ++---
 ...structured-agent-session-create-options.ts |  20 +
 .../structured-agent-session-create.ts        |  30 +-
 ...d-agent-session-failed-start-settlement.ts |  76 ++++
 .../structured-agent-session-host-contexts.ts |  90 ++++
 .../structured-agent-session-host-lifetime.ts |  18 +-
 ...ured-agent-session-host-mutation-wiring.ts |   3 +-
 ...structured-agent-session-host-mutations.ts |  13 +-
 .../structured-agent-session-host-types.ts    |   5 +
 .../structured-agent-session-host.ts          | 139 +++---
 ...ructured-agent-session-mutation-context.ts |   2 +-
 ...structured-agent-session-start-attempts.ts |   3 +-
 ...uctured-agent-session-start-failure-row.ts |   3 +-
 ...ructured-agent-session-switch-admission.ts | 135 +++++-
 ...-agent-session-switch-command-selection.ts | 192 ++++++++
 ...tured-agent-session-switch-command.test.ts | 270 ++++++++++++
 ...tructured-agent-session-switch-commands.ts | 167 +++++++
 ...structured-agent-session-switch-to-chat.ts |  88 +++-
 .../structured-provider-session-ownership.ts  |   8 +-
 .../transcript-line-decoders-codex.ts         |  13 +-
 .../loading-store/pty-binding-persistence.ts  |   5 +-
 .../layout-command-persistence.ts             |  13 +-
 .../terminal-topology-commit.ts               |   4 +-
 ...agent-foreground-process-real-rows.test.ts |  18 +
 ...gent-foreground-process-remote-evidence.ts |   3 +
 .../providers/agent-foreground-process.ts     |   6 +-
 .../local-pty-foreground-inspection.ts        |  13 +-
 .../providers/local-pty-provider-state.ts     |  20 +-
 src/main/providers/local-pty-provider.ts      |  82 +++-
 .../providers/local-pty-session-activation.ts |  35 +-
 .../providers/local-pty-session-operations.ts |   4 +
 .../local-pty-shell-ready-startup-command.ts  |   5 +-
 src/main/providers/local-pty-spawn-state.ts   |   4 +
 src/main/providers/local-pty-spawn.ts         |  17 +-
 .../local-pty-switch-cleanup.test.ts          | 165 +++++++
 src/main/providers/local-pty-termination.ts   |  59 ++-
 src/main/providers/local-pty-utils.ts         |  11 +-
 src/main/providers/pty-process-inspection.ts  |   1 +
 src/main/providers/pty-provider-contract.ts   |   2 +
 src/main/providers/pty-spawn-result.ts        |   5 +
 src/main/providers/suspended-agent-process.ts |  17 +
 src/main/pty-descendant-ancestry.ts           |  52 +++
 src/main/pty-descendant-termination.ts        |  78 ++--
 .../runtime/agent-session-founding-store.ts   |   3 +-
 .../agent-session-record-publication.ts       |  52 +++
 .../runtime/agent-session-record-store.ts     | 105 +++--
 .../agent-session-store-transactions.ts       |  10 +-
 .../agent-session-tab-layout-queue.test.ts    |  29 ++
 .../runtime/agent-session-tab-layout-queue.ts |  25 +-
 .../construction/runtime-identity-state.ts    |   4 +-
 .../main-owned-workspace-runtime-fixture.ts   |  15 +-
 ...ca-runtime-create-terminal-dependencies.ts |  11 +-
 src/main/runtime/orca-runtime.ts              |  17 +
 .../methods/agent-launch-caller-support.ts    |  26 ++
 .../methods/agent-launch-tab-publication.ts   |  39 +-
 .../rpc/methods/agent-launch.test-fixture.ts  |   2 +
 src/main/runtime/rpc/methods/agent-launch.ts  |  40 +-
 ...structured-agent-session-create-options.ts |  37 ++
 .../structured-agent-session-create.ts        |  41 +-
 .../structured-agent-session-schemas.ts       |   2 +
 ...red-agent-session-switch-execution.test.ts | 409 ++++++++++++++++++
 ...ructured-agent-session-switch-execution.ts | 266 ++++++++++++
 .../structured-agent-session-switch-source.ts |  67 +++
 ...agent-session-switch-terminal-execution.ts | 127 ++++++
 ...structured-agent-session-switch-to-chat.ts |  27 +-
 ...ctured-agent-session-switch-to-terminal.ts |  17 +-
 .../runtime/runtime-durable-store-fixture.ts  |  11 +-
 src/main/runtime/runtime-layout-apply.ts      |   2 +-
 ...time-mobile-session-result-finalization.ts |   1 +
 src/main/runtime/runtime-notifier-contract.ts |   7 +-
 src/main/runtime/runtime-pane-admission.ts    |  32 +-
 .../runtime-pty-controller-contract.ts        |  12 +-
 .../runtime/runtime-terminal-contracts.ts     |   3 +
 .../session-window-graph-leaf.ts              |  42 ++
 .../session-graph/session-window-graph.ts     |  57 ++-
 .../main-layout-agent-launch-tabs.test.ts     |  97 ++++-
 .../main-layout-agent-launch-tabs.ts          | 126 ++++--
 .../structured-session-launch-runtime.ts      | 152 +++++++
 .../structured-session-switch-projection.ts   | 188 ++++++++
 .../structured-session-tab-close.ts           |  22 +-
 .../structured-session-tab-restoration.ts     | 159 ++-----
 ...ured-session-terminal-launch-retirement.ts |   3 +
 .../structured-agent-cli-writers.test.ts      |  26 ++
 .../runtime/structured-agent-cli-writers.ts   |  19 +-
 .../launch/mobile-terminal-create-options.ts  |  48 ++
 .../launch/mobile-terminal-create-owner.ts    |  76 ++++
 .../terminal/launch/mobile-terminal-create.ts |  15 +-
 .../launch/mobile-terminal-owned-create.ts    |  33 +-
 .../launch/mobile-terminal-renderer-create.ts | 131 +++---
 .../mobile-terminal-session-switch.test.ts    | 258 +++++++++++
 .../launch/mobile-terminal-startup.ts         |  74 +++-
 .../mobile-terminal-switch-publication.ts     | 129 ++++++
 .../launch/terminal-create-completion.ts      |  85 ++++
 .../terminal/launch/terminal-create-size.ts   |  21 +
 .../terminal/launch/terminal-create.ts        | 137 +++---
 .../terminal/launch/terminal-launch-result.ts |  10 +-
 .../recovery/resolve-terminal-pane.ts         |  91 +---
 .../terminal/recovery/terminal-pane-read.ts   |  84 ++++
 .../window/agent-launch-tab-publish-relay.ts  |   8 +-
 src/main/window/runtime-window-lifecycle.ts   |   4 +-
 .../window/session-tab-close-request-relay.ts |  21 +-
 src/preload/api/runtime-api.ts                |   6 +
 .../api/runtime-environments-bridge.ts        |   6 +
 .../runtime-environment-subscriptions.ts      |  19 +-
 .../native-chat/NativeChatMessageList.tsx     |   2 +
 .../native-chat/NativeChatNoticeRow.tsx       |   7 +-
 ...ucturedSession.history-read-state.test.tsx |   2 +-
 ...StructuredSession.switch-readable.test.tsx | 277 ++++++++++++
 .../NativeChatStructuredSession.tsx           | 363 ++++++++--------
 .../NativeChatTopRightControls.tsx            |  34 +-
 .../native-chat/NativeChatTranscriptItems.tsx |   7 +-
 .../native-chat-structured-session-notices.ts |  17 +
 ...structured-agent-session-message-sender.ts |   3 +
 ...tured-agent-session-read-owner-contract.ts |   1 +
 ...uctured-agent-session-read-owner-create.ts | 300 +++++++++++++
 .../structured-agent-session-read-owner.ts    | 296 +------------
 .../use-structured-native-chat-delivery.ts    |  32 ++
 .../AiVaultSessionActionMenuItems.tsx         |  10 +-
 .../right-sidebar/AiVaultSessionDetails.tsx   |   4 +
 .../AiVaultSessionDetailsSwitchButtons.tsx    |  21 +-
 .../right-sidebar/AiVaultSessionRow.tsx       |   7 +
 .../AiVaultSessionSurfaceSwitchMenuItems.tsx  |  24 +-
 .../right-sidebar/AiVaultVirtualRow.tsx       |   9 +-
 .../SessionRowTrailingActions.tsx             |   5 +
 .../ai-vault-history-native-return.test.tsx   |  37 +-
 .../ai-vault-session-in-place-switch.ts       |  90 ++--
 .../ai-vault-session-launch-actions.ts        |  16 +-
 .../tab-bar/CliChatResumeMenuItems.tsx        |  14 +-
 .../tab-bar/NativeChatCliForkMenuItems.tsx    |  47 +-
 .../TabSessionSurfaceSwitchMenuItems.test.tsx |  21 +-
 .../tab-bar/TabSessionSwitchHoverAction.tsx   |  40 +-
 ...li-chat-resume-exit-return.test-fixture.ts |  24 +-
 .../tab-bar/cli-chat-resume-feedback.ts       |  71 +--
 .../cli-chat-resume-mocks.test-fixture.ts     |   1 +
 .../tab-bar/cli-chat-resume-run.test.ts       | 158 ++++---
 .../components/tab-bar/cli-chat-resume-run.ts |  32 +-
 .../cli-chat-resume-snapshot.test-fixture.ts  |  24 +
 .../native-chat-cli-switch-run.test.ts        |   7 +-
 .../tab-bar/native-chat-cli-switch-run.ts     |  67 +--
 .../tab-session-history-switch.test.ts        |  14 +-
 ...alPaneResumeInChatButton.held-job.test.tsx | 128 ++++++
 .../TerminalPaneResumeInChatButton.test.tsx   |   4 +-
 .../TerminalPaneResumeInChatButton.tsx        |  42 +-
 .../pane-foreground-agent-retry.ts            |  18 +
 .../pane-foreground-agent-tracker-contract.ts |  14 +
 .../pane-foreground-agent-tracker.test.ts     |  42 ++
 .../pane-foreground-agent-tracker.ts          | 103 +++--
 .../pane-foreground-process-exit.ts           |  46 ++
 .../pane-foreground-process-reader.ts         |   8 +
 .../pty-connection/pane-agent-identity.ts     |   4 +-
 .../terminal-tab-agent-type-index.ts          |   9 +-
 .../ipc-events/agent-launch-tab-ipc-bridge.ts |  22 +-
 .../ipc-events/session-tab-ipc-bridge.ts      | 151 ++++---
 ...seIpcEvents-agent-conversation-cap.test.ts |   5 +-
 .../src/i18n/en-runtime-required.json         |  18 +
 src/renderer/src/i18n/locales/en.json         |  22 +-
 .../src/lib/agent-launch-pane-closes.ts       |   6 +-
 .../src/lib/agent-launch-pane-start.ts        |  61 ++-
 .../agent-launch-pane-verdict-application.ts  | 141 +++---
 .../src/lib/agent-launch-tab-main-written.ts  |  34 +-
 .../lib/agent-launch-tab-publication.test.ts  |  56 +++
 .../src/lib/agent-launch-tab-publication.ts   |  31 +-
 .../lib/conversation-surface-switch.test.tsx  | 214 +++++++++
 .../src/lib/conversation-surface-switch.ts    | 299 +++++++++++++
 .../src/lib/conversation-switch-feedback.ts   | 132 ++++++
 .../src/lib/conversation-switch-legacy.ts     |  33 ++
 .../conversation-switch-presentation.test.tsx | 164 +++++++
 .../lib/conversation-switch-presentation.tsx  | 224 ++++++++++
 .../src/lib/conversation-switch-projection.ts | 280 ++++++++++++
 .../src/lib/conversation-switch-state.ts      | 120 +++++
 .../src/lib/in-place-switch-support.ts        |  14 +-
 .../src/lib/open-tab-occupant-agent.ts        |   4 +-
 .../pending-conversation-surface-switches.ts  |   9 +
 ...structured-agent-session-launch-failure.ts |   8 +-
 src/renderer/src/lib/use-tab-agent.ts         |  11 +-
 .../abortable-runtime-environment-call.ts     |  61 ++-
 .../snapshot-apply.ts                         |   3 +-
 ...runtime-environment-compatibility-cache.ts |  51 +++
 ...-environment-switch-dispatch-clock.test.ts | 155 +++++++
 .../src/runtime/runtime-rpc-client.ts         |  83 ++--
 .../runtime/runtime-rpc-environment-call.ts   |   7 +-
 .../structured-agent-session-client.test.ts   |  16 +
 .../structured-agent-session-client.ts        |  28 +-
 .../sync-runtime-graph/graph-publication.ts   |   1 +
 .../web-session-tabs-sync/store-patch.ts      |  33 +-
 .../runtime/workspace-layout-frame-sync.ts    |   2 +-
 .../src/store/slices/pane-foreground-agent.ts |   3 +
 .../store/slices/tabs/moved-tab-selection.ts  |  16 +-
 .../store/slices/tabs/tabs-drop-actions.ts    |   2 +
 .../store/slices/tabs/tabs-focus-actions.ts   |   2 +
 .../store/slices/tabs/tabs-label-actions.ts   |  22 +-
 .../store/slices/tabs/tabs-move-actions.ts    |   2 +
 .../store/slices/tabs/tabs-slice-contract.ts  |  12 +
 ...workspace-layout-frame-store-patch.test.ts | 112 ++++-
 src/shared/agent-launch-pane-verdict.ts       |   9 +-
 src/shared/agent-launch-tab-publication.ts    |  17 +
 .../agent-session-lease-adjudication.ts       |  21 +
 src/shared/agent-session-native-content.ts    |   5 +
 src/shared/agent-session-refusal-details.ts   |   7 +-
 src/shared/agent-session-switch-execution.ts  | 126 ++++++
 src/shared/claimed-agent-pty-owner.test.ts    |  70 +++
 src/shared/claimed-agent-pty-owner.ts         |  28 +-
 src/shared/foreground-process-evidence.ts     |   3 +
 src/shared/pty-fenced-termination.ts          |   6 +
 src/shared/remote-runtime-client.ts           |   1 +
 .../remote-runtime-shared-control-send.ts     |  11 +
 .../remote-runtime-shared-control-types.ts    |   1 +
 .../remote-runtime-subscription-contract.ts   |   1 +
 ...emote-runtime-subscription-frame-router.ts |  12 +
 .../rpc-params-catalog.generated.ts           |   6 +-
 ...uctured-agent-session-mutation-envelope.ts |  14 +
 .../structured-agent-session-params.ts        | 142 +++---
 ...tructured-agent-session-question-params.ts |  56 +++
 src/shared/runtime-rpc-call-queue.ts          |   7 +-
 src/shared/runtime-rpc-envelope.ts            |   7 +
 src/shared/runtime-session-contracts.ts       |   7 +
 .../runtime-terminal-create-contract.ts       |   1 +
 src/shared/session-tab-close.ts               |   4 +
 ...uctured-agent-cli-conversation-adoption.ts |  10 +-
 src/shared/terminal-process-inspection.ts     |   3 +
 290 files changed, 11133 insertions(+), 2614 deletions(-)
 create mode 100644 src/main/daemon/daemon-pty-spawn-preparations.test.ts
 create mode 100644 src/main/daemon/session-process-inspection.ts
 create mode 100644 src/main/daemon/session-subprocess.test-fixture.ts
 create mode 100644 src/main/daemon/session-switch-use.ts
 create mode 100644 src/main/daemon/terminal-host-inspection.ts
 create mode 100644 src/main/daemon/terminal-host-session-process.ts
 create mode 100644 src/main/ipc/pty/runtime/spawn-saved-resume.ts
 create mode 100644 src/main/ipc/pty/spawn-commit-adopted-session.ts
 create mode 100644 src/main/ipc/pty/spawn-commit-binding.test.ts
 create mode 100644 src/main/ipc/runtime-environments/runtime-environment-subscription-controls.ts
 create mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.test.ts
 create mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.ts
 create mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-attach-options.ts
 create mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-create-options.ts
 create mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-failed-start-settlement.ts
 create mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-host-contexts.ts
 create mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-switch-command-selection.ts
 create mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test.ts
 create mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-switch-commands.ts
 create mode 100644 src/main/providers/local-pty-switch-cleanup.test.ts
 create mode 100644 src/main/providers/suspended-agent-process.ts
 create mode 100644 src/main/pty-descendant-ancestry.ts
 create mode 100644 src/main/runtime/agent-session-record-publication.ts
 create mode 100644 src/main/runtime/rpc/methods/agent-launch-caller-support.ts
 create mode 100644 src/main/runtime/rpc/methods/structured-agent-session-create-options.ts
 create mode 100644 src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
 create mode 100644 src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
 create mode 100644 src/main/runtime/rpc/methods/structured-agent-session-switch-source.ts
 create mode 100644 src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts
 create mode 100644 src/main/runtime/session-graph/session-window-graph-leaf.ts
 create mode 100644 src/main/runtime/session-tabs/structured-session-launch-runtime.ts
 create mode 100644 src/main/runtime/session-tabs/structured-session-switch-projection.ts
 create mode 100644 src/main/runtime/terminal/launch/mobile-terminal-create-options.ts
 create mode 100644 src/main/runtime/terminal/launch/mobile-terminal-create-owner.ts
 create mode 100644 src/main/runtime/terminal/launch/mobile-terminal-session-switch.test.ts
 create mode 100644 src/main/runtime/terminal/launch/mobile-terminal-switch-publication.ts
 create mode 100644 src/main/runtime/terminal/launch/terminal-create-completion.ts
 create mode 100644 src/main/runtime/terminal/launch/terminal-create-size.ts
 create mode 100644 src/main/runtime/terminal/recovery/terminal-pane-read.ts
 create mode 100644 src/renderer/src/components/native-chat/NativeChatStructuredSession.switch-readable.test.tsx
 create mode 100644 src/renderer/src/components/native-chat/structured-agent-session-read-owner-create.ts
 create mode 100644 src/renderer/src/components/native-chat/use-structured-native-chat-delivery.ts
 create mode 100644 src/renderer/src/components/tab-bar/cli-chat-resume-snapshot.test-fixture.ts
 create mode 100644 src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.held-job.test.tsx
 create mode 100644 src/renderer/src/components/terminal-pane/pane-foreground-agent-retry.ts
 create mode 100644 src/renderer/src/components/terminal-pane/pane-foreground-process-exit.ts
 create mode 100644 src/renderer/src/lib/conversation-surface-switch.test.tsx
 create mode 100644 src/renderer/src/lib/conversation-surface-switch.ts
 create mode 100644 src/renderer/src/lib/conversation-switch-feedback.ts
 create mode 100644 src/renderer/src/lib/conversation-switch-legacy.ts
 create mode 100644 src/renderer/src/lib/conversation-switch-presentation.test.tsx
 create mode 100644 src/renderer/src/lib/conversation-switch-presentation.tsx
 create mode 100644 src/renderer/src/lib/conversation-switch-projection.ts
 create mode 100644 src/renderer/src/lib/conversation-switch-state.ts
 create mode 100644 src/renderer/src/runtime/runtime-environment-compatibility-cache.ts
 create mode 100644 src/renderer/src/runtime/runtime-environment-switch-dispatch-clock.test.ts
 create mode 100644 src/shared/agent-session-native-content.ts
 create mode 100644 src/shared/agent-session-switch-execution.ts
 create mode 100644 src/shared/rpc-contract/structured-agent-session-mutation-envelope.ts
 create mode 100644 src/shared/rpc-contract/structured-agent-session-question-params.ts

diff --git a/src/main/agent-launch/agent-launch-pane-attachment.ts b/src/main/agent-launch/agent-launch-pane-attachment.ts
index 6b69411c9f92..ff3f50d46c56 100644
--- a/src/main/agent-launch/agent-launch-pane-attachment.ts
+++ b/src/main/agent-launch/agent-launch-pane-attachment.ts
@@ -1,9 +1,9 @@
-/** Use process-local launch state; after restart, ordinary pane attachment handles recovery. */
-
 import type { AgentLaunchPaneVerdict } from '../../shared/agent-launch-pane-verdict'
 import { parsePaneKey } from '../../shared/stable-pane-id'
 import type { TerminalSurfaceCloseTarget } from '../../shared/terminal-surface-close-target'
 
+/** Use process-local launch state; after restart, ordinary pane attachment handles recovery. */
+
 const PROCEED: AgentLaunchPaneVerdict = { kind: 'proceed' }
 
 export type AgentLaunchPane = { worktreeId: string; paneKey: string }
@@ -14,12 +14,13 @@ type RunningLaunch = {
   settled: Promise<AgentLaunchPaneVerdict>
   finished: Promise<AgentLaunchPaneVerdict>
   closedByUser: boolean
+  superseded: boolean
 }
 
 const runningLaunchesByPane = new Map<string, RunningLaunch>()
 const failedLaunchesByPane = new Map<
   string,
-  { pane: AgentLaunchPane; verdict: AgentLaunchPaneVerdict }
+  { pane: AgentLaunchPane; verdict: AgentLaunchPaneVerdict; running?: RunningLaunch }
 >()
 
 function paneKeyOf(pane: AgentLaunchPane): string {
@@ -30,6 +31,7 @@ export type RunningAgentLaunchPane = {
   /** Attach as soon as the agent binds, without waiting for prompt delivery. */
   agentBound(): void
   finish(verdict: AgentLaunchPaneVerdict): void
+  current(): boolean
   closedByUser(): boolean
 }
 
@@ -46,8 +48,10 @@ export function trackRunningAgentLaunchPane(pane: AgentLaunchPane): RunningAgent
     finished: new Promise((done) => {
       resolve = done
     }),
+    superseded: false,
     closedByUser: false
   }
+  noteAgentLaunchPaneAccepted(pane.paneKey)
   runningLaunchesByPane.set(key, running)
   failedLaunchesByPane.delete(key)
   let finished = false
@@ -62,18 +66,38 @@ export function trackRunningAgentLaunchPane(pane: AgentLaunchPane): RunningAgent
         runningLaunchesByPane.delete(key)
         if (
           !running.closedByUser &&
-          (verdict.kind === 'not-started' || verdict.kind === 'unconfirmed')
+          (verdict.kind === 'not-started' ||
+            verdict.kind === 'unconfirmed' ||
+            verdict.kind === 'withdrawn')
         ) {
-          failedLaunchesByPane.set(key, { pane, verdict })
+          failedLaunchesByPane.set(key, { pane, verdict, running })
         }
       }
       settle(verdict)
       resolve(verdict)
     },
+    current: () =>
+      !running.superseded &&
+      !running.closedByUser &&
+      (runningLaunchesByPane.get(key) ?? failedLaunchesByPane.get(key)?.running) === running,
     closedByUser: () => running.closedByUser
   }
 }
 
+/** Acceptance precedes option resolution, including callers that do not publish an early tab. */
+export function noteAgentLaunchPaneAccepted(paneKey: string): void {
+  for (const running of runningLaunchesByPane.values()) {
+    if (running.pane.paneKey === paneKey) {
+      running.superseded = true
+    }
+  }
+  for (const failed of failedLaunchesByPane.values()) {
+    if (failed.pane.paneKey === paneKey && failed.running) {
+      failed.running.superseded = true
+    }
+  }
+}
+
 /** `null` targets every pane of the workspace. */
 function launchesIn<T extends { pane: AgentLaunchPane }>(
   launches: Map<string, T>,
diff --git a/src/main/ai-vault/structured-chat-cli-fork.ts b/src/main/ai-vault/structured-chat-cli-fork.ts
index 945fcc732974..7273ee52a775 100644
--- a/src/main/ai-vault/structured-chat-cli-fork.ts
+++ b/src/main/ai-vault/structured-chat-cli-fork.ts
@@ -1,3 +1,4 @@
+import { isNativeConversationMessage } from '../../shared/agent-session-native-content'
 import { stat } from 'node:fs/promises'
 import { isAbsolute, join } from 'node:path'
 import { getSystemCodexHomePath } from '../codex/codex-home-paths'
@@ -24,6 +25,33 @@ import {
   parseAgentJournalItemKey
 } from '../../shared/agent-session-journal-item-key'
 
+export function nativeConversationContent(
+  snapshot: Pick<AgentJournalSnapshot, 'items' | 'submissions'>
+): 'saved' | 'empty' | 'uncertain' {
+  const submissions = new Map(
+    snapshot.submissions.map((submission) => [
+      agentJournalSubmissionKey(submission.clientMessageId),
+      submission
+    ])
+  )
+  const hasContent = snapshot.items.some(({ itemId, body }) => {
+    if (!isNativeConversationMessage(body)) {
+      return false
+    }
+    const identity = parseAgentJournalItemKey(itemId)
+    const submission = submissions.get(itemId)
+    if (submission?.dispatchState === 'accepted' || (identity && identity.provider !== 'orca')) {
+      return true
+    }
+    return false
+  })
+  return hasContent
+    ? 'saved'
+    : snapshot.items.length === 0 && snapshot.submissions.length === 0
+      ? 'empty'
+      : 'uncertain'
+}
+
 function assertNativeConversationContent(snapshot: AgentJournalSnapshot): void {
   const submissions = new Map(
     snapshot.submissions.map((submission) => [
diff --git a/src/main/codex/codex-history-journal-view.ts b/src/main/codex/codex-history-journal-view.ts
index 88e902d87c9a..3a8faf7c938d 100644
--- a/src/main/codex/codex-history-journal-view.ts
+++ b/src/main/codex/codex-history-journal-view.ts
@@ -57,7 +57,20 @@ export function readCodexHistoryJournalView(
       identity.sessionId === threadId &&
       (body.kind === 'message' || body.kind === 'tool-call')
     ) {
-      hasLegacy = true
+      const scope = attribution.turnScope
+      const owner = scope?.kind === 'turn' ? journal.item(scope.turnItemId) : null
+      const ownerIdentity = owner && parseAgentJournalItemKey(owner.itemId)
+      const ownerTurn = owner && readAgentJournalTurn(owner.body)
+      // Positive per-turn imports need no blanket legacy timestamp for the whole journal.
+      const covered =
+        ownerIdentity?.provider === 'legacy' &&
+        ownerIdentity.agent === 'codex' &&
+        ownerIdentity.sessionId === threadId &&
+        ownerIdentity.recordId === `${TURN_LIFECYCLE_RECORD_PREFIX}${ownerTurn?.turnId}` &&
+        (ownerTurn?.state === 'completed' || ownerTurn?.state === 'interrupted')
+      if (!covered) {
+        hasLegacy = true
+      }
     }
     if (identity?.provider === 'orca' && body.kind === 'message' && body.role === 'user') {
       nativePromptKeys.add(itemId)
diff --git a/src/main/codex/codex-structured-session-acquire.ts b/src/main/codex/codex-structured-session-acquire.ts
index 07d970948208..77e677e903a8 100644
--- a/src/main/codex/codex-structured-session-acquire.ts
+++ b/src/main/codex/codex-structured-session-acquire.ts
@@ -122,6 +122,11 @@ export async function acquireCodexStructuredSession(input: {
           }
     acquisitions.assertCurrent(sessionId, attempt)
     account = launch.codexHome ? deps.resolveAccountKind?.(launch.codexHome) : undefined
+    try {
+      acquireInput.checkBeforeSpawn?.()
+    } catch (error) {
+      throw new AgentSessionPreSpawnError(error)
+    }
     const connection = await open(
       {
         command: launch.command,
diff --git a/src/main/daemon/daemon-client-rpc-request.test.ts b/src/main/daemon/daemon-client-rpc-request.test.ts
index 569b59776d5b..8364ccc96dd4 100644
--- a/src/main/daemon/daemon-client-rpc-request.test.ts
+++ b/src/main/daemon/daemon-client-rpc-request.test.ts
@@ -152,6 +152,29 @@ describe('requestDaemonRpc', () => {
     expect(pendingRequests.size).toBe(0)
   })
 
+  it('keeps the actual negotiated switch child result after a matched cancellation acknowledgement', async () => {
+    vi.useFakeTimers()
+    const pendingRequests = new DaemonPendingRequests()
+    const request = requestDaemonRpc({
+      // SAFETY: only the write boundary is exercised; no socket is created.
+      socket: { write: vi.fn() } as unknown as Socket,
+      pendingRequests,
+      id: 'switch-commit',
+      type: 'createOrAttach',
+      payload: { sessionId: 'actual-child', switchExecution: { phase: 'commit' } },
+      timeoutMs: 10,
+      unmatchedCancelGraceMs: 5_000,
+      onCreateCancellationFailure: vi.fn(),
+      settleCreateCancellation: vi.fn(async () => ({ canceled: true }))
+    })
+    await vi.advanceTimersByTimeAsync(6_000)
+    expect(pendingRequests.size).toBe(1)
+    const actual = { isNew: true, switchOutcomeUnknown: true, incarnationId: 'actual-incarnation' }
+    pendingRequests.settle({ id: 'switch-commit', ok: true, payload: actual })
+    await expect(request).resolves.toEqual(actual)
+    expect(pendingRequests.size).toBe(0)
+  })
+
   it('rejects an unmatched cancellation once the grace window elapses', async () => {
     vi.useFakeTimers()
     const pendingRequests = new DaemonPendingRequests()
diff --git a/src/main/daemon/daemon-client-rpc-request.ts b/src/main/daemon/daemon-client-rpc-request.ts
index d559476b07d1..9796cc17ef3d 100644
--- a/src/main/daemon/daemon-client-rpc-request.ts
+++ b/src/main/daemon/daemon-client-rpc-request.ts
@@ -39,6 +39,15 @@ function wedgedDaemonError(requestError: Error, cancelError: unknown): Error | n
 export function requestDaemonRpc<T>(opts: DaemonRpcRequestOptions): Promise<T> {
   // A stalled event loop can deliver a daemon cancellation before its overdue timer runs.
   const { payload, type } = opts
+  const retainSwitchOutcome =
+    type === 'createOrAttach' &&
+    payload !== null &&
+    typeof payload === 'object' &&
+    'switchExecution' in payload &&
+    payload.switchExecution !== null &&
+    typeof payload.switchExecution === 'object' &&
+    'phase' in payload.switchExecution &&
+    payload.switchExecution.phase === 'commit'
   const createTimeoutError = (): DaemonRequestTimeoutError =>
     new DaemonRequestTimeoutError(`Request ${type} timed out after ${opts.timeoutMs}ms`)
   const createSessionId =
@@ -109,6 +118,10 @@ export function requestDaemonRpc<T>(opts: DaemonRpcRequestOptions): Promise<T> {
       void opts
         .settleCreateCancellation(createSessionId, opts.id)
         .then((result) => {
+          // The acknowledged revocation is not proof that a dispatched child exited.
+          if (retainSwitchOutcome) {
+            return
+          }
           if (result.canceled) {
             rejectAndDrop(error)
             return
@@ -124,6 +137,9 @@ export function requestDaemonRpc<T>(opts: DaemonRpcRequestOptions): Promise<T> {
             opts.onCreateCancellationFailure()
             return
           }
+          if (retainSwitchOutcome) {
+            return
+          }
           awaitLateResponseThenReject(wedgedDaemonError(error, cancelError) ?? error)
         })
     }
diff --git a/src/main/daemon/daemon-create-or-attach-result.ts b/src/main/daemon/daemon-create-or-attach-result.ts
index 44e10000f339..766346b7bb7e 100644
--- a/src/main/daemon/daemon-create-or-attach-result.ts
+++ b/src/main/daemon/daemon-create-or-attach-result.ts
@@ -4,6 +4,9 @@ import type { AgentSessionClaimedSpawnResult } from '../../shared/agent-session-
 import type { PtyIncarnationId } from '../../shared/pty-incarnation'
 
 export type DaemonCreateOrAttachResult = {
+  /** A dispatched child remains owned after its initiating handoff lost authority. */
+  switchOutcomeUnknown?: true
+  switchCleanupWitness?: string
   isNew: boolean
   snapshot: TerminalSnapshot | null
   pid: number | null
diff --git a/src/main/daemon/daemon-fenced-termination.ts b/src/main/daemon/daemon-fenced-termination.ts
index 47d4c4073b7c..28049553281d 100644
--- a/src/main/daemon/daemon-fenced-termination.ts
+++ b/src/main/daemon/daemon-fenced-termination.ts
@@ -36,6 +36,7 @@ export async function handleDaemonFencedTermination(
     expectedIncarnationId?: string
     requireNoAgentOwner?: boolean
     requireUnattached?: boolean
+    switchCondition?: PtyFencedTerminationRequest['switchCondition']
   },
   deps: {
     host: TerminalHost
@@ -50,12 +51,15 @@ export async function handleDaemonFencedTermination(
     id: payload.sessionId,
     expectedIncarnationId: payload.expectedIncarnationId,
     requireNoAgentOwner: payload.requireNoAgentOwner === true,
-    requireUnattached: payload.requireUnattached === true
+    requireUnattached: payload.requireUnattached === true,
+    ...(payload.switchCondition ? { switchCondition: payload.switchCondition } : {})
   })
   if (!termination.accepted) {
     return termination.result
   }
-  deps.preparations.cancel(payload.sessionId)
-  deps.attachments.clearInput(payload.sessionId)
+  if (!payload.switchCondition) {
+    deps.preparations.cancel(payload.sessionId)
+    deps.attachments.clearInput(payload.sessionId)
+  }
   return termination.completion
 }
diff --git a/src/main/daemon/daemon-foreground-process-protocol.ts b/src/main/daemon/daemon-foreground-process-protocol.ts
index 29e53c32ff2f..d2b6c277c2d7 100644
--- a/src/main/daemon/daemon-foreground-process-protocol.ts
+++ b/src/main/daemon/daemon-foreground-process-protocol.ts
@@ -17,6 +17,7 @@ export type ConfirmShellForegroundRequest = Omit<GetForegroundProcessRequest, 't
 export type InspectProcessRequest = Omit<GetForegroundProcessRequest, 'type'> & {
   type: 'inspectProcess'
   payload: GetForegroundProcessRequest['payload'] & {
+    captureSwitchWitness?: string
     expectedIncarnationId?: string
     /** Older daemons ignore this and return a full capture. */
     steadyState?: boolean
diff --git a/src/main/daemon/daemon-protocol-version.ts b/src/main/daemon/daemon-protocol-version.ts
index 0da33ce0449a..4dea21d72a20 100644
--- a/src/main/daemon/daemon-protocol-version.ts
+++ b/src/main/daemon/daemon-protocol-version.ts
@@ -10,7 +10,8 @@
 // v43 dropped it with the revert); v41 stages long startup commands as sourced scripts; v40 rolled
 // the #25130/#24636 shell-wrapper changes and the wider agent list into a fresh daemon; older owners
 // stay attachable.
-export const PROTOCOL_VERSION = 52
+export const PROTOCOL_VERSION = 53
+export const SESSION_SWITCH_PHYSICAL_PROTOCOL_VERSION = 53
 export const FENCED_TERMINATION_PROTOCOL_VERSION = 51
 export const CLAUDE_ACCOUNT_FUNCTION_DAEMON_PROTOCOL_VERSION = 42
 export const CLAUDE_ACCOUNT_FUNCTION_REVERTED_DAEMON_PROTOCOL_VERSION = 43
@@ -45,7 +46,7 @@ export const CLEAN_DISCONNECT_PROTOCOL_VERSION = 24
 export const MODE_2031_UNSUBSCRIBE_FACT_PROTOCOL_VERSION = 29
 export const PREVIOUS_DAEMON_PROTOCOL_VERSIONS = [
   1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
-  28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51
+  28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52
 ] as const
 
 export function supportsColorQueryReplyColors(protocolVersion: number): boolean {
diff --git a/src/main/daemon/daemon-pty-adapter.ts b/src/main/daemon/daemon-pty-adapter.ts
index f6ddd69467f5..2098470800c9 100644
--- a/src/main/daemon/daemon-pty-adapter.ts
+++ b/src/main/daemon/daemon-pty-adapter.ts
@@ -3,7 +3,10 @@ import {
   type PtyFencedTerminationRequest,
   type PtyFencedTerminationOutcome
 } from '../../shared/pty-fenced-termination'
-import { FENCED_TERMINATION_PROTOCOL_VERSION } from './daemon-protocol-version'
+import {
+  FENCED_TERMINATION_PROTOCOL_VERSION,
+  SESSION_SWITCH_PHYSICAL_PROTOCOL_VERSION
+} from './daemon-protocol-version'
 import { emitPtyListeners, createPtyExitPayload } from './daemon-pty-listener-emission'
 import { DaemonPtyDaemonRecovery } from './daemon-pty-daemon-recovery'
 import type { DaemonPtyAdapterOptions } from './daemon-pty-runtime-state'
@@ -35,7 +38,10 @@ export class DaemonPtyAdapter extends DaemonPtyDaemonRecovery implements IPtyPro
   }
 
   async killFenced(request: PtyFencedTerminationRequest): Promise<PtyFencedTerminationOutcome> {
-    if (!this.supportsFencedTermination(request.id)) {
+    if (
+      !this.supportsFencedTermination(request.id) ||
+      (request.switchCondition && this.protocolVersion < SESSION_SWITCH_PHYSICAL_PROTOCOL_VERSION)
+    ) {
       return { outcome: 'refused', reason: 'unsupported' }
     }
     // Capture the checked identity before waiting on connection or lifecycle locks.
@@ -49,7 +55,8 @@ export class DaemonPtyAdapter extends DaemonPtyDaemonRecovery implements IPtyPro
           immediate: true,
           expectedIncarnationId,
           requireNoAgentOwner,
-          requireUnattached
+          requireUnattached,
+          ...(request.switchCondition ? { switchCondition: request.switchCondition } : {})
         })
         if (!isPtyFencedTerminationOutcome(result)) {
           return { outcome: 'refused', reason: 'unverifiable' }
diff --git a/src/main/daemon/daemon-pty-process-inspection.ts b/src/main/daemon/daemon-pty-process-inspection.ts
index fc93492bf5db..2cee61155bf9 100644
--- a/src/main/daemon/daemon-pty-process-inspection.ts
+++ b/src/main/daemon/daemon-pty-process-inspection.ts
@@ -1,3 +1,4 @@
+import { SESSION_SWITCH_PHYSICAL_PROTOCOL_VERSION } from './daemon-protocol-version'
 import { isShellProcess } from '../../shared/agent-detection'
 import { DaemonPtyBufferSnapshots } from './daemon-pty-buffer-snapshots'
 import { parsePtySessionId } from '../../shared/pty-session-id-format'
@@ -46,6 +47,10 @@ export abstract class DaemonPtyProcessInspection extends DaemonPtyBufferSnapshot
     }
     return this.client.request<PtyProcessInspection>('inspectProcess', {
       sessionId: id,
+      ...(options?.captureSwitchWitness &&
+      this.protocolVersion >= SESSION_SWITCH_PHYSICAL_PROTOCOL_VERSION
+        ? { captureSwitchWitness: options.captureSwitchWitness }
+        : {}),
       ...(options?.expectedIncarnationId
         ? { expectedIncarnationId: options.expectedIncarnationId }
         : {}),
diff --git a/src/main/daemon/daemon-pty-spawn-preparations.test.ts b/src/main/daemon/daemon-pty-spawn-preparations.test.ts
new file mode 100644
index 000000000000..8d33bdec6f02
--- /dev/null
+++ b/src/main/daemon/daemon-pty-spawn-preparations.test.ts
@@ -0,0 +1,31 @@
+import { afterEach, expect, it, vi } from 'vitest'
+import { DaemonPtySpawnPreparations } from './daemon-pty-spawn-preparations'
+
+afterEach(() => vi.restoreAllMocks())
+it('anchors the commit on receiver preparation, so network and queued delay consume authority without timer delivery', () => {
+  let now = 10
+  vi.spyOn(performance, 'now').mockImplementation(() => now)
+  const preparations = new DaemonPtySpawnPreparations(async () => {})
+  const receipt = preparations.prepareSwitch('pane', 'connection', 'prepare', 'click')
+  now = 20
+  const commit = preparations.commitSwitch('pane', 'connection', 'commit', {
+    invocationId: 'click',
+    anchor: receipt.anchor,
+    remainingMs: 100
+  })
+  expect(preparations.isCanceled(commit)).toBe(false)
+  // a+r = 110; receipt-relative 120 would incorrectly allow this continuation.
+  now = 111
+  expect(preparations.isCanceled(commit)).toBe(true)
+  preparations.finish('pane', commit)
+})
+it('rejects another connection and a reused anchor while the actual selected preparation remains owned', () => {
+  const preparations = new DaemonPtySpawnPreparations(async () => {})
+  const receipt = preparations.prepareSwitch('pane', 'connection', 'prepare', 'click')
+  const execution = { invocationId: 'click', anchor: receipt.anchor, remainingMs: 1000 }
+  expect(() => preparations.commitSwitch('pane', 'different', 'commit', execution)).toThrow()
+  const selected = preparations.commitSwitch('pane', 'connection', 'commit', execution)
+  expect(() => preparations.commitSwitch('pane', 'connection', 'duplicate', execution)).toThrow()
+  expect(preparations.isCanceled(selected)).toBe(false)
+  preparations.finish('pane', selected)
+})
diff --git a/src/main/daemon/daemon-pty-spawn-preparations.ts b/src/main/daemon/daemon-pty-spawn-preparations.ts
index febecde25afc..88421345e9c5 100644
--- a/src/main/daemon/daemon-pty-spawn-preparations.ts
+++ b/src/main/daemon/daemon-pty-spawn-preparations.ts
@@ -2,6 +2,7 @@ import { TerminalAttachCanceledError } from './types'
 
 export type PendingPtySpawnPreparation = {
   canceled: boolean
+  switchAnchor?: { token: string; invocationId: string; at: number; deadline: number }
   // Unlike the polled canceled flag, the signal interrupts in-flight cwd probes on dead shares.
   readonly controller: AbortController
   cancelTimer?: ReturnType<typeof setTimeout>
@@ -52,6 +53,72 @@ export class DaemonPtySpawnPreparations {
     return preparation
   }
 
+  prepareSwitch(sessionId: string, clientId: string, requestId: string, invocationId: string) {
+    const preparation = this.register(sessionId, clientId, requestId, undefined)
+    preparation.switchAnchor = {
+      token: requestId,
+      invocationId,
+      at: performance.now(),
+      deadline: Infinity
+    }
+    preparation.cancelTimer = setTimeout(() => {
+      this.cancelPreparation(preparation)
+      this.finish(sessionId, preparation)
+    }, 720_000)
+    preparation.cancelTimer.unref?.()
+    return { anchor: requestId }
+  }
+
+  commitSwitch(
+    sessionId: string,
+    clientId: string,
+    requestId: string,
+    execution: { invocationId: string; anchor?: string; remainingMs?: number }
+  ): PendingPtySpawnPreparation {
+    const preparation = [...(this.pending.get(sessionId) ?? [])].find(
+      (entry) =>
+        entry.clientId === clientId &&
+        entry.switchAnchor?.token === execution.anchor &&
+        entry.switchAnchor?.invocationId === execution.invocationId
+    )
+    const anchor = preparation?.switchAnchor
+    if (
+      !preparation ||
+      !anchor ||
+      preparation.canceled ||
+      !Number.isFinite(execution.remainingMs) ||
+      execution.remainingMs! <= 0 ||
+      execution.remainingMs! > 720_000 ||
+      anchor.deadline !== Infinity
+    ) {
+      throw new TerminalAttachCanceledError(sessionId)
+    }
+    anchor.deadline = anchor.at + execution.remainingMs!
+    preparation.requestId = requestId
+    if (performance.now() >= anchor.deadline) {
+      this.cancelPreparation(preparation)
+      this.finish(sessionId, preparation)
+      throw new TerminalAttachCanceledError(sessionId)
+    }
+    if (preparation.cancelTimer) {
+      clearTimeout(preparation.cancelTimer)
+    }
+    preparation.cancelTimer = setTimeout(
+      () => this.cancelPreparation(preparation),
+      anchor.deadline - performance.now()
+    )
+    preparation.cancelTimer.unref?.()
+    return preparation
+  }
+
+  isCanceled(preparation: PendingPtySpawnPreparation): boolean {
+    return (
+      preparation.canceled ||
+      (preparation.switchAnchor !== undefined &&
+        performance.now() >= preparation.switchAnchor.deadline)
+    )
+  }
+
   async prepareUnlessCanceled(
     sessionId: string,
     preparation: PendingPtySpawnPreparation
@@ -62,7 +129,7 @@ export class DaemonPtySpawnPreparations {
       ? Promise.race([this.preparePtySpawn(), cancellation.promise])
       : this.preparePtySpawn()
     await preparationTask
-    if (preparation.canceled) {
+    if (this.isCanceled(preparation)) {
       throw new TerminalAttachCanceledError(sessionId)
     }
   }
diff --git a/src/main/daemon/daemon-pty-spawn-request.ts b/src/main/daemon/daemon-pty-spawn-request.ts
index ea5abb25641f..fa331b49f600 100644
--- a/src/main/daemon/daemon-pty-spawn-request.ts
+++ b/src/main/daemon/daemon-pty-spawn-request.ts
@@ -1,3 +1,4 @@
+import { SESSION_SWITCH_PHYSICAL_PROTOCOL_VERSION } from './daemon-protocol-version'
 import type { SpawnIntent } from '../../shared/host-spawn-admission'
 import type { ColdRestorePayload } from './cold-restore-payload-cache'
 import type { DaemonAuditObservation } from './daemon-audit-classifier'
@@ -106,7 +107,8 @@ export abstract class DaemonPtySpawnRequest extends DaemonPtyRuntimeState {
     context: DaemonPtySpawnContext,
     historySeedSegments: readonly string[] | null
   ): Promise<CreateOrAttachResult> {
-    const requestCreateOrAttach = (
+    let anchor: string | undefined
+    const requestCreateOrAttach = async (
       historySeed: string | undefined,
       historySeedTransferId: string | undefined
     ) => {
@@ -114,7 +116,36 @@ export abstract class DaemonPtySpawnRequest extends DaemonPtyRuntimeState {
       if (opts.signal?.aborted) {
         throw new Error('client_disconnected')
       }
+      opts.switchExecution?.check()
+      if (opts.switchExecution && this.protocolVersion < SESSION_SWITCH_PHYSICAL_PROTOCOL_VERSION) {
+        throw new Error('Session switch is unavailable for this terminal owner')
+      }
+      if (opts.switchExecution && !anchor) {
+        const prepared = await this.client.request<{ anchor: string }>(
+          'createOrAttach',
+          {
+            sessionId: context.sessionId,
+            cols: context.effectiveCols,
+            rows: context.effectiveRows,
+            switchExecution: { phase: 'prepare', invocationId: opts.switchExecution.invocationId }
+          },
+          Math.max(1, opts.switchExecution.remaining()),
+          opts.signal
+        )
+        opts.switchExecution.check()
+        anchor = prepared.anchor
+      }
       const payload = {
+        ...(opts.switchExecution
+          ? {
+              switchExecution: {
+                phase: 'commit' as const,
+                invocationId: opts.switchExecution.invocationId,
+                anchor,
+                remainingMs: opts.switchExecution.remaining()
+              }
+            }
+          : {}),
         sessionId: context.sessionId,
         cols: context.effectiveCols,
         rows: context.effectiveRows,
@@ -151,7 +182,7 @@ export abstract class DaemonPtySpawnRequest extends DaemonPtyRuntimeState {
         ? this.client.request<CreateOrAttachResult>(
             'createOrAttach',
             payload,
-            undefined,
+            opts.switchExecution ? Math.max(1, opts.switchExecution.remaining()) : undefined,
             opts.signal
           )
         : this.client.request<CreateOrAttachResult>('createOrAttach', payload)
diff --git a/src/main/daemon/daemon-request-router.ts b/src/main/daemon/daemon-request-router.ts
index 39bcdf63bedd..cab6c2bac56a 100644
--- a/src/main/daemon/daemon-request-router.ts
+++ b/src/main/daemon/daemon-request-router.ts
@@ -124,6 +124,9 @@ export class DaemonRequestRouter {
         }
       case 'inspectProcess': {
         const options = {
+          ...(request.payload.captureSwitchWitness
+            ? { captureSwitchWitness: request.payload.captureSwitchWitness }
+            : {}),
           ...(request.payload.expectedIncarnationId
             ? { expectedIncarnationId: request.payload.expectedIncarnationId }
             : {}),
diff --git a/src/main/daemon/daemon-spawn-result-identity.ts b/src/main/daemon/daemon-spawn-result-identity.ts
index 3a57274ea12b..c27929f20659 100644
--- a/src/main/daemon/daemon-spawn-result-identity.ts
+++ b/src/main/daemon/daemon-spawn-result-identity.ts
@@ -3,8 +3,17 @@ import type { CreateOrAttachResult } from './types'
 
 export function daemonSpawnResultIdentity(
   result: CreateOrAttachResult
-): Pick<PtySpawnResult, 'incarnationId' | 'agentSessionEnsure' | 'launchAgent'> {
+): Pick<
+  PtySpawnResult,
+  | 'incarnationId'
+  | 'agentSessionEnsure'
+  | 'launchAgent'
+  | 'switchOutcomeUnknown'
+  | 'switchCleanupWitness'
+> {
   return {
+    ...(result.switchCleanupWitness ? { switchCleanupWitness: result.switchCleanupWitness } : {}),
+    ...(result.switchOutcomeUnknown ? { switchOutcomeUnknown: true as const } : {}),
     ...(result.incarnationId ? { incarnationId: result.incarnationId } : {}),
     ...(result.agentSessionEnsure ? { agentSessionEnsure: result.agentSessionEnsure } : {}),
     ...(result.launchAgent ? { launchAgent: result.launchAgent } : {})
diff --git a/src/main/daemon/daemon-terminal-admission.ts b/src/main/daemon/daemon-terminal-admission.ts
index 04dff1c93d43..cb3fceec0130 100644
--- a/src/main/daemon/daemon-terminal-admission.ts
+++ b/src/main/daemon/daemon-terminal-admission.ts
@@ -75,6 +75,16 @@ export class DaemonTerminalAdmission {
       this.options.requestEndpointRetirement()
       throw new Error(DAEMON_ENDPOINT_LOST_MESSAGE)
     }
+    if (payload.switchExecution?.phase === 'prepare') {
+      this.options.host.noteSpawnPreparation(payload.sessionId)
+      return this.options.preparations.prepareSwitch(
+        payload.sessionId,
+        clientId,
+        request.id,
+        payload.switchExecution.invocationId
+      )
+    }
+    this.options.host.noteSpawnPreparation(payload.sessionId)
     this.createOrAttachInFlight++
     let routedSessionId = payload.sessionId
     let result: CreateOrAttachResult
@@ -87,12 +97,19 @@ export class DaemonTerminalAdmission {
       ) {
         throw new Error('agent_session_identity_required')
       }
-      spawnPreparation = this.options.preparations.register(
-        payload.sessionId,
-        clientId,
-        request.id,
-        payload.cancelAfterMs
-      )
+      spawnPreparation = payload.switchExecution
+        ? this.options.preparations.commitSwitch(
+            payload.sessionId,
+            clientId,
+            request.id,
+            payload.switchExecution
+          )
+        : this.options.preparations.register(
+            payload.sessionId,
+            clientId,
+            request.id,
+            payload.cancelAfterMs
+          )
       if (!attachOnly) {
         await this.options.preparations.prepareUnlessCanceled(payload.sessionId, spawnPreparation)
       }
@@ -132,7 +149,9 @@ export class DaemonTerminalAdmission {
           declaredIntent: isSpawnIntent(payload.spawnIntent) ? payload.spawnIntent : null,
           deadlineAt: resolveSpawnAdmissionDeadline(payload.cancelAfterMs)
         },
-        isCanceled: () => spawnPreparation?.canceled === true,
+        retainCanceledChild: Boolean(payload.switchExecution),
+        isCanceled: () =>
+          spawnPreparation !== null && this.options.preparations.isCanceled(spawnPreparation),
         cancelSignal: spawnPreparation.controller.signal,
         onSessionResolved: (sessionId) => {
           routedSessionId = sessionId
@@ -156,7 +175,16 @@ export class DaemonTerminalAdmission {
       this.options.host.detach(routedSessionId, result.attachToken)
       throw new TerminalAttachCanceledError(routedSessionId)
     }
-    this.options.attachments.attach(routedSessionId, clientId, result.attachToken)
+    if (
+      payload.switchExecution &&
+      spawnPreparation &&
+      this.options.preparations.isCanceled(spawnPreparation)
+    ) {
+      result.switchOutcomeUnknown = true
+    }
+    if (!result.switchOutcomeUnknown) {
+      this.options.attachments.attach(routedSessionId, clientId, result.attachToken)
+    }
     this.options.streamDataBatcher.refreshSessionDroppability(routedSessionId)
     if (this.options.transientFactRelay.isBackgrounded(routedSessionId)) {
       this.options.streamDataBatcher.enqueueControlEvent(clientId, routedSessionId, {
@@ -172,6 +200,8 @@ export class DaemonTerminalAdmission {
     })
     return {
       isNew: result.isNew,
+      ...(result.switchCleanupWitness ? { switchCleanupWitness: result.switchCleanupWitness } : {}),
+      ...(result.switchOutcomeUnknown ? { switchOutcomeUnknown: true as const } : {}),
       snapshot: result.snapshot,
       pid: result.pid,
       shellState: result.shellState,
diff --git a/src/main/daemon/pty-subprocess.ts b/src/main/daemon/pty-subprocess.ts
index 1594fda4713d..756f64af8b2d 100644
--- a/src/main/daemon/pty-subprocess.ts
+++ b/src/main/daemon/pty-subprocess.ts
@@ -31,6 +31,8 @@ export type PtySubprocessOptions = {
   terminalShellArgs?: string[]
   terminalWindowsWslDistro?: string | null
   terminalWindowsPowerShellImplementation?: 'auto' | 'powershell.exe' | 'pwsh.exe'
+  assertCreateAllowed?: () => void
+  retainCanceledChild?: boolean
   isCanceled?: () => boolean
   /** Aborts in-progress cwd validation; `isCanceled` is only polled between steps. */
   cancelSignal?: AbortSignal
@@ -78,6 +80,8 @@ export async function createPtySubprocess(opts: PtySubprocessOptions): Promise<S
   let spawned: SpawnedDaemonPty
   try {
     spawned = await spawnNativeDaemonPty({
+      assertCreateAllowed: opts.assertCreateAllowed,
+      retainCanceledChild: opts.retainCanceledChild,
       shellPath: launch.shellPath,
       shellArgs: launch.shellArgs,
       spawnCwd: launch.spawnCwd,
diff --git a/src/main/daemon/pty-subprocess/conpty-startup-input-reader.ts b/src/main/daemon/pty-subprocess/conpty-startup-input-reader.ts
index 93f4ea4ba85c..a645258f1638 100644
--- a/src/main/daemon/pty-subprocess/conpty-startup-input-reader.ts
+++ b/src/main/daemon/pty-subprocess/conpty-startup-input-reader.ts
@@ -44,11 +44,16 @@ export type ConptyStartupWatch = {
   verdict: Promise<ConptyStartupOutcome>
   /** Hands buffered output and exit to the caller and stops buffering. */
   claim(): ConptyStartupEvents
+  exited: Promise<void>
 }
 
 /** Buffers a fresh ConPTY's output until its owner claims it, so no startup byte is lost. */
 export function watchConptyStartup(proc: pty.IPty): ConptyStartupWatch {
   const events: ConptyStartupEvents = { data: [], exit: null }
+  let ended!: () => void
+  const exited = new Promise<void>((resolve) => {
+    ended = resolve
+  })
   let output = ''
   let settle: (outcome: ConptyStartupOutcome) => void = () => {}
   const verdict = new Promise<ConptyStartupOutcome>((resolve) => {
@@ -68,12 +73,14 @@ export function watchConptyStartup(proc: pty.IPty): ConptyStartupWatch {
     }
   })
   const exitSubscription = proc.onExit(({ exitCode, signal }) => {
+    ended()
     events.exit = { exitCode, ...(signal !== undefined ? { signal } : {}) }
     decided = true
     settle('exited')
   })
   return {
     verdict,
+    exited,
     claim: () => {
       dataSubscription.dispose()
       exitSubscription.dispose()
@@ -84,8 +91,13 @@ export function watchConptyStartup(proc: pty.IPty): ConptyStartupWatch {
 
 async function decideConptyStartup(
   proc: pty.IPty,
-  signal: AbortSignal | undefined
-): Promise<{ outcome: ConptyStartupOutcome; claim: () => ConptyStartupEvents }> {
+  signal: AbortSignal | undefined,
+  retainCanceledChild = false
+): Promise<{
+  outcome: ConptyStartupOutcome
+  claim: () => ConptyStartupEvents
+  exited: Promise<void>
+}> {
   const watch = watchConptyStartup(proc)
   let limit: ReturnType<typeof setTimeout> | undefined
   let onAbort = (): void => {}
@@ -98,8 +110,11 @@ async function decideConptyStartup(
       limit.unref?.()
       void watch.verdict.then(resolve)
     })
-    return { outcome, claim: watch.claim }
+    return { outcome, claim: watch.claim, exited: watch.exited }
   } catch (error) {
+    if (retainCanceledChild) {
+      return { outcome: 'undecided', claim: watch.claim, exited: watch.exited }
+    }
     // A canceled spawn must not leave the half-started shell running.
     discardConpty(proc, watch)
     throw error
@@ -145,6 +160,7 @@ export async function spawnConptyWithInputReader(
     label: string
     signal?: AbortSignal
     // Only Orca's default interactive argv is safe to respawn; custom argv may repeat a command.
+    retainCanceledChild?: boolean
     respawnSafe: boolean
   }
 ): Promise<{ proc: pty.IPty; claimStartupEvents: () => ConptyStartupEvents }> {
@@ -152,7 +168,7 @@ export async function spawnConptyWithInputReader(
   if (announcementUntrusted) {
     return { proc: first, claimStartupEvents: () => ({ data: [], exit: null }) }
   }
-  const firstStartup = await decideConptyStartup(first, opts.signal)
+  const firstStartup = await decideConptyStartup(first, opts.signal, opts.retainCanceledChild)
   if (firstStartup.outcome === 'input-reader') {
     announcementObserved = true
   }
@@ -168,9 +184,35 @@ export async function spawnConptyWithInputReader(
   console.warn(
     `[daemon/pty] ConPTY for "${opts.label}" started without an input reader; respawning (${respawnCount})`
   )
-  discardConpty(first, firstStartup)
+  if (opts.retainCanceledChild) {
+    // A retry cannot orphan its predecessor while native exit is still uncertain.
+    let limit: ReturnType<typeof setTimeout> | undefined
+    const stopped = firstStartup.exited.then(() => true)
+    try {
+      terminatePtyJob(first)
+      killConptyNow(first)
+      first.kill()
+      const exited = await Promise.race([
+        stopped,
+        new Promise<false>((resolve) => {
+          limit = setTimeout(() => resolve(false), CONPTY_STARTUP_DECISION_LIMIT_MS)
+          limit.unref?.()
+        })
+      ])
+      if (!exited) {
+        return { proc: first, claimStartupEvents: withNotice(firstStartup.claim) }
+      }
+      firstStartup.claim()
+    } catch {
+      return { proc: first, claimStartupEvents: withNotice(firstStartup.claim) }
+    } finally {
+      clearTimeout(limit)
+    }
+  } else {
+    discardConpty(first, firstStartup)
+  }
   const retry = await spawn()
-  const retryStartup = await decideConptyStartup(retry, opts.signal)
+  const retryStartup = await decideConptyStartup(retry, opts.signal, opts.retainCanceledChild)
   if (retryStartup.outcome === 'input-reader') {
     announcementObserved = true
   }
diff --git a/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts b/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts
index ac2d021b270e..f187cf7f7fb2 100644
--- a/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts
+++ b/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts
@@ -1,4 +1,10 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { spawnNativeDaemonPty } from './native-pty-spawn'
+import {
+  _resetConptyStartupTrustForTest,
+  CONPTY_NO_INPUT_READER_NOTICE,
+  CONPTY_STARTUP_DECISION_LIMIT_MS
+} from './conpty-startup-input-reader'
 
 const nodePty = vi.hoisted(() => ({ spawn: vi.fn() }))
 vi.mock('node-pty', () => nodePty)
@@ -9,13 +15,6 @@ const ptyJob = vi.hoisted(() => ({
 }))
 vi.mock('../../windows/windows-pty-job', () => ptyJob)
 
-import { spawnNativeDaemonPty } from './native-pty-spawn'
-import {
-  _resetConptyStartupTrustForTest,
-  CONPTY_NO_INPUT_READER_NOTICE,
-  CONPTY_STARTUP_DECISION_LIMIT_MS
-} from './conpty-startup-input-reader'
-
 const attempts = ['pwsh.exe', 'powershell.exe', 'cmd.exe'].map((shellPath) => ({
   shellPath,
   shellArgs: [shellPath === 'cmd.exe' ? '/K' : '-NoExit'],
@@ -86,6 +85,40 @@ describe('Windows shell fallback over node-pty ConPTY', () => {
     vi.restoreAllMocks()
   })
 
+  it('checks operation authority after loading the native module, before physical spawn', async () => {
+    let allowed = true
+    const starting = spawnNativeDaemonPty({
+      ...args,
+      assertCreateAllowed: () => {
+        if (!allowed) {
+          throw new Error('expired')
+        }
+      }
+    })
+    allowed = false
+    await expect(starting).rejects.toThrow('expired')
+    expect(nodePty.spawn).not.toHaveBeenCalled()
+  })
+
+  it('does not dispatch a fallback shell after the operation loses authority', async () => {
+    let allowed = true
+    nodePty.spawn.mockImplementation(() => {
+      allowed = false
+      throw new Error('primary refused')
+    })
+    await expect(
+      spawnNativeDaemonPty({
+        ...args,
+        assertCreateAllowed: () => {
+          if (!allowed) {
+            throw new Error('expired')
+          }
+        }
+      })
+    ).rejects.toThrow('primary refused')
+    expect(nodePty.spawn).toHaveBeenCalledOnce()
+  })
+
   it('walks both fallback shells when ConPTY rejects the primary ones', async () => {
     const proc = fakePane(9876, [CONPTY_PRELUDE])
     nodePty.spawn.mockImplementation((file: string) => {
diff --git a/src/main/daemon/pty-subprocess/native-pty-spawn.ts b/src/main/daemon/pty-subprocess/native-pty-spawn.ts
index 22c6edd779d4..624b3f1b1c49 100644
--- a/src/main/daemon/pty-subprocess/native-pty-spawn.ts
+++ b/src/main/daemon/pty-subprocess/native-pty-spawn.ts
@@ -35,6 +35,8 @@ export async function spawnNativeDaemonPty(args: {
   /** The primary shell's argv is Orca's interactive default, so a respawn cannot repeat a command. */
   primaryArgsRespawnSafe?: boolean
   signal?: AbortSignal
+  assertCreateAllowed?: () => void
+  retainCanceledChild?: boolean
   onMacosTccSpawnStrategy?: (strategy: 'wrapped' | 'direct') => void
 }): Promise<SpawnedDaemonPty> {
   let reportsChildExitStatus = true
@@ -51,6 +53,8 @@ export async function spawnNativeDaemonPty(args: {
     if (process.platform === 'win32') {
       assignHostProcessToKillOnCloseJob()
     }
+    args.signal?.throwIfAborted()
+    args.assertCreateAllowed?.()
     const proc = nodePty.spawn(wrapped.file, wrapped.args, {
       name: args.env.TERM ?? 'xterm-256color',
       cols: args.cols,
@@ -76,6 +80,7 @@ export async function spawnNativeDaemonPty(args: {
     return spawnConptyWithInputReader(() => spawnOnce(shellPath, shellArgs, cwd), {
       label: shellPath,
       respawnSafe,
+      retainCanceledChild: args.retainCanceledChild,
       ...(args.signal ? { signal: args.signal } : {})
     })
   }
diff --git a/src/main/daemon/pty-subprocess/spawn-file-foreground-process.ts b/src/main/daemon/pty-subprocess/spawn-file-foreground-process.ts
index b5763f238b1f..28ddd927f00c 100644
--- a/src/main/daemon/pty-subprocess/spawn-file-foreground-process.ts
+++ b/src/main/daemon/pty-subprocess/spawn-file-foreground-process.ts
@@ -1,3 +1,4 @@
+import { resolveSuspendedAgentProcessFromPs } from '../../providers/suspended-agent-process'
 import type { IPty } from 'node-pty'
 import { isShellProcess } from '../../../shared/shell-process-detection'
 import {
@@ -68,7 +69,9 @@ export function resolveSpawnFileForegroundFromRows(
     ''
   )
   const selected = selectForegroundProcessCandidate(candidates, tree)
+  const suspendedAgentProcess = resolveSuspendedAgentProcessFromPs(rows, rootPid)
   return {
+    ...(suspendedAgentProcess ? { suspendedAgentProcess } : {}),
     available: name.length > 0,
     processName: selected
       ? resolveOuterWrapperForegroundProcess(selected.recognized, selected.candidate, tree)
diff --git a/src/main/daemon/pty-subprocess/subprocess-handle.ts b/src/main/daemon/pty-subprocess/subprocess-handle.ts
index 395abe113e29..3f611ecae296 100644
--- a/src/main/daemon/pty-subprocess/subprocess-handle.ts
+++ b/src/main/daemon/pty-subprocess/subprocess-handle.ts
@@ -10,7 +10,12 @@ import type { SubprocessHandle } from '../session-subprocess-handle'
 import { createPtyForegroundProcessTracker } from './foreground-process-tracker'
 import { PtyPreListenerEvents } from './pre-listener-events'
 import { ptyProcessNameIsSpawnFile } from './spawn-file-foreground-process'
-import { inspectSpawnFileWindowsChildProcesses } from './spawn-file-child-processes'
+import {
+  inspectSpawnFileWindowsChildProcesses,
+  inspectSpawnFileChildProcessesFromRows
+} from './spawn-file-child-processes'
+import { getStrictProcessTableSnapshotWithAge } from '../../../shared/process-table-snapshot-reader'
+import { getSpawnedShellName } from '../../providers/local-pty-launch-helpers'
 import type { ConptyStartupEvents } from './conpty-startup-input-reader'
 
 type DisposableNativePty = pty.IPty & {
@@ -136,12 +141,20 @@ export function createDaemonPtySubprocessHandle(args: {
     processNameIsSpawnFile: ptyProcessNameIsSpawnFile(proc),
     // Only the login(1) wrapper hides the shell's exit status, and it forks the shell as its child.
     shellIsRootChild: !reportsChildExitStatus,
-    ...(process.platform === 'win32'
-      ? {
-          inspectChildProcesses: (fresh?: boolean, ignoreDetached?: boolean) =>
-            inspectSpawnFileWindowsChildProcesses(proc, shellPath, fresh, ignoreDetached)
-        }
-      : {}),
+    inspectChildProcesses: async (fresh?: boolean, ignoreDetached?: boolean) => {
+      if (dead || masterRetired) {
+        return 'unverifiable'
+      }
+      const verdict =
+        process.platform === 'win32'
+          ? await inspectSpawnFileWindowsChildProcesses(proc, shellPath, fresh, ignoreDetached)
+          : inspectSpawnFileChildProcessesFromRows(
+              (await getStrictProcessTableSnapshotWithAge()).rows,
+              proc.pid,
+              getSpawnedShellName(shellPath)
+            )
+      return dead || masterRetired ? 'unverifiable' : verdict
+    },
     shellPath: args.shellPath,
     shellCwd: args.spawnCwd,
     shellPathEnv: args.env.PATH,
diff --git a/src/main/daemon/session-input-path.ts b/src/main/daemon/session-input-path.ts
index 754f8622b391..ed92b7ef86d8 100644
--- a/src/main/daemon/session-input-path.ts
+++ b/src/main/daemon/session-input-path.ts
@@ -44,7 +44,10 @@ export function attachSessionInputViewer(
 }
 
 export function isSessionInputClosed(session: Session): boolean {
-  return session.isAlive && inputPaths.get(session)?.subprocess.isInputClosed?.() === true
+  return (
+    session.isAlive &&
+    (session.isSwitchClosing || inputPaths.get(session)?.subprocess.isInputClosed?.() === true)
+  )
 }
 
 /** Dropping bytes a retired master cannot take would let every caller report delivery. */
diff --git a/src/main/daemon/session-process-inspection.ts b/src/main/daemon/session-process-inspection.ts
new file mode 100644
index 000000000000..0f6ad1dd52f6
--- /dev/null
+++ b/src/main/daemon/session-process-inspection.ts
@@ -0,0 +1,48 @@
+import type { SessionOutputPlane } from './session-output-plane'
+
+import type { TerminalShellRecoveryBarrier } from './terminal-shell-recovery-barrier'
+
+import type { SubprocessHandle } from './session-subprocess-handle'
+
+import type { ChildProcessVerdictRead } from './session-subprocess-handle'
+
+import { SessionSwitchUse } from './session-switch-use'
+
+export abstract class SessionProcessInspection extends SessionSwitchUse {
+  protected abstract subprocess: SubprocessHandle
+  protected abstract readonly output: SessionOutputPlane
+  protected abstract readonly recoveryBarrier: TerminalShellRecoveryBarrier
+  inspectChildProcesses(fresh?: boolean, ignoreDetached?: boolean): ChildProcessVerdictRead {
+    return this.subprocess.inspectChildProcesses?.(fresh, ignoreDetached) ?? 'unverifiable'
+  }
+
+  getForegroundProcess(options?: { rawFallback?: boolean; cachedOnly?: boolean }): string | null {
+    return this.subprocess.getForegroundProcess(options)
+  }
+
+  async confirmForegroundProcess(): Promise<string | null> {
+    return this.subprocess.confirmForegroundProcess?.() ?? this.subprocess.getForegroundProcess()
+  }
+
+  confirmShellForeground(): Promise<boolean> {
+    return this.recoveryBarrier.confirmOwnerSettled()
+  }
+
+  async settleShellOwnershipConfirmation(): Promise<void> {
+    await this.recoveryBarrier.awaitProofSettled()
+    // Snapshot only after the drained prompt is parsed into the model.
+    await this.output.flushParsedWrites()
+  }
+
+  getPartialEscapeTailAnsi(): string {
+    return this.output.getPartialEscapeTailAnsi()
+  }
+
+  getAppliedSize(): { cols: number; rows: number } | null {
+    return this.output.getAppliedSize()
+  }
+
+  getCwd(): string | null {
+    return this.output.getCwd()
+  }
+}
diff --git a/src/main/daemon/session-shell-ready-barrier.ts b/src/main/daemon/session-shell-ready-barrier.ts
index 25b277efce22..59858ece980d 100644
--- a/src/main/daemon/session-shell-ready-barrier.ts
+++ b/src/main/daemon/session-shell-ready-barrier.ts
@@ -31,6 +31,7 @@ export type SessionShellReadyBarrierDeps = {
   installDeviceAttributesFilter(): void
   releaseDeviceAttributesFilter(): void
   acceptStartupIngress(data: string): void
+  beforeCommandWrite?(): boolean
   /** Use an injected file-log sink because detached daemon stdio is ignored. */
   reportReadinessEvent?(event: string, details: Record<string, unknown>): void
 }
@@ -75,6 +76,10 @@ export class SessionShellReadyBarrier {
   }
 
   /** Keep queuing through the post-marker flush window to preserve input order. */
+  get hasPendingWrites(): boolean {
+    return this.preReadyStdinQueue.length > 0
+  }
+
   get isGatingWrites(): boolean {
     return this._state === 'pending' || this.postReadyFlushGate.isPending
   }
@@ -227,7 +232,9 @@ export class SessionShellReadyBarrier {
     const queued = this.preReadyStdinQueue
     this.preReadyStdinQueue = []
     for (const data of queued) {
-      this.deps.subprocess.write(data)
+      if (this.deps.beforeCommandWrite?.() !== false) {
+        this.deps.subprocess.write(data)
+      }
     }
   }
 }
diff --git a/src/main/daemon/session-subprocess.test-fixture.ts b/src/main/daemon/session-subprocess.test-fixture.ts
new file mode 100644
index 000000000000..2fcfe027efdc
--- /dev/null
+++ b/src/main/daemon/session-subprocess.test-fixture.ts
@@ -0,0 +1,78 @@
+import { vi } from 'vitest'
+
+import type { PtyChildProcessVerdict } from '../../shared/terminal-process-inspection'
+
+export function createMockSubprocess() {
+  const written: string[] = []
+  const signals: string[] = []
+  let onData: ((data: string) => void) | null = null
+  let onExit: ((code: number) => void) | null = null
+  let killed = false
+  let clearCalls = 0
+  let pid = 12345
+  let pauseCalls = 0
+  let resumeCalls = 0
+
+  return {
+    written,
+    signals,
+    get killed() {
+      return killed
+    },
+    get pid() {
+      return pid
+    },
+    get pauseCalls() {
+      return pauseCalls
+    },
+    get resumeCalls() {
+      return resumeCalls
+    },
+    foregroundProcess: null as string | null,
+    getForegroundProcess(): string | null {
+      return this.foregroundProcess
+    },
+    confirmShellForeground: vi.fn(async () => true),
+    inspectChildProcesses: vi.fn(async (): Promise<PtyChildProcessVerdict> => 'no-children'),
+    write(data: string) {
+      written.push(data)
+    },
+    resize(_cols: number, _rows: number) {},
+    pause() {
+      pauseCalls++
+    },
+    resume() {
+      resumeCalls++
+    },
+    get clearCalls() {
+      return clearCalls
+    },
+    clear() {
+      clearCalls++
+    },
+    kill() {
+      killed = true
+      setTimeout(() => onExit?.(0), 5)
+    },
+    terminateOwnedTree: () => 'terminated' as const,
+    forceKill() {
+      killed = true
+    },
+    signal(sig: string) {
+      signals.push(sig)
+    },
+    onData(cb: (data: string) => void) {
+      onData = cb
+    },
+    onExit(cb: (code: number) => void) {
+      onExit = cb
+    },
+    dispose() {},
+    simulateData(data: string) {
+      onData?.(data)
+    },
+    simulateExit(code: number) {
+      onExit?.(code)
+    }
+  }
+}
diff --git a/src/main/daemon/session-switch-use.ts b/src/main/daemon/session-switch-use.ts
new file mode 100644
index 000000000000..36f7ea734f82
--- /dev/null
+++ b/src/main/daemon/session-switch-use.ts
@@ -0,0 +1,54 @@
+import type { SessionShellReadyBarrier } from './session-shell-ready-barrier'
+import { randomUUID } from 'node:crypto'
+
+export abstract class SessionSwitchUse {
+  protected abstract readonly shellReady: SessionShellReadyBarrier
+  abstract get isTerminating(): boolean
+  abstract beginTermination(): boolean
+  private useRevision = 0
+
+  protected switchClosing = false
+
+  private switchWitness?: { token: string; revision: number; anchor: number }
+
+  get isSwitchClosing(): boolean {
+    return this.switchClosing
+  }
+
+  noteUse(): void {
+    this.useRevision++
+  }
+
+  captureSwitchWitness(): string {
+    const token = randomUUID()
+    this.switchWitness = { token, revision: this.useRevision, anchor: performance.now() }
+    return token
+  }
+
+  switchCloseCondition(condition: {
+    token: string
+    remainingMs: number
+    ownedSpawn?: true
+  }): () => boolean {
+    const witness = this.switchWitness
+    const deadline = (witness?.anchor ?? -Infinity) + Math.max(0, condition.remainingMs)
+    return () =>
+      Boolean(
+        witness &&
+        this.switchWitness === witness &&
+        witness.token === condition.token &&
+        witness.revision === this.useRevision &&
+        performance.now() < deadline &&
+        (condition.ownedSpawn || !this.shellReady.hasPendingWrites) &&
+        !this.isTerminating
+      )
+  }
+
+  commitSwitchClose(check: () => boolean): boolean {
+    if (!check() || !this.beginTermination()) {
+      return false
+    }
+    this.switchClosing = true
+    return true
+  }
+}
diff --git a/src/main/daemon/session.test.ts b/src/main/daemon/session.test.ts
index c5ccf4270685..ef466edce3a4 100644
--- a/src/main/daemon/session.test.ts
+++ b/src/main/daemon/session.test.ts
@@ -8,86 +8,14 @@ import {
   _resetPtyOwnerHostColorsForTest,
   setPtyOwnerHostColors
 } from '../../shared/pty-owner-color-query-colors'
+import { createMockSubprocess } from './session-subprocess.test-fixture'
+import type * as PtyDescendantTerminationModule from '../pty-descendant-termination'
 
 const killWithDescendantSweepMock = vi.hoisted(() => vi.fn())
 vi.mock('../pty-descendant-termination', () => ({
   killWithDescendantSweep: killWithDescendantSweepMock
 }))
 
-function createMockSubprocess() {
-  const written: string[] = []
-  const signals: string[] = []
-  let onData: ((data: string) => void) | null = null
-  let onExit: ((code: number) => void) | null = null
-  let killed = false
-  let clearCalls = 0
-  let pid = 12345
-  let pauseCalls = 0
-  let resumeCalls = 0
-
-  return {
-    written,
-    signals,
-    get killed() {
-      return killed
-    },
-    get pid() {
-      return pid
-    },
-    get pauseCalls() {
-      return pauseCalls
-    },
-    get resumeCalls() {
-      return resumeCalls
-    },
-    foregroundProcess: null as string | null,
-    getForegroundProcess(): string | null {
-      return this.foregroundProcess
-    },
-    confirmShellForeground: vi.fn(async () => true),
-    write(data: string) {
-      written.push(data)
-    },
-    resize(_cols: number, _rows: number) {},
-    pause() {
-      pauseCalls++
-    },
-    resume() {
-      resumeCalls++
-    },
-    get clearCalls() {
-      return clearCalls
-    },
-    clear() {
-      clearCalls++
-    },
-    kill() {
-      killed = true
-      setTimeout(() => onExit?.(0), 5)
-    },
-    terminateOwnedTree: () => 'terminated' as const,
-    forceKill() {
-      killed = true
-    },
-    signal(sig: string) {
-      signals.push(sig)
-    },
-    onData(cb: (data: string) => void) {
-      onData = cb
-    },
-    onExit(cb: (code: number) => void) {
-      onExit = cb
-    },
-    dispose() {},
-    simulateData(data: string) {
-      onData?.(data)
-    },
-    simulateExit(code: number) {
-      onExit?.(code)
-    }
-  }
-}
-
 type MockSubprocess = ReturnType<typeof createMockSubprocess>
 
 describe('Session', () => {
@@ -637,6 +565,81 @@ describe('Session', () => {
     })
   })
 
+  describe('switch-only conditional ordinary close', () => {
+    it.each(['input', 'attachment', 'suspended child', 'unknown'] as const)(
+      'refuses without a signal when %s arrives during the final idle probe',
+      async (change) => {
+        createSession()
+        const witness = session.captureSwitchWitness()
+        const check = session.switchCloseCondition({ token: witness, remainingMs: 10_000 })
+        const entered = Promise.withResolvers<void>()
+        const release = Promise.withResolvers<void>()
+        subprocess.inspectChildProcesses.mockImplementation(async () => {
+          entered.resolve()
+          await release.promise
+          return change === 'suspended child'
+            ? 'children'
+            : change === 'unknown'
+              ? 'unverifiable'
+              : 'no-children'
+        })
+        const sweep = await vi.importActual<typeof PtyDescendantTerminationModule>(
+          '../pty-descendant-termination'
+        )
+        killWithDescendantSweepMock.mockImplementation((pid, killRoot, options) =>
+          sweep.killWithDescendantSweep(pid, killRoot, {
+            ...options,
+            platform: 'linux',
+            readTable: async () => ({ rows: [], capturedAtMs: Date.now() })
+          })
+        )
+        const teardown = new TerminalSessionTeardown(new Map([['test-session', session]]))
+        const closing = teardown.killSession('test-session', session, true, check)
+        await entered.promise
+        if (change === 'input') {
+          session.write('codex\r')
+        }
+        if (change === 'attachment') {
+          session.attachClient({ onData: () => {}, onExit: () => {} })
+        }
+        release.resolve()
+        await closing
+        expect(session.isTerminating).toBe(false)
+        expect(subprocess.killed).toBe(false)
+        expect(subprocess.signals).toEqual([])
+        session.write('echo still usable\r')
+        expect(subprocess.written).toContain('echo still usable\r')
+      }
+    )
+    it('seals accepted input only after its actual close is admitted', async () => {
+      createSession()
+      const witness = session.captureSwitchWitness()
+      const check = session.switchCloseCondition({ token: witness, remainingMs: 10_000 })
+      const sweep = await vi.importActual<typeof PtyDescendantTerminationModule>(
+        '../pty-descendant-termination'
+      )
+      killWithDescendantSweepMock.mockImplementation((pid, killRoot, options) =>
+        sweep.killWithDescendantSweep(pid, killRoot, {
+          ...options,
+          platform: 'linux',
+          readTable: async () => ({ rows: [], capturedAtMs: Date.now() })
+        })
+      )
+      vi.spyOn(subprocess, 'forceKill').mockImplementation(() => {
+        session.write('must not reach a closing shell\r')
+        subprocess.simulateExit(0)
+      })
+      await new TerminalSessionTeardown(new Map([['test-session', session]])).killSession(
+        'test-session',
+        session,
+        true,
+        check
+      )
+      expect(subprocess.written).not.toContain('must not reach a closing shell\r')
+      expect(session.isAlive).toBe(false)
+    })
+  })
+
   describe('kill', () => {
     beforeEach(() => {
       killWithDescendantSweepMock.mockImplementation((_pid: number, killRoot: () => void) => {
diff --git a/src/main/daemon/session.ts b/src/main/daemon/session.ts
index 0a4f4d495ea1..e8ec58ffcdd9 100644
--- a/src/main/daemon/session.ts
+++ b/src/main/daemon/session.ts
@@ -5,13 +5,12 @@ import { SessionProducerPause } from './session-producer-pause'
 import { SessionShellReadyBarrier } from './session-shell-ready-barrier'
 import type { TerminalShellRecoveryBarrier } from './terminal-shell-recovery-barrier'
 import { SessionTerminationController } from './session-termination-controller'
-import type { ChildProcessVerdictRead, SubprocessHandle } from './session-subprocess-handle'
+import type { SubprocessHandle } from './session-subprocess-handle'
 import type { JobTerminationOutcome } from '../windows/windows-pty-job'
 import type { SessionOptions } from './session-options'
 import type { TuiAgent } from '../../shared/tui-agent'
 import { randomUUID } from 'node:crypto'
 import { PtyStartupIngress } from '../../shared/pty-startup-ingress'
-
 import type {
   SessionState,
   ShellReadyState,
@@ -19,8 +18,9 @@ import type {
   TerminalSnapshot
 } from './types'
 import type { TerminalExitCause } from '../../shared/terminal-exit-cause'
+import { SessionProcessInspection } from './session-process-inspection'
 
-export class Session {
+export class Session extends SessionProcessInspection {
   readonly sessionId: string
   readonly incarnationId = randomUUID()
   readonly terminalHandle: string | null
@@ -31,16 +31,18 @@ export class Session {
   private _state: SessionState = 'running'
   private _exitCode: number | null = null
   private _disposed = false
-  private subprocess: SubprocessHandle
+
+  protected subprocess: SubprocessHandle
   private readonly onSessionExit?: (code: number) => void
-  private readonly output: SessionOutputPlane
+  protected readonly output: SessionOutputPlane
   private readonly producerPause: SessionProducerPause
-  private readonly shellReady: SessionShellReadyBarrier
+  protected readonly shellReady: SessionShellReadyBarrier
   private readonly termination: SessionTerminationController
   readonly startupIngress: PtyStartupIngress
-  private readonly recoveryBarrier: TerminalShellRecoveryBarrier
+  protected readonly recoveryBarrier: TerminalShellRecoveryBarrier
 
   constructor(opts: SessionOptions) {
+    super()
     this.sessionId = opts.sessionId
     this.terminalHandle = opts.terminalHandle ?? null
     this.launchAgent = opts.launchAgent ?? null
@@ -78,13 +80,26 @@ export class Session {
       shellReadyTimeoutMs: opts.shellReadyTimeoutMs,
       installDeviceAttributesFilter: () => this.output.installDeviceAttributesFilter(),
       releaseDeviceAttributesFilter: () => this.output.releaseDeviceAttributesFilter(),
+      beforeCommandWrite: () => {
+        if (this.switchClosing) {
+          return false
+        }
+        this.noteUse()
+        return true
+      },
       acceptStartupIngress: (data) => this.startupIngress.accept(data)
     })
 
     this.startupIngress = new PtyStartupIngress({
       ...(opts.startupIngress ? { intent: opts.startupIngress } : {}),
       ...(opts.ownerBackend ? { ownerBackend: opts.ownerBackend } : {}),
-      write: (data) => this.subprocess.write(data),
+      write: (data) => {
+        if (this.switchClosing) {
+          return
+        }
+        this.noteUse()
+        this.subprocess.write(data)
+      },
       onEmission: (emission) => this.recoveryBarrier.accept(emission)
     })
     this.shellReady.startPromptReadinessProbe()
@@ -139,9 +154,10 @@ export class Session {
   }
 
   write(data: string): void {
-    if (this._state === 'exited' || this._disposed) {
+    if (this._state === 'exited' || this._disposed || this.switchClosing) {
       return
     }
+    this.noteUse()
 
     // Contain cooked query echoes and preserve input order through the post-ready flush window.
     if (this.startupIngress.answerLiveQueryReply(data) || this.shellReady.tryEnqueue(data)) {
@@ -190,10 +206,15 @@ export class Session {
   }
 
   attachClient(client: Omit<AttachedClient, 'token'>): symbol {
+    if (this.switchClosing) {
+      throw new Error('Terminal is closing')
+    }
+    this.noteUse()
     return this.output.attachClient(client)
   }
 
   detachClient(token: symbol): void {
+    this.noteUse()
     this.output.detachClient(token)
     // With no viewer left to resume the producer, release its pause eagerly.
     if (!this.output.hasAttachedClients) {
@@ -202,6 +223,7 @@ export class Session {
   }
 
   detachAllClients(): void {
+    this.noteUse()
     this.output.clearClients()
     this.producerPause.release({ resume: true })
   }
@@ -211,14 +233,6 @@ export class Session {
     return this.output.getSnapshot(opts)
   }
 
-  getPartialEscapeTailAnsi(): string {
-    return this.output.getPartialEscapeTailAnsi()
-  }
-
-  getAppliedSize(): { cols: number; rows: number } | null {
-    return this.output.getAppliedSize()
-  }
-
   takePendingOutput(
     includeSnapshot: boolean,
     opts: { teardownSnapshot?: boolean } = {}
@@ -231,32 +245,6 @@ export class Session {
     return this.output.takePendingOutput(includeSnapshot, heldBytes, () => this.getSnapshot())
   }
 
-  getCwd(): string | null {
-    return this.output.getCwd()
-  }
-
-  inspectChildProcesses(fresh?: boolean, ignoreDetached?: boolean): ChildProcessVerdictRead {
-    return this.subprocess.inspectChildProcesses?.(fresh, ignoreDetached) ?? 'unverifiable'
-  }
-
-  getForegroundProcess(options?: { rawFallback?: boolean; cachedOnly?: boolean }): string | null {
-    return this.subprocess.getForegroundProcess(options)
-  }
-
-  async confirmForegroundProcess(): Promise<string | null> {
-    return this.subprocess.confirmForegroundProcess?.() ?? this.subprocess.getForegroundProcess()
-  }
-
-  confirmShellForeground(): Promise<boolean> {
-    return this.recoveryBarrier.confirmOwnerSettled()
-  }
-
-  async settleShellOwnershipConfirmation(): Promise<void> {
-    await this.recoveryBarrier.awaitProofSettled()
-    // Snapshot only after the drained prompt is parsed into the model.
-    await this.output.flushParsedWrites()
-  }
-
   clearScrollback(): void {
     this.output.clearScrollback(this.subprocess, this.shellReady.isGatingWrites)
   }
diff --git a/src/main/daemon/terminal-host-agent-session-claim.ts b/src/main/daemon/terminal-host-agent-session-claim.ts
index 84ee3830d9bb..27a271327d83 100644
--- a/src/main/daemon/terminal-host-agent-session-claim.ts
+++ b/src/main/daemon/terminal-host-agent-session-claim.ts
@@ -7,6 +7,7 @@ export type InternalCreateOrAttachOptions = CreateOrAttachOptions & {
   agentSessionGeneration?: string
   /** Request identity for the fork gate; absent for in-process callers. */
   spawnAdmission?: { clientId: string; declaredIntent: SpawnIntent | null; deadlineAt: number }
+  retainCanceledChild?: boolean
   isCanceled?: () => boolean
   cancelSignal?: AbortSignal
 }
@@ -14,6 +15,7 @@ export type InternalCreateOrAttachOptions = CreateOrAttachOptions & {
 export async function createOrAttachClaimedAgentSession(args: {
   options: InternalCreateOrAttachOptions
   owners: ClaimedAgentPtyOwnerRegistry
+  check?: () => void
   isLive: (owner: AgentSessionOwnerBinding) => boolean
   createOrAttach: (options: InternalCreateOrAttachOptions) => Promise<CreateOrAttachResult>
 }): Promise<CreateOrAttachResult> {
@@ -32,7 +34,15 @@ export async function createOrAttachClaimedAgentSession(args: {
       })
       return { ptyId: args.options.sessionId }
     },
-    isLive: args.isLive
+    isLive: args.isLive,
+    check: args.check,
+    onDispatchedRevoked: args.options.retainCanceledChild
+      ? () => {
+          if (created) {
+            created.switchOutcomeUnknown = true
+          }
+        }
+      : undefined
   })
   if (ensured.disposition === 'created' && created) {
     return { ...(created as CreateOrAttachResult), agentSessionEnsure: ensured }
diff --git a/src/main/daemon/terminal-host-create-contract.ts b/src/main/daemon/terminal-host-create-contract.ts
index 4a29ec3350c3..5b8da6a439bd 100644
--- a/src/main/daemon/terminal-host-create-contract.ts
+++ b/src/main/daemon/terminal-host-create-contract.ts
@@ -45,6 +45,9 @@ export type CreateOrAttachOptions = {
 }
 
 export type CreateOrAttachResult = {
+  /** A dispatched child remains owned after its initiating handoff lost authority. */
+  switchOutcomeUnknown?: true
+  switchCleanupWitness?: string
   isNew: boolean
   snapshot: TerminalSnapshot | null
   pid: number | null
diff --git a/src/main/daemon/terminal-host-fenced-termination.ts b/src/main/daemon/terminal-host-fenced-termination.ts
index a771b81f09b8..3db90db7a204 100644
--- a/src/main/daemon/terminal-host-fenced-termination.ts
+++ b/src/main/daemon/terminal-host-fenced-termination.ts
@@ -15,7 +15,10 @@ export function beginTerminalHostFencedTermination(
     sessions: ReadonlyMap<string, Session>
     pendingCreations: ReadonlyMap<string, Promise<void>>
     owners: ClaimedAgentPtyOwnerRegistry
-    kill: (id: string, options: { immediate: true }) => Promise<void>
+    kill: (
+      id: string,
+      options: { immediate: true; switchCheck?: () => boolean; ownedSpawn?: true }
+    ) => Promise<void>
   }
 ): FencedTermination {
   const session = deps.sessions.get(request.id)
@@ -35,10 +38,33 @@ export function beginTerminalHostFencedTermination(
   if (request.requireUnattached && session.hasAttachedClients) {
     return { accepted: false, result: { outcome: 'refused', reason: 'attached' } }
   }
+  if (request.switchCondition && !request.switchCondition.ownedSpawn && session.wslDistro) {
+    return { accepted: false, result: { outcome: 'refused', reason: 'unsupported' } }
+  }
+  const physicalCheck = request.switchCondition
+    ? session.switchCloseCondition(request.switchCondition)
+    : undefined
+  const switchCheck = physicalCheck
+    ? () =>
+        deps.sessions.get(request.id) === session &&
+        !deps.pendingCreations.has(request.id) &&
+        (!request.requireNoAgentOwner || deps.owners.listForPty(request.id).length === 0) &&
+        (!request.switchCondition?.ownedSpawn ||
+          deps.owners
+            .listForPty(request.id)
+            .every((owner) => owner.generation === request.switchCondition?.claimGeneration)) &&
+        physicalCheck()
+    : undefined
+  if (switchCheck && !switchCheck()) {
+    return { accepted: false, result: { outcome: 'refused', reason: 'unverifiable' } }
+  }
   try {
     // kill reserves the exact Session synchronously, before its first OS probe.
     const completion = deps
-      .kill(request.id, { immediate: true })
+      .kill(request.id, {
+        immediate: true,
+        ...(switchCheck ? { switchCheck, ownedSpawn: request.switchCondition?.ownedSpawn } : {})
+      })
       .then((): PtyFencedTerminationOutcome =>
         session.isAlive ? { outcome: 'refused', reason: 'unverifiable' } : { outcome: 'ended' }
       )
diff --git a/src/main/daemon/terminal-host-inspection.ts b/src/main/daemon/terminal-host-inspection.ts
new file mode 100644
index 000000000000..43713bf44d51
--- /dev/null
+++ b/src/main/daemon/terminal-host-inspection.ts
@@ -0,0 +1,60 @@
+import type { Session } from './session'
+import type { PtyProcessInspectionOptions } from '../providers/pty-process-inspection'
+import { getAliveTerminalHostSession } from './terminal-host-session-access'
+import { resolveTerminalHostSessionCwd } from './terminal-host-session-cwd'
+import {
+  inspectTerminalHostSession,
+  type TerminalHostProcessInspection
+} from './terminal-host-process-inspection'
+import {
+  confirmTerminalHostForegroundProcess,
+  confirmTerminalHostShellForeground
+} from './terminal-host-session-inspection-operations'
+
+export abstract class TerminalHostInspection {
+  protected abstract sessions: Map<string, Session>
+  protected abstract readonly retiredIncarnations: Map<
+    string,
+    { incarnationId: string; code: number; expiresAt: number }
+  >
+  protected abstract readonly authorityGeneration: string
+  protected abstract observationEpoch: number
+  async getCwd(sessionId: string): Promise<string | null> {
+    return await resolveTerminalHostSessionCwd(
+      getAliveTerminalHostSession(this.sessions, sessionId)
+    )
+  }
+
+  // A vanished pane has no agent icon to display.
+  getForegroundProcess(sessionId: string): string | null {
+    const session = this.sessions.get(sessionId)
+    if (!session || !session.isAlive) {
+      return null
+    }
+    return session.getForegroundProcess()
+  }
+
+  inspectProcess(
+    sessionId: string,
+    options?: PtyProcessInspectionOptions
+  ): Promise<TerminalHostProcessInspection> {
+    return inspectTerminalHostSession(
+      this.sessions,
+      this.retiredIncarnations,
+      sessionId,
+      options,
+      this.authorityGeneration,
+      () => ++this.observationEpoch
+    )
+  }
+
+  async confirmForegroundProcess(sessionId: string): Promise<string | null> {
+    return confirmTerminalHostForegroundProcess(this.sessions.get(sessionId))
+  }
+
+  async confirmShellForeground(sessionId: string): Promise<boolean> {
+    return confirmTerminalHostShellForeground(this.sessions.get(sessionId), () =>
+      this.sessions.get(sessionId)
+    )
+  }
+}
diff --git a/src/main/daemon/terminal-host-options.ts b/src/main/daemon/terminal-host-options.ts
index 0b21fbc8b3fc..49ed8809b949 100644
--- a/src/main/daemon/terminal-host-options.ts
+++ b/src/main/daemon/terminal-host-options.ts
@@ -19,6 +19,8 @@ export type TerminalHostOptions = {
     terminalShellArgs?: string[]
     terminalWindowsWslDistro?: string | null
     terminalWindowsPowerShellImplementation?: 'auto' | 'powershell.exe' | 'pwsh.exe'
+    assertCreateAllowed?: () => void
+    retainCanceledChild?: boolean
     isCanceled?: () => boolean
     cancelSignal?: AbortSignal
   }) => SubprocessHandle | Promise<SubprocessHandle>
diff --git a/src/main/daemon/terminal-host-process-inspection.ts b/src/main/daemon/terminal-host-process-inspection.ts
index 41f52d20e0ab..0884a83c72ff 100644
--- a/src/main/daemon/terminal-host-process-inspection.ts
+++ b/src/main/daemon/terminal-host-process-inspection.ts
@@ -20,6 +20,8 @@ import { SessionNotFoundError } from './types'
 import type { PtyProcessInspectionOptions } from '../providers/pty-process-inspection'
 
 export type TerminalHostProcessInspection = {
+  switchWitness?: string
+
   foregroundProcess: string | null
   hasChildProcesses: boolean
   childProcessEvidence?: PtyChildProcessVerdict
@@ -39,6 +41,7 @@ export async function inspectTerminalHostProcess(args: {
   /** The caller is a self-correcting poll that only reads the process name, never evidence. */
   steadyState?: boolean
   ignoreDetached?: boolean
+  strictChildren?: boolean
   retiredIncarnation?: RetiredIncarnation
   authorityGeneration: string
   nextObservationEpoch: () => number
@@ -101,7 +104,7 @@ export async function inspectTerminalHostProcess(args: {
   } else {
     try {
       const snapshot = await getStrictProcessTableSnapshotWithAge()
-      if (session.processNameIsSpawnFile) {
+      if (session.processNameIsSpawnFile || args.strictChildren) {
         const observed = resolveSpawnFileForegroundFromRows(snapshot.rows, session.pid)
         foregroundProcess = observed.available ? observed.processName : foregroundProcess
         childProcessEvidence = inspectSpawnFileChildProcessesFromRows(
@@ -208,13 +211,16 @@ export function inspectTerminalHostSession(
     sessionId,
     options?.expectedIncarnationId
   )
+  const witness =
+    options?.captureSwitchWitness && session?.isAlive ? session.captureSwitchWitness() : undefined
   return inspectTerminalHostProcess({
     sessionId,
     currentSession: () => sessions.get(sessionId),
     session: session?.isAlive ? session : null,
     ...options,
+    strictChildren: Boolean(options?.captureSwitchWitness),
     retiredIncarnation: retired.get(sessionId),
     authorityGeneration,
     nextObservationEpoch
-  })
+  }).then((result) => ({ ...result, ...(witness ? { switchWitness: witness } : {}) }))
 }
diff --git a/src/main/daemon/terminal-host-session-create.ts b/src/main/daemon/terminal-host-session-create.ts
index 89a0e65a07e6..32c4b9e948a4 100644
--- a/src/main/daemon/terminal-host-session-create.ts
+++ b/src/main/daemon/terminal-host-session-create.ts
@@ -7,7 +7,6 @@ import {
 } from '../../shared/startup-command-staging'
 import { resolvePtyOwnerBackend } from '../../shared/pty-owner-backend'
 import { getDaemonSessionResultMetadata } from './daemon-create-or-attach-result'
-import { enumerateDirectoryOnce } from './directory-enumeration-probe'
 import { normalizePtySize } from './daemon-pty-size'
 import { Session } from './session'
 import { shellPathSupportsPtyStartupBarrier } from './shell-ready'
@@ -17,11 +16,9 @@ import type { TerminalHostOptions } from './terminal-host-options'
 import type { TerminalHostTombstones } from './terminal-host-tombstones'
 import type { TerminalSessionTeardown } from './terminal-session-teardown'
 import type { TerminalSpawnGate } from './terminal-spawn-gate'
-import type { LegacyRestoreDetails } from './legacy-restore-records'
 import { resolveDaemonSessionScrollbackRows } from './daemon-session-scrollback-window'
 import { TerminalAttachCanceledError } from './daemon-errors'
 import { waitForTerminalAttachOperation } from './terminal-attach-cancellation'
-import { sharedPromiseSettlementWaiters } from '../../shared/promise-settlement-waiters'
 import { SessionNotFoundError } from './types'
 import { resolveWslSessionContext } from './wsl-session-context'
 import { recordSessionSpawnPaneKey } from './terminal-host-session-listing'
@@ -30,8 +27,13 @@ import {
   isSessionInputClosed,
   trackSessionInput
 } from './session-input-path'
+import {
+  createSessionExitHandler,
+  describeAgentRestore,
+  isCwdReadableByThisProcess
+} from './terminal-host-session-process'
 
-type TerminalHostSessionCreateDependencies = {
+export type TerminalHostSessionCreateDependencies = {
   sessions: Map<string, Session>
   /** Re-checks the host's shutdown fence and this request's cancellation after any await. */
   assertCreateAllowed: () => void
@@ -74,6 +76,7 @@ export async function createOrAttachTerminalSession(
   // Attach synchronously: in-flight recovery resets arrive after the snapshot in stream order.
   // Checkpoint readers that require settled ownership use getSettledSnapshot.
   if (existing && existing.isAlive && !existing.isTerminating) {
+    deps.assertCreateAllowed()
     const snapshot = existing.getSnapshot()
     existing.detachAllClients()
     const token = existing.attachClient(opts.streamClient)
@@ -167,6 +170,8 @@ async function spawnAndPublishSession(
     terminalWindowsWslDistro: opts.terminalWindowsWslDistro,
     terminalWindowsPowerShellImplementation: opts.terminalWindowsPowerShellImplementation,
     isCanceled: opts.isCanceled,
+    assertCreateAllowed: deps.assertCreateAllowed,
+    retainCanceledChild: opts.retainCanceledChild,
     ...(opts.cancelSignal ? { cancelSignal: opts.cancelSignal } : {})
   })
 
@@ -208,19 +213,39 @@ async function spawnAndPublishSession(
 
   trackSessionInput(session, subprocess, deps.reportReadinessEvent)
 
-  if (opts.isCanceled?.()) {
+  let revoked = false
+  try {
+    deps.assertCreateAllowed()
+  } catch {
+    revoked = true
+  }
+  if (revoked) {
     // Retain cleanup ownership if the native child refuses to exit.
     deps.sessions.set(opts.sessionId, session)
     // Retain the live-cap charge until physical exit.
     onPublished(opts.sessionId, session.isAlive)
-    await session.forceKillAndDisposeSubprocess()
-    if (deps.sessions.get(opts.sessionId) === session) {
+    await session.forceKillAndWaitForExit().catch(() => {})
+    if (!session.isAlive && deps.sessions.get(opts.sessionId) === session) {
       session.dispose()
       deps.sessions.delete(opts.sessionId)
       deps.onDeadSessionRemoved(opts.sessionId)
       deps.spawnGate?.onSessionExit(opts.sessionId)
     }
-    throw new TerminalAttachCanceledError(opts.sessionId)
+    if (!session.isAlive) {
+      throw new TerminalAttachCanceledError(opts.sessionId)
+    }
+    deps.onSessionCreated(opts.sessionId, opts.agentSessionGeneration, true)
+    return {
+      isNew: true,
+      switchOutcomeUnknown: true,
+      switchCleanupWitness: session.captureSwitchWitness(),
+      snapshot: session.getSnapshot(),
+      pid: session.pid,
+      shellState: session.shellState,
+      incarnationId: session.incarnationId,
+      ...getDaemonSessionResultMetadata(session),
+      attachToken: Symbol('retained-switch-child')
+    }
   }
 
   deps.sessions.set(opts.sessionId, session)
@@ -271,6 +296,7 @@ async function spawnAndPublishSession(
 
   return {
     isNew: true,
+    ...(opts.retainCanceledChild ? { switchCleanupWitness: session.captureSwitchWitness() } : {}),
     snapshot: null,
     pid: subprocess.pid,
     shellState: session.shellState,
@@ -282,53 +308,6 @@ async function spawnAndPublishSession(
   }
 }
 
-function createSessionExitHandler(
-  onSessionExit: TerminalHostSessionCreateDependencies['onSessionExit'],
-  sessionId: string,
-  generation: string | undefined,
-  discardStagedCommand: () => void,
-  spawnGate: TerminalSpawnGate | undefined
-): () => void {
-  return () => {
-    discardStagedCommand()
-    spawnGate?.onSessionExit(sessionId)
-    onSessionExit(sessionId, generation)
-  }
-}
-
 /** Describe restore identity without including environment values that may contain credentials. */
-function describeAgentRestore(
-  opts: InternalCreateOrAttachOptions
-): LegacyRestoreDetails | undefined {
-  if (!opts.command || (!opts.launchAgent && !opts.agentSessionEnsure)) {
-    return undefined
-  }
-  return {
-    sessionId: opts.sessionId,
-    agent: opts.launchAgent ?? opts.agentSessionEnsure?.claim.agent ?? null,
-    cwd: opts.cwd ?? null,
-    worktreeId: opts.agentSessionEnsure?.surface.worktreeId ?? null,
-    command: opts.command,
-    identityDigest: opts.agentSessionEnsure?.claim.identityDigest ?? null
-  }
-}
 
 // TCC may reject directory enumeration despite successful access(); only explicit permission denial counts.
-async function isCwdReadableByThisProcess(
-  cwd: string,
-  opts: Pick<InternalCreateOrAttachOptions, 'sessionId' | 'cancelSignal'>
-): Promise<boolean | null> {
-  const outcome = await sharedPromiseSettlementWaiters(enumerateDirectoryOnce(cwd))
-    .wait({
-      timeoutMs: 1_000,
-      signal: opts.cancelSignal,
-      createAbortError: () => new TerminalAttachCanceledError(opts.sessionId)
-    })
-    .catch((error: unknown) => {
-      if (error instanceof TerminalAttachCanceledError) {
-        throw error
-      }
-      return null
-    })
-  return outcome === null ? null : outcome !== 'denied'
-}
diff --git a/src/main/daemon/terminal-host-session-process.ts b/src/main/daemon/terminal-host-session-process.ts
new file mode 100644
index 000000000000..bcdd2c70cf62
--- /dev/null
+++ b/src/main/daemon/terminal-host-session-process.ts
@@ -0,0 +1,56 @@
+import type { TerminalHostSessionCreateDependencies } from './terminal-host-session-create'
+import { enumerateDirectoryOnce } from './directory-enumeration-probe'
+import type { InternalCreateOrAttachOptions } from './terminal-host-agent-session-claim'
+import type { TerminalSpawnGate } from './terminal-spawn-gate'
+import type { LegacyRestoreDetails } from './legacy-restore-records'
+import { TerminalAttachCanceledError } from './daemon-errors'
+import { sharedPromiseSettlementWaiters } from '../../shared/promise-settlement-waiters'
+
+export function createSessionExitHandler(
+  onSessionExit: TerminalHostSessionCreateDependencies['onSessionExit'],
+  sessionId: string,
+  generation: string | undefined,
+  discardStagedCommand: () => void,
+  spawnGate: TerminalSpawnGate | undefined
+): () => void {
+  return () => {
+    discardStagedCommand()
+    spawnGate?.onSessionExit(sessionId)
+    onSessionExit(sessionId, generation)
+  }
+}
+
+export function describeAgentRestore(
+  opts: InternalCreateOrAttachOptions
+): LegacyRestoreDetails | undefined {
+  if (!opts.command || (!opts.launchAgent && !opts.agentSessionEnsure)) {
+    return undefined
+  }
+  return {
+    sessionId: opts.sessionId,
+    agent: opts.launchAgent ?? opts.agentSessionEnsure?.claim.agent ?? null,
+    cwd: opts.cwd ?? null,
+    worktreeId: opts.agentSessionEnsure?.surface.worktreeId ?? null,
+    command: opts.command,
+    identityDigest: opts.agentSessionEnsure?.claim.identityDigest ?? null
+  }
+}
+
+export async function isCwdReadableByThisProcess(
+  cwd: string,
+  opts: Pick<InternalCreateOrAttachOptions, 'sessionId' | 'cancelSignal'>
+): Promise<boolean | null> {
+  const outcome = await sharedPromiseSettlementWaiters(enumerateDirectoryOnce(cwd))
+    .wait({
+      timeoutMs: 1_000,
+      signal: opts.cancelSignal,
+      createAbortError: () => new TerminalAttachCanceledError(opts.sessionId)
+    })
+    .catch((error: unknown) => {
+      if (error instanceof TerminalAttachCanceledError) {
+        throw error
+      }
+      return null
+    })
+  return outcome === null ? null : outcome !== 'denied'
+}
diff --git a/src/main/daemon/terminal-host.ts b/src/main/daemon/terminal-host.ts
index decff455adec..c2daaa8e71e9 100644
--- a/src/main/daemon/terminal-host.ts
+++ b/src/main/daemon/terminal-host.ts
@@ -1,8 +1,12 @@
 import { beginTerminalHostFencedTermination } from './terminal-host-fenced-termination'
 import type { PtyFencedTerminationRequest } from '../../shared/pty-fenced-termination'
 import type { Session } from './session'
-import type { PtyProcessInspectionOptions } from '../providers/pty-process-inspection'
-import type { SessionInfo, TakePendingOutputResult, TerminalSnapshot } from './types'
+import {
+  SessionNotFoundError,
+  type SessionInfo,
+  type TakePendingOutputResult,
+  type TerminalSnapshot
+} from './types'
 import type { CreateOrAttachResult } from './terminal-host-create-contract'
 import type { TerminalHostOptions } from './terminal-host-options'
 import { disposeTerminalHostSessions } from './terminal-host-disposal'
@@ -13,7 +17,6 @@ import { ClaimedAgentPtyOwnerRegistry } from '../../shared/claimed-agent-pty-own
 import { createOrAttachClaimedAgentSession } from './terminal-host-agent-session-claim'
 import type { InternalCreateOrAttachOptions } from './terminal-host-agent-session-claim'
 import { TerminalHostAgentSessionGenerations } from './terminal-host-agent-session-generations'
-import { resolveTerminalHostSessionCwd } from './terminal-host-session-cwd'
 import { TerminalHostTombstones } from './terminal-host-tombstones'
 import {
   listLiveTerminalHostSessions,
@@ -24,17 +27,14 @@ import { TerminalAttachCanceledError } from './daemon-errors'
 import { waitForTerminalAttachOperation } from './terminal-attach-cancellation'
 import { randomUUID } from 'node:crypto'
 import { pruneRetiredPtyIncarnations } from '../../shared/retired-pty-incarnations'
-import { inspectTerminalHostSession } from './terminal-host-process-inspection'
-import type { TerminalHostProcessInspection } from './terminal-host-process-inspection'
 import {
-  confirmTerminalHostForegroundProcess,
-  confirmTerminalHostShellForeground,
   getSettledTerminalHostSnapshot,
   getTerminalHostAppliedSize,
   getTerminalHostPartialEscapeTail,
   getTerminalHostSnapshot,
   takeTerminalHostPendingOutput
 } from './terminal-host-session-inspection-operations'
+import { TerminalHostInspection } from './terminal-host-inspection'
 
 export type { CreateOrAttachOptions, CreateOrAttachResult } from './terminal-host-create-contract'
 
@@ -43,8 +43,8 @@ export type { TerminalHostOptions } from './terminal-host-options'
 const DEFAULT_MAX_TOMBSTONES = 1000
 const REMOTE_FOREGROUND_TOMBSTONE_RETENTION_MS = 2_000
 
-export class TerminalHost {
-  private sessions = new Map<string, Session>()
+export class TerminalHost extends TerminalHostInspection {
+  protected sessions = new Map<string, Session>()
   // Serializes creates for one id across async spawn validation.
   private pendingCreations = new Map<string, Promise<void>>()
   private sessionTeardown = new TerminalSessionTeardown(this.sessions)
@@ -57,14 +57,15 @@ export class TerminalHost {
   private disposePromise: Promise<void> | null = null
   private readonly agentSessionOwners = new ClaimedAgentPtyOwnerRegistry()
   private readonly agentSessionGenerations = new TerminalHostAgentSessionGenerations()
-  private readonly authorityGeneration = randomUUID()
-  private observationEpoch = 0
-  private readonly retiredIncarnations = new Map<
+  protected readonly authorityGeneration = randomUUID()
+  protected observationEpoch = 0
+  protected readonly retiredIncarnations = new Map<
     string,
     { incarnationId: string; code: number; expiresAt: number }
   >()
 
   constructor(opts: TerminalHostOptions) {
+    super()
     this.spawnOptions = opts
     this.onSessionReaped = opts.onSessionReaped
     this.reportReadinessEvent = opts.reportReadinessEvent
@@ -72,6 +73,14 @@ export class TerminalHost {
     this.killedTombstones = new TerminalHostTombstones(opts.maxTombstones ?? DEFAULT_MAX_TOMBSTONES)
   }
 
+  noteSpawnPreparation(sessionId: string): void {
+    const session = this.sessions.get(sessionId)
+    if (session?.isTerminating) {
+      throw new SessionNotFoundError(sessionId)
+    }
+    session?.noteUse()
+  }
+
   async createOrAttach(opts: InternalCreateOrAttachOptions): Promise<CreateOrAttachResult> {
     this.assertCreateOrAttachAllowed(opts)
     for (
@@ -85,6 +94,7 @@ export class TerminalHost {
     }
     this.assertCreateOrAttachAllowed(opts)
 
+    this.sessions.get(opts.sessionId)?.noteUse()
     let settleCreation: () => void = () => {}
     this.pendingCreations.set(
       opts.sessionId,
@@ -96,6 +106,7 @@ export class TerminalHost {
       return await createOrAttachClaimedAgentSession({
         options: opts,
         owners: this.agentSessionOwners,
+        check: opts.retainCanceledChild ? () => this.assertCreateOrAttachAllowed(opts) : undefined,
         isLive: (owner) =>
           this.agentSessionGenerations.isCurrent(
             owner,
@@ -181,17 +192,35 @@ export class TerminalHost {
     this.sessions.get(sessionId)?.resumeProducer(source)
   }
 
-  kill(sessionId: string, opts: { immediate?: boolean } = {}): Promise<void> {
+  kill(
+    sessionId: string,
+    opts: { immediate?: boolean; switchCheck?: () => boolean; ownedSpawn?: true } = {}
+  ): Promise<void> {
     const pending = this.sessionTeardown.get(sessionId)
     if (pending) {
+      if (opts.switchCheck) {
+        return Promise.resolve()
+      }
       return Promise.resolve(
         opts.immediate ? this.sessionTeardown.requestImmediate(sessionId) : pending
       )
     }
     const session = getAliveTerminalHostSession(this.sessions, sessionId)
-    const killed = this.sessionTeardown.killSession(sessionId, session, opts.immediate === true)
-    this.killedTombstones.record(sessionId)
-    return Promise.resolve(killed)
+    const killed = this.sessionTeardown.killSession(
+      sessionId,
+      session,
+      opts.immediate === true,
+      opts.switchCheck,
+      opts.ownedSpawn
+    )
+    if (!opts.switchCheck) {
+      this.killedTombstones.record(sessionId)
+    }
+    return Promise.resolve(killed).then(() => {
+      if (opts.switchCheck && (!session.isAlive || session.isTerminating)) {
+        this.killedTombstones.record(sessionId)
+      }
+    })
   }
 
   beginFencedTermination(request: PtyFencedTerminationRequest) {
@@ -228,45 +257,6 @@ export class TerminalHost {
     }
   }
 
-  async getCwd(sessionId: string): Promise<string | null> {
-    return await resolveTerminalHostSessionCwd(
-      getAliveTerminalHostSession(this.sessions, sessionId)
-    )
-  }
-
-  // A vanished pane has no agent icon to display.
-  getForegroundProcess(sessionId: string): string | null {
-    const session = this.sessions.get(sessionId)
-    if (!session || !session.isAlive) {
-      return null
-    }
-    return session.getForegroundProcess()
-  }
-
-  inspectProcess(
-    sessionId: string,
-    options?: PtyProcessInspectionOptions
-  ): Promise<TerminalHostProcessInspection> {
-    return inspectTerminalHostSession(
-      this.sessions,
-      this.retiredIncarnations,
-      sessionId,
-      options,
-      this.authorityGeneration,
-      () => ++this.observationEpoch
-    )
-  }
-
-  async confirmForegroundProcess(sessionId: string): Promise<string | null> {
-    return confirmTerminalHostForegroundProcess(this.sessions.get(sessionId))
-  }
-
-  async confirmShellForeground(sessionId: string): Promise<boolean> {
-    return confirmTerminalHostShellForeground(this.sessions.get(sessionId), () =>
-      this.sessions.get(sessionId)
-    )
-  }
-
   clearScrollback(sessionId: string): void {
     getAliveTerminalHostSession(this.sessions, sessionId).clearScrollback()
   }
@@ -304,7 +294,6 @@ export class TerminalHost {
   ): TakePendingOutputResult | null {
     return takeTerminalHostPendingOutput(this.sessions.get(sessionId), includeSnapshot, opts)
   }
-
   isKilled(sessionId: string): boolean {
     return this.killedTombstones.has(sessionId)
   }
diff --git a/src/main/daemon/terminal-session-teardown.ts b/src/main/daemon/terminal-session-teardown.ts
index 252cc8f8d316..266edeaa4763 100644
--- a/src/main/daemon/terminal-session-teardown.ts
+++ b/src/main/daemon/terminal-session-teardown.ts
@@ -68,7 +68,45 @@ export class TerminalSessionTeardown {
     await Promise.all(this.requestImmediateAll())
   }
 
-  killSession(sessionId: string, session: Session, immediate: boolean): void | Promise<void> {
+  killSession(
+    sessionId: string,
+    session: Session,
+    immediate: boolean,
+    switchCheck?: () => boolean,
+    ownedSpawn?: true
+  ): void | Promise<void> {
+    if (switchCheck) {
+      return this.track(sessionId, session, true, async () => {
+        let committed = false
+        await killWithDescendantSweep(session.pid, () => {}, {
+          ownsRoot: () => this.sessions.get(sessionId) === session && session.isAlive && committed,
+          admitClose: async () => {
+            if (!switchCheck()) {
+              return false
+            }
+            const children = ownedSpawn
+              ? 'no-children'
+              : await session.inspectChildProcesses(true, false)
+            if (
+              children !== 'no-children' ||
+              !switchCheck() ||
+              this.sessions.get(sessionId) !== session
+            ) {
+              return false
+            }
+            committed = session.commitSwitchClose(switchCheck)
+            return committed
+          },
+          terminateOwnedTree: () => session.terminateOwnedTree(),
+          // No child is ever an automatic-cleanup target. Recheck occurs after this sweep's census.
+          ...(ownedSpawn ? {} : { terminateDescendants: () => {} }),
+          awaitEscalation: true
+        })
+        if (committed && this.sessions.get(sessionId) === session && session.isAlive) {
+          await session.forceKillAndWaitForExit()
+        }
+      })
+    }
     if (!session.launchAgent && !immediate && process.platform === 'win32') {
       // The PTY job would also end `start /b` and GUI children, which a graceful close leaves running.
       if (session.beginTermination()) {
diff --git a/src/main/daemon/types.ts b/src/main/daemon/types.ts
index bf348eb6008f..808fd82408bd 100644
--- a/src/main/daemon/types.ts
+++ b/src/main/daemon/types.ts
@@ -13,14 +13,6 @@ import type {
   GetForegroundProcessRequest,
   InspectProcessRequest
 } from './daemon-foreground-process-protocol'
-
-export type {
-  ConfirmForegroundProcessRequest,
-  ConfirmShellForegroundRequest,
-  GetForegroundProcessRequest,
-  InspectProcessRequest
-} from './daemon-foreground-process-protocol'
-
 import type { StartupCommandDelivery } from '../../shared/codex-startup-delivery'
 import type { TuiAgent } from '../../shared/tui-agent'
 import type { PtyStartupIngressIntent } from '../../shared/pty-startup-ingress'
@@ -30,8 +22,18 @@ import type {
 } from '../../shared/agent-session-host-authority'
 import type * as HistorySeedProtocol from './terminal-history-seed-transfer-protocol'
 import type * as PtyOwnerQueryProtocol from './daemon-pty-owner-query-protocol'
-export type { TerminalModes } from './terminal-modes'
 import type { TerminalSnapshot } from './terminal-snapshot'
+import type { PtyFencedTerminationRequest } from '../../shared/pty-fenced-termination'
+
+export type {
+  ConfirmForegroundProcessRequest,
+  ConfirmShellForegroundRequest,
+  GetForegroundProcessRequest,
+  InspectProcessRequest
+} from './daemon-foreground-process-protocol'
+
+export type { TerminalModes } from './terminal-modes'
+
 export type { TerminalSnapshot } from './terminal-snapshot'
 export {
   AGENT_SESSION_CLAIM_DAEMON_PROTOCOL_VERSION,
@@ -82,6 +84,12 @@ export type CreateOrAttachRequest = {
     shellReadySupported?: boolean
     shellReadyTimeoutMs?: number
     /** Server-side fence that prevents a client timeout from publishing an orphan PTY. */
+    switchExecution?: {
+      phase: 'prepare' | 'commit'
+      invocationId: string
+      anchor?: string
+      remainingMs?: number
+    }
     cancelAfterMs?: number
     startupIngress?: PtyStartupIngressIntent
     /** Optional; an old daemon ignores it and an old client omits it (legacy pacing). */
@@ -154,6 +162,7 @@ export type KillRequest = {
     expectedIncarnationId?: string
     requireNoAgentOwner?: boolean
     requireUnattached?: boolean
+    switchCondition?: PtyFencedTerminationRequest['switchCondition']
   }
 }
 
diff --git a/src/main/ipc/pty/pane/resume-launch-identity.ts b/src/main/ipc/pty/pane/resume-launch-identity.ts
index 81fb06fcac18..c016376810a1 100644
--- a/src/main/ipc/pty/pane/resume-launch-identity.ts
+++ b/src/main/ipc/pty/pane/resume-launch-identity.ts
@@ -21,6 +21,8 @@ export function seedResumeLaunchIdentityFromSpawn(args: {
   if (
     !args.paneKey ||
     args.resumeArgvDropped ||
+    args.result.agentResumeRefused ||
+    args.result.agentResumeUnavailable ||
     args.result.isReattach === true ||
     args.connectionId ||
     !args.launchedAt
diff --git a/src/main/ipc/pty/runtime/controller.ts b/src/main/ipc/pty/runtime/controller.ts
index ed91190958ca..653ac8bb1d9d 100644
--- a/src/main/ipc/pty/runtime/controller.ts
+++ b/src/main/ipc/pty/runtime/controller.ts
@@ -1,6 +1,6 @@
 import { adoptMaterializedRuntimePtySpawn } from './spawn-early'
 import { createRuntimePtySpawnState } from './spawn-state'
-import { localProvider } from '../provider/registry'
+import { getProviderForPty, localProvider } from '../provider/registry'
 import {
   getLocalAutomaticWorkStatus,
   resumeLocalAutomaticWork
@@ -68,6 +68,9 @@ export function installPtyRuntimeController(deps: PtyRuntimeControllerDeps): voi
     probePtyLiveness: (ptyId) => probePtyLivenessFromRuntimeController(deps, ptyId),
     // Attach-only ingestion serves unmounted daemon sessions without creating/resizing; SSH uses leases and local PTYs already stream.
     attach: (ptyId) => attachPtyFromRuntimeController(deps, ptyId),
+    killFenced: (request) =>
+      getProviderForPty(request.id).killFenced?.(request) ??
+      Promise.resolve({ outcome: 'refused', reason: 'unsupported' }),
     kill: (ptyId) => killPtyFromRuntimeController(deps, ptyId),
     retireRejectedPty: (ptyId, stopConfirmed, incarnationId) =>
       retireRejectedPtyFromRuntimeController(deps, ptyId, stopConfirmed, incarnationId),
diff --git a/src/main/ipc/pty/runtime/spawn-execute.ts b/src/main/ipc/pty/runtime/spawn-execute.ts
index 98d78632fed8..ec89191a156e 100644
--- a/src/main/ipc/pty/runtime/spawn-execute.ts
+++ b/src/main/ipc/pty/runtime/spawn-execute.ts
@@ -1,7 +1,6 @@
 import {
   suppressSavedResumeLaunch,
   captureSavedResumeCleanup,
-  chooseSavedResumeFreshLaunch,
   type ResumeSpawnAdmission,
   resumeSpawnRefusal,
   SavedResumeFreshRefusal
@@ -27,6 +26,7 @@ import { isRegisteredAgentSessionOwnerLive } from '../provider/liveness'
 import { failPtySpawnExecute } from '../spawn-execute-failure'
 import type { RuntimePtySpawnState } from './spawn-state'
 import { markRuntimeSpawnHiddenBeforeSpawn } from './spawn-hidden-delivery'
+import { chooseRuntimeSavedResumeFreshLaunch } from './spawn-saved-resume'
 
 export async function executeRuntimePtySpawn(ctx: RuntimePtySpawnState): Promise<void> {
   const args = ctx.args
@@ -47,21 +47,7 @@ export async function executeRuntimePtySpawn(ctx: RuntimePtySpawnState): Promise
     )
   }
   const chooseFresh = async (): Promise<void> => {
-    ctx.spawnOptions.env = { ...ctx.spawnOptions.env }
-    ctx.resumeAdmission = await chooseSavedResumeFreshLaunch(
-      ctx.deps.runtime,
-      args,
-      ctx.expectedWslDistro,
-      ctx.spawnOptions
-    )
-    if (captured && ctx.resumeAdmission) {
-      ctx.resumeAdmission.refused = captured.refused
-      ctx.resumeAdmission.sourceRecord = captured.sourceRecord
-    }
-    if (resumeSpawnRefusal(ctx.resumeAdmission)) {
-      ctx.launchCommand = undefined
-      ctx.env = ctx.spawnOptions.env
-    }
+    await chooseRuntimeSavedResumeFreshLaunch(ctx, captured)
   }
   const runtime = ctx.deps.runtime
   const acquireWorktreeSpawn = runtime?.acquireWorktreeTerminalSpawn
@@ -129,6 +115,7 @@ export async function executeRuntimePtySpawn(ctx: RuntimePtySpawnState): Promise
       ? (ctx.deps.runtime?.getPtyOutputSequence?.(expectedPtyId) ?? 0)
       : 0
     const assertClientStillConnected = (): void => {
+      args.switchExecution?.check()
       if (args.signal?.aborted) {
         throw new Error('client_disconnected')
       }
@@ -160,10 +147,12 @@ export async function executeRuntimePtySpawn(ctx: RuntimePtySpawnState): Promise
           spawn: async () => {
             assertClientStillConnected()
             await chooseFresh()
+            assertClientStillConnected()
             const refusal = resumeSpawnRefusal(ctx.resumeAdmission)
             if (refusal) {
               throw new SavedResumeFreshRefusal(refusal)
             }
+            assertClientStillConnected()
             providerResult = await ctx.provider.spawn(ctx.spawnOptions)
             ctx.rejectedRegistrationCandidate = providerResult
             // Why: a successful lower-owner return proves physical work committed even if admission sees an early exit.
@@ -190,6 +179,14 @@ export async function executeRuntimePtySpawn(ctx: RuntimePtySpawnState): Promise
             }
           },
           isLive: isRegisteredAgentSessionOwnerLive,
+          check: args.switchExecution?.check,
+          onDispatchedRevoked: args.switchExecution
+            ? () => {
+                if (providerResult) {
+                  providerResult.switchOutcomeUnknown = true
+                }
+              }
+            : undefined,
           onJoin: () => {
             awaitingAnotherStart = true
           }
@@ -209,6 +206,7 @@ export async function executeRuntimePtySpawn(ctx: RuntimePtySpawnState): Promise
         ctx.env = ctx.spawnOptions.env
         delete args.agentSessionEnsure
         ctx.spawnOptions.agentSessionEnsure = undefined
+        assertClientStillConnected()
         providerResult = await ctx.provider.spawn(ctx.spawnOptions)
         ctx.reportPtySpawnCommitted()
         ctx.stablePaneOwner = null
@@ -232,6 +230,7 @@ export async function executeRuntimePtySpawn(ctx: RuntimePtySpawnState): Promise
     } else {
       assertClientStillConnected()
       await chooseFresh()
+      assertClientStillConnected()
       ctx.result = await ctx.provider.spawn(ctx.spawnOptions)
       ctx.reportPtySpawnCommitted()
       ctx.stablePaneOwner = null
diff --git a/src/main/ipc/pty/runtime/spawn-options.ts b/src/main/ipc/pty/runtime/spawn-options.ts
index 9de67a179afe..dfe3cd8ed105 100644
--- a/src/main/ipc/pty/runtime/spawn-options.ts
+++ b/src/main/ipc/pty/runtime/spawn-options.ts
@@ -88,7 +88,10 @@ export async function buildRuntimePtySpawnOptions(
     store: ctx.deps.store,
     claudeAuth: ctx.claudeAuth
   })
-  ctx.spawnOptions = launch.spawnOptions
+  ctx.spawnOptions = {
+    ...launch.spawnOptions,
+    ...(args.switchExecution ? { switchExecution: args.switchExecution } : {})
+  }
   ctx.env = launch.env
   ctx.launchCommand = launch.launchCommand
   const seeded = seedPtySpawnSize({
diff --git a/src/main/ipc/pty/runtime/spawn-saved-resume.ts b/src/main/ipc/pty/runtime/spawn-saved-resume.ts
new file mode 100644
index 000000000000..91d2ab504e90
--- /dev/null
+++ b/src/main/ipc/pty/runtime/spawn-saved-resume.ts
@@ -0,0 +1,28 @@
+import {
+  chooseSavedResumeFreshLaunch,
+  type ResumeSpawnAdmission,
+  resumeSpawnRefusal
+} from '../host-env/saved-resume-admission'
+import type { RuntimePtySpawnState } from './spawn-state'
+
+export async function chooseRuntimeSavedResumeFreshLaunch(
+  ctx: RuntimePtySpawnState,
+  captured: ResumeSpawnAdmission | null
+): Promise<void> {
+  const args = ctx.args
+  ctx.spawnOptions.env = { ...ctx.spawnOptions.env }
+  ctx.resumeAdmission = await chooseSavedResumeFreshLaunch(
+    ctx.deps.runtime,
+    args,
+    ctx.expectedWslDistro,
+    ctx.spawnOptions
+  )
+  if (captured && ctx.resumeAdmission) {
+    ctx.resumeAdmission.refused = captured.refused
+    ctx.resumeAdmission.sourceRecord = captured.sourceRecord
+  }
+  if (resumeSpawnRefusal(ctx.resumeAdmission)) {
+    ctx.launchCommand = undefined
+    ctx.env = ctx.spawnOptions.env
+  }
+}
diff --git a/src/main/ipc/pty/runtime/spawn-state.ts b/src/main/ipc/pty/runtime/spawn-state.ts
index f5ee853d7604..70cac7d6de11 100644
--- a/src/main/ipc/pty/runtime/spawn-state.ts
+++ b/src/main/ipc/pty/runtime/spawn-state.ts
@@ -30,6 +30,7 @@ import type {
 import { localProvider } from '../provider/registry'
 import type { PaneResumeOutcome } from '../../../../shared/workspace-layout/workspace-layout-published'
 import type { StartupCwdFallback } from '../../../../shared/startup-cwd-fallback'
+import type { AgentSessionSwitchAuthority } from '../../../../shared/agent-session-switch-execution'
 
 export type RuntimePtySpawnState = {
   deps: PtyRuntimeControllerDeps
@@ -152,6 +153,7 @@ export type RuntimePtySpawnArgs = {
   agentSessionCreateOperationId?: string
   spawnIntent?: SpawnIntent
   signal?: AbortSignal
+  switchExecution?: AgentSessionSwitchAuthority
   refuseSleptWorktree?: boolean
   onPtySpawnCommitted?: () => void
   /** Publish fresh resume outcome before writing its pane binding. */
diff --git a/src/main/ipc/pty/spawn-commit-adopted-session.ts b/src/main/ipc/pty/spawn-commit-adopted-session.ts
new file mode 100644
index 000000000000..876f2e57494b
--- /dev/null
+++ b/src/main/ipc/pty/spawn-commit-adopted-session.ts
@@ -0,0 +1,90 @@
+import type { AgentSessionClaimedSpawnResult } from '../../../shared/agent-session-host-authority'
+import type { PtySpawnResult } from '../../providers/pty-provider-contract'
+import { codexReattachedHomeRouteField } from './host-env/codex-home'
+import { commitAttachedPtySize } from './delivery/attached-pty-size'
+import type { admitProviderReattachLaunchIdentity } from './pane/launch-authority'
+import { registerPersistedPtySpawn } from './pane/spawn-registration'
+import { resolvePaneSpawnReservation } from './pane/spawn-reservation'
+import { savePtySpawnPaneBinding } from './spawn-commit-binding'
+import type { PtySpawnCommitInput } from './spawn-commit-assembly'
+
+export async function commitAdoptedAgentSession<Reply extends PtySpawnResult>(
+  input: PtySpawnCommitInput<Reply>,
+  adopted: AgentSessionClaimedSpawnResult,
+  providerReattachLaunchIdentity: ReturnType<typeof admitProviderReattachLaunchIdentity>
+): Promise<PtySpawnResult> {
+  const { state } = input
+  const { result } = state
+  const runtime = state.deps.runtime
+  let surface = adopted.owner.surface
+  if (state.args.switchExecution) {
+    const current = runtime?.resolveLiveTerminalSurface(result.id, result.incarnationId)
+    if (current) {
+      surface = current
+    } else if (input.registration.store) {
+      const binding = {
+        worktreeId: surface.worktreeId,
+        tabId: surface.tabId,
+        leafId: surface.leafId,
+        ptyId: result.id,
+        incarnationId: result.incarnationId,
+        mayCreate: false
+      }
+      await savePtySpawnPaneBinding(
+        state,
+        {
+          store: input.registration.store,
+          binding,
+          refusal: 'terminal_pane_owner_changed',
+          failureLog: 'Failed to reconcile attached terminal placement'
+        },
+        state.args.connectionId
+      )
+      surface = { ...surface, tabId: binding.tabId, leafId: binding.leafId }
+    }
+    result.switchRecoveredSurface = { tabId: surface.tabId, leafId: surface.leafId }
+  }
+  // Adoption proves attach even without the reply flag; size commit and joiners must agree.
+  const adoptedResult = { ...result, isReattach: true }
+  const rejectedRegistration = registerPersistedPtySpawn(
+    runtime,
+    input.registration.store,
+    state.pendingRegistrationClaim,
+    result.id,
+    surface.worktreeId,
+    null,
+    {
+      tabId: surface.tabId,
+      leafId: surface.leafId,
+      terminalHandle: surface.terminalHandle,
+      ...(result.incarnationId ? { incarnationId: result.incarnationId } : {}),
+      ...(providerReattachLaunchIdentity ? { providerReattachLaunchIdentity } : {})
+    }
+  )
+  if (rejectedRegistration) {
+    return rejectedRegistration
+  }
+  runtime?.noteTerminalSpawnCommit?.(result, input.expectedSourceBinding)
+  runtime?.registerPreAllocatedHandleForPty(result.id, surface.terminalHandle)
+  state.deps.options?.onCodexHomePtySpawned?.({
+    id: result.id,
+    codexHomePath: state.selectedCodexHomePath,
+    reattached: true,
+    startedAt: state.codexHomeLaunchStartedAt,
+    startedSequence: state.codexHomeLaunchStartedSequence,
+    ...codexReattachedHomeRouteField(state.reattachedCodexHomeRoutes, result.id, true),
+    ...(input.codexLaunchEnv ? { launchEnv: input.codexLaunchEnv } : {})
+  })
+  commitAttachedPtySize({
+    result: adoptedResult,
+    requested: { cols: state.args.cols, rows: state.args.rows },
+    cachedBeforeAttach: state.sessionSizeBeforeAttach,
+    reflowHeadlessTerminalToPtyGrid: runtime?.reflowHeadlessTerminalToPtyGrid?.bind(runtime)
+  })
+  resolvePaneSpawnReservation(
+    state.paneSpawnReservationKey,
+    state.paneSpawnReservation,
+    adoptedResult
+  )
+  return adoptedResult
+}
diff --git a/src/main/ipc/pty/spawn-commit-assembly.ts b/src/main/ipc/pty/spawn-commit-assembly.ts
index 216210f25da0..e6323b61e3b8 100644
--- a/src/main/ipc/pty/spawn-commit-assembly.ts
+++ b/src/main/ipc/pty/spawn-commit-assembly.ts
@@ -1,3 +1,4 @@
+import { agentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
 import { isValidTerminalTabId } from '../../../shared/terminal-tab-id'
 import type { AgentSessionClaimedSpawnResult } from '../../../shared/agent-session-host-authority'
 import type { GlobalSettings } from '../../../shared/global-settings-types'
@@ -11,11 +12,8 @@ import type { CodexPaneHomeRoute } from '../../codex/codex-pane-account-registry
 import type { CodexAccountSelectionTarget } from '../../codex-accounts/runtime-selection'
 import type { PtySpawnTiming } from './pty-spawn-timing'
 import type { CodexHomePtySpawnedLifecycleArgs } from './host-env/types'
-import {
-  codexReattachedHomeRouteField,
-  shouldSkipCodexHomeEnvForWindowsShell
-} from './host-env/codex-home'
-import { commitAttachedPtySize, type PtyGrid } from './delivery/attached-pty-size'
+import { shouldSkipCodexHomeEnvForWindowsShell } from './host-env/codex-home'
+import type { PtyGrid } from './delivery/attached-pty-size'
 import { seedTerminalRestoreRecordsFromSpawnResult } from './pane/agent-session-owners'
 import { admitProviderReattachLaunchIdentity } from './pane/launch-authority'
 import type { ReplacedPaneOwner } from './pane/replaced-pane-owner'
@@ -29,8 +27,13 @@ import type { StablePaneOwner } from './pane/stable-owner'
 import { seedHeadlessTerminalFromSpawnResult } from './pane/terminal-spawn-restore'
 import type { RuntimePtySpawnArgs } from './runtime/spawn-state'
 import { reportRuntimeResumeOutcome } from './runtime/spawn-commit-response'
-import { savePtySpawnPaneBinding, type PtySpawnPaneBinding } from './spawn-commit-binding'
+import {
+  closeUnusedSwitchSpawn,
+  savePtySpawnPaneBinding,
+  type PtySpawnPaneBinding
+} from './spawn-commit-binding'
 import { publishCommittedPtySpawn, type PtySpawnPaneKeyAliases } from './spawn-commit-publication'
+import { commitAdoptedAgentSession } from './spawn-commit-adopted-session'
 
 export type PtySpawnCommitState = {
   deps: {
@@ -52,6 +55,7 @@ export type PtySpawnCommitState = {
     | 'resumeProviderSession'
     | 'onResumeOutcome'
     | 'telemetry'
+    | 'switchExecution'
   > & { resumeOrigin?: unknown }
   result: PtySpawnResult
   provider: IPtyProvider
@@ -127,6 +131,23 @@ export async function commitPtySpawn<Reply extends PtySpawnResult>(
   const { result } = state
   const runtime = state.deps.runtime
   admitPtySpawnOwnership(runtime, result)
+  if (state.args.switchExecution) {
+    let revoked = result.switchOutcomeUnknown === true
+    try {
+      state.args.switchExecution.check()
+    } catch {
+      revoked = true
+    }
+    if (revoked) {
+      if (await closeUnusedSwitchSpawn(state.provider, result)) {
+        throw agentSessionRefusalError('agent_session_operation_expired', {
+          reason: 'operationExpired'
+        })
+      }
+      result.switchOutcomeUnknown = true
+      input.joinPayload.reply.switchOutcomeUnknown = true
+    }
+  }
   if (input.nativeWindowsConptySpawn) {
     markNativeWindowsConptyPty(result.id)
   }
@@ -149,6 +170,20 @@ export async function commitPtySpawn<Reply extends PtySpawnResult>(
   })
   if (input.paneBinding) {
     await savePtySpawnPaneBinding(state, input.paneBinding, state.args.connectionId)
+    if (result.switchOutcomeUnknown) {
+      input.joinPayload.reply.switchOutcomeUnknown = true
+    }
+    if (result.switchRecoveredSurface) {
+      const recovered = result.switchRecoveredSurface
+      state.args.tabId = recovered.tabId
+      state.metadataLeafId = recovered.leafId
+      input.paneKey = `${recovered.tabId}:${recovered.leafId}`
+      input.expectedSourceBinding = undefined
+      input.paneKeyAliases = undefined
+      input.joinPayload.reply.switchRecoveredSurface = recovered
+      input.joinPayload.reservation.switchRecoveredSurface = recovered
+      input.joinPayload.reservation.switchOutcomeUnknown = true
+    }
   }
   const { registration } = input
   if (registration.worktreeId) {
@@ -220,57 +255,3 @@ export async function commitPtySpawn<Reply extends PtySpawnResult>(
   }
   return publishCommittedPtySpawn(input)
 }
-
-function commitAdoptedAgentSession<Reply extends PtySpawnResult>(
-  input: PtySpawnCommitInput<Reply>,
-  adopted: AgentSessionClaimedSpawnResult,
-  providerReattachLaunchIdentity: ReturnType<typeof admitProviderReattachLaunchIdentity>
-): PtySpawnResult | Promise<never> {
-  const { state } = input
-  const { result } = state
-  const runtime = state.deps.runtime
-  // Adoption proves attach even without the reply flag; size commit and joiners must agree.
-  const adoptedResult = { ...result, isReattach: true }
-  const { surface } = adopted.owner
-  const rejectedRegistration = registerPersistedPtySpawn(
-    runtime,
-    input.registration.store,
-    state.pendingRegistrationClaim,
-    result.id,
-    surface.worktreeId,
-    null,
-    {
-      tabId: surface.tabId,
-      leafId: surface.leafId,
-      terminalHandle: surface.terminalHandle,
-      ...(result.incarnationId ? { incarnationId: result.incarnationId } : {}),
-      ...(providerReattachLaunchIdentity ? { providerReattachLaunchIdentity } : {})
-    }
-  )
-  if (rejectedRegistration) {
-    return rejectedRegistration
-  }
-  runtime?.noteTerminalSpawnCommit?.(result, input.expectedSourceBinding)
-  runtime?.registerPreAllocatedHandleForPty(result.id, surface.terminalHandle)
-  state.deps.options?.onCodexHomePtySpawned?.({
-    id: result.id,
-    codexHomePath: state.selectedCodexHomePath,
-    reattached: true,
-    startedAt: state.codexHomeLaunchStartedAt,
-    startedSequence: state.codexHomeLaunchStartedSequence,
-    ...codexReattachedHomeRouteField(state.reattachedCodexHomeRoutes, result.id, true),
-    ...(input.codexLaunchEnv ? { launchEnv: input.codexLaunchEnv } : {})
-  })
-  commitAttachedPtySize({
-    result: adoptedResult,
-    requested: { cols: state.args.cols, rows: state.args.rows },
-    cachedBeforeAttach: state.sessionSizeBeforeAttach,
-    reflowHeadlessTerminalToPtyGrid: runtime?.reflowHeadlessTerminalToPtyGrid?.bind(runtime)
-  })
-  resolvePaneSpawnReservation(
-    state.paneSpawnReservationKey,
-    state.paneSpawnReservation,
-    adoptedResult
-  )
-  return adoptedResult
-}
diff --git a/src/main/ipc/pty/spawn-commit-binding.test.ts b/src/main/ipc/pty/spawn-commit-binding.test.ts
new file mode 100644
index 000000000000..970ea518854b
--- /dev/null
+++ b/src/main/ipc/pty/spawn-commit-binding.test.ts
@@ -0,0 +1,72 @@
+import '../../runtime/orca-runtime-test-mocks.spec'
+import { expect, it, vi } from 'vitest'
+import {
+  fixture,
+  admitRuntimeSpawnPane
+} from '../../persistence/loading-store/profile-state-delayed-authority-fixture'
+import type { IPtyProvider, PtySpawnResult } from '../../providers/pty-provider-contract'
+import { savePtySpawnPaneBinding } from './spawn-commit-binding'
+
+vi.mock('./provider/liveness', () => ({ finishPtyShutdown: vi.fn() }))
+const worktreeId = 'repo-local::/fixture/local'
+const tabId = '11111111-1111-4111-8111-111111111111'
+const leafId = '22222222-2222-4222-8222-222222222222'
+const incarnationId = '33333333-3333-4333-8333-333333333333'
+
+it('reconciles a dispatched child through real topology creation after a queued binding loses to newer work', async () => {
+  const { store, authority } = await fixture()
+  await admitRuntimeSpawnPane(store, { worktreeId, tabId, leafId })
+  const pause = authority.pause()
+  const newer = store.persistPtyBinding({ worktreeId, tabId, leafId, ptyId: 'B', incarnationId })
+  await pause.started.promise
+  const shutdown = vi.fn()
+  const killFenced = vi.fn(async () => ({
+    outcome: 'refused' as const,
+    reason: 'unverifiable' as const
+  }))
+  // SAFETY: this schedule reaches only optional fenced cleanup, never any ordinary provider operation.
+  const provider = { killFenced, shutdown } as unknown as IPtyProvider
+  const result: PtySpawnResult = {
+    id: 'A',
+    incarnationId,
+    switchCleanupWitness: 'captured-before-spawn-reply'
+  }
+  const saving = savePtySpawnPaneBinding(
+    {
+      result,
+      provider,
+      args: {
+        switchExecution: {
+          invocationId: 'click',
+          signal: new AbortController().signal,
+          remaining: () => 100,
+          check: () => {
+            throw new Error('revoked')
+          }
+        }
+      },
+      deps: {}
+    },
+    {
+      store,
+      binding: { worktreeId, tabId, leafId, ptyId: 'A', incarnationId },
+      refusal: 'terminal_pane_owner_changed',
+      failureLog: 'expected binding conflict'
+    },
+    null
+  )
+  pause.finish.resolve()
+  await newer
+  await saving
+  expect(shutdown).not.toHaveBeenCalled()
+  expect(killFenced).toHaveBeenCalledOnce()
+  expect(result.switchOutcomeUnknown).toBe(true)
+  const recovered = result.switchRecoveredSurface!
+  expect(recovered.tabId).not.toBe(tabId)
+  const session = store.getWorkspaceSession()
+  expect(session.terminalLayoutsByTabId[tabId]?.ptyIdsByLeafId[leafId]).toBe('B')
+  expect(session.terminalLayoutsByTabId[recovered.tabId]?.ptyIdsByLeafId[recovered.leafId]).toBe(
+    'A'
+  )
+  expect(session.tabsByWorktree[worktreeId].some((row) => row.id === recovered.tabId)).toBe(true)
+})
diff --git a/src/main/ipc/pty/spawn-commit-binding.ts b/src/main/ipc/pty/spawn-commit-binding.ts
index a26731b2ca47..8fc5e217db7d 100644
--- a/src/main/ipc/pty/spawn-commit-binding.ts
+++ b/src/main/ipc/pty/spawn-commit-binding.ts
@@ -1,3 +1,4 @@
+import { randomUUID } from 'node:crypto'
 import type { Store } from '../../persistence'
 import type { PersistPtyBindingArgs } from '../../persistence/loading-store/pty-binding-persistence'
 import { ptyBindingIsRefused } from '../../persistence/loading-store/pty-binding-refusals'
@@ -13,7 +14,10 @@ import {
 } from './pane/pane-spawn-operation'
 import { swapReplacedPaneBinding } from './pane/pane-owner-replacement'
 import type { ReplacedPaneOwner } from './pane/replaced-pane-owner'
+import { finishPtyShutdown } from './provider/liveness'
+import { PtyExitProof } from '../../pty-exit-proof'
 import { discardUnpersistedPtySpawn } from './pane/spawn-registration'
+import type { AgentSessionSwitchAuthority } from '../../../shared/agent-session-switch-execution'
 
 /** A lane's pane binding for its new process, saved before the spawn is acknowledged. */
 export type PtySpawnPaneBinding = {
@@ -31,16 +35,29 @@ export async function savePtySpawnPaneBinding(
     result: PtySpawnResult
     provider: IPtyProvider
     replacedPaneOwner?: ReplacedPaneOwner | null
-    deps: { runtime?: OrcaRuntimeService }
+    args?: {
+      switchExecution?: AgentSessionSwitchAuthority
+    }
+    deps: { runtime?: OrcaRuntimeService; sendPtySpawnedToRenderer?: (id: string) => void }
   },
   { store, binding, absentOwner, refusal, failureLog }: PtySpawnPaneBinding,
   connectionId: string | null | undefined
 ): Promise<void> {
   const replaced = state.replacedPaneOwner
+  const observeAuthority = () => {
+    try {
+      state.args?.switchExecution?.check()
+    } catch {
+      state.result.switchOutcomeUnknown = true
+    }
+  }
   try {
     const persisted = replaced
-      ? await store.persistPtyBinding(swapReplacedPaneBinding(store, binding, replaced))
-      : await persistFreshPaneBinding(store, binding, connectionId, absentOwner)
+      ? await store.persistPtyBinding(() => {
+          observeAuthority()
+          return swapReplacedPaneBinding(store, binding, replaced)()
+        })
+      : await persistFreshPaneBinding(store, binding, connectionId, absentOwner, observeAuthority)
     if (persisted === false) {
       throw new Error(refusal)
     }
@@ -50,6 +67,31 @@ export async function savePtySpawnPaneBinding(
     }
   } catch (err) {
     console.error(failureLog, err)
+    if (state.args?.switchExecution) {
+      if (await closeUnusedSwitchSpawn(state.provider, state.result)) {
+        throw err
+      }
+      // A dispatched child can have acquired users during the durable wait; never generic-close it.
+      state.result.switchOutcomeUnknown = true
+      const recovered = { tabId: randomUUID(), leafId: randomUUID() }
+      // Rehome the real child through ordinary topology creation, never overwrite the winner.
+      const recovery: PersistPtyBindingArgs = {
+        worktreeId: binding.worktreeId,
+        ...recovered,
+        ptyId: binding.ptyId,
+        incarnationId: binding.incarnationId,
+        startupCwd: binding.startupCwd,
+        mayCreate: true
+      }
+      await store
+        .persistPtyBinding(recovery, connectionId ? toSshExecutionHostId(connectionId) : undefined)
+        .catch(() => false)
+      // Even a failed disk remains an owned, visibly published runtime terminal, not a second start.
+      state.result.switchRecoveredSurface = recovered
+      Object.assign(binding, recovery)
+      state.replacedPaneOwner = null
+      return
+    }
     await discardUnpersistedPtySpawn(state.provider, state.result, state.deps.runtime)
     if (
       err instanceof PaneOwnerContentionError ||
@@ -68,11 +110,13 @@ export async function persistFreshPaneBinding(
   store: Store,
   binding: PersistPtyBindingArgs,
   connectionId?: string | null,
-  absentOwner?: AbsentPaneBinding
+  absentOwner?: AbsentPaneBinding,
+  observeAuthority?: () => void
 ): Promise<boolean> {
   let targetChanged = false
   const hostId = connectionId ? toSshExecutionHostId(connectionId) : undefined
   const persisted = await store.persistPtyBinding(() => {
+    observeAuthority?.()
     const session = store.getWorkspaceSession(hostId)
     const paneKey = makePaneKey(binding.tabId, binding.leafId)
     if (ptyBindingIsRefused(binding, session, binding.worktreeId, paneKey, [])) {
@@ -95,3 +139,42 @@ export async function persistFreshPaneBinding(
   }
   return persisted
 }
+
+/** Only the original unused physical witness can authorize cleanup after a dispatched result. */
+export async function closeUnusedSwitchSpawn(
+  provider: IPtyProvider,
+  result: PtySpawnResult
+): Promise<boolean> {
+  if (
+    !result.switchCleanupWitness ||
+    !result.incarnationId ||
+    result.isReattach ||
+    result.agentSessionEnsure?.disposition === 'adopted'
+  ) {
+    return false
+  }
+  const cleanup = await provider
+    .killFenced?.({
+      id: result.id,
+      expectedIncarnationId: result.incarnationId,
+      requireNoAgentOwner: false,
+      requireUnattached: false,
+      switchCondition: {
+        token: result.switchCleanupWitness,
+        remainingMs: 8_000,
+        ownedSpawn: true,
+        claimGeneration: result.agentSessionEnsure?.owner.generation
+      }
+    })
+    .catch(() => undefined)
+  if (cleanup?.outcome !== 'ended' && cleanup?.outcome !== 'already_exited') {
+    return false
+  }
+  finishPtyShutdown(
+    result.id,
+    null,
+    undefined,
+    PtyExitProof.from('shutdown-acknowledged', result.incarnationId)
+  )
+  return true
+}
diff --git a/src/main/ipc/pty/spawn-commit-publication.ts b/src/main/ipc/pty/spawn-commit-publication.ts
index 88d1e6370d92..26b86ae283bf 100644
--- a/src/main/ipc/pty/spawn-commit-publication.ts
+++ b/src/main/ipc/pty/spawn-commit-publication.ts
@@ -36,6 +36,14 @@ export async function publishCommittedPtySpawn<Reply extends PtySpawnResult>(
 ): Promise<Reply> {
   const { state } = input
   const { deps, args, result } = state
+  let switchRevoked = result.switchOutcomeUnknown === true
+  try {
+    args.switchExecution?.check()
+  } catch {
+    switchRevoked = true
+  }
+  // A dispatched result still needs its ordinary binding and visible inventory.
+
   const runtime = deps.runtime
   runtime?.noteTerminalSpawnCommit?.(
     { ...result, spawnRequestedAt: state.spawnRequestedAt },
@@ -101,16 +109,18 @@ export async function publishCommittedPtySpawn<Reply extends PtySpawnResult>(
         : null
   })
   // Rejected spawns must not leave a published resume identity.
-  seedResumeLaunchIdentityFromSpawn({
-    paneKey: input.paneKey,
-    launchAgent: args.launchAgent,
-    resumeProviderSession: args.resumeProviderSession,
-    connectionId: args.connectionId,
-    worktreeId: args.worktreeId,
-    launchedAt: state.codexHomeLaunchStartedAt,
-    resumeArgvDropped: input.resumeArgvDropped,
-    result
-  })
+  if (!switchRevoked) {
+    seedResumeLaunchIdentityFromSpawn({
+      paneKey: input.paneKey,
+      launchAgent: args.launchAgent,
+      resumeProviderSession: args.resumeProviderSession,
+      connectionId: args.connectionId,
+      worktreeId: args.worktreeId,
+      launchedAt: state.codexHomeLaunchStartedAt,
+      resumeArgvDropped: input.resumeArgvDropped,
+      result
+    })
+  }
   // Inventory cannot infer background/reattached PTYs from mounted views.
   deps.sendPtySpawnedToRenderer(result.id)
   deps.options?.onCodexHomePtySpawned?.({
@@ -129,7 +139,9 @@ export async function publishCommittedPtySpawn<Reply extends PtySpawnResult>(
         ? { launchEnv: input.codexLaunchEnv }
         : {})
   })
-  await retireChatForAdmittedTerminalLaunch(runtime, args, input.joinPayload.reply)
+  if (!switchRevoked) {
+    await retireChatForAdmittedTerminalLaunch(runtime, args, input.joinPayload.reply)
+  }
   resolvePaneSpawnReservation(
     state.paneSpawnReservationKey,
     state.paneSpawnReservation,
diff --git a/src/main/ipc/runtime-environments/runtime-environment-request-connections.ts b/src/main/ipc/runtime-environments/runtime-environment-request-connections.ts
index 3e47d2bf3ac2..33c71848d16a 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-request-connections.ts
+++ b/src/main/ipc/runtime-environments/runtime-environment-request-connections.ts
@@ -204,6 +204,7 @@ export function subscribeRemoteRuntimeSharedControlRequest<TResult>(
   params: unknown,
   timeoutMs: number,
   callbacks: {
+    beforeSend?: () => void
     onResponse: (response: RuntimeRpcResponse<TResult>) => void
     onBinary?: (bytes: Uint8Array<ArrayBufferLike>) => void
     onError: (error: { code: string; message: string }) => void
diff --git a/src/main/ipc/runtime-environments/runtime-environment-subscription-controls.ts b/src/main/ipc/runtime-environments/runtime-environment-subscription-controls.ts
new file mode 100644
index 000000000000..22651e6e9519
--- /dev/null
+++ b/src/main/ipc/runtime-environments/runtime-environment-subscription-controls.ts
@@ -0,0 +1,57 @@
+import { ipcMain } from 'electron'
+import type {
+  RetainedRemoteRuntimeSubscription,
+  PendingRuntimeSubscription
+} from './runtime-environment-subscription-handlers'
+
+export function registerRuntimeEnvironmentSubscriptionControls(
+  remoteRuntimeSubscriptions: Map<string, RetainedRemoteRuntimeSubscription>,
+  pendingSubscriptions: Map<string, PendingRuntimeSubscription>
+): void {
+  ipcMain.handle(
+    'runtimeEnvironments:unsubscribe',
+    (event, args: { subscriptionId: string }): { unsubscribed: boolean } => {
+      const pending = pendingSubscriptions.get(args.subscriptionId)
+      if (pending?.ownerWebContentsId === event.sender.id) {
+        pending.close()
+        return { unsubscribed: true }
+      }
+      const subscription = remoteRuntimeSubscriptions.get(args.subscriptionId)
+      if (!subscription || subscription.ownerWebContentsId !== event.sender.id) {
+        return { unsubscribed: false }
+      }
+      remoteRuntimeSubscriptions.delete(args.subscriptionId)
+      subscription.close()
+      return { unsubscribed: true }
+    }
+  )
+  ipcMain.on(
+    'runtimeEnvironments:subscriptionBinary',
+    (event, args: { subscriptionId?: unknown; bytes?: unknown }) => {
+      if (typeof args.subscriptionId !== 'string') {
+        return
+      }
+      const bytes = toBinaryPayload(args.bytes)
+      if (!bytes) {
+        return
+      }
+      const subscription = remoteRuntimeSubscriptions.get(args.subscriptionId)
+      if (subscription?.ownerWebContentsId === event.sender.id) {
+        subscription.sendBinary(bytes)
+      }
+    }
+  )
+}
+
+function toBinaryPayload(value: unknown): Uint8Array<ArrayBufferLike> | null {
+  if (value instanceof Uint8Array) {
+    return value
+  }
+  if (value instanceof ArrayBuffer) {
+    return new Uint8Array(value)
+  }
+  if (ArrayBuffer.isView(value)) {
+    return new Uint8Array(value.buffer, value.byteOffset, value.byteLength)
+  }
+  return null
+}
diff --git a/src/main/ipc/runtime-environments/runtime-environment-subscription-handlers.ts b/src/main/ipc/runtime-environments/runtime-environment-subscription-handlers.ts
index c6921d5c83a6..c321d45799d7 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-subscription-handlers.ts
+++ b/src/main/ipc/runtime-environments/runtime-environment-subscription-handlers.ts
@@ -3,10 +3,14 @@ import { randomUUID } from 'node:crypto'
 import { abortWhenRendererGone } from '../renderer-lifetime-abort'
 import { resolveEnvironment } from '../../../shared/runtime-environment-store'
 import type { RemoteRuntimeSubscription } from '../../../shared/remote-runtime-client'
-import type { RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope'
+import type {
+  RuntimeRpcDispatchObservation,
+  RuntimeRpcResponse
+} from '../../../shared/runtime-rpc-envelope'
 import { isRuntimeEnvironmentManuallyDisconnected } from './runtime-environment-connectivity-handlers'
 import { getRuntimeEnvironmentTransportGeneration } from './runtime-environment-transport-generation'
 import { subscribeRuntimeEnvironment } from './runtime-environment-transport-routing'
+import { registerRuntimeEnvironmentSubscriptionControls } from './runtime-environment-subscription-controls'
 
 export type RetainedRemoteRuntimeSubscription = RemoteRuntimeSubscription & {
   setupController: AbortController
@@ -53,6 +57,8 @@ export function registerRuntimeEnvironmentSubscriptionHandlers(args: {
         timeoutMs?: number
         subscriptionId?: string
         expectedEnvironmentPairingRevision?: number
+        observeDispatch?: boolean
+        dispatchObservation?: RuntimeRpcDispatchObservation
         expectedEnvironmentRuntimeId?: string
       }
     ): Promise<{ subscriptionId: string; requestId: string }> => {
@@ -89,6 +95,10 @@ export function registerRuntimeEnvironmentSubscriptionHandlers(args: {
       const sender = event.sender
       const ownerWebContentsId = sender.id
       const setupController = new AbortController()
+      const dispatchBy =
+        args.dispatchObservation?.expiresAt ?? Date.now() + (args.timeoutMs ?? 30_000)
+      let dispatchTimer: ReturnType<typeof setTimeout> | undefined
+      let sentAt: number | undefined
       const associationObserver =
         args.method === 'agentSession.subscribeStatus'
           ? createAssociationObserver?.(
@@ -103,6 +113,7 @@ export function registerRuntimeEnvironmentSubscriptionHandlers(args: {
       let subscription: RemoteRuntimeSubscription | null = null
       const rendererLifetime = abortWhenRendererGone(sender)
       const disposeRendererLifetime = (): void => {
+        clearTimeout(dispatchTimer)
         associationObserver?.dispose()
         rendererLifetime.dispose()
         rendererLifetime.signal.removeEventListener('abort', closeSubscription)
@@ -144,6 +155,15 @@ export function registerRuntimeEnvironmentSubscriptionHandlers(args: {
       pendingSubscriptions.set(subscriptionId, pending)
       // A reload replaces the owning document without destroying its WebContents.
       rendererLifetime.signal.addEventListener('abort', closeSubscription, { once: true })
+      if (args.dispatchObservation) {
+        dispatchTimer = setTimeout(
+          () => {
+            notifyClosed()
+            closeSubscription()
+          },
+          Math.max(0, dispatchBy - Date.now())
+        )
+      }
       try {
         subscription = await subscribeRuntimeEnvironment(
           getUserDataPath(),
@@ -152,6 +172,40 @@ export function registerRuntimeEnvironmentSubscriptionHandlers(args: {
           args.params,
           args.timeoutMs,
           {
+            beforeSend:
+              args.observeDispatch || args.dispatchObservation
+                ? () => {
+                    if (
+                      !transportIsCurrent() ||
+                      setupController.signal.aborted ||
+                      Date.now() >= dispatchBy
+                    ) {
+                      throw new Error('request expired')
+                    }
+                    sentAt ??= Date.now()
+                    if (args.dispatchObservation) {
+                      clearTimeout(dispatchTimer)
+                      dispatchTimer = setTimeout(
+                        () => {
+                          notifyClosed()
+                          closeSubscription()
+                        },
+                        Math.max(
+                          0,
+                          (args.dispatchObservation.responseExpiresAt ??
+                            sentAt + args.dispatchObservation.responseTimeoutMs) - Date.now()
+                        )
+                      )
+                    }
+                    if (!sender.isDestroyed()) {
+                      sender.send('runtimeEnvironments:subscriptionEvent', {
+                        subscriptionId,
+                        type: 'sent',
+                        sentAt
+                      })
+                    }
+                  }
+                : undefined,
             onEvent: (payload) => {
               if (
                 rendererGone ||
@@ -169,7 +223,8 @@ export function registerRuntimeEnvironmentSubscriptionHandlers(args: {
               if (transportIsCurrent() && !sender.isDestroyed()) {
                 sender.send('runtimeEnvironments:subscriptionEvent', {
                   subscriptionId,
-                  ...payload
+                  ...payload,
+                  ...(args.observeDispatch && sentAt !== undefined ? { sentAt } : {})
                 })
                 if (payload.type === 'response' && payload.response.ok) {
                   try {
@@ -243,50 +298,5 @@ export function registerRuntimeEnvironmentSubscriptionHandlers(args: {
       return { subscriptionId, requestId: subscription.requestId }
     }
   )
-  ipcMain.handle(
-    'runtimeEnvironments:unsubscribe',
-    (event, args: { subscriptionId: string }): { unsubscribed: boolean } => {
-      const pending = pendingSubscriptions.get(args.subscriptionId)
-      if (pending?.ownerWebContentsId === event.sender.id) {
-        pending.close()
-        return { unsubscribed: true }
-      }
-      const subscription = remoteRuntimeSubscriptions.get(args.subscriptionId)
-      if (!subscription || subscription.ownerWebContentsId !== event.sender.id) {
-        return { unsubscribed: false }
-      }
-      remoteRuntimeSubscriptions.delete(args.subscriptionId)
-      subscription.close()
-      return { unsubscribed: true }
-    }
-  )
-  ipcMain.on(
-    'runtimeEnvironments:subscriptionBinary',
-    (event, args: { subscriptionId?: unknown; bytes?: unknown }) => {
-      if (typeof args.subscriptionId !== 'string') {
-        return
-      }
-      const bytes = toBinaryPayload(args.bytes)
-      if (!bytes) {
-        return
-      }
-      const subscription = remoteRuntimeSubscriptions.get(args.subscriptionId)
-      if (subscription?.ownerWebContentsId === event.sender.id) {
-        subscription.sendBinary(bytes)
-      }
-    }
-  )
-}
-
-function toBinaryPayload(value: unknown): Uint8Array<ArrayBufferLike> | null {
-  if (value instanceof Uint8Array) {
-    return value
-  }
-  if (value instanceof ArrayBuffer) {
-    return new Uint8Array(value)
-  }
-  if (ArrayBuffer.isView(value)) {
-    return new Uint8Array(value.buffer, value.byteOffset, value.byteLength)
-  }
-  return null
+  registerRuntimeEnvironmentSubscriptionControls(remoteRuntimeSubscriptions, pendingSubscriptions)
 }
diff --git a/src/main/ipc/runtime-environments/runtime-environment-support-routing.ts b/src/main/ipc/runtime-environments/runtime-environment-support-routing.ts
index 651da41f68d0..4edbc0625690 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-support-routing.ts
+++ b/src/main/ipc/runtime-environments/runtime-environment-support-routing.ts
@@ -49,6 +49,7 @@ type SubscriptionCallbacks = {
       | { type: 'close' }
   ) => void
   onClose: () => void
+  beforeSend?: () => void
 }
 
 export function shouldRouteCallBySupport(method: string, environmentId: string): boolean {
@@ -141,17 +142,20 @@ export async function subscribeSupportRoutedRuntimeEnvironment(args: {
 }): Promise<RemoteRuntimeSubscription> {
   let markedUsed = false
   let supportOutcome: SupportRoute['outcome'] | null = null
-  const callbacks = subscriptionCallbacks(args, () => {
-    if (
-      markedUsed ||
-      !args.isCurrent() ||
-      (supportOutcome && !isRuntimeEnvironmentCapabilityOutcomeCurrent(supportOutcome))
-    ) {
-      return false
-    }
-    markedUsed = true
-    return true
-  })
+  const callbacks = {
+    beforeSend: args.callbacks.beforeSend,
+    ...subscriptionCallbacks(args, () => {
+      if (
+        markedUsed ||
+        !args.isCurrent() ||
+        (supportOutcome && !isRuntimeEnvironmentCapabilityOutcomeCurrent(supportOutcome))
+      ) {
+        return false
+      }
+      markedUsed = true
+      return true
+    })
+  }
   const routed = await routeRuntimeEnvironmentSubscriptionBySupport({
     userDataPath: args.userDataPath,
     environment: args.environment,
diff --git a/src/main/ipc/runtime-environments/runtime-environment-transport-routing.ts b/src/main/ipc/runtime-environments/runtime-environment-transport-routing.ts
index b770a709127b..d76b57fbe052 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-transport-routing.ts
+++ b/src/main/ipc/runtime-environments/runtime-environment-transport-routing.ts
@@ -159,6 +159,7 @@ export async function subscribeRuntimeEnvironment(
         | { type: 'close' }
     ) => void
     onClose: () => void
+    beforeSend?: () => void
   },
   isCurrent: () => boolean = () => true,
   signal?: AbortSignal
@@ -179,6 +180,7 @@ export async function subscribeRuntimeEnvironment(
     recordRuntimeEnvironmentUsage(userDataPath, environment.id, { runtimeId })
   }
   const callbacksWithMarkUsed = {
+    beforeSend: rawCallbacks.beforeSend,
     onResponse: (response: RuntimeRpcResponse<unknown>) => {
       if (response.ok === true) {
         markUsedOnce(response._meta.runtimeId)
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition.ts
index 2ddef409a533..64eb45870317 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition.ts
@@ -56,6 +56,11 @@ export async function acquireOwner(
     if (input.acquireSignal?.aborted) {
       throw new AgentSessionPreSpawnError(abortSignalReason(input.acquireSignal))
     }
+    try {
+      input.checkBeforeAcquire?.()
+    } catch (error) {
+      throw new AgentSessionPreSpawnError(error)
+    }
     const attempt = mintStructuredAgentSessionStartupAttempt({
       record,
       identity: journalIdentityFor(record, input.params),
@@ -70,6 +75,7 @@ export async function acquireOwner(
     const progress = input.onStartupAttempt?.(attempt)
     const acquired = await input.adapter.acquire({
       ...attempt,
+      checkBeforeSpawn: input.checkBeforeAcquire,
       ...(input.recordPhase ? { recordPhase: input.recordPhase } : {}),
       onSpawned: async (process) => {
         progress?.spawned()
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 5e7df9405d88..04e7e4e492e3 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
@@ -147,6 +147,7 @@ export type StructuredAgentSessionAcquireInput = Pick<
   'identity' | 'fence' | 'spawnToken'
 > &
   Partial<Omit<StructuredAgentSessionStartupAttempt, 'identity' | 'fence' | 'spawnToken'>> & {
+    checkBeforeSpawn?: () => void
     recordPhase?: AgentSessionCreatePhaseRecorder
     /** Persist process identity before handshake so mid-start crashes leave a recoverable owner; returned process must match. */
     onSpawned?: (process: AgentSessionProcessIdentity) => Promise<void>
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-adopted-import.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-adopted-import.test.ts
index 57a7f56ba97b..d30ea7827b35 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-adopted-import.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-adopted-import.test.ts
@@ -1,5 +1,4 @@
 import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types'
-
 import { appendFile, mkdtemp, rm, writeFile } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
@@ -296,7 +295,7 @@ describe('adopting a provider conversation on create', () => {
     expect(sessionAdapter.acquire).toHaveBeenCalledTimes(1)
   })
 
-  it.each(['missing', 'oversized', 'empty', 'invalid', 'source-less'] as const)(
+  it.each(['missing', 'oversized', 'empty', 'metadata-only', 'invalid', 'source-less'] as const)(
     'refuses %s source before claiming a conversation',
     async (kind) => {
       root = await mkdtemp(join(tmpdir(), 'orca-adopt-preflight-'))
@@ -304,6 +303,11 @@ describe('adopting a provider conversation on create', () => {
       if (kind === 'oversized') {
         await writeCodexRollout(transcriptPath, 'original turn')
         await appendFile(transcriptPath, 'x'.repeat(16 * 1024 * 1024 + 1))
+      } else if (kind === 'metadata-only') {
+        await writeFile(
+          transcriptPath,
+          `${JSON.stringify({ type: 'session_meta', payload: { id: THREAD, cwd: '/workspace' } })}\n`
+        )
       } else if (kind === 'empty' || kind === 'invalid') {
         await writeFile(transcriptPath, kind === 'empty' ? '' : 'not json\n')
       }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-adopted-import.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-adopted-import.ts
index e52b4cb07e9b..822bcd73aa12 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-adopted-import.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-adopted-import.ts
@@ -1,3 +1,4 @@
+import { isNativeConversationMessage } from '../../../shared/agent-session-native-content'
 import {
   agentSessionRefusalError,
   isAgentSessionRefusalError,
@@ -55,7 +56,7 @@ async function readAdoptedTranscript(
   if (!prepared.ok) {
     throw new Error(prepared.error)
   }
-  if (prepared.items.length === 0) {
+  if (!prepared.items.some(({ body }) => isNativeConversationMessage(body))) {
     throw agentSessionRefusalError('agent_session_identity_required', {
       reason: prepared.sourceEmpty ? 'transcriptNotFound' : 'transcriptUnreadable'
     })
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-agent-start.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-agent-start.ts
index e9bb1c7216ff..0d2396f5c046 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-agent-start.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-agent-start.ts
@@ -1,6 +1,3 @@
-// Only queued work or provider operations start children. Run waits outside serialization;
-// fence each state commit so concurrent sends remain immediately acceptable.
-
 import {
   providerDiagnosticOf,
   type SubmissionRejectionFact,
@@ -31,12 +28,16 @@ import {
   joinClosingStructuredAgentSessionChild,
   releaseLeaseOfEndedStructuredAgentSessionChild
 } from './structured-agent-session-child-close'
-export { joinClosingStructuredAgentSessionChild }
 import {
   refusedStructuredAgentSessionStart,
   structuredAgentSessionStartParams
 } from './structured-agent-session-start-eligibility'
 
+// Only queued work or provider operations start children. Run waits outside serialization;
+// fence each state commit so concurrent sends remain immediately acceptable.
+
+export { joinClosingStructuredAgentSessionChild }
+
 /** Preserve attach refusal verdicts so callers distinguish recovery in progress from permanent loss. */
 export type StructuredAgentSessionResumeOutcome =
   | { ok: true }
@@ -53,6 +54,7 @@ export type StructuredAgentSessionResumeOutcome =
       retry?: boolean
       failure?: SubmissionRejectionFact
       startKey?: string | null
+      failureItemId?: string
     }
 
 const AGENT_START_CALLER_KEY = 'trusted-local:agent-start'
@@ -65,7 +67,8 @@ export type StructuredAgentSessionStartClaim = {
 export function claimStructuredAgentSessionAgent(
   context: StructuredAgentSessionAttachContext,
   sessionId: string,
-  startedFor?: string
+  startedFor?: string,
+  check?: () => void
 ): StructuredAgentSessionStartClaim {
   const session = context.sessions.get(sessionId)
   const child = session?.child
@@ -84,7 +87,7 @@ export function claimStructuredAgentSessionAgent(
       context,
       sessionId,
       startedFor,
-      (lock, attemptId) => runStart(context, sessionId, startedFor, lock, attemptId)
+      (lock, attemptId) => runStart(context, sessionId, startedFor, lock, attemptId, check)
     )
   }
 }
@@ -111,9 +114,11 @@ export function startStructuredAgentSessionAgentForOperation(
 
 export function claimOperationStart(
   context: StructuredAgentSessionAttachContext,
-  sessionId: string
+  sessionId: string,
+  check?: () => void
 ): StructuredAgentSessionStartClaim {
-  const claim = claimStructuredAgentSessionAgent(context, sessionId)
+  check?.()
+  const claim = claimStructuredAgentSessionAgent(context, sessionId, undefined, check)
   return {
     outcome: claim.outcome.catch((error: unknown) => {
       context.deps.logger.warn('starting the agent for an operation failed', {
@@ -131,8 +136,12 @@ async function runStart(
   sessionId: string,
   startedFor: string | undefined,
   lock: StructuredAgentSessionAttachLock,
-  attemptId: string
+  attemptId: string,
+  check?: () => void
 ): Promise<StructuredAgentSessionResumeOutcome> {
+  if (context.waitSwitchPhysical) {
+    await lock.wait(context.waitSwitchPhysical(sessionId))
+  }
   // Never start beside a closing child; unverifiable exit refuses the restart.
   const closed = await joinClosingStructuredAgentSessionChild(context, sessionId, lock)
   if (!closed.ok) {
@@ -162,6 +171,7 @@ async function runStart(
   try {
     attached = await attachStructuredAgentSessionForStart(context, callerKey, params, {
       lock,
+      checkBeforeAcquire: check,
       startupAttemptId: attemptId,
       ...(startedFor === undefined ? {} : { startedFor }),
       ...(startupOptions ? { startupOptions } : {}),
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.test.ts
new file mode 100644
index 000000000000..a49a4c54f8f7
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.test.ts
@@ -0,0 +1,133 @@
+import { mkdtemp, rm, writeFile } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { agentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
+import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding'
+import { createTrackedJournalOpener } from '../agent-session-journal/journal-host-database-test-support'
+import { readCodexHistoryJournalView } from '../../codex/codex-history-journal-view'
+import { catchUpStructuredSessionAtRest } from './structured-agent-session-at-rest-catch-up'
+
+const journals = createTrackedJournalOpener()
+let root: string
+const deadlines: ReturnType<typeof agentSessionSwitchDeadline>[] = []
+beforeEach(async () => {
+  root = await mkdtemp(join(tmpdir(), 'orca-switch-history-'))
+})
+afterEach(async () => {
+  deadlines.forEach((deadline) => deadline.dispose())
+  deadlines.length = 0
+  await journals.closeAll()
+  await rm(root, { recursive: true, force: true })
+})
+const options = () => ({
+  stateDirectory: root,
+  identity: {
+    sessionId: 'native',
+    workspaceId: 'folder',
+    hostId: 'local',
+    agent: 'codex' as const,
+    providerHandle: codexProviderHandle('019aef12-1234-7000-8000-123456789abc')
+  }
+})
+const threadId = '019aef12-1234-7000-8000-123456789abc'
+function transcript(complete: boolean) {
+  const row = (type: string, payload: object) =>
+    JSON.stringify({
+      timestamp: '2026-10-26T12:00:00Z',
+      type,
+      payload
+    })
+  return `${[
+    row('session_meta', { id: threadId }),
+    row('event_msg', { type: 'task_started', turn_id: 'turn-cli-1' }),
+    row('response_item', {
+      type: 'message',
+      role: 'user',
+      content: [{ type: 'input_text', text: 'Continue the terminal change' }]
+    }),
+    row('response_item', {
+      type: 'message',
+      role: 'assistant',
+      content: [{ type: 'output_text', text: 'Implemented and verified.' }]
+    }),
+    ...(complete ? [row('event_msg', { type: 'task_complete', turn_id: 'turn-cli-1' })] : [])
+  ].join('\n')}\n`
+}
+async function refresh(journal: Awaited<ReturnType<typeof journals.open>>, complete: boolean) {
+  const filePath = join(root, 'rollout.jsonl')
+  await writeFile(filePath, transcript(complete))
+  const deadline = agentSessionSwitchDeadline()
+  deadlines.push(deadline)
+  return catchUpStructuredSessionAtRest({ journal, threadId, filePath, fence: 1, deadline })
+}
+it('opens native-founded CLI history without a provider, survives restart and does not duplicate a second return', async () => {
+  let journal = await journals.open(options())
+  expect(journal.historyOrigin()).toBeNull()
+  await refresh(journal, true)
+  const snapshot = journal.snapshot()
+  expect(snapshot.items.filter((item) => item.body.kind === 'message')).toHaveLength(2)
+  expect(readCodexHistoryJournalView(journal, threadId)).toMatchObject({
+    unresolvedOrigin: false,
+    importedAt: null
+  })
+  expect(readCodexHistoryJournalView(journal, threadId).known.has('turn-cli-1')).toBe(true)
+  await journal.close()
+  journal = await journals.open(options())
+  await refresh(journal, true)
+  expect(journal.snapshot()).toEqual(snapshot)
+})
+it('never turns a partially written CLI turn into covered history', async () => {
+  const journal = await journals.open(options())
+  const before = journal.snapshot()
+  await expect(refresh(journal, false)).rejects.toMatchObject({
+    refusal: { details: { reason: 'messagesUnsettled' } }
+  })
+  expect(journal.snapshot()).toEqual(before)
+  await refresh(journal, true)
+  expect(readCodexHistoryJournalView(journal, threadId).known.has('turn-cli-1')).toBe(true)
+})
+
+it.each([100, 1000])(
+  'imports a real %i-turn Codex corpus with bounded journal passes and idempotent repeat',
+  async (count) => {
+    const journal = await journals.open(options())
+    const filePath = join(root, 'scale-rollout.jsonl')
+    const turns = Array.from({ length: count }, (_, i) =>
+      transcript(true)
+        .split('\n')
+        .filter((row) => row && !row.includes('session_meta'))
+        .join('\n')
+        .replaceAll('turn-cli-1', `turn-cli-${i}`)
+    )
+    const source = `${transcript(true).split('\n')[0]}\n${turns.join('\n')}\n`
+    await writeFile(filePath, source)
+    const deadline = agentSessionSwitchDeadline()
+    deadlines.push(deadline)
+    let scanned = 0
+    const visit = journal.visitItemsWithLinkage.bind(journal)
+    const visits = vi.spyOn(journal, 'visitItemsWithLinkage').mockImplementation((callback) =>
+      visit((...args) => {
+        scanned++
+        callback(...args)
+      })
+    )
+    const started = performance.now()
+    await catchUpStructuredSessionAtRest({ journal, threadId, filePath, fence: 1, deadline })
+    const first = journal.snapshot()
+    expect(first.items.filter((item) => item.body.kind === 'message')).toHaveLength(2 * count)
+    await catchUpStructuredSessionAtRest({ journal, threadId, filePath, fence: 1, deadline })
+    expect(journal.snapshot()).toEqual(first)
+    expect(visits.mock.calls.length).toBeLessThanOrEqual(3)
+    expect(scanned).toBeLessThanOrEqual(12 * count)
+    console.info(
+      JSON.stringify({
+        scanned,
+        corpus: 'codex-at-rest',
+        turns: count,
+        bytes: Buffer.byteLength(source),
+        elapsedMs: performance.now() - started
+      })
+    )
+  }
+)
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.ts
new file mode 100644
index 000000000000..24f1dd18023d
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.ts
@@ -0,0 +1,181 @@
+import { createHash } from 'node:crypto'
+import { createReadStream } from 'node:fs'
+import { asRecord, parseJsonObject } from '../../ai-vault/session-scanner-values'
+import {
+  readCodexHistoryJournalView,
+  sameCodexHistoryJournalView
+} from '../../codex/codex-history-journal-view'
+import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key'
+import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types'
+import { agentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
+import type { AgentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
+import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
+import { createLegacyIdentityTracker } from '../agent-session-journal/journal-legacy-identity'
+import {
+  legacyItemBody,
+  LEGACY_IMPORT_BLOCK_LIMITS
+} from '../agent-session-journal/journal-legacy-import'
+import type { JournalReplacementItem } from '../agent-session-journal/journal-epoch-replacement'
+import { splitTranscriptStreamLines } from '../transcript-stream-lines'
+import { decodeCodexTranscriptLine } from '../transcript-line-decoders-codex'
+import { decodeCodexTurnLifecycle } from '../transcript-turn-lifecycle'
+
+/** Refresh a retained read owner without starting a provider or replacing native submissions. */
+export async function catchUpStructuredSessionAtRest(input: {
+  journal: AgentSessionJournal
+  threadId: string
+  filePath: string
+  fence: number
+  deadline: AgentSessionSwitchDeadline
+}): Promise<void> {
+  const { journal, threadId, deadline } = input
+  const view = readCodexHistoryJournalView(journal, threadId)
+  const tracker = createLegacyIdentityTracker({
+    transcriptAgent: 'codex',
+    agent: 'codex',
+    sessionId: threadId
+  })
+  if (view.unresolvedOrigin) {
+    throw agentSessionRefusalError('agent_session_identity_required', {
+      reason: 'transcriptUnreadable'
+    })
+  }
+  const items: JournalReplacementItem[] = []
+  let bytes = 0
+  const retain = (item: JournalReplacementItem) => {
+    bytes += Buffer.byteLength(JSON.stringify(item))
+    if (bytes > 16 * 1024 * 1024) {
+      throw agentSessionRefusalError('agent_session_identity_required', {
+        reason: 'transcriptUnreadable'
+      })
+    }
+    items.push(item)
+  }
+  let turn: string | undefined
+  let include = false
+  let identityConfirmed = false
+  let paginated = false
+  let index = 0
+  const stream = createReadStream(input.filePath, { signal: deadline.signal })
+  for await (const { line } of splitTranscriptStreamLines(stream, 16 * 1024 * 1024)) {
+    deadline.check()
+    const identity = tracker.identify(line, index++)
+    const record = parseJsonObject(line)
+    const payload = asRecord(record?.payload)
+    if (record?.type === 'session_meta') {
+      if (payload?.id !== threadId) {
+        throw agentSessionRefusalError('agent_session_identity_required', {
+          reason: 'transcriptUnreadable'
+        })
+      }
+      identityConfirmed = true
+      paginated = payload?.history_mode === 'paginated'
+    }
+    const lifecycle = decodeCodexTurnLifecycle(line, '')
+    if (lifecycle?.state === 'working') {
+      if (include) {
+        throw agentSessionRefusalError('agent_session_operation_invalid', {
+          reason: 'messagesUnsettled'
+        })
+      }
+      turn = lifecycle.turnId || undefined
+      include = Boolean(
+        turn &&
+        !view.known.has(turn) &&
+        lifecycle.timestamp !== null &&
+        (view.importedAt === null || lifecycle.timestamp > view.importedAt)
+      )
+    }
+    if (!include || !turn) {
+      continue
+    }
+    if (lifecycle && lifecycle.state !== 'working') {
+      if (lifecycle.turnId !== turn) {
+        throw agentSessionRefusalError('agent_session_operation_invalid', {
+          reason: 'messagesUnsettled'
+        })
+      }
+      retain({
+        identity: {
+          provider: 'legacy',
+          agent: 'codex',
+          sessionId: threadId,
+          recordId: `turn-lifecycle:${turn}`
+        },
+        body: {
+          kind: 'turn',
+          turnId: turn,
+          state: lifecycle.state,
+          ...(lifecycle.timestamp === null ? {} : { completedAt: lifecycle.timestamp })
+        },
+        ownerFence: 0,
+        turnScope: AGENT_JOURNAL_THREAD_SCOPE
+      })
+      include = false
+      continue
+    }
+    if (
+      paginated &&
+      (record?.type === 'response_item' ||
+        (record?.type === 'event_msg' && payload?.type !== 'item_completed'))
+    ) {
+      continue
+    }
+    const message = decodeCodexTranscriptLine(line, `#${index - 1}`)
+    if (message) {
+      retain({
+        identity,
+        body: legacyItemBody(message, LEGACY_IMPORT_BLOCK_LIMITS),
+        ownerFence: 0,
+        turnScope: {
+          kind: 'turn',
+          turnItemId: agentJournalItemKey({
+            provider: 'legacy',
+            agent: 'codex',
+            sessionId: threadId,
+            recordId: `turn-lifecycle:${turn}`
+          })
+        },
+        ...(message.timestamp === null ? {} : { observedAt: message.timestamp })
+      })
+    }
+  }
+  deadline.check()
+  if (!identityConfirmed) {
+    throw agentSessionRefusalError('agent_session_identity_required', {
+      reason: 'transcriptUnreadable'
+    })
+  }
+  // Incomplete source turns must remain retryable rather than being declared covered.
+  if (include) {
+    throw agentSessionRefusalError('agent_session_operation_invalid', {
+      reason: 'messagesUnsettled'
+    })
+  }
+  if (!items.length) {
+    return
+  }
+  const digest = createHash('sha256').update(JSON.stringify(items)).digest('hex')
+  await journal.appendPlannedLifecycleBatch({
+    settlementId: `at-rest:${digest}`,
+    fence: input.fence,
+    plan: () => {
+      deadline.check()
+      if (!sameCodexHistoryJournalView(view, readCodexHistoryJournalView(journal, threadId))) {
+        throw agentSessionRefusalError('agent_session_operation_invalid', {
+          reason: 'messagesUnsettled'
+        })
+      }
+      return {
+        dispatches: [],
+        mutations: items
+          .filter((item) => !journal.item(agentJournalItemKey(item.identity)))
+          .map((item) => ({
+            kind: 'item' as const,
+            ...item,
+            turnScope: item.turnScope ?? AGENT_JOURNAL_THREAD_SCOPE
+          }))
+      }
+    }
+  })
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-attach-context.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-attach-context.ts
index 2c8ee130ea6c..3bd448cb281d 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-attach-context.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-attach-context.ts
@@ -27,6 +27,7 @@ export type StructuredAgentSessionAttachContext = {
   }
   tasks: StructuredAgentSessionTaskQueue
   reconcileLeases: (sessionId: string) => Promise<AgentSessionWireRefusal | null>
+  waitSwitchPhysical?: (sessionId: string) => Promise<void>
   serialize: <T>(sessionId: string, task: () => Promise<T>) => Promise<T>
   now: () => number
   publishStatus: (sessionId: string) => void
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-attach-flow.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-attach-flow.ts
index b159505f97d2..f18f1949b527 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-attach-flow.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-attach-flow.ts
@@ -58,6 +58,7 @@ import {
 export type AttachedOwner = 'acquired' | 'kept' | 'none'
 
 export type AttachFlowInput = {
+  checkBeforeAcquire?: () => void
   store: AgentSessionRecordStore
   adapter: StructuredAgentSessionAdapter
   agents: Pick<StructuredAgentRegistry, 'definition'>
@@ -150,8 +151,9 @@ export async function performAttach(
   }
   try {
     const reserved = await withAgentSessionCreatePhase('reserve_owner', input.recordPhase, () =>
-      lock.commit(() =>
-        store.reserveOwner(
+      lock.commit(() => {
+        input.checkBeforeAcquire?.()
+        return store.reserveOwner(
           reserveRequestFor({
             sessionId,
             params,
@@ -160,9 +162,10 @@ export async function performAttach(
             fingerprint: admitted.fingerprint,
             now: input.now(),
             models: input.models
-          })
+          }),
+          input.checkBeforeAcquire
         )
-      )
+      })
     )
     record = reserved.record
     replayed = reserved.disposition === 'replayed'
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-attach-options.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-attach-options.ts
new file mode 100644
index 000000000000..cb8ffdfb7b54
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-attach-options.ts
@@ -0,0 +1,22 @@
+import type { AttachFlowInput } from './structured-agent-session-attach-flow'
+
+import type { AgentSessionCreatePhaseRecorder } from '../../observability/agent-session-instrumentation'
+import type { StructuredAgentSessionAttachLock } from './structured-agent-session-attach-lock'
+
+export type StructuredAgentSessionAttachOptions = {
+  checkBeforeAcquire?: () => void
+  hostLaunchDirectory?: string
+  catalogModels?: AttachFlowInput['models']
+  recordPhase?: AgentSessionCreatePhaseRecorder
+  onAcquisitionFailed?: AttachFlowInput['onAcquisitionFailed']
+  startedFor?: string
+  startupOptions?: Readonly<Record<string, string>>
+  /** Preserve cancellation reason when host Stop/close/quit aborts attach. */
+  onAborted?: () => void
+  /** Startup expiry is failure, not user cancellation. */
+  onStartupExpired?: () => void
+  /** Background starts wait outside serialization and commit under it. */
+  lock?: StructuredAgentSessionAttachLock
+  startupAttemptId?: string
+  onPublished?: () => void
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-attach-orchestration.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-attach-orchestration.ts
index 59ccc977485c..4f27629f207a 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-attach-orchestration.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-attach-orchestration.ts
@@ -5,7 +5,6 @@ import {
   type AttachCandidate,
   type BoundAttach
 } from './structured-agent-session-attach-publish'
-
 import { agentSessionLeaseAdmitsWriter } from '../../../shared/agent-session-lease-adjudication'
 import { refuse } from '../../../shared/agent-session-wire-refusals'
 import { randomUUID } from 'node:crypto'
@@ -15,7 +14,7 @@ import type {
   AgentSessionMutationResult
 } from '../../../shared/agent-session-wire'
 import type { AgentSessionAttachParams } from './structured-agent-session-attach'
-import { performAttach, type AttachFlowInput } from './structured-agent-session-attach-flow'
+import { performAttach } from './structured-agent-session-attach-flow'
 import { endStructuredAgentSessionReleasedChild } from './structured-agent-session-attach-failure'
 import { stampFailedCreateOwnerVerdict } from './structured-agent-session-failed-create-refusal'
 import {
@@ -42,25 +41,8 @@ import {
   heldStructuredAgentSessionAttachLock,
   type StructuredAgentSessionAttachLock
 } from './structured-agent-session-attach-lock'
+import type { StructuredAgentSessionAttachOptions } from './structured-agent-session-attach-options'
 
-export type StructuredAgentSessionAttachOptions = {
-  hostLaunchDirectory?: string
-  catalogModels?: AttachFlowInput['models']
-  recordPhase?: AgentSessionCreatePhaseRecorder
-  onAcquisitionFailed?: AttachFlowInput['onAcquisitionFailed']
-  startedFor?: string
-  startupOptions?: Readonly<Record<string, string>>
-  /** Preserve cancellation reason when host Stop/close/quit aborts attach. */
-  onAborted?: () => void
-  /** Startup expiry is failure, not user cancellation. */
-  onStartupExpired?: () => void
-  /** Background starts wait outside serialization and commit under it. */
-  lock?: StructuredAgentSessionAttachLock
-  startupAttemptId?: string
-  onPublished?: () => void
-}
-
-/** Share attach steps; background starts use a lock, client attaches hold serialization throughout. */
 export function attachStructuredAgentSessionForStart(
   context: StructuredAgentSessionAttachContext,
   callerKey: string,
@@ -130,7 +112,6 @@ export function attachStructuredAgentSession(
     }
   })
 }
-
 async function runAttach(
   context: StructuredAgentSessionAttachContext,
   callerKey: string,
@@ -233,6 +214,7 @@ async function runAttachUnderAbort(
       now: () => context.now(),
       recordPhase,
       acquireSignal: lock.signal,
+      checkBeforeAcquire: options.checkBeforeAcquire,
       lock,
       ...(options.startupAttemptId ? { startupAttemptId: options.startupAttemptId } : {}),
       onStartupAttempt: (startup) => {
@@ -318,3 +300,5 @@ async function runAttachUnderAbort(
     }
   }
 }
+
+export type { StructuredAgentSessionAttachOptions } from './structured-agent-session-attach-options'
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-child-close.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-child-close.ts
index 0ec7cc40e5d6..0de87c682e40 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-child-close.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-child-close.ts
@@ -16,10 +16,12 @@ export type StructuredAgentSessionChildCloseVerdict = 'exited' | 'unverifiable'
 export async function joinStructuredAgentSessionChildClose(
   context: StructuredAgentSessionLifetimeContext,
   sessionId: string,
-  child: StructuredAgentSessionProviderChild
+  child: StructuredAgentSessionProviderChild,
+  check?: () => void
 ): Promise<StructuredAgentSessionChildCloseVerdict> {
   // Capture startup state before provider release loses that evidence.
   const unanswered = child.phase === 'starting'
+  check?.()
   if (!(await closeProviderRoot(context, sessionId))) {
     return 'unverifiable'
   }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-conversation-lifetime.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-conversation-lifetime.ts
index d3156b9adc77..ee0845bac999 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-conversation-lifetime.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-conversation-lifetime.ts
@@ -1,7 +1,4 @@
 import type { StructuredAgentSessionConversationLifetimeHost } from './structured-agent-session-conversation-lifetime-host'
-import { retryableStructuredAgentSessionStart } from './structured-agent-session-start-retry'
-// Open conversations at rest; never start agents for reads. Acquire serialization once because the queue is nonreentrant.
-
 import {
   AgentSessionRefusalError,
   agentSessionRefusalError
@@ -23,16 +20,12 @@ import { sameProviderChild } from './structured-agent-session-provider-child'
 import type { ExecutionHostId } from '../../../shared/execution-host'
 import * as sleep from './structured-agent-session-workspace-sleep-stop'
 import type { StructuredAgentSessionExpiredStartup } from './structured-agent-session-startup-attempt'
-import {
-  providerStartupFailureFact,
-  structuredAgentSessionStartFailure
-} from './structured-agent-session-failure-text'
-import {
-  oldestQueuedSubmission,
-  recordStructuredAgentSessionStartFailure
-} from './structured-agent-session-start-failure-row'
-import { structuredAgentSessionFailureWordsContext } from './structured-agent-session-send-preparation'
 import * as switchAdmission from './structured-agent-session-switch-admission'
+import type { AgentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
+import { settleStructuredAgentSessionFailedStart } from './structured-agent-session-failed-start-settlement'
+import { createStructuredAgentSessionSwitchCommands } from './structured-agent-session-switch-commands'
+
+// Open conversations at rest; never start agents for reads. Acquire serialization once because the queue is nonreentrant.
 
 export type StructuredAgentSessionConversationLifetime = ReturnType<
   typeof createStructuredAgentSessionConversationLifetime
@@ -44,13 +37,18 @@ export function createStructuredAgentSessionConversationLifetime(
   let disposed = false
   const { sessions, serialize } = host
   const deps = () => host.context().deps
+  const switchCommands = createStructuredAgentSessionSwitchCommands(host, () => disposed)
   const readRefusals = createJournalOpenReadRefusals(
     deferredStructuredAgentSessionLogger(() => deps().logger)
   )
   const stopAgent = (sessionId: string, ending: StructuredAgentSessionStopEnding) =>
     stopStructuredAgentSessionAgentUnderSerialize(host.context(), sessionId, ending)
 
-  const closeConversation = async (sessionId: string, atRest = false): Promise<boolean> => {
+  const closeConversation = async (
+    sessionId: string,
+    atRest = false,
+    ownSwitch = false
+  ): Promise<boolean> => {
     // Retain first-hand exit proof until durable lease release succeeds.
     if (await releaseLeaseOfEndedStructuredAgentSessionChild(host.context(), sessionId)) {
       return false
@@ -65,7 +63,8 @@ export function createStructuredAgentSessionConversationLifetime(
         }
       },
       sessionId,
-      atRest
+      atRest,
+      ownSwitch
     )
   }
 
@@ -105,6 +104,7 @@ export function createStructuredAgentSessionConversationLifetime(
     const starts = sleep.workspaceSleepStartAborts(() => host.context().runtimeState, sessionId)
     // Pending creates do not yet have a record; their queued close waits for founding to finish.
     if (matches()) {
+      switchCommands.revoke(sessionId)
       starts.abort()
     }
     const closed = serialize(sessionId, async () => {
@@ -198,6 +198,7 @@ export function createStructuredAgentSessionConversationLifetime(
     )
   }
   return {
+    ...switchCommands.controls,
     closeForWorkspaceSleep,
     idleSweep,
     stopAgent,
@@ -211,55 +212,10 @@ export function createStructuredAgentSessionConversationLifetime(
       error: unknown,
       openMs: number
     ): Promise<void> =>
-      serialize(sessionId, async () => {
-        const session = sessions.get(sessionId)
-        const child = session?.child
-        if (!session || !child || child.close || !sameProviderChild(child, failed)) {
-          return
-        }
-        const failure = providerStartupFailureFact(error)
-        // Persisted facts cannot retain the original error; log it here.
-        deps().logger.warn('a provider could not finish starting', {
-          scope: 'provider-open-failed',
-          sessionId,
-          failure: failure.kind,
-          ...failure.requestTimeout,
-          openMs,
-          error
-        })
-        const { runtimeState: runtime } = host.context()
-        const owned = runtime.startFlights.ownsChild(sessionId, child)
-        if (owned) {
-          const retry = retryableStructuredAgentSessionStart(error)
-          runtime.startupAttempts.childFailed(sessionId, child, failure, retry)
-        }
-        try {
-          if (!owned) {
-            const record = deps().store.getRecord(sessionId)
-            const wording = structuredAgentSessionFailureWordsContext(record)
-            await recordStructuredAgentSessionStartFailure(
-              { journal: session.journal, fence: child.fence },
-              {
-                startKey: child.generation,
-                ...structuredAgentSessionStartFailure({ failure }, wording)
-              },
-              oldestQueuedSubmission(session)?.clientMessageId ?? null
-            ).catch((writeError: unknown) =>
-              deps().logger.warn('recording a failed provider open failed', {
-                scope: 'provider-open-failure',
-                sessionId,
-                error: writeError
-              })
-            )
-          }
-          const reason = error instanceof Error ? error.message : String(error)
-          await stopAgent(sessionId, { cause: 'host-stop', reason, failure })
-        } finally {
-          runtime.startupAttempts.childEnded(sessionId, child)
-        }
-      }),
+      settleStructuredAgentSessionFailedStart(host, stopAgent, sessionId, failed, error, openMs),
     dispose: (): void => {
       disposed = true
+      switchCommands.dispose()
       idleSweep.dispose()
       host.context().runtimeState.startupAttempts.dispose()
     },
@@ -302,6 +258,7 @@ export function createStructuredAgentSessionConversationLifetime(
     },
     /** Close resources while retaining durable chat/history and personal unsent text for the next turn. */
     close: (sessionId: string, cause: StructuredAgentSessionCloseCause): Promise<void> => {
+      switchCommands.revoke(sessionId)
       // Abort outside serialization so hung startup cannot block close.
       host.context().runtimeState.acquireAborts.abort(sessionId, 'closed while starting')
       return serialize(sessionId, async () => {
@@ -311,15 +268,31 @@ export function createStructuredAgentSessionConversationLifetime(
       })
     },
     /** Idle admission and proven-exit stop share the session queue. */
-    switchToTerminal: (id: string): Promise<void> =>
+    switchToTerminal: (id: string, deadline?: AgentSessionSwitchDeadline): Promise<void> =>
       serialize(id, () =>
         switchAdmission.stopIdleStructuredAgentSessionForSwitch({
           session: sessions.get(id),
           delivering: host.deliveryActive(id),
           idleSweep,
-          stop: () => holdStopClose(id, () => stopAgent(id, { cause: 'user-close' })),
+          stop: async () => {
+            if (!deadline) {
+              return holdStopClose(id, () => stopAgent(id, { cause: 'user-close' }))
+            }
+            deadline.check()
+            await stopStructuredAgentSessionAgentUnderSerialize(
+              host.context(),
+              id,
+              { cause: 'user-close' },
+              deadline.check
+            )
+            deadline.check()
+            await closeConversation(id, false, true)
+          },
           deps: deps(),
-          sessionId: id
+          sessionId: id,
+          check: deadline?.check,
+          background: host.childWorkOpen(id),
+          ownCommand: deadline !== undefined
         })
       )
   }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-create-options.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-create-options.ts
new file mode 100644
index 000000000000..bae600e366fd
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-create-options.ts
@@ -0,0 +1,20 @@
+import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types'
+import type { reserveRequestFor } from './structured-agent-session-attach'
+import type { AgentSessionExecutionOptions } from '../../../shared/agent-session-execution-options'
+
+export type StructuredAgentSessionCreateOptions = {
+  check?: () => void
+  firstMessage?: { clientMessageId: string; body: AgentJournalMessageItem }
+  hostLaunchDirectory?: string
+  catalogModels?: Parameters<typeof reserveRequestFor>[0]['models']
+  /** Publish after durable creation, before agent delivery starts. */
+  publishTab?: () => Promise<void>
+}
+
+/** Opening messages retain creation-time model/effort choices like later sends. */
+export function openingMessageOptions(options: Readonly<Record<string, string>> | undefined): {
+  options?: AgentSessionExecutionOptions
+} {
+  const { model, effort } = options ?? {}
+  return model ? { options: { model, ...(effort ? { effort } : {}) } } : {}
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-create.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-create.ts
index 24e78e7681a9..e56cd7fc3557 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-create.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-create.ts
@@ -1,16 +1,16 @@
 import { isFloatingWorkspaceId } from '../../../shared/floating-workspace-worktree'
 import { isAgentSessionCreateAdmissionRefusal } from '../../../shared/agent-session-definitive-refusal'
-import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types'
 import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope'
 import {
   refuse,
   type AgentSessionAttachResult,
   type AgentSessionMutationResult
 } from '../../../shared/agent-session-wire'
-import type { StructuredAgentSessionCaller } from './structured-agent-session-host-types'
 import { isAgentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
 import { journalOpenRefusalError } from '../agent-session-journal/journal-open-failure'
 import type { StructuredAgentSessionAttachContext } from './structured-agent-session-attach-context'
+import type { StructuredAgentSessionCaller } from './structured-agent-session-host-types'
+import { attachStructuredAgentSession } from './structured-agent-session-attach-orchestration'
 import { reserveRequestFor, type AgentSessionAttachParams } from './structured-agent-session-attach'
 import { openStructuredAgentSessionConversationJournal } from './structured-agent-session-conversation-open'
 import {
@@ -27,18 +27,12 @@ import {
 } from './structured-agent-session-provider-support'
 import { performSend } from './structured-agent-session-turns'
 import { observedReceipt } from './structured-agent-session-operation-settlement'
-import { attachStructuredAgentSession } from './structured-agent-session-attach-orchestration'
 import { readAgentSessionHydrationPage } from './agent-session-history-page'
 import { resolveAgentSessionReplayOutcome } from './structured-agent-session-replay-outcome'
-import type { AgentSessionExecutionOptions } from '../../../shared/agent-session-execution-options'
-
-export type StructuredAgentSessionCreateOptions = {
-  firstMessage?: { clientMessageId: string; body: AgentJournalMessageItem }
-  hostLaunchDirectory?: string
-  catalogModels?: Parameters<typeof reserveRequestFor>[0]['models']
-  /** Publish after durable creation, before agent delivery starts. */
-  publishTab?: () => Promise<void>
-}
+import {
+  type StructuredAgentSessionCreateOptions,
+  openingMessageOptions
+} from './structured-agent-session-create-options'
 
 export function createStructuredAgentSession(
   context: StructuredAgentSessionAttachContext,
@@ -70,6 +64,7 @@ async function foundConversation(
   const { deps } = context
   const { store } = deps
   const sessionId = params.envelope.sessionId
+  options.check?.()
   const prior = store.getRecord(sessionId)
   if (params.envelope.expectedRuntimeFence !== null || params.agent !== params.provider) {
     return {
@@ -224,11 +219,12 @@ async function foundConversation(
           return sent
         }
       } else {
-        await store.founding.commit(request)
+        await store.founding.commit(request, options.check)
       }
       committed = true
     }
     try {
+      options.check?.()
       await options.publishTab?.()
     } catch (error) {
       deps.logger.warn('publishing the tab of a created chat failed', {
@@ -296,10 +292,4 @@ export function structuredAgentSessionEntryDelegates(
   }
 }
 
-/** Opening messages retain creation-time model/effort choices like later sends. */
-function openingMessageOptions(options: Readonly<Record<string, string>> | undefined): {
-  options?: AgentSessionExecutionOptions
-} {
-  const { model, effort } = options ?? {}
-  return model ? { options: { model, ...(effort ? { effort } : {}) } } : {}
-}
+export type { StructuredAgentSessionCreateOptions } from './structured-agent-session-create-options'
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-failed-start-settlement.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-failed-start-settlement.ts
new file mode 100644
index 000000000000..d6d14d5aa528
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-failed-start-settlement.ts
@@ -0,0 +1,76 @@
+import type { StructuredAgentSessionConversationLifetimeHost } from './structured-agent-session-conversation-lifetime-host'
+import { retryableStructuredAgentSessionStart } from './structured-agent-session-start-retry'
+
+import type { StructuredAgentSessionStopEnding } from './structured-agent-session-host-lifetime'
+import type * as hostTypes from './structured-agent-session-host-types'
+
+import { sameProviderChild } from './structured-agent-session-provider-child'
+
+import {
+  providerStartupFailureFact,
+  structuredAgentSessionStartFailure
+} from './structured-agent-session-failure-text'
+import {
+  oldestQueuedSubmission,
+  recordStructuredAgentSessionStartFailure
+} from './structured-agent-session-start-failure-row'
+import { structuredAgentSessionFailureWordsContext } from './structured-agent-session-send-preparation'
+
+export function settleStructuredAgentSessionFailedStart(
+  host: StructuredAgentSessionConversationLifetimeHost,
+  stopAgent: (sessionId: string, ending: StructuredAgentSessionStopEnding) => Promise<void>,
+  sessionId: string,
+  failed: hostTypes.StructuredAgentSessionProviderChildIdentity,
+  error: unknown,
+  openMs: number
+): Promise<void> {
+  const { serialize, sessions } = host
+  const deps = () => host.context().deps
+  return serialize(sessionId, async () => {
+    const session = sessions.get(sessionId)
+    const child = session?.child
+    if (!session || !child || child.close || !sameProviderChild(child, failed)) {
+      return
+    }
+    const failure = providerStartupFailureFact(error)
+    // Persisted facts cannot retain the original error; log it here.
+    deps().logger.warn('a provider could not finish starting', {
+      scope: 'provider-open-failed',
+      sessionId,
+      failure: failure.kind,
+      ...failure.requestTimeout,
+      openMs,
+      error
+    })
+    const { runtimeState: runtime } = host.context()
+    const owned = runtime.startFlights.ownsChild(sessionId, child)
+    if (owned) {
+      const retry = retryableStructuredAgentSessionStart(error)
+      runtime.startupAttempts.childFailed(sessionId, child, failure, retry)
+    }
+    try {
+      if (!owned) {
+        const record = deps().store.getRecord(sessionId)
+        const wording = structuredAgentSessionFailureWordsContext(record)
+        await recordStructuredAgentSessionStartFailure(
+          { journal: session.journal, fence: child.fence },
+          {
+            startKey: child.generation,
+            ...structuredAgentSessionStartFailure({ failure }, wording)
+          },
+          oldestQueuedSubmission(session)?.clientMessageId ?? null
+        ).catch((writeError: unknown) =>
+          deps().logger.warn('recording a failed provider open failed', {
+            scope: 'provider-open-failure',
+            sessionId,
+            error: writeError
+          })
+        )
+      }
+      const reason = error instanceof Error ? error.message : String(error)
+      await stopAgent(sessionId, { cause: 'host-stop', reason, failure })
+    } finally {
+      runtime.startupAttempts.childEnded(sessionId, child)
+    }
+  })
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host-contexts.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host-contexts.ts
new file mode 100644
index 000000000000..aef3d5e79f11
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host-contexts.ts
@@ -0,0 +1,90 @@
+import type { createRestartReconciler } from './structured-agent-session-restart-reconcile'
+import type { StructuredAgentSessionTaskQueue } from './structured-agent-session-task-queue'
+import type { StructuredAgentSessionHostRuntimeState } from './structured-agent-session-host-runtime-state'
+import type { StructuredAgentSessionLifetimeContext } from './structured-agent-session-host-lifetime'
+import { createStructuredAgentSessionHostMutationContext } from './structured-agent-session-host-mutation-wiring'
+import type * as lifetime from './structured-agent-session-conversation-lifetime'
+import type { StructuredAgentSessionAttachContext } from './structured-agent-session-attach-context'
+import type * as hostMutations from './structured-agent-session-host-mutations'
+import type * as HostTypes from './structured-agent-session-host-types'
+import type { StructuredAgentSessionEventRecovery } from './structured-agent-session-event-recovery'
+import type { StructuredAgentSessionClientDelivery } from './structured-agent-session-client-delivery'
+import type { StructuredAgentSessionConversations } from './structured-agent-session-conversations'
+import type * as conversation from './structured-agent-session-host-delivery'
+import type { wireStructuredAgentSessionQueuedMessages as wireQueuedMessages } from './structured-agent-session-queued-wiring'
+import { sleepStructuredAgentSessionWorkspace } from './structured-agent-session-workspace-sleep'
+
+export abstract class StructuredAgentSessionHostContexts {
+  abstract readonly deps: HostTypes.StructuredAgentSessionHostDeps
+  protected abstract readonly sessions: StructuredAgentSessionConversations
+  protected abstract readonly subscribers: StructuredAgentSessionClientDelivery['subscribers']
+  protected abstract readonly tasks: StructuredAgentSessionTaskQueue
+  protected abstract readonly runtimeState: StructuredAgentSessionHostRuntimeState
+  protected abstract readonly reconcileLeases: ReturnType<typeof createRestartReconciler>
+  protected abstract readonly lifetime: lifetime.StructuredAgentSessionConversationLifetime
+  protected abstract readonly conversationDelivery: conversation.StructuredAgentSessionConversationDelivery
+  protected abstract readonly eventRecovery: StructuredAgentSessionEventRecovery
+  protected abstract readonly clientDelivery: StructuredAgentSessionClientDelivery
+  protected abstract readonly queued: ReturnType<typeof wireQueuedMessages>
+  protected abstract now: () => number
+  protected abstract serialize: StructuredAgentSessionTaskQueue['serialize']
+  // Keep inference so publishStatus stays required in the attach-context spread.
+  protected lifetimeContext() {
+    return {
+      deps: this.deps,
+      runtimeState: this.runtimeState,
+      sessions: this.sessions,
+      now: () => this.now(),
+      publishStatus: this.clientDelivery.publishStatus,
+      generationEnded: this.clientDelivery.publishGenerationEnded,
+      wakeDelivery: (sessionId: string) => this.conversationDelivery.loop.wake(sessionId),
+      endExitedChild: this.eventRecovery.endExitedChildUnderSerialize
+    } satisfies StructuredAgentSessionLifetimeContext
+  }
+
+  protected attachContext(): StructuredAgentSessionAttachContext {
+    return {
+      ...this.lifetimeContext(),
+      subscribers: this.subscribers,
+      tasks: this.tasks,
+      reconcileLeases: (sessionId) => this.reconcileLeases(sessionId),
+      waitSwitchPhysical: (sessionId) => this.lifetime.waitSwitchPhysical(sessionId),
+      serialize: (sessionId, task) => this.serialize(sessionId, task),
+      openProviderChild: this.eventRecovery.openProviderChild,
+      openConversation: this.conversationDelivery.open
+    }
+  }
+
+  /** Stop hidden children too, using one bounded host snapshot. */
+  sleepWorkspace = (workspaceId: string, markAsleep?: boolean) =>
+    sleepStructuredAgentSessionWorkspace(
+      {
+        deps: this.deps,
+        tasks: this.tasks,
+        lifetime: this.lifetime,
+        sessions: this.sessions,
+        // Starts registered after Stop are newer work.
+        deliveryRunning: (id) =>
+          this.conversationDelivery.loop.isRunning(id) || this.runtimeState.startFlights.has(id),
+        childWorkIncomplete: this.clientDelivery.childWorkIncomplete,
+        publishRecordNotes: this.clientDelivery.publishRecordNotes
+      },
+      workspaceId,
+      markAsleep
+    )
+
+  protected mutationContext = (): hostMutations.StructuredAgentSessionMutationContext =>
+    createStructuredAgentSessionHostMutationContext({
+      deps: this.deps,
+      sessions: this.sessions,
+      subscribers: this.subscribers,
+      lifetime: this.lifetime,
+      clientDelivery: this.clientDelivery,
+      conversationDelivery: this.conversationDelivery,
+      queued: this.queued,
+      runtimeState: this.runtimeState,
+      attachContext: () => this.attachContext(),
+      serialize: (sessionId, task) => this.serialize(sessionId, task),
+      now: () => this.now()
+    })
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host-lifetime.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host-lifetime.ts
index 44b983a4416d..0bcadac903d3 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-host-lifetime.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host-lifetime.ts
@@ -106,7 +106,8 @@ export async function holdRestartedStructuredAgentSessionSends(
 export async function stopStructuredAgentSessionAgentUnderSerialize(
   context: StructuredAgentSessionLifetimeContext,
   sessionId: string,
-  ending: StructuredAgentSessionStopEnding
+  ending: StructuredAgentSessionStopEnding,
+  check?: () => void
 ): Promise<void> {
   const session = context.sessions.get(sessionId)
   const child = session?.child
@@ -119,6 +120,7 @@ export async function stopStructuredAgentSessionAgentUnderSerialize(
     const recorded = (await stopEndsWork(context, sessionId, session, ending))
       ? recordStopEvent(context, sessionId, session, ending)
       : Promise.resolve(null)
+    check?.()
     child.close = {
       cause,
       ...('quit' in ending && ending.quit ? { quit: true as const } : {}),
@@ -147,7 +149,10 @@ export async function stopStructuredAgentSessionAgentUnderSerialize(
         () => context.restartWitness?.beforeStop(sessionId)
       )
     }
-    if ((await joinStructuredAgentSessionChildClose(context, sessionId, child)) !== 'exited') {
+    check?.()
+    if (
+      (await joinStructuredAgentSessionChildClose(context, sessionId, child, check)) !== 'exited'
+    ) {
       throw new StructuredAgentSessionEvictionError(
         'stop-provider-child',
         sessionId,
@@ -184,9 +189,11 @@ export type StructuredAgentSessionCloseCause = Extract<
 /** Idle cache eviction also retains waiting cards so unseen closes cannot introduce reopen pauses. */
 export function structuredAgentSessionConversationClosable(
   session: StructuredAgentSessionHostSession,
-  atRest = false
+  atRest = false,
+  ownSwitch = false
 ): boolean {
   return (
+    (!session.switchCommand || ownSwitch) &&
     session.child === null &&
     !session.journal.submissions().some(isQueuedAgentJournalSubmission) &&
     session.journal.pendingSubmissions().length === 0 &&
@@ -200,10 +207,11 @@ export async function closeStructuredAgentSessionConversationUnderSerialize(
     closeStatus: (sessionId: string) => void
   },
   sessionId: string,
-  atRest = false
+  atRest = false,
+  ownSwitch = false
 ): Promise<boolean> {
   const session = context.sessions.get(sessionId)
-  if (!session || !structuredAgentSessionConversationClosable(session, atRest)) {
+  if (!session || !structuredAgentSessionConversationClosable(session, atRest, ownSwitch)) {
     return false
   }
   context.sessions.delete(sessionId)
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host-mutation-wiring.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host-mutation-wiring.ts
index 5989ca262e70..3ee0c9c18f35 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-host-mutation-wiring.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host-mutation-wiring.ts
@@ -39,7 +39,8 @@ export function createStructuredAgentSessionHostMutationContext(
     childWorkIncomplete: input.clientDelivery.childWorkIncomplete,
     serialize: input.serialize,
     openConversation: input.conversationDelivery.open,
-    claimAgent: (sessionId) => agentStart.claimOperationStart(input.attachContext(), sessionId),
+    claimAgent: (sessionId, check) =>
+      agentStart.claimOperationStart(input.attachContext(), sessionId, check),
     startFlights: input.runtimeState.startFlights,
     startupAttempts: input.runtimeState.startupAttempts,
     deliveryOrder: input.runtimeState.deliveryOrder,
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 6131592876ea..2b384efaf2b1 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-host-mutations.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host-mutations.ts
@@ -1,6 +1,3 @@
-// Share mutation admission/planning/publication. Conversation writes need no child lease;
-// provider-only effects start their child before admission, sends start through delivery.
-
 import { latestNativeChatUsageLimitCut } from '../../../shared/native-chat/native-chat-usage-limit-cut'
 import { refuse } from '../../../shared/agent-session-wire'
 import { contextStructuredAgentSessionCurrentWork } from './structured-agent-session-current-work'
@@ -48,7 +45,6 @@ import {
   openWithReadyStructuredAgentSessionChild,
   runAfterRewindStart
 } from './structured-agent-session-ready-operation'
-export type { StructuredAgentSessionMutationContext } from './structured-agent-session-mutation-context'
 import type { StructuredAgentSessionCaller } from './structured-agent-session-host-types'
 import {
   readStructuredAgentSessionOptions,
@@ -57,6 +53,12 @@ import {
   type StructuredAgentSessionOptionsReader
 } from './structured-agent-session-options-read'
 import { settleStructuredAgentSessionLateDispatch } from './structured-agent-session-late-dispatch'
+import type { AgentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
+
+// Share mutation admission/planning/publication. Conversation writes need no child lease;
+// provider-only effects start their child before admission, sends start through delivery.
+
+export type { StructuredAgentSessionMutationContext } from './structured-agent-session-mutation-context'
 
 export function sendStructuredAgentSessionTurn(
   context: StructuredAgentSessionMutationContext,
@@ -296,6 +298,7 @@ export function structuredAgentSessionMutationDelegates(
     ) => readStructuredAgentSessionOptions(context(), sessionId, reader),
     settleLateDispatch: (input: Parameters<typeof settleStructuredAgentSessionLateDispatch>[1]) =>
       settleStructuredAgentSessionLateDispatch(context(), input),
-    switchToChat: (sessionId: string) => startStructuredAgentSessionForSwitch(context(), sessionId)
+    switchToChat: (sessionId: string, deadline?: AgentSessionSwitchDeadline) =>
+      startStructuredAgentSessionForSwitch(context(), sessionId, deadline)
   }
 }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host-types.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host-types.ts
index 8ea208a36b72..58f02469bd3b 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-host-types.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host-types.ts
@@ -31,6 +31,7 @@ import type { StructuredAgentId } from '../../../shared/agent-session-provider-h
 import type { StructuredAgentRegistry } from './structured-agent-registry'
 import type { StructuredAgentSessionStartupLimits } from './structured-agent-session-startup-attempt-contract'
 import type { AgentChatPermissionChoice } from '../../../shared/agent-chat-permission-mode'
+import type { AgentSessionSwitchResult } from '../../../shared/agent-session-switch-execution'
 
 export type StructuredAgentSessionCaller = { callerKey: string }
 
@@ -99,6 +100,10 @@ export type StructuredAgentSessionEndedChild = StructuredAgentSessionProviderChi
 
 /** Conversation state outlives its provider children. */
 export type StructuredAgentSessionHostSession = {
+  switchCommand?: {
+    invocationId: string
+    completion: Promise<AgentSessionSwitchResult>
+  }
   /** Enter only through session-map set, which binds delivery. */
   readonly journal: AgentSessionJournal
   params: AgentSessionAttachParams
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
index fb02400dd31e..da225e716985 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
@@ -1,8 +1,7 @@
+import { catchUpStructuredSessionAtRest } from './structured-agent-session-at-rest-catch-up'
 import type { AgentSessionRewindParams } from '../../../shared/agent-session-rewind'
 import { rewindStructuredAgentSession } from './structured-agent-session-rewind'
 import { StructuredConversationCommandController } from './structured-conversation-command-controller'
-// Serialize durable mutations per conversation; open at rest and start a child only when work needs it.
-
 import type { AgentSessionSubscribeInput } from './structured-agent-session-subscribers'
 import type { AgentSessionExecutionLocation } from '../../../shared/agent-session-record'
 import { createRestartReconciler } from './structured-agent-session-restart-reconcile'
@@ -12,11 +11,8 @@ import * as reveal from './structured-agent-session-reveal'
 import { structuredAgentSessionOwnerStatus } from './structured-agent-session-owner-status'
 import { StructuredAgentSessionHostRuntimeState } from './structured-agent-session-host-runtime-state'
 import { structuredAgentSessionEntryDelegates } from './structured-agent-session-create'
-import type { StructuredAgentSessionLifetimeContext } from './structured-agent-session-host-lifetime'
 import * as agentStart from './structured-agent-session-agent-start'
-import { createStructuredAgentSessionHostMutationContext } from './structured-agent-session-host-mutation-wiring'
 import * as lifetime from './structured-agent-session-conversation-lifetime'
-import type { StructuredAgentSessionAttachContext } from './structured-agent-session-attach-context'
 import { createStructuredAgentSessionTabSurface as createTabs } from './structured-agent-session-host-tabs'
 import * as hostMutations from './structured-agent-session-host-mutations'
 import { flushStructuredAgentSessionHost } from './structured-agent-session-host-teardown'
@@ -30,15 +26,19 @@ import { structuredAgentSessionRestartResumeSurfaces } from './structured-agent-
 import * as conversation from './structured-agent-session-host-delivery'
 import { wireStructuredAgentSessionQueuedMessages as wireQueuedMessages } from './structured-agent-session-queued-wiring'
 import * as sessionLogger from './structured-agent-session-logger'
-import { sleepStructuredAgentSessionWorkspace } from './structured-agent-session-workspace-sleep'
+import { StructuredAgentSessionHostContexts } from './structured-agent-session-host-contexts'
+import type { AgentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
+
+// Serialize durable mutations per conversation; open at rest and start a child only when work needs it.
+
 export type { StructuredAgentSessionHostDeps } from './structured-agent-session-host-types'
 
-export class StructuredAgentSessionHost {
+export class StructuredAgentSessionHost extends StructuredAgentSessionHostContexts {
   private readonly conversationCommands = new StructuredConversationCommandController(
     () => this.mutationContext(),
     this
   )
-  private readonly sessions = new StructuredAgentSessionConversations({
+  protected readonly sessions = new StructuredAgentSessionConversations({
     observe: (id, journal, rows) => this.clientDelivery.requestFailures.observe(id, journal, rows),
     forget: (id) => this.clientDelivery.requestFailures.forget(id),
     deliver: (sessionId, journal) => {
@@ -50,9 +50,9 @@ export class StructuredAgentSessionHost {
     onOpened: (sessionId) => this.queued.onOpened(sessionId),
     now: () => this.now()
   })
-  private readonly queued = wireQueuedMessages(this.sessions, () => this.mutationContext())
+  protected readonly queued = wireQueuedMessages(this.sessions, () => this.mutationContext())
   // Journal publication renews idle activity.
-  private readonly clientDelivery = new StructuredAgentSessionClientDelivery(
+  protected readonly clientDelivery = new StructuredAgentSessionClientDelivery(
     this.sessions,
     () => this.now(),
     () => this.deps,
@@ -62,18 +62,19 @@ export class StructuredAgentSessionHost {
     (sessionId) => this.backgroundTasks.read(sessionId),
     (sessionId) => this.runtimeState?.startFlights.projectsStarting(sessionId) ?? false
   )
-  private readonly subscribers = this.clientDelivery.subscribers
-  private readonly tasks = new StructuredAgentSessionTaskQueue()
-  private readonly runtimeState: StructuredAgentSessionHostRuntimeState
-  private readonly reconcileLeases: ReturnType<typeof createRestartReconciler>
+  protected readonly subscribers = this.clientDelivery.subscribers
+  protected readonly tasks = new StructuredAgentSessionTaskQueue()
+  protected readonly runtimeState: StructuredAgentSessionHostRuntimeState
+  protected readonly reconcileLeases: ReturnType<typeof createRestartReconciler>
   private readonly restore: ReturnType<typeof reveal.createStructuredAgentSessionHostRestore>
-  private readonly lifetime: lifetime.StructuredAgentSessionConversationLifetime
-  private readonly conversationDelivery: conversation.StructuredAgentSessionConversationDelivery
-  private readonly eventRecovery: StructuredAgentSessionEventRecovery
+  protected readonly lifetime: lifetime.StructuredAgentSessionConversationLifetime
+  protected readonly conversationDelivery: conversation.StructuredAgentSessionConversationDelivery
+  protected readonly eventRecovery: StructuredAgentSessionEventRecovery
   private readonly backgroundTasks: StructuredAgentSessionBackgroundTaskChannel
   readonly restartResume: resume.StructuredAgentSessionRestartResume
 
   constructor(readonly deps: HostTypes.StructuredAgentSessionHostDeps) {
+    super()
     // Collaborators share a logger wrapper that cannot fail the operation it reports.
     this.deps = deps = sessionLogger.withNeverThrowingLogger(deps)
     this.clientDelivery.watchAtRestCommands(deps.adapter)
@@ -159,7 +160,7 @@ export class StructuredAgentSessionHost {
     this.lifetime.idleSweep.start()
   }
 
-  private now = (): number => this.deps.now?.() ?? Date.now()
+  protected now = (): number => this.deps.now?.() ?? Date.now()
 
   hasSession = (sessionId: string): boolean => this.sessions.has(sessionId)
   loadedSessionIds = (): string[] =>
@@ -170,53 +171,34 @@ export class StructuredAgentSessionHost {
   handleAdapterEvent = (event: Parameters<StructuredAgentSessionEventRecovery['handle']>[0]) =>
     this.eventRecovery.handle(event)
 
-  // Keep inference so publishStatus stays required in the attach-context spread.
-  private lifetimeContext() {
-    return {
-      deps: this.deps,
-      runtimeState: this.runtimeState,
-      sessions: this.sessions,
-      now: () => this.now(),
-      publishStatus: this.clientDelivery.publishStatus,
-      generationEnded: this.clientDelivery.publishGenerationEnded,
-      wakeDelivery: (sessionId: string) => this.conversationDelivery.loop.wake(sessionId),
-      endExitedChild: this.eventRecovery.endExitedChildUnderSerialize
-    } satisfies StructuredAgentSessionLifetimeContext
-  }
-
-  private attachContext(): StructuredAgentSessionAttachContext {
-    return {
-      ...this.lifetimeContext(),
-      subscribers: this.subscribers,
-      tasks: this.tasks,
-      reconcileLeases: (sessionId) => this.reconcileLeases(sessionId),
-      serialize: (sessionId, task) => this.serialize(sessionId, task),
-      openProviderChild: this.eventRecovery.openProviderChild,
-      openConversation: this.conversationDelivery.open
-    }
-  }
   /** Release resources; user-close cancels cut turns, while eviction leaves their failure reportable. */
   close: lifetime.StructuredAgentSessionConversationLifetime['close'] = (sessionId, cause) =>
     this.lifetime.close(sessionId, cause)
-  switchToTerminal = (id: string) => this.lifetime.switchToTerminal(id)
-
-  /** Stop hidden children too, using one bounded host snapshot. */
-  sleepWorkspace = (workspaceId: string, markAsleep?: boolean) =>
-    sleepStructuredAgentSessionWorkspace(
-      {
-        deps: this.deps,
-        tasks: this.tasks,
-        lifetime: this.lifetime,
-        sessions: this.sessions,
-        // Starts registered after Stop are newer work.
-        deliveryRunning: (id) =>
-          this.conversationDelivery.loop.isRunning(id) || this.runtimeState.startFlights.has(id),
-        childWorkIncomplete: this.clientDelivery.childWorkIncomplete,
-        publishRecordNotes: this.clientDelivery.publishRecordNotes
-      },
-      workspaceId,
-      markAsleep
-    )
+  switchToTerminal: lifetime.StructuredAgentSessionConversationLifetime['switchToTerminal'] = (
+    ...args
+  ) => this.lifetime.switchToTerminal(...args)
+  runSwitch: lifetime.StructuredAgentSessionConversationLifetime['runSwitch'] = (...args) =>
+    this.lifetime.runSwitch(...args)
+  adoptSwitch = (from: string, to: string) => this.lifetime.adoptSwitch(from, to)
+  switchGeneration = (id: string) => this.lifetime.switchGeneration(id)
+  retainSwitch = (id: string) => this.lifetime.retainSwitch(id)
+  trackSwitchPhysical = <T>(id: string, work: Promise<T>) =>
+    this.lifetime.trackSwitchPhysical(id, work)
+  presentSwitch: lifetime.StructuredAgentSessionConversationLifetime['presentSwitch'] = (...args) =>
+    this.lifetime.presentSwitch(...args)
+  openedSwitch: lifetime.StructuredAgentSessionConversationLifetime['openedSwitch'] = (...args) =>
+    this.lifetime.openedSwitch(...args)
+  captureSwitchWork = (id: string, deadline: AgentSessionSwitchDeadline) => {
+    const count = this.deps.store.admittedSendCount(id)
+    return () =>
+      !deadline.signal.aborted &&
+      deadline.remaining() > 0 &&
+      this.deps.store.admittedSendCount(id) === count &&
+      !this.sessions.get(id)?.child &&
+      !this.conversationDelivery.loop.isRunning(id) &&
+      !this.runtimeState.startFlights.has(id)
+  }
+  switchExecuting = (id: string) => this.lifetime.switchExecuting(id)
 
   supportsCreate = (location: AgentSessionExecutionLocation, agent: string): boolean =>
     providerSupport.adapterSupportsCreate(this.deps.adapter, location, agent)
@@ -244,7 +226,7 @@ export class StructuredAgentSessionHost {
   revealSession = (sessionId: string): Promise<HostTypes.StructuredAgentSessionReveal> =>
     reveal.revealStructuredAgentSession(this.deps, sessionId, this.lifetime.conversation)
 
-  private serialize = this.tasks.serialize.bind(this.tasks)
+  protected serialize = this.tasks.serialize.bind(this.tasks)
 
   private readonly entry = structuredAgentSessionEntryDelegates(() => this.attachContext())
   attach = this.entry.attach
@@ -268,21 +250,6 @@ export class StructuredAgentSessionHost {
     }).finally(() => this.clientDelivery.closeAll())
   }
 
-  private mutationContext = (): hostMutations.StructuredAgentSessionMutationContext =>
-    createStructuredAgentSessionHostMutationContext({
-      deps: this.deps,
-      sessions: this.sessions,
-      subscribers: this.subscribers,
-      lifetime: this.lifetime,
-      clientDelivery: this.clientDelivery,
-      conversationDelivery: this.conversationDelivery,
-      queued: this.queued,
-      runtimeState: this.runtimeState,
-      attachContext: () => this.attachContext(),
-      serialize: (sessionId, task) => this.serialize(sessionId, task),
-      now: () => this.now()
-    })
-
   send = this.conversationCommands.send
 
   queuedMessageSend = this.queued.queuedMessageSend
@@ -323,6 +290,22 @@ export class StructuredAgentSessionHost {
   journalSnapshot = async (sessionId: string) =>
     (await this.lifetime.conversation(sessionId)).journal.snapshot()
 
+  refreshSwitchTranscript = async (
+    sessionId: string,
+    source: { sessionId: string; filePath: string },
+    deadline: AgentSessionSwitchDeadline
+  ) => {
+    const session = await this.lifetime.conversation(sessionId)
+    await catchUpStructuredSessionAtRest({
+      journal: session.journal,
+      threadId: source.sessionId,
+      filePath: source.filePath,
+      fence: this.deps.store.getRecord(sessionId)?.lease.runtimeFence ?? 0,
+      deadline
+    })
+    this.subscribers.publish(sessionId, session.journal)
+  }
+
   currentWork = this.clientDelivery.readCurrentWork
   readCurrentRequests: StructuredAgentSessionBackgroundTaskChannel['currentRequests'] = (...args) =>
     this.backgroundTasks.currentRequests(...args)
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-mutation-context.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-mutation-context.ts
index b4e277bb89da..54cedbc4cafb 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-mutation-context.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-mutation-context.ts
@@ -43,7 +43,7 @@ export type StructuredAgentSessionMutationContext = {
   /** Open within the caller’s existing serialization. */
   openConversation: (sessionId: string) => Promise<StructuredAgentSessionHostSession | null>
   /** Claim inside serialization; await the result outside. */
-  claimAgent: (sessionId: string) => StructuredAgentSessionStartClaim
+  claimAgent: (sessionId: string, check?: () => void) => StructuredAgentSessionStartClaim
   startFlights: Pick<StructuredAgentSessionStartFlights, 'get'>
   startupAttempts: Pick<StructuredAgentSessionStartupAttempts, 'readiness'>
   deliveryOrder: StructuredAgentSessionDeliveryOrder
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-start-attempts.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-start-attempts.ts
index dda212ad8e57..bc1dd486c1ff 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-start-attempts.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-start-attempts.ts
@@ -150,7 +150,7 @@ export function registerStructuredAgentSessionStart(
             if (session) {
               const record = context.deps.store.getRecord(sessionId)
               const failure = failedStart(record, settled)
-              await recordStructuredAgentSessionStartFailure(
+              const failureItemId = await recordStructuredAgentSessionStartFailure(
                 { journal: session.journal, fence: record?.lease.runtimeFence ?? 0 },
                 {
                   startKey:
@@ -162,6 +162,7 @@ export function registerStructuredAgentSessionStart(
                 },
                 startedFor ?? null
               )
+              return { ...settled, ...(failureItemId ? { failureItemId } : {}) }
             }
           }
           return settled
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-start-failure-row.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-start-failure-row.ts
index 1f0b7f9c43be..b8b104c5e723 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-start-failure-row.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-start-failure-row.ts
@@ -98,7 +98,7 @@ export async function recordStructuredAgentSessionStartFailure(
   session: Pick<StructuredAgentSessionHostSession, 'journal'> & { fence: number },
   failure: StructuredAgentSessionStartFailure,
   clientMessageId: string | null
-): Promise<void> {
+): Promise<string | undefined> {
   const selected = session.journal
     .submissions()
     .find(
@@ -128,6 +128,7 @@ export async function recordStructuredAgentSessionStartFailure(
         }
       : {})
   })
+  return agentJournalItemKey(structuredAgentSessionStartFailureRowIdentity(startKey))
 }
 
 export function acceptedNoLaterThan(
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-admission.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-admission.ts
index 917d54e25f9d..66dd3c1bdd6a 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-admission.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-admission.ts
@@ -1,15 +1,74 @@
-// The chat's half of a switch to its terminal. Unlike a tab close, a switch never cuts work short
-// (the user stops a reply first), so it is admitted only when the chat is idle, and its admission
-// has no effect of its own: no start is aborted and nothing is stopped before it passes.
-
-import { agentSessionLeaseOwnerVerdict } from '../../../shared/agent-session-lease-adjudication'
+import {
+  agentSessionLeaseOwnerVerdict,
+  agentSessionLeasePossiblyWriting
+} from '../../../shared/agent-session-lease-adjudication'
+import { heldStructuredAgentSessionCurrentWork } from './structured-agent-session-host-current-work'
 import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission'
-import { agentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
+import {
+  agentSessionRefusalError,
+  isAgentSessionRefusalError
+} from '../../../shared/agent-session-wire-refusals'
 import type {
   StructuredAgentSessionHostDeps,
   StructuredAgentSessionHostSession
 } from './structured-agent-session-host-types'
 
+// The chat's half of a switch to its terminal. Unlike a tab close, a switch never cuts work short
+// (the user stops a reply first), so it is admitted only when the chat is idle, and its admission
+// has no effect of its own: no start is aborted and nothing is stopped before it passes.
+
+export type SwitchBlockedReason =
+  | 'turnActive'
+  | 'providerStarting'
+  | 'messagesUnsettled'
+  | 'backgroundTasksRunning'
+  | 'handoffInFlight'
+  | 'previousExitUnverifiable'
+
+export function structuredAgentSessionSwitchBlocked(input: {
+  session?: StructuredAgentSessionHostSession
+  deps: StructuredAgentSessionHostDeps
+  sessionId: string
+  delivering: boolean
+  starting?: boolean
+  background: boolean
+  ownCommand?: boolean
+  joinStart?: boolean
+}): SwitchBlockedReason | null {
+  const { session, deps, sessionId } = input
+  const record = deps.store.getRecord(sessionId)
+  if (!input.ownCommand && session?.switchCommand) {
+    return 'handoffInFlight'
+  }
+  if (session?.child?.close) {
+    return 'handoffInFlight'
+  }
+  if (!input.joinStart && (input.starting || session?.child?.phase === 'starting')) {
+    return 'providerStarting'
+  }
+  if (input.background) {
+    return 'backgroundTasksRunning'
+  }
+  const work = session?.child
+    ? heldStructuredAgentSessionCurrentWork(deps.store, sessionId, session.journal, session)
+    : null
+  if (work?.activeTurnId()) {
+    return 'turnActive'
+  }
+  if (
+    input.delivering ||
+    work?.holdsHandedOverSend() ||
+    (record && (deps.hasOwedSwitchWork ?? deps.hasOpenDispatch)?.(record)) ||
+    session?.journal.submissions().some(isQueuedAgentJournalSubmission)
+  ) {
+    return 'messagesUnsettled'
+  }
+  if (!session?.child && record && agentSessionLeasePossiblyWriting(record.lease)) {
+    return 'previousExitUnverifiable'
+  }
+  return null
+}
+
 /** In the chat's ordered step: refuses unless nothing is running, starting, queued or owed, then
  *  admits, stops through close's body, and proves the agent gone before anything starts elsewhere. */
 export async function stopIdleStructuredAgentSessionForSwitch(input: {
@@ -21,24 +80,60 @@ export async function stopIdleStructuredAgentSessionForSwitch(input: {
   stop: () => Promise<unknown>
   deps: StructuredAgentSessionHostDeps
   sessionId: string
+  check?: () => void
+  ownCommand?: boolean
+  background?: boolean
 }): Promise<void> {
   const { session, deps, sessionId, stop } = input
-  const currentRecord = deps.store.getRecord(sessionId)
-  const owesWork = deps.hasOwedSwitchWork ?? deps.hasOpenDispatch
-  if (
-    input.delivering ||
-    (currentRecord !== null && owesWork?.(currentRecord) === true) ||
-    (session !== undefined &&
-      (session.child?.phase === 'starting' ||
-        session.journal.submissions().some(isQueuedAgentJournalSubmission) ||
-        (session.child !== null &&
-          input.idleSweep.owesWork(session.params.envelope.sessionId, session))))
-  ) {
-    throw agentSessionRefusalError('agent_session_operation_invalid', { reason: 'turnActive' })
+  if (!input.check) {
+    const record = deps.store.getRecord(sessionId)
+    if (
+      input.delivering ||
+      (record && (deps.hasOwedSwitchWork ?? deps.hasOpenDispatch)?.(record)) ||
+      (session &&
+        (session.child?.phase === 'starting' ||
+          session.journal.submissions().some(isQueuedAgentJournalSubmission) ||
+          (session.child !== null && input.idleSweep.owesWork(sessionId, session))))
+    ) {
+      throw agentSessionRefusalError('agent_session_operation_invalid', { reason: 'turnActive' })
+    }
+  } else {
+    input.check()
+    const reason = structuredAgentSessionSwitchBlocked({
+      ...input,
+      background: input.background ?? false
+    })
+    if (reason === 'previousExitUnverifiable') {
+      throw agentSessionRefusalError('agent_session_ownership_unknown', { reason })
+    }
+    if (reason) {
+      throw agentSessionRefusalError('agent_session_operation_invalid', { reason })
+    }
+    if (session?.child && input.idleSweep.owesWork(sessionId, session)) {
+      throw agentSessionRefusalError('agent_session_operation_invalid', {
+        reason: 'backgroundTasksRunning'
+      })
+    }
+  }
+  try {
+    await stop()
+  } catch (error) {
+    if (
+      !input.check ||
+      (isAgentSessionRefusalError(error) &&
+        error.refusal.code === 'agent_session_operation_expired')
+    ) {
+      throw error
+    }
+    throw agentSessionRefusalError('agent_session_ownership_unknown', { reason: 'ownerUnproven' })
   }
-  await stop()
   const lease = deps.store.getRecord(sessionId)?.lease
-  if (!lease || agentSessionLeaseOwnerVerdict(lease) !== 'exited') {
+  if (
+    !lease ||
+    (input.check
+      ? agentSessionLeasePossiblyWriting(lease)
+      : agentSessionLeaseOwnerVerdict(lease) !== 'exited')
+  ) {
     throw agentSessionRefusalError('agent_session_ownership_unknown', { reason: 'ownerUnproven' })
   }
 }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command-selection.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command-selection.ts
new file mode 100644
index 000000000000..2eac4498f9f1
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command-selection.ts
@@ -0,0 +1,192 @@
+import { randomUUID } from 'node:crypto'
+import type { StructuredAgentSessionConversationLifetimeHost } from './structured-agent-session-conversation-lifetime-host'
+import {
+  AgentSessionRefusalError,
+  agentSessionRefusalError
+} from '../../../shared/agent-session-wire-refusals'
+import { AGENT_SESSION_NOT_ATTACHED } from './structured-agent-session-mutation-admission'
+import type {
+  AgentSessionSwitchDeadline,
+  AgentSessionSwitchResult,
+  AgentSessionSwitchReceipt
+} from '../../../shared/agent-session-switch-execution'
+
+// Commands outlive the read handle they may close themselves.
+export type SwitchCommand = {
+  invocationId: string
+  generation: string
+  settled: boolean
+  present: (view: Extract<AgentSessionSwitchResult, { status: 'present' }>) => void
+  presentation: Promise<AgentSessionSwitchResult>
+  shown: Promise<boolean>
+  acknowledge: (shown: boolean) => void
+  opened: Promise<AgentSessionSwitchResult>
+  openedResult: (result: AgentSessionSwitchResult) => void
+  deadline: AgentSessionSwitchDeadline
+  revokeOnSend: boolean
+  retain?: () => Promise<void>
+  retentionAllowed: boolean
+  completion: Promise<AgentSessionSwitchResult>
+  physical?: Promise<void>
+  cleanupTimer?: ReturnType<typeof setTimeout>
+}
+
+export function selectStructuredSessionSwitchCommand(args: {
+  host: StructuredAgentSessionConversationLifetimeHost
+  commands: Map<string, SwitchCommand>
+  isDisposed: () => boolean
+  id: string
+  invocationId: string
+  deadline: AgentSessionSwitchDeadline
+  run: () => Promise<AgentSessionSwitchResult>
+  revokeOnSend: boolean
+  phase?: { observe?: boolean; receipt?: AgentSessionSwitchReceipt }
+  onRetained?: (check: () => void) => Promise<void>
+  allowUncreated: boolean
+}): SwitchCommand {
+  const {
+    host,
+    commands,
+    isDisposed,
+    id,
+    invocationId,
+    deadline,
+    run,
+    revokeOnSend,
+    phase,
+    onRetained,
+    allowUncreated
+  } = args
+  const { sessions, serialize } = host
+  const deps = () => host.context().deps
+  deadline.check()
+  const prior = commands.get(id)
+  if (prior) {
+    if (prior.invocationId !== invocationId && !prior.settled) {
+      throw agentSessionRefusalError('agent_session_operation_invalid', {
+        reason: 'handoffInFlight'
+      })
+    }
+    if (prior.invocationId === invocationId) {
+      return prior
+    }
+    prior.retentionAllowed = false
+    clearTimeout(prior.cleanupTimer)
+    prior.deadline.revoke()
+    commands.delete(id)
+  }
+  if (phase?.observe || phase?.receipt) {
+    throw agentSessionRefusalError('agent_session_operation_unknown', {
+      reason: 'outcomeUnknown'
+    })
+  }
+  const session = sessions.get(id)
+  if (!deps().store.getRecord(id) && !allowUncreated) {
+    throw new AgentSessionRefusalError(AGENT_SESSION_NOT_ATTACHED)
+  }
+  let present!: (view: Extract<AgentSessionSwitchResult, { status: 'present' }>) => void
+  let acknowledge!: (shown: boolean) => void
+  let openedResult!: (result: AgentSessionSwitchResult) => void
+  const presentation = new Promise<Extract<AgentSessionSwitchResult, { status: 'present' }>>(
+    (resolve) => {
+      present = resolve
+    }
+  )
+  const shown = new Promise<boolean>((resolve) => {
+    acknowledge = resolve
+  })
+  const opened = new Promise<AgentSessionSwitchResult>((resolve) => {
+    openedResult = resolve
+  })
+  const command: SwitchCommand = {
+    invocationId,
+    generation: randomUUID(),
+    settled: false,
+    deadline,
+    revokeOnSend,
+    retentionAllowed: true,
+    retain: async () => {
+      const check = () => {
+        if (!command.retentionAllowed || commands.get(id) !== command) {
+          throw agentSessionRefusalError('agent_session_operation_expired', {
+            reason: 'operationExpired'
+          })
+        }
+      }
+      check()
+      await onRetained?.(check)
+    },
+    present,
+    acknowledge,
+    presentation,
+    shown,
+    opened,
+    openedResult,
+    completion: Promise.resolve().then(async () => {
+      if (deps().store.getRecord(id)) {
+        await serialize(id, async () => {
+          deadline.check()
+          const opened = await host.open(id)
+          deadline.check()
+          if (opened) {
+            opened.switchCommand = command
+          }
+        })
+      }
+      try {
+        const result = await run()
+        if (revokeOnSend && (result.status === 'refused' || result.status === 'uncertain')) {
+          await command.retain?.()
+        }
+        return result
+      } catch (error) {
+        if (revokeOnSend) {
+          await command.retain?.().catch(() => {})
+        }
+        throw error
+      }
+    })
+  }
+  commands.set(id, command)
+  const retainOnExpiry = () => {
+    if (revokeOnSend) {
+      void command.retain?.().catch(() => {})
+    }
+  }
+  deadline.signal.addEventListener('abort', retainOnExpiry, { once: true })
+  if (session) {
+    session.switchCommand = command
+  }
+  host.context().publishStatus(id)
+  void command.completion
+    .finally(() => {
+      command.settled = true
+      deadline.dispose()
+      for (const [key, current] of commands) {
+        if (current === command && sessions.get(key)?.switchCommand === command) {
+          delete sessions.get(key)!.switchCommand
+        }
+      }
+      host.context().publishStatus(id)
+      if (isDisposed()) {
+        return
+      }
+      command.cleanupTimer = setTimeout(
+        () => {
+          void Promise.resolve(command.physical).then(() => {
+            command.retentionAllowed = false
+            deadline.signal.removeEventListener('abort', retainOnExpiry)
+            for (const [key, current] of commands) {
+              if (current === command) {
+                commands.delete(key)
+              }
+            }
+          })
+        },
+        Math.max(1, deadline.remaining())
+      )
+      command.cleanupTimer.unref?.()
+    })
+    .catch(() => {})
+  return command
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test.ts
new file mode 100644
index 000000000000..86b90dd3da55
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test.ts
@@ -0,0 +1,270 @@
+import { nativeConversationContent } from '../../ai-vault/structured-chat-cli-fork'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { agentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
+import {
+  agentSessionLeaseNeverAcquired,
+  agentSessionLeasePossiblyWriting
+} from '../../../shared/agent-session-lease-adjudication'
+import {
+  createRestTestRig,
+  restTestSend,
+  type RestTestRig
+} from './structured-agent-session-rest-test-rig'
+import {
+  createTestParams,
+  CREATE_TEST_CALLER as caller
+} from './structured-agent-session-create-test-fixture'
+import { HOST_TEST_SESSION as id } from './structured-agent-session-host-test-data'
+
+let initial: ReturnType<typeof createTestParams>
+let rig: RestTestRig
+const deadlines: ReturnType<typeof agentSessionSwitchDeadline>[] = []
+function clock() {
+  let now = 0
+  const deadline = agentSessionSwitchDeadline(() => now, 720_000)
+  deadlines.push(deadline)
+  return {
+    deadline,
+    expire: () => {
+      now = 720_001
+    }
+  }
+}
+beforeEach(async () => {
+  rig = await createRestTestRig({ idleSweep: { intervalMs: 60_000 } })
+  initial = createTestParams()
+  expect(await rig.host.create(caller, initial)).toMatchObject({ ok: true })
+})
+afterEach(async () => {
+  deadlines.forEach((deadline) => deadline.dispose())
+  deadlines.length = 0
+  await rig.dispose()
+  vi.restoreAllMocks()
+})
+
+it('joins the command across its own resource close, without holding the session queue while waiting', async () => {
+  const { deadline } = clock()
+  const entered = Promise.withResolvers<void>()
+  const release = Promise.withResolvers<void>()
+  const run = vi.fn(async () => {
+    await rig.host.switchToTerminal(id, deadline)
+    entered.resolve()
+    await release.promise
+    return { status: 'completed' as const, sessionId: id }
+  })
+  const first = rig.host.runSwitch(id, 'same-click', deadline, run)
+  await entered.promise
+  expect(rig.host.hasSession(id)).toBe(false)
+  expect(rig.host.switchExecuting(id)).toBe(true)
+  const duplicate = rig.host.runSwitch(id, 'same-click', deadline, run)
+  await expect(rig.host.runSwitch(id, 'another-click', deadline, run)).rejects.toMatchObject({
+    refusal: { details: { reason: 'handoffInFlight' } }
+  })
+  release.resolve()
+  expect(await first).toEqual(await duplicate)
+  expect(run).toHaveBeenCalledOnce()
+})
+
+it('revokes a command queued before expiry without executing its later effect', async () => {
+  const entered = Promise.withResolvers<void>()
+  const release = Promise.withResolvers<void>()
+  // A create publication occupies the real nonreentrant session queue.
+  const create = rig.host.create(caller, initial, {
+    publishTab: async () => {
+      entered.resolve()
+      await release.promise
+    }
+  })
+  await entered.promise
+  const time = clock()
+  const effect = vi.fn(async () => ({ status: 'completed' as const, sessionId: id }))
+  const waiting = rig.host.runSwitch(id, 'queued', time.deadline, effect)
+  const refused = expect(waiting).rejects.toMatchObject({
+    refusal: { code: 'agent_session_operation_expired' }
+  })
+  time.expire()
+  release.resolve()
+  await create
+  await refused
+  expect(effect).not.toHaveBeenCalled()
+})
+
+it('checks expiry in the actual reservation transaction after the earlier acquire check', async () => {
+  const time = clock()
+  const reserve = rig.store.reserveOwner
+  vi.spyOn(rig.store, 'reserveOwner').mockImplementation((request, check) => {
+    time.expire()
+    return reserve(request, check)
+  })
+  expect(await rig.host.switchToChat(id, time.deadline)).toMatchObject({ ok: false })
+  expect(rig.adapter.acquire).not.toHaveBeenCalled()
+  expect(agentSessionLeaseNeverAcquired(rig.store.getRecord(id)!.lease)).toBe(true)
+})
+
+it('shares the full never-acquired proof, while recovery-released ownership stays unavailable after restart', async () => {
+  const { deadline } = clock()
+  const founding = rig.store.getRecord(id)!.lease
+  expect(agentSessionLeaseNeverAcquired(founding)).toBe(true)
+  expect(agentSessionLeasePossiblyWriting(founding)).toBe(false)
+  await rig.host.switchToTerminal(id, deadline)
+  // Recovery can release without observing death: fence 1 alone must not grant a writer.
+  await rig.store.transitionHandoff(id, (record) => ({
+    ...record,
+    lease: { ...record.lease, minimumNextFence: 2 }
+  }))
+  expect(agentSessionLeasePossiblyWriting(rig.store.getRecord(id)!.lease)).toBe(true)
+  await rig.restart()
+  await expect(rig.host.switchToTerminal(id, deadline)).rejects.toMatchObject({
+    refusal: { details: { reason: 'previousExitUnverifiable' } }
+  })
+  expect(rig.adapter.closeSession).not.toHaveBeenCalled()
+  expect((await rig.host.journalSnapshot(id)).items).toBeDefined()
+})
+
+it('preserves accepted work before retirement and never aborts the send that starts it', async () => {
+  const { deadline } = clock()
+  await rig.host.revealSession(id)
+  const current = rig.host.captureSwitchWork(id, deadline)
+  expect(current()).toBe(true)
+  const accepted = await rig.host.send(caller, restTestSend('Implement the CLI change', 1))
+  expect(accepted.ok).toBe(true)
+  expect(current()).toBe(false)
+  await expect(rig.host.switchToTerminal(id, deadline)).rejects.toHaveProperty('refusal')
+  expect(rig.adapter.closeSession).not.toHaveBeenCalled()
+})
+
+it('rechecks source work at the actual queued visibility transaction and never retires a different tab', async () => {
+  await rig.store.setSessionTabVisibility(id, false)
+  await rig.store.setSessionTabVisibility(id, true, 'source-tab')
+  let current = true
+  const late = rig.store.setSwitchedSessionTabVisibility(id, 'source-tab', false, () => current)
+  current = false
+  expect(await late).toBe(false)
+  expect(rig.store.getSessionTabId(id)).toBe('source-tab')
+  expect(
+    await rig.store.setSwitchedSessionTabVisibility(id, 'another-tab', false, () => true)
+  ).toBe(false)
+  expect(rig.store.getSessionTabId(id)).toBe('source-tab')
+})
+
+it('accepts the first send against an empty transfer and revokes only the unsent switch effects', async () => {
+  const { deadline } = clock()
+  const empty = Promise.withResolvers<void>()
+  const continueSwitch = Promise.withResolvers<void>()
+  const physicalCreate = vi.fn()
+  await rig.host.revealSession(id)
+  const operation = rig.host.runSwitch(id, 'empty-first-send', deadline, async () => {
+    expect(nativeConversationContent(await rig.host.journalSnapshot(id))).toBe('empty')
+    empty.resolve()
+    await continueSwitch.promise
+    await rig.host.switchToTerminal(id, deadline)
+    deadline.check()
+    physicalCreate()
+    return { status: 'completed', sessionId: id }
+  })
+  const refused = expect(operation).rejects.toHaveProperty('refusal')
+  await empty.promise
+  const accepted = await rig.host.send(caller, restTestSend('Keep this first message', 1))
+  expect(accepted.ok).toBe(true)
+  continueSwitch.resolve()
+  await refused
+  expect(physicalCreate).not.toHaveBeenCalled()
+  expect(rig.adapter.closeSession).not.toHaveBeenCalled()
+  expect((await rig.host.journalSnapshot(id)).items.length).toBeGreaterThan(0)
+})
+
+it('accepts immediately and waits only the prior physical acquisition before starting the accepted send', async () => {
+  const { deadline } = clock()
+  const entered = Promise.withResolvers<void>()
+  const physical = Promise.withResolvers<void>()
+  const operation = rig.host.runSwitch(id, 'prior-physical', deadline, async () => {
+    const acquisition = rig.host.trackSwitchPhysical(id, physical.promise)
+    entered.resolve()
+    await acquisition
+    return { status: 'completed', sessionId: id }
+  })
+  await entered.promise
+  const accepted = await rig.host.send(
+    caller,
+    restTestSend('Continue after the old launch settles', 1)
+  )
+  expect(accepted.ok).toBe(true)
+  expect(deadline.signal.aborted).toBe(true)
+  const start = rig.host.switchToChat(id)
+  await rig.host.journalSnapshot(id)
+  expect(rig.adapter.acquire).not.toHaveBeenCalled()
+  physical.resolve()
+  await operation
+  expect(await start).toMatchObject({ ok: true })
+  expect(rig.adapter.acquire).toHaveBeenCalledOnce()
+})
+
+it('ordinary Close revokes a queued retention writer instead of resurrecting the source', async () => {
+  const { deadline } = clock()
+  const started = Promise.withResolvers<void>()
+  const finish = Promise.withResolvers<void>()
+  const restoring = Promise.withResolvers<void>()
+  const write = Promise.withResolvers<void>()
+  const retained = vi.fn(async (check: () => void) => {
+    restoring.resolve()
+    await write.promise
+    await rig.store.setSessionTabVisibility(id, true, undefined, check)
+  })
+  const operation = rig.host.runSwitch(
+    id,
+    'close-during-retain',
+    deadline,
+    async () => {
+      started.resolve()
+      await finish.promise
+      return { status: 'completed', sessionId: id }
+    },
+    true,
+    undefined,
+    retained
+  )
+  await started.promise
+  const retain = rig.host.retainSwitch(id)
+  const rejected = expect(retain).rejects.toHaveProperty('refusal')
+  await restoring.promise
+  await rig.host.close(id, 'user-close')
+  await rig.store.setSessionTabVisibility(id, false)
+  write.resolve()
+  await rejected
+  finish.resolve()
+  await operation
+  expect(rig.store.getSessionTabId(id)).toBeNull()
+})
+
+it('expiry retains a source through the command owner and cannot restore after external Close', async () => {
+  const { deadline } = clock()
+  const started = Promise.withResolvers<void>()
+  const finish = Promise.withResolvers<void>()
+  const retained = vi.fn(async (check: () => void) => {
+    check()
+    await rig.store.setSessionTabVisibility(id, true, undefined, check)
+  })
+  const operation = rig.host.runSwitch(
+    id,
+    'expire-retain',
+    deadline,
+    async () => {
+      started.resolve()
+      await finish.promise
+      return { status: 'completed', sessionId: id }
+    },
+    true,
+    undefined,
+    retained
+  )
+  await started.promise
+  deadline.revoke()
+  await rig.host.retainSwitch(id)
+  expect(rig.store.getSessionTabId(id)).not.toBeNull()
+  await rig.host.close(id, 'user-close')
+  await rig.store.setSessionTabVisibility(id, false)
+  await expect(rig.host.retainSwitch(id)).rejects.toHaveProperty('refusal')
+  finish.resolve()
+  await operation
+  expect(rig.store.getSessionTabId(id)).toBeNull()
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-commands.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-commands.ts
new file mode 100644
index 000000000000..fc02bba47fbc
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-commands.ts
@@ -0,0 +1,167 @@
+import type { StructuredAgentSessionConversationLifetimeHost } from './structured-agent-session-conversation-lifetime-host'
+import { agentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
+import type {
+  AgentSessionSwitchDeadline,
+  AgentSessionSwitchResult,
+  AgentSessionSwitchReceipt
+} from '../../../shared/agent-session-switch-execution'
+import {
+  selectStructuredSessionSwitchCommand,
+  type SwitchCommand
+} from './structured-agent-session-switch-command-selection'
+
+export function createStructuredAgentSessionSwitchCommands(
+  host: StructuredAgentSessionConversationLifetimeHost,
+  isDisposed: () => boolean
+) {
+  const { serialize } = host
+  const deps = () => host.context().deps
+  const commands = new Map<string, SwitchCommand>()
+  const unsubscribeAcceptance = deps().store.onAcceptedSend((id) => {
+    const command = commands.get(id)
+    if (!command?.revokeOnSend || command.settled) {
+      return
+    }
+    command.deadline.revoke(
+      agentSessionRefusalError('agent_session_operation_invalid', {
+        reason: 'messagesUnsettled'
+      })
+    )
+  })
+
+  return {
+    controls: {
+      runSwitch: async (
+        id: string,
+        invocationId: string,
+        deadline: AgentSessionSwitchDeadline,
+        run: () => Promise<AgentSessionSwitchResult>,
+        revokeOnSend = true,
+        phase?: {
+          observe?: boolean
+          receipt?: AgentSessionSwitchReceipt
+        },
+        onRetained?: (check: () => void) => Promise<void>,
+        allowUncreated = false,
+        onConverged?: (generation: string) => void
+      ): Promise<AgentSessionSwitchResult> => {
+        const selected = await deadline.wait(
+          serialize(id, async () => {
+            return selectStructuredSessionSwitchCommand({
+              host,
+              commands,
+              isDisposed,
+              id,
+              invocationId,
+              deadline,
+              run,
+              revokeOnSend,
+              phase,
+              onRetained,
+              allowUncreated
+            })
+          })
+        )
+        if (selected.deadline !== deadline) {
+          deadline.dispose()
+        }
+        if (phase?.receipt) {
+          if (phase.receipt.generation !== selected.generation) {
+            throw agentSessionRefusalError('agent_session_operation_invalid', {
+              reason: 'handoffInFlight'
+            })
+          }
+          if (phase.receipt.converged) {
+            onConverged?.(selected.generation)
+            return { status: 'completed', sessionId: id }
+          }
+          if (phase.receipt.retained) {
+            selected.deadline.revoke(
+              agentSessionRefusalError('agent_session_operation_invalid', {
+                reason: 'messagesUnsettled'
+              })
+            )
+            await selected.retain?.()
+            return { status: 'completed', sessionId: id, sourceRetained: true }
+          }
+          selected.deadline.check()
+          selected.acknowledge(phase.receipt.shown)
+          return Promise.race([selected.completion, selected.opened])
+        }
+        return phase?.observe
+          ? selected.completion
+          : Promise.race([selected.completion, selected.presentation])
+      },
+      adoptSwitch: (from: string, to: string) =>
+        serialize(to, async () => {
+          const command = commands.get(from)
+          const prior = commands.get(to)
+          command?.deadline.check()
+          if (!command || (prior && prior !== command && !prior.settled)) {
+            throw agentSessionRefusalError('agent_session_operation_invalid', {
+              reason: 'handoffInFlight'
+            })
+          }
+          commands.set(to, command)
+        }),
+      switchGeneration: (id: string) => commands.get(id)?.generation,
+      retainSwitch: async (id: string) => {
+        await commands.get(id)?.retain?.()
+      },
+      presentSwitch: async (
+        id: string,
+        view: Omit<
+          Extract<AgentSessionSwitchResult, { status: 'present' }>,
+          'status' | 'generation'
+        >
+      ) => {
+        const command = commands.get(id)
+        if (!command) {
+          throw agentSessionRefusalError('agent_session_operation_expired', {
+            reason: 'operationExpired'
+          })
+        }
+        command.deadline.check()
+        command.present({ ...view, status: 'present', generation: command.generation })
+        if (!(await command.deadline.wait(command.shown))) {
+          throw agentSessionRefusalError('agent_session_operation_unknown', {
+            reason: 'tabUnconfirmed'
+          })
+        }
+        command.deadline.check()
+      },
+      openedSwitch: (id: string, result: AgentSessionSwitchResult) =>
+        commands.get(id)?.openedResult(result),
+      switchExecuting: (id: string) => Boolean(commands.get(id) && !commands.get(id)?.settled),
+      trackSwitchPhysical: <T>(id: string, work: Promise<T>): Promise<T> => {
+        const command = commands.get(id)
+        if (command) {
+          command.physical = work.then(
+            () => {},
+            () => {}
+          )
+        }
+        return work
+      },
+      waitSwitchPhysical: async (id: string): Promise<void> => {
+        await commands.get(id)?.physical
+      }
+    },
+    revoke: (id: string) => {
+      const command = commands.get(id)
+      if (command) {
+        command.retentionAllowed = false
+        command.deadline.revoke()
+      }
+    },
+    dispose: () => {
+      unsubscribeAcceptance()
+      for (const command of commands.values()) {
+        command.retentionAllowed = false
+        clearTimeout(command.cleanupTimer)
+        command.deadline.revoke()
+      }
+      commands.clear()
+    }
+  }
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-to-chat.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-to-chat.ts
index ea21e2425d0e..973aca9c8f9d 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-to-chat.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-to-chat.ts
@@ -1,7 +1,3 @@
-// A terminal handing its conversation to the chat that already holds it: the chat's agent starts
-// through the one operation start (its provider open imports the terminal's turns), and only that
-// same child reaching ready is success. Its ended child's typed failure is the click's refusal.
-
 import {
   agentSessionRefusalFromReference,
   refuse,
@@ -15,7 +11,10 @@ import {
   operationDidNotRun,
   selectStructuredAgentSessionOperationChild
 } from './structured-agent-session-operation-child'
+import { structuredAgentSessionSwitchBlocked } from './structured-agent-session-switch-admission'
+import { agentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
 import { sameProviderChild } from './structured-agent-session-provider-child'
+import { recordStructuredAgentSessionStartFailure } from './structured-agent-session-start-failure-row'
 import { structuredAgentSessionEndedChildFailure } from './structured-agent-session-ended-child-failure'
 import {
   type StructuredAgentSessionStartFailureCause,
@@ -25,22 +24,49 @@ import {
 } from './structured-agent-session-failure-text'
 import { structuredAgentSessionFailureWordsContext } from './structured-agent-session-send-preparation'
 import { STRUCTURED_AGENT_SESSION_START_WAIT_MS } from './structured-agent-session-send-settlement'
+import type { AgentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
+
+// A terminal handing its conversation to the chat that already holds it: the chat's agent starts
+// through the one operation start (its provider open imports the terminal's turns), and only that
+// same child reaching ready is success. Its ended child's typed failure is the click's refusal.
 
 export type StructuredAgentSessionSwitchToChatOutcome =
   | { ok: true }
-  | { ok: false; refusal: AgentSessionWireRefusal }
+  | { ok: false; refusal: AgentSessionWireRefusal; failureItemId?: string }
 
 export async function startStructuredAgentSessionForSwitch(
   context: StructuredAgentSessionMutationContext,
-  sessionId: string
+  sessionId: string,
+  deadline?: AgentSessionSwitchDeadline
 ): Promise<StructuredAgentSessionSwitchToChatOutcome> {
   const selected = await context.serialize(sessionId, async () => {
+    deadline?.check()
     if (!(await context.openConversation(sessionId))) {
       return operationDidNotRun()
     }
+    deadline?.check()
+    if (deadline) {
+      const reason = structuredAgentSessionSwitchBlocked({
+        session: context.sessions.get(sessionId),
+        deps: context.deps,
+        sessionId,
+        delivering: context.deliveryOrder.hasActiveSend(sessionId),
+        background: context.childWorkOpen(sessionId),
+        ownCommand: true,
+        joinStart: true
+      })
+      if (reason) {
+        throw agentSessionRefusalError(
+          reason === 'previousExitUnverifiable'
+            ? 'agent_session_ownership_unknown'
+            : 'agent_session_operation_invalid',
+          { reason }
+        )
+      }
+    }
     const selection = selectStructuredAgentSessionOperationChild(context, sessionId)
     return selection.ok && !selection.child
-      ? { ...selection, start: context.claimAgent(sessionId) }
+      ? { ...selection, start: context.claimAgent(sessionId, deadline?.check) }
       : { ...selection, start: null }
   })
   if (!selected.ok) {
@@ -51,9 +77,13 @@ export async function startStructuredAgentSessionForSwitch(
     const started: StructuredAgentSessionResumeOutcome = await (selected.start?.outcome ??
       operationDidNotRun())
     if (!started.ok) {
-      return started.failure
+      const result = started.failure
         ? switchStartFailure(context, sessionId, { failure: started.failure })
-        : { ok: false, refusal: started.refusal }
+        : { ok: false as const, refusal: started.refusal }
+      return {
+        ...result,
+        ...(deadline && started.failureItemId ? { failureItemId: started.failureItemId } : {})
+      }
     }
     const selection = selectStructuredAgentSessionOperationChild(context, sessionId)
     if (!selection.ok || !selection.child) {
@@ -62,20 +92,24 @@ export async function startStructuredAgentSessionForSwitch(
     child = selection.child
     readiness = selection.readiness
   }
-  const outcome = (await readiness?.wait(STRUCTURED_AGENT_SESSION_START_WAIT_MS)) ?? 'ready'
+  const outcome =
+    (await readiness?.wait(
+      Math.min(STRUCTURED_AGENT_SESSION_START_WAIT_MS, deadline?.remaining() ?? Infinity)
+    )) ?? 'ready'
   const awaited = child
-  return context.serialize(sessionId, async () =>
-    switchStartVerdict(context, sessionId, awaited, outcome)
-  )
+  return context.serialize(sessionId, async () => {
+    return switchStartVerdict(context, sessionId, awaited, outcome, Boolean(deadline))
+  })
 }
 
 /** Under the queue: the awaited child itself is ready, or its own end says why it is not. */
-function switchStartVerdict(
+async function switchStartVerdict(
   context: StructuredAgentSessionMutationContext,
   sessionId: string,
   awaited: StructuredAgentSessionProviderChildIdentity,
-  outcome: 'ready' | 'ended' | 'timeout'
-): StructuredAgentSessionSwitchToChatOutcome {
+  outcome: 'ready' | 'ended' | 'timeout',
+  execution: boolean
+): Promise<StructuredAgentSessionSwitchToChatOutcome> {
   const session = context.sessions.get(sessionId)
   const child = session?.child
   if (outcome === 'ready' && child?.phase === 'ready' && !child.close) {
@@ -89,7 +123,27 @@ function switchStartVerdict(
   if (!failure) {
     return operationDidNotRun(outcome === 'timeout')
   }
-  return switchStartFailure(context, sessionId, failure)
+  const failureItemId =
+    execution && session
+      ? await recordStructuredAgentSessionStartFailure(
+          {
+            journal: session.journal,
+            fence: context.deps.store.getRecord(sessionId)?.lease.runtimeFence ?? 0
+          },
+          {
+            startKey: awaited.generation,
+            ...structuredAgentSessionStartFailure(
+              failure,
+              structuredAgentSessionFailureWordsContext(context.deps.store.getRecord(sessionId))
+            )
+          },
+          null
+        )
+      : undefined
+  return {
+    ...switchStartFailure(context, sessionId, failure),
+    ...(failureItemId ? { failureItemId } : {})
+  }
 }
 
 function switchStartFailure(
diff --git a/src/main/native-chat/agent-session-wire/structured-provider-session-ownership.ts b/src/main/native-chat/agent-session-wire/structured-provider-session-ownership.ts
index 465da9aeedcb..62b5939dd442 100644
--- a/src/main/native-chat/agent-session-wire/structured-provider-session-ownership.ts
+++ b/src/main/native-chat/agent-session-wire/structured-provider-session-ownership.ts
@@ -1,6 +1,7 @@
 import type { AgentSessionLease, AgentSessionRecord } from '../../../shared/agent-session-record'
 import type { StructuredAgentId } from '../../../shared/agent-session-provider-handle'
-import { agentSessionLeaseOwnerVerdict } from '../../../shared/agent-session-lease-adjudication'
+import { agentSessionLeasePossiblyWriting } from '../../../shared/agent-session-lease-adjudication'
+export { agentSessionLeasePossiblyWriting } from '../../../shared/agent-session-lease-adjudication'
 import { structuredAgentRuntimeMetadata } from '../../runtime/structured-agent-runtime-metadata'
 import { inPlaceSwitchEnabled } from '../../../shared/structured-agent-cli-conversation-adoption'
 import {
@@ -52,11 +53,6 @@ export function listStructuredProviderSessionOwnership(
   })
 }
 
-/** Fail closed: only a lease released on proof its owner exited can't be writing. */
-export function agentSessionLeasePossiblyWriting(lease: AgentSessionLease): boolean {
-  return agentSessionLeaseOwnerVerdict(lease) !== 'exited'
-}
-
 /** Agents whose chats let a terminal resume the same conversation once the chat stopped writing. */
 export function sameIdTerminalResumeEnabled(provider: StructuredAgentId): boolean {
   return inPlaceSwitchEnabled(provider)
diff --git a/src/main/native-chat/transcript-line-decoders-codex.ts b/src/main/native-chat/transcript-line-decoders-codex.ts
index 2a5dfc4f5b10..c62ea9242b6b 100644
--- a/src/main/native-chat/transcript-line-decoders-codex.ts
+++ b/src/main/native-chat/transcript-line-decoders-codex.ts
@@ -9,7 +9,7 @@ import {
   parseJsonObject,
   timestampMs
 } from '../ai-vault/session-scanner-values'
-import { claudeContentBlocks, toolResultOutput } from './transcript-record-blocks'
+import { toolResultOutput } from './transcript-record-blocks'
 import { CODEX_EVENT_TURN_ABORTED } from './transcript-turn-markers'
 
 export function decodeCodexTranscriptLine(
@@ -63,7 +63,7 @@ function codexResponseItem(
     if (!role) {
       return null
     }
-    const decodedBlocks = claudeContentBlocks(payload.content)
+    const decodedBlocks = codexTurnItemBlocks(payload.content)
     const blocks =
       role === 'user' ? decodedBlocks.filter((block) => !isSkillContext(block)) : decodedBlocks
     if (blocks.length === 0) {
@@ -174,11 +174,20 @@ function codexCompletedTurnItem(
 }
 
 function codexTurnItemBlocks(content: unknown): NativeChatBlock[] {
+  if (typeof content === 'string') {
+    return content.trim() ? [{ type: 'text', text: content }] : []
+  }
   if (!Array.isArray(content)) {
     return []
   }
   const blocks: NativeChatBlock[] = []
   for (const value of content) {
+    if (typeof value === 'string') {
+      if (value.trim()) {
+        blocks.push({ type: 'text', text: value })
+      }
+      continue
+    }
     const item = asRecord(value)
     if (!item) {
       continue
diff --git a/src/main/persistence/loading-store/pty-binding-persistence.ts b/src/main/persistence/loading-store/pty-binding-persistence.ts
index 37b54e3b02c5..d2c27e87522f 100644
--- a/src/main/persistence/loading-store/pty-binding-persistence.ts
+++ b/src/main/persistence/loading-store/pty-binding-persistence.ts
@@ -243,10 +243,11 @@ export class PtyBindingPersistenceOperations {
 
   admitTerminalPane(
     admission: TerminalPaneAdmission,
-    hostId?: string | null
+    hostId?: string | null,
+    check?: () => void
   ): Promise<TerminalPaneAdmissionOutcome> {
     return this[ptyBindingPersistenceOperationsContext].runtime.runDurableMutation(
-      admitPane(resolveHostId(hostId), admission, this.topology())
+      admitPane(resolveHostId(hostId), admission, this.topology(), check)
     )
   }
 
diff --git a/src/main/persistence/terminal-topology/layout-command-persistence.ts b/src/main/persistence/terminal-topology/layout-command-persistence.ts
index 58ae5fdccdef..7e5681ca069e 100644
--- a/src/main/persistence/terminal-topology/layout-command-persistence.ts
+++ b/src/main/persistence/terminal-topology/layout-command-persistence.ts
@@ -83,6 +83,7 @@ export class LayoutCommandPersistence {
     run: {
       originalPresentation?: TerminalSurfaceCloseCapture
       admit?: () => boolean
+      onApplied?: () => void
       live?: LayoutLiveContext
       stopBeforeWrite?: (ptyIds: readonly string[]) => boolean
       onEffects?: (effects: LayoutEffects) => void
@@ -151,7 +152,7 @@ export class LayoutCommandPersistence {
         })
     }
     let effects: LayoutEffects | undefined
-    const commit = raisingBindingGenerations(
+    const apply = raisingBindingGenerations(
       context.runtime,
       resolved,
       (hostId) => context.sessions.getWorkspaceSession(hostId),
@@ -161,6 +162,16 @@ export class LayoutCommandPersistence {
         noteEffects: (noted) => (effects = noted)
       })
     )
+    const commit = () => {
+      if (run.admit && !run.admit()) {
+        return { value: { ok: false as const, code: 'tab_not_found' as const }, persist: false }
+      }
+      const mutation = apply()
+      if (!(mutation.value instanceof Error) && mutation.value.ok) {
+        run.onApplied?.()
+      }
+      return mutation
+    }
     // Applied closes must stay closed even when persistence fails.
     const applied: Promise<LayoutApplyOutcome> =
       ORCA_LAYOUT_OWNER_IS_MAIN && context.writeLater && isTerminalClose(command)
diff --git a/src/main/persistence/terminal-topology/terminal-topology-commit.ts b/src/main/persistence/terminal-topology/terminal-topology-commit.ts
index 327b789ffc2f..04642c29b03f 100644
--- a/src/main/persistence/terminal-topology/terminal-topology-commit.ts
+++ b/src/main/persistence/terminal-topology/terminal-topology-commit.ts
@@ -84,7 +84,8 @@ export function moveLeaf(
 export function admitPane(
   hostId: ExecutionHostId,
   admission: TerminalPaneAdmission,
-  context: TerminalTopologyCommitContext
+  context: TerminalTopologyCommitContext,
+  check?: () => void
 ): () => DurableProfileStateMutation<TerminalPaneAdmissionOutcome> {
   return traced(
     'admit_pane',
@@ -92,6 +93,7 @@ export function admitPane(
     fencedIfLayoutOwner(
       () => partitionsFence([hostId], context.getSession, false),
       () => {
+        check?.()
         // A legacy reattach can land outside the partition that recorded the tab's close.
         if (
           admission.type === 'createTerminalTab' &&
diff --git a/src/main/providers/agent-foreground-process-real-rows.test.ts b/src/main/providers/agent-foreground-process-real-rows.test.ts
index fd86e2073987..1a12bbba8e23 100644
--- a/src/main/providers/agent-foreground-process-real-rows.test.ts
+++ b/src/main/providers/agent-foreground-process-real-rows.test.ts
@@ -1,3 +1,4 @@
+import { resolveSuspendedAgentProcessFromPs } from './suspended-agent-process'
 import { readFileSync } from 'node:fs'
 import { join } from 'node:path'
 import { gunzipSync } from 'node:zlib'
@@ -35,3 +36,20 @@ describe('real foreground process captures', () => {
     ])
   })
 })
+
+it('keeps a stopped real Codex subtree distinct from foreground routing after Ctrl-Z', () => {
+  const captures = JSON.parse(
+    gunzipSync(readFileSync(join(__dirname, '__fixtures__', 'real-agent-rows.json.gz'))).toString(
+      'utf8'
+    )
+  ) as CapturedRun[]
+  const capture = captures.find((run) => run.agent === 'codex')!
+  const stopped = capture.rows.map((row) =>
+    row.pid === capture.shellPid
+      ? { ...row, stat: 'Ss+' }
+      : { ...row, stat: row.stat.replace('+', '').replace(/^[A-Za-z]/, 'T') }
+  )
+  expect(resolveAgentForegroundProcessFromPs(stopped, capture.shellPid)).toBeNull()
+  expect(resolveSuspendedAgentProcessFromPs(stopped, capture.shellPid)).toBe('codex')
+  expect(resolveSuspendedAgentProcessFromPs(capture.rows, capture.shellPid)).toBeNull()
+})
diff --git a/src/main/providers/agent-foreground-process-remote-evidence.ts b/src/main/providers/agent-foreground-process-remote-evidence.ts
index d9fa77914985..4d2b85a275b3 100644
--- a/src/main/providers/agent-foreground-process-remote-evidence.ts
+++ b/src/main/providers/agent-foreground-process-remote-evidence.ts
@@ -1,3 +1,4 @@
+import { resolveSuspendedAgentProcessFromPs } from './suspended-agent-process'
 import { hasControllingTty } from '../../shared/posix-controlling-terminal'
 import { recognizeAgentProcessFromCommandLine } from '../../shared/agent-process-recognition'
 import type {
@@ -102,10 +103,12 @@ export function resolveRemoteForegroundEvidenceFromRows(
   if (candidate && !candidate.row.startTime) {
     return { ...metadata, verdict: 'unverifiable', reason: 'candidate_start_time_missing' }
   }
+  const suspendedAgentProcess = resolveSuspendedAgentProcessFromPs(rows, root.pid)
   return {
     ...metadata,
     verdict: 'live',
     processName: candidate?.name.processName ?? null,
+    ...(suspendedAgentProcess ? { suspendedAgentProcess } : {}),
     fence
   }
 }
diff --git a/src/main/providers/agent-foreground-process.ts b/src/main/providers/agent-foreground-process.ts
index e517c1ed807e..20ebc0423f23 100644
--- a/src/main/providers/agent-foreground-process.ts
+++ b/src/main/providers/agent-foreground-process.ts
@@ -1,3 +1,4 @@
+import { resolveSuspendedAgentProcessFromPs } from './suspended-agent-process'
 import { recognizeAgentProcessFromCommandLine } from '../../shared/agent-process-recognition'
 import { resolveOuterWrapperForegroundProcess } from '../../shared/foreground-wrapper-agent'
 import type { ProcessTableRow } from '../../shared/process-table-snapshot'
@@ -37,6 +38,7 @@ export {
 export type AgentForegroundProcessResolution = {
   available: boolean
   processName: string | null
+  suspendedAgentProcess?: string
   /** Windows liveness anchor for an unambiguous recognized name; omitted for fallbacks and POSIX. */
   processId?: number
   /** Windows: the scan proved the caller's `anchorProcessId` is now a non-agent. */
@@ -164,9 +166,11 @@ export async function resolveAgentForegroundProcessWithAvailability(
     if (options.fresh && !getProcessTableIndex(rows).byPid.has(shellPid)) {
       return { available: false, processName: fallbackProcess }
     }
+    const suspendedAgentProcess = resolveSuspendedAgentProcessFromPs(rows, shellPid)
     return {
       available: true,
-      processName: resolveAgentForegroundProcessFromPs(rows, shellPid) ?? fallbackProcess
+      processName: resolveAgentForegroundProcessFromPs(rows, shellPid) ?? fallbackProcess,
+      ...(suspendedAgentProcess ? { suspendedAgentProcess } : {})
     }
   } catch {
     // Why: a failed scan cannot prove fallback ownership; callers retain the last recognized agent.
diff --git a/src/main/providers/local-pty-foreground-inspection.ts b/src/main/providers/local-pty-foreground-inspection.ts
index cf1ec9bc172c..987ec4f86e05 100644
--- a/src/main/providers/local-pty-foreground-inspection.ts
+++ b/src/main/providers/local-pty-foreground-inspection.ts
@@ -37,7 +37,8 @@ import { isWindowsPtyJobReadable, readWindowsPtyJobProcessIds } from './windows-
 export async function inspectLocalPtyChildProcesses(
   id: string,
   fresh = true,
-  ignoreDetached = false
+  ignoreDetached = false,
+  strict = false
 ): Promise<PtyChildProcessVerdict> {
   const proc = ptyProcesses.get(id)
   if (!proc) {
@@ -56,7 +57,7 @@ export async function inspectLocalPtyChildProcesses(
       )
       return ptyProcesses.get(id) === proc ? verdict : 'unverifiable'
     }
-    if (ptyProcessNameIsSpawnFile(proc)) {
+    if (strict || ptyProcessNameIsSpawnFile(proc)) {
       const snapshot = await getStrictProcessTableSnapshotWithAge()
       return ptyProcesses.get(id) === proc
         ? inspectSpawnFileChildProcessesFromRows(
@@ -241,7 +242,10 @@ async function readPosixSteadyState(
   }
 }
 
-export async function confirmLocalPtyForegroundProcess(id: string): Promise<string | null> {
+export async function confirmLocalPtyForegroundProcess(
+  id: string,
+  observeSuspended?: (name: string | undefined) => void
+): Promise<string | null> {
   const proc = ptyProcesses.get(id)
   if (!proc) {
     return null
@@ -269,6 +273,9 @@ export async function confirmLocalPtyForegroundProcess(id: string): Promise<stri
     if (ptyProcesses.get(id) !== proc) {
       return null
     }
+    if (resolution.available) {
+      observeSuspended?.(resolution.suspendedAgentProcess)
+    }
     return resolution.available ? resolution.processName : null
   } catch {
     return null
diff --git a/src/main/providers/local-pty-provider-state.ts b/src/main/providers/local-pty-provider-state.ts
index a0dfda576464..a15670169618 100644
--- a/src/main/providers/local-pty-provider-state.ts
+++ b/src/main/providers/local-pty-provider-state.ts
@@ -1,5 +1,5 @@
 import type * as pty from 'node-pty'
-import type { PhysicalExitTracker } from '../../shared/physical-exit-tracker'
+import { PhysicalExitTracker } from '../../shared/physical-exit-tracker'
 import type { PtyStartupIngress } from '../../shared/pty-startup-ingress'
 import type { TerminalExitCause } from '../../shared/terminal-exit-cause'
 import { getSpawnedShellName, normalizeLocalCallerSessionId } from './local-pty-launch-helpers'
@@ -62,7 +62,23 @@ export const ptyDisposables = new Map<string, { dispose: () => void }[]>()
 export const ptyExitDisposables = new Map<string, { dispose: () => void }>()
 export const ptyCleanupCallbacks = new Map<string, () => void>()
 export const ptyTerminationMode = new Map<string, 'graceful' | 'force'>()
-export const ptyPhysicalExits = new Map<string, PhysicalExitTracker>()
+export class LocalPtyPhysicalExit extends PhysicalExitTracker {
+  useRevision = 0
+  closing = false
+  pendingCommand = false
+  witness?: { token: string; revision: number; at: number }
+}
+export const ptyPhysicalExits = new Map<string, LocalPtyPhysicalExit>()
+export function noteLocalPtyUse(id: string): boolean {
+  const owner = ptyPhysicalExits.get(id)
+  if (owner?.closing) {
+    return false
+  }
+  if (owner) {
+    owner.useRevision++
+  }
+  return true
+}
 // macOS TCC wrapper status is not the shell/agent exit status (STA-4536).
 export const ptyReportsChildExitStatus = new Map<string, boolean>()
 export const ptyForceKillTimers = new Map<string, ReturnType<typeof setTimeout>>()
diff --git a/src/main/providers/local-pty-provider.ts b/src/main/providers/local-pty-provider.ts
index 9417320773d3..585ecf7ee109 100644
--- a/src/main/providers/local-pty-provider.ts
+++ b/src/main/providers/local-pty-provider.ts
@@ -1,3 +1,7 @@
+import type {
+  PtyFencedTerminationRequest,
+  PtyFencedTerminationOutcome
+} from '../../shared/pty-fenced-termination'
 import type * as pty from 'node-pty'
 import type {
   IPtyProvider,
@@ -25,6 +29,9 @@ import {
   setPtyOwnerHostColors
 } from '../../shared/pty-owner-color-query-colors'
 import {
+  ptyPhysicalExits,
+  ptyWslDistroById,
+  noteLocalPtyUse,
   advanceLoadGeneration,
   clearPtyState,
   pendingLocalPtySpawns,
@@ -79,7 +86,11 @@ export class LocalPtyProvider implements IPtyProvider {
   }
 
   // Local PTYs are always attached -- no-op. Remote providers use this to resubscribe.
-  async attach(_id: string): Promise<void> {}
+  async attach(id: string): Promise<void> {
+    if (!noteLocalPtyUse(id)) {
+      throw new Error('terminal_handle_stale')
+    }
+  }
   hasPty(id: string): boolean {
     return ptyProcesses.has(id)
   }
@@ -160,12 +171,26 @@ export class LocalPtyProvider implements IPtyProvider {
         childProcessEvidence: 'unverifiable'
       }
     }
-    const foregroundProcess = await getLocalPtyForegroundProcess(id)
+    const owner = ptyPhysicalExits.get(id)
+    if (options?.captureSwitchWitness && owner) {
+      owner.witness = {
+        token: options.captureSwitchWitness,
+        revision: owner.useRevision,
+        at: performance.now()
+      }
+    }
+    let suspendedAgentProcess: string | undefined
+    const foregroundProcess = await (options?.scanChildProcesses
+      ? confirmLocalPtyForegroundProcess(id, (name) => {
+          suspendedAgentProcess = name
+        })
+      : getLocalPtyForegroundProcess(id))
     // A steady-state poll never decides adoption or close, so it may read the cached process table.
     const childProcessEvidence = await inspectLocalPtyChildProcesses(
       id,
       options?.steadyState !== true,
-      options?.ignoreDetached === true
+      options?.ignoreDetached === true,
+      Boolean(options?.captureSwitchWitness)
     )
     // Neither asynchronous inspection may publish a replacement pane's identity.
     if (ptyProcesses.get(id) !== proc || ptyIncarnations.get(id) !== incarnation) {
@@ -177,11 +202,62 @@ export class LocalPtyProvider implements IPtyProvider {
     }
     return {
       foregroundProcess,
+      ...(suspendedAgentProcess ? { suspendedAgentProcess } : {}),
+      ...(options?.captureSwitchWitness && owner?.witness
+        ? { switchWitness: owner.witness.token }
+        : {}),
       hasChildProcesses: childProcessEvidence !== 'no-children',
       childProcessEvidence
     }
   }
 
+  supportsFencedTermination(): boolean {
+    return true
+  }
+  async killFenced(request: PtyFencedTerminationRequest): Promise<PtyFencedTerminationOutcome> {
+    const proc = ptyProcesses.get(request.id)
+    if (!proc) {
+      return { outcome: 'already_exited' }
+    }
+    if (ptyIncarnations.get(request.id) !== request.expectedIncarnationId) {
+      return { outcome: 'refused', reason: 'replaced' }
+    }
+    const owner = ptyPhysicalExits.get(request.id)
+    const witness = owner?.witness
+    const condition = request.switchCondition
+    if (!condition || !witness || condition.token !== witness.token) {
+      return { outcome: 'refused', reason: 'unsupported' }
+    }
+    if (!condition.ownedSpawn && ptyWslDistroById.get(request.id)) {
+      return { outcome: 'refused', reason: 'unsupported' }
+    }
+    const deadline = witness.at + condition.remainingMs
+    const current = () =>
+      ptyProcesses.get(request.id) === proc &&
+      ptyPhysicalExits.get(request.id) === owner &&
+      owner?.useRevision === witness.revision &&
+      !owner?.closing &&
+      (condition.ownedSpawn || !owner?.pendingCommand) &&
+      !pendingLocalPtySpawns.has(request.id) &&
+      performance.now() < deadline
+    if (!current()) {
+      return { outcome: 'refused', reason: 'unverifiable' }
+    }
+    try {
+      await shutdownLocalPty(request.id, {
+        immediate: true,
+        expectedIncarnationId: request.expectedIncarnationId,
+        switchCheck: current,
+        switchOwnedSpawn: condition.ownedSpawn
+      })
+    } catch {
+      return { outcome: 'refused', reason: 'unverifiable' }
+    }
+    return ptyProcesses.get(request.id) === proc
+      ? { outcome: 'refused', reason: 'unverifiable' }
+      : { outcome: 'ended' }
+  }
+
   getForegroundProcess(id: string): Promise<string | null> {
     return getLocalPtyForegroundProcess(id)
   }
diff --git a/src/main/providers/local-pty-session-activation.ts b/src/main/providers/local-pty-session-activation.ts
index 9bebe81de13b..80288e3939b7 100644
--- a/src/main/providers/local-pty-session-activation.ts
+++ b/src/main/providers/local-pty-session-activation.ts
@@ -27,6 +27,7 @@ import {
   ptyInitialCwd,
   ptyLoadGeneration,
   ptyPhysicalExits,
+  noteLocalPtyUse,
   ptyProcesses,
   ptyReportsChildExitStatus,
   ptyShellPath,
@@ -107,7 +108,11 @@ export function activateLocalPtySession(args: {
       shellPath: plan.shellPath,
       wslDistro: spawnedWslDistro
     }),
-    write: (data) => proc.write(data),
+    write: (data) => {
+      if (noteLocalPtyUse(id)) {
+        proc.write(data)
+      }
+    },
     onEmission: emitIngressData
   })
   startupIngressByPty.set(id, startupIngress)
@@ -195,6 +200,10 @@ export function activateLocalPtySession(args: {
         reason: staging.failure
       })
     }
+    const physical = ptyPhysicalExits.get(id)
+    if (physical) {
+      physical.pendingCommand = true
+    }
     writeStartupCommandWhenShellReady(
       readiness.shellReadyPromise,
       proc,
@@ -203,7 +212,18 @@ export function activateLocalPtySession(args: {
         readiness.setStartupCommandCleanup(cleanup)
       },
       {
-        bracketedPasteSafe
+        bracketedPasteSafe,
+        beforeWrite: () => {
+          if (physical) {
+            physical.pendingCommand = false
+          }
+          try {
+            spawn.switchExecution?.check()
+          } catch {
+            return false
+          }
+          return ptyProcesses.get(id) === proc && noteLocalPtyUse(id)
+        }
       }
     )
   }
@@ -211,10 +231,21 @@ export function activateLocalPtySession(args: {
   // Memory collection needs a proven positive OS PID; node-pty can briefly publish zero during spawn.
   const rawPid = proc.pid
   const pid = typeof rawPid === 'number' && Number.isFinite(rawPid) && rawPid > 0 ? rawPid : null
+  const physical = ptyPhysicalExits.get(id)
+  if (spawn.switchExecution && physical) {
+    physical.witness = {
+      token: spawn.switchExecution.invocationId,
+      revision: physical.useRevision,
+      at: performance.now()
+    }
+  }
   return {
     id,
     incarnationId,
     pid,
+    ...(spawn.switchExecution && physical?.witness
+      ? { switchCleanupWitness: physical.witness.token }
+      : {}),
     startupCwdSource: 'request',
     ...(exitedBeforeSpawnReply ? { exitedBeforeSpawnReply: true } : {}),
     ...(spawnedWslDistro !== undefined ? { wslDistro: spawnedWslDistro } : {})
diff --git a/src/main/providers/local-pty-session-operations.ts b/src/main/providers/local-pty-session-operations.ts
index 2c6008c8f5da..7bd6f93c3844 100644
--- a/src/main/providers/local-pty-session-operations.ts
+++ b/src/main/providers/local-pty-session-operations.ts
@@ -8,6 +8,7 @@ import { isWslAvailableAsync } from '../wsl'
 import { resolveGitBashPath } from '../git-bash'
 import { resolveProcessCwd } from './process-cwd'
 import {
+  noteLocalPtyUse,
   dataListeners,
   exitListeners,
   ptyIncarnations,
@@ -29,6 +30,9 @@ export function writeLocalPty(id: string, data: string): boolean {
   if (startupIngressByPty.get(id)?.answerLiveQueryReply(data)) {
     return true
   }
+  if (!noteLocalPtyUse(id)) {
+    return false
+  }
   const proc = ptyProcesses.get(id)
   if (!proc) {
     return false
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 dc9e3ff4ac0c..2a0b3e7a9698 100644
--- a/src/main/providers/local-pty-shell-ready-startup-command.ts
+++ b/src/main/providers/local-pty-shell-ready-startup-command.ts
@@ -15,7 +15,7 @@ export function writeStartupCommandWhenShellReady(
   startupCommand: string,
   onExit: (cleanup: () => void) => void,
   // Only shells with active bracketed paste accept its escape wrapper without echoing it.
-  options: { bracketedPasteSafe?: boolean } = {}
+  options: { bracketedPasteSafe?: boolean; beforeWrite?: () => boolean } = {}
 ): void {
   let sent = false
   let postReadyTimer: ReturnType<typeof setTimeout> | null = null
@@ -42,6 +42,9 @@ export function writeStartupCommandWhenShellReady(
       clearTimeout(postReadyTimer)
       postReadyTimer = null
     }
+    if (options.beforeWrite?.() === false) {
+      return
+    }
     // Keep the interactive shell alive after agent exit; write once past readiness to avoid incremental-paste drops.
     proc.write(
       buildStartupCommandSubmission(startupCommand, {
diff --git a/src/main/providers/local-pty-spawn-state.ts b/src/main/providers/local-pty-spawn-state.ts
index c862a6dbba4a..e24a9faa416d 100644
--- a/src/main/providers/local-pty-spawn-state.ts
+++ b/src/main/providers/local-pty-spawn-state.ts
@@ -1,5 +1,6 @@
 import type { PtySpawnResult } from './pty-provider-contract'
 import {
+  noteLocalPtyUse,
   pendingLocalPtySpawns,
   ptyIncarnations,
   ptyProcesses,
@@ -28,6 +29,9 @@ export async function runCancelableLocalPtySpawn<T>(
   id: string,
   operation: (throwIfCanceled: () => void, signal: AbortSignal) => Promise<T>
 ): Promise<T> {
+  if (!noteLocalPtyUse(id)) {
+    throw new Error('terminal_handle_stale')
+  }
   const cancellation = new AbortController()
   const pendingSpawn: PendingLocalPtySpawn = { cancellation }
   const pending = pendingLocalPtySpawns.get(id) ?? new Set()
diff --git a/src/main/providers/local-pty-spawn.ts b/src/main/providers/local-pty-spawn.ts
index 36b676781b8d..fe2140b757a1 100644
--- a/src/main/providers/local-pty-spawn.ts
+++ b/src/main/providers/local-pty-spawn.ts
@@ -35,6 +35,7 @@ export async function spawnLocalPty(
     if (pendingShutdown) {
       await pendingShutdown.promise
     }
+    args.switchExecution?.check()
     const existing = reattachLocalPty(reattachId, args.cols, args.rows)
     if (existing) {
       return existing
@@ -95,6 +96,7 @@ export async function spawnLocalPty(
     return reserveLocalPtySpawn(id, async () => {
       const checkCanceled = (): void => {
         throwIfCanceled()
+        args.switchExecution?.check()
         if (args.signal?.aborted) {
           throw new Error('client_disconnected')
         }
@@ -106,6 +108,7 @@ export async function spawnLocalPty(
         return concurrentWinner
       }
       const pendingSpawn = spawn({
+        assertCreateAllowed: checkCanceled,
         shellPath: plan.shellPath,
         shellArgs: plan.shellArgs,
         cols: args.cols,
@@ -126,12 +129,16 @@ export async function spawnLocalPty(
       try {
         checkCanceled()
       } catch (error) {
-        try {
-          spawnResult.process.kill('SIGKILL')
-        } finally {
-          destroyPtyProcess(spawnResult.process)
+        if (args.switchExecution) {
+          args = { ...args, command: undefined }
+        } else {
+          try {
+            spawnResult.process.kill('SIGKILL')
+          } finally {
+            destroyPtyProcess(spawnResult.process)
+          }
+          throw error
         }
-        throw error
       }
       args.onPtySpawnCommitted?.()
       plan.shellPath = spawnResult.shellPath
diff --git a/src/main/providers/local-pty-switch-cleanup.test.ts b/src/main/providers/local-pty-switch-cleanup.test.ts
new file mode 100644
index 000000000000..ee71ec619848
--- /dev/null
+++ b/src/main/providers/local-pty-switch-cleanup.test.ts
@@ -0,0 +1,165 @@
+import { afterEach, expect, it, vi } from 'vitest'
+import type { IPty } from 'node-pty'
+import type { ProcessTableRow } from '../../shared/process-table-snapshot'
+import { LocalPtyProvider } from './local-pty-provider'
+import {
+  ptyProcesses,
+  ptyIncarnations,
+  ptyShellPath,
+  ptyPhysicalExits,
+  LocalPtyPhysicalExit,
+  clearPtyState,
+  ptyWslDistroById
+} from './local-pty-provider-state'
+import type * as PtyDescendantTerminationModule from '../pty-descendant-termination'
+import type * as ProcessTableSnapshotReaderModule from '../../shared/process-table-snapshot-reader'
+
+const table = vi.hoisted(() => vi.fn())
+vi.mock('../../shared/process-table-snapshot-reader', async (importOriginal) => ({
+  ...(await importOriginal<typeof ProcessTableSnapshotReaderModule>()),
+  getProcessTableSnapshot: async () => (await table()).rows,
+  getStrictProcessTableSnapshotWithAge: () => table()
+}))
+vi.mock('../pty/posix-pty-process-groups', () => ({
+  forceKillPosixPtyProcessGroups: (_pid: number, killRoot: () => void) => killRoot()
+}))
+vi.mock('../pty-descendant-termination', async (importOriginal) => {
+  const sweep = await importOriginal<typeof PtyDescendantTerminationModule>()
+  return {
+    ...sweep,
+    killWithDescendantSweep: (
+      pid: number,
+      killRoot: () => void,
+      options: Parameters<typeof sweep.killWithDescendantSweep>[2]
+    ) =>
+      sweep.killWithDescendantSweep(pid, killRoot, {
+        ...options,
+        platform: 'linux',
+        readTable: async () => ({ rows: [], capturedAtMs: Date.now() })
+      })
+  }
+})
+const id = 'switch-cleanup-fixture'
+const incarnation = '45454545-4545-4545-8545-454545454545'
+const shell: ProcessTableRow = {
+  pid: 12000,
+  ppid: 1,
+  pgid: 12000,
+  tpgid: 12000,
+  tty: 'pts/7',
+  stat: 'Ss+',
+  command: '/bin/zsh'
+}
+const snapshot = (rows: ProcessTableRow[]) => ({ rows, capturedAgeMs: 0 })
+afterEach(() => {
+  clearPtyState(id)
+  vi.restoreAllMocks()
+  table.mockReset()
+})
+function setup() {
+  const owner = new LocalPtyPhysicalExit()
+  const kill = vi.fn(() => {
+    owner.markExited()
+    clearPtyState(id)
+  })
+  const proc: IPty = {
+    pid: shell.pid,
+    cols: 80,
+    rows: 24,
+    process: 'zsh',
+    handleFlowControl: false,
+    onData: () => ({ dispose: () => {} }),
+    onExit: () => ({ dispose: () => {} }),
+    write: vi.fn(),
+    resize: () => {},
+    clear: () => {},
+    pause: () => {},
+    resume: () => {},
+    kill
+  }
+  ptyProcesses.set(id, proc)
+  ptyIncarnations.set(id, incarnation)
+  ptyShellPath.set(id, '/bin/zsh')
+  ptyPhysicalExits.set(id, owner)
+  owner.witness = {
+    token: 'captured-before-probe',
+    at: performance.now(),
+    revision: owner.useRevision
+  }
+  table.mockResolvedValue(snapshot([shell]))
+  return { provider: new LocalPtyProvider(), proc, owner, kill }
+}
+const request = () => ({
+  id,
+  expectedIncarnationId: incarnation,
+  requireNoAgentOwner: true,
+  requireUnattached: false,
+  switchCondition: { token: 'captured-before-probe', remainingMs: 10_000 }
+})
+
+it.each(['input', 'attachment', 'preparing launch', 'suspended child', 'unknown'] as const)(
+  'keeps the real local owner usable when %s races the final probe',
+  async (change) => {
+    const { provider, proc, kill } = setup()
+    const entered = Promise.withResolvers<void>()
+    const release = Promise.withResolvers<void>()
+    table.mockImplementation(async () => {
+      entered.resolve()
+      await release.promise
+      if (change === 'unknown') {
+        throw new Error('unreadable table')
+      }
+      return snapshot(
+        change === 'suspended child'
+          ? [
+              shell,
+              {
+                ...shell,
+                pid: 12001,
+                ppid: shell.pid,
+                pgid: 12001,
+                stat: 'T',
+                command: 'codex resume 019aef12-1234-7000-8000-123456789abc'
+              }
+            ]
+          : [shell]
+      )
+    })
+    const closing = provider.killFenced(request())
+    await entered.promise
+    if (change === 'input') {
+      expect(provider.write(id, 'codex\r')).toBe(true)
+    }
+    if (change === 'attachment') {
+      await provider.attach(id)
+    }
+    let releaseLaunch: (() => void) | undefined
+    let launching: Promise<unknown> | undefined
+    if (change === 'preparing launch') {
+      const { runCancelableLocalPtySpawn } = await import('./local-pty-spawn-state')
+      const wait = Promise.withResolvers<void>()
+      releaseLaunch = wait.resolve
+      launching = runCancelableLocalPtySpawn(id, () => wait.promise)
+    }
+    release.resolve()
+    expect(await closing).toMatchObject({ outcome: 'refused' })
+    expect(kill).not.toHaveBeenCalled()
+    expect(ptyProcesses.get(id)).toBe(proc)
+    expect(provider.write(id, 'echo still here\r')).toBe(true)
+    releaseLaunch?.()
+    await launching
+  }
+)
+it('closes indistinguishable pre-capture builtin work, while a Windows WSL wrapper is not Linux job proof', async () => {
+  const { provider, kill } = setup()
+  // No post-capture input, child or pending emission is observable in this authorized boundary case.
+  ptyWslDistroById.set(id, 'Ubuntu')
+  expect(await provider.killFenced(request())).toMatchObject({
+    outcome: 'refused',
+    reason: 'unsupported'
+  })
+  expect(kill).not.toHaveBeenCalled()
+  ptyWslDistroById.delete(id)
+  expect(await provider.killFenced(request())).toEqual({ outcome: 'ended' })
+  expect(kill).toHaveBeenCalledOnce()
+})
diff --git a/src/main/providers/local-pty-termination.ts b/src/main/providers/local-pty-termination.ts
index e16f2cc10538..1ed87d98b8ae 100644
--- a/src/main/providers/local-pty-termination.ts
+++ b/src/main/providers/local-pty-termination.ts
@@ -1,5 +1,6 @@
+import { inspectLocalPtyChildProcesses } from './local-pty-foreground-inspection'
 import type * as pty from 'node-pty'
-import { PhysicalExitTracker } from '../../shared/physical-exit-tracker'
+import type { PhysicalExitTracker } from '../../shared/physical-exit-tracker'
 import { killWithDescendantSweep } from '../pty-descendant-termination'
 import { terminateShutdownDescendants } from '../daemon/terminal-descendant-shutdown'
 import { forceKillPosixPtyProcessGroups } from '../pty/posix-pty-process-groups'
@@ -18,6 +19,7 @@ import {
   ptyTerminationMode,
   ptyLoadGeneration,
   runPtyCleanup,
+  LocalPtyPhysicalExit,
   type PtyShutdownOperation
 } from './local-pty-provider-state'
 import {
@@ -30,7 +32,7 @@ export const LOCAL_PTY_GRACEFUL_FORCE_TIMEOUT_MS = 5_000
 export const LOCAL_PTY_FORCE_KILL_RETRY_MS = 250
 
 export function createPtyPhysicalExit(id: string): void {
-  ptyPhysicalExits.set(id, new PhysicalExitTracker())
+  ptyPhysicalExits.set(id, new LocalPtyPhysicalExit())
 }
 
 function waitForPtyPhysicalExit(id: string, physicalExit?: PhysicalExitTracker): Promise<void> {
@@ -158,7 +160,9 @@ function requestTrackedPtyShutdown(id: string, proc: pty.IPty, immediate: boolea
 async function shutdownTrackedPty(
   id: string,
   proc: pty.IPty,
-  operation: PtyShutdownOperation
+  operation: PtyShutdownOperation,
+  switchCheck?: () => boolean,
+  switchOwnedSpawn = false
 ): Promise<void> {
   const physicalExit = ptyPhysicalExits.get(id)
   const signalRoot = (): void => {
@@ -175,27 +179,66 @@ async function shutdownTrackedPty(
     // Typed agents also detach tool process groups; immediate close must snapshot before root exit.
     await killWithDescendantSweep(proc.pid, signalRoot, {
       ownsRoot: () => ptyProcesses.get(id) === proc,
+      ...(switchCheck
+        ? {
+            admitClose: async () => {
+              if (!switchCheck()) {
+                return false
+              }
+              const evidence = switchOwnedSpawn
+                ? 'no-children'
+                : await inspectLocalPtyChildProcesses(id, true, false, true)
+              if (evidence !== 'no-children' || !switchCheck()) {
+                return false
+              }
+              const owner = ptyPhysicalExits.get(id)
+              if (!owner || ptyProcesses.get(id) !== proc) {
+                return false
+              }
+              owner.closing = true
+              return true
+            }
+          }
+        : {}),
       terminateOwnedTree: () => terminatePtyJob(proc),
-      terminateDescendants: terminateShutdownDescendants,
+      terminateDescendants:
+        switchCheck && !switchOwnedSpawn ? () => {} : terminateShutdownDescendants,
       // Group SIGKILL must wait out the SIGTERM grace so agents can run exit hooks (Claude SessionEnd).
       awaitEscalation: () => operation.immediate
     })
   } else {
     signalRoot()
   }
-  await waitForPtyPhysicalExit(id, physicalExit)
+  if (!switchCheck || operation.rootSignalled || ptyPhysicalExits.get(id)?.closing) {
+    await waitForPtyPhysicalExit(id, physicalExit)
+  }
 }
 
 export async function shutdownLocalPty(
   id: string,
-  opts: { immediate?: boolean; keepHistory?: boolean; expectedIncarnationId?: string }
+  opts: {
+    immediate?: boolean
+    keepHistory?: boolean
+    expectedIncarnationId?: string
+    switchCheck?: () => boolean
+    switchOwnedSpawn?: boolean
+  }
 ): Promise<void> {
   if (opts.expectedIncarnationId && ptyIncarnations.get(id) !== opts.expectedIncarnationId) {
     throw new Error('terminal_handle_stale')
   }
-  cancelPendingLocalPtySpawns(id)
+  if (opts.switchCheck) {
+    if (!opts.switchCheck()) {
+      return
+    }
+  } else {
+    cancelPendingLocalPtySpawns(id)
+  }
   const pending = ptyShutdownOperations.get(id)
   if (pending) {
+    if (opts.switchCheck) {
+      return
+    }
     if (opts.immediate === true) {
       pending.immediate = true
       if (pending.rootSignalled && ptyProcesses.get(id) === pending.proc) {
@@ -215,7 +258,7 @@ export async function shutdownLocalPty(
     rootSignalled: false,
     proc
   }
-  entry.promise = shutdownTrackedPty(id, proc, entry)
+  entry.promise = shutdownTrackedPty(id, proc, entry, opts.switchCheck, opts.switchOwnedSpawn)
   ptyShutdownOperations.set(id, entry)
   try {
     await entry.promise
diff --git a/src/main/providers/local-pty-utils.ts b/src/main/providers/local-pty-utils.ts
index 83ddd0677cda..708359fe8910 100644
--- a/src/main/providers/local-pty-utils.ts
+++ b/src/main/providers/local-pty-utils.ts
@@ -119,6 +119,7 @@ export type ShellSpawnParams = {
   cwd: string
   env: Record<string, string>
   ptySpawn: typeof pty.spawn
+  assertCreateAllowed?: () => void
   getShellReadyConfig?: (
     shell: string
   ) => { args: string[] | null; env: Record<string, string> } | null
@@ -154,6 +155,7 @@ function spawnWindowsFallbackChain(
   // Skip the first entry: it is the primary that already failed above.
   for (const attempt of attempts.slice(1)) {
     try {
+      params.assertCreateAllowed?.()
       const proc = ptySpawn(attempt.shellPath, attempt.shellArgs, {
         name: termName,
         cols,
@@ -171,6 +173,7 @@ function spawnWindowsFallbackChain(
         startupCommandDeliveredInShellArgs: attempt.startupCommandDeliveredInShellArgs
       }
     } catch {
+      params.assertCreateAllowed?.()
       // This fallback shell also failed -- try the next link in the chain.
     }
   }
@@ -179,12 +182,13 @@ function spawnWindowsFallbackChain(
 
 export type PtyExecutableSpawnParams = Pick<
   ShellSpawnParams,
-  'termName' | 'cols' | 'rows' | 'cwd' | 'env' | 'ptySpawn'
+  'termName' | 'cols' | 'rows' | 'cwd' | 'env' | 'ptySpawn' | 'assertCreateAllowed'
 > & { file: string; args: string[] }
 
 /** One executable with an argv array, no shell and no fallback; throws when it can't start. */
 export function spawnPtyExecutable(params: PtyExecutableSpawnParams): pty.IPty {
   const { file, args, termName = 'xterm-256color', cols, rows, cwd, env, ptySpawn } = params
+  params.assertCreateAllowed?.()
   return ptySpawn(file, args, {
     name: termName,
     cols,
@@ -226,7 +230,8 @@ export function spawnShellWithFallback(params: ShellSpawnParams): ShellSpawnResu
           rows,
           cwd,
           env,
-          ptySpawn
+          ptySpawn,
+          assertCreateAllowed: params.assertCreateAllowed
         }),
         shellPath,
         reportsChildExitStatus: hostReportsChildExitStatus(wrapped.file)
@@ -270,6 +275,7 @@ export function spawnShellWithFallback(params: ShellSpawnParams): ShellSpawnResu
           fallbackReady?.args ?? ['-l'],
           env
         )
+        params.assertCreateAllowed?.()
         const proc = ptySpawn(wrapped.file, wrapped.args, {
           name: termName,
           cols,
@@ -286,6 +292,7 @@ export function spawnShellWithFallback(params: ShellSpawnParams): ShellSpawnResu
           reportsChildExitStatus: hostReportsChildExitStatus(wrapped.file)
         }
       } catch {
+        params.assertCreateAllowed?.()
         // Fallback also failed -- try next.
       }
     }
diff --git a/src/main/providers/pty-process-inspection.ts b/src/main/providers/pty-process-inspection.ts
index 19aed772f253..c23fa66514db 100644
--- a/src/main/providers/pty-process-inspection.ts
+++ b/src/main/providers/pty-process-inspection.ts
@@ -17,6 +17,7 @@ type CompletionSensitivePtyProvider = IPtyProvider & {
 
 /** scanChildProcesses requests decision-time evidence; steady polls may rely on the next tick to correct stale reads. */
 export type PtyProcessInspectionOptions = {
+  captureSwitchWitness?: string
   expectedIncarnationId?: PtyIncarnationId
   scanChildProcesses?: boolean
   /** Adoption only: ignore members outside both shell ancestry and console; close still reaches the whole job. */
diff --git a/src/main/providers/pty-provider-contract.ts b/src/main/providers/pty-provider-contract.ts
index 3c404fa56a1e..d70254edb7ec 100644
--- a/src/main/providers/pty-provider-contract.ts
+++ b/src/main/providers/pty-provider-contract.ts
@@ -20,6 +20,7 @@ import type { PtyProcessInfo } from './pty-process-info'
 import type { TerminalExitCause } from '../../shared/terminal-exit-cause'
 import type { TerminalOwner } from '../../shared/terminal-owner'
 import type { WriteSettlement } from '../../shared/pty-write-settlement'
+import type { AgentSessionSwitchAuthority } from '../../shared/agent-session-switch-execution'
 
 export type {
   PtyBackgroundStreamEvent,
@@ -105,6 +106,7 @@ export type PtySpawnOptions = {
   onPtySpawnCommitted?: () => void
   /** Cancels only before physical dispatch; operation identity fences later ambiguity. */
   signal?: AbortSignal
+  switchExecution?: AgentSessionSwitchAuthority
 }
 
 export type { PtyProcessInfo, PtySpawnResult }
diff --git a/src/main/providers/pty-spawn-result.ts b/src/main/providers/pty-spawn-result.ts
index a651ae7a65e7..9697a7c96c23 100644
--- a/src/main/providers/pty-spawn-result.ts
+++ b/src/main/providers/pty-spawn-result.ts
@@ -7,6 +7,11 @@ import type { TerminalOwner } from '../../shared/terminal-owner'
 import type { OpenCodeCliCapabilities } from '../../shared/opencode-cli-version'
 
 export type PtySpawnResult = TerminalLaunchResult & {
+  /** A dispatched child remains owned after its initiating handoff lost authority. */
+  switchOutcomeUnknown?: true
+  switchCleanupWitness?: string
+  /** Main-only placement reconciliation of the same dispatched process; never a provider identity. */
+  switchRecoveredSurface?: { tabId: string; leafId: string }
   /** Execution-host probe; absent on older hosts and reattachments. */
   openCodeCapabilities?: OpenCodeCliCapabilities
   agentSessionEnsure?: AgentSessionClaimedSpawnResult
diff --git a/src/main/providers/suspended-agent-process.ts b/src/main/providers/suspended-agent-process.ts
new file mode 100644
index 000000000000..2c93802d8fc4
--- /dev/null
+++ b/src/main/providers/suspended-agent-process.ts
@@ -0,0 +1,17 @@
+import { collectDescendantsFromIndex, getProcessTableIndex } from '../../shared/process-table-index'
+import type { ProcessTableRow } from '../../shared/process-table-snapshot'
+import { selectForegroundProcessCandidate } from '../../shared/foreground-process-selection'
+import { resolveOuterWrapperForegroundProcess } from '../../shared/foreground-wrapper-agent'
+
+/** Observation only: stopped jobs remain owned work, but never authorize foreground input routing. */
+export function resolveSuspendedAgentProcessFromPs(
+  rows: readonly ProcessTableRow[],
+  shellPid: number
+): string | null {
+  const descendants = collectDescendantsFromIndex(getProcessTableIndex(rows), shellPid)
+  const stopped = descendants.filter((row) => /^[Tt]/.test(row.stat))
+  const selected = selectForegroundProcessCandidate(stopped, descendants)
+  return selected
+    ? resolveOuterWrapperForegroundProcess(selected.recognized, selected.candidate, descendants)
+    : null
+}
diff --git a/src/main/pty-descendant-ancestry.ts b/src/main/pty-descendant-ancestry.ts
new file mode 100644
index 000000000000..89e358a25e9b
--- /dev/null
+++ b/src/main/pty-descendant-ancestry.ts
@@ -0,0 +1,52 @@
+import type { DescendantSnapshot } from './pty-descendant-termination'
+import type { ProcessTableRow } from './pty-process-table-parser'
+
+export function collectDescendantRows(
+  rootPid: number,
+  table: ProcessTableRow[],
+  capturedAtMs = Date.now()
+): DescendantSnapshot {
+  const childrenByPpid = new Map<number, ProcessTableRow[]>()
+  let rootRow: ProcessTableRow | null = null
+  let duplicateRoot = false
+  for (const row of table) {
+    if (row.pid === rootPid) {
+      // Duplicate root rows from a non-atomic read leave its identity ambiguous.
+      duplicateRoot = rootRow !== null
+      rootRow ??= row
+      continue
+    }
+    const siblings = childrenByPpid.get(row.ppid)
+    if (siblings) {
+      siblings.push(row)
+    } else {
+      childrenByPpid.set(row.ppid, [row])
+    }
+  }
+  // After root exit, descendants reparent; remaining rows with its old PID as parent may reflect PID reuse.
+  if (!rootRow || duplicateRoot) {
+    return { rootPgid: null, descendants: [], capturedAtMs }
+  }
+  const descendants: ProcessTableRow[] = []
+  const queue = [rootPid]
+  const visited = new Set(queue)
+  for (let nextIndex = 0; nextIndex < queue.length; nextIndex += 1) {
+    const pid = queue[nextIndex]
+    for (const child of childrenByPpid.get(pid) ?? []) {
+      // Non-atomic ps output can contain duplicate or cyclic rows; never loop on them.
+      if (visited.has(child.pid)) {
+        continue
+      }
+      visited.add(child.pid)
+      descendants.push(child)
+      queue.push(child.pid)
+    }
+  }
+  return {
+    root: { pid: rootRow.pid, startedAt: rootRow.startedAt },
+    rootPgid: rootRow.pgid,
+    descendants,
+    capturedAtMs,
+    reDerivedPids: new Set(descendants.map((row) => row.pid))
+  }
+}
diff --git a/src/main/pty-descendant-termination.ts b/src/main/pty-descendant-termination.ts
index a46ca7d65894..de3fd3033001 100644
--- a/src/main/pty-descendant-termination.ts
+++ b/src/main/pty-descendant-termination.ts
@@ -6,6 +6,7 @@ import {
   type WindowsTreeKillTarget
 } from './windows-pty-root-identity'
 import { parseProcessTable, type ProcessTableRow } from './pty-process-table-parser'
+import { collectDescendantRows } from './pty-descendant-ancestry'
 
 export { parseProcessTable, type ProcessTableRow } from './pty-process-table-parser'
 
@@ -124,55 +125,7 @@ export function readProcessTableBeforeDeadline(
   })
 }
 
-export function collectDescendantRows(
-  rootPid: number,
-  table: ProcessTableRow[],
-  capturedAtMs = Date.now()
-): DescendantSnapshot {
-  const childrenByPpid = new Map<number, ProcessTableRow[]>()
-  let rootRow: ProcessTableRow | null = null
-  let duplicateRoot = false
-  for (const row of table) {
-    if (row.pid === rootPid) {
-      // Duplicate root rows from a non-atomic read leave its identity ambiguous.
-      duplicateRoot = rootRow !== null
-      rootRow ??= row
-      continue
-    }
-    const siblings = childrenByPpid.get(row.ppid)
-    if (siblings) {
-      siblings.push(row)
-    } else {
-      childrenByPpid.set(row.ppid, [row])
-    }
-  }
-  // After root exit, descendants reparent; remaining rows with its old PID as parent may reflect PID reuse.
-  if (!rootRow || duplicateRoot) {
-    return { rootPgid: null, descendants: [], capturedAtMs }
-  }
-  const descendants: ProcessTableRow[] = []
-  const queue = [rootPid]
-  const visited = new Set(queue)
-  for (let nextIndex = 0; nextIndex < queue.length; nextIndex += 1) {
-    const pid = queue[nextIndex]
-    for (const child of childrenByPpid.get(pid) ?? []) {
-      // Non-atomic ps output can contain duplicate or cyclic rows; never loop on them.
-      if (visited.has(child.pid)) {
-        continue
-      }
-      visited.add(child.pid)
-      descendants.push(child)
-      queue.push(child.pid)
-    }
-  }
-  return {
-    root: { pid: rootRow.pid, startedAt: rootRow.startedAt },
-    rootPgid: rootRow.pgid,
-    descendants,
-    capturedAtMs,
-    reDerivedPids: new Set(descendants.map((row) => row.pid))
-  }
-}
+export { collectDescendantRows } from './pty-descendant-ancestry'
 
 type SnapshotDeps = {
   readTable?: ProcessTableReader
@@ -202,6 +155,8 @@ export async function captureDescendantSnapshot(
 type KillSweepDeps = SnapshotDeps &
   TerminateDeps & {
     ownsRoot?: () => boolean
+    /** Conditional ordinary close admits only after the final census; refusal signals nothing. */
+    admitClose?: () => Promise<boolean>
     /** Shutdown can retain the owner until descendant escalation finishes. */
     terminateDescendants?: (snapshot: DescendantSnapshot) => void | Promise<unknown>
     awaitEscalation?: boolean | (() => boolean)
@@ -218,7 +173,14 @@ export async function killWithDescendantSweep(
   deps: KillSweepDeps = {}
 ): Promise<void> {
   const platform = deps.platform ?? process.platform
+  let admitted = !deps.admitClose
   if (platform === 'win32') {
+    if (deps.admitClose) {
+      admitted = await deps.admitClose()
+      if (!admitted) {
+        return
+      }
+    }
     try {
       if ((deps.ownsRoot?.() ?? true) && Number.isInteger(rootPid) && rootPid > 0) {
         // Owned jobs survive PID reuse and include descendants reparented away from the shell.
@@ -238,12 +200,20 @@ export async function killWithDescendantSweep(
         }
       }
     } finally {
-      killRoot()
+      if (!deps.admitClose || (admitted && (deps.ownsRoot?.() ?? true))) {
+        killRoot()
+      }
     }
     return
   }
 
   const snapshot = await captureDescendantSnapshot(rootPid, deps)
+  if (deps.admitClose) {
+    admitted = await deps.admitClose()
+    if (!admitted) {
+      return
+    }
+  }
   let descendants: void | Promise<unknown> = undefined
   const awaitEscalation =
     typeof deps.awaitEscalation === 'function' ? deps.awaitEscalation() : deps.awaitEscalation
@@ -256,7 +226,9 @@ export async function killWithDescendantSweep(
       }
       await descendants
     } finally {
-      killRoot()
+      if (!deps.admitClose || (admitted && (deps.ownsRoot?.() ?? true))) {
+        killRoot()
+      }
     }
     return
   }
@@ -268,7 +240,9 @@ export async function killWithDescendantSweep(
         : terminateDescendantSnapshot(snapshot, deps)
     }
   } finally {
-    killRoot()
+    if (!deps.admitClose || (admitted && (deps.ownsRoot?.() ?? true))) {
+      killRoot()
+    }
   }
 }
 
diff --git a/src/main/runtime/agent-session-founding-store.ts b/src/main/runtime/agent-session-founding-store.ts
index 2561e8d14ebd..6040efcdc9d2 100644
--- a/src/main/runtime/agent-session-founding-store.ts
+++ b/src/main/runtime/agent-session-founding-store.ts
@@ -13,9 +13,10 @@ export function createAgentSessionFoundingStore(
   return {
     prepare: (request: AgentSessionReserveRequest) =>
       commitAgentSessionFounding(draftAgentSessionStoreState(transactions.state), request),
-    commit: async (request: AgentSessionReserveRequest) => {
+    commit: async (request: AgentSessionReserveRequest, check?: () => void) => {
       let heldBefore = true
       const result = await transactions.transact((draft) => {
+        check?.()
         heldBefore = draft.records.size > 0 || draft.unreadableRecords.size > 0
         return commitAgentSessionFounding(draft, request)
       })
diff --git a/src/main/runtime/agent-session-record-publication.ts b/src/main/runtime/agent-session-record-publication.ts
new file mode 100644
index 000000000000..bb532bfbde4f
--- /dev/null
+++ b/src/main/runtime/agent-session-record-publication.ts
@@ -0,0 +1,52 @@
+import type { AgentSessionStoreState } from './agent-session-store-state'
+import type { AgentSessionStoreTransactions } from './agent-session-store-transactions'
+
+export abstract class AgentSessionRecordPublication {
+  constructor(protected readonly transactions: AgentSessionStoreTransactions) {}
+  abstract holdsRecords(): boolean
+  private readonly deathEvidenceListeners = new Set<(sessionId: string) => void>()
+
+  protected readonly firstRecordListeners = new Set<() => void>()
+
+  /** Notify committed death evidence from every transition; listeners must not throw. */
+  onDeathEvidence(listener: (sessionId: string) => void): () => void {
+    this.deathEvidenceListeners.add(listener)
+    return () => this.deathEvidenceListeners.delete(listener)
+  }
+
+  /** Notify first committed record; listeners must not throw. */
+  onFirstRecord(listener: () => void): () => void {
+    this.firstRecordListeners.add(listener)
+    return () => this.firstRecordListeners.delete(listener)
+  }
+
+  /** Serialize draft mutations; publish to readers only after row commit. */
+  protected transact = async <T>(
+    apply: (draft: AgentSessionStoreState) => T,
+    options?: { inMemoryWhenReadOnly?: boolean }
+  ): Promise<T> => {
+    let proven: string[] = []
+    let heldBefore = true
+    const result = await this.transactions.transact((draft) => {
+      heldBefore = this.holdsRecords()
+      if (this.deathEvidenceListeners.size === 0) {
+        return apply(draft)
+      }
+      const before = new Map(
+        [...draft.records].map(([id, record]) => [id, record.lease.deathEvidence])
+      )
+      const applied = apply(draft)
+      proven = [...draft.records]
+        .filter(([id, { lease }]) => lease.deathEvidence && lease.deathEvidence !== before.get(id))
+        .map(([id]) => id)
+      return applied
+    }, options)
+    for (const sessionId of proven) {
+      this.deathEvidenceListeners.forEach((listener) => listener(sessionId))
+    }
+    if (!heldBefore && this.holdsRecords()) {
+      this.firstRecordListeners.forEach((listener) => listener())
+    }
+    return result
+  }
+}
diff --git a/src/main/runtime/agent-session-record-store.ts b/src/main/runtime/agent-session-record-store.ts
index a51576cb7ee2..0b8af6435204 100644
--- a/src/main/runtime/agent-session-record-store.ts
+++ b/src/main/runtime/agent-session-record-store.ts
@@ -1,5 +1,3 @@
-/** Single-writer records/operation ledger in the host chat-journal database. */
-
 import { backfillAgentSessionPermissionModes } from './agent-session/ownership/agent-session-permission-backfill'
 import { agentSessionRefusalError } from '../../shared/agent-session-wire-refusals'
 import { createAgentSessionConversationReceipts } from './agent-session-conversation-receipts'
@@ -80,19 +78,21 @@ import {
   setAgentSessionRecordConversationName,
   setAgentSessionRecordUserNameThrough
 } from './agent-session-record-conversation-name'
+import { AgentSessionRecordPublication } from './agent-session-record-publication'
+
+/** Single-writer records/operation ledger in the host chat-journal database. */
 
 export const AGENT_SESSION_LEASE_TTL_MS = 30_000,
   AGENT_SESSION_LEASE_RENEW_INTERVAL_MS = 10_000
 
-export class AgentSessionRecordStore {
-  private readonly deathEvidenceListeners = new Set<(sessionId: string) => void>()
-  private readonly firstRecordListeners = new Set<() => void>()
+export class AgentSessionRecordStore extends AgentSessionRecordPublication {
   readonly conversationReceipts: ReturnType<typeof createAgentSessionConversationReceipts>
 
   private constructor(
-    private readonly transactions: AgentSessionStoreTransactions,
+    transactions: AgentSessionStoreTransactions,
     readonly hostId: string
   ) {
+    super(transactions)
     this.founding = createAgentSessionFoundingStore(transactions, this.firstRecordListeners)
     this.conversationReceipts = createAgentSessionConversationReceipts(transactions)
   }
@@ -142,8 +142,36 @@ export class AgentSessionRecordStore {
     this.state.sessionTabs?.tabIdFor(sessionId) ?? null
 
   /** Persist chat-tab identity separately from rollback-sensitive profile tabs; explicit tabId restores hidden tabs under their old ids. */
-  setSessionTabVisibility(sessionId: string, visible: boolean, tabId?: string): Promise<void> {
-    return this.transact((draft) => setAgentSessionTabVisibility(draft, sessionId, visible, tabId))
+  setSessionTabVisibility(
+    sessionId: string,
+    visible: boolean,
+    tabId?: string,
+    check?: () => void
+  ): Promise<void> {
+    return this.transact((draft) => {
+      check?.()
+      return setAgentSessionTabVisibility(draft, sessionId, visible, tabId)
+    })
+  }
+
+  setSwitchedSessionTabVisibility(
+    sessionId: string,
+    tabId: string,
+    visible: boolean,
+    admit: () => boolean
+  ): Promise<boolean> {
+    return this.transact((draft) => {
+      if (
+        (visible
+          ? draft.sessionTabs?.tabIdFor(sessionId) !== undefined
+          : draft.sessionTabs?.tabIdFor(sessionId) !== tabId) ||
+        !admit()
+      ) {
+        return false
+      }
+      setAgentSessionTabVisibility(draft, sessionId, visible, tabId)
+      return true
+    })
   }
 
   /** Publish the complete tab index in one write; a partial index would drop remaining chats on restart. */
@@ -186,10 +214,14 @@ export class AgentSessionRecordStore {
   isClaimKeyVerifiable = (keyId: string, now: number): boolean =>
     isAgentSessionClaimKeyVerifiable(this.state, keyId, now)
 
-  reserveOwner = (request: AgentSessionReserveRequest): Promise<AgentSessionReserveResult> =>
-    this.transact((draft) =>
-      commitAgentSessionReservation(draft, request, AGENT_SESSION_LEASE_TTL_MS)
-    )
+  reserveOwner = (
+    request: AgentSessionReserveRequest,
+    check?: () => void
+  ): Promise<AgentSessionReserveResult> =>
+    this.transact((draft) => {
+      check?.()
+      return commitAgentSessionReservation(draft, request, AGENT_SESSION_LEASE_TTL_MS)
+    })
 
   readonly founding: ReturnType<typeof createAgentSessionFoundingStore>
 
@@ -291,6 +323,13 @@ export class AgentSessionRecordStore {
   submissionReceipt = (sessionId: string) =>
     this.transactions.receipt(() => {}, { submissionSessionId: sessionId })
 
+  onAcceptedSend = (listener: (sessionId: string) => void): (() => void) => {
+    this.transactions.acceptedSendListeners.add(listener)
+    return () => {
+      this.transactions.acceptedSendListeners.delete(listener)
+    }
+  }
+
   admittedSendCount = (sessionId: string) => this.transactions.admittedSendCount(sessionId)
 
   commitOperationReceipt = (receipt: JournalOperationReceipt) =>
@@ -328,46 +367,4 @@ export class AgentSessionRecordStore {
       return next
     })
   }
-
-  /** Notify committed death evidence from every transition; listeners must not throw. */
-  onDeathEvidence(listener: (sessionId: string) => void): () => void {
-    this.deathEvidenceListeners.add(listener)
-    return () => this.deathEvidenceListeners.delete(listener)
-  }
-
-  /** Notify first committed record; listeners must not throw. */
-  onFirstRecord(listener: () => void): () => void {
-    this.firstRecordListeners.add(listener)
-    return () => this.firstRecordListeners.delete(listener)
-  }
-
-  /** Serialize draft mutations; publish to readers only after row commit. */
-  private transact = async <T>(
-    apply: (draft: AgentSessionStoreState) => T,
-    options?: { inMemoryWhenReadOnly?: boolean }
-  ): Promise<T> => {
-    let proven: string[] = []
-    let heldBefore = true
-    const result = await this.transactions.transact((draft) => {
-      heldBefore = this.holdsRecords()
-      if (this.deathEvidenceListeners.size === 0) {
-        return apply(draft)
-      }
-      const before = new Map(
-        [...draft.records].map(([id, record]) => [id, record.lease.deathEvidence])
-      )
-      const applied = apply(draft)
-      proven = [...draft.records]
-        .filter(([id, { lease }]) => lease.deathEvidence && lease.deathEvidence !== before.get(id))
-        .map(([id]) => id)
-      return applied
-    }, options)
-    for (const sessionId of proven) {
-      this.deathEvidenceListeners.forEach((listener) => listener(sessionId))
-    }
-    if (!heldBefore && this.holdsRecords()) {
-      this.firstRecordListeners.forEach((listener) => listener())
-    }
-    return result
-  }
 }
diff --git a/src/main/runtime/agent-session-store-transactions.ts b/src/main/runtime/agent-session-store-transactions.ts
index a64eafec5261..d251cc73fc95 100644
--- a/src/main/runtime/agent-session-store-transactions.ts
+++ b/src/main/runtime/agent-session-store-transactions.ts
@@ -1,6 +1,3 @@
-// Commit validated draft rows atomically before publication; failures discard the draft.
-// The promise queue preserves FIFO and defers BEGIN beyond the caller's open journal transaction.
-
 import type { JournalHostDatabase } from '../native-chat/agent-session-journal/journal-host-database'
 import type { JournalOperationReceipt } from '../native-chat/agent-session-journal/journal-row-writer'
 import { journalOpenRefusalError } from '../native-chat/agent-session-journal/journal-open-failure'
@@ -30,6 +27,9 @@ import {
   type AgentSessionStoreRowWrites
 } from './agent-session-store-draft'
 
+// Commit validated draft rows atomically before publication; failures discard the draft.
+// The promise queue preserves FIFO and defers BEGIN beyond the caller's open journal transaction.
+
 // Identity-based diffs miss in-place edits; freeze rows in dev/tests to catch them.
 const FREEZE_ROWS = process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'test'
 
@@ -83,6 +83,7 @@ export class AgentSessionStoreTransactions {
   private queue: Promise<unknown> = Promise.resolve()
   // Reads/reopens do not admit work; a count survives handle eviction without replaying history.
   private readonly admittedSends = new Map<string, number>()
+  readonly acceptedSendListeners = new Set<(sessionId: string) => void>()
   private published: AgentSessionStoreState
   /** Loaded takeover evidence; immutable for this runtime. */
   readonly replacedRuntimes: ReadonlyMap<string, AgentSessionReplacedRuntime>
@@ -176,6 +177,9 @@ export class AgentSessionStoreTransactions {
         staged?.adopt()
         if (admitted) {
           this.admittedSends.set(admitted, this.admittedSendCount(admitted) + 1)
+          for (const listener of this.acceptedSendListeners) {
+            listener(admitted)
+          }
         }
         staged = null
         admitted = undefined
diff --git a/src/main/runtime/agent-session-tab-layout-queue.test.ts b/src/main/runtime/agent-session-tab-layout-queue.test.ts
index 3edbf568755d..464f1a028f1e 100644
--- a/src/main/runtime/agent-session-tab-layout-queue.test.ts
+++ b/src/main/runtime/agent-session-tab-layout-queue.test.ts
@@ -55,3 +55,32 @@ it('goes on past a batch whose changes cannot be read', async () => {
   expect(warn).toHaveBeenCalledOnce()
   warn.mockRestore()
 })
+
+it('awaits the actual layout apply and refuses a revoked invocation after queueing', async () => {
+  const entered = Promise.withResolvers<void>()
+  const release = Promise.withResolvers<void>()
+  let authority = true
+  let changed = false
+  const queue = createChatTabLayoutQueue({
+    sessionOf: () => null,
+    hostIdOf: () => 'local',
+    apply: async (_command, run) => {
+      entered.resolve()
+      await release.promise
+      if (run?.admit && !run.admit()) {
+        return { ok: false, code: 'tab_not_found' }
+      }
+      changed = true
+      return { ok: true, result: {} }
+    }
+  })
+  const result = queue(
+    () => [open('source')],
+    () => authority
+  )
+  await entered.promise
+  authority = false
+  release.resolve()
+  expect(await result).toBe(false)
+  expect(changed).toBe(false)
+})
diff --git a/src/main/runtime/agent-session-tab-layout-queue.ts b/src/main/runtime/agent-session-tab-layout-queue.ts
index e1f4da667397..8a95cf938914 100644
--- a/src/main/runtime/agent-session-tab-layout-queue.ts
+++ b/src/main/runtime/agent-session-tab-layout-queue.ts
@@ -1,3 +1,4 @@
+import type { LayoutCommandRunOptions } from './runtime-layout-apply'
 import type { ExecutionHostId } from '../../shared/execution-host'
 import type { LayoutApplyReply } from '../../shared/workspace-layout/workspace-layout-command-types'
 import type { WorkspaceSessionState } from '../../shared/workspace-session-state-types'
@@ -15,8 +16,11 @@ export function createChatTabLayoutQueue(deps: {
   sessionOf: (worktreeId: string) => WorkspaceSessionState | null
   /** Called only with a saved session; unplaceable worktrees throw. */
   hostIdOf: (worktreeId: string) => ExecutionHostId
-  apply: (command: ChatTabLayoutCommand) => Promise<LayoutApplyReply>
-}): (changesNow: () => readonly QueuedChatTabChange[]) => void {
+  apply: (
+    command: ChatTabLayoutCommand,
+    options?: LayoutCommandRunOptions
+  ) => Promise<LayoutApplyReply>
+}): (changesNow: () => readonly QueuedChatTabChange[], admit?: () => boolean) => Promise<boolean> {
   let queue: Promise<void> = Promise.resolve()
   const commandNow = ({ worktreeId, change }: QueuedChatTabChange) => {
     const session = deps.sessionOf(worktreeId)
@@ -32,26 +36,35 @@ export function createChatTabLayoutQueue(deps: {
       change
     )
   }
-  return (changesNow) => {
-    queue = queue.then(async () => {
+  return (changesNow, admit) => {
+    const result = queue.then(async () => {
+      let applied = true
       let changes: readonly QueuedChatTabChange[]
       try {
         changes = changesNow()
       } catch (error) {
         console.warn('[agent-session-tabs] reading chat tab changes failed:', error)
-        return
+        return false
       }
       for (const queued of changes) {
         try {
           const command = commandNow(queued)
-          const reply = command ? await deps.apply(command) : null
+          if (!command && admit && 'close' in queued.change) {
+            applied = false
+          }
+          const reply = command ? await deps.apply(command, admit ? { admit } : undefined) : null
           if (command && reply && !reply.ok) {
+            applied = false
             console.warn(`[agent-session-tabs] ${command.type} refused:`, reply.code)
           }
         } catch (error) {
+          applied = false
           console.warn('[agent-session-tabs] a chat tab change failed:', error)
         }
       }
+      return applied
     })
+    queue = result.then(() => {})
+    return result
   }
 }
diff --git a/src/main/runtime/construction/runtime-identity-state.ts b/src/main/runtime/construction/runtime-identity-state.ts
index f59357dffb21..542f9832985b 100644
--- a/src/main/runtime/construction/runtime-identity-state.ts
+++ b/src/main/runtime/construction/runtime-identity-state.ts
@@ -63,7 +63,6 @@ import {
 import { RuntimeTerminalWait as RuntimeTerminalWaitController } from '../terminal/wait/terminal-wait'
 import type { PtyLivenessVerdict } from '../../../shared/pty-liveness-verdict'
 import type { HostScopedWorktreeKey } from '../../../shared/worktree/host-qualified-identity'
-
 import { RuntimeConstructionServices } from './runtime-construction-services'
 
 export abstract class OrcaRuntimeWithRuntimeId extends RuntimeConstructionServices {
@@ -117,6 +116,9 @@ export abstract class OrcaRuntimeWithRuntimeId extends RuntimeConstructionServic
     snapshot: RuntimeMobileSessionTabsSnapshot
   ): RuntimeMobileSessionTabsSnapshot {
     const existing = this.mobileSessionTabsByWorktree.get(worktreeId)
+    if (snapshot.switchProjections === undefined && existing?.switchProjections) {
+      snapshot = { ...snapshot, switchProjections: existing.switchProjections }
+    }
     if (ORCA_LAYOUT_OWNER_IS_MAIN) {
       const merged = startedMainTerminalSurfaces(this)?.withMainOrder(snapshot) ?? snapshot
       // Main-order-only rebuilds are no-ops unless occupant/publication/retirement evidence changed.
diff --git a/src/main/runtime/main-owned-workspace-runtime-fixture.ts b/src/main/runtime/main-owned-workspace-runtime-fixture.ts
index e592e784573a..3fa704592186 100644
--- a/src/main/runtime/main-owned-workspace-runtime-fixture.ts
+++ b/src/main/runtime/main-owned-workspace-runtime-fixture.ts
@@ -1,4 +1,3 @@
-// Windowless main-owned layout fixture: apply in memory and notify writes so terminal listings refresh.
 import { getDefaultWorkspaceSession } from '../../shared/constants'
 import type { WorkspaceSessionState } from '../../shared/workspace-session-state-types'
 import type { TerminalPaneLayoutNode } from '../../shared/terminal-tab-types'
@@ -9,6 +8,8 @@ import { resolveHostId } from '../persistence/loading-store/session-host-partiti
 import { withDurableRuntimeStore, withRuntimePaneAdmission } from './runtime-durable-store-fixture'
 import { OrcaRuntimeService } from './orca-runtime'
 
+// Windowless main-owned layout fixture: apply in memory and notify writes so terminal listings refresh.
+
 export const REPO = {
   id: 'repo-1',
   path: '/workspace',
@@ -80,11 +81,21 @@ export function setupMainOwnedWorkspace(opts: { split?: boolean; pinned?: boolea
         return () => written.delete(listener)
       },
       setWorkspaceSession: (next: WorkspaceSessionState) => write(next),
-      applyLayoutCommand: async (command: LayoutCommand, hostIds: readonly string[] = []) => {
+      applyLayoutCommand: async (
+        command: LayoutCommand,
+        hostIds: readonly string[] = [],
+        run?: { admit?: () => boolean; onApplied?: () => void }
+      ) => {
+        if (run?.admit && !run.admit()) {
+          return { ok: false as const, code: 'tab_not_found' as const }
+        }
         const change = applyCommandToSession(resolveHostId(hostIds[0]), current, command)
         if (change.session) {
           write(change.session)
         }
+        if (change.value.ok) {
+          run?.onApplied?.()
+        }
         return change.value
       },
       getSettings: () => ({}),
diff --git a/src/main/runtime/orca-runtime-create-terminal-dependencies.ts b/src/main/runtime/orca-runtime-create-terminal-dependencies.ts
index a1d743d8c35a..e12cf90d35d7 100644
--- a/src/main/runtime/orca-runtime-create-terminal-dependencies.ts
+++ b/src/main/runtime/orca-runtime-create-terminal-dependencies.ts
@@ -54,10 +54,17 @@ export const spawnShellInputs = ({
 
 /** Abort disconnected callers, refuse sleeping workspaces, and pass fork intent for host validation. */
 export function callerSpawnScope(
-  opts: Pick<TerminalCreateOptions, 'signal' | 'refuseSleptWorktree' | 'spawnIntent'>
-): { signal?: AbortSignal; refuseSleptWorktree?: true; spawnIntent?: SpawnIntent } {
+  opts: Pick<
+    TerminalCreateOptions,
+    'signal' | 'refuseSleptWorktree' | 'spawnIntent' | 'switchExecution'
+  >
+): Pick<TerminalCreateOptions, 'signal' | 'switchExecution'> & {
+  refuseSleptWorktree?: true
+  spawnIntent?: SpawnIntent
+} {
   return {
     ...(opts.signal ? { signal: opts.signal } : {}),
+    ...(opts.switchExecution ? { switchExecution: opts.switchExecution } : {}),
     ...(opts.refuseSleptWorktree ? { refuseSleptWorktree: true } : {}),
     ...(opts.spawnIntent ? { spawnIntent: opts.spawnIntent } : {})
   }
diff --git a/src/main/runtime/orca-runtime.ts b/src/main/runtime/orca-runtime.ts
index 8b2e7770b22b..9aef015774f1 100644
--- a/src/main/runtime/orca-runtime.ts
+++ b/src/main/runtime/orca-runtime.ts
@@ -1,3 +1,5 @@
+import { parsePaneKey } from '../../shared/stable-pane-id'
+import { noteAgentLaunchPaneAccepted } from '../agent-launch/agent-launch-pane-attachment'
 import type { RuntimeLinearCommandSurface } from './runtime-linear-command-surface'
 import { installRuntimeLinearCommandSurface } from './runtime-linear-command-surface'
 import { publishWorkspaceViewChanges } from './runtime-workspace-view-change-events'
@@ -190,6 +192,21 @@ class OrcaRuntimeService extends OrcaRuntimeSidebarBase {
   }
 
   /** Retain final verdicts, clear settled ones, and remove withdrawn panes without removing split siblings. */
+  noteAcceptedAgentLaunchPane(paneKey: string, operationId?: string): void {
+    noteAgentLaunchPaneAccepted(paneKey)
+    const pane = parsePaneKey(paneKey)
+    if (!pane || !this.supportsConditionalSwitchProjection()) {
+      return
+    }
+    this.notifier?.agentLaunchPaneVerdict?.({
+      worktreeId: '',
+      ...pane,
+      operationId,
+      accepted: true,
+      verdict: { kind: 'proceed' }
+    })
+  }
+
   reportAgentLaunchPaneVerdict(
     pane: AgentLaunchPaneAddress,
     verdict: AgentLaunchPaneVerdict
diff --git a/src/main/runtime/rpc/methods/agent-launch-caller-support.ts b/src/main/runtime/rpc/methods/agent-launch-caller-support.ts
new file mode 100644
index 000000000000..4c18f8960a57
--- /dev/null
+++ b/src/main/runtime/rpc/methods/agent-launch-caller-support.ts
@@ -0,0 +1,26 @@
+import { AGENT_LAUNCH_RUNTIME_CAPABILITY } from '../../../../shared/agent-launch-runtime-capability'
+import type { RpcContext } from '../core'
+import { clientRendersStructuredAgent } from './structured-agent-session-policy'
+
+/** agent.launch.v2 declares support for both outcomes. CLI/runtime-socket and SSH bridges have no clientKind/capabilities; the desktop renderer is a runtime client and must advertise support. */
+export function supportsAgentLaunch(
+  context: Pick<RpcContext, 'clientKind' | 'clientCapabilities'>
+): boolean {
+  return (
+    context.clientKind === undefined ||
+    context.clientCapabilities?.includes(AGENT_LAUNCH_RUNTIME_CAPABILITY) === true
+  )
+}
+
+/** v2 covers Claude/Codex chats; other agents require the same explicit rendering capability used by tabs and restart offers, else use terminal. */
+export function callerRendersLaunchedChat(
+  context: Pick<RpcContext, 'clientKind' | 'clientCapabilities'>,
+  agent: string
+): boolean {
+  return (
+    context.clientKind === undefined ||
+    agent === 'claude' ||
+    agent === 'codex' ||
+    clientRendersStructuredAgent(context.clientCapabilities, agent)
+  )
+}
diff --git a/src/main/runtime/rpc/methods/agent-launch-tab-publication.ts b/src/main/runtime/rpc/methods/agent-launch-tab-publication.ts
index 836b3578a2cb..4257ca565121 100644
--- a/src/main/runtime/rpc/methods/agent-launch-tab-publication.ts
+++ b/src/main/runtime/rpc/methods/agent-launch-tab-publication.ts
@@ -1,7 +1,3 @@
-/** Publish a stable-id tab before cold admission/spawn for replay-safe launches; its pane waits for the launch.
- * Best-effort only: unresolved workspace, chat default, absent layout owner or occupied pane falls back to publication at spawn.
- * After restart the pane behaves as an ordinary pane. */
-
 import { randomUUID } from 'node:crypto'
 import type {
   AgentLaunchPlacementReceipt,
@@ -29,6 +25,10 @@ import type { AgentLaunchParams } from '../../../../shared/rpc-contract/agent-la
 import { agentLaunchOperationCallerKey } from './agent-launch-replay'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
 
+/** Publish a stable-id tab before cold admission/spawn for replay-safe launches; its pane waits for the launch.
+ * Best-effort only: unresolved workspace, chat default, absent layout owner or occupied pane falls back to publication at spawn.
+ * After restart the pane behaves as an ordinary pane. */
+
 /** Paired launches move only the caller's view; both early publication and spawn must obey this. */
 export function agentLaunchMovesHostWindow(
   context: Pick<RpcContext, 'caller' | 'clientKind'>
@@ -192,13 +192,28 @@ export async function publishAgentLaunchTabEarly(
     publishing,
     finishRunning: (verdict) => running.finish(verdict),
     agentBound: () => running.agentBound(),
-    paneIsLive: () => runtime.hasLiveTerminalForPaneKey(paneKey),
+    paneIsLive: () => !running.current() || runtime.hasLiveTerminalForPaneKey(paneKey),
     closedByUser: () => running.closedByUser(),
-    report: (verdict) => {
-      const address = { worktreeId: workspace.id, tabId: pane.tabId, leafId: pane.leafId }
-      // Main withdraws panes it owns; the window still receives the verdict to release retained launch state.
-      if (ORCA_LAYOUT_OWNER_IS_MAIN && verdict.kind === 'withdrawn') {
-        runtime.withdrawAgentLaunchPaneInMainLayout(address)
+    report: async (verdict) => {
+      const address = {
+        worktreeId: workspace.id,
+        tabId: pane.tabId,
+        leafId: pane.leafId,
+        operationId: params.operationId
+      }
+      if (!running.current()) {
+        return
+      }
+      if (verdict.kind === 'withdrawn') {
+        const published = await publishing
+        const withdrawn = await runtime.withdrawAgentLaunchPaneInMainLayout(
+          address,
+          running.current,
+          published.withdrawalRoot
+        )
+        if (!withdrawn || !running.current()) {
+          return
+        }
       }
       runtime.reportAgentLaunchPaneVerdict(address, verdict)
     }
@@ -212,7 +227,7 @@ function trackEarlyAgentLaunchTab(args: {
   agentBound: () => void
   paneIsLive: () => boolean
   closedByUser: () => boolean
-  report: (verdict: AgentLaunchPaneVerdict) => void
+  report: (verdict: AgentLaunchPaneVerdict) => Promise<void>
 }): EarlyAgentLaunchTab {
   let reply: AgentLaunchTabPublished | null = null
   let publicationFailed = false
@@ -265,7 +280,7 @@ function trackEarlyAgentLaunchTab(args: {
                 ? { kind: 'unconfirmed' }
                 : { kind: 'not-started', code: failureCode }
         args.finishRunning(verdict)
-        args.report(verdict)
+        void args.report(verdict).catch(() => {})
       })
     },
     placement: () => reply?.placement
diff --git a/src/main/runtime/rpc/methods/agent-launch.test-fixture.ts b/src/main/runtime/rpc/methods/agent-launch.test-fixture.ts
index f85a8a8e8a01..eba3447b2f44 100644
--- a/src/main/runtime/rpc/methods/agent-launch.test-fixture.ts
+++ b/src/main/runtime/rpc/methods/agent-launch.test-fixture.ts
@@ -1,3 +1,4 @@
+import { noteAgentLaunchPaneAccepted } from '../../../agent-launch/agent-launch-pane-attachment'
 /** Use one runtime stub for RPC and replay tests so they exercise the same host surface. */
 
 import { vi } from 'vitest'
@@ -165,6 +166,7 @@ export function runtimeStub(options: AgentLaunchRuntimeStubOptions = {}) {
       (request: Omit<AgentLaunchTabPublishRequest, 'requestId'>) =>
         options.publishAgentLaunchTab?.(request) ?? null
     ),
+    noteAcceptedAgentLaunchPane: vi.fn((paneKey: string) => noteAgentLaunchPaneAccepted(paneKey)),
     reportAgentLaunchPaneVerdict: vi.fn(
       (_pane: { worktreeId: string; tabId: string; leafId: string }, _verdict: unknown) => {}
     ),
diff --git a/src/main/runtime/rpc/methods/agent-launch.ts b/src/main/runtime/rpc/methods/agent-launch.ts
index adf285911787..9b42e179ad13 100644
--- a/src/main/runtime/rpc/methods/agent-launch.ts
+++ b/src/main/runtime/rpc/methods/agent-launch.ts
@@ -1,8 +1,3 @@
-/** Capability-gated surface routing; callers must inspect outcome.kind and receipt for fallback reasons.
- * Keep worktree.create's PTY/handle contract for older clients.
- * operationId adds durable at-most-once execution and recorded replay; unknown outcomes refuse, while stranded-surface recovery remains separate. */
-
-import { AGENT_LAUNCH_RUNTIME_CAPABILITY } from '../../../../shared/agent-launch-runtime-capability'
 import { AgentLaunchTabClosedError } from '../../../../shared/agent-launch-tab-closed'
 import { computeAgentLaunchFingerprint } from '../../../../shared/agent-launch-operation'
 import type { AgentLaunchIntent, AgentLaunchResult } from '../../../../shared/agent-launch-intent'
@@ -43,36 +38,17 @@ import {
 } from './agent-launch-caller-selection'
 import { agentLaunchWorkspaceFactory } from './agent-launch-worktree-creation'
 import { assertAgentLaunchTargetAuthorized } from './agent-launch-target-authorization'
-import { clientRendersStructuredAgent } from './structured-agent-session-policy'
 import { resolveUnlaunchedIntent } from './agent-launch-intent-resolution'
 import {
   publishEarlyTab,
   withPlacement,
   type AgentLaunchView
 } from './agent-launch-tab-publication'
+import { supportsAgentLaunch, callerRendersLaunchedChat } from './agent-launch-caller-support'
 
-/** agent.launch.v2 declares support for both outcomes. CLI/runtime-socket and SSH bridges have no clientKind/capabilities; the desktop renderer is a runtime client and must advertise support. */
-export function supportsAgentLaunch(
-  context: Pick<RpcContext, 'clientKind' | 'clientCapabilities'>
-): boolean {
-  return (
-    context.clientKind === undefined ||
-    context.clientCapabilities?.includes(AGENT_LAUNCH_RUNTIME_CAPABILITY) === true
-  )
-}
-
-/** v2 covers Claude/Codex chats; other agents require the same explicit rendering capability used by tabs and restart offers, else use terminal. */
-function callerRendersLaunchedChat(
-  context: Pick<RpcContext, 'clientKind' | 'clientCapabilities'>,
-  agent: string
-): boolean {
-  return (
-    context.clientKind === undefined ||
-    agent === 'claude' ||
-    agent === 'codex' ||
-    clientRendersStructuredAgent(context.clientCapabilities, agent)
-  )
-}
+/** Capability-gated surface routing; callers must inspect outcome.kind and receipt for fallback reasons.
+ * Keep worktree.create's PTY/handle contract for older clients.
+ * operationId adds durable at-most-once execution and recorded replay; unknown outcomes refuse, while stranded-surface recovery remains separate. */
 
 /** What a launch admitted under an operation id carries into its execution. */
 type ReplaySafeLaunch = {
@@ -257,6 +233,9 @@ function runReplaySafeAgentLaunch(
     return active.promise
   }
 
+  if (params.paneKey) {
+    context.runtime.noteAcceptedAgentLaunchPane(params.paneKey, params.operationId)
+  }
   let promise: Promise<AgentLaunchResult>
   promise = executeReplaySafeAgentLaunch(params, context, fingerprint).finally(() => {
     if (activeAgentLaunches.get(key)?.promise === promise) {
@@ -309,6 +288,9 @@ export const AGENT_LAUNCH_METHODS = [
       }
       assertAgentLaunchTargetAuthorized(params.target, context)
       if (!params.operationId) {
+        if (params.paneKey) {
+          context.runtime.noteAcceptedAgentLaunchPane(params.paneKey, params.operationId)
+        }
         return runLegacyAgentLaunch(params, context)
       }
       return runReplaySafeAgentLaunch(
@@ -329,3 +311,5 @@ export const AGENT_LAUNCH_METHODS = [
     }
   })
 ]
+
+export { supportsAgentLaunch } from './agent-launch-caller-support'
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-create-options.ts b/src/main/runtime/rpc/methods/structured-agent-session-create-options.ts
new file mode 100644
index 000000000000..a9b143bafaff
--- /dev/null
+++ b/src/main/runtime/rpc/methods/structured-agent-session-create-options.ts
@@ -0,0 +1,37 @@
+import { AGENT_CHAT_PERMISSION_MODE_OPTION_ID } from '../../../../shared/agent-chat-permission-mode'
+import { computeAgentSessionPayloadFingerprint } from '../../../../shared/agent-session-mutation-envelope'
+import type { AgentSessionMutationEnvelope } from '../../../../shared/agent-session-wire'
+import type {
+  StructuredAgentSessionResumeSource,
+  StructuredAgentSessionFirstMessage
+} from '../../../../shared/structured-agent-session-create'
+
+export function structuredAgentSessionCreateIntentFingerprint(params: {
+  envelope: AgentSessionMutationEnvelope
+  worktree: string
+  agent: string
+  resumeFrom?: StructuredAgentSessionResumeSource
+  tabId?: string
+  firstMessage?: StructuredAgentSessionFirstMessage
+  options?: Readonly<Record<string, string>>
+}): string {
+  return computeAgentSessionPayloadFingerprint({
+    method: 'agentSession.create',
+    sessionId: params.envelope.sessionId,
+    fields: {
+      worktree: params.worktree,
+      agent: params.agent,
+      resumeFrom: params.resumeFrom,
+      tabId: params.tabId,
+      firstMessage: params.firstMessage,
+      options: params.options
+    }
+  })
+}
+
+export function seededPermissionMode(
+  options: Readonly<Record<string, string>> | undefined
+): Record<string, string> {
+  const mode = options?.[AGENT_CHAT_PERMISSION_MODE_OPTION_ID]
+  return mode ? { [AGENT_CHAT_PERMISSION_MODE_OPTION_ID]: mode } : {}
+}
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-create.ts b/src/main/runtime/rpc/methods/structured-agent-session-create.ts
index 20d91d07b3dd..acef9bfaacb9 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-create.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-create.ts
@@ -1,6 +1,3 @@
-// Resolve the host launch identity, then commit an at-rest create or the compatible acquired path.
-
-import { AGENT_CHAT_PERMISSION_MODE_OPTION_ID } from '../../../../shared/agent-chat-permission-mode'
 import { refuse, AgentSessionRefusalError } from '../../../../shared/agent-session-wire-refusals'
 import { computeAgentSessionPayloadFingerprint } from '../../../../shared/agent-session-mutation-envelope'
 import type {
@@ -36,6 +33,12 @@ import { structuredAgentSessionClosedBeforeCreate } from './structured-agent-ses
 import { structuredLaunchSeedOnSavedListing } from '../../session-tabs/structured-launch-seed-listing'
 import type { ChatTabPlacement } from '../../agent-session/agent-session-tab-layout'
 import { seedOptionsAdmittedOnSavedListing } from '../../agent-session-record-options'
+import {
+  structuredAgentSessionCreateIntentFingerprint,
+  seededPermissionMode
+} from './structured-agent-session-create-options'
+
+// Resolve the host launch identity, then commit an at-rest create or the compatible acquired path.
 
 export type PreparedStructuredAgentSessionCreate = {
   host: StructuredAgentSessionHost
@@ -49,28 +52,6 @@ export type PreparedStructuredAgentSessionCreate = {
 }
 
 /** New creates keep the immutable client intent in the ledger; legacy creates keep attach identity. */
-export function structuredAgentSessionCreateIntentFingerprint(params: {
-  envelope: AgentSessionMutationEnvelope
-  worktree: string
-  agent: string
-  resumeFrom?: StructuredAgentSessionResumeSource
-  tabId?: string
-  firstMessage?: StructuredAgentSessionFirstMessage
-  options?: Readonly<Record<string, string>>
-}): string {
-  return computeAgentSessionPayloadFingerprint({
-    method: 'agentSession.create',
-    sessionId: params.envelope.sessionId,
-    fields: {
-      worktree: params.worktree,
-      agent: params.agent,
-      resumeFrom: params.resumeFrom,
-      tabId: params.tabId,
-      firstMessage: params.firstMessage,
-      options: params.options
-    }
-  })
-}
 
 /** Run throwing pre-commit work inside resolveUncommittedStructuredCreate so clients receive a no-effects refusal. */
 export async function prepareStructuredAgentSessionCreateForWorktree(args: {
@@ -202,6 +183,7 @@ export async function commitStructuredAgentSessionCreate(args: {
   caller: StructuredAgentSessionCaller
   prepared: PreparedStructuredAgentSessionCreate
   activate: boolean
+  check?: () => void
   /** This machine's window made the create and opens the chat's tab where it reserved it. */
   placedByWindow?: boolean
   /** Where the creating client opens the chat, in this host's ids. */
@@ -216,6 +198,7 @@ export async function commitStructuredAgentSessionCreate(args: {
   if (prepared.atRest) {
     return prepared.host.create(args.caller, prepared.attachParams, {
       ...prepared.atRest,
+      check: args.check,
       ...(prepared.catalogModels ? { catalogModels: prepared.catalogModels } : {}),
       ...(prepared.hostLaunchDirectory
         ? { hostLaunchDirectory: prepared.hostLaunchDirectory }
@@ -232,6 +215,7 @@ export async function commitStructuredAgentSessionCreate(args: {
                     sessionId: prepared.attachParams.envelope.sessionId,
                     agent: tab.agent,
                     activate: args.activate,
+                    ...(args.check ? { check: args.check } : {}),
                     ...tabPlace,
                     ...(prepared.attachParams.surfaceTabId
                       ? { tabId: prepared.attachParams.surfaceTabId }
@@ -320,9 +304,4 @@ export async function createStructuredAgentSessionForWorktree(args: {
   })
 }
 
-function seededPermissionMode(
-  options: Readonly<Record<string, string>> | undefined
-): Record<string, string> {
-  const mode = options?.[AGENT_CHAT_PERMISSION_MODE_OPTION_ID]
-  return mode ? { [AGENT_CHAT_PERMISSION_MODE_OPTION_ID]: mode } : {}
-}
+export { structuredAgentSessionCreateIntentFingerprint } from './structured-agent-session-create-options'
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-schemas.ts b/src/main/runtime/rpc/methods/structured-agent-session-schemas.ts
index 992bf35dc92d..7005d8ce271b 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-schemas.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-schemas.ts
@@ -16,6 +16,8 @@ export {
   ModelCatalogParams,
   MutationEnvelope,
   OptionsParams,
+  SwitchToChatParams,
+  SwitchToTerminalParams,
   QueuedMessageActionParams,
   QueuedMessagesResumeParams,
   RespondParams,
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
new file mode 100644
index 000000000000..9f667d224b73
--- /dev/null
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
@@ -0,0 +1,409 @@
+import { writeFile } from 'node:fs/promises'
+import { join } from 'node:path'
+import * as cliTranscript from '../../../ai-vault/structured-chat-cli-fork'
+import { structuredAgentRuntimeRegistration } from '../../structured-agent-runtime-registrations'
+import { agentSessionProviderHandleChainHead } from '../../../../shared/agent-session-provider-handle'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import {
+  createRestTestRig,
+  type RestTestRig
+} from '../../../native-chat/agent-session-wire/structured-agent-session-rest-test-rig'
+import {
+  createTestParams,
+  CREATE_TEST_CALLER as caller
+} from '../../../native-chat/agent-session-wire/structured-agent-session-create-test-fixture'
+import { HOST_TEST_SESSION as id } from '../../../native-chat/agent-session-wire/structured-agent-session-host-test-data'
+import { setStructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-registry'
+import { setupMainOwnedWorkspace, WORKTREE_ID } from '../../main-owned-workspace-runtime-fixture'
+import { executeStructuredSessionSwitch } from './structured-agent-session-switch-execution'
+import { SwitchToChatParams, SwitchToTerminalParams } from './structured-agent-session-schemas'
+import { STRUCTURED_AGENT_SESSION_SWITCH_TO_CHAT_METHODS } from './structured-agent-session-switch-to-chat'
+import type { RuntimeMobileSessionCreateTerminalResult } from '../../../../shared/runtime-types'
+import { DaemonRequestTimeoutError } from '../../../daemon/daemon-errors'
+
+let rig: RestTestRig
+beforeEach(async () => {
+  rig = await createRestTestRig({ idleSweep: { intervalMs: 60_000 } })
+  const params = createTestParams()
+  expect(
+    await rig.host.create(
+      caller,
+      createTestParams(undefined, {
+        location: { ...params.location, workspaceId: WORKTREE_ID }
+      })
+    )
+  ).toMatchObject({ ok: true })
+  setStructuredAgentSessionHost(rig.host)
+})
+afterEach(async () => {
+  setStructuredAgentSessionHost(null)
+  await rig.dispose()
+  vi.restoreAllMocks()
+})
+const terminal: RuntimeMobileSessionCreateTerminalResult = {
+  tab: {
+    type: 'terminal',
+    id: 'new:leaf',
+    parentTabId: 'new',
+    leafId: 'leaf',
+    title: 'Codex',
+    terminal: 'handle',
+    status: 'ready',
+    isActive: true
+  },
+  publicationEpoch: 'host',
+  snapshotVersion: 1
+}
+
+it('executes empty/fresh through the ordinary terminal owner without requesting a saved resume or native identity', async () => {
+  const { runtime } = setupMainOwnedWorkspace()
+  const create = vi
+    .spyOn(runtime, 'createSessionSwitchTerminal')
+    .mockImplementation(async (_workspace, args) => {
+      args.execution.check()
+      expect(rig.adapter.closeSession).not.toHaveBeenCalled()
+      return terminal
+    })
+  const result = await executeStructuredSessionSwitch(
+    { sessionId: id, execution: { invocationId: 'fresh', commandOverride: 'cx' } },
+    { runtime },
+    'terminal'
+  )
+  expect(result).toMatchObject({ status: 'completed', terminal: terminal.tab.id })
+  expect(create).toHaveBeenCalledWith(
+    expect.any(String),
+    expect.objectContaining({ sessionId: id, source: undefined, commandOverride: 'cx' })
+  )
+  expect(rig.adapter.acquire).not.toHaveBeenCalled()
+})
+
+it('returns readable chat before selected provider readiness without starting it twice', async () => {
+  const { runtime } = setupMainOwnedWorkspace()
+  const acquired = Promise.withResolvers<void>()
+  const original = rig.adapter.acquire.getMockImplementation()!
+  rig.adapter.acquire.mockImplementation(async (...args) => {
+    await acquired.promise
+    return original(...args)
+  })
+  vi.spyOn(runtime, 'publishStructuredAgentSessionTab').mockImplementation(async (input) => {
+    input.check?.()
+    await rig.store.setSessionTabVisibility(id, true)
+  })
+  const close = vi.spyOn(runtime, 'closeSwitchedSourceTerminal')
+  const params = { sessionId: id, execution: { invocationId: 'chat' } }
+  const view = await executeStructuredSessionSwitch(params, { runtime }, 'chat')
+  expect(view.status).toBe('present')
+  expect(rig.adapter.acquire).not.toHaveBeenCalled()
+  if (view.status !== 'present') {
+    throw new Error('missing shown handshake')
+  }
+  const opened = await executeStructuredSessionSwitch(
+    {
+      ...params,
+      execution: {
+        ...params.execution,
+        receipt: { generation: view.generation, shown: true }
+      }
+    },
+    { runtime },
+    'chat'
+  )
+  expect(opened).toMatchObject({ status: 'completed', startupPending: true })
+  const completion = executeStructuredSessionSwitch(
+    {
+      ...params,
+      execution: {
+        ...params.execution,
+        observe: true
+      }
+    },
+    { runtime },
+    'chat'
+  )
+  acquired.resolve()
+  expect(await completion).toMatchObject({ status: 'completed', sourceRetained: false })
+  expect(rig.adapter.acquire).toHaveBeenCalledOnce()
+  expect(close).not.toHaveBeenCalled()
+})
+
+it('keeps opened chat visible and returns the exact committed selected start failure separately', async () => {
+  const { runtime } = setupMainOwnedWorkspace()
+  vi.spyOn(runtime, 'publishStructuredAgentSessionTab').mockImplementation(async () => {
+    await rig.store.setSessionTabVisibility(id, true)
+  })
+  vi.spyOn(rig.host.deps.adapter, 'open').mockRejectedValue(new Error('provider launch failed'))
+  const params = { sessionId: id, execution: { invocationId: 'failed' } }
+  const view = await executeStructuredSessionSwitch(params, { runtime }, 'chat')
+  if (view.status !== 'present') {
+    throw new Error('missing shown handshake')
+  }
+  await executeStructuredSessionSwitch(
+    {
+      ...params,
+      execution: {
+        ...params.execution,
+        receipt: { generation: view.generation, shown: true }
+      }
+    },
+    { runtime },
+    'chat'
+  )
+  const result = await executeStructuredSessionSwitch(
+    {
+      ...params,
+      execution: {
+        ...params.execution,
+        observe: true
+      }
+    },
+    { runtime },
+    'chat'
+  )
+  expect(result).toMatchObject({ status: 'refused', failureItemId: expect.any(String) })
+  if (result.status !== 'refused') {
+    throw new Error('missing selected failure')
+  }
+  const failures = (await rig.host.journalSnapshot(id)).items.filter(
+    (item) => item.body.kind === 'status' && item.body.failure
+  )
+  expect(failures).toHaveLength(1)
+  expect(failures[0].itemId).toBe(result.failureItemId)
+  expect(
+    await executeStructuredSessionSwitch(
+      { ...params, execution: { ...params.execution, observe: true } },
+      { runtime },
+      'chat'
+    )
+  ).toEqual(result)
+  expect(rig.store.getRecord(id)).not.toBeNull()
+  expect(rig.store.getSessionTabId(id)).not.toBeNull()
+})
+
+it('reports a dispatched terminal with a lost answer as uncertain, preserving its source', async () => {
+  const { runtime } = setupMainOwnedWorkspace()
+  await rig.store.setSessionTabVisibility(id, false)
+  await rig.store.setSessionTabVisibility(id, true, 'source-chat')
+  vi.spyOn(runtime, 'createSessionSwitchTerminal').mockRejectedValue(
+    new DaemonRequestTimeoutError('raw daemon text must not become start-failed copy')
+  )
+  const result = await executeStructuredSessionSwitch(
+    { sessionId: id, execution: { invocationId: 'lost', sourceTabId: 'source-chat' } },
+    { runtime },
+    'terminal'
+  )
+  expect(result).toMatchObject({
+    status: 'uncertain',
+    refusal: { code: 'agent_session_operation_unknown', details: { reason: 'outcomeUnknown' } }
+  })
+  expect(rig.store.getSessionTabId(id)).toBe('source-chat')
+})
+
+it('retires the captured custom source and its ordinary projected row after fresh startup', async () => {
+  const { runtime } = setupMainOwnedWorkspace()
+  await rig.store.setSessionTabVisibility(id, false)
+  await rig.store.setSessionTabVisibility(id, true, 'source-chat')
+  await runtime.applyLayoutCommand({
+    type: 'openAgentSessionTab',
+    workspace: WORKTREE_ID,
+    sessionId: id,
+    agent: 'codex',
+    tabId: 'source-chat'
+  })
+  runtime.projectStructuredAgentSessionTab({
+    workspaceId: WORKTREE_ID,
+    sessionId: id,
+    agent: 'codex',
+    activate: true
+  })
+  vi.spyOn(runtime, 'createSessionSwitchTerminal').mockResolvedValue(terminal)
+  const result = await executeStructuredSessionSwitch(
+    { sessionId: id, execution: { invocationId: 'retire', sourceTabId: 'source-chat' } },
+    { runtime },
+    'terminal'
+  )
+  expect(result).toMatchObject({ status: 'completed', sourceRetained: false })
+  expect(rig.store.getSessionTabId(id)).toBeNull()
+  expect(
+    (await runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)).tabs.some(
+      (tab) => tab.type === 'agent-session' && tab.sessionId === id
+    )
+  ).toBe(false)
+})
+
+it('preserves the v1 request/result and start-only side effects when execution is absent', async () => {
+  const { runtime } = setupMainOwnedWorkspace()
+  expect(SwitchToChatParams.parse({ sessionId: id })).toEqual({ sessionId: id })
+  expect(SwitchToTerminalParams.parse({ sessionId: id })).toEqual({ sessionId: id })
+  expect(SwitchToChatParams.safeParse({ sessionId: id, other: true }).success).toBe(false)
+  const publish = vi.spyOn(runtime, 'publishStructuredAgentSessionTab')
+  const create = vi.spyOn(runtime, 'createSessionSwitchTerminal')
+  const result = await STRUCTURED_AGENT_SESSION_SWITCH_TO_CHAT_METHODS[0].handler(
+    { sessionId: id },
+    { runtime }
+  )
+  expect(result).toEqual({ ok: true, sessionId: id })
+  expect(publish).not.toHaveBeenCalled()
+  expect(create).not.toHaveBeenCalled()
+})
+
+it('keeps an opened readable chat successful when conditional source-shell cleanup refuses', async () => {
+  await rig.host.switchToChat(id)
+  await rig.host.switchToTerminal(id)
+  const record = rig.store.getRecord(id)!
+  const head = agentSessionProviderHandleChainHead(record.providerHandleChain)!
+  const filePath = join(rig.root, 'cleanup-source.jsonl')
+  const nativeId = head.handle.nativeId
+  await writeFile(
+    filePath,
+    `${[
+      { type: 'session_meta', payload: { id: nativeId } },
+      {
+        timestamp: '2026-10-26T12:00:00Z',
+        type: 'event_msg',
+        payload: { type: 'task_started', turn_id: 'terminal-turn' }
+      },
+      {
+        type: 'response_item',
+        payload: {
+          type: 'message',
+          role: 'user',
+          content: [{ type: 'input_text', text: 'Finish the change' }]
+        }
+      },
+      {
+        timestamp: '2026-10-26T12:00:01Z',
+        type: 'event_msg',
+        payload: { type: 'task_complete', turn_id: 'terminal-turn' }
+      }
+    ]
+      .map((row) => JSON.stringify(row))
+      .join('\n')}\n`
+  )
+  // External source lookup/preparation is the I/O boundary; journal catch-up and host/start ownership stay real.
+  vi.spyOn(cliTranscript, 'resolveStructuredChatCliSource').mockResolvedValue({
+    host: rig.host,
+    record,
+    head,
+    agent: 'codex',
+    cwd: rig.root,
+    providerSessionId: nativeId,
+    registration: structuredAgentRuntimeRegistration('codex')!
+  })
+  vi.spyOn(cliTranscript, 'prepareStructuredChatCliTranscript').mockResolvedValue({
+    useRealCodexHome: false,
+    cliForkSource: {
+      agent: 'codex',
+      sourceAgent: 'codex',
+      sessionId: nativeId,
+      filePath,
+      cwd: rig.root,
+      codexHome: null,
+      executionHostPlatform: process.platform
+    }
+  })
+  const { runtime } = setupMainOwnedWorkspace()
+  vi.spyOn(runtime, 'inspectTerminalProcess').mockResolvedValue({
+    foregroundProcess: 'zsh',
+    hasChildProcesses: false,
+    childProcessEvidence: 'no-children',
+    switchWitness: 'before-probe'
+  })
+  vi.spyOn(runtime, 'publishStructuredAgentSessionTab').mockImplementation(async (input) => {
+    input.check?.()
+    await rig.store.setSessionTabVisibility(id, true)
+  })
+  const cleanup = vi.spyOn(runtime, 'closeSwitchedSourceTerminal').mockResolvedValue(false)
+  const params = {
+    sessionId: id,
+    execution: {
+      invocationId: 'cleanup-refused',
+      source: {
+        terminal: 'term_source',
+        expectedIncarnationId: '11111111-1111-4111-8111-111111111111'
+      }
+    }
+  }
+  const view = await executeStructuredSessionSwitch(params, { runtime }, 'chat')
+  if (view.status !== 'present') {
+    throw new Error('missing shown handshake')
+  }
+  await executeStructuredSessionSwitch(
+    {
+      ...params,
+      execution: { ...params.execution, receipt: { generation: view.generation, shown: true } }
+    },
+    { runtime },
+    'chat'
+  )
+  const result = await executeStructuredSessionSwitch(
+    { ...params, execution: { ...params.execution, observe: true } },
+    { runtime },
+    'chat'
+  )
+  expect(result).toMatchObject({ status: 'completed', sourceRetained: true })
+  expect(cleanup).toHaveBeenCalledOnce()
+  expect(rig.store.getSessionTabId(id)).not.toBeNull()
+})
+
+it('does not invent a failed journal item when acquisition fails before a selected child exists', async () => {
+  const { runtime } = setupMainOwnedWorkspace()
+  vi.spyOn(runtime, 'publishStructuredAgentSessionTab').mockImplementation(async () => {
+    await rig.store.setSessionTabVisibility(id, true)
+  })
+  rig.adapter.acquire.mockRejectedValue(new Error('acquire refused'))
+  const params = { sessionId: id, execution: { invocationId: 'pre-child-failure' } }
+  const view = await executeStructuredSessionSwitch(params, { runtime }, 'chat')
+  if (view.status !== 'present') {
+    throw new Error('missing shown handshake')
+  }
+  await executeStructuredSessionSwitch(
+    {
+      ...params,
+      execution: { ...params.execution, receipt: { generation: view.generation, shown: true } }
+    },
+    { runtime },
+    'chat'
+  )
+  const result = await executeStructuredSessionSwitch(
+    { ...params, execution: { ...params.execution, observe: true } },
+    { runtime },
+    'chat'
+  )
+  expect(result).toMatchObject({ status: 'refused' })
+  expect(result).not.toHaveProperty('failureItemId')
+  expect(
+    (await rig.host.journalSnapshot(id)).items.filter(
+      (item) => item.body.kind === 'status' && item.body.failure
+    )
+  ).toEqual([])
+})
+
+it('keeps strict v1 envelopes and journal effects for both a selected and already-starting failed child', async () => {
+  const { runtime } = setupMainOwnedWorkspace()
+  const opening = Promise.withResolvers<void>()
+  const entered = Promise.withResolvers<void>()
+  vi.spyOn(rig.host.deps.adapter, 'open').mockImplementation(async () => {
+    entered.resolve()
+    await opening.promise
+    throw new Error('provider launch failed')
+  })
+  const method = STRUCTURED_AGENT_SESSION_SWITCH_TO_CHAT_METHODS[0]!
+  const first = method.handler({ sessionId: id }, { runtime })
+  await entered.promise
+  const joined = method.handler({ sessionId: id }, { runtime })
+  opening.resolve()
+  const answer = await first
+  expect(await joined).toEqual(answer)
+  expect(Object.keys(answer).sort()).toEqual(['ok', 'refusal'])
+  expect(answer).toEqual({
+    ok: false,
+    refusal: {
+      code: 'agent_session_owner_restart_failed',
+      message: "Codex couldn't start. Send your message to try again."
+    }
+  })
+  const failures = (await rig.host.journalSnapshot(id)).items.filter(
+    (item) => item.body.kind === 'status' && item.body.failure
+  )
+  expect(failures).toHaveLength(1)
+})
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
new file mode 100644
index 000000000000..c7c3a0a9dee7
--- /dev/null
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
@@ -0,0 +1,266 @@
+import type { z } from 'zod'
+import type { RpcContext } from '../core'
+import { DaemonConnectionLostError, DaemonRequestTimeoutError } from '../../../daemon/daemon-errors'
+import { isAgentSessionOperationOutcomeUnknown } from '../../runtime-agent-launch-resolution'
+import type { SwitchToChatParams, SwitchToTerminalParams } from './structured-agent-session-schemas'
+import {
+  agentSessionSwitchDeadline,
+  type AgentSessionSwitchResult
+} from '../../../../shared/agent-session-switch-execution'
+import {
+  AgentSessionRefusalError,
+  agentSessionRefusalError,
+  isAgentSessionRefusalError,
+  refuseUnclassified
+} from '../../../../shared/agent-session-wire-refusals'
+import {
+  nativeConversationContent,
+  prepareStructuredChatCliTranscript,
+  resolveStructuredChatCliSource
+} from '../../../ai-vault/structured-chat-cli-fork'
+import {
+  ensureStructuredHostInstalled,
+  requireStructuredSessionHost,
+  requireStructuredHost,
+  structuredCallerFor
+} from './structured-agent-session-gate'
+import {
+  prepareStructuredAgentSessionCreateForWorktree,
+  commitStructuredAgentSessionCreate
+} from './structured-agent-session-create'
+import { inPlaceSwitchEnabled } from '../../../../shared/structured-agent-cli-conversation-adoption'
+import {
+  cleanupSwitchedSourceShell,
+  recordWorkspace,
+  switchRetainedOwner
+} from './structured-agent-session-switch-source'
+import { executeStructuredSessionTerminalSwitch } from './structured-agent-session-switch-terminal-execution'
+
+export async function executeStructuredSessionSwitch(
+  params: z.infer<typeof SwitchToChatParams> | z.infer<typeof SwitchToTerminalParams>,
+  ctx: RpcContext,
+  direction: 'chat' | 'terminal'
+): Promise<AgentSessionSwitchResult> {
+  const deadline = agentSessionSwitchDeadline()
+  let sessionId = params.sessionId
+  let commandOwned = false
+  const operation = (async (): Promise<AgentSessionSwitchResult> => {
+    await ensureStructuredHostInstalled(ctx)
+    deadline.check()
+    const execution = params.execution
+    if (!execution) {
+      throw agentSessionRefusalError('agent_session_operation_invalid', {
+        reason: 'requestMalformed'
+      })
+    }
+    const create = 'create' in execution ? execution.create : undefined
+    const host = create
+      ? requireStructuredHost(ctx, create.agent)
+      : requireStructuredSessionHost(ctx, sessionId)
+    commandOwned = true
+    return host.runSwitch(
+      sessionId,
+      execution.invocationId,
+      deadline,
+      async () => {
+        if (create && !execution.receipt && !execution.observe) {
+          if (
+            direction !== 'chat' ||
+            create.envelope.sessionId !== sessionId ||
+            create.agent !== 'codex'
+          ) {
+            throw agentSessionRefusalError('agent_session_operation_invalid', {
+              reason: 'requestMalformed'
+            })
+          }
+          try {
+            const prepared = await prepareStructuredAgentSessionCreateForWorktree({
+              ...create,
+              runtime: ctx.runtime,
+              caller: structuredCallerFor(ctx),
+              atRest: true,
+              ensureHost: async () => requireStructuredHost(ctx, create.agent),
+              structuredAgentCliSourceEvidence: ctx.structuredAgentCliSourceEvidence
+            })
+            deadline.check()
+            const created = await commitStructuredAgentSessionCreate({
+              runtime: ctx.runtime,
+              caller: structuredCallerFor(ctx),
+              prepared,
+              activate: true,
+              tabPlacement: create.tabPlacement,
+              check: deadline.check
+            })
+            if (!created.ok) {
+              const owner = switchRetainedOwner(host, create, created.refusal)
+              if (!owner) {
+                return { status: 'refused', sessionId, refusal: created.refusal }
+              }
+              sessionId = owner
+            }
+          } catch (error) {
+            const owner = isAgentSessionRefusalError(error)
+              ? switchRetainedOwner(host, create, error.refusal)
+              : null
+            if (!owner) {
+              throw error
+            }
+            sessionId = owner
+          }
+          if (sessionId !== params.sessionId) {
+            await host.adoptSwitch(params.sessionId, sessionId)
+          }
+        }
+        const record = host.deps.store.getRecord(sessionId)
+        if (!record || !inPlaceSwitchEnabled(record.provider)) {
+          throw agentSessionRefusalError('structured_agent_session_unsupported', {
+            reason: 'hostUnsupported'
+          })
+        }
+        const workCurrent = host.captureSwitchWork(sessionId, deadline)
+        if (direction === 'chat') {
+          const source = 'source' in execution ? execution.source : undefined
+          let switchWitness: string | undefined
+          let witnessBudget = 0
+          if (source) {
+            const inspection = await ctx.runtime.inspectTerminalProcess(source.terminal, {
+              expectedIncarnationId: source.expectedIncarnationId,
+              scanChildProcesses: true,
+              captureSwitchWitness: execution.invocationId
+            })
+            deadline.check()
+            switchWitness = inspection.switchWitness
+            witnessBudget = deadline.remaining()
+            if (inspection.childProcessEvidence !== 'no-children') {
+              throw agentSessionRefusalError('agent_session_operation_invalid', {
+                reason:
+                  inspection.childProcessEvidence === 'children'
+                    ? 'conversationOpenInTerminal'
+                    : 'outcomeUnknown'
+              })
+            }
+          }
+          // Initial creation already imported this source before committing its record.
+          if (
+            (!create || sessionId !== params.sessionId) &&
+            (source || nativeConversationContent(await host.journalSnapshot(sessionId)) === 'saved')
+          ) {
+            const prepared = await prepareStructuredChatCliTranscript(
+              await resolveStructuredChatCliSource(
+                { sessionId, workspaceId: record.location.workspaceId },
+                false
+              ),
+              (args) => ctx.runtime.prepareAiVaultSessionResume(args),
+              false
+            )
+            deadline.check()
+            if (!prepared.cliForkSource) {
+              throw agentSessionRefusalError('agent_session_identity_required', {
+                reason: 'transcriptUnreadable'
+              })
+            }
+            await host.refreshSwitchTranscript(sessionId, prepared.cliForkSource, deadline)
+          }
+          const revealed = await host.revealSession(sessionId)
+          deadline.check()
+          if (!revealed.readable && revealed.openRefusal) {
+            throw new AgentSessionRefusalError(revealed.openRefusal)
+          }
+          await ctx.runtime.publishStructuredAgentSessionTab({
+            ...revealed,
+            activate: true,
+            check: deadline.check
+          })
+          deadline.check()
+          await host.presentSwitch(sessionId, {
+            sessionId,
+            workspaceId: revealed.workspaceId,
+            agent: 'codex',
+            tabId: host.getSessionTabId(sessionId) ?? `agent-session:${sessionId}`,
+            ...(create?.tabPlacement ? { placement: create.tabPlacement } : {})
+          })
+          const starting = host.switchToChat(sessionId, deadline)
+          host.openedSwitch(sessionId, {
+            status: 'completed',
+            sessionId,
+            startupPending: true
+          })
+          const cleanup = source
+            ? cleanupSwitchedSourceShell(ctx, source, switchWitness, witnessBudget, deadline)
+            : Promise.resolve(true)
+          const started = await starting
+          if (!started.ok) {
+            return {
+              status: 'refused',
+              sessionId,
+              refusal: started.refusal,
+              ...(started.failureItemId ? { failureItemId: started.failureItemId } : {})
+            }
+          }
+          return { status: 'completed', sessionId, sourceRetained: !(await cleanup) }
+        }
+        return executeStructuredSessionTerminalSwitch(
+          params,
+          record,
+          ctx,
+          host,
+          sessionId,
+          deadline,
+          workCurrent,
+          execution
+        )
+      },
+      direction === 'terminal',
+      execution,
+      async (check) => {
+        check()
+        const revealed = await host.revealSession(sessionId)
+        check()
+        await ctx.runtime.publishStructuredAgentSessionTab({ ...revealed, activate: false, check })
+        check()
+        ctx.runtime.retainSessionSwitchProjection(
+          recordWorkspace(host, sessionId),
+          sessionId,
+          execution.invocationId,
+          host.switchGeneration(sessionId) ??
+            execution.receipt?.generation ??
+            execution.invocationId
+        )
+      },
+      Boolean(create),
+      (generation) =>
+        ctx.runtime.convergeSessionSwitchProjection(recordWorkspace(host, sessionId), generation)
+    )
+  })()
+  void operation
+    .finally(() => {
+      if (!commandOwned) {
+        deadline.dispose()
+      }
+    })
+    .catch(() => {})
+  try {
+    return await deadline.wait(operation)
+  } catch (error) {
+    const refusal = isAgentSessionRefusalError(error)
+      ? error.refusal
+      : isAgentSessionOperationOutcomeUnknown(error) ||
+          error instanceof DaemonConnectionLostError ||
+          error instanceof DaemonRequestTimeoutError
+        ? agentSessionRefusalError('agent_session_operation_unknown', { reason: 'outcomeUnknown' })
+            .refusal
+        : refuseUnclassified(
+            'agent_session_owner_restart_failed',
+            'The agent could not switch. Try again.'
+          )
+    return {
+      status:
+        refusal.code === 'agent_session_operation_expired' ||
+        refusal.code === 'agent_session_operation_unknown'
+          ? 'uncertain'
+          : 'refused',
+      sessionId,
+      refusal
+    }
+  }
+}
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-source.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-source.ts
new file mode 100644
index 000000000000..fb3d8b678abb
--- /dev/null
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-source.ts
@@ -0,0 +1,67 @@
+import { agentSessionProviderHandleChainHead } from '../../../../shared/agent-session-provider-handle'
+import type { StructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-host'
+import type { z } from 'zod'
+import type { RpcContext } from '../core'
+
+import type { SwitchToChatParams } from './structured-agent-session-schemas'
+import type { agentSessionSwitchDeadline } from '../../../../shared/agent-session-switch-execution'
+import { agentSessionRefusalError } from '../../../../shared/agent-session-wire-refusals'
+
+import type { AgentSessionWireRefusal } from '../../../../shared/agent-session-wire'
+
+/** The switch alone owns this captured-shell cleanup; ordinary Close keeps its semantics. */
+export async function cleanupSwitchedSourceShell(
+  ctx: RpcContext,
+  source: NonNullable<NonNullable<z.infer<typeof SwitchToChatParams>['execution']>['source']>,
+  witness: string | undefined,
+  witnessBudget: number,
+  deadline: ReturnType<typeof agentSessionSwitchDeadline>
+): Promise<boolean> {
+  try {
+    deadline.check()
+    if (!witness) {
+      return false
+    }
+    return await ctx.runtime.closeSwitchedSourceTerminal(
+      source.terminal,
+      source.expectedIncarnationId,
+      { token: witness, remainingMs: witnessBudget }
+    )
+  } catch {
+    return false
+  }
+}
+
+export function recordWorkspace(host: StructuredAgentSessionHost, id: string) {
+  const record = host.deps.store.getRecord(id)
+  if (!record) {
+    throw agentSessionRefusalError('agent_session_identity_required', { reason: 'recordMissing' })
+  }
+  return record.location.workspaceId
+}
+
+export function switchRetainedOwner(
+  host: StructuredAgentSessionHost,
+  create: NonNullable<NonNullable<z.infer<typeof SwitchToChatParams>['execution']>['create']>,
+  refusal: AgentSessionWireRefusal
+): string | null {
+  if (
+    refusal.code !== 'agent_session_conflict' &&
+    refusal.code !== 'agent_session_ownership_unknown'
+  ) {
+    return null
+  }
+  const owner = refusal.details?.owner
+  if (!owner || !create.resumeFrom?.providerSessionId) {
+    return null
+  }
+  const record = host.deps.store.getRecord(owner.sessionId)
+  const head = record && agentSessionProviderHandleChainHead(record.providerHandleChain)
+  return record?.provider === create.agent &&
+    head?.handle.nativeId === create.resumeFrom.providerSessionId &&
+    record.location.executionHostId === 'local' &&
+    !record.location.wslDistro &&
+    owner.workspaceId === record.location.workspaceId
+    ? owner.sessionId
+    : null
+}
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts
new file mode 100644
index 000000000000..2a7d278f66af
--- /dev/null
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts
@@ -0,0 +1,127 @@
+import type { AgentSessionRecord } from '../../../../shared/agent-session-record'
+import type { StructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-host'
+import type { z } from 'zod'
+import type { RpcContext } from '../core'
+import { agentLaunchTabViewerRule } from './agent-launch-tab-publication'
+import { SwitchToTerminalParams } from './structured-agent-session-schemas'
+import type {
+  agentSessionSwitchDeadline,
+  AgentSessionSwitchResult
+} from '../../../../shared/agent-session-switch-execution'
+import { agentSessionRefusalError } from '../../../../shared/agent-session-wire-refusals'
+import {
+  nativeConversationContent,
+  prepareStructuredChatCliTranscript,
+  resolveStructuredChatCliSource
+} from '../../../ai-vault/structured-chat-cli-fork'
+
+export async function executeStructuredSessionTerminalSwitch(
+  params: z.infer<typeof SwitchToTerminalParams>,
+  record: AgentSessionRecord,
+  ctx: RpcContext,
+  host: StructuredAgentSessionHost,
+  sessionId: string,
+  deadline: ReturnType<typeof agentSessionSwitchDeadline>,
+  workCurrent: () => boolean,
+  execution: NonNullable<z.infer<typeof SwitchToTerminalParams>['execution']>
+): Promise<AgentSessionSwitchResult> {
+  const terminalExecution = SwitchToTerminalParams.parse(params).execution
+  const sourceTabId = terminalExecution?.sourceTabId
+  const retire = ctx.runtime.captureSessionSwitchRetirement(
+    record.location.workspaceId,
+    sessionId,
+    sourceTabId,
+    workCurrent,
+    () => host.retainSwitch(sessionId),
+    {
+      invocationId: execution.invocationId,
+      generation: host.switchGeneration(sessionId)!,
+      sessionId,
+      tabId: sourceTabId ?? `agent-session:${sessionId}`,
+      phase: 'prepare'
+    }
+  )
+  const snapshot = await host.journalSnapshot(sessionId)
+  deadline.check()
+  const content = nativeConversationContent(snapshot)
+  if (content === 'uncertain') {
+    throw agentSessionRefusalError('agent_session_operation_invalid', {
+      reason: 'messagesUnsettled'
+    })
+  }
+  const prepared =
+    content === 'saved'
+      ? await prepareStructuredChatCliTranscript(
+          await resolveStructuredChatCliSource(
+            { sessionId, workspaceId: record.location.workspaceId },
+            false
+          ),
+          (args) => ctx.runtime.prepareAiVaultSessionResume(args),
+          false
+        )
+      : undefined
+  deadline.check()
+  if (content === 'saved' && !prepared?.cliForkSource) {
+    throw agentSessionRefusalError('agent_session_identity_required', {
+      reason: 'transcriptNotFound'
+    })
+  }
+  await host.switchToTerminal(sessionId, deadline)
+  deadline.check()
+  const terminal = await ctx.runtime.createSessionSwitchTerminal(record.location.workspaceId, {
+    invocationId: execution.invocationId,
+    sessionId,
+    source: prepared?.cliForkSource,
+    commandOverride: terminalExecution?.commandOverride,
+    options: record.options,
+    afterTabId: sourceTabId,
+    groupId: terminalExecution?.groupId,
+    execution: {
+      invocationId: execution.invocationId,
+      signal: deadline.signal,
+      trackPhysical: (work) => host.trackSwitchPhysical(sessionId, work),
+      remaining: deadline.remaining,
+      check: () => {
+        deadline.check()
+        if (!workCurrent()) {
+          throw agentSessionRefusalError('agent_session_operation_invalid', {
+            reason: 'messagesUnsettled'
+          })
+        }
+      },
+      viewer: agentLaunchTabViewerRule(ctx, 'focused'),
+      shown: (pane) =>
+        host.presentSwitch(sessionId, {
+          ...pane,
+          surface: 'terminal',
+          sessionId,
+          agent: 'codex'
+        })
+    }
+  })
+  if (terminal.agentResumeRefused || terminal.agentResumeUnavailable) {
+    return {
+      status: 'refused',
+      sessionId,
+      refusal: agentSessionRefusalError('agent_session_operation_unknown', {
+        reason: 'outcomeUnknown'
+      }).refusal
+    }
+  }
+  if (terminal.switchOutcomeUnknown) {
+    return {
+      status: 'uncertain',
+      sessionId,
+      refusal: agentSessionRefusalError('agent_session_operation_unknown', {
+        reason: 'outcomeUnknown'
+      }).refusal
+    }
+  }
+  const retired = await retire()
+  return {
+    status: 'completed',
+    sessionId,
+    terminal: terminal.tab.id,
+    sourceRetained: Boolean(sourceTabId && !retired)
+  }
+}
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-to-chat.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-to-chat.ts
index 0e7623b6efec..e8d9c05124d2 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-to-chat.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-to-chat.ts
@@ -1,8 +1,5 @@
-// `agentSession.switchToChat` — a terminal's conversation moving into the chat that already holds
-// it. The host resolves the record and starts its agent through the ordinary operation start, so the
-// provider open imports the terminal's turns; success is that agent ready. A refusal leaves the
-// terminal to the client. Gated per agent by `agent-session.structured.switch.v1:<agent>`.
-
+import { executeStructuredSessionSwitch } from './structured-agent-session-switch-execution'
+import type { AgentSessionSwitchResult } from '../../../../shared/agent-session-switch-execution'
 import { inPlaceSwitchEnabled } from '../../../../shared/structured-agent-cli-conversation-adoption'
 import { refuse } from '../../../../shared/agent-session-wire-refusals'
 import type { AgentSessionWireRefusal } from '../../../../shared/agent-session-wire'
@@ -12,20 +9,30 @@ import {
   requireStructuredCapability,
   requireStructuredSessionHost
 } from './structured-agent-session-gate'
-import { OptionsParams } from './structured-agent-session-schemas'
+import { SwitchToChatParams } from './structured-agent-session-schemas'
+
+// `agentSession.switchToChat` — a terminal's conversation moving into the chat that already holds
+// it. The host resolves the record and starts its agent through the ordinary operation start, so the
+// provider open imports the terminal's turns; success is that agent ready. A refusal leaves the
+// terminal to the client. Gated per agent by `agent-session.structured.switch.v1:<agent>`.
 
 export const STRUCTURED_AGENT_SESSION_SWITCH_TO_CHAT_METHODS = [
   defineMethod({
     name: 'agentSession.switchToChat',
     permission: 'workspace',
-    params: OptionsParams,
+    params: SwitchToChatParams,
     handler: async (
       params,
       ctx
     ): Promise<
-      { ok: true; sessionId: string } | { ok: false; refusal: AgentSessionWireRefusal }
+      | { ok: true; sessionId: string }
+      | { ok: false; refusal: AgentSessionWireRefusal }
+      | AgentSessionSwitchResult
     > => {
       requireStructuredCapability(ctx)
+      if (params.execution) {
+        return executeStructuredSessionSwitch(params, ctx, 'chat')
+      }
       await ensureStructuredHostInstalled(ctx)
       const host = requireStructuredSessionHost(ctx, params.sessionId)
       const record = host.deps.store.getRecord(params.sessionId)
@@ -40,7 +47,9 @@ export const STRUCTURED_AGENT_SESSION_SWITCH_TO_CHAT_METHODS = [
         }
       }
       const started = await host.switchToChat(params.sessionId)
-      return started.ok ? { ok: true, sessionId: params.sessionId } : started
+      return started.ok
+        ? { ok: true, sessionId: params.sessionId }
+        : { ok: false, refusal: started.refusal }
     }
   })
 ]
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-to-terminal.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-to-terminal.ts
index d734436c472f..6577bfe916c6 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-to-terminal.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-to-terminal.ts
@@ -1,4 +1,5 @@
-// Prepare the ordinary same-id resume recipe before the ordered idle-only, proven-exit stop.
+import { executeStructuredSessionSwitch } from './structured-agent-session-switch-execution'
+import type { AgentSessionSwitchResult } from '../../../../shared/agent-session-switch-execution'
 import { inPlaceSwitchEnabled } from '../../../../shared/structured-agent-cli-conversation-adoption'
 import type { AiVaultChatForkSource } from '../../../../shared/ai-vault-resume-preparation'
 import {
@@ -11,15 +12,23 @@ import {
   requireStructuredCapability,
   requireStructuredSessionHost
 } from './structured-agent-session-gate'
-import { OptionsParams } from './structured-agent-session-schemas'
+import { SwitchToTerminalParams } from './structured-agent-session-schemas'
+
+// Prepare the ordinary same-id resume recipe before the ordered idle-only, proven-exit stop.
 
 export const STRUCTURED_AGENT_SESSION_SWITCH_TO_TERMINAL_METHODS = [
   defineMethod({
     name: 'agentSession.switchToTerminal',
     permission: 'workspace',
-    params: OptionsParams,
-    handler: async (params, ctx): Promise<{ source: AiVaultChatForkSource }> => {
+    params: SwitchToTerminalParams,
+    handler: async (
+      params,
+      ctx
+    ): Promise<{ source: AiVaultChatForkSource } | AgentSessionSwitchResult> => {
       requireStructuredCapability(ctx)
+      if (params.execution) {
+        return executeStructuredSessionSwitch(params, ctx, 'terminal')
+      }
       await ensureStructuredHostInstalled(ctx)
       const host = requireStructuredSessionHost(ctx, params.sessionId)
       const record = host.deps.store.getRecord(params.sessionId)
diff --git a/src/main/runtime/runtime-durable-store-fixture.ts b/src/main/runtime/runtime-durable-store-fixture.ts
index 26cd7bcdb4e5..f0a5c6fa8f4a 100644
--- a/src/main/runtime/runtime-durable-store-fixture.ts
+++ b/src/main/runtime/runtime-durable-store-fixture.ts
@@ -107,8 +107,15 @@ export function withRuntimePaneAdmission<
     return value
   }
   return Object.assign(store, {
-    admitTerminalPane: async (admission: TerminalPaneAdmission, hostId?: string) =>
-      commit(hostId, (session) => admitPaneToSession(resolveHostId(hostId), session, admission)),
+    admitTerminalPane: async (
+      admission: TerminalPaneAdmission,
+      hostId?: string,
+      check?: () => void
+    ) =>
+      commit(hostId, (session) => {
+        check?.()
+        return admitPaneToSession(resolveHostId(hostId), session, admission)
+      }),
     withdrawTerminalPane: async (
       pane: CommandOf<'closePane'>,
       hostId?: string,
diff --git a/src/main/runtime/runtime-layout-apply.ts b/src/main/runtime/runtime-layout-apply.ts
index d7c1d648bd5f..7ddea427f4f6 100644
--- a/src/main/runtime/runtime-layout-apply.ts
+++ b/src/main/runtime/runtime-layout-apply.ts
@@ -135,7 +135,7 @@ export async function applyWindowLayoutCommand(
   }
   const { workspace, tabId, leafId } = command
   // A launch still starting in the pane the user closed stops, and says so (as the legacy close).
-  if (!run?.originalPresentation) {
+  if (!run?.originalPresentation && !run?.admit) {
     markAgentLaunchesClosedByUser(workspace, { kind: 'pane', tabId, leafId })
   }
   const close: CommandOf<'closePane'> = {
diff --git a/src/main/runtime/runtime-mobile-session-result-finalization.ts b/src/main/runtime/runtime-mobile-session-result-finalization.ts
index e35949780551..fc8167245488 100644
--- a/src/main/runtime/runtime-mobile-session-result-finalization.ts
+++ b/src/main/runtime/runtime-mobile-session-result-finalization.ts
@@ -34,6 +34,7 @@ export function finalizeRuntimeMobileSessionTabsResult(
         null)
   return {
     worktree: snapshot.worktree,
+    ...(snapshot.switchProjections ? { switchProjections: snapshot.switchProjections } : {}),
     publicationEpoch: snapshot.publicationEpoch,
     snapshotVersion: snapshot.snapshotVersion,
     activeGroupId,
diff --git a/src/main/runtime/runtime-notifier-contract.ts b/src/main/runtime/runtime-notifier-contract.ts
index facbb5ba14eb..30c6ce3d2c88 100644
--- a/src/main/runtime/runtime-notifier-contract.ts
+++ b/src/main/runtime/runtime-notifier-contract.ts
@@ -30,6 +30,7 @@ import type {
   RuntimeTerminalDriverState,
   RuntimeTerminalPresentation
 } from '../../shared/runtime-types'
+import type { SessionSwitchProjection } from '../../shared/agent-session-switch-execution'
 
 type DriverState = RuntimeTerminalDriverState
 
@@ -132,7 +133,11 @@ export type RuntimeNotifier = {
   /** Raises the window onto a pane it shows; resolves false when the window does not know the worktree. */
   revealTerminalPane?(target: TerminalPaneRevealTarget): Promise<boolean>
   focusEditorTab?(tabId: string, worktreeId: string): void
-  closeSessionTab?(tabId: string, worktreeId: string): void | Promise<void>
+  closeSessionTab?(
+    tabId: string,
+    worktreeId: string,
+    switchProjection?: SessionSwitchProjection
+  ): void | Promise<void | boolean>
   moveSessionTab?(worktreeId: string, move: RuntimeMobileSessionTabMove): void
   /** Host window only: host/all move it; caller/clients open without moving it; absence keeps legacy switching. Paired clients never navigate (all means host). */
   openFile?(
diff --git a/src/main/runtime/runtime-pane-admission.ts b/src/main/runtime/runtime-pane-admission.ts
index f50679155b1d..3955675da663 100644
--- a/src/main/runtime/runtime-pane-admission.ts
+++ b/src/main/runtime/runtime-pane-admission.ts
@@ -23,6 +23,9 @@ type Spawn = NonNullable<RuntimePtyController['spawn']>
 type PaneStartStatusSink = Pick<PaneStartStatuses, 'set' | 'clear'>
 /** Main-owned/keepOnFailure panes retain failed start status. Each start clears prior resume outcome; only resumesSleepingRecord publishes a new one. */
 export type PaneStartArgs = {
+  beforeAdmission?: () => void
+  beforeSpawn?: () => void
+  keepOnFailure?: boolean
   startStatus?: {
     sink: PaneStartStatusSink
     keepOnFailure: boolean
@@ -118,9 +121,12 @@ export async function withdrawAdmittedPane(
 export async function admitRuntimePane(
   store: RuntimeStore | null | undefined,
   admission: TerminalPaneAdmission,
-  hostId: string | undefined
+  hostId: string | undefined,
+  check?: () => void
 ): Promise<TerminalPaneAdmissionOutcome | undefined> {
-  return store?.admitTerminalPane?.(admission, hostId)
+  return check
+    ? store?.admitTerminalPane?.(admission, hostId, check)
+    : store?.admitTerminalPane?.(admission, hostId)
 }
 
 /** Admit before starting (design 4.1); withdraw failed newly admitted panes unless keepOnFailure retains the error surface. */
@@ -129,9 +135,10 @@ export async function startInAdmittedPane<T>(
   admission: TerminalPaneAdmission,
   hostId: string | undefined,
   start: (outcome: TerminalPaneAdmissionOutcome | undefined) => Promise<T>,
-  keepOnFailure = false
+  keepOnFailure = false,
+  check?: () => void
 ): Promise<{ outcome: TerminalPaneAdmissionOutcome | undefined; result: T }> {
-  const outcome = await admitRuntimePane(store, admission, hostId)
+  const outcome = await admitRuntimePane(store, admission, hostId, check)
   try {
     return { outcome, result: await start(outcome) }
   } catch (error) {
@@ -147,7 +154,13 @@ export async function startInAdmittedPane<T>(
 export async function spawnInAdmittedPane(
   store: RuntimeStore | null | undefined,
   controller: Pick<RuntimePtyController, 'spawn'>,
-  { startStatus, ...args }: AdmittedSpawnArgs & PaneStartArgs
+  {
+    startStatus,
+    beforeAdmission,
+    beforeSpawn,
+    keepOnFailure,
+    ...args
+  }: AdmittedSpawnArgs & PaneStartArgs
 ): ReturnType<Spawn> {
   const { groupId: _groupId, afterTabId: _afterTabId, ...spawnArgs } = args
   const paneKey = `${args.tabId}:${args.leafId}`
@@ -182,6 +195,7 @@ export async function spawnInAdmittedPane(
         admitted === 'tab_closed' ? 'tab_not_found' : 'terminal_split_source_not_found'
       )
     }
+    beforeSpawn?.()
     admittedAs = admitted
     // SAFETY: Callers require spawn; a lost capability during admission keeps the original failure.
     return controller.spawn!(spawnArgs)
@@ -195,7 +209,8 @@ export async function spawnInAdmittedPane(
           admissionFor(args),
           hostIdOf(args),
           start,
-          startStatus?.keepOnFailure
+          keepOnFailure || startStatus?.keepOnFailure,
+          beforeAdmission
         )
   } catch (error) {
     // Retained panes show failure; user-closed panes stay gone and contended panes attach to the winner.
@@ -218,7 +233,10 @@ export async function spawnInAdmittedPane(
   }
   startStatus?.sink.clear(paneKey)
   const { outcome, result } = run
-  const started = result.agentSessionEnsure?.owner.surface ?? result.stablePaneOwner
+  const started =
+    result.switchRecoveredSurface ??
+    result.agentSessionEnsure?.owner.surface ??
+    result.stablePaneOwner
   const elsewhere = started && (started.tabId !== args.tabId || started.leafId !== args.leafId)
   if (outcome === 'admitted' && elsewhere) {
     await withdrawRuntimePane(store, args)
diff --git a/src/main/runtime/runtime-pty-controller-contract.ts b/src/main/runtime/runtime-pty-controller-contract.ts
index 1a74fb0b4f66..30dee741a41f 100644
--- a/src/main/runtime/runtime-pty-controller-contract.ts
+++ b/src/main/runtime/runtime-pty-controller-contract.ts
@@ -12,7 +12,6 @@ import type {
 import type { AgentProviderSessionMetadata } from '../../shared/agent-session-resume'
 import type { TuiAgent } from '../../shared/tui-agent'
 import type { WorktreeStartupLaunch } from '../../shared/worktree/launch-types'
-import type { PtyIncarnationId } from '../../shared/pty-incarnation'
 import type { PtyBindingSourceExpectation } from '../persistence'
 import type { TerminalPanePlacement } from '../../shared/terminal-pane-placement'
 import type { ExecutionHostId } from '../../shared/execution-host'
@@ -26,6 +25,12 @@ import type { WriteSettlement } from '../../shared/pty-write-settlement'
 import type { StartupCwdFallback } from '../../shared/startup-cwd-fallback'
 import type { TerminalInputKind } from '../../shared/terminal-input-kind'
 import type { PaneResumeOutcome } from '../../shared/workspace-layout/workspace-layout-published'
+import type {
+  PtyFencedTerminationRequest,
+  PtyFencedTerminationOutcome
+} from '../../shared/pty-fenced-termination'
+import type { AgentSessionSwitchAuthority } from '../../shared/agent-session-switch-execution'
+import type { PtyProcessInspectionOptions } from '../providers/pty-process-inspection'
 
 export type PtyInventoryRefreshOptions = {
   includeForegroundProcessEvidence?: boolean
@@ -41,6 +46,7 @@ export type RuntimePtyController = {
   }): () => void
   adoptStablePane?(opts: {
     signal?: AbortSignal
+    switchExecution?: AgentSessionSwitchAuthority
     spawnFresh?: (operation: PaneSpawnOperation) => Promise<PtySpawnResult>
     cols: number
     rows: number
@@ -101,6 +107,7 @@ export type RuntimePtyController = {
     agentSessionCreateOperationId?: string
     spawnIntent?: SpawnIntent
     signal?: AbortSignal
+    switchExecution?: AgentSessionSwitchAuthority
     refuseSleptWorktree?: boolean
     onPtySpawnCommitted?: () => void
     /** Layout-owner build: whether a fresh start resumed its agent, told before its bind is written. */
@@ -136,6 +143,7 @@ export type RuntimePtyController = {
   ): WriteSettlement | Promise<WriteSettlement>
   /** Attach existing local daemon output without creating, resizing or focusing; refuse uncertain, SSH-scoped or non-daemon sessions. */
   attach?(ptyId: string): Promise<boolean>
+  killFenced?: (request: PtyFencedTerminationRequest) => Promise<PtyFencedTerminationOutcome>
   kill(ptyId: string): boolean
   /** `incarnationId` is the rejected spawn's; a same-id respawn since then is left alone. */
   retireRejectedPty?(ptyId: string, stopConfirmed: boolean, incarnationId: string | undefined): void
@@ -147,7 +155,7 @@ export type RuntimePtyController = {
   getForegroundProcess(ptyId: string): Promise<string | null>
   inspectProcess?(
     ptyId: string,
-    options?: { expectedIncarnationId?: PtyIncarnationId; scanChildProcesses?: boolean }
+    options?: PtyProcessInspectionOptions
   ): Promise<PtyProcessInspection>
   confirmForegroundProcess?(ptyId: string): Promise<string | null>
   confirmShellForeground?(ptyId: string): Promise<boolean>
diff --git a/src/main/runtime/runtime-terminal-contracts.ts b/src/main/runtime/runtime-terminal-contracts.ts
index bc3ae34ef2da..6328ae56873c 100644
--- a/src/main/runtime/runtime-terminal-contracts.ts
+++ b/src/main/runtime/runtime-terminal-contracts.ts
@@ -27,6 +27,7 @@ import type { TerminalInputKind } from '../../shared/terminal-input-kind'
 import type { RuntimePtyController } from './runtime-pty-controller-contract'
 import type { RuntimeAgentRowSnapshot } from './runtime-worktree-agent-rows'
 import type { WorkerTerminalHostScope } from '../../shared/worker-terminal-host-scope'
+import type { AgentSessionSwitchAuthority } from '../../shared/agent-session-switch-execution'
 
 export type TerminalCreateOptions = {
   command?: string
@@ -102,10 +103,12 @@ export type TerminalCreateOptions = {
   /** The paired client's declared intent; the host's fork gate validates and may defer it. */
   spawnIntent?: SpawnIntent
   signal?: AbortSignal
+  switchExecution?: AgentSessionSwitchAuthority
   /** Refuse (`worktree_terminals_sleeping`) instead of waking a worktree the host has put to sleep. */
   refuseSleptWorktree?: boolean
   onPtySpawnCommitted?: () => void
   /** Called before the spawn request leaves this process; a throw before it proves nothing spawned. */
+  beforePtySpawn?: () => void
   onPtySpawnDispatched?: (launch?: {
     launchConfig?: SleepingAgentLaunchConfig
     launchAgent?: TuiAgent
diff --git a/src/main/runtime/session-graph/session-window-graph-leaf.ts b/src/main/runtime/session-graph/session-window-graph-leaf.ts
new file mode 100644
index 000000000000..0e35b8bcb012
--- /dev/null
+++ b/src/main/runtime/session-graph/session-window-graph-leaf.ts
@@ -0,0 +1,42 @@
+import type { RuntimeSyncWindowGraph } from '../../../shared/runtime-session-contracts'
+import type { RuntimeLeafRecord } from '../runtime-terminal-state-records'
+
+export function runtimeGraphLeaf(
+  leaf: RuntimeSyncWindowGraph['leaves'][number],
+  existing: RuntimeLeafRecord | undefined,
+  ptyId: string | null,
+  ptyGeneration: number,
+  connected: boolean,
+  graphStatus: string,
+  tailSource: Partial<RuntimeLeafRecord> | undefined,
+  graphSyncedAt: number
+): RuntimeLeafRecord {
+  return {
+    ...leaf,
+    ptyId,
+    ptyGeneration,
+    connected,
+    writable: graphStatus === 'ready' && connected,
+    lastOutputAt: tailSource?.lastOutputAt ?? null,
+    lastExitCode: tailSource?.lastExitCode ?? null,
+    lastExitCause: tailSource?.lastExitCause ?? null,
+    tailBuffer: tailSource?.tailBuffer ?? [],
+    tailTranscriptBuffer: tailSource?.tailTranscriptBuffer ?? [],
+    tailTranscriptChars: tailSource?.tailTranscriptChars ?? 0,
+    tailPartialLine: tailSource?.tailPartialLine ?? '',
+    tailPendingAnsi: tailSource?.tailPendingAnsi ?? '',
+    tailRedrawCursor: tailSource?.tailRedrawCursor ?? null,
+    tailTruncated: tailSource?.tailTruncated ?? false,
+    tailLinesTotal: tailSource?.tailLinesTotal ?? 0,
+    preview: tailSource?.preview ?? '',
+    waitBlockedAt: tailSource?.waitBlockedAt ?? null,
+    lastAgentStatus: tailSource?.lastAgentStatus ?? null,
+    lastAgentStatusObservedLive: tailSource?.lastAgentStatusObservedLive ?? false,
+    lastOscTitle: tailSource?.lastOscTitle ?? null,
+    lastOscTitleAt: tailSource?.lastOscTitleAt ?? null,
+    paneTitleUpdatedAt:
+      existing?.ptyId === ptyId && existing.paneTitle === leaf.paneTitle
+        ? existing.paneTitleUpdatedAt
+        : graphSyncedAt
+  }
+}
diff --git a/src/main/runtime/session-graph/session-window-graph.ts b/src/main/runtime/session-graph/session-window-graph.ts
index 4c19138b6b5c..907bebf5dc81 100644
--- a/src/main/runtime/session-graph/session-window-graph.ts
+++ b/src/main/runtime/session-graph/session-window-graph.ts
@@ -7,8 +7,8 @@ import type {
 } from '../../../shared/runtime-session-contracts'
 import { HEADLESS_RUNTIME_WINDOW_ID } from '../../../shared/runtime-types'
 import type { RuntimeLeafRecord } from '../runtime-terminal-state-records'
-
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../shared/layout-owner-switch'
+import { runtimeGraphLeaf } from './session-window-graph-leaf'
 
 type Graph = RuntimeSyncWindowGraph
 
@@ -24,6 +24,16 @@ function assertUniqueRuntimeGraphTabIds(tabs: readonly RuntimeSyncedTab[]): void
 }
 
 export abstract class OrcaRuntimeWithSyncWindowGraph extends OrcaRuntimeWithAttachWindow {
+  private switchProjectionViewer: { windowId: number; generation: string | undefined } | undefined
+
+  supportsConditionalSwitchProjection(): boolean {
+    return (
+      this.graphStatus === 'ready' &&
+      this.switchProjectionViewer?.windowId === this.authoritativeWindowId &&
+      this.switchProjectionViewer?.generation === this.rendererGeneration
+    )
+  }
+
   /** Layout-owner builds: main's panes in place of the window's (session-tabs-inventory.ts). */
   protected abstract withMainSurfaces(windowId: number, graph: Graph): Graph
   declare protected terminalGroupGridSizes?: RuntimeSyncWindowGraph['terminalGroupGridSizes']
@@ -86,6 +96,10 @@ export abstract class OrcaRuntimeWithSyncWindowGraph extends OrcaRuntimeWithAtta
       this.servesHeadlessGraph = true
       this.rendererGeneration = null
     }
+    this.switchProjectionViewer =
+      graph.conditionalSwitchProjection === 1
+        ? { windowId, generation: rendererGeneration ?? undefined }
+        : undefined
     graph = ORCA_LAYOUT_OWNER_IS_MAIN ? this.withMainSurfaces(windowId, graph) : graph
 
     if (graph.terminalGroupGridSizes) {
@@ -148,34 +162,19 @@ export abstract class OrcaRuntimeWithSyncWindowGraph extends OrcaRuntimeWithAtta
       const connected = this.graphLeafConnected(ptyId, leaf.worktreeId)
       const tailSource = existing?.ptyId === ptyId ? existing : existingPty
 
-      nextLeaves.set(leafKey, {
-        ...leaf,
-        ptyId,
-        ptyGeneration,
-        connected,
-        writable: this.graphStatus === 'ready' && connected,
-        lastOutputAt: tailSource?.lastOutputAt ?? null,
-        lastExitCode: tailSource?.lastExitCode ?? null,
-        lastExitCause: tailSource?.lastExitCause ?? null,
-        tailBuffer: tailSource?.tailBuffer ?? [],
-        tailTranscriptBuffer: tailSource?.tailTranscriptBuffer ?? [],
-        tailTranscriptChars: tailSource?.tailTranscriptChars ?? 0,
-        tailPartialLine: tailSource?.tailPartialLine ?? '',
-        tailPendingAnsi: tailSource?.tailPendingAnsi ?? '',
-        tailRedrawCursor: tailSource?.tailRedrawCursor ?? null,
-        tailTruncated: tailSource?.tailTruncated ?? false,
-        tailLinesTotal: tailSource?.tailLinesTotal ?? 0,
-        preview: tailSource?.preview ?? '',
-        waitBlockedAt: tailSource?.waitBlockedAt ?? null,
-        lastAgentStatus: tailSource?.lastAgentStatus ?? null,
-        lastAgentStatusObservedLive: tailSource?.lastAgentStatusObservedLive ?? false,
-        lastOscTitle: tailSource?.lastOscTitle ?? null,
-        lastOscTitleAt: tailSource?.lastOscTitleAt ?? null,
-        paneTitleUpdatedAt:
-          existing?.ptyId === ptyId && existing.paneTitle === leaf.paneTitle
-            ? existing.paneTitleUpdatedAt
-            : graphSyncedAt
-      })
+      nextLeaves.set(
+        leafKey,
+        runtimeGraphLeaf(
+          leaf,
+          existing,
+          ptyId,
+          ptyGeneration,
+          connected,
+          this.graphStatus,
+          tailSource,
+          graphSyncedAt
+        )
+      )
 
       // Main-owned pane presence does not prove its terminal is connected.
       if (leaf.ptyId && connected && !this.mainDecidesLiveness(leaf.worktreeId)) {
diff --git a/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.test.ts b/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.test.ts
index f66772ba4a83..1fadc64dd078 100644
--- a/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.test.ts
+++ b/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.test.ts
@@ -1,10 +1,15 @@
-// Layout-owner build, no window: an agent launch's early tab in a workspace main owns is written by
-// main, a retry finds it, and a withdrawn launch pane is taken back by main.
+import { fixture as durableFixture } from '../../persistence/loading-store/profile-state-delayed-authority-fixture'
+import { OrcaRuntimeService } from '../orca-runtime'
+import { HEADLESS_RUNTIME_WINDOW_ID } from '../../../shared/runtime-session-contracts'
+import { trackRunningAgentLaunchPane } from '../../agent-launch/agent-launch-pane-attachment'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { WORKTREE_ID, setupMainOwnedWorkspace } from '../main-owned-workspace-runtime-fixture'
 import { publishAgentLaunchTabEarly } from '../rpc/methods/agent-launch-tab-publication'
 import { resetAgentLaunchPanesForTests } from '../../agent-launch/agent-launch-pane-attachment'
 
+// Layout-owner build, no window: an agent launch's early tab in a workspace main owns is written by
+// main, a retry finds it, and a withdrawn launch pane is taken back by main.
+
 vi.mock('../../../shared/layout-owner-switch', () => ({ ORCA_LAYOUT_OWNER_IS_MAIN: true }))
 
 const NEW_TAB = '9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d'
@@ -106,3 +111,91 @@ describe("an agent launch's early tab in a workspace main owns, with a window at
     )
   })
 })
+
+// These schedules go through Store -> LayoutCommandPersistence's actual durable queue.
+describe('conditional launch withdrawal at the durable writer', () => {
+  const worktreeId = 'repo-local::/fixture/local'
+  const pane = { worktreeId, tabId: NEW_TAB, leafId: NEW_LEAF, operationId: 'old-launch' }
+  async function opened() {
+    const state = await durableFixture()
+    const runtime = new OrcaRuntimeService(state.store)
+    runtime.syncWindowGraph(HEADLESS_RUNTIME_WINDOW_ID, { tabs: [], leaves: [] })
+    const running = trackRunningAgentLaunchPane({ worktreeId, paneKey: `${NEW_TAB}:${NEW_LEAF}` })
+    const shown = await runtime.publishAgentLaunchTabInMainLayout({
+      ...pane,
+      launchAgent: 'codex',
+      viewMode: 'terminal',
+      viewer: 'none'
+    })
+    if (!shown?.withdrawalRoot) {
+      throw new Error('actual create did not capture placement')
+    }
+    return { ...state, runtime, running, shown }
+  }
+  it('keeps a destination after a new launch is accepted before its options resolve', async () => {
+    const { store, authority, runtime, running, shown } = await opened()
+    const pause = authority.pause()
+    const preceding = store.runDurableMutation(() => ({ value: undefined }))
+    await pause.started.promise
+    const removing = runtime.withdrawAgentLaunchPaneInMainLayout(
+      pane,
+      running.current,
+      shown.withdrawalRoot
+    )
+    runtime.noteAcceptedAgentLaunchPane(`${NEW_TAB}:${NEW_LEAF}`, 'new-preparing-launch')
+    pause.finish.resolve()
+    await preceding
+    expect(await removing).toBe(false)
+    expect(store.getWorkspaceSession().terminalLayoutsByTabId[NEW_TAB]?.root).toMatchObject({
+      leafId: NEW_LEAF
+    })
+  })
+  it('rechecks acceptance after last_pane before its queued closeTabs', async () => {
+    const { store, runtime, running, shown } = await opened()
+    const apply = runtime.applyLayoutCommand.bind(runtime)
+    const spy = vi.spyOn(runtime, 'applyLayoutCommand').mockImplementation(async (...args) => {
+      const reply = await apply(...args)
+      if (!reply.ok && reply.code === 'last_pane') {
+        runtime.noteAcceptedAgentLaunchPane(`${NEW_TAB}:${NEW_LEAF}`, 'later-launch')
+      }
+      return reply
+    })
+    expect(
+      await runtime.withdrawAgentLaunchPaneInMainLayout(pane, running.current, shown.withdrawalRoot)
+    ).toBe(false)
+    expect(spy).toHaveBeenCalledTimes(2)
+    expect(
+      store.getWorkspaceSession().tabsByWorktree[worktreeId].some((row) => row.id === NEW_TAB)
+    ).toBe(true)
+  })
+  it('refuses a queued create after expiry at the actual layout apply', async () => {
+    const { store, authority } = await durableFixture()
+    const runtime = new OrcaRuntimeService(store)
+    runtime.syncWindowGraph(HEADLESS_RUNTIME_WINDOW_ID, { tabs: [], leaves: [] })
+    const pause = authority.pause()
+    const preceding = store.runDurableMutation(() => ({ value: undefined }))
+    await pause.started.promise
+    let expired = false
+    const creating = runtime.publishAgentLaunchTabInMainLayout(
+      {
+        ...pane,
+        launchAgent: 'codex',
+        viewMode: 'terminal',
+        viewer: 'none'
+      },
+      () => {
+        if (expired) {
+          throw new Error('expired')
+        }
+      }
+    )!
+    const refused = expect(creating).rejects.toThrow('expired')
+    expired = true
+    pause.finish.resolve()
+    await preceding
+    await refused
+    expect(
+      store.getWorkspaceSession().tabsByWorktree[worktreeId].some((row) => row.id === NEW_TAB)
+    ).toBe(false)
+  })
+})
diff --git a/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.ts b/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.ts
index 07b4beb5a22c..52655006efb4 100644
--- a/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.ts
+++ b/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.ts
@@ -1,4 +1,4 @@
-// Main-owned early launch tabs are written before launch and withdrawn through main close; paired-runtime workspaces retain window relay.
+import { launchTabWithdrawalIdentity } from '../../../shared/agent-launch-tab-publication'
 import { OrcaRuntimeWithCloseStructuredAgentSessionTab } from './structured-session-tab-close'
 import type {
   AgentLaunchTabPublished,
@@ -10,6 +10,8 @@ import { parseExecutionHostId } from '../../../shared/execution-host'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../shared/layout-owner-switch'
 import type { RuntimePtyWorktreeRecord } from '../runtime-terminal-state-records'
 
+// Main-owned early launch tabs are written before launch and withdrawn through main close; paired-runtime workspaces retain window relay.
+
 /** Where the tab landed against where the launch asked for it, as the window reports it. */
 function placementFallback(
   asked: AgentLaunchTabPublishRequest['placement'],
@@ -48,25 +50,52 @@ export abstract class OrcaRuntimeWithMainLayoutAgentLaunchTabs extends OrcaRunti
     )?.groupId
   }
 
+  private launchWithdrawalIdentity(worktreeId: string, tabId: string): string {
+    const session = this.getWorkspaceSessionForWorktree(worktreeId)
+    return launchTabWithdrawalIdentity(
+      session?.terminalLayoutsByTabId?.[tabId]?.root,
+      session?.unifiedTabs?.[worktreeId] ?? [],
+      session?.tabGroups?.[worktreeId] ?? [],
+      tabId
+    )
+  }
+
   /** The launch's tab in main's layout; null for a workspace main does not own (today's path). */
   publishAgentLaunchTabInMainLayout(
-    request: Omit<AgentLaunchTabPublishRequest, 'requestId'>
+    request: Omit<AgentLaunchTabPublishRequest, 'requestId'>,
+    check?: () => void
   ): Promise<AgentLaunchTabPublished> | null {
     const { worktreeId, tabId, leafId, placement } = request
     if (!this.ownsLaunchTab(worktreeId, tabId)) {
       return null
     }
     const existed = this.groupOfTab(worktreeId, tabId) !== undefined
-    return this.applyLayoutCommand({
-      type: 'createTerminalTab',
-      workspace: worktreeId,
-      tabId,
-      leafId,
-      viewMode: request.viewMode,
-      ...(placement?.groupId ? { groupId: placement.groupId } : {}),
-      ...(placement?.afterTabId ? { afterTabId: placement.afterTabId } : {}),
-      creation: { launchAgent: request.launchAgent }
-    }).then((reply) => {
+    let withdrawalRoot: string | undefined
+    return this.applyLayoutCommand(
+      {
+        type: 'createTerminalTab',
+        workspace: worktreeId,
+        tabId,
+        leafId,
+        viewMode: request.viewMode,
+        ...(placement?.groupId ? { groupId: placement.groupId } : {}),
+        ...(placement?.afterTabId ? { afterTabId: placement.afterTabId } : {}),
+        creation: { launchAgent: request.launchAgent }
+      },
+      {
+        ...(check
+          ? {
+              admit: () => {
+                check()
+                return true
+              }
+            }
+          : {}),
+        onApplied: () => {
+          withdrawalRoot = this.launchWithdrawalIdentity(worktreeId, tabId)
+        }
+      }
+    ).then((reply) => {
       if (!reply.ok) {
         throw new Error(reply.code)
       }
@@ -86,6 +115,7 @@ export abstract class OrcaRuntimeWithMainLayoutAgentLaunchTabs extends OrcaRunti
       return {
         tabId,
         created: true,
+        withdrawalRoot,
         placement: { groupId: landed, ...(fallback ? { fallback } : {}) }
       }
     })
@@ -108,28 +138,70 @@ export abstract class OrcaRuntimeWithMainLayoutAgentLaunchTabs extends OrcaRunti
   }
 
   /** Withdraw main-owned launch panes, closing the tab for its last pane; false leaves unowned workspaces to window cleanup. */
-  withdrawAgentLaunchPaneInMainLayout(pane: AgentLaunchPaneAddress): boolean {
-    if (!this.ownsLaunchTab(pane.worktreeId, pane.tabId)) {
+  async withdrawAgentLaunchPaneInMainLayout(
+    pane: AgentLaunchPaneAddress,
+    current: () => boolean = () => true,
+    withdrawalRoot?: string,
+    publicationOwner?: 'main' | 'window'
+  ): Promise<boolean> {
+    if (!withdrawalRoot || !current()) {
       return false
     }
-    // The verdict is a report: a failed take-back leaves an idle pane, never a failed launch.
-    void this.takeBackLaunchPane(pane).catch((error: unknown) => {
-      console.warn('[agent-launch] could not take back a withdrawn launch pane', error)
-    })
-    return true
+    if (
+      publicationOwner === 'window' ||
+      (publicationOwner === undefined && !this.ownsLaunchTab(pane.worktreeId, pane.tabId))
+    ) {
+      if (!this.supportsConditionalSwitchProjection()) {
+        return false
+      }
+      const published = this.notifier?.publishAgentLaunchTab?.({
+        ...pane,
+        launchAgent: 'codex',
+        viewMode: 'terminal',
+        viewer: 'none',
+        withdraw: { root: withdrawalRoot }
+      })
+      return (await published)?.withdrawn === true
+    }
+    return this.takeBackLaunchPane(pane, current, withdrawalRoot)
   }
 
-  private async takeBackLaunchPane(pane: AgentLaunchPaneAddress): Promise<void> {
+  private async takeBackLaunchPane(
+    pane: AgentLaunchPaneAddress,
+    current: () => boolean,
+    captured: string
+  ): Promise<boolean> {
     const { worktreeId: workspace, tabId, leafId } = pane
-    const reply = await this.applyLayoutCommand({ type: 'closePane', workspace, tabId, leafId })
+    const read = () => this.getWorkspaceSessionForWorktree(workspace)
+    const admit = () => {
+      const session = read()
+      const root = session?.terminalLayoutsByTabId?.[tabId]?.root
+      return (
+        current() &&
+        root?.type === 'leaf' &&
+        root.leafId === leafId &&
+        this.launchWithdrawalIdentity(workspace, tabId) === captured &&
+        !this.hasLiveTerminalForPaneKey(`${tabId}:${leafId}`) &&
+        !session?.terminalPtyIncarnationsByPaneKey?.[`${tabId}:${leafId}`]
+      )
+    }
+    const reply = await this.applyLayoutCommand(
+      { type: 'closePane', workspace, tabId, leafId },
+      { admit }
+    )
     // A pane close keeps a tab's last pane; that pane goes with its tab.
     if (!reply.ok && reply.code === 'last_pane') {
-      await this.applyLayoutCommand({
-        type: 'closeTabs',
-        workspace,
-        tabIds: [tabId],
-        recordClose: 'cleanup'
-      })
+      const closed = await this.applyLayoutCommand(
+        {
+          type: 'closeTabs',
+          workspace,
+          tabIds: [tabId],
+          recordClose: 'cleanup'
+        },
+        { admit }
+      )
+      return closed.ok
     }
+    return reply.ok
   }
 }
diff --git a/src/main/runtime/session-tabs/structured-session-launch-runtime.ts b/src/main/runtime/session-tabs/structured-session-launch-runtime.ts
new file mode 100644
index 000000000000..c1bfae7f1ff7
--- /dev/null
+++ b/src/main/runtime/session-tabs/structured-session-launch-runtime.ts
@@ -0,0 +1,152 @@
+import { OrcaRuntimeWithGetStructuredAgentSessionCreateSupport } from './structured-session-create-support'
+import type { RuntimeRepoSearchRefs } from '../../../shared/runtime-types'
+import { DEFAULT_REPO_SEARCH_REFS_LIMIT } from '../orca-runtime-postlude'
+import type { Repo } from '../../../shared/repo-types'
+import type { GitAdmissionTier } from '../../git/command-runner/git-exec-options'
+import {
+  getLocalProjectGhExecOptions,
+  type LocalProjectGhExecOptions
+} from '../../project-runtime-git-options'
+import {
+  agentLaunchPlatformForScope,
+  newWorktreeLaunchScope,
+  resolveAgentLaunchRuntime,
+  resolveStartupAgentLaunchRuntime
+} from '../agent-launch-scope-runtime'
+import type { TuiAgent } from '../../../shared/tui-agent'
+import type { AgentLaunchRuntime } from '../../../shared/agent-launch-runtime'
+import type { TerminalWorkspaceLaunchScope } from '../runtime-legacy-worker-terminal-recovery-types'
+import { parseAppSshPtyId } from '../../../shared/ssh-pty-id'
+import type {
+  PtyProcessInspection,
+  PtyProcessInspectionOptions
+} from '../../providers/pty-process-inspection'
+
+export abstract class OrcaRuntimeWithStructuredSessionLaunchRuntime extends OrcaRuntimeWithGetStructuredAgentSessionCreateSupport {
+  async closeSwitchedSourceTerminal(
+    terminal: string,
+    expectedIncarnationId: string,
+    condition: { token: string; remainingMs: number }
+  ): Promise<boolean> {
+    const leaf = this.resolveLiveLeafForHandle(terminal)
+    if (!leaf?.ptyId || !this.ptyController?.killFenced) {
+      return false
+    }
+    const result = await this.ptyController.killFenced({
+      id: leaf.ptyId,
+      expectedIncarnationId,
+      requireNoAgentOwner: true,
+      requireUnattached: false,
+      switchCondition: condition
+    })
+    return result.outcome === 'ended' || result.outcome === 'already_exited'
+  }
+
+  async inspectTerminalProcess(
+    terminalSelector: string,
+    options?: PtyProcessInspectionOptions
+  ): Promise<PtyProcessInspection> {
+    const leaf = this.resolveLiveLeafForHandle(terminalSelector)
+    if (!leaf?.ptyId || !this.ptyController) {
+      throw new Error('terminal_gone')
+    }
+    if (this.ptyController.inspectProcess) {
+      // Preserve one-argument unfenced calls; providers may use arity to select legacy versus fenced inspection.
+      const inspection =
+        options === undefined
+          ? await this.ptyController.inspectProcess(leaf.ptyId)
+          : await this.ptyController.inspectProcess(leaf.ptyId, options)
+      const evidence = inspection.foregroundProcessEvidence
+      // The runtime handle is the request identity on this wire; keep the
+      // host-owned leaf PTY id out of the client-facing comparison.
+      const relayPtyId = parseAppSshPtyId(leaf.ptyId)?.relayPtyId
+      const evidenceBelongsToLeaf =
+        evidence !== undefined && (evidence.ptyId === leaf.ptyId || evidence.ptyId === relayPtyId)
+      return evidenceBelongsToLeaf
+        ? { ...inspection, foregroundProcessEvidence: { ...evidence, ptyId: terminalSelector } }
+        : inspection
+    }
+    const foregroundProcess = await this.ptyController.getForegroundProcess(leaf.ptyId)
+    const hasChildProcesses = (await this.ptyController.hasChildProcesses?.(leaf.ptyId)) ?? false
+    return { foregroundProcess, hasChildProcesses }
+  }
+
+  async searchRepoRefs(
+    repoSelector: string,
+    query: string,
+    limit = DEFAULT_REPO_SEARCH_REFS_LIMIT,
+    includeQualifiedRefs = true
+  ): Promise<RuntimeRepoSearchRefs> {
+    return this.repositoryRefQueries.search(repoSelector, query, limit, includeQualifiedRefs)
+  }
+
+  protected async resolveHostedReviewTarget(args: {
+    repoSelector: string
+    worktreeSelector?: string
+  }): Promise<{ repo: Repo; repoPath: string }> {
+    const repo = await this.resolveRepoSelector(args.repoSelector)
+    if (!args.worktreeSelector) {
+      return { repo, repoPath: repo.path }
+    }
+
+    const worktree = await this.resolveWorktreeSelector(args.worktreeSelector)
+    if (worktree.repoId !== repo.id) {
+      throw new Error('Access denied: worktree does not belong to repository')
+    }
+    return { repo, repoPath: worktree.path }
+  }
+
+  protected getHostedReviewExecutionOptions(
+    repo: Repo,
+    admissionTier?: GitAdmissionTier
+  ):
+    | { localGitExecOptions: LocalProjectGhExecOptions & { admissionTier?: GitAdmissionTier } }
+    | undefined {
+    const localGitOptions = {
+      ...this.getLocalGitExecutionOptionArgs(repo)[0],
+      ...(admissionTier && { admissionTier })
+    }
+    return Object.keys(localGitOptions).length > 0
+      ? { localGitExecOptions: localGitOptions }
+      : undefined
+  }
+
+  protected getLocalGitExecutionOptionArgs(repo: Repo): [] | [LocalProjectGhExecOptions] {
+    const localGitOptions = getLocalProjectGhExecOptions(this.requireStore(), repo)
+    return Object.keys(localGitOptions).length > 0 ? [localGitOptions] : []
+  }
+
+  protected getAgentLaunchPlatformForWorkspace(
+    scope: Pick<TerminalWorkspaceLaunchScope, 'repo' | 'path'> & {
+      connectionId?: string | null
+    }
+  ): NodeJS.Platform {
+    // Orchestration passes a repo-only scope; the platform never reads its id or folder.
+    return agentLaunchPlatformForScope(this.requireStore(), {
+      id: '',
+      folderWorkspace: null,
+      ...scope,
+      connectionId: scope.connectionId ?? null
+    })
+  }
+
+  protected resolveAgentLaunchRuntime(
+    scope: TerminalWorkspaceLaunchScope,
+    agent: TuiAgent | undefined
+  ): AgentLaunchRuntime {
+    return resolveAgentLaunchRuntime(this.requireStore(), scope, undefined, agent)
+  }
+
+  protected resolveStartupAgentLaunchRuntime(
+    repo: Repo,
+    agent: TuiAgent,
+    scope?: TerminalWorkspaceLaunchScope
+  ): ReturnType<typeof resolveStartupAgentLaunchRuntime> {
+    const store = this.requireStore()
+    return resolveStartupAgentLaunchRuntime(
+      store,
+      scope ?? newWorktreeLaunchScope(repo, store.getSettings()),
+      agent
+    )
+  }
+}
diff --git a/src/main/runtime/session-tabs/structured-session-switch-projection.ts b/src/main/runtime/session-tabs/structured-session-switch-projection.ts
new file mode 100644
index 000000000000..dfc88935e55e
--- /dev/null
+++ b/src/main/runtime/session-tabs/structured-session-switch-projection.ts
@@ -0,0 +1,188 @@
+import { getStructuredAgentSessionHost } from '../../native-chat/agent-session-wire/structured-agent-session-registry'
+
+import { retireStructuredAgentSessionTabFrom } from '../agent-session/structured-agent-session-tab-retirement'
+import type { ChatTabChange } from '../agent-session/agent-session-tab-layout'
+import { createChatTabLayoutQueue } from '../agent-session-tab-layout-queue'
+import type { LayoutCommandRunOptions, WindowLayoutCommand } from '../runtime-layout-apply'
+import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../shared/layout-owner-switch'
+import type { LayoutApplyReply } from '../../../shared/workspace-layout/workspace-layout-command-types'
+
+import type { SessionSwitchProjection } from '../../../shared/agent-session-switch-execution'
+import { OrcaRuntimeWithCloseMobileSessionTab } from '../session-lifecycle/close/close-mobile-session-tab'
+
+import { loadChatTabLayout } from '../agent-session/agent-session-tab-layout'
+
+export abstract class OrcaRuntimeWithStructuredSessionSwitchProjection extends OrcaRuntimeWithCloseMobileSessionTab {
+  protected abstract changeWindowlessChatTabs(
+    worktreeId: string,
+    changes: readonly ChatTabChange[]
+  ): void
+  retainSessionSwitchProjection(
+    worktreeId: string,
+    sessionId: string,
+    invocationId: string,
+    generation: string
+  ): void {
+    const snapshot = this.mobileSessionTabsByWorktree.get(worktreeId)
+    if (!snapshot) {
+      return
+    }
+    const next = this.storeMobileSessionSnapshot(worktreeId, {
+      ...snapshot,
+      snapshotVersion: snapshot.snapshotVersion + 1,
+      switchProjections: [
+        ...(snapshot.switchProjections ?? []).filter((item) => item.sessionId !== sessionId),
+        {
+          sessionId,
+          invocationId,
+          generation,
+          tabId: `agent-session:${sessionId}`,
+          phase: 'retain'
+        }
+      ]
+    })
+    this.emitMobileSessionTabsSnapshot(next)
+  }
+
+  convergeSessionSwitchProjection(worktreeId: string, generation: string): void {
+    const snapshot = this.mobileSessionTabsByWorktree.get(worktreeId)
+    if (!snapshot?.switchProjections?.some((item) => item.generation === generation)) {
+      return
+    }
+    const next = this.storeMobileSessionSnapshot(worktreeId, {
+      ...snapshot,
+      snapshotVersion: snapshot.snapshotVersion + 1,
+      switchProjections: snapshot.switchProjections.filter((item) => item.generation !== generation)
+    })
+    this.emitMobileSessionTabsSnapshot(next)
+  }
+
+  captureSessionSwitchRetirement(
+    worktreeId: string,
+    sessionId: string,
+    tabId: string | undefined,
+    workCurrent: () => boolean,
+    restore: () => Promise<void>,
+    projection?: SessionSwitchProjection
+  ) {
+    const read = () => {
+      const session = this.getWorkspaceSessionForWorktree(worktreeId)
+      const workspace =
+        session &&
+        loadChatTabLayout(
+          this.getWorkspaceSessionHostIdForWorktree(worktreeId),
+          session,
+          worktreeId
+        ).loaded.layout.workspaces[worktreeId]
+      const tab = workspace?.tabs.find(
+        (row) => row.id === tabId && row.kind === 'agent-session' && row.entityId === sessionId
+      )
+      const group = workspace?.groups.find((row) => row.tabOrder.includes(tabId ?? ''))
+      return tab && group
+        ? { tab, group: group.id, before: group.tabOrder.slice(0, group.tabOrder.indexOf(tab.id)) }
+        : null
+    }
+    const captured = JSON.stringify(read())
+    const presentationCurrent = () =>
+      captured === 'null' ? windowAvailable && viewerSupported : JSON.stringify(read()) === captured
+    const announce = (phase: 'prepare' | 'retire' | 'retain') => {
+      const snapshot = this.mobileSessionTabsByWorktree.get(worktreeId)
+      if (!snapshot || !projection) {
+        return
+      }
+      const next = this.storeMobileSessionSnapshot(worktreeId, {
+        ...snapshot,
+        snapshotVersion: snapshot.snapshotVersion + 1,
+        switchProjections: [
+          ...(snapshot.switchProjections ?? []).filter((item) => item.sessionId !== sessionId),
+          { ...projection, phase }
+        ]
+      })
+      this.emitMobileSessionTabsSnapshot(next)
+    }
+    announce('prepare')
+    const windowAvailable = Boolean(this.getAvailableAuthoritativeWindow())
+    const viewerSupported = !windowAvailable || this.supportsConditionalSwitchProjection()
+    const capturedWindow =
+      viewerSupported && projection && tabId && windowAvailable
+        ? Promise.resolve(
+            this.notifier?.closeSessionTab?.(tabId, worktreeId, { ...projection, phase: 'prepare' })
+          ).catch(() => false)
+        : undefined
+    return async () => {
+      const host = getStructuredAgentSessionHost()
+      if (!host || !tabId) {
+        return false
+      }
+      if (!viewerSupported) {
+        await restore()
+        return false
+      }
+      const admit = () => workCurrent() && presentationCurrent()
+      if (capturedWindow && (await capturedWindow) !== true) {
+        await restore()
+        return false
+      }
+      if (!admit()) {
+        await restore()
+        return false
+      }
+      if (
+        !(await host.deps.store.setSwitchedSessionTabVisibility(sessionId, tabId, false, admit))
+      ) {
+        await restore()
+        return false
+      }
+      if (
+        windowAvailable &&
+        projection &&
+        (await this.notifier?.closeSessionTab?.(tabId, worktreeId, {
+          ...projection,
+          phase: 'retire'
+        })) !== true
+      ) {
+        await restore()
+        return false
+      }
+      const closed = ORCA_LAYOUT_OWNER_IS_MAIN
+        ? await this.queueChatTabChanges(
+            () => [{ worktreeId, change: { close: sessionId } }],
+            admit
+          )
+        : windowAvailable
+          ? admit()
+          : admit() && (this.changeWindowlessChatTabs(worktreeId, [{ close: sessionId }]), true)
+      if (!closed || !workCurrent()) {
+        await restore()
+        return false
+      }
+      const snapshot = this.mobileSessionTabsByWorktree.get(worktreeId)
+      if (!workCurrent()) {
+        await restore()
+        return false
+      }
+      if (
+        !snapshot?.tabs.some((tab) => tab.type === 'agent-session' && tab.sessionId === sessionId)
+      ) {
+        return false
+      }
+      const next = retireStructuredAgentSessionTabFrom(snapshot, sessionId)
+      if (next) {
+        this.storeMobileSessionSnapshot(worktreeId, next)
+        this.emitMobileSessionTabsSnapshot(next)
+      }
+      announce('retire')
+      return true
+    }
+  }
+
+  abstract applyLayoutCommand(
+    command: WindowLayoutCommand,
+    options?: LayoutCommandRunOptions
+  ): Promise<LayoutApplyReply>
+  protected readonly queueChatTabChanges = createChatTabLayoutQueue({
+    sessionOf: (worktreeId) => this.getWorkspaceSessionForWorktree(worktreeId),
+    hostIdOf: (worktreeId) => this.getWorkspaceSessionHostIdForWorktree(worktreeId),
+    apply: (command, options) => this.applyLayoutCommand(command, options)
+  })
+}
diff --git a/src/main/runtime/session-tabs/structured-session-tab-close.ts b/src/main/runtime/session-tabs/structured-session-tab-close.ts
index 27a94a5a46e2..2811ad88c26c 100644
--- a/src/main/runtime/session-tabs/structured-session-tab-close.ts
+++ b/src/main/runtime/session-tabs/structured-session-tab-close.ts
@@ -1,6 +1,5 @@
 import type { OrcaRuntimeWithPruneMobileSessionTabGroupLayout as PruneMobileSessionTabGroupLayoutMethods } from '../session-lifecycle/projection/prune-mobile-session-tab-group-layout'
 import type { RuntimeHeadlessTabGroups as HeadlessTabGroupsMethods } from './headless-tab-group-moves'
-import { OrcaRuntimeWithCloseMobileSessionTab } from '../session-lifecycle/close/close-mobile-session-tab'
 import type {
   BrowserTabInfo,
   RuntimeMobileSessionAgentTab,
@@ -23,16 +22,14 @@ import {
   type ChatTabChange,
   type ChatTabPlacement
 } from '../agent-session/agent-session-tab-layout'
-import { createChatTabLayoutQueue } from '../agent-session-tab-layout-queue'
-import type { WindowLayoutCommand } from '../runtime-layout-apply'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../shared/layout-owner-switch'
-import type { LayoutApplyReply } from '../../../shared/workspace-layout/workspace-layout-command-types'
 import { savedSessionId } from '../saved-structured-agent-session-restoration'
 import { LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host'
 import { structuredSessionTabRetired } from '../structured-worker-custody'
 import type { StructuredAgentId } from '../../../shared/agent-session-provider-handle'
+import { OrcaRuntimeWithStructuredSessionSwitchProjection } from './structured-session-switch-projection'
 
-export abstract class OrcaRuntimeWithCloseStructuredAgentSessionTab extends OrcaRuntimeWithCloseMobileSessionTab {
+export abstract class OrcaRuntimeWithCloseStructuredAgentSessionTab extends OrcaRuntimeWithStructuredSessionSwitchProjection {
   protected abstract getListedBrowserTabsByPageId(worktreeId: string): Map<string, BrowserTabInfo>
   protected abstract getMobileTerminalLeafPtyIds(
     ...args: Parameters<PruneMobileSessionTabGroupLayoutMethods['getMobileTerminalLeafPtyIds']>
@@ -42,8 +39,6 @@ export abstract class OrcaRuntimeWithCloseStructuredAgentSessionTab extends Orca
     ...args: Parameters<PruneMobileSessionTabGroupLayoutMethods['getMobileTerminalPaneKey']>
   ): ReturnType<PruneMobileSessionTabGroupLayoutMethods['getMobileTerminalPaneKey']>
 
-  abstract applyLayoutCommand(command: WindowLayoutCommand): Promise<LayoutApplyReply>
-
   protected abstract persistHeadlessTabGroups(
     ...args: Parameters<HeadlessTabGroupsMethods['persistHeadlessTabGroups']>
   ): ReturnType<HeadlessTabGroupsMethods['persistHeadlessTabGroups']>
@@ -86,6 +81,13 @@ export abstract class OrcaRuntimeWithCloseStructuredAgentSessionTab extends Orca
     return false
   }
 
+  abstract publishStructuredAgentSessionTab(input: {
+    workspaceId: string
+    sessionId: string
+    agent: StructuredAgentId
+    activate: boolean
+  }): Promise<void>
+
   // Refused echo closes need a newer snapshot so clients restore the still-live mirror they already pruned.
   protected republishMobileSessionTabsSnapshot(worktreeId: string): void {
     const snapshot = this.mobileSessionTabsByWorktree.get(worktreeId)
@@ -320,10 +322,4 @@ export abstract class OrcaRuntimeWithCloseStructuredAgentSessionTab extends Orca
       this.setWorkspaceSessionForWorktree(worktreeId, next)
     }
   }
-
-  private readonly queueChatTabChanges = createChatTabLayoutQueue({
-    sessionOf: (worktreeId) => this.getWorkspaceSessionForWorktree(worktreeId),
-    hostIdOf: (worktreeId) => this.getWorkspaceSessionHostIdForWorktree(worktreeId),
-    apply: (command) => this.applyLayoutCommand(command)
-  })
 }
diff --git a/src/main/runtime/session-tabs/structured-session-tab-restoration.ts b/src/main/runtime/session-tabs/structured-session-tab-restoration.ts
index fe27452ef4cf..dc2fd246b9d8 100644
--- a/src/main/runtime/session-tabs/structured-session-tab-restoration.ts
+++ b/src/main/runtime/session-tabs/structured-session-tab-restoration.ts
@@ -1,6 +1,5 @@
 import type { OrcaRuntimeWithScheduleMobileSessionTabsChanged as ScheduleMobileSessionTabsChangedMethods } from './session-tabs-change-publication'
 import { defaultAgentChatLabel } from '../../../shared/agent-session/agent-session-chat-label'
-import { OrcaRuntimeWithGetStructuredAgentSessionCreateSupport } from './structured-session-create-support'
 import { getStructuredAgentSessionHost } from '../../native-chat/agent-session-wire/structured-agent-session-registry'
 import { collectSavedStructuredAgentSessionIds } from '../saved-structured-agent-session-restoration'
 import { LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host'
@@ -9,35 +8,17 @@ import { restoredChatTabChanges } from './restored-chat-tab-changes'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../shared/layout-owner-switch'
 import type {
   RuntimeMobileSessionAgentTab,
-  RuntimeMobileSessionTabsSnapshot,
-  RuntimeRepoSearchRefs
+  RuntimeMobileSessionTabsSnapshot
 } from '../../../shared/runtime-types'
 import { getHeadlessMobileSessionGroupId } from '../mobile-session-layout-projection'
-import { DEFAULT_REPO_SEARCH_REFS_LIMIT } from '../orca-runtime-postlude'
-import type { Repo } from '../../../shared/repo-types'
-import type { GitAdmissionTier } from '../../git/command-runner/git-exec-options'
-import {
-  getLocalProjectGhExecOptions,
-  type LocalProjectGhExecOptions
-} from '../../project-runtime-git-options'
-import {
-  agentLaunchPlatformForScope,
-  newWorktreeLaunchScope,
-  resolveAgentLaunchRuntime,
-  resolveStartupAgentLaunchRuntime
-} from '../agent-launch-scope-runtime'
-import type { TuiAgent } from '../../../shared/tui-agent'
-import type { AgentLaunchRuntime } from '../../../shared/agent-launch-runtime'
-import type { TerminalWorkspaceLaunchScope } from '../runtime-legacy-worker-terminal-recovery-types'
-import { parseAppSshPtyId } from '../../../shared/ssh-pty-id'
-import type { PtyProcessInspection } from '../../providers/pty-process-inspection'
 import type { StructuredAgentId } from '../../../shared/agent-session-provider-handle'
+import { OrcaRuntimeWithStructuredSessionLaunchRuntime } from './structured-session-launch-runtime'
 
 export type AgentLaunchScope = Parameters<
   OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce['getAgentLaunchPlatformForWorkspace']
 >[0]
 
-export abstract class OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce extends OrcaRuntimeWithGetStructuredAgentSessionCreateSupport {
+export abstract class OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce extends OrcaRuntimeWithStructuredSessionLaunchRuntime {
   protected abstract notifyMobileSessionTabSnapshots(
     ...args: Parameters<ScheduleMobileSessionTabsChangedMethods['notifyMobileSessionTabSnapshots']>
   ): ReturnType<ScheduleMobileSessionTabsChangedMethods['notifyMobileSessionTabSnapshots']>
@@ -100,6 +81,7 @@ export abstract class OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce exten
     sessionId: string
     agent: StructuredAgentId
     activate: boolean
+    check?: () => void
     notify?: boolean
     /** The host tab id a create reserved; a session that already has a tab keeps its own. */
     tabId?: string
@@ -110,7 +92,10 @@ export abstract class OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce exten
     placement?: { groupId?: string; afterTabId?: string }
   }): Promise<void> {
     const host = getStructuredAgentSessionHost()
-    if (typeof host?.setSessionTabVisibility === 'function') {
+    input.check?.()
+    if (input.check && host) {
+      await host.deps.store.setSessionTabVisibility(input.sessionId, true, input.tabId, input.check)
+    } else if (typeof host?.setSessionTabVisibility === 'function') {
       // Restore-index failures (newer records/disk errors) are reported without preventing tab open.
       await host
         .setSessionTabVisibility(input.sessionId, true, ...(input.tabId ? [input.tabId] : []))
@@ -123,9 +108,28 @@ export abstract class OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce exten
         })
     }
     // Window creates retain the window's own placement decision.
-    if (!(ORCA_LAYOUT_OWNER_IS_MAIN && input.placedByWindow)) {
+    input.check?.()
+    if (input.check && (ORCA_LAYOUT_OWNER_IS_MAIN || !this.getAvailableAuthoritativeWindow())) {
+      const check = input.check
+      const applied = await this.queueChatTabChanges(
+        () => [
+          {
+            worktreeId: input.workspaceId,
+            change: { open: { ...input, tabId: input.tabId ?? `agent-session:${input.sessionId}` } }
+          }
+        ],
+        () => {
+          check()
+          return true
+        }
+      )
+      if (!applied) {
+        throw new Error('tab_not_found')
+      }
+    } else if (!(ORCA_LAYOUT_OWNER_IS_MAIN && input.placedByWindow)) {
       this.saveWindowlessAgentSessionTab(input.workspaceId, input)
     }
+    input.check?.()
     this.projectStructuredAgentSessionTab(input)
   }
 
@@ -220,112 +224,5 @@ export abstract class OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce exten
     }
   }
 
-  async inspectTerminalProcess(
-    terminalSelector: string,
-    options?: { expectedIncarnationId?: string; scanChildProcesses?: boolean }
-  ): Promise<PtyProcessInspection> {
-    const leaf = this.resolveLiveLeafForHandle(terminalSelector)
-    if (!leaf?.ptyId || !this.ptyController) {
-      throw new Error('terminal_gone')
-    }
-    if (this.ptyController.inspectProcess) {
-      // Preserve one-argument unfenced calls; providers may use arity to select legacy versus fenced inspection.
-      const inspection =
-        options === undefined
-          ? await this.ptyController.inspectProcess(leaf.ptyId)
-          : await this.ptyController.inspectProcess(leaf.ptyId, options)
-      const evidence = inspection.foregroundProcessEvidence
-      // The runtime handle is the request identity on this wire; keep the
-      // host-owned leaf PTY id out of the client-facing comparison.
-      const relayPtyId = parseAppSshPtyId(leaf.ptyId)?.relayPtyId
-      const evidenceBelongsToLeaf =
-        evidence !== undefined && (evidence.ptyId === leaf.ptyId || evidence.ptyId === relayPtyId)
-      return evidenceBelongsToLeaf
-        ? { ...inspection, foregroundProcessEvidence: { ...evidence, ptyId: terminalSelector } }
-        : inspection
-    }
-    const foregroundProcess = await this.ptyController.getForegroundProcess(leaf.ptyId)
-    const hasChildProcesses = (await this.ptyController.hasChildProcesses?.(leaf.ptyId)) ?? false
-    return { foregroundProcess, hasChildProcesses }
-  }
-
-  async searchRepoRefs(
-    repoSelector: string,
-    query: string,
-    limit = DEFAULT_REPO_SEARCH_REFS_LIMIT,
-    includeQualifiedRefs = true
-  ): Promise<RuntimeRepoSearchRefs> {
-    return this.repositoryRefQueries.search(repoSelector, query, limit, includeQualifiedRefs)
-  }
-
-  protected async resolveHostedReviewTarget(args: {
-    repoSelector: string
-    worktreeSelector?: string
-  }): Promise<{ repo: Repo; repoPath: string }> {
-    const repo = await this.resolveRepoSelector(args.repoSelector)
-    if (!args.worktreeSelector) {
-      return { repo, repoPath: repo.path }
-    }
-
-    const worktree = await this.resolveWorktreeSelector(args.worktreeSelector)
-    if (worktree.repoId !== repo.id) {
-      throw new Error('Access denied: worktree does not belong to repository')
-    }
-    return { repo, repoPath: worktree.path }
-  }
-
-  protected getHostedReviewExecutionOptions(
-    repo: Repo,
-    admissionTier?: GitAdmissionTier
-  ):
-    | { localGitExecOptions: LocalProjectGhExecOptions & { admissionTier?: GitAdmissionTier } }
-    | undefined {
-    const localGitOptions = {
-      ...this.getLocalGitExecutionOptionArgs(repo)[0],
-      ...(admissionTier && { admissionTier })
-    }
-    return Object.keys(localGitOptions).length > 0
-      ? { localGitExecOptions: localGitOptions }
-      : undefined
-  }
-
-  protected getLocalGitExecutionOptionArgs(repo: Repo): [] | [LocalProjectGhExecOptions] {
-    const localGitOptions = getLocalProjectGhExecOptions(this.requireStore(), repo)
-    return Object.keys(localGitOptions).length > 0 ? [localGitOptions] : []
-  }
-
-  protected getAgentLaunchPlatformForWorkspace(
-    scope: Pick<TerminalWorkspaceLaunchScope, 'repo' | 'path'> & {
-      connectionId?: string | null
-    }
-  ): NodeJS.Platform {
-    // Orchestration passes a repo-only scope; the platform never reads its id or folder.
-    return agentLaunchPlatformForScope(this.requireStore(), {
-      id: '',
-      folderWorkspace: null,
-      ...scope,
-      connectionId: scope.connectionId ?? null
-    })
-  }
-
-  protected resolveAgentLaunchRuntime(
-    scope: TerminalWorkspaceLaunchScope,
-    agent: TuiAgent | undefined
-  ): AgentLaunchRuntime {
-    return resolveAgentLaunchRuntime(this.requireStore(), scope, undefined, agent)
-  }
-
   /** A startup's fact: the workspace it starts in, else the new worktree a create is making. */
-  protected resolveStartupAgentLaunchRuntime(
-    repo: Repo,
-    agent: TuiAgent,
-    scope?: TerminalWorkspaceLaunchScope
-  ): ReturnType<typeof resolveStartupAgentLaunchRuntime> {
-    const store = this.requireStore()
-    return resolveStartupAgentLaunchRuntime(
-      store,
-      scope ?? newWorktreeLaunchScope(repo, store.getSettings()),
-      agent
-    )
-  }
 }
diff --git a/src/main/runtime/session-tabs/structured-session-terminal-launch-retirement.ts b/src/main/runtime/session-tabs/structured-session-terminal-launch-retirement.ts
index 4d133cc7265f..98fd74893e0b 100644
--- a/src/main/runtime/session-tabs/structured-session-terminal-launch-retirement.ts
+++ b/src/main/runtime/session-tabs/structured-session-terminal-launch-retirement.ts
@@ -32,6 +32,9 @@ export async function retireChatForAdmittedTerminalLaunch(
     (holding) => holding.role === 'head' && keysMayMatch(holding.key, key)
   )
   for (const holding of holders) {
+    if (host.switchExecuting(holding.sessionId)) {
+      continue
+    }
     const record = host.deps.store.getRecord(holding.sessionId)
     if (
       record?.location.executionHostId !== LOCAL_EXECUTION_HOST_ID ||
diff --git a/src/main/runtime/structured-agent-cli-writers.test.ts b/src/main/runtime/structured-agent-cli-writers.test.ts
index d39ca3493b6c..ba5f335bae66 100644
--- a/src/main/runtime/structured-agent-cli-writers.test.ts
+++ b/src/main/runtime/structured-agent-cli-writers.test.ts
@@ -516,3 +516,29 @@ describe('execution-host conversation writer inspection', () => {
     await expect(check('opencode')).resolves.toBeUndefined()
   })
 })
+
+it.each(['claude', 'codex'] as const)(
+  'distinguishes an addressed %s source with an opaque inspection from another writer without claiming a live job',
+  async (agent) => {
+    const check = inspection('unverifiable')
+    check.host.shellAlone = vi.fn(async () => false)
+    await expect(
+      assertCliConversationWritersExited(check.host, agent, 'conversation', {
+        paneKey: 'source',
+        worktreeId: 'workspace'
+      })
+    ).rejects.toMatchObject({
+      refusal: {
+        code: 'agent_session_conflict',
+        details: { reason: 'conversationHeldElsewhere', source: true }
+      }
+    })
+    const other = inspection('unverifiable')
+    await expect(other.run()).rejects.toMatchObject(refusal)
+    try {
+      await other.run()
+    } catch (error) {
+      expect(error).not.toMatchObject({ refusal: { details: { source: true } } })
+    }
+  }
+)
diff --git a/src/main/runtime/structured-agent-cli-writers.ts b/src/main/runtime/structured-agent-cli-writers.ts
index 7435c86085ff..0efd58fc5058 100644
--- a/src/main/runtime/structured-agent-cli-writers.ts
+++ b/src/main/runtime/structured-agent-cli-writers.ts
@@ -5,7 +5,10 @@ import {
   chatAgentsShareConversations,
   CLI_CONVERSATION_ADOPTING_AGENTS
 } from '../../shared/structured-agent-cli-conversation-adoption'
-import { agentSessionRefusalError } from '../../shared/agent-session-wire-refusals'
+import {
+  agentSessionRefusalError,
+  isAgentSessionRefusalError
+} from '../../shared/agent-session-wire-refusals'
 import type { CliWriterObservation } from '../agent-hooks/server/cli-writer-observation'
 import { getFreshShellForegroundSnapshot } from '../../shared/process-table-snapshot-reader'
 import { collectDescendantsFromIndex, getProcessTableIndex } from '../../shared/process-table-index'
@@ -100,7 +103,14 @@ export async function assertCliConversationWritersExited(
   }
   try {
     if (source) {
-      await censusPane(() => host.terminal(source), source.worktreeId, true)
+      try {
+        await censusPane(() => host.terminal(source), source.worktreeId, true)
+      } catch {
+        throw agentSessionRefusalError('agent_session_conflict', {
+          reason: 'conversationHeldElsewhere',
+          source: true
+        })
+      }
     }
     const savedCandidates = () =>
       host
@@ -248,7 +258,10 @@ export async function assertCliConversationWritersExited(
     ) {
       throw refuse()
     }
-  } catch {
+  } catch (error) {
+    if (isAgentSessionRefusalError(error)) {
+      throw error
+    }
     throw refuse()
   }
 }
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-create-options.ts b/src/main/runtime/terminal/launch/mobile-terminal-create-options.ts
new file mode 100644
index 000000000000..e9b2b3c59426
--- /dev/null
+++ b/src/main/runtime/terminal/launch/mobile-terminal-create-options.ts
@@ -0,0 +1,48 @@
+import type { AgentSessionSwitchAuthority } from '../../../../shared/agent-session-switch-execution'
+import type { AgentLaunchRuntime } from '../../../../shared/agent-launch-runtime'
+import type { AgentLaunchTabViewerRule } from '../../../../shared/agent-launch-tab-publication'
+import type { WorktreeStartupLaunch } from '../../../../shared/worktree/launch-types'
+import type { TuiAgent } from '../../../../shared/tui-agent'
+import type {
+  AgentProviderSessionMetadata,
+  SleepingAgentLaunchConfig
+} from '../../../../shared/agent-session-resume'
+
+export type MobileTerminalCreateOptions = {
+  terminalImageViewerSupported?: boolean
+  afterTabId?: string
+  sourceChatFork?: { sessionId: string }
+  targetGroupId?: string
+  command?: string
+  sessionOptions?: Record<string, string>
+  commandOverride?: string
+  launchRuntime?: AgentLaunchRuntime
+  shellOverride?: string
+  cwd?: string
+  env?: Record<string, string>
+  envToDelete?: string[]
+  startupCommandDelivery?: WorktreeStartupLaunch['startupCommandDelivery']
+  agent?: TuiAgent
+  agentPrompt?: string
+  launchConfig?: SleepingAgentLaunchConfig
+  launchAgent?: TuiAgent
+  /** A switch's start: its ordinary spawn admission checks the conversation. */
+  resumeProviderSession?: AgentProviderSessionMetadata
+  resumeOrigin?: 'switch'
+  viewMode?: 'terminal' | 'chat'
+  activate?: boolean
+  clientNavigationId?: string
+  clientMutationId?: string
+  supportsSplitGroupPlacement?: boolean
+  signal?: AbortSignal
+  switchExecution?: AgentSessionSwitchAuthority & {
+    afterTabId?: string
+    shown?: (pane: {
+      workspaceId: string
+      tabId: string
+      leafId: string
+      placement?: { groupId?: string; afterTabId?: string }
+    }) => Promise<void>
+    viewer: AgentLaunchTabViewerRule
+  }
+}
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-create-owner.ts b/src/main/runtime/terminal/launch/mobile-terminal-create-owner.ts
new file mode 100644
index 000000000000..f6eb84baca3a
--- /dev/null
+++ b/src/main/runtime/terminal/launch/mobile-terminal-create-owner.ts
@@ -0,0 +1,76 @@
+import type {
+  AgentLaunchTabPublishRequest,
+  AgentLaunchTabPublished
+} from '../../../../shared/agent-launch-tab-publication'
+import type {
+  AgentLaunchPaneAddress,
+  AgentLaunchPaneVerdict
+} from '../../../../shared/agent-launch-pane-verdict'
+import type { MobileTerminalCommandOptions, MobileTerminalCommand } from './mobile-terminal-startup'
+import type { RuntimePtyWorktreeRecord } from '../../runtime-terminal-state-records'
+import type { TerminalWorkspaceLaunchScope } from '../../runtime-legacy-worker-terminal-recovery-types'
+import type { RuntimeMobileSessionCreateTerminalResult } from '../../../../shared/runtime-types'
+import { OrcaRuntimeWithMobileChatForkCreate } from './mobile-terminal-chat-fork-create'
+
+export abstract class OrcaRuntimeWithMobileTerminalCreateOwner extends OrcaRuntimeWithMobileChatForkCreate {
+  abstract publishAgentLaunchTab(
+    request: Omit<AgentLaunchTabPublishRequest, 'requestId'>
+  ): Promise<AgentLaunchTabPublished> | null
+
+  abstract publishAgentLaunchTabInMainLayout(
+    request: Omit<AgentLaunchTabPublishRequest, 'requestId'>,
+    check?: () => void
+  ): Promise<AgentLaunchTabPublished> | null
+
+  abstract reportAgentLaunchPaneVerdict(
+    pane: AgentLaunchPaneAddress,
+    verdict: AgentLaunchPaneVerdict
+  ): void
+
+  abstract withdrawAgentLaunchPaneInMainLayout(
+    pane: AgentLaunchPaneAddress,
+    current?: () => boolean,
+    withdrawalRoot?: string,
+    publicationOwner?: 'main' | 'window'
+  ): Promise<boolean>
+
+  abstract hasLiveTerminalForPaneKey(paneKey: string): boolean
+
+  protected abstract resolveMobileSessionTerminalCommand(
+    workspace: TerminalWorkspaceLaunchScope,
+    opts: MobileTerminalCommandOptions
+  ): Promise<MobileTerminalCommand>
+
+  protected abstract ensurePtyBackedMobileSurfaceForRendererTab(
+    worktreeId: string,
+    tabId: string
+  ): RuntimeMobileSessionCreateTerminalResult | null
+
+  protected abstract waitForMobileTerminalSurface(
+    worktreeId: string,
+    parentTabId: string,
+    options?: { timeoutMs?: number; requireReady?: boolean; signal?: AbortSignal }
+  ): Promise<RuntimeMobileSessionCreateTerminalResult>
+
+  protected abstract isReadyMobileTerminalSurface(
+    surface: RuntimeMobileSessionCreateTerminalResult | null
+  ): boolean
+
+  protected abstract deliverPendingStartupCommandToBareRendererPty(
+    worktreeId: string,
+    tabId: string
+  ): void
+
+  protected abstract findMobileTerminalSurface(
+    worktreeId: string,
+    parentTabId: string,
+    options?: { requireReady?: boolean }
+  ): RuntimeMobileSessionCreateTerminalResult | null
+
+  protected abstract findLiveRegisteredPtyForRendererTab(
+    worktreeId: string,
+    tabId: string
+  ): RuntimePtyWorktreeRecord | null
+
+  protected abstract hasLiveShellForRendererTab(worktreeId: string, tabId: string): boolean
+}
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-create.ts b/src/main/runtime/terminal/launch/mobile-terminal-create.ts
index b96c0c4050b1..20c7aeb2ef77 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-create.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-create.ts
@@ -18,6 +18,7 @@ import type { AgentLaunchRuntime } from '../../../../shared/agent-launch-runtime
 import { navigationTargetsHost } from '../../../../shared/runtime-navigation'
 import { MOBILE_TERMINAL_CREATE_RESULT_TTL_MS } from '../../orca-runtime-core'
 import { seedResumeLaunchIdentity } from '../../../ipc/pty/pane/resume-launch-identity'
+import type { AgentSessionSwitchAuthority } from '../../../../shared/agent-session-switch-execution'
 
 export type OwnedMobileTerminalCreateOptions = {
   command?: string
@@ -39,10 +40,13 @@ export type OwnedMobileTerminalCreateOptions = {
   resumeOrigin?: 'saved' | 'switch'
   spawnIntent?: SpawnIntent
   launchRuntime?: AgentLaunchRuntime
+  switchExecution?: AgentSessionSwitchAuthority
   signal?: AbortSignal
   refuseSleptWorktree?: boolean
   resumesSleepingRecord?: true
   /** See TerminalCreateOptions; a create that throws before it proves nothing spawned. */
+  beforePtySpawn?: () => void
+  keepPaneOnStartFailure?: true
   onPtySpawnDispatched?: () => void
   /** The PTY this create produced, reported before publication can fail. */
   onPtyCreated?: (ptyId: string, result: RuntimeTerminalCreate) => void
@@ -72,6 +76,9 @@ export abstract class OrcaRuntimeWithCreateMobileSessionTerminal extends OrcaRun
       sourceChatFork?: { sessionId: string }
       targetGroupId?: string
       command?: string
+      sessionOptions?: Record<string, string>
+      commandOverride?: string
+      launchRuntime?: AgentLaunchRuntime
       shellOverride?: string
       cwd?: string
       env?: Record<string, string>
@@ -93,6 +100,7 @@ export abstract class OrcaRuntimeWithCreateMobileSessionTerminal extends OrcaRun
       // Older mobile clients optimistically append; preserve that placement until they advertise
       // split-group ordering support.
       supportsSplitGroupPlacement?: boolean
+      switchExecution?: MobileTerminalCreateOptions['switchExecution']
       signal?: AbortSignal
     } = {}
   ): Promise<RuntimeMobileSessionCreateTerminalResult> {
@@ -149,7 +157,12 @@ export abstract class OrcaRuntimeWithCreateMobileSessionTerminal extends OrcaRun
     created: RuntimeMobileSessionCreateTerminalResult,
     opts: { resumeProviderSession?: AgentProviderSessionMetadata; launchAgent?: TuiAgent }
   ): void {
-    if (!opts.resumeProviderSession || !created.tab.terminal) {
+    if (
+      created.agentResumeRefused ||
+      created.agentResumeUnavailable ||
+      !opts.resumeProviderSession ||
+      !created.tab.terminal
+    ) {
       return
     }
     const pty = this.getLivePtyForHandle(created.tab.terminal)?.pty
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts b/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
index b01df5683771..7b4695472fb1 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
@@ -7,7 +7,6 @@ import type {
   RuntimeMobileSessionTerminalTab
 } from '../../../../shared/runtime-types'
 import type { OwnedMobileTerminalCreateOptions } from './mobile-terminal-create'
-export type { OwnedMobileTerminalCreateOptions } from './mobile-terminal-create'
 import { randomUUID } from 'node:crypto'
 import { copySleepingAgentLaunchConfig } from '../../runtime-agent-launch-resolution'
 import { deriveRemoteRuntimeTerminalCreateHandle } from '../../remote-runtime-terminal-create-identity'
@@ -23,6 +22,8 @@ import {
   getHeadlessMobileSessionGroupId
 } from '../../mobile-session-layout-projection'
 
+export type { OwnedMobileTerminalCreateOptions } from './mobile-terminal-create'
+
 const OWNED_MOBILE_DISPATCH_RECIPE_TTL_MS = 15 * 60_000
 
 export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal extends OrcaRuntimeWithResolveMobileSessionTerminalCommand {
@@ -70,6 +71,9 @@ export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal ext
         focus: false,
         ...(opts.presentation ? { presentation: opts.presentation } : {}),
         ...(opts.afterDesktopTabId ? { afterTabId: opts.afterDesktopTabId } : {}),
+        beforePtySpawn: opts.beforePtySpawn,
+        switchExecution: opts.switchExecution,
+        ...(opts.keepPaneOnStartFailure ? { keepPaneOnStartFailure: true as const } : {}),
         onPtySpawnDispatched: (launch) => {
           if (mutationHandle && launch) {
             if (
@@ -170,11 +174,17 @@ export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal ext
         (!livePty.pty.launchAgent || livePty.pty.launchAgent === dispatchedRecipe.launchAgent)
           ? dispatchedRecipe
           : null
-      if (opts.launchConfig && !livePty.pty.launchConfig && !recipe?.launchConfig) {
+      if (
+        !terminal.agentResumeRefused &&
+        !terminal.agentResumeUnavailable &&
+        opts.launchConfig &&
+        !livePty.pty.launchConfig &&
+        !recipe?.launchConfig
+      ) {
         // Missing original dispatch evidence cannot authorize a retry's captured recipe.
         throw new Error('runtime_unavailable')
       }
-      if (recipe) {
+      if (recipe && !terminal.agentResumeRefused && !terminal.agentResumeUnavailable) {
         livePty.pty.launchAgent ??= recipe.launchAgent ?? null
         if (!livePty.pty.launchConfig && recipe.launchConfig) {
           livePty.pty.launchConfig = copySleepingAgentLaunchConfig(recipe.launchConfig)
@@ -185,10 +195,14 @@ export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal ext
         this.ownedMobileDispatchRecipes.delete(mutationHandle)
       }
     }
-    if (opts.createMutation && opts.identity && terminal.ptyId) {
+    if (opts.createMutation && terminal.tabId && terminal.paneKey && terminal.ptyId) {
+      const actual = parsePaneKey(terminal.paneKey)
+      if (!actual || actual.tabId !== terminal.tabId) {
+        throw new Error('terminal_handle_stale')
+      }
       this.registerPty(terminal.ptyId, worktreeId, workspace.connectionId ?? null, {
-        tabId: opts.identity.tabId,
-        leafId: opts.identity.leafId,
+        tabId: terminal.tabId,
+        leafId: actual.leafId,
         terminalHandle: terminal.handle
       })
     }
@@ -221,7 +235,9 @@ export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal ext
         ? { startupCwd: terminal.savedStartupCwd ?? cwd }
         : {}),
       ...(livePty.pty.launchAgent ? { launchAgent: livePty.pty.launchAgent } : {}),
-      ...(!terminal.agentResumeRefused && opts.viewMode ? { viewMode: opts.viewMode } : {}),
+      ...(!terminal.agentResumeRefused && !terminal.agentResumeUnavailable && opts.viewMode
+        ? { viewMode: opts.viewMode }
+        : {}),
       parentLayout,
       isActive: activate
     }
@@ -280,6 +296,9 @@ export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal ext
     }
     return {
       tab: created,
+      ...(terminal.switchOutcomeUnknown ? { switchOutcomeUnknown: true as const } : {}),
+      ...(terminal.agentResumeUnavailable ? { agentResumeUnavailable: true as const } : {}),
+      ...(terminal.agentResumeRefused ? { agentResumeRefused: true as const } : {}),
       publicationEpoch: result.publicationEpoch,
       snapshotVersion: result.snapshotVersion,
       ...(terminal.startupCwdFallback ? { startupCwdFallback: 'workspace-root' as const } : {})
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-renderer-create.ts b/src/main/runtime/terminal/launch/mobile-terminal-renderer-create.ts
index 9b54dab527d6..998054164599 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-renderer-create.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-renderer-create.ts
@@ -1,14 +1,4 @@
 import { applyRemoteViewerLaunchEnv } from '../../remote-viewer-launch-env'
-import type { MobileTerminalCommandOptions, MobileTerminalCommand } from './mobile-terminal-startup'
-import type { RuntimePtyWorktreeRecord } from '../../runtime-terminal-state-records'
-import type { TerminalWorkspaceLaunchScope } from '../../runtime-legacy-worker-terminal-recovery-types'
-import { OrcaRuntimeWithMobileChatForkCreate } from './mobile-terminal-chat-fork-create'
-import type { WorktreeStartupLaunch } from '../../../../shared/worktree/launch-types'
-import type { TuiAgent } from '../../../../shared/tui-agent'
-import type {
-  AgentProviderSessionMetadata,
-  SleepingAgentLaunchConfig
-} from '../../../../shared/agent-session-resume'
 import type { RuntimeMobileSessionCreateTerminalResult } from '../../../../shared/runtime-types'
 import { randomUUID } from 'node:crypto'
 import { getRuntimeDesktopSurface } from '../../runtime-desktop-surface'
@@ -22,72 +12,11 @@ import { rendererPublicationThrottle } from '../../../window/renderer-publicatio
 import { deterministicAgentSessionUuid } from '../../runtime-agent-launch-resolution'
 import { assertMobileTerminalShellSupported } from './mobile-terminal-shell-refusal'
 import { anchorTabOfCreate, mainPlacedAfter } from './mobile-terminal-create-anchor'
+import { createPublishedSwitchTerminal } from './mobile-terminal-switch-publication'
+import { OrcaRuntimeWithMobileTerminalCreateOwner } from './mobile-terminal-create-owner'
+import type { MobileTerminalCreateOptions } from './mobile-terminal-create-options'
 
-export type MobileTerminalCreateOptions = {
-  terminalImageViewerSupported?: boolean
-  afterTabId?: string
-  sourceChatFork?: { sessionId: string }
-  targetGroupId?: string
-  command?: string
-  shellOverride?: string
-  cwd?: string
-  env?: Record<string, string>
-  envToDelete?: string[]
-  startupCommandDelivery?: WorktreeStartupLaunch['startupCommandDelivery']
-  agent?: TuiAgent
-  agentPrompt?: string
-  launchConfig?: SleepingAgentLaunchConfig
-  launchAgent?: TuiAgent
-  /** A switch's start: its ordinary spawn admission checks the conversation. */
-  resumeProviderSession?: AgentProviderSessionMetadata
-  resumeOrigin?: 'switch'
-  viewMode?: 'terminal' | 'chat'
-  activate?: boolean
-  clientNavigationId?: string
-  clientMutationId?: string
-  supportsSplitGroupPlacement?: boolean
-  signal?: AbortSignal
-}
-
-export abstract class OrcaRuntimeWithRunCreateMobileSessionTerminal extends OrcaRuntimeWithMobileChatForkCreate {
-  protected abstract resolveMobileSessionTerminalCommand(
-    workspace: TerminalWorkspaceLaunchScope,
-    opts: MobileTerminalCommandOptions
-  ): Promise<MobileTerminalCommand>
-
-  protected abstract ensurePtyBackedMobileSurfaceForRendererTab(
-    worktreeId: string,
-    tabId: string
-  ): RuntimeMobileSessionCreateTerminalResult | null
-
-  protected abstract waitForMobileTerminalSurface(
-    worktreeId: string,
-    parentTabId: string,
-    options?: { timeoutMs?: number; requireReady?: boolean; signal?: AbortSignal }
-  ): Promise<RuntimeMobileSessionCreateTerminalResult>
-
-  protected abstract isReadyMobileTerminalSurface(
-    surface: RuntimeMobileSessionCreateTerminalResult | null
-  ): boolean
-
-  protected abstract deliverPendingStartupCommandToBareRendererPty(
-    worktreeId: string,
-    tabId: string
-  ): void
-
-  protected abstract findMobileTerminalSurface(
-    worktreeId: string,
-    parentTabId: string,
-    options?: { requireReady?: boolean }
-  ): RuntimeMobileSessionCreateTerminalResult | null
-
-  protected abstract findLiveRegisteredPtyForRendererTab(
-    worktreeId: string,
-    tabId: string
-  ): RuntimePtyWorktreeRecord | null
-
-  protected abstract hasLiveShellForRendererTab(worktreeId: string, tabId: string): boolean
-
+export abstract class OrcaRuntimeWithRunCreateMobileSessionTerminal extends OrcaRuntimeWithMobileTerminalCreateOwner {
   protected async runCreateMobileSessionTerminal(
     worktreeSelector: string,
     opts: MobileTerminalCreateOptions = {}
@@ -154,6 +83,9 @@ export abstract class OrcaRuntimeWithRunCreateMobileSessionTerminal extends Orca
       opts.resumeOrigin === 'switch'
         ? { resumeProviderSession: opts.resumeProviderSession, resumeOrigin: opts.resumeOrigin }
         : {}
+    let destinationCurrent = () => {}
+    let dispatched = false
+    let targetGroupId = opts.targetGroupId
     const createOwned = (identity?: { tabId: string; leafId: string }) =>
       this.createRuntimeOwnedMobileSessionTerminal(
         worktreeId,
@@ -169,7 +101,7 @@ export abstract class OrcaRuntimeWithRunCreateMobileSessionTerminal extends Orca
           ...(identity ? { identity } : {}),
           launchAgent: startupCommand.launchAgent,
           viewMode: opts.viewMode,
-          targetGroupId: opts.targetGroupId,
+          targetGroupId,
           ...mainPlacedAfter(
             () => this.mainLayoutTabOfRow(worktreeId, requestedAfterTabId),
             afterDesktopTabId
@@ -178,9 +110,52 @@ export abstract class OrcaRuntimeWithRunCreateMobileSessionTerminal extends Orca
           launchConfig: startupCommand.launchConfig,
           launchRuntime: startupCommand.launchRuntime,
           ...switchStart,
-          signal: opts.signal
+          ...(opts.switchExecution
+            ? {
+                createMutation: {
+                  clientIdentity: opts.clientNavigationId ?? 'local',
+                  id: opts.clientMutationId!
+                },
+                keepPaneOnStartFailure: true as const,
+                beforePtySpawn: () => {
+                  opts.switchExecution?.check()
+                  destinationCurrent()
+                },
+                onPtySpawnDispatched: () => {
+                  dispatched = true
+                }
+              }
+            : {}),
+          signal: opts.switchExecution?.signal ?? opts.signal,
+          switchExecution: opts.switchExecution
+            ? {
+                ...opts.switchExecution,
+                check: () => {
+                  opts.switchExecution?.check()
+                  destinationCurrent()
+                }
+              }
+            : undefined
         }
       )
+    if (opts.switchExecution) {
+      return createPublishedSwitchTerminal({
+        owner: this,
+        windowAvailable: () => Boolean(this.getAvailableAuthoritativeWindow()),
+        worktreeId,
+        opts,
+        startupCommand,
+        afterDesktopTabId,
+        createOwned,
+        setDestinationCurrent: (check) => {
+          destinationCurrent = check
+        },
+        setTargetGroup: (group) => {
+          targetGroupId = group
+        },
+        wasDispatched: () => dispatched
+      })
+    }
     const win = this.getAvailableAuthoritativeWindow()
     if (!win) {
       return await createOwned()
@@ -317,3 +292,5 @@ export abstract class OrcaRuntimeWithRunCreateMobileSessionTerminal extends Orca
     }
   }
 }
+
+export type { MobileTerminalCreateOptions } from './mobile-terminal-create-options'
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-session-switch.test.ts b/src/main/runtime/terminal/launch/mobile-terminal-session-switch.test.ts
new file mode 100644
index 000000000000..52d92570fadd
--- /dev/null
+++ b/src/main/runtime/terminal/launch/mobile-terminal-session-switch.test.ts
@@ -0,0 +1,258 @@
+import { createTestStore } from '@/store/slices/store-test-helpers'
+import { createTabsSliceMockApi } from '@/store/slices/tabs-slice-test-harness'
+import { publishAgentLaunchTab as windowPublish } from '@/lib/agent-launch-tab-publication'
+import { applyAgentLaunchPaneVerdict } from '@/lib/agent-launch-pane-verdict-application'
+import { acceptAgentLaunchPaneAttempt } from '@/lib/agent-launch-pane-start'
+import { agentSessionSwitchDeadline } from '../../../../shared/agent-session-switch-execution'
+import { afterEach, expect, it, vi } from 'vitest'
+import '../../orca-runtime-test-lifecycle.spec'
+import { OrcaRuntimeService, electronMocks } from '../../orca-runtime-test-mocks.spec'
+import {
+  TEST_WORKTREE_ID as wt,
+  makeRuntimeStoreWithWorkspaceSession,
+  makeWorkspaceSessionWithHeadlessTerminal
+} from '../../orca-runtime-test-fixtures.spec'
+import { withChatTabChanges } from '../../agent-session/agent-session-tab-layout'
+import { committingSpawn } from '../../bind-first-pane.test-fixture'
+import type { RuntimeNotifier } from '../../runtime-notifier-contract'
+import { DaemonRequestTimeoutError } from '../../../daemon/daemon-errors'
+import type { RuntimePtyController } from '../../runtime-pty-controller-contract'
+
+const renderer = vi.hoisted(() => {
+  const ref: { store: ReturnType<typeof createTestStore> | null } = { store: null }
+  return ref
+})
+vi.mock('@/store', () => ({
+  useAppStore: {
+    getState: () => renderer.store!.getState(),
+    setState: (...args: Parameters<ReturnType<typeof createTestStore>['setState']>) =>
+      renderer.store!.setState(...args)
+  }
+}))
+vi.mock('@/hooks/ipc-events/terminal-command-state', () => ({
+  focusTerminalInitiatedTab: () => {}
+}))
+
+vi.mock('../../../../shared/layout-owner-switch', () => ({ ORCA_LAYOUT_OWNER_IS_MAIN: false }))
+
+async function setup(outcome: 'ready' | 'failed' | 'unknown' = 'ready') {
+  createTabsSliceMockApi()
+  renderer.store = createTestStore()
+  renderer.store.getState().setActiveWorktree(wt)
+  renderer.store.getState().createUnifiedTab(wt, 'agent-session', {
+    id: 'custom-source',
+    entityId: 'source-chat',
+    agent: 'codex'
+  })
+  const initial = makeWorkspaceSessionWithHeadlessTerminal()
+  const session =
+    withChatTabChanges('local', initial, wt, [
+      { open: { sessionId: 'source-chat', agent: 'codex', tabId: 'custom-source' } }
+    ]) ?? initial
+  const fixture = makeRuntimeStoreWithWorkspaceSession(session)
+  const service = new OrcaRuntimeService(fixture.runtimeStore)
+  const events: string[] = []
+  const spawn = vi.fn(
+    async (_options: Parameters<NonNullable<RuntimePtyController['spawn']>>[0]) => {
+      events.push('spawn')
+      if (outcome === 'failed') {
+        throw new Error('spawn rejected')
+      }
+      if (outcome === 'unknown') {
+        throw new DaemonRequestTimeoutError('spawn timed out')
+      }
+      return { id: 'pty-switch', incarnationId: '45454545-4545-4545-8545-454545454545' }
+    }
+  )
+  service.setPtyController({
+    spawn: committingSpawn(service, spawn),
+    write: () => true,
+    kill: () => true,
+    getForegroundProcess: async () => null,
+    listProcesses: async () => []
+  })
+  electronMocks.BrowserWindow.fromId.mockReturnValue({
+    isDestroyed: () => false,
+    webContents: { isDestroyed: () => false, setBackgroundThrottling: vi.fn() }
+  })
+  service.attachWindow(1)
+  service.syncWindowGraph(1, {
+    tabs: [],
+    leaves: [],
+    conditionalSwitchProjection: 1,
+    rendererGeneration: 'window-test'
+  })
+  const publish = vi.spyOn(service, 'publishAgentLaunchTab').mockImplementation(async (request) => {
+    events.push('published')
+    expect(request.placement?.afterTabId).toBe('custom-source')
+    expect(request.viewer).toBe('focus-in-workspace')
+    expect(fixture.getSession().terminalLayoutsByTabId[request.tabId]).toBeUndefined()
+    return windowPublish({ ...request, requestId: 'window-publication' })
+  })
+  const report = vi.spyOn(service, 'reportAgentLaunchPaneVerdict')
+  const reveal = vi.fn<NonNullable<RuntimeNotifier['revealTerminalSession']>>(
+    (_workspace, opts) => ({
+      tabId: opts.tabId!,
+      identity: { worktreeId: wt, tabId: opts.tabId!, leafId: opts.leafId!, ptyId: opts.ptyId }
+    })
+  )
+  const { createMobileCreateTestNotifier } =
+    await import('../../orca-runtime-test-scenario-builders.spec')
+  service.setNotifier({
+    ...createMobileCreateTestNotifier(vi.fn()),
+    revealTerminalSession: reveal,
+    publishAgentLaunchTab: async (request) =>
+      windowPublish({ ...request, requestId: 'window-verdict' }),
+    agentLaunchPaneVerdict: applyAgentLaunchPaneVerdict
+  })
+  service.projectStructuredAgentSessionTab({
+    workspaceId: wt,
+    sessionId: 'source-chat',
+    agent: 'codex',
+    activate: true
+  })
+  return { service, fixture, events, spawn, publish, report, reveal }
+}
+const deadlines: ReturnType<typeof agentSessionSwitchDeadline>[] = []
+afterEach(() => {
+  for (const deadline of deadlines) {
+    deadline.dispose()
+  }
+})
+function execution() {
+  const deadline = agentSessionSwitchDeadline()
+  deadlines.push(deadline)
+  return {
+    ...deadline,
+    invocationId: 'click-1',
+    viewer: 'focus-in-workspace' as const,
+    shown: async () => {}
+  }
+}
+const args = () => ({
+  invocationId: 'click-1',
+  sessionId: 'source-chat',
+  afterTabId: 'custom-source',
+  commandOverride: 'my-codex',
+  options: { model: 'gpt-5.4', effort: 'high' },
+  execution: execution()
+})
+
+it('publishes before ordinary fresh startup, forwards caller choices and never seeds a fabricated Codex ID', async () => {
+  const { service, events, spawn, publish } = await setup()
+  const created = await service.createSessionSwitchTerminal(wt, args())
+  expect(events.slice(0, 2)).toEqual(['published', 'spawn'])
+  expect(publish).toHaveBeenCalledOnce()
+  expect(spawn).toHaveBeenCalledWith(
+    expect.objectContaining({ command: expect.stringContaining('my-codex'), launchAgent: 'codex' })
+  )
+  expect(spawn.mock.calls[0]?.[0]).not.toHaveProperty('resumeProviderSession')
+  expect(created.tab.terminal).toBeDefined()
+})
+
+it.each(['failed', 'unknown'] as const)(
+  'withdraws only a definitely unused destination after %s spawn',
+  async (outcome) => {
+    const { service, report, publish } = await setup(outcome)
+    await expect(service.createSessionSwitchTerminal(wt, args())).rejects.toThrow()
+    expect(report).toHaveBeenCalledWith(expect.objectContaining({ worktreeId: wt }), {
+      kind: outcome === 'failed' ? 'withdrawn' : 'unconfirmed'
+    })
+    const published = await publish.mock.results[0]!.value
+    if (outcome === 'unknown') {
+      expect(renderer.store!.getState().terminalLayoutsByTabId[published.tabId]?.root).toBeDefined()
+    } else {
+      expect(renderer.store!.getState().terminalLayoutsByTabId[published.tabId]).toBeUndefined()
+    }
+  }
+)
+
+it('expires after preparation/publication without dispatching spawn, keeping the source', async () => {
+  const { service, spawn, publish, report } = await setup()
+  let expired = false
+  const original = publish.getMockImplementation()!
+  publish.mockImplementation(async (request) => {
+    const answer = await original(request)
+    expired = true
+    return answer
+  })
+  await expect(
+    service.createSessionSwitchTerminal(wt, {
+      ...args(),
+      execution: {
+        ...execution(),
+        check: () => {
+          if (expired) {
+            throw new Error('expired')
+          }
+        }
+      }
+    })
+  ).rejects.toThrow('expired')
+  expect(spawn).not.toHaveBeenCalled()
+  expect(report).toHaveBeenCalledWith(expect.anything(), { kind: 'withdrawn' })
+})
+
+it('uses the saved native ID with ordinary resume environment/runtime instead of forking', async () => {
+  const { service, spawn } = await setup()
+  const nativeId = '019aef12-1234-7000-8000-123456789abc'
+  await service.createSessionSwitchTerminal(wt, {
+    ...args(),
+    source: {
+      agent: 'codex',
+      sourceAgent: 'codex',
+      sessionId: nativeId,
+      filePath: '/tmp/rollout.jsonl',
+      cwd: '/repo',
+      codexHome: null,
+      executionHostPlatform: process.platform
+    }
+  })
+  expect(spawn).toHaveBeenCalledWith(
+    expect.objectContaining({
+      command: expect.stringContaining(nativeId),
+      resumeProviderSession: expect.objectContaining({ id: nativeId }),
+      launchRuntime: expect.any(Object)
+    })
+  )
+  expect(spawn.mock.calls[0]?.[0].command).not.toContain('fork')
+})
+
+it.each(['input', 'replacement', 'preparing', 'layout'] as const)(
+  'retains a window-published failed destination after newer %s before persistence',
+  async (use) => {
+    const { service, publish, spawn } = await setup('failed')
+    const original = publish.getMockImplementation()!
+    publish.mockImplementation(async (request) => {
+      const receipt = await original(request)
+      const key = `${request.tabId}:${request.leafId}`
+      if (use === 'input') {
+        renderer.store!.setState({ lastTerminalInputAtByPaneKey: { [key]: 1 } })
+      }
+      if (use === 'preparing' || use === 'replacement') {
+        acceptAgentLaunchPaneAttempt(key, 'new-launch')
+      }
+      if (use === 'replacement') {
+        windowPublish({ ...request, operationId: 'new-launch', requestId: 'replacement' })
+      }
+      if (use === 'layout') {
+        renderer.store!.setState((state) => ({
+          terminalLayoutsByTabId: {
+            ...state.terminalLayoutsByTabId,
+            [request.tabId]: {
+              ...state.terminalLayoutsByTabId[request.tabId]!,
+              root: { type: 'leaf', leafId: 'changed' }
+            }
+          }
+        }))
+      }
+      return receipt
+    })
+    await expect(service.createSessionSwitchTerminal(wt, args())).rejects.toThrow()
+    const published = await publish.mock.results[0]!.value
+    expect(
+      renderer.store!.getState().tabsByWorktree[wt]?.some((row) => row.id === published.tabId)
+    ).toBe(true)
+    expect(spawn).toHaveBeenCalledOnce()
+  }
+)
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-startup.ts b/src/main/runtime/terminal/launch/mobile-terminal-startup.ts
index 98e78822d475..6f6d6475148f 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-startup.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-startup.ts
@@ -1,3 +1,9 @@
+import type { AiVaultChatForkSource } from '../../../../shared/ai-vault-resume-preparation'
+import {
+  buildAiVaultLocalResumeStartup,
+  getAiVaultResumeCodexHome
+} from '../../../../shared/ai-vault-resume-startup'
+import type { MobileTerminalCreateOptions } from './mobile-terminal-renderer-create'
 import { OrcaRuntimeWithRunCreateMobileSessionTerminal } from './mobile-terminal-renderer-create'
 import type { TerminalWorkspaceLaunchScope } from '../../runtime-legacy-worker-terminal-recovery-types'
 import type { WorktreeStartupLaunch } from '../../../../shared/worktree/launch-types'
@@ -22,6 +28,9 @@ import {
 
 export type MobileTerminalCommandOptions = {
   command?: string
+  sessionOptions?: Record<string, string>
+  commandOverride?: string
+  launchRuntime?: AgentLaunchRuntime
   env?: Record<string, string>
   envToDelete?: string[]
   startupCommandDelivery?: WorktreeStartupLaunch['startupCommandDelivery']
@@ -61,6 +70,58 @@ function normalizeOriginConnectionId(connectionId: string | null | undefined): s
 }
 
 export abstract class OrcaRuntimeWithResolveMobileSessionTerminalCommand extends OrcaRuntimeWithRunCreateMobileSessionTerminal {
+  async createSessionSwitchTerminal(
+    workspaceId: string,
+    args: {
+      source?: AiVaultChatForkSource
+      options?: Record<string, string>
+      commandOverride?: string
+      invocationId: string
+      sessionId: string
+      afterTabId?: string
+      groupId?: string
+      execution: NonNullable<MobileTerminalCreateOptions['switchExecution']>
+    }
+  ) {
+    const workspace = await this.resolveTerminalWorkspaceLaunchScope(`id:${workspaceId}`)
+    args.execution.check()
+    const source = args.source
+    const runtime = this.resolveAgentLaunchRuntime(workspace, 'codex')
+    const startup = source
+      ? buildAiVaultLocalResumeStartup({
+          session: source,
+          settings: this.store?.getSettings(),
+          commandOverride: args.commandOverride,
+          host: {
+            platform: runtime.platform,
+            liveShell: agentLaunchQuotingShell(runtime),
+            codexHome: getAiVaultResumeCodexHome(source.codexHome, runtime.platform)
+          },
+          embedCwd: false
+        })
+      : undefined
+    args.execution.check()
+    return this.createMobileSessionTerminal(`id:${workspaceId}`, {
+      ...(startup
+        ? {
+            ...startup,
+            launchRuntime: runtime,
+            resumeProviderSession: startup.providerSession,
+            resumeOrigin: 'switch' as const,
+            launchAgent: 'codex' as const
+          }
+        : {
+            agent: 'codex' as const,
+            commandOverride: args.commandOverride,
+            sessionOptions: args.options
+          }),
+      afterTabId: args.afterTabId ? `agent-session:${args.sessionId}` : undefined,
+      targetGroupId: args.groupId,
+      clientMutationId: args.invocationId,
+      switchExecution: { ...args.execution, afterTabId: args.afterTabId }
+    })
+  }
+
   /** The `--resume` launch for a pane's recorded agent session, as the host window's cold restore builds it. */
   protected resolveMobileSessionResumeCommand(
     workspace: TerminalWorkspaceLaunchScope,
@@ -115,6 +176,7 @@ export abstract class OrcaRuntimeWithResolveMobileSessionTerminalCommand extends
     if (opts.command || !opts.agent) {
       return {
         command: opts.command,
+        launchRuntime: opts.launchRuntime,
         env: opts.env,
         envToDelete: opts.envToDelete,
         launchConfig: opts.launchConfig,
@@ -133,7 +195,17 @@ export abstract class OrcaRuntimeWithResolveMobileSessionTerminalCommand extends
     const startupPlan = buildAgentStartupPlan({
       ...resolveAgentStartupPlanInputs({
         agent: opts.agent,
-        settings,
+        sessionOptions: opts.sessionOptions,
+        settings:
+          opts.commandOverride === undefined
+            ? settings
+            : {
+                ...settings,
+                agentCmdOverrides: {
+                  ...settings.agentCmdOverrides,
+                  [opts.agent]: opts.commandOverride
+                }
+              },
         // Quote for the execution host, even when the mobile client runs another OS.
         platform: launchRuntime.platform,
         shell: agentLaunchQuotingShell(launchRuntime),
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-switch-publication.ts b/src/main/runtime/terminal/launch/mobile-terminal-switch-publication.ts
new file mode 100644
index 000000000000..bcafbdfbe0bd
--- /dev/null
+++ b/src/main/runtime/terminal/launch/mobile-terminal-switch-publication.ts
@@ -0,0 +1,129 @@
+import type { OrcaRuntimeWithMobileTerminalCreateOwner } from './mobile-terminal-create-owner'
+import type { MobileTerminalCreateOptions } from './mobile-terminal-create-options'
+import { DaemonConnectionLostError, DaemonRequestTimeoutError } from '../../../daemon/daemon-errors'
+import { trackRunningAgentLaunchPane } from '../../../agent-launch/agent-launch-pane-attachment'
+import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
+import type { AgentLaunchTabPublished } from '../../../../shared/agent-launch-tab-publication'
+import type { AgentLaunchPaneVerdict } from '../../../../shared/agent-launch-pane-verdict'
+import type { MobileTerminalCommand } from './mobile-terminal-startup'
+import type { RuntimeMobileSessionCreateTerminalResult } from '../../../../shared/runtime-types'
+import { randomUUID } from 'node:crypto'
+import { isAgentSessionOperationOutcomeUnknown } from '../../runtime-agent-launch-resolution'
+
+export async function createPublishedSwitchTerminal(args: {
+  owner: Pick<
+    OrcaRuntimeWithMobileTerminalCreateOwner,
+    | 'publishAgentLaunchTabInMainLayout'
+    | 'publishAgentLaunchTab'
+    | 'reportAgentLaunchPaneVerdict'
+    | 'hasLiveTerminalForPaneKey'
+    | 'withdrawAgentLaunchPaneInMainLayout'
+  >
+  windowAvailable: () => boolean
+  worktreeId: string
+  opts: MobileTerminalCreateOptions
+  startupCommand: MobileTerminalCommand
+  afterDesktopTabId: string | undefined
+  createOwned: (identity: {
+    tabId: string
+    leafId: string
+  }) => Promise<RuntimeMobileSessionCreateTerminalResult>
+  setDestinationCurrent: (check: () => void) => void
+  setTargetGroup: (group: string) => void
+  wasDispatched: () => boolean
+}): Promise<RuntimeMobileSessionCreateTerminalResult> {
+  const {
+    owner,
+    windowAvailable,
+    worktreeId,
+    opts,
+    startupCommand,
+    afterDesktopTabId,
+    createOwned,
+    setDestinationCurrent,
+    setTargetGroup,
+    wasDispatched
+  } = args
+  opts.switchExecution!.check()
+  const identity = { tabId: randomUUID(), leafId: randomUUID() }
+  const pane = { worktreeId, ...identity, operationId: opts.clientMutationId }
+  const paneKey = `${identity.tabId}:${identity.leafId}`
+  const running = trackRunningAgentLaunchPane({ worktreeId, paneKey })
+  setDestinationCurrent(() => {
+    if (!running.current()) {
+      throw new Error('tab_not_found')
+    }
+  })
+  let shown: AgentLaunchTabPublished | undefined
+  let publicationOwner: 'main' | 'window' = 'window'
+  try {
+    const request = {
+      ...pane,
+      launchAgent: startupCommand.launchAgent ?? 'codex',
+      viewMode: 'terminal' as const,
+      viewer: opts.switchExecution!.viewer,
+      placement: {
+        afterTabId: opts.switchExecution!.afterTabId ?? afterDesktopTabId,
+        groupId: opts.targetGroupId
+      },
+      operationId: opts.clientMutationId
+    }
+    const mainPublication =
+      ORCA_LAYOUT_OWNER_IS_MAIN || !windowAvailable()
+        ? owner.publishAgentLaunchTabInMainLayout(request, opts.switchExecution!.check)
+        : null
+    publicationOwner = mainPublication ? 'main' : 'window'
+    const publishing = mainPublication ?? owner.publishAgentLaunchTab(request)
+    if (!publishing) {
+      throw new Error('runtime_unavailable')
+    }
+    shown = await publishing
+    setTargetGroup(shown.placement.groupId)
+    await opts.switchExecution!.shown?.({
+      workspaceId: worktreeId,
+      ...identity,
+      placement: request.placement
+    })
+    opts.switchExecution!.check()
+    if (!running.current()) {
+      throw new Error('tab_not_found')
+    }
+    const result = await createOwned(identity)
+    running.agentBound()
+    running.finish({ kind: 'proceed' })
+    owner.reportAgentLaunchPaneVerdict(pane, { kind: 'proceed' })
+    return result
+  } catch (error) {
+    const live = owner.hasLiveTerminalForPaneKey(paneKey)
+    const withdraw =
+      shown?.created === true &&
+      running.current() &&
+      !live &&
+      (!wasDispatched() ||
+        !(
+          isAgentSessionOperationOutcomeUnknown(error) ||
+          error instanceof DaemonConnectionLostError ||
+          error instanceof DaemonRequestTimeoutError
+        ))
+    const verdict: AgentLaunchPaneVerdict = withdraw
+      ? { kind: 'withdrawn' }
+      : wasDispatched() && !live
+        ? { kind: 'unconfirmed' }
+        : { kind: 'proceed' }
+    running.finish(verdict)
+    if (withdraw) {
+      const withdrawn = await owner.withdrawAgentLaunchPaneInMainLayout(
+        pane,
+        running.current,
+        shown?.withdrawalRoot,
+        publicationOwner
+      )
+      if (withdrawn && running.current()) {
+        owner.reportAgentLaunchPaneVerdict(pane, verdict)
+      }
+    } else if (running.current() || live) {
+      owner.reportAgentLaunchPaneVerdict(pane, verdict)
+    }
+    throw error
+  }
+}
diff --git a/src/main/runtime/terminal/launch/terminal-create-completion.ts b/src/main/runtime/terminal/launch/terminal-create-completion.ts
new file mode 100644
index 000000000000..b73463389520
--- /dev/null
+++ b/src/main/runtime/terminal/launch/terminal-create-completion.ts
@@ -0,0 +1,85 @@
+import {
+  type resolveTerminalLaunchResult,
+  terminalLaunchPublicFacts
+} from './terminal-launch-result'
+import { revealCreatedTerminal } from './terminal-create-reveal'
+
+import type * as dependencies from '../../orca-runtime-create-terminal-dependencies'
+
+export function prepareTerminalCreateCompletion(args: {
+  notifier: Parameters<typeof revealCreatedTerminal>[0]['notifier']
+  workspace: Parameters<typeof revealCreatedTerminal>[0]['workspace']
+  result: Parameters<typeof terminalLaunchPublicFacts>[0]
+  pty: Parameters<typeof terminalLaunchPublicFacts>[2]
+  launch: ReturnType<typeof resolveTerminalLaunchResult>
+  launchOpts: dependencies.TerminalCreateOptions
+  presentation: Parameters<typeof revealCreatedTerminal>[0]['presentation']
+  opts: dependencies.TerminalCreateOptions
+  tabId: string
+  leafId: string
+  paneKey: string
+  handle: string
+  savedStartupCwd: string
+  executionMetadata: () => Pick<
+    dependencies.RuntimeTerminalCreate,
+    'executionHostId' | 'hostPlatform' | 'incarnationId'
+  >
+}) {
+  const {
+    notifier,
+    workspace,
+    result,
+    pty,
+    launch,
+    launchOpts,
+    presentation,
+    opts,
+    tabId,
+    leafId,
+    paneKey,
+    handle,
+    savedStartupCwd,
+    executionMetadata
+  } = args
+  const reveal = revealCreatedTerminal({
+    notifier,
+    workspace,
+    ptyId: result.id,
+    handle,
+    cwd: savedStartupCwd,
+    launchOpts: {
+      ...launchOpts,
+      title: pty?.title ?? launch.effectiveTitle ?? undefined,
+      launchAgent: pty?.launchAgent ?? undefined,
+      viewMode: launch.effectiveViewMode
+    },
+    effectiveLaunchConfig: pty?.launchConfig ?? undefined,
+    launchToken: pty?.launchToken ?? undefined,
+    adoptedStablePane: launch.adoptedStablePane,
+    presentation,
+    opts,
+    tabId,
+    leafId
+  })
+
+  return {
+    reveal,
+    result: ({ surface, warning }: Awaited<ReturnType<typeof revealCreatedTerminal>>) => {
+      return {
+        ...terminalLaunchPublicFacts(result, launch.adoptedStablePane, pty),
+        ...(result.switchOutcomeUnknown ? { switchOutcomeUnknown: true as const } : {}),
+        handle,
+        savedStartupCwd,
+        tabId,
+        paneKey,
+        ptyId: result.id,
+        worktreeId: workspace.id,
+        title: pty?.title ?? launch.effectiveTitle ?? null,
+        ...executionMetadata(),
+        surface,
+        ...(result.startupCwdFallback ? { startupCwdFallback: result.startupCwdFallback } : {}),
+        ...(warning ? { warning } : {})
+      }
+    }
+  }
+}
diff --git a/src/main/runtime/terminal/launch/terminal-create-size.ts b/src/main/runtime/terminal/launch/terminal-create-size.ts
new file mode 100644
index 000000000000..b9d1607d8c2c
--- /dev/null
+++ b/src/main/runtime/terminal/launch/terminal-create-size.ts
@@ -0,0 +1,21 @@
+import { paneSize, resolvePtyFirstSize, type PtyGridSize } from '../../../ipc/pty/pty-first-size'
+
+export function terminalCreateSize(args: {
+  workspaceId: string
+  targetGroupId?: string
+  activeGroupId?: string | null
+  session: Parameters<typeof paneSize>[0]
+  opts: Parameters<typeof paneSize>[1]
+  singleGroupSize?: PtyGridSize
+  groupSizes?: Record<string, PtyGridSize>
+}) {
+  const { workspaceId, targetGroupId, activeGroupId, session, opts, singleGroupSize, groupSizes } =
+    args
+  // The window's latest published active group is where its reveal places the tab.
+  const groupId = targetGroupId ?? activeGroupId ?? session?.activeGroupIdByWorktree?.[workspaceId]
+  // Unshown workspaces have no measured group; a single group can use the common workspace geometry.
+  const singleGroup =
+    (session?.tabGroups?.[workspaceId]?.length ?? 0) <= 1 ? singleGroupSize : undefined
+  const group = groupId ? groupSizes?.[groupId] : undefined
+  return resolvePtyFirstSize({ pane: paneSize(session, opts), group, singleGroup })
+}
diff --git a/src/main/runtime/terminal/launch/terminal-create.ts b/src/main/runtime/terminal/launch/terminal-create.ts
index 4c8e84276102..ba4bf2c92108 100644
--- a/src/main/runtime/terminal/launch/terminal-create.ts
+++ b/src/main/runtime/terminal/launch/terminal-create.ts
@@ -1,9 +1,4 @@
-import {
-  recordTerminalLaunchMetadata,
-  resolveTerminalLaunchResult,
-  terminalLaunchPublicFacts
-} from './terminal-launch-result'
-import { revealCreatedTerminal } from './terminal-create-reveal'
+import { recordTerminalLaunchMetadata, resolveTerminalLaunchResult } from './terminal-launch-result'
 import type { PaneSpawnOperation } from '../../../ipc/pty/pane/pane-spawn-operation'
 import { OrcaRuntimeWithTerminalCreateDeduplication } from './terminal-create-deduplication'
 import * as dependencies from '../../orca-runtime-create-terminal-dependencies'
@@ -14,8 +9,9 @@ import { recordPtySurface, spawnSurfaceClaimSequence } from '../../pty-recorded-
 import { agentLaunchTokenFor, withAgentLaunchToken } from '../../../agent-launch/agent-launch-token'
 import { seedPtyLaunchTitle } from './pty-launch-title'
 import { migratedPaneRestoreHint } from '../../migrated-pane-restore-cwd'
-import { paneSize, resolvePtyFirstSize } from '../../../ipc/pty/pty-first-size'
 import { resolveLaunchCommandPaneAgent } from '../../runtime-agent-launch-resolution'
+import { prepareTerminalCreateCompletion } from './terminal-create-completion'
+import { terminalCreateSize } from './terminal-create-size'
 
 export abstract class OrcaRuntimeWithCreateTerminal extends OrcaRuntimeWithTerminalCreateDeduplication {
   protected abstract paneStartStatusArgs: dependencies.PaneStartArgsOf
@@ -43,21 +39,19 @@ export abstract class OrcaRuntimeWithCreateTerminal extends OrcaRuntimeWithTermi
       }
       const workspace = await this.resolveTerminalWorkspaceLaunchScope(worktreeSelector, created)
       const launchOpts = await this.resolveAgentTerminalCreateOptions(workspace, opts)
+      launchOpts.switchExecution?.check()
       const launchTitleAt = { sequence: this.nextTitleObservationSequence(), epochMs: Date.now() }
       let cwd = this.resolveWorkspaceTerminalStartupCwd(workspace, launchOpts.cwd) ?? workspace.path
       const session = this.getWorkspaceSessionForWorktree(workspace.id)
-      // The window's latest published active group is where its reveal places the tab.
-      const groupId =
-        launchOpts.targetGroupId ??
-        this.mobileSessionTabsByWorktree.get(workspace.id)?.activeGroupId ??
-        session?.activeGroupIdByWorktree?.[workspace.id]
-      // Unshown workspaces have no measured group; a single group can use the common workspace geometry.
-      const singleGroup =
-        (session?.tabGroups?.[workspace.id]?.length ?? 0) <= 1
-          ? this.singleGroupWorkspaceGridSize
-          : undefined
-      const group = groupId ? this.terminalGroupGridSizes?.[groupId] : undefined
-      const initialSize = resolvePtyFirstSize({ pane: paneSize(session, opts), group, singleGroup })
+      const initialSize = terminalCreateSize({
+        workspaceId: workspace.id,
+        targetGroupId: launchOpts.targetGroupId,
+        activeGroupId: this.mobileSessionTabsByWorktree.get(workspace.id)?.activeGroupId,
+        session,
+        opts,
+        singleGroupSize: this.singleGroupWorkspaceGridSize,
+        groupSizes: this.terminalGroupGridSizes
+      })
       let preAllocatedHandle =
         launchOpts.preAllocatedHandle ?? this.createPreAllocatedTerminalHandle()
       let { tabId, leafId, paneKey } = dependencies.allocateTerminalPaneIdentity(launchOpts)
@@ -121,8 +115,16 @@ export abstract class OrcaRuntimeWithCreateTerminal extends OrcaRuntimeWithTermi
         }
         try {
           const { launchAgent } = launchOpts
-          launchOpts.onPtySpawnDispatched?.({ launchConfig: effectiveLaunchConfig, launchAgent })
           result = await dependencies.spawnInAdmittedPane(this.store, ptyController, {
+            keepOnFailure: launchOpts.keepPaneOnStartFailure,
+            beforeAdmission: launchOpts.beforePtySpawn,
+            beforeSpawn: () => {
+              launchOpts.beforePtySpawn?.()
+              launchOpts.onPtySpawnDispatched?.({
+                launchConfig: effectiveLaunchConfig,
+                launchAgent
+              })
+            },
             ...initialSize,
             cwd,
             command: sequencedStartupCommand
@@ -138,7 +140,9 @@ export abstract class OrcaRuntimeWithCreateTerminal extends OrcaRuntimeWithTermi
               launchOpts.envToDelete,
               agentTeamsPlan?.envToDelete
             ),
-            resumeProviderSession: launchOpts.resumeProviderSession,
+            ...(launchOpts.resumeProviderSession
+              ? { resumeProviderSession: launchOpts.resumeProviderSession }
+              : {}),
             ...(launchOpts.resumeOrigin ? { resumeOrigin: launchOpts.resumeOrigin } : {}),
             telemetry: launchOpts.telemetry,
             connectionId: workspace.connectionId,
@@ -190,23 +194,31 @@ export abstract class OrcaRuntimeWithCreateTerminal extends OrcaRuntimeWithTermi
         if (launchOpts.signal?.aborted) {
           throw new Error('client_disconnected')
         }
-        const adoptedBeforeLaunch = await ptyController.adoptStablePane?.({
-          ...initialSize,
-          cwd,
-          connectionId: workspace.connectionId,
-          worktreeId: workspace.id,
-          preAllocatedHandle,
-          tabId,
-          leafId,
-          spawnFresh,
-          signal: launchOpts.signal
-        })
-        if (adoptedBeforeLaunch) {
-          result = dependencies.materializedStablePaneReply(adoptedBeforeLaunch, preAllocatedHandle)
-          Object.assign(result, this.getTerminalLaunchResult(result.id))
-        } else if (!ptyController.adoptStablePane) {
-          result = await spawnFresh({ mustExist: false })
+        const acquire = async () => {
+          const adoptedBeforeLaunch = await ptyController.adoptStablePane?.({
+            ...initialSize,
+            cwd,
+            connectionId: workspace.connectionId,
+            worktreeId: workspace.id,
+            preAllocatedHandle,
+            tabId,
+            leafId,
+            spawnFresh,
+            signal: launchOpts.signal,
+            switchExecution: launchOpts.switchExecution
+          })
+          if (adoptedBeforeLaunch) {
+            result = dependencies.materializedStablePaneReply(
+              adoptedBeforeLaunch,
+              preAllocatedHandle
+            )
+            Object.assign(result, this.getTerminalLaunchResult(result.id))
+          } else if (!ptyController.adoptStablePane) {
+            result = await spawnFresh({ mustExist: false })
+          }
         }
+        const physical = acquire()
+        await (launchOpts.switchExecution?.trackPhysical?.(physical) ?? physical)
         if (!result.stablePaneOwner) {
           reportPtySpawnCommitted()
         }
@@ -219,7 +231,9 @@ export abstract class OrcaRuntimeWithCreateTerminal extends OrcaRuntimeWithTermi
           launchToken
         })
         if (launch.surface) {
-          ;({ terminalHandle: preAllocatedHandle, tabId, leafId } = launch.surface)
+          tabId = launch.surface.tabId
+          leafId = launch.surface.leafId
+          preAllocatedHandle = launch.surface.terminalHandle ?? preAllocatedHandle
           paneKey = dependencies.makePaneKey(tabId, leafId)
         }
         this.assertCreatedPtyRegistrationAllowed(result.id, result.incarnationId)
@@ -246,9 +260,10 @@ export abstract class OrcaRuntimeWithCreateTerminal extends OrcaRuntimeWithTermi
           }
           recordTerminalLaunchMetadata(pty, result, launch)
           if (!launch.adoptedStablePane) {
-            pty.launchCommandAgent = result.agentResumeRefused
-              ? null
-              : resolveLaunchCommandPaneAgent(launchOpts.command)
+            pty.launchCommandAgent =
+              result.agentResumeRefused || result.agentResumeUnavailable
+                ? null
+                : resolveLaunchCommandPaneAgent(launchOpts.command)
             this.rememberSavedTerminalLaunchResult(result.id, result)
           }
           recordPtySurface(pty, tabId, paneKey, spawnSurfaceClaimSequence(this.graphSequence))
@@ -265,41 +280,25 @@ export abstract class OrcaRuntimeWithCreateTerminal extends OrcaRuntimeWithTermi
             ...(savedStartupCwd !== workspace.path ? { startupCwd: savedStartupCwd } : {})
           })
         }
-        const reveal = revealCreatedTerminal({
+        const completion = prepareTerminalCreateCompletion({
           notifier: this.notifier,
           workspace,
-          ptyId: result.id,
-          handle,
-          cwd: savedStartupCwd,
-          launchOpts: {
-            ...launchOpts,
-            title: pty?.title ?? launch.effectiveTitle ?? undefined,
-            launchAgent: pty?.launchAgent ?? undefined,
-            viewMode: launch.effectiveViewMode
-          },
-          effectiveLaunchConfig: pty?.launchConfig ?? undefined,
-          launchToken: pty?.launchToken ?? undefined,
-          adoptedStablePane: launch.adoptedStablePane,
+          result,
+          pty,
+          launch,
+          launchOpts,
           presentation,
           opts,
           tabId,
-          leafId
-        })
-        const { surface, warning } = reveal instanceof Promise ? await reveal : reveal
-        return {
-          ...terminalLaunchPublicFacts(result, launch.adoptedStablePane, pty),
+          leafId,
+          paneKey,
           handle,
           savedStartupCwd,
-          tabId,
-          paneKey,
-          ptyId: result.id,
-          worktreeId: workspace.id,
-          title: pty?.title ?? launch.effectiveTitle ?? null,
-          ...this.getPtyExecutionHostMetadata(result.id),
-          surface,
-          ...(result.startupCwdFallback ? { startupCwdFallback: result.startupCwdFallback } : {}),
-          ...(warning ? { warning } : {})
-        }
+          executionMetadata: () => this.getPtyExecutionHostMetadata(result.id)
+        })
+        const revealed =
+          completion.reveal instanceof Promise ? await completion.reveal : completion.reveal
+        return completion.result(revealed)
       } finally {
         releaseStablePaneCreate()
       }
diff --git a/src/main/runtime/terminal/launch/terminal-launch-result.ts b/src/main/runtime/terminal/launch/terminal-launch-result.ts
index 05a293f4d8ad..2abf1380dcad 100644
--- a/src/main/runtime/terminal/launch/terminal-launch-result.ts
+++ b/src/main/runtime/terminal/launch/terminal-launch-result.ts
@@ -19,9 +19,17 @@ export function resolveTerminalLaunchResult(
     stablePaneAdopted ||
     result.isReattach === true ||
     result.agentSessionEnsure?.disposition === 'adopted'
-  const refused = Boolean(result.agentResumeRefused)
+  const refused = Boolean(result.agentResumeRefused || result.agentResumeUnavailable)
   const owner = result.stablePaneOwner
   const surface =
+    (result.switchRecoveredSurface
+      ? {
+          ...result.switchRecoveredSurface,
+          terminalHandle:
+            result.agentSessionEnsure?.owner.surface.terminalHandle ??
+            result.stablePaneOwner?.handle
+        }
+      : undefined) ??
     result.agentSessionEnsure?.owner.surface ??
     (owner ? { terminalHandle: owner.handle, tabId: owner.tabId, leafId: owner.leafId } : undefined)
   return {
diff --git a/src/main/runtime/terminal/recovery/resolve-terminal-pane.ts b/src/main/runtime/terminal/recovery/resolve-terminal-pane.ts
index ecb92891da1a..b348a703e9b9 100644
--- a/src/main/runtime/terminal/recovery/resolve-terminal-pane.ts
+++ b/src/main/runtime/terminal/recovery/resolve-terminal-pane.ts
@@ -4,27 +4,19 @@ import {
 } from '../../workspace-session-terminal-tab-retirement-identity'
 import { terminalLaunchFacts } from '../../../../shared/agent-session-resume'
 import type { OrcaRuntimeWithCreateTerminal } from '../launch/terminal-create'
-import { OrcaRuntimeWithRestoredHandlePaneStart } from '../surface/restored-handle-pane-start'
 import type * as Read from '../../../../shared/runtime-types'
 import type { RuntimeTerminalResolvePane } from '../../../../shared/runtime-types'
 import type { RuntimeTerminalCreate } from '../../../../shared/runtime-terminal-contracts'
-import type {
-  RuntimeProviderSnapshotReadOptions,
-  TerminalHandleRecord
-} from '../../runtime-terminal-contracts'
 import type {
   RuntimeLeafRecord,
   RuntimePtyWorktreeRecord
 } from '../../runtime-terminal-state-records'
 import type { ResolvedWorktree } from '../../runtime-worktree-path-identity'
 import { parsePaneKey } from '../../../../shared/stable-pane-id'
-import { labelTerminalReadSource, readTerminalTail } from '../../terminal-tail-read'
-import { getTerminalState } from '../../terminal-wait-results'
-import { readStructuredWorkerTerminal } from '../../structured-worker-terminal-read'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
+import { OrcaRuntimeWithReadTerminalPane } from './terminal-pane-read'
 
-export abstract class OrcaRuntimeWithResolveTerminalPane extends OrcaRuntimeWithRestoredHandlePaneStart {
-  protected abstract assertLiveTerminalHandleTargetsPty(handle: string, expectedPtyId: string): void
+export abstract class OrcaRuntimeWithResolveTerminalPane extends OrcaRuntimeWithReadTerminalPane {
   abstract createTerminal(
     ...args: Parameters<OrcaRuntimeWithCreateTerminal['createTerminal']>
   ): ReturnType<OrcaRuntimeWithCreateTerminal['createTerminal']>
@@ -39,20 +31,12 @@ export abstract class OrcaRuntimeWithResolveTerminalPane extends OrcaRuntimeWith
     pty: RuntimePtyWorktreeRecord,
     worktreesById: Map<string, ResolvedWorktree>
   ): Read.RuntimeTerminalSummary
-  protected abstract getLiveLeafForHandle(handle: string): {
-    record: TerminalHandleRecord
-    leaf: RuntimeLeafRecord
-  }
+
   protected abstract buildTerminalSummary(
     leaf: RuntimeLeafRecord,
     worktreesById: Map<string, ResolvedWorktree>,
     provenLivePtyIds?: ReadonlySet<string> | null
   ): Read.RuntimeTerminalSummary
-  protected abstract readPtyTerminal(
-    handle: string,
-    pty: RuntimePtyWorktreeRecord,
-    opts?: { cursor?: number; limit?: number }
-  ): Read.RuntimeTerminalRead
 
   resolveTerminalPane(paneKey: string, expectedWorktreeId?: string): RuntimeTerminalResolvePane {
     // Why: the renderer context menu only knows the stable pane key; main owns
@@ -127,6 +111,20 @@ export abstract class OrcaRuntimeWithResolveTerminalPane extends OrcaRuntimeWith
     }
   }
 
+  /** Actual placement of an exact live child; a launch claim's original coordinates can be stale. */
+  resolveLiveTerminalSurface(ptyId: string, incarnationId: string | undefined) {
+    const pty = this.ptysById.get(ptyId)
+    if (!pty?.connected || !incarnationId || pty.incarnationId !== incarnationId) {
+      return null
+    }
+    const pane = this.paneOfPty(pty)
+    const parsed = pane.paneKey ? parsePaneKey(pane.paneKey) : null
+    if (!parsed) {
+      return null
+    }
+    return { ...parsed, worktreeId: pty.worktreeId, terminalHandle: this.issuePtyHandle(pty) }
+  }
+
   /** Whether the caller's handle still names the pane it asks to recover. */
   private handleNamesRecoveredPane(
     handle: string,
@@ -262,59 +260,4 @@ export abstract class OrcaRuntimeWithResolveTerminalPane extends OrcaRuntimeWith
       ...(agentWait !== undefined ? { agentWait } : {})
     }
   }
-
-  async readTerminal(
-    handle: string,
-    opts: { cursor?: number; limit?: number; screen?: boolean } = {},
-    providerSnapshot: RuntimeProviderSnapshotReadOptions = {}
-  ): Promise<Read.RuntimeTerminalRead> {
-    // Before the PTY lookup, because a structured worker has no PTY and no leaf: without this the
-    // only peer read verb answers `terminal_handle_stale` for a perfectly live worker.
-    const structured = await readStructuredWorkerTerminal({
-      handle,
-      db: this.getOrchestrationDbIfAvailable?.() ?? null,
-      ...(opts.cursor === undefined ? {} : { cursor: opts.cursor }),
-      ...(opts.limit === undefined ? {} : { limit: opts.limit })
-    })
-    if (structured) {
-      // `screen` asks for a rendered grid; there is none, and the journal is the whole record.
-      return { ...structured, source: opts.screen ? 'screen-unavailable' : 'stream' }
-    }
-    // Switch point: a saved pane main holds with no terminal yet starts first (once, shared).
-    const starting = ORCA_LAYOUT_OWNER_IS_MAIN ? this.startRestoredHandlePane(handle) : null
-    if (starting) {
-      const target = await starting
-      return { ...(await this.readTerminal(target, opts, providerSnapshot)), handle }
-    }
-    const pty = this.getLivePtyForHandle(handle)
-    if (pty) {
-      const read = this.readPtyTerminal(handle, pty.pty, opts)
-      const visibleRead = opts.screen
-        ? await this.readRenderedScreen(pty.pty.ptyId, read, opts)
-        : await this.withVisibleSnapshotFallback(pty.pty.ptyId, read, opts, providerSnapshot)
-      this.assertLiveTerminalHandleTargetsPty(handle, pty.pty.ptyId)
-      return labelTerminalReadSource(visibleRead)
-    }
-
-    const { leaf } = this.getLiveLeafForHandle(handle)
-    const read = readTerminalTail({
-      handle,
-      status: getTerminalState(leaf),
-      previewLines: leaf.tailBuffer,
-      completedLines: leaf.tailTranscriptBuffer,
-      partialLine: leaf.tailPartialLine,
-      completedLineCount: leaf.tailLinesTotal,
-      bufferTruncated: leaf.tailTruncated,
-      cursor: opts.cursor,
-      limit: opts.limit
-    })
-    if (!leaf.ptyId) {
-      return { ...read, source: opts.screen ? 'screen-unavailable' : 'stream' }
-    }
-    const visibleRead = opts.screen
-      ? await this.readRenderedScreen(leaf.ptyId, read, opts)
-      : await this.withVisibleSnapshotFallback(leaf.ptyId, read, opts, providerSnapshot)
-    this.assertLiveTerminalHandleTargetsPty(handle, leaf.ptyId)
-    return labelTerminalReadSource(visibleRead)
-  }
 }
diff --git a/src/main/runtime/terminal/recovery/terminal-pane-read.ts b/src/main/runtime/terminal/recovery/terminal-pane-read.ts
new file mode 100644
index 000000000000..71b54cbd2c67
--- /dev/null
+++ b/src/main/runtime/terminal/recovery/terminal-pane-read.ts
@@ -0,0 +1,84 @@
+import { OrcaRuntimeWithRestoredHandlePaneStart } from '../surface/restored-handle-pane-start'
+import type * as Read from '../../../../shared/runtime-types'
+import type {
+  RuntimeProviderSnapshotReadOptions,
+  TerminalHandleRecord
+} from '../../runtime-terminal-contracts'
+import type {
+  RuntimeLeafRecord,
+  RuntimePtyWorktreeRecord
+} from '../../runtime-terminal-state-records'
+import { labelTerminalReadSource, readTerminalTail } from '../../terminal-tail-read'
+import { getTerminalState } from '../../terminal-wait-results'
+import { readStructuredWorkerTerminal } from '../../structured-worker-terminal-read'
+import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
+
+export abstract class OrcaRuntimeWithReadTerminalPane extends OrcaRuntimeWithRestoredHandlePaneStart {
+  protected abstract assertLiveTerminalHandleTargetsPty(handle: string, expectedPtyId: string): void
+
+  protected abstract getLiveLeafForHandle(handle: string): {
+    record: TerminalHandleRecord
+    leaf: RuntimeLeafRecord
+  }
+
+  protected abstract readPtyTerminal(
+    handle: string,
+    pty: RuntimePtyWorktreeRecord,
+    opts?: { cursor?: number; limit?: number }
+  ): Read.RuntimeTerminalRead
+
+  async readTerminal(
+    handle: string,
+    opts: { cursor?: number; limit?: number; screen?: boolean } = {},
+    providerSnapshot: RuntimeProviderSnapshotReadOptions = {}
+  ): Promise<Read.RuntimeTerminalRead> {
+    // Before the PTY lookup, because a structured worker has no PTY and no leaf: without this the
+    // only peer read verb answers `terminal_handle_stale` for a perfectly live worker.
+    const structured = await readStructuredWorkerTerminal({
+      handle,
+      db: this.getOrchestrationDbIfAvailable?.() ?? null,
+      ...(opts.cursor === undefined ? {} : { cursor: opts.cursor }),
+      ...(opts.limit === undefined ? {} : { limit: opts.limit })
+    })
+    if (structured) {
+      // `screen` asks for a rendered grid; there is none, and the journal is the whole record.
+      return { ...structured, source: opts.screen ? 'screen-unavailable' : 'stream' }
+    }
+    // Switch point: a saved pane main holds with no terminal yet starts first (once, shared).
+    const starting = ORCA_LAYOUT_OWNER_IS_MAIN ? this.startRestoredHandlePane(handle) : null
+    if (starting) {
+      const target = await starting
+      return { ...(await this.readTerminal(target, opts, providerSnapshot)), handle }
+    }
+    const pty = this.getLivePtyForHandle(handle)
+    if (pty) {
+      const read = this.readPtyTerminal(handle, pty.pty, opts)
+      const visibleRead = opts.screen
+        ? await this.readRenderedScreen(pty.pty.ptyId, read, opts)
+        : await this.withVisibleSnapshotFallback(pty.pty.ptyId, read, opts, providerSnapshot)
+      this.assertLiveTerminalHandleTargetsPty(handle, pty.pty.ptyId)
+      return labelTerminalReadSource(visibleRead)
+    }
+
+    const { leaf } = this.getLiveLeafForHandle(handle)
+    const read = readTerminalTail({
+      handle,
+      status: getTerminalState(leaf),
+      previewLines: leaf.tailBuffer,
+      completedLines: leaf.tailTranscriptBuffer,
+      partialLine: leaf.tailPartialLine,
+      completedLineCount: leaf.tailLinesTotal,
+      bufferTruncated: leaf.tailTruncated,
+      cursor: opts.cursor,
+      limit: opts.limit
+    })
+    if (!leaf.ptyId) {
+      return { ...read, source: opts.screen ? 'screen-unavailable' : 'stream' }
+    }
+    const visibleRead = opts.screen
+      ? await this.readRenderedScreen(leaf.ptyId, read, opts)
+      : await this.withVisibleSnapshotFallback(leaf.ptyId, read, opts, providerSnapshot)
+    this.assertLiveTerminalHandleTargetsPty(handle, leaf.ptyId)
+    return labelTerminalReadSource(visibleRead)
+  }
+}
diff --git a/src/main/window/agent-launch-tab-publish-relay.ts b/src/main/window/agent-launch-tab-publish-relay.ts
index cef2fd887cee..3986f043b4fb 100644
--- a/src/main/window/agent-launch-tab-publish-relay.ts
+++ b/src/main/window/agent-launch-tab-publish-relay.ts
@@ -43,7 +43,13 @@ export function requestAgentLaunchTabPublishFromRenderer(
         finish(new Error(reply.error))
         return
       }
-      finish(null, { tabId: reply.tabId, created: reply.created, placement: reply.placement })
+      finish(null, {
+        tabId: reply.tabId,
+        created: reply.created,
+        placement: reply.placement,
+        withdrawalRoot: reply.withdrawalRoot,
+        withdrawn: reply.withdrawn
+      })
     }
     ipcMain.on('agentLaunch:tabPublishReply', onReply)
     webContents.send('ui:publishAgentLaunchTab', { ...request, requestId })
diff --git a/src/main/window/runtime-window-lifecycle.ts b/src/main/window/runtime-window-lifecycle.ts
index 6b0a516baf94..1c464618d7d2 100644
--- a/src/main/window/runtime-window-lifecycle.ts
+++ b/src/main/window/runtime-window-lifecycle.ts
@@ -179,8 +179,8 @@ export function registerRuntimeWindowLifecycle(
       send('ui:focusTerminal', { tabId, worktreeId, leafId }),
     revealTerminalPane: (target) => revealTerminalPaneInWindow(mainWindow, target),
     focusEditorTab: (tabId, worktreeId) => send('ui:focusEditorTab', { tabId, worktreeId }),
-    closeSessionTab: (tabId, worktreeId) =>
-      requestSessionTabCloseFromRenderer(mainWindow, tabId, worktreeId),
+    closeSessionTab: (tabId, worktreeId, switchProjection) =>
+      requestSessionTabCloseFromRenderer(mainWindow, tabId, worktreeId, switchProjection),
     moveSessionTab: (worktreeId: string, move: RuntimeMobileSessionTabMove) =>
       send('ui:moveSessionTab', { worktreeId, ...move }),
     openFile: (worktreeId, filePath, relativePath, runtimeEnvironmentId?, navigation?, position?) =>
diff --git a/src/main/window/session-tab-close-request-relay.ts b/src/main/window/session-tab-close-request-relay.ts
index 07bec3d5ce6d..4e7286392242 100644
--- a/src/main/window/session-tab-close-request-relay.ts
+++ b/src/main/window/session-tab-close-request-relay.ts
@@ -14,16 +14,17 @@ const SESSION_TAB_CLOSE_RESPONSE_GRACE_MS = 5_000
 export async function requestSessionTabCloseFromRenderer(
   mainWindow: BrowserWindow,
   tabId: string,
-  worktreeId: string
-): Promise<void> {
+  worktreeId: string,
+  switchProjection?: SessionTabCloseRequest['switchProjection']
+): Promise<void | boolean> {
   if (mainWindow.isDestroyed() || mainWindow.webContents.isDestroyed()) {
     throw new Error('renderer_unavailable')
   }
   const webContents = mainWindow.webContents
   const requestId = randomUUID()
-  await new Promise<void>((resolve, reject) => {
+  return await new Promise<void | boolean>((resolve, reject) => {
     let settled = false
-    const finish = (error?: Error): void => {
+    const finish = (error?: Error, applied?: boolean): void => {
       if (settled) {
         return
       }
@@ -37,7 +38,7 @@ export async function requestSessionTabCloseFromRenderer(
       if (error) {
         reject(error)
       } else {
-        resolve()
+        resolve(applied)
       }
     }
     const onRendererUnavailable = (): void => finish(new Error('renderer_unavailable'))
@@ -45,7 +46,7 @@ export async function requestSessionTabCloseFromRenderer(
       if (event.sender !== webContents || response.requestId !== requestId) {
         return
       }
-      finish(response.error ? new Error(response.error) : undefined)
+      finish(response.error ? new Error(response.error) : undefined, response.switchApplied)
     }
     const expiresAt = Date.now() + SESSION_TAB_CLOSE_CONFIRMATION_MS
     const timeout = setTimeout(
@@ -58,7 +59,13 @@ export async function requestSessionTabCloseFromRenderer(
     webContents.once('destroyed', onRendererUnavailable)
     webContents.once('render-process-gone', onRendererUnavailable)
     webContents.once('did-start-loading', onRendererUnavailable)
-    const request: SessionTabCloseRequest = { requestId, tabId, worktreeId, expiresAt }
+    const request: SessionTabCloseRequest = {
+      requestId,
+      tabId,
+      worktreeId,
+      expiresAt,
+      ...(switchProjection ? { switchProjection } : {})
+    }
     try {
       webContents.send('ui:sessionTabCloseRequest', request)
     } catch {
diff --git a/src/preload/api/runtime-api.ts b/src/preload/api/runtime-api.ts
index cf8d10377f20..db80dd1ef93e 100644
--- a/src/preload/api/runtime-api.ts
+++ b/src/preload/api/runtime-api.ts
@@ -1,3 +1,4 @@
+import type { RuntimeRpcDispatchObservation } from '../../shared/runtime-rpc-envelope'
 import type { ManagedOrcadPreloadApi } from './managed-orcad-api'
 import type { WslHostsPreloadApi } from './wsl-hosts-api'
 import type { RuntimeHostStatusSnapshot } from '../../shared/runtime-host-status'
@@ -136,6 +137,8 @@ export type RuntimeApi = {
       params?: unknown
       timeoutMs?: number
       expectedEnvironmentPairingRevision?: number
+      observeDispatch?: boolean
+      dispatchObservation?: RuntimeRpcDispatchObservation
       expectedEnvironmentRuntimeId?: string
     }) => Promise<RuntimeRpcResponse<unknown>>
     cancelSubscription: (args: { subscriptionId: string }) => Promise<void>
@@ -147,9 +150,12 @@ export type RuntimeApi = {
         params?: unknown
         timeoutMs?: number
         expectedEnvironmentPairingRevision?: number
+        observeDispatch?: boolean
+        dispatchObservation?: RuntimeRpcDispatchObservation
         expectedEnvironmentRuntimeId?: string
       },
       callbacks: {
+        onSent?: (sentAt?: number) => void
         onResponse: (response: RuntimeRpcResponse<unknown>) => void
         onBinary?: (bytes: Uint8Array<ArrayBufferLike>) => void
         onError?: (error: { code: string; message: string }) => void
diff --git a/src/preload/api/runtime-environments-bridge.ts b/src/preload/api/runtime-environments-bridge.ts
index a0b4dea3be9b..e5e415ac96ec 100644
--- a/src/preload/api/runtime-environments-bridge.ts
+++ b/src/preload/api/runtime-environments-bridge.ts
@@ -1,3 +1,4 @@
+import type { RuntimeRpcDispatchObservation } from '../../shared/runtime-rpc-envelope'
 import { ipcRenderer } from 'electron'
 import {
   RUNTIME_HOST_STATUS_CHANNEL,
@@ -109,6 +110,8 @@ export const runtimeEnvironmentsApi = {
     params?: unknown
     timeoutMs?: number
     expectedEnvironmentPairingRevision?: number
+    observeDispatch?: boolean
+    dispatchObservation?: RuntimeRpcDispatchObservation
     expectedEnvironmentRuntimeId?: string
   }): Promise<RuntimeRpcResponse<unknown>> => ipcRenderer.invoke('runtimeEnvironments:call', args),
   cancelSubscription: (args: { subscriptionId: string }): Promise<void> =>
@@ -121,9 +124,12 @@ export const runtimeEnvironmentsApi = {
       params?: unknown
       timeoutMs?: number
       expectedEnvironmentPairingRevision?: number
+      observeDispatch?: boolean
+      dispatchObservation?: RuntimeRpcDispatchObservation
       expectedEnvironmentRuntimeId?: string
     },
     callbacks: {
+      onSent?: (sentAt?: number) => void
       onResponse: (response: RuntimeRpcResponse<unknown>) => void
       onBinary?: (bytes: Uint8Array<ArrayBufferLike>) => void
       onError?: (error: { code: string; message: string }) => void
diff --git a/src/preload/runtime-environment-subscriptions.ts b/src/preload/runtime-environment-subscriptions.ts
index d0d83110f16b..677260549523 100644
--- a/src/preload/runtime-environment-subscriptions.ts
+++ b/src/preload/runtime-environment-subscriptions.ts
@@ -1,3 +1,4 @@
+import type { RuntimeRpcDispatchObservation } from '../shared/runtime-rpc-envelope'
 import type { RuntimeRpcResponse } from '../shared/runtime-rpc-envelope'
 
 type RuntimeEnvironmentSubscribeArgs = {
@@ -7,10 +8,13 @@ type RuntimeEnvironmentSubscribeArgs = {
   params?: unknown
   timeoutMs?: number
   expectedEnvironmentPairingRevision?: number
+  observeDispatch?: boolean
+  dispatchObservation?: RuntimeRpcDispatchObservation
   expectedEnvironmentRuntimeId?: string
 }
 
 type RuntimeEnvironmentSubscriptionCallbacks = {
+  onSent?: (sentAt?: number) => void
   onResponse: (response: RuntimeRpcResponse<unknown>) => void
   onBinary?: (bytes: Uint8Array<ArrayBufferLike>) => void
   onError?: (error: { code: string; message: string }) => void
@@ -23,10 +27,16 @@ export type RuntimeEnvironmentSubscriptionHandle = {
 }
 
 type RuntimeEnvironmentSubscriptionEvent =
-  | { subscriptionId: string; type: 'response'; response: RuntimeRpcResponse<unknown> }
+  | {
+      subscriptionId: string
+      type: 'response'
+      response: RuntimeRpcResponse<unknown>
+      sentAt?: number
+    }
   | { subscriptionId: string; type: 'binary'; bytes: Uint8Array<ArrayBufferLike> }
   | { subscriptionId: string; type: 'error'; code: string; message: string }
   | { subscriptionId: string; type: 'close' }
+  | { subscriptionId: string; type: 'sent'; sentAt?: number }
 
 type RuntimeEnvironmentSubscriptionIpc = {
   invoke: (channel: string, args: unknown) => Promise<unknown>
@@ -90,7 +100,12 @@ function getOrCreateDispatcher(
     if (!subscriptionCallbacks) {
       return
     }
-    if (event.type === 'response') {
+    if (event.type === 'sent') {
+      subscriptionCallbacks.onSent?.(event.sentAt)
+    } else if (event.type === 'response') {
+      if (event.sentAt !== undefined) {
+        subscriptionCallbacks.onSent?.(event.sentAt)
+      }
       subscriptionCallbacks.onResponse(event.response)
     } else if (event.type === 'binary') {
       subscriptionCallbacks.onBinary?.(event.bytes)
diff --git a/src/renderer/src/components/native-chat/NativeChatMessageList.tsx b/src/renderer/src/components/native-chat/NativeChatMessageList.tsx
index f34874c12f9a..f9e655827e91 100644
--- a/src/renderer/src/components/native-chat/NativeChatMessageList.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatMessageList.tsx
@@ -1,3 +1,4 @@
+import { useSwitchPresentationRows } from '@/lib/conversation-switch-presentation'
 import {
   nativeChatTranscriptOuterClass,
   NATIVE_CHAT_TRANSCRIPT_COLUMN_CLASS
@@ -132,6 +133,7 @@ export function NativeChatMessageList({
     [journalItems]
   )
   const scrollRef = useRef<HTMLDivElement | null>(null)
+  useSwitchPresentationRows(scrollRef)
   const contentRef = useRef<HTMLDivElement | null>(null)
   const [expandedTurnIds, setExpandedTurnIds] = useState<ReadonlySet<string>>(new Set())
   const disclosures = useNativeChatDisclosures()
diff --git a/src/renderer/src/components/native-chat/NativeChatNoticeRow.tsx b/src/renderer/src/components/native-chat/NativeChatNoticeRow.tsx
index eef632ccb8ae..5ef9f631cd99 100644
--- a/src/renderer/src/components/native-chat/NativeChatNoticeRow.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatNoticeRow.tsx
@@ -1,3 +1,4 @@
+import { useSwitchFailureSuppressed } from '@/lib/conversation-switch-presentation'
 import { AlertCircle, AlertTriangle, Info } from 'lucide-react'
 import { useTranslation } from 'react-i18next'
 import type { CommentMarkdownLinkClickHandler } from '@/components/sidebar/CommentMarkdown'
@@ -67,11 +68,15 @@ export function NativeChatNoticeRow({
   agentName?: string
   onLinkClick?: CommentMarkdownLinkClickHandler
   allowFileUriLinks?: boolean
-}): React.JSX.Element {
+}): React.JSX.Element | null {
+  const switchSuppressed = useSwitchFailureSuppressed(messageId)
   useTranslation()
   const orcaStopView = useNativeChatOrcaStopView()
   const claudeSignIn = useNativeChatClaudeSignInView()
   const look = nativeChatNoticeLook(block)
+  if (switchSuppressed) {
+    return null
+  }
   if (look.kind === 'divider') {
     const label =
       look.label === 'contextCleared'
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx
index 7062c4863dc8..a9f71dbd7589 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx
@@ -3,7 +3,7 @@ import { z } from 'zod'
 import { createGlobalSettingsFixture } from '../../../../shared/global-settings-test-fixture'
 import { makeRepo, makeWorktree } from '../worktree-jump-palette-test-fixtures'
 import { agentSessionTabFixture } from './native-chat-workspace-test-fixtures'
-import * as cliSwitch from '../tab-bar/native-chat-cli-switch-run'
+import * as cliSwitch from '@/lib/conversation-surface-switch'
 import { useAppStore } from '@/store'
 import { makeTabGroup } from '@/store/slices/store-test-helpers'
 import * as cliFork from '../tab-bar/native-chat-cli-fork-run'
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.switch-readable.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.switch-readable.test.tsx
new file mode 100644
index 000000000000..469fdc674451
--- /dev/null
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.switch-readable.test.tsx
@@ -0,0 +1,277 @@
+import { writeFile } from 'node:fs/promises'
+import { join } from 'node:path'
+import * as cliTranscript from '../../../../main/ai-vault/structured-chat-cli-fork'
+import { createRestTestRig } from '../../../../main/native-chat/agent-session-wire/structured-agent-session-rest-test-rig'
+import {
+  createTestParams,
+  CREATE_TEST_CALLER
+} from '../../../../main/native-chat/agent-session-wire/structured-agent-session-create-test-fixture'
+import { HOST_TEST_SESSION } from '../../../../main/native-chat/agent-session-wire/structured-agent-session-host-test-data'
+import { setStructuredAgentSessionHost } from '../../../../main/native-chat/agent-session-wire/structured-agent-session-registry'
+import {
+  setupMainOwnedWorkspace,
+  WORKTREE_ID
+} from '../../../../main/runtime/main-owned-workspace-runtime-fixture'
+import { executeStructuredSessionSwitch } from '../../../../main/runtime/rpc/methods/structured-agent-session-switch-execution'
+import { structuredAgentRuntimeRegistration } from '../../../../main/runtime/structured-agent-runtime-registrations'
+import { agentSessionProviderHandleChainHead } from '../../../../shared/agent-session-provider-handle'
+import { act, cleanup, render, screen, waitFor } from '@testing-library/react'
+import { afterEach, expect, it, vi } from 'vitest'
+import { agentSessionRefusalError } from '../../../../shared/agent-session-wire-refusals'
+import { beginSwitchPresentation } from '@/lib/conversation-switch-presentation'
+import { NativeChatStructuredSession } from './NativeChatStructuredSession'
+import {
+  stubLayout,
+  stubResizeObserver,
+  deliverResizes
+} from './native-chat-windowing-test-harness'
+import { resetStructuredAgentSessionReadOwnersForTests } from './structured-agent-session-read-owner'
+import type { AgentSessionHistoryResult } from '../../../../shared/agent-session-wire'
+import type * as StructuredAgentSessionClientModule from '@/runtime/structured-agent-session-client'
+import type { AgentSessionSubscribeEvent } from '../../../../shared/agent-session-wire'
+
+// @vitest-environment happy-dom
+
+const { mocks, moduleFactories, resetStructuredSessionMocks } = await vi.hoisted(async () =>
+  (await import('./NativeChatStructuredSession.test-harness')).createStructuredSessionMocks()
+)
+const feed = vi.hoisted(() => ({ cursor: { epoch: 'epoch', sequence: 1 } }))
+vi.mock('@/lib/structured-agent-session-launch', () =>
+  moduleFactories.structuredAgentSessionLaunch()
+)
+vi.mock('@/runtime/structured-agent-session-client', async (actual) => ({
+  ...(await actual<typeof StructuredAgentSessionClientModule>()),
+  callStructuredAgentSession: mocks.call,
+  subscribeStructuredAgentSession: async (
+    _target: unknown,
+    params: { sessionId: string },
+    onEvent: (event: AgentSessionSubscribeEvent) => void
+  ) => {
+    onEvent({
+      type: 'batch',
+      sessionId: params.sessionId,
+      batch: {
+        cursor: feed.cursor,
+        items: [],
+        removedItemIds: [],
+        submissions: []
+      }
+    })
+    return { unsubscribe: () => {} }
+  },
+  subscribeStructuredAgentSessionStatus: async () => ({ unsubscribe: () => {} }),
+  supportsStructuredAgentSessionQuietRepeatedStop: async () => false
+}))
+vi.mock('./use-native-chat-font-size', () => moduleFactories.useNativeChatFontSize())
+vi.mock('./use-native-chat-file-link-context', () => moduleFactories.useNativeChatFileLinkContext())
+vi.mock('./use-native-chat-file-link-click', () => moduleFactories.useNativeChatFileLinkClick())
+vi.mock('./NativeChatComposer', () => moduleFactories.nativeChatComposer())
+vi.mock('./NativeChatApprovalCard', () => moduleFactories.nativeChatApprovalCard())
+vi.mock('./NativeChatQuestionCard', () => moduleFactories.nativeChatQuestionCard())
+const restores: (() => void)[] = []
+const disposals: (() => Promise<void>)[] = []
+afterEach(async () => {
+  cleanup()
+  for (const dispose of disposals.splice(0)) {
+    await dispose()
+  }
+  setStructuredAgentSessionHost(null)
+  resetStructuredAgentSessionReadOwnersForTests()
+  resetStructuredSessionMocks()
+  for (const restore of restores.splice(0).toReversed()) {
+    restore()
+  }
+  vi.restoreAllMocks()
+})
+it.each(['readable', 'refused', 'unmounted'] as const)(
+  'acknowledges the real cold root only after its first history is %s',
+  async (outcome) => {
+    const restoreLayout = stubLayout()
+    const restoreResize = stubResizeObserver()
+    restores.push(restoreLayout, restoreResize)
+    vi.spyOn(HTMLElement.prototype, 'getBoundingClientRect').mockImplementation(() => ({
+      x: 0,
+      y: 0,
+      top: 0,
+      left: 0,
+      right: 800,
+      bottom: 600,
+      width: 800,
+      height: 600,
+      toJSON: () => ({})
+    }))
+    const rig = await createRestTestRig({ idleSweep: { intervalMs: 60_000 } })
+    disposals.push(rig.dispose)
+    const params = createTestParams()
+    await rig.host.create(
+      CREATE_TEST_CALLER,
+      createTestParams(undefined, {
+        location: { ...params.location, workspaceId: WORKTREE_ID }
+      })
+    )
+    setStructuredAgentSessionHost(rig.host)
+    await rig.host.switchToChat(HOST_TEST_SESSION)
+    await rig.host.switchToTerminal(HOST_TEST_SESSION)
+    rig.adapter.acquire.mockClear()
+    const record = rig.store.getRecord(HOST_TEST_SESSION)!
+    const head = agentSessionProviderHandleChainHead(record.providerHandleChain)!
+    const nativeId = head.handle.nativeId
+    const filePath = join(rig.root, 'readable.jsonl')
+    await writeFile(
+      filePath,
+      `${[
+        { type: 'session_meta', payload: { id: nativeId } },
+        { type: 'event_msg', payload: { type: 'task_started', turn_id: 'terminal-turn' } },
+        {
+          type: 'response_item',
+          payload: {
+            type: 'message',
+            role: 'assistant',
+            content: [{ type: 'output_text', text: 'Readable before Codex is ready' }]
+          }
+        },
+        { type: 'event_msg', payload: { type: 'task_complete', turn_id: 'terminal-turn' } }
+      ]
+        .map((row) => JSON.stringify({ timestamp: '2026-10-26T12:00:00Z', ...row }))
+        .join('\n')}\n`
+    )
+    // External lookup is the I/O boundary; import, journal, command, receipt and root stay real.
+    vi.spyOn(cliTranscript, 'resolveStructuredChatCliSource').mockResolvedValue({
+      host: rig.host,
+      record,
+      head,
+      agent: 'codex',
+      cwd: rig.root,
+      providerSessionId: nativeId,
+      registration: structuredAgentRuntimeRegistration('codex')!
+    })
+    vi.spyOn(cliTranscript, 'prepareStructuredChatCliTranscript').mockResolvedValue({
+      useRealCodexHome: false,
+      cliForkSource: {
+        agent: 'codex',
+        sourceAgent: 'codex',
+        sessionId: nativeId,
+        filePath,
+        cwd: rig.root,
+        codexHome: null,
+        executionHostPlatform: process.platform
+      }
+    })
+    const { runtime } = setupMainOwnedWorkspace()
+    vi.spyOn(runtime, 'inspectTerminalProcess').mockResolvedValue({
+      foregroundProcess: 'zsh',
+      hasChildProcesses: false,
+      childProcessEvidence: 'no-children',
+      switchWitness: 'before-probe'
+    })
+    vi.spyOn(runtime, 'publishStructuredAgentSessionTab').mockImplementation(async (input) => {
+      input.check?.()
+      await rig.store.setSessionTabVisibility(HOST_TEST_SESSION, true)
+    })
+    const close = vi.spyOn(runtime, 'closeSwitchedSourceTerminal').mockResolvedValue(true)
+    const invocation = {
+      sessionId: HOST_TEST_SESSION,
+      execution: {
+        invocationId: 'root-readable',
+        source: { terminal: 'source', expectedIncarnationId: 'source-incarnation' }
+      }
+    }
+    const viewResult = await executeStructuredSessionSwitch(invocation, { runtime }, 'chat')
+    if (viewResult.status !== 'present') {
+      throw new Error('missing presentation')
+    }
+    const page = await rig.host.history({ sessionId: HOST_TEST_SESSION, direction: 'tail' })
+    if (!page.ok) {
+      throw new Error('missing imported history')
+    }
+    feed.cursor = page.page.liveCursor
+    const read = Promise.withResolvers<AgentSessionHistoryResult>()
+    mocks.call.mockImplementation(async (_target, method) => {
+      if (method === 'agentSession.history') {
+        return read.promise
+      }
+      return { ok: true, models: [], current: { model: '' } }
+    })
+    const visit = beginSwitchPresentation({ kind: 'local' }, HOST_TEST_SESSION)
+    const shown = vi.fn()
+    const completion = visit.shown.then(async (readable) => {
+      shown(readable)
+      return executeStructuredSessionSwitch(
+        {
+          ...invocation,
+          execution: {
+            ...invocation.execution,
+            receipt: { generation: viewResult.generation, shown: readable }
+          }
+        },
+        { runtime },
+        'chat'
+      )
+    })
+    const view = render(
+      <NativeChatStructuredSession
+        isVisible
+        isFocusedGroup
+        tabId="cold-tab"
+        sessionId={HOST_TEST_SESSION}
+        target={{ kind: 'local' }}
+        agent="codex"
+      />
+    )
+    await waitFor(() =>
+      expect(mocks.call).toHaveBeenCalledWith(
+        expect.anything(),
+        'agentSession.history',
+        expect.anything()
+      )
+    )
+    expect(shown).not.toHaveBeenCalled()
+    expect(rig.adapter.acquire).not.toHaveBeenCalled()
+    expect(close).not.toHaveBeenCalled()
+    expect(screen.getByRole('status', { name: 'Loading chat' })).toBeTruthy()
+    if (outcome === 'unmounted') {
+      view.unmount()
+    }
+    await act(async () =>
+      outcome === 'refused'
+        ? read.reject(
+            agentSessionRefusalError('agent_session_journal_unreadable', {
+              reason: 'journalCorrupt'
+            })
+          )
+        : read.resolve(page)
+    )
+    await waitFor(() => {
+      act(() => {
+        deliverResizes()
+      })
+      expect(shown).toHaveBeenCalledExactlyOnceWith(outcome === 'readable')
+    })
+    const opened = await completion
+    if (outcome === 'readable') {
+      expect(screen.getByText('Readable before Codex is ready')).toBeTruthy()
+      expect(opened).toMatchObject({ status: 'completed', startupPending: true })
+      await executeStructuredSessionSwitch(
+        {
+          ...invocation,
+          execution: {
+            ...invocation.execution,
+            observe: true
+          }
+        },
+        { runtime },
+        'chat'
+      )
+      expect(rig.adapter.acquire).toHaveBeenCalledOnce()
+      expect(close).toHaveBeenCalledOnce()
+    } else {
+      expect(opened).toMatchObject({
+        status: 'uncertain',
+        refusal: { details: { reason: 'tabUnconfirmed' } }
+      })
+      expect(rig.adapter.acquire).not.toHaveBeenCalled()
+      expect(close).not.toHaveBeenCalled()
+    }
+    visit.release()
+  }
+)
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx
index 5af2ef892cba..c281d37be893 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx
@@ -1,3 +1,7 @@
+import {
+  SwitchPresentationContext,
+  useSwitchPresentation
+} from '@/lib/conversation-switch-presentation'
 import { cn } from '@/lib/utils'
 import { NATIVE_CHAT_APPEARANCE_ROOT_CLASS } from './native-chat-appearance-style'
 import { useNativeChatStoreAppearanceStyle } from './use-native-chat-store-appearance-style'
@@ -36,7 +40,6 @@ import { NativeChatStructuredSessionStatus } from './NativeChatStructuredSession
 import { useNativeChatLaunchDraftSignal } from './use-native-chat-launch-draft-adoption'
 import { useNativeChatInterruptedContinuation } from './NativeChatInterruptedContinue'
 import { NativeChatOrcaStopContext } from './native-chat-orca-stop-context'
-import { structuredSessionNotices } from './native-chat-structured-session-notices'
 import { NativeChatPromptSlotNotices } from './NativeChatComposerNotices'
 import { NativeChatInstallSlot, useNativeChatInstallSlot } from './NativeChatInstallSlot'
 import { useNativeChatComposerError } from './use-native-chat-composer-notice'
@@ -53,19 +56,13 @@ import { useNativeChatStructuredComposerTransport } from './use-native-chat-stru
 import { NativeChatStructuredGoalStrip } from './NativeChatStructuredGoalStrip'
 import { nativeChatPaneHeader, nativeChatPaneCaptureHandlers } from './NativeChatPaneHeader'
 import { structuredAgentSessionReadFailureNotice } from './structured-agent-session-read-failure-notice'
-import { useStructuredAgentSessionDeliveryNotices } from './use-structured-agent-session-delivery-notices'
-import { dispatchWasWithdrawn } from '../../../../shared/structured-agent-session-dispatch-rejection'
 import { useNativeChatHostOutage } from './use-native-chat-host-outage'
 import { useNativeChatHostOutageNotice } from './use-native-chat-host-outage-notice'
 import { useNativeChatHostPermissionGate } from './use-native-chat-host-permission-gate'
-import { useNativeChatAvailabilityNotice } from './use-native-chat-availability-notice'
-import { useStructuredAgentSessionStartFailureFacts } from './use-structured-agent-session-start-failure-facts'
 import { pendingPromptsAllUnanswerableHere } from '../../../../shared/agent-session-approval-subject'
-import {
-  isClaudeSignInFailureKind,
-  NativeChatClaudeSignInContext,
-  useNativeChatClaudeSignIn
-} from './native-chat-claude-sign-in'
+import { NativeChatClaudeSignInContext } from './native-chat-claude-sign-in'
+import { useStructuredSessionNotices } from './native-chat-structured-session-notices'
+import { useStructuredNativeChatDelivery } from './use-structured-native-chat-delivery'
 
 export function NativeChatStructuredSession(
   props: Omit<NativeChatStructuredViewProps, 'mode'>
@@ -129,21 +126,13 @@ export function NativeChatStructuredSession(
   const hostHeld = hostPermission.sendBlockedReason !== null
   const submits = useStructuredNativeChatSubmitReveal(controller, provisionalLaunch.retry, hostHeld)
   const promptResponse = useStructuredPromptResponseHold(submits.respond)
-  const needsFailureFacts =
-    submits.queuedMessages.cards.some((card) => card.state === 'returned') ||
-    controller.submissions.some(
-      (submission) => submission.dispatchState === 'rejected' && !dispatchWasWithdrawn(submission)
-    )
-  const startFailures = useStructuredAgentSessionStartFailureFacts(
-    controller.journalItems,
-    needsFailureFacts || props.agent === 'claude'
-  )
-  const deliveryNotices = useStructuredAgentSessionDeliveryNotices({
+  const { startFailures, deliveryNotices, signInFailureRows } = useStructuredNativeChatDelivery({
     pending: controller.pending,
     submissions: controller.submissions,
     journalItems: controller.journalItems,
-    startFailures,
-    agentName: agentLabel
+    agent: props.agent,
+    agentName: agentLabel,
+    hasReturnedMessages: submits.queuedMessages.cards.some((card) => card.state === 'returned')
   })
   // A lost contact is the host notice's to say; the read adds only a refusal the host sent.
   const readFailure =
@@ -153,6 +142,19 @@ export function NativeChatStructuredSession(
   // Final read refusal replaces the pane because no existing action can succeed.
   const readFailedFinally = readFailure?.final === true
   const viewState = selectNativeChatViewState(session, { readRetries: !readFailedFinally })
+  const switchPresentation = useSwitchPresentation(
+    props.target,
+    props.sessionId,
+    props.isVisible,
+    (controller.readCurrent || provisionalLaunch.launch?.kind === 'new') &&
+      (viewState.kind === 'ready' || viewState.kind === 'empty')
+      ? viewState.kind === 'empty'
+        ? 'empty'
+        : 'readable'
+      : controller.status === 'error'
+        ? 'failed'
+        : 'pending'
+  )
   const paneActive = props.isVisible && props.isFocusedGroup
   useNativeChatFontSize(viewState.kind === 'ready' && paneActive, rootRef)
   const find = useNativeChatFind(paneActive, rootRef, composerRef, submits.messageListRef)
@@ -235,34 +237,31 @@ export function NativeChatStructuredSession(
   const sessionError =
     viewState.kind === 'error' || !readFailure ? controller.error : readFailure.text
   const launch = { ...provisionalLaunch, retry: submits.retryLaunch }
-  const availability = useNativeChatAvailabilityNotice({
-    unavailable: controller.unavailable,
-    agent: props.agent,
-    agentLabel,
-    launchFailure: provisionalLaunch.lifecycle === 'failed' ? provisionalLaunch.failure : null,
-    journalItems: controller.journalItems,
-    submissions: controller.submissions,
-    deliveryNotices
-  })
-  const claudeSignIn = useNativeChatClaudeSignIn({
-    agent: props.agent,
-    target: props.target,
-    failure: provisionalLaunch.failure,
-    failureRows: startFailures.filter((fact) => isClaudeSignInFailureKind(fact.kind)).length
-  })
-  // While Install shows, it says what to do; a start failure's "send again" or Retry can't help.
-  const notices = structuredSessionNotices({
-    launch: install.slot.kind === 'install' ? { ...launch, lifecycle: null } : launch,
-    agentLabel,
-    sessionError,
-    composerError: composerError ?? continuation.continueError,
-    claudeSignIn,
-    availability,
-    hostPermission: hostPermission.notice
+  const { claudeSignIn, notices } = useStructuredSessionNotices({
+    availability: {
+      unavailable: controller.unavailable,
+      agent: props.agent,
+      agentLabel,
+      launchFailure: provisionalLaunch.lifecycle === 'failed' ? provisionalLaunch.failure : null,
+      journalItems: controller.journalItems,
+      submissions: controller.submissions,
+      deliveryNotices
+    },
+    signIn: {
+      agent: props.agent,
+      target: props.target,
+      failure: provisionalLaunch.failure,
+      failureRows: signInFailureRows
+    },
+    notices: {
+      launch: install.slot.kind === 'install' ? { ...launch, lifecycle: null } : launch,
+      agentLabel,
+      sessionError,
+      composerError: composerError ?? continuation.continueError,
+      hostPermission: hostPermission.notice
+    },
+    hostNotice
   })
-  if (hostNotice) {
-    notices.push(hostNotice)
-  }
   const controls = { find, session: props, working: controller.isWorking }
   const paneHeader = nativeChatPaneHeader(
     props,
@@ -271,143 +270,145 @@ export function NativeChatStructuredSession(
     !find.isOpen && <NativeChatTopRightControls {...controls} inline />
   )
   return (
-    <div
-      ref={rootRef}
-      data-native-chat-root="true"
-      data-native-chat-working={controller.isWorking ? 'true' : 'false'}
-      tabIndex={-1}
-      {...nativeChatPaneCaptureHandlers(find, paneCommands, rootInput)}
-      onContextMenuCapture={paneCommands.onContextMenuCapture}
-      className={cn(
-        NATIVE_CHAT_APPEARANCE_ROOT_CLASS,
-        'flex h-full min-h-0 w-full flex-col focus:outline-none'
-      )}
-      style={appearanceStyle}
-      data-native-chat-scheme={appearanceStyle.colorScheme}
-    >
-      {paneHeader}
-      <NativeChatContextClearFade clearing={controller.contextClear.clearing}>
-        {(find.isOpen || !paneHeader) && <NativeChatTopRightControls {...controls} />}
-        {viewState.kind === 'loading' || (viewState.kind === 'error' && !readFailure) ? (
-          historyPhase !== 'unread' && <NativeChatLoadingCue />
-        ) : viewState.kind === 'error' ? (
-          <NativeChatEmptyState
-            kind="error"
-            retrying={!readFailure?.final}
-            {...(readFailure?.named ? { headline: readFailure.text } : {})}
-          />
-        ) : viewState.kind === 'empty' ? (
-          <NativeChatEmptyPane slot={install.slot} agent={props.agent} />
-        ) : (
-          <NativeChatRewindContext.Provider value={controller.rewind.surface}>
-            <NativeChatOrcaStopContext.Provider value={continuation.view}>
-              <NativeChatClaudeSignInContext.Provider value={claudeSignIn}>
-                <NativeChatMessageList
-                  // A rewind or a /clear replaces the conversation; nothing the old one held carries over.
-                  key={`${controller.epoch}:${controller.contextClear.clears}`}
-                  ref={submits.messageListRef}
-                  session={session}
-                  journalItems={controller.journalItems}
-                  journalSubmissions={controller.submissions}
-                  journalLatestTurn={controller.latestTurn}
-                  journalHostWork={controller.hostWork}
-                  subagentRoster={controller.subagentRoster}
-                  railOutline={controller.railOutline}
-                  isVisible={props.isVisible}
-                  isWorking={controller.isWorking}
-                  expandSignal={false}
-                  workingStartedAt={controller.workingStartedAt}
-                  settledTurns={controller.settledTurns}
-                  awaitingInput={prompt === null ? null : 'shown'}
-                  turnActivity={controller.turnActivity}
-                  stopping={stopControls.stopping}
-                  {...fileLinkProps}
-                  runtimeContext={imageRuntimeContext}
-                  deliveryNotices={deliveryNotices}
-                />
-              </NativeChatClaudeSignInContext.Provider>
-            </NativeChatOrcaStopContext.Provider>
-          </NativeChatRewindContext.Provider>
+    <SwitchPresentationContext.Provider value={switchPresentation}>
+      <div
+        ref={rootRef}
+        data-native-chat-root="true"
+        data-native-chat-working={controller.isWorking ? 'true' : 'false'}
+        tabIndex={-1}
+        {...nativeChatPaneCaptureHandlers(find, paneCommands, rootInput)}
+        onContextMenuCapture={paneCommands.onContextMenuCapture}
+        className={cn(
+          NATIVE_CHAT_APPEARANCE_ROOT_CLASS,
+          'flex h-full min-h-0 w-full flex-col focus:outline-none'
         )}
-      </NativeChatContextClearFade>
-      {readFailedFinally ? null : (
-        <>
-          {/* Keep queued drafts outside the transcript and above the background-task dock. */}
-          <NativeChatQueuedMessageList
-            controller={submits.queuedMessages}
-            chatWorktreeId={ownerWorktreeId ?? null}
-            agentName={agentLabel}
-            statedFailures={startFailures}
-            steerHeld={stopControls.stopping || hostHeld}
-            focusComposer={focusComposer}
-            editAttachTo={{ terminalTabId: props.tabId, transport: structuredTransport }}
-          />
-          <NativeChatStructuredSessionStatus
-            sessionId={props.sessionId}
-            paneKey={paneKey}
-            isVisible={props.isVisible}
-            backgroundTasks={controller.backgroundTasks}
-            stopBackgroundTask={controller.stopBackgroundTask}
-          />
-          {prompt ? null : (
-            <NativeChatStructuredGoalStrip
-              sessionId={props.sessionId}
-              threadGoal={controller.threadGoal}
-              transport={structuredTransport}
-              isWorking={controller.isWorking}
-              isVisible={props.isVisible}
-              turnId={controller.turnId}
-              workingStartedAt={controller.workingStartedAt}
+        style={appearanceStyle}
+        data-native-chat-scheme={appearanceStyle.colorScheme}
+      >
+        {paneHeader}
+        <NativeChatContextClearFade clearing={controller.contextClear.clearing}>
+          {(find.isOpen || !paneHeader) && <NativeChatTopRightControls {...controls} />}
+          {viewState.kind === 'loading' || (viewState.kind === 'error' && !readFailure) ? (
+            historyPhase !== 'unread' && <NativeChatLoadingCue />
+          ) : viewState.kind === 'error' ? (
+            <NativeChatEmptyState
+              kind="error"
+              retrying={!readFailure?.final}
+              {...(readFailure?.named ? { headline: readFailure.text } : {})}
             />
+          ) : viewState.kind === 'empty' ? (
+            <NativeChatEmptyPane slot={install.slot} agent={props.agent} />
+          ) : (
+            <NativeChatRewindContext.Provider value={controller.rewind.surface}>
+              <NativeChatOrcaStopContext.Provider value={continuation.view}>
+                <NativeChatClaudeSignInContext.Provider value={claudeSignIn}>
+                  <NativeChatMessageList
+                    // A rewind or a /clear replaces the conversation; nothing the old one held carries over.
+                    key={`${controller.epoch}:${controller.contextClear.clears}`}
+                    ref={submits.messageListRef}
+                    session={session}
+                    journalItems={controller.journalItems}
+                    journalSubmissions={controller.submissions}
+                    journalLatestTurn={controller.latestTurn}
+                    journalHostWork={controller.hostWork}
+                    subagentRoster={controller.subagentRoster}
+                    railOutline={controller.railOutline}
+                    isVisible={props.isVisible}
+                    isWorking={controller.isWorking}
+                    expandSignal={false}
+                    workingStartedAt={controller.workingStartedAt}
+                    settledTurns={controller.settledTurns}
+                    awaitingInput={prompt === null ? null : 'shown'}
+                    turnActivity={controller.turnActivity}
+                    stopping={stopControls.stopping}
+                    {...fileLinkProps}
+                    runtimeContext={imageRuntimeContext}
+                    deliveryNotices={deliveryNotices}
+                  />
+                </NativeChatClaudeSignInContext.Provider>
+              </NativeChatOrcaStopContext.Provider>
+            </NativeChatRewindContext.Provider>
           )}
-          {composerShown ? null : <NativeChatPromptSlotNotices notices={notices} />}
-          {prompt && approval ? (
-            <NativeChatApprovalCard
-              key={`${prompt.itemId}:${prompt.revision}`}
-              approval={approval}
-              onChoose={(optionId) =>
-                void promptResponse.respond(prompt, { kind: 'option', optionId })
-              }
-              isSubmitting={promptResponse.holds(prompt)}
-              onCancel={cancelPrompt}
-              shouldFocus={!promptsUnanswerable && props.isVisible && props.isFocusedGroup}
-              {...fileLinkProps}
-            />
-          ) : null}
-          {prompt && questionBody ? (
-            <NativeChatStructuredQuestionCard
-              key={`${prompt.itemId}:${prompt.revision}`}
-              questions={agentSessionPromptQuestions(questionBody)}
-              onAnswer={(response) => void promptResponse.respond(prompt, response)}
-              isSubmitting={promptResponse.holds(prompt)}
-              onCancel={cancelPrompt}
-              shouldFocus={!promptsUnanswerable && props.isVisible && props.isFocusedGroup}
-              answerInputRef={questionAnswerInputRef}
+        </NativeChatContextClearFade>
+        {readFailedFinally ? null : (
+          <>
+            {/* Keep queued drafts outside the transcript and above the background-task dock. */}
+            <NativeChatQueuedMessageList
+              controller={submits.queuedMessages}
+              chatWorktreeId={ownerWorktreeId ?? null}
+              agentName={agentLabel}
+              statedFailures={startFailures}
+              steerHeld={stopControls.stopping || hostHeld}
+              focusComposer={focusComposer}
+              editAttachTo={{ terminalTabId: props.tabId, transport: structuredTransport }}
             />
-          ) : null}
-          {prompt ? null : <NativeChatStructuredAsyncQuestion {...asyncQuestion} />}
-          {composerShown && <NativeChatInstallSlot slot={install.slot} agentLabel={agentLabel} />}
-          {composerShown ? (
-            <NativeChatComposer
-              ref={composerRef}
-              terminalTabId={props.tabId}
+            <NativeChatStructuredSessionStatus
+              sessionId={props.sessionId}
               paneKey={paneKey}
-              draftScopeKey={structuredAgentSessionDraftScopeKey(props.sessionId)}
-              targetPtyId={null}
-              agent={props.agent}
-              {...stopControls.composer}
-              unavailableHint={install.unavailableHint}
-              steerQueued={stopControls.stopping ? undefined : submits.queuedMessages.steerNewest}
-              structuredTransport={structuredTransport}
-              launchSeed={{ ...launchDraftSignal, ownsTabWideLaunchDraft: true }}
-              notices={notices}
-              recallSource={{ messages: session.messages, withoutImageMarkers: true }}
+              isVisible={props.isVisible}
+              backgroundTasks={controller.backgroundTasks}
+              stopBackgroundTask={controller.stopBackgroundTask}
             />
-          ) : null}
-        </>
-      )}
-      {paneCommands.menu}
-      <LinkActionPopover request={linkActionRequest} onClose={closeLinkActions} />
-    </div>
+            {prompt ? null : (
+              <NativeChatStructuredGoalStrip
+                sessionId={props.sessionId}
+                threadGoal={controller.threadGoal}
+                transport={structuredTransport}
+                isWorking={controller.isWorking}
+                isVisible={props.isVisible}
+                turnId={controller.turnId}
+                workingStartedAt={controller.workingStartedAt}
+              />
+            )}
+            {composerShown ? null : <NativeChatPromptSlotNotices notices={notices} />}
+            {prompt && approval ? (
+              <NativeChatApprovalCard
+                key={`${prompt.itemId}:${prompt.revision}`}
+                approval={approval}
+                onChoose={(optionId) =>
+                  void promptResponse.respond(prompt, { kind: 'option', optionId })
+                }
+                isSubmitting={promptResponse.holds(prompt)}
+                onCancel={cancelPrompt}
+                shouldFocus={!promptsUnanswerable && props.isVisible && props.isFocusedGroup}
+                {...fileLinkProps}
+              />
+            ) : null}
+            {prompt && questionBody ? (
+              <NativeChatStructuredQuestionCard
+                key={`${prompt.itemId}:${prompt.revision}`}
+                questions={agentSessionPromptQuestions(questionBody)}
+                onAnswer={(response) => void promptResponse.respond(prompt, response)}
+                isSubmitting={promptResponse.holds(prompt)}
+                onCancel={cancelPrompt}
+                shouldFocus={!promptsUnanswerable && props.isVisible && props.isFocusedGroup}
+                answerInputRef={questionAnswerInputRef}
+              />
+            ) : null}
+            {prompt ? null : <NativeChatStructuredAsyncQuestion {...asyncQuestion} />}
+            {composerShown && <NativeChatInstallSlot slot={install.slot} agentLabel={agentLabel} />}
+            {composerShown ? (
+              <NativeChatComposer
+                ref={composerRef}
+                terminalTabId={props.tabId}
+                paneKey={paneKey}
+                draftScopeKey={structuredAgentSessionDraftScopeKey(props.sessionId)}
+                targetPtyId={null}
+                agent={props.agent}
+                {...stopControls.composer}
+                unavailableHint={install.unavailableHint}
+                steerQueued={stopControls.stopping ? undefined : submits.queuedMessages.steerNewest}
+                structuredTransport={structuredTransport}
+                launchSeed={{ ...launchDraftSignal, ownsTabWideLaunchDraft: true }}
+                notices={notices}
+                recallSource={{ messages: session.messages, withoutImageMarkers: true }}
+              />
+            ) : null}
+          </>
+        )}
+        {paneCommands.menu}
+        <LinkActionPopover request={linkActionRequest} onClose={closeLinkActions} />
+      </div>
+    </SwitchPresentationContext.Provider>
   )
 }
diff --git a/src/renderer/src/components/native-chat/NativeChatTopRightControls.tsx b/src/renderer/src/components/native-chat/NativeChatTopRightControls.tsx
index 5a83ed41b23a..3aceeea8296c 100644
--- a/src/renderer/src/components/native-chat/NativeChatTopRightControls.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatTopRightControls.tsx
@@ -1,3 +1,4 @@
+import { useConversationSwitchReadiness } from '@/lib/conversation-surface-switch'
 import { isNativeChatEnabled } from '../../../../shared/structured-native-chat-launch-route'
 import { SquareTerminal } from 'lucide-react'
 import { Button } from '@/components/ui/button'
@@ -7,10 +8,7 @@ import { useAppStore } from '@/store'
 import { useInPlaceSwitchCapability } from '@/lib/in-place-switch-support'
 import { AI_VAULT_AGENTS } from '../../../../shared/ai-vault-types'
 import { SwitchToCliTooltipText } from '../right-sidebar/ai-vault-session-cli-fork-copy'
-import {
-  runNativeChatCliSwitch,
-  useNativeChatCliSwitchPending
-} from '../tab-bar/native-chat-cli-switch-run'
+import { runNativeChatCliSwitch } from '@/lib/conversation-surface-switch'
 import { resolveTabSessionHistorySubject } from '../tab-bar/tab-session-history-switch'
 import { NativeChatFindBar } from './NativeChatFindBar'
 import type { NativeChatFind } from './use-native-chat-find'
@@ -21,7 +19,6 @@ import { useNativeChatTabOwnerWorktreeId } from './use-native-chat-tab-owner'
 export function NativeChatTopRightControls({
   find,
   session,
-  working,
   inline = false
 }: {
   find: NativeChatFind
@@ -42,7 +39,18 @@ export function NativeChatTopRightControls({
   })
   const agent = AI_VAULT_AGENTS.find((candidate) => candidate === session.agent)
   const inPlace = useInPlaceSwitchCapability(hostId, agent)
-  const pending = useNativeChatCliSwitchPending(session.sessionId)
+  const readiness = useConversationSwitchReadiness(
+    worktreeId && hostId && agent
+      ? {
+          direction: 'terminal',
+          sessionId: session.sessionId,
+          workspaceId: worktreeId,
+          executionHostId: hostId,
+          agent,
+          chatTabId: session.tabId
+        }
+      : null
+  )
   const enabled = useAppStore((state) => isNativeChatEnabled(state.settings))
   if (find.isOpen) {
     return <NativeChatFindBar find={find} isVisible={session.isVisible} />
@@ -60,11 +68,10 @@ export function NativeChatTopRightControls({
             variant={inline ? 'pane-title' : 'ghost'}
             size="icon-xs"
             aria-label={label}
-            // Not `disabled` while a reply runs: the tooltip has to say why.
-            aria-disabled={working || undefined}
-            disabled={pending || inPlace !== true}
+            aria-disabled={!readiness.ready || undefined}
+            disabled={!readiness.ready || inPlace !== true}
             onClick={() => {
-              if (!working && inPlace === true) {
+              if (readiness.ready && inPlace === true) {
                 void runNativeChatCliSwitch({
                   sessionId: session.sessionId,
                   workspaceId: worktreeId,
@@ -85,11 +92,8 @@ export function NativeChatTopRightControls({
               'Switching {{agent}} is not available yet.',
               { agent: session.agent }
             )
-          ) : working ? (
-            translate(
-              'components.tab.bar.switch.waitForReply',
-              'Wait for the reply to finish or stop it, then switch.'
-            )
+          ) : readiness.explanation ? (
+            readiness.explanation
           ) : (
             <SwitchToCliTooltipText agent={agent} />
           )}
diff --git a/src/renderer/src/components/native-chat/NativeChatTranscriptItems.tsx b/src/renderer/src/components/native-chat/NativeChatTranscriptItems.tsx
index 3f6d65314403..d50725fea8e2 100644
--- a/src/renderer/src/components/native-chat/NativeChatTranscriptItems.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatTranscriptItems.tsx
@@ -45,7 +45,12 @@ export function NativeChatTranscriptItems({
             return (
               <Fragment key={item.key}>
                 <div aria-hidden style={{ height: Math.max(0, item.start - previousEnd) }} />
-                <div data-index={item.index} ref={window.measureRow} className="flow-root w-full">
+                <div
+                  data-switch-item-id={slot.kind === 'message' ? slot.message.id : undefined}
+                  data-index={item.index}
+                  ref={window.measureRow}
+                  className="flow-root w-full"
+                >
                   <NativeChatTranscriptRow
                     slot={slot}
                     context={context}
diff --git a/src/renderer/src/components/native-chat/native-chat-structured-session-notices.ts b/src/renderer/src/components/native-chat/native-chat-structured-session-notices.ts
index cfac26627b16..edbcfb61e359 100644
--- a/src/renderer/src/components/native-chat/native-chat-structured-session-notices.ts
+++ b/src/renderer/src/components/native-chat/native-chat-structured-session-notices.ts
@@ -1,3 +1,5 @@
+import { useNativeChatAvailabilityNotice } from './use-native-chat-availability-notice'
+import { useNativeChatClaudeSignIn } from './native-chat-claude-sign-in'
 import { nativeChatAntigravitySignInContent } from './native-chat-antigravity-settings'
 import { translate } from '@/i18n/i18n'
 import type { StructuredAgentSessionLaunchLifecycle } from '@/lib/structured-agent-session-launch'
@@ -120,3 +122,18 @@ export function structuredSessionNotices({
     ...(composerError ? [{ key: 'composer-error', kind: 'error' as const, ...composerError }] : [])
   ]
 }
+
+export function useStructuredSessionNotices(args: {
+  availability: Parameters<typeof useNativeChatAvailabilityNotice>[0]
+  signIn: Parameters<typeof useNativeChatClaudeSignIn>[0]
+  notices: Omit<Parameters<typeof structuredSessionNotices>[0], 'availability' | 'claudeSignIn'>
+  hostNotice: NativeChatComposerNotice | null
+}) {
+  const availability = useNativeChatAvailabilityNotice(args.availability)
+  const claudeSignIn = useNativeChatClaudeSignIn(args.signIn)
+  const notices = structuredSessionNotices({ ...args.notices, claudeSignIn, availability })
+  if (args.hostNotice) {
+    notices.push(args.hostNotice)
+  }
+  return { claudeSignIn, notices }
+}
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-message-sender.ts b/src/renderer/src/components/native-chat/structured-agent-session-message-sender.ts
index 07d964ae021a..9cf31516cfaa 100644
--- a/src/renderer/src/components/native-chat/structured-agent-session-message-sender.ts
+++ b/src/renderer/src/components/native-chat/structured-agent-session-message-sender.ts
@@ -1,3 +1,4 @@
+import { noteSwitchPresentationUse } from '@/lib/conversation-switch-projection'
 // Allow one unanswered send per chat in memory; host rows/cards own admitted messages. Never retry a send or retain it past its deadline.
 
 import type {
@@ -93,6 +94,7 @@ function dispatch(
 export function sendStructuredAgentSessionMessage(
   input: StructuredAgentSessionSendInput & { target: RuntimeClientTarget }
 ): StructuredAgentSessionSent | null {
+  noteSwitchPresentationUse(input.sessionId)
   const entry = takeStructuredAgentSessionSendSlot(input)
   return entry ? dispatch(entry, input.target) : null
 }
@@ -122,6 +124,7 @@ export type StructuredAgentSessionCreateSend = StructuredAgentSessionSent & {
 export function reserveStructuredAgentSessionSend(
   input: StructuredAgentSessionSendInput
 ): StructuredAgentSessionReservedSend | null {
+  noteSwitchPresentationUse(input.sessionId)
   const entry = takeStructuredAgentSessionSendSlot(input)
   if (!entry) {
     return null
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-read-owner-contract.ts b/src/renderer/src/components/native-chat/structured-agent-session-read-owner-contract.ts
index ffc0dc3d8f9d..350b67a86274 100644
--- a/src/renderer/src/components/native-chat/structured-agent-session-read-owner-contract.ts
+++ b/src/renderer/src/components/native-chat/structured-agent-session-read-owner-contract.ts
@@ -16,6 +16,7 @@ export type StructuredAgentSessionReadSnapshot = {
 export type StructuredAgentSessionReadOwner = {
   publishCreated: (page: AgentSessionHistoryPage) => void
   activate: () => () => void
+  resync?: () => void
   dispose: () => void
   getSnapshot: () => StructuredAgentSessionReadSnapshot
   loadOlder: () => Promise<NativeChatOlderPageResult>
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-read-owner-create.ts b/src/renderer/src/components/native-chat/structured-agent-session-read-owner-create.ts
new file mode 100644
index 000000000000..be37d9ca4587
--- /dev/null
+++ b/src/renderer/src/components/native-chat/structured-agent-session-read-owner-create.ts
@@ -0,0 +1,300 @@
+import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types'
+import {
+  type AgentProviderSessionMetadata,
+  agentProviderSessionsEqual
+} from '../../../../shared/agent-session-resume'
+import {
+  AGENT_SESSION_HISTORY_MAX_LIMIT,
+  type AgentSessionHistoryResult
+} from '../../../../shared/agent-session-wire'
+import {
+  EMPTY_STRUCTURED_AGENT_SESSION,
+  oldestStructuredAgentSessionCursor,
+  reduceStructuredAgentSession,
+  type StructuredAgentSessionAction
+} from '../../../../shared/structured-agent-session-reducer'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
+import { callStructuredAgentSession } from '@/runtime/structured-agent-session-client'
+import { NATIVE_CHAT_INITIAL_LIMIT, type NativeChatOlderPageResult } from './native-chat-pagination'
+import {
+  OLDER_PAGE_ANCHOR_ATTEMPTS,
+  readStructuredAgentSessionOlderPage
+} from './structured-agent-session-older-page-read'
+import { startStructuredAgentSessionReadTransport } from './structured-agent-session-read-transport'
+import { createStructuredAgentSessionPRLinkObserver } from './structured-agent-session-pr-link-observer'
+import type {
+  StructuredAgentSessionReadSnapshot,
+  StructuredAgentSessionReadOwner
+} from './structured-agent-session-read-owner-contract'
+import {
+  adoptStructuredReadOwner,
+  forgetStructuredReadOwner
+} from './structured-agent-session-read-owner-registry'
+
+export function countsTowardInitialHistory(item: AgentJournalRenderItem): boolean {
+  return item.body.kind !== 'status' || !item.body.providerFrame
+}
+
+export function createReadOwner(
+  key: string,
+  sessionId: string,
+  target: RuntimeClientTarget
+): StructuredAgentSessionReadOwner {
+  let snapshot: StructuredAgentSessionReadSnapshot = {
+    state: EMPTY_STRUCTURED_AGENT_SESSION,
+    loadingOlder: false,
+    olderHistoryGeneration: 0,
+    current: false
+  }
+  let stopActiveRun: (() => void) | null = null
+  const retiredHistoryRead = (): boolean => true
+  let captureActiveHistoryReadGuard = (): (() => boolean) => retiredHistoryRead
+  const activations = new Set<symbol>()
+  const listeners = new Set<() => void>()
+  const observePRLinks = createStructuredAgentSessionPRLinkObserver(sessionId, target)
+
+  const emit = (): void => {
+    for (const listener of listeners) {
+      listener()
+    }
+  }
+  const setSnapshot = (next: StructuredAgentSessionReadSnapshot): void => {
+    if (next === snapshot) {
+      return
+    }
+    snapshot = next
+    emit()
+  }
+  const apply = (action: StructuredAgentSessionAction): void => {
+    const state = reduceStructuredAgentSession(snapshot.state, action, Date.now())
+    // Published even when the frame changed nothing: a caught-up resume is an empty batch.
+    const current =
+      snapshot.current ||
+      (action.type === 'event' &&
+        action.event.type !== 'end' &&
+        !(action.event.type === 'batch' && action.event.hasNewer))
+    if (state !== snapshot.state || current !== snapshot.current) {
+      setSnapshot({ ...snapshot, state, current })
+    }
+  }
+  const markStale = (): void => {
+    if (snapshot.current) {
+      setSnapshot({ ...snapshot, current: false })
+    }
+  }
+  const setProviderSession = (providerSession: AgentProviderSessionMetadata | undefined): void => {
+    if (!agentProviderSessionsEqual(undefined, snapshot.providerSession, providerSession)) {
+      setSnapshot({ ...snapshot, providerSession })
+    }
+  }
+  const clearLoadingOlder = (): void => {
+    if (snapshot.loadingOlder) {
+      setSnapshot({ ...snapshot, loadingOlder: false })
+    }
+  }
+  const invalidateOlderPages = (): void => {
+    setSnapshot({
+      ...snapshot,
+      loadingOlder: false,
+      olderHistoryGeneration: snapshot.olderHistoryGeneration + 1
+    })
+  }
+  const hydrate = async (shouldStop: () => boolean): Promise<void> => {
+    const result = await callStructuredAgentSession<AgentSessionHistoryResult>(
+      target,
+      'agentSession.history',
+      { sessionId, direction: 'tail', limit: AGENT_SESSION_HISTORY_MAX_LIMIT }
+    )
+    if (shouldStop()) {
+      return
+    }
+    setProviderSession(result.providerSession)
+    if (!result.ok) {
+      if (shouldStop()) {
+        return
+      }
+      apply({
+        type: 'event',
+        event: {
+          type: 'reset',
+          sessionId,
+          reset: result.reset,
+          page: result.page,
+          fence: result.fence ?? 0
+        }
+      })
+      return
+    }
+    if (shouldStop()) {
+      return
+    }
+    apply({ type: 'history-page', page: result.page })
+    if (shouldStop()) {
+      return
+    }
+    let restored = snapshot.state.items.filter(countsTowardInitialHistory).length
+    let anchorSlides = 0
+    while (snapshot.state.hasOlder && restored < NATIVE_CHAT_INITIAL_LIMIT) {
+      const oldest = oldestStructuredAgentSessionCursor(snapshot.state)
+      if (!oldest || shouldStop()) {
+        break
+      }
+      const missing = NATIVE_CHAT_INITIAL_LIMIT - restored
+      const older = await callStructuredAgentSession<AgentSessionHistoryResult>(
+        target,
+        'agentSession.history',
+        {
+          sessionId,
+          direction: 'before',
+          cursor: oldest,
+          limit: Math.min(AGENT_SESSION_HISTORY_MAX_LIMIT, missing)
+        }
+      )
+      if (shouldStop()) {
+        return
+      }
+      if (!older.ok || older.page.window.oldest?.sequence === oldest.sequence) {
+        break
+      }
+      if (shouldStop()) {
+        return
+      }
+      // Bound re-anchoring when head trimming makes older pages discontiguous.
+      if (oldestStructuredAgentSessionCursor(snapshot.state)?.sequence !== oldest.sequence) {
+        anchorSlides += 1
+        if (anchorSlides >= OLDER_PAGE_ANCHOR_ATTEMPTS) {
+          break
+        }
+        continue
+      }
+      apply({ type: 'older-page', requestedCursor: oldest, page: older.page })
+      if (shouldStop()) {
+        return
+      }
+      restored = snapshot.state.items.filter(countsTowardInitialHistory).length
+    }
+  }
+
+  let olderPage: {
+    shouldStop: () => boolean
+    promise: Promise<NativeChatOlderPageResult>
+  } | null = null
+
+  const start = (): void => {
+    if (snapshot.state.epoch === null) {
+      apply({ type: 'loading' })
+    }
+    const transport = startStructuredAgentSessionReadTransport({
+      applyRequests: apply,
+      applyEvent: (event, options) => {
+        apply({ type: 'event', event, ...options })
+        observePRLinks(event)
+      },
+      applyError: (message, refusal) => {
+        // After loading, transport failures retain history while retrying; host refusals are explicit answers to show.
+        if (snapshot.state.epoch !== null && refusal === undefined) {
+          return
+        }
+        apply({ type: 'error', message, refusal })
+      },
+      getCursor: () => snapshot.state.cursor,
+      onContactLost: markStale,
+      onHistoryReadInvalidated: invalidateOlderPages,
+      hydrate: snapshot.state.epoch === null ? hydrate : undefined,
+      sessionId,
+      target
+    })
+    captureActiveHistoryReadGuard = transport.captureHistoryReadGuard
+    stopActiveRun = () => {
+      captureActiveHistoryReadGuard = () => retiredHistoryRead
+      transport.dispose()
+      stopActiveRun = null
+      markStale()
+    }
+  }
+
+  let owner: StructuredAgentSessionReadOwner
+  const deleteIfUnused = (): void => {
+    if (activations.size === 0 && listeners.size === 0) {
+      forgetStructuredReadOwner(key, owner)
+    }
+  }
+  owner = {
+    publishCreated: (page) => {
+      if (snapshot.state.epoch === null) {
+        apply({ type: 'history-page', page })
+      }
+    },
+    activate: () => {
+      // Remounts and StrictMode re-run setup on an owner whose cleanup just forgot it.
+      adoptStructuredReadOwner(key, owner)
+      const token = Symbol(sessionId)
+      activations.add(token)
+      if (activations.size === 1) {
+        start()
+      }
+      return () => {
+        activations.delete(token)
+        if (activations.size === 0) {
+          stopActiveRun?.()
+          deleteIfUnused()
+        }
+      }
+    },
+    resync: () => {
+      if (activations.size === 0) {
+        return
+      }
+      stopActiveRun?.()
+      start()
+    },
+    dispose: () => {
+      activations.clear()
+      listeners.clear()
+      stopActiveRun?.()
+    },
+    getSnapshot: () => snapshot,
+    loadOlder: () => {
+      // Share concurrent page requests so another caller’s refusal cannot look like exhaustion.
+      if (olderPage && !olderPage.shouldStop()) {
+        return olderPage.promise
+      }
+      const shouldStop = captureActiveHistoryReadGuard()
+      if (shouldStop()) {
+        return Promise.resolve('superseded')
+      }
+      if (!oldestStructuredAgentSessionCursor(snapshot.state) || !snapshot.state.hasOlder) {
+        return Promise.resolve('exhausted')
+      }
+      setSnapshot({ ...snapshot, loadingOlder: true })
+      const promise = readStructuredAgentSessionOlderPage({
+        target,
+        sessionId,
+        getState: () => snapshot.state,
+        apply,
+        shouldStop
+      })
+      const page = { shouldStop, promise }
+      olderPage = page
+      void page.promise.finally(() => {
+        if (olderPage !== page) {
+          return
+        }
+        olderPage = null
+        if (!shouldStop()) {
+          clearLoadingOlder()
+        }
+      })
+      return page.promise
+    },
+    subscribe: (listener) => {
+      adoptStructuredReadOwner(key, owner)
+      listeners.add(listener)
+      return () => {
+        listeners.delete(listener)
+        deleteIfUnused()
+      }
+    }
+  }
+  return owner
+}
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-read-owner.ts b/src/renderer/src/components/native-chat/structured-agent-session-read-owner.ts
index 68e145c4e6ea..f11bb24bf629 100644
--- a/src/renderer/src/components/native-chat/structured-agent-session-read-owner.ts
+++ b/src/renderer/src/components/native-chat/structured-agent-session-read-owner.ts
@@ -1,308 +1,22 @@
-import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types'
-import type { AgentProviderSessionMetadata } from '../../../../shared/agent-session-resume'
-import { agentProviderSessionsEqual } from '../../../../shared/agent-session-resume'
-import {
-  AGENT_SESSION_HISTORY_MAX_LIMIT,
-  type AgentSessionHistoryResult
-} from '../../../../shared/agent-session-wire'
-import {
-  EMPTY_STRUCTURED_AGENT_SESSION,
-  oldestStructuredAgentSessionCursor,
-  reduceStructuredAgentSession,
-  type StructuredAgentSessionAction
-} from '../../../../shared/structured-agent-session-reducer'
 import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
-import { callStructuredAgentSession } from '@/runtime/structured-agent-session-client'
-import { NATIVE_CHAT_INITIAL_LIMIT, type NativeChatOlderPageResult } from './native-chat-pagination'
+import type { StructuredAgentSessionReadOwner } from './structured-agent-session-read-owner-contract'
 import {
-  OLDER_PAGE_ANCHOR_ATTEMPTS,
-  readStructuredAgentSessionOlderPage
-} from './structured-agent-session-older-page-read'
-import { startStructuredAgentSessionReadTransport } from './structured-agent-session-read-transport'
-import { createStructuredAgentSessionPRLinkObserver } from './structured-agent-session-pr-link-observer'
+  getOrCreateStructuredReadOwner,
+  structuredReadOwnerKey
+} from './structured-agent-session-read-owner-registry'
+import { createReadOwner } from './structured-agent-session-read-owner-create'
 
-import type {
-  StructuredAgentSessionReadSnapshot,
-  StructuredAgentSessionReadOwner
-} from './structured-agent-session-read-owner-contract'
 export type {
   StructuredAgentSessionReadSnapshot,
   StructuredAgentSessionReadOwner
 } from './structured-agent-session-read-owner-contract'
 
-import {
-  adoptStructuredReadOwner,
-  getOrCreateStructuredReadOwner,
-  forgetStructuredReadOwner,
-  structuredReadOwnerKey
-} from './structured-agent-session-read-owner-registry'
 export {
   findStructuredAgentSessionReadOwner,
   retireStructuredAgentSessionReadOwner,
   resetStructuredAgentSessionReadOwnersForTests
 } from './structured-agent-session-read-owner-registry'
 
-function countsTowardInitialHistory(item: AgentJournalRenderItem): boolean {
-  return item.body.kind !== 'status' || !item.body.providerFrame
-}
-
-function createReadOwner(
-  key: string,
-  sessionId: string,
-  target: RuntimeClientTarget
-): StructuredAgentSessionReadOwner {
-  let snapshot: StructuredAgentSessionReadSnapshot = {
-    state: EMPTY_STRUCTURED_AGENT_SESSION,
-    loadingOlder: false,
-    olderHistoryGeneration: 0,
-    current: false
-  }
-  let stopActiveRun: (() => void) | null = null
-  const retiredHistoryRead = (): boolean => true
-  let captureActiveHistoryReadGuard = (): (() => boolean) => retiredHistoryRead
-  const activations = new Set<symbol>()
-  const listeners = new Set<() => void>()
-  const observePRLinks = createStructuredAgentSessionPRLinkObserver(sessionId, target)
-
-  const emit = (): void => {
-    for (const listener of listeners) {
-      listener()
-    }
-  }
-  const setSnapshot = (next: StructuredAgentSessionReadSnapshot): void => {
-    if (next === snapshot) {
-      return
-    }
-    snapshot = next
-    emit()
-  }
-  const apply = (action: StructuredAgentSessionAction): void => {
-    const state = reduceStructuredAgentSession(snapshot.state, action, Date.now())
-    // Published even when the frame changed nothing: a caught-up resume is an empty batch.
-    const current =
-      snapshot.current ||
-      (action.type === 'event' &&
-        action.event.type !== 'end' &&
-        !(action.event.type === 'batch' && action.event.hasNewer))
-    if (state !== snapshot.state || current !== snapshot.current) {
-      setSnapshot({ ...snapshot, state, current })
-    }
-  }
-  const markStale = (): void => {
-    if (snapshot.current) {
-      setSnapshot({ ...snapshot, current: false })
-    }
-  }
-  const setProviderSession = (providerSession: AgentProviderSessionMetadata | undefined): void => {
-    if (!agentProviderSessionsEqual(undefined, snapshot.providerSession, providerSession)) {
-      setSnapshot({ ...snapshot, providerSession })
-    }
-  }
-  const clearLoadingOlder = (): void => {
-    if (snapshot.loadingOlder) {
-      setSnapshot({ ...snapshot, loadingOlder: false })
-    }
-  }
-  const invalidateOlderPages = (): void => {
-    setSnapshot({
-      ...snapshot,
-      loadingOlder: false,
-      olderHistoryGeneration: snapshot.olderHistoryGeneration + 1
-    })
-  }
-  const hydrate = async (shouldStop: () => boolean): Promise<void> => {
-    const result = await callStructuredAgentSession<AgentSessionHistoryResult>(
-      target,
-      'agentSession.history',
-      { sessionId, direction: 'tail', limit: AGENT_SESSION_HISTORY_MAX_LIMIT }
-    )
-    if (shouldStop()) {
-      return
-    }
-    setProviderSession(result.providerSession)
-    if (!result.ok) {
-      if (shouldStop()) {
-        return
-      }
-      apply({
-        type: 'event',
-        event: {
-          type: 'reset',
-          sessionId,
-          reset: result.reset,
-          page: result.page,
-          fence: result.fence ?? 0
-        }
-      })
-      return
-    }
-    if (shouldStop()) {
-      return
-    }
-    apply({ type: 'history-page', page: result.page })
-    if (shouldStop()) {
-      return
-    }
-    let restored = snapshot.state.items.filter(countsTowardInitialHistory).length
-    let anchorSlides = 0
-    while (snapshot.state.hasOlder && restored < NATIVE_CHAT_INITIAL_LIMIT) {
-      const oldest = oldestStructuredAgentSessionCursor(snapshot.state)
-      if (!oldest || shouldStop()) {
-        break
-      }
-      const missing = NATIVE_CHAT_INITIAL_LIMIT - restored
-      const older = await callStructuredAgentSession<AgentSessionHistoryResult>(
-        target,
-        'agentSession.history',
-        {
-          sessionId,
-          direction: 'before',
-          cursor: oldest,
-          limit: Math.min(AGENT_SESSION_HISTORY_MAX_LIMIT, missing)
-        }
-      )
-      if (shouldStop()) {
-        return
-      }
-      if (!older.ok || older.page.window.oldest?.sequence === oldest.sequence) {
-        break
-      }
-      if (shouldStop()) {
-        return
-      }
-      // Bound re-anchoring when head trimming makes older pages discontiguous.
-      if (oldestStructuredAgentSessionCursor(snapshot.state)?.sequence !== oldest.sequence) {
-        anchorSlides += 1
-        if (anchorSlides >= OLDER_PAGE_ANCHOR_ATTEMPTS) {
-          break
-        }
-        continue
-      }
-      apply({ type: 'older-page', requestedCursor: oldest, page: older.page })
-      if (shouldStop()) {
-        return
-      }
-      restored = snapshot.state.items.filter(countsTowardInitialHistory).length
-    }
-  }
-
-  let olderPage: {
-    shouldStop: () => boolean
-    promise: Promise<NativeChatOlderPageResult>
-  } | null = null
-
-  const start = (): void => {
-    if (snapshot.state.epoch === null) {
-      apply({ type: 'loading' })
-    }
-    const transport = startStructuredAgentSessionReadTransport({
-      applyRequests: apply,
-      applyEvent: (event, options) => {
-        apply({ type: 'event', event, ...options })
-        observePRLinks(event)
-      },
-      applyError: (message, refusal) => {
-        // After loading, transport failures retain history while retrying; host refusals are explicit answers to show.
-        if (snapshot.state.epoch !== null && refusal === undefined) {
-          return
-        }
-        apply({ type: 'error', message, refusal })
-      },
-      getCursor: () => snapshot.state.cursor,
-      onContactLost: markStale,
-      onHistoryReadInvalidated: invalidateOlderPages,
-      hydrate: snapshot.state.epoch === null ? hydrate : undefined,
-      sessionId,
-      target
-    })
-    captureActiveHistoryReadGuard = transport.captureHistoryReadGuard
-    stopActiveRun = () => {
-      captureActiveHistoryReadGuard = () => retiredHistoryRead
-      transport.dispose()
-      stopActiveRun = null
-      markStale()
-    }
-  }
-
-  let owner: StructuredAgentSessionReadOwner
-  const deleteIfUnused = (): void => {
-    if (activations.size === 0 && listeners.size === 0) {
-      forgetStructuredReadOwner(key, owner)
-    }
-  }
-  owner = {
-    publishCreated: (page) => {
-      if (snapshot.state.epoch === null) {
-        apply({ type: 'history-page', page })
-      }
-    },
-    activate: () => {
-      // Remounts and StrictMode re-run setup on an owner whose cleanup just forgot it.
-      adoptStructuredReadOwner(key, owner)
-      const token = Symbol(sessionId)
-      activations.add(token)
-      if (activations.size === 1) {
-        start()
-      }
-      return () => {
-        activations.delete(token)
-        if (activations.size === 0) {
-          stopActiveRun?.()
-          deleteIfUnused()
-        }
-      }
-    },
-    dispose: () => {
-      activations.clear()
-      listeners.clear()
-      stopActiveRun?.()
-    },
-    getSnapshot: () => snapshot,
-    loadOlder: () => {
-      // Share concurrent page requests so another caller’s refusal cannot look like exhaustion.
-      if (olderPage && !olderPage.shouldStop()) {
-        return olderPage.promise
-      }
-      const shouldStop = captureActiveHistoryReadGuard()
-      if (shouldStop()) {
-        return Promise.resolve('superseded')
-      }
-      if (!oldestStructuredAgentSessionCursor(snapshot.state) || !snapshot.state.hasOlder) {
-        return Promise.resolve('exhausted')
-      }
-      setSnapshot({ ...snapshot, loadingOlder: true })
-      const promise = readStructuredAgentSessionOlderPage({
-        target,
-        sessionId,
-        getState: () => snapshot.state,
-        apply,
-        shouldStop
-      })
-      const page = { shouldStop, promise }
-      olderPage = page
-      void page.promise.finally(() => {
-        if (olderPage !== page) {
-          return
-        }
-        olderPage = null
-        if (!shouldStop()) {
-          clearLoadingOlder()
-        }
-      })
-      return page.promise
-    },
-    subscribe: (listener) => {
-      adoptStructuredReadOwner(key, owner)
-      listeners.add(listener)
-      return () => {
-        listeners.delete(listener)
-        deleteIfUnused()
-      }
-    }
-  }
-  return owner
-}
-
 export function getStructuredAgentSessionReadOwner(
   sessionId: string,
   target: RuntimeClientTarget
diff --git a/src/renderer/src/components/native-chat/use-structured-native-chat-delivery.ts b/src/renderer/src/components/native-chat/use-structured-native-chat-delivery.ts
new file mode 100644
index 000000000000..aceeb6c08edc
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-structured-native-chat-delivery.ts
@@ -0,0 +1,32 @@
+import { isClaudeSignInFailureKind } from './native-chat-claude-sign-in'
+import { useStructuredAgentSessionDeliveryNotices } from './use-structured-agent-session-delivery-notices'
+import { dispatchWasWithdrawn } from '../../../../shared/structured-agent-session-dispatch-rejection'
+import { useStructuredAgentSessionStartFailureFacts } from './use-structured-agent-session-start-failure-facts'
+
+export function useStructuredNativeChatDelivery(
+  args: Omit<Parameters<typeof useStructuredAgentSessionDeliveryNotices>[0], 'startFailures'> & {
+    agent: string
+    hasReturnedMessages: boolean
+  }
+) {
+  const needsFailureFacts =
+    args.hasReturnedMessages ||
+    args.submissions.some(
+      (submission) => submission.dispatchState === 'rejected' && !dispatchWasWithdrawn(submission)
+    )
+  const startFailures = useStructuredAgentSessionStartFailureFacts(
+    args.journalItems,
+    needsFailureFacts || args.agent === 'claude'
+  )
+  const deliveryNotices = useStructuredAgentSessionDeliveryNotices({
+    pending: args.pending,
+    submissions: args.submissions,
+    journalItems: args.journalItems,
+    startFailures,
+    agentName: args.agentName
+  })
+  const signInFailureRows = startFailures.filter((fact) =>
+    isClaudeSignInFailureKind(fact.kind)
+  ).length
+  return { startFailures, deliveryNotices, signInFailureRows }
+}
diff --git a/src/renderer/src/components/right-sidebar/AiVaultSessionActionMenuItems.tsx b/src/renderer/src/components/right-sidebar/AiVaultSessionActionMenuItems.tsx
index 9b55ed8d5727..8187d79f6ee6 100644
--- a/src/renderer/src/components/right-sidebar/AiVaultSessionActionMenuItems.tsx
+++ b/src/renderer/src/components/right-sidebar/AiVaultSessionActionMenuItems.tsx
@@ -1,3 +1,4 @@
+import type { AiVaultOriginalPaneTarget } from './ai-vault-original-pane'
 import {
   Copy,
   FileJson,
@@ -17,6 +18,7 @@ import type { AiVaultAgent } from '../../../../shared/ai-vault-types'
 import { isAiVaultFolderWorkspaceId } from './ai-vault-session-worktree-affordances'
 import { useAppStore } from '@/store'
 import { isNativeChatEnabled } from '../../../../shared/structured-native-chat-launch-route'
+import type { AiVaultSession } from '../../../../shared/ai-vault-types'
 
 export function SessionActionMenuItems({
   menuKind = 'dropdown',
@@ -40,9 +42,12 @@ export function SessionActionMenuItems({
   deleteBlockedReason,
   onDelete,
   inPlaceAgent,
-  switchLoading
+  switchLoading,
+  originalPaneTarget,
+  session
 }: {
   menuKind?: 'dropdown' | 'context'
+  originalPaneTarget?: AiVaultOriginalPaneTarget | null
   resumeDisabled: boolean
   resumeLabel: string
   resumeHidden?: boolean
@@ -65,6 +70,7 @@ export function SessionActionMenuItems({
   // Null when Delete is offered; otherwise the tooltip explaining why it isn't.
   deleteBlockedReason: string | null
   onDelete?: () => void
+  session?: AiVaultSession
   switchLoading?: boolean
   inPlaceAgent?: AiVaultAgent
 }) {
@@ -128,6 +134,8 @@ export function SessionActionMenuItems({
       ) : null}
       {showSurfaceActions ? (
         <AiVaultSessionSurfaceSwitchMenuItems
+          originalPaneTarget={originalPaneTarget}
+          session={session}
           action="resume"
           menuKind={menuKind}
           tooltipSide={menuKind === 'context' ? 'right' : 'left'}
diff --git a/src/renderer/src/components/right-sidebar/AiVaultSessionDetails.tsx b/src/renderer/src/components/right-sidebar/AiVaultSessionDetails.tsx
index 4528ac210b80..91694941ff21 100644
--- a/src/renderer/src/components/right-sidebar/AiVaultSessionDetails.tsx
+++ b/src/renderer/src/components/right-sidebar/AiVaultSessionDetails.tsx
@@ -1,3 +1,4 @@
+import type { AiVaultOriginalPaneTarget } from './ai-vault-original-pane'
 import { isAntigravityReferenceSession } from '../../../../shared/antigravity-session-origin'
 import type { AiVaultSubagentResumeActions } from './AiVaultSessionSubagents'
 import type React from 'react'
@@ -30,6 +31,7 @@ import {
 export function SessionInlineDetails({
   id,
   session,
+  originalPaneTarget,
   worktreeInfo,
   vaultScope,
   resumeActions,
@@ -44,6 +46,7 @@ export function SessionInlineDetails({
 }: {
   id: string
   session: AiVaultSession
+  originalPaneTarget?: AiVaultOriginalPaneTarget | null
   worktreeInfo: AiVaultSessionWorktreeInfo | null
   vaultScope: AiVaultScope
   resumeActions: {
@@ -132,6 +135,7 @@ export function SessionInlineDetails({
             </Button>
           ) : null}
           <AiVaultSessionDetailsSwitchButtons
+            originalPaneTarget={originalPaneTarget}
             session={session}
             onResumeInNewChat={onResumeInNewChat}
             onResumeInNewCli={onResumeInNewCli}
diff --git a/src/renderer/src/components/right-sidebar/AiVaultSessionDetailsSwitchButtons.tsx b/src/renderer/src/components/right-sidebar/AiVaultSessionDetailsSwitchButtons.tsx
index 92b8a385d72f..cca74d2caa27 100644
--- a/src/renderer/src/components/right-sidebar/AiVaultSessionDetailsSwitchButtons.tsx
+++ b/src/renderer/src/components/right-sidebar/AiVaultSessionDetailsSwitchButtons.tsx
@@ -1,3 +1,6 @@
+import type { AiVaultOriginalPaneTarget } from './ai-vault-original-pane'
+import { useConversationSwitchReadiness } from '@/lib/conversation-surface-switch'
+import { historyConversationSwitch } from './ai-vault-session-in-place-switch'
 import { useAppStore } from '@/store'
 import { isNativeChatEnabled } from '../../../../shared/structured-native-chat-launch-route'
 import { MessagesSquare, SquareTerminal } from 'lucide-react'
@@ -11,18 +14,26 @@ import { ResumeInNewCliTooltipText, SwitchToCliTooltipText } from './ai-vault-se
 /** The details bar's chat and CLI moves: in place where the row's host switches its agent. */
 export function AiVaultSessionDetailsSwitchButtons({
   session,
+  originalPaneTarget,
   onResumeInNewChat,
   onResumeInNewCli
 }: {
-  session: Pick<AiVaultSession, 'agent' | 'executionHostId'>
+  session: AiVaultSession
+  originalPaneTarget?: AiVaultOriginalPaneTarget | null
   onResumeInNewChat?: () => void
   onResumeInNewCli?: () => void
 }): React.JSX.Element | null {
   const inPlaceAgent = useAiVaultInPlaceAgent(session)
   const switchLoading =
     useInPlaceSwitchCapability(session.executionHostId, session.agent) === undefined
+  const chat = useConversationSwitchReadiness(
+    historyConversationSwitch(session, 'chat', undefined, originalPaneTarget)
+  )
+  const cli = useConversationSwitchReadiness(
+    historyConversationSwitch(session, 'terminal', undefined, originalPaneTarget)
+  )
   const enabled = useAppStore((state) => isNativeChatEnabled(state.settings))
-  if (!enabled && (inPlaceAgent !== undefined || switchLoading)) {
+  if (!enabled) {
     return null
   }
   return (
@@ -33,7 +44,8 @@ export function AiVaultSessionDetailsSwitchButtons({
           variant="secondary"
           size="xs"
           draggable={false}
-          disabled={switchLoading}
+          disabled={switchLoading || Boolean(inPlaceAgent && !chat.ready)}
+          title={chat.explanation}
           onClick={(event) => {
             event.stopPropagation()
             onResumeInNewChat()
@@ -57,7 +69,8 @@ export function AiVaultSessionDetailsSwitchButtons({
               variant="secondary"
               size="xs"
               draggable={false}
-              disabled={switchLoading}
+              disabled={switchLoading || Boolean(inPlaceAgent && !cli.ready)}
+              title={cli.explanation}
               onClick={(event) => {
                 event.stopPropagation()
                 onResumeInNewCli()
diff --git a/src/renderer/src/components/right-sidebar/AiVaultSessionRow.tsx b/src/renderer/src/components/right-sidebar/AiVaultSessionRow.tsx
index df44d601dab0..4ee366bbb35a 100644
--- a/src/renderer/src/components/right-sidebar/AiVaultSessionRow.tsx
+++ b/src/renderer/src/components/right-sidebar/AiVaultSessionRow.tsx
@@ -1,3 +1,4 @@
+import type { AiVaultOriginalPaneTarget } from './ai-vault-original-pane'
 import { useAiVaultInPlaceAgent, useInPlaceSwitchCapability } from '@/lib/in-place-switch-support'
 import { isAntigravityReferenceSession } from '../../../../shared/antigravity-session-origin'
 import type { AiVaultSubagentResumeActions } from './AiVaultSessionSubagents'
@@ -32,6 +33,7 @@ import { useAiVaultSessionDisplayTitle } from './use-ai-vault-session-display-ti
 
 export function VaultSessionRow({
   session,
+  originalPaneTarget,
   liveState,
   resumeStartup,
   realHomeResumeStartup,
@@ -65,6 +67,7 @@ export function VaultSessionRow({
   onPick
 }: {
   session: AiVaultSession
+  originalPaneTarget?: AiVaultOriginalPaneTarget | null
   liveState: AgentStatusState | null
   resumeStartup: AiVaultResumeStartup
   realHomeResumeStartup: AiVaultResumeStartup
@@ -194,6 +197,7 @@ export function VaultSessionRow({
           {title}
         </div>
         <SessionRowTrailingActions
+          originalPaneTarget={originalPaneTarget}
           session={session}
           detailsExpanded={detailsExpanded}
           detailsId={detailsId}
@@ -249,6 +253,7 @@ export function VaultSessionRow({
       />
       {detailsExpanded ? (
         <SessionInlineDetails
+          originalPaneTarget={originalPaneTarget}
           id={detailsId}
           session={session}
           worktreeInfo={worktreeInfo}
@@ -277,6 +282,8 @@ export function VaultSessionRow({
       </ContextMenuTrigger>
       <ContextMenuContent>
         <SessionActionMenuItems
+          originalPaneTarget={originalPaneTarget}
+          session={session}
           menuKind="context"
           resumeDisabled={resumeDisabled}
           resumeHidden={resumeHidden}
diff --git a/src/renderer/src/components/right-sidebar/AiVaultSessionSurfaceSwitchMenuItems.tsx b/src/renderer/src/components/right-sidebar/AiVaultSessionSurfaceSwitchMenuItems.tsx
index cc098ca995dd..081b6f61dd37 100644
--- a/src/renderer/src/components/right-sidebar/AiVaultSessionSurfaceSwitchMenuItems.tsx
+++ b/src/renderer/src/components/right-sidebar/AiVaultSessionSurfaceSwitchMenuItems.tsx
@@ -1,3 +1,7 @@
+import type { AiVaultOriginalPaneTarget } from './ai-vault-original-pane'
+import { useConversationSwitchReadiness } from '@/lib/conversation-surface-switch'
+import { historyConversationSwitch } from './ai-vault-session-in-place-switch'
+import type { AiVaultSession } from '../../../../shared/ai-vault-types'
 import { MessagesSquare, SquareTerminal } from 'lucide-react'
 import { DropdownMenuItem } from '@/components/ui/dropdown-menu'
 import { ContextMenuItem } from '@/components/ui/context-menu'
@@ -18,8 +22,14 @@ export function AiVaultSessionSurfaceSwitchMenuItems({
   onResumeInNewCli,
   cliPending = false,
   inPlaceAgent,
+  session,
+  originalPaneTarget,
+  switchExplanation,
   switchLoading = false
 }: {
+  session?: AiVaultSession
+  originalPaneTarget?: AiVaultOriginalPaneTarget | null
+  switchExplanation?: string
   action: 'resume' | 'switch'
   menuKind: 'dropdown' | 'context'
   tooltipSide: 'left' | 'right'
@@ -31,6 +41,14 @@ export function AiVaultSessionSurfaceSwitchMenuItems({
   switchLoading?: boolean
   inPlaceAgent?: AiVaultAgent
 }): React.JSX.Element {
+  const chat = useConversationSwitchReadiness(
+    session ? historyConversationSwitch(session, 'chat', undefined, originalPaneTarget) : null
+  )
+  const cli = useConversationSwitchReadiness(
+    session ? historyConversationSwitch(session, 'terminal', undefined, originalPaneTarget) : null
+  )
+  const heldChat = session && inPlaceAgent ? chat : null
+  const heldCli = session?.structuredSession && inPlaceAgent ? cli : null
   const inPlace = inPlaceAgent !== undefined
   const Item = menuKind === 'context' ? ContextMenuItem : DropdownMenuItem
   return (
@@ -38,7 +56,8 @@ export function AiVaultSessionSurfaceSwitchMenuItems({
       {onResumeInNewChat ? (
         <Item
           onSelect={onResumeInNewChat}
-          disabled={chatPending || switchLoading}
+          disabled={chatPending || switchLoading || Boolean(heldChat && !heldChat.ready)}
+          title={switchExplanation ?? heldChat?.explanation}
           aria-busy={chatPending || undefined}
         >
           <MessagesSquare className="size-3.5" />
@@ -55,7 +74,8 @@ export function AiVaultSessionSurfaceSwitchMenuItems({
           <TooltipTrigger asChild>
             <Item
               onSelect={onResumeInNewCli}
-              disabled={cliPending || switchLoading}
+              disabled={cliPending || switchLoading || Boolean(heldCli && !heldCli.ready)}
+              title={switchExplanation ?? heldCli?.explanation}
               aria-busy={cliPending}
             >
               {cliPending ? (
diff --git a/src/renderer/src/components/right-sidebar/AiVaultVirtualRow.tsx b/src/renderer/src/components/right-sidebar/AiVaultVirtualRow.tsx
index d95d036b8c49..d793110dbac7 100644
--- a/src/renderer/src/components/right-sidebar/AiVaultVirtualRow.tsx
+++ b/src/renderer/src/components/right-sidebar/AiVaultVirtualRow.tsx
@@ -92,7 +92,11 @@ export function AiVaultVirtualRow({
   onJumpToWorktree: (worktreeId: string) => void
   onResume: (session: AiVaultSession, worktreeId: string) => void
   onContinueInNewSession: (session: AiVaultSession, worktreeId: string) => void
-  onResumeInNewChat: (session: AiVaultSession, worktreeId: string) => void
+  onResumeInNewChat: (
+    session: AiVaultSession,
+    worktreeId: string,
+    pane?: AiVaultOriginalPaneTarget | null
+  ) => void
   onResumeInNewCli: (session: AiVaultSession, worktreeId: string) => void
   onCopyResume: (session: AiVaultSession, worktreeId?: string | null) => void
   onCopyId: (session: AiVaultSession) => void
@@ -204,6 +208,7 @@ export function AiVaultVirtualRow({
         />
       ) : (
         <VaultSessionRow
+          originalPaneTarget={originalPaneTarget}
           session={row.session}
           searchHit={searchHit}
           sourceHostLabel={searchHitHostLabels?.get(row.session.executionHostId)}
@@ -251,7 +256,7 @@ export function AiVaultVirtualRow({
           }
           onResumeInNewChat={
             resumeInNewChatWorkspaceId
-              ? () => onResumeInNewChat(row.session, resumeInNewChatWorkspaceId)
+              ? () => onResumeInNewChat(row.session, resumeInNewChatWorkspaceId, originalPaneTarget)
               : undefined
           }
           onResumeInNewCli={
diff --git a/src/renderer/src/components/right-sidebar/SessionRowTrailingActions.tsx b/src/renderer/src/components/right-sidebar/SessionRowTrailingActions.tsx
index dc14d65637d2..ea06e2a1aa72 100644
--- a/src/renderer/src/components/right-sidebar/SessionRowTrailingActions.tsx
+++ b/src/renderer/src/components/right-sidebar/SessionRowTrailingActions.tsx
@@ -1,3 +1,4 @@
+import type { AiVaultOriginalPaneTarget } from './ai-vault-original-pane'
 import { useAiVaultInPlaceAgent, useInPlaceSwitchCapability } from '@/lib/in-place-switch-support'
 import type React from 'react'
 import {
@@ -38,6 +39,7 @@ const HOVER_ACTION_GROUP_CLASS = `${HOVER_ACTION_GROUP_BASE} ${HOVER_ACTION_GROU
 
 export function SessionRowTrailingActions({
   session,
+  originalPaneTarget,
   detailsExpanded,
   detailsId,
   detailsTooltip,
@@ -64,6 +66,7 @@ export function SessionRowTrailingActions({
   actionsHidden = false
 }: {
   session: AiVaultSession
+  originalPaneTarget?: AiVaultOriginalPaneTarget | null
   detailsExpanded: boolean
   detailsId: string
   detailsTooltip: string
@@ -264,6 +267,8 @@ export function SessionRowTrailingActions({
           </Tooltip>
           <DropdownMenuContent align="end">
             <SessionActionMenuItems
+              originalPaneTarget={originalPaneTarget}
+              session={session}
               resumeDisabled={resumeDisabled}
               resumeHidden={resumeHidden}
               resumeLabel={resumeLabel}
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx b/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx
index 3a6d5402b0f6..cc6f48fd07ed 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx
+++ b/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx
@@ -52,8 +52,11 @@ vi.mock('@/lib/agent-session-launch-plan', async (original) => ({
 vi.mock('./ai-vault-session-resume-in-chat-launch', () => ({
   resumeAiVaultSessionInNewChat: mocks.newChat
 }))
-vi.mock('../tab-bar/cli-chat-resume-feedback', () => ({ switchIntoOwner: mocks.startOwner }))
-vi.mock('../tab-bar/cli-chat-resume-run', () => ({ runCliChatResume: mocks.run }))
+vi.mock('@/lib/conversation-surface-switch', () => ({
+  runConversationSwitch: mocks.startOwner,
+  runCliChatResume: mocks.run,
+  useConversationSwitchReadiness: () => ({ ready: true, pending: false })
+}))
 vi.mock('../tab-bar/cli-chat-resume-source', () => ({ resolveCliChatResumeSource: mocks.source }))
 vi.mock('@/lib/ai-vault-tab-title-requests', async (original) => ({
   ...(await original<object>()),
@@ -96,7 +99,13 @@ const row: AiVaultSession = {
   resumeCommand: '',
   subagent: null
 }
-function History({ session }: { session: AiVaultSession }) {
+function History({
+  session,
+  originalPaneTarget = null
+}: {
+  session: AiVaultSession
+  originalPaneTarget?: { worktreeId: string; tabId: string; paneKey: string } | null
+}) {
   const state = useAppStore.getState()
   const targetState = {
     ...state,
@@ -132,7 +141,7 @@ function History({ session }: { session: AiVaultSession }) {
         expandedSessionIds={new Set([session.id])}
         vaultScope="all"
         buildResumeStartup={actions.buildResumeStartup}
-        getOriginalPaneTarget={() => null}
+        getOriginalPaneTarget={() => originalPaneTarget}
         isStructuredSessionOpen={() => false}
         getSessionLiveState={() => null}
         getWorktreeInfo={resume.getSessionWorktreeInfo}
@@ -218,9 +227,12 @@ it.each(['local', 'runtime:paired'] as const)(
     expect(button.hasAttribute('disabled')).toBe(false)
     await userEvent.setup().click(button)
     expect(mocks.startOwner).toHaveBeenCalledWith(
-      expect.objectContaining({ workspaceId: 'workspace' }),
-      row.structuredSession,
-      host === 'local' ? { kind: 'local' } : { kind: 'environment', environmentId: 'paired' }
+      expect.objectContaining({
+        direction: 'chat',
+        sessionId: 'owner',
+        workspaceId: 'workspace',
+        executionHostId: host
+      })
     )
     await userEvent.setup().click(screen.getByTestId('ai-vault-session-more-actions'))
     await userEvent
@@ -265,14 +277,21 @@ it('routes a capable paired unowned row with a matching terminal through the sam
     }
   ])
   mocks.source.mockReturnValue(source)
-  render(<History session={session} />)
+  render(
+    <History
+      session={session}
+      originalPaneTarget={{ worktreeId: 'workspace', tabId: 'terminal', paneKey: 'terminal:leaf' }}
+    />
+  )
   await waitFor(() =>
     expect(
       screen.getByRole('button', { name: 'Switch to native chat' }).hasAttribute('disabled')
     ).toBe(false)
   )
   await userEvent.setup().click(screen.getByRole('button', { name: 'Switch to native chat' }))
-  expect(mocks.run).toHaveBeenCalledExactlyOnceWith(source)
+  expect(mocks.startOwner).toHaveBeenCalledExactlyOnceWith(
+    expect.objectContaining({ direction: 'chat', source, history: session })
+  )
 })
 
 it.each([
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts b/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts
index 9457bc8e8c06..088a61f743b1 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts
@@ -1,16 +1,17 @@
-import { switchIntoOwner } from '../tab-bar/cli-chat-resume-feedback'
-import { structuredAgentSessionTargetForHost } from '@/runtime/structured-agent-session-owner'
+import type { AiVaultOriginalPaneTarget } from './ai-vault-original-pane'
 import {
   cliConversationRowsShareAgent,
   adoptsCliConversations
 } from '../../../../shared/structured-agent-cli-conversation-adoption'
 import { useAppStore } from '@/store'
-import { collectAgentPaneConversations } from '@/lib/ai-vault-tab-title-requests'
 import { inPlaceSwitchSupportedNow } from '@/lib/in-place-switch-support'
 import type { AiVaultSession } from '../../../../shared/ai-vault-types'
 import { resolveCliChatResumeSource } from '../tab-bar/cli-chat-resume-source'
-import { runCliChatResume } from '../tab-bar/cli-chat-resume-run'
-import { runNativeChatCliSwitch } from '../tab-bar/native-chat-cli-switch-run'
+import {
+  runConversationSwitch,
+  runNativeChatCliSwitch,
+  type ConversationSwitch
+} from '@/lib/conversation-surface-switch'
 
 /** History's "Switch to CLI": in the chat tab's slot when that tab is open in this window, else a
  *  new tab. False when the row's host doesn't switch this agent in place, so the row forks. */
@@ -29,48 +30,75 @@ export function switchAiVaultSessionToCli(session: AiVaultSession): boolean {
     workspaceId: chat.workspaceId,
     executionHostId: session.executionHostId,
     agent: session.agent,
-    chatTabId: chatTab?.id ?? null
+    chatTabId: chatTab?.id ?? null,
+    history: session
   })
   return true
 }
 
 /** History's "Switch to native chat": in place when a pane in this window last reported the
  *  conversation. False otherwise, so the row opens or reveals its chat in a new tab. */
-export function switchAiVaultSessionToNativeChat(session: AiVaultSession): boolean {
+export function switchAiVaultSessionToNativeChat(
+  session: AiVaultSession,
+  workspaceId?: string,
+  originalPaneTarget?: AiVaultOriginalPaneTarget | null
+): boolean {
   if (
     !adoptsCliConversations(session.agent) ||
     !inPlaceSwitchSupportedNow(session.executionHostId, session.agent)
   ) {
     return false
   }
-  const agent = session.agent
-  const state = useAppStore.getState()
-  const pane = collectAgentPaneConversations(state, adoptsCliConversations, {
-    allPanes: true
-  }).find(
-    (candidate) =>
-      candidate.providerSession.id === session.sessionId &&
-      cliConversationRowsShareAgent(candidate.agent, agent) &&
-      candidate.executionHostId === session.executionHostId
-  )
-  const source = pane
-    ? resolveCliChatResumeSource(state, {
-        tab: { id: pane.tabId, worktreeId: pane.worktreeId },
-        paneKey: pane.paneKey
-      })
-    : null
+  const source = historyPaneSource(session, originalPaneTarget)
   if (!source) {
-    const target = structuredAgentSessionTargetForHost(session.executionHostId)
-    if (!target || !session.structuredSession || !adoptsCliConversations(session.agent)) {
+    const subject = historyConversationSwitch(session, 'chat', workspaceId)
+    if (!subject) {
       return false
     }
-    void switchIntoOwner(
-      { agent: session.agent, tabId: '', workspaceId: session.structuredSession.workspaceId },
-      session.structuredSession,
-      target
-    )
+    void runConversationSwitch(subject)
     return true
   }
-  void runCliChatResume(source)
+  void runConversationSwitch({ direction: 'chat', ...source, source, history: session })
   return true
 }
+
+/** History can address a closed chat without opening it merely to inspect availability. */
+export function historyConversationSwitch(
+  session: AiVaultSession,
+  direction: 'chat' | 'terminal',
+  workspaceId?: string,
+  originalPaneTarget?: AiVaultOriginalPaneTarget | null
+): ConversationSwitch | null {
+  const chat = session.structuredSession
+  return chat || direction === 'chat'
+    ? {
+        direction,
+        agent: session.agent,
+        executionHostId: session.executionHostId,
+        workspaceId: chat?.workspaceId ?? workspaceId ?? '',
+        sessionId: chat?.sessionId,
+        history: session,
+        source:
+          direction === 'chat'
+            ? (historyPaneSource(session, originalPaneTarget) ?? undefined)
+            : undefined,
+        platform: session.executionHostPlatform ?? undefined
+      }
+    : null
+}
+
+function historyPaneSource(session: AiVaultSession, pane?: AiVaultOriginalPaneTarget | null) {
+  if (!pane) {
+    return null
+  }
+  const source = resolveCliChatResumeSource(useAppStore.getState(), {
+    tab: { id: pane.tabId, worktreeId: pane.worktreeId },
+    paneKey: pane.paneKey
+  })
+  return source &&
+    source.executionHostId === session.executionHostId &&
+    source.providerSessionId === session.sessionId &&
+    cliConversationRowsShareAgent(source.agent, session.agent)
+    ? source
+    : null
+}
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 ac117ce5e8f7..15fcedeb0ec5 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
@@ -1,3 +1,4 @@
+import type { AiVaultOriginalPaneTarget } from './ai-vault-original-pane'
 import {
   notifyAiVaultSessionPreparationFailure,
   resolveAiVaultSessionLaunchTargetOrNotify
@@ -196,8 +197,19 @@ export function useAiVaultSessionLaunchActions({
   )
 
   const handleResumeInNewChat = useCallback(
-    (session: AiVaultSession, targetWorktreeId?: string): void => {
-      if (!adoptsCliConversations(session.agent) || switchAiVaultSessionToNativeChat(session)) {
+    (
+      session: AiVaultSession,
+      targetWorktreeId?: string,
+      pane?: AiVaultOriginalPaneTarget | null
+    ): void => {
+      if (
+        !adoptsCliConversations(session.agent) ||
+        switchAiVaultSessionToNativeChat(
+          session,
+          targetWorktreeId ?? activeWorktreeId ?? activeWorktree?.id,
+          pane
+        )
+      ) {
         return
       }
       const worktreeId = targetWorktreeId ?? activeWorktreeId ?? activeWorktree?.id ?? null
diff --git a/src/renderer/src/components/tab-bar/CliChatResumeMenuItems.tsx b/src/renderer/src/components/tab-bar/CliChatResumeMenuItems.tsx
index dfc25f1f9cd4..05910edb59be 100644
--- a/src/renderer/src/components/tab-bar/CliChatResumeMenuItems.tsx
+++ b/src/renderer/src/components/tab-bar/CliChatResumeMenuItems.tsx
@@ -1,3 +1,4 @@
+import { useConversationSwitchReadiness } from '@/lib/conversation-surface-switch'
 import { isNativeChatEnabled } from '../../../../shared/structured-native-chat-launch-route'
 import { useShallow } from 'zustand/react/shallow'
 import { useAppStore } from '@/store'
@@ -5,7 +6,7 @@ import { DropdownMenuSeparator } from '@/components/ui/dropdown-menu'
 import type { TerminalTab } from '../../../../shared/terminal-tab-types'
 import { AiVaultSessionSurfaceSwitchMenuItems } from '../right-sidebar/AiVaultSessionSurfaceSwitchMenuItems'
 import { resolveCliChatResumeSource, useCliChatResumeCapability } from './cli-chat-resume-source'
-import { runCliChatResume, useCliChatResumePending } from './cli-chat-resume-run'
+import { runCliChatResume } from '@/lib/conversation-surface-switch'
 
 export function CliChatResumeMenuItems({
   tab,
@@ -18,9 +19,11 @@ export function CliChatResumeMenuItems({
 }): React.JSX.Element | null {
   const source = useAppStore(useShallow((state) => resolveCliChatResumeSource(state, { tab })))
   const capability = useCliChatResumeCapability(tab.worktreeId, source?.agent)
-  const pending = useCliChatResumePending(source)
+  const readiness = useConversationSwitchReadiness(
+    source ? { direction: 'chat', ...source, source } : null
+  )
   const enabled = useAppStore((state) => isNativeChatEnabled(state.settings))
-  if (!source || (!enabled && capability !== false)) {
+  if (!source || !enabled) {
     return null
   }
   return (
@@ -28,10 +31,11 @@ export function CliChatResumeMenuItems({
       {leadingSeparator ? <DropdownMenuSeparator /> : null}
       <AiVaultSessionSurfaceSwitchMenuItems
         action={capability === false ? 'resume' : 'switch'}
-        switchLoading={capability === undefined}
+        switchLoading={!readiness.ready}
+        switchExplanation={readiness.explanation}
         menuKind="dropdown"
         tooltipSide="right"
-        chatPending={pending}
+        chatPending={readiness.pending}
         onResumeInNewChat={(event) => {
           event.preventDefault()
           void runCliChatResume(source).finally(() => onComplete?.())
diff --git a/src/renderer/src/components/tab-bar/NativeChatCliForkMenuItems.tsx b/src/renderer/src/components/tab-bar/NativeChatCliForkMenuItems.tsx
index cd6a6531aaf4..86678d59ed0f 100644
--- a/src/renderer/src/components/tab-bar/NativeChatCliForkMenuItems.tsx
+++ b/src/renderer/src/components/tab-bar/NativeChatCliForkMenuItems.tsx
@@ -1,16 +1,18 @@
+import { useConversationSwitchReadiness } from '@/lib/conversation-surface-switch'
+import { useShallow } from 'zustand/react/shallow'
 import { isNativeChatEnabled } from '../../../../shared/structured-native-chat-launch-route'
-import { useState } from 'react'
 import { DropdownMenuSeparator } from '@/components/ui/dropdown-menu'
 import { useAppStore } from '@/store'
 import { AI_VAULT_AGENTS } from '../../../../shared/ai-vault-types'
 import { AiVaultSessionSurfaceSwitchMenuItems } from '../right-sidebar/AiVaultSessionSurfaceSwitchMenuItems'
 import {
+  resolveNativeChatCliForkIdentity,
   resolveTabSessionHistorySubject,
   type NativeChatTabSession
 } from './tab-session-history-switch'
 import { runNativeChatCliFork, useNativeChatCliForkPending } from './native-chat-cli-fork-run'
 import { useInPlaceSwitchCapability } from '@/lib/in-place-switch-support'
-import { runNativeChatCliSwitch, useNativeChatCliSwitchPending } from './native-chat-cli-switch-run'
+import { runNativeChatCliSwitch } from '@/lib/conversation-surface-switch'
 
 /** "Switch to CLI" where the chat's host switches its agent in place; otherwise the fork. */
 export function NativeChatCliForkMenuItems({
@@ -24,19 +26,29 @@ export function NativeChatCliForkMenuItems({
   leadingSeparator: boolean
   onComplete?: () => void
 }): React.JSX.Element | null {
-  const [subject] = useState(() =>
-    resolveTabSessionHistorySubject(useAppStore.getState(), { tab, nativeChat })
+  const chat = useAppStore(
+    useShallow((state) => resolveNativeChatCliForkIdentity(state, { tab, nativeChat }))
   )
-  const chat = subject?.kind === 'chat' ? subject : null
   const forkPending = useNativeChatCliForkPending(
-    chat ? { executionHostScope: chat.request.executionHostScope, sessionId: chat.sessionId } : null
+    chat ? { executionHostScope: chat.executionHostScope, sessionId: chat.sessionId } : null
   )
-  const switchPending = useNativeChatCliSwitchPending(chat?.sessionId)
   const commandOverrides = useAppStore((state) => state.settings?.agentCmdOverrides)
   const agent = AI_VAULT_AGENTS.find((candidate) => candidate === nativeChat.agent)
-  const inPlace = useInPlaceSwitchCapability(chat?.request.executionHostScope, agent)
+  const inPlace = useInPlaceSwitchCapability(chat?.executionHostScope, agent)
+  const readiness = useConversationSwitchReadiness(
+    chat && agent
+      ? {
+          direction: 'terminal',
+          sessionId: chat.sessionId,
+          agent,
+          workspaceId: chat.workspaceId,
+          executionHostId: chat.executionHostScope,
+          chatTabId: tab.id
+        }
+      : null
+  )
   const enabled = useAppStore((state) => isNativeChatEnabled(state.settings))
-  if (!chat || !agent || (!enabled && inPlace !== false)) {
+  if (!chat || !agent || !enabled) {
     return null
   }
   return (
@@ -46,8 +58,9 @@ export function NativeChatCliForkMenuItems({
         action="switch"
         menuKind="dropdown"
         tooltipSide="right"
-        cliPending={inPlace !== false ? switchPending : forkPending}
-        switchLoading={inPlace === undefined}
+        cliPending={inPlace !== false ? readiness.pending : forkPending}
+        switchLoading={inPlace !== false && !readiness.ready}
+        switchExplanation={readiness.explanation}
         {...(inPlace !== false ? { inPlaceAgent: agent } : {})}
         onResumeInNewCli={(event) => {
           event.preventDefault()
@@ -55,12 +68,20 @@ export function NativeChatCliForkMenuItems({
             ? runNativeChatCliSwitch({
                 sessionId: chat.sessionId,
                 workspaceId: chat.workspaceId,
-                executionHostId: chat.request.executionHostScope,
+                executionHostId: chat.executionHostScope,
                 agent,
                 chatTabId: tab.id,
                 onComplete
               })
-            : runNativeChatCliFork({ subject: chat, tab, agent, commandOverrides, onComplete }))
+            : (() => {
+                const subject = resolveTabSessionHistorySubject(useAppStore.getState(), {
+                  tab,
+                  nativeChat
+                })
+                return subject?.kind === 'chat'
+                  ? runNativeChatCliFork({ subject, tab, agent, commandOverrides, onComplete })
+                  : Promise.resolve()
+              })())
         }}
       />
     </>
diff --git a/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx b/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx
index 3b7feed815d0..9549556535d6 100644
--- a/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx
+++ b/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx
@@ -1,5 +1,8 @@
 vi.mock('@/lib/in-place-switch-support', () => ({ useInPlaceSwitchCapability: () => false }))
 // @vitest-environment happy-dom
+import { useAppStore } from '@/store'
+import { makeRepo, makeWorktree } from '../worktree-jump-palette-test-fixtures'
+import { createGlobalSettingsFixture } from '../../../../shared/global-settings-test-fixture'
 import { useSyncExternalStore } from 'react'
 import { act, cleanup, fireEvent, render, screen } from '@testing-library/react'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
@@ -38,14 +41,6 @@ vi.mock('./native-chat-cli-fork-run', () => ({
     )
 }))
 
-vi.mock('@/store', () => ({
-  useAppStore: Object.assign(
-    (selector: (state: Record<string, unknown>) => unknown) =>
-      selector({ settings: { experimentalNativeChat: true } }),
-    { getState: () => ({}) }
-  )
-}))
-
 vi.mock('./tab-session-history-switch', async (importOriginal) => ({
   ...(await importOriginal<Record<string, unknown>>()),
   resolveTabSessionHistorySubject: () => mocks.subject
@@ -55,9 +50,9 @@ vi.mock('./cli-chat-resume-source', () => ({
   useCliChatResumeCapability: (_worktreeId: string, agent: string) => agent === 'codex',
   resolveCliChatResumeSource: () => mocks.cliSource
 }))
-vi.mock('./cli-chat-resume-run', () => ({
+vi.mock('@/lib/conversation-surface-switch', () => ({
   runCliChatResume: mocks.runCliChatResume,
-  useCliChatResumePending: () => false
+  useConversationSwitchReadiness: () => ({ ready: true, pending: false })
 }))
 
 const CHAT_SUBJECT = {
@@ -68,6 +63,12 @@ const CHAT_SUBJECT = {
 }
 
 beforeEach(() => {
+  useAppStore.setState(useAppStore.getInitialState(), true)
+  useAppStore.setState({
+    settings: createGlobalSettingsFixture({ experimentalNativeChat: true }),
+    repos: [makeRepo()],
+    worktreesByRepo: { 'repo-1': [makeWorktree('wt-1', 'Worktree', { path: '/repo/wt' })] }
+  })
   mocks.subject = null
   mocks.cliSource = null
   mocks.pending = false
diff --git a/src/renderer/src/components/tab-bar/TabSessionSwitchHoverAction.tsx b/src/renderer/src/components/tab-bar/TabSessionSwitchHoverAction.tsx
index 6f1b9555cdba..44a161424ac9 100644
--- a/src/renderer/src/components/tab-bar/TabSessionSwitchHoverAction.tsx
+++ b/src/renderer/src/components/tab-bar/TabSessionSwitchHoverAction.tsx
@@ -1,5 +1,5 @@
+import { useConversationSwitchReadiness } from '@/lib/conversation-surface-switch'
 import { isNativeChatEnabled } from '../../../../shared/structured-native-chat-launch-route'
-import { useState } from 'react'
 import { useShallow } from 'zustand/react/shallow'
 import { MessagesSquare, SquareTerminal } from 'lucide-react'
 import { Button } from '@/components/ui/button'
@@ -8,10 +8,10 @@ import { useAppStore } from '@/store'
 import { useInPlaceSwitchCapability } from '@/lib/in-place-switch-support'
 import { AI_VAULT_AGENTS } from '../../../../shared/ai-vault-types'
 import { resolveCliChatResumeSource, useCliChatResumeCapability } from './cli-chat-resume-source'
-import { runCliChatResume, useCliChatResumePending } from './cli-chat-resume-run'
-import { runNativeChatCliSwitch, useNativeChatCliSwitchPending } from './native-chat-cli-switch-run'
+import { runCliChatResume } from '@/lib/conversation-surface-switch'
+import { runNativeChatCliSwitch } from '@/lib/conversation-surface-switch'
 import {
-  resolveTabSessionHistorySubject,
+  resolveNativeChatCliForkIdentity,
   type NativeChatTabSession
 } from './tab-session-history-switch'
 
@@ -41,13 +41,23 @@ function ChatSwitchAction({
   tab: { id: string; worktreeId: string }
   nativeChat: NativeChatTabSession
 }): React.JSX.Element | null {
-  const [subject] = useState(() =>
-    resolveTabSessionHistorySubject(useAppStore.getState(), { tab, nativeChat })
+  const chat = useAppStore(
+    useShallow((state) => resolveNativeChatCliForkIdentity(state, { tab, nativeChat }))
   )
-  const chat = subject?.kind === 'chat' ? subject : null
   const agent = AI_VAULT_AGENTS.find((candidate) => candidate === nativeChat.agent)
-  const inPlace = useInPlaceSwitchCapability(chat?.request.executionHostScope, agent)
-  const pending = useNativeChatCliSwitchPending(chat?.sessionId)
+  const inPlace = useInPlaceSwitchCapability(chat?.executionHostScope, agent)
+  const readiness = useConversationSwitchReadiness(
+    chat && agent
+      ? {
+          direction: 'terminal',
+          sessionId: chat.sessionId,
+          agent,
+          workspaceId: chat.workspaceId,
+          executionHostId: chat.executionHostScope,
+          chatTabId: tab.id
+        }
+      : null
+  )
   if (!chat || !agent || inPlace === false) {
     return null
   }
@@ -55,12 +65,13 @@ function ChatSwitchAction({
     <Button
       variant="ghost"
       size="xs"
-      disabled={pending || inPlace === undefined}
+      disabled={!readiness.ready}
+      title={readiness.explanation}
       onClick={() =>
         void runNativeChatCliSwitch({
           sessionId: chat.sessionId,
           workspaceId: chat.workspaceId,
-          executionHostId: chat.request.executionHostScope,
+          executionHostId: chat.executionHostScope,
           agent,
           chatTabId: tab.id
         })
@@ -79,7 +90,9 @@ function TerminalSwitchAction({
 }): React.JSX.Element | null {
   const source = useAppStore(useShallow((state) => resolveCliChatResumeSource(state, { tab })))
   const capability = useCliChatResumeCapability(tab.worktreeId, source?.agent)
-  const pending = useCliChatResumePending(source)
+  const readiness = useConversationSwitchReadiness(
+    source ? { direction: 'chat', ...source, source } : null
+  )
   if (!source || capability === false) {
     return null
   }
@@ -87,7 +100,8 @@ function TerminalSwitchAction({
     <Button
       variant="ghost"
       size="xs"
-      disabled={pending || capability === undefined}
+      disabled={!readiness.ready}
+      title={readiness.explanation}
       onClick={() => void runCliChatResume(source)}
     >
       <MessagesSquare />
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-exit-return.test-fixture.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-exit-return.test-fixture.ts
index e11e86f4ab3a..74cb0068b2c4 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-exit-return.test-fixture.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-exit-return.test-fixture.ts
@@ -216,6 +216,10 @@ export async function verifyExitedPaneHistoryReturn(
     subagent: null
   }
   await vi.waitFor(() => expect(inPlaceSwitchSupportedNow('local', 'codex')).toBe(true))
+  mocks.source = resolveCliChatResumeSource(useAppStore.getState(), {
+    tab: { id: 'shell', worktreeId: 'wt-1' },
+    paneKey
+  })
   mocks.call.mockResolvedValueOnce({
     ok: false,
     refusal: {
@@ -225,8 +229,18 @@ export async function verifyExitedPaneHistoryReturn(
       createAttemptRefusedBeforeCommit: true
     }
   })
-  expect(switchAiVaultSessionToNativeChat(history)).toBe(true)
+  expect(
+    switchAiVaultSessionToNativeChat(history, 'wt-1', {
+      worktreeId: 'wt-1',
+      tabId: 'shell',
+      paneKey: pane.paneKey
+    })
+  ).toBe(true)
   await vi.waitFor(() => expect(mocks.toast).toHaveBeenCalledOnce())
+  expect(mocks.call.mock.calls.some(([, method]) => method === 'agentSession.create')).toBe(true)
+  expect(mocks.toast).toHaveBeenCalledWith(
+    "Codex couldn't open this conversation's history. Check that its saved conversation is available, then try again."
+  )
   expect(tabs().map((tab) => tab.id)).toContain('shell')
   expect(mocks.rpc.mock.calls.some(([, method]) => method === 'terminal.close')).toBe(false)
   expect(canPaneOfferResumeInNewChat(useAppStore.getState(), pane)).toBe(true)
@@ -240,7 +254,13 @@ export async function verifyExitedPaneHistoryReturn(
   )
   const { closed, siblingWatcher } = installExitedPaneRetirement(mocks)
   try {
-    expect(switchAiVaultSessionToNativeChat(history)).toBe(true)
+    expect(
+      switchAiVaultSessionToNativeChat(history, 'wt-1', {
+        worktreeId: 'wt-1',
+        tabId: 'shell',
+        paneKey: pane.paneKey
+      })
+    ).toBe(true)
     await vi.waitFor(() =>
       expect(
         mocks.call.mock.calls.some(([, method]) => method === 'agentSession.switchToChat')
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
index eacdd6e75646..4137936b2013 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
@@ -1,3 +1,4 @@
+import { conversationSwitchFailureText } from '@/lib/conversation-switch-feedback'
 import { useAppStore } from '@/store'
 import { parseWorkspaceKey } from '../../../../shared/workspace-scope'
 import { getIndexedWorktreeById } from '@/store/worktree-repo-index'
@@ -14,12 +15,9 @@ import {
   callStructuredAgentSession,
   supportsInPlaceSwitch
 } from '@/runtime/structured-agent-session-client'
-import { agentSessionWriteFailureText } from '../native-chat/agent-session-write-notice-text'
-import { agentLabel } from '../../../../shared/ai-vault-session-filters'
 import type { AgentSessionWireRefusal } from '../../../../shared/agent-session-wire'
 import type { AiVaultSession } from '../../../../shared/ai-vault-types'
 import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
-import { cliConversationExitGuidance } from '@/lib/cli-conversation-exit-guidance'
 import type { CliChatResumeSource } from './cli-chat-resume-source'
 
 /** True only when the chat already holding the conversation took it over: the host started its
@@ -31,13 +29,13 @@ export async function reportCliChatResumeFailure(
 ): Promise<boolean> {
   const owner = structuredLaunchFailure(error)?.owner
   if (owner) {
-    return switchIntoOwner(source, owner, target)
+    return switchIntoOwnerLegacy(source, owner, target)
   }
   toastCliChatResumeFailure(source, error)
   return false
 }
 
-export async function switchIntoOwner(
+export async function switchIntoOwnerLegacy(
   source: Pick<CliChatResumeSource, 'agent' | 'tabId' | 'workspaceId'>,
   structuredSession: NonNullable<AiVaultSession['structuredSession']>,
   target: RuntimeClientTarget
@@ -114,17 +112,14 @@ export async function startCliChatReturn(
     { ok: true } | { ok: false; refusal: AgentSessionWireRefusal }
   >(target, 'agentSession.switchToChat', { sessionId }).catch(() => null)
   if (!switched?.ok) {
-    const failure = switched
-      ? structuredLaunchFailure(Object.assign(new Error(switched.refusal.message), switched))
-      : undefined
-    // Never the owner shortcut again: a refused start keeps the terminal and says why.
     toast.error(
-      failure?.code === 'agent_session_operation_invalid' &&
-        failure.details?.reason === 'conversationOpenInTerminal'
-        ? cliConversationExitGuidance(source.agent, true)
-        : agentSessionWriteFailureText(failure ?? { kind: 'unconfirmed' }, 'read-history', {
-            agentName: agentLabel(source.agent)
-          })
+      conversationSwitchFailureText(
+        switched ? Object.assign(new Error('Chat switch refused'), switched) : null,
+        {
+          agent: source.agent,
+          direction: 'chat'
+        }
+      )
     )
     return false
   }
@@ -132,51 +127,7 @@ export async function startCliChatReturn(
 }
 
 export function toastCliChatResumeFailure(source: CliChatResumeSource, error: unknown): void {
-  const refusal = structuredLaunchFailure(error)
-  if (
-    refusal?.code === 'agent_session_conflict' ||
-    refusal?.code === 'agent_session_ownership_unknown'
-  ) {
-    toast.error(
-      refusal.code === 'agent_session_conflict' &&
-        refusal.details?.reason === 'conversationHeldElsewhere'
-        ? cliConversationExitGuidance(source.agent, true)
-        : translate(
-            'auto.components.right.sidebar.AiVaultPanel.resumeInChatConflict',
-            'Another chat is already holding this conversation.'
-          )
-    )
-    return
-  }
-  // The chat's agent refused to start while the terminal may still write the conversation.
-  if (
-    refusal?.code === 'agent_session_operation_invalid' &&
-    refusal.details?.reason === 'conversationOpenInTerminal'
-  ) {
-    toast.error(cliConversationExitGuidance(source.agent, true))
-    return
-  }
-  if (refusal?.code === 'agent_session_identity_required') {
-    if (refusal.details?.reason === 'transcriptNotFound') {
-      toast.error(
-        translate(
-          'components.native-chat.resumeInNewChat.notSavedYet',
-          "{{agent}} hasn't saved this conversation yet. Try again after it replies.",
-          { agent: agentLabel(source.agent) }
-        )
-      )
-      return
-    }
-    const failure = structuredLaunchFailure(error)
-    if (failure) {
-      toast.error(agentSessionWriteFailureText(failure, 'read-history'))
-      return
-    }
-  }
   toast.error(
-    translate(
-      'auto.components.right.sidebar.AiVaultPanel.resumeInChatFailed',
-      'Could not resume this session in a new chat.'
-    )
+    conversationSwitchFailureText(error, { agent: source.agent, direction: 'chat', source })
   )
 }
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-mocks.test-fixture.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-mocks.test-fixture.ts
index 1ec339e33188..6a4fe100e334 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-mocks.test-fixture.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-mocks.test-fixture.ts
@@ -10,6 +10,7 @@ export type CliChatResumeTestMocks = {
   call: Mock
   toast: Mock
   success: Mock
+  info: Mock
   activate: Mock<() => Promise<boolean>>
   activateVerified: Mock<() => Promise<string>>
   switchCapability: Mock<() => Promise<boolean>>
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
index 7d61a5104787..acb848138cfb 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
@@ -1,4 +1,3 @@
-// @vitest-environment happy-dom
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type { CliChatResumeSource } from './cli-chat-resume-source'
 import type * as ResumeSourceModule from './cli-chat-resume-source'
@@ -6,11 +5,62 @@ import type * as RuntimeRpcModule from '@/runtime/runtime-rpc-client'
 import type { AgentSessionWireRefusal } from '../../../../shared/agent-session-wire'
 import type { StructuredAgentSessionCreateParams } from '../../../../shared/structured-agent-session-create'
 import type * as FrameDrawnChatTabPlacementModule from '@/lib/frame-drawn-chat-tab-placement'
-
 import {
   seedCliChatResumeRpc,
   type CliChatResumeTestMocks
 } from './cli-chat-resume-mocks.test-fixture'
+import {
+  STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY,
+  STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY
+} from '../../../../shared/protocol-version'
+import { adoptAgentSessionLaunchVerdict } from '@/lib/agent-session-launch-plan'
+import { newAgentLaunchRequestId } from '@/lib/agent-launch-request-id'
+import { beginStructuredAgentSessionProvisionalLaunch } from '@/lib/agent-session/structured-agent-session-provisional-tab'
+import {
+  getStructuredAgentSessionLaunchLifecycle,
+  retryStructuredAgentSessionLaunch
+} from '@/lib/structured-agent-session-launch'
+import {
+  readStructuredAgentLaunchRecord,
+  writeStructuredAgentLaunchRecord,
+  resetStructuredAgentLaunchPersistenceForTests
+} from '@/lib/agent-session/launch/structured-agent-session-launch-persistence'
+import {
+  reserveStructuredLaunchSlot,
+  restoreStructuredLaunchSurfaces,
+  stopStructuredLaunchSlotTracking
+} from '@/lib/structured-agent-session-launch-surface'
+import { applyStructuredSessionTabSnapshots } from '@/runtime/local-structured-session-tabs-sync/snapshot-apply'
+import { resetLocalStructuredSessionVersionForTests } from '@/runtime/local-structured-session-tabs-sync/inventory-generation-fence'
+import { resetWebSessionTabsSnapshotFreshnessForTests } from '@/runtime/web-session-tabs-sync/tracking-lifecycle'
+import { buildWorkspaceSessionPayload } from '@/lib/workspace-session'
+import { buildHydratedTabState } from '@/store/slices/tabs-hydration'
+import { makeTerminalTab, makeWorktree } from '@/store/slices/worktrees-slice-test-fixtures'
+import { useAppStore } from '@/store'
+import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
+import { layoutApplyTestTransport } from '@/runtime/layout-apply-test-transport.test-fixture'
+import { runLegacyCliChatResume as runCliChatResume } from './cli-chat-resume-run'
+import { verifyExitedPaneHistoryReturn } from './cli-chat-resume-exit-return.test-fixture'
+import { switchIntoOwnerLegacy as switchIntoOwner } from './cli-chat-resume-feedback'
+import {
+  resetStructuredAgentLaunchRegistryForTests,
+  structuredLaunchStates
+} from '@/lib/agent-session/launch/structured-agent-session-launch-registry'
+import { isEmptyWorkspaceDefaultSurfacePending } from '@/lib/empty-workspace-default-surface-claims'
+import {
+  clearWebSessionFocusIntent,
+  peekWebSessionFocusIntent,
+  resetWebSessionFocusIntentForTests
+} from '@/runtime/web-session-focus-intent'
+import { structuredAgentSessionFocusOwner } from '@/runtime/structured-agent-session-owner'
+import { registerSessionTabIpcBridge } from '@/hooks/ipc-events/session-tab-ipc-bridge'
+import {
+  drawTabsFromMain,
+  type TabsDrawnFromMain
+} from '@/store/slices/tabs-drawn-from-main.test-fixture'
+import { snapshot } from './cli-chat-resume-snapshot.test-fixture'
+
+// @vitest-environment happy-dom
 
 const mocks: CliChatResumeTestMocks = vi.hoisted(() => {
   const state: { source: CliChatResumeSource | null } = { source: null }
@@ -23,6 +73,7 @@ const mocks: CliChatResumeTestMocks = vi.hoisted(() => {
     toast: vi.fn(),
     frameDrawn: false,
     success: vi.fn(),
+    info: vi.fn(),
     activate: vi.fn(async () => true),
     activateVerified: vi.fn(async () => 'activated'),
     switchCapability: vi.fn(async () => false),
@@ -52,7 +103,8 @@ vi.mock('./cli-chat-resume-source', async (importOriginal) => {
 vi.mock('@/runtime/structured-agent-session-client', () => ({
   supportsStructuredAgentSessionCliSource: mocks.sourceCapability,
   supportsStructuredAgentSessionCreateMessage: mocks.createCapability,
-  supportsInPlaceSwitch: mocks.switchCapability,
+  supportsInPlaceSwitch: (_target: unknown, _agent: string, execution = false) =>
+    execution ? Promise.resolve(false) : mocks.switchCapability(),
   callStructuredAgentSession: (...args: unknown[]) =>
     args[1] === 'agentSession.createSupport'
       ? Promise.resolve({ supported: true })
@@ -81,7 +133,9 @@ vi.mock('@/runtime/structured-session-tab-inventory', () => ({
 vi.mock('@/lib/structured-agent-session-create-hydration', () => ({
   publishStructuredAgentSessionCreateHydration: vi.fn()
 }))
-vi.mock('sonner', () => ({ toast: { error: mocks.toast, success: mocks.success } }))
+vi.mock('sonner', () => ({
+  toast: { error: mocks.toast, success: mocks.success, info: mocks.info }
+}))
 // A frame-drawn server workspace's create carries the tab's place, read as it is sent.
 vi.mock('@/lib/frame-drawn-chat-tab-placement', async (importOriginal) => {
   const actual = await importOriginal<typeof FrameDrawnChatTabPlacementModule>()
@@ -117,57 +171,6 @@ vi.mock('@/runtime/runtime-layout-client', async (importOriginal) =>
   ).runtimeLayoutClientWithTestFrames(await importOriginal())
 )
 
-import {
-  STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY,
-  STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY
-} from '../../../../shared/protocol-version'
-import { adoptAgentSessionLaunchVerdict } from '@/lib/agent-session-launch-plan'
-import { newAgentLaunchRequestId } from '@/lib/agent-launch-request-id'
-import { beginStructuredAgentSessionProvisionalLaunch } from '@/lib/agent-session/structured-agent-session-provisional-tab'
-import {
-  getStructuredAgentSessionLaunchLifecycle,
-  retryStructuredAgentSessionLaunch
-} from '@/lib/structured-agent-session-launch'
-import {
-  readStructuredAgentLaunchRecord,
-  writeStructuredAgentLaunchRecord,
-  resetStructuredAgentLaunchPersistenceForTests
-} from '@/lib/agent-session/launch/structured-agent-session-launch-persistence'
-import {
-  reserveStructuredLaunchSlot,
-  restoreStructuredLaunchSurfaces,
-  stopStructuredLaunchSlotTracking
-} from '@/lib/structured-agent-session-launch-surface'
-import { applyStructuredSessionTabSnapshots } from '@/runtime/local-structured-session-tabs-sync/snapshot-apply'
-import { resetLocalStructuredSessionVersionForTests } from '@/runtime/local-structured-session-tabs-sync/inventory-generation-fence'
-import { resetWebSessionTabsSnapshotFreshnessForTests } from '@/runtime/web-session-tabs-sync/tracking-lifecycle'
-import { buildWorkspaceSessionPayload } from '@/lib/workspace-session'
-import { buildHydratedTabState } from '@/store/slices/tabs-hydration'
-import { makeTerminalTab, makeWorktree } from '@/store/slices/worktrees-slice-test-fixtures'
-import type { RuntimeMobileSessionTabsResult } from '../../../../shared/runtime-types'
-import { useAppStore } from '@/store'
-import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
-import { layoutApplyTestTransport } from '@/runtime/layout-apply-test-transport.test-fixture'
-import { runCliChatResume } from './cli-chat-resume-run'
-import { verifyExitedPaneHistoryReturn } from './cli-chat-resume-exit-return.test-fixture'
-import { switchIntoOwner } from './cli-chat-resume-feedback'
-import {
-  resetStructuredAgentLaunchRegistryForTests,
-  structuredLaunchStates
-} from '@/lib/agent-session/launch/structured-agent-session-launch-registry'
-import { isEmptyWorkspaceDefaultSurfacePending } from '@/lib/empty-workspace-default-surface-claims'
-import {
-  clearWebSessionFocusIntent,
-  peekWebSessionFocusIntent,
-  resetWebSessionFocusIntentForTests
-} from '@/runtime/web-session-focus-intent'
-import { structuredAgentSessionFocusOwner } from '@/runtime/structured-agent-session-owner'
-import { registerSessionTabIpcBridge } from '@/hooks/ipc-events/session-tab-ipc-bridge'
-import {
-  drawTabsFromMain,
-  type TabsDrawnFromMain
-} from '@/store/slices/tabs-drawn-from-main.test-fixture'
-
 const SOURCE: CliChatResumeSource = {
   tabId: 'tab-1',
   workspaceId: 'wt-1',
@@ -179,7 +182,13 @@ const SOURCE: CliChatResumeSource = {
 }
 const tabs = () => useAppStore.getState().unifiedTabsByWorktree['wt-1'] ?? []
 let main: TabsDrawnFromMain | undefined
-afterEach(() => {
+const deferredCleanups: (() => void)[] = []
+afterEach(async () => {
+  for (const finish of deferredCleanups.splice(0)) {
+    finish()
+  }
+  // Settle fixture-owned replies even when an assertion prevented its normal resolver.
+  await new Promise((resolve) => setTimeout(resolve, 0))
   vi.unstubAllGlobals()
   main?.close()
   main = undefined
@@ -189,6 +198,7 @@ function deferred<T>() {
   const promise = new Promise<T>((done) => {
     resolve = done
   })
+  deferredCleanups.push(() => resolve(undefined!))
   return { promise, resolve }
 }
 function refuse(reason: 'transcriptNotFound' | 'transcriptUnreadable'): AgentSessionWireRefusal {
@@ -202,6 +212,10 @@ function refuse(reason: 'transcriptNotFound' | 'transcriptUnreadable'): AgentSes
 
 beforeEach(async () => {
   vi.clearAllMocks()
+  mocks.call.mockReset()
+  mocks.rpc.mockReset()
+  mocks.createCapability.mockReset()
+  mocks.sourceCapability.mockReset()
   resetLocalStructuredSessionVersionForTests()
   resetWebSessionTabsSnapshotFreshnessForTests()
   stopStructuredLaunchSlotTracking()
@@ -240,29 +254,6 @@ beforeEach(async () => {
   })
 })
 
-function snapshot(sessionId?: string): RuntimeMobileSessionTabsResult {
-  return {
-    worktree: 'wt-1',
-    publicationEpoch: 'publication-test',
-    snapshotVersion: Date.now(),
-    activeGroupId: null,
-    activeTabId: null,
-    activeTabType: null,
-    tabs: sessionId
-      ? [
-          {
-            type: 'agent-session',
-            id: `agent-session:${sessionId}`,
-            sessionId,
-            agent: 'claude',
-            title: 'Chat',
-            isActive: false
-          }
-        ]
-      : []
-  }
-}
-
 /** Main takes the store's current layout, as after a restart; seeding after it is invisible to main. */
 async function redrawFromMain(): Promise<void> {
   main?.close()
@@ -472,20 +463,20 @@ describe('CLI identity resume through the existing launch owner', () => {
     }
   })
 
-  it('keeps the terminal and directs a refused terminal writer to Session History', async () => {
+  it('keeps the terminal and directs an addressed refused writer to quit here and retry', async () => {
     mocks.call.mockResolvedValue({
       ok: false,
       refusal: {
         code: 'agent_session_conflict',
         message: 'private host evidence',
-        details: { reason: 'conversationHeldElsewhere' },
+        details: { reason: 'conversationHeldElsewhere', source: true },
         createAttemptRefusedBeforeCommit: true
       }
     })
     await runCliChatResume(SOURCE)
     expect(mocks.toast).toHaveBeenCalledTimes(1)
     expect(mocks.toast.mock.calls[0]?.[0]).toBe(
-      'Claude is already running this conversation in another terminal. Quit Claude there or close that terminal, then open this conversation from Session History.'
+      'Orca could not confirm Claude stopped in this terminal. Quit Claude here, then try this action again.'
     )
     expect(mocks.activate).not.toHaveBeenCalled()
     expect(tabs()).toEqual([])
@@ -566,7 +557,8 @@ describe('CLI identity resume through the existing launch owner', () => {
       .mockRejectedValueOnce(new Error('required write failed'))
     await runCliChatResume(mocks.source)
     expect(mocks.rpc.mock.calls.filter(([, method]) => method === 'terminal.close')).toHaveLength(1)
-    expect(mocks.toast).toHaveBeenCalledTimes(2)
+    expect(mocks.toast).toHaveBeenCalledOnce()
+    expect(mocks.info).toHaveBeenCalledWith(expect.stringContaining('opened successfully'))
     expect(mocks.activateVerified).toHaveBeenCalledWith({ structuredSession: owner }, undefined, {
       kind: 'local'
     })
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
index c7dd7f66c287..29d1bacd70d1 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
@@ -1,4 +1,6 @@
-import { useSyncExternalStore } from 'react'
+import { toast } from 'sonner'
+import { conversationSwitchSourceKept } from '@/lib/conversation-switch-feedback'
+import { conversationSwitchChanged } from '@/lib/pending-conversation-surface-switches'
 import { useAppStore } from '@/store'
 import { newAgentLaunchRequestId } from '@/lib/agent-launch-request-id'
 import { adoptAgentSessionLaunchVerdict } from '@/lib/agent-session-launch-plan'
@@ -11,11 +13,7 @@ import { structuredAgentSessionTargetForHost } from '@/runtime/structured-agent-
 import { waitForPromiseWithSignal } from '../../../../shared/abort-signal-reason'
 import { CLI_CONVERSATION_ADOPTING_AGENTS } from '../../../../shared/structured-agent-cli-conversation-adoption'
 import { resolveCliChatResumeSource, type CliChatResumeSource } from './cli-chat-resume-source'
-import {
-  reportCliChatResumeFailure,
-  startCliChatReturn,
-  toastCliChatResumeFailure
-} from './cli-chat-resume-feedback'
+import { reportCliChatResumeFailure, startCliChatReturn } from './cli-chat-resume-feedback'
 import { adoptingAgentOnHost } from '../right-sidebar/ai-vault-session-resume-in-chat-launch'
 import { callRuntimeRpc } from '@/runtime/runtime-rpc-client'
 import { captureSourceTerminal } from './cli-chat-resume-terminal-capture'
@@ -39,30 +37,16 @@ async function retireSwitchedTerminalPane(
   })
 }
 
-const listeners = new Set<() => void>()
-const changed = () => listeners.forEach((listener) => listener())
+const changed = conversationSwitchChanged
 const keyFor = (source: CliChatResumeSource) =>
   [
     source.executionHostId,
     CLI_CONVERSATION_ADOPTING_AGENTS[source.agent],
     source.providerSessionId
   ].join('\0')
-const subscribe = (listener: () => void) => {
-  listeners.add(listener)
-  return () => listeners.delete(listener)
-}
-
-export function useCliChatResumePending(source: CliChatResumeSource | null): boolean {
-  return useSyncExternalStore(
-    subscribe,
-    () => !!source && isCliChatResumePending(keyFor(source)),
-    () => false
-  )
-}
-
 /** Switches a terminal's conversation into a chat in the terminal's slot: a new chat, or the chat
  *  that already holds it, revealed. The terminal pane closes once the chat has it. */
-export async function runCliChatResume(source: CliChatResumeSource): Promise<void> {
+export async function runLegacyCliChatResume(source: CliChatResumeSource): Promise<void> {
   const key = keyFor(source)
   if (isCliChatResumePending(key)) {
     return
@@ -213,8 +197,8 @@ export async function runCliChatResume(source: CliChatResumeSource): Promise<voi
     if (retireSource) {
       try {
         await retireSwitchedTerminalPane(sourceIncarnation)
-      } catch (error) {
-        toastCliChatResumeFailure(source, error)
+      } catch {
+        toast.info(conversationSwitchSourceKept(source.agent))
       }
     }
   } finally {
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-snapshot.test-fixture.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-snapshot.test-fixture.ts
new file mode 100644
index 000000000000..efc273e2ad62
--- /dev/null
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-snapshot.test-fixture.ts
@@ -0,0 +1,24 @@
+import type { RuntimeMobileSessionTabsResult } from '../../../../shared/runtime-types'
+
+export function snapshot(sessionId?: string): RuntimeMobileSessionTabsResult {
+  return {
+    worktree: 'wt-1',
+    publicationEpoch: 'publication-test',
+    snapshotVersion: Date.now(),
+    activeGroupId: null,
+    activeTabId: null,
+    activeTabType: null,
+    tabs: sessionId
+      ? [
+          {
+            type: 'agent-session',
+            id: `agent-session:${sessionId}`,
+            sessionId,
+            agent: 'claude',
+            title: 'Chat',
+            isActive: false
+          }
+        ]
+      : []
+  }
+}
diff --git a/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.test.ts b/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.test.ts
index 71a086d74d0c..1e2541a1b547 100644
--- a/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.test.ts
+++ b/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.test.ts
@@ -20,6 +20,7 @@ vi.mock('@/runtime/structured-agent-session-client', () => ({
   supportsInPlaceSwitch: async () => mocks.supported,
   callStructuredAgentSession: mocks.call
 }))
+vi.mock('@/lib/worktree-runtime-owner', () => ({ getExecutionHostIdForWorktree: () => 'local' }))
 vi.mock('@/lib/launch-ai-vault-session', () => ({ launchAiVaultSessionInNewTab: mocks.launch }))
 vi.mock('@/lib/ai-vault-resume-command', () => ({
   buildAiVaultResumeStartupForWorktree: () => ({
@@ -29,7 +30,7 @@ vi.mock('@/lib/ai-vault-resume-command', () => ({
   })
 }))
 
-import { runNativeChatCliSwitch } from './native-chat-cli-switch-run'
+import { runLegacyNativeChatCliSwitch as runNativeChatCliSwitch } from './native-chat-cli-switch-run'
 
 const SWITCH = {
   sessionId: 'chat-1',
@@ -92,5 +93,7 @@ it('keeps the chat when the host refuses a busy chat, and says why', async () =>
   await runNativeChatCliSwitch(SWITCH)
   expect(mocks.launch).not.toHaveBeenCalled()
   expect(mocks.closeUnifiedTab).not.toHaveBeenCalled()
-  expect(mocks.toast).toHaveBeenCalledWith('Wait for the reply to finish or stop it, then switch.')
+  expect(mocks.toast).toHaveBeenCalledWith(
+    'Codex is replying. Wait for the reply or stop it, then switch.'
+  )
 })
diff --git a/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts b/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts
index 57f61bedbb23..206b85e530ef 100644
--- a/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts
+++ b/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts
@@ -1,11 +1,9 @@
-import { useSyncExternalStore } from 'react'
+import { conversationSwitchChanged } from '@/lib/pending-conversation-surface-switches'
+import { conversationSwitchFailureText } from '@/lib/conversation-switch-feedback'
 import { toast } from 'sonner'
 import { useAppStore } from '@/store'
-import { translate } from '@/i18n/i18n'
-import { readIpcErrorMessage } from '@/lib/ipc-error'
 import { buildAiVaultResumeStartupForWorktree } from '@/lib/ai-vault-resume-command'
 import { launchAiVaultSessionInNewTab } from '@/lib/launch-ai-vault-session'
-import { structuredLaunchFailure } from '@/lib/structured-agent-session-launch-failure'
 import {
   callStructuredAgentSession,
   supportsInPlaceSwitch
@@ -13,50 +11,14 @@ import {
 import { structuredAgentSessionTargetForHost } from '@/runtime/structured-agent-session-owner'
 import { AiVaultChatForkSourceSchema } from '../../../../shared/ai-vault-chat-fork-contract'
 import type { AiVaultAgent } from '../../../../shared/ai-vault-types'
-import { agentLabel } from '../../../../shared/ai-vault-session-filters'
+import { getExecutionHostIdForWorktree } from '@/lib/worktree-runtime-owner'
 import { parseExecutionHostId } from '../../../../shared/execution-host'
 import { pendingNativeChatCliSwitches as pending } from '@/lib/pending-conversation-surface-switches'
 
-const listeners = new Set<() => void>()
-const changed = () => listeners.forEach((listener) => listener())
-
-export function useNativeChatCliSwitchPending(sessionId: string | null | undefined): boolean {
-  return useSyncExternalStore(
-    (listener) => {
-      listeners.add(listener)
-      return () => listeners.delete(listener)
-    },
-    () => !!sessionId && pending.has(sessionId),
-    () => false
-  )
-}
-
-/** Why a switch to the CLI didn't happen, in words the chat's user can act on. */
-export function nativeChatCliSwitchFailureText(error: unknown, agent: AiVaultAgent): string {
-  const refusal = structuredLaunchFailure(error)
-  const reason = refusal?.details?.reason
-  if (reason === 'turnActive') {
-    return translate(
-      'components.tab.bar.switch.waitForReply',
-      'Wait for the reply to finish or stop it, then switch.'
-    )
-  }
-  if (reason === 'ownerUnproven') {
-    return translate(
-      'components.tab.bar.switch.stopUnconfirmed',
-      "Couldn't confirm {{agent}} stopped. Try again.",
-      { agent: agentLabel(agent) }
-    )
-  }
-  return (
-    (refusal ? undefined : readIpcErrorMessage(error)) ||
-    translate('components.tab.bar.switch.failed', "Couldn't switch this conversation to the CLI.")
-  )
-}
-
+const changed = conversationSwitchChanged
 /** Moves a chat's conversation into a terminal on the same id: the host stops the idle chat, the
  *  terminal opens in the chat's slot, then the chat tab closes. `chatTabId` null opens a new tab. */
-export async function runNativeChatCliSwitch(args: {
+export async function runLegacyNativeChatCliSwitch(args: {
   sessionId: string
   workspaceId: string
   executionHostId: string
@@ -64,17 +26,26 @@ export async function runNativeChatCliSwitch(args: {
   chatTabId: string | null
   onComplete?: () => void
 }): Promise<void> {
+  const key = `${args.executionHostId}\0${args.sessionId}\0legacy`
   const target = structuredAgentSessionTargetForHost(args.executionHostId)
   const hostId = parseExecutionHostId(args.executionHostId)?.id
-  if (pending.has(args.sessionId) || !target || !hostId) {
+  if (pending.has(key) || !target || !hostId) {
     return
   }
-  pending.set(args.sessionId, args)
+  pending.set(key, args)
   try {
     changed()
+    if (
+      getExecutionHostIdForWorktree(useAppStore.getState(), args.workspaceId) !==
+      args.executionHostId
+    ) {
+      throw new Error('source unavailable')
+    }
     // Fail closed: a host that doesn't advertise the switch never receives it.
     if (!(await supportsInPlaceSwitch(target, args.agent))) {
-      throw new Error(nativeChatCliSwitchFailureText(null, args.agent))
+      throw new Error(
+        conversationSwitchFailureText(null, { agent: args.agent, direction: 'terminal' })
+      )
     }
     const answered = await callStructuredAgentSession<{ source: unknown }>(
       target,
@@ -103,9 +74,9 @@ export async function runNativeChatCliSwitch(args: {
     // The execution host retires only the source presentation after its explicit admitted result.
     // A tab allocation or generic create receipt says nothing about admission.
   } catch (error) {
-    toast.error(nativeChatCliSwitchFailureText(error, args.agent))
+    toast.error(conversationSwitchFailureText(error, { agent: args.agent, direction: 'terminal' }))
   } finally {
-    pending.delete(args.sessionId)
+    pending.delete(key)
     try {
       useAppStore.setState((state) => ({
         agentConversationsByPaneKey: state.agentConversationsByPaneKey
diff --git a/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts b/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts
index ba3ba9aa692e..9b9b488473b5 100644
--- a/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts
+++ b/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts
@@ -42,7 +42,7 @@ const mocks = vi.hoisted(() => {
   }
 })
 
-vi.mock('./cli-chat-resume-feedback', () => ({ switchIntoOwner: mocks.switchOwner }))
+vi.mock('@/lib/conversation-surface-switch', () => ({ runConversationSwitch: mocks.switchOwner }))
 
 // Staged host answers: its capabilities arrive over IPC at boot, and the platform from preload.
 vi.mock('@/runtime/local-runtime-capabilities', async (importOriginal) => ({
@@ -804,11 +804,13 @@ it.each(['local', 'runtime:paired-host'] as const)(
       switchAiVaultSessionToNativeChat(row({ agent: 'codex', executionHostId, structuredSession }))
     ).toBe(true)
     expect(mocks.switchOwner).toHaveBeenCalledWith(
-      { agent: 'codex', tabId: '', workspaceId: WORKTREE_ID },
-      structuredSession,
-      executionHostId === 'local'
-        ? { kind: 'local' }
-        : { kind: 'environment', environmentId: 'paired-host' }
+      expect.objectContaining({
+        agent: 'codex',
+        direction: 'chat',
+        workspaceId: WORKTREE_ID,
+        sessionId: structuredSession.sessionId,
+        executionHostId
+      })
     )
     mocks.inPlaceSwitch = false
   }
diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.held-job.test.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.held-job.test.tsx
new file mode 100644
index 000000000000..88b4ef8aecbf
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.held-job.test.tsx
@@ -0,0 +1,128 @@
+// @vitest-environment happy-dom
+import { act, cleanup, render, screen } from '@testing-library/react'
+import { afterEach, expect, it, vi } from 'vitest'
+import { useAppStore } from '@/store'
+import { createGlobalSettingsFixture } from '../../../../shared/global-settings-test-fixture'
+import {
+  TEST_REPO,
+  makeWorktree,
+  makeTerminalTab
+} from '@/store/slices/worktrees-slice-test-fixtures'
+import { TooltipProvider } from '@/components/ui/tooltip'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuTrigger
+} from '@/components/ui/dropdown-menu'
+import { CliChatResumeMenuItems } from '../tab-bar/CliChatResumeMenuItems'
+import { TerminalPaneResumeInChatButton } from './TerminalPaneResumeInChatButton'
+import { resolveCliChatResumeSource } from '../tab-bar/cli-chat-resume-source'
+import { conversationSwitchFailureText } from '@/lib/conversation-switch-feedback'
+import { STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY } from '../../../../shared/protocol-version'
+import { agentSessionRefusalError } from '../../../../shared/agent-session-wire-refusals'
+vi.mock('@/runtime/local-runtime-capabilities', () => ({
+  ensureLocalRuntimeCapabilities: async () => [STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY],
+  readLocalRuntimeCapabilitiesOrUnknown: () => [STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY],
+  subscribeLocalRuntimeCapabilityObservation: () => () => {}
+}))
+afterEach(cleanup)
+it.each(['foreground', 'suspended'] as const)(
+  'keeps the real Claude legacy header/menu disabled for held %s work and available after exit',
+  (job) => {
+    useAppStore.setState(useAppStore.getInitialState(), true)
+    const paneKey = 'shell:3f2504e0-4f89-41d3-9a0c-0305e82c3301'
+    useAppStore.setState({
+      settings: createGlobalSettingsFixture({ experimentalNativeChat: true }),
+      repos: [TEST_REPO],
+      worktreesByRepo: { repo1: [makeWorktree({ id: 'wt-1', repoId: 'repo1' })] },
+      tabsByWorktree: { 'wt-1': [makeTerminalTab({ id: 'shell', worktreeId: 'wt-1' })] },
+      terminalLayoutsByTabId: {
+        shell: {
+          root: { type: 'leaf', leafId: '3f2504e0-4f89-41d3-9a0c-0305e82c3301' },
+          activeLeafId: '3f2504e0-4f89-41d3-9a0c-0305e82c3301',
+          expandedLeafId: null,
+          ptyIdsByLeafId: { '3f2504e0-4f89-41d3-9a0c-0305e82c3301': 'pty-1' }
+        }
+      }
+    })
+    useAppStore
+      .getState()
+      .recordAgentProviderSession(
+        paneKey,
+        'claude',
+        { key: 'session_id', id: 'real-claude' },
+        undefined,
+        { worktreeId: 'wt-1', tabId: 'shell' }
+      )
+    useAppStore.getState().setPaneForegroundAgent(paneKey, {
+      agent: 'claude',
+      shellForeground: job === 'suspended',
+      ...(job === 'suspended' ? { suspendedAgent: 'claude' as const } : {})
+    })
+    const source = resolveCliChatResumeSource(useAppStore.getState(), {
+      tab: { id: 'shell', worktreeId: 'wt-1' },
+      paneKey
+    })
+    expect(source).toMatchObject({ agent: 'claude', providerSessionId: 'real-claude' })
+    render(
+      <TooltipProvider>
+        <TerminalPaneResumeInChatButton tabId="shell" worktreeId="wt-1" paneKey={paneKey} />
+        <DropdownMenu open>
+          <DropdownMenuTrigger>Menu</DropdownMenuTrigger>
+          <DropdownMenuContent>
+            <CliChatResumeMenuItems
+              tab={{ id: 'shell', worktreeId: 'wt-1' }}
+              leadingSeparator={false}
+            />
+          </DropdownMenuContent>
+        </DropdownMenu>
+      </TooltipProvider>
+    )
+    const header = screen.getByRole('button', { name: 'Resume in New Chat', hidden: true })
+    expect(header.hasAttribute('disabled')).toBe(true)
+    expect(
+      screen.getByRole('menuitem', { name: 'Resume in New Chat' }).getAttribute('aria-disabled')
+    ).toBe('true')
+    act(() =>
+      useAppStore.getState().setPaneForegroundAgent(paneKey, { agent: null, shellForeground: true })
+    )
+    expect(header.hasAttribute('disabled')).toBe(false)
+    expect(
+      screen.getByRole('menuitem', { name: 'Resume in New Chat' }).getAttribute('aria-disabled')
+    ).not.toBe('true')
+    expect(
+      resolveCliChatResumeSource(useAppStore.getState(), {
+        tab: { id: 'shell', worktreeId: 'wt-1' },
+        paneKey
+      })
+    ).toEqual(source)
+    const refusal = agentSessionRefusalError('agent_session_conflict', {
+      reason: 'conversationHeldElsewhere',
+      source: true
+    })
+    expect(
+      conversationSwitchFailureText(refusal, { agent: 'claude', direction: 'chat', source })
+    ).toBe(
+      'Orca could not confirm Claude stopped in this terminal. Quit Claude here, then try this action again.'
+    )
+    expect(
+      conversationSwitchFailureText(
+        agentSessionRefusalError('agent_session_conflict', {
+          reason: 'conversationHeldElsewhere'
+        }),
+        { agent: 'claude', direction: 'chat', source, history: {} }
+      )
+    ).toBe(
+      'Orca could not confirm Claude stopped. Check its open chats and terminals, then try this action again.'
+    )
+    expect(
+      conversationSwitchFailureText(
+        agentSessionRefusalError('agent_session_conflict', {
+          reason: 'conversationHeldElsewhere',
+          owner: { sessionId: 'other', workspaceId: 'wt-1' }
+        }),
+        { agent: 'claude', direction: 'chat', source }
+      )
+    ).toBe('Claude is open in another chat or terminal. Continue there, then try switching again.')
+  }
+)
diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.test.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.test.tsx
index 87a929374db0..5536a732d5e8 100644
--- a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.test.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.test.tsx
@@ -32,9 +32,9 @@ vi.mock('../tab-bar/cli-chat-resume-source', () => ({
     return mocks.source
   }
 }))
-vi.mock('../tab-bar/cli-chat-resume-run', () => ({
+vi.mock('@/lib/conversation-surface-switch', () => ({
   runCliChatResume: mocks.run,
-  useCliChatResumePending: () => mocks.pending
+  useConversationSwitchReadiness: () => ({ ready: !mocks.pending, pending: mocks.pending })
 }))
 afterEach(cleanup)
 beforeEach(() => {
diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx
index 999eede61525..a83fdc278a99 100644
--- a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx
@@ -1,3 +1,4 @@
+import { useConversationSwitchReadiness } from '@/lib/conversation-surface-switch'
 import { isNativeChatEnabled } from '../../../../shared/structured-native-chat-launch-route'
 import { useShallow } from 'zustand/react/shallow'
 import { MessagesSquare } from 'lucide-react'
@@ -5,12 +6,11 @@ import { Button } from '@/components/ui/button'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import { translate } from '@/i18n/i18n'
 import { useAppStore } from '@/store'
-import { agentLabel } from '../../../../shared/ai-vault-session-filters'
 import {
   resolveCliChatResumeSource,
   useCliChatResumeCapability
 } from '../tab-bar/cli-chat-resume-source'
-import { runCliChatResume, useCliChatResumePending } from '../tab-bar/cli-chat-resume-run'
+import { runCliChatResume } from '@/lib/conversation-surface-switch'
 
 export function TerminalPaneResumeInChatButton({
   tabId,
@@ -27,17 +27,11 @@ export function TerminalPaneResumeInChatButton({
     )
   )
   const capability = useCliChatResumeCapability(worktreeId, source?.agent)
-  // The host's writer check decides; this only explains the refusal before the click.
-  const running = useAppStore((state) => {
-    const foreground = state.paneForegroundAgentByPaneKey[paneKey]
-    return (
-      state.agentStatusByPaneKey[paneKey] !== undefined ||
-      (!!foreground?.agent && !foreground.shellForeground)
-    )
-  })
-  const pending = useCliChatResumePending(source)
+  const readiness = useConversationSwitchReadiness(
+    source ? { direction: 'chat', ...source, source } : null
+  )
   const enabled = useAppStore((state) => isNativeChatEnabled(state.settings))
-  if (!enabled && capability !== false) {
+  if (!enabled) {
     return null
   }
   const label =
@@ -52,20 +46,13 @@ export function TerminalPaneResumeInChatButton({
         'components.tab.bar.switch.noConversation',
         'No saved conversation is available in this terminal yet.'
       )
-    : capability === false
-      ? label
-      : running && source
-        ? translate(
-            'components.tab.bar.switch.exitAgentFirst',
-            'Exit {{agent}} in this terminal to switch.',
-            {
-              agent: agentLabel(source.agent)
-            }
-          )
+    : (readiness.explanation ??
+      (capability === false
+        ? label
         : translate(
             'components.tab.bar.switch.toNativeChatTooltip',
             'Switch to native chat: continues the same conversation in a chat, in this tab.'
-          )
+          )))
 
   return (
     <Tooltip>
@@ -75,13 +62,12 @@ export function TerminalPaneResumeInChatButton({
           variant="pane-title"
           size="icon-xs"
           aria-label={label}
-          disabled={!source || pending || capability === undefined}
-          // Not `disabled`: the tooltip has to say why.
-          aria-disabled={(capability === true && running) || undefined}
-          aria-busy={pending || undefined}
+          disabled={!readiness.ready}
+          aria-disabled={!readiness.ready || undefined}
+          aria-busy={readiness.pending || undefined}
           onClick={(event) => {
             event.stopPropagation()
-            if (source && capability !== undefined && (capability === false || !running)) {
+            if (source && readiness.ready) {
               void runCliChatResume(source)
             }
           }}
diff --git a/src/renderer/src/components/terminal-pane/pane-foreground-agent-retry.ts b/src/renderer/src/components/terminal-pane/pane-foreground-agent-retry.ts
new file mode 100644
index 000000000000..3ab8df9e0a1a
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/pane-foreground-agent-retry.ts
@@ -0,0 +1,18 @@
+import { isAgentForegroundWrapperProcess } from '../../../../shared/agent-process-recognition'
+import type { ForegroundReadReason } from './pane-foreground-agent-tracker-contract'
+
+export function shouldRetryForegroundAgentRead(
+  hasConfirmationExpectation: boolean,
+  reason: ForegroundReadReason,
+  processName: string | null,
+  retryDelay: number | undefined
+): boolean {
+  const shouldRetryExpectedIdentity =
+    hasConfirmationExpectation && (reason !== 'command-finished' || processName === null)
+  const shouldRetry =
+    retryDelay !== undefined &&
+    (shouldRetryExpectedIdentity ||
+      (processName !== null &&
+        (reason === 'command' || isAgentForegroundWrapperProcess(processName))))
+  return shouldRetry
+}
diff --git a/src/renderer/src/components/terminal-pane/pane-foreground-agent-tracker-contract.ts b/src/renderer/src/components/terminal-pane/pane-foreground-agent-tracker-contract.ts
index 83274a01746a..7be00ec79f8e 100644
--- a/src/renderer/src/components/terminal-pane/pane-foreground-agent-tracker-contract.ts
+++ b/src/renderer/src/components/terminal-pane/pane-foreground-agent-tracker-contract.ts
@@ -1,3 +1,4 @@
+import type { TerminalAgent } from '../../../../shared/terminal-agent'
 import type { RecognizedAgentProcess } from '../../../../shared/agent-process-recognition'
 import type { PaneForegroundAgentEntry } from '@/store/slices/pane-foreground-agent'
 import type { RuntimeTerminalProcessInspection } from '@/runtime/runtime-terminal-inspection'
@@ -32,3 +33,16 @@ export type PaneForegroundAgentTrackerDeps = {
   onCommandFinishedUnavailable?: () => void
   onVisibleForegroundSettled?: (outcome: 'agent' | 'shell' | 'inconclusive') => void
 }
+
+export type PaneForegroundAgentTracker = {
+  /** True while any read is scheduled or running, whatever its authority. */
+  hasReadInFlight: () => boolean
+  onVisiblePtyBound: (expectsAgent?: boolean) => boolean
+  onCommandStarted: (expectedAgent?: TerminalAgent | null) => void
+  onAgentStartupObserved: () => void
+  /** True when pane identity must remain visible until an async shell confirmation. */
+  onCommandFinished: () => boolean
+  /** The process monitor confirmed this agent exited (no agent, no children, settled). */
+  onProcessExitConfirmed: (process: RecognizedAgentProcess) => void
+  dispose: () => void
+}
diff --git a/src/renderer/src/components/terminal-pane/pane-foreground-agent-tracker.test.ts b/src/renderer/src/components/terminal-pane/pane-foreground-agent-tracker.test.ts
index 4d13455aa3ae..a3ffc77b46df 100644
--- a/src/renderer/src/components/terminal-pane/pane-foreground-agent-tracker.test.ts
+++ b/src/renderer/src/components/terminal-pane/pane-foreground-agent-tracker.test.ts
@@ -806,3 +806,45 @@ describe('createPaneForegroundAgentTracker', () => {
     expect(publish).not.toHaveBeenCalled()
   })
 })
+
+it('retains a suspended agent at a shell return without granting foreground routing or clearing its header', async () => {
+  vi.useFakeTimers()
+  const publish = vi.fn()
+  const shell = vi.fn()
+  const read = vi.fn().mockResolvedValue({
+    foregroundProcess: 'zsh',
+    hasChildProcesses: true,
+    suspendedAgentProcess: 'codex'
+  })
+  const tracker = createPaneForegroundAgentTracker({
+    getPtyId: () => 'pty-stopped',
+    isTrackablePtyId: () => true,
+    readForegroundProcess: read,
+    confirmForegroundProcess: read,
+    publish,
+    hasKnownAgentIdentity: () => true,
+    onConfirmedShellForeground: shell
+  })
+  try {
+    tracker.onCommandFinished()
+    await vi.advanceTimersByTimeAsync(350)
+    expect(publish).toHaveBeenLastCalledWith(
+      expect.objectContaining({
+        agent: null,
+        suspendedAgent: 'codex',
+        shellForeground: true,
+        routingTrusted: false,
+        routingRevoked: true
+      })
+    )
+    expect(shell).not.toHaveBeenCalled()
+    read.mockResolvedValue({ foregroundProcess: 'zsh', hasChildProcesses: false })
+    tracker.onCommandFinished()
+    await vi.advanceTimersByTimeAsync(350)
+    expect(publish).toHaveBeenLastCalledWith({ agent: null, shellForeground: true })
+    expect(shell).toHaveBeenCalledOnce()
+  } finally {
+    tracker.dispose()
+    vi.useRealTimers()
+  }
+})
diff --git a/src/renderer/src/components/terminal-pane/pane-foreground-agent-tracker.ts b/src/renderer/src/components/terminal-pane/pane-foreground-agent-tracker.ts
index 387a076b0049..a0a40c747a41 100644
--- a/src/renderer/src/components/terminal-pane/pane-foreground-agent-tracker.ts
+++ b/src/renderer/src/components/terminal-pane/pane-foreground-agent-tracker.ts
@@ -1,33 +1,21 @@
-import {
-  isAgentForegroundWrapperProcess,
-  recognizeAgentProcess,
-  type RecognizedAgentProcess
-} from '../../../../shared/agent-process-recognition'
-import { resolveCompatibleAgentTypeForOwner } from '../../../../shared/agent-title-owner'
+import { recognizeAgentProcess } from '../../../../shared/agent-process-recognition'
 import { isShellProcess } from '../../../../shared/shell-process-detection'
-import type { TerminalAgent } from '../../../../shared/terminal-agent'
 import { createPaneForegroundProcessReader } from './pane-foreground-process-reader'
 import { FOREGROUND_COMMAND_READS } from '../../../../shared/foreground-command-settle'
 import type {
   ForegroundReadReason,
   PaneForegroundAgentTrackerDeps
 } from './pane-foreground-agent-tracker-contract'
+import { confirmPaneForegroundProcessExit } from './pane-foreground-process-exit'
+import { shouldRetryForegroundAgentRead } from './pane-foreground-agent-retry'
+import type { PaneForegroundAgentTracker } from './pane-foreground-agent-tracker-contract'
 
 const VISIBLE_PTY_SETTLE_MS = 350
 
 /** Read foreground identity at command boundaries; confirm 133;D before clearing known agents because nested shells can leak that marker. */
-export function createPaneForegroundAgentTracker(deps: PaneForegroundAgentTrackerDeps): {
-  /** True while any read is scheduled or running, whatever its authority. */
-  hasReadInFlight: () => boolean
-  onVisiblePtyBound: (expectsAgent?: boolean) => boolean
-  onCommandStarted: (expectedAgent?: TerminalAgent | null) => void
-  onAgentStartupObserved: () => void
-  /** True when pane identity must remain visible until an async shell confirmation. */
-  onCommandFinished: () => boolean
-  /** The process monitor confirmed this agent exited (no agent, no children, settled). */
-  onProcessExitConfirmed: (process: RecognizedAgentProcess) => void
-  dispose: () => void
-} {
+export function createPaneForegroundAgentTracker(
+  deps: PaneForegroundAgentTrackerDeps
+): PaneForegroundAgentTracker {
   let disposed = false
   let readTimer: ReturnType<typeof setTimeout> | null = null
   let scheduledReadReason: ForegroundReadReason | null = null
@@ -115,10 +103,13 @@ export function createPaneForegroundAgentTracker(deps: PaneForegroundAgentTracke
       hasForegroundAgentEvidence ||
       hasKnownAgentEvidence ||
       hasAgentExpectation
-    const { processName, remoteEvidenceVerdict, expectedIncarnationId, remote } = await readProcess(
-      ptyId,
-      requiresRoutingConfirmation
-    )
+    const {
+      processName,
+      suspendedAgentProcess,
+      remoteEvidenceVerdict,
+      expectedIncarnationId,
+      remote
+    } = await readProcess(ptyId, requiresRoutingConfirmation)
     // Fence pending inspection so an old PTY cannot publish identity into its replacement.
     if (
       disposed ||
@@ -129,6 +120,23 @@ export function createPaneForegroundAgentTracker(deps: PaneForegroundAgentTracke
       settleAbortedRead(generation)
       return
     }
+    const suspended = recognizeAgentProcess(suspendedAgentProcess ?? null)
+    if (suspended) {
+      hasKnownAgentEvidence = true
+      hasAgentExpectation = false
+      deps.publish({
+        agent: null,
+        suspendedAgent: suspended.agent,
+        agentEvidence: 'process-read',
+        shellForeground: true,
+        routingTrusted: false,
+        routingRevoked: true
+      })
+      if (reason === 'visible-pty') {
+        deps.onVisibleForegroundSettled?.('agent')
+      }
+      return
+    }
     const recognized =
       remoteEvidenceVerdict === 'live'
         ? recognizeAgentProcess(processName)
@@ -157,13 +165,12 @@ export function createPaneForegroundAgentTracker(deps: PaneForegroundAgentTracke
     const retryDelay = FOREGROUND_COMMAND_READS.retryDelaysMs[retryIndex]
     const hasConfirmationExpectation =
       hasForegroundAgentEvidence || hasKnownAgentEvidence || hasAgentExpectation
-    const shouldRetryExpectedIdentity =
-      hasConfirmationExpectation && (reason !== 'command-finished' || processName === null)
-    const shouldRetry =
-      retryDelay !== undefined &&
-      (shouldRetryExpectedIdentity ||
-        (processName !== null &&
-          (reason === 'command' || isAgentForegroundWrapperProcess(processName))))
+    const shouldRetry = shouldRetryForegroundAgentRead(
+      hasConfirmationExpectation,
+      reason,
+      processName,
+      retryDelay
+    )
     if (shouldRetry) {
       // Bound retries across PowerShell-to-WMIC enrichment, which may initially hide a live agent.
       scheduleRead(retryDelay, retryIndex + 1, reason)
@@ -220,9 +227,7 @@ export function createPaneForegroundAgentTracker(deps: PaneForegroundAgentTracke
 
   return {
     // A higher-authority command read still promises confirmation when visibility schedules nothing.
-    hasReadInFlight(): boolean {
-      return hasPendingRead()
-    },
+    hasReadInFlight: hasPendingRead,
     onVisiblePtyBound(expectsAgent = false) {
       // Lower-authority visibility recovery must not cancel command-boundary reads that own the exit decision.
       if (hasCommandReadInFlight()) {
@@ -302,26 +307,18 @@ export function createPaneForegroundAgentTracker(deps: PaneForegroundAgentTracke
       return true
     },
     onProcessExitConfirmed(process) {
-      // Why: an in-flight command read owns the pane's next identity, and only a live read is ours.
-      const published = deps.getPublishedEntry?.()
-      if (
-        disposed ||
-        hasCommandReadInFlight() ||
-        published?.agentEvidence !== 'process-read' ||
-        resolveCompatibleAgentTypeForOwner(process.agent, published.agent) !== published.agent
-      ) {
-        return
-      }
-      const hadVisibleRead = hasPendingRead()
-      cancelPendingRead()
-      clearAgentEvidence()
-      startupSampled = false
-      // Without command marks, shellForeground would never lift and would block Enter from identifying the next agent.
-      deps.publish({ agent: null, shellForeground: false })
-      if (hadVisibleRead) {
-        deps.onVisibleForegroundSettled?.('shell')
-      }
-      deps.onConfirmedShellForeground?.('process-exit')
+      confirmPaneForegroundProcessExit({
+        deps,
+        process,
+        disposed,
+        commandReadInFlight: hasCommandReadInFlight(),
+        pendingRead: hasPendingRead(),
+        cancelPendingRead,
+        clearAgentEvidence,
+        resetStartupSample: () => {
+          startupSampled = false
+        }
+      })
     },
     dispose() {
       const hadReadAtDispose = hasPendingRead()
diff --git a/src/renderer/src/components/terminal-pane/pane-foreground-process-exit.ts b/src/renderer/src/components/terminal-pane/pane-foreground-process-exit.ts
new file mode 100644
index 000000000000..7bb37f25812e
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/pane-foreground-process-exit.ts
@@ -0,0 +1,46 @@
+import type { RecognizedAgentProcess } from '../../../../shared/agent-process-recognition'
+import { resolveCompatibleAgentTypeForOwner } from '../../../../shared/agent-title-owner'
+
+import type { PaneForegroundAgentTrackerDeps } from './pane-foreground-agent-tracker-contract'
+
+export function confirmPaneForegroundProcessExit(args: {
+  deps: PaneForegroundAgentTrackerDeps
+  process: RecognizedAgentProcess
+  disposed: boolean
+  commandReadInFlight: boolean
+  pendingRead: boolean
+  cancelPendingRead: () => void
+  clearAgentEvidence: () => void
+  resetStartupSample: () => void
+}): void {
+  const {
+    deps,
+    process,
+    disposed,
+    commandReadInFlight,
+    pendingRead,
+    cancelPendingRead,
+    clearAgentEvidence,
+    resetStartupSample
+  } = args
+  // Why: an in-flight command read owns the pane's next identity, and only a live read is ours.
+  const published = deps.getPublishedEntry?.()
+  if (
+    disposed ||
+    commandReadInFlight ||
+    published?.agentEvidence !== 'process-read' ||
+    resolveCompatibleAgentTypeForOwner(process.agent, published.agent) !== published.agent
+  ) {
+    return
+  }
+  const hadVisibleRead = pendingRead
+  cancelPendingRead()
+  clearAgentEvidence()
+  resetStartupSample()
+  // Without command marks, shellForeground would never lift and would block Enter from identifying the next agent.
+  deps.publish({ agent: null, shellForeground: false })
+  if (hadVisibleRead) {
+    deps.onVisibleForegroundSettled?.('shell')
+  }
+  deps.onConfirmedShellForeground?.('process-exit')
+}
diff --git a/src/renderer/src/components/terminal-pane/pane-foreground-process-reader.ts b/src/renderer/src/components/terminal-pane/pane-foreground-process-reader.ts
index 51627feb119e..45e75845d1e4 100644
--- a/src/renderer/src/components/terminal-pane/pane-foreground-process-reader.ts
+++ b/src/renderer/src/components/terminal-pane/pane-foreground-process-reader.ts
@@ -22,6 +22,7 @@ export function createPaneForegroundProcessReader(deps: {
 
   return async (ptyId: string, requiresConfirmation: boolean) => {
     let processName: string | null = null
+    let suspendedAgentProcess: string | undefined
     let remoteEvidenceVerdict: 'live' | 'unverifiable' | 'exited' | null = null
     const expectedIncarnationId = deps.getExpectedIncarnationId?.() ?? null
     const options = expectedIncarnationId ? { expectedIncarnationId } : undefined
@@ -66,9 +67,15 @@ export function createPaneForegroundProcessReader(deps: {
         remoteEvidenceVerdict = admitted?.verdict ?? 'unverifiable'
         if (admitted?.verdict === 'live') {
           processName = admitted.processName
+          suspendedAgentProcess = admitted.suspendedAgentProcess
         }
       } else {
         processName = inspection.foregroundProcess
+        suspendedAgentProcess =
+          inspection.suspendedAgentProcess ??
+          (inspection.foregroundProcessEvidence?.verdict === 'live'
+            ? inspection.foregroundProcessEvidence.suspendedAgentProcess
+            : undefined)
       }
     } catch {
       // Missing legacy/injected-provider answers remain unverifiable remote verdicts.
@@ -76,6 +83,7 @@ export function createPaneForegroundProcessReader(deps: {
     }
     return {
       processName,
+      suspendedAgentProcess,
       remoteEvidenceVerdict,
       expectedIncarnationId,
       remote
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/pane-agent-identity.ts b/src/renderer/src/components/terminal-pane/pty-connection/pane-agent-identity.ts
index 31a92c2e396f..5165b6dd7750 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/pane-agent-identity.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/pane-agent-identity.ts
@@ -144,9 +144,7 @@ export function installPaneAgentIdentity(session: ConnectPanePtySession): void {
         ? inspectRuntimeTerminalProcess(id, options)
         : window.api.pty.getForegroundProcess(id),
     confirmForegroundProcess: (id, options) =>
-      isRemoteExecutionHostPtyId(id)
-        ? inspectRuntimeTerminalProcess(id, options)
-        : window.api.pty.confirmForegroundProcess(id),
+      inspectRuntimeTerminalProcess(id, { ...options, scanChildProcesses: true }),
     isRemotePtyId: isRemoteExecutionHostPtyId,
     getExpectedIncarnationId: () => session.remotePtyIncarnationId ?? null,
     publish: (entry) => useAppStore.getState().setPaneForegroundAgent(session.cacheKey, entry),
diff --git a/src/renderer/src/components/terminal-pane/terminal-tab-agent-type-index.ts b/src/renderer/src/components/terminal-pane/terminal-tab-agent-type-index.ts
index 3e31c5aefb7a..6bec879ea930 100644
--- a/src/renderer/src/components/terminal-pane/terminal-tab-agent-type-index.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-tab-agent-type-index.ts
@@ -62,7 +62,10 @@ export function createTerminalTabAgentTypeSelector(
         }
       }
       for (const [paneKey, entry] of Object.entries(foreground)) {
-        if (!entry.agent || entry.shellForeground || entry.routingRevoked) {
+        const agent =
+          entry.suspendedAgent ??
+          (!entry.shellForeground && !entry.routingRevoked ? entry.agent : null)
+        if (!agent) {
           continue
         }
         const separator = paneKey.indexOf(':')
@@ -73,9 +76,9 @@ export function createTerminalTabAgentTypeSelector(
         const leafId = paneKey.slice(separator + 1)
         const byLeaf = nextByTabId.get(entryTabId)
         if (byLeaf) {
-          byLeaf[leafId] ??= entry.agent
+          byLeaf[leafId] ??= agent
         } else {
-          nextByTabId.set(entryTabId, { [leafId]: entry.agent })
+          nextByTabId.set(entryTabId, { [leafId]: agent })
         }
       }
 
diff --git a/src/renderer/src/hooks/ipc-events/agent-launch-tab-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/agent-launch-tab-ipc-bridge.ts
index 528dcb6af24c..3f7c9345acb2 100644
--- a/src/renderer/src/hooks/ipc-events/agent-launch-tab-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/agent-launch-tab-ipc-bridge.ts
@@ -4,12 +4,15 @@ import { applyAgentLaunchPaneVerdict } from '@/lib/agent-launch-pane-verdict-app
 import { keepAgentLaunchTabMainWrote } from '@/lib/agent-launch-tab-main-written'
 import { afterLayoutFrame } from '@/runtime/layout-frame-position'
 
-function replyToPublish(request: AgentLaunchTabPublishRequest): void {
+function replyToPublish(
+  request: AgentLaunchTabPublishRequest,
+  kept?: ReturnType<typeof keepAgentLaunchTabMainWrote>
+): void {
   try {
     window.api.ui.replyAgentLaunchTabPublish({
       requestId: request.requestId,
       ...(request.shownByMain
-        ? keepAgentLaunchTabMainWrote(request)
+        ? (kept ?? keepAgentLaunchTabMainWrote(request))
         : publishAgentLaunchTab(request))
     })
   } catch (error) {
@@ -22,12 +25,15 @@ function replyToPublish(request: AgentLaunchTabPublishRequest): void {
 
 export function registerAgentLaunchTabIpcBridge(unsubs: (() => void)[]): void {
   unsubs.push(
-    window.api.ui.onPublishAgentLaunchTab((request) =>
-      // A tab main wrote is kept once this window holds the frame that draws it.
-      request.shownByMain
-        ? afterLayoutFrame(request.shownByMain.frameSeq, () => replyToPublish(request))
-        : replyToPublish(request)
-    ),
+    window.api.ui.onPublishAgentLaunchTab((request) => {
+      // Retain the exact publication before a verdict can overtake its frame.
+      if (request.shownByMain) {
+        const kept = keepAgentLaunchTabMainWrote(request)
+        afterLayoutFrame(request.shownByMain.frameSeq, () => replyToPublish(request, kept))
+      } else {
+        replyToPublish(request)
+      }
+    }),
     window.api.ui.onAgentLaunchPaneVerdict(applyAgentLaunchPaneVerdict)
   )
 }
diff --git a/src/renderer/src/hooks/ipc-events/session-tab-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/session-tab-ipc-bridge.ts
index fcbf23ca82c1..2e22a8639771 100644
--- a/src/renderer/src/hooks/ipc-events/session-tab-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/session-tab-ipc-bridge.ts
@@ -1,3 +1,9 @@
+import { callStructuredAgentSession } from '@/runtime/structured-agent-session-client'
+import {
+  disposeSwitchProjections,
+  captureSwitchProjection,
+  retireSwitchProjection
+} from '@/lib/conversation-switch-projection'
 import { isLocalSessionTabCloseOwned } from '@/runtime/local-session-tab-close-owner'
 import { closeMobileSessionTabInStore } from '@/runtime/mobile-session-tab-close'
 import {
@@ -22,6 +28,7 @@ import { resolveBrowserSessionTabTarget } from './browser-session-tab-target'
 import { resolveWindowTabIdForHostTab } from './host-session-tab-target'
 
 export function registerSessionTabIpcBridge(unsubs: (() => void)[]): void {
+  unsubs.push(disposeSwitchProjections)
   unsubs.push(
     window.api.ui.onCloseSessionTab(({ tabId, worktreeId }) => {
       if (isLocalSessionTabCloseOwned(worktreeId, tabId)) {
@@ -50,69 +57,105 @@ export function registerSessionTabIpcBridge(unsubs: (() => void)[]): void {
   )
 
   unsubs.push(
-    window.api.ui.onSessionTabCloseRequest(({ requestId, tabId, worktreeId, expiresAt }) => {
-      const localTabId = resolveWindowTabIdForHostTab(worktreeId, tabId)
-      const store = useAppStore.getState()
-      const browserTarget = resolveBrowserSessionTabTarget(store, worktreeId, localTabId)
-      let cancelConfirmation: (() => void) | undefined
-      let timeout: ReturnType<typeof setTimeout> | undefined
-      let settled = false
-      const respond = (error?: string): void => {
-        if (settled) {
+    window.api.ui.onSessionTabCloseRequest(
+      ({ requestId, tabId, worktreeId, expiresAt, switchProjection }) => {
+        if (switchProjection) {
+          let switchApplied = false
+          useAppStore.setState((state) => {
+            if (expiresAt !== undefined && Date.now() >= expiresAt) {
+              return state
+            }
+            if (switchProjection.phase === 'prepare') {
+              captureSwitchProjection(state, worktreeId, switchProjection, (converged) => {
+                void callStructuredAgentSession(
+                  { kind: 'local' },
+                  'agentSession.switchToTerminal',
+                  {
+                    sessionId: switchProjection.sessionId,
+                    execution: {
+                      invocationId: switchProjection.invocationId,
+                      receipt: {
+                        generation: switchProjection.generation,
+                        shown: true,
+                        ...(converged ? { converged: true } : { retained: true })
+                      }
+                    }
+                  }
+                ).catch(() => {})
+              })
+              switchApplied = true
+              return state
+            }
+            const patch = retireSwitchProjection(state, switchProjection)
+            switchApplied = patch !== null
+            return patch ?? state
+          })
+          window.api.ui.respondSessionTabClose({ requestId, switchApplied })
           return
         }
-        settled = true
-        if (timeout !== undefined) {
-          clearTimeout(timeout)
+        const localTabId = resolveWindowTabIdForHostTab(worktreeId, tabId)
+        const store = useAppStore.getState()
+        const browserTarget = resolveBrowserSessionTabTarget(store, worktreeId, localTabId)
+        let cancelConfirmation: (() => void) | undefined
+        let timeout: ReturnType<typeof setTimeout> | undefined
+        let settled = false
+        const respond = (error?: string): void => {
+          if (settled) {
+            return
+          }
+          settled = true
+          if (timeout !== undefined) {
+            clearTimeout(timeout)
+          }
+          window.api.ui.respondSessionTabClose({ requestId, ...(error ? { error } : {}) })
         }
-        window.api.ui.respondSessionTabClose({ requestId, ...(error ? { error } : {}) })
-      }
-      if (expiresAt !== undefined) {
-        timeout = setTimeout(
-          () => {
-            cancelConfirmation?.()
-            respond(SESSION_TAB_CLOSE_TIMEOUT_ERROR)
-          },
-          Math.max(0, expiresAt - Date.now())
-        )
-      }
-      const closeAndRespond = (): void => {
-        if (expiresAt !== undefined && Date.now() >= expiresAt) {
-          respond(SESSION_TAB_CLOSE_TIMEOUT_ERROR)
-          return
+        if (expiresAt !== undefined) {
+          timeout = setTimeout(
+            () => {
+              cancelConfirmation?.()
+              respond(SESSION_TAB_CLOSE_TIMEOUT_ERROR)
+            },
+            Math.max(0, expiresAt - Date.now())
+          )
         }
-        try {
-          if (browserTarget) {
-            useAppStore.getState().closeBrowserTab(browserTarget.workspaceId)
-            respond()
+        const closeAndRespond = (): void => {
+          if (expiresAt !== undefined && Date.now() >= expiresAt) {
+            respond(SESSION_TAB_CLOSE_TIMEOUT_ERROR)
             return
           }
-          const closed = closeMobileSessionTabInStore(
-            useAppStore.getState(),
-            worktreeId,
-            localTabId
+          try {
+            if (browserTarget) {
+              useAppStore.getState().closeBrowserTab(browserTarget.workspaceId)
+              respond()
+              return
+            }
+            const closed = closeMobileSessionTabInStore(
+              useAppStore.getState(),
+              worktreeId,
+              localTabId
+            )
+            respond(closed ? undefined : SESSION_TAB_NOT_FOUND_ERROR)
+          } catch (error) {
+            respond(error instanceof Error ? error.message : SESSION_TAB_CLOSE_FAILED_ERROR)
+          }
+        }
+        if (isLocalSessionTabCloseOwned(worktreeId, tabId)) {
+          respond(
+            expiresAt !== undefined && Date.now() >= expiresAt
+              ? SESSION_TAB_CLOSE_TIMEOUT_ERROR
+              : undefined
           )
-          respond(closed ? undefined : SESSION_TAB_NOT_FOUND_ERROR)
-        } catch (error) {
-          respond(error instanceof Error ? error.message : SESSION_TAB_CLOSE_FAILED_ERROR)
+          return
         }
+        const visibleId = browserTarget?.workspaceId ?? localTabId
+        cancelConfirmation = guardPinnedTabClose({
+          isPinned: isUnifiedTabPinned(store, worktreeId, visibleId),
+          tabLabel: resolvePinnedTabLabel(store, worktreeId, visibleId),
+          onClose: closeAndRespond,
+          onCancel: () => respond(SESSION_TAB_CLOSE_CANCELED_ERROR)
+        })
       }
-      if (isLocalSessionTabCloseOwned(worktreeId, tabId)) {
-        respond(
-          expiresAt !== undefined && Date.now() >= expiresAt
-            ? SESSION_TAB_CLOSE_TIMEOUT_ERROR
-            : undefined
-        )
-        return
-      }
-      const visibleId = browserTarget?.workspaceId ?? localTabId
-      cancelConfirmation = guardPinnedTabClose({
-        isPinned: isUnifiedTabPinned(store, worktreeId, visibleId),
-        tabLabel: resolvePinnedTabLabel(store, worktreeId, visibleId),
-        onClose: closeAndRespond,
-        onCancel: () => respond(SESSION_TAB_CLOSE_CANCELED_ERROR)
-      })
-    })
+    )
   )
 
   unsubs.push(
diff --git a/src/renderer/src/hooks/useIpcEvents-agent-conversation-cap.test.ts b/src/renderer/src/hooks/useIpcEvents-agent-conversation-cap.test.ts
index 1d0ae3abfbef..51f090ac1196 100644
--- a/src/renderer/src/hooks/useIpcEvents-agent-conversation-cap.test.ts
+++ b/src/renderer/src/hooks/useIpcEvents-agent-conversation-cap.test.ts
@@ -120,10 +120,11 @@ it.each([600, 6000])(
       })
     )
     const { registerAgentStatusIpcBridge } = await import('./ipc-events/agent-status-ipc-bridge')
-    const { runCliChatResume } = await import('../components/tab-bar/cli-chat-resume-run')
+    const { runLegacyCliChatResume: runCliChatResume } =
+      await import('../components/tab-bar/cli-chat-resume-run')
     const { resolveCliChatResumeSource } =
       await import('../components/tab-bar/cli-chat-resume-source')
-    const { runNativeChatCliSwitch } =
+    const { runLegacyNativeChatCliSwitch: runNativeChatCliSwitch } =
       await import('../components/tab-bar/native-chat-cli-switch-run')
     const unsubs: (() => void)[] = []
     const bridge = registerAgentStatusIpcBridge(unsubs)
diff --git a/src/renderer/src/i18n/en-runtime-required.json b/src/renderer/src/i18n/en-runtime-required.json
index 1c06f7ef605e..e5b240198dbd 100644
--- a/src/renderer/src/i18n/en-runtime-required.json
+++ b/src/renderer/src/i18n/en-runtime-required.json
@@ -3389,6 +3389,24 @@
     },
     "tab": {
       "bar": {
+        "switch": {
+          "replyBusy": "{{agent}} is replying. Wait for the reply or stop it, then switch.",
+          "startBusy": "{{agent}} is starting. Wait, then switch.",
+          "switchBusy": "{{agent}} is already switching. Wait, then try again.",
+          "openElsewhere": "{{agent}} is open in another chat or terminal. Continue there, then try switching again.",
+          "workBusy": "{{agent}} still has work waiting. Finish or cancel it, then switch.",
+          "terminalBusy": "{{agent}} cannot switch while this terminal has a running job. Exit the job, then switch.",
+          "terminalBusyPosix": "{{agent}} cannot switch while this terminal has a running job. If you suspended a job, run fg and exit it, then switch.",
+          "unavailableNow": "Switching {{agent}} is unavailable for this chat now. You can keep using chat.",
+          "stopUnknown": "Orca could not confirm {{agent}} stopped. Restart Orca, then check this chat before trying again. Switching may remain unavailable.",
+          "outcomeUnknown": "Orca could not confirm the {{agent}} switch. Check the open chat and terminal before trying again.",
+          "historyUnavailable": "{{agent}} couldn't open this conversation's history. Check that its saved conversation is available, then try again.",
+          "chatStartFailed": "{{agent}} could not start in chat. Check its setup and try again.",
+          "terminalStartFailed": "{{agent}} could not start in a terminal. Check its setup and try again.",
+          "writerUnconfirmed": "Orca could not confirm {{agent}} stopped. Check its open chats and terminals, then try this action again.",
+          "sourceExitUnconfirmed": "Orca could not confirm {{agent}} stopped in this terminal. Quit {{agent}} here, then try this action again.",
+          "sourceKept": "{{agent}} opened successfully. The original tab was kept; continue in the new tab."
+        },
         "SortableTabContextMenu": {
           "closeTabsToLeft": "Close All Tabs To The Left",
           "switchToTerminalView": "Show as terminal"
diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index 8186487d12dd..51dd4c5b727c 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -19525,8 +19525,8 @@
         "showTerminal": "Show terminal"
       },
       "resumeInNewChat": {
-        "exitUnconfirmedFromTerminal": "{{agent}} is already running this conversation in another terminal. Quit {{agent}} there or close that terminal, then open this conversation from Session History.",
-        "exitUnconfirmed": "{{agent}} is already running this conversation in another terminal. Quit {{agent}} there or close that terminal, then open this conversation from Session History.",
+        "exitUnconfirmedFromTerminal": "Orca could not confirm {{agent}} stopped in this terminal. Quit {{agent}} here, then try this action again.",
+        "exitUnconfirmed": "Orca could not confirm {{agent}} stopped in this terminal. Quit {{agent}} here, then try this action again.",
         "notSavedYet": "{{agent}} hasn't saved this conversation yet. Try again after it replies.",
         "cannotResume": "This {{agent}} conversation can't be resumed in a native chat."
       },
@@ -19812,7 +19812,23 @@
           "stopUnconfirmed": "Couldn't confirm {{agent}} stopped. Try again.",
           "failed": "Couldn't switch this conversation to the CLI.",
           "noConversation": "No saved conversation is available in this terminal yet.",
-          "unavailable": "Switching {{agent}} is not available yet."
+          "unavailable": "Switching {{agent}} is not available yet.",
+          "replyBusy": "{{agent}} is replying. Wait for the reply or stop it, then switch.",
+          "startBusy": "{{agent}} is starting. Wait, then switch.",
+          "switchBusy": "{{agent}} is already switching. Wait, then try again.",
+          "openElsewhere": "{{agent}} is open in another chat or terminal. Continue there, then try switching again.",
+          "workBusy": "{{agent}} still has work waiting. Finish or cancel it, then switch.",
+          "terminalBusy": "{{agent}} cannot switch while this terminal has a running job. Exit the job, then switch.",
+          "terminalBusyPosix": "{{agent}} cannot switch while this terminal has a running job. If you suspended a job, run fg and exit it, then switch.",
+          "unavailableNow": "Switching {{agent}} is unavailable for this chat now. You can keep using chat.",
+          "stopUnknown": "Orca could not confirm {{agent}} stopped. Restart Orca, then check this chat before trying again. Switching may remain unavailable.",
+          "outcomeUnknown": "Orca could not confirm the {{agent}} switch. Check the open chat and terminal before trying again.",
+          "historyUnavailable": "{{agent}} couldn't open this conversation's history. Check that its saved conversation is available, then try again.",
+          "chatStartFailed": "{{agent}} could not start in chat. Check its setup and try again.",
+          "terminalStartFailed": "{{agent}} could not start in a terminal. Check its setup and try again.",
+          "writerUnconfirmed": "Orca could not confirm {{agent}} stopped. Check its open chats and terminals, then try this action again.",
+          "sourceExitUnconfirmed": "Orca could not confirm {{agent}} stopped in this terminal. Quit {{agent}} here, then try this action again.",
+          "sourceKept": "{{agent}} opened successfully. The original tab was kept; continue in the new tab."
         },
         "BrowserTab": {
           "closeOthers": "Close Others",
diff --git a/src/renderer/src/lib/agent-launch-pane-closes.ts b/src/renderer/src/lib/agent-launch-pane-closes.ts
index cc8e15f6a66c..a6ed4bbf1196 100644
--- a/src/renderer/src/lib/agent-launch-pane-closes.ts
+++ b/src/renderer/src/lib/agent-launch-pane-closes.ts
@@ -1,6 +1,9 @@
 /** Remember explicit user closes so a racing spawn reveal stops the agent instead of resurrecting its tab; absence after reload is not a close. Keep store-free for teardown callers. */
 
-import { settleAgentLaunchPaneStart } from './agent-launch-pane-start'
+import {
+  settleAgentLaunchPaneStart,
+  forgetAgentLaunchPaneAttempts
+} from './agent-launch-pane-start'
 
 const MAX_REMEMBERED_CLOSES = 32
 const closedPaneKeys = new Set<string>()
@@ -12,6 +15,7 @@ function closeKey(tabId: string, leafId: string): string {
 
 export function noteAgentLaunchPaneClosedByUser(tabId: string, leafId: string): void {
   settleAgentLaunchPaneStart(tabId, leafId, null)
+  forgetAgentLaunchPaneAttempts(tabId, leafId)
   const paneKey = closeKey(tabId, leafId)
   closedPaneKeys.delete(paneKey)
   closedPaneKeys.add(paneKey)
diff --git a/src/renderer/src/lib/agent-launch-pane-start.ts b/src/renderer/src/lib/agent-launch-pane-start.ts
index 216d2aa1f57c..61df9d7cf63f 100644
--- a/src/renderer/src/lib/agent-launch-pane-start.ts
+++ b/src/renderer/src/lib/agent-launch-pane-start.ts
@@ -1,6 +1,9 @@
 // Session-only: this pane's own spawn answers first, and its answer gates the prompt's paste.
 
-const pendingStarts = new Map<string, (startedPtyId: string | null) => void>()
+const pendingStarts = new Map<
+  string,
+  { resolve?: (startedPtyId: string | null) => void; operationId?: string; awaitingHost?: boolean }
+>()
 
 // Not `makePaneKey`: that validates the leaf id, and a launch must never fail over bookkeeping.
 function startKey(tabId: string, leafId: string): string {
@@ -10,9 +13,9 @@ function startKey(tabId: string, leafId: string): string {
 /** Registered before the pane exists, so its first spawn already answers it: with its PTY, or null. */
 export function awaitAgentLaunchPaneStart(tabId: string, leafId: string): Promise<string | null> {
   const key = startKey(tabId, leafId)
-  pendingStarts.get(key)?.(null)
+  pendingStarts.get(key)?.resolve?.(null)
   return new Promise((resolve) => {
-    pendingStarts.set(key, resolve)
+    pendingStarts.set(key, { ...pendingStarts.get(key), resolve })
   })
 }
 
@@ -24,7 +27,55 @@ export function settleAgentLaunchPaneStart(
   if (tabId && leafId) {
     const key = startKey(tabId, leafId)
     const settle = pendingStarts.get(key)
-    pendingStarts.delete(key)
-    settle?.(startedPtyId)
+    const resolve = settle?.resolve
+    if (settle) {
+      settle.resolve = undefined
+    }
+    resolve?.(startedPtyId)
+  }
+}
+
+/** New addressed work wins before launch preparation or a late old verdict. */
+export function acceptAgentLaunchPaneAttempt(paneKey: string, operationId?: string): void {
+  const split = paneKey.indexOf(':')
+  if (split === -1) {
+    return
+  }
+  const key = startKey(paneKey.slice(0, split), paneKey.slice(split + 1))
+  const entry = pendingStarts.get(key)
+  entry?.resolve?.(null)
+  pendingStarts.set(key, { operationId, awaitingHost: true })
+}
+export function confirmAgentLaunchPaneAttempt(
+  tabId: string,
+  leafId: string,
+  operationId?: string
+): void {
+  const key = startKey(tabId, leafId)
+  const current = pendingStarts.get(key)
+  if (current?.awaitingHost && current.operationId !== operationId) {
+    return
+  }
+  if (current?.operationId !== operationId) {
+    current?.resolve?.(null)
+  }
+  pendingStarts.set(key, { ...current, operationId, awaitingHost: false })
+}
+
+export function agentLaunchPaneAttemptCurrent(
+  tabId: string,
+  leafId: string,
+  operationId?: string
+): boolean {
+  const entry = pendingStarts.get(startKey(tabId, leafId))
+  return !entry || entry.operationId === operationId
+}
+
+export function forgetAgentLaunchPaneAttempts(tabId: string, leafId?: string): void {
+  for (const [key, entry] of pendingStarts) {
+    if (JSON.parse(key)[0] === tabId && (leafId === undefined || JSON.parse(key)[1] === leafId)) {
+      entry.resolve?.(null)
+      pendingStarts.delete(key)
+    }
   }
 }
diff --git a/src/renderer/src/lib/agent-launch-pane-verdict-application.ts b/src/renderer/src/lib/agent-launch-pane-verdict-application.ts
index e8d4bbd59f97..92be4dac7883 100644
--- a/src/renderer/src/lib/agent-launch-pane-verdict-application.ts
+++ b/src/renderer/src/lib/agent-launch-pane-verdict-application.ts
@@ -1,65 +1,108 @@
-/** Apply main’s typed spawn/takeback verdicts, retaining final pane outcomes until session cleanup. */
-
+import { launchTabWithdrawalIdentity } from '../../../shared/agent-launch-tab-publication'
 import type { AgentLaunchPaneVerdictEvent } from '../../../shared/agent-launch-pane-verdict'
-import { applyClosedTerminalLeafNotice } from '@/components/terminal-pane/closed-terminal-leaf-notice'
-import { collectLeafIdsInOrder } from '@/components/terminal-pane/terminal-layout-leaf-ids'
+import { createKeptWorktreeSurfacePruners } from '@/store/slices/tabs/kept-worktree-surface-pruning'
 import { useAppStore } from '@/store'
 import { forgetAgentLaunchPanePrompt } from './agent-launch-pane-prompt'
-import { settleAgentLaunchPaneStart } from './agent-launch-pane-start'
+import {
+  agentLaunchPaneAttemptCurrent,
+  confirmAgentLaunchPaneAttempt,
+  settleAgentLaunchPaneStart
+} from './agent-launch-pane-start'
 import {
   applyVerdictToUndrawnLaunchTab,
   releaseMainWrittenLaunchTab
 } from './agent-launch-tab-main-written'
 
-export function applyAgentLaunchPaneVerdict(event: AgentLaunchPaneVerdictEvent): void {
-  const { worktreeId, tabId, leafId, verdict } = event
-  const state = useAppStore.getState()
-  const tab = state.tabsByWorktree[worktreeId]?.find((candidate) => candidate.id === tabId)
-  // A main-written tab this window does not draw yet keeps the verdict until it draws.
-  if (!tab && applyVerdictToUndrawnLaunchTab(event)) {
-    return
-  }
-  // Only a pane its tab says a launch laid out: a verdict never touches anything else.
-  if (tab?.agentLaunchPane?.leafId !== leafId) {
-    return
-  }
-  if (verdict.kind !== 'proceed') {
-    settleAgentLaunchPaneStart(tabId, leafId, null)
+/** Apply main’s typed spawn/takeback verdicts, retaining final pane outcomes until session cleanup. */
+
+export function applyAgentLaunchPaneVerdict(event: AgentLaunchPaneVerdictEvent): boolean {
+  if (event.accepted) {
+    confirmAgentLaunchPaneAttempt(event.tabId, event.leafId, event.operationId)
+    return true
   }
-  switch (verdict.kind) {
-    case 'proceed':
-      releaseMainWrittenLaunchTab(tabId)
-      forgetAgentLaunchPanePrompt(tabId)
-      state.setTabAgentLaunchPane(tabId, undefined)
-      return
-    case 'not-started':
-    case 'unconfirmed': {
+  const { worktreeId, tabId, leafId, verdict } = event
+  // Commit the state verdict first; never call ordinary Close on a launch's provisional pane.
+  let accepted = false
+  let withdrawn = false
+  useAppStore.setState((state) => {
+    if (!agentLaunchPaneAttemptCurrent(tabId, leafId, event.operationId)) {
+      return state
+    }
+    const tab = state.tabsByWorktree[worktreeId]?.find((candidate) => candidate.id === tabId)
+    if (!tab) {
+      accepted = applyVerdictToUndrawnLaunchTab(event)
+      return state
+    }
+    if (
+      tab.agentLaunchPane?.leafId !== leafId ||
+      tab.agentLaunchPane.operationId !== event.operationId
+    ) {
+      return state
+    }
+    if (verdict.kind === 'withdrawn') {
       const root = state.terminalLayoutsByTabId[tabId]?.root
-      if (root && !collectLeafIdsInOrder(root).includes(leafId)) {
-        forgetAgentLaunchPanePrompt(tabId)
-        state.setTabAgentLaunchPane(tabId, undefined)
-        return
+      if (
+        (event.withdrawalRoot !== undefined &&
+          event.withdrawalRoot !==
+            launchTabWithdrawalIdentity(
+              root,
+              state.unifiedTabsByWorktree[worktreeId] ?? [],
+              state.groupsByWorktree[worktreeId] ?? [],
+              tabId
+            )) ||
+        root?.type !== 'leaf' ||
+        root.leafId !== leafId ||
+        state.ptyIdsByTabId[tabId]?.length ||
+        state.lastTerminalInputAtByPaneKey[`${tabId}:${leafId}`]
+      ) {
+        return state
       }
-      state.setTabAgentLaunchPane(tabId, { ...tab.agentLaunchPane, outcome: verdict })
-      return
-    }
-    case 'withdrawn': {
-      forgetAgentLaunchPanePrompt(tabId)
-      if (releaseMainWrittenLaunchTab(tabId)) {
-        state.setTabAgentLaunchPane(tabId, undefined)
-        return
+      const prune = createKeptWorktreeSurfacePruners(state, {
+        worktreeIds: new Set([worktreeId]),
+        terminalTabIds: new Set([tabId]),
+        unifiedTabIds: new Set(),
+        fileIds: new Set(),
+        browserTabIds: new Set()
+      })
+      accepted = withdrawn = true
+      const layouts = { ...state.terminalLayoutsByTabId }
+      delete layouts[tabId]
+      return {
+        tabsByWorktree: prune.tabs(state.tabsByWorktree),
+        unifiedTabsByWorktree: prune.unifiedTabs(state.unifiedTabsByWorktree),
+        groupsByWorktree: prune.groups(state.groupsByWorktree),
+        tabBarOrderByWorktree: prune.tabBarOrder(state.tabBarOrderByWorktree),
+        activeTabIdByWorktree: prune.activeTabIds(state.activeTabIdByWorktree),
+        terminalLayoutsByTabId: layouts
       }
-      // The pane alone when the user split the tab while it waited; their split stays.
-      if (state.terminalLayoutsByTabId[tabId]?.root?.type === 'leaf') {
-        state.closeTab(tabId, {
-          reason: 'cleanup',
-          recordInteraction: false,
-          captureRecentlyClosed: false
-        })
-      } else {
-        state.setTabAgentLaunchPane(tabId, undefined)
-        applyClosedTerminalLeafNotice(tabId, leafId)
+    }
+    accepted = true
+    return {
+      tabsByWorktree: {
+        ...state.tabsByWorktree,
+        [worktreeId]: state.tabsByWorktree[worktreeId].map((row) =>
+          row !== tab
+            ? row
+            : {
+                ...row,
+                agentLaunchPane:
+                  verdict.kind === 'proceed'
+                    ? undefined
+                    : { ...tab.agentLaunchPane!, outcome: verdict }
+              }
+        )
       }
     }
+  })
+  if (!accepted) {
+    return false
+  }
+  if (verdict.kind !== 'proceed') {
+    settleAgentLaunchPaneStart(tabId, leafId, null)
+  }
+  if (withdrawn || verdict.kind === 'proceed') {
+    releaseMainWrittenLaunchTab(tabId)
+    forgetAgentLaunchPanePrompt(tabId)
   }
+  return true
 }
diff --git a/src/renderer/src/lib/agent-launch-tab-main-written.ts b/src/renderer/src/lib/agent-launch-tab-main-written.ts
index 9ce97730d3a5..39626aa284b9 100644
--- a/src/renderer/src/lib/agent-launch-tab-main-written.ts
+++ b/src/renderer/src/lib/agent-launch-tab-main-written.ts
@@ -1,5 +1,5 @@
-/** Main owns tab creation/closure; attach this window’s session-only prompt, pane verdict and presentation state when its frame draws, retaining them for undrawn workspaces. */
-
+import { agentLaunchPaneAttemptCurrent } from './agent-launch-pane-start'
+import { afterLayoutFrame } from '@/runtime/layout-frame-position'
 import type { AgentLaunchPaneVerdictEvent } from '../../../shared/agent-launch-pane-verdict'
 import type {
   AgentLaunchTabPublished,
@@ -16,6 +16,8 @@ import { revealWorkspaceSurface } from './workspace-surface-reveal'
 import { layoutFramesFlowing } from '@/runtime/layout-frame-position'
 import { layoutFrameTerminalTab } from '@/runtime/layout-frame-terminal-panes'
 
+/** Main owns tab creation/closure; attach this window’s session-only prompt, pane verdict and presentation state when its frame draws, retaining them for undrawn workspaces. */
+
 type LaunchPane = NonNullable<TerminalTab['agentLaunchPane']>
 
 const undrawn = new Map<string, { pane: LaunchPane; present: () => void; stop: () => void }>()
@@ -76,27 +78,31 @@ function goneFromFrames(worktreeId: string, tabId: string): boolean {
 function keepWhenDrawn(request: AgentLaunchTabPublishRequest, present: () => void): boolean {
   const { worktreeId, tabId } = request
   undrawn.get(tabId)?.stop()
-  if (goneFromFrames(worktreeId, tabId)) {
-    dropUndrawn(tabId)
-    return false
-  }
+
   const stop = useAppStore.subscribe(() => {
     const tab = drawnTab(worktreeId, tabId)
     if (!tab) {
-      if (goneFromFrames(worktreeId, tabId)) {
-        dropUndrawn(tabId)
-      }
       return
     }
     const entry = undrawn.get(tabId)
     undrawn.delete(tabId)
     stop()
-    if (entry) {
+    if (entry && agentLaunchPaneAttemptCurrent(tabId, entry.pane.leafId, entry.pane.operationId)) {
       keepLaunchPane(tabId, tab, entry.pane)
       entry.present()
     }
   })
   undrawn.set(tabId, { pane: launchPaneOf(request), present, stop })
+  if (request.shownByMain) {
+    afterLayoutFrame(request.shownByMain.frameSeq, () => {
+      if (
+        undrawn.get(tabId)?.pane.operationId === request.operationId &&
+        goneFromFrames(worktreeId, tabId)
+      ) {
+        dropUndrawn(tabId)
+      }
+    })
+  }
   return true
 }
 
@@ -104,6 +110,9 @@ export function keepAgentLaunchTabMainWrote(
   request: AgentLaunchTabPublishRequest
 ): AgentLaunchTabPublished {
   const { worktreeId, tabId, leafId, viewer } = request
+  if (!agentLaunchPaneAttemptCurrent(tabId, leafId, request.operationId)) {
+    throw new Error('agent_launch_superseded')
+  }
   const created = request.shownByMain?.created === true
   noteMainWritten(tabId)
   if (request.prompt) {
@@ -137,8 +146,11 @@ export function keepAgentLaunchTabMainWrote(
 
 /** Retain verdicts for undrawn launch panes; return false when no such pane is pending. */
 export function applyVerdictToUndrawnLaunchTab(event: AgentLaunchPaneVerdictEvent): boolean {
+  if (!agentLaunchPaneAttemptCurrent(event.tabId, event.leafId, event.operationId)) {
+    return false
+  }
   const entry = undrawn.get(event.tabId)
-  if (entry?.pane.leafId !== event.leafId) {
+  if (entry?.pane.leafId !== event.leafId || entry.pane.operationId !== event.operationId) {
     return false
   }
   const { verdict } = event
diff --git a/src/renderer/src/lib/agent-launch-tab-publication.test.ts b/src/renderer/src/lib/agent-launch-tab-publication.test.ts
index baec5addfdc5..76a1b5c56ff8 100644
--- a/src/renderer/src/lib/agent-launch-tab-publication.test.ts
+++ b/src/renderer/src/lib/agent-launch-tab-publication.test.ts
@@ -1,3 +1,11 @@
+import type { AppState } from '@/store/types'
+import {
+  acceptAgentLaunchPaneAttempt,
+  awaitAgentLaunchPaneStart,
+  settleAgentLaunchPaneStart,
+  forgetAgentLaunchPaneAttempts
+} from './agent-launch-pane-start'
+import { applyAgentLaunchPaneVerdict } from './agent-launch-pane-verdict-application'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import type * as AgentStatusModule from '@/lib/agent-status'
 import type { AgentLaunchTabPublishRequest } from '../../../shared/agent-launch-tab-publication'
@@ -16,6 +24,8 @@ const testStore = vi.hoisted(() => {
 })
 vi.mock('@/store', () => ({
   useAppStore: {
+    setState: (patch: Partial<AppState> | ((state: AppState) => Partial<AppState>)) =>
+      testStore.current!.setState(patch),
     getState: () => {
       if (!testStore.current) {
         throw new Error('no test store')
@@ -62,6 +72,7 @@ function launchTab() {
 }
 
 beforeEach(() => {
+  forgetAgentLaunchPaneAttempts(TAB_ID)
   store = createTestStore()
   testStore.current = store
   focusTerminalInitiatedTab.mockClear()
@@ -284,3 +295,48 @@ describe('whose view moves', () => {
     expect(focusTerminalInitiatedTab).toHaveBeenCalledWith(TAB_ID, LEAF_ID, WT)
   })
 })
+
+describe('the ordinary window actual verdict producer', () => {
+  it('takes back an exact unused failed tab without ordinary Close', () => {
+    const shown = publishAgentLaunchTab(request({ operationId: 'A' }))
+    expect(
+      publishAgentLaunchTab(
+        request({ operationId: 'A', withdraw: { root: shown.withdrawalRoot! } })
+      ).withdrawn
+    ).toBe(true)
+    expect(store.getState().tabsByWorktree[WT]?.some((row) => row.id === TAB_ID)).toBe(false)
+    expect(store.getState().terminalLayoutsByTabId[TAB_ID]).toBeUndefined()
+  })
+  it('does not clear a newer accepted/preparing launch prompt or waiter', async () => {
+    const shown = publishAgentLaunchTab(request({ operationId: 'A', prompt: 'original' }))
+    acceptAgentLaunchPaneAttempt(`${TAB_ID}:${LEAF_ID}`, 'B')
+    publishAgentLaunchTab(request({ operationId: 'B', prompt: 'new work' }))
+    const started = awaitAgentLaunchPaneStart(TAB_ID, LEAF_ID)
+    const answer = vi.fn()
+    void started.then(answer)
+    expect(
+      applyAgentLaunchPaneVerdict({
+        worktreeId: WT,
+        tabId: TAB_ID,
+        leafId: LEAF_ID,
+        operationId: 'A',
+        withdrawalRoot: shown.withdrawalRoot,
+        verdict: { kind: 'withdrawn' }
+      })
+    ).toBe(false)
+    expect(agentLaunchPanePrompt(TAB_ID)).toBe('new work')
+    await Promise.resolve()
+    expect(answer).not.toHaveBeenCalled()
+    settleAgentLaunchPaneStart(TAB_ID, LEAF_ID, 'pty-B')
+    expect(await started).toBe('pty-B')
+  })
+  it('retains a used destination even when the failed start was definitive', () => {
+    const shown = publishAgentLaunchTab(request({ operationId: 'A' }))
+    store.setState({ lastTerminalInputAtByPaneKey: { [`${TAB_ID}:${LEAF_ID}`]: 1 } })
+    const receipt = publishAgentLaunchTab(
+      request({ operationId: 'A', withdraw: { root: shown.withdrawalRoot! } })
+    )
+    expect(receipt.withdrawn).toBe(false)
+    expect(store.getState().tabsByWorktree[WT]?.some((row) => row.id === TAB_ID)).toBe(true)
+  })
+})
diff --git a/src/renderer/src/lib/agent-launch-tab-publication.ts b/src/renderer/src/lib/agent-launch-tab-publication.ts
index 05492aacb766..568c8c143614 100644
--- a/src/renderer/src/lib/agent-launch-tab-publication.ts
+++ b/src/renderer/src/lib/agent-launch-tab-publication.ts
@@ -1,5 +1,6 @@
-/** Publish under host-reserved IDs before the agent exists so PTY routing names this pane and retries reuse its tab; the pane’s spawn waits in main and attaches to the host’s process. */
-
+import { applyAgentLaunchPaneVerdict } from './agent-launch-pane-verdict-application'
+import { launchTabWithdrawalIdentity } from '../../../shared/agent-launch-tab-publication'
+import { agentLaunchPaneAttemptCurrent } from './agent-launch-pane-start'
 import type { AgentLaunchPlacementReceipt } from '../../../shared/agent-launch-intent'
 import type {
   AgentLaunchTabPublished,
@@ -13,6 +14,8 @@ import { insertUnifiedTabAfterAnchor } from './unified-tab-anchor-insertion'
 import { rememberAgentLaunchPanePrompt } from './agent-launch-pane-prompt'
 import { selectFolderWorkspaces } from '@/store/workspace-record-selectors'
 
+/** Publish under host-reserved IDs before the agent exists so PTY routing names this pane and retries reuse its tab; the pane’s spawn waits in main and attaches to the host’s process. */
+
 function landedGroupId(worktreeId: string, tabId: string): string | undefined {
   return useAppStore
     .getState()
@@ -45,6 +48,24 @@ export function publishAgentLaunchTab(
   request: AgentLaunchTabPublishRequest
 ): AgentLaunchTabPublished {
   const { worktreeId, tabId, leafId } = request
+  if (request.withdraw) {
+    return {
+      tabId,
+      created: false,
+      placement: { groupId: '' },
+      withdrawn: applyAgentLaunchPaneVerdict({
+        worktreeId,
+        tabId,
+        leafId,
+        operationId: request.operationId,
+        verdict: { kind: 'withdrawn' },
+        withdrawalRoot: request.withdraw.root
+      })
+    }
+  }
+  if (!agentLaunchPaneAttemptCurrent(tabId, leafId, request.operationId)) {
+    throw new Error('agent_launch_superseded')
+  }
   const store = useAppStore.getState()
   const owner = Object.entries(store.tabsByWorktree).find(([, tabs]) =>
     tabs.some((tab) => tab.id === tabId)
@@ -110,6 +131,12 @@ export function publishAgentLaunchTab(
   return {
     tabId: tab.id,
     created: true,
+    withdrawalRoot: launchTabWithdrawalIdentity(
+      useAppStore.getState().terminalLayoutsByTabId[tab.id]?.root,
+      useAppStore.getState().unifiedTabsByWorktree[worktreeId] ?? [],
+      useAppStore.getState().groupsByWorktree[worktreeId] ?? [],
+      tab.id
+    ),
     placement: { groupId: landed, ...(fallback ? { fallback } : {}) }
   }
 }
diff --git a/src/renderer/src/lib/conversation-surface-switch.test.tsx b/src/renderer/src/lib/conversation-surface-switch.test.tsx
new file mode 100644
index 000000000000..c125640d2fbb
--- /dev/null
+++ b/src/renderer/src/lib/conversation-surface-switch.test.tsx
@@ -0,0 +1,214 @@
+// @vitest-environment happy-dom
+import { act, cleanup, renderHook } from '@testing-library/react'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { useAppStore } from '@/store'
+import { EMPTY_STRUCTURED_AGENT_SESSION } from '../../../shared/structured-agent-session-reducer'
+import type { StructuredAgentSessionReadSnapshot } from '@/components/native-chat/structured-agent-session-read-owner-contract'
+import {
+  runConversationSwitch,
+  useConversationSwitchReadiness,
+  conversationSwitchFailureText
+} from './conversation-surface-switch'
+import { pendingNativeChatCliSwitches } from './pending-conversation-surface-switches'
+
+const mocks = vi.hoisted(() => ({
+  support: vi.fn(),
+  call: vi.fn(),
+  legacy: vi.fn(async () => {}),
+  refresh: vi.fn(async () => {}),
+  error: vi.fn(),
+  info: vi.fn(),
+  reader: vi.fn(),
+  listeners: new Set<() => void>(),
+  subscribe: (listener: () => void) => {
+    mocks.listeners.add(listener)
+    return () => mocks.listeners.delete(listener)
+  }
+}))
+vi.mock('sonner', () => ({ toast: { error: mocks.error, info: mocks.info } }))
+vi.mock('@/runtime/structured-agent-session-client', () => ({
+  supportsInPlaceSwitch: mocks.support,
+  callStructuredAgentSession: mocks.call
+}))
+vi.mock('@/runtime/structured-agent-session-owner', () => ({
+  structuredAgentSessionTargetForHost: () => ({ kind: 'local' }),
+  executionHostIdForStructuredTarget: () => 'local'
+}))
+vi.mock('./in-place-switch-support', () => ({
+  useInPlaceSwitchRevision: () => 0,
+  inPlaceSwitchCapabilityNow: () => true
+}))
+vi.mock('@/runtime/structured-agent-session-status-feed', () => ({
+  getStructuredAgentSessionStatusFeed: () => ({
+    subscribe: mocks.subscribe,
+    getSnapshot: () => new Map()
+  })
+}))
+vi.mock('@/components/native-chat/structured-agent-session-read-owner-registry', () => ({
+  findStructuredAgentSessionReadOwner: mocks.reader
+}))
+vi.mock('@/components/tab-bar/cli-chat-resume-run', () => ({
+  runLegacyCliChatResume: mocks.legacy
+}))
+vi.mock('@/components/tab-bar/native-chat-cli-switch-run', () => ({
+  runLegacyNativeChatCliSwitch: mocks.legacy
+}))
+vi.mock('@/components/tab-bar/cli-chat-resume-feedback', () => ({
+  switchIntoOwnerLegacy: mocks.legacy
+}))
+vi.mock('@/runtime/local-structured-session-tabs-sync/inventory-refresh', () => ({
+  refreshLocalStructuredSessionWorktreeTabs: mocks.refresh
+}))
+vi.mock('@/components/right-sidebar/ai-vault-session-resume-in-chat-launch', () => ({
+  resumeAiVaultSessionInNewChat: mocks.legacy
+}))
+
+const subject = {
+  direction: 'terminal' as const,
+  executionHostId: 'local',
+  workspaceId: 'workspace',
+  sessionId: 'codex_chat',
+  agent: 'codex' as const,
+  chatTabId: 'source'
+}
+beforeEach(() => {
+  vi.clearAllMocks()
+  mocks.reader.mockReturnValue(undefined)
+  mocks.support.mockResolvedValue(true)
+  mocks.call.mockResolvedValue({ status: 'completed', sessionId: subject.sessionId })
+  useAppStore.setState(useAppStore.getInitialState(), true)
+})
+afterEach(() => {
+  cleanup()
+  vi.useRealTimers()
+  pendingNativeChatCliSwitches.clear()
+})
+
+it('reserves pending before negotiation, sends one execution request and leaves all launching to the host', async () => {
+  const negotiation = Promise.withResolvers<boolean>()
+  mocks.support.mockReturnValue(negotiation.promise)
+  const first = runConversationSwitch(subject)
+  expect(pendingNativeChatCliSwitches.size).toBe(1)
+  expect(await runConversationSwitch(subject)).toBe(false)
+  negotiation.resolve(true)
+  expect(await first).toBe(true)
+  expect(mocks.support).toHaveBeenCalledOnce()
+  expect(mocks.call).toHaveBeenCalledWith(
+    { kind: 'local' },
+    'agentSession.switchToTerminal',
+    expect.objectContaining({
+      sessionId: subject.sessionId,
+      execution: expect.objectContaining({ sourceTabId: 'source' })
+    }),
+    expect.objectContaining({ signal: expect.any(AbortSignal), beforeSend: expect.any(Function) })
+  )
+  expect(mocks.legacy).not.toHaveBeenCalled()
+  expect(pendingNativeChatCliSwitches.size).toBe(0)
+})
+
+it('keeps an old peer on the explicit v1 adapter without sending execution fields', async () => {
+  mocks.support.mockResolvedValue(false)
+  await runConversationSwitch(subject)
+  expect(mocks.legacy).toHaveBeenCalledOnce()
+  expect(mocks.call).not.toHaveBeenCalled()
+})
+
+it('starts the full observer at actual first send, without refilling on later observation', async () => {
+  vi.useFakeTimers()
+  const answer = Promise.withResolvers<unknown>()
+  let send: (() => void) | undefined
+  mocks.call.mockImplementation((_target, _method, _params, options) => {
+    send = options.beforeSend
+    return answer.promise
+  })
+  const running = runConversationSwitch(subject)
+  await act(async () => {
+    await vi.advanceTimersByTimeAsync(700_000)
+  })
+  expect(send).toBeDefined()
+  send!()
+  await act(async () => {
+    await vi.advanceTimersByTimeAsync(40_000)
+  })
+  expect(pendingNativeChatCliSwitches.size).toBe(1)
+  send!()
+  await act(async () => {
+    await vi.advanceTimersByTimeAsync(695_001)
+  })
+  expect(await running).toBe(false)
+  expect(pendingNativeChatCliSwitches.size).toBe(0)
+  answer.resolve({ status: 'completed', sessionId: subject.sessionId })
+})
+
+it('clears invocation pending and rereads real state after a lost answer, without hiding a late destination', async () => {
+  vi.useFakeTimers()
+  const answer = Promise.withResolvers<unknown>()
+  mocks.call.mockReturnValue(answer.promise)
+  const running = runConversationSwitch(subject)
+  await act(async () => {
+    await vi.advanceTimersByTimeAsync(735_001)
+  })
+  expect(await running).toBe(false)
+  expect(pendingNativeChatCliSwitches.size).toBe(0)
+  expect(mocks.refresh).toHaveBeenCalledWith('workspace', { reacceptCurrentVersion: true })
+  expect(mocks.error).toHaveBeenCalledExactlyOnceWith(
+    expect.stringContaining('could not confirm the Codex switch')
+  )
+  answer.resolve({ status: 'completed', sessionId: subject.sessionId })
+  await Promise.resolve()
+  expect(mocks.error).toHaveBeenCalledOnce()
+  expect(mocks.legacy).not.toHaveBeenCalled()
+})
+
+it.each(['chat', 'terminal'] as const)(
+  'uses held live turn facts for %s, without opening a History reader',
+  (direction) => {
+    let held: StructuredAgentSessionReadSnapshot = {
+      current: true,
+      loadingOlder: false,
+      olderHistoryGeneration: 0,
+      state: { ...EMPTY_STRUCTURED_AGENT_SESSION, working: true }
+    }
+    mocks.reader.mockReturnValue({ subscribe: mocks.subscribe, getSnapshot: () => held })
+    const { result } = renderHook(() => useConversationSwitchReadiness({ ...subject, direction }))
+    // Owed/unanswered work is decided by the host at click, not by this broad working flag.
+    expect(result.current.ready).toBe(true)
+    act(() => {
+      held = {
+        ...held,
+        state: {
+          ...held.state,
+          latestTurn: {
+            itemId: 'codex:turn:turn_123',
+            observedAt: 1,
+            turn: { turnId: 'turn_123', state: 'running' }
+          }
+        }
+      }
+      mocks.listeners.forEach((listener) => listener())
+    })
+    expect(result.current.ready).toBe(false)
+    expect(result.current.explanation).toContain('Codex is replying')
+    act(() => {
+      held = { ...held, current: false }
+      mocks.listeners.forEach((listener) => listener())
+    })
+    expect(result.current.ready).toBe(true)
+    expect(mocks.call).not.toHaveBeenCalled()
+  }
+)
+
+it('formats real refusal categories once, with agent and next step, never raw errors or platform-wrong job control', async () => {
+  const text = (reason: string, platform = 'darwin') =>
+    conversationSwitchFailureText(null, { ...subject, platform }, reason)
+  expect(text('messagesUnsettled')).toContain('work waiting')
+  expect(text('ownerUnproven')).toContain('Restart Orca')
+  expect(text('previousExitUnverifiable')).not.toContain('Restart')
+  expect(text('conversationOpenInTerminal')).toContain('If you suspended a job, run fg')
+  expect(text('conversationOpenInTerminal', 'win32')).not.toContain('fg')
+  mocks.call.mockRejectedValue(new Error('secret raw transport/provider failure'))
+  await runConversationSwitch({ ...subject, direction: 'chat' })
+  expect(mocks.error).toHaveBeenCalledExactlyOnceWith(
+    'Codex could not start in chat. Check its setup and try again.'
+  )
+})
diff --git a/src/renderer/src/lib/conversation-surface-switch.ts b/src/renderer/src/lib/conversation-surface-switch.ts
new file mode 100644
index 000000000000..682e79ce92a2
--- /dev/null
+++ b/src/renderer/src/lib/conversation-surface-switch.ts
@@ -0,0 +1,299 @@
+import {
+  captureSwitchProjection,
+  releaseUnsentSwitchProjection
+} from './conversation-switch-projection'
+import {
+  beginSwitchPresentation,
+  reportSwitchPresentationFailure,
+  settleSwitchPresentation,
+  type SwitchPresentationVisit
+} from './conversation-switch-presentation'
+import { publishAgentLaunchTab } from './agent-launch-tab-publication'
+import { openStructuredAgentSessionProvisionalTab } from './structured-agent-session-launch-surface'
+import { activateAndRevealWorkspace } from './worktree-activation'
+import { afterPendingTab } from '@/runtime/layout-owner-pending-tabs'
+import { parseExecutionHostId } from '../../../shared/execution-host'
+import { toast } from 'sonner'
+import { useAppStore } from '@/store'
+import {
+  conversationSwitchFailureText,
+  conversationSwitchSourceKept
+} from './conversation-switch-feedback'
+import { resolveWorktreeExecutionHostPlatform } from './execution-host-facts'
+import { structuredAgentSessionTargetForHost } from '@/runtime/structured-agent-session-owner'
+import {
+  callStructuredAgentSession,
+  supportsInPlaceSwitch
+} from '@/runtime/structured-agent-session-client'
+import { createStructuredAgentSessionLaunchIntent } from './launch-structured-agent-session'
+import { createBrowserUuid } from './browser-uuid'
+import { captureSourceTerminal } from '@/components/tab-bar/cli-chat-resume-terminal-capture'
+import {
+  pendingNativeChatCliSwitches as pending,
+  conversationSwitchChanged
+} from './pending-conversation-surface-switches'
+import {
+  agentSessionSwitchDeadline,
+  AGENT_SESSION_SWITCH_CLIENT_MS,
+  type AgentSessionSwitchResult
+} from '../../../shared/agent-session-switch-execution'
+import { AgentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
+import { prepareAiVaultSessionForResume } from './ai-vault-session-resume-preparation'
+import type { CliChatResumeSource } from '@/components/tab-bar/cli-chat-resume-source'
+import { runLegacyConversationSwitch } from './conversation-switch-legacy'
+import {
+  type ConversationSwitch,
+  keyFor,
+  pendingNow,
+  rederiveConversationSwitch
+} from './conversation-switch-state'
+
+export { conversationSwitchFailureText } from './conversation-switch-feedback'
+
+export function runCliChatResume(source: CliChatResumeSource): Promise<void> {
+  return runConversationSwitch({ direction: 'chat', ...source, source }).then(() => undefined)
+}
+export function runNativeChatCliSwitch(
+  args: Omit<ConversationSwitch, 'direction'> & { onComplete?: () => void }
+): Promise<void> {
+  return runConversationSwitch({ ...args, direction: 'terminal' })
+    .then(() => undefined)
+    .finally(args.onComplete)
+}
+
+export async function runConversationSwitch(args: ConversationSwitch): Promise<boolean> {
+  if (pendingNow(args)) {
+    return false
+  }
+  const platform = resolveWorktreeExecutionHostPlatform(
+    useAppStore.getState(),
+    args.workspaceId,
+    undefined
+  )
+  args = {
+    ...args,
+    platform: args.platform ?? (platform.kind === 'known' ? platform.platform : undefined)
+  }
+  const target = structuredAgentSessionTargetForHost(args.executionHostId)
+  const hostId = parseExecutionHostId(args.executionHostId)?.id
+  if (!target || !hostId) {
+    return false
+  }
+  const deadline = agentSessionSwitchDeadline(Date.now, AGENT_SESSION_SWITCH_CLIENT_MS)
+  const key = keyFor(args)
+  const feedback =
+    args.feedback ?? ((message: string, kind: 'error' | 'info') => toast[kind](message))
+  pending.set(key, {
+    chatTabId: args.source?.tabId ?? args.chatTabId ?? null,
+    workspaceId: args.workspaceId,
+    executionHostId: args.executionHostId
+  })
+  conversationSwitchChanged()
+  const invocationId = createBrowserUuid()
+  if (args.direction === 'terminal' && args.sessionId && args.chatTabId) {
+    captureSwitchProjection(
+      useAppStore.getState(),
+      args.workspaceId,
+      {
+        invocationId,
+        generation: invocationId,
+        sessionId: args.sessionId,
+        tabId: args.chatTabId,
+        phase: 'prepare'
+      },
+      () => {}
+    )
+  }
+  let sent = false
+  let observing = false
+  let presentation: SwitchPresentationVisit | undefined
+  try {
+    if (!(await deadline.wait(supportsInPlaceSwitch(target, args.agent, true)))) {
+      await runLegacyConversationSwitch(args, target)
+      return false
+    }
+    let sessionId = args.sessionId
+    let execution: Record<string, unknown> = { invocationId }
+    if (args.direction === 'chat' && args.source) {
+      const captured = await deadline.wait(captureSourceTerminal(args.source))
+      if (!captured) {
+        throw new Error('source unavailable')
+      }
+      const intent = createStructuredAgentSessionLaunchIntent(
+        args.workspaceId,
+        'codex',
+        args.source.executionHostId,
+        {
+          providerSessionId: args.source.providerSessionId,
+          cliSource: { workspaceId: args.workspaceId, paneKey: args.source.paneKey }
+        }
+      )
+      sessionId = intent.sessionId
+      const group = useAppStore
+        .getState()
+        .groupsByWorktree[args.workspaceId]?.find((row) =>
+          row.tabOrder.includes(args.source!.tabId)
+        )
+      execution = {
+        ...execution,
+        create: {
+          ...intent.params,
+          tabPlacement: { groupId: group?.id, afterTabId: args.source.tabId }
+        },
+        source: {
+          terminal: captured.handle,
+          expectedIncarnationId: captured.incarnationId,
+          originalPresentation: captured.presentation
+        }
+      }
+    } else if (args.direction === 'chat' && !sessionId && args.history) {
+      const prepared = await deadline.wait(prepareAiVaultSessionForResume(args.history))
+      const intent = createStructuredAgentSessionLaunchIntent(args.workspaceId, 'codex', hostId, {
+        providerSessionId: prepared.sessionId
+      })
+      sessionId = intent.sessionId
+      execution = { ...execution, create: intent.params }
+    } else if (args.direction === 'terminal') {
+      const state = useAppStore.getState()
+      execution = {
+        ...execution,
+        sourceTabId: args.chatTabId ?? undefined,
+        groupId: state.groupsByWorktree[args.workspaceId]?.find((row) =>
+          row.tabOrder.includes(args.chatTabId ?? '')
+        )?.id,
+        commandOverride: state.settings?.agentCmdOverrides?.[args.agent]
+      }
+    }
+    const method =
+      args.direction === 'chat' ? 'agentSession.switchToChat' : 'agentSession.switchToTerminal'
+    const invoke = (extra: Record<string, unknown> = {}) =>
+      deadline.wait(
+        callStructuredAgentSession<AgentSessionSwitchResult>(
+          target,
+          method,
+          { sessionId, execution: { ...execution, ...extra } },
+          {
+            signal: deadline.signal,
+            dispatchObservation: deadline.delegateSend,
+            beforeSend: (sentAt) => {
+              deadline.beforeSend(sentAt)
+              sent = true
+            }
+          }
+        )
+      )
+    let answer = await invoke()
+    if (answer.status === 'present') {
+      const view = answer
+      sessionId = answer.sessionId
+      if (view.surface !== 'terminal') {
+        presentation = beginSwitchPresentation(target, sessionId)
+      }
+      const opened =
+        view.surface === 'terminal' && view.leafId
+          ? {
+              id: publishAgentLaunchTab({
+                requestId: invocationId,
+                operationId: invocationId,
+                worktreeId: view.workspaceId,
+                tabId: view.tabId,
+                leafId: view.leafId,
+                launchAgent: view.agent,
+                viewMode: 'terminal',
+                placement: view.placement,
+                viewer: 'focus-window'
+              }).tabId
+            }
+          : openStructuredAgentSessionProvisionalTab({
+              worktreeId: answer.workspaceId,
+              executionHostId: args.executionHostId,
+              sessionId,
+              agent: answer.agent,
+              targetGroupId: answer.placement?.groupId,
+              afterTabId: answer.placement?.afterTabId,
+              activate: true
+            })
+      await deadline.wait(
+        new Promise<void>((resolve, reject) =>
+          afterPendingTab(opened.id, (id) => {
+            if (!id || activateAndRevealWorkspace(view.workspaceId) === false) {
+              reject(new Error('chat unavailable'))
+            } else {
+              resolve()
+            }
+          })
+        )
+      )
+      const shown = presentation ? await deadline.wait(presentation.shown) : true
+      answer = await invoke({ receipt: { generation: answer.generation, shown } })
+    }
+    if (answer.status !== 'completed') {
+      if (answer.status === 'present') {
+        throw new Error('chat unavailable')
+      }
+      if (!presentation || reportSwitchPresentationFailure(presentation, answer.failureItemId)) {
+        feedback(
+          conversationSwitchFailureText(new AgentSessionRefusalError(answer.refusal), args),
+          'error'
+        )
+      }
+      return false
+    }
+    if (answer.sourceRetained) {
+      feedback(conversationSwitchSourceKept(args.agent), 'info')
+    }
+    if (answer.startupPending) {
+      observing = true
+      const selectedVisit = presentation
+      void invoke({ observe: true })
+        .then((settled) => {
+          if (settled.status === 'completed' && settled.sourceRetained) {
+            feedback(conversationSwitchSourceKept(args.agent), 'info')
+          }
+          if (
+            (settled.status === 'refused' || settled.status === 'uncertain') &&
+            (!selectedVisit ||
+              reportSwitchPresentationFailure(selectedVisit, settled.failureItemId))
+          ) {
+            feedback(
+              conversationSwitchFailureText(new AgentSessionRefusalError(settled.refusal), args),
+              'error'
+            )
+          }
+        })
+        .catch((error: unknown) => {
+          if (deadline.signal.aborted) {
+            rederiveConversationSwitch({ ...args, sessionId })
+          }
+          if (!selectedVisit || reportSwitchPresentationFailure(selectedVisit)) {
+            feedback(conversationSwitchFailureText(error, args), 'error')
+          }
+        })
+        .finally(() => {
+          settleSwitchPresentation(selectedVisit)
+          deadline.dispose()
+        })
+    }
+    return true
+  } catch (error) {
+    feedback(conversationSwitchFailureText(error, args), 'error')
+    return false
+  } finally {
+    if (!sent) {
+      releaseUnsentSwitchProjection(invocationId)
+    }
+    if (!observing) {
+      settleSwitchPresentation(presentation)
+      deadline.dispose()
+    }
+    pending.delete(key)
+    conversationSwitchChanged()
+    rederiveConversationSwitch(args)
+  }
+}
+
+export {
+  useConversationSwitchPending,
+  useConversationSwitchReadiness,
+  type ConversationSwitch
+} from './conversation-switch-state'
diff --git a/src/renderer/src/lib/conversation-switch-feedback.ts b/src/renderer/src/lib/conversation-switch-feedback.ts
new file mode 100644
index 000000000000..715273b998b2
--- /dev/null
+++ b/src/renderer/src/lib/conversation-switch-feedback.ts
@@ -0,0 +1,132 @@
+import { translate } from '@/i18n/i18n'
+import { structuredLaunchFailure } from './structured-agent-session-launch-failure'
+import { agentLabel } from '../../../shared/ai-vault-session-filters'
+import type { AiVaultAgent } from '../../../shared/ai-vault-types'
+
+export function conversationSwitchFailureText(
+  error: unknown,
+  args: {
+    agent: AiVaultAgent
+    direction: 'chat' | 'terminal'
+    source?: unknown
+    history?: unknown
+    platform?: string
+  },
+  reasonOverride?: string
+): string {
+  const failure = structuredLaunchFailure(error)
+  const reason = reasonOverride ?? failure?.details?.reason
+  const values = { agent: agentLabel(args.agent) }
+  if (reason === 'turnActive') {
+    return translate(
+      'components.tab.bar.switch.replyBusy',
+      '{{agent}} is replying. Wait for the reply or stop it, then switch.',
+      values
+    )
+  }
+  if (reason === 'handoffInFlight') {
+    return translate(
+      'components.tab.bar.switch.switchBusy',
+      '{{agent}} is already switching. Wait, then try again.',
+      values
+    )
+  }
+  if (reason === 'providerStarting') {
+    return translate(
+      'components.tab.bar.switch.startBusy',
+      '{{agent}} is starting. Wait, then switch.',
+      values
+    )
+  }
+  if (reason === 'messagesUnsettled' || reason === 'backgroundTasksRunning') {
+    return translate(
+      'components.tab.bar.switch.workBusy',
+      '{{agent}} still has work waiting. Finish or cancel it, then switch.',
+      values
+    )
+  }
+  if (reason === 'conversationHeldElsewhere') {
+    return failure?.source
+      ? translate(
+          'components.tab.bar.switch.sourceExitUnconfirmed',
+          'Orca could not confirm {{agent}} stopped in this terminal. Quit {{agent}} here, then try this action again.',
+          values
+        )
+      : failure?.owner
+        ? translate(
+            'components.tab.bar.switch.openElsewhere',
+            '{{agent}} is open in another chat or terminal. Continue there, then try switching again.',
+            values
+          )
+        : translate(
+            'components.tab.bar.switch.writerUnconfirmed',
+            'Orca could not confirm {{agent}} stopped. Check its open chats and terminals, then try this action again.',
+            values
+          )
+  }
+  if (reason === 'conversationOpenInTerminal') {
+    return translate(
+      args.platform === 'darwin' || args.platform === 'linux'
+        ? 'components.tab.bar.switch.terminalBusyPosix'
+        : 'components.tab.bar.switch.terminalBusy',
+      args.platform !== 'win32' && (args.platform === 'darwin' || args.platform === 'linux')
+        ? '{{agent}} cannot switch while this terminal has a running job. If you suspended a job, run fg and exit it, then switch.'
+        : '{{agent}} cannot switch while this terminal has a running job. Exit the job, then switch.',
+      values
+    )
+  }
+  if (reason === 'previousExitUnverifiable') {
+    return translate(
+      'components.tab.bar.switch.unavailableNow',
+      'Switching {{agent}} is unavailable for this chat now. You can keep using chat.',
+      values
+    )
+  }
+  if (reason === 'ownerUnproven') {
+    return translate(
+      'components.tab.bar.switch.stopUnknown',
+      'Orca could not confirm {{agent}} stopped. Restart Orca, then check this chat before trying again. Switching may remain unavailable.',
+      values
+    )
+  }
+  if (reason === 'operationExpired' || reason === 'outcomeUnknown' || reason === 'tabUnconfirmed') {
+    return translate(
+      'components.tab.bar.switch.outcomeUnknown',
+      'Orca could not confirm the {{agent}} switch. Check the open chat and terminal before trying again.',
+      values
+    )
+  }
+  if (reason === 'transcriptNotFound') {
+    return translate(
+      'components.native-chat.resumeInNewChat.notSavedYet',
+      "{{agent}} hasn't saved this conversation yet. Try again after it replies.",
+      values
+    )
+  }
+  if (reason === 'transcriptUnreadable') {
+    return translate(
+      'components.tab.bar.switch.historyUnavailable',
+      "{{agent}} couldn't open this conversation's history. Check that its saved conversation is available, then try again.",
+      values
+    )
+  }
+  return args.direction === 'chat'
+    ? translate(
+        'components.tab.bar.switch.chatStartFailed',
+        '{{agent}} could not start in chat. Check its setup and try again.',
+        values
+      )
+    : translate(
+        'components.tab.bar.switch.terminalStartFailed',
+        '{{agent}} could not start in a terminal. Check its setup and try again.',
+        values
+      )
+}
+
+export function conversationSwitchSourceKept(agent: AiVaultAgent): string {
+  return translate(
+    'components.tab.bar.switch.sourceKept',
+    '{{agent}} opened successfully. The original tab was kept; continue in the new tab.',
+    { agent: agentLabel(agent) }
+  )
+}
diff --git a/src/renderer/src/lib/conversation-switch-legacy.ts b/src/renderer/src/lib/conversation-switch-legacy.ts
new file mode 100644
index 000000000000..6272d0b9db06
--- /dev/null
+++ b/src/renderer/src/lib/conversation-switch-legacy.ts
@@ -0,0 +1,33 @@
+import { runLegacyCliChatResume } from '@/components/tab-bar/cli-chat-resume-run'
+import { runLegacyNativeChatCliSwitch } from '@/components/tab-bar/native-chat-cli-switch-run'
+import { switchIntoOwnerLegacy } from '@/components/tab-bar/cli-chat-resume-feedback'
+
+import { newAgentLaunchRequestId } from './agent-launch-request-id'
+import { resumeAiVaultSessionInNewChat } from '@/components/right-sidebar/ai-vault-session-resume-in-chat-launch'
+
+import type { ConversationSwitch } from './conversation-switch-state'
+import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
+export function runLegacyConversationSwitch(args: ConversationSwitch, target: RuntimeClientTarget) {
+  if (args.direction === 'terminal' && args.sessionId) {
+    return runLegacyNativeChatCliSwitch({
+      ...args,
+      sessionId: args.sessionId,
+      chatTabId: args.chatTabId ?? null
+    })
+  } else if (args.source) {
+    return runLegacyCliChatResume(args.source)
+  } else if (args.sessionId) {
+    return switchIntoOwnerLegacy(
+      { agent: args.agent, tabId: args.chatTabId ?? '', workspaceId: args.workspaceId },
+      { sessionId: args.sessionId, workspaceId: args.workspaceId },
+      target
+    )
+  } else if (args.history && args.agent === 'codex') {
+    return resumeAiVaultSessionInNewChat(
+      args.history,
+      args.agent,
+      args.workspaceId,
+      newAgentLaunchRequestId()
+    )
+  }
+}
diff --git a/src/renderer/src/lib/conversation-switch-presentation.test.tsx b/src/renderer/src/lib/conversation-switch-presentation.test.tsx
new file mode 100644
index 000000000000..001c3a8c4840
--- /dev/null
+++ b/src/renderer/src/lib/conversation-switch-presentation.test.tsx
@@ -0,0 +1,164 @@
+import { useRef } from 'react'
+import { act, cleanup, render, screen } from '@testing-library/react'
+import { afterEach, expect, it, vi } from 'vitest'
+import { NativeChatNoticeRow } from '@/components/native-chat/NativeChatNoticeRow'
+import {
+  beginSwitchPresentation,
+  reportSwitchPresentationFailure,
+  SwitchPresentationContext,
+  useSwitchPresentation,
+  useSwitchPresentationRows
+} from './conversation-switch-presentation'
+
+// @vitest-environment happy-dom
+
+const target = { kind: 'local' as const }
+afterEach(() => {
+  cleanup()
+  vi.restoreAllMocks()
+})
+function List({ item }: { item?: string }) {
+  const root = useRef<HTMLDivElement>(null)
+  useSwitchPresentationRows(root)
+  return (
+    <div ref={root} data-testid="list">
+      {item && (
+        <div data-switch-item-id={item}>
+          <NativeChatNoticeRow
+            messageId={item}
+            agentName="Codex"
+            block={{ type: 'text', text: 'Codex could not start. Try again.' }}
+          />
+        </div>
+      )}
+    </div>
+  )
+}
+function Visit({ item, visible = true }: { item?: string; visible?: boolean }) {
+  const visit = useSwitchPresentation(target, 'conversation', visible)
+  return (
+    <SwitchPresentationContext.Provider value={visit}>
+      <List item={item} />
+    </SwitchPresentationContext.Provider>
+  )
+}
+function bounds(top: number): DOMRect {
+  return {
+    x: 0,
+    y: top,
+    width: 200,
+    height: 30,
+    top,
+    bottom: top + 30,
+    left: 0,
+    right: 200,
+    toJSON: () => ({})
+  }
+}
+it.each(['before row', 'offscreen', 'absent root'] as const)(
+  'selects one clicked-context report for the exact failure %s, without hiding future manual history',
+  (timing) => {
+    vi.spyOn(HTMLElement.prototype, 'getBoundingClientRect').mockImplementation(function (
+      this: HTMLElement
+    ) {
+      return bounds(timing === 'offscreen' && this.dataset.switchItemId ? 5_000 : 0)
+    })
+    const visit = beginSwitchPresentation(target, 'conversation')
+    const view =
+      timing === 'absent root'
+        ? undefined
+        : render(<Visit item={timing === 'before row' ? undefined : 'failed-new'} />)
+    act(() => {
+      expect(reportSwitchPresentationFailure(visit, 'failed-new')).toBe(true)
+    })
+    expect(reportSwitchPresentationFailure(visit, 'failed-new')).toBe(false)
+    view?.rerender(<Visit item="failed-new" />)
+    if (view) {
+      expect(screen.queryByText('Codex could not start. Try again.')).toBeNull()
+    }
+    view?.unmount()
+    visit.release()
+    render(<Visit item="failed-new" />)
+    expect(screen.getByText('Codex could not start. Try again.')).toBeTruthy()
+  }
+)
+it('uses the currently visible exact row, never an older equal failure', async () => {
+  vi.spyOn(HTMLElement.prototype, 'getBoundingClientRect').mockImplementation(() => bounds(0))
+  const visit = beginSwitchPresentation(target, 'conversation')
+  const view = render(<Visit item="old-failure" />)
+  expect(await visit.shown).toBe(true)
+  view.rerender(<Visit item="selected-failure" />)
+  act(() => {
+    expect(reportSwitchPresentationFailure(visit, 'selected-failure')).toBe(false)
+  })
+  expect(screen.getByText('Codex could not start. Try again.')).toBeTruthy()
+  expect(reportSwitchPresentationFailure(visit, 'selected-failure')).toBe(false)
+})
+
+it('does not toast again when the exact failure was shown before its result but has since left the viewport', () => {
+  vi.spyOn(HTMLElement.prototype, 'getBoundingClientRect').mockImplementation(() => bounds(0))
+  const visit = beginSwitchPresentation(target, 'conversation')
+  const view = render(<Visit item="selected-failure" />)
+  expect(visit.presentedItems.has('selected-failure')).toBe(true)
+  view.rerender(<Visit />)
+  expect(reportSwitchPresentationFailure(visit, 'selected-failure')).toBe(false)
+  view.unmount()
+  visit.release()
+})
+it('inspects only mounted virtual rows once per current-visit render, without consulting history', () => {
+  const geometry = vi
+    .spyOn(HTMLElement.prototype, 'getBoundingClientRect')
+    .mockImplementation(() => bounds(0))
+  const visit = beginSwitchPresentation(target, 'conversation')
+  const view = render(<Visit item="mounted-only" />)
+  geometry.mockClear()
+  view.rerender(<Visit item="next-mounted" />)
+  expect(visit.presentedItems.has('next-mounted')).toBe(true)
+  expect(geometry.mock.calls.length).toBeLessThanOrEqual(4)
+  view.unmount()
+  visit.release()
+})
+
+it.each([100, 1000])(
+  'bounds viewport work by %i mounted rows and tears it down at selected settlement',
+  (count) => {
+    const geometry = vi
+      .spyOn(HTMLElement.prototype, 'getBoundingClientRect')
+      .mockImplementation(() => bounds(0))
+    function Rows() {
+      const root = useRef<HTMLDivElement>(null)
+      useSwitchPresentationRows(root)
+      return (
+        <div ref={root} data-testid="viewport">
+          {Array.from({ length: count }, (_, i) => (
+            <div key={i} data-switch-item-id={`item-${i}`} />
+          ))}
+        </div>
+      )
+    }
+    function ScaleVisit() {
+      const visit = useSwitchPresentation(target, 'scale', true)
+      return (
+        <SwitchPresentationContext.Provider value={visit}>
+          <Rows />
+        </SwitchPresentationContext.Provider>
+      )
+    }
+    const visit = beginSwitchPresentation(target, 'scale')
+    const view = render(<ScaleVisit />)
+    geometry.mockClear()
+    act(() => screen.getByTestId('viewport').dispatchEvent(new Event('scroll')))
+    expect(geometry.mock.calls.length).toBe(2 * count)
+    expect(visit.presentedItems.size).toBe(count)
+    act(() => {
+      expect(reportSwitchPresentationFailure(visit, 'item-1')).toBe(false)
+    })
+    expect(visit.presentedItems.size).toBe(0)
+    geometry.mockClear()
+    act(() => screen.getByTestId('viewport').dispatchEvent(new Event('scroll')))
+    view.rerender(<ScaleVisit />)
+    expect(geometry).not.toHaveBeenCalled()
+    view.unmount()
+    visit.release()
+  }
+)
diff --git a/src/renderer/src/lib/conversation-switch-presentation.tsx b/src/renderer/src/lib/conversation-switch-presentation.tsx
new file mode 100644
index 000000000000..a2ef91e8787a
--- /dev/null
+++ b/src/renderer/src/lib/conversation-switch-presentation.tsx
@@ -0,0 +1,224 @@
+import { createContext, useContext, useLayoutEffect, useSyncExternalStore } from 'react'
+import type { RefObject } from 'react'
+import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
+import { executionHostIdForStructuredTarget } from '@/runtime/structured-agent-session-owner'
+
+export type SwitchPresentationVisit = {
+  stopObserving?: () => void
+  captureVisible?: () => void
+  itemVisible?: (id: string) => boolean
+  presentedItems: Set<string>
+  readable: boolean
+  settled: boolean
+  failureItemId?: string
+  reporter?: 'inline' | 'clicked'
+  shown: Promise<boolean>
+  show: (shown: boolean) => void
+  mounted: boolean
+  visible: boolean
+  release: () => void
+}
+const visits = new Map<string, SwitchPresentationVisit>()
+const listeners = new Set<() => void>()
+let revision = 0
+const changed = () => {
+  revision++
+  for (const listener of listeners) {
+    listener()
+  }
+}
+const subscribe = (listener: () => void) => {
+  listeners.add(listener)
+  return () => {
+    listeners.delete(listener)
+  }
+}
+const keyFor = (target: RuntimeClientTarget, id: string) =>
+  `${executionHostIdForStructuredTarget(target)}\0${id}`
+export const SwitchPresentationContext = createContext<SwitchPresentationVisit | undefined>(
+  undefined
+)
+
+/** Only this automatic visit owns the click's selected failure; a later manual visit reads history normally. */
+export function beginSwitchPresentation(
+  target: RuntimeClientTarget,
+  id: string
+): SwitchPresentationVisit {
+  const key = keyFor(target, id)
+  visits.get(key)?.release()
+  let show!: (shown: boolean) => void
+  const shown = new Promise<boolean>((resolve) => {
+    show = resolve
+  })
+  const visit: SwitchPresentationVisit = {
+    shown,
+    show,
+    presentedItems: new Set(),
+    readable: false,
+    settled: false,
+    mounted: false,
+    visible: false,
+    release: () => {
+      if (visits.get(key) === visit) {
+        visit.show(false)
+        visit.stopObserving?.()
+        visits.delete(key)
+        changed()
+      }
+    }
+  }
+  visits.set(key, visit)
+  changed()
+  return visit
+}
+export function reportSwitchPresentationFailure(
+  visit: SwitchPresentationVisit,
+  itemId?: string
+): boolean {
+  if (visit.reporter) {
+    return false
+  }
+  visit.failureItemId = itemId
+  visit.reporter =
+    itemId && (visit.presentedItems.has(itemId) || (visit.visible && visit.itemVisible?.(itemId)))
+      ? 'inline'
+      : 'clicked'
+  settleSwitchPresentation(visit)
+  return visit.reporter === 'clicked'
+}
+export function settleSwitchPresentation(visit: SwitchPresentationVisit | undefined): void {
+  if (!visit || visit.settled) {
+    return
+  }
+  visit.settled = true
+  visit.stopObserving?.()
+  visit.presentedItems.clear()
+  visit.captureVisible = undefined
+  visit.itemVisible = undefined
+  changed()
+}
+export function useSwitchPresentation(
+  target: RuntimeClientTarget,
+  id: string,
+  visible: boolean,
+  transcript: 'pending' | 'readable' | 'empty' | 'failed' = 'readable'
+) {
+  useSyncExternalStore(
+    subscribe,
+    () => revision,
+    () => revision
+  )
+  const visit = visits.get(keyFor(target, id))
+  useLayoutEffect(() => {
+    if (!visit) {
+      return
+    }
+    visit.mounted = true
+    visit.visible = visible
+
+    if (!visible) {
+      visit.release()
+    }
+    return () => {
+      visit.visible = false
+      visit.release()
+    }
+  }, [visit, visible])
+  useLayoutEffect(() => {
+    if (!visit || !visible) {
+      return
+    }
+    visit.readable = transcript === 'readable'
+    if (transcript === 'empty') {
+      visit.show(true)
+    } else if (transcript === 'readable') {
+      visit.captureVisible?.()
+    } else if (transcript === 'failed') {
+      visit.show(false)
+    }
+  }, [visit, visible, transcript])
+  return visit
+}
+export function useSwitchPresentationRows(root: RefObject<HTMLDivElement | null>): void {
+  const visit = useContext(SwitchPresentationContext)
+  useLayoutEffect(() => {
+    if (!visit || visit.settled) {
+      return
+    }
+    const rowVisible = (row: HTMLElement): boolean => {
+      const element = root.current
+      if (!element || !element.isConnected) {
+        return false
+      }
+      const bounds = element.getBoundingClientRect()
+      const rect = row.getBoundingClientRect()
+      return (
+        bounds.width > 0 &&
+        bounds.height > 0 &&
+        rect.height > 0 &&
+        rect.width > 0 &&
+        rect.right > Math.max(0, bounds.left) &&
+        rect.left < Math.min(window.innerWidth, bounds.right) &&
+        rect.bottom > Math.max(0, bounds.top) &&
+        rect.top < Math.min(window.innerHeight, bounds.bottom)
+      )
+    }
+    const itemVisible = (id: string): boolean => {
+      for (const row of root.current?.querySelectorAll<HTMLElement>('[data-switch-item-id]') ??
+        []) {
+        if (row.dataset.switchItemId === id) {
+          return rowVisible(row)
+        }
+      }
+      return false
+    }
+    visit.itemVisible = itemVisible
+    const observe = () => {
+      if (!visit.visible || visit.settled) {
+        return
+      }
+      let shown = false
+      for (const row of root.current?.querySelectorAll<HTMLElement>('[data-switch-item-id]') ??
+        []) {
+        const id = row.dataset.switchItemId
+        if (id && rowVisible(row)) {
+          visit.presentedItems.add(id)
+          shown = true
+        }
+      }
+      if (shown && visit.readable) {
+        visit.show(true)
+      }
+    }
+    visit.captureVisible = observe
+    observe()
+    const element = root.current
+    element?.addEventListener('scroll', observe, { passive: true })
+    const stop = () => {
+      element?.removeEventListener('scroll', observe)
+      if (visit.itemVisible === itemVisible) {
+        visit.itemVisible = undefined
+      }
+      if (visit.captureVisible === observe) {
+        visit.captureVisible = undefined
+      }
+      if (visit.stopObserving === stop) {
+        visit.stopObserving = undefined
+      }
+    }
+    visit.stopObserving = stop
+    return () => {
+      observe()
+      stop()
+    }
+  })
+}
+export function useSwitchFailureSuppressed(itemId: string | undefined): boolean {
+  const visit = useContext(SwitchPresentationContext)
+  useSyncExternalStore(
+    subscribe,
+    () => revision,
+    () => revision
+  )
+  return Boolean(itemId && visit?.failureItemId === itemId && visit.reporter === 'clicked')
+}
diff --git a/src/renderer/src/lib/conversation-switch-projection.ts b/src/renderer/src/lib/conversation-switch-projection.ts
new file mode 100644
index 000000000000..1c1ff0c0131d
--- /dev/null
+++ b/src/renderer/src/lib/conversation-switch-projection.ts
@@ -0,0 +1,280 @@
+import type { AppState } from '@/store'
+import type { Tab } from '../../../shared/tab-types'
+import type { SessionSwitchProjection } from '../../../shared/agent-session-switch-execution'
+import type { RuntimeMobileSessionTabsResult } from '../../../shared/runtime-types'
+import { createKeptWorktreeSurfacePruners } from '@/store/slices/tabs/kept-worktree-surface-pruning'
+
+type Guard = {
+  proposal: SessionSwitchProjection
+  workspaceId: string
+  tab?: Tab
+  placement: string
+  used: boolean
+  notified: boolean
+  retain: (converged?: boolean) => void
+}
+const guards = new Map<string, Guard>()
+function placement(state: Pick<AppState, 'groupsByWorktree'>, workspaceId: string, tab?: Tab) {
+  const group = state.groupsByWorktree[workspaceId]?.find((row) => row.id === tab?.groupId)
+  return JSON.stringify([
+    tab?.id,
+    tab?.entityId,
+    tab?.groupId,
+    group?.tabOrder.indexOf(tab?.id ?? '')
+  ])
+}
+
+/** Only active handoffs own guards; ordinary tab use never waits for a host receipt. */
+export function captureSwitchProjection(
+  state: AppState,
+  workspaceId: string,
+  proposal: SessionSwitchProjection,
+  retain: (converged?: boolean) => void
+): void {
+  const provisional = [...guards.entries()].find(
+    ([, guard]) => guard.proposal.invocationId === proposal.invocationId
+  )
+  const previous = guards.get(proposal.generation) ?? provisional?.[1]
+  if (previous && provisional && provisional[0] !== proposal.generation) {
+    guards.delete(provisional[0])
+    guards.set(proposal.generation, previous)
+    previous.proposal = proposal
+  }
+  if (previous?.proposal.invocationId === proposal.invocationId) {
+    previous.retain = retain
+    if (previous.used) {
+      previous.notified = true
+      queueMicrotask(retain)
+    }
+    return
+  }
+  for (const [generation, guard] of guards) {
+    if (guard.workspaceId !== workspaceId || guard.proposal.sessionId !== proposal.sessionId) {
+      continue
+    }
+    guard.retain()
+    guards.delete(generation)
+  }
+  const tab = state.unifiedTabsByWorktree[workspaceId]?.find(
+    (row) =>
+      row.id === proposal.tabId ||
+      (row.contentType === 'agent-session' && row.entityId === proposal.sessionId)
+  )
+  guards.set(proposal.generation, {
+    proposal,
+    workspaceId,
+    tab,
+    placement: placement(state, workspaceId, tab),
+    used: false,
+    notified: false,
+    retain
+  })
+}
+export function noteSwitchPresentationUse(tabOrSessionId: string): void {
+  for (const guard of guards.values()) {
+    if (guard.tab?.id === tabOrSessionId || guard.proposal.sessionId === tabOrSessionId) {
+      guard.used = true
+      if (!guard.notified) {
+        guard.notified = true
+        queueMicrotask(guard.retain)
+      }
+    }
+  }
+}
+export function observeSwitchProjections(
+  state: AppState,
+  snapshot: RuntimeMobileSessionTabsResult,
+  retain: (proposal: SessionSwitchProjection, converged?: boolean) => void
+): void {
+  for (const proposal of snapshot.switchProjections ?? []) {
+    if (proposal.phase === 'prepare') {
+      captureSwitchProjection(state, snapshot.worktree, proposal, (converged) =>
+        retain(proposal, converged)
+      )
+    }
+    const guard = guards.get(proposal.generation)
+    if (guard) {
+      guard.proposal = proposal
+    }
+  }
+}
+
+/** A switch projection changes presentation only, never drafts, readers or provider ownership. */
+export function retireSwitchProjection(
+  state: AppState,
+  proposal: SessionSwitchProjection
+): Partial<AppState> | null {
+  const guard = guards.get(proposal.generation)
+  if (!guard || !guard.tab || guard.used) {
+    return null
+  }
+  const tab = state.unifiedTabsByWorktree[guard.workspaceId]?.find(
+    (row) => row.id === guard.tab!.id
+  )
+  if (!tab || placement(state, guard.workspaceId, tab) !== guard.placement) {
+    noteSwitchPresentationUse(proposal.sessionId)
+    return null
+  }
+  const prune = createKeptWorktreeSurfacePruners(state, {
+    worktreeIds: new Set([guard.workspaceId]),
+    unifiedTabIds: new Set([tab.id]),
+    terminalTabIds: new Set(),
+    fileIds: new Set(),
+    browserTabIds: new Set()
+  })
+  return {
+    unifiedTabsByWorktree: prune.unifiedTabs(state.unifiedTabsByWorktree),
+    groupsByWorktree: prune.groups(state.groupsByWorktree),
+    tabBarOrderByWorktree: prune.tabBarOrder(state.tabBarOrderByWorktree),
+    activeTabIdByWorktree: prune.activeTabIds(state.activeTabIdByWorktree)
+  }
+}
+
+/** Recheck inside the actual producer, including prepared patches and later omission frames. */
+export function protectSwitchProjections<
+  State extends Pick<AppState, 'unifiedTabsByWorktree' | 'groupsByWorktree'> &
+    Partial<Pick<AppState, 'activeTabIdByWorktree' | 'activeGroupIdByWorktree'>>
+>(state: State, patch: Partial<State>): Partial<State> {
+  const workspaces = new Map<
+    string,
+    {
+      current: Map<string, Tab>
+      present: Set<string>
+      placements: Map<string, string>
+      restored: Tab[]
+    }
+  >()
+  for (const guard of guards.values()) {
+    const rows = patch.unifiedTabsByWorktree?.[guard.workspaceId]
+    if (!rows || !guard.tab) {
+      continue
+    }
+    let indexed = workspaces.get(guard.workspaceId)
+    if (!indexed) {
+      const currentRows = state.unifiedTabsByWorktree[guard.workspaceId] ?? []
+      const positions = new Map<string, number>()
+      const groupIds = new Set(
+        (state.groupsByWorktree[guard.workspaceId] ?? []).map((group) => group.id)
+      )
+      for (const group of state.groupsByWorktree[guard.workspaceId] ?? []) {
+        group.tabOrder.forEach((id, index) => positions.set(id, index))
+      }
+      indexed = {
+        current: new Map(currentRows.map((tab) => [tab.id, tab])),
+        present: new Set(rows.map((tab) => tab.id)),
+        placements: new Map(
+          currentRows.map((tab) => [
+            tab.id,
+            JSON.stringify([
+              tab.id,
+              tab.entityId,
+              tab.groupId,
+              positions.get(tab.id) ?? (groupIds.has(tab.groupId ?? '') ? -1 : undefined)
+            ])
+          ])
+        ),
+        restored: []
+      }
+      workspaces.set(guard.workspaceId, indexed)
+    }
+    const current = indexed.current.get(guard.tab.id)
+    if (current && indexed.placements.get(current.id) !== guard.placement) {
+      guard.used = true
+    }
+    const present = indexed.present.has(guard.tab.id)
+    if (
+      (guard.proposal.phase === 'retain' && present) ||
+      (guard.proposal.phase === 'retire' && !guard.used && !present)
+    ) {
+      guards.delete(guard.proposal.generation)
+      queueMicrotask(() => guard.retain(true))
+      continue
+    }
+    if (!guard.used || present) {
+      continue
+    }
+    if (!guard.notified) {
+      guard.notified = true
+      queueMicrotask(guard.retain)
+    }
+    const kept = current ?? guard.tab
+    indexed.restored.push(kept)
+    indexed.present.add(kept.id)
+  }
+  let next = patch
+  for (const [workspaceId, indexed] of workspaces) {
+    if (!indexed.restored.length) {
+      continue
+    }
+    const currentGroups = new Map(
+      (state.groupsByWorktree[workspaceId] ?? []).map((group) => [group.id, group])
+    )
+    const additions = new Map<string, string[]>()
+    for (const tab of indexed.restored) {
+      if (!tab.groupId) {
+        continue
+      }
+      const ids = additions.get(tab.groupId) ?? []
+      ids.push(tab.id)
+      additions.set(tab.groupId, ids)
+    }
+    const groups = (
+      patch.groupsByWorktree?.[workspaceId] ??
+      state.groupsByWorktree[workspaceId] ??
+      []
+    ).map((group) => {
+      const ids = additions.get(group.id)
+      additions.delete(group.id)
+      if (!ids) {
+        return group
+      }
+      const present = new Set(group.tabOrder)
+      return { ...group, tabOrder: [...group.tabOrder, ...ids.filter((id) => !present.has(id))] }
+    })
+    for (const id of additions.keys()) {
+      const group = currentGroups.get(id)
+      if (group) {
+        groups.push(group)
+      }
+    }
+    next = {
+      ...next,
+      unifiedTabsByWorktree: {
+        ...(next.unifiedTabsByWorktree ?? state.unifiedTabsByWorktree),
+        [workspaceId]: [...(patch.unifiedTabsByWorktree?.[workspaceId] ?? []), ...indexed.restored]
+      },
+      groupsByWorktree: {
+        ...(next.groupsByWorktree ?? state.groupsByWorktree),
+        [workspaceId]: groups
+      },
+      ...(indexed.restored.some((tab) => state.activeTabIdByWorktree?.[workspaceId] === tab.id)
+        ? {
+            activeTabIdByWorktree: {
+              ...next.activeTabIdByWorktree,
+              ...state.activeTabIdByWorktree
+            },
+            activeGroupIdByWorktree: {
+              ...next.activeGroupIdByWorktree,
+              ...state.activeGroupIdByWorktree
+            }
+          }
+        : {})
+    }
+  }
+  return next
+}
+
+/** Teardown retains unresolved sources before releasing this view's transient protection. */
+export function disposeSwitchProjections(): void {
+  for (const guard of guards.values()) {
+    guard.retain()
+  }
+  guards.clear()
+}
+
+export function releaseUnsentSwitchProjection(invocationId: string): void {
+  const guard = guards.get(invocationId)
+  if (guard?.proposal.invocationId === invocationId) {
+    guards.delete(invocationId)
+  }
+}
diff --git a/src/renderer/src/lib/conversation-switch-state.ts b/src/renderer/src/lib/conversation-switch-state.ts
new file mode 100644
index 000000000000..53c070b16b25
--- /dev/null
+++ b/src/renderer/src/lib/conversation-switch-state.ts
@@ -0,0 +1,120 @@
+import { useMemo, useSyncExternalStore } from 'react'
+import { useAppStore } from '@/store'
+import { conversationSwitchFailureText } from './conversation-switch-feedback'
+import { findStructuredAgentSessionReadOwner } from '@/components/native-chat/structured-agent-session-read-owner-registry'
+import { runningStructuredAgentSessionTurnId } from '../../../shared/structured-agent-session-live-turn'
+import { inPlaceSwitchCapabilityNow, useInPlaceSwitchRevision } from './in-place-switch-support'
+import { structuredAgentSessionTargetForHost } from '@/runtime/structured-agent-session-owner'
+import { refreshLocalStructuredSessionWorktreeTabs } from '@/runtime/local-structured-session-tabs-sync/inventory-refresh'
+import {
+  pendingNativeChatCliSwitches as pending,
+  pendingCliChatResumes,
+  subscribeConversationSwitch as subscribe
+} from './pending-conversation-surface-switches'
+import type { AiVaultSession, AiVaultAgent } from '../../../shared/ai-vault-types'
+import type { CliChatResumeSource } from '@/components/tab-bar/cli-chat-resume-source'
+
+export type ConversationSwitch = {
+  direction: 'chat' | 'terminal'
+  executionHostId: string
+  workspaceId: string
+  agent: AiVaultAgent
+  sessionId?: string
+  chatTabId?: string | null
+  source?: CliChatResumeSource
+  history?: AiVaultSession
+  platform?: string
+  feedback?: (message: string, kind: 'error' | 'info') => void
+}
+
+export const keyFor = (args: ConversationSwitch) =>
+  `${args.executionHostId}\0${args.sessionId ?? args.source?.providerSessionId ?? args.history?.sessionId}`
+
+export function pendingNow(args: ConversationSwitch) {
+  return (
+    pending.has(keyFor(args)) ||
+    Boolean(args.sessionId && pending.has(`${args.executionHostId}\0${args.sessionId}`)) ||
+    [...pendingCliChatResumes.values()].some(
+      ({ source }) =>
+        source.executionHostId === args.executionHostId &&
+        source.providerSessionId === args.source?.providerSessionId
+    )
+  )
+}
+
+export function useConversationSwitchPending(args: ConversationSwitch | null): boolean {
+  return useSyncExternalStore(
+    subscribe,
+    () => Boolean(args && pendingNow(args)),
+    () => false
+  )
+}
+
+export function useConversationSwitchReadiness(args: ConversationSwitch | null) {
+  useInPlaceSwitchRevision()
+  const target = useMemo(
+    () => structuredAgentSessionTargetForHost(args?.executionHostId),
+    [args?.executionHostId]
+  )
+  const reader =
+    args?.sessionId && target
+      ? findStructuredAgentSessionReadOwner(args.sessionId, target)
+      : undefined
+  const held = useSyncExternalStore(
+    reader?.subscribe ?? subscribe,
+    () => reader?.getSnapshot(),
+    () => undefined
+  )
+  const runningTurn = useMemo(
+    () =>
+      Boolean(
+        held?.current &&
+        held.state.working !== false &&
+        runningStructuredAgentSessionTurnId(held.state)
+      ),
+    [held]
+  )
+  const terminalRunning = useAppStore((state) => {
+    const key = args?.source?.paneKey
+    if (!key) {
+      return false
+    }
+    const foreground = state.paneForegroundAgentByPaneKey[key]
+    return Boolean(foreground?.suspendedAgent || (foreground?.agent && !foreground.shellForeground))
+  })
+  const pending = useConversationSwitchPending(args)
+  const capability = args ? inPlaceSwitchCapabilityNow(args.executionHostId, args.agent) : undefined
+  const reason = terminalRunning
+    ? 'conversationOpenInTerminal'
+    : runningTurn
+      ? 'turnActive'
+      : undefined
+  return {
+    ready: Boolean(args && target && capability !== undefined && !pending && !reason),
+    pending,
+    explanation: args && reason ? conversationSwitchFailureText(null, args, reason) : undefined
+  }
+}
+
+export function rederiveConversationSwitch(args: ConversationSwitch): void {
+  const target = structuredAgentSessionTargetForHost(args.executionHostId)
+  if (!target) {
+    return
+  }
+  if (args.sessionId) {
+    findStructuredAgentSessionReadOwner(args.sessionId, target)?.resync?.()
+  }
+  const refresh =
+    target.kind === 'local'
+      ? refreshLocalStructuredSessionWorktreeTabs(args.workspaceId, {
+          reacceptCurrentVersion: true
+        })
+      : import('@/runtime/web-runtime-session-snapshot').then(
+          ({ refreshWebRuntimeSessionTabsSnapshot }) =>
+            refreshWebRuntimeSessionTabsSnapshot(target.environmentId, args.workspaceId, {
+              acceptCurrentSnapshot: true,
+              afterCurrentInFlight: true
+            })
+        )
+  void refresh.catch(() => {})
+}
diff --git a/src/renderer/src/lib/in-place-switch-support.ts b/src/renderer/src/lib/in-place-switch-support.ts
index ffea80b7b74b..1a339a2e5975 100644
--- a/src/renderer/src/lib/in-place-switch-support.ts
+++ b/src/renderer/src/lib/in-place-switch-support.ts
@@ -16,6 +16,7 @@ import {
 } from '@/runtime/runtime-environment-revision'
 import {
   inPlaceSwitchCapability,
+  inPlaceSwitchExecutionCapability,
   inPlaceSwitchEnabled
 } from '../../../shared/structured-agent-cli-conversation-adoption'
 import type { AiVaultAgent } from '../../../shared/ai-vault-types'
@@ -66,7 +67,8 @@ export function useInPlaceSwitchRevision(): number {
 /** The addressed runtime owner's learned answer; reading never starts a probe. */
 export function inPlaceSwitchCapabilityNow(
   executionHostId: string | null | undefined,
-  agent: string
+  agent: string,
+  execution = false
 ): boolean | undefined {
   if (!inPlaceSwitchEnabled(agent)) {
     return false
@@ -76,7 +78,9 @@ export function inPlaceSwitchCapabilityNow(
     return undefined
   }
   if (target.kind === 'local') {
-    return readLocalRuntimeCapabilitiesOrUnknown()?.includes(inPlaceSwitchCapability(agent))
+    return readLocalRuntimeCapabilitiesOrUnknown()?.includes(
+      execution ? inPlaceSwitchExecutionCapability(agent) : inPlaceSwitchCapability(agent)
+    )
   }
   const state = useAppStore.getState()
   if (!state.runtimeEnvironments.some((environment) => environment.id === target.environmentId)) {
@@ -84,7 +88,11 @@ export function inPlaceSwitchCapabilityNow(
   }
   const entry = state.runtimeStatusByEnvironmentId.get(target.environmentId)
   const status = isRuntimeHostContactRevoked(entry) ? null : lastVerifiedRuntimeStatus(entry)
-  return status ? (status.capabilities ?? []).includes(inPlaceSwitchCapability(agent)) : undefined
+  return status
+    ? (status.capabilities ?? []).includes(
+        execution ? inPlaceSwitchExecutionCapability(agent) : inPlaceSwitchCapability(agent)
+      )
+    : undefined
 }
 
 export function inPlaceSwitchSupportedNow(host: string | null | undefined, agent: string): boolean {
diff --git a/src/renderer/src/lib/open-tab-occupant-agent.ts b/src/renderer/src/lib/open-tab-occupant-agent.ts
index 6a43c220df86..c8dd569f44c7 100644
--- a/src/renderer/src/lib/open-tab-occupant-agent.ts
+++ b/src/renderer/src/lib/open-tab-occupant-agent.ts
@@ -52,7 +52,7 @@ export function resolveOpenTabOccupantAgent({
     resolveSiblingRetainedTabAgent(retainedAgentsByPaneKey, layout, tabId)
   const focusedPaneKey = focusedPaneKeyFor(tabId, layout)
   const process = focusedPaneKey ? paneForegroundAgentByPaneKey?.[focusedPaneKey] : undefined
-  const processAgent = process?.agent ?? null
+  const processAgent = process?.agent ?? process?.suspendedAgent ?? null
   const sleepingSessionAgent = focusedPaneKey
     ? (sleepingAgentSessionsByPaneKey[focusedPaneKey]?.agent ?? null)
     : null
@@ -75,7 +75,7 @@ export function resolveOpenTabOccupantAgent({
     focusedCompletedHookAgent,
     siblingCompletedHookAgent,
     processAgent,
-    processShellForeground: Boolean(process?.shellForeground),
+    processShellForeground: Boolean(process?.shellForeground && !process?.suspendedAgent),
     sleepingSessionAgent,
     launchAgent
   })
diff --git a/src/renderer/src/lib/pending-conversation-surface-switches.ts b/src/renderer/src/lib/pending-conversation-surface-switches.ts
index 810867f167c9..593a78be2a81 100644
--- a/src/renderer/src/lib/pending-conversation-surface-switches.ts
+++ b/src/renderer/src/lib/pending-conversation-surface-switches.ts
@@ -43,3 +43,12 @@ export function protectedConversationPaneKeys(
   }
   return protectedKeys
 }
+
+const listeners = new Set<() => void>()
+export const conversationSwitchChanged = () => listeners.forEach((listener) => listener())
+export const subscribeConversationSwitch = (listener: () => void) => {
+  listeners.add(listener)
+  return () => {
+    listeners.delete(listener)
+  }
+}
diff --git a/src/renderer/src/lib/structured-agent-session-launch-failure.ts b/src/renderer/src/lib/structured-agent-session-launch-failure.ts
index f67ae163824d..513f7f129595 100644
--- a/src/renderer/src/lib/structured-agent-session-launch-failure.ts
+++ b/src/renderer/src/lib/structured-agent-session-launch-failure.ts
@@ -18,6 +18,7 @@ export type StructuredLaunchFailure = AgentSessionWriteRefusal & {
    *  workspace can't run the chat. */
   causeText?: string
   owner?: AgentSessionConversationOwner
+  source?: true
 }
 
 /** Why a host said it can't run a chat in this workspace, and what to do instead. */
@@ -57,7 +58,12 @@ export function structuredLaunchFailure(error: unknown): StructuredLaunchFailure
       : undefined
   const failure = {
     ...agentSessionRefusalFailure(refusal),
-    ...(owner ? { owner } : {})
+    ...(owner ? { owner } : {}),
+    ...((refusal.code === 'agent_session_conflict' ||
+      refusal.code === 'agent_session_ownership_unknown') &&
+    refusal.details?.source
+      ? { source: true as const }
+      : {})
   }
   const message = error instanceof Error ? error.message : undefined
   return failure.code === 'agent_session_operation_invalid' &&
diff --git a/src/renderer/src/lib/use-tab-agent.ts b/src/renderer/src/lib/use-tab-agent.ts
index 9d29a0052342..d6e0d9c81bba 100644
--- a/src/renderer/src/lib/use-tab-agent.ts
+++ b/src/renderer/src/lib/use-tab-agent.ts
@@ -195,11 +195,18 @@ export function useTabAgent(tab: TerminalTab): TerminalAgent | null {
     return activeLeafId && isTerminalLeafId(activeLeafId) ? makePaneKey(tab.id, activeLeafId) : null
   })
   const processAgent = useAppStore((s) =>
-    focusedPaneKey ? (s.paneForegroundAgentByPaneKey[focusedPaneKey]?.agent ?? null) : null
+    focusedPaneKey
+      ? (s.paneForegroundAgentByPaneKey[focusedPaneKey]?.agent ??
+        s.paneForegroundAgentByPaneKey[focusedPaneKey]?.suspendedAgent ??
+        null)
+      : null
   )
   const processShellForeground = useAppStore((s) =>
     focusedPaneKey
-      ? Boolean(s.paneForegroundAgentByPaneKey[focusedPaneKey]?.shellForeground)
+      ? Boolean(
+          s.paneForegroundAgentByPaneKey[focusedPaneKey]?.shellForeground &&
+          !s.paneForegroundAgentByPaneKey[focusedPaneKey]?.suspendedAgent
+        )
       : false
   )
   // Why: a hibernated pane's session record is the freshest identity once PTY, hook, and process signals are all gone.
diff --git a/src/renderer/src/runtime/abortable-runtime-environment-call.ts b/src/renderer/src/runtime/abortable-runtime-environment-call.ts
index 31e463b97121..104efa00f6ae 100644
--- a/src/renderer/src/runtime/abortable-runtime-environment-call.ts
+++ b/src/renderer/src/runtime/abortable-runtime-environment-call.ts
@@ -1,5 +1,8 @@
 import { createBrowserUuid } from '@/lib/browser-uuid'
-import type { RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope'
+import type {
+  RuntimeRpcDispatchObservation,
+  RuntimeRpcResponse
+} from '../../../shared/runtime-rpc-envelope'
 
 export function createRuntimeRpcAbortError(): Error {
   const error = new Error('Runtime request aborted')
@@ -14,7 +17,9 @@ export async function callAbortableRuntimeEnvironment(
   timeoutMs: number | undefined,
   signal: AbortSignal,
   expectedEnvironmentPairingRevision?: number,
-  expectedEnvironmentRuntimeId?: string
+  expectedEnvironmentRuntimeId?: string,
+  beforeSend?: (sentAt?: number) => void,
+  dispatchObservation?: RuntimeRpcDispatchObservation
 ): Promise<RuntimeRpcResponse<unknown>> {
   if (signal.aborted) {
     throw createRuntimeRpcAbortError()
@@ -24,13 +29,26 @@ export async function callAbortableRuntimeEnvironment(
     const subscriptionId = createBrowserUuid()
     let handle: { unsubscribe: () => void } | null = null
     let settled = false
+    let sent = false
     // Subscription timeout bounds start only; retain the response deadline or connected unresponsive hosts stall forever.
-    const deadline =
+    let deadline =
       timeoutMs === undefined
         ? null
-        : setTimeout(() => {
-            finish(() => reject(new Error(`Runtime request timed out before ${method} completed`)))
-          }, timeoutMs)
+        : setTimeout(
+            () => {
+              finish(() =>
+                reject(new Error(`Runtime request timed out before ${method} completed`))
+              )
+            },
+            dispatchObservation
+              ? Math.max(
+                  0,
+                  (dispatchObservation.responseExpiresAt ??
+                    dispatchObservation.expiresAt + dispatchObservation.responseTimeoutMs) -
+                    Date.now()
+                )
+              : timeoutMs
+          )
     const finish = (complete: () => void): void => {
       if (settled) {
         return
@@ -59,9 +77,38 @@ export async function callAbortableRuntimeEnvironment(
           params,
           timeoutMs,
           expectedEnvironmentPairingRevision,
-          expectedEnvironmentRuntimeId
+          expectedEnvironmentRuntimeId,
+          observeDispatch: Boolean(beforeSend),
+          dispatchObservation
         },
         {
+          onSent: (sentAt) => {
+            if (sent || settled) {
+              return
+            }
+            sent = true
+            try {
+              beforeSend?.(sentAt)
+            } catch (error) {
+              finish(() => reject(error))
+              return
+            }
+            if (deadline !== null) {
+              clearTimeout(deadline)
+            }
+            if (timeoutMs !== undefined) {
+              deadline = setTimeout(
+                () => finish(() => reject(new Error('Request timed out'))),
+                dispatchObservation
+                  ? Math.max(
+                      0,
+                      (dispatchObservation.responseExpiresAt ??
+                        (sentAt ?? Date.now()) + dispatchObservation.responseTimeoutMs) - Date.now()
+                    )
+                  : timeoutMs
+              )
+            }
+          },
           onResponse: (response) => finish(() => resolve(response)),
           onError: (error) => finish(() => reject(new Error(error.message))),
           onClose: () =>
diff --git a/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts b/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts
index c1922d4d9261..c4bd9428b7c1 100644
--- a/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts
+++ b/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts
@@ -81,7 +81,8 @@ export function applyStructuredSessionTabSnapshots(
         framesDraw: ORCA_LAYOUT_OWNER_IS_MAIN ? framesDrawWorkspace(state) : undefined,
         onDrawnChatLabel: (change) => drawnChatLabels.push(change)
       }),
-    { frames: [] }
+    { frames: [] },
+    snapshots
   )
   settleStructuredSessionMirror()
   const { setTabLabel } = useAppStore.getState()
diff --git a/src/renderer/src/runtime/runtime-environment-compatibility-cache.ts b/src/renderer/src/runtime/runtime-environment-compatibility-cache.ts
new file mode 100644
index 000000000000..384138cf00cf
--- /dev/null
+++ b/src/renderer/src/runtime/runtime-environment-compatibility-cache.ts
@@ -0,0 +1,51 @@
+import type { RuntimeStatus } from '../../../shared/runtime-types'
+
+export const RUNTIME_COMPATIBILITY_CACHE_MAX = 32
+
+export const RECENT_RUNTIME_COMPATIBILITY_FAILURE_TTL_MS = 60_000
+
+// Why: capability verdicts must eventually follow a saved environment's version changes.
+export const RUNTIME_CAPABILITY_STATUS_TTL_MS = 60_000
+
+export type RuntimeCompatibilityCacheEntry = {
+  check: Promise<void>
+  failedAt: number | null
+  // False while probing so recovery can drop a doomed pending compatibility check.
+  provenCompatible: boolean
+  status: RuntimeStatus | null
+  statusCheckedAt: number | null
+}
+
+export const runtimeCompatibilityChecks = new Map<string, RuntimeCompatibilityCacheEntry>()
+
+/** A pending probe by default; an observed status is proof of itself. */
+export function compatibilityEntry(
+  status: RuntimeStatus | null = null,
+  provenCompatible = status !== null
+): RuntimeCompatibilityCacheEntry {
+  const statusCheckedAt = status ? Date.now() : null
+  return { check: Promise.resolve(), failedAt: null, provenCompatible, status, statusCheckedAt }
+}
+
+export function getCachedRuntimeCompatibilityCheck(
+  environmentId: string,
+  options: { reuseRecentCompatibilityFailure?: boolean }
+): RuntimeCompatibilityCacheEntry | null {
+  const cached = runtimeCompatibilityChecks.get(environmentId)
+  if (!cached) {
+    return null
+  }
+  if (
+    cached.failedAt !== null &&
+    Date.now() - cached.failedAt >= RECENT_RUNTIME_COMPATIBILITY_FAILURE_TTL_MS
+  ) {
+    runtimeCompatibilityChecks.delete(environmentId)
+    return null
+  }
+  if (cached.failedAt !== null && options.reuseRecentCompatibilityFailure !== true) {
+    return null
+  }
+  runtimeCompatibilityChecks.delete(environmentId)
+  runtimeCompatibilityChecks.set(environmentId, cached)
+  return cached
+}
diff --git a/src/renderer/src/runtime/runtime-environment-switch-dispatch-clock.test.ts b/src/renderer/src/runtime/runtime-environment-switch-dispatch-clock.test.ts
new file mode 100644
index 000000000000..7c0f7804c73c
--- /dev/null
+++ b/src/renderer/src/runtime/runtime-environment-switch-dispatch-clock.test.ts
@@ -0,0 +1,155 @@
+import { afterEach, expect, it, vi } from 'vitest'
+import { registerRuntimeEnvironmentSubscriptionHandlers } from '../../../main/ipc/runtime-environments/runtime-environment-subscription-handlers'
+import { subscribeRuntimeEnvironmentFromPreload } from '../../../preload/runtime-environment-subscriptions'
+import { sendSharedControlSubscription } from '../../../shared/remote-runtime/control/remote-runtime-shared-control-send'
+import type { SharedControlLogicalSubscription } from '../../../shared/remote-runtime/control/remote-runtime-shared-control-types'
+import { agentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
+import { callAbortableRuntimeEnvironment } from './abortable-runtime-environment-call'
+import { stubRuntimeEnvironmentBridge } from './runtime-environment-bridge-fixture'
+
+// @vitest-environment happy-dom
+
+type SubscriptionIpc = Parameters<typeof subscribeRuntimeEnvironmentFromPreload>[0]
+type SubscriptionEvent = Parameters<Parameters<SubscriptionIpc['on']>[1]>[1]
+const mocks = vi.hoisted(() => ({ handle: vi.fn(), subscribe: vi.fn() }))
+vi.mock('electron', () => ({ ipcMain: { handle: mocks.handle, on: vi.fn() } }))
+vi.mock('../../../shared/runtime-environment-store', () => ({
+  resolveEnvironment: () => ({ id: 'paired', createdAt: 1, runtimeId: 'host' })
+}))
+vi.mock('../../../main/ipc/runtime-environments/runtime-environment-connectivity-handlers', () => ({
+  isRuntimeEnvironmentManuallyDisconnected: () => false
+}))
+vi.mock('../../../main/ipc/runtime-environments/runtime-environment-transport-generation', () => ({
+  getRuntimeEnvironmentTransportGeneration: () => 1
+}))
+vi.mock('../../../main/ipc/runtime-environments/runtime-environment-transport-routing', () => ({
+  subscribeRuntimeEnvironment: mocks.subscribe
+}))
+afterEach(() => {
+  vi.useRealTimers()
+  vi.unstubAllGlobals()
+  vi.clearAllMocks()
+})
+it.each(['ready after expiry', 'delayed sent receipt'] as const)(
+  'uses actual main/shared-control dispatch authority with %s across preload',
+  async (schedule) => {
+    vi.useFakeTimers()
+    vi.setSystemTime(0)
+    const deadline = agentSessionSwitchDeadline(Date.now, 735_000)
+    const ready = Promise.withResolvers<void>()
+    const queuedEvents: (() => void)[] = []
+    let deliver: Parameters<SubscriptionIpc['on']>[1] | undefined
+    const wire = vi.fn(() => true)
+    const sender = {
+      id: 1,
+      isDestroyed: () => false,
+      once: vi.fn(),
+      removeListener: vi.fn(),
+      send: (_channel: string, payload: SubscriptionEvent) => {
+        queuedEvents.push(() => deliver?.(null, payload))
+      }
+    }
+    registerRuntimeEnvironmentSubscriptionHandlers({
+      getUserDataPath: () => '/unused',
+      remoteRuntimeSubscriptions: new Map(),
+      pendingSubscriptions: new Map(),
+      recordLayoutFrame: () => {}
+    })
+    const handler = (channel: string) =>
+      mocks.handle.mock.calls.find(([name]) => name === channel)?.[1]
+    const ipc: SubscriptionIpc = {
+      invoke: async (channel: string, args: unknown) => {
+        // Cancellation delivery is independently stalled; the main deadline must suffice.
+        if (channel.endsWith(':unsubscribe')) {
+          return new Promise(() => {})
+        }
+        const call = handler(channel)
+        if (!call) {
+          throw new Error('missing handler')
+        }
+        return call({ sender }, args)
+      },
+      send: vi.fn(),
+      on: (_channel: string, listener: typeof deliver) => {
+        deliver = listener
+      },
+      removeListener: vi.fn()
+    }
+    mocks.subscribe.mockImplementation(async (_root, _id, method, params, _timeout, callbacks) => {
+      await ready.promise
+      const logical: SharedControlLogicalSubscription = {
+        requestId: 'request',
+        method,
+        params,
+        retainedParamsBytes: 0,
+        sent: false,
+        closed: false,
+        closeAfterReady: false,
+        remoteSubscriptionId: null,
+        callbacks: {
+          beforeSend: callbacks.beforeSend,
+          onResponse: (response) => callbacks.onEvent({ type: 'response', response }),
+          onError: (error) =>
+            callbacks.onEvent({ type: 'error', code: error.code, message: error.message }),
+          onClose: callbacks.onClose
+        }
+      }
+      sendSharedControlSubscription({
+        subscriptions: new Map([['request', logical]]),
+        subscription: logical,
+        deviceToken: 'fixture-token',
+        send: wire
+      })
+      return { requestId: 'request', close: vi.fn(), sendBinary: () => false }
+    })
+    stubRuntimeEnvironmentBridge({
+      subscribe: (
+        args: Parameters<typeof subscribeRuntimeEnvironmentFromPreload>[1],
+        callbacks: Parameters<typeof subscribeRuntimeEnvironmentFromPreload>[2]
+      ) => subscribeRuntimeEnvironmentFromPreload(ipc, args, callbacks),
+      cancelSubscription: () => new Promise(() => {})
+    })
+    await vi.advanceTimersByTimeAsync(700_000)
+    const sent = vi.fn((at?: number) => deadline.beforeSend(at))
+    const call = callAbortableRuntimeEnvironment(
+      'paired',
+      'agentSession.switchToChat',
+      {},
+      735_000,
+      deadline.signal,
+      undefined,
+      undefined,
+      sent,
+      deadline.delegateSend()
+    )
+    const rejected = expect(call).rejects.toThrow()
+    if (schedule === 'ready after expiry') {
+      await vi.advanceTimersByTimeAsync(36_000)
+      ready.resolve()
+      await Promise.resolve()
+      await Promise.resolve()
+      expect(wire).not.toHaveBeenCalled()
+    } else {
+      await vi.advanceTimersByTimeAsync(20_000)
+      ready.resolve()
+      await Promise.resolve()
+      await Promise.resolve()
+      expect(wire).toHaveBeenCalledOnce()
+      await vi.advanceTimersByTimeAsync(30_000)
+      for (const send of queuedEvents.splice(0)) {
+        send()
+      }
+      expect(sent).toHaveBeenCalledExactlyOnceWith(720_000)
+      expect(deadline.remaining()).toBe(705_000)
+      // A delayed duplicate receipt must not refill observation.
+      deadline.beforeSend(750_000)
+      expect(deadline.remaining()).toBe(705_000)
+      await vi.advanceTimersByTimeAsync(705_000)
+    }
+    for (const send of queuedEvents.splice(0)) {
+      send()
+    }
+    await rejected
+    deadline.dispose()
+  }
+)
diff --git a/src/renderer/src/runtime/runtime-rpc-client.ts b/src/renderer/src/runtime/runtime-rpc-client.ts
index 845479219889..9d077b40bef4 100644
--- a/src/renderer/src/runtime/runtime-rpc-client.ts
+++ b/src/renderer/src/runtime/runtime-rpc-client.ts
@@ -1,3 +1,5 @@
+import type { RuntimeRpcDispatchObservation } from '../../../shared/runtime-rpc-envelope'
+import { acceptAgentLaunchPaneAttempt } from '@/lib/agent-launch-pane-start'
 import { waitForPromiseWithSignal } from '../../../shared/abort-signal-reason'
 import type { RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope'
 import type { RuntimeStatus } from '../../../shared/runtime-types'
@@ -9,31 +11,14 @@ import { callRuntimeEnvironmentWithRevision } from './runtime-rpc-environment-ca
 import { unwrapRuntimeRpcResult } from './runtime-rpc-result'
 import { captureRuntimeEnvironmentRequestRevision } from './runtime-environment-revision'
 import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
-
-const RUNTIME_COMPATIBILITY_CACHE_MAX = 32
-const RECENT_RUNTIME_COMPATIBILITY_FAILURE_TTL_MS = 60_000
-// Why: capability verdicts must eventually follow a saved environment's version changes.
-const RUNTIME_CAPABILITY_STATUS_TTL_MS = 60_000
-
-type RuntimeCompatibilityCacheEntry = {
-  check: Promise<void>
-  failedAt: number | null
-  // False while probing so recovery can drop a doomed pending compatibility check.
-  provenCompatible: boolean
-  status: RuntimeStatus | null
-  statusCheckedAt: number | null
-}
-
-const runtimeCompatibilityChecks = new Map<string, RuntimeCompatibilityCacheEntry>()
-
-/** A pending probe by default; an observed status is proof of itself. */
-function compatibilityEntry(
-  status: RuntimeStatus | null = null,
-  provenCompatible = status !== null
-): RuntimeCompatibilityCacheEntry {
-  const statusCheckedAt = status ? Date.now() : null
-  return { check: Promise.resolve(), failedAt: null, provenCompatible, status, statusCheckedAt }
-}
+import {
+  getCachedRuntimeCompatibilityCheck,
+  RUNTIME_COMPATIBILITY_CACHE_MAX,
+  RUNTIME_CAPABILITY_STATUS_TTL_MS,
+  type RuntimeCompatibilityCacheEntry,
+  runtimeCompatibilityChecks,
+  compatibilityEntry
+} from './runtime-environment-compatibility-cache'
 
 export async function callRuntimeRpc<TResult>(
   target: RuntimeClientTarget,
@@ -47,9 +32,24 @@ export async function callRuntimeRpc<TResult>(
     signal?: AbortSignal
     expectedEnvironmentPairingRevision?: number
     expectedEnvironmentRuntimeId?: string
-    beforeSend?: () => void
+    beforeSend?: (sentAt?: number) => void
+    dispatchObservation?: () => RuntimeRpcDispatchObservation
   } = {}
 ): Promise<TResult> {
+  if (
+    (method === 'agent.launch' || method === 'agent.launchReplay') &&
+    params &&
+    typeof params === 'object' &&
+    'paneKey' in params &&
+    typeof params.paneKey === 'string'
+  ) {
+    acceptAgentLaunchPaneAttempt(
+      params.paneKey,
+      'operationId' in params && typeof params.operationId === 'string'
+        ? params.operationId
+        : undefined
+    )
+  }
   if (options.signal?.aborted) {
     throw createRuntimeRpcAbortError()
   }
@@ -79,15 +79,19 @@ export async function callRuntimeRpc<TResult>(
   const nextParams = options.suppressFeatureInteraction
     ? withBrowserPaneUiRuntimeRpcSource(params)
     : params
-  options.beforeSend?.()
   const response =
     target.kind === 'local'
-      ? await window.api.runtime.call({ method, params: nextParams })
+      ? await (() => {
+          options.beforeSend?.()
+          return window.api.runtime.call({ method, params: nextParams })
+        })()
       : await callRuntimeEnvironmentWithRevision({
           environmentId: target.environmentId,
           method,
           params: nextParams,
           timeoutMs: options.timeoutMs,
+          beforeSend: options.beforeSend,
+          dispatchObservation: options.dispatchObservation,
           signal: options.signal,
           expectedEnvironmentPairingRevision,
           expectedEnvironmentRuntimeId: options.expectedEnvironmentRuntimeId
@@ -139,29 +143,6 @@ export async function ensureRuntimeEnvironmentCompatible(
   }
 }
 
-function getCachedRuntimeCompatibilityCheck(
-  environmentId: string,
-  options: { reuseRecentCompatibilityFailure?: boolean }
-): RuntimeCompatibilityCacheEntry | null {
-  const cached = runtimeCompatibilityChecks.get(environmentId)
-  if (!cached) {
-    return null
-  }
-  if (
-    cached.failedAt !== null &&
-    Date.now() - cached.failedAt >= RECENT_RUNTIME_COMPATIBILITY_FAILURE_TTL_MS
-  ) {
-    runtimeCompatibilityChecks.delete(environmentId)
-    return null
-  }
-  if (cached.failedAt !== null && options.reuseRecentCompatibilityFailure !== true) {
-    return null
-  }
-  runtimeCompatibilityChecks.delete(environmentId)
-  runtimeCompatibilityChecks.set(environmentId, cached)
-  return cached
-}
-
 function rememberRuntimeEnvironmentCompatibility(
   environmentId: string,
   entry: RuntimeCompatibilityCacheEntry
diff --git a/src/renderer/src/runtime/runtime-rpc-environment-call.ts b/src/renderer/src/runtime/runtime-rpc-environment-call.ts
index bde86fe38346..f5cb82d85514 100644
--- a/src/renderer/src/runtime/runtime-rpc-environment-call.ts
+++ b/src/renderer/src/runtime/runtime-rpc-environment-call.ts
@@ -1,3 +1,4 @@
+import type { RuntimeRpcDispatchObservation } from '../../../shared/runtime-rpc-envelope'
 import { callAbortableRuntimeEnvironment } from './abortable-runtime-environment-call'
 import { observePairingRefusal } from './runtime-environment-pairing-refresh'
 
@@ -12,6 +13,8 @@ async function callRuntimeEnvironmentOnce(args: {
   method: string
   params: unknown
   timeoutMs?: number
+  beforeSend?: (sentAt?: number) => void
+  dispatchObservation?: () => RuntimeRpcDispatchObservation
   signal?: AbortSignal
   expectedEnvironmentPairingRevision?: number
   expectedEnvironmentRuntimeId?: string
@@ -24,7 +27,9 @@ async function callRuntimeEnvironmentOnce(args: {
       args.timeoutMs,
       args.signal,
       args.expectedEnvironmentPairingRevision,
-      args.expectedEnvironmentRuntimeId
+      args.expectedEnvironmentRuntimeId,
+      args.beforeSend,
+      args.dispatchObservation?.()
     )
   }
   return window.api.runtimeEnvironments.call({
diff --git a/src/renderer/src/runtime/structured-agent-session-client.test.ts b/src/renderer/src/runtime/structured-agent-session-client.test.ts
index adcde73f93f4..57ecbd371141 100644
--- a/src/renderer/src/runtime/structured-agent-session-client.test.ts
+++ b/src/renderer/src/runtime/structured-agent-session-client.test.ts
@@ -136,6 +136,22 @@ describe('callStructuredAgentSession timeouts', () => {
     mocks.call.mockResolvedValue({ origin: 'unknown' })
   })
 
+  it.each(['agentSession.switchToChat', 'agentSession.switchToTerminal'])(
+    'allows the complete host-owned %s while retaining the legacy transport call',
+    async (method) => {
+      for (const switchTarget of [{ kind: 'local' } as const, target]) {
+        const params = { sessionId: 'session-1', execution: { invocationId: 'switch-1' } }
+        await callStructuredAgentSession(switchTarget, method, params)
+        expect(mocks.call).toHaveBeenLastCalledWith(switchTarget, method, params, {
+          timeoutMs: 735_000
+        })
+        const legacyParams = { sessionId: 'session-1' }
+        await callStructuredAgentSession(switchTarget, method, legacyParams)
+        expect(mocks.call).toHaveBeenLastCalledWith(switchTarget, method, legacyParams)
+      }
+    }
+  )
+
   // A waiting read lasts as long as the host's listing, which outlasts the default 15 s.
   it('gives a model catalog read longer than the slowest host listing', async () => {
     const params = { agent: 'claude', sessionId: 'session-1', waitForListing: true }
diff --git a/src/renderer/src/runtime/structured-agent-session-client.ts b/src/renderer/src/runtime/structured-agent-session-client.ts
index b62c68f46964..e569bd0947e0 100644
--- a/src/renderer/src/runtime/structured-agent-session-client.ts
+++ b/src/renderer/src/runtime/structured-agent-session-client.ts
@@ -1,3 +1,5 @@
+import type { RuntimeRpcDispatchObservation } from '../../../shared/runtime-rpc-envelope'
+import { AGENT_SESSION_SWITCH_CLIENT_MS } from '../../../shared/agent-session-switch-execution'
 import type {
   AgentJournalCursor,
   AgentJournalRenderItem
@@ -25,6 +27,7 @@ import {
 import { AGENT_SESSION_CREATE_MESSAGE_RUNTIME_CAPABILITY } from '../../../shared/agent-session-create-capabilities'
 import {
   inPlaceSwitchCapability,
+  inPlaceSwitchExecutionCapability,
   inPlaceSwitchEnabled
 } from '../../../shared/structured-agent-cli-conversation-adoption'
 import { callRuntimeRpc, runtimeEnvironmentSupportsCapability } from './runtime-rpc-client'
@@ -77,10 +80,14 @@ export function supportsStructuredAgentSessionCliSource(
 /** Whether the destination host switches this agent's conversations in place; unknown is no. */
 export function supportsInPlaceSwitch(
   target: RuntimeClientTarget,
-  agent: string
+  agent: string,
+  execution = false
 ): Promise<boolean> {
   return inPlaceSwitchEnabled(agent)
-    ? structuredAgentSessionHostSupports(target, inPlaceSwitchCapability(agent))
+    ? structuredAgentSessionHostSupports(
+        target,
+        execution ? inPlaceSwitchExecutionCapability(agent) : inPlaceSwitchCapability(agent)
+      )
     : Promise.resolve(false)
 }
 
@@ -158,7 +165,12 @@ export async function callStructuredAgentSession<TResult>(
   method: string,
   params?: unknown,
   /** For a caller that checked the remote host's compatibility itself, just before. */
-  options: { skipCompatibilityCheck?: true; beforeSend?: () => void } = {}
+  options: {
+    skipCompatibilityCheck?: true
+    beforeSend?: (sentAt?: number) => void
+    dispatchObservation?: () => RuntimeRpcDispatchObservation
+    signal?: AbortSignal
+  } = {}
 ): Promise<TResult> {
   if (
     method === 'agentSession.rewind' &&
@@ -170,7 +182,15 @@ export async function callStructuredAgentSession<TResult>(
   ) {
     throw new Error('Rewinding requires a newer Orca server. Update the server and try again.')
   }
-  const timeoutMs = STRUCTURED_AGENT_SESSION_METHOD_TIMEOUT_MS.get(method)
+  const executionSwitch =
+    (method === 'agentSession.switchToChat' || method === 'agentSession.switchToTerminal') &&
+    params !== null &&
+    typeof params === 'object' &&
+    'execution' in params &&
+    Boolean(params.execution)
+  const timeoutMs = executionSwitch
+    ? AGENT_SESSION_SWITCH_CLIENT_MS
+    : STRUCTURED_AGENT_SESSION_METHOD_TIMEOUT_MS.get(method)
   return timeoutMs === undefined && !options.skipCompatibilityCheck && !options.beforeSend
     ? callRuntimeRpc<TResult>(target, method, params)
     : callRuntimeRpc<TResult>(target, method, params, {
diff --git a/src/renderer/src/runtime/sync-runtime-graph/graph-publication.ts b/src/renderer/src/runtime/sync-runtime-graph/graph-publication.ts
index 778b53c01303..bf18e6b77684 100644
--- a/src/renderer/src/runtime/sync-runtime-graph/graph-publication.ts
+++ b/src/renderer/src/runtime/sync-runtime-graph/graph-publication.ts
@@ -80,6 +80,7 @@ export async function syncRuntimeGraph(): Promise<void> {
     tabs: [],
     leaves: [],
     rendererGeneration: mobilePublicationEpoch,
+    conditionalSwitchProjection: 1,
     mobileSessionTabs: publication.changed,
     unchangedMobileSessionWorktrees: publication.unchangedWorktrees,
     ...(gridSizes ? { terminalGroupGridSizes: gridSizes.groups } : {}),
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/store-patch.ts b/src/renderer/src/runtime/web-session-tabs-sync/store-patch.ts
index 4e2fdb91e341..410b3db93402 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/store-patch.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/store-patch.ts
@@ -1,3 +1,10 @@
+import {
+  observeSwitchProjections,
+  protectSwitchProjections
+} from '@/lib/conversation-switch-projection'
+import { callStructuredAgentSession } from '@/runtime/structured-agent-session-client'
+import { structuredAgentSessionTargetForHost } from '@/runtime/structured-agent-session-owner'
+import { getExecutionHostIdForWorktree } from '@/lib/worktree-runtime-owner'
 import {
   markStructuredAgentSessionLaunchesPublished,
   publishedStructuredSessions
@@ -53,7 +60,31 @@ export function applyWebSessionTabsStorePatch(
   const runStorePatch = (
     state: AppState
   ): WebSessionTabsSyncState | Partial<WebSessionTabsSyncState> => {
-    const patch = buildPatch(state)
+    for (const snapshot of agentStatusSnapshots
+      ? Array.isArray(agentStatusSnapshots)
+        ? agentStatusSnapshots
+        : [agentStatusSnapshots]
+      : []) {
+      observeSwitchProjections(state, snapshot, (proposal, converged) => {
+        const target = structuredAgentSessionTargetForHost(
+          getExecutionHostIdForWorktree(state, snapshot.worktree)
+        )
+        if (target) {
+          void callStructuredAgentSession(target, 'agentSession.switchToTerminal', {
+            sessionId: proposal.sessionId,
+            execution: {
+              invocationId: proposal.invocationId,
+              receipt: {
+                generation: proposal.generation,
+                shown: true,
+                ...(converged ? { converged: true } : { retained: true })
+              }
+            }
+          }).catch(() => {})
+        }
+      })
+    }
+    const patch = protectSwitchProjections(state, buildPatch(state))
     mirroredAgentStatusChanged = patch !== state && Object.hasOwn(patch, 'agentStatusByPaneKey')
     if (agentStatusSnapshots) {
       const nextAgentStatuses = patch.agentStatusByPaneKey ?? state.agentStatusByPaneKey
diff --git a/src/renderer/src/runtime/workspace-layout-frame-sync.ts b/src/renderer/src/runtime/workspace-layout-frame-sync.ts
index fdb409b7d03e..e1368fc8ec0b 100644
--- a/src/renderer/src/runtime/workspace-layout-frame-sync.ts
+++ b/src/renderer/src/runtime/workspace-layout-frame-sync.ts
@@ -54,7 +54,7 @@ import {
 
 type FrameSyncStore = {
   getState: () => AppState
-  setState: (patch: Partial<AppState>) => void
+  setState: (patch: Partial<AppState> | ((state: AppState) => Partial<AppState>)) => void
   subscribe: (listener: (state: AppState) => void) => () => void
 }
 
diff --git a/src/renderer/src/store/slices/pane-foreground-agent.ts b/src/renderer/src/store/slices/pane-foreground-agent.ts
index 2a955997fc13..ad7ff7d7c0c7 100644
--- a/src/renderer/src/store/slices/pane-foreground-agent.ts
+++ b/src/renderer/src/store/slices/pane-foreground-agent.ts
@@ -8,6 +8,8 @@ export type PaneForegroundAgentEvidence = 'process-read' | 'launch-record'
 export type PaneForegroundAgentEntry = {
   /** Recognized agent process in the pane's foreground; null when unknown. */
   agent: TerminalAgent | null
+  /** Observed stopped job; independent of foreground byte routing. */
+  suspendedAgent?: TerminalAgent
   /** Where `agent` came from. Only 'process-read' is a live read; absent counts as unconfirmed,
    *  so a writer that omits it cannot make a sidebar row look process-backed. */
   agentEvidence?: PaneForegroundAgentEvidence
@@ -46,6 +48,7 @@ export const createPaneForegroundAgentSlice: StateCreator<
       if (
         current &&
         current.agent === entry.agent &&
+        current.suspendedAgent === entry.suspendedAgent &&
         current.agentEvidence === entry.agentEvidence &&
         current.routingTrusted === entry.routingTrusted &&
         current.routingRevoked === entry.routingRevoked &&
diff --git a/src/renderer/src/store/slices/tabs/moved-tab-selection.ts b/src/renderer/src/store/slices/tabs/moved-tab-selection.ts
index 7fd2a2e1dd03..e49e5a486783 100644
--- a/src/renderer/src/store/slices/tabs/moved-tab-selection.ts
+++ b/src/renderer/src/store/slices/tabs/moved-tab-selection.ts
@@ -1,3 +1,4 @@
+import { protectSwitchProjections } from '@/lib/conversation-switch-projection'
 // Select moved tabs with the frame showing the move (L120); a later reply may already be superseded by another drag.
 
 import type { AppState } from '../../types'
@@ -84,13 +85,20 @@ export function withMovedTabsSelected(
 
 /** Writes a frame's patch, with the selection of each moved tab it shows; returns those moves. */
 export function showFramePatch(
-  store: { getState: () => AppState; setState: (patch: Partial<AppState>) => void },
+  store: {
+    getState: () => AppState
+    setState: (patch: Partial<AppState> | ((state: AppState) => Partial<AppState>)) => void
+  },
   patch: Partial<AppState>
 ): MovedTabSelection[] {
   if (Object.keys(patch).length === 0) {
     return []
   }
-  const shown = withMovedTabSelections(store.getState(), patch)
-  store.setState(shown.patch)
-  return shown.taken
+  let taken: MovedTabSelection[] = []
+  store.setState((current) => {
+    const shown = withMovedTabSelections(current, patch)
+    taken = shown.taken
+    return protectSwitchProjections(current, shown.patch)
+  })
+  return taken
 }
diff --git a/src/renderer/src/store/slices/tabs/tabs-drop-actions.ts b/src/renderer/src/store/slices/tabs/tabs-drop-actions.ts
index c47d530519e4..e5b441128e06 100644
--- a/src/renderer/src/store/slices/tabs/tabs-drop-actions.ts
+++ b/src/renderer/src/store/slices/tabs/tabs-drop-actions.ts
@@ -1,3 +1,4 @@
+import { noteSwitchPresentationUse } from '@/lib/conversation-switch-projection'
 import { createBrowserUuid } from '@/lib/browser-uuid'
 import type { TabGroup } from '../../../../../shared/tab-types'
 import type { TabsSlice, TabsSliceGet, TabsSliceSet } from './tabs-slice-contract'
@@ -24,6 +25,7 @@ export function createTabsDropActions(
 ): Pick<TabsSlice, 'dropUnifiedTab'> {
   return {
     dropUnifiedTab: (tabId, target) => {
+      noteSwitchPresentationUse(tabId)
       let moved = false
       set((state) => {
         const foundTab = findTabAndWorktree(state.unifiedTabsByWorktree, tabId)
diff --git a/src/renderer/src/store/slices/tabs/tabs-focus-actions.ts b/src/renderer/src/store/slices/tabs/tabs-focus-actions.ts
index ee078883aadf..7715da0a461d 100644
--- a/src/renderer/src/store/slices/tabs/tabs-focus-actions.ts
+++ b/src/renderer/src/store/slices/tabs/tabs-focus-actions.ts
@@ -1,3 +1,4 @@
+import { noteSwitchPresentationUse } from '@/lib/conversation-switch-projection'
 import type { TabsSlice, TabsSliceGet, TabsSliceSet } from './tabs-slice-contract'
 import {
   findTabAndWorktree,
@@ -103,6 +104,7 @@ export function createTabsFocusActions(
       ),
 
     activateTab: (tabId, opts) => {
+      noteSwitchPresentationUse(tabId)
       const promoted: Tab[] = []
       set((state) => {
         const scopedWorktreeId = opts?.worktreeId
diff --git a/src/renderer/src/store/slices/tabs/tabs-label-actions.ts b/src/renderer/src/store/slices/tabs/tabs-label-actions.ts
index d91ec04ed778..e9713ebd4d41 100644
--- a/src/renderer/src/store/slices/tabs/tabs-label-actions.ts
+++ b/src/renderer/src/store/slices/tabs/tabs-label-actions.ts
@@ -1,7 +1,8 @@
+import { noteSwitchPresentationUse } from '@/lib/conversation-switch-projection'
 import { emitNativeChatToggled } from '@/lib/native-chat-telemetry'
 import type { TuiAgent } from '../../../../../shared/tui-agent'
 import type { AppState } from '../../types'
-import type { TabsSlice, TabsSliceGet, TabsSliceSet } from './tabs-slice-contract'
+import type { TabsSliceGet, TabsSliceSet } from './tabs-slice-contract'
 import { findTabAndWorktree, patchTab, updateGroup } from '../tab-group-state'
 import {
   applyTabOrderSortValues,
@@ -19,25 +20,13 @@ import { recordTabOrderInLayoutOwner } from './tab-order-layout-owner'
 import { withPreviewEnded } from './tab-preview-flag'
 import { endsPreviewHere, promotePreviewTabsThroughLayoutOwner } from './preview-tab-promotion'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../shared/layout-owner-switch'
+import type { TabsLabelActions } from './tabs-slice-contract'
 
 function oppositeViewMode(mode: 'terminal' | 'chat'): 'terminal' | 'chat' {
   return mode === 'chat' ? 'terminal' : 'chat'
 }
 
-export function createTabsLabelActions(
-  set: TabsSliceSet,
-  get: TabsSliceGet
-): Pick<
-  TabsSlice,
-  | 'reorderUnifiedTabs'
-  | 'setTabLabel'
-  | 'setTabViewMode'
-  | 'toggleTabViewMode'
-  | 'setTabCustomLabel'
-  | 'setUnifiedTabColor'
-  | 'pinTab'
-  | 'unpinTab'
-> {
+export function createTabsLabelActions(set: TabsSliceSet, get: TabsSliceGet): TabsLabelActions {
   function setTabViewModeHere(tabId: string, mode: 'terminal' | 'chat'): void {
     set((state) => {
       const tabPatch = patchTab(state.unifiedTabsByWorktree, tabId, { viewMode: mode })
@@ -160,6 +149,9 @@ export function createTabsLabelActions(
 
   return {
     reorderUnifiedTabs: (groupId, tabIds, opts) => {
+      for (const tabId of tabIds) {
+        noteSwitchPresentationUse(tabId)
+      }
       let reordered = false
       const changes: { worktreeId: string; from: string[]; to: string[] }[] = []
       set((state) => {
diff --git a/src/renderer/src/store/slices/tabs/tabs-move-actions.ts b/src/renderer/src/store/slices/tabs/tabs-move-actions.ts
index 112bc5173462..c745a19c76eb 100644
--- a/src/renderer/src/store/slices/tabs/tabs-move-actions.ts
+++ b/src/renderer/src/store/slices/tabs/tabs-move-actions.ts
@@ -1,3 +1,4 @@
+import { noteSwitchPresentationUse } from '@/lib/conversation-switch-projection'
 import type { TabsSlice, TabsSliceGet, TabsSliceSet } from './tabs-slice-contract'
 import { collapseGroupLayout } from '../../../../../shared/workspace-layout/tab-group-layout-tree'
 import { buildActiveSurfacePatch } from './tabs-surface'
@@ -17,6 +18,7 @@ export function createTabsMoveActions(
 ): Pick<TabsSlice, 'moveUnifiedTabToGroup'> {
   return {
     moveUnifiedTabToGroup: (tabId, targetGroupId, opts) => {
+      noteSwitchPresentationUse(tabId)
       let moved = false
       set((state) => {
         const foundTab = findTabAndWorktree(state.unifiedTabsByWorktree, tabId)
diff --git a/src/renderer/src/store/slices/tabs/tabs-slice-contract.ts b/src/renderer/src/store/slices/tabs/tabs-slice-contract.ts
index 026c994e8dce..9f4b72b9b360 100644
--- a/src/renderer/src/store/slices/tabs/tabs-slice-contract.ts
+++ b/src/renderer/src/store/slices/tabs/tabs-slice-contract.ts
@@ -194,3 +194,15 @@ export type TabsSlice = {
 type TabsStateCreator = StateCreator<AppState, [], [], TabsSlice>
 export type TabsSliceSet = Parameters<TabsStateCreator>[0]
 export type TabsSliceGet = Parameters<TabsStateCreator>[1]
+
+export type TabsLabelActions = Pick<
+  TabsSlice,
+  | 'reorderUnifiedTabs'
+  | 'setTabLabel'
+  | 'setTabViewMode'
+  | 'toggleTabViewMode'
+  | 'setTabCustomLabel'
+  | 'setUnifiedTabColor'
+  | 'pinTab'
+  | 'unpinTab'
+>
diff --git a/src/renderer/src/store/workspace-layout-frame-store-patch.test.ts b/src/renderer/src/store/workspace-layout-frame-store-patch.test.ts
index 30481d9596eb..dc6b2bbb7786 100644
--- a/src/renderer/src/store/workspace-layout-frame-store-patch.test.ts
+++ b/src/renderer/src/store/workspace-layout-frame-store-patch.test.ts
@@ -1,4 +1,9 @@
-import { describe, expect, it, vi } from 'vitest'
+import {
+  captureSwitchProjection,
+  disposeSwitchProjections
+} from '@/lib/conversation-switch-projection'
+import { showFramePatch } from './slices/tabs/moved-tab-selection'
+import { afterEach, describe, expect, it, vi } from 'vitest'
 import type * as AgentStatusModule from '@/lib/agent-status'
 import type { WorkspaceSessionState } from '../../../shared/workspace-session-state-types'
 import { loadWorkspaceLayoutWithoutReport } from '../../../shared/workspace-layout/workspace-layout-load'
@@ -208,3 +213,108 @@ describe('laying frame slices over the store', () => {
     expect(dropped.remoteBrowserPageHandlesByPageId).not.toHaveProperty(page.id)
   })
 })
+
+afterEach(() => disposeSwitchProjections())
+it('the real frame producer preserves a chat activated after an omission patch was prepared, including later frames', async () => {
+  const { state } = await restored()
+  const store = createTestStore()
+  const basis = state.unifiedTabsByWorktree[GIT_KEY]![0]!
+  const source = {
+    ...basis,
+    id: 'source-chat',
+    contentType: 'agent-session' as const,
+    entityId: 'conversation',
+    agent: 'codex' as const
+  }
+  const rows = [...state.unifiedTabsByWorktree[GIT_KEY]!, source]
+  const groups = state.groupsByWorktree[GIT_KEY]!.map((group) =>
+    group.id === source.groupId ? { ...group, tabOrder: [...group.tabOrder, source.id] } : group
+  )
+  store.setState({
+    ...state,
+    unifiedTabsByWorktree: { ...state.unifiedTabsByWorktree, [GIT_KEY]: rows },
+    groupsByWorktree: { ...state.groupsByWorktree, [GIT_KEY]: groups }
+  })
+  const retain = vi.fn()
+  captureSwitchProjection(
+    store.getState(),
+    GIT_KEY,
+    {
+      invocationId: 'A',
+      generation: 'generation-A',
+      sessionId: 'conversation',
+      tabId: source.id,
+      phase: 'retire'
+    },
+    retain
+  )
+  const prepared = {
+    unifiedTabsByWorktree: state.unifiedTabsByWorktree,
+    groupsByWorktree: state.groupsByWorktree
+  }
+  // Actual ordinary activation, even already-active, invalidates the handoff before its frame lands.
+  store.getState().activateTab(source.id)
+  showFramePatch(store, prepared)
+  showFramePatch(store, prepared)
+  expect(store.getState().unifiedTabsByWorktree[GIT_KEY]?.some((row) => row.id === source.id)).toBe(
+    true
+  )
+  expect(
+    store.getState().groupsByWorktree[GIT_KEY]?.find((group) => group.id === source.groupId)
+      ?.tabOrder
+  ).toContain(source.id)
+  await Promise.resolve()
+  expect(retain).toHaveBeenCalledOnce()
+})
+
+it.each([100, 1000])(
+  'indexes a frame once for %i tabs with equally many unresolved guards',
+  async (count) => {
+    const { state } = await restored()
+    const store = createTestStore()
+    const basis = state.unifiedTabsByWorktree[GIT_KEY]![0]!
+    let reads = 0
+    const rows = Array.from({ length: count }, (_, i) => ({
+      ...basis,
+      get id() {
+        reads++
+        return `chat-${i}`
+      },
+      contentType: 'agent-session' as const,
+      entityId: `session-${i}`,
+      agent: 'codex' as const
+    }))
+    const group = {
+      ...state.groupsByWorktree[GIT_KEY]![0]!,
+      id: basis.groupId!,
+      tabOrder: rows.map((row) => row.id)
+    }
+    store.setState({
+      ...state,
+      unifiedTabsByWorktree: { [GIT_KEY]: rows },
+      groupsByWorktree: { [GIT_KEY]: [group] }
+    })
+    for (let i = 0; i < count; i++) {
+      captureSwitchProjection(
+        store.getState(),
+        GIT_KEY,
+        {
+          invocationId: `op-${i}`,
+          generation: `gen-${i}`,
+          sessionId: `session-${i}`,
+          tabId: `chat-${i}`,
+          phase: 'prepare'
+        },
+        () => {}
+      )
+      store.getState().activateTab(`chat-${i}`)
+    }
+    reads = 0
+    showFramePatch(store, {
+      unifiedTabsByWorktree: { [GIT_KEY]: [] },
+      groupsByWorktree: { [GIT_KEY]: [] }
+    })
+    expect(store.getState().unifiedTabsByWorktree[GIT_KEY]).toHaveLength(count)
+    expect(reads).toBeLessThan(30 * count)
+  }
+)
diff --git a/src/shared/agent-launch-pane-verdict.ts b/src/shared/agent-launch-pane-verdict.ts
index b36ece9c65d5..8bb1c47cb4d9 100644
--- a/src/shared/agent-launch-pane-verdict.ts
+++ b/src/shared/agent-launch-pane-verdict.ts
@@ -22,10 +22,17 @@ export type AgentLaunchPaneVerdict =
 export const AGENT_LAUNCH_PANE_REFUSED_CODE = 'agent_launch_pane_refused'
 
 /** The pane a verdict is about, as the window addresses it. */
-export type AgentLaunchPaneAddress = { worktreeId: string; tabId: string; leafId: string }
+export type AgentLaunchPaneAddress = {
+  worktreeId: string
+  tabId: string
+  leafId: string
+  operationId?: string
+}
 
 export type AgentLaunchPaneVerdictEvent = AgentLaunchPaneAddress & {
   verdict: AgentLaunchPaneVerdict
+  accepted?: true
+  withdrawalRoot?: string
 }
 
 /** A launch pane as the window saves it: only a pending one, since its outcome is this session's. */
diff --git a/src/shared/agent-launch-tab-publication.ts b/src/shared/agent-launch-tab-publication.ts
index d62125604354..648b138d17d1 100644
--- a/src/shared/agent-launch-tab-publication.ts
+++ b/src/shared/agent-launch-tab-publication.ts
@@ -21,6 +21,7 @@ export type AgentLaunchTabViewerRule =
 
 export type AgentLaunchTabPublishRequest = {
   requestId: string
+  withdraw?: { root: string }
   worktreeId: string
   tabId: string
   leafId: string
@@ -43,6 +44,8 @@ export type AgentLaunchTabPublishReply =
       /** True for a tab created by this launch (including just before request); false for retries finding it. */
       created: boolean
       placement: AgentLaunchPlacementReceipt
+      withdrawalRoot?: string
+      withdrawn?: boolean
     }
   | { requestId: string; error: string }
 
@@ -51,4 +54,18 @@ export type AgentLaunchTabPublished = {
   tabId: string
   created: boolean
   placement: AgentLaunchPlacementReceipt
+  /** Original provisional root, used only by the creating owner for conditional withdrawal. */
+  withdrawalRoot?: string
+  withdrawn?: boolean
+}
+
+export function launchTabWithdrawalIdentity(
+  root: unknown,
+  tabs: readonly { id: string; entityId?: string; groupId?: string }[],
+  groups: readonly { id: string; tabOrder: string[] }[],
+  tabId: string
+): string {
+  const tab = tabs.find((row) => row.entityId === tabId || row.id === tabId)
+  const group = groups.find((row) => row.id === tab?.groupId)
+  return JSON.stringify([root, tab?.groupId, group?.tabOrder.indexOf(tab?.id ?? '')])
 }
diff --git a/src/shared/agent-session-lease-adjudication.ts b/src/shared/agent-session-lease-adjudication.ts
index a71e9d7a81a9..72ac23b67ff2 100644
--- a/src/shared/agent-session-lease-adjudication.ts
+++ b/src/shared/agent-session-lease-adjudication.ts
@@ -118,6 +118,27 @@ export function agentSessionLeaseOwnerVerdict(lease: AgentSessionLease): AgentSe
     : 'unverifiable'
 }
 
+/** Founding is not an observed death; every reservation/recovery leaves a different tuple. */
+export function agentSessionLeaseNeverAcquired(lease: AgentSessionLease): boolean {
+  return (
+    lease.runtimeKind === 'native' &&
+    lease.runtimeFence === 1 &&
+    lease.minimumNextFence === undefined &&
+    !lease.unreconciled &&
+    lease.claimStatus === 'released' &&
+    lease.ownerProcess === null &&
+    lease.reservedSpawnToken === null &&
+    lease.handoffStage === null &&
+    lease.handoffOperationId === null &&
+    lease.provenHandleLinkId === null &&
+    lease.deathEvidence === null
+  )
+}
+
+export function agentSessionLeasePossiblyWriting(lease: AgentSessionLease): boolean {
+  return !agentSessionLeaseNeverAcquired(lease) && agentSessionLeaseOwnerVerdict(lease) !== 'exited'
+}
+
 /** Nothing holds this lease: released, no handoff in flight, and reconciled since the last restart. */
 export function agentSessionLeaseIsReleased(lease: AgentSessionLease): boolean {
   return !lease.unreconciled && lease.claimStatus === 'released' && lease.handoffStage === null
diff --git a/src/shared/agent-session-native-content.ts b/src/shared/agent-session-native-content.ts
new file mode 100644
index 000000000000..a52a49118a54
--- /dev/null
+++ b/src/shared/agent-session-native-content.ts
@@ -0,0 +1,5 @@
+import type { AgentJournalItemBody } from './agent-session-journal-types'
+
+export function isNativeConversationMessage(body: AgentJournalItemBody): boolean {
+  return body.kind === 'message' && (body.role === 'user' || body.role === 'assistant')
+}
diff --git a/src/shared/agent-session-refusal-details.ts b/src/shared/agent-session-refusal-details.ts
index 6f9b6734161d..ae4164f61111 100644
--- a/src/shared/agent-session-refusal-details.ts
+++ b/src/shared/agent-session-refusal-details.ts
@@ -170,7 +170,7 @@ type NoFacts = Record<never, never>
 
 export type AgentSessionConversationOwner = { sessionId: string; workspaceId: string }
 
-type ConversationOwnerFacts = { owner?: AgentSessionConversationOwner }
+type ConversationOwnerFacts = { owner?: AgentSessionConversationOwner; source?: true }
 
 /** The facts a code carries beside its reason. */
 type AgentSessionRefusalFactsByCode = {
@@ -324,6 +324,11 @@ export function readAgentSessionRefusalDetails<C extends AgentSessionWireRefusal
     ...(isAgentSessionRefusalReason(code, value.reason) ? { reason: value.reason } : {}),
     ...facts,
     ...(owner ? { owner } : {}),
+    ...((code === 'agent_session_conflict' || code === 'agent_session_ownership_unknown') &&
+    value.reason === 'conversationHeldElsewhere' &&
+    value.source === true
+      ? { source: true as const }
+      : {}),
     ...(code === 'agent_session_operation_invalid' &&
     value.reason === 'notSignedIn' &&
     (value.account === 'managed' || value.account === 'system')
diff --git a/src/shared/agent-session-switch-execution.ts b/src/shared/agent-session-switch-execution.ts
new file mode 100644
index 000000000000..a92dac631d54
--- /dev/null
+++ b/src/shared/agent-session-switch-execution.ts
@@ -0,0 +1,126 @@
+import type { AgentSessionWireRefusal } from './agent-session-wire'
+import { agentSessionRefusalError } from './agent-session-wire-refusals'
+import { waitForPromiseWithSignal } from './abort-signal-reason'
+
+export const AGENT_SESSION_SWITCH_HOST_MS = 720_000
+export const AGENT_SESSION_SWITCH_CLIENT_MS = 735_000
+
+export type AgentSessionSwitchResult =
+  | {
+      status: 'completed'
+      sessionId: string
+      terminal?: string
+      sourceRetained?: boolean
+      startupPending?: boolean
+    }
+  | {
+      status: 'present'
+      surface?: 'terminal'
+      leafId?: string
+      sessionId: string
+      generation: string
+      workspaceId: string
+      tabId: string
+      agent: 'codex'
+      placement?: { groupId?: string; afterTabId?: string }
+    }
+  | {
+      status: 'refused' | 'uncertain'
+      refusal: AgentSessionWireRefusal
+      sessionId: string
+      failureItemId?: string
+    }
+
+export type AgentSessionSwitchReceipt = {
+  generation: string
+  shown: boolean
+  retained?: boolean
+  converged?: boolean
+}
+
+/** Expiry revokes new effects; already dispatched owners still reconcile their real outcome. */
+export function agentSessionSwitchDeadline(
+  now = () => performance.now(),
+  budget = AGENT_SESSION_SWITCH_HOST_MS
+) {
+  let expiresAt = now() + budget
+  let dispatched = false
+  let delegated = false
+  const controller = new AbortController()
+  let timer = setTimeout(() => controller.abort(expired()), budget)
+  function expired() {
+    return agentSessionRefusalError('agent_session_operation_expired', {
+      reason: 'operationExpired'
+    })
+  }
+  return {
+    signal: controller.signal,
+    delegateSend: () => {
+      if (controller.signal.aborted) {
+        throw expired()
+      }
+      const dispatchExpiresAt = expiresAt
+      if (!dispatched && !delegated) {
+        if (now() >= expiresAt) {
+          throw expired()
+        }
+        delegated = true
+        clearTimeout(timer)
+        // Main now owns unsent expiry; allow its actual-send receipt to cross IPC.
+        timer = setTimeout(() => controller.abort(expired()), expiresAt - now() + budget)
+      }
+      return {
+        expiresAt: dispatchExpiresAt,
+        responseTimeoutMs: budget,
+        ...(dispatched ? { responseExpiresAt: expiresAt } : {})
+      }
+    },
+    beforeSend: (sentAt = now()) => {
+      if (controller.signal.aborted || (!dispatched && sentAt >= expiresAt)) {
+        throw expired()
+      }
+      if (dispatched) {
+        return
+      }
+      dispatched = true
+      expiresAt = sentAt + budget
+      clearTimeout(timer)
+      timer = setTimeout(() => controller.abort(expired()), Math.max(0, expiresAt - now()))
+      if (now() >= expiresAt) {
+        controller.abort(expired())
+      }
+    },
+    revoke: (reason: unknown = expired()) => controller.abort(reason),
+    remaining: () => Math.max(0, expiresAt - now()),
+    check: () => {
+      if (controller.signal.aborted) {
+        throw controller.signal.reason
+      }
+      if (now() >= expiresAt) {
+        controller.abort(expired())
+        throw controller.signal.reason
+      }
+    },
+    wait: <T>(promise: Promise<T>) => waitForPromiseWithSignal(promise, controller.signal),
+    dispose: () => clearTimeout(timer)
+  }
+}
+export type AgentSessionSwitchDeadline = ReturnType<typeof agentSessionSwitchDeadline>
+
+/** In-process authority; never serialize the callbacks as a transport permit. */
+export type AgentSessionSwitchAuthority = {
+  invocationId: string
+  check: () => void
+  remaining: () => number
+  signal: AbortSignal
+  /** Existing physical acquisition only, excluding placement and presentation. */
+  trackPhysical?: <T>(work: Promise<T>) => Promise<T>
+}
+
+export type SessionSwitchProjection = {
+  invocationId: string
+  generation: string
+  sessionId: string
+  tabId: string
+  phase: 'prepare' | 'retire' | 'retain'
+}
diff --git a/src/shared/claimed-agent-pty-owner.test.ts b/src/shared/claimed-agent-pty-owner.test.ts
index af7e2480439d..06a3f67a9a5a 100644
--- a/src/shared/claimed-agent-pty-owner.test.ts
+++ b/src/shared/claimed-agent-pty-owner.test.ts
@@ -313,3 +313,73 @@ describe('ClaimedAgentPtyOwnerRegistry', () => {
     expect(spawn).toHaveBeenCalledOnce()
   })
 })
+
+it('expires a waiting claim observer after liveness without releasing the actual creator', async () => {
+  const registry = new ClaimedAgentPtyOwnerRegistry()
+  const gate = Promise.withResolvers<boolean>()
+  const probing = Promise.withResolvers<void>()
+  let expired = false
+  const check = () => {
+    if (expired) {
+      throw new Error('expired')
+    }
+  }
+  const created = await registry.ensure({
+    claim: claim(),
+    surface,
+    spawn: async () => ({ ptyId: 'real' })
+  })
+  const adopting = registry.ensure({
+    claim: claim(),
+    surface,
+    check,
+    spawn: async () => {
+      throw new Error('must not duplicate')
+    },
+    isLive: () => {
+      probing.resolve()
+      return gate.promise
+    }
+  })
+  const rejected = expect(adopting).rejects.toThrow('expired')
+  await probing.promise
+  expired = true
+  gate.resolve(true)
+  await rejected
+  expect(
+    await registry.ensure({
+      claim: claim(),
+      surface,
+      spawn: async () => {
+        throw new Error('must not duplicate')
+      }
+    })
+  ).toMatchObject({
+    disposition: 'adopted',
+    owner: { generation: created.owner.generation, ptyId: 'real' }
+  })
+})
+it('settles the dispatched creator while an expired joiner cannot cancel its claim', async () => {
+  const registry = new ClaimedAgentPtyOwnerRegistry()
+  const gate = Promise.withResolvers<{ ptyId: string }>()
+  let expired = false
+  const first = registry.ensure({ claim: claim(), surface, spawn: () => gate.promise })
+  const second = registry.ensure({
+    claim: claim(),
+    surface,
+    check: () => {
+      if (expired) {
+        throw new Error('expired')
+      }
+    },
+    spawn: async () => {
+      throw new Error('must not duplicate')
+    }
+  })
+  const rejected = expect(second).rejects.toThrow('expired')
+  expired = true
+  gate.resolve({ ptyId: 'real' })
+  const owner = await first
+  await rejected
+  expect(registry.listForPty('real')).toEqual([owner.owner])
+})
diff --git a/src/shared/claimed-agent-pty-owner.ts b/src/shared/claimed-agent-pty-owner.ts
index 93a9c63ea0af..ef284f179b9d 100644
--- a/src/shared/claimed-agent-pty-owner.ts
+++ b/src/shared/claimed-agent-pty-owner.ts
@@ -62,8 +62,13 @@ export class ClaimedAgentPtyOwnerRegistry {
     isLive?: (owner: LiveAgentSessionOwner) => boolean | Promise<boolean>
     /** Called when this request waits on another request's start instead of starting its own. */
     onJoin?: () => void
+    /** Checked at mutation, including after asynchronous liveness proof. */
+    check?: () => void
+    /** Reconcile an already dispatched creator without granting new attach authority. */
+    onDispatchedRevoked?: () => void
   }): Promise<AgentSessionClaimedSpawnResult> {
     // Snapshot reused retry arguments before awaits so caller mutations cannot change registry keys.
+    args.check?.()
     const requestedClaim = cloneClaim(args.claim)
     const requestedSurface = cloneSurface(args.surface)
     const key = agentSessionClaimKey(requestedClaim)
@@ -79,12 +84,14 @@ export class ClaimedAgentPtyOwnerRegistry {
         throw new Error('agent_session_conflict')
       }
       if (!args.isLive || (await args.isLive(cloneOwner(live)))) {
+        args.check?.()
         const current = this.live.get(key)
         if (current?.ptyId === live.ptyId && current.generation === live.generation) {
           return { disposition: 'adopted', owner: cloneOwner(current) }
         }
         return await this.ensure(args)
       }
+      args.check?.()
       this.release(live.ptyId, live.generation)
     }
 
@@ -95,9 +102,11 @@ export class ClaimedAgentPtyOwnerRegistry {
       }
       args.onJoin?.()
       const result = await reserved.promise
+      args.check?.()
       return { disposition: 'adopted', owner: cloneOwner(result.owner as LiveOwner) }
     }
 
+    args.check?.()
     this.assertCapacityForNewOwner()
     const generation = randomUUID()
     let resolveReservation!: (result: AgentSessionClaimedSpawnResult) => void
@@ -116,7 +125,6 @@ export class ClaimedAgentPtyOwnerRegistry {
       promise
     })
 
-    let promotedOwner: LiveOwner | null = null
     try {
       const spawned = await args.spawn({ generation })
       const owner: LiveOwner = spawned.owner
@@ -151,15 +159,27 @@ export class ClaimedAgentPtyOwnerRegistry {
       if (reservation?.generation !== generation) {
         throw new Error('agent_session_ownership_unknown')
       }
+      const checkDispatched = () => {
+        try {
+          args.check?.()
+        } catch (error) {
+          if (!args.onDispatchedRevoked) {
+            throw error
+          }
+          args.onDispatchedRevoked()
+        }
+      }
+      checkDispatched()
       this.live.set(key, owner)
       const keys = this.keysByPtyId.get(owner.ptyId) ?? new Set<string>()
       keys.add(key)
       this.keysByPtyId.set(owner.ptyId, keys)
-      promotedOwner = owner
       // Index before awaited proof so an exit beating spawn completion can remove the matching generation.
       if (args.isLive && !(await args.isLive(cloneOwner(owner)))) {
+        this.release(owner.ptyId, owner.generation)
         throw new Error('agent_session_exited_during_start')
       }
+      checkDispatched()
       const current = this.live.get(key)
       if (current?.ptyId !== owner.ptyId || current.generation !== owner.generation) {
         throw new Error('agent_session_exited_during_start')
@@ -168,12 +188,10 @@ export class ClaimedAgentPtyOwnerRegistry {
         disposition: spawned.disposition ?? 'created',
         owner: cloneOwner(owner)
       }
+      // Dispatch already happened: reconcile its real owner even if this observer expired.
       resolveReservation(result)
       return result
     } catch (error) {
-      if (promotedOwner) {
-        this.release(promotedOwner.ptyId, promotedOwner.generation)
-      }
       rejectReservation(error)
       throw error
     } finally {
diff --git a/src/shared/foreground-process-evidence.ts b/src/shared/foreground-process-evidence.ts
index 4744575aa137..21d61029cfa7 100644
--- a/src/shared/foreground-process-evidence.ts
+++ b/src/shared/foreground-process-evidence.ts
@@ -51,6 +51,7 @@ export type RemoteForegroundEvidence =
   | ({
       verdict: 'live'
       processName: string | null
+      suspendedAgentProcess?: string
       fence: PosixFence | WindowsFence
     } & HostObservation)
   | ({ verdict: 'unverifiable'; reason: string } & HostObservation)
@@ -142,6 +143,8 @@ export function isRemoteForegroundEvidence(value: unknown): value is RemoteForeg
   if (input.verdict === 'live') {
     return (
       (input.processName === null || typeof input.processName === 'string') &&
+      (input.suspendedAgentProcess === undefined ||
+        isNonEmptyString(input.suspendedAgentProcess)) &&
       (isPosixFence(input.fence) || isWindowsFence(input.fence))
     )
   }
diff --git a/src/shared/pty-fenced-termination.ts b/src/shared/pty-fenced-termination.ts
index 4d277958b7d2..9037e5374946 100644
--- a/src/shared/pty-fenced-termination.ts
+++ b/src/shared/pty-fenced-termination.ts
@@ -3,6 +3,12 @@ export type PtyFencedTerminationRequest = {
   expectedIncarnationId: string
   requireNoAgentOwner: boolean
   requireUnattached: boolean
+  switchCondition?: {
+    token: string
+    remainingMs: number
+    ownedSpawn?: true
+    claimGeneration?: string
+  }
 }
 
 export type PtyFencedTerminationOutcome =
diff --git a/src/shared/remote-runtime-client.ts b/src/shared/remote-runtime-client.ts
index 459ee6a9b53a..f7f25b43ba4a 100644
--- a/src/shared/remote-runtime-client.ts
+++ b/src/shared/remote-runtime-client.ts
@@ -22,6 +22,7 @@ export type RemoteRuntimeSubscription = {
 }
 
 export type RemoteRuntimeSubscriptionCallbacks<TResult = unknown> = {
+  beforeSend?: () => void
   onResponse: (response: RuntimeRpcResponse<TResult>) => void
   onBinary?: (bytes: Uint8Array<ArrayBufferLike>) => void
   onError: (error: RemoteRuntimeClientError) => void
diff --git a/src/shared/remote-runtime/control/remote-runtime-shared-control-send.ts b/src/shared/remote-runtime/control/remote-runtime-shared-control-send.ts
index a67efedf8aa7..f823e25ad464 100644
--- a/src/shared/remote-runtime/control/remote-runtime-shared-control-send.ts
+++ b/src/shared/remote-runtime/control/remote-runtime-shared-control-send.ts
@@ -31,6 +31,17 @@ export function sendSharedControlSubscription(args: {
   if (args.subscription.closed || args.subscription.sent) {
     return
   }
+  try {
+    args.subscription.callbacks.beforeSend?.()
+  } catch {
+    finishSharedControlSubscription(
+      args.subscriptions,
+      args.subscription,
+      true,
+      remoteRuntimeUnavailableError()
+    )
+    return
+  }
   if (
     args.send({
       id: args.subscription.requestId,
diff --git a/src/shared/remote-runtime/control/remote-runtime-shared-control-types.ts b/src/shared/remote-runtime/control/remote-runtime-shared-control-types.ts
index 8629a18a1b95..770f8bd9180a 100644
--- a/src/shared/remote-runtime/control/remote-runtime-shared-control-types.ts
+++ b/src/shared/remote-runtime/control/remote-runtime-shared-control-types.ts
@@ -24,6 +24,7 @@ export type SharedControlPendingRequest<TResult> = {
 }
 
 export type SharedControlSubscriptionCallbacks<TResult> = {
+  beforeSend?: () => void
   onResponse: (response: RuntimeRpcResponse<TResult>) => void
   onBinary?: (bytes: Uint8Array<ArrayBufferLike>) => void
   onError: (error: RemoteRuntimeClientError) => void
diff --git a/src/shared/remote-runtime/requests/remote-runtime-subscription-contract.ts b/src/shared/remote-runtime/requests/remote-runtime-subscription-contract.ts
index 8f95f552a62e..7f636f5c884b 100644
--- a/src/shared/remote-runtime/requests/remote-runtime-subscription-contract.ts
+++ b/src/shared/remote-runtime/requests/remote-runtime-subscription-contract.ts
@@ -19,6 +19,7 @@ export type RemoteRuntimeTransportSubscription = {
 }
 
 export type RemoteRuntimeTransportSubscriptionCallbacks<TResult = unknown> = {
+  beforeSend?: () => void
   onResponse: (response: RuntimeRpcResponse<TResult>) => void
   onBinary?: (bytes: Uint8Array<ArrayBufferLike>) => void
   onError: (error: RemoteRuntimeClientError) => void
diff --git a/src/shared/remote-runtime/requests/remote-runtime-subscription-frame-router.ts b/src/shared/remote-runtime/requests/remote-runtime-subscription-frame-router.ts
index 061a594d3979..5e6d19334e2c 100644
--- a/src/shared/remote-runtime/requests/remote-runtime-subscription-frame-router.ts
+++ b/src/shared/remote-runtime/requests/remote-runtime-subscription-frame-router.ts
@@ -17,6 +17,7 @@ type SubscriptionFrameRouterOptions<TResult> = {
   // Responses to requests the caller sent over this same socket; unmatched ids stay a hard failure.
   resolvePendingRequest?: (response: RuntimeRpcResponse<unknown>) => boolean
   callbacks: {
+    beforeSend?: () => void
     onResponse: (response: RuntimeRpcResponse<TResult>) => void
     onBinary?: (bytes: Uint8Array<ArrayBufferLike>) => void
   }
@@ -107,6 +108,17 @@ export class RemoteRuntimeSubscriptionFrameRouter<TResult> {
       )
       return
     }
+    if (this.options.isSettled()) {
+      return
+    }
+    try {
+      this.options.callbacks.beforeSend?.()
+    } catch {
+      this.options.fail(
+        new RemoteRuntimeClientError('runtime_unavailable', 'Request expired before dispatch.')
+      )
+      return
+    }
     this.state = 'ready'
     this.options.send(this.options.handshake.channel.sealText(this.options.serializedRequest))
     this.options.onAuthenticated()
diff --git a/src/shared/rpc-contract/rpc-params-catalog.generated.ts b/src/shared/rpc-contract/rpc-params-catalog.generated.ts
index ea08c15ecae8..52b719d481bd 100644
--- a/src/shared/rpc-contract/rpc-params-catalog.generated.ts
+++ b/src/shared/rpc-contract/rpc-params-catalog.generated.ts
@@ -565,6 +565,8 @@ import {
   ItemParams,
   ModelCatalogParams,
   OptionsParams,
+  SwitchToChatParams,
+  SwitchToTerminalParams,
   QueuedMessageActionParams,
   QueuedMessagesResumeParams,
   RespondParams,
@@ -765,8 +767,8 @@ export const RPC_PARAMS_BY_METHOD = {
   'agentSession.subscribeAvailability': AvailabilityParams,
   'agentSession.subscribeStatus': null,
   'agentSession.subscribeTurnCompletions': SubscribeTurnCompletionsParams,
-  'agentSession.switchToChat': OptionsParams,
-  'agentSession.switchToTerminal': OptionsParams,
+  'agentSession.switchToChat': SwitchToChatParams,
+  'agentSession.switchToTerminal': SwitchToTerminalParams,
   'agentSession.threadGoal': ThreadGoalParams,
   'agentSession.unsubscribe': UnsubscribeParams,
   'agentSessionAttachment.read': AttachmentReadParams,
diff --git a/src/shared/rpc-contract/structured-agent-session-mutation-envelope.ts b/src/shared/rpc-contract/structured-agent-session-mutation-envelope.ts
new file mode 100644
index 000000000000..412b0e623777
--- /dev/null
+++ b/src/shared/rpc-contract/structured-agent-session-mutation-envelope.ts
@@ -0,0 +1,14 @@
+import { Identifier, SessionId } from './structured-agent-session-identifiers'
+import { z } from 'zod'
+
+export const MutationEnvelope = z
+  .object({
+    sessionId: SessionId,
+    clientOperationId: Identifier('Invalid client operation id'),
+    /** Null is the "must not exist yet" case; every other call fences. */
+    expectedRuntimeFence: z.number().int().positive().nullable(),
+    payloadFingerprint: z
+      .string()
+      .regex(/^[0-9a-f]{64}$/, 'Payload fingerprint must be a sha256 hex digest')
+  })
+  .strict()
diff --git a/src/shared/rpc-contract/structured-agent-session-params.ts b/src/shared/rpc-contract/structured-agent-session-params.ts
index bde9e086915d..1a803764eecc 100644
--- a/src/shared/rpc-contract/structured-agent-session-params.ts
+++ b/src/shared/rpc-contract/structured-agent-session-params.ts
@@ -1,21 +1,6 @@
+import { SendBody, MAX_OPTION_LABEL } from './structured-agent-session-message-params'
+import { TerminalClose } from './terminal-unary-params'
 import {
-  SendBody,
-  MAX_OPTION_LABEL,
-  MAX_PROMPT_BYTES
-} from './structured-agent-session-message-params'
-export {
-  SendBlock,
-  MAX_BLOCKS,
-  MAX_OPTION_LABEL,
-  MAX_PROMPT_BYTES
-} from './structured-agent-session-message-params'
-import {
-  Identifier,
-  JournalCursor,
-  MAX_ID_LENGTH,
-  SessionId
-} from './structured-agent-session-identifiers'
-export {
   Identifier,
   JournalCursor,
   MAX_ID_LENGTH,
@@ -26,38 +11,36 @@ import { CREATE_TAB_FIELDS } from './structured-agent-session-create-tab-params'
 import { isAgentSessionOptions } from '../agent-session-record'
 import { isStructuredAgentId } from '../agent-session-provider-handle-encoding'
 import { normalizeExecutionHostId } from '../execution-host'
-import {
-  AGENT_SESSION_QUESTION_ANSWER_MAX_BYTES,
-  AGENT_SESSION_RESPONSE_OPTION_ID_MAX_LENGTH
-} from '../agent-session-question-answer'
+import { AGENT_SESSION_RESPONSE_OPTION_ID_MAX_LENGTH } from '../agent-session-question-answer'
 import {
   AGENT_SESSION_HISTORY_DIRECTIONS,
   AGENT_SESSION_HISTORY_MAX_LIMIT
 } from '../agent-session-wire'
 import { AGENT_SESSION_THREAD_GOAL_OBJECTIVE_MAX_LENGTH } from '../agent-session-thread-goal-wire'
+import { MutationEnvelope } from './structured-agent-session-mutation-envelope'
+
+export {
+  SendBlock,
+  MAX_BLOCKS,
+  MAX_OPTION_LABEL,
+  MAX_PROMPT_BYTES
+} from './structured-agent-session-message-params'
+
+export {
+  Identifier,
+  JournalCursor,
+  MAX_ID_LENGTH,
+  SessionId
+} from './structured-agent-session-identifiers'
 
 // Four Claude questions with all four generated choices occupy 610 chars when fully percent-encoded.
 export const MAX_RESPONSE_OPTION_ID_LENGTH = AGENT_SESSION_RESPONSE_OPTION_ID_MAX_LENGTH
 
 /** Matches the journal's bounds on one grouped prompt. */
-const MAX_QUESTION_ANSWER_QUESTIONS = 4
-const MAX_QUESTION_ANSWER_OPTIONS = 64
 
 /** One relaunch cannot offer more chats than a profile plausibly holds. */
 export const MAX_RESTART_RESUME_SESSIONS = 512
 
-export const MutationEnvelope = z
-  .object({
-    sessionId: SessionId,
-    clientOperationId: Identifier('Invalid client operation id'),
-    /** Null is the "must not exist yet" case; every other call fences. */
-    expectedRuntimeFence: z.number().int().positive().nullable(),
-    payloadFingerprint: z
-      .string()
-      .regex(/^[0-9a-f]{64}$/, 'Payload fingerprint must be a sha256 hex digest')
-  })
-  .strict()
-
 export const ProviderHandle = z.discriminatedUnion('kind', [
   z.object({ kind: z.literal('codex'), threadId: Identifier('Invalid thread id') }).strict(),
   z
@@ -217,50 +200,6 @@ export const RespondParams = z
   })
   .strict()
 
-const QuestionAnswer = z
-  .object({
-    // Codex question ids are model-written and untrimmed; the host matches them exactly.
-    questionId: z
-      .string()
-      .min(1, 'Invalid question id')
-      .max(MAX_RESPONSE_OPTION_ID_LENGTH, 'Invalid question id'),
-    optionIds: z
-      .array(Identifier('Invalid option id', MAX_RESPONSE_OPTION_ID_LENGTH))
-      .max(MAX_QUESTION_ANSWER_OPTIONS),
-    // Hashed verbatim by both peers, so no trim or transform here.
-    other: z
-      .string()
-      .max(AGENT_SESSION_QUESTION_ANSWER_MAX_BYTES)
-      .refine(
-        (value) => Buffer.byteLength(value, 'utf8') <= AGENT_SESSION_QUESTION_ANSWER_MAX_BYTES,
-        'Answer is too large'
-      )
-      .optional()
-  })
-  .strict()
-
-export const RespondToQuestionParams = z
-  .object({
-    envelope: MutationEnvelope,
-    itemId: Identifier('Invalid item id'),
-    expectedRevision: z.number().int().positive(),
-    /** An answer packed into one id, from clients that predate `answers`. */
-    optionId: Identifier('Invalid option id', MAX_RESPONSE_OPTION_ID_LENGTH).optional(),
-    answers: z.array(QuestionAnswer).min(1).max(MAX_QUESTION_ANSWER_QUESTIONS).optional()
-  })
-  .strict()
-  .superRefine((value, ctx) => {
-    if ((value.optionId === undefined) === (value.answers === undefined)) {
-      ctx.addIssue({ code: 'custom', message: 'Send exactly one of an option id or answers' })
-    }
-    if (
-      value.answers !== undefined &&
-      Buffer.byteLength(JSON.stringify(value.answers), 'utf8') > MAX_PROMPT_BYTES
-    ) {
-      ctx.addIssue({ code: 'custom', message: 'Answer is too large' })
-    }
-  })
-
 export const SetOptionParams = z.strictObject({
   envelope: MutationEnvelope,
   key: Identifier('Invalid option key'),
@@ -268,6 +207,47 @@ export const SetOptionParams = z.strictObject({
 })
 
 export const OptionsParams = z.object({ sessionId: SessionId }).strict()
+export const SwitchToChatParams = OptionsParams.extend({
+  execution: z
+    .object({
+      invocationId: Identifier('Invalid invocation'),
+      observe: z.boolean().optional(),
+      receipt: z
+        .object({
+          generation: Identifier('Invalid generation'),
+          shown: z.boolean(),
+          retained: z.boolean().optional(),
+          converged: z.boolean().optional()
+        })
+        .strict()
+        .optional(),
+      create: CreateIntentParams.omit({ firstMessage: true }).optional(),
+      source: TerminalClose.required().optional()
+    })
+    .strict()
+    .optional()
+}).strict()
+export const SwitchToTerminalParams = OptionsParams.extend({
+  execution: z
+    .object({
+      invocationId: Identifier('Invalid invocation'),
+      observe: z.boolean().optional(),
+      receipt: z
+        .object({
+          generation: Identifier('Invalid generation'),
+          shown: z.boolean(),
+          retained: z.boolean().optional(),
+          converged: z.boolean().optional()
+        })
+        .strict()
+        .optional(),
+      sourceTabId: Identifier('Invalid tab').optional(),
+      groupId: Identifier('Invalid group').optional(),
+      commandOverride: z.string().max(8192).optional()
+    })
+    .strict()
+    .optional()
+}).strict()
 export const ItemParams = OptionsParams.extend({ itemId: z.string().min(1) }).strict()
 // Why optional: only a host advertising the workspace-sleep-mark capability is sent `markAsleep`.
 export const SleepWorkspaceParams = z
@@ -366,3 +346,7 @@ export const RewindParams = z
     expectedEpoch: Identifier('Invalid journal epoch')
   })
   .strict()
+
+export { RespondToQuestionParams } from './structured-agent-session-question-params'
+
+export { MutationEnvelope } from './structured-agent-session-mutation-envelope'
diff --git a/src/shared/rpc-contract/structured-agent-session-question-params.ts b/src/shared/rpc-contract/structured-agent-session-question-params.ts
new file mode 100644
index 000000000000..8dfa95e5fd97
--- /dev/null
+++ b/src/shared/rpc-contract/structured-agent-session-question-params.ts
@@ -0,0 +1,56 @@
+import { MAX_PROMPT_BYTES } from './structured-agent-session-message-params'
+import { Identifier } from './structured-agent-session-identifiers'
+import { z } from 'zod'
+import {
+  AGENT_SESSION_QUESTION_ANSWER_MAX_BYTES,
+  AGENT_SESSION_RESPONSE_OPTION_ID_MAX_LENGTH as MAX_RESPONSE_OPTION_ID_LENGTH
+} from '../agent-session-question-answer'
+import { MutationEnvelope } from './structured-agent-session-mutation-envelope'
+
+const MAX_QUESTION_ANSWER_QUESTIONS = 4
+
+const MAX_QUESTION_ANSWER_OPTIONS = 64
+
+const QuestionAnswer = z
+  .object({
+    // Codex question ids are model-written and untrimmed; the host matches them exactly.
+    questionId: z
+      .string()
+      .min(1, 'Invalid question id')
+      .max(MAX_RESPONSE_OPTION_ID_LENGTH, 'Invalid question id'),
+    optionIds: z
+      .array(Identifier('Invalid option id', MAX_RESPONSE_OPTION_ID_LENGTH))
+      .max(MAX_QUESTION_ANSWER_OPTIONS),
+    // Hashed verbatim by both peers, so no trim or transform here.
+    other: z
+      .string()
+      .max(AGENT_SESSION_QUESTION_ANSWER_MAX_BYTES)
+      .refine(
+        (value) => Buffer.byteLength(value, 'utf8') <= AGENT_SESSION_QUESTION_ANSWER_MAX_BYTES,
+        'Answer is too large'
+      )
+      .optional()
+  })
+  .strict()
+
+export const RespondToQuestionParams = z
+  .object({
+    envelope: MutationEnvelope,
+    itemId: Identifier('Invalid item id'),
+    expectedRevision: z.number().int().positive(),
+    /** An answer packed into one id, from clients that predate `answers`. */
+    optionId: Identifier('Invalid option id', MAX_RESPONSE_OPTION_ID_LENGTH).optional(),
+    answers: z.array(QuestionAnswer).min(1).max(MAX_QUESTION_ANSWER_QUESTIONS).optional()
+  })
+  .strict()
+  .superRefine((value, ctx) => {
+    if ((value.optionId === undefined) === (value.answers === undefined)) {
+      ctx.addIssue({ code: 'custom', message: 'Send exactly one of an option id or answers' })
+    }
+    if (
+      value.answers !== undefined &&
+      Buffer.byteLength(JSON.stringify(value.answers), 'utf8') > MAX_PROMPT_BYTES
+    ) {
+      ctx.addIssue({ code: 'custom', message: 'Answer is too large' })
+    }
+  })
diff --git a/src/shared/runtime-rpc-call-queue.ts b/src/shared/runtime-rpc-call-queue.ts
index 00b8382f1cc4..0ca4e98c76a8 100644
--- a/src/shared/runtime-rpc-call-queue.ts
+++ b/src/shared/runtime-rpc-call-queue.ts
@@ -54,7 +54,12 @@ export function isBackgroundRuntimeMethod(method: string): boolean {
 // Slow worktree removal/model listing waits get a separate lane so foreground refresh/send slots remain free;
 // background slots belong to status.
 function isLongWaitRuntimeMethod(method: string): boolean {
-  return method === 'worktree.rm' || method === 'agentSession.modelCatalog'
+  return (
+    method === 'worktree.rm' ||
+    method === 'agentSession.modelCatalog' ||
+    method === 'agentSession.switchToChat' ||
+    method === 'agentSession.switchToTerminal'
+  )
 }
 
 export class RuntimeRpcCallQueuePool {
diff --git a/src/shared/runtime-rpc-envelope.ts b/src/shared/runtime-rpc-envelope.ts
index 203e2cdae5ed..a702748fe297 100644
--- a/src/shared/runtime-rpc-envelope.ts
+++ b/src/shared/runtime-rpc-envelope.ts
@@ -98,3 +98,10 @@ export function isKeepaliveFrame(frame: unknown): frame is RuntimeRpcKeepaliveFr
     (frame as { _keepalive: unknown })._keepalive === true
   )
 }
+
+/** Same-machine IPC observation only; remote hosts own their own monotonic operation budget. */
+export type RuntimeRpcDispatchObservation = {
+  expiresAt: number
+  responseTimeoutMs: number
+  responseExpiresAt?: number
+}
diff --git a/src/shared/runtime-session-contracts.ts b/src/shared/runtime-session-contracts.ts
index fbb3f53d0071..126a5db479d5 100644
--- a/src/shared/runtime-session-contracts.ts
+++ b/src/shared/runtime-session-contracts.ts
@@ -18,6 +18,7 @@ import type {
 import type { CliStatusCaller } from './orchestration-caller-status'
 import type { RuntimeHostDescriptor } from './runtime-host-descriptor'
 import type { TuiAgent } from './tui-agent'
+import type { SessionSwitchProjection } from './agent-session-switch-execution'
 
 export type * from './runtime-mobile-session-tab-contracts'
 
@@ -165,6 +166,7 @@ export type RuntimeMountedLeaf = {
 }
 
 export type RuntimeSyncWindowGraph = {
+  conditionalSwitchProjection?: 1
   tabs: RuntimeSyncedTab[]
   leaves: RuntimeSyncedLeaf[]
   /** Layout-owner windows report main-owned panes here; tabs/leaves then cover other workspaces. Window-to-main only. */
@@ -251,6 +253,7 @@ export type RuntimeMobileSessionTabsSnapshot = {
   activeTabType: 'terminal' | 'markdown' | 'file' | 'browser' | 'agent-session' | null
   tabGroups?: RuntimeMobileSessionTabGroup[]
   tabGroupLayout?: TabGroupLayoutNode | null
+  switchProjections?: SessionSwitchProjection[]
   retiredTerminalSurfaces?: RuntimeMobileSessionRetiredTerminalSurface[]
   tabs: RuntimeMobileSessionSnapshotTab[]
 }
@@ -275,6 +278,7 @@ export type RuntimeMobileSessionTabsResult = {
   activeTabType: 'terminal' | 'markdown' | 'file' | 'browser' | 'agent-session' | null
   tabGroups?: RuntimeMobileSessionTabGroup[]
   tabGroupLayout?: TabGroupLayoutNode | null
+  switchProjections?: SessionSwitchProjection[]
   retiredTerminalSurfaces?: RuntimeMobileSessionRetiredTerminalSurface[]
   tabs: RuntimeMobileSessionClientTab[]
   /** After restart, client-hosted browser rows may be unknown while terminals are authoritative. Preserve absent
@@ -290,6 +294,9 @@ export type RuntimeMobileSessionCreateTerminalResult = {
   publicationEpoch: string
   snapshotVersion: number
   warning?: 'desktop-tab-not-shown'
+  agentResumeRefused?: true
+  agentResumeUnavailable?: true
+  switchOutcomeUnknown?: true
   /** The saved folder was gone, so the terminal started at the workspace root. */
   startupCwdFallback?: 'workspace-root'
 }
diff --git a/src/shared/runtime-terminal-create-contract.ts b/src/shared/runtime-terminal-create-contract.ts
index e4fc3e55ca52..4b4ac8d5c8e7 100644
--- a/src/shared/runtime-terminal-create-contract.ts
+++ b/src/shared/runtime-terminal-create-contract.ts
@@ -3,6 +3,7 @@ import type { ExecutionHostId } from './execution-host'
 import type { StartupCwdFallback } from './startup-cwd-fallback'
 
 export type RuntimeTerminalCreate = TerminalLaunchResult & {
+  switchOutcomeUnknown?: true
   coldRestore?: { scrollback: string; cwd: string; cols?: number; rows?: number }
   handle: string
   /** Host-owned PTY incarnation used to fence remote identity observations. */
diff --git a/src/shared/session-tab-close.ts b/src/shared/session-tab-close.ts
index 2817e729a92a..85d91f49a58f 100644
--- a/src/shared/session-tab-close.ts
+++ b/src/shared/session-tab-close.ts
@@ -1,3 +1,5 @@
+import type { SessionSwitchProjection } from './agent-session-switch-execution'
+
 export const SESSION_TAB_CLOSE_CANCELED_ERROR = 'session_tab_close_canceled'
 export const SESSION_TAB_CLOSE_FAILED_ERROR = 'session_tab_close_failed'
 export const SESSION_TAB_NOT_FOUND_ERROR = 'session_tab_not_found'
@@ -8,9 +10,11 @@ export type SessionTabCloseRequest = {
   tabId: string
   worktreeId: string
   expiresAt?: number
+  switchProjection?: SessionSwitchProjection
 }
 
 export type SessionTabCloseResponse = {
   requestId: string
   error?: string
+  switchApplied?: boolean
 }
diff --git a/src/shared/structured-agent-cli-conversation-adoption.ts b/src/shared/structured-agent-cli-conversation-adoption.ts
index b1fab5b9f870..9c4fa4f678e7 100644
--- a/src/shared/structured-agent-cli-conversation-adoption.ts
+++ b/src/shared/structured-agent-cli-conversation-adoption.ts
@@ -50,8 +50,14 @@ export function inPlaceSwitchCapability(agent: string): string {
   return `agent-session.structured.switch.v1:${agent}`
 }
 
-export const IN_PLACE_SWITCH_RUNTIME_CAPABILITIES =
-  IN_PLACE_SWITCH_AGENTS.map(inPlaceSwitchCapability)
+export const IN_PLACE_SWITCH_RUNTIME_CAPABILITIES = IN_PLACE_SWITCH_AGENTS.flatMap((agent) => [
+  inPlaceSwitchCapability(agent),
+  inPlaceSwitchExecutionCapability(agent)
+])
+
+export function inPlaceSwitchExecutionCapability(agent: string): string {
+  return `agent-session.structured.switch-execution.v1:${agent}`
+}
 
 /** `saved`: built from a pane's saved facts; `switch`: the terminal half of a chat's switch. */
 export type TerminalResumeOrigin = 'saved' | 'switch'
diff --git a/src/shared/terminal-process-inspection.ts b/src/shared/terminal-process-inspection.ts
index 4cdfe32e092c..7f16368dea34 100644
--- a/src/shared/terminal-process-inspection.ts
+++ b/src/shared/terminal-process-inspection.ts
@@ -27,6 +27,9 @@ export type ClientOnlyUnverifiableInspection = {
 
 /** Compatibility-shaped host/local inspection returned by the inspect RPC. */
 export type HostProcessInspection = {
+  switchWitness?: string
+  suspendedAgentProcess?: string
+
   foregroundProcess: string | null
   hasChildProcesses: boolean
   /** Optional on old hosts; the renderer treats an omitted field as old-host unverifiable. */

From b5a600f02b46e47c8d14cba240e17d569ac16406 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Mon, 26 Oct 2026 23:01:14 -0700
Subject: [PATCH 079/207] Fix switch admission and integration contracts

---
 config/flaky-test-pattern-baseline.txt        |  1 -
 config/scripts/ci-unit-files.mjs              |  3 +-
 config/scripts/vitest-node-runtime-files.mjs  |  1 +
 src/main/daemon/session.test.ts               | 10 ++-
 src/main/ipc/pty/spawn-commit-binding.test.ts |  4 +-
 ...uctured-agent-session-current-work.test.ts |  1 +
 .../structured-agent-session-current-work.ts  | 15 ++++
 ...-agent-session-switch-command-selection.ts |  4 +-
 ...tured-agent-session-switch-command.test.ts | 17 +++++
 .../local-pty-switch-cleanup.test.ts          |  2 +-
 .../orchestration/chat-assignee.test.ts       |  5 +-
 .../methods/agent-launch-instant-tab.test.ts  | 72 +++++++++----------
 .../methods/agent-launch-tab-publication.ts   |  2 +-
 .../rpc/methods/agent-launch.test-fixture.ts  | 26 +++++++
 ...red-agent-session-switch-execution.test.ts | 43 +++++++++++
 ...ructured-agent-session-switch-execution.ts | 15 ++--
 .../session-window-graph-leaf.ts              |  4 +-
 ...ent-session-windowless-layout-host.test.ts |  8 +--
 .../launch/mobile-terminal-create-owner.ts    | 14 ----
 .../ai-vault-history-native-return.test.tsx   |  9 ++-
 .../ai-vault-session-in-place-switch.ts       |  1 +
 ...li-chat-resume-exit-return.test-fixture.ts |  2 +
 .../tab-bar/cli-chat-resume-feedback.ts       |  4 +-
 .../src/lib/conversation-surface-switch.ts    |  2 +-
 .../src/lib/conversation-switch-legacy.ts     |  1 +
 .../src/runtime/server-layout-frames.ts       |  2 +-
 .../tabs-drawn-from-main.test-fixture.ts      |  2 +-
 ...obile-terminal-session-switch.unit.test.ts | 31 +++++---
 .../native-chat-switch-readable.unit.test.tsx | 69 +++++++++++-------
 ...ronment-switch-dispatch-clock.unit.test.ts | 36 +++++-----
 30 files changed, 266 insertions(+), 140 deletions(-)
 rename src/main/runtime/terminal/launch/mobile-terminal-session-switch.test.ts => tests/e2e/mobile-terminal-session-switch.unit.test.ts (88%)
 rename src/renderer/src/components/native-chat/NativeChatStructuredSession.switch-readable.test.tsx => tests/e2e/native-chat-switch-readable.unit.test.tsx (75%)
 rename src/renderer/src/runtime/runtime-environment-switch-dispatch-clock.test.ts => tests/e2e/runtime-environment-switch-dispatch-clock.unit.test.ts (78%)

diff --git a/config/flaky-test-pattern-baseline.txt b/config/flaky-test-pattern-baseline.txt
index 7355625addae..662881e5ef76 100644
--- a/config/flaky-test-pattern-baseline.txt
+++ b/config/flaky-test-pattern-baseline.txt
@@ -1134,7 +1134,6 @@
 1 test-no-wall-clock:src/renderer/src/components/status-bar/status-bar-cursor-segment.test.tsx
 3 test-no-wall-clock:src/renderer/src/components/status-bar/status-bar-provider-menu-focus.test.tsx
 1 test-no-wall-clock:src/renderer/src/components/status-bar/workspace-space-worktree-row.test.tsx
-2 test-no-wall-clock:src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
 1 test-no-wall-clock:src/renderer/src/components/tab-bar/open-tab-search.test.ts
 1 test-no-wall-clock:src/renderer/src/components/tab-bar/TabBarCreateEntry.history.test.tsx
 4 test-no-wall-clock:src/renderer/src/components/task-page-jira-cache-selectors.test.ts
diff --git a/config/scripts/ci-unit-files.mjs b/config/scripts/ci-unit-files.mjs
index 9588e43e6359..61e645e58eb7 100644
--- a/config/scripts/ci-unit-files.mjs
+++ b/config/scripts/ci-unit-files.mjs
@@ -10,7 +10,8 @@ export const UNIT_INCLUDE = [
   'config/scripts/**/*.test.ts',
   'config/scripts/**/*.test.mjs',
   'tests/tools/**/*.test.mjs',
-  'tests/e2e/**/*.unit.test.ts'
+  'tests/e2e/**/*.unit.test.ts',
+  'tests/e2e/**/*.unit.test.tsx'
 ]
 
 export const UNIT_SETUP_FILES = [
diff --git a/config/scripts/vitest-node-runtime-files.mjs b/config/scripts/vitest-node-runtime-files.mjs
index a7639b731b20..bc2d085d130f 100644
--- a/config/scripts/vitest-node-runtime-files.mjs
+++ b/config/scripts/vitest-node-runtime-files.mjs
@@ -29,6 +29,7 @@ const NODE_RUNTIME_INCLUDE = [
   'src/renderer/src/lib/react-commit-cascade-observer.test.ts',
   'src/renderer/src/lib/react-commit-cascade-telemetry.test.ts',
   // These reach Node SQLite through a shared helper or a dynamic import, which the scan skips.
+  'tests/e2e/mobile-terminal-session-switch.unit.test.ts',
   'src/main/claude/claude-transcript-catch-up.test.ts',
   'src/main/claude/claude-transcript-duration.test.ts',
   'tests/e2e/native-chat-startup-option-pickers.unit.test.ts',
diff --git a/src/main/daemon/session.test.ts b/src/main/daemon/session.test.ts
index ef466edce3a4..c3dc3312935b 100644
--- a/src/main/daemon/session.test.ts
+++ b/src/main/daemon/session.test.ts
@@ -11,6 +11,10 @@ import {
 import { createMockSubprocess } from './session-subprocess.test-fixture'
 import type * as PtyDescendantTerminationModule from '../pty-descendant-termination'
 
+const sweep = await vi.importActual<typeof PtyDescendantTerminationModule>(
+  '../pty-descendant-termination'
+)
+
 const killWithDescendantSweepMock = vi.hoisted(() => vi.fn())
 vi.mock('../pty-descendant-termination', () => ({
   killWithDescendantSweep: killWithDescendantSweepMock
@@ -583,9 +587,6 @@ describe('Session', () => {
               ? 'unverifiable'
               : 'no-children'
         })
-        const sweep = await vi.importActual<typeof PtyDescendantTerminationModule>(
-          '../pty-descendant-termination'
-        )
         killWithDescendantSweepMock.mockImplementation((pid, killRoot, options) =>
           sweep.killWithDescendantSweep(pid, killRoot, {
             ...options,
@@ -615,9 +616,6 @@ describe('Session', () => {
       createSession()
       const witness = session.captureSwitchWitness()
       const check = session.switchCloseCondition({ token: witness, remainingMs: 10_000 })
-      const sweep = await vi.importActual<typeof PtyDescendantTerminationModule>(
-        '../pty-descendant-termination'
-      )
       killWithDescendantSweepMock.mockImplementation((pid, killRoot, options) =>
         sweep.killWithDescendantSweep(pid, killRoot, {
           ...options,
diff --git a/src/main/ipc/pty/spawn-commit-binding.test.ts b/src/main/ipc/pty/spawn-commit-binding.test.ts
index 970ea518854b..02921753af38 100644
--- a/src/main/ipc/pty/spawn-commit-binding.test.ts
+++ b/src/main/ipc/pty/spawn-commit-binding.test.ts
@@ -64,8 +64,8 @@ it('reconciles a dispatched child through real topology creation after a queued
   const recovered = result.switchRecoveredSurface!
   expect(recovered.tabId).not.toBe(tabId)
   const session = store.getWorkspaceSession()
-  expect(session.terminalLayoutsByTabId[tabId]?.ptyIdsByLeafId[leafId]).toBe('B')
-  expect(session.terminalLayoutsByTabId[recovered.tabId]?.ptyIdsByLeafId[recovered.leafId]).toBe(
+  expect(session.terminalLayoutsByTabId?.[tabId]?.ptyIdsByLeafId[leafId]).toBe('B')
+  expect(session.terminalLayoutsByTabId?.[recovered.tabId]?.ptyIdsByLeafId[recovered.leafId]).toBe(
     'A'
   )
   expect(session.tabsByWorktree[worktreeId].some((row) => row.id === recovered.tabId)).toBe(true)
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-current-work.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-current-work.test.ts
index bae602d898fa..57d23f64ffda 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-current-work.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-current-work.test.ts
@@ -117,6 +117,7 @@ describe("a dead generation's leftovers, its settlement refused and its lease re
 
     expect(work.liveFence).toBeNull()
     expect(work.working()).toBe(false)
+    expect(work.holdsHandedOverSend()).toBe(false)
     expect(work.actionablePromptIds()).toEqual([])
     expect(view.listed()?.status).not.toBe('working')
     expect(current.host.readStatusSummary(SESSION)?.status).not.toBe('working')
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-current-work.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-current-work.ts
index f750f6bbf4dd..49c50baed527 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-current-work.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-current-work.ts
@@ -190,6 +190,21 @@ export class StructuredAgentSessionCurrentWork {
     )
   }
 
+  holdsHandedOverSend(): boolean {
+    const submissions = this.unansweredSends()
+    if (submissions.length === 0) {
+      return false
+    }
+    const held = this.heldSends?.()
+    const handingOver = structuredAgentSessionHandingOver(this.journal)
+    return (
+      held === undefined ||
+      submissions.some(
+        ({ clientMessageId }) => held.has(clientMessageId) || handingOver.has(clientMessageId)
+      )
+    )
+  }
+
   isCurrentItem(itemId: string): boolean {
     if (this.liveFence === null) {
       return false
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command-selection.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command-selection.ts
index 2eac4498f9f1..b2d7e4d8c21a 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command-selection.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command-selection.ts
@@ -157,7 +157,7 @@ export function selectStructuredSessionSwitchCommand(args: {
   if (session) {
     session.switchCommand = command
   }
-  host.context().publishStatus(id)
+  host.context().publishStatus?.(id)
   void command.completion
     .finally(() => {
       command.settled = true
@@ -167,7 +167,7 @@ export function selectStructuredSessionSwitchCommand(args: {
           delete sessions.get(key)!.switchCommand
         }
       }
-      host.context().publishStatus(id)
+      host.context().publishStatus?.(id)
       if (isDisposed()) {
         return
       }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test.ts
index 86b90dd3da55..f54d6e804942 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test.ts
@@ -1,3 +1,4 @@
+import { structuredAgentSessionSwitchBlocked } from './structured-agent-session-switch-admission'
 import { nativeConversationContent } from '../../ai-vault/structured-chat-cli-fork'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import { agentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
@@ -42,6 +43,22 @@ afterEach(async () => {
   vi.restoreAllMocks()
 })
 
+it('admits an idle held child with no active turn and nothing delivering', async () => {
+  expect(await rig.host.switchToChat(id)).toMatchObject({ ok: true })
+  const session = rig.host.collaboratorsForTests().sessions.get(id)!
+  expect(session.child).not.toBeNull()
+  expect(session.journal.runningTurn()).toBeNull()
+  expect(
+    structuredAgentSessionSwitchBlocked({
+      session,
+      deps: rig.host.deps,
+      sessionId: id,
+      delivering: false,
+      background: false
+    })
+  ).toBeNull()
+})
+
 it('joins the command across its own resource close, without holding the session queue while waiting', async () => {
   const { deadline } = clock()
   const entered = Promise.withResolvers<void>()
diff --git a/src/main/providers/local-pty-switch-cleanup.test.ts b/src/main/providers/local-pty-switch-cleanup.test.ts
index ee71ec619848..77071c83762f 100644
--- a/src/main/providers/local-pty-switch-cleanup.test.ts
+++ b/src/main/providers/local-pty-switch-cleanup.test.ts
@@ -35,7 +35,7 @@ vi.mock('../pty-descendant-termination', async (importOriginal) => {
       sweep.killWithDescendantSweep(pid, killRoot, {
         ...options,
         platform: 'linux',
-        readTable: async () => ({ rows: [], capturedAtMs: Date.now() })
+        readTable: async () => ({ rows: [], capturedAtMs: 0 })
       })
   }
 })
diff --git a/src/main/runtime/orchestration/chat-assignee.test.ts b/src/main/runtime/orchestration/chat-assignee.test.ts
index cc4123e96c01..6c81c99ab1a1 100644
--- a/src/main/runtime/orchestration/chat-assignee.test.ts
+++ b/src/main/runtime/orchestration/chat-assignee.test.ts
@@ -85,9 +85,10 @@ it('derives direct debt through legacy clear lineage and stops pinning once that
       }
     }
     const records = [root, sessionRecord(successor, { lease: { claimStatus: 'released' } })]
+    const conversations = records.map(agentSessionConversationView)
     const reader = {
-      getRecord: (id: string) => records.find((record) => record.sessionId === id) ?? null,
-      listRecords: () => records
+      getRecord: (id: string) => conversations.find((record) => record.sessionId === id) ?? null,
+      listRecords: () => conversations
     }
     const task = db.createTask({ runId: 'run_legacy_local', spec: 'original work' })
     const dispatch = createRootDispatch(db, task.id, `orca_session_id:${CHAT}`)
diff --git a/src/main/runtime/rpc/methods/agent-launch-instant-tab.test.ts b/src/main/runtime/rpc/methods/agent-launch-instant-tab.test.ts
index 83bcb85418eb..5690349e75da 100644
--- a/src/main/runtime/rpc/methods/agent-launch-instant-tab.test.ts
+++ b/src/main/runtime/rpc/methods/agent-launch-instant-tab.test.ts
@@ -20,6 +20,7 @@ import type {
 import { parsePaneKey } from '../../../../shared/stable-pane-id'
 import {
   markAgentLaunchesClosedByUser,
+  noteAgentLaunchPaneAccepted,
   resetAgentLaunchPanesForTests,
   resolveAgentLaunchPaneVerdict
 } from '../../../agent-launch/agent-launch-pane-attachment'
@@ -30,6 +31,10 @@ import type { RpcContext } from '../core'
 import { DESKTOP_RPC_CALLER } from '../rpc-caller-identity'
 import {
   STRUCTURED_PREFERENCE,
+  terminalOptions,
+  coldRecord,
+  failBeforeDispatch,
+  failAfterDispatch,
   methodNamed,
   rpcContext,
   runtimeStub,
@@ -162,9 +167,9 @@ function hostWithWindow(
       (request: Omit<AgentLaunchTabPublishRequest, 'requestId'>) =>
         runtime.publishAgentLaunchTab(request)
     ),
-    withdrawAgentLaunchPaneInMainLayout: vi.fn(
-      (_address: { worktreeId: string; tabId: string; leafId: string }) => true
-    )
+    withdrawAgentLaunchPaneInMainLayout: vi.fn<
+      RpcContext['runtime']['withdrawAgentLaunchPaneInMainLayout']
+    >(async (_address, current) => current?.() ?? false)
   })
 }
 
@@ -192,10 +197,6 @@ function plainLaunch(
   )
 }
 
-function terminalOptions(runtime: Host): Record<string, unknown> {
-  return runtime.createTerminal.mock.calls[0]?.[1] ?? {}
-}
-
 /** What the pane's spawn decides when it mounts; `unowned` is an ordinary pane's spawn. */
 async function paneVerdict(
   runtime: Host,
@@ -208,28 +209,6 @@ async function paneVerdict(
   )
 }
 
-/** The record not open yet when the request arrives, as on the first launch after a restart. */
-function coldRecord(runtime: Host): Host {
-  runtime.openedAgentSessionRecordStore.mockReturnValueOnce(null)
-  return runtime
-}
-
-/** A spawn that fails before the daemon was asked for a process: nothing can be running. */
-function failBeforeDispatch(runtime: Host, message: string): void {
-  runtime.createTerminal.mockRejectedValueOnce(new Error(message))
-}
-
-/** A spawn the daemon was asked for, whose answer was lost: the process may exist. */
-function failAfterDispatch(runtime: Host, message: string): void {
-  runtime.createTerminal.mockImplementationOnce(async (_selector, createOptions) => {
-    const dispatched = createOptions?.onPtySpawnDispatched
-    if (typeof dispatched === 'function') {
-      dispatched()
-    }
-    throw new Error(message)
-  })
-}
-
 describe.each(['window', 'main'] as const)('the %s owning the layout', (owner) => {
   beforeEach(() => {
     layoutOwner.isMain = owner === 'main'
@@ -395,7 +374,12 @@ describe.each(['window', 'main'] as const)('the %s owning the layout', (owner) =
       })
       await vi.waitFor(() =>
         expect(runtime.reportAgentLaunchPaneVerdict).toHaveBeenCalledWith(
-          { worktreeId: 'wt-7', tabId: TAB_ID, leafId: LEAF_ID },
+          {
+            worktreeId: 'wt-7',
+            tabId: TAB_ID,
+            leafId: LEAF_ID,
+            operationId: runtime.published[0]?.operationId
+          },
           { kind: 'not-started', code: 'spawn claude ENOENT' }
         )
       )
@@ -511,7 +495,12 @@ describe.each(['window', 'main'] as const)('the %s owning the layout', (owner) =
 
       await vi.waitFor(() =>
         expect(runtime.reportAgentLaunchPaneVerdict).toHaveBeenCalledWith(
-          { worktreeId: 'wt-7', tabId: TAB_ID, leafId: LEAF_ID },
+          {
+            worktreeId: 'wt-7',
+            tabId: TAB_ID,
+            leafId: LEAF_ID,
+            operationId: runtime.published[0]?.operationId
+          },
           { kind: 'not-started', code: 'spawn claude ENOENT' }
         )
       )
@@ -570,7 +559,7 @@ describe.each(['window', 'main'] as const)('the %s owning the layout', (owner) =
       expect(retried.published[0]?.operationId).toBe(operationId)
       await vi.waitFor(() =>
         expect(retried.reportAgentLaunchPaneVerdict).toHaveBeenCalledWith(
-          { worktreeId: 'wt-7', tabId: TAB_ID, leafId: LEAF_ID },
+          { worktreeId: 'wt-7', tabId: TAB_ID, leafId: LEAF_ID, operationId },
           { kind: 'proceed' }
         )
       )
@@ -588,7 +577,7 @@ describe.each(['window', 'main'] as const)('the %s owning the layout', (owner) =
       await replayLaunch(remadeForNothing, { paneKey: PANE_KEY, operationId }, CLI)
       await vi.waitFor(() =>
         expect(remadeForNothing.reportAgentLaunchPaneVerdict).toHaveBeenCalledWith(
-          { worktreeId: 'wt-7', tabId: TAB_ID, leafId: LEAF_ID },
+          { worktreeId: 'wt-7', tabId: TAB_ID, leafId: LEAF_ID, operationId },
           { kind: 'withdrawn' }
         )
       )
@@ -602,7 +591,7 @@ describe.each(['window', 'main'] as const)('the %s owning the layout', (owner) =
       await replayLaunch(survived, { paneKey: PANE_KEY, operationId }, CLI)
       await vi.waitFor(() =>
         expect(survived.reportAgentLaunchPaneVerdict).toHaveBeenCalledWith(
-          { worktreeId: 'wt-7', tabId: TAB_ID, leafId: LEAF_ID },
+          { worktreeId: 'wt-7', tabId: TAB_ID, leafId: LEAF_ID, operationId },
           { kind: 'proceed' }
         )
       )
@@ -890,11 +879,18 @@ describe.each(['window', 'main'] as const)('the %s owning the layout', (owner) =
         )
       )
       expect(refused.publishAgentLaunchTabInMainLayout).toHaveBeenCalledOnce()
+      const publication = await refused.publishAgentLaunchTabInMainLayout.mock.results[0]!.value
+      const [, current] = refused.withdrawAgentLaunchPaneInMainLayout.mock.calls[0]!
       await vi.waitFor(() =>
         expect(refused.withdrawAgentLaunchPaneInMainLayout).toHaveBeenCalledWith(
-          expect.objectContaining({ worktreeId: 'wt-7', tabId: TAB_ID, leafId: LEAF_ID })
+          { worktreeId: 'wt-7', tabId: TAB_ID, leafId: LEAF_ID, operationId },
+          current,
+          publication?.withdrawalRoot
         )
       )
+      expect(current?.()).toBe(true)
+      noteAgentLaunchPaneAccepted(PANE_KEY)
+      expect(current?.()).toBe(false)
     }
   )
 
@@ -913,8 +909,8 @@ describe.each(['window', 'main'] as const)('the %s owning the layout', (owner) =
       refused.publishAgentLaunchTabInMainLayout.mockImplementation((request) =>
         real.runtime.publishAgentLaunchTabInMainLayout(request)
       )
-      refused.withdrawAgentLaunchPaneInMainLayout.mockImplementation((address) =>
-        real.runtime.withdrawAgentLaunchPaneInMainLayout(address)
+      refused.withdrawAgentLaunchPaneInMainLayout.mockImplementation((...args) =>
+        real.runtime.withdrawAgentLaunchPaneInMainLayout(...args)
       )
       const mainTabIds = () =>
         real.session().tabsByWorktree[MAIN_WORKTREE_ID]?.map((tab) => tab.id) ?? []
@@ -941,7 +937,7 @@ describe.each(['window', 'main'] as const)('the %s owning the layout', (owner) =
       ).resolves.toMatchObject({ tabId: TAB_ID, created: true })
       await vi.waitFor(() => expect(mainTabIds()).not.toContain(TAB_ID))
       expect(refused.reportAgentLaunchPaneVerdict).toHaveBeenCalledWith(
-        { worktreeId: MAIN_WORKTREE_ID, tabId: TAB_ID, leafId: LEAF_ID },
+        { worktreeId: MAIN_WORKTREE_ID, tabId: TAB_ID, leafId: LEAF_ID, operationId },
         { kind: 'withdrawn' }
       )
     }
diff --git a/src/main/runtime/rpc/methods/agent-launch-tab-publication.ts b/src/main/runtime/rpc/methods/agent-launch-tab-publication.ts
index 4257ca565121..c14f0df503bc 100644
--- a/src/main/runtime/rpc/methods/agent-launch-tab-publication.ts
+++ b/src/main/runtime/rpc/methods/agent-launch-tab-publication.ts
@@ -279,8 +279,8 @@ function trackEarlyAgentLaunchTab(args: {
               : failureCode === null
                 ? { kind: 'unconfirmed' }
                 : { kind: 'not-started', code: failureCode }
-        args.finishRunning(verdict)
         void args.report(verdict).catch(() => {})
+        args.finishRunning(verdict)
       })
     },
     placement: () => reply?.placement
diff --git a/src/main/runtime/rpc/methods/agent-launch.test-fixture.ts b/src/main/runtime/rpc/methods/agent-launch.test-fixture.ts
index eba3447b2f44..96da46a66851 100644
--- a/src/main/runtime/rpc/methods/agent-launch.test-fixture.ts
+++ b/src/main/runtime/rpc/methods/agent-launch.test-fixture.ts
@@ -206,3 +206,29 @@ export const CAPABLE_CLIENT: Partial<RpcContext> = {
   pairedDeviceId: 'device-1',
   clientCapabilities: [AGENT_LAUNCH_RUNTIME_CAPABILITY]
 }
+
+export function terminalOptions(runtime: AgentLaunchRuntimeStub): Record<string, unknown> {
+  return runtime.createTerminal.mock.calls[0]?.[1] ?? {}
+}
+
+/** The record not open yet when the request arrives, as on the first launch after a restart. */
+export function coldRecord<T extends AgentLaunchRuntimeStub>(runtime: T): T {
+  runtime.openedAgentSessionRecordStore.mockReturnValueOnce(null)
+  return runtime
+}
+
+/** A spawn that fails before the daemon was asked for a process: nothing can be running. */
+export function failBeforeDispatch(runtime: AgentLaunchRuntimeStub, message: string): void {
+  runtime.createTerminal.mockRejectedValueOnce(new Error(message))
+}
+
+/** A spawn the daemon was asked for, whose answer was lost: the process may exist. */
+export function failAfterDispatch(runtime: AgentLaunchRuntimeStub, message: string): void {
+  runtime.createTerminal.mockImplementationOnce(async (_selector, createOptions) => {
+    const dispatched = createOptions?.onPtySpawnDispatched
+    if (typeof dispatched === 'function') {
+      dispatched()
+    }
+    throw new Error(message)
+  })
+}
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
index 06f405b599ad..19a08ad3fb6a 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
@@ -179,6 +179,49 @@ it('keeps opened chat visible and returns the exact committed selected start fai
   expect(rig.store.getSessionTabId(id)).not.toBeNull()
 })
 
+it.each(['children', 'unknown'] as const)(
+  'retains the source with a factual typed refusal when inspection reports %s',
+  async (evidence) => {
+    const { runtime } = setupMainOwnedWorkspace()
+    vi.spyOn(runtime, 'inspectTerminalProcess').mockResolvedValue(
+      evidence === 'children'
+        ? { foregroundProcess: 'codex', hasChildProcesses: true, childProcessEvidence: 'children' }
+        : {
+            foregroundProcess: null,
+            hasChildProcesses: false,
+            verdict: 'unverifiable',
+            reason: 'timeout'
+          }
+    )
+    const close = vi.spyOn(runtime, 'closeSwitchedSourceTerminal')
+    const result = await executeStructuredSessionSwitch(
+      {
+        sessionId: id,
+        execution: {
+          invocationId: 'inspection',
+          source: { terminal: 'source', expectedIncarnationId: 'source-incarnation' }
+        }
+      },
+      { runtime },
+      'chat'
+    )
+    expect(result).toMatchObject({
+      status: evidence === 'children' ? 'refused' : 'uncertain',
+      refusal: {
+        code:
+          evidence === 'children'
+            ? 'agent_session_operation_invalid'
+            : 'agent_session_operation_unknown',
+        details: {
+          reason: evidence === 'children' ? 'conversationOpenInTerminal' : 'outcomeUnknown'
+        }
+      }
+    })
+    expect(rig.adapter.acquire).not.toHaveBeenCalled()
+    expect(close).not.toHaveBeenCalled()
+  }
+)
+
 it('reports a dispatched terminal with a lost answer as uncertain, preserving its source', async () => {
   const { runtime } = setupMainOwnedWorkspace()
   await rig.store.setSessionTabVisibility(id, false)
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
index c7c3a0a9dee7..7b49ec5f27ad 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
@@ -129,15 +129,16 @@ export async function executeStructuredSessionSwitch(
               captureSwitchWitness: execution.invocationId
             })
             deadline.check()
-            switchWitness = inspection.switchWitness
+            switchWitness = 'switchWitness' in inspection ? inspection.switchWitness : undefined
             witnessBudget = deadline.remaining()
             if (inspection.childProcessEvidence !== 'no-children') {
-              throw agentSessionRefusalError('agent_session_operation_invalid', {
-                reason:
-                  inspection.childProcessEvidence === 'children'
-                    ? 'conversationOpenInTerminal'
-                    : 'outcomeUnknown'
-              })
+              throw inspection.childProcessEvidence === 'children'
+                ? agentSessionRefusalError('agent_session_operation_invalid', {
+                    reason: 'conversationOpenInTerminal'
+                  })
+                : agentSessionRefusalError('agent_session_operation_unknown', {
+                    reason: 'outcomeUnknown'
+                  })
             }
           }
           // Initial creation already imported this source before committing its record.
diff --git a/src/main/runtime/session-graph/session-window-graph-leaf.ts b/src/main/runtime/session-graph/session-window-graph-leaf.ts
index 0e35b8bcb012..0681fac23c24 100644
--- a/src/main/runtime/session-graph/session-window-graph-leaf.ts
+++ b/src/main/runtime/session-graph/session-window-graph-leaf.ts
@@ -1,5 +1,5 @@
 import type { RuntimeSyncWindowGraph } from '../../../shared/runtime-session-contracts'
-import type { RuntimeLeafRecord } from '../runtime-terminal-state-records'
+import type { RuntimeLeafRecord, RuntimePtyWorktreeRecord } from '../runtime-terminal-state-records'
 
 export function runtimeGraphLeaf(
   leaf: RuntimeSyncWindowGraph['leaves'][number],
@@ -8,7 +8,7 @@ export function runtimeGraphLeaf(
   ptyGeneration: number,
   connected: boolean,
   graphStatus: string,
-  tailSource: Partial<RuntimeLeafRecord> | undefined,
+  tailSource: Partial<RuntimeLeafRecord | RuntimePtyWorktreeRecord> | undefined,
   graphSyncedAt: number
 ): RuntimeLeafRecord {
   return {
diff --git a/src/main/runtime/structured-agent-session-windowless-layout-host.test.ts b/src/main/runtime/structured-agent-session-windowless-layout-host.test.ts
index 350d15c813ab..fa197cb1a81f 100644
--- a/src/main/runtime/structured-agent-session-windowless-layout-host.test.ts
+++ b/src/main/runtime/structured-agent-session-windowless-layout-host.test.ts
@@ -400,7 +400,7 @@ it.each([
     worktreeId: WT
   })
   spawnState.result = reply
-  const commit: PtySpawnCommitInput<typeof reply> = {
+  const commit: PtySpawnCommitInput = {
     state: spawnState,
     nativeWindowsConptySpawn: false,
     seedPaneKey: null,
@@ -412,13 +412,11 @@ it.each([
     },
     preAllocatedHandle: null,
     paneKey: null,
-    memorySessionId: null,
     resumeArgvDropped: false,
     codexLaunchEnv: undefined,
     initiallyHidden: false,
     hiddenDelivery: 'runtime-owned',
-    earlyExit: 'throw',
-    joinPayload: { reservation: reply, reply }
+    response: reply
   }
   const counts = () => ({
     ...Object.fromEntries(Object.entries(probes).map(([key, spy]) => [key, spy.mock.calls.length])),
@@ -427,7 +425,7 @@ it.each([
     ...visits
   })
   try {
-    expect(await publishCommittedPtySpawn(commit)).toBe(reply)
+    expect((await publishCommittedPtySpawn(commit)).result).toBe(reply)
     const beforeDrain = counts()
     await Promise.all(dismissals.mock.results.map(({ value }) => value))
     await settled()
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-create-owner.ts b/src/main/runtime/terminal/launch/mobile-terminal-create-owner.ts
index f6eb84baca3a..dd33511d1381 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-create-owner.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-create-owner.ts
@@ -17,25 +17,11 @@ export abstract class OrcaRuntimeWithMobileTerminalCreateOwner extends OrcaRunti
     request: Omit<AgentLaunchTabPublishRequest, 'requestId'>
   ): Promise<AgentLaunchTabPublished> | null
 
-  abstract publishAgentLaunchTabInMainLayout(
-    request: Omit<AgentLaunchTabPublishRequest, 'requestId'>,
-    check?: () => void
-  ): Promise<AgentLaunchTabPublished> | null
-
   abstract reportAgentLaunchPaneVerdict(
     pane: AgentLaunchPaneAddress,
     verdict: AgentLaunchPaneVerdict
   ): void
 
-  abstract withdrawAgentLaunchPaneInMainLayout(
-    pane: AgentLaunchPaneAddress,
-    current?: () => boolean,
-    withdrawalRoot?: string,
-    publicationOwner?: 'main' | 'window'
-  ): Promise<boolean>
-
-  abstract hasLiveTerminalForPaneKey(paneKey: string): boolean
-
   protected abstract resolveMobileSessionTerminalCommand(
     workspace: TerminalWorkspaceLaunchScope,
     opts: MobileTerminalCommandOptions
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx b/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx
index cc6f48fd07ed..c4dd8e9361b8 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx
+++ b/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx
@@ -104,7 +104,7 @@ function History({
   originalPaneTarget = null
 }: {
   session: AiVaultSession
-  originalPaneTarget?: { worktreeId: string; tabId: string; paneKey: string } | null
+  originalPaneTarget?: { worktreeId: string; tabId: string; paneKey: string; leafId: string } | null
 }) {
   const state = useAppStore.getState()
   const targetState = {
@@ -280,7 +280,12 @@ it('routes a capable paired unowned row with a matching terminal through the sam
   render(
     <History
       session={session}
-      originalPaneTarget={{ worktreeId: 'workspace', tabId: 'terminal', paneKey: 'terminal:leaf' }}
+      originalPaneTarget={{
+        worktreeId: 'workspace',
+        tabId: 'terminal',
+        paneKey: 'terminal:leaf',
+        leafId: 'leaf'
+      }}
     />
   )
   await waitFor(() =>
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts b/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts
index 088a61f743b1..42f2964f218c 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts
@@ -96,6 +96,7 @@ function historyPaneSource(session: AiVaultSession, pane?: AiVaultOriginalPaneTa
     paneKey: pane.paneKey
   })
   return source &&
+    adoptsCliConversations(session.agent) &&
     source.executionHostId === session.executionHostId &&
     source.providerSessionId === session.sessionId &&
     cliConversationRowsShareAgent(source.agent, session.agent)
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-exit-return.test-fixture.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-exit-return.test-fixture.ts
index 74cb0068b2c4..79296a69e984 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-exit-return.test-fixture.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-exit-return.test-fixture.ts
@@ -233,6 +233,7 @@ export async function verifyExitedPaneHistoryReturn(
     switchAiVaultSessionToNativeChat(history, 'wt-1', {
       worktreeId: 'wt-1',
       tabId: 'shell',
+      leafId: LEAF_1,
       paneKey: pane.paneKey
     })
   ).toBe(true)
@@ -258,6 +259,7 @@ export async function verifyExitedPaneHistoryReturn(
       switchAiVaultSessionToNativeChat(history, 'wt-1', {
         worktreeId: 'wt-1',
         tabId: 'shell',
+        leafId: LEAF_1,
         paneKey: pane.paneKey
       })
     ).toBe(true)
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
index 4137936b2013..eb4f5c77b798 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
@@ -36,7 +36,7 @@ export async function reportCliChatResumeFailure(
 }
 
 export async function switchIntoOwnerLegacy(
-  source: Pick<CliChatResumeSource, 'agent' | 'tabId' | 'workspaceId'>,
+  source: Pick<AiVaultSession, 'agent'> & Pick<CliChatResumeSource, 'tabId' | 'workspaceId'>,
   structuredSession: NonNullable<AiVaultSession['structuredSession']>,
   target: RuntimeClientTarget
 ): Promise<boolean> {
@@ -104,7 +104,7 @@ export async function switchIntoOwnerLegacy(
 
 /** Explicit returns await the selected child; ordinary lazy creation remains unchanged. */
 export async function startCliChatReturn(
-  source: Pick<CliChatResumeSource, 'agent'>,
+  source: Pick<AiVaultSession, 'agent'>,
   sessionId: string,
   target: RuntimeClientTarget
 ): Promise<boolean> {
diff --git a/src/renderer/src/lib/conversation-surface-switch.ts b/src/renderer/src/lib/conversation-surface-switch.ts
index 263719fab7c7..62ebf2a7033e 100644
--- a/src/renderer/src/lib/conversation-surface-switch.ts
+++ b/src/renderer/src/lib/conversation-surface-switch.ts
@@ -210,7 +210,7 @@ export async function runConversationSwitch(args: ConversationSwitch): Promise<b
             }
           : openStructuredAgentSessionProvisionalTab({
               worktreeId: answer.workspaceId,
-              executionHostId: args.executionHostId,
+              executionHostId: hostId,
               sessionId,
               agent: answer.agent,
               targetGroupId: answer.placement?.groupId,
diff --git a/src/renderer/src/lib/conversation-switch-legacy.ts b/src/renderer/src/lib/conversation-switch-legacy.ts
index 6272d0b9db06..2d51a3cb0e67 100644
--- a/src/renderer/src/lib/conversation-switch-legacy.ts
+++ b/src/renderer/src/lib/conversation-switch-legacy.ts
@@ -30,4 +30,5 @@ export function runLegacyConversationSwitch(args: ConversationSwitch, target: Ru
       newAgentLaunchRequestId()
     )
   }
+  return undefined
 }
diff --git a/src/renderer/src/runtime/server-layout-frames.ts b/src/renderer/src/runtime/server-layout-frames.ts
index c546a661de5a..6140b7f2b00e 100644
--- a/src/renderer/src/runtime/server-layout-frames.ts
+++ b/src/renderer/src/runtime/server-layout-frames.ts
@@ -35,7 +35,7 @@ import {
 
 type FramesStore = {
   getState: () => AppState
-  setState: (patch: Partial<AppState>) => void
+  setState: (patch: Partial<AppState> | ((state: AppState) => Partial<AppState>)) => void
   subscribe: (listener: (state: AppState) => void) => () => void
 }
 
diff --git a/src/renderer/src/store/slices/tabs-drawn-from-main.test-fixture.ts b/src/renderer/src/store/slices/tabs-drawn-from-main.test-fixture.ts
index 0e3769754703..5f44f9a74d95 100644
--- a/src/renderer/src/store/slices/tabs-drawn-from-main.test-fixture.ts
+++ b/src/renderer/src/store/slices/tabs-drawn-from-main.test-fixture.ts
@@ -13,7 +13,7 @@ import type { AppState } from '../types'
 
 type DrawnStore = {
   getState: () => AppState
-  setState: (patch: Partial<AppState>) => void
+  setState: (patch: Partial<AppState> | ((state: AppState) => Partial<AppState>)) => void
   subscribe: (listener: (state: AppState) => void) => () => void
 }
 
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-session-switch.test.ts b/tests/e2e/mobile-terminal-session-switch.unit.test.ts
similarity index 88%
rename from src/main/runtime/terminal/launch/mobile-terminal-session-switch.test.ts
rename to tests/e2e/mobile-terminal-session-switch.unit.test.ts
index 52d92570fadd..4e79974b1a50 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-session-switch.test.ts
+++ b/tests/e2e/mobile-terminal-session-switch.unit.test.ts
@@ -3,20 +3,23 @@ import { createTabsSliceMockApi } from '@/store/slices/tabs-slice-test-harness'
 import { publishAgentLaunchTab as windowPublish } from '@/lib/agent-launch-tab-publication'
 import { applyAgentLaunchPaneVerdict } from '@/lib/agent-launch-pane-verdict-application'
 import { acceptAgentLaunchPaneAttempt } from '@/lib/agent-launch-pane-start'
-import { agentSessionSwitchDeadline } from '../../../../shared/agent-session-switch-execution'
+import { agentSessionSwitchDeadline } from '../../src/shared/agent-session-switch-execution'
 import { afterEach, expect, it, vi } from 'vitest'
-import '../../orca-runtime-test-lifecycle.spec'
-import { OrcaRuntimeService, electronMocks } from '../../orca-runtime-test-mocks.spec'
+import '../../src/main/runtime/orca-runtime-test-lifecycle.spec'
+import {
+  OrcaRuntimeService,
+  electronMocks
+} from '../../src/main/runtime/orca-runtime-test-mocks.spec'
 import {
   TEST_WORKTREE_ID as wt,
   makeRuntimeStoreWithWorkspaceSession,
   makeWorkspaceSessionWithHeadlessTerminal
-} from '../../orca-runtime-test-fixtures.spec'
-import { withChatTabChanges } from '../../agent-session/agent-session-tab-layout'
-import { committingSpawn } from '../../bind-first-pane.test-fixture'
-import type { RuntimeNotifier } from '../../runtime-notifier-contract'
-import { DaemonRequestTimeoutError } from '../../../daemon/daemon-errors'
-import type { RuntimePtyController } from '../../runtime-pty-controller-contract'
+} from '../../src/main/runtime/orca-runtime-test-fixtures.spec'
+import { withChatTabChanges } from '../../src/main/runtime/agent-session/agent-session-tab-layout'
+import { committingSpawn } from '../../src/main/runtime/bind-first-pane.test-fixture'
+import type { RuntimeNotifier } from '../../src/main/runtime/runtime-notifier-contract'
+import { DaemonRequestTimeoutError } from '../../src/main/daemon/daemon-errors'
+import type { RuntimePtyController } from '../../src/main/runtime/runtime-pty-controller-contract'
 
 const renderer = vi.hoisted(() => {
   const ref: { store: ReturnType<typeof createTestStore> | null } = { store: null }
@@ -33,7 +36,7 @@ vi.mock('@/hooks/ipc-events/terminal-command-state', () => ({
   focusTerminalInitiatedTab: () => {}
 }))
 
-vi.mock('../../../../shared/layout-owner-switch', () => ({ ORCA_LAYOUT_OWNER_IS_MAIN: false }))
+vi.mock('../../src/shared/layout-owner-switch', () => ({ ORCA_LAYOUT_OWNER_IS_MAIN: false }))
 
 async function setup(outcome: 'ready' | 'failed' | 'unknown' = 'ready') {
   createTabsSliceMockApi()
@@ -97,7 +100,7 @@ async function setup(outcome: 'ready' | 'failed' | 'unknown' = 'ready') {
     })
   )
   const { createMobileCreateTestNotifier } =
-    await import('../../orca-runtime-test-scenario-builders.spec')
+    await import('../../src/main/runtime/orca-runtime-test-scenario-builders.spec')
   service.setNotifier({
     ...createMobileCreateTestNotifier(vi.fn()),
     revealTerminalSession: reveal,
@@ -173,6 +176,9 @@ it('expires after preparation/publication without dispatching spawn, keeping the
   const original = publish.getMockImplementation()!
   publish.mockImplementation(async (request) => {
     const answer = await original(request)
+    if (!answer) {
+      throw new Error('missing window publication')
+    }
     expired = true
     return answer
   })
@@ -225,6 +231,9 @@ it.each(['input', 'replacement', 'preparing', 'layout'] as const)(
     const original = publish.getMockImplementation()!
     publish.mockImplementation(async (request) => {
       const receipt = await original(request)
+      if (!receipt) {
+        throw new Error('missing window publication')
+      }
       const key = `${request.tabId}:${request.leafId}`
       if (use === 'input') {
         renderer.store!.setState({ lastTerminalInputAtByPaneKey: { [key]: 1 } })
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.switch-readable.test.tsx b/tests/e2e/native-chat-switch-readable.unit.test.tsx
similarity index 75%
rename from src/renderer/src/components/native-chat/NativeChatStructuredSession.switch-readable.test.tsx
rename to tests/e2e/native-chat-switch-readable.unit.test.tsx
index 469fdc674451..5de15f356779 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.switch-readable.test.tsx
+++ b/tests/e2e/native-chat-switch-readable.unit.test.tsx
@@ -1,39 +1,41 @@
 import { writeFile } from 'node:fs/promises'
 import { join } from 'node:path'
-import * as cliTranscript from '../../../../main/ai-vault/structured-chat-cli-fork'
-import { createRestTestRig } from '../../../../main/native-chat/agent-session-wire/structured-agent-session-rest-test-rig'
+import * as cliTranscript from '../../src/main/ai-vault/structured-chat-cli-fork'
+import { createRestTestRig } from '../../src/main/native-chat/agent-session-wire/structured-agent-session-rest-test-rig'
 import {
   createTestParams,
   CREATE_TEST_CALLER
-} from '../../../../main/native-chat/agent-session-wire/structured-agent-session-create-test-fixture'
-import { HOST_TEST_SESSION } from '../../../../main/native-chat/agent-session-wire/structured-agent-session-host-test-data'
-import { setStructuredAgentSessionHost } from '../../../../main/native-chat/agent-session-wire/structured-agent-session-registry'
+} from '../../src/main/native-chat/agent-session-wire/structured-agent-session-create-test-fixture'
+import { HOST_TEST_SESSION } from '../../src/main/native-chat/agent-session-wire/structured-agent-session-host-test-data'
+import { setStructuredAgentSessionHost } from '../../src/main/native-chat/agent-session-wire/structured-agent-session-registry'
 import {
   setupMainOwnedWorkspace,
   WORKTREE_ID
-} from '../../../../main/runtime/main-owned-workspace-runtime-fixture'
-import { executeStructuredSessionSwitch } from '../../../../main/runtime/rpc/methods/structured-agent-session-switch-execution'
-import { structuredAgentRuntimeRegistration } from '../../../../main/runtime/structured-agent-runtime-registrations'
-import { agentSessionProviderHandleChainHead } from '../../../../shared/agent-session-provider-handle'
+} from '../../src/main/runtime/main-owned-workspace-runtime-fixture'
+import { executeStructuredSessionSwitch } from '../../src/main/runtime/rpc/methods/structured-agent-session-switch-execution'
+import { structuredAgentRuntimeRegistration } from '../../src/main/runtime/structured-agent-runtime-registrations'
+import { agentSessionProviderHandleChainHead } from '../../src/shared/agent-session-provider-handle'
 import { act, cleanup, render, screen, waitFor } from '@testing-library/react'
 import { afterEach, expect, it, vi } from 'vitest'
-import { agentSessionRefusalError } from '../../../../shared/agent-session-wire-refusals'
+import { agentSessionRefusalError } from '../../src/shared/agent-session-wire-refusals'
 import { beginSwitchPresentation } from '@/lib/conversation-switch-presentation'
-import { NativeChatStructuredSession } from './NativeChatStructuredSession'
+import { NativeChatStructuredSession } from '../../src/renderer/src/components/native-chat/NativeChatStructuredSession'
 import {
   stubLayout,
   stubResizeObserver,
   deliverResizes
-} from './native-chat-windowing-test-harness'
-import { resetStructuredAgentSessionReadOwnersForTests } from './structured-agent-session-read-owner'
-import type { AgentSessionHistoryResult } from '../../../../shared/agent-session-wire'
+} from '../../src/renderer/src/components/native-chat/native-chat-windowing-test-harness'
+import { resetStructuredAgentSessionReadOwnersForTests } from '../../src/renderer/src/components/native-chat/structured-agent-session-read-owner'
+import type { AgentSessionHistoryResult } from '../../src/shared/agent-session-wire'
 import type * as StructuredAgentSessionClientModule from '@/runtime/structured-agent-session-client'
-import type { AgentSessionSubscribeEvent } from '../../../../shared/agent-session-wire'
+import type { AgentSessionSubscribeEvent } from '../../src/shared/agent-session-wire'
 
 // @vitest-environment happy-dom
 
 const { mocks, moduleFactories, resetStructuredSessionMocks } = await vi.hoisted(async () =>
-  (await import('./NativeChatStructuredSession.test-harness')).createStructuredSessionMocks()
+  (
+    await import('../../src/renderer/src/components/native-chat/NativeChatStructuredSession.test-harness')
+  ).createStructuredSessionMocks()
 )
 const feed = vi.hoisted(() => ({ cursor: { epoch: 'epoch', sequence: 1 } }))
 vi.mock('@/lib/structured-agent-session-launch', () =>
@@ -62,12 +64,24 @@ vi.mock('@/runtime/structured-agent-session-client', async (actual) => ({
   subscribeStructuredAgentSessionStatus: async () => ({ unsubscribe: () => {} }),
   supportsStructuredAgentSessionQuietRepeatedStop: async () => false
 }))
-vi.mock('./use-native-chat-font-size', () => moduleFactories.useNativeChatFontSize())
-vi.mock('./use-native-chat-file-link-context', () => moduleFactories.useNativeChatFileLinkContext())
-vi.mock('./use-native-chat-file-link-click', () => moduleFactories.useNativeChatFileLinkClick())
-vi.mock('./NativeChatComposer', () => moduleFactories.nativeChatComposer())
-vi.mock('./NativeChatApprovalCard', () => moduleFactories.nativeChatApprovalCard())
-vi.mock('./NativeChatQuestionCard', () => moduleFactories.nativeChatQuestionCard())
+vi.mock('../../src/renderer/src/components/native-chat/use-native-chat-font-size', () =>
+  moduleFactories.useNativeChatFontSize()
+)
+vi.mock('../../src/renderer/src/components/native-chat/use-native-chat-file-link-context', () =>
+  moduleFactories.useNativeChatFileLinkContext()
+)
+vi.mock('../../src/renderer/src/components/native-chat/use-native-chat-file-link-click', () =>
+  moduleFactories.useNativeChatFileLinkClick()
+)
+vi.mock('../../src/renderer/src/components/native-chat/NativeChatComposer', () =>
+  moduleFactories.nativeChatComposer()
+)
+vi.mock('../../src/renderer/src/components/native-chat/NativeChatApprovalCard', () =>
+  moduleFactories.nativeChatApprovalCard()
+)
+vi.mock('../../src/renderer/src/components/native-chat/NativeChatQuestionCard', () =>
+  moduleFactories.nativeChatQuestionCard()
+)
 const restores: (() => void)[] = []
 const disposals: (() => Promise<void>)[] = []
 afterEach(async () => {
@@ -143,7 +157,14 @@ it.each(['readable', 'refused', 'unmounted'] as const)(
       agent: 'codex',
       cwd: rig.root,
       providerSessionId: nativeId,
-      registration: structuredAgentRuntimeRegistration('codex')!
+      registration: structuredAgentRuntimeRegistration('codex')!,
+      requireCurrent: () => {
+        const current = rig.store.requireWritableRecord(record.sessionId)
+        expect(current.location).toEqual(record.location)
+        expect(agentSessionProviderHandleChainHead(current.providerHandleChain)?.linkId).toBe(
+          head.linkId
+        )
+      }
     })
     vi.spyOn(cliTranscript, 'prepareStructuredChatCliTranscript').mockResolvedValue({
       useRealCodexHome: false,
@@ -181,7 +202,7 @@ it.each(['readable', 'refused', 'unmounted'] as const)(
       throw new Error('missing presentation')
     }
     const page = await rig.host.history({ sessionId: HOST_TEST_SESSION, direction: 'tail' })
-    if (!page.ok) {
+    if (!page.ok || !page.page.liveCursor) {
       throw new Error('missing imported history')
     }
     feed.cursor = page.page.liveCursor
diff --git a/src/renderer/src/runtime/runtime-environment-switch-dispatch-clock.test.ts b/tests/e2e/runtime-environment-switch-dispatch-clock.unit.test.ts
similarity index 78%
rename from src/renderer/src/runtime/runtime-environment-switch-dispatch-clock.test.ts
rename to tests/e2e/runtime-environment-switch-dispatch-clock.unit.test.ts
index 7c0f7804c73c..4bd3cd7aecee 100644
--- a/src/renderer/src/runtime/runtime-environment-switch-dispatch-clock.test.ts
+++ b/tests/e2e/runtime-environment-switch-dispatch-clock.unit.test.ts
@@ -1,11 +1,11 @@
 import { afterEach, expect, it, vi } from 'vitest'
-import { registerRuntimeEnvironmentSubscriptionHandlers } from '../../../main/ipc/runtime-environments/runtime-environment-subscription-handlers'
-import { subscribeRuntimeEnvironmentFromPreload } from '../../../preload/runtime-environment-subscriptions'
-import { sendSharedControlSubscription } from '../../../shared/remote-runtime/control/remote-runtime-shared-control-send'
-import type { SharedControlLogicalSubscription } from '../../../shared/remote-runtime/control/remote-runtime-shared-control-types'
-import { agentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
-import { callAbortableRuntimeEnvironment } from './abortable-runtime-environment-call'
-import { stubRuntimeEnvironmentBridge } from './runtime-environment-bridge-fixture'
+import { registerRuntimeEnvironmentSubscriptionHandlers } from '../../src/main/ipc/runtime-environments/runtime-environment-subscription-handlers'
+import { subscribeRuntimeEnvironmentFromPreload } from '../../src/preload/runtime-environment-subscriptions'
+import { sendSharedControlSubscription } from '../../src/shared/remote-runtime/control/remote-runtime-shared-control-send'
+import type { SharedControlLogicalSubscription } from '../../src/shared/remote-runtime/control/remote-runtime-shared-control-types'
+import { agentSessionSwitchDeadline } from '../../src/shared/agent-session-switch-execution'
+import { callAbortableRuntimeEnvironment } from '../../src/renderer/src/runtime/abortable-runtime-environment-call'
+import { stubRuntimeEnvironmentBridge } from '../../src/renderer/src/runtime/runtime-environment-bridge-fixture'
 
 // @vitest-environment happy-dom
 
@@ -13,16 +13,19 @@ type SubscriptionIpc = Parameters<typeof subscribeRuntimeEnvironmentFromPreload>
 type SubscriptionEvent = Parameters<Parameters<SubscriptionIpc['on']>[1]>[1]
 const mocks = vi.hoisted(() => ({ handle: vi.fn(), subscribe: vi.fn() }))
 vi.mock('electron', () => ({ ipcMain: { handle: mocks.handle, on: vi.fn() } }))
-vi.mock('../../../shared/runtime-environment-store', () => ({
+vi.mock('../../src/shared/runtime-environment-store', () => ({
   resolveEnvironment: () => ({ id: 'paired', createdAt: 1, runtimeId: 'host' })
 }))
-vi.mock('../../../main/ipc/runtime-environments/runtime-environment-connectivity-handlers', () => ({
-  isRuntimeEnvironmentManuallyDisconnected: () => false
-}))
-vi.mock('../../../main/ipc/runtime-environments/runtime-environment-transport-generation', () => ({
+vi.mock(
+  '../../src/main/ipc/runtime-environments/runtime-environment-connectivity-handlers',
+  () => ({
+    isRuntimeEnvironmentManuallyDisconnected: () => false
+  })
+)
+vi.mock('../../src/main/ipc/runtime-environments/runtime-environment-transport-generation', () => ({
   getRuntimeEnvironmentTransportGeneration: () => 1
 }))
-vi.mock('../../../main/ipc/runtime-environments/runtime-environment-transport-routing', () => ({
+vi.mock('../../src/main/ipc/runtime-environments/runtime-environment-transport-routing', () => ({
   subscribeRuntimeEnvironment: mocks.subscribe
 }))
 afterEach(() => {
@@ -43,7 +46,7 @@ it.each(['ready after expiry', 'delayed sent receipt'] as const)(
     const sender = {
       id: 1,
       isDestroyed: () => false,
-      once: vi.fn(),
+      on: vi.fn(),
       removeListener: vi.fn(),
       send: (_channel: string, payload: SubscriptionEvent) => {
         queuedEvents.push(() => deliver?.(null, payload))
@@ -122,7 +125,8 @@ it.each(['ready after expiry', 'delayed sent receipt'] as const)(
       sent,
       deadline.delegateSend()
     )
-    const rejected = expect(call).rejects.toThrow()
+    void call.catch(() => undefined)
+    expect(mocks.subscribe).toHaveBeenCalledOnce()
     if (schedule === 'ready after expiry') {
       await vi.advanceTimersByTimeAsync(36_000)
       ready.resolve()
@@ -149,7 +153,7 @@ it.each(['ready after expiry', 'delayed sent receipt'] as const)(
     for (const send of queuedEvents.splice(0)) {
       send()
     }
-    await rejected
+    await expect(call).rejects.toThrow()
     deadline.dispose()
   }
 )

From b82a2bb1e09253f5e83fc8e033c7d094832d8cb9 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Tue, 27 Oct 2026 02:32:36 -0700
Subject: [PATCH 080/207] Fix switch execution test fixture contracts

---
 src/main/ipc/pty/spawn-commit-binding.test.ts |  8 +++----
 ...red-agent-session-at-rest-catch-up.test.ts | 11 ++++++++-
 ...red-agent-session-switch-execution.test.ts | 24 +++++++++++++++----
 3 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/src/main/ipc/pty/spawn-commit-binding.test.ts b/src/main/ipc/pty/spawn-commit-binding.test.ts
index 02921753af38..5a567c60ce14 100644
--- a/src/main/ipc/pty/spawn-commit-binding.test.ts
+++ b/src/main/ipc/pty/spawn-commit-binding.test.ts
@@ -64,9 +64,9 @@ it('reconciles a dispatched child through real topology creation after a queued
   const recovered = result.switchRecoveredSurface!
   expect(recovered.tabId).not.toBe(tabId)
   const session = store.getWorkspaceSession()
-  expect(session.terminalLayoutsByTabId?.[tabId]?.ptyIdsByLeafId[leafId]).toBe('B')
-  expect(session.terminalLayoutsByTabId?.[recovered.tabId]?.ptyIdsByLeafId[recovered.leafId]).toBe(
-    'A'
-  )
+  expect(session.terminalLayoutsByTabId?.[tabId]?.ptyIdsByLeafId?.[leafId]).toBe('B')
+  expect(
+    session.terminalLayoutsByTabId?.[recovered.tabId]?.ptyIdsByLeafId?.[recovered.leafId]
+  ).toBe('A')
   expect(session.tabsByWorktree[worktreeId].some((row) => row.id === recovered.tabId)).toBe(true)
 })
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.test.ts
index a49a4c54f8f7..6b177a31bebd 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.test.ts
@@ -31,8 +31,17 @@ const options = () => ({
   }
 })
 const threadId = '019aef12-1234-7000-8000-123456789abc'
+type CodexTranscriptFixturePayload =
+  | { id: string }
+  | { type: 'task_started' | 'task_complete'; turn_id: string }
+  | {
+      type: 'message'
+      role: 'user' | 'assistant'
+      content: { type: 'input_text' | 'output_text'; text: string }[]
+    }
+
 function transcript(complete: boolean) {
-  const row = (type: string, payload: object) =>
+  const row = (type: string, payload: CodexTranscriptFixturePayload) =>
     JSON.stringify({
       timestamp: '2026-10-26T12:00:00Z',
       type,
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
index 19a08ad3fb6a..e02efc77c416 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
@@ -1,8 +1,9 @@
 import { writeFile } from 'node:fs/promises'
 import { join } from 'node:path'
 import * as cliTranscript from '../../../ai-vault/structured-chat-cli-fork'
-import { structuredAgentRuntimeRegistration } from '../../structured-agent-runtime-registrations'
+import { structuredAgentRuntimeMetadata } from '../../structured-agent-runtime-metadata'
 import { agentSessionProviderHandleChainHead } from '../../../../shared/agent-session-provider-handle'
+import { captureTerminalSurfaceIdentity } from '../../../../shared/terminal-tab-close'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import {
   createRestTestRig,
@@ -14,7 +15,12 @@ import {
 } from '../../../native-chat/agent-session-wire/structured-agent-session-create-test-fixture'
 import { HOST_TEST_SESSION as id } from '../../../native-chat/agent-session-wire/structured-agent-session-host-test-data'
 import { setStructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-registry'
-import { setupMainOwnedWorkspace, WORKTREE_ID } from '../../main-owned-workspace-runtime-fixture'
+import {
+  setupMainOwnedWorkspace,
+  WORKTREE_ID,
+  TAB_ID,
+  LEAF_A
+} from '../../main-owned-workspace-runtime-fixture'
 import { executeStructuredSessionSwitch } from './structured-agent-session-switch-execution'
 import { SwitchToChatParams, SwitchToTerminalParams } from './structured-agent-session-schemas'
 import { STRUCTURED_AGENT_SESSION_SWITCH_TO_CHAT_METHODS } from './structured-agent-session-switch-to-chat'
@@ -182,7 +188,11 @@ it('keeps opened chat visible and returns the exact committed selected start fai
 it.each(['children', 'unknown'] as const)(
   'retains the source with a factual typed refusal when inspection reports %s',
   async (evidence) => {
-    const { runtime } = setupMainOwnedWorkspace()
+    const { runtime, session } = setupMainOwnedWorkspace()
+    const identity = captureTerminalSurfaceIdentity(session(), WORKTREE_ID, TAB_ID, LEAF_A)
+    if (!identity) {
+      throw new Error('Expected the workspace fixture terminal surface')
+    }
     vi.spyOn(runtime, 'inspectTerminalProcess').mockResolvedValue(
       evidence === 'children'
         ? { foregroundProcess: 'codex', hasChildProcesses: true, childProcessEvidence: 'children' }
@@ -199,7 +209,11 @@ it.each(['children', 'unknown'] as const)(
         sessionId: id,
         execution: {
           invocationId: 'inspection',
-          source: { terminal: 'source', expectedIncarnationId: 'source-incarnation' }
+          source: {
+            terminal: 'source',
+            expectedIncarnationId: 'source-incarnation',
+            originalPresentation: { identity, holders: [{ hostId: 'local', identity }] }
+          }
         }
       },
       { runtime },
@@ -331,7 +345,7 @@ it('keeps an opened readable chat successful when conditional source-shell clean
     cwd: rig.root,
     providerSessionId: nativeId,
     requireCurrent: vi.fn(),
-    registration: structuredAgentRuntimeRegistration('codex')!
+    metadata: structuredAgentRuntimeMetadata('codex')!
   })
   vi.spyOn(cliTranscript, 'prepareStructuredChatCliTranscript').mockResolvedValue({
     useRealCodexHome: false,

From 6d3b6c5e412d1dce1c62a735ccfd7238c8678932 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Tue, 27 Oct 2026 03:14:26 -0700
Subject: [PATCH 081/207] Consolidate switch imports and type the mobile
 fixture store

---
 src/main/daemon/daemon-pty-spawn-request.ts          |  6 ++++--
 src/main/daemon/session-process-inspection.ts        |  4 +---
 .../structured-agent-session-switch-to-chat.ts       |  4 ++--
 src/main/runtime/runtime-pty-controller-contract.ts  |  6 ++++--
 .../main-layout-agent-launch-tabs.test.ts            |  6 ++++--
 src/preload/api/runtime-api.ts                       |  6 ++++--
 src/preload/api/runtime-environments-bridge.ts       |  6 ++++--
 src/preload/runtime-environment-subscriptions.ts     |  6 ++++--
 .../native-chat/NativeChatTopRightControls.tsx       |  6 ++++--
 .../native-chat-structured-session-notices.ts        | 12 ++++++------
 .../right-sidebar/AiVaultSessionActionMenuItems.tsx  |  3 +--
 .../AiVaultSessionSurfaceSwitchMenuItems.tsx         |  3 +--
 .../components/tab-bar/CliChatResumeMenuItems.tsx    |  3 +--
 .../tab-bar/NativeChatCliForkMenuItems.tsx           |  6 ++++--
 .../tab-bar/TabSessionSwitchHoverAction.tsx          |  8 +++++---
 .../src/components/tab-bar/cli-chat-resume-run.ts    | 10 +++++-----
 .../components/tab-bar/native-chat-cli-switch-run.ts |  6 ++++--
 .../terminal-pane/TerminalPaneResumeInChatButton.tsx |  3 +--
 .../terminal-pane/pane-foreground-agent-tracker.ts   |  4 ++--
 .../src/lib/agent-launch-tab-main-written.ts         |  3 +--
 src/renderer/src/runtime/runtime-rpc-client.ts       |  6 ++++--
 .../src/store/slices/tabs/tabs-label-actions.ts      |  3 +--
 .../e2e/mobile-terminal-session-switch.unit.test.ts  |  4 +++-
 tests/e2e/native-chat-switch-readable.unit.test.tsx  |  6 ++++--
 24 files changed, 74 insertions(+), 56 deletions(-)

diff --git a/src/main/daemon/daemon-pty-spawn-request.ts b/src/main/daemon/daemon-pty-spawn-request.ts
index fa331b49f600..04fe2374ae74 100644
--- a/src/main/daemon/daemon-pty-spawn-request.ts
+++ b/src/main/daemon/daemon-pty-spawn-request.ts
@@ -1,4 +1,7 @@
-import { SESSION_SWITCH_PHYSICAL_PROTOCOL_VERSION } from './daemon-protocol-version'
+import {
+  SESSION_SWITCH_PHYSICAL_PROTOCOL_VERSION,
+  HISTORY_SEED_TRANSFER_PROTOCOL_VERSION
+} from './daemon-protocol-version'
 import type { SpawnIntent } from '../../shared/host-spawn-admission'
 import type { ColdRestorePayload } from './cold-restore-payload-cache'
 import type { DaemonAuditObservation } from './daemon-audit-classifier'
@@ -9,7 +12,6 @@ import {
   type SnapshotCheckpointResult
 } from './daemon-pty-runtime-state'
 import { isDaemonGoneError } from './daemon-endpoint-errors'
-import { HISTORY_SEED_TRANSFER_PROTOCOL_VERSION } from './daemon-protocol-version'
 import type { ColdRestoreInfo } from './history-reader'
 import { NdjsonLineTooLongError } from './ndjson'
 import {
diff --git a/src/main/daemon/session-process-inspection.ts b/src/main/daemon/session-process-inspection.ts
index 433103b908f7..610e57725b18 100644
--- a/src/main/daemon/session-process-inspection.ts
+++ b/src/main/daemon/session-process-inspection.ts
@@ -2,9 +2,7 @@ import type { SessionOutputPlane } from './session-output-plane'
 
 import type { TerminalShellRecoveryBarrier } from './terminal-shell-recovery-barrier'
 
-import type { SubprocessHandle } from './session-subprocess-handle'
-
-import type { ChildProcessVerdictRead } from './session-subprocess-handle'
+import type { SubprocessHandle, ChildProcessVerdictRead } from './session-subprocess-handle'
 
 import { SessionSwitchUse } from './session-switch-use'
 
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-to-chat.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-to-chat.ts
index 973aca9c8f9d..b44fa9b35bd4 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-to-chat.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-to-chat.ts
@@ -1,7 +1,8 @@
 import {
   agentSessionRefusalFromReference,
   refuse,
-  refuseUnclassified
+  refuseUnclassified,
+  agentSessionRefusalError
 } from '../../../shared/agent-session-wire-refusals'
 import type { AgentSessionWireRefusal } from '../../../shared/agent-session-wire'
 import type { StructuredAgentSessionResumeOutcome } from './structured-agent-session-agent-start'
@@ -12,7 +13,6 @@ import {
   selectStructuredAgentSessionOperationChild
 } from './structured-agent-session-operation-child'
 import { structuredAgentSessionSwitchBlocked } from './structured-agent-session-switch-admission'
-import { agentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
 import { sameProviderChild } from './structured-agent-session-provider-child'
 import { recordStructuredAgentSessionStartFailure } from './structured-agent-session-start-failure-row'
 import { structuredAgentSessionEndedChildFailure } from './structured-agent-session-ended-child-failure'
diff --git a/src/main/runtime/runtime-pty-controller-contract.ts b/src/main/runtime/runtime-pty-controller-contract.ts
index 62aca5225cb6..e731d5a72ccc 100644
--- a/src/main/runtime/runtime-pty-controller-contract.ts
+++ b/src/main/runtime/runtime-pty-controller-contract.ts
@@ -22,7 +22,10 @@ import type {
   PtyProcessInfo,
   PtySpawnResult
 } from '../providers/pty-provider-contract'
-import type { PtyProcessInspection } from '../providers/pty-process-inspection'
+import type {
+  PtyProcessInspection,
+  PtyProcessInspectionOptions
+} from '../providers/pty-process-inspection'
 import type { WriteSettlement } from '../../shared/pty-write-settlement'
 import type { StartupCwdFallback } from '../../shared/startup-cwd-fallback'
 import type { TerminalInputKind } from '../../shared/terminal-input-kind'
@@ -32,7 +35,6 @@ import type {
   PtyFencedTerminationOutcome
 } from '../../shared/pty-fenced-termination'
 import type { AgentSessionSwitchAuthority } from '../../shared/agent-session-switch-execution'
-import type { PtyProcessInspectionOptions } from '../providers/pty-process-inspection'
 
 export type PtyInventoryRefreshOptions = {
   includeForegroundProcessEvidence?: boolean
diff --git a/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.test.ts b/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.test.ts
index 1fadc64dd078..231b9149ced7 100644
--- a/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.test.ts
+++ b/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.test.ts
@@ -1,11 +1,13 @@
 import { fixture as durableFixture } from '../../persistence/loading-store/profile-state-delayed-authority-fixture'
 import { OrcaRuntimeService } from '../orca-runtime'
 import { HEADLESS_RUNTIME_WINDOW_ID } from '../../../shared/runtime-session-contracts'
-import { trackRunningAgentLaunchPane } from '../../agent-launch/agent-launch-pane-attachment'
+import {
+  trackRunningAgentLaunchPane,
+  resetAgentLaunchPanesForTests
+} from '../../agent-launch/agent-launch-pane-attachment'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { WORKTREE_ID, setupMainOwnedWorkspace } from '../main-owned-workspace-runtime-fixture'
 import { publishAgentLaunchTabEarly } from '../rpc/methods/agent-launch-tab-publication'
-import { resetAgentLaunchPanesForTests } from '../../agent-launch/agent-launch-pane-attachment'
 
 // Layout-owner build, no window: an agent launch's early tab in a workspace main owns is written by
 // main, a retry finds it, and a withdrawn launch pane is taken back by main.
diff --git a/src/preload/api/runtime-api.ts b/src/preload/api/runtime-api.ts
index 346f77d3384c..0d0859aecb60 100644
--- a/src/preload/api/runtime-api.ts
+++ b/src/preload/api/runtime-api.ts
@@ -1,4 +1,7 @@
-import type { RuntimeRpcDispatchObservation } from '../../shared/runtime-rpc-envelope'
+import type {
+  RuntimeRpcDispatchObservation,
+  RuntimeRpcResponse
+} from '../../shared/runtime-rpc-envelope'
 import type { ManagedOrcadPreloadApi } from './managed-orcad-api'
 import type { WslHostsPreloadApi } from './wsl-hosts-api'
 import type { RuntimeHostStatusSnapshot } from '../../shared/runtime-host-status'
@@ -9,7 +12,6 @@ import type {
   RuntimeSyncWindowGraphResult,
   RuntimeTerminalDriverState
 } from '../../shared/runtime-types'
-import type { RuntimeRpcResponse } from '../../shared/runtime-rpc-envelope'
 import type { ClientHostedBrowserRowsEvent } from '../../shared/client-hosted-browser-rows'
 import type { SidebarInputsChangedEvent } from '../../shared/sidebar-list/sidebar-inputs-feed-contract'
 import type {
diff --git a/src/preload/api/runtime-environments-bridge.ts b/src/preload/api/runtime-environments-bridge.ts
index 0e870ed17d4b..3f6eabc89189 100644
--- a/src/preload/api/runtime-environments-bridge.ts
+++ b/src/preload/api/runtime-environments-bridge.ts
@@ -1,4 +1,7 @@
-import type { RuntimeRpcDispatchObservation } from '../../shared/runtime-rpc-envelope'
+import type {
+  RuntimeRpcDispatchObservation,
+  RuntimeRpcResponse
+} from '../../shared/runtime-rpc-envelope'
 import { ipcRenderer } from 'electron'
 import {
   RUNTIME_HOST_STATUS_CHANNEL,
@@ -6,7 +9,6 @@ import {
 } from '../../shared/runtime-host-status'
 import type { VerifyAndAddRuntimeEnvironmentResult } from '../../shared/remote-pairing-verification'
 import type { RuntimeStatus } from '../../shared/runtime-types'
-import type { RuntimeRpcResponse } from '../../shared/runtime-rpc-envelope'
 import type {
   PublicKnownRuntimeEnvironment,
   RuntimeEnvironmentRemoval
diff --git a/src/preload/runtime-environment-subscriptions.ts b/src/preload/runtime-environment-subscriptions.ts
index 677260549523..e756e8ac456b 100644
--- a/src/preload/runtime-environment-subscriptions.ts
+++ b/src/preload/runtime-environment-subscriptions.ts
@@ -1,5 +1,7 @@
-import type { RuntimeRpcDispatchObservation } from '../shared/runtime-rpc-envelope'
-import type { RuntimeRpcResponse } from '../shared/runtime-rpc-envelope'
+import type {
+  RuntimeRpcDispatchObservation,
+  RuntimeRpcResponse
+} from '../shared/runtime-rpc-envelope'
 
 type RuntimeEnvironmentSubscribeArgs = {
   subscriptionId?: string
diff --git a/src/renderer/src/components/native-chat/NativeChatTopRightControls.tsx b/src/renderer/src/components/native-chat/NativeChatTopRightControls.tsx
index 3aceeea8296c..d872d5a663e8 100644
--- a/src/renderer/src/components/native-chat/NativeChatTopRightControls.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatTopRightControls.tsx
@@ -1,4 +1,7 @@
-import { useConversationSwitchReadiness } from '@/lib/conversation-surface-switch'
+import {
+  useConversationSwitchReadiness,
+  runNativeChatCliSwitch
+} from '@/lib/conversation-surface-switch'
 import { isNativeChatEnabled } from '../../../../shared/structured-native-chat-launch-route'
 import { SquareTerminal } from 'lucide-react'
 import { Button } from '@/components/ui/button'
@@ -8,7 +11,6 @@ import { useAppStore } from '@/store'
 import { useInPlaceSwitchCapability } from '@/lib/in-place-switch-support'
 import { AI_VAULT_AGENTS } from '../../../../shared/ai-vault-types'
 import { SwitchToCliTooltipText } from '../right-sidebar/ai-vault-session-cli-fork-copy'
-import { runNativeChatCliSwitch } from '@/lib/conversation-surface-switch'
 import { resolveTabSessionHistorySubject } from '../tab-bar/tab-session-history-switch'
 import { NativeChatFindBar } from './NativeChatFindBar'
 import type { NativeChatFind } from './use-native-chat-find'
diff --git a/src/renderer/src/components/native-chat/native-chat-structured-session-notices.ts b/src/renderer/src/components/native-chat/native-chat-structured-session-notices.ts
index edbcfb61e359..ce12d4f3bf4f 100644
--- a/src/renderer/src/components/native-chat/native-chat-structured-session-notices.ts
+++ b/src/renderer/src/components/native-chat/native-chat-structured-session-notices.ts
@@ -1,5 +1,10 @@
 import { useNativeChatAvailabilityNotice } from './use-native-chat-availability-notice'
-import { useNativeChatClaudeSignIn } from './native-chat-claude-sign-in'
+import {
+  useNativeChatClaudeSignIn,
+  isClaudeSignInFailureKind,
+  nativeChatClaudeSignInLabel,
+  type NativeChatClaudeSignIn
+} from './native-chat-claude-sign-in'
 import { nativeChatAntigravitySignInContent } from './native-chat-antigravity-settings'
 import { translate } from '@/i18n/i18n'
 import type { StructuredAgentSessionLaunchLifecycle } from '@/lib/structured-agent-session-launch'
@@ -7,11 +12,6 @@ import { agentSessionRefusalCauseParts } from '../../../../shared/agent-session-
 import type { StructuredLaunchFailure } from '@/lib/structured-agent-session-launch-failure'
 import { joinSentences } from '../../../../shared/sentence-joining'
 import { agentSessionWriteNoticeText } from './agent-session-write-notice-text'
-import {
-  isClaudeSignInFailureKind,
-  nativeChatClaudeSignInLabel,
-  type NativeChatClaudeSignIn
-} from './native-chat-claude-sign-in'
 import type {
   NativeChatComposerNotice,
   NativeChatComposerNoticeContent
diff --git a/src/renderer/src/components/right-sidebar/AiVaultSessionActionMenuItems.tsx b/src/renderer/src/components/right-sidebar/AiVaultSessionActionMenuItems.tsx
index 8187d79f6ee6..0bcabbd4ab84 100644
--- a/src/renderer/src/components/right-sidebar/AiVaultSessionActionMenuItems.tsx
+++ b/src/renderer/src/components/right-sidebar/AiVaultSessionActionMenuItems.tsx
@@ -14,11 +14,10 @@ import { ContextMenuItem, ContextMenuSeparator } from '@/components/ui/context-m
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import { translate } from '@/i18n/i18n'
 import { AiVaultSessionSurfaceSwitchMenuItems } from './AiVaultSessionSurfaceSwitchMenuItems'
-import type { AiVaultAgent } from '../../../../shared/ai-vault-types'
+import type { AiVaultAgent, AiVaultSession } from '../../../../shared/ai-vault-types'
 import { isAiVaultFolderWorkspaceId } from './ai-vault-session-worktree-affordances'
 import { useAppStore } from '@/store'
 import { isNativeChatEnabled } from '../../../../shared/structured-native-chat-launch-route'
-import type { AiVaultSession } from '../../../../shared/ai-vault-types'
 
 export function SessionActionMenuItems({
   menuKind = 'dropdown',
diff --git a/src/renderer/src/components/right-sidebar/AiVaultSessionSurfaceSwitchMenuItems.tsx b/src/renderer/src/components/right-sidebar/AiVaultSessionSurfaceSwitchMenuItems.tsx
index 081b6f61dd37..758d2dbcfec9 100644
--- a/src/renderer/src/components/right-sidebar/AiVaultSessionSurfaceSwitchMenuItems.tsx
+++ b/src/renderer/src/components/right-sidebar/AiVaultSessionSurfaceSwitchMenuItems.tsx
@@ -1,13 +1,12 @@
 import type { AiVaultOriginalPaneTarget } from './ai-vault-original-pane'
 import { useConversationSwitchReadiness } from '@/lib/conversation-surface-switch'
 import { historyConversationSwitch } from './ai-vault-session-in-place-switch'
-import type { AiVaultSession } from '../../../../shared/ai-vault-types'
+import type { AiVaultSession, AiVaultAgent } from '../../../../shared/ai-vault-types'
 import { MessagesSquare, SquareTerminal } from 'lucide-react'
 import { DropdownMenuItem } from '@/components/ui/dropdown-menu'
 import { ContextMenuItem } from '@/components/ui/context-menu'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import { translate } from '@/i18n/i18n'
-import type { AiVaultAgent } from '../../../../shared/ai-vault-types'
 import { LoadingSpinner } from '@/components/LoadingSpinner'
 import { ResumeInNewCliTooltipText, SwitchToCliTooltipText } from './ai-vault-session-cli-fork-copy'
 
diff --git a/src/renderer/src/components/tab-bar/CliChatResumeMenuItems.tsx b/src/renderer/src/components/tab-bar/CliChatResumeMenuItems.tsx
index 960e8afe4141..093a986c311b 100644
--- a/src/renderer/src/components/tab-bar/CliChatResumeMenuItems.tsx
+++ b/src/renderer/src/components/tab-bar/CliChatResumeMenuItems.tsx
@@ -1,4 +1,4 @@
-import { useConversationSwitchReadiness } from '@/lib/conversation-surface-switch'
+import { useConversationSwitchReadiness, runCliChatResume } from '@/lib/conversation-surface-switch'
 import { isNativeChatEnabled } from '../../../../shared/structured-native-chat-launch-route'
 import { useShallow } from 'zustand/react/shallow'
 import { useAppStore } from '@/store'
@@ -6,7 +6,6 @@ import { DropdownMenuSeparator } from '@/components/ui/dropdown-menu'
 import type { TerminalTab } from '../../../../shared/terminal-tab-types'
 import { AiVaultSessionSurfaceSwitchMenuItems } from '../right-sidebar/AiVaultSessionSurfaceSwitchMenuItems'
 import { resolveCliChatResumeSource, useCliChatResumeCapability } from './cli-chat-resume-source'
-import { runCliChatResume } from '@/lib/conversation-surface-switch'
 
 export function CliChatResumeMenuItems({
   tab,
diff --git a/src/renderer/src/components/tab-bar/NativeChatCliForkMenuItems.tsx b/src/renderer/src/components/tab-bar/NativeChatCliForkMenuItems.tsx
index 86678d59ed0f..a7b73d3c8d8f 100644
--- a/src/renderer/src/components/tab-bar/NativeChatCliForkMenuItems.tsx
+++ b/src/renderer/src/components/tab-bar/NativeChatCliForkMenuItems.tsx
@@ -1,4 +1,7 @@
-import { useConversationSwitchReadiness } from '@/lib/conversation-surface-switch'
+import {
+  useConversationSwitchReadiness,
+  runNativeChatCliSwitch
+} from '@/lib/conversation-surface-switch'
 import { useShallow } from 'zustand/react/shallow'
 import { isNativeChatEnabled } from '../../../../shared/structured-native-chat-launch-route'
 import { DropdownMenuSeparator } from '@/components/ui/dropdown-menu'
@@ -12,7 +15,6 @@ import {
 } from './tab-session-history-switch'
 import { runNativeChatCliFork, useNativeChatCliForkPending } from './native-chat-cli-fork-run'
 import { useInPlaceSwitchCapability } from '@/lib/in-place-switch-support'
-import { runNativeChatCliSwitch } from '@/lib/conversation-surface-switch'
 
 /** "Switch to CLI" where the chat's host switches its agent in place; otherwise the fork. */
 export function NativeChatCliForkMenuItems({
diff --git a/src/renderer/src/components/tab-bar/TabSessionSwitchHoverAction.tsx b/src/renderer/src/components/tab-bar/TabSessionSwitchHoverAction.tsx
index 44a161424ac9..bdc5e773038f 100644
--- a/src/renderer/src/components/tab-bar/TabSessionSwitchHoverAction.tsx
+++ b/src/renderer/src/components/tab-bar/TabSessionSwitchHoverAction.tsx
@@ -1,4 +1,8 @@
-import { useConversationSwitchReadiness } from '@/lib/conversation-surface-switch'
+import {
+  useConversationSwitchReadiness,
+  runCliChatResume,
+  runNativeChatCliSwitch
+} from '@/lib/conversation-surface-switch'
 import { isNativeChatEnabled } from '../../../../shared/structured-native-chat-launch-route'
 import { useShallow } from 'zustand/react/shallow'
 import { MessagesSquare, SquareTerminal } from 'lucide-react'
@@ -8,8 +12,6 @@ import { useAppStore } from '@/store'
 import { useInPlaceSwitchCapability } from '@/lib/in-place-switch-support'
 import { AI_VAULT_AGENTS } from '../../../../shared/ai-vault-types'
 import { resolveCliChatResumeSource, useCliChatResumeCapability } from './cli-chat-resume-source'
-import { runCliChatResume } from '@/lib/conversation-surface-switch'
-import { runNativeChatCliSwitch } from '@/lib/conversation-surface-switch'
 import {
   resolveNativeChatCliForkIdentity,
   type NativeChatTabSession
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
index 91b20f43693d..6cd94f1d1de2 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
@@ -1,6 +1,10 @@
 import { toast } from 'sonner'
 import { conversationSwitchSourceKept } from '@/lib/conversation-switch-feedback'
-import { conversationSwitchChanged } from '@/lib/pending-conversation-surface-switches'
+import {
+  conversationSwitchChanged,
+  isCliChatResumePending,
+  pendingCliChatResumes as pending
+} from '@/lib/pending-conversation-surface-switches'
 import { useAppStore } from '@/store'
 import { newAgentLaunchRequestId } from '@/lib/agent-launch-request-id'
 import { adoptAgentSessionLaunchVerdict } from '@/lib/agent-session-launch-plan'
@@ -18,10 +22,6 @@ import { reportCliChatResumeFailure, startCliChatReturn } from './cli-chat-resum
 import { adoptingAgentOnHost } from '../right-sidebar/ai-vault-session-resume-in-chat-launch'
 import { callRuntimeRpc } from '@/runtime/runtime-rpc-client'
 import { captureSourceTerminal } from './cli-chat-resume-terminal-capture'
-import {
-  isCliChatResumePending,
-  pendingCliChatResumes as pending
-} from '@/lib/pending-conversation-surface-switches'
 
 /** The execution host closes only the captured shell; refused or unknown closes leave it alone. */
 async function retireSwitchedTerminalPane(
diff --git a/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts b/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts
index 206b85e530ef..355a0bc03bb8 100644
--- a/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts
+++ b/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts
@@ -1,4 +1,7 @@
-import { conversationSwitchChanged } from '@/lib/pending-conversation-surface-switches'
+import {
+  conversationSwitchChanged,
+  pendingNativeChatCliSwitches as pending
+} from '@/lib/pending-conversation-surface-switches'
 import { conversationSwitchFailureText } from '@/lib/conversation-switch-feedback'
 import { toast } from 'sonner'
 import { useAppStore } from '@/store'
@@ -13,7 +16,6 @@ import { AiVaultChatForkSourceSchema } from '../../../../shared/ai-vault-chat-fo
 import type { AiVaultAgent } from '../../../../shared/ai-vault-types'
 import { getExecutionHostIdForWorktree } from '@/lib/worktree-runtime-owner'
 import { parseExecutionHostId } from '../../../../shared/execution-host'
-import { pendingNativeChatCliSwitches as pending } from '@/lib/pending-conversation-surface-switches'
 
 const changed = conversationSwitchChanged
 /** Moves a chat's conversation into a terminal on the same id: the host stops the idle chat, the
diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx
index ae8b7aba7b51..11d3684225b2 100644
--- a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx
@@ -1,4 +1,4 @@
-import { useConversationSwitchReadiness } from '@/lib/conversation-surface-switch'
+import { useConversationSwitchReadiness, runCliChatResume } from '@/lib/conversation-surface-switch'
 import { isNativeChatEnabled } from '../../../../shared/structured-native-chat-launch-route'
 import { useShallow } from 'zustand/react/shallow'
 import { MessagesSquare } from 'lucide-react'
@@ -10,7 +10,6 @@ import {
   resolveCliChatResumeSource,
   useCliChatResumeCapability
 } from '../tab-bar/cli-chat-resume-source'
-import { runCliChatResume } from '@/lib/conversation-surface-switch'
 
 export function TerminalPaneResumeInChatButton({
   tabId,
diff --git a/src/renderer/src/components/terminal-pane/pane-foreground-agent-tracker.ts b/src/renderer/src/components/terminal-pane/pane-foreground-agent-tracker.ts
index a0a40c747a41..2ddc941b3f47 100644
--- a/src/renderer/src/components/terminal-pane/pane-foreground-agent-tracker.ts
+++ b/src/renderer/src/components/terminal-pane/pane-foreground-agent-tracker.ts
@@ -4,11 +4,11 @@ import { createPaneForegroundProcessReader } from './pane-foreground-process-rea
 import { FOREGROUND_COMMAND_READS } from '../../../../shared/foreground-command-settle'
 import type {
   ForegroundReadReason,
-  PaneForegroundAgentTrackerDeps
+  PaneForegroundAgentTrackerDeps,
+  PaneForegroundAgentTracker
 } from './pane-foreground-agent-tracker-contract'
 import { confirmPaneForegroundProcessExit } from './pane-foreground-process-exit'
 import { shouldRetryForegroundAgentRead } from './pane-foreground-agent-retry'
-import type { PaneForegroundAgentTracker } from './pane-foreground-agent-tracker-contract'
 
 const VISIBLE_PTY_SETTLE_MS = 350
 
diff --git a/src/renderer/src/lib/agent-launch-tab-main-written.ts b/src/renderer/src/lib/agent-launch-tab-main-written.ts
index 39626aa284b9..61c2b555f8da 100644
--- a/src/renderer/src/lib/agent-launch-tab-main-written.ts
+++ b/src/renderer/src/lib/agent-launch-tab-main-written.ts
@@ -1,5 +1,5 @@
 import { agentLaunchPaneAttemptCurrent } from './agent-launch-pane-start'
-import { afterLayoutFrame } from '@/runtime/layout-frame-position'
+import { afterLayoutFrame, layoutFramesFlowing } from '@/runtime/layout-frame-position'
 import type { AgentLaunchPaneVerdictEvent } from '../../../shared/agent-launch-pane-verdict'
 import type {
   AgentLaunchTabPublished,
@@ -13,7 +13,6 @@ import {
   rememberAgentLaunchPanePrompt
 } from './agent-launch-pane-prompt'
 import { revealWorkspaceSurface } from './workspace-surface-reveal'
-import { layoutFramesFlowing } from '@/runtime/layout-frame-position'
 import { layoutFrameTerminalTab } from '@/runtime/layout-frame-terminal-panes'
 
 /** Main owns tab creation/closure; attach this window’s session-only prompt, pane verdict and presentation state when its frame draws, retaining them for undrawn workspaces. */
diff --git a/src/renderer/src/runtime/runtime-rpc-client.ts b/src/renderer/src/runtime/runtime-rpc-client.ts
index 9d077b40bef4..241c1685ecce 100644
--- a/src/renderer/src/runtime/runtime-rpc-client.ts
+++ b/src/renderer/src/runtime/runtime-rpc-client.ts
@@ -1,7 +1,9 @@
-import type { RuntimeRpcDispatchObservation } from '../../../shared/runtime-rpc-envelope'
+import type {
+  RuntimeRpcDispatchObservation,
+  RuntimeRpcResponse
+} from '../../../shared/runtime-rpc-envelope'
 import { acceptAgentLaunchPaneAttempt } from '@/lib/agent-launch-pane-start'
 import { waitForPromiseWithSignal } from '../../../shared/abort-signal-reason'
-import type { RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope'
 import type { RuntimeStatus } from '../../../shared/runtime-types'
 import type { RuntimeCapability } from '../../../shared/protocol-version'
 import { withBrowserPaneUiRuntimeRpcSource } from '../../../shared/runtime-rpc-feature-interaction-source'
diff --git a/src/renderer/src/store/slices/tabs/tabs-label-actions.ts b/src/renderer/src/store/slices/tabs/tabs-label-actions.ts
index e9713ebd4d41..1d907ddfbb52 100644
--- a/src/renderer/src/store/slices/tabs/tabs-label-actions.ts
+++ b/src/renderer/src/store/slices/tabs/tabs-label-actions.ts
@@ -2,7 +2,7 @@ import { noteSwitchPresentationUse } from '@/lib/conversation-switch-projection'
 import { emitNativeChatToggled } from '@/lib/native-chat-telemetry'
 import type { TuiAgent } from '../../../../../shared/tui-agent'
 import type { AppState } from '../../types'
-import type { TabsSliceGet, TabsSliceSet } from './tabs-slice-contract'
+import type { TabsSliceGet, TabsSliceSet, TabsLabelActions } from './tabs-slice-contract'
 import { findTabAndWorktree, patchTab, updateGroup } from '../tab-group-state'
 import {
   applyTabOrderSortValues,
@@ -20,7 +20,6 @@ import { recordTabOrderInLayoutOwner } from './tab-order-layout-owner'
 import { withPreviewEnded } from './tab-preview-flag'
 import { endsPreviewHere, promotePreviewTabsThroughLayoutOwner } from './preview-tab-promotion'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../shared/layout-owner-switch'
-import type { TabsLabelActions } from './tabs-slice-contract'
 
 function oppositeViewMode(mode: 'terminal' | 'chat'): 'terminal' | 'chat' {
   return mode === 'chat' ? 'terminal' : 'chat'
diff --git a/tests/e2e/mobile-terminal-session-switch.unit.test.ts b/tests/e2e/mobile-terminal-session-switch.unit.test.ts
index 4e79974b1a50..011a45d878f2 100644
--- a/tests/e2e/mobile-terminal-session-switch.unit.test.ts
+++ b/tests/e2e/mobile-terminal-session-switch.unit.test.ts
@@ -1,3 +1,5 @@
+import type { StoreApi } from 'zustand'
+import type { AppState } from '../../src/renderer/src/store/types'
 import { createTestStore } from '@/store/slices/store-test-helpers'
 import { createTabsSliceMockApi } from '@/store/slices/tabs-slice-test-harness'
 import { publishAgentLaunchTab as windowPublish } from '@/lib/agent-launch-tab-publication'
@@ -22,7 +24,7 @@ import { DaemonRequestTimeoutError } from '../../src/main/daemon/daemon-errors'
 import type { RuntimePtyController } from '../../src/main/runtime/runtime-pty-controller-contract'
 
 const renderer = vi.hoisted(() => {
-  const ref: { store: ReturnType<typeof createTestStore> | null } = { store: null }
+  const ref: { store: StoreApi<AppState> | null } = { store: null }
   return ref
 })
 vi.mock('@/store', () => ({
diff --git a/tests/e2e/native-chat-switch-readable.unit.test.tsx b/tests/e2e/native-chat-switch-readable.unit.test.tsx
index 5de15f356779..f71804b7f755 100644
--- a/tests/e2e/native-chat-switch-readable.unit.test.tsx
+++ b/tests/e2e/native-chat-switch-readable.unit.test.tsx
@@ -26,9 +26,11 @@ import {
   deliverResizes
 } from '../../src/renderer/src/components/native-chat/native-chat-windowing-test-harness'
 import { resetStructuredAgentSessionReadOwnersForTests } from '../../src/renderer/src/components/native-chat/structured-agent-session-read-owner'
-import type { AgentSessionHistoryResult } from '../../src/shared/agent-session-wire'
+import type {
+  AgentSessionHistoryResult,
+  AgentSessionSubscribeEvent
+} from '../../src/shared/agent-session-wire'
 import type * as StructuredAgentSessionClientModule from '@/runtime/structured-agent-session-client'
-import type { AgentSessionSubscribeEvent } from '../../src/shared/agent-session-wire'
 
 // @vitest-environment happy-dom
 

From 1f8e943409f3498c4e5bdbaec58cac557c1de40f Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Tue, 27 Oct 2026 05:43:03 -0700
Subject: [PATCH 082/207] Preserve Codex history and automatic switch placement

---
 src/main/ipc/pty/spawn-commit-binding.test.ts |   7 +-
 .../adopted-transcript-source.ts              |   7 +-
 .../codex-history-test-fixture.ts             | 108 ++++++
 .../journal-codex-history.test.ts             | 339 ++++++++++++++++++
 .../journal-legacy-identity.ts                |  12 +-
 ...journal-legacy-import-record-bound.test.ts |  52 ++-
 ...journal-legacy-import-tool-pairing.test.ts |   1 +
 .../journal-legacy-import.ts                  |  31 +-
 .../journal-legacy-transcript-stream.ts       |  25 ++
 ...tured-agent-session-adopted-import.test.ts |  41 ++-
 ...ructured-agent-session-at-rest-catch-up.ts |  11 +-
 .../structured-agent-session-attach.ts        |   3 +-
 src/main/native-chat/codex-local-history.ts   | 154 ++++++++
 .../codex-rollout-history-source.ts           |  82 +++++
 .../codex-rollout-history-stream.ts           |  34 ++
 .../transcript-line-decoders-codex.ts         |  27 ++
 ...agent-foreground-process-real-rows.test.ts |   4 +-
 .../structured-session-create-support.ts      |   5 +
 ...tructured-agent-session-create-adoption.ts |   7 +-
 .../lib/agent-launch-tab-publication.test.ts  |  48 ++-
 .../store/slices/tabs/tabs-label-actions.ts   |   6 +-
 21 files changed, 967 insertions(+), 37 deletions(-)
 create mode 100644 src/main/native-chat/agent-session-journal/codex-history-test-fixture.ts
 create mode 100644 src/main/native-chat/agent-session-journal/journal-codex-history.test.ts
 create mode 100644 src/main/native-chat/agent-session-journal/journal-legacy-transcript-stream.ts
 create mode 100644 src/main/native-chat/codex-local-history.ts
 create mode 100644 src/main/native-chat/codex-rollout-history-source.ts
 create mode 100644 src/main/native-chat/codex-rollout-history-stream.ts

diff --git a/src/main/ipc/pty/spawn-commit-binding.test.ts b/src/main/ipc/pty/spawn-commit-binding.test.ts
index 5a567c60ce14..7a695b60b358 100644
--- a/src/main/ipc/pty/spawn-commit-binding.test.ts
+++ b/src/main/ipc/pty/spawn-commit-binding.test.ts
@@ -4,6 +4,7 @@ import {
   fixture,
   admitRuntimeSpawnPane
 } from '../../persistence/loading-store/profile-state-delayed-authority-fixture'
+import { LocalPtyProvider } from '../../providers/local-pty-provider'
 import type { IPtyProvider, PtySpawnResult } from '../../providers/pty-provider-contract'
 import { savePtySpawnPaneBinding } from './spawn-commit-binding'
 
@@ -24,8 +25,10 @@ it('reconciles a dispatched child through real topology creation after a queued
     outcome: 'refused' as const,
     reason: 'unverifiable' as const
   }))
-  // SAFETY: this schedule reaches only optional fenced cleanup, never any ordinary provider operation.
-  const provider = { killFenced, shutdown } as unknown as IPtyProvider
+  const provider: IPtyProvider = Object.assign(new LocalPtyProvider(), {
+    killFenced,
+    shutdown
+  })
   const result: PtySpawnResult = {
     id: 'A',
     incarnationId,
diff --git a/src/main/native-chat/agent-session-journal/adopted-transcript-source.ts b/src/main/native-chat/agent-session-journal/adopted-transcript-source.ts
index 433a9b564311..1905a5db1488 100644
--- a/src/main/native-chat/agent-session-journal/adopted-transcript-source.ts
+++ b/src/main/native-chat/agent-session-journal/adopted-transcript-source.ts
@@ -8,7 +8,12 @@ import { readOpenCodeTranscriptSignalViaWorker } from '../../ai-vault/session-sc
 import { samePiDirectory } from '../../pi/rpc-launch-resolution'
 import { admitTranscriptPath } from '../transcript-path-admission'
 
-export type AdoptedTranscriptSource = { providerSessionId: string; workspaceCwd: string }
+export type AdoptedTranscriptSource = {
+  providerSessionId: string
+  workspaceCwd: string
+  /** Host-selected account store, never supplied by a wire caller or persisted. */
+  conversationStore?: string
+}
 
 export function assertAdoptedSourceIdentity(
   source: AdoptedTranscriptSource,
diff --git a/src/main/native-chat/agent-session-journal/codex-history-test-fixture.ts b/src/main/native-chat/agent-session-journal/codex-history-test-fixture.ts
new file mode 100644
index 000000000000..ec00e05ec161
--- /dev/null
+++ b/src/main/native-chat/agent-session-journal/codex-history-test-fixture.ts
@@ -0,0 +1,108 @@
+import { writeFile } from 'node:fs/promises'
+import { join } from 'node:path'
+
+export type CodexHistoryPositionFixture = {
+  thread_id: string
+  end_ordinal_exclusive: number
+  end_byte_offset: number
+}
+
+export async function writeCodexHistoryFixture(
+  root: string,
+  id: string,
+  prompts: string[],
+  base?: CodexHistoryPositionFixture,
+  metadataId = id,
+  reasoning = false
+) {
+  const records = [
+    {
+      type: 'session_meta',
+      payload: {
+        id: metadataId,
+        history_mode: 'paginated',
+        ...(base ? { history_base: base } : {})
+      }
+    },
+    ...prompts.flatMap((text, turn) => [
+      {
+        type: 'response_item',
+        payload: {
+          type: 'message',
+          role: 'user',
+          id: `response-user-${turn}`,
+          content: [{ type: 'input_text', text }]
+        }
+      },
+      {
+        type: 'event_msg',
+        payload: {
+          type: 'item_completed',
+          thread_id: id,
+          turn_id: `turn-${turn}`,
+          completed_at_ms: 1,
+          item: { type: 'UserMessage', id: `user-${turn}`, content: [{ type: 'text', text }] }
+        }
+      },
+      ...(reasoning && turn === 0
+        ? [
+            {
+              type: 'response_item',
+              payload: {
+                type: 'reasoning',
+                id: 'reason',
+                summary: [{ type: 'summary_text', text: 'why' }]
+              }
+            },
+            {
+              type: 'event_msg',
+              payload: {
+                type: 'item_completed',
+                item: { type: 'Reasoning', id: 'reason', summary_text: ['why'], raw_content: [] }
+              }
+            }
+          ]
+        : []),
+      {
+        type: 'response_item',
+        payload: {
+          type: 'message',
+          role: 'assistant',
+          id: `answer-${turn}`,
+          content: [{ type: 'output_text', text: `${text} answer` }]
+        }
+      },
+      {
+        type: 'event_msg',
+        payload: {
+          type: 'item_completed',
+          thread_id: id,
+          turn_id: `turn-${turn}`,
+          completed_at_ms: 1,
+          item: {
+            type: 'AgentMessage',
+            id: `answer-${turn}`,
+            content: [{ type: 'Text', text: `${text} answer` }]
+          }
+        }
+      }
+    ])
+  ].map((record, index) => ({
+    ...record,
+    timestamp: '2026-10-27T00:00:00.000Z',
+    ordinal: (base?.end_ordinal_exclusive ?? 0) + index
+  }))
+  const serialized = `${records.map((record) => JSON.stringify(record)).join('\n')}\n`
+  const ids = metadataId === id ? id : `${metadataId}_${id}`
+  const filePath = join(root, `rollout-2026-10-27T00-00-00-${ids}.jsonl`)
+  await writeFile(filePath, serialized)
+  return {
+    filePath,
+    records,
+    position: {
+      thread_id: id,
+      end_ordinal_exclusive: (base?.end_ordinal_exclusive ?? 0) + records.length,
+      end_byte_offset: Buffer.byteLength(serialized)
+    }
+  }
+}
diff --git a/src/main/native-chat/agent-session-journal/journal-codex-history.test.ts b/src/main/native-chat/agent-session-journal/journal-codex-history.test.ts
new file mode 100644
index 000000000000..49a06483b425
--- /dev/null
+++ b/src/main/native-chat/agent-session-journal/journal-codex-history.test.ts
@@ -0,0 +1,339 @@
+import { createReadStream } from 'node:fs'
+import {
+  appendFile,
+  mkdir,
+  mkdtemp,
+  readFile,
+  readdir,
+  rename,
+  rm,
+  writeFile
+} from 'node:fs/promises'
+import type * as FsPromises from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { basename, dirname, join } from 'node:path'
+import { createZstdDecompress, zstdCompressSync } from 'node:zlib'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import * as values from '../../ai-vault/session-scanner-values'
+import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding'
+import {
+  prepareLegacyTranscriptImport,
+  importLegacyTranscriptIntoJournal
+} from './journal-legacy-import'
+import { openAgentSessionJournal } from './journal-store-factory'
+import {
+  createTrackedJournalOpener,
+  openTestJournalHostDatabase
+} from './journal-host-database-test-support'
+import {
+  writeCodexHistoryFixture,
+  type CodexHistoryPositionFixture
+} from './codex-history-test-fixture'
+
+vi.mock(import('node:fs'), async (original) => {
+  const fs = await original()
+  return { ...fs, createReadStream: vi.fn(fs.createReadStream) }
+})
+vi.mock(import('node:fs/promises'), async (original) => {
+  const fs = await original()
+  return { ...fs, readdir: vi.fn(fs.readdir) }
+})
+vi.mock(import('node:zlib'), async (original) => {
+  const zlib = await original()
+  return { ...zlib, createZstdDecompress: vi.fn(zlib.createZstdDecompress) }
+})
+
+const PARENT = '01a17c7f-6f58-7a73-b87a-a8702ff2da17'
+const CHILD = '01a17c81-30d1-72f0-b84e-002ddfe6fd47'
+const MIDDLE = '01a17c80-30d1-72f0-b84e-002ddfe6fd47'
+let root: string
+const journals = createTrackedJournalOpener()
+beforeEach(async () => {
+  const account = await mkdtemp(join(tmpdir(), 'orca-codex-lineage-'))
+  root = join(account, 'sessions')
+  await mkdir(root)
+  await mkdir(join(account, 'archived_sessions'))
+})
+afterEach(async () => {
+  await journals.closeAll()
+  await rm(dirname(root), { recursive: true, force: true })
+  vi.restoreAllMocks()
+  vi.clearAllMocks()
+})
+
+async function journal() {
+  return journals.track(
+    await openAgentSessionJournal({
+      identity: {
+        sessionId: CHILD,
+        agent: 'codex',
+        hostId: 'host',
+        workspaceId: 'workspace',
+        providerHandle: codexProviderHandle(CHILD)
+      },
+      database: openTestJournalHostDatabase(root)
+    })
+  )
+}
+function request(filePath: string) {
+  return {
+    agent: 'codex' as const,
+    sessionId: CHILD,
+    options: {
+      filePath,
+      codexSessionsDirs: [root],
+      source: { providerSessionId: CHILD, workspaceCwd: '/workspace' }
+    }
+  }
+}
+
+it('imports canonical completed items once with stable nested IDs, including repeated prompts', async () => {
+  const fixture = await writeCodexHistoryFixture(
+    root,
+    CHILD,
+    ['ice', 'ice'],
+    undefined,
+    CHILD,
+    true
+  )
+  const input = request(fixture.filePath)
+  const first = await prepareLegacyTranscriptImport(input)
+  expect(first.ok && first.items.map((item) => item.identity)).toMatchObject([
+    { recordId: `${CHILD}:user-0` },
+    { recordId: `${CHILD}:reason` },
+    { recordId: `${CHILD}:answer-0` },
+    { recordId: `${CHILD}:user-1` },
+    { recordId: `${CHILD}:answer-1` }
+  ])
+  expect(await prepareLegacyTranscriptImport(input)).toEqual(first)
+  const destination = await journal()
+  expect(
+    await importLegacyTranscriptIntoJournal({ ...input, journal: destination, fence: 1 })
+  ).toMatchObject({ ok: true, imported: 5 })
+  const rows = destination.snapshot().items
+  expect(rows.map((item) => item.body)).toMatchObject([
+    { role: 'user', blocks: [{ text: 'ice' }] },
+    { role: 'reasoning', blocks: [{ text: 'why' }] },
+    { role: 'assistant', blocks: [{ text: 'ice answer' }] },
+    { role: 'user', blocks: [{ text: 'ice' }] },
+    { role: 'assistant', blocks: [{ text: 'ice answer' }] }
+  ])
+  await importLegacyTranscriptIntoJournal({ ...input, journal: destination, fence: 1 })
+  expect(destination.snapshot().items.map((item) => [item.itemId, item.body])).toEqual(
+    rows.map((item) => [item.itemId, item.body])
+  )
+  await writeFile(
+    fixture.filePath,
+    JSON.stringify({
+      type: 'message',
+      id: 'early',
+      role: 'user',
+      content: [{ type: 'input_text', text: 'early format' }]
+    })
+  )
+  const legacy = await prepareLegacyTranscriptImport({
+    ...input,
+    options: { filePath: fixture.filePath }
+  })
+  expect(legacy.ok && legacy.items.map((item) => item.body)).toMatchObject([
+    { role: 'user', blocks: [{ text: 'early format' }] }
+  ])
+})
+
+it.each(['active', 'archive', 'compressed'] as const)(
+  'reads %s prefixes oldest first, excludes later turns and leaves copied forks standalone',
+  async (location) => {
+    const parent = await writeCodexHistoryFixture(root, PARENT, ['sky'], undefined, MIDDLE)
+    const middle = await writeCodexHistoryFixture(root, MIDDLE, ['leaves'], parent.position)
+    const child = await writeCodexHistoryFixture(root, CHILD, ['ice'], middle.position)
+    const later = await writeCodexHistoryFixture(root, '01a17c82-30d1-72f0-b84e-002ddfe6fd47', [
+      'S1'
+    ])
+    await appendFile(
+      parent.filePath,
+      `${later.records
+        .slice(1)
+        .map((record, index) =>
+          JSON.stringify({ ...record, ordinal: parent.position.end_ordinal_exclusive + index })
+        )
+        .join('\n')}\n`
+    )
+    if (location !== 'active') {
+      const archived = join(dirname(root), 'archived_sessions', basename(parent.filePath))
+      if (location === 'compressed') {
+        await writeFile(`${archived}.zst`, zstdCompressSync(await readFile(parent.filePath)))
+        await rm(parent.filePath)
+      } else {
+        await rename(parent.filePath, archived)
+      }
+    }
+    const result = await prepareLegacyTranscriptImport(request(child.filePath))
+    expect(result.ok && result.items.map((item) => item.body)).toMatchObject([
+      { blocks: [{ text: 'sky' }] },
+      { blocks: [{ text: 'sky answer' }] },
+      { blocks: [{ text: 'leaves' }] },
+      { blocks: [{ text: 'leaves answer' }] },
+      { blocks: [{ text: 'ice' }] },
+      { blocks: [{ text: 'ice answer' }] }
+    ])
+    const copy = await writeCodexHistoryFixture(root, CHILD, ['ice'])
+    await writeFile(
+      copy.filePath,
+      copy.records
+        .map((record, index) =>
+          JSON.stringify(
+            index === 0
+              ? {
+                  ...record,
+                  payload: {
+                    ...record.payload,
+                    forked_from_id: PARENT,
+                    forked_from_ordinal_exclusive: 28
+                  }
+                }
+              : record
+          )
+        )
+        .join('\n')
+    )
+    const copied = await prepareLegacyTranscriptImport(request(copy.filePath))
+    expect(copied.ok && copied.items).toHaveLength(2)
+    expect(createZstdDecompress).toHaveBeenCalledTimes(location === 'compressed' ? 2 : 0)
+    expect(
+      vi.mocked(createReadStream).mock.results.every(({ value }) => value.destroyed && value.closed)
+    ).toBe(true)
+    expect(
+      vi
+        .mocked(createZstdDecompress)
+        .mock.results.every(({ value }) => value.destroyed && value.closed)
+    ).toBe(true)
+  }
+)
+
+it.each(['missing', 'cycle', 'wrong-store', 'ordinal', 'byte', 'truncated'] as const)(
+  'refuses %s ancestry without changing a journal',
+  async (fault) => {
+    const outside = join(root, 'other-account')
+    await mkdir(outside)
+    const selectedStore = join(root, 'selected-account')
+    await mkdir(selectedStore)
+    const parent = await writeCodexHistoryFixture(
+      fault === 'wrong-store' ? outside : selectedStore,
+      PARENT,
+      ['sky']
+    )
+    const position = { ...parent.position }
+    if (fault === 'missing') {
+      await rm(parent.filePath)
+    }
+    if (fault === 'cycle') {
+      position.thread_id = CHILD
+    }
+    if (fault === 'ordinal') {
+      position.end_ordinal_exclusive += 1
+    }
+    if (fault === 'byte') {
+      position.end_byte_offset -= 1
+    }
+    if (fault === 'truncated') {
+      position.end_byte_offset += 1
+    }
+    const child = await writeCodexHistoryFixture(selectedStore, CHILD, ['ice'], position)
+    const destination = await journal()
+    const before = destination.snapshot()
+    const result = await importLegacyTranscriptIntoJournal({
+      ...request(child.filePath),
+      options: { filePath: child.filePath, codexSessionsDirs: [selectedStore] },
+      journal: destination,
+      fence: 1
+    })
+    expect(result).toMatchObject({ ok: false })
+    expect(destination.snapshot()).toEqual(before)
+    expect(
+      vi.mocked(createReadStream).mock.results.every(({ value }) => value.destroyed && value.closed)
+    ).toBe(true)
+  }
+)
+
+it('uses a readable active parent without consulting an inaccessible archive', async () => {
+  const parent = await writeCodexHistoryFixture(root, PARENT, ['sky'])
+  const child = await writeCodexHistoryFixture(root, CHILD, ['ice'], parent.position)
+  const archive = join(dirname(root), 'archived_sessions')
+  const fs = await vi.importActual<typeof FsPromises>('node:fs/promises')
+  vi.mocked(readdir).mockImplementation((...args) => {
+    if (args[0] === archive) {
+      throw Object.assign(new Error('Archive is inaccessible.'), { code: 'EACCES' })
+    }
+    return fs.readdir(...args)
+  })
+  try {
+    const result = await prepareLegacyTranscriptImport(request(child.filePath))
+    expect(result.ok && result.items.map((item) => item.body)).toMatchObject([
+      { blocks: [{ text: 'sky' }] },
+      { blocks: [{ text: 'sky answer' }] },
+      { blocks: [{ text: 'ice' }] },
+      { blocks: [{ text: 'ice answer' }] }
+    ])
+    expect(readdir).toHaveBeenCalledTimes(1)
+    expect(vi.mocked(readdir).mock.calls.some(([path]) => path === archive)).toBe(false)
+    await rename(parent.filePath, join(archive, basename(parent.filePath)))
+    const destination = await journal()
+    const before = destination.snapshot()
+    expect(
+      await importLegacyTranscriptIntoJournal({
+        ...request(child.filePath),
+        journal: destination,
+        fence: 1
+      })
+    ).toMatchObject({ ok: false })
+    expect(vi.mocked(readdir).mock.calls.some(([path]) => path === archive)).toBe(true)
+    expect(destination.snapshot()).toEqual(before)
+    expect(
+      vi.mocked(createReadStream).mock.results.every(({ value }) => value.destroyed && value.closed)
+    ).toBe(true)
+  } finally {
+    vi.mocked(readdir).mockImplementation(fs.readdir)
+  }
+})
+
+it.each([100, 1000])(
+  'prepares %i account entries/turns once through a deep lineage with linear work',
+  async (count) => {
+    let base: CodexHistoryPositionFixture | undefined
+    for (let index = 0; index < 40; index++) {
+      const id = `01a17c7f-6f58-7a73-b87a-${String(index).padStart(12, '0')}`
+      const segment = await writeCodexHistoryFixture(root, id, [String(index)], base)
+      base = segment.position
+      if (count === 1000 && index === 0) {
+        await rename(
+          segment.filePath,
+          join(dirname(root), 'archived_sessions', basename(segment.filePath))
+        )
+      }
+    }
+    const child = await writeCodexHistoryFixture(
+      root,
+      CHILD,
+      Array.from({ length: count }, (_, i) => `turn-${i}`),
+      base
+    )
+    for (let index = 0; index < count; index++) {
+      await writeFile(join(root, `unrelated-${index}.jsonl`), '')
+    }
+    const parses = vi.spyOn(values, 'parseJsonObject')
+    const result = await prepareLegacyTranscriptImport(request(child.filePath))
+    expect(result.ok && result.items).toHaveLength(2 * (40 + count))
+    expect(result.ok && result.items[0]?.body).toMatchObject({ blocks: [{ text: '0' }] })
+    expect(result.ok && result.items.at(-1)?.body).toMatchObject({
+      blocks: [{ text: `turn-${count - 1} answer` }]
+    })
+    expect(readdir).toHaveBeenCalledTimes(count === 1000 ? 2 : 1)
+    const listings = await Promise.all(vi.mocked(readdir).mock.results.map(({ value }) => value))
+    expect(listings.reduce((total, entries) => total + entries.length, 0)).toBe(count + 41)
+    expect(parses.mock.calls.length).toBeLessThanOrEqual(10 * count + 500)
+    expect(createReadStream).toHaveBeenCalledTimes(82)
+    expect(
+      vi.mocked(createReadStream).mock.results.every(({ value }) => value.destroyed && value.closed)
+    ).toBe(true)
+  }
+)
diff --git a/src/main/native-chat/agent-session-journal/journal-legacy-identity.ts b/src/main/native-chat/agent-session-journal/journal-legacy-identity.ts
index 92b9aba86a80..dde940448701 100644
--- a/src/main/native-chat/agent-session-journal/journal-legacy-identity.ts
+++ b/src/main/native-chat/agent-session-journal/journal-legacy-identity.ts
@@ -23,7 +23,7 @@ export function createLegacyIdentityTracker(input: {
       provider: 'legacy',
       agent: input.agent,
       sessionId: input.sessionId,
-      recordId: legacyRecordId(line, index)
+      recordId: legacyRecordId(line, index, input.transcriptAgent === 'codex')
     })
   }
 }
@@ -44,10 +44,16 @@ function claudeIdentity(
 }
 
 /** Line position is stable only within a given import; prefer stored IDs when available. */
-function legacyRecordId(line: string, lineIndex: number): string {
+function legacyRecordId(line: string, lineIndex: number, nestedItem: boolean): string {
   const record = parseRecord(line)
   const payload = record?.payload
-  const id = stringField(payload, 'id') ?? stringField(record, 'id') ?? stringField(record, 'uuid')
+  const item =
+    nestedItem && payload && typeof payload === 'object' && 'item' in payload ? payload.item : null
+  const id =
+    stringField(item, 'id') ??
+    stringField(payload, 'id') ??
+    stringField(record, 'id') ??
+    stringField(record, 'uuid')
   return id ?? `#${lineIndex}`
 }
 
diff --git a/src/main/native-chat/agent-session-journal/journal-legacy-import-record-bound.test.ts b/src/main/native-chat/agent-session-journal/journal-legacy-import-record-bound.test.ts
index 515429eea1e6..9490ded3d07a 100644
--- a/src/main/native-chat/agent-session-journal/journal-legacy-import-record-bound.test.ts
+++ b/src/main/native-chat/agent-session-journal/journal-legacy-import-record-bound.test.ts
@@ -1,5 +1,5 @@
 import { createReadStream } from 'node:fs'
-import { mkdtemp, rm, writeFile } from 'node:fs/promises'
+import { mkdtemp, open, rm, writeFile } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { afterEach, describe, expect, it, vi } from 'vitest'
@@ -18,7 +18,7 @@ afterEach(async () => {
   await Promise.all(roots.splice(0).map((root) => rm(root, { recursive: true, force: true })))
 })
 
-describe('legacy import record byte bound', () => {
+describe.each(['claude', 'codex'] as const)('record byte bound: %s', (agent) => {
   it('refuses a single line past the limit and closes the stream', async () => {
     const root = await mkdtemp(join(tmpdir(), 'orca-legacy-import-bound-'))
     roots.push(root)
@@ -26,7 +26,7 @@ describe('legacy import record byte bound', () => {
     await writeFile(filePath, ' '.repeat(RECORD_LIMIT_BYTES + 1))
 
     const result = await prepareLegacyTranscriptImport({
-      agent: 'claude',
+      agent,
       sessionId: 'record-bound',
       options: { filePath }
     })
@@ -39,3 +39,49 @@ describe('legacy import record byte bound', () => {
     expect(vi.mocked(createReadStream).mock.results[0]?.value.destroyed).toBe(true)
   })
 })
+
+it('streams a valid source past 128 MiB, retaining recent bounded history and closing its readers', async () => {
+  const root = await mkdtemp(join(tmpdir(), 'orca-legacy-import-long-'))
+  roots.push(root)
+  const filePath = join(root, 'long.jsonl')
+  const file = await open(filePath, 'w')
+  try {
+    const output = 'x'.repeat(1024 * 1024)
+    for (let index = 0; index < 130; index++) {
+      await file.write(
+        `${JSON.stringify({
+          type: 'response_item',
+          payload: { type: 'function_call_output', call_id: String(index), output }
+        })}\n`
+      )
+    }
+    await file.write(
+      `${JSON.stringify({
+        type: 'response_item',
+        payload: {
+          type: 'message',
+          role: 'assistant',
+          content: [{ type: 'output_text', text: 'recent answer' }]
+        }
+      })}\n`
+    )
+  } finally {
+    await file.close()
+  }
+  const result = await prepareLegacyTranscriptImport({
+    agent: 'codex',
+    sessionId: 'long',
+    options: { filePath }
+  })
+  expect(result.ok).toBe(true)
+  if (!result.ok) {
+    throw new Error(result.error)
+  }
+  expect(result.items.at(-1)?.body).toMatchObject({ blocks: [{ text: 'recent answer' }] })
+  expect(
+    result.items.reduce((total, item) => total + Buffer.byteLength(JSON.stringify(item)), 0)
+  ).toBeLessThanOrEqual(RECORD_LIMIT_BYTES)
+  expect(
+    vi.mocked(createReadStream).mock.results.every(({ value }) => value.destroyed && value.closed)
+  ).toBe(true)
+})
diff --git a/src/main/native-chat/agent-session-journal/journal-legacy-import-tool-pairing.test.ts b/src/main/native-chat/agent-session-journal/journal-legacy-import-tool-pairing.test.ts
index ac5eb4363fba..7bc0662e6039 100644
--- a/src/main/native-chat/agent-session-journal/journal-legacy-import-tool-pairing.test.ts
+++ b/src/main/native-chat/agent-session-journal/journal-legacy-import-tool-pairing.test.ts
@@ -286,6 +286,7 @@ describe('legacy import tool identity', () => {
   ])('pairs Codex singleton %s and %s import records', async (callType, outputType) => {
     const { pairs } = await importRows(
       [
+        { type: 'session_meta', payload: { history_mode: 'paginated' } },
         {
           type: 'response_item',
           payload: {
diff --git a/src/main/native-chat/agent-session-journal/journal-legacy-import.ts b/src/main/native-chat/agent-session-journal/journal-legacy-import.ts
index de21b7689843..d12003956f21 100644
--- a/src/main/native-chat/agent-session-journal/journal-legacy-import.ts
+++ b/src/main/native-chat/agent-session-journal/journal-legacy-import.ts
@@ -5,7 +5,6 @@ import {
   validateAdoptedOpenCodeSource,
   type AdoptedTranscriptSource
 } from './adopted-transcript-source'
-import { createReadStream } from 'node:fs'
 import type { AgentType } from '../../../shared/agent-status-types'
 import type {
   AgentJournalCursor,
@@ -21,7 +20,7 @@ import {
   decodeGrokTranscriptLine,
   decodeOmpTranscriptLine
 } from '../transcript-line-decoders'
-import { decodeTranscriptStream } from '../transcript-stream-lines'
+import { readLegacyImportTranscript } from './journal-legacy-transcript-stream'
 import { readOpenCodeNativeChatTranscriptFull } from '../transcript-opencode'
 import { boundSubagentEntryId } from '../subagent-entry-id-bounds'
 import { createLegacyIdentityTracker } from './journal-legacy-identity'
@@ -111,6 +110,9 @@ export async function prepareLegacyTranscriptImport(input: {
       agent: input.agent,
       sessionId: input.sessionId,
       source: options.source,
+      codexSessionsDirs: options.source?.conversationStore
+        ? [options.source.conversationStore]
+        : options.codexSessionsDirs,
       decodedMessageIdentities: options.decodedMessageIdentities,
       limits
     })
@@ -199,6 +201,7 @@ async function decodeReplacementItems(input: {
   sessionId: string
   decodedMessageIdentities?: true
   source?: AdoptedTranscriptSource
+  codexSessionsDirs?: string[]
   limits: JournalPayloadLimits
 }): Promise<{ items: JournalReplacementItem[]; consumedBytes: number }> {
   const source = input.source
@@ -224,12 +227,16 @@ async function decodeReplacementItems(input: {
       : null
   let lineIndex = 0
   try {
-    const { consumedBytes } = await decodeTranscriptStream(
-      createReadStream(input.filePath),
-      input.filePath,
-      0,
-      (line, fallbackId) => {
-        source?.observe(line)
+    const { consumedBytes } = await readLegacyImportTranscript(
+      {
+        filePath: input.filePath,
+        codex: input.transcriptAgent === 'codex',
+        roots: input.codexSessionsDirs
+      },
+      (line, fallbackId, recordId, selected = true) => {
+        if (selected) {
+          source?.observe(line)
+        }
         const currentLineIndex = lineIndex
         lineIndex += 1
         if (pi) {
@@ -241,21 +248,19 @@ async function decodeReplacementItems(input: {
           retained.push(
             toItem(
               message,
-              input.decodedMessageIdentities
+              recordId || input.decodedMessageIdentities
                 ? {
                     provider: 'legacy',
                     agent: input.agent,
                     sessionId: input.sessionId,
-                    recordId: message.id
+                    recordId: recordId ?? message.id
                   }
                 : tracker.identify(line, currentLineIndex)
             )
           )
         }
         return null
-      },
-      true,
-      MAX_LEGACY_IMPORT_RECORD_BYTES
+      }
     )
     if (consumedBytes > 0) {
       await source?.validate()
diff --git a/src/main/native-chat/agent-session-journal/journal-legacy-transcript-stream.ts b/src/main/native-chat/agent-session-journal/journal-legacy-transcript-stream.ts
new file mode 100644
index 000000000000..760a75df2383
--- /dev/null
+++ b/src/main/native-chat/agent-session-journal/journal-legacy-transcript-stream.ts
@@ -0,0 +1,25 @@
+import { createReadStream } from 'node:fs'
+import { decodeTranscriptStream } from '../transcript-stream-lines'
+import { readCodexLocalHistory } from '../codex-local-history'
+
+export async function readLegacyImportTranscript(
+  input: { filePath: string; codex: boolean; roots?: readonly string[] },
+  visit: (line: string, fallbackId: string, recordId?: string, selected?: boolean) => null
+): Promise<{ consumedBytes: number }> {
+  return input.codex
+    ? {
+        consumedBytes: await readCodexLocalHistory({
+          ...input,
+          visit: (line, fallbackId, selected, recordId) =>
+            visit(line, fallbackId, recordId, selected)
+        })
+      }
+    : decodeTranscriptStream(
+        createReadStream(input.filePath),
+        input.filePath,
+        0,
+        visit,
+        true,
+        16 * 1024 * 1024
+      )
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-adopted-import.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-adopted-import.test.ts
index d30ea7827b35..35b264cf1a1d 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-adopted-import.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-adopted-import.test.ts
@@ -15,6 +15,7 @@ import { openTestAttachConversation } from './structured-agent-session-attach-te
 import { performAttach, type AttachFlowInput } from './structured-agent-session-attach-flow'
 import { AgentSessionJournal } from '../agent-session-journal/journal-store'
 import * as legacyImport from '../agent-session-journal/journal-legacy-import'
+import { writeCodexHistoryFixture } from '../agent-session-journal/codex-history-test-fixture'
 import { StructuredAgentSessionHost } from './structured-agent-session-host'
 import { openTestJournalHostDatabase } from '../agent-session-journal/journal-host-database-test-support'
 import { createStructuredAgentSessionLogger } from './structured-agent-session-logger'
@@ -96,6 +97,11 @@ function attachParams(
     runtimeKind: 'native',
     adopt: {
       providerHandle: codexProviderHandle(THREAD),
+      source: {
+        providerSessionId: THREAD,
+        workspaceCwd: '/workspace',
+        conversationStore: root ?? undefined
+      },
       ...(transcriptPath ? { transcriptPath } : {})
     },
     ...overrides
@@ -333,6 +339,26 @@ describe('adopting a provider conversation on create', () => {
     }
   )
 
+  it('refuses unreadable physical ancestry before acquisition or publication', async () => {
+    root = await mkdtemp(join(tmpdir(), 'orca-adopt-lineage-'))
+    const { filePath } = await writeCodexHistoryFixture(root, THREAD, ['ice'], {
+      thread_id: '01a17c7f-6f58-7a73-b87a-a8702ff2da17',
+      end_ordinal_exclusive: 5,
+      end_byte_offset: 1024
+    })
+    const sessionAdapter = adapter()
+    const publish = vi.fn()
+    expect(await attach(filePath, sessionAdapter, publish)).toMatchObject({
+      ok: false,
+      refusal: { code: 'agent_session_identity_required' }
+    })
+    expect(sessionAdapter.acquire).not.toHaveBeenCalled()
+    expect(sessionAdapter.dispatch).not.toHaveBeenCalled()
+    expect(publish).not.toHaveBeenCalled()
+    expect(store?.getRecord(SESSION)).toBeNull()
+    expect(store?.listOperationRows()).toEqual([])
+  })
+
   it('still releases acquisition on an import write failure, and leaves the conversation open', async () => {
     root = await mkdtemp(join(tmpdir(), 'orca-adopt-write-failure-'))
     const transcriptPath = join(root, 'rollout.jsonl')
@@ -392,14 +418,22 @@ describe('adopting a provider conversation on create', () => {
 
   it('prepares a valid source once before acquisition and imports those exact items', async () => {
     root = await mkdtemp(join(tmpdir(), 'orca-adopt-once-'))
-    const transcriptPath = join(root, 'rollout.jsonl')
-    await writeCodexRollout(transcriptPath, 'prepared before acquiring')
+    const parent = await writeCodexHistoryFixture(root, '01a17c7f-6f58-7a73-b87a-a8702ff2da17', [
+      'sky'
+    ])
+    const { filePath: transcriptPath } = await writeCodexHistoryFixture(
+      root,
+      THREAD,
+      ['prepared before acquiring'],
+      parent.position
+    )
     const prepare = vi.spyOn(legacyImport, 'prepareLegacyTranscriptImport')
     const sessionAdapter = adapter()
     const acquire = sessionAdapter.acquire
     sessionAdapter.acquire = vi.fn(async (input) => {
       expect(prepare).toHaveBeenCalledTimes(1)
       await rm(transcriptPath)
+      await rm(parent.filePath)
       return acquire(input)
     })
     const result = await attach(transcriptPath, sessionAdapter, async ({ journal }) =>
@@ -410,6 +444,9 @@ describe('adopting a provider conversation on create', () => {
       throw new Error('attach failed')
     }
     expect(JSON.stringify(result.value.page.items)).toContain('prepared before acquiring')
+    expect(JSON.stringify(result.value.page.items)).toContain('sky answer')
+    expect(result.value.page.items).toHaveLength(4)
+    expect(sessionAdapter.dispatch).not.toHaveBeenCalled()
     expect(prepare).toHaveBeenCalledTimes(1)
   })
 })
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.ts
index 24f1dd18023d..43151cae019f 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.ts
@@ -17,7 +17,10 @@ import {
 } from '../agent-session-journal/journal-legacy-import'
 import type { JournalReplacementItem } from '../agent-session-journal/journal-epoch-replacement'
 import { splitTranscriptStreamLines } from '../transcript-stream-lines'
-import { decodeCodexTranscriptLine } from '../transcript-line-decoders-codex'
+import {
+  decodeCodexTranscriptLine,
+  isCodexVisibleHistoryRecord
+} from '../transcript-line-decoders-codex'
 import { decodeCodexTurnLifecycle } from '../transcript-turn-lifecycle'
 
 /** Refresh a retained read owner without starting a provider or replacing native submissions. */
@@ -114,11 +117,7 @@ export async function catchUpStructuredSessionAtRest(input: {
       include = false
       continue
     }
-    if (
-      paginated &&
-      (record?.type === 'response_item' ||
-        (record?.type === 'event_msg' && payload?.type !== 'item_completed'))
-    ) {
+    if (!isCodexVisibleHistoryRecord(record, paginated)) {
       continue
     }
     const message = decodeCodexTranscriptLine(line, `#${index - 1}`)
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-attach.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-attach.ts
index 79cb8c859c5c..8c868adf3119 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-attach.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-attach.ts
@@ -36,6 +36,7 @@ import {
 } from '../../../shared/agent-session-mutation-envelope'
 import type { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
 import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
+import type { AdoptedTranscriptSource } from '../agent-session-journal/adopted-transcript-source'
 import { structuredAgentSessionRefusalMessage } from './structured-agent-session-refusal-message'
 
 /** Clients cannot assert spawn tokens, claim keys or owner death; only host observations grant authority. */
@@ -59,7 +60,7 @@ export type AgentSessionAttachParams = {
     providerHandle: AgentSessionProviderHandle
     /** Omit only for exact replay of an already-imported journal. */
     transcriptPath?: string
-    source?: { providerSessionId: string; workspaceCwd: string }
+    source?: AdoptedTranscriptSource
   }
 }
 
diff --git a/src/main/native-chat/codex-local-history.ts b/src/main/native-chat/codex-local-history.ts
new file mode 100644
index 000000000000..f59904efc87d
--- /dev/null
+++ b/src/main/native-chat/codex-local-history.ts
@@ -0,0 +1,154 @@
+import { createHash } from 'node:crypto'
+import { asRecord, extractString, parseJsonObject } from '../ai-vault/session-scanner-values'
+import { sessionIdFromFileName } from '../ai-vault/session-scanner-accumulator'
+import { codexHistorySources, codexPhysicalRolloutId } from './codex-rollout-history-source'
+import { readCodexRolloutBytes } from './codex-rollout-history-stream'
+import { splitTranscriptStreamLines } from './transcript-stream-lines'
+import { isCodexVisibleHistoryRecord } from './transcript-line-decoders-codex'
+import { transcriptFallbackId } from './transcript-fallback-id'
+
+type HistoryPosition = {
+  thread_id: string
+  end_ordinal_exclusive: number
+  end_byte_offset: number
+}
+
+type HistorySegment = {
+  path: string
+  rolloutId: string
+  headerDigest: string | null
+  paginated: boolean
+  start: number
+  end?: HistoryPosition
+}
+
+/** Resolve physical prefixes only; logical fork parents can describe standalone copied files. */
+export async function readCodexLocalHistory(input: {
+  filePath: string
+  roots?: readonly string[]
+  visit: (line: string, fallbackId: string, selected: boolean, recordId?: string) => void
+}): Promise<number> {
+  const sources = await codexHistorySources(input.filePath, input.roots)
+  const seen = new Set<string>()
+  const segments: HistorySegment[] = []
+  let path = sources.path
+  let end: HistoryPosition | undefined
+  for (;;) {
+    const rolloutId = codexPhysicalRolloutId(path) ?? sessionIdFromFileName(path)
+    if (seen.has(path) || seen.has(rolloutId)) {
+      throw new Error('The conversation history lineage is invalid.')
+    }
+    seen.add(path)
+    seen.add(rolloutId)
+    if (end && rolloutId !== end.thread_id.toLowerCase()) {
+      throw new Error('The conversation history source identity is invalid.')
+    }
+    let header: string | null = null
+    for await (const raw of lines(path, end)) {
+      if (raw.line.trim()) {
+        header = raw.line
+        break
+      }
+    }
+    const record = header ? parseJsonObject(header) : null
+    const metadata = record?.type === 'session_meta' ? asRecord(record.payload) : null
+    const paginated = metadata?.history_mode === 'paginated'
+    const base = metadata?.history_base == null ? undefined : historyPosition(metadata.history_base)
+    if ((end || base) && !paginated) {
+      throw new Error('The conversation history source is not paginated.')
+    }
+    segments.push({
+      path,
+      rolloutId,
+      headerDigest: header === null ? null : digestHeader(header),
+      paginated,
+      start: base?.end_ordinal_exclusive ?? 0,
+      end
+    })
+    if (!base) {
+      break
+    }
+    path = await sources.resolve(base.thread_id)
+    end = base
+  }
+  let bytes = 0
+  for (const segment of segments.toReversed()) {
+    let offset = 0
+    let ordinal = segment.start
+    let first = true
+    const strictOrdinals = segment.end !== undefined || segment.start > 0
+    for await (const raw of lines(segment.path, segment.end)) {
+      offset += raw.byteLength
+      bytes += raw.byteLength
+      if (!raw.line.trim()) {
+        continue
+      }
+      if (first) {
+        first = false
+        if (digestHeader(raw.line) !== segment.headerDigest) {
+          throw new Error('The conversation history source changed during import.')
+        }
+      }
+      const record = parseJsonObject(raw.line)
+      if (
+        strictOrdinals &&
+        (record?.ordinal !== ordinal ||
+          (segment.end && (!raw.terminated || ordinal >= segment.end.end_ordinal_exclusive)))
+      ) {
+        throw new Error('The conversation history ordinal or byte boundary is invalid.')
+      }
+      ordinal += 1
+      if (isCodexVisibleHistoryRecord(record, segment.paginated)) {
+        const payload = asRecord(record?.payload)
+        const item = asRecord(payload?.item)
+        const id =
+          extractString(item?.id) ?? extractString(payload?.id) ?? extractString(record?.id)
+        input.visit(
+          raw.line,
+          transcriptFallbackId(segment.path, offset - raw.byteLength),
+          segment.end === undefined,
+          segment.paginated ? `${segment.rolloutId}:${id ?? `#${ordinal - 1}`}` : undefined
+        )
+      }
+    }
+    if (
+      (first && segment.headerDigest !== null) ||
+      (segment.end &&
+        (offset !== segment.end.end_byte_offset || ordinal !== segment.end.end_ordinal_exclusive))
+    ) {
+      throw new Error('The conversation history prefix is truncated or mismatched.')
+    }
+  }
+  return bytes
+}
+
+function lines(path: string, end?: HistoryPosition) {
+  return splitTranscriptStreamLines(
+    readCodexRolloutBytes(path, end?.end_byte_offset),
+    16 * 1024 * 1024
+  )
+}
+
+function digestHeader(line: string): string {
+  return createHash('sha256').update(line).digest('hex')
+}
+
+function historyPosition(value: unknown): HistoryPosition {
+  const record = asRecord(value)
+  const thread_id = extractString(record?.thread_id)
+  const end_ordinal_exclusive = record?.end_ordinal_exclusive
+  const end_byte_offset = record?.end_byte_offset
+  if (
+    !thread_id ||
+    !/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(thread_id) ||
+    typeof end_ordinal_exclusive !== 'number' ||
+    !Number.isSafeInteger(end_ordinal_exclusive) ||
+    end_ordinal_exclusive < 1 ||
+    typeof end_byte_offset !== 'number' ||
+    !Number.isSafeInteger(end_byte_offset) ||
+    end_byte_offset < 1
+  ) {
+    throw new Error('The conversation history position is invalid.')
+  }
+  return { thread_id, end_ordinal_exclusive, end_byte_offset }
+}
diff --git a/src/main/native-chat/codex-rollout-history-source.ts b/src/main/native-chat/codex-rollout-history-source.ts
new file mode 100644
index 000000000000..3932efc5c6b2
--- /dev/null
+++ b/src/main/native-chat/codex-rollout-history-source.ts
@@ -0,0 +1,82 @@
+import { basename, dirname, join } from 'node:path'
+import { forEachSessionFile } from '../ai-vault/session-scanner-discovery'
+import { admitTranscriptPath } from './transcript-path-admission'
+
+export function codexPhysicalRolloutId(path: string): string | null {
+  const match = basename(path).match(
+    /^rollout-\d{4}-\d{2}-\d{2}T\d{2}-\d{2}-\d{2}-([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})(?:_([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}))?\.jsonl(?:\.zst)?$/i
+  )
+  return (match?.[2] ?? match?.[1])?.toLowerCase() ?? null
+}
+
+export async function codexHistorySources(filePath: string, roots?: readonly string[]) {
+  let stores: string[] | undefined
+  let selected = filePath
+  for (const root of roots ?? []) {
+    const name = basename(root)
+    const candidates =
+      name === 'sessions' || name === 'archived_sessions'
+        ? [join(dirname(root), 'sessions'), join(dirname(root), 'archived_sessions')]
+        : [root]
+    for (const store of candidates) {
+      const admitted = await admitTranscriptPath(store, filePath)
+      if (admitted) {
+        stores = candidates
+        selected = admitted.path
+        break
+      }
+    }
+    if (stores) {
+      break
+    }
+  }
+  if (roots?.length && !stores) {
+    throw new Error('The conversation is outside its account storage.')
+  }
+  const paths = new Map<string, string>()
+  let indexedStores = 0
+  return { path: selected, resolve }
+
+  async function resolve(id: string): Promise<string> {
+    if (!stores) {
+      throw new Error('The conversation history account is unavailable.')
+    }
+    const key = id.toLowerCase()
+    while (!paths.has(key) && indexedStores < stores.length) {
+      const indexed = new Map<string, string>()
+      await forEachSessionFile(
+        stores[indexedStores],
+        'codex',
+        [],
+        { extensions: new Set(['.jsonl', '.zst']), strictErrors: true },
+        (path) => {
+          const physicalId = codexPhysicalRolloutId(path)
+          if (!physicalId) {
+            return
+          }
+          const previous = indexed.get(physicalId)
+          // Prefer a plain file over its compressed sibling within this store.
+          if (!previous || `${path}.zst` === previous) {
+            indexed.set(physicalId, path)
+          }
+        }
+      )
+      for (const [physicalId, path] of indexed) {
+        if (!paths.has(physicalId)) {
+          paths.set(physicalId, path)
+        }
+      }
+      indexedStores += 1
+    }
+    const found = paths.get(key)
+    if (found) {
+      for (const store of stores) {
+        const admitted = await admitTranscriptPath(store, found)
+        if (admitted) {
+          return admitted.path
+        }
+      }
+    }
+    throw new Error('The conversation history source is unavailable.')
+  }
+}
diff --git a/src/main/native-chat/codex-rollout-history-stream.ts b/src/main/native-chat/codex-rollout-history-stream.ts
new file mode 100644
index 000000000000..adaf53b409fe
--- /dev/null
+++ b/src/main/native-chat/codex-rollout-history-stream.ts
@@ -0,0 +1,34 @@
+import { createReadStream } from 'node:fs'
+import { finished } from 'node:stream/promises'
+import { createZstdDecompress } from 'node:zlib'
+
+/** Bookmarks count decoded JSONL bytes, including newlines, never compressed file bytes. */
+export async function* readCodexRolloutBytes(path: string, end?: number): AsyncGenerator<Buffer> {
+  const decoder = path.endsWith('.zst') ? createZstdDecompress() : undefined
+  const file = createReadStream(path)
+  try {
+    if (decoder) {
+      file.on('error', (error) => decoder.destroy(error))
+      file.pipe(decoder)
+    }
+    let remaining = end ?? Infinity
+    for await (const chunk of decoder ?? file) {
+      const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk)
+      const prefix = buffer.subarray(0, Math.min(buffer.length, remaining))
+      if (prefix.length) {
+        yield prefix
+      }
+      remaining -= prefix.length
+      if (remaining === 0) {
+        break
+      }
+    }
+  } finally {
+    decoder?.destroy()
+    file.destroy()
+    await Promise.allSettled([
+      finished(file, { cleanup: true }),
+      ...(decoder ? [finished(decoder, { cleanup: true })] : [])
+    ])
+  }
+}
diff --git a/src/main/native-chat/transcript-line-decoders-codex.ts b/src/main/native-chat/transcript-line-decoders-codex.ts
index c62ea9242b6b..65993af8ea46 100644
--- a/src/main/native-chat/transcript-line-decoders-codex.ts
+++ b/src/main/native-chat/transcript-line-decoders-codex.ts
@@ -12,6 +12,23 @@ import {
 import { toolResultOutput } from './transcript-record-blocks'
 import { CODEX_EVENT_TURN_ABORTED } from './transcript-turn-markers'
 
+/** Paginated completed items own visible messages; response tools retain their legacy format. */
+export function isCodexVisibleHistoryRecord(
+  record: Record<string, unknown> | null,
+  paginated: boolean
+): boolean {
+  const payload = asRecord(record?.payload)
+  return (
+    !paginated ||
+    !(
+      (record?.type === 'response_item' &&
+        (payload?.type === 'message' || payload?.type === 'reasoning')) ||
+      (record?.type === 'event_msg' &&
+        (payload?.type === 'user_message' || payload?.type === 'agent_message'))
+    )
+  )
+}
+
 export function decodeCodexTranscriptLine(
   line: string,
   fallbackId: string
@@ -160,6 +177,16 @@ function codexCompletedTurnItem(
     return null
   }
   const id = extractString(item.id) ?? fallbackId
+  if (item.type === 'Reasoning') {
+    return codexResponseItem(
+      {
+        type: 'reasoning',
+        text: codexSummaryText(item.summary_text) ?? codexSummaryText(item.raw_content)
+      },
+      id,
+      timestamp
+    )
+  }
   const blocks = codexTurnItemBlocks(item.content)
   if (blocks.length === 0) {
     return null
diff --git a/src/main/providers/agent-foreground-process-real-rows.test.ts b/src/main/providers/agent-foreground-process-real-rows.test.ts
index 1a12bbba8e23..db4adfeddaf0 100644
--- a/src/main/providers/agent-foreground-process-real-rows.test.ts
+++ b/src/main/providers/agent-foreground-process-real-rows.test.ts
@@ -38,11 +38,11 @@ describe('real foreground process captures', () => {
 })
 
 it('keeps a stopped real Codex subtree distinct from foreground routing after Ctrl-Z', () => {
-  const captures = JSON.parse(
+  const captures: CapturedRun[] = JSON.parse(
     gunzipSync(readFileSync(join(__dirname, '__fixtures__', 'real-agent-rows.json.gz'))).toString(
       'utf8'
     )
-  ) as CapturedRun[]
+  )
   const capture = captures.find((run) => run.agent === 'codex')!
   const stopped = capture.rows.map((row) =>
     row.pid === capture.shellPid
diff --git a/src/main/runtime/session-tabs/structured-session-create-support.ts b/src/main/runtime/session-tabs/structured-session-create-support.ts
index 719df1deee8e..a57546469e6b 100644
--- a/src/main/runtime/session-tabs/structured-session-create-support.ts
+++ b/src/main/runtime/session-tabs/structured-session-create-support.ts
@@ -268,6 +268,11 @@ export abstract class OrcaRuntimeWithGetStructuredAgentSessionCreateSupport exte
             adopt: structuredAgentSessionAdoptAttach({
               definition,
               handleNamesTranscript: transcriptImport!.handleNamesTranscript,
+              conversationStore:
+                transcriptImport!.conversationStore({
+                  accountHome: adoption.accountHome,
+                  launchEnv
+                }) ?? undefined,
               transcriptPath: adoption.transcriptPath,
               providerSessionId: input.resumeFrom.providerSessionId,
               workspaceCwd
diff --git a/src/main/runtime/structured-agent-session-create-adoption.ts b/src/main/runtime/structured-agent-session-create-adoption.ts
index c0f6bb4d3970..b7b6e7231581 100644
--- a/src/main/runtime/structured-agent-session-create-adoption.ts
+++ b/src/main/runtime/structured-agent-session-create-adoption.ts
@@ -218,6 +218,7 @@ export function structuredAgentSessionAdoptAttach(input: {
     agent: AgentSessionProviderHandle['agent']
   }
   handleNamesTranscript: boolean | undefined
+  conversationStore?: string
   transcriptPath: string
   providerSessionId: string
   workspaceCwd: string
@@ -229,6 +230,10 @@ export function structuredAgentSessionAdoptAttach(input: {
       nativeId: input.handleNamesTranscript ? input.transcriptPath : input.providerSessionId
     },
     transcriptPath: input.transcriptPath,
-    source: { providerSessionId: input.providerSessionId, workspaceCwd: input.workspaceCwd }
+    source: {
+      providerSessionId: input.providerSessionId,
+      workspaceCwd: input.workspaceCwd,
+      conversationStore: input.conversationStore
+    }
   }
 }
diff --git a/src/renderer/src/lib/agent-launch-tab-publication.test.ts b/src/renderer/src/lib/agent-launch-tab-publication.test.ts
index 76a1b5c56ff8..a522a40d7195 100644
--- a/src/renderer/src/lib/agent-launch-tab-publication.test.ts
+++ b/src/renderer/src/lib/agent-launch-tab-publication.test.ts
@@ -6,7 +6,8 @@ import {
   forgetAgentLaunchPaneAttempts
 } from './agent-launch-pane-start'
 import { applyAgentLaunchPaneVerdict } from './agent-launch-pane-verdict-application'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { captureSwitchProjection, disposeSwitchProjections } from './conversation-switch-projection'
 import type * as AgentStatusModule from '@/lib/agent-status'
 import type { AgentLaunchTabPublishRequest } from '../../../shared/agent-launch-tab-publication'
 import { createTabsSliceMockApi } from '../store/slices/tabs-slice-test-harness'
@@ -78,6 +79,7 @@ beforeEach(() => {
   focusTerminalInitiatedTab.mockClear()
   store.getState().setActiveWorktree(WT)
 })
+afterEach(() => disposeSwitchProjections())
 
 describe('publishing a launch tab before its agent exists', () => {
   it('creates the tab under the host ids with its one pane laid out and no process', () => {
@@ -173,6 +175,50 @@ describe('publishing a launch tab before its agent exists', () => {
 })
 
 describe('placement', () => {
+  it('places the destination after a guarded source without retaining it until a user reorders', async () => {
+    const source = store.getState().createUnifiedTab(WT, 'agent-session', {
+      id: 'source-chat',
+      entityId: 'saved-source',
+      agentSessionAgent: 'codex'
+    })
+    const following = store.getState().createTab(WT)
+    store.getState().activateTab(source.id)
+    const order = () =>
+      store.getState().groupsByWorktree[WT]!.find((group) => group.id === source.groupId)!.tabOrder
+    expect(order()).toEqual([source.id, following.id])
+    const retain = vi.fn()
+    captureSwitchProjection(
+      store.getState(),
+      WT,
+      {
+        invocationId: 'switch-placement',
+        generation: 'switch-generation',
+        sessionId: source.entityId,
+        tabId: source.id,
+        phase: 'prepare'
+      },
+      retain
+    )
+
+    const published = publishAgentLaunchTab(
+      request({
+        operationId: 'switch-placement',
+        launchAgent: 'codex',
+        placement: { groupId: source.groupId, afterTabId: source.id }
+      })
+    )
+    expect(published).toMatchObject({ tabId: TAB_ID, created: true })
+    expect(launchTab()).toMatchObject({ id: TAB_ID, entityId: TAB_ID, groupId: source.groupId })
+    expect(order()).toEqual([source.id, TAB_ID, following.id])
+    await Promise.resolve()
+    expect(retain).not.toHaveBeenCalled()
+
+    store.getState().reorderUnifiedTabs(source.groupId!, [following.id, source.id, TAB_ID])
+    expect(order()).toEqual([following.id, source.id, TAB_ID])
+    await Promise.resolve()
+    expect(retain).toHaveBeenCalledOnce()
+  })
+
   function twoGroups() {
     const anchor = store.getState().createUnifiedTab(WT, 'terminal')
     const sourceGroupId = store.getState().groupsByWorktree[WT]![0]!.id
diff --git a/src/renderer/src/store/slices/tabs/tabs-label-actions.ts b/src/renderer/src/store/slices/tabs/tabs-label-actions.ts
index 1d907ddfbb52..e625a0d3398b 100644
--- a/src/renderer/src/store/slices/tabs/tabs-label-actions.ts
+++ b/src/renderer/src/store/slices/tabs/tabs-label-actions.ts
@@ -148,8 +148,10 @@ export function createTabsLabelActions(set: TabsSliceSet, get: TabsSliceGet): Ta
 
   return {
     reorderUnifiedTabs: (groupId, tabIds, opts) => {
-      for (const tabId of tabIds) {
-        noteSwitchPresentationUse(tabId)
+      if (opts?.recordInteraction !== false) {
+        for (const tabId of tabIds) {
+          noteSwitchPresentationUse(tabId)
+        }
       }
       let reordered = false
       const changes: { worktreeId: string; from: string[]; to: string[] }[] = []

From 23fc7449a125dc65ee3871fee6a89c626fdab795 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Tue, 27 Oct 2026 06:46:29 -0700
Subject: [PATCH 083/207] Limit wrapped Codex decoding to History imports

---
 .../journal-codex-history.test.ts             | 22 +++++++++++++++++++
 .../journal-legacy-import.ts                  |  3 ++-
 ...ructured-agent-session-at-rest-catch-up.ts |  2 +-
 .../transcript-line-decoders-codex.ts         | 17 +++++++++-----
 4 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/src/main/native-chat/agent-session-journal/journal-codex-history.test.ts b/src/main/native-chat/agent-session-journal/journal-codex-history.test.ts
index 49a06483b425..845d72347fdc 100644
--- a/src/main/native-chat/agent-session-journal/journal-codex-history.test.ts
+++ b/src/main/native-chat/agent-session-journal/journal-codex-history.test.ts
@@ -140,6 +140,28 @@ it('imports canonical completed items once with stable nested IDs, including rep
   ])
 })
 
+it.each([
+  ['user', 'input_text'],
+  ['assistant', 'output_text']
+] as const)('imports wrapped raw-only %s messages', async (role, type) => {
+  const filePath = join(root, 'rollout.jsonl')
+  await writeFile(
+    filePath,
+    JSON.stringify({
+      type: 'response_item',
+      payload: { type: 'message', role, content: [{ type, text: 'Raw-only message' }] }
+    })
+  )
+  const result = await prepareLegacyTranscriptImport({
+    agent: 'codex',
+    sessionId: CHILD,
+    options: { filePath }
+  })
+  expect(result.ok && result.items.map((item) => item.body)).toMatchObject([
+    { role, blocks: [{ type: 'text', text: 'Raw-only message' }] }
+  ])
+})
+
 it.each(['active', 'archive', 'compressed'] as const)(
   'reads %s prefixes oldest first, excludes later turns and leaves copied forks standalone',
   async (location) => {
diff --git a/src/main/native-chat/agent-session-journal/journal-legacy-import.ts b/src/main/native-chat/agent-session-journal/journal-legacy-import.ts
index d12003956f21..930615fbc8f5 100644
--- a/src/main/native-chat/agent-session-journal/journal-legacy-import.ts
+++ b/src/main/native-chat/agent-session-journal/journal-legacy-import.ts
@@ -188,7 +188,8 @@ function replacementItem(
 
 const TRANSCRIPT_DECODERS = {
   claude: decodeClaudeTranscriptLine,
-  codex: decodeCodexTranscriptLine,
+  codex: (line: string, fallbackId: string) =>
+    decodeCodexTranscriptLine(line, fallbackId, { historyImport: true }),
   grok: decodeGrokTranscriptLine,
   omp: decodeOmpTranscriptLine
 } as const
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.ts
index 43151cae019f..ffa3b23b8405 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.ts
@@ -120,7 +120,7 @@ export async function catchUpStructuredSessionAtRest(input: {
     if (!isCodexVisibleHistoryRecord(record, paginated)) {
       continue
     }
-    const message = decodeCodexTranscriptLine(line, `#${index - 1}`)
+    const message = decodeCodexTranscriptLine(line, `#${index - 1}`, { historyImport: true })
     if (message) {
       retain({
         identity,
diff --git a/src/main/native-chat/transcript-line-decoders-codex.ts b/src/main/native-chat/transcript-line-decoders-codex.ts
index 05a25d263826..29b21dff2fb3 100644
--- a/src/main/native-chat/transcript-line-decoders-codex.ts
+++ b/src/main/native-chat/transcript-line-decoders-codex.ts
@@ -10,7 +10,7 @@ import {
   parseJsonObject,
   timestampMs
 } from '../ai-vault/session-scanner-values'
-import { toolResultOutput } from './transcript-record-blocks'
+import { claudeContentBlocks, toolResultOutput } from './transcript-record-blocks'
 import { CODEX_EVENT_TURN_ABORTED } from './transcript-turn-markers'
 
 /** Paginated completed items own visible messages; response tools retain their legacy format. */
@@ -32,7 +32,8 @@ export function isCodexVisibleHistoryRecord(
 
 export function decodeCodexTranscriptLine(
   line: string,
-  fallbackId: string
+  fallbackId: string,
+  options?: { historyImport: true }
 ): NativeChatMessage | null {
   const record = parseJsonObject(line)
   if (!record) {
@@ -47,7 +48,12 @@ export function decodeCodexTranscriptLine(
   const baseId = extractString(payload.id) ?? fallbackId
 
   if (record.type === 'response_item') {
-    return codexResponseItem(payload, baseId, timestamp)
+    return codexResponseItem(
+      payload,
+      baseId,
+      timestamp,
+      options?.historyImport ? codexTurnItemBlocks : claudeContentBlocks
+    )
   }
   if (record.type === 'event_msg') {
     return codexEventMessage(payload, baseId, timestamp)
@@ -73,7 +79,8 @@ function codexUnwrappedResponseItem(
 function codexResponseItem(
   payload: Record<string, unknown>,
   id: string,
-  timestamp: number | null
+  timestamp: number | null,
+  decodeMessageBlocks = claudeContentBlocks
 ): NativeChatMessage | null {
   if (payload.type === 'message') {
     const role =
@@ -81,7 +88,7 @@ function codexResponseItem(
     if (!role) {
       return null
     }
-    const decodedBlocks = codexTurnItemBlocks(payload.content)
+    const decodedBlocks = decodeMessageBlocks(payload.content)
     const blocks =
       role === 'user' ? decodedBlocks.filter((block) => !isSkillContext(block)) : decodedBlocks
     if (blocks.length === 0) {

From 85e56f9b7f3ef3a42e13a40b0ea0cb110e2e74a0 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Tue, 27 Oct 2026 09:46:29 -0700
Subject: [PATCH 084/207] Keep retired chats out of stale terminal-switch
 inventories

---
 ...time-terminal-close-continuity-fixtures.ts |   9 +-
 ...terminal-close-continuity-state-fixture.ts |  11 +
 .../cli-chat-resume-terminal-capture.ts       |  39 ++-
 .../lib/agent-launch-tab-publication.test.ts  |  62 ++++-
 .../lib/conversation-surface-switch.test.tsx  |  32 +++
 .../src/lib/conversation-switch-feedback.ts   |   9 +-
 .../src/lib/conversation-switch-projection.ts |  23 +-
 .../src/lib/conversation-switch-state.ts      |  18 +-
 .../src/runtime/web-session-close-intent.ts   |  24 +-
 ...-chat-resume-terminal-capture.unit.test.ts | 110 ++++++--
 ...ion-switch-desktop-retirement.unit.test.ts | 243 ++++++++++++++++++
 11 files changed, 525 insertions(+), 55 deletions(-)
 create mode 100644 tests/e2e/conversation-switch-desktop-retirement.unit.test.ts

diff --git a/src/main/runtime/__fixtures__/orca-runtime-terminal-close-continuity-fixtures.ts b/src/main/runtime/__fixtures__/orca-runtime-terminal-close-continuity-fixtures.ts
index 23584d925d49..56b0879694aa 100644
--- a/src/main/runtime/__fixtures__/orca-runtime-terminal-close-continuity-fixtures.ts
+++ b/src/main/runtime/__fixtures__/orca-runtime-terminal-close-continuity-fixtures.ts
@@ -23,6 +23,7 @@ import {
   WORKTREE_PATH,
   canaryProcess,
   makeDeferred,
+  makeRepo,
   makeSession
 } from './orca-runtime-terminal-close-continuity-state-fixture'
 import { createCloseContinuityGraphFixture } from './orca-runtime-terminal-close-continuity-graph-fixture'
@@ -91,13 +92,7 @@ function createHarness(
   let includeSiblingPty = false
   let victimPtyListed = true
   let flushError: Error | null = null
-  const repo = {
-    id: REPO_ID,
-    path: WORKTREE_PATH,
-    displayName: 'close-continuity',
-    badgeColor: '#000000',
-    addedAt: 1
-  }
+  const repo = makeRepo()
   const store = withDurableRuntimeStore({
     ...terminalClose.terminalCloseStoreDefaults(),
     getRepos: () => [repo],
diff --git a/src/main/runtime/__fixtures__/orca-runtime-terminal-close-continuity-state-fixture.ts b/src/main/runtime/__fixtures__/orca-runtime-terminal-close-continuity-state-fixture.ts
index 21013296dafe..5909d55a0f23 100644
--- a/src/main/runtime/__fixtures__/orca-runtime-terminal-close-continuity-state-fixture.ts
+++ b/src/main/runtime/__fixtures__/orca-runtime-terminal-close-continuity-state-fixture.ts
@@ -71,6 +71,17 @@ export const canaryProcess = {
   title: 'Canary shell'
 }
 
+export function makeRepo() {
+  return {
+    id: REPO_ID,
+    path: WORKTREE_PATH,
+    displayName: 'close-continuity',
+    upstream: null,
+    badgeColor: '#000000',
+    addedAt: 1
+  }
+}
+
 export function makeSession(ptyId = PTY_ID, includeCanary = false): WorkspaceSessionState {
   return {
     ...getDefaultWorkspaceSession(),
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-terminal-capture.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-terminal-capture.ts
index d7ceac61a3ae..76ee70a5164c 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-terminal-capture.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-terminal-capture.ts
@@ -5,6 +5,12 @@ import type { RuntimeTerminalResolvePane } from '../../../../shared/runtime-type
 import { getRemoteRuntimePtyOwner } from '@/runtime/runtime-terminal-stream'
 import { callRuntimeRpc } from '@/runtime/runtime-rpc-client'
 import { isRemoteRuntimePtyId } from '../../../../shared/remote-runtime/remote-runtime-pty-id'
+import { getKnownExecutionHostIdForWorktree } from '@/lib/worktree-runtime-owner'
+import {
+  HOST_TERMINAL_SURFACE_SEPARATOR,
+  toHostSessionPaneKey,
+  toHostSessionTabId
+} from '../../../../shared/terminal-surface-id'
 
 import { parseHostAuthorityKey } from '../../../../shared/host-authority'
 import { LOCAL_EXECUTION_HOST_ID } from '../../../../shared/execution-host'
@@ -26,12 +32,9 @@ export async function captureSourceTerminal(source: CliChatResumeSource) {
   if (source.paneKey !== `${source.tabId}:${leafId}`) {
     return null
   }
-  const renderer = captureTerminalSurfaceIdentity(
-    useAppStore.getState(),
-    source.workspaceId,
-    source.tabId,
-    leafId
-  )
+  const state = useAppStore.getState()
+  const rendererHost = owner ? getKnownExecutionHostIdForWorktree(state, source.workspaceId) : null
+  const renderer = captureTerminalSurfaceIdentity(state, source.workspaceId, source.tabId, leafId)
   const sourceTarget = structuredAgentSessionTargetForHost(source.executionHostId)
   if (
     owner &&
@@ -46,7 +49,7 @@ export async function captureSourceTerminal(source: CliChatResumeSource) {
       target,
       'terminal.resolvePane',
       {
-        paneKey: source.paneKey,
+        paneKey: owner ? toHostSessionPaneKey(source.paneKey) : source.paneKey,
         worktreeId: source.workspaceId
       }
     )
@@ -57,7 +60,10 @@ export async function captureSourceTerminal(source: CliChatResumeSource) {
       !original ||
       !terminal.incarnationId ||
       original.worktreeId !== source.workspaceId ||
-      original.tabId !== source.tabId ||
+      original.tabId !==
+        (owner
+          ? toHostSessionTabId(source.tabId).split(HOST_TERMINAL_SURFACE_SEPARATOR)[0]
+          : source.tabId) ||
       original.leafId !== leafId ||
       (terminal.executionHostId != null && terminal.executionHostId !== authority?.at) ||
       original.ptyId !== terminal.ptyId ||
@@ -65,12 +71,25 @@ export async function captureSourceTerminal(source: CliChatResumeSource) {
     ) {
       return null
     }
+    const currentState = useAppStore.getState()
+    const current = captureTerminalSurfaceIdentity(
+      currentState,
+      source.workspaceId,
+      source.tabId,
+      leafId
+    )
+    const currentHost = owner
+      ? getKnownExecutionHostIdForWorktree(currentState, source.workspaceId)
+      : null
     const matches = owner
       ? terminal.handle === owner.terminal &&
+        currentHost === rendererHost &&
+        (currentHost === null || currentHost === source.executionHostId) &&
+        (renderer === null
+          ? current === null
+          : isRetainedTerminalSurfaceIdentity(renderer, current)) &&
         (renderer === null ||
           ((renderer.ptyId === null || renderer.ptyId === source.ptyId) &&
-            renderer.createdAt === original.createdAt &&
-            renderer.generation === original.generation &&
             (!renderer.hasLeaf || original.hasLeaf) &&
             (renderer.incarnationId === null || renderer.incarnationId === original.incarnationId)))
       : (source.ptyId === undefined || terminal.ptyId === source.ptyId) &&
diff --git a/src/renderer/src/lib/agent-launch-tab-publication.test.ts b/src/renderer/src/lib/agent-launch-tab-publication.test.ts
index a522a40d7195..6b8e8535524b 100644
--- a/src/renderer/src/lib/agent-launch-tab-publication.test.ts
+++ b/src/renderer/src/lib/agent-launch-tab-publication.test.ts
@@ -7,7 +7,18 @@ import {
 } from './agent-launch-pane-start'
 import { applyAgentLaunchPaneVerdict } from './agent-launch-pane-verdict-application'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { captureSwitchProjection, disposeSwitchProjections } from './conversation-switch-projection'
+import {
+  captureSwitchProjection,
+  disposeSwitchProjections,
+  observeSwitchProjections,
+  retireSwitchProjection
+} from './conversation-switch-projection'
+import {
+  isWebSessionCloseIntentPending,
+  recordWebSessionCloseIntent
+} from '@/runtime/web-session-close-intent'
+import { LOCAL_STRUCTURED_SESSION_OWNER } from '@/runtime/local-structured-session-owner'
+import { AGENT_SESSION_SWITCH_CLIENT_MS } from '../../../shared/agent-session-switch-execution'
 import type * as AgentStatusModule from '@/lib/agent-status'
 import type { AgentLaunchTabPublishRequest } from '../../../shared/agent-launch-tab-publication'
 import { createTabsSliceMockApi } from '../store/slices/tabs-slice-test-harness'
@@ -219,6 +230,55 @@ describe('placement', () => {
     expect(retain).toHaveBeenCalledOnce()
   })
 
+  it('releases retirement on actual use or rollback without clearing a newer close', () => {
+    const source = store
+      .getState()
+      .createUnifiedTab(WT, 'agent-session', { entityId: 'saved-source' })
+    const owner = { environmentId: LOCAL_STRUCTURED_SESSION_OWNER }
+    const hostTabId = `agent-session:${source.entityId}`
+    const pending = (now = Date.now()) => isWebSessionCloseIntentPending(owner, WT, hostTabId, now)
+    const proposal = {
+      invocationId: 'retirement',
+      generation: 'retirement',
+      sessionId: source.entityId,
+      tabId: source.id,
+      phase: 'prepare' as const
+    }
+    const retiredAt = Date.now()
+    captureSwitchProjection(store.getState(), WT, proposal, vi.fn())
+    store.setState(retireSwitchProjection(store.getState(), proposal) ?? {})
+    expect(store.getState().unifiedTabsByWorktree[WT]).not.toContainEqual(source)
+    expect(pending(retiredAt + AGENT_SESSION_SWITCH_CLIENT_MS - 1)).toBe(true)
+    store
+      .getState()
+      .createUnifiedTab(WT, 'agent-session', { id: source.id, entityId: source.entityId })
+    store.getState().activateTab(source.id)
+    expect(pending()).toBe(false)
+
+    const rollback = { ...proposal, invocationId: 'rollback', generation: 'rollback' }
+    captureSwitchProjection(store.getState(), WT, rollback, vi.fn())
+    store.setState(retireSwitchProjection(store.getState(), rollback) ?? {})
+    expect(pending()).toBe(true)
+    observeSwitchProjections(
+      store.getState(),
+      {
+        worktree: WT,
+        publicationEpoch: 'rollback',
+        snapshotVersion: 1,
+        activeGroupId: null,
+        activeTabId: null,
+        activeTabType: null,
+        tabs: [],
+        switchProjections: [{ ...rollback, phase: 'retain' }]
+      },
+      vi.fn()
+    )
+    expect(pending()).toBe(false)
+    recordWebSessionCloseIntent(owner, WT, hostTabId, Date.now())
+    disposeSwitchProjections()
+    expect(pending()).toBe(true)
+  })
+
   function twoGroups() {
     const anchor = store.getState().createUnifiedTab(WT, 'terminal')
     const sourceGroupId = store.getState().groupsByWorktree[WT]![0]!.id
diff --git a/src/renderer/src/lib/conversation-surface-switch.test.tsx b/src/renderer/src/lib/conversation-surface-switch.test.tsx
index c125640d2fbb..d7e11e10a7b6 100644
--- a/src/renderer/src/lib/conversation-surface-switch.test.tsx
+++ b/src/renderer/src/lib/conversation-surface-switch.test.tsx
@@ -198,6 +198,38 @@ it.each(['chat', 'terminal'] as const)(
   }
 )
 
+it('keeps suspended and live jobs disabled, with fg guidance only for suspension', () => {
+  const paneKey = 'terminal:leaf'
+  const source = {
+    tabId: 'terminal',
+    workspaceId: subject.workspaceId,
+    paneKey,
+    agent: subject.agent,
+    providerSessionId: 'provider-session',
+    executionHostId: 'local' as const,
+    ptyId: 'pty'
+  }
+  useAppStore.getState().setPaneForegroundAgent(paneKey, {
+    agent: null,
+    suspendedAgent: 'codex',
+    shellForeground: true
+  })
+  const { result } = renderHook(() =>
+    useConversationSwitchReadiness({ ...subject, direction: 'chat', source })
+  )
+  expect(result.current.ready).toBe(false)
+  expect(result.current.explanation).toContain('If you suspended a job, run fg and exit it')
+  act(() => {
+    useAppStore.getState().setPaneForegroundAgent(paneKey, {
+      agent: 'codex',
+      shellForeground: false
+    })
+  })
+  expect(result.current.ready).toBe(false)
+  expect(result.current.explanation).toContain('Exit the job, then switch.')
+  expect(result.current.explanation).not.toContain('fg')
+})
+
 it('formats real refusal categories once, with agent and next step, never raw errors or platform-wrong job control', async () => {
   const text = (reason: string, platform = 'darwin') =>
     conversationSwitchFailureText(null, { ...subject, platform }, reason)
diff --git a/src/renderer/src/lib/conversation-switch-feedback.ts b/src/renderer/src/lib/conversation-switch-feedback.ts
index 715273b998b2..7267585f4364 100644
--- a/src/renderer/src/lib/conversation-switch-feedback.ts
+++ b/src/renderer/src/lib/conversation-switch-feedback.ts
@@ -12,7 +12,8 @@ export function conversationSwitchFailureText(
     history?: unknown
     platform?: string
   },
-  reasonOverride?: string
+  reasonOverride?: string,
+  context?: { suspended: boolean }
 ): string {
   const failure = structuredLaunchFailure(error)
   const reason = reasonOverride ?? failure?.details?.reason
@@ -65,11 +66,13 @@ export function conversationSwitchFailureText(
           )
   }
   if (reason === 'conversationOpenInTerminal') {
+    const suspended =
+      context?.suspended ?? (args.platform === 'darwin' || args.platform === 'linux')
     return translate(
-      args.platform === 'darwin' || args.platform === 'linux'
+      suspended
         ? 'components.tab.bar.switch.terminalBusyPosix'
         : 'components.tab.bar.switch.terminalBusy',
-      args.platform !== 'win32' && (args.platform === 'darwin' || args.platform === 'linux')
+      suspended
         ? '{{agent}} cannot switch while this terminal has a running job. If you suspended a job, run fg and exit it, then switch.'
         : '{{agent}} cannot switch while this terminal has a running job. Exit the job, then switch.',
       values
diff --git a/src/renderer/src/lib/conversation-switch-projection.ts b/src/renderer/src/lib/conversation-switch-projection.ts
index 1c1ff0c0131d..975c4a40c4b0 100644
--- a/src/renderer/src/lib/conversation-switch-projection.ts
+++ b/src/renderer/src/lib/conversation-switch-projection.ts
@@ -1,6 +1,11 @@
 import type { AppState } from '@/store'
 import type { Tab } from '../../../shared/tab-types'
-import type { SessionSwitchProjection } from '../../../shared/agent-session-switch-execution'
+import {
+  AGENT_SESSION_SWITCH_CLIENT_MS,
+  type SessionSwitchProjection
+} from '../../../shared/agent-session-switch-execution'
+import { recordWebSessionCloseIntent } from '@/runtime/web-session-close-intent'
+import { LOCAL_STRUCTURED_SESSION_OWNER } from '@/runtime/local-structured-session-owner'
 import type { RuntimeMobileSessionTabsResult } from '../../../shared/runtime-types'
 import { createKeptWorktreeSurfacePruners } from '@/store/slices/tabs/kept-worktree-surface-pruning'
 
@@ -11,6 +16,7 @@ type Guard = {
   placement: string
   used: boolean
   notified: boolean
+  releaseClose?: () => void
   retain: (converged?: boolean) => void
 }
 const guards = new Map<string, Guard>()
@@ -52,6 +58,7 @@ export function captureSwitchProjection(
     if (guard.workspaceId !== workspaceId || guard.proposal.sessionId !== proposal.sessionId) {
       continue
     }
+    guard.releaseClose?.()
     guard.retain()
     guards.delete(generation)
   }
@@ -73,6 +80,7 @@ export function captureSwitchProjection(
 export function noteSwitchPresentationUse(tabOrSessionId: string): void {
   for (const guard of guards.values()) {
     if (guard.tab?.id === tabOrSessionId || guard.proposal.sessionId === tabOrSessionId) {
+      guard.releaseClose?.()
       guard.used = true
       if (!guard.notified) {
         guard.notified = true
@@ -95,6 +103,9 @@ export function observeSwitchProjections(
     const guard = guards.get(proposal.generation)
     if (guard) {
       guard.proposal = proposal
+      if (proposal.phase === 'retain') {
+        guard.releaseClose?.()
+      }
     }
   }
 }
@@ -122,6 +133,13 @@ export function retireSwitchProjection(
     fileIds: new Set(),
     browserTabIds: new Set()
   })
+  guard.releaseClose = recordWebSessionCloseIntent(
+    { environmentId: LOCAL_STRUCTURED_SESSION_OWNER },
+    guard.workspaceId,
+    `agent-session:${proposal.sessionId}`,
+    Date.now(),
+    AGENT_SESSION_SWITCH_CLIENT_MS
+  )
   return {
     unifiedTabsByWorktree: prune.unifiedTabs(state.unifiedTabsByWorktree),
     groupsByWorktree: prune.groups(state.groupsByWorktree),
@@ -179,6 +197,7 @@ export function protectSwitchProjections<
     }
     const current = indexed.current.get(guard.tab.id)
     if (current && indexed.placements.get(current.id) !== guard.placement) {
+      guard.releaseClose?.()
       guard.used = true
     }
     const present = indexed.present.has(guard.tab.id)
@@ -186,6 +205,7 @@ export function protectSwitchProjections<
       (guard.proposal.phase === 'retain' && present) ||
       (guard.proposal.phase === 'retire' && !guard.used && !present)
     ) {
+      guard.releaseClose?.()
       guards.delete(guard.proposal.generation)
       queueMicrotask(() => guard.retain(true))
       continue
@@ -267,6 +287,7 @@ export function protectSwitchProjections<
 /** Teardown retains unresolved sources before releasing this view's transient protection. */
 export function disposeSwitchProjections(): void {
   for (const guard of guards.values()) {
+    guard.releaseClose?.()
     guard.retain()
   }
   guards.clear()
diff --git a/src/renderer/src/lib/conversation-switch-state.ts b/src/renderer/src/lib/conversation-switch-state.ts
index 4361082988a7..d73045cc2140 100644
--- a/src/renderer/src/lib/conversation-switch-state.ts
+++ b/src/renderer/src/lib/conversation-switch-state.ts
@@ -75,22 +75,22 @@ export function useConversationSwitchReadiness(args: ConversationSwitch | null)
       ),
     [held]
   )
-  const terminalRunning = useAppStore((state) => {
+  const terminalJob = useAppStore((state) => {
     const key = args?.source?.paneKey
     if (!key) {
       return false
     }
     const foreground = state.paneForegroundAgentByPaneKey[key]
-    return Boolean(foreground?.suspendedAgent || (foreground?.agent && !foreground.shellForeground))
+    return foreground?.suspendedAgent
+      ? 'suspended'
+      : foreground?.agent && !foreground.shellForeground
+        ? 'live'
+        : false
   })
   const pending = useConversationSwitchPending(args)
   const capability = args ? inPlaceSwitchCapabilityNow(args.executionHostId, args.agent) : undefined
   const updateRequired = args?.source?.hostUpdateRequired === true
-  const reason = terminalRunning
-    ? 'conversationOpenInTerminal'
-    : runningTurn
-      ? 'turnActive'
-      : undefined
+  const reason = terminalJob ? 'conversationOpenInTerminal' : runningTurn ? 'turnActive' : undefined
   return {
     ready: Boolean(
       args && target && capability !== undefined && !pending && !reason && !updateRequired
@@ -102,7 +102,9 @@ export function useConversationSwitchReadiness(args: ConversationSwitch | null)
           'Update Orca on this host to continue in Chat UI.'
         )
       : args && reason
-        ? conversationSwitchFailureText(null, args, reason)
+        ? conversationSwitchFailureText(null, args, reason, {
+            suspended: terminalJob === 'suspended'
+          })
         : undefined
   }
 }
diff --git a/src/renderer/src/runtime/web-session-close-intent.ts b/src/renderer/src/runtime/web-session-close-intent.ts
index 70bedc512859..637941866a3a 100644
--- a/src/renderer/src/runtime/web-session-close-intent.ts
+++ b/src/renderer/src/runtime/web-session-close-intent.ts
@@ -9,7 +9,7 @@ export const WEB_SESSION_CLOSE_INTENT_TTL_MS =
   WEB_SESSION_TAB_RPC_TIMEOUT_MS + CLOSE_INTENT_ANSWER_GRACE_MS
 export const MAX_WEB_SESSION_CLOSE_INTENT_PARTITIONS = 512
 
-type CloseIntent = { recordedAt: number; durable: boolean }
+type CloseIntent = { expiresAt: number; durable: boolean }
 
 const pendingCloseByOwnerAndWorktree = new Map<string, Map<string, CloseIntent>>()
 
@@ -21,8 +21,9 @@ export function recordWebSessionCloseIntent(
   owner: WebSessionIntentOwner,
   worktreeId: string,
   hostTabId: string,
-  now: number
-): void {
+  now: number,
+  ttlMs = WEB_SESSION_CLOSE_INTENT_TTL_MS
+): (() => void) | undefined {
   const trimmed = hostTabId.trim()
   if (!worktreeId || !trimmed) {
     return
@@ -40,7 +41,20 @@ export function recordWebSessionCloseIntent(
     }
     pendingCloseByOwnerAndWorktree.set(partitionKey, byTab)
   }
-  byTab.set(trimmed, { recordedAt: now, durable: byTab.get(trimmed)?.durable === true })
+  const durable = ttlMs === WEB_SESSION_CLOSE_INTENT_TTL_MS && byTab.get(trimmed)?.durable === true
+  const intent = { expiresAt: now + ttlMs, durable }
+  byTab.set(trimmed, intent)
+  return () => {
+    if (
+      byTab?.get(trimmed) === intent &&
+      pendingCloseByOwnerAndWorktree.get(partitionKey) === byTab
+    ) {
+      byTab.delete(trimmed)
+      if (byTab.size === 0) {
+        pendingCloseByOwnerAndWorktree.delete(partitionKey)
+      }
+    }
+  }
 }
 
 // Definitive tab_not_found can coexist with stale republished surfaces (#9194); no TTL or unclosable panes return. Clear when a snapshot omits the surface so recovered tabs are not suppressed forever.
@@ -69,7 +83,7 @@ export function isWebSessionCloseIntentPending(
   if (!intent) {
     return false
   }
-  if (!intent.durable && now - intent.recordedAt > WEB_SESSION_CLOSE_INTENT_TTL_MS) {
+  if (!intent.durable && now > intent.expiresAt) {
     byTab!.delete(hostTabId)
     if (byTab!.size === 0) {
       pendingCloseByOwnerAndWorktree.delete(partitionKey)
diff --git a/tests/e2e/cli-chat-resume-terminal-capture.unit.test.ts b/tests/e2e/cli-chat-resume-terminal-capture.unit.test.ts
index bc7b3edf612b..7b4440fc9b85 100644
--- a/tests/e2e/cli-chat-resume-terminal-capture.unit.test.ts
+++ b/tests/e2e/cli-chat-resume-terminal-capture.unit.test.ts
@@ -2,6 +2,7 @@
 import { beforeEach, expect, it, vi } from 'vitest'
 import { useAppStore } from '@/store'
 import { captureSourceTerminal } from '@/components/tab-bar/cli-chat-resume-terminal-capture'
+import { buildMirroredTerminalTabs } from '@/runtime/web-session-tabs-sync/terminal-build'
 import { toRemoteRuntimePtyId } from '../../src/shared/remote-runtime/remote-runtime-pty-id'
 import {
   createHarness,
@@ -130,33 +131,102 @@ it.each(['row', 'incarnation', 'pty', 'workspace', 'leaf', 'host'] as const)(
   }
 )
 
-it('keeps remote proxy and host PTY namespaces distinct, and refuses absent or changed remote owners', async () => {
+it('captures a real mirrored source on host coordinates and keeps client continuity independent of host clocks', async () => {
   const harness = createHarness({ registerPtyBacked: true, publishMobileSurface: true })
-  seed(harness)
+  harness.editSession((session) => ({
+    ...session,
+    tabsByWorktree: {
+      ...session.tabsByWorktree,
+      [WORKTREE_ID]: session.tabsByWorktree[WORKTREE_ID].map((row) => ({ ...row, generation: 7 }))
+    }
+  }))
+  const snapshot = await harness.runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)
   const terminal = harness.runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_ID}`, WORKTREE_ID)
-  const proxy = toRemoteRuntimePtyId(terminal.handle, 'paired')
-  useAppStore.setState({
-    terminalLayoutsByTabId: {
-      ...useAppStore.getState().terminalLayoutsByTabId,
-      [TAB_ID]: {
-        ...useAppStore.getState().terminalLayoutsByTabId[TAB_ID],
-        ptyIdsByLeafId: { [LEAF_ID]: proxy }
-      }
+  const [mirror] = buildMirroredTerminalTabs(snapshot, 'paired', new Map(), {}, {}, 0, 9000)
+  if (!mirror || !terminal.presentation) {
+    throw new Error('Expected a real published terminal')
+  }
+  const mirrored = {
+    ...source(mirror.layout.ptyIdsByLeafId?.[LEAF_ID], 'runtime:paired'),
+    tabId: mirror.tab.id,
+    paneKey: `${mirror.tab.id}:${LEAF_ID}`
+  }
+  const seedMirror = () =>
+    useAppStore.setState({
+      tabsByWorktree: { [WORKTREE_ID]: [mirror.tab] },
+      terminalLayoutsByTabId: { [mirror.tab.id]: mirror.layout },
+      terminalPtyIncarnationsByPaneKey: {},
+      activeWorktreeId: WORKTREE_ID,
+      activeWorkspaceExecutionHostId: 'runtime:paired'
+    })
+  seedMirror()
+  let duringResolve = () => {}
+  rpc.mockImplementation(
+    async (_target, method, params: { paneKey: string; worktreeId: string }) => {
+      expect(method).toBe('terminal.resolvePane')
+      expect(params).toEqual({ paneKey: `${TAB_ID}:${LEAF_ID}`, worktreeId: WORKTREE_ID })
+      duringResolve()
+      return { terminal: harness.runtime.resolveTerminalPane(params.paneKey, params.worktreeId) }
     }
-  })
-  rpc.mockResolvedValue({ terminal })
-  expect(await captureSourceTerminal(source(proxy, 'runtime:paired'))).toMatchObject({
+  )
+  expect(mirrored.tabId).not.toBe(terminal.presentation.identity.tabId)
+  expect(mirror.tab.createdAt).not.toBe(terminal.presentation.identity.createdAt)
+  expect(mirror.tab.generation ?? 0).not.toBe(terminal.presentation.identity.generation)
+  expect(await captureSourceTerminal(mirrored)).toEqual({
     target: { kind: 'environment', environmentId: 'paired' },
-    handle: terminal.handle
+    handle: terminal.handle,
+    incarnationId: terminal.incarnationId,
+    presentation: terminal.presentation
   })
+  for (const change of ['generation', 'adoption', 'binding', 'owner', 'incarnation'] as const) {
+    seedMirror()
+    duringResolve = () =>
+      useAppStore.setState({
+        ...(change === 'generation' || change === 'adoption'
+          ? {
+              tabsByWorktree: {
+                [WORKTREE_ID]: [
+                  {
+                    ...mirror.tab,
+                    ...(change === 'generation' ? { generation: 1 } : { createdAt: 9001 })
+                  }
+                ]
+              }
+            }
+          : {}),
+        ...(change === 'binding'
+          ? {
+              terminalLayoutsByTabId: {
+                [mirror.tab.id]: {
+                  ...mirror.layout,
+                  ptyIdsByLeafId: { [LEAF_ID]: toRemoteRuntimePtyId('successor', 'paired') }
+                }
+              }
+            }
+          : {}),
+        ...(change === 'owner' ? { activeWorkspaceExecutionHostId: 'runtime:successor' } : {}),
+        ...(change === 'incarnation'
+          ? {
+              terminalPtyIncarnationsByPaneKey: { [mirrored.paneKey]: 'successor' }
+            }
+          : {})
+      })
+    expect(await captureSourceTerminal(mirrored), change).toBeNull()
+  }
+  seedMirror()
+  duringResolve = () => {}
   expect(
-    await captureSourceTerminal(source(toRemoteRuntimePtyId(terminal.handle), 'runtime:paired'))
+    await captureSourceTerminal({ ...mirrored, ptyId: toRemoteRuntimePtyId(terminal.handle) })
   ).toBeNull()
-  expect(await captureSourceTerminal(source(undefined, 'runtime:paired'))).toBeNull()
-  expect(await captureSourceTerminal(source(proxy, 'local'))).toBeNull()
-  terminal.handle = 'different'
-  expect(await captureSourceTerminal(source(proxy, 'runtime:paired'))).toBeNull()
-  expect(rpc).toHaveBeenCalledTimes(2)
+  expect(await captureSourceTerminal({ ...mirrored, ptyId: undefined })).toBeNull()
+  expect(await captureSourceTerminal({ ...mirrored, executionHostId: 'local' })).toBeNull()
+  rpc.mockImplementation(async (_target, _method, params) => ({
+    terminal: {
+      ...harness.runtime.resolveTerminalPane(params.paneKey, params.worktreeId),
+      handle: 'different'
+    }
+  }))
+  expect(await captureSourceTerminal(mirrored)).toBeNull()
 })
 
 it('requires a real row/leaf for the new missing-binding exception while retaining existing nonnull-source admission', async () => {
diff --git a/tests/e2e/conversation-switch-desktop-retirement.unit.test.ts b/tests/e2e/conversation-switch-desktop-retirement.unit.test.ts
new file mode 100644
index 000000000000..528ba8f28b35
--- /dev/null
+++ b/tests/e2e/conversation-switch-desktop-retirement.unit.test.ts
@@ -0,0 +1,243 @@
+// @vitest-environment happy-dom
+import { afterEach, expect, it, vi } from 'vitest'
+import { useAppStore } from '@/store'
+import { publishAgentLaunchTab } from '@/lib/agent-launch-tab-publication'
+import { buildWorkspaceSessionPayload } from '@/lib/workspace-session'
+import { registerSessionTabIpcBridge } from '@/hooks/ipc-events/session-tab-ipc-bridge'
+import { buildMobileSessionTabSnapshots } from '@/runtime/sync-runtime-graph/mobile-session-snapshots'
+import { mobilePublicationEpoch } from '@/runtime/sync-runtime-graph/graph-state'
+import { applyStructuredSessionTabSnapshots } from '@/runtime/local-structured-session-tabs-sync/snapshot-apply'
+import { resetLocalStructuredSessionVersionForTests } from '@/runtime/local-structured-session-tabs-sync/inventory-generation-fence'
+import { createTabsSliceMockApi } from '@/store/slices/tabs-slice-test-harness'
+import {
+  createHarness,
+  WORKTREE_ID
+} from '../../src/main/runtime/__fixtures__/orca-runtime-terminal-close-continuity-fixtures'
+import { createMobileCreateTestNotifier } from '../../src/main/runtime/orca-runtime-test-scenario-builders.spec'
+import { electronMocks } from '../../src/main/runtime/orca-runtime-test-mocks.spec'
+import { setRuntimeDesktopSurface } from '../../src/main/runtime/runtime-desktop-surface'
+import { electronRuntimeDesktopSurface } from '../../src/main/host/electron-runtime-desktop-surface'
+import { createRestTestRig } from '../../src/main/native-chat/agent-session-wire/structured-agent-session-rest-test-rig'
+import {
+  createTestParams,
+  CREATE_TEST_CALLER
+} from '../../src/main/native-chat/agent-session-wire/structured-agent-session-create-test-fixture'
+import {
+  HOST_TEST_SESSION,
+  HOST_TEST_THREAD,
+  hostTestMessage
+} from '../../src/main/native-chat/agent-session-wire/structured-agent-session-host-test-data'
+import { setStructuredAgentSessionHost } from '../../src/main/native-chat/agent-session-wire/structured-agent-session-registry'
+import { agentSessionSwitchDeadline } from '../../src/shared/agent-session-switch-execution'
+import { structuredAgentSessionTabId } from '../../src/shared/structured-agent-session-projection'
+import type {
+  SessionTabCloseRequest,
+  SessionTabCloseResponse
+} from '../../src/shared/session-tab-close'
+
+const { receipts } = vi.hoisted(() => ({ receipts: vi.fn(async () => {}) }))
+vi.mock('@/runtime/structured-agent-session-client', () => ({
+  callStructuredAgentSession: receipts
+}))
+vi.mock('@/runtime/sync-runtime-graph', () => ({ scheduleRuntimeGraphSync: vi.fn() }))
+
+afterEach(() => {
+  setRuntimeDesktopSurface(null)
+  electronMocks.BrowserWindow.fromId.mockReset()
+  resetLocalStructuredSessionVersionForTests()
+  vi.clearAllMocks()
+})
+
+it.each(['saved', 'empty'] as const)(
+  'diagnoses focused %s desktop retirement through real IPC, visibility and inventory owners',
+  async (content) => {
+    useAppStore.setState(useAppStore.getInitialState(), true)
+    createTabsSliceMockApi()
+    const state = () => useAppStore.getState()
+    state().setActiveWorktree(WORKTREE_ID)
+    const neighbor = state().createTab(WORKTREE_ID)
+    const source = state().createUnifiedTab(WORKTREE_ID, 'agent-session', {
+      id: structuredAgentSessionTabId(HOST_TEST_SESSION),
+      entityId: HOST_TEST_SESSION,
+      agentSessionAgent: 'codex'
+    })
+    useAppStore.setState({
+      unifiedTabsByWorktree: {
+        ...state().unifiedTabsByWorktree,
+        [WORKTREE_ID]: state().unifiedTabsByWorktree[WORKTREE_ID]!.map((tab) =>
+          tab.id === source.id ? { ...tab, sortOrder: 0 } : tab
+        )
+      }
+    })
+    state().activateTab(source.id)
+    const order = () =>
+      state().groupsByWorktree[WORKTREE_ID]!.find((group) => group.id === source.groupId)!.tabOrder
+    expect(order()).toEqual([neighbor.id, source.id])
+    const rig = await createRestTestRig({ idleSweep: { intervalMs: 60_000 } })
+    const deadline = agentSessionSwitchDeadline()
+    const unsubs: (() => void)[] = []
+    try {
+      const params = createTestParams(undefined, {
+        surfaceTabId: source.id,
+        location: {
+          executionHostId: 'local',
+          wslDistro: null,
+          workspaceId: WORKTREE_ID,
+          workspaceKind: 'git-worktree'
+        }
+      })
+      expect(await rig.host.create(CREATE_TEST_CALLER, params)).toMatchObject({ ok: true })
+      if (content === 'saved') {
+        expect(await rig.host.switchToChat(HOST_TEST_SESSION)).toMatchObject({ ok: true })
+        rig.adapter.acquire.mock.calls[0]![0].events.appendItem(
+          { provider: 'codex', threadId: HOST_TEST_THREAD, turnId: 'saved', ordinal: 1 },
+          hostTestMessage('Saved conversation'),
+          { turnScope: { kind: 'thread' } }
+        )
+        await rig.host.flushStreamedEvents(HOST_TEST_SESSION)
+      }
+      await rig.host.switchToTerminal(HOST_TEST_SESSION, deadline)
+      setStructuredAgentSessionHost(rig.host)
+      await rig.store.setSessionTabVisibility(HOST_TEST_SESSION, true, source.id)
+      electronMocks.BrowserWindow.fromId.mockReturnValue({
+        isDestroyed: () => false,
+        webContents: { isDestroyed: () => false, setBackgroundThrottling: () => {} }
+      })
+      setRuntimeDesktopSurface({
+        showNotification: () => false,
+        findWindowById: electronRuntimeDesktopSurface.findWindowById,
+        onIpc: () => {},
+        removeIpcListener: () => {}
+      })
+      const harness = createHarness()
+      harness.removeVictimFromInventory()
+      harness.editSession(() => buildWorkspaceSessionPayload(state()))
+      const publishGraph = () =>
+        harness.runtime.syncWindowGraph(1, {
+          tabs: [],
+          leaves: [],
+          rendererGeneration: mobilePublicationEpoch,
+          conditionalSwitchProjection: 1,
+          mobileSessionTabs: buildMobileSessionTabSnapshots(state(), false)
+        })
+      publishGraph()
+      harness.runtime.projectStructuredAgentSessionTab({
+        workspaceId: WORKTREE_ID,
+        sessionId: HOST_TEST_SESSION,
+        agent: 'codex',
+        activate: false
+      })
+      const before = await harness.runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)
+      let onClose!: (request: SessionTabCloseRequest) => void
+      const pending = new Map<string, (applied: boolean) => void>()
+      const responses: SessionTabCloseResponse[] = []
+      Object.assign(window.api.ui, {
+        onCloseSessionTab: () => () => {},
+        onMoveSessionTab: () => () => {},
+        onSessionTabCloseRequest: (listener: typeof onClose) => {
+          onClose = listener
+          return () => {}
+        },
+        respondSessionTabClose: (response: SessionTabCloseResponse) => {
+          responses.push(response)
+          pending.get(response.requestId)!(response.switchApplied === true)
+          pending.delete(response.requestId)
+        }
+      })
+      registerSessionTabIpcBridge(unsubs)
+      const entered = Promise.withResolvers<void>()
+      const release = Promise.withResolvers<void>()
+      const phases: string[] = []
+      harness.runtime.setNotifier({
+        ...createMobileCreateTestNotifier(vi.fn()),
+        closeSessionTab: async (tabId, worktreeId, switchProjection) => {
+          const requestId = `close-${phases.length}`
+          phases.push(switchProjection?.phase ?? 'ordinary')
+          const answer = new Promise<boolean>((resolve) => {
+            pending.set(requestId, resolve)
+            onClose({ requestId, tabId, worktreeId, switchProjection })
+          })
+          if (switchProjection?.phase === 'retire') {
+            entered.resolve()
+            await release.promise
+          }
+          return answer
+        }
+      })
+      const restore = vi.fn(async () => {
+        await rig.store.setSessionTabVisibility(HOST_TEST_SESSION, true, source.id)
+      })
+      const retire = harness.runtime.captureSessionSwitchRetirement(
+        WORKTREE_ID,
+        HOST_TEST_SESSION,
+        source.id,
+        rig.host.captureSwitchWork(HOST_TEST_SESSION, deadline),
+        restore,
+        {
+          invocationId: 'desktop-diagnostic',
+          generation: 'desktop-generation',
+          sessionId: HOST_TEST_SESSION,
+          tabId: source.id,
+          phase: 'prepare'
+        }
+      )
+      const destination = '9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d'
+      publishAgentLaunchTab({
+        requestId: 'destination',
+        operationId: 'desktop-diagnostic',
+        worktreeId: WORKTREE_ID,
+        tabId: destination,
+        leafId: '3f2504e0-4f89-41d3-9a0c-0305e82c3301',
+        launchAgent: 'codex',
+        viewMode: 'terminal',
+        viewer: 'focus-window',
+        placement: { groupId: source.groupId!, afterTabId: source.id }
+      })
+      expect(state().activeTabId).toBe(destination)
+      expect(order()).toEqual([neighbor.id, source.id, destination])
+      publishGraph()
+      const closing = retire()
+      const retired = await Promise.race([
+        entered.promise.then(() => 'ipc'),
+        closing.then(() => 'settled')
+      ])
+      try {
+        if (retired === 'ipc') {
+          expect(rig.store.listVisibleSessionIds()).not.toContain(HOST_TEST_SESSION)
+          applyStructuredSessionTabSnapshots([before], undefined, { reacceptCurrentVersion: true })
+        }
+      } finally {
+        release.resolve()
+        await closing
+      }
+      expect(await closing).toBe(true)
+      expect(phases).toEqual(['prepare', 'retire'])
+      expect(responses.map((response) => response.switchApplied)).toEqual([true, true])
+      expect(restore).not.toHaveBeenCalled()
+      const inventory = await harness.runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)
+      applyStructuredSessionTabSnapshots([inventory], undefined, { reacceptCurrentVersion: true })
+      expect(rig.store.getVisibleSessionTabIndex().sessionIds).not.toContain(HOST_TEST_SESSION)
+      expect(
+        inventory.tabs.some(
+          (tab) => tab.type === 'agent-session' && tab.sessionId === HOST_TEST_SESSION
+        )
+      ).toBe(false)
+      expect(state().unifiedTabsByWorktree[WORKTREE_ID]!.some((tab) => tab.id === source.id)).toBe(
+        false
+      )
+      expect(order()).toEqual([neighbor.id, destination])
+      expect(receipts.mock.calls.flat()).not.toContainEqual(
+        expect.objectContaining({
+          execution: expect.objectContaining({
+            receipt: expect.objectContaining({ retained: true })
+          })
+        })
+      )
+    } finally {
+      unsubs.forEach((unsubscribe) => unsubscribe())
+      setStructuredAgentSessionHost(null)
+      deadline.dispose()
+      await rig.dispose()
+    }
+  }
+)

From eb1ecb3276580969194cc634a88c48f02dca44b8 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Tue, 27 Oct 2026 10:41:59 -0700
Subject: [PATCH 085/207] Preserve filesystem spy types and use a deterministic
 switch test clock

---
 .../journal-codex-history.test.ts             | 12 +--
 .../lib/agent-launch-tab-publication.test.ts  | 96 ++++++++++---------
 2 files changed, 57 insertions(+), 51 deletions(-)

diff --git a/src/main/native-chat/agent-session-journal/journal-codex-history.test.ts b/src/main/native-chat/agent-session-journal/journal-codex-history.test.ts
index 845d72347fdc..71106809f980 100644
--- a/src/main/native-chat/agent-session-journal/journal-codex-history.test.ts
+++ b/src/main/native-chat/agent-session-journal/journal-codex-history.test.ts
@@ -13,7 +13,7 @@ import type * as FsPromises from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { basename, dirname, join } from 'node:path'
 import { createZstdDecompress, zstdCompressSync } from 'node:zlib'
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { afterEach, beforeAll, beforeEach, expect, it, vi } from 'vitest'
 import * as values from '../../ai-vault/session-scanner-values'
 import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding'
 import {
@@ -34,10 +34,7 @@ vi.mock(import('node:fs'), async (original) => {
   const fs = await original()
   return { ...fs, createReadStream: vi.fn(fs.createReadStream) }
 })
-vi.mock(import('node:fs/promises'), async (original) => {
-  const fs = await original()
-  return { ...fs, readdir: vi.fn(fs.readdir) }
-})
+vi.mock('node:fs/promises', { spy: true })
 vi.mock(import('node:zlib'), async (original) => {
   const zlib = await original()
   return { ...zlib, createZstdDecompress: vi.fn(zlib.createZstdDecompress) }
@@ -47,6 +44,10 @@ const PARENT = '01a17c7f-6f58-7a73-b87a-a8702ff2da17'
 const CHILD = '01a17c81-30d1-72f0-b84e-002ddfe6fd47'
 const MIDDLE = '01a17c80-30d1-72f0-b84e-002ddfe6fd47'
 let root: string
+let fs: typeof FsPromises
+beforeAll(async () => {
+  fs = await vi.importActual<typeof FsPromises>('node:fs/promises')
+})
 const journals = createTrackedJournalOpener()
 beforeEach(async () => {
   const account = await mkdtemp(join(tmpdir(), 'orca-codex-lineage-'))
@@ -281,7 +282,6 @@ it('uses a readable active parent without consulting an inaccessible archive', a
   const parent = await writeCodexHistoryFixture(root, PARENT, ['sky'])
   const child = await writeCodexHistoryFixture(root, CHILD, ['ice'], parent.position)
   const archive = join(dirname(root), 'archived_sessions')
-  const fs = await vi.importActual<typeof FsPromises>('node:fs/promises')
   vi.mocked(readdir).mockImplementation((...args) => {
     if (args[0] === archive) {
       throw Object.assign(new Error('Archive is inaccessible.'), { code: 'EACCES' })
diff --git a/src/renderer/src/lib/agent-launch-tab-publication.test.ts b/src/renderer/src/lib/agent-launch-tab-publication.test.ts
index 6b8e8535524b..ccd28a1b73c8 100644
--- a/src/renderer/src/lib/agent-launch-tab-publication.test.ts
+++ b/src/renderer/src/lib/agent-launch-tab-publication.test.ts
@@ -231,52 +231,58 @@ describe('placement', () => {
   })
 
   it('releases retirement on actual use or rollback without clearing a newer close', () => {
-    const source = store
-      .getState()
-      .createUnifiedTab(WT, 'agent-session', { entityId: 'saved-source' })
-    const owner = { environmentId: LOCAL_STRUCTURED_SESSION_OWNER }
-    const hostTabId = `agent-session:${source.entityId}`
-    const pending = (now = Date.now()) => isWebSessionCloseIntentPending(owner, WT, hostTabId, now)
-    const proposal = {
-      invocationId: 'retirement',
-      generation: 'retirement',
-      sessionId: source.entityId,
-      tabId: source.id,
-      phase: 'prepare' as const
+    const fixedNow = 1_000_000
+    const clock = vi.spyOn(Date, 'now').mockReturnValue(fixedNow)
+    try {
+      const source = store
+        .getState()
+        .createUnifiedTab(WT, 'agent-session', { entityId: 'saved-source' })
+      const owner = { environmentId: LOCAL_STRUCTURED_SESSION_OWNER }
+      const hostTabId = `agent-session:${source.entityId}`
+      const pending = (now = fixedNow) => isWebSessionCloseIntentPending(owner, WT, hostTabId, now)
+      const proposal = {
+        invocationId: 'retirement',
+        generation: 'retirement',
+        sessionId: source.entityId,
+        tabId: source.id,
+        phase: 'prepare' as const
+      }
+      const retiredAt = fixedNow
+      captureSwitchProjection(store.getState(), WT, proposal, vi.fn())
+      store.setState(retireSwitchProjection(store.getState(), proposal) ?? {})
+      expect(store.getState().unifiedTabsByWorktree[WT]).not.toContainEqual(source)
+      expect(pending(retiredAt + AGENT_SESSION_SWITCH_CLIENT_MS - 1)).toBe(true)
+      store
+        .getState()
+        .createUnifiedTab(WT, 'agent-session', { id: source.id, entityId: source.entityId })
+      store.getState().activateTab(source.id)
+      expect(pending()).toBe(false)
+
+      const rollback = { ...proposal, invocationId: 'rollback', generation: 'rollback' }
+      captureSwitchProjection(store.getState(), WT, rollback, vi.fn())
+      store.setState(retireSwitchProjection(store.getState(), rollback) ?? {})
+      expect(pending()).toBe(true)
+      observeSwitchProjections(
+        store.getState(),
+        {
+          worktree: WT,
+          publicationEpoch: 'rollback',
+          snapshotVersion: 1,
+          activeGroupId: null,
+          activeTabId: null,
+          activeTabType: null,
+          tabs: [],
+          switchProjections: [{ ...rollback, phase: 'retain' }]
+        },
+        vi.fn()
+      )
+      expect(pending()).toBe(false)
+      recordWebSessionCloseIntent(owner, WT, hostTabId, fixedNow)
+      disposeSwitchProjections()
+      expect(pending()).toBe(true)
+    } finally {
+      clock.mockRestore()
     }
-    const retiredAt = Date.now()
-    captureSwitchProjection(store.getState(), WT, proposal, vi.fn())
-    store.setState(retireSwitchProjection(store.getState(), proposal) ?? {})
-    expect(store.getState().unifiedTabsByWorktree[WT]).not.toContainEqual(source)
-    expect(pending(retiredAt + AGENT_SESSION_SWITCH_CLIENT_MS - 1)).toBe(true)
-    store
-      .getState()
-      .createUnifiedTab(WT, 'agent-session', { id: source.id, entityId: source.entityId })
-    store.getState().activateTab(source.id)
-    expect(pending()).toBe(false)
-
-    const rollback = { ...proposal, invocationId: 'rollback', generation: 'rollback' }
-    captureSwitchProjection(store.getState(), WT, rollback, vi.fn())
-    store.setState(retireSwitchProjection(store.getState(), rollback) ?? {})
-    expect(pending()).toBe(true)
-    observeSwitchProjections(
-      store.getState(),
-      {
-        worktree: WT,
-        publicationEpoch: 'rollback',
-        snapshotVersion: 1,
-        activeGroupId: null,
-        activeTabId: null,
-        activeTabType: null,
-        tabs: [],
-        switchProjections: [{ ...rollback, phase: 'retain' }]
-      },
-      vi.fn()
-    )
-    expect(pending()).toBe(false)
-    recordWebSessionCloseIntent(owner, WT, hostTabId, Date.now())
-    disposeSwitchProjections()
-    expect(pending()).toBe(true)
   })
 
   function twoGroups() {

From c3d738a77b5daf7557e496c0c67c87c1955361b6 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Tue, 27 Oct 2026 11:21:11 -0700
Subject: [PATCH 086/207] Preserve pane admission calls and expose E2E type
 diagnostics

---
 config/scripts/check-e2e-typecheck-ratchet.mjs    |  1 +
 .../scripts/check-e2e-typecheck-ratchet.test.mjs  |  1 +
 src/main/runtime/runtime-pane-admission.test.ts   | 15 ++++++++++++++-
 src/main/runtime/runtime-pane-admission.ts        |  7 ++++---
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/config/scripts/check-e2e-typecheck-ratchet.mjs b/config/scripts/check-e2e-typecheck-ratchet.mjs
index 1f43e5c6da0d..f1991c72fcaa 100644
--- a/config/scripts/check-e2e-typecheck-ratchet.mjs
+++ b/config/scripts/check-e2e-typecheck-ratchet.mjs
@@ -53,6 +53,7 @@ export function main(
     console.error(`${file}: ${now} type error(s), baseline allows ${allowed}.`)
   }
   if (grown.length > 0) {
+    console.error(tscOutput)
     console.error(`See the errors with: pnpm typecheck:e2e`)
   }
   for (const { file, now, allowed } of shrunk) {
diff --git a/config/scripts/check-e2e-typecheck-ratchet.test.mjs b/config/scripts/check-e2e-typecheck-ratchet.test.mjs
index f61be826e5c1..1e593022ed16 100644
--- a/config/scripts/check-e2e-typecheck-ratchet.test.mjs
+++ b/config/scripts/check-e2e-typecheck-ratchet.test.mjs
@@ -46,6 +46,7 @@ describe('main', () => {
   it('fails when a file gains an error, as a missing helper import does', () => {
     withBaseline('1 tests/e2e/a.spec.ts\n1 tests/e2e/helpers/b.ts\n')
     expect(main(root, undefined, OUTPUT)).toBe(1)
+    expect(console.error).toHaveBeenCalledWith(OUTPUT)
   })
 
   it('passes at the baseline and fails until a fixed file is pruned', () => {
diff --git a/src/main/runtime/runtime-pane-admission.test.ts b/src/main/runtime/runtime-pane-admission.test.ts
index 662be255e886..060e793722c6 100644
--- a/src/main/runtime/runtime-pane-admission.test.ts
+++ b/src/main/runtime/runtime-pane-admission.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it, vi } from 'vitest'
 import type { TerminalPaneAdmissionOutcome } from '../persistence/terminal-topology/terminal-pane-admission'
-import { startInAdmittedPane } from './runtime-pane-admission'
+import { admitRuntimePane, startInAdmittedPane } from './runtime-pane-admission'
 import type { RuntimeStore } from './runtime-store-contract'
 
 const SPLIT = {
@@ -36,9 +36,22 @@ describe('startInAdmittedPane', () => {
       result: 'term-1'
     })
     expect(store.admitTerminalPane).toHaveBeenCalledWith(SPLIT, 'ssh:target-1')
+    expect(store.admitTerminalPane.mock.contexts).toEqual([runtimeStore])
     expect(start).toHaveBeenCalledWith('admitted')
   })
 
+  it('forwards the authority check to the store without running it early', async () => {
+    const { store, runtimeStore } = storeAnswering('admitted')
+    const check = vi.fn()
+
+    await expect(admitRuntimePane(runtimeStore, SPLIT, 'ssh:target-1', check)).resolves.toBe(
+      'admitted'
+    )
+    expect(store.admitTerminalPane).toHaveBeenCalledWith(SPLIT, 'ssh:target-1', check)
+    expect(store.admitTerminalPane.mock.contexts).toEqual([runtimeStore])
+    expect(check).not.toHaveBeenCalled()
+  })
+
   it('takes back the pane it wrote when the start fails', async () => {
     const { store, runtimeStore } = storeAnswering('admitted')
 
diff --git a/src/main/runtime/runtime-pane-admission.ts b/src/main/runtime/runtime-pane-admission.ts
index 9ae1876c2db5..68f973f588a7 100644
--- a/src/main/runtime/runtime-pane-admission.ts
+++ b/src/main/runtime/runtime-pane-admission.ts
@@ -124,9 +124,10 @@ export async function admitRuntimePane(
   hostId: string | undefined,
   check?: () => void
 ): Promise<TerminalPaneAdmissionOutcome | undefined> {
-  return check
-    ? store?.admitTerminalPane?.(admission, hostId, check)
-    : store?.admitTerminalPane?.(admission, hostId)
+  const args: Parameters<NonNullable<RuntimeStore['admitTerminalPane']>> = check
+    ? [admission, hostId, check]
+    : [admission, hostId]
+  return store?.admitTerminalPane?.(...args)
 }
 
 /** Admit before starting (design 4.1); withdraw failed newly admitted panes unless keepOnFailure retains the error surface. */

From bbf0532e08c9cb3d0dbb3afe5ca08834a0105501 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Tue, 27 Oct 2026 11:30:17 -0700
Subject: [PATCH 087/207] Account for approved fenced switch layout writers

---
 config/main-layout-writer-baseline.txt     | 2 +-
 config/renderer-layout-writer-baseline.txt | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/config/main-layout-writer-baseline.txt b/config/main-layout-writer-baseline.txt
index 29fc2ea849f2..e0c3f5754439 100644
--- a/config/main-layout-writer-baseline.txt
+++ b/config/main-layout-writer-baseline.txt
@@ -5,7 +5,7 @@
 1 src/main/ipc/pty/ipc/leaf-move.ts
 1 src/main/ipc/pty/pane/pane-owner-replacement.ts
 3 src/main/ipc/pty/pane/stable-owner.ts
-2 src/main/ipc/pty/spawn-commit-binding.ts
+3 src/main/ipc/pty/spawn-commit-binding.ts # Replacement/fresh queued checks differ from recovery of an already-dispatched child.
 1 src/main/ipc/renderer-shutdown-checkpoint.ts
 1 src/main/ipc/runtime-environments/runtime-environment-removal-cleanup.ts
 1 src/main/ipc/runtime-environments/runtime-environment-session-reconcile.ts
diff --git a/config/renderer-layout-writer-baseline.txt b/config/renderer-layout-writer-baseline.txt
index 2ec2aab42ee8..1b002b487922 100644
--- a/config/renderer-layout-writer-baseline.txt
+++ b/config/renderer-layout-writer-baseline.txt
@@ -21,6 +21,8 @@
 3 src/renderer/src/components/worktree-jump-palette-status-inputs.ts
 9 src/renderer/src/lib/agent-background-session-test-state.ts
 1 src/renderer/src/lib/agent-hibernation-coordinator.ts
+7 src/renderer/src/lib/agent-launch-pane-verdict-application.ts # Shipped window owner: fenced launch withdrawal/outcome; port when main owns layout.
+8 src/renderer/src/lib/conversation-switch-projection.ts # Shipped window owner: fenced retirement/restoration; port when main owns layout.
 4 src/renderer/src/lib/floating-workspace-terminal-actions.ts
 1 src/renderer/src/lib/pane-manager/client-hosted-browser-row-state.ts
 4 src/renderer/src/lib/session-write-subscriber.ts

From 4342b895696653658844fcb11e8a7b50bf3f1a31 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Tue, 27 Oct 2026 11:40:47 -0700
Subject: [PATCH 088/207] Align switch regression fixtures with current owner
 contracts

---
 .../e2e/cli-chat-resume-terminal-capture.unit.test.ts | 11 ++++++++---
 ...onversation-switch-desktop-retirement.unit.test.ts |  6 +++++-
 tests/e2e/mobile-terminal-session-switch.unit.test.ts |  2 +-
 tests/e2e/native-chat-switch-readable.unit.test.tsx   |  4 ++--
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/tests/e2e/cli-chat-resume-terminal-capture.unit.test.ts b/tests/e2e/cli-chat-resume-terminal-capture.unit.test.ts
index 7b4440fc9b85..6a1f607f5ef7 100644
--- a/tests/e2e/cli-chat-resume-terminal-capture.unit.test.ts
+++ b/tests/e2e/cli-chat-resume-terminal-capture.unit.test.ts
@@ -4,6 +4,7 @@ import { useAppStore } from '@/store'
 import { captureSourceTerminal } from '@/components/tab-bar/cli-chat-resume-terminal-capture'
 import { buildMirroredTerminalTabs } from '@/runtime/web-session-tabs-sync/terminal-build'
 import { toRemoteRuntimePtyId } from '../../src/shared/remote-runtime/remote-runtime-pty-id'
+import type { captureTerminalSurfaceIdentity } from '../../src/shared/terminal-tab-close'
 import {
   createHarness,
   WORKTREE_ID,
@@ -151,14 +152,18 @@ it('captures a real mirrored source on host coordinates and keeps client continu
     tabId: mirror.tab.id,
     paneKey: `${mirror.tab.id}:${LEAF_ID}`
   }
-  const seedMirror = () =>
-    useAppStore.setState({
+  const seedMirror = () => {
+    const presentationState: NonNullable<Parameters<typeof captureTerminalSurfaceIdentity>[0]> = {
       tabsByWorktree: { [WORKTREE_ID]: [mirror.tab] },
       terminalLayoutsByTabId: { [mirror.tab.id]: mirror.layout },
-      terminalPtyIncarnationsByPaneKey: {},
+      terminalPtyIncarnationsByPaneKey: {}
+    }
+    useAppStore.setState({
+      ...presentationState,
       activeWorktreeId: WORKTREE_ID,
       activeWorkspaceExecutionHostId: 'runtime:paired'
     })
+  }
   seedMirror()
   let duringResolve = () => {}
   rpc.mockImplementation(
diff --git a/tests/e2e/conversation-switch-desktop-retirement.unit.test.ts b/tests/e2e/conversation-switch-desktop-retirement.unit.test.ts
index 528ba8f28b35..a832ec5a95a2 100644
--- a/tests/e2e/conversation-switch-desktop-retirement.unit.test.ts
+++ b/tests/e2e/conversation-switch-desktop-retirement.unit.test.ts
@@ -89,7 +89,11 @@ it.each(['saved', 'empty'] as const)(
       expect(await rig.host.create(CREATE_TEST_CALLER, params)).toMatchObject({ ok: true })
       if (content === 'saved') {
         expect(await rig.host.switchToChat(HOST_TEST_SESSION)).toMatchObject({ ok: true })
-        rig.adapter.acquire.mock.calls[0]![0].events.appendItem(
+        const events = rig.adapter.acquire.mock.calls[0]?.[0].events
+        if (!events) {
+          throw new Error('Expected the host acquisition event sink')
+        }
+        events.appendItem(
           { provider: 'codex', threadId: HOST_TEST_THREAD, turnId: 'saved', ordinal: 1 },
           hostTestMessage('Saved conversation'),
           { turnScope: { kind: 'thread' } }
diff --git a/tests/e2e/mobile-terminal-session-switch.unit.test.ts b/tests/e2e/mobile-terminal-session-switch.unit.test.ts
index 011a45d878f2..a699c36057b0 100644
--- a/tests/e2e/mobile-terminal-session-switch.unit.test.ts
+++ b/tests/e2e/mobile-terminal-session-switch.unit.test.ts
@@ -47,7 +47,7 @@ async function setup(outcome: 'ready' | 'failed' | 'unknown' = 'ready') {
   renderer.store.getState().createUnifiedTab(wt, 'agent-session', {
     id: 'custom-source',
     entityId: 'source-chat',
-    agent: 'codex'
+    agentSessionAgent: 'codex'
   })
   const initial = makeWorkspaceSessionWithHeadlessTerminal()
   const session =
diff --git a/tests/e2e/native-chat-switch-readable.unit.test.tsx b/tests/e2e/native-chat-switch-readable.unit.test.tsx
index f71804b7f755..f725740061e6 100644
--- a/tests/e2e/native-chat-switch-readable.unit.test.tsx
+++ b/tests/e2e/native-chat-switch-readable.unit.test.tsx
@@ -13,7 +13,7 @@ import {
   WORKTREE_ID
 } from '../../src/main/runtime/main-owned-workspace-runtime-fixture'
 import { executeStructuredSessionSwitch } from '../../src/main/runtime/rpc/methods/structured-agent-session-switch-execution'
-import { structuredAgentRuntimeRegistration } from '../../src/main/runtime/structured-agent-runtime-registrations'
+import { structuredAgentRuntimeMetadata } from '../../src/main/runtime/structured-agent-runtime-metadata'
 import { agentSessionProviderHandleChainHead } from '../../src/shared/agent-session-provider-handle'
 import { act, cleanup, render, screen, waitFor } from '@testing-library/react'
 import { afterEach, expect, it, vi } from 'vitest'
@@ -159,7 +159,7 @@ it.each(['readable', 'refused', 'unmounted'] as const)(
       agent: 'codex',
       cwd: rig.root,
       providerSessionId: nativeId,
-      registration: structuredAgentRuntimeRegistration('codex')!,
+      metadata: structuredAgentRuntimeMetadata('codex')!,
       requireCurrent: () => {
         const current = rig.store.requireWritableRecord(record.sessionId)
         expect(current.location).toEqual(record.location)

From e8c26d523b4825b03157ced8fa1952bdb6945677 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Tue, 27 Oct 2026 12:29:01 -0700
Subject: [PATCH 089/207] Refresh switch catalog and handle generated-only
 commits

---
 package.json                                            | 2 +-
 src/shared/rpc-contract/rpc-params-catalog.generated.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 14a1102fd461..03bd9ccb4747 100644
--- a/package.json
+++ b/package.json
@@ -372,7 +372,7 @@
   },
   "lint-staged": {
     "{*.{ts,tsx,js,jsx,mjs,mts,cts},!(cloud)/**/*.{ts,tsx,js,jsx,mjs,mts,cts}}": [
-      "oxlint",
+      "oxlint --no-error-on-unmatched-pattern",
       "oxlint --config config/oxlint-js-plugins.json",
       "ast-grep scan --config config/sgconfig.yml --min-severity warning",
       "oxlint --config config/oxlint-react-doctor.json",
diff --git a/src/shared/rpc-contract/rpc-params-catalog.generated.ts b/src/shared/rpc-contract/rpc-params-catalog.generated.ts
index 22515b67a6c1..420e2018a08d 100644
--- a/src/shared/rpc-contract/rpc-params-catalog.generated.ts
+++ b/src/shared/rpc-contract/rpc-params-catalog.generated.ts
@@ -569,8 +569,6 @@ import {
   ItemParams,
   ModelCatalogParams,
   OptionsParams,
-  SwitchToChatParams,
-  SwitchToTerminalParams,
   QueuedMessageActionParams,
   QueuedMessagesResumeParams,
   RespondParams,
@@ -583,6 +581,8 @@ import {
   SleepWorkspaceParams,
   SubscribeParams,
   SubscribeTurnCompletionsParams,
+  SwitchToChatParams,
+  SwitchToTerminalParams,
   ThreadGoalParams,
   UnsubscribeParams
 } from './structured-agent-session-params'

From 15c7a13689f97a06bd4e5ab57c468747e30e1e77 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Tue, 27 Oct 2026 20:44:15 -0700
Subject: [PATCH 090/207] Order switch startup before source shell cleanup

---
 ...red-agent-session-switch-execution.test.ts | 69 +++++++++++++++++--
 ...ructured-agent-session-switch-execution.ts |  6 +-
 2 files changed, 68 insertions(+), 7 deletions(-)

diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
index e02efc77c416..7a85bd875872 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
@@ -1,6 +1,11 @@
 import { writeFile } from 'node:fs/promises'
 import { join } from 'node:path'
 import * as cliTranscript from '../../../ai-vault/structured-chat-cli-fork'
+import * as processTable from '../../../../shared/process-table-snapshot-reader'
+import {
+  assertCliConversationWritersExited,
+  posixCliWriterShellAlone
+} from '../../structured-agent-cli-writers'
 import { structuredAgentRuntimeMetadata } from '../../structured-agent-runtime-metadata'
 import { agentSessionProviderHandleChainHead } from '../../../../shared/agent-session-provider-handle'
 import { captureTerminalSurfaceIdentity } from '../../../../shared/terminal-tab-close'
@@ -303,13 +308,59 @@ it('preserves the v1 request/result and start-only side effects when execution i
   expect(create).not.toHaveBeenCalled()
 })
 
-it('keeps an opened readable chat successful when conditional source-shell cleanup refuses', async () => {
+it.each([false, true])('keeps chat with cleanup=%s', async (cleanupCompletes) => {
   await rig.host.switchToChat(id)
   await rig.host.switchToTerminal(id)
   const record = rig.store.getRecord(id)!
   const head = agentSessionProviderHandleChainHead(record.providerHandleChain)!
   const filePath = join(rig.root, 'cleanup-source.jsonl')
   const nativeId = head.handle.nativeId
+  let shellExited = false
+  const phases: string[] = []
+  const acquisition = Promise.withResolvers<void>()
+  vi.spyOn(processTable, 'getFreshShellForegroundSnapshot').mockImplementation(async () => {
+    phases.push(shellExited ? 'census-exited' : 'census-live')
+    return shellExited ? [] : [{ pid: 101, ppid: 1, stat: 'S+', command: '-/bin/zsh -l' }]
+  })
+  const writer = vi.fn(async () => {
+    await acquisition.promise
+    await assertCliConversationWritersExited(
+      {
+        rows: () => [
+          {
+            paneKey: 'source',
+            worktreeId: WORKTREE_ID,
+            connectionId: null,
+            agentType: 'codex',
+            receivedAt: 1,
+            stateStartedAt: 1,
+            state: 'done',
+            prompt: '',
+            providerSession: { key: 'session_id', id: nativeId }
+          }
+        ],
+        saved: () => [],
+        observation: () => ({
+          current: () => true,
+          topology: 'pane-owned',
+          presence: async () => 'exited'
+        }),
+        terminal: () => ({
+          pane: {
+            ptyId: 'source',
+            incarnationId: 'source-incarnation',
+            identity: 'source:original'
+          }
+        }),
+        links: () => [],
+        sleeping: () => false,
+        shellAlone: () => posixCliWriterShellAlone(101)
+      },
+      'codex',
+      nativeId
+    )
+  })
+  rig.host.deps.assertNoTerminalWriter = writer
   await writeFile(
     filePath,
     `${[
@@ -370,7 +421,13 @@ it('keeps an opened readable chat successful when conditional source-shell clean
     input.check?.()
     await rig.store.setSessionTabVisibility(id, true)
   })
-  const cleanup = vi.spyOn(runtime, 'closeSwitchedSourceTerminal').mockResolvedValue(false)
+  const cleanup = vi.spyOn(runtime, 'closeSwitchedSourceTerminal').mockImplementation(async () => {
+    if (cleanupCompletes) {
+      shellExited = true
+      phases.push('shell-exit')
+    }
+    return cleanupCompletes
+  })
   const params = {
     sessionId: id,
     execution: {
@@ -385,7 +442,7 @@ it('keeps an opened readable chat successful when conditional source-shell clean
   if (view.status !== 'present') {
     throw new Error('missing shown handshake')
   }
-  await executeStructuredSessionSwitch(
+  const opened = await executeStructuredSessionSwitch(
     {
       ...params,
       execution: { ...params.execution, receipt: { generation: view.generation, shown: true } }
@@ -393,12 +450,16 @@ it('keeps an opened readable chat successful when conditional source-shell clean
     { runtime },
     'chat'
   )
+  expect(opened).toMatchObject({ status: 'completed', startupPending: true })
+  acquisition.resolve()
   const result = await executeStructuredSessionSwitch(
     { ...params, execution: { ...params.execution, observe: true } },
     { runtime },
     'chat'
   )
-  expect(result).toMatchObject({ status: 'completed', sourceRetained: true })
+  expect.soft(phases).toEqual(['census-live', ...(cleanupCompletes ? ['shell-exit'] : [])])
+  await expect.soft(writer.mock.results[0]?.value).resolves.toBeUndefined()
+  expect(result).toMatchObject({ status: 'completed', sourceRetained: !cleanupCompletes })
   expect(cleanup).toHaveBeenCalledOnce()
   expect(rig.store.getSessionTabId(id)).not.toBeNull()
 })
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
index 7b49ec5f27ad..6987cd199340 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
@@ -186,9 +186,6 @@ export async function executeStructuredSessionSwitch(
             sessionId,
             startupPending: true
           })
-          const cleanup = source
-            ? cleanupSwitchedSourceShell(ctx, source, switchWitness, witnessBudget, deadline)
-            : Promise.resolve(true)
           const started = await starting
           if (!started.ok) {
             return {
@@ -198,6 +195,9 @@ export async function executeStructuredSessionSwitch(
               ...(started.failureItemId ? { failureItemId: started.failureItemId } : {})
             }
           }
+          const cleanup = source
+            ? cleanupSwitchedSourceShell(ctx, source, switchWitness, witnessBudget, deadline)
+            : Promise.resolve(true)
           return { status: 'completed', sessionId, sourceRetained: !(await cleanup) }
         }
         return executeStructuredSessionTerminalSwitch(

From d1264877cdad7f9704931091558752e667b02740 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Tue, 27 Oct 2026 22:07:22 -0700
Subject: [PATCH 091/207] Test selected-account history adoption at rest

---
 ...ured-agent-session-create-adoption.test.ts | 112 +++++++++++++++++-
 1 file changed, 111 insertions(+), 1 deletion(-)

diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-create-adoption.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-create-adoption.test.ts
index e26f3d221c62..bb4a9efa953f 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-create-adoption.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-create-adoption.test.ts
@@ -1,4 +1,4 @@
-import { writeFile, rm } from 'node:fs/promises'
+import { mkdir, realpath, rename, writeFile, rm } from 'node:fs/promises'
 import { join } from 'node:path'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import {
@@ -23,6 +23,13 @@ import { openTestJournalHostDatabase } from '../agent-session-journal/journal-ho
 import { adapterFor, fakeCodex } from '../../codex/codex-structured-session-adapter-fixture'
 import { createCodexStructuredLaunchResolver } from '../../runtime/structured-agent-launch-composition.test-support'
 import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding'
+import { writeCodexHistoryFixture } from '../agent-session-journal/codex-history-test-fixture'
+import { structuredAgentRuntimeMetadata } from '../../runtime/structured-agent-runtime-metadata'
+import {
+  resolveStructuredAgentSessionAdoptionForCreate,
+  structuredAgentSessionAdoptAttach
+} from '../../runtime/structured-agent-session-create-adoption'
+import { prepareCodexAiVaultSessionResume } from '../../codex/codex-ai-vault-session-resume'
 
 let rig: RestTestRig
 beforeEach(async () => {
@@ -31,6 +38,7 @@ beforeEach(async () => {
 afterEach(async () => {
   await rig.dispose()
   vi.restoreAllMocks()
+  vi.unstubAllEnvs()
 })
 
 async function adoptedParams(history = 'adopted history', threadId = THREAD) {
@@ -65,6 +73,108 @@ function anotherSession(params: AgentSessionAttachParams): AgentSessionAttachPar
   })
 }
 
+it.each([
+  ['matching', THREAD],
+  ['mismatched', '019fd532-7c11-7a90-b6de-4e1a2c3d5f61']
+] as const)(
+  'resolves a selected-account rollout with %s metadata before at-rest publication',
+  async (_kind, metadataId) => {
+    vi.stubEnv('ORCA_USER_DATA_PATH', join(rig.root, 'host-data'))
+    const accountHome = { variable: 'CODEX_HOME', path: join(rig.root, 'selected-account') }
+    const sessions = join(accountHome.path, 'sessions')
+    await mkdir(sessions, { recursive: true })
+    const rollout = await writeCodexHistoryFixture(
+      sessions,
+      THREAD,
+      ['saved CLI turn'],
+      undefined,
+      metadataId
+    )
+    if (metadataId !== THREAD) {
+      // Keep filename lookup valid so the imported metadata is what refuses the mismatched source.
+      await rename(rollout.filePath, join(sessions, `rollout-2026-10-27T00-00-00-${THREAD}.jsonl`))
+    }
+    const metadata = structuredAgentRuntimeMetadata('codex')
+    if (!metadata?.transcriptImport) {
+      throw new Error('Codex transcript importer is not registered')
+    }
+    const adoption = await resolveStructuredAgentSessionAdoptionForCreate({
+      settings: {},
+      agent: 'codex',
+      transcriptImport: metadata.transcriptImport,
+      providerSessionId: THREAD,
+      selectedAccountHome: accountHome,
+      launchEnv: {},
+      workspaceCwd: rig.root,
+      prepareCodexResume: (args) =>
+        prepareCodexAiVaultSessionResume(args, {
+          runtimeHome: null,
+          systemCodexHomePath: join(rig.root, 'system-account'),
+          preparePinnedLaunchHome: async () => {
+            throw new Error('At-rest adoption must not ready a fork launch')
+          }
+        })
+    })
+    expect(adoption.accountHome).toEqual(accountHome)
+    expect(adoption.transcriptPath).toBe(
+      await realpath(join(sessions, `rollout-2026-10-27T00-00-00-${THREAD}.jsonl`))
+    )
+    const result = await rig.host.create(
+      CALLER,
+      createTestParams(undefined, {
+        accountHome: adoption.accountHome,
+        adopt: structuredAgentSessionAdoptAttach({
+          definition: metadata.definition,
+          handleNamesTranscript: metadata.transcriptImport.handleNamesTranscript,
+          conversationStore:
+            metadata.transcriptImport.conversationStore({
+              accountHome: adoption.accountHome,
+              launchEnv: {}
+            }) ?? undefined,
+          transcriptPath: adoption.transcriptPath,
+          providerSessionId: THREAD,
+          workspaceCwd: rig.root
+        })
+      })
+    )
+    expect(rig.adapter.acquire).not.toHaveBeenCalled()
+    expect(rig.adapter.dispatch).not.toHaveBeenCalled()
+    if (metadataId !== THREAD) {
+      expect(result).toMatchObject({
+        ok: false,
+        refusal: {
+          code: 'agent_session_identity_required',
+          details: { reason: 'transcriptUnreadable' },
+          createAttemptRefusedBeforeCommit: true
+        }
+      })
+      expect(rig.store.listRecords()).toEqual([])
+      expect(rig.store.listOperationRows()).toEqual([])
+      expect(rig.store.listVisibleSessionIds()).toEqual([])
+      return
+    }
+    expect(result.ok).toBe(true)
+    if (!result.ok) {
+      throw new Error('Real selected-account adoption failed')
+    }
+    const snapshot = await rig.host.journalSnapshot(SESSION)
+    expect(snapshot.items.map(({ body }) => body)).toEqual([
+      { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'saved CLI turn' }] },
+      {
+        kind: 'message',
+        role: 'assistant',
+        blocks: [{ type: 'text', text: 'saved CLI turn answer' }]
+      }
+    ])
+    expect(result.value.page.items).toEqual(snapshot.items)
+    expect(rig.store.getRecord(SESSION)?.accountHome).toEqual(accountHome)
+    expect(rig.store.getRecord(SESSION)?.providerHandleChain).toMatchObject([
+      { origin: 'adopted', mintedAtFence: 1, handle: { nativeId: THREAD } }
+    ])
+    expect(rig.store.listVisibleSessionIds()).toEqual([SESSION])
+  }
+)
+
 it('imports adoption at rest and resumes its original provider identity after its source disappears', async () => {
   const params = await adoptedParams()
   const history = vi.fn(async () => ({ data: [], nextCursor: null }))

From 975d5c504ae0755203020fa3f90a04fb12e79359 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Wed, 28 Oct 2026 14:58:53 -0700
Subject: [PATCH 092/207] Compose conversation switching with ordinary
 lifecycle owners

---
 pnpm-lock.yaml                                |  25 +
 src/main/daemon/client.ts                     | 261 +----
 src/main/daemon/daemon-client-connection.ts   | 282 +++++
 src/main/daemon/daemon-client-connections.ts  |   8 +
 .../daemon/daemon-client-rpc-request.test.ts  |   2 +-
 src/main/daemon/daemon-client-rpc-request.ts  |   6 +-
 .../daemon-create-or-attach-cancellation.ts   |  81 ++
 .../daemon-create-or-attach-contract.ts       |  83 ++
 src/main/daemon/daemon-provider-restart.ts    |   5 +
 ...on-pty-adapter-concurrent-recovery.test.ts |  94 +-
 ...on-pty-adapter-history-checkpoints.test.ts |  13 +-
 ...ty-adapter-live-rebased-checkpoint.test.ts |  19 +-
 ...pty-adapter-protocol-compatibility.test.ts |  47 +-
 ...on-pty-adapter-steady-state-compat.test.ts |   3 +-
 ...apter-switch-compatibility.test-fixture.ts | 185 ++++
 src/main/daemon/daemon-pty-adapter.ts         |   5 +-
 .../daemon/daemon-pty-connection-lifecycle.ts |   1 +
 src/main/daemon/daemon-pty-daemon-recovery.ts |   3 +
 .../daemon/daemon-pty-event-subscriptions.ts  |  10 +-
 src/main/daemon/daemon-pty-operation-state.ts |  64 ++
 src/main/daemon/daemon-pty-reattach-result.ts |  55 +
 src/main/daemon/daemon-pty-runtime-state.ts   | 107 +-
 src/main/daemon/daemon-pty-session-spawn.ts   |  31 +-
 src/main/daemon/daemon-pty-spawn-context.ts   |  25 +
 .../daemon-pty-spawn-preparation-release.ts   | 107 ++
 .../daemon-pty-spawn-preparation-state.ts     |  32 +
 .../daemon-pty-spawn-preparations.test.ts     |  26 +-
 .../daemon/daemon-pty-spawn-preparations.ts   | 166 ++-
 src/main/daemon/daemon-pty-spawn-request.ts   | 228 ++--
 src/main/daemon/daemon-pty-spawn-result.ts    |  85 +-
 .../daemon/daemon-pty-spawn-settlement.ts     | 259 +++++
 src/main/daemon/daemon-request-router.ts      |  14 +-
 ...on-server-async-spawn-cancellation.test.ts | 709 ++++++++++++-
 ...on-server-creation-failure.test-fixture.ts | 238 +++++
 ...emon-server-native-failure.test-fixture.ts | 155 +++
 src/main/daemon/daemon-server-request.ts      |  41 +
 src/main/daemon/daemon-server.ts              |  55 +-
 src/main/daemon/daemon-terminal-admission.ts  | 125 ++-
 .../daemon/daemon-terminal-stream-client.ts   |  62 ++
 src/main/daemon/pty-subprocess.ts             | 111 +-
 .../daemon-pty-physical-owner.ts              | 118 +++
 .../native-pty-spawn-windows.test.ts          | 119 ++-
 .../daemon/pty-subprocess/native-pty-spawn.ts |  68 +-
 .../pty-subprocess/subprocess-handle.ts       |  86 +-
 src/main/daemon/session-process-inspection.ts |  23 +-
 src/main/daemon/session-switch-use.ts         |   4 +-
 .../daemon/session-termination-controller.ts  |   6 +-
 src/main/daemon/session.test.ts               |  38 +-
 src/main/daemon/session.ts                    |  41 +-
 src/main/daemon/terminal-creation-work.ts     |  78 ++
 .../terminal-host-agent-session-claim.ts      |  13 +
 src/main/daemon/terminal-host-disposal.ts     |  10 +-
 .../terminal-host-fenced-termination.ts       |   4 +-
 src/main/daemon/terminal-host-inspection.ts   |  63 +-
 src/main/daemon/terminal-host-options.ts      |   2 +
 .../daemon/terminal-host-session-create.ts    | 222 +---
 .../daemon/terminal-host-session-publish.ts   | 280 +++++
 .../daemon/terminal-host-session-shutdown.ts  |  22 +-
 src/main/daemon/terminal-host.ts              | 235 +++--
 src/main/daemon/terminal-session-teardown.ts  |  11 +-
 src/main/daemon/types.ts                      |  66 +-
 .../journal-legacy-import-body.ts             |  56 +
 .../journal-legacy-import-contract.ts         |  31 +
 .../journal-legacy-import.ts                  | 176 ++--
 .../journal-pi-active-branch.ts               |  55 +-
 .../claude-cli-switch-2.1.302.jsonl           |   4 +
 .../structured-agent-session-acquisition.ts   |  15 +-
 .../structured-agent-session-agent-start.ts   |  20 +-
 ...red-agent-session-at-rest-catch-up.test.ts |  44 +
 ...ructured-agent-session-at-rest-catch-up.ts |   5 +-
 .../structured-agent-session-chat-stop.ts     |  59 +-
 ...red-agent-session-conversation-lifetime.ts |  32 +-
 ...ured-agent-session-host-mutation-wiring.ts |   4 +-
 ...structured-agent-session-host-mutations.ts |   9 +-
 .../structured-agent-session-host-types.ts    |   3 +-
 .../structured-agent-session-host.ts          |  83 +-
 ...ructured-agent-session-mutation-context.ts |   6 +-
 ...structured-agent-session-start-attempts.ts |  11 +-
 ...tructured-agent-session-stop-acceptance.ts |  48 +-
 ...ructured-agent-session-switch-admission.ts | 139 ---
 ...on-switch-command-ordinary.test-fixture.ts | 143 +++
 ...-agent-session-switch-command-selection.ts | 144 ++-
 ...ent-session-switch-command.test-fixture.ts | 168 +++
 ...tured-agent-session-switch-command.test.ts | 983 +++++++++++++-----
 ...tructured-agent-session-switch-commands.ts | 133 +--
 ...ed-agent-session-switch-import-coverage.ts | 140 +++
 ...ctured-agent-session-switch-import.test.ts | 651 ++++++++++++
 .../structured-agent-session-switch-import.ts | 164 +++
 ...session-switch-reservation.test-fixture.ts |  60 ++
 ...gent-session-switch-socket.test-fixture.ts | 133 +++
 .../structured-agent-session-switch-source.ts | 188 ++++
 ...ructured-agent-session-switch-stop.test.ts |  68 ++
 ...structured-agent-session-switch-to-chat.ts |  59 +-
 ...nt-session-terminal-writer-acquire.test.ts | 121 ++-
 .../structured-conversation-key.ts            |  14 +-
 .../transcript-grok-turn-lifecycle.ts         |  47 +
 .../transcript-opencode-message-rows.ts       |  96 ++
 .../transcript-opencode-sqlite-query.ts       | 138 +--
 src/main/native-chat/transcript-opencode.ts   |  13 +-
 .../transcript-opencode2-sqlite.ts            |  36 +-
 .../native-chat/transcript-turn-lifecycle.ts  |  40 +-
 src/main/providers/local-pty-provider.ts      |   4 +-
 .../local-pty-switch-cleanup.test.ts          |  49 +-
 src/main/providers/local-pty-termination.ts   |   9 +-
 .../agent-session-record-publication.ts       |  55 +-
 .../runtime/agent-session-record-store.ts     |  80 +-
 .../agent-session/agent-session-tab-layout.ts |  53 +-
 .../agent-session-reservation-admission.ts    |  20 +-
 .../main-owned-workspace-runtime-fixture.ts   |  50 +-
 ...ctured-agent-session-create-intent.test.ts |  72 +-
 .../structured-session-mail-target.ts         |  21 +-
 .../structured-worker-switch-stop.test.ts     |  96 ++
 .../structured-worker-switch-stop.ts          |  54 +
 .../terminal-pane-mail-routing.ts             |  26 +-
 .../cli-runtime-boundary.test.ts              | 330 +++++-
 ...ured-agent-session-adoption-replay.test.ts |  11 +-
 ...red-agent-session-switch-execution.test.ts | 682 ++++++------
 ...ructured-agent-session-switch-execution.ts | 400 +++----
 ...structured-agent-session-switch-failure.ts |  33 +
 ...red-agent-session-switch-generated.test.ts | 477 +++++++++
 ...ctured-agent-session-switch-preparation.ts |  97 ++
 ...ructured-agent-session-switch-retention.ts |  28 +
 .../structured-agent-session-switch-source.ts |  92 +-
 ...agent-session-switch-terminal-execution.ts |  28 +-
 ...ctured-agent-session-switch-to-terminal.ts |   2 +-
 src/main/runtime/runtime-notifier-contract.ts |   2 +-
 .../explicit-terminal-close-stops.ts          |  85 +-
 .../main-layout-agent-launch-tabs.ts          |   8 +-
 .../structured-session-account-home.ts        |  19 +-
 .../structured-session-create-support.ts      |  69 +-
 .../structured-session-launch-runtime.ts      |  19 -
 .../structured-session-switch-projection.ts   |   8 +-
 ...uctured-session-switch-publication.test.ts | 232 +++++
 .../structured-session-tab-restoration.ts     |  68 +-
 ...ured-session-terminal-launch-retirement.ts |  14 +-
 .../terminal-switch-close-capture.ts          | 100 ++
 ...tructured-agent-session-create-adoption.ts |  34 +-
 .../structured-agent-session-host-assembly.ts |   4 +-
 .../structured-agent-session-runtime.ts       |   2 +-
 .../launch/mobile-terminal-create-options.ts  |   7 +-
 .../launch/mobile-terminal-owned-create.ts    |   1 +
 .../launch/mobile-terminal-renderer-create.ts |   6 +-
 .../launch/mobile-terminal-startup.ts         |   7 +-
 .../mobile-terminal-switch-publication.ts     |  82 +-
 .../workspace-process-listing-dependencies.ts |   1 +
 .../workspaces/workspace-process-listing.ts   |   6 +-
 src/main/window/runtime-window-lifecycle.ts   |   7 +-
 .../ui-bridge-terminal-and-session-tabs.ts    |   9 +-
 src/preload/api/ui-command-event-api.ts       |   1 +
 .../NativeChatResumeInCliButton.tsx           |   4 +-
 ...ucturedSession.history-read-state.test.tsx |  38 +-
 .../NativeChatStructuredSession.tsx           |  13 +-
 .../NativeChatTopRightControls.tsx            |  24 +-
 .../native-chat/native-chat-view-state.ts     |  15 -
 .../right-sidebar/AiVaultVirtualRow.test.tsx  | 329 +++++-
 .../right-sidebar/AiVaultVirtualRow.tsx       |   5 +
 .../ai-vault-history-native-return.test.tsx   |  45 +-
 .../ai-vault-session-in-place-switch.ts       |  23 +-
 .../ai-vault-session-launch-actions.test.ts   |  54 +-
 .../ai-vault-session-launch-actions.ts        |  13 +-
 .../ai-vault-session-resume-in-chat-launch.ts |  11 +-
 ...-vault-session-resume-in-chat-workspace.ts |  39 +-
 .../use-ai-vault-panel-session-resume.ts      |   3 -
 .../tab-bar/CliChatResumeMenuItems.tsx        |   9 +-
 .../tab-bar/NativeChatCliForkMenuItems.tsx    |  48 +-
 .../TabSessionSurfaceSwitchMenuItems.test.tsx |  38 +-
 .../tab-bar/TabSessionSwitchHoverAction.tsx   |  16 +-
 ...li-chat-resume-exit-return.test-fixture.ts | 302 ------
 .../tab-bar/cli-chat-resume-feedback.ts       |  24 +-
 .../cli-chat-resume-mocks.test-fixture.ts     |  47 -
 ...t-resume-parked-retirement.test-fixture.ts |  69 --
 .../tab-bar/cli-chat-resume-run.test.ts       | 929 +++--------------
 .../components/tab-bar/cli-chat-resume-run.ts | 314 +++---
 ...cli-chat-resume-slot-order.test-fixture.ts | 111 --
 .../cli-chat-resume-snapshot.test-fixture.ts  |  24 -
 .../native-chat-cli-switch-run.test.ts        | 105 +-
 .../tab-bar/native-chat-cli-switch-run.ts     |  95 +-
 ...alPaneResumeInChatButton.held-job.test.tsx |  17 +-
 .../TerminalPaneResumeInChatButton.test.tsx   |  11 +-
 .../TerminalPaneResumeInChatButton.tsx        |  12 +-
 .../floating-workspace-reveal-routing.test.ts |  32 +
 .../terminal-ui-routing-ipc-bridge.ts         |   6 +-
 ...seIpcEvents-agent-conversation-cap.test.ts | 213 ++--
 .../src/i18n/en-runtime-required.json         |   9 +-
 src/renderer/src/i18n/locales/en.json         |  13 +-
 src/renderer/src/i18n/locales/pt.json         |   6 +
 .../activate-ai-vault-structured-session.ts   |  37 +-
 .../lib/agent-launch-tab-main-written.test.ts |  31 +-
 .../src/lib/agent-launch-tab-main-written.ts  |  35 +-
 .../src/lib/agent-launch-tab-presentation.ts  |   7 +-
 .../lib/agent-launch-tab-publication.test.ts  |  25 +
 .../src/lib/agent-launch-tab-publication.ts   |  11 +-
 ...ured-agent-session-provisional-tab.test.ts | 211 +++-
 ...tructured-agent-session-provisional-tab.ts |  10 +-
 ...structured-agent-session-tab-activation.ts |   9 +-
 .../lib/conversation-surface-switch.test.tsx  | 444 +++++++-
 .../src/lib/conversation-surface-switch.ts    | 220 ++--
 .../src/lib/conversation-switch-feedback.ts   |  61 +-
 .../src/lib/conversation-switch-legacy.ts     |  21 +-
 .../conversation-switch-presentation.test.tsx |  49 +-
 .../lib/conversation-switch-presentation.tsx  | 101 +-
 .../conversation-switch-result-selection.ts   |  40 +
 .../src/lib/conversation-switch-selection.ts  |  26 +
 .../src/lib/conversation-switch-state.ts      |  88 +-
 .../src/lib/in-place-switch-support.test.tsx  |  70 +-
 .../src/lib/in-place-switch-support.ts        |  16 +-
 .../src/lib/launch-ai-vault-session.ts        |  13 +-
 ...structured-agent-session-launch-surface.ts |   9 +-
 ...t-session-tab-open-through-layout-owner.ts |   3 +-
 ...b-runtime-agent-terminal-host-authority.ts |  91 ++
 ...session-terminal-workspace-routing.test.ts | 223 +++-
 .../web-runtime-terminal-create-operation.ts  | 125 +--
 .../runtime/web-runtime-terminal-creation.ts  |   4 +-
 ...b-runtime-terminal-placement-settlement.ts |   3 +-
 .../web-session-tabs-sync/store-patch.ts      |  22 +-
 .../src/store/agent-conversation-retention.ts |   5 +-
 .../agent-status/agent-status-live-reducer.ts |   5 +-
 .../agent-status-provider-session-actions.ts  |   8 +-
 src/shared/agent-launch-tab-publication.ts    |   2 +
 src/shared/agent-session-switch-execution.ts  |  25 +-
 .../claimed-agent-pty-ensure-options.ts       |  25 +
 src/shared/claimed-agent-pty-owner.ts         |  83 +-
 src/shared/pty-creation-disposition.ts        |  11 +
 .../structured-agent-session-params.ts        |  22 +-
 ...uctured-agent-cli-conversation-adoption.ts |  20 +-
 225 files changed, 12793 insertions(+), 5720 deletions(-)
 create mode 100644 src/main/daemon/daemon-client-connection.ts
 create mode 100644 src/main/daemon/daemon-create-or-attach-cancellation.ts
 create mode 100644 src/main/daemon/daemon-create-or-attach-contract.ts
 create mode 100644 src/main/daemon/daemon-pty-adapter-switch-compatibility.test-fixture.ts
 create mode 100644 src/main/daemon/daemon-pty-operation-state.ts
 create mode 100644 src/main/daemon/daemon-pty-reattach-result.ts
 create mode 100644 src/main/daemon/daemon-pty-spawn-context.ts
 create mode 100644 src/main/daemon/daemon-pty-spawn-preparation-release.ts
 create mode 100644 src/main/daemon/daemon-pty-spawn-preparation-state.ts
 create mode 100644 src/main/daemon/daemon-pty-spawn-settlement.ts
 create mode 100644 src/main/daemon/daemon-server-creation-failure.test-fixture.ts
 create mode 100644 src/main/daemon/daemon-server-native-failure.test-fixture.ts
 create mode 100644 src/main/daemon/daemon-server-request.ts
 create mode 100644 src/main/daemon/daemon-terminal-stream-client.ts
 create mode 100644 src/main/daemon/pty-subprocess/daemon-pty-physical-owner.ts
 create mode 100644 src/main/daemon/terminal-creation-work.ts
 create mode 100644 src/main/daemon/terminal-host-session-publish.ts
 create mode 100644 src/main/native-chat/agent-session-journal/journal-legacy-import-body.ts
 create mode 100644 src/main/native-chat/agent-session-journal/journal-legacy-import-contract.ts
 create mode 100644 src/main/native-chat/agent-session-wire/__fixtures__/claude-cli-switch-2.1.302.jsonl
 delete mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-switch-admission.ts
 create mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-switch-command-ordinary.test-fixture.ts
 create mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test-fixture.ts
 create mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-switch-import-coverage.ts
 create mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.test.ts
 create mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.ts
 create mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-switch-reservation.test-fixture.ts
 create mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-switch-socket.test-fixture.ts
 create mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts
 create mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-switch-stop.test.ts
 create mode 100644 src/main/native-chat/transcript-grok-turn-lifecycle.ts
 create mode 100644 src/main/native-chat/transcript-opencode-message-rows.ts
 create mode 100644 src/main/runtime/orchestration/structured-worker-switch-stop.test.ts
 create mode 100644 src/main/runtime/orchestration/structured-worker-switch-stop.ts
 create mode 100644 src/main/runtime/rpc/methods/structured-agent-session-switch-failure.ts
 create mode 100644 src/main/runtime/rpc/methods/structured-agent-session-switch-generated.test.ts
 create mode 100644 src/main/runtime/rpc/methods/structured-agent-session-switch-preparation.ts
 create mode 100644 src/main/runtime/rpc/methods/structured-agent-session-switch-retention.ts
 create mode 100644 src/main/runtime/session-tabs/structured-session-switch-publication.test.ts
 create mode 100644 src/main/runtime/session-tabs/terminal-switch-close-capture.ts
 delete mode 100644 src/renderer/src/components/tab-bar/cli-chat-resume-exit-return.test-fixture.ts
 delete mode 100644 src/renderer/src/components/tab-bar/cli-chat-resume-mocks.test-fixture.ts
 delete mode 100644 src/renderer/src/components/tab-bar/cli-chat-resume-parked-retirement.test-fixture.ts
 delete mode 100644 src/renderer/src/components/tab-bar/cli-chat-resume-slot-order.test-fixture.ts
 delete mode 100644 src/renderer/src/components/tab-bar/cli-chat-resume-snapshot.test-fixture.ts
 create mode 100644 src/renderer/src/lib/conversation-switch-result-selection.ts
 create mode 100644 src/renderer/src/lib/conversation-switch-selection.ts
 create mode 100644 src/renderer/src/runtime/web-runtime-agent-terminal-host-authority.ts
 create mode 100644 src/shared/claimed-agent-pty-ensure-options.ts
 create mode 100644 src/shared/pty-creation-disposition.ts

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b5bfd4cee68d..9df280f23651 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -6,6 +6,9 @@ importers:
   .:
     configDependencies: {}
     packageManagerDependencies:
+      '@pnpm/exe':
+        specifier: 12.14.0
+        version: 12.14.0
       pnpm:
         specifier: 12.14.0
         version: 12.14.0
@@ -89,6 +92,11 @@ packages:
     cpu: [x64]
     os: [win32]
 
+  '@pnpm/exe@12.14.0':
+    resolution: {integrity: sha512-iZCbiKegYUapNVkZY4O8vjXt9EF/j34LbDvew6qUM5g/HrxMY38cFJaoE8+5ZWQfbt2YCsLfufI5TTh+GxUbWw==}
+    engines: {node: '>=18.*'}
+    hasBin: true
+
   pnpm@12.14.0:
     resolution: {integrity: sha512-wYum2HmT09Fky16JSPMrLAbuhUSH4GzY2GeBNC+z5btGNDZwNHEehoArqpw3vqkGzhkprQjXCITJfYAd8TOJpg==}
     engines: {node: '>=18.*'}
@@ -138,6 +146,23 @@ snapshots:
   '@pnpm/exe.win32-x64@12.14.0':
     optional: true
 
+  '@pnpm/exe@12.14.0':
+    optionalDependencies:
+      '@pnpm/exe.android-arm64': 12.14.0
+      '@pnpm/exe.android-x64': 12.14.0
+      '@pnpm/exe.darwin-arm64': 12.14.0
+      '@pnpm/exe.darwin-x64': 12.14.0
+      '@pnpm/exe.freebsd-x64': 12.14.0
+      '@pnpm/exe.linux-arm64': 12.14.0
+      '@pnpm/exe.linux-arm64-musl': 12.14.0
+      '@pnpm/exe.linux-ppc64': 12.14.0
+      '@pnpm/exe.linux-riscv64': 12.14.0
+      '@pnpm/exe.linux-s390x': 12.14.0
+      '@pnpm/exe.linux-x64': 12.14.0
+      '@pnpm/exe.linux-x64-musl': 12.14.0
+      '@pnpm/exe.win32-arm64': 12.14.0
+      '@pnpm/exe.win32-x64': 12.14.0
+
   pnpm@12.14.0:
     optionalDependencies:
       '@pnpm/exe.android-arm64': 12.14.0
diff --git a/src/main/daemon/client.ts b/src/main/daemon/client.ts
index 22495a18e3e5..8efa1a282c4e 100644
--- a/src/main/daemon/client.ts
+++ b/src/main/daemon/client.ts
@@ -1,202 +1,23 @@
-import type { Socket } from 'node:net'
-import { readDaemonClientToken } from './daemon-client-token'
-import { randomUUID } from 'node:crypto'
+import { DaemonClientConnection } from './daemon-client-connection'
 import { encodeNdjson } from './ndjson'
-import {
-  PROTOCOL_VERSION,
-  NOTIFY_PREFIX,
-  DaemonConnectionLostError,
-  DaemonProtocolError,
-  type DaemonEndpointIdentity
-} from './types'
+import { NOTIFY_PREFIX, DaemonConnectionLostError } from './types'
 import { writeRefused, type WriteSettlement } from '../../shared/pty-write-settlement'
-import {
-  armDaemonSocketCloseHandlers,
-  connectDaemonSocket,
-  waitForDaemonConnectionAttempt
-} from './daemon-client-socket-connect'
-import { DaemonClientListeners } from './daemon-client-listener-registry'
-import { sameDaemonIdentity, sendDaemonHello } from './daemon-client-hello-handshake'
-import { DaemonPendingRequests } from './daemon-client-pending-requests'
-import {
-  attachControlResponseReader,
-  attachStreamEventReader
-} from './daemon-client-ndjson-readers'
 import { writeNotifyWithSettlement } from './daemon-client-notify-settlement'
 import { requestDaemonRpc } from './daemon-client-rpc-request'
+export type { DaemonClientOptions } from './daemon-client-connection'
 
-const CONNECT_TIMEOUT_MS = 5000
-const CONNECTION_ATTEMPT_WAIT_MS = CONNECT_TIMEOUT_MS * 4
 const REQUEST_TIMEOUT_MS = 30000
 const NOTIFY_SETTLEMENT_TIMEOUT_MS = 5000
 
-export type DaemonClientOptions = {
-  socketPath: string
-  tokenPath: string
-  protocolVersion?: number
-}
-
-export class DaemonClient {
-  private socketPath: string
-  private tokenPath: string
-  private protocolVersion: number
-  private clientId = randomUUID()
-
-  private controlSocket: Socket | null = null
-  private streamSocket: Socket | null = null
-  private connected = false
-  private disconnectArmed = false
-  // Ignore old-socket close events after reconnect so they cannot tear down the new connection.
-  private connectionGeneration = 0
-  // Share connection attempts across concurrent pane spawns.
-  private connectingPromise: Promise<void> | null = null
-  private connectionAttemptGeneration = 0
-  private daemonIdentity: DaemonEndpointIdentity | null = null
-  private daemonResizeModel: string | null | undefined
-  private observedAuthenticatedDisconnect = false
-
-  private pendingRequests = new DaemonPendingRequests()
-  private eventListeners = new DaemonClientListeners<(event: unknown) => void>()
-  private disconnectedListeners = new DaemonClientListeners<() => void>()
+export class DaemonClient extends DaemonClientConnection {
   private requestCounter = 0
-  private cleanupSocketListeners: (() => void) | null = null
-
-  constructor(opts: DaemonClientOptions) {
-    this.socketPath = opts.socketPath
-    this.tokenPath = opts.tokenPath
-    this.protocolVersion = opts.protocolVersion ?? PROTOCOL_VERSION
-  }
-
-  isConnected(): boolean {
-    return this.connected
-  }
-
-  getDaemonIdentity(): DaemonEndpointIdentity | null {
-    return this.daemonIdentity ? { ...this.daemonIdentity } : null
-  }
-
-  /**
-   * The last daemon's resize model, kept through a disconnect (the next hello replaces it): null is
-   * an older daemon, undefined that no daemon has answered yet.
-   */
-  getDaemonResizeModel(): string | null | undefined {
-    return this.daemonResizeModel
-  }
-
-  hasObservedAuthenticatedDisconnect(): boolean {
-    return this.observedAuthenticatedDisconnect
-  }
-
-  async ensureConnected(): Promise<void> {
-    return this.ensureConnectedWithTimeout(CONNECT_TIMEOUT_MS, false)
-  }
-
-  async ensureConnectedWithin(timeoutMs: number): Promise<void> {
-    return this.ensureConnectedWithTimeout(timeoutMs, true)
-  }
-
-  private async ensureConnectedWithTimeout(
-    timeoutMs: number,
-    sharedBudget: boolean
-  ): Promise<void> {
-    if (this.connected) {
-      return
-    }
-    if (this.connectingPromise) {
-      // Teardown shares one deadline; normal connects allow separate socket and handshake budgets.
-      const waiterTimeoutMs = sharedBudget ? timeoutMs : CONNECTION_ATTEMPT_WAIT_MS
-      return waitForDaemonConnectionAttempt(this.connectingPromise, waiterTimeoutMs)
-    }
-
-    const attemptGeneration = this.connectionAttemptGeneration
-    this.connectingPromise = this.doConnect(timeoutMs, attemptGeneration, sharedBudget)
-    try {
-      await this.connectingPromise
-    } finally {
-      this.connectingPromise = null
-    }
-  }
-
-  private async doConnect(
-    timeoutMs: number,
-    attemptGeneration: number,
-    sharedBudget: boolean
-  ): Promise<void> {
-    const token = readDaemonClientToken(this.tokenPath)
-    const deadlineMs = Date.now() + timeoutMs
-    const remainingMs = (): number =>
-      sharedBudget ? Math.max(1, deadlineMs - Date.now()) : timeoutMs
-    const pendingListenerCleanups: (() => void)[] = []
-    const cleanupPendingListeners = (): void => {
-      for (const cleanup of pendingListenerCleanups.splice(0)) {
-        cleanup()
-      }
-    }
-
-    try {
-      const pendingControlSocket = await connectDaemonSocket(this.socketPath, remainingMs())
-      this.assertConnectionAttemptCurrent(attemptGeneration, pendingControlSocket)
-      this.controlSocket = pendingControlSocket
-      const controlHello = await this.sendHello(this.controlSocket, token, 'control', remainingMs())
-      const controlIdentity = controlHello.identity
-      this.assertConnectionAttemptCurrent(attemptGeneration, this.controlSocket)
-      pendingListenerCleanups.push(
-        attachControlResponseReader(
-          this.controlSocket,
-          (response) => this.pendingRequests.settle(response),
-          controlHello.remainder
-        )
-      )
-
-      const pendingStreamSocket = await connectDaemonSocket(this.socketPath, remainingMs())
-      this.assertConnectionAttemptCurrent(attemptGeneration, pendingStreamSocket)
-      this.streamSocket = pendingStreamSocket
-      const streamHello = await this.sendHello(this.streamSocket, token, 'stream', remainingMs())
-      this.assertConnectionAttemptCurrent(attemptGeneration, this.streamSocket)
-      if (!sameDaemonIdentity(controlIdentity, streamHello.identity)) {
-        throw new DaemonProtocolError('Daemon identity changed during connection')
-      }
-      const streamReader = attachStreamEventReader(this.streamSocket, streamHello, (event) => {
-        this.eventListeners.each((listener) => listener(event))
-      })
-      pendingListenerCleanups.push(streamReader.detach)
-
-      this.assertConnectionAttemptCurrent(attemptGeneration)
-      this.connected = true
-      this.observedAuthenticatedDisconnect = false
-      this.daemonIdentity = controlIdentity
-      this.daemonResizeModel = controlHello.resizeModel
-      this.disconnectArmed = true
-      this.connectionGeneration++
-
-      const gen = this.connectionGeneration
-      pendingListenerCleanups.push(
-        armDaemonSocketCloseHandlers(
-          this.controlSocket,
-          this.streamSocket,
-          () => this.handleDisconnect(gen),
-          streamReader.drainBuffered
-        )
-      )
-      this.cleanupSocketListeners = cleanupPendingListeners
-    } catch (error) {
-      cleanupPendingListeners()
-      this.controlSocket?.destroy()
-      this.streamSocket?.destroy()
-      this.controlSocket = null
-      this.streamSocket = null
-      this.connected = false
-      this.daemonIdentity = null
-      this.disconnectArmed = false
-      throw error
-    }
-  }
 
   async request<T = unknown>(
     type: string,
     payload: unknown,
     timeoutMs = REQUEST_TIMEOUT_MS,
-    signal?: AbortSignal
+    signal?: AbortSignal,
+    onSent?: (requestId: string) => void
   ): Promise<T> {
     if (!this.connected || !this.controlSocket) {
       // No socket is a transport failure, distinct from a daemon refusing the request.
@@ -212,6 +33,7 @@ export class DaemonClient {
       payload,
       timeoutMs,
       ...(signal ? { signal } : {}),
+      ...(onSent ? { onSent } : {}),
       unmatchedCancelGraceMs: NOTIFY_SETTLEMENT_TIMEOUT_MS,
       onCreateCancellationFailure: () => this.handleDisconnect(generation),
       settleCreateCancellation: (sessionId, requestId) =>
@@ -271,73 +93,4 @@ export class DaemonClient {
   onDisconnected(listener: () => void): () => void {
     return this.disconnectedListeners.add(listener)
   }
-
-  disconnect(): void {
-    this.connectionAttemptGeneration++
-    this.connected = false
-    this.daemonIdentity = null
-    this.disconnectArmed = false
-    this.cleanupActiveSocketListeners()
-
-    this.pendingRequests.rejectAll('Disconnected')
-
-    this.controlSocket?.destroy()
-    this.streamSocket?.destroy()
-    this.controlSocket = null
-    this.streamSocket = null
-  }
-
-  private assertConnectionAttemptCurrent(attemptGeneration: number, socket?: Socket): void {
-    if (attemptGeneration === this.connectionAttemptGeneration) {
-      return
-    }
-    socket?.destroy()
-    throw new DaemonProtocolError('Disconnected')
-  }
-
-  private sendHello(
-    socket: Socket,
-    token: string,
-    role: 'control' | 'stream',
-    timeoutMs: number
-  ): ReturnType<typeof sendDaemonHello> {
-    return sendDaemonHello({
-      socket,
-      token,
-      role,
-      timeoutMs,
-      protocolVersion: this.protocolVersion,
-      clientId: this.clientId
-    })
-  }
-
-  private handleDisconnect(generation: number): void {
-    if (!this.disconnectArmed || generation !== this.connectionGeneration) {
-      return
-    }
-    this.disconnectArmed = false
-    this.connectionAttemptGeneration++
-    if (this.daemonIdentity) {
-      this.observedAuthenticatedDisconnect = true
-    }
-    this.connected = false
-    this.daemonIdentity = null
-    this.daemonResizeModel = null
-    this.cleanupActiveSocketListeners()
-
-    this.pendingRequests.rejectAll('Connection lost')
-
-    this.controlSocket?.destroy()
-    this.streamSocket?.destroy()
-    this.controlSocket = null
-    this.streamSocket = null
-
-    this.disconnectedListeners.each((listener) => listener())
-  }
-
-  private cleanupActiveSocketListeners(): void {
-    const cleanup = this.cleanupSocketListeners
-    this.cleanupSocketListeners = null
-    cleanup?.()
-  }
 }
diff --git a/src/main/daemon/daemon-client-connection.ts b/src/main/daemon/daemon-client-connection.ts
new file mode 100644
index 000000000000..387600a8f317
--- /dev/null
+++ b/src/main/daemon/daemon-client-connection.ts
@@ -0,0 +1,282 @@
+import type { Socket } from 'node:net'
+import { readDaemonClientToken } from './daemon-client-token'
+import { randomUUID } from 'node:crypto'
+import { PROTOCOL_VERSION, DaemonProtocolError, type DaemonEndpointIdentity } from './types'
+import {
+  armDaemonSocketCloseHandlers,
+  connectDaemonSocket,
+  waitForDaemonConnectionAttempt
+} from './daemon-client-socket-connect'
+import { DaemonClientListeners } from './daemon-client-listener-registry'
+import { sameDaemonIdentity, sendDaemonHello } from './daemon-client-hello-handshake'
+import { DaemonPendingRequests } from './daemon-client-pending-requests'
+import {
+  attachControlResponseReader,
+  attachStreamEventReader
+} from './daemon-client-ndjson-readers'
+const CONNECT_TIMEOUT_MS = 5000
+const CONNECTION_ATTEMPT_WAIT_MS = CONNECT_TIMEOUT_MS * 4
+export type DaemonClientOptions = {
+  socketPath: string
+  tokenPath: string
+  protocolVersion?: number
+}
+
+export class DaemonClientConnection {
+  private socketPath: string
+
+  private tokenPath: string
+
+  private protocolVersion: number
+
+  private clientId = randomUUID()
+
+  protected controlSocket: Socket | null = null
+
+  private streamSocket: Socket | null = null
+
+  private connectionBorrowers = 0
+
+  private ownerReleased = false
+
+  protected connected = false
+
+  private disconnectArmed = false
+
+  // Old-socket close events cannot tear down a replacement connection.
+  protected connectionGeneration = 0
+
+  // Concurrent pane spawns share their connection attempt.
+  private connectingPromise: Promise<void> | null = null
+
+  private connectionAttemptGeneration = 0
+
+  private daemonIdentity: DaemonEndpointIdentity | null = null
+
+  private daemonResizeModel: string | null | undefined
+
+  private observedAuthenticatedDisconnect = false
+
+  protected pendingRequests = new DaemonPendingRequests()
+
+  protected eventListeners = new DaemonClientListeners<(event: unknown) => void>()
+
+  protected disconnectedListeners = new DaemonClientListeners<() => void>()
+
+  private cleanupSocketListeners: (() => void) | null = null
+
+  constructor(opts: DaemonClientOptions) {
+    this.socketPath = opts.socketPath
+    this.tokenPath = opts.tokenPath
+    this.protocolVersion = opts.protocolVersion ?? PROTOCOL_VERSION
+  }
+
+  isConnected(): boolean {
+    return this.connected
+  }
+
+  getDaemonIdentity(): DaemonEndpointIdentity | null {
+    return this.daemonIdentity ? { ...this.daemonIdentity } : null
+  }
+
+  getDaemonResizeModel(): string | null | undefined {
+    return this.daemonResizeModel
+  }
+
+  hasObservedAuthenticatedDisconnect(): boolean {
+    return this.observedAuthenticatedDisconnect
+  }
+
+  async ensureConnected(): Promise<void> {
+    return this.ensureConnectedWithTimeout(CONNECT_TIMEOUT_MS, false)
+  }
+
+  async ensureConnectedWithin(timeoutMs: number): Promise<void> {
+    return this.ensureConnectedWithTimeout(timeoutMs, true)
+  }
+
+  private async ensureConnectedWithTimeout(
+    timeoutMs: number,
+    sharedBudget: boolean
+  ): Promise<void> {
+    if (this.connected) {
+      return
+    }
+    if (this.connectingPromise) {
+      // Teardown shares one deadline; normal connects allow separate socket and handshake budgets.
+      const waiterTimeoutMs = sharedBudget ? timeoutMs : CONNECTION_ATTEMPT_WAIT_MS
+      return waitForDaemonConnectionAttempt(this.connectingPromise, waiterTimeoutMs)
+    }
+
+    const attemptGeneration = this.connectionAttemptGeneration
+    this.connectingPromise = this.doConnect(timeoutMs, attemptGeneration, sharedBudget)
+    try {
+      await this.connectingPromise
+    } finally {
+      this.connectingPromise = null
+    }
+  }
+
+  private async doConnect(
+    timeoutMs: number,
+    attemptGeneration: number,
+    sharedBudget: boolean
+  ): Promise<void> {
+    const token = readDaemonClientToken(this.tokenPath)
+    const deadlineMs = Date.now() + timeoutMs
+    const remainingMs = (): number =>
+      sharedBudget ? Math.max(1, deadlineMs - Date.now()) : timeoutMs
+    const pendingListenerCleanups: (() => void)[] = []
+    const cleanupPendingListeners = (): void => {
+      for (const cleanup of pendingListenerCleanups.splice(0)) {
+        cleanup()
+      }
+    }
+
+    try {
+      const pendingControlSocket = await connectDaemonSocket(this.socketPath, remainingMs())
+      this.assertConnectionAttemptCurrent(attemptGeneration, pendingControlSocket)
+      this.controlSocket = pendingControlSocket
+      const controlHello = await this.sendHello(this.controlSocket, token, 'control', remainingMs())
+      const controlIdentity = controlHello.identity
+      this.assertConnectionAttemptCurrent(attemptGeneration, this.controlSocket)
+      pendingListenerCleanups.push(
+        attachControlResponseReader(
+          this.controlSocket,
+          (response) => this.pendingRequests.settle(response),
+          controlHello.remainder
+        )
+      )
+
+      const pendingStreamSocket = await connectDaemonSocket(this.socketPath, remainingMs())
+      this.assertConnectionAttemptCurrent(attemptGeneration, pendingStreamSocket)
+      this.streamSocket = pendingStreamSocket
+      const streamHello = await this.sendHello(this.streamSocket, token, 'stream', remainingMs())
+      this.assertConnectionAttemptCurrent(attemptGeneration, this.streamSocket)
+      if (!sameDaemonIdentity(controlIdentity, streamHello.identity)) {
+        throw new DaemonProtocolError('Daemon identity changed during connection')
+      }
+      const streamReader = attachStreamEventReader(this.streamSocket, streamHello, (event) => {
+        this.eventListeners.each((listener) => listener(event))
+      })
+      pendingListenerCleanups.push(streamReader.detach)
+
+      this.assertConnectionAttemptCurrent(attemptGeneration)
+      this.connected = true
+      this.observedAuthenticatedDisconnect = false
+      this.daemonIdentity = controlIdentity
+      this.daemonResizeModel = controlHello.resizeModel
+      this.disconnectArmed = true
+      this.connectionGeneration++
+
+      const gen = this.connectionGeneration
+      pendingListenerCleanups.push(
+        armDaemonSocketCloseHandlers(
+          this.controlSocket,
+          this.streamSocket,
+          () => this.handleDisconnect(gen),
+          streamReader.drainBuffered
+        )
+      )
+      this.cleanupSocketListeners = cleanupPendingListeners
+    } catch (error) {
+      cleanupPendingListeners()
+      this.controlSocket?.destroy()
+      this.streamSocket?.destroy()
+      this.controlSocket = null
+      this.streamSocket = null
+      this.connected = false
+      this.daemonIdentity = null
+      this.disconnectArmed = false
+      throw error
+    }
+  }
+
+  async withRetainedConnection<T>(operation: () => Promise<T>): Promise<T> {
+    this.connectionBorrowers++
+    try {
+      return await operation()
+    } finally {
+      this.connectionBorrowers--
+      if (this.ownerReleased && this.connectionBorrowers === 0) {
+        this.disconnect()
+      }
+    }
+  }
+
+  releaseOwner(): void {
+    this.ownerReleased = true
+    if (this.connectionBorrowers === 0) {
+      this.disconnect()
+    }
+  }
+
+  disconnect(): void {
+    this.connectionAttemptGeneration++
+    this.connected = false
+    this.daemonIdentity = null
+    this.disconnectArmed = false
+    this.cleanupActiveSocketListeners()
+
+    this.pendingRequests.rejectAll('Disconnected')
+
+    this.controlSocket?.destroy()
+    this.streamSocket?.destroy()
+    this.controlSocket = null
+    this.streamSocket = null
+  }
+
+  private assertConnectionAttemptCurrent(attemptGeneration: number, socket?: Socket): void {
+    if (attemptGeneration === this.connectionAttemptGeneration) {
+      return
+    }
+    socket?.destroy()
+    throw new DaemonProtocolError('Disconnected')
+  }
+
+  private sendHello(
+    socket: Socket,
+    token: string,
+    role: 'control' | 'stream',
+    timeoutMs: number
+  ): ReturnType<typeof sendDaemonHello> {
+    return sendDaemonHello({
+      socket,
+      token,
+      role,
+      timeoutMs,
+      protocolVersion: this.protocolVersion,
+      clientId: this.clientId
+    })
+  }
+
+  protected handleDisconnect(generation: number): void {
+    if (!this.disconnectArmed || generation !== this.connectionGeneration) {
+      return
+    }
+    this.disconnectArmed = false
+    this.connectionAttemptGeneration++
+    if (this.daemonIdentity) {
+      this.observedAuthenticatedDisconnect = true
+    }
+    this.connected = false
+    this.daemonIdentity = null
+    this.daemonResizeModel = null
+    this.cleanupActiveSocketListeners()
+
+    this.pendingRequests.rejectAll('Connection lost')
+
+    this.controlSocket?.destroy()
+    this.streamSocket?.destroy()
+    this.controlSocket = null
+    this.streamSocket = null
+
+    this.disconnectedListeners.each((listener) => listener())
+  }
+
+  private cleanupActiveSocketListeners(): void {
+    const cleanup = this.cleanupSocketListeners
+    this.cleanupSocketListeners = null
+    cleanup?.()
+  }
+}
diff --git a/src/main/daemon/daemon-client-connections.ts b/src/main/daemon/daemon-client-connections.ts
index 8d67473511b8..9059f6fcfd8b 100644
--- a/src/main/daemon/daemon-client-connections.ts
+++ b/src/main/daemon/daemon-client-connections.ts
@@ -77,6 +77,14 @@ export class DaemonClientConnections {
     socket.on('data', (chunk) => parser.feed(decoder.write(chunk)))
   }
 
+  matchesEndpoint(identity: { pid: number; startedAtMs: number; launchNonce: string }): boolean {
+    return (
+      identity.pid === process.pid &&
+      identity.startedAtMs === this.options.identity.startedAtMs &&
+      identity.launchNonce === this.options.identity.launchNonce
+    )
+  }
+
   get(clientId: string): ConnectedDaemonClient | undefined {
     return this.clients.get(clientId)
   }
diff --git a/src/main/daemon/daemon-client-rpc-request.test.ts b/src/main/daemon/daemon-client-rpc-request.test.ts
index 8364ccc96dd4..146c736101cd 100644
--- a/src/main/daemon/daemon-client-rpc-request.test.ts
+++ b/src/main/daemon/daemon-client-rpc-request.test.ts
@@ -167,7 +167,7 @@ describe('requestDaemonRpc', () => {
       onCreateCancellationFailure: vi.fn(),
       settleCreateCancellation: vi.fn(async () => ({ canceled: true }))
     })
-    await vi.advanceTimersByTimeAsync(6_000)
+    await vi.advanceTimersByTimeAsync(10)
     expect(pendingRequests.size).toBe(1)
     const actual = { isNew: true, switchOutcomeUnknown: true, incarnationId: 'actual-incarnation' }
     pendingRequests.settle({ id: 'switch-commit', ok: true, payload: actual })
diff --git a/src/main/daemon/daemon-client-rpc-request.ts b/src/main/daemon/daemon-client-rpc-request.ts
index 9796cc17ef3d..e38e9484dfdc 100644
--- a/src/main/daemon/daemon-client-rpc-request.ts
+++ b/src/main/daemon/daemon-client-rpc-request.ts
@@ -15,6 +15,7 @@ type DaemonRpcRequestOptions = {
   type: string
   payload: unknown
   timeoutMs: number
+  onSent?: (requestId: string) => void
   signal?: AbortSignal
   /** Bound late-response waits after unmatched cancellation, including attach-only requests with no reply coming. */
   unmatchedCancelGraceMs: number
@@ -120,6 +121,7 @@ export function requestDaemonRpc<T>(opts: DaemonRpcRequestOptions): Promise<T> {
         .then((result) => {
           // The acknowledged revocation is not proof that a dispatched child exited.
           if (retainSwitchOutcome) {
+            awaitLateResponseThenReject(error)
             return
           }
           if (result.canceled) {
@@ -137,9 +139,6 @@ export function requestDaemonRpc<T>(opts: DaemonRpcRequestOptions): Promise<T> {
             opts.onCreateCancellationFailure()
             return
           }
-          if (retainSwitchOutcome) {
-            return
-          }
           awaitLateResponseThenReject(wedgedDaemonError(error, cancelError) ?? error)
         })
     }
@@ -185,6 +184,7 @@ export function requestDaemonRpc<T>(opts: DaemonRpcRequestOptions): Promise<T> {
       return
     }
     try {
+      opts.onSent?.(opts.id)
       opts.socket.write(encoded)
       sent = true
     } catch (err) {
diff --git a/src/main/daemon/daemon-create-or-attach-cancellation.ts b/src/main/daemon/daemon-create-or-attach-cancellation.ts
new file mode 100644
index 000000000000..8fce79e5c38d
--- /dev/null
+++ b/src/main/daemon/daemon-create-or-attach-cancellation.ts
@@ -0,0 +1,81 @@
+import type { DaemonRequest } from './types'
+import type { DaemonRequestRouterOptions } from './daemon-request-router'
+export async function cancelDaemonCreateOrAttach(
+  options: DaemonRequestRouterOptions,
+  clientId: string,
+  request: Extract<DaemonRequest, { type: 'cancelCreateOrAttach' }>
+): Promise<unknown> {
+  const client = options.connections.get(clientId)
+  if (request.payload.release) {
+    const release = request.payload.release
+    if (
+      request.payload.settlement ||
+      !client?.authenticatedPairEstablished ||
+      !client.streamSocket ||
+      !release ||
+      typeof release.anchor !== 'string' ||
+      typeof release.invocationId !== 'string' ||
+      (release.outcome !== 'exited' &&
+        release.outcome !== 'adopted' &&
+        release.outcome !== 'failed') ||
+      typeof request.payload.requestId !== 'string' ||
+      typeof request.payload.sessionId !== 'string' ||
+      (release.incarnationId !== undefined && typeof release.incarnationId !== 'string') ||
+      !release.endpoint ||
+      typeof release.endpoint.pid !== 'number' ||
+      typeof release.endpoint.startedAtMs !== 'number' ||
+      typeof release.endpoint.launchNonce !== 'string' ||
+      !options.connections.matchesEndpoint(release.endpoint)
+    ) {
+      return { canceled: false, released: false }
+    }
+    const released = options.preparations.release(
+      request.payload.sessionId,
+      clientId,
+      request.payload.requestId,
+      release
+    )
+    options.lifecycle.reevaluateIdleShutdown()
+    return { canceled: false, released }
+  }
+  if (request.payload.settlement) {
+    if (
+      !client?.authenticatedPairEstablished ||
+      !client.streamSocket ||
+      !options.connections.matchesEndpoint(request.payload.settlement.endpoint)
+    ) {
+      return { canceled: false, settlement: { outcome: 'unknown' } }
+    }
+    return {
+      canceled: true,
+      retention: 'creation-settlement-v1',
+      settlement: await options.preparations.settle(
+        request.payload.sessionId,
+        clientId,
+        request.payload.requestId,
+        request.payload.settlement,
+        (result, code) => {
+          const sessionId = result.agentSessionEnsure?.owner.ptyId ?? request.payload.sessionId
+          options.streamDataBatcher.enqueueControlEvent(clientId, sessionId, {
+            type: 'event',
+            event: 'exit',
+            sessionId,
+            payload: {
+              code,
+              ...(result.incarnationId ? { incarnationId: result.incarnationId } : {})
+            }
+          })
+          options.streamDataBatcher.flush(clientId)
+        }
+      )
+    }
+  }
+  return {
+    canceled: options.preparations.cancel(request.payload.sessionId, {
+      clientId,
+      ...(typeof request.payload.requestId === 'string'
+        ? { requestId: request.payload.requestId }
+        : {})
+    })
+  }
+}
diff --git a/src/main/daemon/daemon-create-or-attach-contract.ts b/src/main/daemon/daemon-create-or-attach-contract.ts
new file mode 100644
index 000000000000..3429ac0800e3
--- /dev/null
+++ b/src/main/daemon/daemon-create-or-attach-contract.ts
@@ -0,0 +1,83 @@
+import type { SpawnIntent } from '../../shared/host-spawn-admission'
+import type { StartupCommandDelivery } from '../../shared/codex-startup-delivery'
+import type { TuiAgent } from '../../shared/tui-agent'
+import type { PtyStartupIngressIntent } from '../../shared/pty-startup-ingress'
+import type {
+  AgentSessionExecutionClaim,
+  AgentSessionSurfaceBinding
+} from '../../shared/agent-session-host-authority'
+import type * as HistorySeedProtocol from './terminal-history-seed-transfer-protocol'
+import type { DaemonCreateOrAttachResult as CreateOrAttachResult } from './daemon-create-or-attach-result'
+import type { DaemonEndpointIdentity } from './daemon-hello-protocol'
+export type CreateOrAttachRequest = {
+  id: string
+  type: 'createOrAttach'
+  payload: HistorySeedProtocol.CreateOrAttachHistorySeedPayload & {
+    sessionId: string
+    cols: number
+    rows: number
+    cwd?: string
+    env?: Record<string, string>
+    envToDelete?: string[]
+    command?: string
+    startupCommandDelivery?: StartupCommandDelivery
+    launchAgent?: TuiAgent
+    /** Rejects an absent session instead of interpreting mount uncertainty as create permission. */
+    attachOnly?: boolean
+    /** Preserve the selected shell instead of defaulting to the daemon’s platform fallback. */
+    shellOverride?: string
+    terminalShellArgs?: string[]
+    /** Preferred WSL distro for generic `wsl.exe` launches. */
+    terminalWindowsWslDistro?: string | null
+    /** Preserve the selected PowerShell implementation so daemon and local spawns resolve the same executable. */
+    terminalWindowsPowerShellImplementation?: 'auto' | 'powershell.exe' | 'pwsh.exe'
+    shellReadySupported?: boolean
+    shellReadyTimeoutMs?: number
+    /** Server-side fence that prevents a client timeout from publishing an orphan PTY. */
+    switchExecution?: {
+      phase: 'prepare' | 'commit'
+      invocationId: string
+      anchor?: string
+      contract?: 'creation-settlement-v1'
+      remainingMs?: number
+    }
+    cancelAfterMs?: number
+    startupIngress?: PtyStartupIngressIntent
+    /** Optional; an old daemon ignores it and an old client omits it (legacy pacing). */
+    spawnIntent?: SpawnIntent
+    agentSessionEnsure?: {
+      claim: AgentSessionExecutionClaim
+      surface: AgentSessionSurfaceBinding
+    }
+  }
+}
+
+export type CreateOrAttachSettlement =
+  | { outcome: 'exited' }
+  | { outcome: 'failed' }
+  | { outcome: 'owned'; result: CreateOrAttachResult }
+  | { outcome: 'unknown' }
+
+export type CancelCreateOrAttachResult = {
+  canceled: boolean
+  settlement?: CreateOrAttachSettlement
+  retention?: 'creation-settlement-v1'
+  released?: boolean
+}
+
+export type CancelCreateOrAttachRequest = {
+  id: string
+  type: 'cancelCreateOrAttach'
+  payload: {
+    sessionId: string
+    requestId?: string
+    settlement?: { invocationId: string; anchor: string; endpoint: DaemonEndpointIdentity }
+    release?: {
+      invocationId: string
+      anchor: string
+      endpoint: DaemonEndpointIdentity
+      outcome: 'exited' | 'adopted' | 'failed'
+      incarnationId?: string
+    }
+  }
+}
diff --git a/src/main/daemon/daemon-provider-restart.ts b/src/main/daemon/daemon-provider-restart.ts
index f47ff331aabd..0a960e62203b 100644
--- a/src/main/daemon/daemon-provider-restart.ts
+++ b/src/main/daemon/daemon-provider-restart.ts
@@ -90,6 +90,8 @@ async function runRestartDaemon(
     (legacy) => !legacy.hasRetiredForIdle()
   )
 
+  await currentOnly.settleSwitchWorkForReplacement()
+
   // Fan out exits before teardown: daemon shutdown does not deliver session exits to the renderer.
   const fallbackKilledCount =
     currentAdapter instanceof DegradedDaemonPtyProvider
@@ -183,8 +185,11 @@ async function runRestartDaemon(
     throw error
   }
 
+  newCurrent.inheritSwitchReleaseCleanup(currentOnly)
+
   // Dispose only old subscriptions after adoption; full disposal would kill shared legacy adapters.
   disposeProviderSubscriptionsOnly(currentAdapter)
+  currentOnly.dispose()
 
   replaceDaemonProvider(newProvider)
 
diff --git a/src/main/daemon/daemon-pty-adapter-concurrent-recovery.test.ts b/src/main/daemon/daemon-pty-adapter-concurrent-recovery.test.ts
index 66a3320ac812..bea9023eb93b 100644
--- a/src/main/daemon/daemon-pty-adapter-concurrent-recovery.test.ts
+++ b/src/main/daemon/daemon-pty-adapter-concurrent-recovery.test.ts
@@ -1,12 +1,14 @@
 import './mock-descendant-sweep'
 import { expect, it, vi } from 'vitest'
-import { mkdtempSync, rmSync } from 'node:fs'
+import { mkdtempSync, rmSync, unlinkSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { DaemonPtyAdapter } from './daemon-pty-adapter'
 import { DaemonServer } from './daemon-server'
 import { createMockSubprocess } from './daemon-pty-adapter-test-harness'
 import { getDaemonSocketPath } from './daemon-spawner'
+import type { DaemonClientConnections } from './daemon-client-connections'
+import { agentSessionSwitchDeadline } from '../../shared/agent-session-switch-execution'
 
 it('recovers concurrent spawns rejected by an adapter-initiated disconnect', async () => {
   const concurrentSpawnCount = 70
@@ -77,3 +79,93 @@ it('recovers concurrent spawns rejected by an adapter-initiated disconnect', asy
     rmSync(dir, { recursive: true, force: true })
   }
 })
+
+it.skipIf(process.platform === 'win32')(
+  'keeps an exact dispatched owner unknown across an authenticated empty endpoint replacement',
+  async () => {
+    const directory = mkdtempSync(join(tmpdir(), 'daemon-switch-replacement-'))
+    const socketPath = getDaemonSocketPath(directory)
+    const tokenPath = join(directory, 'test.token')
+    const entered = Promise.withResolvers<void>()
+    const release = Promise.withResolvers<void>()
+    const child = createMockSubprocess()
+    const originalSpawn = vi.fn(async () => {
+      entered.resolve()
+      await release.promise
+      return child
+    })
+    const original = new DaemonServer({
+      socketPath,
+      tokenPath,
+      launchNonce: 'original',
+      preparePtySpawn: async () => {},
+      spawnSubprocess: originalSpawn
+    })
+    await original.start()
+    const adapter = new DaemonPtyAdapter({ socketPath, tokenPath })
+    const deadline = agentSessionSwitchDeadline()
+    let settled = false
+    let recover: (() => Promise<void>) | undefined
+    const operation = adapter
+      .spawn({
+        sessionId: 'exact-owner',
+        cols: 80,
+        rows: 24,
+        signal: deadline.signal,
+        switchExecution: {
+          invocationId: 'original-click',
+          ...deadline,
+          trackPhysical: (work, recovery) => {
+            recover = recovery
+            void work.then(() => {
+              settled = true
+            })
+            return work
+          }
+        }
+      })
+      .catch((error: unknown) => error)
+    let replacement: DaemonServer | undefined
+    try {
+      await entered.promise
+      // Replace only this fixture's POSIX socket; the original receiver and pending child remain alive.
+      unlinkSync(socketPath)
+      const replacementSpawn = vi.fn(() => createMockSubprocess())
+      replacement = new DaemonServer({
+        socketPath,
+        tokenPath,
+        launchNonce: 'replacement',
+        spawnSubprocess: replacementSpawn
+      })
+      await replacement.start()
+      // SAFETY: this is the exact owned fixture server's authenticated connection registry.
+      const connections = (original as unknown as { connections: DaemonClientConnections })
+        .connections
+      connections.values().next().value?.controlSocket.destroy()
+      expect(await operation).toBeInstanceOf(Error)
+      await vi.waitFor(() =>
+        expect(adapter.getLastAuthenticatedDaemonIdentity()?.launchNonce).toBe('replacement')
+      )
+      expect(await adapter.listProcesses()).toEqual([])
+      if (!recover) {
+        throw new Error('dispatched settlement recovery missing')
+      }
+      await expect(recover()).rejects.toThrow('Terminal owner unavailable')
+      expect(settled).toBe(false)
+      expect(replacementSpawn).not.toHaveBeenCalled()
+      expect(originalSpawn).toHaveBeenCalledOnce()
+      release.resolve()
+      await vi.waitFor(() => expect(child.forceKill).toHaveBeenCalled())
+      // An empty new daemon still cannot answer for the old receiver's exact child.
+      expect(settled).toBe(false)
+    } finally {
+      release.resolve()
+      deadline.dispose()
+      adapter.dispose()
+      await operation
+      await original.shutdown()
+      await replacement?.shutdown()
+      rmSync(directory, { recursive: true, force: true })
+    }
+  }
+)
diff --git a/src/main/daemon/daemon-pty-adapter-history-checkpoints.test.ts b/src/main/daemon/daemon-pty-adapter-history-checkpoints.test.ts
index 670fb77b414c..ff255a9cae12 100644
--- a/src/main/daemon/daemon-pty-adapter-history-checkpoints.test.ts
+++ b/src/main/daemon/daemon-pty-adapter-history-checkpoints.test.ts
@@ -183,9 +183,8 @@ describe('DaemonPtyAdapter (IPtyProvider)', () => {
       const checkpoint = vi.fn(async () => 'committed' as const)
       const appendIncrements = vi.fn(async () => 'ok' as const)
       const dispose = vi.fn(async () => {})
-      const disconnect = vi.fn()
       const internals = historyAdapter as unknown as {
-        client: { request: typeof request; disconnect: typeof disconnect }
+        client: { request: typeof request; disconnect: () => void }
         historyManager: {
           checkpoint: typeof checkpoint
           appendIncrements: typeof appendIncrements
@@ -193,7 +192,7 @@ describe('DaemonPtyAdapter (IPtyProvider)', () => {
         }
         checkpointSessions(sessionIds: Iterable<string>): Promise<Set<string>>
       }
-      internals.client = { request, disconnect }
+      internals.client.request = request
       internals.historyManager = { checkpoint, appendIncrements, dispose }
 
       const checkpointing = internals.checkpointSessions(['a', 'b', 'c', 'd', 'e', 'f'])
@@ -248,7 +247,7 @@ describe('DaemonPtyAdapter (IPtyProvider)', () => {
         nonFinalCheckpointAdmissionSessionIds: Set<string>
         tryAdmitNonFinalCheckpoint(sessionId: string): boolean
       }
-      internals.client = { request, disconnect: vi.fn() }
+      internals.client.request = request
       internals.historyManager = {
         checkpoint: vi.fn(async () => 'committed' as const),
         appendIncrements,
@@ -334,7 +333,7 @@ describe('DaemonPtyAdapter (IPtyProvider)', () => {
         client: { request: typeof request; disconnect: ReturnType<typeof vi.fn> }
         checkpointSessions(sessionIds: Iterable<string>): Promise<Set<string>>
       }
-      internals.client = { request, disconnect: vi.fn() }
+      internals.client.request = request
       const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
 
       try {
@@ -367,7 +366,7 @@ describe('DaemonPtyAdapter (IPtyProvider)', () => {
         client: { request: typeof request; disconnect: ReturnType<typeof vi.fn> }
         checkpointSessions(sessionIds: Iterable<string>): Promise<Set<string>>
       }
-      internals.client = { request, disconnect: vi.fn() }
+      internals.client.request = request
       const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
 
       try {
@@ -431,7 +430,7 @@ describe('DaemonPtyAdapter (IPtyProvider)', () => {
           }
         })
         const internals = historyAdapter as unknown as CooldownInternals
-        internals.client = { request, disconnect: vi.fn() }
+        internals.client.request = request
         internals.historyManager = {
           checkpoint: vi.fn(async () => takeResult.checkpointResult ?? 'committed'),
           appendIncrements: vi.fn(async () => takeResult.appendResult ?? 'ok'),
diff --git a/src/main/daemon/daemon-pty-adapter-live-rebased-checkpoint.test.ts b/src/main/daemon/daemon-pty-adapter-live-rebased-checkpoint.test.ts
index 895b60222116..c4de28ed9266 100644
--- a/src/main/daemon/daemon-pty-adapter-live-rebased-checkpoint.test.ts
+++ b/src/main/daemon/daemon-pty-adapter-live-rebased-checkpoint.test.ts
@@ -200,7 +200,7 @@ describe('DaemonPtyAdapter checkpoints rebased on live', () => {
       expect(await manager.checkpoint(sessionId, disk.getSnapshot())).toBe('committed')
       expect(live.writeSync(base + drained)).toBe(true)
       const liveSnapshot = { ...live.getSnapshot(), outputSequence: 99 }
-      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: a teardown checkpoint only calls client.request and the history manager/reader, all real or faked here.
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: stub only external RPC answers, keeping actual client and history lifetime.
       const internals = historyAdapter as unknown as {
         client: { request: ReturnType<typeof vi.fn>; disconnect: () => void }
         checkpointSessions(
@@ -208,16 +208,13 @@ describe('DaemonPtyAdapter checkpoints rebased on live', () => {
           opts?: { final?: boolean; teardown?: boolean }
         ): Promise<Set<string>>
       }
-      internals.client = {
-        request: vi.fn(async () => ({
-          records: [{ kind: 'output', data: marker }],
-          drainedRecords: [{ kind: 'output', data: drained }],
-          seq: 2,
-          overflowed: false,
-          snapshot: liveSnapshot
-        })),
-        disconnect: () => {}
-      }
+      internals.client.request = vi.fn(async () => ({
+        records: [{ kind: 'output', data: marker }],
+        drainedRecords: [{ kind: 'output', data: drained }],
+        seq: 2,
+        overflowed: false,
+        snapshot: liveSnapshot
+      }))
 
       const append = vi.spyOn(manager, 'appendIncrements')
 
diff --git a/src/main/daemon/daemon-pty-adapter-protocol-compatibility.test.ts b/src/main/daemon/daemon-pty-adapter-protocol-compatibility.test.ts
index bd9033d592e6..a5a0f88cd3e7 100644
--- a/src/main/daemon/daemon-pty-adapter-protocol-compatibility.test.ts
+++ b/src/main/daemon/daemon-pty-adapter-protocol-compatibility.test.ts
@@ -1,3 +1,4 @@
+import { registerDaemonSwitchCompatibilityTests } from './daemon-pty-adapter-switch-compatibility.test-fixture'
 import './mock-descendant-sweep'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { rmSync } from 'node:fs'
@@ -14,7 +15,6 @@ import type { DaemonServer } from './daemon-server'
 import { createMockSubprocess, startDaemonAdapterHarness } from './daemon-pty-adapter-test-harness'
 import type * as DaemonHealthModule from './daemon-health'
 import type * as DaemonTccAttributionModule from './daemon-tcc-attribution'
-
 const { getMacDaemonSystemResolverHealthMock, getMacDaemonTccAttributionHealthMock } = vi.hoisted(
   () => ({
     getMacDaemonSystemResolverHealthMock: vi.fn(
@@ -475,11 +475,9 @@ describe('DaemonPtyAdapter (IPtyProvider)', () => {
       request: ReturnType<typeof vi.fn>
     ): DaemonPtyAdapter {
       const probeAdapter = new DaemonPtyAdapter({ socketPath, tokenPath, protocolVersion })
-      ;(
-        probeAdapter as unknown as {
-          client: { request: ReturnType<typeof vi.fn>; disconnect: ReturnType<typeof vi.fn> }
-        }
-      ).client = { request, disconnect: vi.fn() }
+      // SAFETY: stub external RPC answers while keeping the actual client's transport lifetime.
+      const client = (probeAdapter as unknown as { client: DaemonClient }).client
+      vi.spyOn(client, 'request').mockImplementation(request)
       return probeAdapter
     }
 
@@ -681,10 +679,6 @@ describe('DaemonPtyAdapter (IPtyProvider)', () => {
   })
 
   describe('inspectProcess on pre-inspection daemon protocols', () => {
-    type ClientInternals = {
-      client: { request: ReturnType<typeof vi.fn>; disconnect: ReturnType<typeof vi.fn> }
-    }
-
     function createInspectionAdapter(
       protocolVersion: number,
       request: ReturnType<typeof vi.fn>
@@ -694,10 +688,9 @@ describe('DaemonPtyAdapter (IPtyProvider)', () => {
         tokenPath,
         protocolVersion
       })
-      ;(inspectionAdapter as unknown as ClientInternals).client = {
-        request,
-        disconnect: vi.fn()
-      }
+      // SAFETY: stub external RPC answers while keeping the actual client's transport lifetime.
+      const client = (inspectionAdapter as unknown as { client: DaemonClient }).client
+      vi.spyOn(client, 'request').mockImplementation(request)
       return inspectionAdapter
     }
 
@@ -804,4 +797,30 @@ describe('DaemonPtyAdapter (IPtyProvider)', () => {
       current.dispose()
     })
   })
+  registerDaemonSwitchCompatibilityTests({
+    get server() {
+      return server
+    },
+    set server(value) {
+      server = value
+    },
+    get adapter() {
+      return adapter
+    },
+    set adapter(value) {
+      adapter = value
+    },
+    get socketPath() {
+      return socketPath
+    },
+    set socketPath(value) {
+      socketPath = value
+    },
+    get tokenPath() {
+      return tokenPath
+    },
+    set tokenPath(value) {
+      tokenPath = value
+    }
+  })
 })
diff --git a/src/main/daemon/daemon-pty-adapter-steady-state-compat.test.ts b/src/main/daemon/daemon-pty-adapter-steady-state-compat.test.ts
index 3c3847ea0ad9..df62bd8872cc 100644
--- a/src/main/daemon/daemon-pty-adapter-steady-state-compat.test.ts
+++ b/src/main/daemon/daemon-pty-adapter-steady-state-compat.test.ts
@@ -15,7 +15,8 @@ function createAdapter(
     tokenPath: '/tmp/orca-steady-state-compat.token',
     protocolVersion
   })
-  ;(adapter as unknown as ClientInternals).client = { request, disconnect: vi.fn() }
+  // SAFETY: replace only external RPC answers; preserve the actual client lifetime.
+  ;(adapter as unknown as ClientInternals).client.request = request
   return adapter
 }
 
diff --git a/src/main/daemon/daemon-pty-adapter-switch-compatibility.test-fixture.ts b/src/main/daemon/daemon-pty-adapter-switch-compatibility.test-fixture.ts
new file mode 100644
index 000000000000..ef1967e963e5
--- /dev/null
+++ b/src/main/daemon/daemon-pty-adapter-switch-compatibility.test-fixture.ts
@@ -0,0 +1,185 @@
+import './mock-descendant-sweep'
+import * as transport from './daemon-client-socket-connect'
+import type { DaemonClientConnections } from './daemon-client-connections'
+import { expect, it, vi } from 'vitest'
+import { DaemonClient } from './client'
+import { DaemonPtyAdapter } from './daemon-pty-adapter'
+import { DaemonServer } from './daemon-server'
+import { agentSessionSwitchDeadline } from '../../shared/agent-session-switch-execution'
+import { createMockSubprocess } from './daemon-pty-adapter-test-harness'
+export function registerDaemonSwitchCompatibilityTests(fixture: {
+  server: DaemonServer
+  adapter: DaemonPtyAdapter
+  socketPath: string
+  tokenPath: string
+}) {
+  it('uses supported v53 ordinary creation before dispatch with existing source authority', async () => {
+    fixture.adapter.dispose()
+    await fixture.server.shutdown()
+    const spawn = vi.fn(() => createMockSubprocess())
+    fixture.server = new DaemonServer({
+      socketPath: fixture.socketPath,
+      tokenPath: fixture.tokenPath,
+      protocolVersion: 53,
+      spawnSubprocess: spawn
+    })
+    await fixture.server.start()
+    fixture.adapter = new DaemonPtyAdapter({
+      socketPath: fixture.socketPath,
+      tokenPath: fixture.tokenPath,
+      protocolVersion: 53
+    })
+    const request = vi.spyOn(DaemonClient.prototype, 'request')
+    const deadline = agentSessionSwitchDeadline()
+    try {
+      expect(
+        await fixture.adapter.spawn({ sessionId: 'legacy-ordinary', cols: 80, rows: 24 })
+      ).toMatchObject({ id: 'legacy-ordinary' })
+      await expect(
+        fixture.adapter.spawn({
+          sessionId: 'switch-destination',
+          cols: 80,
+          rows: 24,
+          switchExecution: { invocationId: 'new-click', ...deadline }
+        })
+      ).resolves.toMatchObject({ id: 'switch-destination' })
+      expect(spawn).toHaveBeenCalledTimes(2)
+      const creates = request.mock.calls.filter(([type]) => type === 'createOrAttach')
+      expect(creates).toHaveLength(2)
+      for (const create of creates) {
+        expect(create[1]).not.toHaveProperty('switchExecution')
+      }
+      expect(request.mock.calls.some(([type]) => type === 'cancelCreateOrAttach')).toBe(false)
+    } finally {
+      deadline.dispose()
+      request.mockRestore()
+    }
+  })
+
+  it.each(['confirmation', 'anchor', 'stale-token', 'stale-token-cleanup-loss'] as const)(
+    'chooses ordinary creation before dispatch when v54 lacks complete %s',
+    async (missing) => {
+      const connect = transport.connectDaemonSocket
+      const stale = missing.startsWith('stale-token')
+      let cleanupReplyLost = false
+      const cleanupRequests = new Set<string>()
+      let tracked: Promise<unknown> | undefined
+      const writes: {
+        type: string
+        payload?: { switchExecution?: { phase: string }; settlement?: unknown; release?: unknown }
+      }[] = []
+      vi.spyOn(transport, 'connectDaemonSocket').mockImplementation(async (...args) => {
+        const socket = await connect(...args)
+        let receiverObserved = false
+        const write = socket.write.bind(socket)
+        vi.spyOn(socket, 'write').mockImplementation(
+          (...bytes: Parameters<typeof socket.write>) => {
+            const frame = JSON.parse(String(bytes[0]))
+            writes.push(frame)
+            if (frame.type === 'cancelCreateOrAttach' && !frame.payload?.release) {
+              cleanupRequests.add(frame.id)
+            }
+            if (
+              !receiverObserved &&
+              (frame.payload?.switchExecution?.phase === 'prepare' ||
+                (stale && frame.type === 'cancelCreateOrAttach'))
+            ) {
+              receiverObserved = true
+              // SAFETY: modify only this fixture's actual authenticated response bytes.
+              const peers = (fixture.server as unknown as { connections: DaemonClientConnections })
+                .connections
+              const peer = [...peers.values()].at(-1)?.controlSocket
+              if (!peer) {
+                throw new Error('fixture peer missing')
+              }
+              const respond = peer.write.bind(peer)
+              vi.spyOn(peer, 'write').mockImplementation(
+                (...reply: Parameters<typeof peer.write>) => {
+                  const result = JSON.parse(String(reply[0]))
+                  if (stale && result.payload?.retention) {
+                    result.payload.retention = 'consumer-release-v1'
+                  }
+                  if (
+                    missing === 'stale-token-cleanup-loss' &&
+                    cleanupRequests.has(result.id) &&
+                    !cleanupReplyLost
+                  ) {
+                    cleanupReplyLost = true
+                    peer.destroy()
+                    return true
+                  }
+                  if (
+                    result.id === frame.id &&
+                    frame.payload?.switchExecution?.phase === 'prepare'
+                  ) {
+                    if (missing === 'confirmation') {
+                      delete result.payload.retention
+                    } else if (missing === 'anchor') {
+                      delete result.payload.anchor
+                    } else {
+                      result.payload.retention = 'consumer-release-v1'
+                    }
+                    return respond(`${JSON.stringify(result)}\n`)
+                  }
+                  return stale && result.payload?.retention
+                    ? respond(`${JSON.stringify(result)}\n`)
+                    : respond(...reply)
+                }
+              )
+            }
+            return write(...bytes)
+          }
+        )
+        return socket
+      })
+      const deadline = agentSessionSwitchDeadline()
+      try {
+        const spawning = fixture.adapter.spawn({
+          sessionId: 'bare-v54',
+          cols: 80,
+          rows: 24,
+          switchExecution: {
+            invocationId: 'bare-click',
+            ...deadline,
+            trackPhysical: (work) => {
+              tracked = work
+              return work
+            }
+          }
+        })
+        if (missing === 'stale-token-cleanup-loss') {
+          await expect(spawning).rejects.toThrow('Connection lost')
+          expect(cleanupReplyLost).toBe(true)
+          if (!tracked) {
+            throw new Error('known old anchor lost its ordinary settlement owner')
+          }
+          await tracked
+          // SAFETY: inspect only the owned fixture receiver's retained handoff state.
+          const receiver = fixture.server as unknown as {
+            preparations: { hasOwedOutcomes(): boolean }
+          }
+          await vi.waitFor(() => expect(receiver.preparations.hasOwedOutcomes()).toBe(false))
+          expect(writes.filter((frame) => frame.type === 'createOrAttach')).toHaveLength(1)
+          expect(fixture.server.host.listSessions()).toEqual([])
+          await expect(
+            fixture.adapter.spawn({ sessionId: 'bare-v54', cols: 80, rows: 24 })
+          ).resolves.toMatchObject({ id: 'bare-v54' })
+        } else {
+          await expect(spawning).resolves.toMatchObject({ id: 'bare-v54' })
+        }
+        expect(writes.filter((frame) => frame.type === 'createOrAttach')).toHaveLength(2)
+        expect(writes.some((frame) => frame.payload?.switchExecution?.phase === 'commit')).toBe(
+          false
+        )
+        const ordinary = writes.findLast((frame) => frame.type === 'createOrAttach')
+        expect(ordinary?.payload).not.toHaveProperty('switchExecution')
+        expect(fixture.server.host.listSessions()).toMatchObject([
+          { sessionId: 'bare-v54', isAlive: true }
+        ])
+      } finally {
+        deadline.dispose()
+        vi.restoreAllMocks()
+      }
+    }
+  )
+}
diff --git a/src/main/daemon/daemon-pty-adapter.ts b/src/main/daemon/daemon-pty-adapter.ts
index a718e228a956..5a44b33e3b4b 100644
--- a/src/main/daemon/daemon-pty-adapter.ts
+++ b/src/main/daemon/daemon-pty-adapter.ts
@@ -33,7 +33,9 @@ export class DaemonPtyAdapter extends DaemonPtyDaemonRecovery implements IPtyPro
   constructor(opts: DaemonPtyAdapterOptions) {
     super(opts)
     // Registered after the base listener, which marks the sessions awaiting recovery first.
-    this.client.onDisconnected(() => this.recoverAfterEndpointLoss())
+    this.disconnectedListenerCleanups.push(
+      this.client.onDisconnected(() => this.recoverAfterEndpointLoss())
+    )
   }
 
   supportsFencedTermination(_id: string): boolean {
@@ -232,6 +234,7 @@ export class DaemonPtyAdapter extends DaemonPtyDaemonRecovery implements IPtyPro
           return
         }
         this.finishExit(event.sessionId, event.payload)
+        void this.reconcileSwitchSpawns().catch(() => {})
       }
     })
   }
diff --git a/src/main/daemon/daemon-pty-connection-lifecycle.ts b/src/main/daemon/daemon-pty-connection-lifecycle.ts
index 721fc6da8339..853668110af3 100644
--- a/src/main/daemon/daemon-pty-connection-lifecycle.ts
+++ b/src/main/daemon/daemon-pty-connection-lifecycle.ts
@@ -35,6 +35,7 @@ export abstract class DaemonPtyConnectionLifecycle extends DaemonPtyEventSubscri
       this.releasePendingRespawnAdoptionLease()
     }
     this.recordAuthenticatedIdentity()
+    this.drainSwitchReleaseCleanup()
     // Sample before installing routing so a fresh connection resyncs daemon-local background state.
     const isFreshConnection = this.removeEventListener === null
     this.setupEventRouting()
diff --git a/src/main/daemon/daemon-pty-daemon-recovery.ts b/src/main/daemon/daemon-pty-daemon-recovery.ts
index 68e383362028..6da2ef2139d9 100644
--- a/src/main/daemon/daemon-pty-daemon-recovery.ts
+++ b/src/main/daemon/daemon-pty-daemon-recovery.ts
@@ -70,6 +70,9 @@ export abstract class DaemonPtyDaemonRecovery extends DaemonPtyCheckpointPersist
 
   // Reconnect on endpoint loss without waiting for input; only daemon-gone errors permit respawn.
   protected recoverAfterEndpointLoss(): void {
+    if (this.switchSpawnSettlements.size > 0) {
+      void this.reconcileSwitchSpawns().catch(() => {})
+    }
     if (this.activeSessionIds.size > 0) {
       this.reconnectAfterWriteFailure()
     }
diff --git a/src/main/daemon/daemon-pty-event-subscriptions.ts b/src/main/daemon/daemon-pty-event-subscriptions.ts
index a8bba5d70da0..ca518f0c10c2 100644
--- a/src/main/daemon/daemon-pty-event-subscriptions.ts
+++ b/src/main/daemon/daemon-pty-event-subscriptions.ts
@@ -78,7 +78,10 @@ export abstract class DaemonPtyEventSubscriptions extends DaemonPtySessionInvent
         .dispose()
         .catch((err) => console.warn('[history] dispose failed:', err))
     }
-    this.client.disconnect()
+    for (const cleanup of this.disconnectedListenerCleanups.splice(0)) {
+      cleanup()
+    }
+    this.client.releaseOwner()
   }
 
   async establishLifecycleLease(): Promise<void> {
@@ -225,6 +228,9 @@ export abstract class DaemonPtyEventSubscriptions extends DaemonPtySessionInvent
         // Closing auth sockets still permits the daemon to retire itself once empty.
       }
     }
-    this.client.disconnect()
+    for (const cleanup of this.disconnectedListenerCleanups.splice(0)) {
+      cleanup()
+    }
+    this.client.releaseOwner()
   }
 }
diff --git a/src/main/daemon/daemon-pty-operation-state.ts b/src/main/daemon/daemon-pty-operation-state.ts
new file mode 100644
index 000000000000..033dde2f5178
--- /dev/null
+++ b/src/main/daemon/daemon-pty-operation-state.ts
@@ -0,0 +1,64 @@
+import type { DaemonEndpointIdentity } from './daemon-hello-protocol'
+import type { TakePendingOutputResult } from './types'
+import type { HistoryCheckpointResult, HistoryRecoveryFreeze } from './history-manager'
+import type { ReadRunningWslDistros } from './daemon-wsl-bridge-exit'
+export type PendingDaemonSpawnOperation = {
+  switchSettlement?: {
+    adopt?: (incarnationId: string) => void
+    completion: Promise<void>
+    recover: () => Promise<void>
+    consume: (outcome: 'exited' | 'adopted' | 'failed', incarnationId?: string) => void
+  }
+  exitsBySessionId: Map<string, { code: number; incarnationId?: string }[]>
+  ignoredExitIncarnationIds: Set<string>
+  ignoreNextExit: boolean
+}
+
+export type HistoryRecoveryContext = {
+  freeze: HistoryRecoveryFreeze | null
+  unreadableSessionId: string | null
+  identityChanged: boolean
+}
+
+export type SnapshotCheckpointResult = {
+  checkpoint: HistoryCheckpointResult
+  snapshot: NonNullable<TakePendingOutputResult['snapshot']> | null
+}
+
+export type DaemonPtyShutdownOptions = {
+  immediate?: boolean
+  keepHistory?: boolean
+  deadlineMs?: number
+  expectedIncarnationId?: string
+}
+
+export type DaemonPtyAdapterOptions = {
+  socketPath: string
+  tokenPath: string
+  pidPath?: string
+  profileScope?: string
+  protocolVersion?: number
+  historyPath?: string
+  runtimeDir?: string
+  packagedAppVersion?: string | null
+  respawn?: (reason: DaemonRespawnReason) => Promise<void | (() => void)>
+  /** Test seam; production reads the shared, coalesced `wsl --list --running`. */
+  readRunningWslDistros?: ReadRunningWslDistros
+}
+
+export type DaemonRespawnReason =
+  | 'daemon_died'
+  | 'unhealthy_resolver'
+  | 'stale_bundle'
+  | 'severed_tcc_attribution'
+
+export type DaemonIdentityChangeEvent = {
+  previous: DaemonEndpointIdentity
+  current: DaemonEndpointIdentity
+}
+
+export type DaemonIdleRetirementResult =
+  | { state: 'retiring' }
+  | { state: 'busy'; liveSessions: number | null; admissionReopened?: true }
+  | { state: 'unsupported' }
+  | { state: 'unverifiable' }
diff --git a/src/main/daemon/daemon-pty-reattach-result.ts b/src/main/daemon/daemon-pty-reattach-result.ts
new file mode 100644
index 000000000000..c9282ca3880a
--- /dev/null
+++ b/src/main/daemon/daemon-pty-reattach-result.ts
@@ -0,0 +1,55 @@
+import { parseTerminalKittyKeyboardFlags } from '../../shared/terminal-kitty-keyboard-flags'
+import { daemonSpawnResultIdentity } from './daemon-spawn-result-identity'
+import type { PtySpawnResult } from '../providers/pty-provider-contract'
+import type { CreateOrAttachResult, TerminalSnapshot } from './types'
+export function daemonPtyReattachResult(
+  sessionId: string,
+  result: CreateOrAttachResult,
+  pid: number | null,
+  providerWslDistro: string | null | undefined,
+  reattachSnapshot: TerminalSnapshot,
+  providerSequence: PtySpawnResult['providerSequence']
+): PtySpawnResult {
+  const reattachProviderSequence =
+    typeof reattachSnapshot.outputSequence === 'number'
+      ? { value: reattachSnapshot.outputSequence, generation: 'continued' as const }
+      : providerSequence
+  const isAltScreen = reattachSnapshot.modes.alternateScreen
+  const snapshotPrefix = reattachSnapshot.scrollbackAnsi + reattachSnapshot.rehydrateSequences
+  const snapshotFrame = reattachSnapshot.snapshotAnsi
+  const snapshotPayload = snapshotPrefix + snapshotFrame
+  // Reassert kitty flags after payload screen switches; carry known zero separately from unknown.
+  const kittyKeyboardFlags = parseTerminalKittyKeyboardFlags(
+    reattachSnapshot.modes.kittyKeyboardFlags
+  )
+  return {
+    id: sessionId,
+    ...daemonSpawnResultIdentity(result),
+    pid,
+    ...(providerWslDistro !== undefined ? { wslDistro: providerWslDistro } : {}),
+    snapshot: snapshotPayload,
+    snapshotCols: reattachSnapshot.cols,
+    snapshotRows: reattachSnapshot.rows,
+    // Only alt frames need a separate restore; normal history can replay at its captured grid.
+    ...(isAltScreen && snapshotFrame && reattachSnapshot.frameRestoreAnsi
+      ? {
+          snapshotPrefixAnsi: snapshotPrefix,
+          snapshotFrameAnsi: snapshotFrame,
+          snapshotFrameRestoreAnsi: reattachSnapshot.frameRestoreAnsi
+        }
+      : {}),
+    ...(reattachProviderSequence ? { providerSequence: reattachProviderSequence } : {}),
+    ...(kittyKeyboardFlags !== undefined ? { snapshotKittyKeyboardFlags: kittyKeyboardFlags } : {}),
+    ...(reattachSnapshot.terminalOwner
+      ? { snapshotTerminalOwner: reattachSnapshot.terminalOwner }
+      : {}),
+    isReattach: true,
+    isAlternateScreen: isAltScreen,
+    // Snapshot ANSI lacks title frames; carry the title separately across relaunch.
+    ...(reattachSnapshot.lastTitle ? { lastTitle: reattachSnapshot.lastTitle } : {}),
+    // Replay the mid-escape tail after renderer reset so split escapes do not render literally.
+    ...(reattachSnapshot.pendingEscapeTailAnsi
+      ? { pendingEscapeTailAnsi: reattachSnapshot.pendingEscapeTailAnsi }
+      : {})
+  }
+}
diff --git a/src/main/daemon/daemon-pty-runtime-state.ts b/src/main/daemon/daemon-pty-runtime-state.ts
index a41c1efc6bd0..caa5f9e22893 100644
--- a/src/main/daemon/daemon-pty-runtime-state.ts
+++ b/src/main/daemon/daemon-pty-runtime-state.ts
@@ -1,3 +1,9 @@
+import type {
+  PendingDaemonSpawnOperation,
+  DaemonPtyAdapterOptions,
+  DaemonIdentityChangeEvent,
+  DaemonIdleRetirementResult
+} from './daemon-pty-operation-state'
 import { DaemonClient } from './client'
 import { DaemonPtyInputClosedIncarnations } from './daemon-pty-input-closed-incarnations'
 import { createDaemonAuditEligibilityTracker } from './daemon-audit-eligibility-event'
@@ -19,74 +25,24 @@ import {
   GIT_CREDENTIAL_GUARD_HOST_PROTOCOL_VERSION,
   PROTOCOL_VERSION,
   supportsMode2031UnsubscribeFact,
-  supportsPtyStartupIngress,
-  type TakePendingOutputResult
+  supportsPtyStartupIngress
 } from './types'
 import { ColdRestorePayloadCache } from './cold-restore-payload-cache'
-import {
-  HistoryManager,
-  type HistoryCheckpointResult,
-  type HistoryRecoveryFreeze
-} from './history-manager'
+import { HistoryManager } from './history-manager'
 import { HistoryReader } from './history-reader'
 import type { PtyBackgroundStreamEvent } from '../providers/pty-provider-contract'
 import type { DaemonPtyRouterDataEvent, DaemonPtyRouterExitEvent } from './daemon-pty-router-events'
 import type { ReadRunningWslDistros } from './daemon-wsl-bridge-exit'
-
-export type PendingDaemonSpawnOperation = {
-  exitsBySessionId: Map<string, { code: number; incarnationId?: string }[]>
-  ignoredExitIncarnationIds: Set<string>
-  ignoreNextExit: boolean
-}
-
-export type HistoryRecoveryContext = {
-  freeze: HistoryRecoveryFreeze | null
-  unreadableSessionId: string | null
-  identityChanged: boolean
-}
-
-export type SnapshotCheckpointResult = {
-  checkpoint: HistoryCheckpointResult
-  snapshot: NonNullable<TakePendingOutputResult['snapshot']> | null
-}
-
-export type DaemonPtyShutdownOptions = {
-  immediate?: boolean
-  keepHistory?: boolean
-  deadlineMs?: number
-  expectedIncarnationId?: string
-}
-
-export type DaemonPtyAdapterOptions = {
-  socketPath: string
-  tokenPath: string
-  pidPath?: string
-  profileScope?: string
-  protocolVersion?: number
-  historyPath?: string
-  runtimeDir?: string
-  packagedAppVersion?: string | null
-  respawn?: (reason: DaemonRespawnReason) => Promise<void | (() => void)>
-  /** Test seam; production reads the shared, coalesced `wsl --list --running`. */
-  readRunningWslDistros?: ReadRunningWslDistros
-}
-
-export type DaemonRespawnReason =
-  | 'daemon_died'
-  | 'unhealthy_resolver'
-  | 'stale_bundle'
-  | 'severed_tcc_attribution'
-
-export type DaemonIdentityChangeEvent = {
-  previous: DaemonEndpointIdentity
-  current: DaemonEndpointIdentity
-}
-
-export type DaemonIdleRetirementResult =
-  | { state: 'retiring' }
-  | { state: 'busy'; liveSessions: number | null; admissionReopened?: true }
-  | { state: 'unsupported' }
-  | { state: 'unverifiable' }
+export {
+  type PendingDaemonSpawnOperation,
+  type HistoryRecoveryContext,
+  type SnapshotCheckpointResult,
+  type DaemonPtyShutdownOptions,
+  type DaemonPtyAdapterOptions,
+  type DaemonRespawnReason,
+  type DaemonIdentityChangeEvent,
+  type DaemonIdleRetirementResult
+} from './daemon-pty-operation-state'
 
 export abstract class DaemonPtyRuntimeState {
   protected readonly readRunningWslDistros: ReadRunningWslDistros | undefined
@@ -121,6 +77,7 @@ export abstract class DaemonPtyRuntimeState {
   protected exitListeners: ((payload: DaemonPtyRouterExitEvent) => void)[] = []
   protected backgroundStreamListeners: ((payload: PtyBackgroundStreamEvent) => void)[] = []
   protected writeUnavailableListeners: ((payload: { id: string }) => void)[] = []
+  protected readonly disconnectedListenerCleanups: (() => void)[] = []
   protected removeEventListener: (() => void) | null = null
   protected initialCwds = new Map<string, string>()
   protected wslDistrosBySessionId = new Map<string, string>()
@@ -254,19 +211,21 @@ export abstract class DaemonPtyRuntimeState {
     this.supportsAuthoritativeBufferSnapshots =
       this.protocolVersion >= SNAPSHOT_SERIALIZER_FIDELITY_DAEMON_PROTOCOL_VERSION
     this.supportsStartupIngress = supportsPtyStartupIngress(this.protocolVersion)
-    this.client.onDisconnected(() => {
-      if (!this.respawnAdoptionClosed) {
-        this.writeRecoveryAttempted = false
-        for (const id of this.activeSessionIds) {
-          this.sessionsAwaitingDaemonRecovery.add(id)
+    this.disconnectedListenerCleanups.push(
+      this.client.onDisconnected(() => {
+        if (!this.respawnAdoptionClosed) {
+          this.writeRecoveryAttempted = false
+          for (const id of this.activeSessionIds) {
+            this.sessionsAwaitingDaemonRecovery.add(id)
+          }
         }
-      }
-      for (const id of this.pausedProducerSessionIds) {
-        this.producerResumesOwedOnReconnect.add(id)
-      }
-      this.pausedProducerSessionIds.clear()
-      this.observeAuditFailure('transport_closed')
-    })
+        for (const id of this.pausedProducerSessionIds) {
+          this.producerResumesOwedOnReconnect.add(id)
+        }
+        this.pausedProducerSessionIds.clear()
+        this.observeAuditFailure('transport_closed')
+      })
+    )
   }
 
   supportsGitCredentialGuardHost(): boolean {
diff --git a/src/main/daemon/daemon-pty-session-spawn.ts b/src/main/daemon/daemon-pty-session-spawn.ts
index d3672c5b3125..265ce0442162 100644
--- a/src/main/daemon/daemon-pty-session-spawn.ts
+++ b/src/main/daemon/daemon-pty-session-spawn.ts
@@ -51,19 +51,36 @@ export abstract class DaemonPtySessionSpawn extends DaemonPtySpawnResult {
       identityChanged: false
     }
     try {
+      const create = async () => {
+        const retained = operation.switchSettlement
+        if (retained) {
+          await retained.recover()
+          throw new Error('Terminal creation was interrupted; try again')
+        }
+        return this.doSpawn({ ...spawnOpts, sessionId }, operation, historyRecovery)
+      }
       return await this.withHistorySpawnLock(sessionId, () =>
-        this.withDaemonRetry(() =>
-          this.doSpawn({ ...spawnOpts, sessionId }, operation, historyRecovery)
-        )
+        // Switch authority already owns the source proof; an uncertain ordinary send cannot replay.
+        opts.switchExecution ? create() : this.withDaemonRetry(create)
       )
     } finally {
       if (historyRecovery.freeze) {
         this.historyManager?.abandonRecoveryFreeze(historyRecovery.freeze)
       }
-      this.pendingClaimSpawnOperations.delete(operation)
-      operations.delete(operation)
-      if (operations.size === 0) {
-        this.pendingSpawnOperationsBySessionId.delete(sessionId)
+      const forget = () => {
+        this.pendingClaimSpawnOperations.delete(operation)
+        operations.delete(operation)
+        if (operations.size === 0) {
+          this.pendingSpawnOperationsBySessionId.delete(sessionId)
+        }
+      }
+      const retained = this.switchSpawnSettlements.get(operation)
+      if (retained) {
+        void retained.completion.then(forget)
+        // This is the same receiver join; it cannot replay the failed creation.
+        void retained.recover().catch(() => {})
+      } else {
+        forget()
       }
     }
   }
diff --git a/src/main/daemon/daemon-pty-spawn-context.ts b/src/main/daemon/daemon-pty-spawn-context.ts
new file mode 100644
index 000000000000..e0fc08fa1f64
--- /dev/null
+++ b/src/main/daemon/daemon-pty-spawn-context.ts
@@ -0,0 +1,25 @@
+import type {
+  HistoryRecoveryContext,
+  PendingDaemonSpawnOperation
+} from './daemon-pty-runtime-state'
+import type { ColdRestoreInfo } from './history-reader'
+import type { PtySpawnOptions } from '../providers/pty-provider-contract'
+export type DaemonPtySpawnContext = {
+  opts: PtySpawnOptions
+  operation: PendingDaemonSpawnOperation
+  historyRecovery: HistoryRecoveryContext
+  requestedSessionId: string
+  attachOnly: boolean
+  emulateLegacyAttachOnly: boolean
+  sessionId: string
+  wslDistro: string | undefined
+  restoreInfo: ColdRestoreInfo | null
+  restoreSkippedForLiveSession: boolean
+  effectiveCwd: string | undefined
+  effectiveCols: number
+  effectiveRows: number
+  shellReadySupported: boolean
+  shellReadyTimeoutMs: number | undefined
+  historySeedSegments: readonly string[] | null
+  detectColdRestore(options?: { ignoreCleanEnd?: boolean }): Promise<ColdRestoreInfo | null>
+}
diff --git a/src/main/daemon/daemon-pty-spawn-preparation-release.ts b/src/main/daemon/daemon-pty-spawn-preparation-release.ts
new file mode 100644
index 000000000000..7c92323cf896
--- /dev/null
+++ b/src/main/daemon/daemon-pty-spawn-preparation-release.ts
@@ -0,0 +1,107 @@
+import type {
+  PendingPtySpawnPreparation,
+  CompletedPreparation
+} from './daemon-pty-spawn-preparation-state'
+export function releaseDaemonSpawnPreparation(
+  retained: Map<string, PendingPtySpawnPreparation | CompletedPreparation>,
+  sessionId: string,
+  clientId: string,
+  requestId: unknown,
+  release: {
+    anchor: string
+    invocationId: string
+    outcome: 'exited' | 'adopted' | 'failed'
+    incarnationId?: string
+  }
+): boolean {
+  const key = JSON.stringify([sessionId, clientId, release.anchor])
+  const entry = retained.get(key)
+  // GC acknowledgement is distinct from physical proof and is safe to repeat after deletion.
+  if (!entry) {
+    return true
+  }
+  if (typeof requestId !== 'string' || entry.requestId !== requestId) {
+    return false
+  }
+  if ('outcome' in entry) {
+    if (
+      entry.invocationId !== release.invocationId ||
+      (release.outcome === 'failed' ? entry.outcome !== 'failed' : entry.outcome === 'failed') ||
+      (release.outcome === 'adopted' &&
+        (!release.incarnationId || release.incarnationId !== entry.incarnationId))
+    ) {
+      return false
+    }
+  } else {
+    const settlement = entry.settlement
+    if (
+      entry.switchAnchor?.invocationId !== release.invocationId ||
+      !settlement?.producerFinished
+    ) {
+      return false
+    }
+    if (release.outcome === 'failed') {
+      // Pending failed dependencies must compact before their terminal fact can be released.
+      return false
+    } else if (settlement.failed) {
+      return false
+    } else if (release.outcome === 'exited') {
+      if (!settlement.noChild) {
+        return false
+      }
+    } else if (
+      !release.incarnationId ||
+      settlement.result?.incarnationId !== release.incarnationId
+    ) {
+      return false
+    }
+  }
+  retained.delete(key)
+  if (!('outcome' in entry) && entry.settlement) {
+    entry.settlement.result = undefined
+    entry.settlement.reconcile = undefined
+    entry.settlement.notifyExit = undefined
+    entry.settlement.preparationWork = undefined
+    entry.settlement.physicalCompletion = undefined
+  }
+  return true
+}
+
+export function compactDaemonSpawnPreparation(
+  retained: Map<string, PendingPtySpawnPreparation | CompletedPreparation>,
+  sessionId: string,
+  preparation: PendingPtySpawnPreparation
+): void {
+  const settlement = preparation.settlement
+  if (!settlement) {
+    return
+  }
+  if (!settlement.failed) {
+    settlement.noChild = true
+  }
+  void Promise.all([
+    settlement.completion,
+    settlement.failed ? settlement.physicalCompletion : undefined
+  ]).then(() => {
+    const anchor = preparation.switchAnchor
+    const key = JSON.stringify([sessionId, preparation.clientId, anchor?.token])
+    if (!anchor || retained.get(key) !== preparation || !settlement.producerFinished) {
+      return
+    }
+    retained.set(key, {
+      outcome: settlement.failed ? 'failed' : 'exited',
+      clientId: preparation.clientId,
+      requestId: preparation.requestId,
+      anchor: anchor.token,
+      invocationId: anchor.invocationId,
+      ...(settlement.result?.incarnationId
+        ? { incarnationId: settlement.result.incarnationId }
+        : {})
+    })
+    settlement.result = undefined
+    settlement.reconcile = undefined
+    settlement.notifyExit = undefined
+    settlement.preparationWork = undefined
+    settlement.physicalCompletion = undefined
+  })
+}
diff --git a/src/main/daemon/daemon-pty-spawn-preparation-state.ts b/src/main/daemon/daemon-pty-spawn-preparation-state.ts
new file mode 100644
index 000000000000..f0a359ccf5ef
--- /dev/null
+++ b/src/main/daemon/daemon-pty-spawn-preparation-state.ts
@@ -0,0 +1,32 @@
+import type { CreateOrAttachResult } from './types'
+export type PendingPtySpawnPreparation = {
+  canceled: boolean
+  switchAnchor?: { token: string; invocationId: string; at: number; deadline: number }
+  // Unlike the polled canceled flag, the signal interrupts in-flight cwd probes on dead shares.
+  readonly controller: AbortController
+  settlement?: {
+    completion: Promise<void>
+    finish: () => void
+    notifyExit?: (result: CreateOrAttachResult, code: number) => void
+    result?: CreateOrAttachResult
+    noChild: boolean
+    failed?: true
+    preparationWork?: Promise<void>
+    physicalCompletion?: Promise<void>
+    reconcile?: () => Promise<void>
+    producerFinished?: boolean
+  }
+  cancelTimer?: ReturnType<typeof setTimeout>
+  // Session IDs can be shared; disconnect cancels only this client's preparations.
+  clientId: string
+  requestId: string
+}
+
+export type CompletedPreparation = {
+  outcome: 'exited' | 'failed'
+  clientId: string
+  requestId: string
+  anchor: string
+  invocationId: string
+  incarnationId?: string
+}
diff --git a/src/main/daemon/daemon-pty-spawn-preparations.test.ts b/src/main/daemon/daemon-pty-spawn-preparations.test.ts
index 8d33bdec6f02..4bbd246fc97c 100644
--- a/src/main/daemon/daemon-pty-spawn-preparations.test.ts
+++ b/src/main/daemon/daemon-pty-spawn-preparations.test.ts
@@ -9,6 +9,7 @@ it('anchors the commit on receiver preparation, so network and queued delay cons
   const receipt = preparations.prepareSwitch('pane', 'connection', 'prepare', 'click')
   now = 20
   const commit = preparations.commitSwitch('pane', 'connection', 'commit', {
+    contract: 'creation-settlement-v1',
     invocationId: 'click',
     anchor: receipt.anchor,
     remainingMs: 100
@@ -22,10 +23,33 @@ it('anchors the commit on receiver preparation, so network and queued delay cons
 it('rejects another connection and a reused anchor while the actual selected preparation remains owned', () => {
   const preparations = new DaemonPtySpawnPreparations(async () => {})
   const receipt = preparations.prepareSwitch('pane', 'connection', 'prepare', 'click')
-  const execution = { invocationId: 'click', anchor: receipt.anchor, remainingMs: 1000 }
+  const execution = {
+    contract: 'creation-settlement-v1',
+    invocationId: 'click',
+    anchor: receipt.anchor,
+    remainingMs: 1000
+  }
   expect(() => preparations.commitSwitch('pane', 'different', 'commit', execution)).toThrow()
   const selected = preparations.commitSwitch('pane', 'connection', 'commit', execution)
   expect(() => preparations.commitSwitch('pane', 'connection', 'duplicate', execution)).toThrow()
   expect(preparations.isCanceled(selected)).toBe(false)
   preparations.finish('pane', selected)
 })
+
+it('proves no fork by fencing its exact uncommitted anchor, never from a missing preparation', async () => {
+  const preparations = new DaemonPtySpawnPreparations(async () => {})
+  const identity = { invocationId: 'click', anchor: 'prepare' }
+  expect(await preparations.settle('pane', 'connection', 'commit', identity)).toEqual({
+    outcome: 'unknown'
+  })
+  preparations.prepareSwitch('pane', 'connection', 'prepare', 'click')
+  expect(await preparations.settle('pane', 'connection', 'commit', identity)).toEqual({
+    outcome: 'exited'
+  })
+  expect(() =>
+    preparations.commitSwitch('pane', 'connection', 'late-commit', {
+      ...identity,
+      remainingMs: 1000
+    })
+  ).toThrow()
+})
diff --git a/src/main/daemon/daemon-pty-spawn-preparations.ts b/src/main/daemon/daemon-pty-spawn-preparations.ts
index 88421345e9c5..e9e658aad0c6 100644
--- a/src/main/daemon/daemon-pty-spawn-preparations.ts
+++ b/src/main/daemon/daemon-pty-spawn-preparations.ts
@@ -1,17 +1,26 @@
-import { TerminalAttachCanceledError } from './types'
-
-export type PendingPtySpawnPreparation = {
-  canceled: boolean
-  switchAnchor?: { token: string; invocationId: string; at: number; deadline: number }
-  // Unlike the polled canceled flag, the signal interrupts in-flight cwd probes on dead shares.
-  readonly controller: AbortController
-  cancelTimer?: ReturnType<typeof setTimeout>
-  // Session IDs can be shared; disconnect cancels only this client's preparations.
-  clientId: string
-  requestId: string
-}
+import { compactDaemonSpawnPreparation } from './daemon-pty-spawn-preparation-release'
+import { releaseDaemonSpawnPreparation } from './daemon-pty-spawn-preparation-release'
+import type {
+  PendingPtySpawnPreparation,
+  CompletedPreparation
+} from './daemon-pty-spawn-preparation-state'
+import {
+  TerminalAttachCanceledError,
+  type CreateOrAttachResult,
+  type CreateOrAttachSettlement
+} from './types'
+export {
+  type PendingPtySpawnPreparation,
+  type CompletedPreparation
+} from './daemon-pty-spawn-preparation-state'
 
 export class DaemonPtySpawnPreparations {
+  private readonly retained = new Map<string, PendingPtySpawnPreparation | CompletedPreparation>()
+
+  hasOwedOutcomes(): boolean {
+    return this.retained.size > 0
+  }
+
   private readonly pending = new Map<string, Set<PendingPtySpawnPreparation>>()
   private readonly cancellationByPreparation = new WeakMap<
     PendingPtySpawnPreparation,
@@ -55,6 +64,13 @@ export class DaemonPtySpawnPreparations {
 
   prepareSwitch(sessionId: string, clientId: string, requestId: string, invocationId: string) {
     const preparation = this.register(sessionId, clientId, requestId, undefined)
+    const completion = Promise.withResolvers<void>()
+    preparation.settlement = {
+      completion: completion.promise,
+      finish: completion.resolve,
+      noChild: true
+    }
+    this.retained.set(JSON.stringify([sessionId, clientId, requestId]), preparation)
     preparation.switchAnchor = {
       token: requestId,
       invocationId,
@@ -66,14 +82,14 @@ export class DaemonPtySpawnPreparations {
       this.finish(sessionId, preparation)
     }, 720_000)
     preparation.cancelTimer.unref?.()
-    return { anchor: requestId }
+    return { anchor: requestId, retention: 'creation-settlement-v1' as const }
   }
 
   commitSwitch(
     sessionId: string,
     clientId: string,
     requestId: string,
-    execution: { invocationId: string; anchor?: string; remainingMs?: number }
+    execution: { invocationId: string; anchor?: string; remainingMs?: number; contract?: string }
   ): PendingPtySpawnPreparation {
     const preparation = [...(this.pending.get(sessionId) ?? [])].find(
       (entry) =>
@@ -82,24 +98,28 @@ export class DaemonPtySpawnPreparations {
         entry.switchAnchor?.invocationId === execution.invocationId
     )
     const anchor = preparation?.switchAnchor
+    if (!preparation || !anchor || anchor.deadline !== Infinity) {
+      throw new TerminalAttachCanceledError(sessionId)
+    }
+    preparation.requestId = requestId
     if (
-      !preparation ||
-      !anchor ||
+      execution.contract !== 'creation-settlement-v1' ||
       preparation.canceled ||
       !Number.isFinite(execution.remainingMs) ||
       execution.remainingMs! <= 0 ||
-      execution.remainingMs! > 720_000 ||
-      anchor.deadline !== Infinity
+      execution.remainingMs! > 720_000
     ) {
+      this.cancelPreparation(preparation)
+      this.finish(sessionId, preparation)
       throw new TerminalAttachCanceledError(sessionId)
     }
     anchor.deadline = anchor.at + execution.remainingMs!
-    preparation.requestId = requestId
     if (performance.now() >= anchor.deadline) {
       this.cancelPreparation(preparation)
       this.finish(sessionId, preparation)
       throw new TerminalAttachCanceledError(sessionId)
     }
+    preparation.settlement!.noChild = false
     if (preparation.cancelTimer) {
       clearTimeout(preparation.cancelTimer)
     }
@@ -125,9 +145,11 @@ export class DaemonPtySpawnPreparations {
   ): Promise<void> {
     // Return protocol cancellation before shutdown tears down the client transport.
     const cancellation = this.cancellationByPreparation.get(preparation)
-    const preparationTask = cancellation
-      ? Promise.race([this.preparePtySpawn(), cancellation.promise])
-      : this.preparePtySpawn()
+    const work = this.preparePtySpawn()
+    if (preparation.settlement) {
+      preparation.settlement.preparationWork = work
+    }
+    const preparationTask = cancellation ? Promise.race([work, cancellation.promise]) : work
     await preparationTask
     if (this.isCanceled(preparation)) {
       throw new TerminalAttachCanceledError(sessionId)
@@ -139,6 +161,18 @@ export class DaemonPtySpawnPreparations {
       clearTimeout(preparation.cancelTimer)
     }
     this.cancellationByPreparation.delete(preparation)
+    if (preparation.settlement) {
+      const settlement = preparation.settlement
+      void Promise.resolve(settlement.preparationWork)
+        .catch(() => {})
+        .then(() => {
+          settlement.producerFinished = true
+          settlement.finish()
+          if (settlement.noChild || settlement.failed) {
+            this.retireSettled(sessionId, preparation)
+          }
+        })
+    }
     const pendingForSession = this.pending.get(sessionId)
     pendingForSession?.delete(preparation)
     if (pendingForSession?.size === 0) {
@@ -166,6 +200,94 @@ export class DaemonPtySpawnPreparations {
     return canceled
   }
 
+  async settle(
+    sessionId: string,
+    clientId: string,
+    requestId: string | undefined,
+    identity: { anchor: string; invocationId: string },
+    notifyExit?: (result: CreateOrAttachResult, code: number) => void
+  ): Promise<CreateOrAttachSettlement> {
+    const key = JSON.stringify([sessionId, clientId, identity.anchor])
+    const preparation = this.retained.get(key)
+    if (preparation && 'outcome' in preparation) {
+      return preparation.requestId === requestId &&
+        preparation.invocationId === identity.invocationId
+        ? { outcome: preparation.outcome }
+        : { outcome: 'unknown' }
+    }
+    const preparedOnly =
+      preparation?.switchAnchor?.deadline === Infinity && preparation.requestId === identity.anchor
+    if (
+      !preparation ||
+      typeof requestId !== 'string' ||
+      (!preparedOnly && preparation.requestId !== requestId) ||
+      preparation.switchAnchor?.invocationId !== identity.invocationId ||
+      !preparation.settlement
+    ) {
+      return { outcome: 'unknown' }
+    }
+    this.cancelPreparation(preparation)
+    if (preparedOnly) {
+      preparation.requestId = requestId
+      this.finish(sessionId, preparation)
+    }
+    const settlement = preparation.settlement
+    settlement.notifyExit = notifyExit
+    await settlement.completion
+    if (!settlement.noChild) {
+      await settlement.reconcile?.()
+    }
+    if (settlement.failed) {
+      await settlement.physicalCompletion
+      return { outcome: 'failed' }
+    }
+    if (settlement.noChild) {
+      return { outcome: 'exited' }
+    }
+    return settlement.result
+      ? { outcome: 'owned', result: settlement.result }
+      : { outcome: 'unknown' }
+  }
+
+  trackPhysical(
+    sessionId: string,
+    preparation: PendingPtySpawnPreparation,
+    completion: Promise<void>,
+    exitCode?: () => number | null
+  ): void {
+    if (!preparation.settlement) {
+      return
+    }
+    preparation.settlement.physicalCompletion = completion
+    if (!exitCode) {
+      preparation.settlement.failed = true
+    }
+    const reference = new WeakRef(preparation)
+    void completion.then(() => {
+      const current = reference.deref()
+      if (!current) {
+        return
+      }
+      const result = current.settlement?.result
+      if (result && exitCode) {
+        current.settlement?.notifyExit?.(result, exitCode() ?? -1)
+      }
+      this.retireSettled(sessionId, current)
+    })
+  }
+
+  retireSettled(sessionId: string, preparation: PendingPtySpawnPreparation): void {
+    compactDaemonSpawnPreparation(this.retained, sessionId, preparation)
+  }
+
+  release(
+    ...args: Parameters<typeof releaseDaemonSpawnPreparation> extends [unknown, ...infer A]
+      ? A
+      : never
+  ): boolean {
+    return releaseDaemonSpawnPreparation(this.retained, ...args)
+  }
+
   cancelForClient(clientId: string): void {
     for (const pendingForSession of this.pending.values()) {
       for (const preparation of pendingForSession) {
diff --git a/src/main/daemon/daemon-pty-spawn-request.ts b/src/main/daemon/daemon-pty-spawn-request.ts
index 04fe2374ae74..b7339a6f308e 100644
--- a/src/main/daemon/daemon-pty-spawn-request.ts
+++ b/src/main/daemon/daemon-pty-spawn-request.ts
@@ -1,3 +1,5 @@
+import type { DaemonPtySpawnContext } from './daemon-pty-spawn-context'
+import { DaemonPtySpawnSettlement } from './daemon-pty-spawn-settlement'
 import {
   SESSION_SWITCH_PHYSICAL_PROTOCOL_VERSION,
   HISTORY_SEED_TRANSFER_PROTOCOL_VERSION
@@ -5,12 +7,11 @@ import {
 import type { SpawnIntent } from '../../shared/host-spawn-admission'
 import type { ColdRestorePayload } from './cold-restore-payload-cache'
 import type { DaemonAuditObservation } from './daemon-audit-classifier'
-import {
-  DaemonPtyRuntimeState,
-  type HistoryRecoveryContext,
-  type PendingDaemonSpawnOperation,
-  type SnapshotCheckpointResult
+import type {
+  PendingDaemonSpawnOperation,
+  SnapshotCheckpointResult
 } from './daemon-pty-runtime-state'
+import type { DaemonClient } from './client'
 import { isDaemonGoneError } from './daemon-endpoint-errors'
 import type { ColdRestoreInfo } from './history-reader'
 import { NdjsonLineTooLongError } from './ndjson'
@@ -20,36 +21,17 @@ import {
   TERMINAL_HISTORY_INLINE_SEED_CODE_UNITS
 } from './terminal-history-seed-chunks'
 import type { CreateOrAttachResult, GetSnapshotResult } from './types'
-import type { PtySpawnOptions, PtySpawnResult } from '../providers/pty-provider-contract'
+import type { PtySpawnResult } from '../providers/pty-provider-contract'
 import { resolveSafePtyDefaultCwd } from '../providers/pty-default-cwd'
 import { isMissingWorkingDirectoryError } from '../providers/working-directory-validation'
+export { type DaemonPtySpawnContext } from './daemon-pty-spawn-context'
 
 /** A daemon kept running across an update trusts `interactive` even for a claimed resume. */
 function forwardedSpawnIntent(intent: SpawnIntent, claim: unknown): SpawnIntent {
   return intent === 'interactive' && claim !== undefined ? 'automatic-restore' : intent
 }
 
-export type DaemonPtySpawnContext = {
-  opts: PtySpawnOptions
-  operation: PendingDaemonSpawnOperation
-  historyRecovery: HistoryRecoveryContext
-  requestedSessionId: string
-  attachOnly: boolean
-  emulateLegacyAttachOnly: boolean
-  sessionId: string
-  wslDistro: string | undefined
-  restoreInfo: ColdRestoreInfo | null
-  restoreSkippedForLiveSession: boolean
-  effectiveCwd: string | undefined
-  effectiveCols: number
-  effectiveRows: number
-  shellReadySupported: boolean
-  shellReadyTimeoutMs: number | undefined
-  historySeedSegments: readonly string[] | null
-  detectColdRestore(options?: { ignoreCleanEnd?: boolean }): Promise<ColdRestoreInfo | null>
-}
-
-export abstract class DaemonPtySpawnRequest extends DaemonPtyRuntimeState {
+export abstract class DaemonPtySpawnRequest extends DaemonPtySpawnSettlement {
   protected abstract takeSnapshotAndCheckpoint(
     sessionId: string,
     opts: {
@@ -115,79 +97,131 @@ export abstract class DaemonPtySpawnRequest extends DaemonPtyRuntimeState {
       historySeedTransferId: string | undefined
     ) => {
       const { opts } = context
-      if (opts.signal?.aborted) {
-        throw new Error('client_disconnected')
-      }
-      opts.switchExecution?.check()
-      if (opts.switchExecution && this.protocolVersion < SESSION_SWITCH_PHYSICAL_PROTOCOL_VERSION) {
-        throw new Error('Session switch is unavailable for this terminal owner')
-      }
-      if (opts.switchExecution && !anchor) {
-        const prepared = await this.client.request<{ anchor: string }>(
-          'createOrAttach',
-          {
-            sessionId: context.sessionId,
-            cols: context.effectiveCols,
-            rows: context.effectiveRows,
-            switchExecution: { phase: 'prepare', invocationId: opts.switchExecution.invocationId }
-          },
-          Math.max(1, opts.switchExecution.remaining()),
-          opts.signal
-        )
-        opts.switchExecution.check()
-        anchor = prepared.anchor
-      }
-      const payload = {
-        ...(opts.switchExecution
-          ? {
-              switchExecution: {
-                phase: 'commit' as const,
-                invocationId: opts.switchExecution.invocationId,
-                anchor,
-                remainingMs: opts.switchExecution.remaining()
-              }
-            }
-          : {}),
-        sessionId: context.sessionId,
-        cols: context.effectiveCols,
-        rows: context.effectiveRows,
-        cwd: context.attachOnly ? undefined : context.effectiveCwd,
-        env: context.attachOnly ? undefined : opts.env,
-        envToDelete: context.attachOnly ? undefined : opts.envToDelete,
-        command: context.attachOnly ? undefined : opts.command,
-        startupCommandDelivery: context.attachOnly ? undefined : opts.startupCommandDelivery,
-        launchAgent: context.attachOnly ? undefined : opts.launchAgent,
-        ...(context.attachOnly && !context.emulateLegacyAttachOnly ? { attachOnly: true } : {}),
-        shellOverride: context.attachOnly ? undefined : opts.shellOverride,
-        terminalShellArgs: context.attachOnly ? undefined : opts.terminalShellArgs,
-        terminalWindowsWslDistro: context.attachOnly ? undefined : opts.terminalWindowsWslDistro,
-        terminalWindowsPowerShellImplementation: context.attachOnly
-          ? undefined
-          : opts.terminalWindowsPowerShellImplementation,
-        shellReadySupported: context.attachOnly ? false : context.shellReadySupported,
-        ...(!context.attachOnly && context.shellReadyTimeoutMs !== undefined
-          ? { shellReadyTimeoutMs: context.shellReadyTimeoutMs }
-          : {}),
-        ...(historySeed ? { historySeed } : {}),
-        ...(historySeedTransferId ? { historySeedTransferId } : {}),
-        ...(this.supportsStartupIngress && !context.attachOnly && opts.startupIngress
-          ? { startupIngress: opts.startupIngress }
-          : {}),
-        ...(!context.attachOnly && opts.spawnIntent
-          ? { spawnIntent: forwardedSpawnIntent(opts.spawnIntent, opts.agentSessionEnsure) }
-          : {}),
-        ...(!context.attachOnly && opts.agentSessionEnsure
-          ? { agentSessionEnsure: opts.agentSessionEnsure }
-          : {})
-      }
-      return opts.signal
-        ? this.client.request<CreateOrAttachResult>(
+      let strong = Boolean(
+        opts.switchExecution && this.protocolVersion >= SESSION_SWITCH_PHYSICAL_PROTOCOL_VERSION
+      )
+      let preparedEndpoint: ReturnType<DaemonClient['getDaemonIdentity']> = null
+      const observeDispatch = (requestId: string, contract = 'creation-settlement-v1') =>
+        this.observeSwitchSpawn(context, requestId, anchor, preparedEndpoint, contract)
+
+      try {
+        if (context.operation.switchSettlement) {
+          throw new Error('Terminal creation was interrupted; try again')
+        }
+        if (opts.signal?.aborted) {
+          throw new Error('client_disconnected')
+        }
+        opts.switchExecution?.check()
+        if (opts.switchExecution && strong && !anchor) {
+          preparedEndpoint = this.client.getDaemonIdentity()
+          const prepared = await this.client.request<{ anchor: string; retention?: string }>(
             'createOrAttach',
-            payload,
-            opts.switchExecution ? Math.max(1, opts.switchExecution.remaining()) : undefined,
+            {
+              sessionId: context.sessionId,
+              cols: context.effectiveCols,
+              rows: context.effectiveRows,
+              switchExecution: { phase: 'prepare', invocationId: opts.switchExecution.invocationId }
+            },
+            Math.max(1, opts.switchExecution.remaining()),
             opts.signal
           )
-        : this.client.request<CreateOrAttachResult>('createOrAttach', payload)
+          if (
+            prepared.retention !== 'creation-settlement-v1' ||
+            typeof prepared.anchor !== 'string' ||
+            !prepared.anchor
+          ) {
+            // Negotiate before destination dispatch; an unaware peer keeps its ordinary route.
+            if (typeof prepared.anchor === 'string' && prepared.anchor) {
+              if (prepared.retention === 'consumer-release-v1' && preparedEndpoint) {
+                // Known old prepared-only cleanup uses the same exact owner, never a strong commit.
+                anchor = prepared.anchor
+                observeDispatch(anchor, 'consumer-release-v1')
+                await context.operation.switchSettlement!.recover()
+                context.operation.switchSettlement = undefined
+                anchor = undefined
+              } else {
+                await this.client.request(
+                  'cancelCreateOrAttach',
+                  { sessionId: context.sessionId, requestId: prepared.anchor },
+                  Math.max(1, opts.switchExecution.remaining())
+                )
+              }
+            }
+            strong = false
+          }
+          if (strong) {
+            anchor = prepared.anchor
+          }
+          opts.switchExecution.check()
+        }
+        const payload = {
+          ...(opts.switchExecution && strong
+            ? {
+                switchExecution: {
+                  phase: 'commit' as const,
+                  contract: 'creation-settlement-v1' as const,
+                  invocationId: opts.switchExecution.invocationId,
+                  anchor,
+                  remainingMs: opts.switchExecution.remaining()
+                }
+              }
+            : {}),
+          sessionId: context.sessionId,
+          cols: context.effectiveCols,
+          rows: context.effectiveRows,
+          cwd: context.attachOnly ? undefined : context.effectiveCwd,
+          env: context.attachOnly ? undefined : opts.env,
+          envToDelete: context.attachOnly ? undefined : opts.envToDelete,
+          command: context.attachOnly ? undefined : opts.command,
+          startupCommandDelivery: context.attachOnly ? undefined : opts.startupCommandDelivery,
+          launchAgent: context.attachOnly ? undefined : opts.launchAgent,
+          ...(context.attachOnly && !context.emulateLegacyAttachOnly ? { attachOnly: true } : {}),
+          shellOverride: context.attachOnly ? undefined : opts.shellOverride,
+          terminalShellArgs: context.attachOnly ? undefined : opts.terminalShellArgs,
+          terminalWindowsWslDistro: context.attachOnly ? undefined : opts.terminalWindowsWslDistro,
+          terminalWindowsPowerShellImplementation: context.attachOnly
+            ? undefined
+            : opts.terminalWindowsPowerShellImplementation,
+          shellReadySupported: context.attachOnly ? false : context.shellReadySupported,
+          ...(!context.attachOnly && context.shellReadyTimeoutMs !== undefined
+            ? { shellReadyTimeoutMs: context.shellReadyTimeoutMs }
+            : {}),
+          ...(historySeed ? { historySeed } : {}),
+          ...(historySeedTransferId ? { historySeedTransferId } : {}),
+          ...(this.supportsStartupIngress && !context.attachOnly && opts.startupIngress
+            ? { startupIngress: opts.startupIngress }
+            : {}),
+          ...(!context.attachOnly && opts.spawnIntent
+            ? { spawnIntent: forwardedSpawnIntent(opts.spawnIntent, opts.agentSessionEnsure) }
+            : {}),
+          ...(!context.attachOnly && opts.agentSessionEnsure
+            ? { agentSessionEnsure: opts.agentSessionEnsure }
+            : {})
+        }
+        const result = await (opts.switchExecution
+          ? this.client.request<CreateOrAttachResult>(
+              'createOrAttach',
+              payload,
+              Math.max(1, opts.switchExecution.remaining()),
+              opts.signal,
+              (requestId) =>
+                observeDispatch(requestId, strong ? 'creation-settlement-v1' : 'ordinary')
+            )
+          : opts.signal
+            ? this.client.request<CreateOrAttachResult>(
+                'createOrAttach',
+                payload,
+                undefined,
+                opts.signal
+              )
+            : this.client.request<CreateOrAttachResult>('createOrAttach', payload))
+        return result
+      } catch (error) {
+        if (anchor && !context.operation.switchSettlement) {
+          observeDispatch(anchor)
+        }
+        throw error
+      }
     }
 
     let historySeedUnavailable = false
diff --git a/src/main/daemon/daemon-pty-spawn-result.ts b/src/main/daemon/daemon-pty-spawn-result.ts
index 167edd5f6280..fd33033321f1 100644
--- a/src/main/daemon/daemon-pty-spawn-result.ts
+++ b/src/main/daemon/daemon-pty-spawn-result.ts
@@ -1,5 +1,5 @@
+import { daemonPtyReattachResult } from './daemon-pty-reattach-result'
 import { isAgentSessionClaimedSpawnResult } from '../../shared/agent-session-host-authority'
-import { parseTerminalKittyKeyboardFlags } from '../../shared/terminal-kitty-keyboard-flags'
 import { daemonSpawnResultIdentity } from './daemon-spawn-result-identity'
 import { retireUnexpectedAttachOnlySpawn } from './daemon-attach-only-retirement'
 import { DaemonPtySpawnRequest, type DaemonPtySpawnContext } from './daemon-pty-spawn-request'
@@ -8,7 +8,6 @@ import { takeHistoryRecoveryFreeze } from './daemon-history-recovery-freeze'
 import { getRecoveredHistorySeedSegments } from './terminal-history-seed-segments'
 import { SessionNotFoundError, type CreateOrAttachResult } from './types'
 import type { PtySpawnResult } from '../providers/pty-provider-contract'
-
 export abstract class DaemonPtySpawnResult extends DaemonPtySpawnRequest {
   protected async finishSpawn(
     context: DaemonPtySpawnContext,
@@ -31,14 +30,28 @@ export abstract class DaemonPtySpawnResult extends DaemonPtySpawnRequest {
       return created
     }
     let result = initialResult
-    const finalizeSpawnResult = (spawnResult: PtySpawnResult): PtySpawnResult =>
-      this.resultForExitBeforeSpawnReply(sessionId, result, operation) ??
-      (result.isNew && !historyRecovery.identityChanged
-        ? {
-            ...spawnResult,
-            startupCwdSource: effectiveCwd === opts.cwd ? 'request' : 'recovered-history'
+    const finalizeSpawnResult = (spawnResult: PtySpawnResult): PtySpawnResult => {
+      const exited = this.resultForExitBeforeSpawnReply(sessionId, result, operation)
+      if (!result.switchOutcomeUnknown && result.incarnationId) {
+        operation.switchSettlement?.consume(exited ? 'exited' : 'adopted', result.incarnationId)
+      }
+      if (!result.switchOutcomeUnknown && result.incarnationId) {
+        for (const pending of this.pendingSpawnOperationsBySessionId.get(sessionId) ?? []) {
+          if (pending !== operation) {
+            pending.switchSettlement?.adopt?.(result.incarnationId)
           }
-        : spawnResult)
+        }
+      }
+      return (
+        exited ??
+        (result.isNew && !historyRecovery.identityChanged
+          ? {
+              ...spawnResult,
+              startupCwdSource: effectiveCwd === opts.cwd ? 'request' : 'recovered-history'
+            }
+          : spawnResult)
+      )
+    }
     let historySeedSegments = restoreInfo ? getRecoveredHistorySeedSegments(restoreInfo) : null
     const adoptSpawnResultSession = async (spawnResult: CreateOrAttachResult): Promise<void> => {
       const requestedSessionId = sessionId
@@ -77,6 +90,7 @@ export abstract class DaemonPtySpawnResult extends DaemonPtySpawnRequest {
     this.clearSessionAwaitingDaemonRecovery(sessionId)
     const exitedResult = this.resultForExitBeforeSpawnReply(sessionId, result, operation)
     if (exitedResult) {
+      operation.switchSettlement?.consume('exited')
       return exitedResult
     }
     if (result.incarnationId) {
@@ -150,6 +164,7 @@ export abstract class DaemonPtySpawnResult extends DaemonPtySpawnRequest {
         await adoptSpawnResultSession(result)
         const exitedRetryResult = this.resultForExitBeforeSpawnReply(sessionId, result, operation)
         if (exitedRetryResult) {
+          operation.switchSettlement?.consume('exited')
           return exitedRetryResult
         }
         if (result.incarnationId) {
@@ -280,49 +295,15 @@ export abstract class DaemonPtySpawnResult extends DaemonPtySpawnRequest {
     }
 
     const reattachSnapshot = await this.overlayDurableRestoreSnapshot(sessionId, result.snapshot)
-    const reattachProviderSequence =
-      typeof reattachSnapshot.outputSequence === 'number'
-        ? { value: reattachSnapshot.outputSequence, generation: 'continued' as const }
-        : providerSequence
-    const isAltScreen = reattachSnapshot.modes.alternateScreen
-    const snapshotPrefix = reattachSnapshot.scrollbackAnsi + reattachSnapshot.rehydrateSequences
-    const snapshotFrame = reattachSnapshot.snapshotAnsi
-    const snapshotPayload = snapshotPrefix + snapshotFrame
-    // Reassert kitty flags after payload screen switches; carry known zero separately from unknown.
-    const kittyKeyboardFlags = parseTerminalKittyKeyboardFlags(
-      reattachSnapshot.modes.kittyKeyboardFlags
+    return finalizeSpawnResult(
+      daemonPtyReattachResult(
+        sessionId,
+        result,
+        pid,
+        providerWslDistro,
+        reattachSnapshot,
+        providerSequence
+      )
     )
-    return finalizeSpawnResult({
-      id: sessionId,
-      ...daemonSpawnResultIdentity(result),
-      pid,
-      ...(providerWslDistro !== undefined ? { wslDistro: providerWslDistro } : {}),
-      snapshot: snapshotPayload,
-      snapshotCols: reattachSnapshot.cols,
-      snapshotRows: reattachSnapshot.rows,
-      // Only alt frames need a separate restore; normal history can replay at its captured grid.
-      ...(isAltScreen && snapshotFrame && reattachSnapshot.frameRestoreAnsi
-        ? {
-            snapshotPrefixAnsi: snapshotPrefix,
-            snapshotFrameAnsi: snapshotFrame,
-            snapshotFrameRestoreAnsi: reattachSnapshot.frameRestoreAnsi
-          }
-        : {}),
-      ...(reattachProviderSequence ? { providerSequence: reattachProviderSequence } : {}),
-      ...(kittyKeyboardFlags !== undefined
-        ? { snapshotKittyKeyboardFlags: kittyKeyboardFlags }
-        : {}),
-      ...(reattachSnapshot.terminalOwner
-        ? { snapshotTerminalOwner: reattachSnapshot.terminalOwner }
-        : {}),
-      isReattach: true,
-      isAlternateScreen: isAltScreen,
-      // Snapshot ANSI lacks title frames; carry the title separately across relaunch.
-      ...(reattachSnapshot.lastTitle ? { lastTitle: reattachSnapshot.lastTitle } : {}),
-      // Replay the mid-escape tail after renderer reset so split escapes do not render literally.
-      ...(reattachSnapshot.pendingEscapeTailAnsi
-        ? { pendingEscapeTailAnsi: reattachSnapshot.pendingEscapeTailAnsi }
-        : {})
-    })
   }
 }
diff --git a/src/main/daemon/daemon-pty-spawn-settlement.ts b/src/main/daemon/daemon-pty-spawn-settlement.ts
new file mode 100644
index 000000000000..11c523a55e6a
--- /dev/null
+++ b/src/main/daemon/daemon-pty-spawn-settlement.ts
@@ -0,0 +1,259 @@
+import { isProvenProcessExit } from '../../shared/terminal-exit-cause'
+import type { DaemonClient } from './client'
+import { sameEndpointIdentity } from './daemon-endpoint-incarnation'
+import { STABLE_PANE_ATTACH_ONLY_DAEMON_PROTOCOL_VERSION } from './daemon-protocol-version'
+import { DaemonPtyRuntimeState, type PendingDaemonSpawnOperation } from './daemon-pty-runtime-state'
+import type { DaemonPtySpawnContext } from './daemon-pty-spawn-request'
+import type {
+  CancelCreateOrAttachResult,
+  CancelCreateOrAttachRequest,
+  CreateOrAttachResult
+} from './types'
+
+export abstract class DaemonPtySpawnSettlement extends DaemonPtyRuntimeState {
+  protected readonly switchSpawnSettlements = new Map<
+    PendingDaemonSpawnOperation,
+    NonNullable<PendingDaemonSpawnOperation['switchSettlement']>
+  >()
+  private readonly switchReleaseCleanup = new Map<
+    string,
+    {
+      client: DaemonClient
+      payload: CancelCreateOrAttachRequest['payload']
+    }
+  >()
+  private switchReleaseDrain: Promise<void> | undefined
+
+  protected async reconcileSwitchSpawns(): Promise<void> {
+    await Promise.all([...this.switchSpawnSettlements.values()].map((owner) => owner.recover()))
+  }
+
+  async settleSwitchWorkForReplacement(): Promise<void> {
+    await this.reconcileSwitchSpawns()
+    await Promise.all([...this.switchSpawnSettlements.values()].map((owner) => owner.completion))
+  }
+
+  inheritSwitchReleaseCleanup(previous: DaemonPtySpawnSettlement): void {
+    for (const [key, entry] of previous.switchReleaseCleanup) {
+      this.switchReleaseCleanup.set(key, entry)
+    }
+    previous.switchReleaseCleanup.clear()
+    this.drainSwitchReleaseCleanup()
+  }
+
+  protected drainSwitchReleaseCleanup(): void {
+    if (this.switchReleaseDrain || !this.switchReleaseCleanup.size) {
+      return
+    }
+    const batch = new Map(this.switchReleaseCleanup)
+    this.switchReleaseDrain = Promise.all(
+      [...batch].map(async ([key, entry]) => {
+        try {
+          await entry.client.withRetainedConnection(async () => {
+            await entry.client.ensureConnected()
+            const endpoint = entry.payload.release?.endpoint
+            const current = entry.client.getDaemonIdentity()
+            if (!endpoint || !current) {
+              return
+            }
+            if (!sameEndpointIdentity(endpoint, current)) {
+              // Only consumed GC debt is obsolete at an authenticated replacement endpoint.
+              if (this.switchReleaseCleanup.get(key) === entry) {
+                this.switchReleaseCleanup.delete(key)
+              }
+              return
+            }
+            const result = await entry.client.request<CancelCreateOrAttachResult>(
+              'cancelCreateOrAttach',
+              entry.payload,
+              5000
+            )
+            if (result.released === true && this.switchReleaseCleanup.get(key) === entry) {
+              this.switchReleaseCleanup.delete(key)
+            }
+          })
+        } catch {
+          /* Release debt never holds physical completion or user work. */
+        }
+      })
+    )
+      .then(() => {})
+      .finally(() => {
+        this.switchReleaseDrain = undefined
+        if ([...this.switchReleaseCleanup].some(([key, entry]) => batch.get(key) !== entry)) {
+          this.drainSwitchReleaseCleanup()
+        }
+      })
+  }
+
+  protected abstract ensureConnected(deadlineMs?: number): Promise<void>
+  protected abstract withDaemonRetry<T>(fn: () => Promise<T>): Promise<T>
+
+  protected observeSwitchSpawn(
+    context: DaemonPtySpawnContext,
+    requestId: string,
+    anchor: string | undefined,
+    preparedEndpoint: ReturnType<DaemonClient['getDaemonIdentity']>,
+    contract = 'creation-settlement-v1'
+  ): void {
+    const { opts } = context
+    const authority = opts.switchExecution
+    const endpoint = preparedEndpoint ?? this.client.getDaemonIdentity()
+    if (!authority || (contract !== 'ordinary' && !anchor)) {
+      return
+    }
+    const completion = Promise.withResolvers<void>()
+    const originalAnchor = anchor
+    let consumed = false
+    const dispatchedClient = this.client
+    const dispatchedSessionId = context.sessionId
+    let recovery: Promise<void> | undefined
+    let ordinaryIncarnation: string | undefined
+    const consume = (outcome: 'exited' | 'adopted' | 'failed', incarnationId?: string) => {
+      if (consumed) {
+        return
+      }
+      consumed = true
+      completion.resolve()
+      if (this.switchSpawnSettlements.get(context.operation) === owner) {
+        this.switchSpawnSettlements.delete(context.operation)
+      }
+      if (endpoint && originalAnchor && contract !== 'ordinary') {
+        const payload = {
+          sessionId: dispatchedSessionId,
+          requestId,
+          release: {
+            invocationId: authority.invocationId,
+            anchor: originalAnchor,
+            endpoint,
+            outcome,
+            ...(incarnationId ? { incarnationId } : {})
+          }
+        }
+        this.switchReleaseCleanup.set(
+          JSON.stringify([endpoint, dispatchedSessionId, requestId, originalAnchor]),
+          { client: dispatchedClient, payload }
+        )
+        this.drainSwitchReleaseCleanup()
+      }
+    }
+    const recover = (): Promise<void> => {
+      if (consumed) {
+        return owner.completion
+      }
+      if (recovery) {
+        return recovery
+      }
+      recovery = this.withDaemonRetry(async () => {
+        await this.ensureConnected()
+        if (consumed) {
+          return
+        }
+        const current = this.client.getDaemonIdentity()
+        if (!endpoint || !current || !sameEndpointIdentity(endpoint, current)) {
+          throw new Error('Terminal owner unavailable; reconnect and try again')
+        }
+        if (contract === 'ordinary') {
+          const exited =
+            ordinaryIncarnation &&
+            (context.operation.exitsBySessionId.get(dispatchedSessionId) ?? []).some(
+              (exit) => exit.incarnationId === ordinaryIncarnation && isProvenProcessExit(exit.code)
+            )
+          if (exited) {
+            consume('exited')
+            return
+          }
+          if (this.protocolVersion < STABLE_PANE_ATTACH_ONLY_DAEMON_PROTOCOL_VERSION) {
+            throw new Error('Terminal owner unavailable; reconnect and try again')
+          }
+          const result = await this.client.request<CreateOrAttachResult>(
+            'createOrAttach',
+            {
+              sessionId: dispatchedSessionId,
+              cols: context.effectiveCols,
+              rows: context.effectiveRows,
+              attachOnly: true
+            },
+            5000
+          )
+          if (consumed) {
+            return
+          }
+          if (
+            result.isNew ||
+            !result.incarnationId ||
+            (ordinaryIncarnation && ordinaryIncarnation !== result.incarnationId)
+          ) {
+            throw new Error('Terminal owner has not confirmed physical completion; try again')
+          }
+          ordinaryIncarnation = result.incarnationId
+          this.sessionIncarnations.set(dispatchedSessionId, ordinaryIncarnation)
+          this.activeSessionIds.add(dispatchedSessionId)
+          // Attach observes the exact live resource; only ordinary adoption or its positive exit settles it.
+          throw new Error('Terminal is still running; open its tab or close it and try again')
+        }
+        if (!originalAnchor) {
+          throw new Error('Terminal owner unavailable; reconnect and try again')
+        }
+        const response = await this.client.request<CancelCreateOrAttachResult>(
+          'cancelCreateOrAttach',
+          {
+            sessionId: dispatchedSessionId,
+            requestId,
+            settlement: {
+              invocationId: authority.invocationId,
+              anchor: originalAnchor,
+              endpoint
+            }
+          },
+          5000
+        )
+        if (consumed) {
+          return
+        }
+        if (response.retention !== contract) {
+          throw new Error('Terminal owner has not confirmed physical completion; try again')
+        }
+        if (
+          response.settlement?.outcome === 'exited' ||
+          (contract === 'creation-settlement-v1' && response.settlement?.outcome === 'failed')
+        ) {
+          consume(response.settlement.outcome)
+          return
+        }
+        if (response.settlement?.outcome === 'owned') {
+          const result = response.settlement.result
+          const id = result.agentSessionEnsure?.owner.ptyId ?? dispatchedSessionId
+          // Publish the actual surviving incarnation through ordinary adapter inventory.
+          if (result.incarnationId) {
+            this.sessionIncarnations.set(id, result.incarnationId)
+          }
+          this.activeSessionIds.add(id)
+        }
+        throw new Error('Terminal owner has not confirmed physical completion; try again')
+      })
+        .catch((error) => {
+          if (!consumed) {
+            throw error
+          }
+        })
+        .finally(() => {
+          recovery = undefined
+        })
+      return recovery
+    }
+    const owner = {
+      completion: completion.promise,
+      recover,
+      consume,
+      adopt: (incarnationId: string) => {
+        if (contract === 'ordinary' && ordinaryIncarnation === incarnationId) {
+          consume('adopted', incarnationId)
+        }
+      }
+    }
+    context.operation.switchSettlement = owner
+    this.switchSpawnSettlements.set(context.operation, owner)
+    authority.trackPhysical?.(owner.completion, recover)
+  }
+}
diff --git a/src/main/daemon/daemon-request-router.ts b/src/main/daemon/daemon-request-router.ts
index cab6c2bac56a..13016337e721 100644
--- a/src/main/daemon/daemon-request-router.ts
+++ b/src/main/daemon/daemon-request-router.ts
@@ -1,3 +1,4 @@
+import { cancelDaemonCreateOrAttach } from './daemon-create-or-attach-cancellation'
 import { handleDaemonTerminalKill } from './daemon-terminal-kill'
 import { handleDaemonFencedTermination } from './daemon-fenced-termination'
 import { performance } from 'node:perf_hooks'
@@ -15,8 +16,7 @@ import { DaemonHealthRequests } from './daemon-health-requests'
 import type { TerminalHistorySeedTransferRegistry } from './terminal-history-seed-transfer-registry'
 import type { TerminalHost } from './terminal-host'
 import { SessionNotFoundError, type DaemonRequest } from './types'
-
-type DaemonRequestRouterOptions = {
+export type DaemonRequestRouterOptions = {
   host: TerminalHost
   connections: DaemonClientConnections
   lifecycle: DaemonServerLifecycle
@@ -65,14 +65,7 @@ export class DaemonRequestRouter {
       case 'createOrAttach':
         return this.options.admission.createOrAttach(clientId, request)
       case 'cancelCreateOrAttach':
-        return {
-          canceled: this.options.preparations.cancel(request.payload.sessionId, {
-            clientId,
-            ...(typeof request.payload.requestId === 'string'
-              ? { requestId: request.payload.requestId }
-              : {})
-          })
-        }
+        return cancelDaemonCreateOrAttach(this.options, clientId, request)
       case 'closeStartupQueryAuthority':
         return {
           appliedSeq: this.options.host.closeStartupQueryAuthority(request.payload.sessionId)
@@ -221,6 +214,7 @@ export class DaemonRequestRouter {
       client.streamSocket !== null &&
       this.options.connections.size === 1 &&
       this.options.admission.inFlight === 0 &&
+      !this.options.preparations.hasOwedOutcomes() &&
       this.options.host.listSessions().length === 0 &&
       this.options.connections.hasOnlyTransportsFor(client)
     if (retiring) {
diff --git a/src/main/daemon/daemon-server-async-spawn-cancellation.test.ts b/src/main/daemon/daemon-server-async-spawn-cancellation.test.ts
index 3ea304bc1b9d..a8b48f379d77 100644
--- a/src/main/daemon/daemon-server-async-spawn-cancellation.test.ts
+++ b/src/main/daemon/daemon-server-async-spawn-cancellation.test.ts
@@ -1,3 +1,5 @@
+import { registerDaemonCreationFailureTests } from './daemon-server-creation-failure.test-fixture'
+import type * as LocalPtyUtils from '../providers/local-pty-utils'
 import './mock-descendant-sweep'
 import { mkdtempSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
@@ -6,7 +8,20 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { DaemonClient } from './client'
 import { createMockSubprocess } from './daemon-pty-adapter-test-harness'
 import { DaemonServer } from './daemon-server'
+import { DaemonPtyAdapter } from './daemon-pty-adapter'
+import * as transport from './daemon-client-socket-connect'
+import { HistoryManager } from './history-manager'
+import type { DaemonClientConnections } from './daemon-client-connections'
 import { getDaemonSocketPath } from './daemon-spawner'
+import type { CancelCreateOrAttachResult, CreateOrAttachResult } from './types'
+const nativePty = vi.hoisted(() => ({ spawn: vi.fn() }))
+vi.mock('node-pty', () => nativePty)
+
+vi.mock('../providers/local-pty-utils', async (importOriginal) => ({
+  ...(await importOriginal<typeof LocalPtyUtils>()),
+  ensureNodePtySpawnHelperExecutable: () => {},
+  getNodePtySpawnHelperCandidates: () => [process.execPath]
+}))
 type DaemonServerInternals = {
   preparations: {
     pending: Map<string, Set<{ canceled: boolean }>>
@@ -21,6 +36,8 @@ describe('daemon async spawn cancellation', () => {
   let releaseSpawn: () => void
   let spawnStarted: Promise<void>
   let subprocess: ReturnType<typeof createMockSubprocess>
+  let preparation: Promise<void>
+  let spawned: number
 
   beforeEach(async () => {
     directory = mkdtempSync(join(tmpdir(), 'daemon-async-spawn-cancel-'))
@@ -31,10 +48,14 @@ describe('daemon async spawn cancellation', () => {
     const spawnGate = new Promise<void>((resolve) => {
       releaseSpawn = resolve
     })
+    preparation = Promise.resolve()
+    spawned = 0
     server = new DaemonServer({
       socketPath: getDaemonSocketPath(directory),
       tokenPath: join(directory, 'daemon.token'),
+      preparePtySpawn: () => preparation,
       spawnSubprocess: async () => {
+        spawned += 1
         subprocess = createMockSubprocess()
         markSpawnStarted()
         await spawnGate
@@ -53,9 +74,615 @@ describe('daemon async spawn cancellation', () => {
     releaseSpawn?.()
     client?.disconnect()
     await server?.shutdown()
+    vi.restoreAllMocks()
     rmSync(directory, { recursive: true, force: true })
   })
 
+  it.each([
+    'healthy',
+    'release-request-lost',
+    'release-reply-lost',
+    'late-recovery',
+    'adoption-failed',
+    'construction-failed',
+    'continuing-adapter',
+    'surviving-adapter',
+    'replacement-endpoint'
+  ] as const)(
+    'consumes only after actual adoption and reclaims without a physical hold: %s',
+    async (loss) => {
+      const adapter = new DaemonPtyAdapter({
+        socketPath: getDaemonSocketPath(directory),
+        tokenPath: join(directory, 'daemon.token'),
+        ...(loss === 'adoption-failed' ? { historyPath: join(directory, 'history') } : {})
+      })
+      if (loss === 'adoption-failed') {
+        vi.spyOn(HistoryManager.prototype, 'openSession').mockRejectedValue(
+          new Error('fixture disk unavailable')
+        )
+      }
+      let successor: DaemonPtyAdapter | undefined
+      let owner: { work: Promise<unknown>; recover: () => Promise<void> } | undefined
+      let blocked = false
+      let releaseSent = 0
+      let releaseReplyDropped = false
+      let originalReply: (() => void) | undefined
+      let lateReply: (() => void) | undefined
+      // SAFETY: inspect only this fixture's receiver and adapter ownership maps.
+      const receiver = server as unknown as {
+        preparations: { retained: Map<string, unknown> }
+        connections: DaemonClientConnections
+      }
+      // SAFETY: read-only assertions on the actual local owners, never resolve/remove them from a test.
+      const local = adapter as unknown as {
+        switchReleaseCleanup: Map<string, unknown>
+        switchReleaseDrain?: Promise<void>
+        switchSpawnSettlements: Map<unknown, unknown>
+      }
+      const connect = transport.connectDaemonSocket
+      vi.spyOn(transport, 'connectDaemonSocket').mockImplementation(async (...args) => {
+        if (blocked) {
+          throw new Error('Connection lost')
+        }
+        const socket = await connect(...args)
+        const write = socket.write.bind(socket)
+        vi.spyOn(socket, 'write').mockImplementation(
+          (...values: Parameters<typeof socket.write>) => {
+            const frame = JSON.parse(String(values[0]))
+            if (frame.payload?.switchExecution?.phase === 'commit') {
+              const peer = [...receiver.connections.values()].at(-1)?.controlSocket
+              if (!peer) {
+                throw new Error('fixture control missing')
+              }
+              const respond = peer.write.bind(peer)
+              vi.spyOn(peer, 'write').mockImplementation(
+                (...bytes: Parameters<typeof peer.write>) => {
+                  const result = JSON.parse(String(bytes[0]))
+                  if (loss === 'late-recovery' && result.id === frame.id) {
+                    originalReply = () => {
+                      respond(...bytes)
+                    }
+                    return true
+                  }
+                  if (loss === 'late-recovery' && result.payload?.settlement) {
+                    lateReply = () => {
+                      respond(...bytes)
+                    }
+                    return true
+                  }
+                  if (
+                    loss === 'release-reply-lost' &&
+                    !releaseReplyDropped &&
+                    result.payload?.released === true
+                  ) {
+                    releaseReplyDropped = true
+                    blocked = true
+                    peer.destroy()
+                    return true
+                  }
+                  return respond(...bytes)
+                }
+              )
+            }
+            if (frame.payload?.release) {
+              releaseSent++
+              if (releaseSent === 1 && frame.payload.release.outcome === 'adopted') {
+                expect(adapter.getActiveSessionIds()).toContain('receipt-pane')
+              }
+              if (
+                (loss === 'release-request-lost' ||
+                  loss === 'continuing-adapter' ||
+                  loss === 'surviving-adapter' ||
+                  loss === 'replacement-endpoint') &&
+                releaseSent === 1
+              ) {
+                blocked = true
+                socket.destroy()
+                return true
+              }
+            }
+            return write(...values)
+          }
+        )
+        return socket
+      })
+      const starting = adapter.spawn({
+        sessionId: 'receipt-pane',
+        cols: 80,
+        rows: 24,
+        switchExecution: {
+          invocationId: 'adoption-click',
+          signal: new AbortController().signal,
+          remaining: () => 60_000,
+          check: () => {},
+          trackPhysical: (work, recover) => {
+            if (recover) {
+              owner = { work, recover }
+            }
+            return work
+          }
+        }
+      })
+      const observed = starting.then(
+        (result) => ({ result }),
+        (error: unknown) => ({ error })
+      )
+      try {
+        await spawnStarted
+        if (loss === 'construction-failed') {
+          subprocess.onData = () => {
+            throw new Error('fixture subscription failed')
+          }
+          vi.mocked(subprocess.forceKill).mockImplementation(() => {
+            throw new Error('fixture close unavailable')
+          })
+        }
+        releaseSpawn()
+        if (loss === 'late-recovery') {
+          await vi.waitFor(() => expect(originalReply).toBeTypeOf('function'))
+          if (!owner) {
+            throw new Error('receiver completion was not tracked')
+          }
+          const recovering = owner.recover()
+          await vi.waitFor(() => expect(lateReply).toBeTypeOf('function'))
+          originalReply!()
+          expect(await observed).toMatchObject({ result: { id: 'receipt-pane' } })
+          await owner.work
+          await vi.waitFor(() => expect(receiver.preparations.retained.size).toBe(0))
+          // The real older owned response arrives after the exact receipt has been released.
+          lateReply!()
+          await expect(recovering).resolves.toBeUndefined()
+        } else if (loss === 'adoption-failed' || loss === 'construction-failed') {
+          expect(await observed).toMatchObject({
+            error: {
+              message:
+                loss === 'adoption-failed'
+                  ? 'fixture disk unavailable'
+                  : 'fixture subscription failed'
+            }
+          })
+          expect(releaseSent).toBe(0)
+          expect(local.switchSpawnSettlements.size).toBe(1)
+          expect(receiver.preparations.retained.size).toBe(1)
+          await expect(adapter.settleSwitchWorkForReplacement()).rejects.toThrow(
+            loss === 'adoption-failed'
+              ? 'not confirmed physical completion'
+              : 'fixture close unavailable'
+          )
+          expect(local.switchSpawnSettlements.size).toBe(1)
+          if (loss === 'construction-failed') {
+            vi.mocked(subprocess.forceKill).mockImplementation(() => {
+              setTimeout(() => subprocess._simulateExit(137), 5)
+            })
+          } else {
+            subprocess._simulateExit(0)
+          }
+          if (!owner) {
+            throw new Error('receiver completion was not tracked')
+          }
+          await owner.recover()
+          await owner.work
+        } else {
+          expect(await observed).toMatchObject({ result: { id: 'receipt-pane' } })
+          if (!owner) {
+            throw new Error('receiver completion was not tracked')
+          }
+          await owner.work
+          expect(local.switchSpawnSettlements.size).toBe(0)
+          if (loss !== 'healthy') {
+            await vi.waitFor(() => expect(blocked).toBe(true))
+            await vi.waitFor(() => expect(local.switchReleaseDrain).toBeUndefined())
+            expect(local.switchReleaseCleanup.size).toBe(1)
+            expect(receiver.preparations.retained.size).toBe(
+              loss === 'release-request-lost' ||
+                loss === 'continuing-adapter' ||
+                loss === 'surviving-adapter' ||
+                loss === 'replacement-endpoint'
+                ? 1
+                : 0
+            )
+            // Physical ownership is consumed even while exact GC delivery is unavailable.
+            await expect(owner.recover()).resolves.toBeUndefined()
+            if (
+              loss === 'continuing-adapter' ||
+              loss === 'surviving-adapter' ||
+              loss === 'replacement-endpoint'
+            ) {
+              await adapter.settleSwitchWorkForReplacement()
+              successor = new DaemonPtyAdapter({
+                socketPath: getDaemonSocketPath(directory),
+                tokenPath: join(directory, 'daemon.token')
+              })
+              if (loss === 'replacement-endpoint') {
+                await server.shutdown()
+                server = new DaemonServer({
+                  socketPath: getDaemonSocketPath(directory),
+                  tokenPath: join(directory, 'daemon.token'),
+                  spawnSubprocess: () => {
+                    throw new Error('GC must never create a process')
+                  }
+                })
+                await server.start()
+              }
+              successor.inheritSwitchReleaseCleanup(adapter)
+              if (loss !== 'surviving-adapter') {
+                adapter.dispose()
+              }
+            }
+            blocked = false
+            await (successor ?? adapter).listProcesses()
+          }
+        }
+        if (loss === 'replacement-endpoint') {
+          if (!successor) {
+            throw new Error('successor missing')
+          }
+          // SAFETY: actual successor transport/outcome maps, never mutate them.
+          const replacement = server as unknown as {
+            preparations: { retained: Map<string, unknown> }
+            connections: DaemonClientConnections
+          }
+          const cleanup = successor as unknown as {
+            switchReleaseCleanup: Map<string, unknown>
+            switchReleaseDrain?: Promise<void>
+          }
+          await vi.waitFor(() => expect(cleanup.switchReleaseCleanup.size).toBe(0))
+          await vi.waitFor(() => expect(cleanup.switchReleaseDrain).toBeUndefined())
+          expect(replacement.preparations.retained.size).toBe(0)
+          await vi.waitFor(() => expect(replacement.connections.size).toBe(1))
+          await successor.listProcesses()
+          await vi.waitFor(() => expect(replacement.connections.size).toBe(1))
+          expect(await successor.requestIdleRetirement()).toMatchObject({ state: 'retiring' })
+          return
+        }
+        await vi.waitFor(() => expect(receiver.preparations.retained.size).toBe(0))
+        await vi.waitFor(() => expect(local.switchReleaseCleanup.size).toBe(0))
+        if (loss !== 'adoption-failed' && loss !== 'construction-failed') {
+          expect(server.host.listSessions()).toMatchObject([
+            { sessionId: 'receipt-pane', isAlive: true }
+          ])
+          expect(subprocess.forceKill).not.toHaveBeenCalled()
+        }
+        expect(spawned).toBe(1)
+        if (loss === 'surviving-adapter') {
+          await vi.waitFor(() => expect(receiver.connections.size).toBe(3))
+        }
+        if (
+          loss === 'release-request-lost' ||
+          loss === 'release-reply-lost' ||
+          loss === 'surviving-adapter' ||
+          loss === 'continuing-adapter'
+        ) {
+          await (successor ?? adapter).spawn({
+            sessionId: 'receipt-pane',
+            cols: 80,
+            rows: 24,
+            attachOnly: true
+          })
+        }
+        const exit = vi.fn()
+        ;(successor ?? adapter).onExit(exit)
+        subprocess._simulateExit(0)
+        if (loss !== 'adoption-failed' && loss !== 'construction-failed') {
+          await vi.waitFor(() => expect(exit).toHaveBeenCalledOnce())
+        }
+        expect(receiver.preparations.retained.size).toBe(0)
+        if (loss === 'continuing-adapter' || loss === 'surviving-adapter') {
+          if (!successor) {
+            throw new Error('successor missing')
+          }
+          client.disconnect()
+          if (loss === 'surviving-adapter') {
+            await vi.waitFor(() => expect(receiver.connections.size).toBe(2))
+            expect(await successor.requestIdleRetirement()).toMatchObject({ state: 'busy' })
+            adapter.dispose()
+          }
+          await vi.waitFor(() => expect(receiver.connections.size).toBe(1))
+          expect(await successor.requestIdleRetirement()).toMatchObject({ state: 'retiring' })
+        }
+      } finally {
+        blocked = false
+        releaseSpawn()
+        originalReply?.()
+        lateReply?.()
+        await observed
+        subprocess?._simulateExit(0)
+        await owner?.recover().catch(() => {})
+        await owner?.work
+        successor?.dispose()
+        adapter.dispose()
+      }
+    },
+    15_000
+  )
+
+  it('keeps owed terminal proof through ordinary graceful retirement and releases only an exact completed disposition', async () => {
+    const prepared = await client.request<{ anchor: string }>('createOrAttach', {
+      sessionId: 'owed-pane',
+      cols: 80,
+      rows: 24,
+      switchExecution: { phase: 'prepare', invocationId: 'owed-click' }
+    })
+    const release = {
+      sessionId: 'owed-pane',
+      requestId: 'not-committed',
+      release: {
+        invocationId: 'owed-click',
+        anchor: prepared.anchor,
+        endpoint: client.getDaemonIdentity()!,
+        outcome: 'exited' as const
+      }
+    }
+    expect(await client.request('cancelCreateOrAttach', release)).toMatchObject({
+      released: false,
+      canceled: false
+    })
+    expect(await client.request('shutdownIfIdle', undefined)).toMatchObject({ retiring: false })
+    const settled = await client.request('cancelCreateOrAttach', {
+      sessionId: 'owed-pane',
+      requestId: 'not-committed',
+      settlement: release.release
+    })
+    expect(settled).toMatchObject({ settlement: { outcome: 'exited' } })
+    expect(await client.request('shutdownIfIdle', undefined)).toMatchObject({ retiring: false })
+    expect(await client.request('cancelCreateOrAttach', release)).toMatchObject({
+      released: true,
+      canceled: false
+    })
+    expect(await client.request('cancelCreateOrAttach', release)).toMatchObject({ released: true })
+    expect(
+      await client.request('cancelCreateOrAttach', {
+        sessionId: 'owed-pane',
+        requestId: 'not-committed',
+        settlement: release.release
+      })
+    ).toMatchObject({ settlement: { outcome: 'unknown' } })
+    expect(await client.request('shutdownIfIdle', undefined)).toMatchObject({ retiring: true })
+  })
+
+  it.each([
+    'canceled',
+    'missing-budget',
+    'zero-budget',
+    'oversized-budget',
+    'unsupported-contract'
+  ] as const)('settles an exact refused commit with no admitted work: %s', async (refusal) => {
+    const sessionId = 'refused-switch'
+    const prepared = await client.request<{ anchor: string }>('createOrAttach', {
+      sessionId,
+      cols: 80,
+      rows: 24,
+      switchExecution: { phase: 'prepare', invocationId: 'original-click' }
+    })
+    if (refusal === 'canceled') {
+      await client.request('cancelCreateOrAttach', { sessionId, requestId: prepared.anchor })
+    }
+    let requestId = ''
+    await expect(
+      client.request(
+        'createOrAttach',
+        {
+          sessionId,
+          cols: 80,
+          rows: 24,
+          switchExecution: {
+            phase: 'commit',
+            contract: refusal === 'unsupported-contract' ? undefined : 'creation-settlement-v1',
+            invocationId: 'original-click',
+            anchor: prepared.anchor,
+            ...(refusal === 'missing-budget'
+              ? {}
+              : {
+                  remainingMs:
+                    refusal === 'zero-budget'
+                      ? 0
+                      : refusal === 'oversized-budget'
+                        ? 720_001
+                        : 60_000
+                })
+          }
+        },
+        30_000,
+        undefined,
+        (sent) => {
+          requestId = sent
+        }
+      )
+    ).rejects.toThrow('Attach canceled')
+    const settlement = {
+      sessionId,
+      requestId,
+      settlement: {
+        invocationId: 'original-click',
+        anchor: prepared.anchor,
+        endpoint: client.getDaemonIdentity()!
+      }
+    }
+    for (let repeat = 0; repeat < 2; repeat++) {
+      await expect(client.request('cancelCreateOrAttach', settlement)).resolves.toMatchObject({
+        settlement: { outcome: 'exited' }
+      })
+    }
+    expect(spawned).toBe(0)
+    expect(server.host.listSessions()).toEqual([])
+    await expect(
+      client.request('createOrAttach', {
+        sessionId,
+        cols: 80,
+        rows: 24,
+        switchExecution: {
+          phase: 'commit',
+          contract: 'creation-settlement-v1',
+          invocationId: 'original-click',
+          anchor: prepared.anchor,
+          remainingMs: 60_000
+        }
+      })
+    ).rejects.toThrow('Attach canceled')
+  })
+
+  it.each(['pre-host', 'exited', 'live-unknown', 'used', 'replaced'] as const)(
+    'rejoins the exact admitted owner and preserves physical truth: %s',
+    async (outcome) => {
+      const preHost = Promise.withResolvers<void>()
+      if (outcome === 'pre-host') {
+        preparation = preHost.promise
+      }
+      const sessionId = 'retained-switch'
+      const prepared = await client.request<{ anchor: string }>('createOrAttach', {
+        sessionId,
+        cols: 80,
+        rows: 24,
+        switchExecution: { phase: 'prepare', invocationId: 'original-click' }
+      })
+      const endpoint = client.getDaemonIdentity()!
+      let requestId = ''
+      const create = client
+        .request<CreateOrAttachResult>(
+          'createOrAttach',
+          {
+            sessionId,
+            cols: 80,
+            rows: 24,
+            switchExecution: {
+              phase: 'commit',
+              contract: 'creation-settlement-v1',
+              invocationId: 'original-click',
+              anchor: prepared.anchor,
+              remainingMs: 60_000
+            }
+          },
+          30_000,
+          undefined,
+          (sent) => {
+            requestId = sent
+          }
+        )
+        .catch(() => undefined)
+      const payload = {
+        sessionId,
+        get requestId() {
+          return requestId
+        },
+        settlement: { invocationId: 'original-click', anchor: prepared.anchor, endpoint }
+      }
+      if (outcome !== 'pre-host') {
+        await spawnStarted
+      }
+      await expect(
+        client.request('cancelCreateOrAttach', {
+          ...payload,
+          settlement: {
+            ...payload.settlement,
+            endpoint: { ...endpoint, launchNonce: 'different-endpoint' }
+          }
+        })
+      ).resolves.toMatchObject({ settlement: { outcome: 'unknown' } })
+      await expect(
+        client.request('cancelCreateOrAttach', {
+          ...payload,
+          settlement: { ...payload.settlement, invocationId: 'other-click' }
+        })
+      ).resolves.toMatchObject({ settlement: { outcome: 'unknown' } })
+
+      try {
+        if (outcome === 'used' || outcome === 'replaced') {
+          releaseSpawn()
+          const original = await create
+          expect(original?.incarnationId).toBeDefined()
+          if (outcome === 'replaced') {
+            subprocess._simulateExit(0)
+          }
+          const other = new DaemonClient({
+            socketPath: getDaemonSocketPath(directory),
+            tokenPath: join(directory, 'daemon.token')
+          })
+          try {
+            await other.ensureConnected()
+            await expect(other.request('cancelCreateOrAttach', payload)).resolves.toMatchObject({
+              settlement: { outcome: 'unknown' }
+            })
+            const current = await other.request<CreateOrAttachResult>('createOrAttach', {
+              sessionId,
+              cols: 80,
+              rows: 24
+            })
+            const protectedChild = subprocess
+            expect(await client.request('cancelCreateOrAttach', payload)).toMatchObject({
+              settlement:
+                outcome === 'used'
+                  ? { outcome: 'owned', result: { incarnationId: original?.incarnationId } }
+                  : { outcome: 'exited' }
+            })
+            expect(protectedChild.forceKill).not.toHaveBeenCalled()
+            expect(server.host.listSessions()).toMatchObject([
+              { incarnationId: current.incarnationId, isAlive: true }
+            ])
+          } finally {
+            other.disconnect()
+          }
+        } else {
+          if (outcome === 'live-unknown') {
+            subprocess.forceKill.mockImplementation(() => {
+              throw new Error('physical close unavailable')
+            })
+          }
+          let settled = false
+          const joined = client
+            .request<CancelCreateOrAttachResult>('cancelCreateOrAttach', payload)
+            .then((value) => {
+              settled = true
+              return value
+            })
+          void joined.catch(() => {})
+          await (outcome === 'pre-host'
+            ? create
+            : vi.waitFor(() => {
+                const daemon = server as unknown as DaemonServerInternals
+                expect([...(daemon.preparations.pending.get(sessionId) ?? [])][0]?.canceled).toBe(
+                  true
+                )
+              }))
+          expect(settled).toBe(false)
+          if (outcome === 'pre-host') {
+            await create
+            expect(settled).toBe(false)
+            expect(server.host.listSessions()).toEqual([])
+            preHost.resolve()
+          } else {
+            releaseSpawn()
+          }
+          expect(await joined).toMatchObject({
+            settlement: { outcome: outcome === 'live-unknown' ? 'owned' : 'exited' }
+          })
+          if (outcome === 'live-unknown') {
+            expect(server.host.listSessions()).toMatchObject([{ isAlive: true }])
+            const observedExit = vi.fn()
+            const unsubscribe = client.onEvent(observedExit)
+            subprocess._simulateExit(137)
+            await vi.waitFor(() =>
+              expect(observedExit).toHaveBeenCalledWith(
+                expect.objectContaining({ event: 'exit', sessionId })
+              )
+            )
+            unsubscribe()
+            await expect(client.request('cancelCreateOrAttach', payload)).resolves.toMatchObject({
+              settlement: { outcome: 'exited' }
+            })
+          } else {
+            expect(server.host.listSessions()).toEqual([])
+          }
+        }
+      } finally {
+        preHost.resolve()
+        releaseSpawn()
+        subprocess?._simulateExit(137)
+        await create
+      }
+    },
+    20_000
+  )
+
   it.each(['cancelCreateOrAttach', 'kill'] as const)(
     'reaps a subprocess canceled by %s during async spawn',
     async (requestType) => {
@@ -134,59 +761,6 @@ describe('daemon async spawn cancellation', () => {
     await expect(client.request('listSessions', undefined)).resolves.toEqual({ sessions: [] })
   })
 
-  it('matches a cancel for an attach-only request queued behind a hung create', async () => {
-    const create = client.request('createOrAttach', {
-      sessionId: 'shared-session',
-      cols: 80,
-      rows: 24
-    })
-    await spawnStarted
-    const abort = new AbortController()
-    const attach = client.request(
-      'createOrAttach',
-      { sessionId: 'shared-session', cols: 80, rows: 24, attachOnly: true },
-      30_000,
-      abort.signal
-    )
-    const daemon = server as unknown as DaemonServerInternals
-    // Attach-only preparations must remain registered so cancellation can find them.
-    await vi.waitFor(() => expect(daemon.preparations.pending.get('shared-session')?.size).toBe(2))
-
-    abort.abort()
-    await expect(attach).rejects.toThrow('client_disconnected')
-
-    releaseSpawn()
-    await expect(create).resolves.toMatchObject({ isNew: true })
-  })
-
-  it('does not cancel a sibling request for the same session id', async () => {
-    const first = client.request('createOrAttach', {
-      sessionId: 'shared-session',
-      cols: 80,
-      rows: 24
-    })
-    const abort = new AbortController()
-    const second = client.request(
-      'createOrAttach',
-      { sessionId: 'shared-session', cols: 80, rows: 24 },
-      30_000,
-      abort.signal
-    )
-    await spawnStarted
-    const daemon = server as unknown as DaemonServerInternals
-    await vi.waitFor(() => expect(daemon.preparations.pending.get('shared-session')?.size).toBe(2))
-
-    abort.abort()
-    await expect(second).rejects.toThrow('client_disconnected')
-    releaseSpawn()
-
-    await expect(first).resolves.toMatchObject({ isNew: true })
-    expect(subprocess.forceKill).not.toHaveBeenCalled()
-    await expect(client.request('listSessions', undefined)).resolves.toMatchObject({
-      sessions: [expect.objectContaining({ sessionId: 'shared-session' })]
-    })
-  })
-
   it('reaps an async spawn before daemon shutdown completes', async () => {
     const create = client
       .request('createOrAttach', {
@@ -205,4 +779,33 @@ describe('daemon async spawn cancellation', () => {
     expect(subprocess.forceKill).toHaveBeenCalledOnce()
     expect(subprocess.dispose).toHaveBeenCalledOnce()
   })
+  registerDaemonCreationFailureTests({
+    get directory() {
+      return directory
+    },
+    get server() {
+      return server
+    },
+    set server(value) {
+      server = value
+    },
+    get client() {
+      return client
+    },
+    get subprocess() {
+      return subprocess
+    },
+    get releaseSpawn() {
+      return releaseSpawn
+    },
+    get spawnStarted() {
+      return spawnStarted
+    },
+    get spawned() {
+      return spawned
+    },
+    get nativePty() {
+      return nativePty
+    }
+  })
 })
diff --git a/src/main/daemon/daemon-server-creation-failure.test-fixture.ts b/src/main/daemon/daemon-server-creation-failure.test-fixture.ts
new file mode 100644
index 000000000000..fd6ad0807a85
--- /dev/null
+++ b/src/main/daemon/daemon-server-creation-failure.test-fixture.ts
@@ -0,0 +1,238 @@
+import { registerDaemonNativeFailureTests } from './daemon-server-native-failure.test-fixture'
+import './mock-descendant-sweep'
+import { join } from 'node:path'
+import { expect, it, vi } from 'vitest'
+import type { DaemonClient } from './client'
+import type { createMockSubprocess } from './daemon-pty-adapter-test-harness'
+import type { DaemonServer } from './daemon-server'
+import { DaemonPtyAdapter } from './daemon-pty-adapter'
+import * as transport from './daemon-client-socket-connect'
+import type { DaemonClientConnections } from './daemon-client-connections'
+import { getDaemonSocketPath } from './daemon-spawner'
+type DaemonServerInternals = {
+  preparations: { pending: Map<string, Set<{ canceled: boolean }>> }
+}
+export type DaemonCreationFailureFixture = {
+  directory: string
+  server: DaemonServer
+  client: DaemonClient
+  subprocess: ReturnType<typeof createMockSubprocess>
+  releaseSpawn: () => void
+  spawnStarted: Promise<void>
+  spawned: number
+  nativePty: { spawn: ReturnType<typeof vi.fn> }
+}
+export function registerDaemonCreationFailureTests(fixture: DaemonCreationFailureFixture) {
+  registerDaemonNativeFailureTests(fixture)
+  it.each([
+    ['constructor', 'retry'],
+    ['publication', 'disposal']
+  ] as const)(
+    'ordinary authenticated create drives failed unpublished cleanup: %s/%s',
+    async (failure, wake) => {
+      const options = {
+        sessionId: 'ordinary-failed',
+        cols: 80,
+        rows: 24,
+        agentSessionEnsure: {
+          claim: {
+            digestVersion: 1 as const,
+            keyId: 'key',
+            identityDigest: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+            worktreeScopeDigest: 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+            agent: 'codex' as const
+          },
+          surface: {
+            worktreeId: 'worktree',
+            tabId: 'ordinary-tab',
+            leafId: '11111111-1111-4111-8111-111111111111',
+            terminalHandle: 'term_ordinary'
+          }
+        }
+      }
+      const creating = fixture.client.request('createOrAttach', options)
+      const observed = expect(creating).rejects.toThrow('fixture subscription failed')
+      await fixture.spawnStarted
+      const failed = fixture.subprocess
+      if (failure === 'constructor') {
+        failed.onData = () => {
+          throw new Error('fixture subscription failed')
+        }
+      } else {
+        Object.assign(failed, {
+          onInputClosed: () => {
+            throw new Error('fixture subscription failed')
+          }
+        })
+      }
+      vi.mocked(failed.forceKill).mockImplementation(() => {
+        throw new Error('fixture close unavailable')
+      })
+      fixture.releaseSpawn()
+      await observed
+      await vi.waitFor(() => expect(failed.forceKill).toHaveBeenCalled())
+      expect(fixture.server.host.listSessions()).toEqual([])
+      expect(fixture.server.automaticWork.gate.snapshot().terminals).toBe(1)
+      const attempts = vi.mocked(failed.forceKill).mock.calls.length
+      // The ordinary next authenticated request drives the retained resource, not a test callback.
+      vi.mocked(failed.forceKill).mockImplementation(() => {
+        setTimeout(() => failed._simulateExit(137), 5)
+      })
+      if (wake === 'disposal') {
+        await fixture.server.host.dispose()
+        expect(failed.dispose).toHaveBeenCalledOnce()
+        expect(fixture.spawned).toBe(1)
+        expect(fixture.server.automaticWork.gate.snapshot().terminals).toBe(0)
+        return
+      }
+      expect(await fixture.client.request('createOrAttach', options)).toMatchObject({ isNew: true })
+      expect(vi.mocked(failed.forceKill).mock.calls.length).toBeGreaterThan(attempts)
+      expect(failed.dispose).toHaveBeenCalledOnce()
+      expect(fixture.spawned).toBe(2)
+      expect(fixture.server.automaticWork.gate.snapshot().terminals).toBe(1)
+      await fixture.client.request('write', { sessionId: options.sessionId, data: 'new input' })
+      expect(fixture.subprocess.write).toHaveBeenCalledWith('new input')
+      await fixture.server.host.dispose()
+      expect(fixture.server.automaticWork.gate.snapshot().terminals).toBe(0)
+    }
+  )
+
+  it.each(['authority', 'canceled-before-send'] as const)(
+    'finishes a known successful prepare when %s refuses before commit',
+    async (failure) => {
+      const adapter = new DaemonPtyAdapter({
+        socketPath: getDaemonSocketPath(fixture.directory),
+        tokenPath: join(fixture.directory, 'daemon.token')
+      })
+      const abort = new AbortController()
+      let checks = 0
+      let owner: { work: Promise<unknown>; recover: () => Promise<void> } | undefined
+      const frames: {
+        type: string
+        payload?: { switchExecution?: { phase: string }; settlement?: unknown; release?: unknown }
+      }[] = []
+      const connect = transport.connectDaemonSocket
+      vi.spyOn(transport, 'connectDaemonSocket').mockImplementation(async (...args) => {
+        const socket = await connect(...args)
+        const write = socket.write.bind(socket)
+        vi.spyOn(socket, 'write').mockImplementation(
+          (...bytes: Parameters<typeof socket.write>) => {
+            frames.push(JSON.parse(String(bytes[0])))
+            return write(...bytes)
+          }
+        )
+        return socket
+      })
+      try {
+        await expect(
+          adapter.spawn({
+            sessionId: 'known-prepared',
+            cols: 80,
+            rows: 24,
+            signal: abort.signal,
+            switchExecution: {
+              invocationId: 'abandoned-click',
+              signal: abort.signal,
+              remaining: () => 60_000,
+              check: () => {
+                if (++checks !== 2) {
+                  return
+                }
+                if (failure === 'authority') {
+                  throw new Error('fixture newer authority')
+                }
+                abort.abort()
+              },
+              trackPhysical: (work, recover) => {
+                if (recover) {
+                  owner = { work, recover }
+                }
+                return work
+              }
+            }
+          })
+        ).rejects.toThrow(failure === 'authority' ? 'fixture newer authority' : /abort|disconnect/i)
+        if (!owner) {
+          throw new Error('known preparation lost its ordinary owner')
+        }
+        await owner.work
+        // SAFETY: inspect only this fixture receiver's actual outcome owner.
+        const receiver = fixture.server as unknown as {
+          preparations: { hasOwedOutcomes(): boolean }
+          connections: DaemonClientConnections
+        }
+        await vi.waitFor(() => expect(receiver.preparations.hasOwedOutcomes()).toBe(false))
+        expect(
+          frames.filter((frame) => frame.payload?.switchExecution?.phase === 'prepare')
+        ).toHaveLength(1)
+        expect(
+          frames.filter((frame) => frame.payload?.switchExecution?.phase === 'commit')
+        ).toHaveLength(0)
+        expect(frames.some((frame) => frame.payload?.settlement)).toBe(true)
+        expect(frames.some((frame) => frame.payload?.release)).toBe(true)
+        expect(fixture.spawned).toBe(0)
+        await owner.recover()
+        adapter.dispose()
+        await vi.waitFor(() => expect(receiver.connections.size).toBe(1))
+        expect(await fixture.client.request('shutdownIfIdle', undefined)).toMatchObject({
+          retiring: true
+        })
+      } finally {
+        adapter.dispose()
+      }
+    }
+  )
+  it('matches a cancel for an attach-only request queued behind a hung create', async () => {
+    const create = fixture.client.request('createOrAttach', {
+      sessionId: 'shared-session',
+      cols: 80,
+      rows: 24
+    })
+    await fixture.spawnStarted
+    const abort = new AbortController()
+    const attach = fixture.client.request(
+      'createOrAttach',
+      { sessionId: 'shared-session', cols: 80, rows: 24, attachOnly: true },
+      30_000,
+      abort.signal
+    )
+    const daemon = fixture.server as unknown as {
+      preparations: { pending: Map<string, Set<{ canceled: boolean }>> }
+    }
+    // Attach-only preparations must remain registered so cancellation can find them.
+    await vi.waitFor(() => expect(daemon.preparations.pending.get('shared-session')?.size).toBe(2))
+
+    abort.abort()
+    await expect(attach).rejects.toThrow('client_disconnected')
+
+    fixture.releaseSpawn()
+    await expect(create).resolves.toMatchObject({ isNew: true })
+  })
+  it('does not cancel a sibling request for the same session id', async () => {
+    const first = fixture.client.request('createOrAttach', {
+      sessionId: 'shared-session',
+      cols: 80,
+      rows: 24
+    })
+    const abort = new AbortController()
+    const second = fixture.client.request(
+      'createOrAttach',
+      { sessionId: 'shared-session', cols: 80, rows: 24 },
+      30_000,
+      abort.signal
+    )
+    await fixture.spawnStarted
+    const daemon = fixture.server as unknown as DaemonServerInternals
+    await vi.waitFor(() => expect(daemon.preparations.pending.get('shared-session')?.size).toBe(2))
+
+    abort.abort()
+    await expect(second).rejects.toThrow('client_disconnected')
+    fixture.releaseSpawn()
+
+    await expect(first).resolves.toMatchObject({ isNew: true })
+    expect(fixture.subprocess.forceKill).not.toHaveBeenCalled()
+    await expect(fixture.client.request('listSessions', undefined)).resolves.toMatchObject({
+      sessions: [expect.objectContaining({ sessionId: 'shared-session' })]
+    })
+  })
+}
diff --git a/src/main/daemon/daemon-server-native-failure.test-fixture.ts b/src/main/daemon/daemon-server-native-failure.test-fixture.ts
new file mode 100644
index 000000000000..46e9f8c21c41
--- /dev/null
+++ b/src/main/daemon/daemon-server-native-failure.test-fixture.ts
@@ -0,0 +1,155 @@
+import './mock-descendant-sweep'
+import { join } from 'node:path'
+import { expect, it, vi } from 'vitest'
+import { createPtySubprocess } from './pty-subprocess'
+import { mockPtyProcess } from './pty-subprocess-test-harness'
+import { DaemonServer } from './daemon-server'
+import { getDaemonSocketPath } from './daemon-spawner'
+import type { DaemonCreationFailureFixture } from './daemon-server-creation-failure.test-fixture'
+export function registerDaemonNativeFailureTests(fixture: DaemonCreationFailureFixture) {
+  it.each(['ordinary', 'retained'] as const)(
+    '%s authenticated native throw releases its exact logical claim/cap before same-ID retry and delivery',
+    async (mode) => {
+      fixture.client.disconnect()
+      await fixture.server.shutdown()
+      fixture.server = new DaemonServer({
+        socketPath: getDaemonSocketPath(fixture.directory),
+        tokenPath: join(fixture.directory, 'daemon.token'),
+        spawnSubprocess: createPtySubprocess,
+        preparePtySpawn: async () => {},
+        ptySpawnHealthCheck: async () => {}
+      })
+      await fixture.server.start()
+      await fixture.client.ensureConnected()
+      const native = mockPtyProcess(999_999_999)
+      fixture.nativePty.spawn
+        .mockReset()
+        .mockImplementationOnce(() => {
+          throw new Error('exact native no-export failure')
+        })
+        .mockReturnValue(native)
+      const payload = {
+        sessionId: 'failed-native-ordinary',
+        cols: 80,
+        rows: 24,
+        cwd: fixture.directory,
+        agentSessionEnsure: {
+          claim: {
+            digestVersion: 1 as const,
+            keyId: 'key',
+            identityDigest: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+            worktreeScopeDigest: 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+            agent: 'codex' as const
+          },
+          surface: {
+            worktreeId: 'worktree',
+            tabId: 'tab',
+            leafId: '11111111-1111-4111-8111-111111111111',
+            terminalHandle: 'term_native'
+          }
+        }
+      }
+      try {
+        const events: unknown[] = []
+        const remove = fixture.client.onEvent((event) => events.push(event))
+        let requestId = ''
+        const prepared =
+          mode === 'retained'
+            ? await fixture.client.request<{ anchor: string; retention: string }>(
+                'createOrAttach',
+                {
+                  ...payload,
+                  switchExecution: { phase: 'prepare', invocationId: 'native-click' }
+                }
+              )
+            : undefined
+        if (prepared) {
+          expect(prepared.retention).toBe('creation-settlement-v1')
+        }
+        await expect(
+          fixture.client.request(
+            'createOrAttach',
+            {
+              ...payload,
+              ...(prepared
+                ? {
+                    switchExecution: {
+                      phase: 'commit',
+                      contract: 'creation-settlement-v1',
+                      invocationId: 'native-click',
+                      anchor: prepared.anchor,
+                      remainingMs: 60_000
+                    }
+                  }
+                : {})
+            },
+            undefined,
+            undefined,
+            (id) => {
+              requestId = id
+            }
+          )
+        ).rejects.toThrow('exact native no-export failure')
+        if (prepared) {
+          const identity = {
+            anchor: prepared.anchor,
+            invocationId: 'native-click',
+            endpoint: fixture.client.getDaemonIdentity()!
+          }
+          expect(
+            await fixture.client.request('cancelCreateOrAttach', {
+              sessionId: payload.sessionId,
+              requestId,
+              settlement: identity
+            })
+          ).toMatchObject({
+            retention: 'creation-settlement-v1',
+            settlement: { outcome: 'failed' }
+          })
+          expect(events).toEqual([])
+          expect(
+            await fixture.client.request('cancelCreateOrAttach', {
+              sessionId: payload.sessionId,
+              requestId,
+              release: { ...identity, outcome: 'exited' }
+            })
+          ).toMatchObject({ released: false })
+          expect(
+            await fixture.client.request('cancelCreateOrAttach', {
+              sessionId: payload.sessionId,
+              requestId: 'wrong-request',
+              release: { ...identity, outcome: 'failed' }
+            })
+          ).toMatchObject({ released: false })
+          expect(
+            await fixture.client.request('cancelCreateOrAttach', {
+              sessionId: payload.sessionId,
+              requestId,
+              release: { ...identity, outcome: 'failed' }
+            })
+          ).toMatchObject({ released: true })
+        }
+        remove()
+        await vi.waitFor(() =>
+          expect(fixture.server.automaticWork.gate.snapshot().terminals).toBe(0)
+        )
+        expect(fixture.server.host.listSessions()).toEqual([])
+        expect(await fixture.client.request('createOrAttach', payload)).toMatchObject({
+          isNew: true
+        })
+        expect(fixture.nativePty.spawn).toHaveBeenCalledTimes(2)
+        expect(fixture.server.automaticWork.gate.snapshot().terminals).toBe(1)
+        await fixture.client.request('write', {
+          sessionId: payload.sessionId,
+          data: 'new ordinary input'
+        })
+        expect(native.write).toHaveBeenCalledWith('new ordinary input')
+      } finally {
+        // External native exit reaches the actual owner; never signal a fixture PID.
+        native._simulateExit(0)
+        await fixture.server.host.dispose()
+      }
+      expect(fixture.server.automaticWork.gate.snapshot().terminals).toBe(0)
+    }
+  )
+}
diff --git a/src/main/daemon/daemon-server-request.ts b/src/main/daemon/daemon-server-request.ts
new file mode 100644
index 000000000000..e96a0f76bbcf
--- /dev/null
+++ b/src/main/daemon/daemon-server-request.ts
@@ -0,0 +1,41 @@
+import type { Socket } from 'node:net'
+import type { DaemonEndpointLifecycle } from './daemon-endpoint-lifecycle'
+import type { DaemonRequestRouter } from './daemon-request-router'
+import type { DaemonServerLifecycle } from './daemon-server-lifecycle'
+import type { DaemonAutomaticWorkGuard } from './daemon-automatic-work-guard'
+import { answerAutomaticWorkRequest } from './daemon-automatic-work-protocol'
+import { NOTIFY_PREFIX, type DaemonRequest } from './types'
+import { encodeNdjson } from './ndjson'
+export async function handleDaemonRequest(
+  options: {
+    automaticWork: DaemonAutomaticWorkGuard
+    endpoint: DaemonEndpointLifecycle
+    requestRouter: DaemonRequestRouter
+    lifecycle: DaemonServerLifecycle
+  },
+  socket: Socket,
+  clientId: string,
+  request: DaemonRequest
+): Promise<void> {
+  const isNotify = request.id.startsWith(NOTIFY_PREFIX)
+  try {
+    const result =
+      answerAutomaticWorkRequest(request, options.automaticWork, options.endpoint) ??
+      (await options.requestRouter.route(clientId, request))
+    if (!isNotify) {
+      socket.write(encodeNdjson({ id: request.id, ok: true, payload: result }), () => {
+        options.lifecycle.startPendingShutdownReply(clientId, request.id)
+      })
+    }
+  } catch (error) {
+    if (!isNotify) {
+      socket.write(
+        encodeNdjson({
+          id: request.id,
+          ok: false,
+          error: error instanceof Error ? error.message : String(error)
+        })
+      )
+    }
+  }
+}
diff --git a/src/main/daemon/daemon-server.ts b/src/main/daemon/daemon-server.ts
index 67a263d86b02..edfec399c08e 100644
--- a/src/main/daemon/daemon-server.ts
+++ b/src/main/daemon/daemon-server.ts
@@ -1,3 +1,4 @@
+import { handleDaemonRequest } from './daemon-server-request'
 import { randomUUID } from 'node:crypto'
 import type { Socket } from 'node:net'
 import { setImmediate as waitForImmediate } from 'node:timers/promises'
@@ -22,15 +23,7 @@ import { checkPtySpawnHealth } from './pty-subprocess'
 import { TerminalHistorySeedTransferRegistry } from './terminal-history-seed-transfer-registry'
 import { TerminalHost } from './terminal-host'
 import { DaemonAutomaticWorkGuard } from './daemon-automatic-work-guard'
-import { answerAutomaticWorkRequest } from './daemon-automatic-work-protocol'
-import {
-  CLEAN_DISCONNECT_PROTOCOL_VERSION,
-  NOTIFY_PREFIX,
-  PROTOCOL_VERSION,
-  type DaemonRequest
-} from './types'
-import { encodeNdjson } from './ndjson'
-
+import { CLEAN_DISCONNECT_PROTOCOL_VERSION, PROTOCOL_VERSION, type DaemonRequest } from './types'
 export class DaemonServer {
   private static readonly INITIAL_ADOPTION_TIMEOUT_MS = 2 * 60 * 1000
 
@@ -254,7 +247,11 @@ export class DaemonServer {
   }
 
   private isIdle(): boolean {
-    if (this.admission.inFlight > 0 || this.host.hasLiveSessions()) {
+    if (
+      this.admission.inFlight > 0 ||
+      this.host.hasLiveSessions() ||
+      this.preparations.hasOwedOutcomes()
+    ) {
       return false
     }
     if (this.endpoint.lost) {
@@ -284,31 +281,17 @@ export class DaemonServer {
     this.connections.dispose()
   }
 
-  private async handleRequest(
-    socket: Socket,
-    clientId: string,
-    request: DaemonRequest
-  ): Promise<void> {
-    const isNotify = request.id.startsWith(NOTIFY_PREFIX)
-    try {
-      const result =
-        answerAutomaticWorkRequest(request, this.automaticWork, this.endpoint) ??
-        (await this.requestRouter.route(clientId, request))
-      if (!isNotify) {
-        socket.write(encodeNdjson({ id: request.id, ok: true, payload: result }), () => {
-          this.lifecycle.startPendingShutdownReply(clientId, request.id)
-        })
-      }
-    } catch (error) {
-      if (!isNotify) {
-        socket.write(
-          encodeNdjson({
-            id: request.id,
-            ok: false,
-            error: error instanceof Error ? error.message : String(error)
-          })
-        )
-      }
-    }
+  private handleRequest(socket: Socket, clientId: string, request: DaemonRequest): Promise<void> {
+    return handleDaemonRequest(
+      {
+        automaticWork: this.automaticWork,
+        endpoint: this.endpoint,
+        requestRouter: this.requestRouter,
+        lifecycle: this.lifecycle
+      },
+      socket,
+      clientId,
+      request
+    )
   }
 }
diff --git a/src/main/daemon/daemon-terminal-admission.ts b/src/main/daemon/daemon-terminal-admission.ts
index cb3fceec0130..10c067f69328 100644
--- a/src/main/daemon/daemon-terminal-admission.ts
+++ b/src/main/daemon/daemon-terminal-admission.ts
@@ -1,3 +1,5 @@
+import { createAdmissionStreamClient } from './daemon-terminal-stream-client'
+import type { PtyCreationDisposition } from '../../shared/claimed-agent-pty-owner'
 import { performance } from 'node:perf_hooks'
 import type { BackgroundTransientFactRelay } from './daemon-background-transient-facts'
 import type { DaemonClientConnections } from './daemon-client-connections'
@@ -9,10 +11,9 @@ import type {
   PendingPtySpawnPreparation
 } from './daemon-pty-spawn-preparations'
 import type { DaemonSessionAttachments } from './daemon-session-attachments'
-import { recordDaemonStreamBacklogEvent } from './daemon-stream-backlog-probe'
 import type { DaemonStreamDataBatcher } from './daemon-stream-data-batcher'
 import type { TerminalHistorySeedTransferRegistry } from './terminal-history-seed-transfer-registry'
-import type { CreateOrAttachOptions, CreateOrAttachResult, TerminalHost } from './terminal-host'
+import type { CreateOrAttachResult, TerminalHost } from './terminal-host'
 import { isTuiAgent } from '../../shared/tui-agent-config'
 import { isSpawnIntent } from '../../shared/host-spawn-admission'
 import { parsePtyStartupIngressIntent } from '../../shared/pty-startup-ingress'
@@ -21,7 +22,6 @@ import {
   isAgentSessionSurfaceBinding
 } from '../../shared/agent-session-host-authority'
 import { type DaemonRequest, TerminalAttachCanceledError } from './types'
-
 type CreateOrAttachRequest = Extract<DaemonRequest, { type: 'createOrAttach' }>
 
 const MAX_SPAWN_ADMISSION_WINDOW_MS = 12_000
@@ -35,7 +35,7 @@ function resolveSpawnAdmissionDeadline(cancelAfterMs: unknown): number {
   return Date.now() + windowMs
 }
 
-type DaemonTerminalAdmissionOptions = {
+export type DaemonTerminalAdmissionOptions = {
   host: TerminalHost
   connections: DaemonClientConnections
   endpoint: DaemonEndpointLifecycle
@@ -51,8 +51,6 @@ type DaemonTerminalAdmissionOptions = {
 }
 
 export class DaemonTerminalAdmission {
-  private static readonly INTERACTIVE_OUTPUT_WINDOW_MS = 100
-  private static readonly INTERACTIVE_OUTPUT_MAX_CHARS = 1024
   private createOrAttachInFlight = 0
 
   constructor(private readonly options: DaemonTerminalAdmissionOptions) {}
@@ -89,6 +87,9 @@ export class DaemonTerminalAdmission {
     let routedSessionId = payload.sessionId
     let result: CreateOrAttachResult
     let spawnPreparation: PendingPtySpawnPreparation | null = null
+    let hostDisposition: PtyCreationDisposition = {
+      kind: 'no-fork'
+    }
     try {
       if (
         payload.agentSessionEnsure !== undefined &&
@@ -122,6 +123,7 @@ export class DaemonTerminalAdmission {
           : payload.historySeed !== undefined
             ? [payload.historySeed]
             : undefined
+      hostDisposition = { kind: 'unknown' }
       result = await this.options.host.createOrAttach({
         sessionId: payload.sessionId,
         cols: payload.cols,
@@ -150,17 +152,68 @@ export class DaemonTerminalAdmission {
           deadlineAt: resolveSpawnAdmissionDeadline(payload.cancelAfterMs)
         },
         retainCanceledChild: Boolean(payload.switchExecution),
+        onCreationDisposition: (disposition) => {
+          hostDisposition = disposition
+        },
         isCanceled: () =>
           spawnPreparation !== null && this.options.preparations.isCanceled(spawnPreparation),
         cancelSignal: spawnPreparation.controller.signal,
         onSessionResolved: (sessionId) => {
           routedSessionId = sessionId
         },
-        streamClient: this.createStreamClient(clientId, () => routedSessionId)
+        streamClient: createAdmissionStreamClient(this.options, clientId, () => routedSessionId)
       })
+      if (spawnPreparation.settlement) {
+        const { attachToken: _attachToken, ...wireResult } = result
+        spawnPreparation.settlement.result = wireResult
+        const sessionId = result.agentSessionEnsure?.owner.ptyId ?? payload.sessionId
+        const anchor = spawnPreparation.switchAnchor
+        if (result.isNew && result.switchCleanupWitness && anchor) {
+          const token = result.switchCleanupWitness
+          spawnPreparation.settlement.reconcile = async () => {
+            const close = this.options.host.beginFencedTermination({
+              id: sessionId,
+              expectedIncarnationId: result.incarnationId,
+              requireNoAgentOwner: !result.agentSessionEnsure,
+              requireUnattached: true,
+              switchCondition: {
+                token,
+                remainingMs: Math.max(0, anchor.deadline - performance.now()),
+                ownedSpawn: true,
+                ...(result.agentSessionEnsure
+                  ? { claimGeneration: result.agentSessionEnsure.owner.generation }
+                  : {})
+              }
+            })
+            if (close.accepted) {
+              await close.completion
+            }
+          }
+        }
+      }
     } finally {
       if (spawnPreparation) {
-        this.options.preparations.finish(payload.sessionId, spawnPreparation)
+        const preparation = spawnPreparation
+        const settlement = preparation.settlement
+        if (settlement) {
+          if (hostDisposition.kind === 'unknown' && settlement.result) {
+            settlement.result.switchOutcomeUnknown = true
+            result!.switchOutcomeUnknown = true
+          }
+          settlement.noChild = hostDisposition.kind === 'no-fork'
+          if (!settlement.result && hostDisposition.kind !== 'no-fork') {
+            settlement.reconcile = hostDisposition.recover
+          }
+          if (hostDisposition.kind === 'physical' || hostDisposition.kind === 'failed') {
+            this.options.preparations.trackPhysical(
+              payload.sessionId,
+              preparation,
+              hostDisposition.completion,
+              hostDisposition.kind === 'physical' ? hostDisposition.exitCode : undefined
+            )
+          }
+        }
+        this.options.preparations.finish(payload.sessionId, preparation)
       }
       this.createOrAttachInFlight--
       this.options.reevaluateIdleShutdown()
@@ -216,60 +269,4 @@ export class DaemonTerminalAdmission {
       ...(result.inputClosed ? { inputClosed: true as const } : {})
     }
   }
-
-  private createStreamClient(
-    clientId: string,
-    sessionId: () => string
-  ): CreateOrAttachOptions['streamClient'] {
-    return {
-      onData: (data, rawLength = data.length, transformed = false, seq) => {
-        const routedSessionId = sessionId()
-        this.options.transientFactRelay.onSessionData(routedSessionId, data)
-        const lastInputAt = this.options.attachments.lastInputAt(routedSessionId)
-        const isInteractiveOutput =
-          data.length <= DaemonTerminalAdmission.INTERACTIVE_OUTPUT_MAX_CHARS &&
-          lastInputAt !== undefined &&
-          performance.now() - lastInputAt <= DaemonTerminalAdmission.INTERACTIVE_OUTPUT_WINDOW_MS
-        this.options.streamDataBatcher.enqueue(clientId, routedSessionId, data, {
-          flushImmediately: isInteractiveOutput,
-          flushMaxChars: DaemonTerminalAdmission.INTERACTIVE_OUTPUT_MAX_CHARS,
-          rawLength,
-          transformed,
-          seq
-        })
-      },
-      onInputClosed: (incarnationId) => {
-        const routedSessionId = sessionId()
-        this.options.streamDataBatcher.enqueueControlEvent(clientId, routedSessionId, {
-          type: 'event',
-          event: 'inputClosed',
-          sessionId: routedSessionId,
-          payload: { incarnationId }
-        })
-        this.options.streamDataBatcher.flush(clientId)
-      },
-      onExit: (code, incarnationId, cause) => {
-        const routedSessionId = sessionId()
-        this.options.log.log('session-exited', {
-          sessionId: routedSessionId,
-          code,
-          cause: cause?.kind
-        })
-        this.options.streamDataBatcher.enqueueControlEvent(clientId, routedSessionId, {
-          type: 'event',
-          event: 'exit',
-          sessionId: routedSessionId,
-          payload: { code, incarnationId, ...(cause ? { cause } : {}) }
-        })
-        this.options.streamDataBatcher.flush(clientId)
-        recordDaemonStreamBacklogEvent('sessionExit', {
-          sessionIdSuffix: routedSessionId.slice(-10)
-        })
-        this.options.transientFactRelay.onSessionExit(routedSessionId)
-        this.options.streamDataBatcher.refreshSessionDroppability(routedSessionId)
-        this.options.attachments.release(routedSessionId)
-        this.options.reevaluateIdleShutdown()
-      }
-    }
-  }
 }
diff --git a/src/main/daemon/daemon-terminal-stream-client.ts b/src/main/daemon/daemon-terminal-stream-client.ts
new file mode 100644
index 000000000000..90b30966d6a0
--- /dev/null
+++ b/src/main/daemon/daemon-terminal-stream-client.ts
@@ -0,0 +1,62 @@
+import { performance } from 'node:perf_hooks'
+import { recordDaemonStreamBacklogEvent } from './daemon-stream-backlog-probe'
+import type { CreateOrAttachOptions } from './terminal-host'
+import type { DaemonTerminalAdmissionOptions } from './daemon-terminal-admission'
+const INTERACTIVE_OUTPUT_WINDOW_MS = 100
+const INTERACTIVE_OUTPUT_MAX_CHARS = 1024
+export function createAdmissionStreamClient(
+  options: DaemonTerminalAdmissionOptions,
+  clientId: string,
+  sessionId: () => string
+): CreateOrAttachOptions['streamClient'] {
+  return {
+    onData: (data, rawLength = data.length, transformed = false, seq) => {
+      const routedSessionId = sessionId()
+      options.transientFactRelay.onSessionData(routedSessionId, data)
+      const lastInputAt = options.attachments.lastInputAt(routedSessionId)
+      const isInteractiveOutput =
+        data.length <= INTERACTIVE_OUTPUT_MAX_CHARS &&
+        lastInputAt !== undefined &&
+        performance.now() - lastInputAt <= INTERACTIVE_OUTPUT_WINDOW_MS
+      options.streamDataBatcher.enqueue(clientId, routedSessionId, data, {
+        flushImmediately: isInteractiveOutput,
+        flushMaxChars: INTERACTIVE_OUTPUT_MAX_CHARS,
+        rawLength,
+        transformed,
+        seq
+      })
+    },
+    onInputClosed: (incarnationId) => {
+      const routedSessionId = sessionId()
+      options.streamDataBatcher.enqueueControlEvent(clientId, routedSessionId, {
+        type: 'event',
+        event: 'inputClosed',
+        sessionId: routedSessionId,
+        payload: { incarnationId }
+      })
+      options.streamDataBatcher.flush(clientId)
+    },
+    onExit: (code, incarnationId, cause) => {
+      const routedSessionId = sessionId()
+      options.log.log('session-exited', {
+        sessionId: routedSessionId,
+        code,
+        cause: cause?.kind
+      })
+      options.streamDataBatcher.enqueueControlEvent(clientId, routedSessionId, {
+        type: 'event',
+        event: 'exit',
+        sessionId: routedSessionId,
+        payload: { code, incarnationId, ...(cause ? { cause } : {}) }
+      })
+      options.streamDataBatcher.flush(clientId)
+      recordDaemonStreamBacklogEvent('sessionExit', {
+        sessionIdSuffix: routedSessionId.slice(-10)
+      })
+      options.transientFactRelay.onSessionExit(routedSessionId)
+      options.streamDataBatcher.refreshSessionDroppability(routedSessionId)
+      options.attachments.release(routedSessionId)
+      options.reevaluateIdleShutdown()
+    }
+  }
+}
diff --git a/src/main/daemon/pty-subprocess.ts b/src/main/daemon/pty-subprocess.ts
index 756f64af8b2d..2280934b5c37 100644
--- a/src/main/daemon/pty-subprocess.ts
+++ b/src/main/daemon/pty-subprocess.ts
@@ -1,3 +1,5 @@
+import type { PtyCreationDisposition } from '../../shared/claimed-agent-pty-owner'
+import { TerminalCreationWork } from './terminal-creation-work'
 import type { SubprocessHandle } from './session-subprocess-handle'
 import { normalizePtySize } from './daemon-pty-size'
 import { TerminalAttachCanceledError } from './daemon-errors'
@@ -31,6 +33,7 @@ export type PtySubprocessOptions = {
   terminalShellArgs?: string[]
   terminalWindowsWslDistro?: string | null
   terminalWindowsPowerShellImplementation?: 'auto' | 'powershell.exe' | 'pwsh.exe'
+  onCreationDisposition?: (disposition: PtyCreationDisposition) => void
   assertCreateAllowed?: () => void
   retainCanceledChild?: boolean
   isCanceled?: () => boolean
@@ -63,61 +66,69 @@ export async function checkPtySpawnHealth(): Promise<void> {
 
 /** Plan first so validation uses the host or WSL cwd that spawn will actually use. */
 export async function createPtySubprocess(opts: PtySubprocessOptions): Promise<SubprocessHandle> {
-  const size = normalizePtySize(opts.cols, opts.rows)
-  const env = createDaemonPtyEnvironment(opts)
-  const launch = createPtyShellLaunchPlan(opts, env)
-
-  await preflightPtySpawn({
-    validationCwd: launch.validationCwd,
-    cwdWasExplicit: opts.cwd !== undefined,
-    sessionId: opts.sessionId,
-    ...(opts.cancelSignal ? { signal: opts.cancelSignal } : {})
-  })
-  if (opts.isCanceled?.()) {
-    throw new TerminalAttachCanceledError(opts.sessionId)
-  }
-
-  let spawned: SpawnedDaemonPty
+  const work = new TerminalCreationWork()
   try {
-    spawned = await spawnNativeDaemonPty({
-      assertCreateAllowed: opts.assertCreateAllowed,
-      retainCanceledChild: opts.retainCanceledChild,
-      shellPath: launch.shellPath,
-      shellArgs: launch.shellArgs,
-      spawnCwd: launch.spawnCwd,
-      env,
-      cols: size.cols,
-      rows: size.rows,
-      windowsFallbackAttempts: launch.windowsFallbackAttempts,
-      // User-configured shell args can carry a command (`pwsh -Command ...`); never respawn those.
-      primaryArgsRespawnSafe:
-        !launch.startupCommandDeliveredInShellArgs && !opts.terminalShellArgs?.length,
-      onMacosTccSpawnStrategy: opts.onMacosTccSpawnStrategy,
+    const size = normalizePtySize(opts.cols, opts.rows)
+    const env = createDaemonPtyEnvironment(opts)
+    const launch = createPtyShellLaunchPlan(opts, env)
+
+    await preflightPtySpawn({
+      validationCwd: launch.validationCwd,
+      cwdWasExplicit: opts.cwd !== undefined,
+      sessionId: opts.sessionId,
       ...(opts.cancelSignal ? { signal: opts.cancelSignal } : {})
     })
-  } catch (error) {
-    // A cancel that lands while ConPTY's startup is awaited is a cancel, not a spawn failure.
-    if (opts.cancelSignal?.aborted) {
+    if (opts.isCanceled?.()) {
       throw new TerminalAttachCanceledError(opts.sessionId)
     }
-    if (process.platform === 'win32') {
-      throw formatPtySpawnError(error, launch.shellPath, launch.spawnCwd)
+
+    let spawned: SpawnedDaemonPty
+    try {
+      spawned = await spawnNativeDaemonPty({
+        creationWork: work,
+        assertCreateAllowed: opts.assertCreateAllowed,
+        retainCanceledChild: opts.retainCanceledChild,
+        shellPath: launch.shellPath,
+        shellArgs: launch.shellArgs,
+        spawnCwd: launch.spawnCwd,
+        env,
+        cols: size.cols,
+        rows: size.rows,
+        windowsFallbackAttempts: launch.windowsFallbackAttempts,
+        // User-configured shell args can carry a command (`pwsh -Command ...`); never respawn those.
+        primaryArgsRespawnSafe:
+          !launch.startupCommandDeliveredInShellArgs && !opts.terminalShellArgs?.length,
+        onMacosTccSpawnStrategy: opts.onMacosTccSpawnStrategy,
+        ...(opts.cancelSignal ? { signal: opts.cancelSignal } : {})
+      })
+    } catch (error) {
+      // A cancel that lands while ConPTY's startup is awaited is a cancel, not a spawn failure.
+      if (opts.cancelSignal?.aborted) {
+        throw new TerminalAttachCanceledError(opts.sessionId)
+      }
+      if (process.platform === 'win32') {
+        throw formatPtySpawnError(error, launch.shellPath, launch.spawnCwd)
+      }
+      throw error
     }
-    throw error
-  }
 
-  return createDaemonPtySubprocessHandle({
-    process: spawned.process,
-    shellPath: spawned.shellPath,
-    spawnCwd: spawned.spawnCwd,
-    env,
-    startupCommandDeliveredInShellArgs:
-      spawned.startupCommandDeliveredInShellArgs ?? launch.startupCommandDeliveredInShellArgs,
-    reportsChildExitStatus: spawned.reportsChildExitStatus,
-    requestedCwd: opts.cwd,
-    sessionId: opts.sessionId,
-    startupAgentRecognition: launch.startupAgentRecognition,
-    // Claimed here, synchronously with the handle's own subscription, so no event falls between.
-    ...(spawned.claimStartupEvents ? { startupEvents: spawned.claimStartupEvents() } : {})
-  })
+    return createDaemonPtySubprocessHandle({
+      process: spawned.process,
+      physicalOwner: spawned.physicalOwner,
+      shellPath: spawned.shellPath,
+      spawnCwd: spawned.spawnCwd,
+      env,
+      startupCommandDeliveredInShellArgs:
+        spawned.startupCommandDeliveredInShellArgs ?? launch.startupCommandDeliveredInShellArgs,
+      reportsChildExitStatus: spawned.reportsChildExitStatus,
+      requestedCwd: opts.cwd,
+      sessionId: opts.sessionId,
+      startupAgentRecognition: launch.startupAgentRecognition,
+      // Claimed here, synchronously with the handle's own subscription, so no event falls between.
+      ...(spawned.claimStartupEvents ? { startupEvents: spawned.claimStartupEvents() } : {})
+    })
+  } finally {
+    await work.finish()
+    opts.onCreationDisposition?.(await work.completion)
+  }
 }
diff --git a/src/main/daemon/pty-subprocess/daemon-pty-physical-owner.ts b/src/main/daemon/pty-subprocess/daemon-pty-physical-owner.ts
new file mode 100644
index 000000000000..8e5b3dec4b5f
--- /dev/null
+++ b/src/main/daemon/pty-subprocess/daemon-pty-physical-owner.ts
@@ -0,0 +1,118 @@
+import type { DisposableNativePty } from './native-pty-spawn'
+import type * as pty from 'node-pty'
+import { forceKillPosixPtyProcessGroups } from '../../pty/posix-pty-process-groups'
+import { PendingPtyGroupSweep } from '../../pty/pending-pty-group-sweep'
+import { terminatePtyJob } from '../../windows/windows-pty-job'
+import { SessionTerminationController } from '../session-termination-controller'
+import { shutdownOwnedTerminalProcess } from '../terminal-host-session-shutdown'
+export function createDaemonPtyPhysicalOwner(proc: pty.IPty) {
+  const nativeProc: DisposableNativePty = proc
+  let exited = false
+  let code: number | null = null
+  let disposed = false
+  let nodePtyKillIssued = false
+  const groupSweep = new PendingPtyGroupSweep()
+  const killRoot = (): void => {
+    process.kill(proc.pid, 'SIGKILL')
+  }
+  const fallBackToNodePtyKill = (signalError: unknown): void => {
+    try {
+      proc.kill()
+      nodePtyKillIssued = true
+    } catch {
+      nodePtyKillIssued = false
+      throw signalError
+    }
+  }
+  const forceKillPosix = async (): Promise<void> => {
+    if (exited) {
+      return
+    }
+    // A reaped root frees its pid and TTY for reuse, so a table read that outlives it signals nothing.
+    await groupSweep.track(
+      forceKillPosixPtyProcessGroups(proc.pid, killRoot, { ownsRoot: () => !exited }).catch(
+        fallBackToNodePtyKill
+      )
+    )
+  }
+  // Stays synchronous: dispose() reads nodePtyKillIssued right after to avoid double-closing ConPTY.
+  const forceKillConpty = (): void => {
+    if (exited) {
+      return
+    }
+    // Escalate a ConPTY kill through the job without double-closing node-pty's shell handle.
+    if (nodePtyKillIssued) {
+      terminatePtyJob(proc)
+      return
+    }
+    try {
+      killRoot()
+    } catch (signalError) {
+      fallBackToNodePtyKill(signalError)
+    }
+  }
+
+  const kill = (): void => {
+    if (exited) {
+      return
+    }
+    nodePtyKillIssued = true
+    try {
+      proc.kill()
+    } catch (error) {
+      nodePtyKillIssued = false
+      throw error
+    }
+  }
+  const forceKill = () => (process.platform === 'win32' ? forceKillConpty() : forceKillPosix())
+  const dispose = (): void => {
+    if (disposed) {
+      return
+    }
+    disposed = true
+    const destroy = (): void => {
+      try {
+        nativeProc.destroy?.()
+      } catch {}
+    }
+    if (process.platform !== 'win32') {
+      nativeProc.kill = () => {}
+    } else if (nodePtyKillIssued) {
+      return
+    }
+    groupSweep.afterSettled(destroy)
+  }
+  const termination = new SessionTerminationController({
+    sessionId: String(proc.pid),
+    subprocess: { kill, forceKill, signal: (signal) => proc.kill(signal), dispose },
+    isExited: () => exited,
+    releaseProducerPause: ({ resume }) => {
+      if (resume) {
+        proc.resume()
+      }
+    }
+  })
+  proc.onExit(({ exitCode }) => {
+    exited = true
+    code = exitCode
+    termination.markPhysicalExit()
+  })
+  return {
+    completion: termination.physicalCompletion,
+    exitCode: () => code,
+    hasExited: () => exited,
+    kill,
+    forceKill,
+    dispose,
+    recover: () =>
+      shutdownOwnedTerminalProcess({
+        pid: proc.pid,
+        isAlive: () => !exited,
+        terminateOwnedTree: () => terminatePtyJob(proc),
+        close: async () => {
+          await termination.forceKillAndWaitForExit()
+          dispose()
+        }
+      })
+  }
+}
diff --git a/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts b/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts
index 7c2b357d9946..e71e25aa04fc 100644
--- a/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts
+++ b/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts
@@ -1,5 +1,6 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { spawnNativeDaemonPty } from './native-pty-spawn'
+import { TerminalCreationWork } from '../terminal-creation-work'
 import {
   _resetConptyStartupTrustForTest,
   CONPTY_NO_INPUT_READER_NOTICE,
@@ -42,7 +43,13 @@ function fakePane(pid: number, chunks: string[], exitCode?: number) {
   const pane = {
     pid,
     kill: vi.fn(),
+    resume: vi.fn(),
     write: vi.fn(),
+    exit: (code: number) => {
+      for (const listener of exitListeners) {
+        listener({ exitCode: code })
+      }
+    },
     onData: (listener: (data: string) => void) => {
       dataListeners.add(listener)
       return { dispose: () => dataListeners.delete(listener) }
@@ -88,8 +95,10 @@ describe('Windows shell fallback over node-pty ConPTY', () => {
 
   it('checks operation authority after loading the native module, before physical spawn', async () => {
     let allowed = true
+    const creationWork = new TerminalCreationWork()
     const starting = spawnNativeDaemonPty({
       ...args,
+      creationWork,
       assertCreateAllowed: () => {
         if (!allowed) {
           throw new Error('expired')
@@ -99,6 +108,8 @@ describe('Windows shell fallback over node-pty ConPTY', () => {
     allowed = false
     await expect(starting).rejects.toThrow('expired')
     expect(nodePty.spawn).not.toHaveBeenCalled()
+    await creationWork.finish()
+    expect(await creationWork.completion).toEqual({ kind: 'no-fork' })
   })
 
   it('does not dispatch a fallback shell after the operation loses authority', async () => {
@@ -120,6 +131,68 @@ describe('Windows shell fallback over node-pty ConPTY', () => {
     expect(nodePty.spawn).toHaveBeenCalledOnce()
   })
 
+  it('settles exact no-export native failure without trying another switch shell', async () => {
+    const creationWork = new TerminalCreationWork()
+    nodePty.spawn.mockImplementation(() => {
+      throw new Error('opaque native dispatch failure')
+    })
+    await expect(
+      spawnNativeDaemonPty({ ...args, creationWork, retainCanceledChild: true })
+    ).rejects.toThrow('opaque native dispatch failure')
+    await creationWork.finish()
+    expect(await creationWork.completion).toMatchObject({ kind: 'failed' })
+    expect(nodePty.spawn).toHaveBeenCalledOnce()
+  })
+
+  it.each(['physical', 'exited', 'unknown'] as const)(
+    'keeps every %s predecessor when a later native invocation fails',
+    async (predecessor) => {
+      const creationWork = new TerminalCreationWork()
+      const pane = healthyPane(999_999_999)
+      if (predecessor === 'unknown') {
+        pane.onExit = () => {
+          throw new Error('external listener failure')
+        }
+      }
+      nodePty.spawn.mockReturnValueOnce(pane)
+      await (predecessor !== 'unknown'
+        ? spawnNativeDaemonPty({ ...args, creationWork })
+        : expect(
+            spawnNativeDaemonPty({ ...args, windowsFallbackAttempts: [attempts[0]!], creationWork })
+          ).rejects.toThrow('external listener failure'))
+      if (predecessor === 'exited') {
+        pane.exit(0)
+      }
+      nodePty.spawn.mockImplementation(() => {
+        throw new Error('later no-export failure')
+      })
+      await expect(
+        spawnNativeDaemonPty({ ...args, creationWork, retainCanceledChild: true })
+      ).rejects.toThrow('later no-export failure')
+      await creationWork.finish()
+      const disposition = await creationWork.completion
+      if (predecessor === 'unknown') {
+        expect(disposition.kind).toBe('unknown')
+        return
+      }
+      if (disposition.kind !== 'failed') {
+        throw new Error('failed aggregate was collapsed')
+      }
+      let completed = false
+      void disposition.completion.then(() => {
+        completed = true
+      })
+      await Promise.resolve()
+      if (predecessor === 'physical') {
+        expect(completed).toBe(false)
+      }
+      expect(disposition.recover).toBeTypeOf('function')
+      pane.exit(0)
+      await disposition.completion
+      expect((await creationWork.completion).kind).toBe('failed')
+    }
+  )
+
   it('keeps a WSL pane out of a distro the internal allowlist excludes, falling back past it', async () => {
     vi.stubEnv('ORCA_INTERNAL_WSL_DISTRO_ALLOWLIST', 'orca-test-a')
     try {
@@ -163,7 +236,12 @@ describe('Windows shell fallback over node-pty ConPTY', () => {
       }
       return proc
     })
-    const result = await spawnNativeDaemonPty(args)
+    const creationWork = new TerminalCreationWork()
+    const result = await spawnNativeDaemonPty({ ...args, creationWork })
+    await creationWork.finish()
+    // Ordinary fallback keeps the actual returned owner and earlier failed physical-unknown fact.
+    expect(await creationWork.completion).toMatchObject({ kind: 'failed' })
+    proc.exit(0)
     expect(nodePty.spawn.mock.calls.map(([file]) => file)).toEqual([
       'pwsh.exe',
       'powershell.exe',
@@ -179,9 +257,23 @@ describe('Windows shell fallback over node-pty ConPTY', () => {
     // Measured on CI: such a pane prints its banner and prompt, then ignores every keystroke.
     const broken = fakePane(990001, ['Microsoft Windows [Version 10.0.20348]\r\n'])
     const healthy = fakePane(990002, ['\x1b[1t', '\x1b[c\x1b[?1004h', 'Microsoft Windows'])
+    broken.kill.mockImplementation(() => broken.exit(137))
     nodePty.spawn.mockReturnValueOnce(broken).mockReturnValueOnce(healthy)
-
-    const result = await spawnNativeDaemonPty(args)
+    const creationWork = new TerminalCreationWork()
+    const result = await spawnNativeDaemonPty({ ...args, creationWork, retainCanceledChild: true })
+    await creationWork.finish()
+    const disposition = await creationWork.completion
+    if (disposition.kind !== 'physical') {
+      throw new Error('native attempts lost their owners')
+    }
+    let completed = false
+    void disposition.completion.then(() => {
+      completed = true
+    })
+    await Promise.resolve()
+    expect(completed).toBe(false)
+    healthy.exit(0)
+    await disposition.completion
 
     expect(nodePty.spawn.mock.calls.map(([file]) => file)).toEqual(['pwsh.exe', 'pwsh.exe'])
     expect(ptyJob.terminatePtyJob).toHaveBeenCalledWith(broken)
@@ -193,6 +285,27 @@ describe('Windows shell fallback over node-pty ConPTY', () => {
     expect(result.claimStartupEvents?.().data).toEqual(['\x1b[1t\x1b[?1004h'])
   })
 
+  it('keeps failed after a retained ConPTY predecessor really exits before the native retry throws', async () => {
+    const creationWork = new TerminalCreationWork()
+    const broken = deadPane(999_999_999)
+    broken.kill.mockImplementation(() => broken.exit(137))
+    nodePty.spawn.mockReturnValueOnce(broken).mockImplementationOnce(() => {
+      throw new Error('retry exported no handle')
+    })
+    await expect(
+      spawnNativeDaemonPty({ ...args, creationWork, retainCanceledChild: true })
+    ).rejects.toThrow('retry exported no handle')
+    await creationWork.finish()
+    const disposition = await creationWork.completion
+    if (disposition.kind !== 'failed') {
+      throw new Error('failed retry was collapsed into exit')
+    }
+    await disposition.completion
+    expect(nodePty.spawn.mock.calls.map(([file]) => file)).toEqual(['pwsh.exe', 'pwsh.exe'])
+    expect(broken.kill).toHaveBeenCalledOnce()
+    expect(broken.write).not.toHaveBeenCalled()
+  })
+
   it('respawns only once, then says so in the pane', async () => {
     nodePty.spawn.mockReturnValueOnce(healthyPane(990001))
     await spawnNativeDaemonPty(args)
diff --git a/src/main/daemon/pty-subprocess/native-pty-spawn.ts b/src/main/daemon/pty-subprocess/native-pty-spawn.ts
index 7d7d6de848e7..1c7d6b1a99ce 100644
--- a/src/main/daemon/pty-subprocess/native-pty-spawn.ts
+++ b/src/main/daemon/pty-subprocess/native-pty-spawn.ts
@@ -1,3 +1,6 @@
+import type { PtyCreationDisposition } from '../../../shared/claimed-agent-pty-owner'
+import type { TerminalCreationWork } from '../terminal-creation-work'
+import { createDaemonPtyPhysicalOwner, type DaemonPtyPhysicalOwner } from './subprocess-handle'
 import { assertWslDistroAllowed } from '@orca/process-host/wsl-distro-allowlist'
 import type * as pty from 'node-pty'
 import {
@@ -24,6 +27,7 @@ export type DisposableNativePty = pty.IPty & {
 
 export type SpawnedDaemonPty = {
   process: pty.IPty
+  physicalOwner?: DaemonPtyPhysicalOwner
   shellPath: string
   spawnCwd: string
   startupCommandDeliveredInShellArgs?: boolean
@@ -36,6 +40,7 @@ export type SpawnedDaemonPty = {
 type SpawnedNativePty = { proc: pty.IPty; claimStartupEvents?: () => ConptyStartupEvents }
 
 export async function spawnNativeDaemonPty(args: {
+  creationWork?: TerminalCreationWork
   shellPath: string
   shellArgs: string[]
   spawnCwd: string
@@ -51,6 +56,8 @@ export async function spawnNativeDaemonPty(args: {
   onMacosTccSpawnStrategy?: (strategy: 'wrapped' | 'direct') => void
 }): Promise<SpawnedDaemonPty> {
   let reportsChildExitStatus = true
+  let lastAttempt: Promise<PtyCreationDisposition> | undefined
+  const physicalOwners = new WeakMap<pty.IPty, DaemonPtyPhysicalOwner>()
   const spawnOnce = async (
     shellPath: string,
     shellArgs: string[],
@@ -67,17 +74,43 @@ export async function spawnNativeDaemonPty(args: {
     }
     args.signal?.throwIfAborted()
     args.assertCreateAllowed?.()
-    const proc = nodePty.spawn(wrapped.file, wrapped.args, {
-      name: args.env.TERM ?? 'xterm-256color',
-      cols: args.cols,
-      rows: args.rows,
-      cwd,
-      env: wrapped.env,
-      // Bundled ConPTY provides the wrap-marker behavior xterm expects.
-      ...(process.platform === 'win32' ? { useConptyDll: true } : {})
-    })
+    const attempt = Promise.withResolvers<PtyCreationDisposition>()
+    lastAttempt = attempt.promise
+    args.creationWork?.join(attempt.promise)
+    let proc: pty.IPty
+    try {
+      proc = nodePty.spawn(wrapped.file, wrapped.args, {
+        name: args.env.TERM ?? 'xterm-256color',
+        cols: args.cols,
+        rows: args.rows,
+        cwd,
+        env: wrapped.env,
+        // Bundled ConPTY provides the wrap-marker behavior xterm expects.
+        ...(process.platform === 'win32' ? { useConptyDll: true } : {})
+      })
+    } catch (error) {
+      attempt.resolve({ kind: 'failed', completion: Promise.resolve() })
+      throw error
+    }
+    try {
+      const physical = createDaemonPtyPhysicalOwner(proc)
+      physicalOwners.set(proc, physical)
+      attempt.resolve({
+        kind: 'physical',
+        completion: physical.completion,
+        exitCode: physical.exitCode,
+        recover: physical.recover
+      })
+    } catch (error) {
+      attempt.resolve({ kind: 'unknown' })
+      throw error
+    }
     reportsChildExitStatus = hostReportsChildExitStatus(tcc.file)
-    args.onMacosTccSpawnStrategy?.(tcc.file === shellPath ? 'direct' : 'wrapped')
+    try {
+      args.onMacosTccSpawnStrategy?.(tcc.file === shellPath ? 'direct' : 'wrapped')
+    } catch {
+      /* Diagnostics cannot revoke an owned child. */
+    }
     return proc
   }
   const spawnAt = async (
@@ -106,6 +139,7 @@ export async function spawnNativeDaemonPty(args: {
     )
     return {
       process: spawned.proc,
+      physicalOwner: physicalOwners.get(spawned.proc),
       shellPath: args.shellPath,
       spawnCwd: args.spawnCwd,
       reportsChildExitStatus,
@@ -113,7 +147,10 @@ export async function spawnNativeDaemonPty(args: {
     }
   } catch (primaryErr) {
     args.signal?.throwIfAborted()
-    if (process.platform !== 'win32') {
+    if (
+      process.platform !== 'win32' ||
+      (args.retainCanceledChild && ['unknown', 'failed'].includes((await lastAttempt)?.kind ?? ''))
+    ) {
       throw primaryErr
     }
     for (const attempt of args.windowsFallbackAttempts.slice(1)) {
@@ -130,14 +167,21 @@ export async function spawnNativeDaemonPty(args: {
         )
         return {
           process: spawned.proc,
+          physicalOwner: physicalOwners.get(spawned.proc),
           shellPath: attempt.shellPath,
           spawnCwd: attempt.effectiveCwd,
           startupCommandDeliveredInShellArgs: attempt.startupCommandDeliveredInShellArgs,
           reportsChildExitStatus,
           ...(spawned.claimStartupEvents ? { claimStartupEvents: spawned.claimStartupEvents } : {})
         }
-      } catch {
+      } catch (error) {
         args.signal?.throwIfAborted()
+        if (
+          args.retainCanceledChild &&
+          ['unknown', 'failed'].includes((await lastAttempt)?.kind ?? '')
+        ) {
+          throw error
+        }
       }
     }
     throw primaryErr
diff --git a/src/main/daemon/pty-subprocess/subprocess-handle.ts b/src/main/daemon/pty-subprocess/subprocess-handle.ts
index 0fc549ce0f4b..fc284f9cc0a1 100644
--- a/src/main/daemon/pty-subprocess/subprocess-handle.ts
+++ b/src/main/daemon/pty-subprocess/subprocess-handle.ts
@@ -1,10 +1,9 @@
+import { createDaemonPtyPhysicalOwner } from './daemon-pty-physical-owner'
 import type { DisposableNativePty } from './native-pty-spawn'
 import type * as pty from 'node-pty'
 import type { RecognizedAgentProcess } from '../../../shared/agent-process-recognition'
 import { readPtySlavePath } from '../../../shared/pty-slave-line-discipline-echo'
-import { forceKillPosixPtyProcessGroups } from '../../pty/posix-pty-process-groups'
 import { signalPosixPtyForegroundGroup } from '../../pty/posix-pty-foreground-group'
-import { PendingPtyGroupSweep } from '../../pty/pending-pty-group-sweep'
 import { readPtsName } from '../../pty/node-pty-pts-name'
 import { terminatePtyJob } from '../../windows/windows-pty-job'
 import { isValidPtySize } from '../daemon-pty-size'
@@ -19,12 +18,16 @@ import {
 import { getStrictProcessTableSnapshotWithAge } from '../../../shared/process-table-snapshot-reader'
 import { getSpawnedShellName } from '../../providers/local-pty-launch-helpers'
 import type { ConptyStartupEvents } from './conpty-startup-input-reader'
+export { createDaemonPtyPhysicalOwner } from './daemon-pty-physical-owner'
 
 // Normal exit also retires the master first; let the exit report win before calling input closed.
 export const MASTER_CLOSE_EXIT_GRACE_MS = 1_000
 
+export type DaemonPtyPhysicalOwner = ReturnType<typeof createDaemonPtyPhysicalOwner>
+
 export function createDaemonPtySubprocessHandle(args: {
   process: pty.IPty
+  physicalOwner?: DaemonPtyPhysicalOwner
   shellPath: string
   spawnCwd: string
   env: Record<string, string>
@@ -41,15 +44,12 @@ export function createDaemonPtySubprocessHandle(args: {
   const proc = args.process
   // node-pty exposes destroy at runtime but omits it from IPty.
   const nativeProc: DisposableNativePty = proc
+  const physical = args.physicalOwner ?? createDaemonPtyPhysicalOwner(proc)
   const events = new PtyPreListenerEvents()
   let dead = false
-  // Unlike dead, disposal keeps this false so an in-flight force-kill still lands.
-  let exited = false
-  const groupSweep = new PendingPtyGroupSweep()
   // I/O failure is not exit evidence; keep termination and producer flow control available.
   let ioFailed = false
   let disposed = false
-  let nodePtyKillIssued = false
   let masterRetired = false
   let masterError: string | null = null
   let masterRetiredTimer: ReturnType<typeof setTimeout> | null = null
@@ -113,7 +113,6 @@ export function createDaemonPtySubprocessHandle(args: {
   const acceptExit = ({ exitCode, signal }: { exitCode: number; signal?: number }): void => {
     // Exit listeners may re-enter cleanup; retire signal authority before notifying them.
     dead = true
-    exited = true
     clearMasterRetiredTimer()
     foreground.markDead()
     // Neutralize kill before an async socket-close SIGHUP can target a recycled PID.
@@ -132,46 +131,6 @@ export function createDaemonPtySubprocessHandle(args: {
     proc.onExit(acceptExit)
   }
 
-  const killRoot = (): void => {
-    process.kill(proc.pid, 'SIGKILL')
-  }
-  const fallBackToNodePtyKill = (signalError: unknown): void => {
-    try {
-      proc.kill()
-      nodePtyKillIssued = true
-    } catch {
-      nodePtyKillIssued = false
-      throw signalError
-    }
-  }
-  const forceKillPosix = async (): Promise<void> => {
-    if (dead) {
-      return
-    }
-    // A reaped root frees its pid and TTY for reuse, so a table read that outlives it signals nothing.
-    await groupSweep.track(
-      forceKillPosixPtyProcessGroups(proc.pid, killRoot, { ownsRoot: () => !exited }).catch(
-        fallBackToNodePtyKill
-      )
-    )
-  }
-  // Stays synchronous: dispose() reads nodePtyKillIssued right after to avoid double-closing ConPTY.
-  const forceKillConpty = (): void => {
-    if (dead) {
-      return
-    }
-    // Escalate a ConPTY kill through the job without double-closing node-pty's shell handle.
-    if (nodePtyKillIssued) {
-      terminatePtyJob(proc)
-      return
-    }
-    try {
-      killRoot()
-    } catch (signalError) {
-      fallBackToNodePtyKill(signalError)
-    }
-  }
-
   const slavePath = readPtySlavePath(proc)
   return {
     pid: proc.pid,
@@ -252,20 +211,16 @@ export function createDaemonPtySubprocessHandle(args: {
       } catch {}
     },
     kill: () => {
-      if (dead) {
-        return
-      }
-      nodePtyKillIssued = true
-      try {
-        proc.kill()
-      } catch (error) {
-        // A rejected native kill is not proof of exit; keep the wrapper live for a retry.
-        nodePtyKillIssued = false
-        throw error
+      if (!dead) {
+        physical.kill()
       }
     },
     terminateOwnedTree: () => terminatePtyJob(proc),
-    forceKill: () => (process.platform === 'win32' ? forceKillConpty() : forceKillPosix()),
+    forceKill: () => {
+      if (!dead) {
+        return physical.forceKill()
+      }
+    },
     signal: (sig) => {
       if (dead) {
         return
@@ -284,7 +239,7 @@ export function createDaemonPtySubprocessHandle(args: {
       // SIGWINCH belongs to the tty foreground group; destructive signals keep the root-pid target.
       if (sig === 'SIGWINCH') {
         void signalPosixPtyForegroundGroup(proc.pid, readPtsName(proc), sig, signalRootPid, {
-          ownsRoot: () => !exited
+          ownsRoot: () => !physical.hasExited()
         })
         return
       }
@@ -301,18 +256,7 @@ export function createDaemonPtySubprocessHandle(args: {
       clearMasterRetiredTimer()
       inputClosedListener = null
       events.clear()
-      const destroy = (): void => {
-        try {
-          nativeProc.destroy?.()
-        } catch {}
-      }
-      // POSIX destroy() can asynchronously signal a recycled pid; Windows needs kill() to close ConPTY.
-      if (process.platform !== 'win32') {
-        nativeProc.kill = () => {}
-      } else if (nodePtyKillIssued) {
-        return
-      }
-      groupSweep.afterSettled(destroy)
+      physical.dispose()
     }
   }
 }
diff --git a/src/main/daemon/session-process-inspection.ts b/src/main/daemon/session-process-inspection.ts
index 610e57725b18..84a434c06895 100644
--- a/src/main/daemon/session-process-inspection.ts
+++ b/src/main/daemon/session-process-inspection.ts
@@ -1,11 +1,8 @@
+import type { SessionTerminationController } from './session-termination-controller'
 import type { SessionOutputPlane } from './session-output-plane'
-
 import type { TerminalShellRecoveryBarrier } from './terminal-shell-recovery-barrier'
-
 import type { SubprocessHandle, ChildProcessVerdictRead } from './session-subprocess-handle'
-
 import { SessionSwitchUse } from './session-switch-use'
-
 export abstract class SessionProcessInspection extends SessionSwitchUse {
   protected abstract subprocess: SubprocessHandle
   protected abstract readonly output: SessionOutputPlane
@@ -45,4 +42,22 @@ export abstract class SessionProcessInspection extends SessionSwitchUse {
   getCwd(): string | null {
     return this.output.getCwd()
   }
+
+  protected abstract readonly termination: SessionTerminationController
+
+  signalTerminationRoot(): void {
+    this.termination.signalTerminationRoot()
+  }
+
+  scheduleForceDisposeFallback(): void {
+    this.termination.scheduleForceDisposeFallback()
+  }
+
+  async forceKillAndWaitForExit(timeoutMs?: number): Promise<void> {
+    await this.termination.forceKillAndWaitForExit(timeoutMs)
+  }
+
+  signal(sig: string): void {
+    this.termination.signal(sig)
+  }
 }
diff --git a/src/main/daemon/session-switch-use.ts b/src/main/daemon/session-switch-use.ts
index 36f7ea734f82..50899e8f4b19 100644
--- a/src/main/daemon/session-switch-use.ts
+++ b/src/main/daemon/session-switch-use.ts
@@ -1,8 +1,6 @@
-import type { SessionShellReadyBarrier } from './session-shell-ready-barrier'
 import { randomUUID } from 'node:crypto'
 
 export abstract class SessionSwitchUse {
-  protected abstract readonly shellReady: SessionShellReadyBarrier
   abstract get isTerminating(): boolean
   abstract beginTermination(): boolean
   private useRevision = 0
@@ -34,12 +32,12 @@ export abstract class SessionSwitchUse {
     const deadline = (witness?.anchor ?? -Infinity) + Math.max(0, condition.remainingMs)
     return () =>
       Boolean(
+        condition.ownedSpawn &&
         witness &&
         this.switchWitness === witness &&
         witness.token === condition.token &&
         witness.revision === this.useRevision &&
         performance.now() < deadline &&
-        (condition.ownedSpawn || !this.shellReady.hasPendingWrites) &&
         !this.isTerminating
       )
   }
diff --git a/src/main/daemon/session-termination-controller.ts b/src/main/daemon/session-termination-controller.ts
index e13778a75871..99ae90a2c9b2 100644
--- a/src/main/daemon/session-termination-controller.ts
+++ b/src/main/daemon/session-termination-controller.ts
@@ -11,7 +11,7 @@ const SESSION_FORCE_KILL_MAX_ATTEMPTS = 2
 
 export type SessionTerminationControllerDeps = {
   sessionId: string
-  subprocess: SubprocessHandle
+  subprocess: Pick<SubprocessHandle, 'kill' | 'forceKill' | 'signal' | 'dispose'>
   isExited(): boolean
   releaseProducerPause(opts: { resume: boolean }): void
 }
@@ -25,6 +25,10 @@ export class SessionTerminationController {
 
   constructor(private readonly deps: SessionTerminationControllerDeps) {}
 
+  get physicalCompletion(): Promise<void> {
+    return this.physicalExit.exitedPromise
+  }
+
   get isTerminating(): boolean {
     return this._isTerminating
   }
diff --git a/src/main/daemon/session.test.ts b/src/main/daemon/session.test.ts
index 0263fb76bf2c..407a40c39512 100644
--- a/src/main/daemon/session.test.ts
+++ b/src/main/daemon/session.test.ts
@@ -572,33 +572,32 @@ describe('Session', () => {
     })
   })
 
-  describe('switch-only conditional ordinary close', () => {
-    it.each(['input', 'attachment', 'suspended child', 'unknown'] as const)(
-      'refuses without a signal when %s arrives during the final idle probe',
+  describe('unused owned-spawn conditional close', () => {
+    it.each(['input', 'attachment'] as const)(
+      'refuses without a signal when %s arrives during descendant capture',
       async (change) => {
         createSession()
         const witness = session.captureSwitchWitness()
-        const check = session.switchCloseCondition({ token: witness, remainingMs: 10_000 })
+        const check = session.switchCloseCondition({
+          token: witness,
+          remainingMs: 10_000,
+          ownedSpawn: true
+        })
         const entered = Promise.withResolvers<void>()
         const release = Promise.withResolvers<void>()
-        subprocess.inspectChildProcesses.mockImplementation(async () => {
-          entered.resolve()
-          await release.promise
-          return change === 'suspended child'
-            ? 'children'
-            : change === 'unknown'
-              ? 'unverifiable'
-              : 'no-children'
-        })
         killWithDescendantSweepMock.mockImplementation((pid, killRoot, options) =>
           sweep.killWithDescendantSweep(pid, killRoot, {
             ...options,
             platform: 'linux',
-            readTable: async () => ({ rows: [], capturedAtMs: Date.now() })
+            readTable: async () => {
+              entered.resolve()
+              await release.promise
+              return { rows: [], capturedAtMs: Date.now() }
+            }
           })
         )
         const teardown = new TerminalSessionTeardown(new Map([['test-session', session]]))
-        const closing = teardown.killSession('test-session', session, true, check)
+        const closing = teardown.killSession('test-session', session, true, check, true)
         await entered.promise
         if (change === 'input') {
           session.write('codex\r')
@@ -618,7 +617,11 @@ describe('Session', () => {
     it('seals accepted input only after its actual close is admitted', async () => {
       createSession()
       const witness = session.captureSwitchWitness()
-      const check = session.switchCloseCondition({ token: witness, remainingMs: 10_000 })
+      const check = session.switchCloseCondition({
+        token: witness,
+        remainingMs: 10_000,
+        ownedSpawn: true
+      })
       killWithDescendantSweepMock.mockImplementation((pid, killRoot, options) =>
         sweep.killWithDescendantSweep(pid, killRoot, {
           ...options,
@@ -634,7 +637,8 @@ describe('Session', () => {
         'test-session',
         session,
         true,
-        check
+        check,
+        true
       )
       expect(subprocess.written).not.toContain('must not reach a closing shell\r')
       expect(session.isAlive).toBe(false)
diff --git a/src/main/daemon/session.ts b/src/main/daemon/session.ts
index 5677b26a19bb..bbb0c8e44d1f 100644
--- a/src/main/daemon/session.ts
+++ b/src/main/daemon/session.ts
@@ -19,7 +19,6 @@ import type {
 } from './types'
 import type { TerminalExitCause } from '../../shared/terminal-exit-cause'
 import { SessionProcessInspection } from './session-process-inspection'
-
 export class Session extends SessionProcessInspection {
   readonly sessionId: string
   readonly incarnationId = randomUUID()
@@ -37,7 +36,7 @@ export class Session extends SessionProcessInspection {
   protected readonly output: SessionOutputPlane
   private readonly producerPause: SessionProducerPause
   protected readonly shellReady: SessionShellReadyBarrier
-  private readonly termination: SessionTerminationController
+  protected readonly termination: SessionTerminationController
   readonly startupIngress: PtyStartupIngress
   protected readonly recoveryBarrier: TerminalShellRecoveryBarrier
 
@@ -102,12 +101,20 @@ export class Session extends SessionProcessInspection {
       },
       onEmission: (emission) => this.recoveryBarrier.accept(emission)
     })
-    this.subprocess.onData((data) => {
-      if (!this._disposed) {
-        this.shellReady.ingestSubprocessData(data)
-      }
-    })
-    this.subprocess.onExit((code, cause) => this.handleSubprocessExit(code, cause))
+    try {
+      this.subprocess.onData((data) => {
+        if (!this._disposed) {
+          this.shellReady.ingestSubprocessData(data)
+        }
+      })
+      this.subprocess.onExit((code, cause) => this.handleSubprocessExit(code, cause))
+    } catch (error) {
+      this._disposed = true
+      this.shellReady.dispose()
+      this.recoveryBarrier.dispose()
+      this.output.disposeEmulator()
+      throw error
+    }
   }
 
   get state(): SessionState {
@@ -134,6 +141,10 @@ export class Session extends SessionProcessInspection {
     return this.output.hasAttachedClients
   }
 
+  get physicalCompletion(): Promise<void> {
+    return this.termination.physicalCompletion
+  }
+
   get isTerminating(): boolean {
     return this.termination.isTerminating
   }
@@ -195,22 +206,8 @@ export class Session extends SessionProcessInspection {
   }
 
   /** Signal the root only after its descendant snapshot has completed. */
-  signalTerminationRoot(): void {
-    this.termination.signalTerminationRoot()
-  }
 
   /** Arm escalation after a coordinator begins snapshot-first teardown. */
-  scheduleForceDisposeFallback(): void {
-    this.termination.scheduleForceDisposeFallback()
-  }
-
-  async forceKillAndWaitForExit(timeoutMs?: number): Promise<void> {
-    await this.termination.forceKillAndWaitForExit(timeoutMs)
-  }
-
-  signal(sig: string): void {
-    this.termination.signal(sig)
-  }
 
   attachClient(client: Omit<AttachedClient, 'token'>): symbol {
     if (this.switchClosing) {
diff --git a/src/main/daemon/terminal-creation-work.ts b/src/main/daemon/terminal-creation-work.ts
new file mode 100644
index 000000000000..de441f9dc1bd
--- /dev/null
+++ b/src/main/daemon/terminal-creation-work.ts
@@ -0,0 +1,78 @@
+import type { PtyCreationDisposition } from '../../shared/claimed-agent-pty-owner'
+
+export type PendingTerminalCreation = {
+  completion: Promise<void>
+  recover: () => Promise<void>
+}
+
+/** The complete ordinary call owns every lower attempt and acquired dependency. */
+export class TerminalCreationWork {
+  private readonly result = Promise.withResolvers<PtyCreationDisposition>()
+  readonly completion = this.result.promise
+  private readonly dependencies: Promise<PtyCreationDisposition>[] = []
+  private readonly owners: {
+    completion: Promise<void>
+    exitCode: () => number | null
+    recover?: () => Promise<void>
+  }[] = []
+  private uncertain = false
+
+  join(disposition: Promise<PtyCreationDisposition>): void {
+    this.dependencies.push(disposition)
+  }
+
+  dispatched(): void {
+    this.uncertain = true
+  }
+
+  owner(
+    completion: Promise<void>,
+    exitCode: () => number | null,
+    recover?: () => Promise<void>
+  ): void {
+    this.owners.push({ completion, exitCode, recover })
+  }
+
+  async finish(reconcile?: (release: () => Promise<void>) => Promise<void>): Promise<void> {
+    const joined = await Promise.all(this.dependencies)
+    const physical = [
+      ...this.owners,
+      ...joined.flatMap((entry) => (entry.kind === 'physical' ? [entry] : []))
+    ]
+    const release = async () => {
+      await Promise.all(
+        [...this.owners, ...joined.filter((entry) => entry.kind !== 'no-fork')].map((entry) =>
+          entry.recover?.()
+        )
+      )
+    }
+    let recovery: Promise<void> | undefined
+    const recover = () => {
+      recovery ??= (reconcile ? reconcile(release) : release()).finally(() => {
+        recovery = undefined
+      })
+      return recovery
+    }
+    if (this.uncertain || joined.some((entry) => entry.kind === 'unknown')) {
+      this.result.resolve({ kind: 'unknown', recover })
+    } else if (joined.some((entry) => entry.kind === 'failed')) {
+      this.result.resolve({
+        kind: 'failed',
+        completion: Promise.all([
+          ...physical.map((entry) => entry.completion),
+          ...joined.flatMap((entry) => (entry.kind === 'failed' ? [entry.completion] : []))
+        ]).then(() => {}),
+        recover
+      })
+    } else if (physical.length) {
+      this.result.resolve({
+        kind: 'physical',
+        completion: Promise.all(physical.map((entry) => entry.completion)).then(() => {}),
+        exitCode: () => physical.at(-1)?.exitCode() ?? null,
+        recover
+      })
+    } else {
+      this.result.resolve({ kind: 'no-fork' })
+    }
+  }
+}
diff --git a/src/main/daemon/terminal-host-agent-session-claim.ts b/src/main/daemon/terminal-host-agent-session-claim.ts
index 27a271327d83..929329715344 100644
--- a/src/main/daemon/terminal-host-agent-session-claim.ts
+++ b/src/main/daemon/terminal-host-agent-session-claim.ts
@@ -1,3 +1,5 @@
+import type { PtyCreationDisposition } from '../../shared/claimed-agent-pty-owner'
+import type { TerminalCreationWork } from './terminal-creation-work'
 import type { ClaimedAgentPtyOwnerRegistry } from '../../shared/claimed-agent-pty-owner'
 import type { AgentSessionOwnerBinding } from '../../shared/agent-session-host-authority'
 import type { SpawnIntent } from '../../shared/host-spawn-admission'
@@ -7,6 +9,9 @@ export type InternalCreateOrAttachOptions = CreateOrAttachOptions & {
   agentSessionGeneration?: string
   /** Request identity for the fork gate; absent for in-process callers. */
   spawnAdmission?: { clientId: string; declaredIntent: SpawnIntent | null; deadlineAt: number }
+  creationWork?: TerminalCreationWork
+  onCreationDisposition?: (disposition: PtyCreationDisposition) => void
+  onPhysicalOwner?: (completion: Promise<void>, exitCode: () => number | null) => void
   retainCanceledChild?: boolean
   isCanceled?: () => boolean
   cancelSignal?: AbortSignal
@@ -25,6 +30,14 @@ export async function createOrAttachClaimedAgentSession(args: {
   }
   let created: CreateOrAttachResult | null = null
   const ensured = await args.owners.ensure({
+    creation: args.options.creationWork?.completion,
+    onJoin: (creation) => {
+      if (creation) {
+        args.options.creationWork?.join(creation)
+      } else {
+        args.options.creationWork?.dispatched()
+      }
+    },
     claim: ensureRequest.claim,
     surface: ensureRequest.surface,
     spawn: async ({ generation }) => {
diff --git a/src/main/daemon/terminal-host-disposal.ts b/src/main/daemon/terminal-host-disposal.ts
index 0a733db4e343..741b4fc43bfa 100644
--- a/src/main/daemon/terminal-host-disposal.ts
+++ b/src/main/daemon/terminal-host-disposal.ts
@@ -1,3 +1,4 @@
+import type { PendingTerminalCreation } from './terminal-creation-work'
 import { shutdownTerminalHostSessions } from './terminal-host-session-shutdown'
 import type { TerminalSessionTeardown } from './terminal-session-teardown'
 import type { Session } from './session'
@@ -10,7 +11,7 @@ type FinalCheckpoint = (
 ) => void
 
 type TerminalHostDisposalOptions = {
-  pendingCreations: ReadonlyMap<string, Promise<void>>
+  pendingCreations: ReadonlyMap<string, PendingTerminalCreation>
   sessionTeardown: TerminalSessionTeardown
   sessions: Map<string, Session>
   onFinalCheckpoint?: FinalCheckpoint
@@ -26,7 +27,12 @@ export async function disposeTerminalHostSessions({
 }: TerminalHostDisposalOptions): Promise<void> {
   if (pendingCreations.size > 0) {
     // No spawn may publish a session after teardown completes.
-    await Promise.all(pendingCreations.values())
+    await Promise.all(
+      [...pendingCreations.values()].map(async (creation) => {
+        await creation.recover()
+        await creation.completion
+      })
+    )
   }
   const existingTeardowns = sessionTeardown.requestImmediateAll()
   await Promise.all([
diff --git a/src/main/daemon/terminal-host-fenced-termination.ts b/src/main/daemon/terminal-host-fenced-termination.ts
index 255e4b6031c1..0f96885b409b 100644
--- a/src/main/daemon/terminal-host-fenced-termination.ts
+++ b/src/main/daemon/terminal-host-fenced-termination.ts
@@ -13,7 +13,7 @@ export function beginTerminalHostFencedTermination(
   request: PtyFencedTerminationRequest,
   deps: {
     sessions: ReadonlyMap<string, Session>
-    pendingCreations: ReadonlyMap<string, Promise<void>>
+    pendingCreations: ReadonlyMap<string, unknown>
     owners: ClaimedAgentPtyOwnerRegistry
     kill: (
       id: string,
@@ -39,7 +39,7 @@ export function beginTerminalHostFencedTermination(
   if (request.requireUnattached && session.hasAttachedClients) {
     return { accepted: false, result: { outcome: 'refused', reason: 'attached' } }
   }
-  if (request.switchCondition && !request.switchCondition.ownedSpawn && session.wslDistro) {
+  if (request.switchCondition && !request.switchCondition.ownedSpawn) {
     return { accepted: false, result: { outcome: 'refused', reason: 'unsupported' } }
   }
   const physicalCheck = request.switchCondition
diff --git a/src/main/daemon/terminal-host-inspection.ts b/src/main/daemon/terminal-host-inspection.ts
index 43713bf44d51..dcedf4e7ccbe 100644
--- a/src/main/daemon/terminal-host-inspection.ts
+++ b/src/main/daemon/terminal-host-inspection.ts
@@ -1,3 +1,12 @@
+import { hasLiveTerminalHostSessions } from './terminal-host-session-listing'
+import type { TakePendingOutputResult, TerminalSnapshot } from './types'
+import {
+  getSettledTerminalHostSnapshot,
+  getTerminalHostAppliedSize,
+  getTerminalHostPartialEscapeTail,
+  getTerminalHostSnapshot,
+  takeTerminalHostPendingOutput
+} from './terminal-host-session-inspection-operations'
 import type { Session } from './session'
 import type { PtyProcessInspectionOptions } from '../providers/pty-process-inspection'
 import { getAliveTerminalHostSession } from './terminal-host-session-access'
@@ -10,7 +19,6 @@ import {
   confirmTerminalHostForegroundProcess,
   confirmTerminalHostShellForeground
 } from './terminal-host-session-inspection-operations'
-
 export abstract class TerminalHostInspection {
   protected abstract sessions: Map<string, Session>
   protected abstract readonly retiredIncarnations: Map<
@@ -57,4 +65,57 @@ export abstract class TerminalHostInspection {
       this.sessions.get(sessionId)
     )
   }
+
+  signal(sessionId: string, sig: string): void {
+    getAliveTerminalHostSession(this.sessions, sessionId).signal(sig)
+  }
+
+  detach(sessionId: string, token: symbol): void {
+    this.detachClients([{ sessionId, token }])
+  }
+
+  detachClients(attachments: readonly { sessionId: string; token: symbol }[]): void {
+    for (const { sessionId, token } of attachments) {
+      this.sessions.get(sessionId)?.detachClient(token)
+    }
+  }
+
+  clearScrollback(sessionId: string): void {
+    getAliveTerminalHostSession(this.sessions, sessionId).clearScrollback()
+  }
+
+  resetInputModes(sessionId: string): void {
+    getAliveTerminalHostSession(this.sessions, sessionId).resetInputModes()
+  }
+
+  getSnapshot(sessionId: string, opts: { scrollbackRows?: number } = {}): TerminalSnapshot | null {
+    return getTerminalHostSnapshot(this.sessions.get(sessionId), opts)
+  }
+
+  async getSettledSnapshot(
+    sessionId: string,
+    opts: { scrollbackRows?: number } = {}
+  ): Promise<TerminalSnapshot | null> {
+    return getSettledTerminalHostSnapshot(this.sessions.get(sessionId), opts)
+  }
+
+  getPartialEscapeTailAnsi(sessionId: string): string {
+    return getTerminalHostPartialEscapeTail(this.sessions.get(sessionId))
+  }
+
+  getAppliedSize(sessionId: string): { cols: number; rows: number } | null {
+    return getTerminalHostAppliedSize(this.sessions.get(sessionId))
+  }
+
+  takePendingOutput(
+    sessionId: string,
+    includeSnapshot: boolean,
+    opts: { teardownSnapshot?: boolean } = {}
+  ): TakePendingOutputResult | null {
+    return takeTerminalHostPendingOutput(this.sessions.get(sessionId), includeSnapshot, opts)
+  }
+
+  hasLiveSessions(): boolean {
+    return hasLiveTerminalHostSessions(this.sessions)
+  }
 }
diff --git a/src/main/daemon/terminal-host-options.ts b/src/main/daemon/terminal-host-options.ts
index 49ed8809b949..64c944052927 100644
--- a/src/main/daemon/terminal-host-options.ts
+++ b/src/main/daemon/terminal-host-options.ts
@@ -1,3 +1,4 @@
+import type { PtyCreationDisposition } from '../../shared/claimed-agent-pty-owner'
 import type { StartupCommandDelivery } from '../../shared/codex-startup-delivery'
 import type { TuiAgent } from '../../shared/tui-agent'
 import type { SubprocessHandle } from './session-subprocess-handle'
@@ -19,6 +20,7 @@ export type TerminalHostOptions = {
     terminalShellArgs?: string[]
     terminalWindowsWslDistro?: string | null
     terminalWindowsPowerShellImplementation?: 'auto' | 'powershell.exe' | 'pwsh.exe'
+    onCreationDisposition?: (disposition: PtyCreationDisposition) => void
     assertCreateAllowed?: () => void
     retainCanceledChild?: boolean
     isCanceled?: () => boolean
diff --git a/src/main/daemon/terminal-host-session-create.ts b/src/main/daemon/terminal-host-session-create.ts
index 09b2884f3b96..2ef35993cf14 100644
--- a/src/main/daemon/terminal-host-session-create.ts
+++ b/src/main/daemon/terminal-host-session-create.ts
@@ -1,38 +1,19 @@
-import { buildStartupCommandSubmission } from '../../shared/startup-command-submission'
-import {
-  discardStagedStartupCommand,
-  stageStartupCommand,
-  startupStagingFailureNotice,
-  type StartupCommandStaging
-} from '../../shared/startup-command-staging'
-import { resolvePtyOwnerBackend } from '../../shared/pty-owner-backend'
+import { spawnAndPublishSession } from './terminal-host-session-publish'
 import { getDaemonSessionResultMetadata } from './daemon-create-or-attach-result'
 import { normalizePtySize } from './daemon-pty-size'
-import { Session } from './session'
-import { shellPathSupportsPtyStartupBarrier } from './shell-ready'
+import type { Session } from './session'
 import type { InternalCreateOrAttachOptions } from './terminal-host-agent-session-claim'
 import type { CreateOrAttachResult } from './terminal-host-create-contract'
 import type { TerminalHostOptions } from './terminal-host-options'
 import type { TerminalHostTombstones } from './terminal-host-tombstones'
 import type { TerminalSessionTeardown } from './terminal-session-teardown'
 import type { TerminalSpawnGate } from './terminal-spawn-gate'
-import { resolveDaemonSessionScrollbackRows } from './daemon-session-scrollback-window'
 import { TerminalAttachCanceledError } from './daemon-errors'
 import { waitForTerminalAttachOperation } from './terminal-attach-cancellation'
 import { SessionNotFoundError } from './types'
 import { resolveWslSessionContext } from './wsl-session-context'
-import { recordSessionSpawnPaneKey } from './terminal-host-session-listing'
-import {
-  attachSessionInputViewer,
-  isSessionInputClosed,
-  trackSessionInput
-} from './session-input-path'
-import {
-  createSessionExitHandler,
-  describeAgentRestore,
-  isCwdReadableByThisProcess
-} from './terminal-host-session-process'
-
+import { attachSessionInputViewer, isSessionInputClosed } from './session-input-path'
+import { describeAgentRestore } from './terminal-host-session-process'
 export type TerminalHostSessionCreateDependencies = {
   sessions: Map<string, Session>
   /** Re-checks the host's shutdown fence and this request's cancellation after any await. */
@@ -77,6 +58,8 @@ export async function createOrAttachTerminalSession(
   // Checkpoint readers that require settled ownership use getSettledSnapshot.
   if (existing && existing.isAlive && !existing.isTerminating) {
     deps.assertCreateAllowed()
+    const attachedSession = existing
+    opts.onPhysicalOwner?.(attachedSession.physicalCompletion, () => attachedSession.exitCode)
     const snapshot = existing.getSnapshot()
     existing.detachAllClients()
     const token = existing.attachClient(opts.streamClient)
@@ -129,183 +112,38 @@ export async function createOrAttachTerminalSession(
   if (lease instanceof Promise) {
     lease = await lease
   }
+  let published = false
   try {
     if (paced) {
       // Pacing can outlast shutdown or cancellation; recheck before spawning.
       deps.assertCreateAllowed()
     }
-    return await spawnAndPublishSession(opts, deps, { size, wslDistro }, (publishedId, isAlive) =>
-      lease?.commit(publishedId, isAlive)
+    const result = await spawnAndPublishSession(
+      opts,
+      deps,
+      { size, wslDistro },
+      (publishedId, isAlive) => lease?.commit(publishedId, isAlive)
     )
+    published = true
+    return result
   } finally {
-    lease?.abandon()
-  }
-}
-
-async function spawnAndPublishSession(
-  opts: InternalCreateOrAttachOptions,
-  deps: TerminalHostSessionCreateDependencies,
-  ctx: { size: { cols: number; rows: number }; wslDistro: string | undefined },
-  onPublished: (sessionId: string, isAlive: boolean) => void
-): Promise<CreateOrAttachResult> {
-  const { size, wslDistro } = ctx
-  // Only macOS needs the TCC probe; other hosts must not pin extra filesystem workers.
-  const cwdReadableByDaemon =
-    process.platform === 'darwin' && opts.cwd && !wslDistro
-      ? await isCwdReadableByThisProcess(opts.cwd, opts)
-      : null
-  deps.assertCreateAllowed()
-  const subprocess = await deps.spawnSubprocess({
-    sessionId: opts.sessionId,
-    cols: size.cols,
-    rows: size.rows,
-    cwd: opts.cwd,
-    env: opts.env,
-    envToDelete: opts.envToDelete,
-    command: opts.command,
-    startupCommandDelivery: opts.startupCommandDelivery,
-    ...(opts.launchAgent ? { launchAgent: opts.launchAgent } : {}),
-    shellOverride: opts.shellOverride,
-    terminalShellArgs: opts.terminalShellArgs,
-    terminalWindowsWslDistro: opts.terminalWindowsWslDistro,
-    terminalWindowsPowerShellImplementation: opts.terminalWindowsPowerShellImplementation,
-    isCanceled: opts.isCanceled,
-    assertCreateAllowed: deps.assertCreateAllowed,
-    retainCanceledChild: opts.retainCanceledChild,
-    ...(opts.cancelSignal ? { cancelSignal: opts.cancelSignal } : {})
-  })
-
-  let staging: StartupCommandStaging | undefined
-  // Reconcile fallback-shell capability or its first command could remain queued until timeout.
-  const shellReadySupported =
-    (opts.shellReadySupported ?? false) &&
-    (subprocess.shellPath === undefined || shellPathSupportsPtyStartupBarrier(subprocess.shellPath))
-  const session = new Session({
-    sessionId: opts.sessionId,
-    cols: size.cols,
-    rows: size.rows,
-    terminalHandle: opts.env?.ORCA_TERMINAL_HANDLE,
-    launchAgent: opts.launchAgent,
-    subprocess,
-    ownerBackend: resolvePtyOwnerBackend({
-      platform: process.platform,
-      shellPath: subprocess.shellPath,
-      wslDistro
-    }),
-    shellReadySupported,
-    scrollback: resolveDaemonSessionScrollbackRows(),
-    historySeedChunks: opts.historySeedChunks,
-    ...(opts.startupIngress ? { startupIngress: opts.startupIngress } : {}),
-    wslDistro,
-    onExit: createSessionExitHandler(
-      deps.onSessionExit,
-      opts.sessionId,
-      opts.agentSessionGeneration,
-      () => discardStagedStartupCommand(staging),
-      deps.spawnGate
-    ),
-    ...(deps.reportReadinessEvent ? { reportReadinessEvent: deps.reportReadinessEvent } : {}),
-    ...(opts.shellReadyTimeoutMs !== undefined
-      ? { shellReadyTimeoutMs: opts.shellReadyTimeoutMs }
-      : {})
-  })
-  recordSessionSpawnPaneKey(session, opts.env?.ORCA_PANE_KEY)
-
-  trackSessionInput(session, subprocess, deps.reportReadinessEvent)
-
-  let revoked = false
-  try {
-    deps.assertCreateAllowed()
-  } catch {
-    revoked = true
-  }
-  if (revoked) {
-    // Retain cleanup ownership if the native child refuses to exit.
-    deps.sessions.set(opts.sessionId, session)
-    // Retain the live-cap charge until physical exit.
-    onPublished(opts.sessionId, session.isAlive)
-    await session.forceKillAndWaitForExit().catch(() => {})
-    if (!session.isAlive && deps.sessions.get(opts.sessionId) === session) {
-      session.dispose()
-      deps.sessions.delete(opts.sessionId)
-      deps.onDeadSessionRemoved(opts.sessionId)
-      deps.spawnGate?.onSessionExit(opts.sessionId)
-    }
-    if (!session.isAlive) {
-      throw new TerminalAttachCanceledError(opts.sessionId)
-    }
-    deps.onSessionCreated(opts.sessionId, opts.agentSessionGeneration, true)
-    return {
-      isNew: true,
-      switchOutcomeUnknown: true,
-      switchCleanupWitness: session.captureSwitchWitness(),
-      snapshot: session.getSnapshot(),
-      pid: session.pid,
-      shellState: session.shellState,
-      incarnationId: session.incarnationId,
-      ...getDaemonSessionResultMetadata(session),
-      attachToken: Symbol('retained-switch-child')
-    }
-  }
-
-  deps.sessions.set(opts.sessionId, session)
-  deps.onSessionCreated(opts.sessionId, opts.agentSessionGeneration, session.isAlive)
-  onPublished(opts.sessionId, session.isAlive)
-  const token = session.attachClient(opts.streamClient)
-  attachSessionInputViewer(session, opts.streamClient)
-
-  const startupCommandWritten =
-    Boolean(opts.command) && !subprocess.startupCommandDeliveredInShellArgs
-  // Distinguish absent from undelivered commands; log only length because command text may contain credentials.
-  try {
-    deps.reportReadinessEvent?.('startup-command-delivery', {
-      sessionId: opts.sessionId,
-      written: startupCommandWritten,
-      hasCommand: Boolean(opts.command),
-      commandLength: opts.command?.length ?? 0,
-      viaShellArgs: subprocess.startupCommandDeliveredInShellArgs === true,
-      queuedByShellReadyBarrier: shellReadySupported
-    })
-  } catch {
-    // Diagnostics must never turn a live PTY into a failed create.
-  }
-  if (startupCommandWritten && opts.command) {
-    staging = stageStartupCommand({
-      command: opts.command,
-      shellPath: subprocess.shellPath,
-      orcaBuiltLine: opts.launchAgent !== undefined
-    })
-    const notice = startupStagingFailureNotice(staging)
-    if (notice) {
-      session.startupIngress.accept(notice)
-      try {
-        deps.reportReadinessEvent?.('startup-command-stage-failed', {
-          sessionId: opts.sessionId,
-          reason: staging.failure
-        })
-      } catch {
-        // Diagnostics must never turn a live PTY into a failed create.
-      }
-    }
-    // Why: only Orca-wrapped shells advertise the paste-safe startup barrier.
-    session.writeStartupCommand(
-      buildStartupCommandSubmission(staging.command, {
-        bracketedPasteSafe: shellReadySupported
+    const admitted = lease
+    if (published || !opts.creationWork) {
+      admitted?.abandon()
+    } else {
+      void opts.creationWork.completion.then(async (disposition) => {
+        if (disposition.kind === 'no-fork') {
+          admitted?.abandon()
+        } else if (disposition.kind === 'failed') {
+          await disposition.completion
+          admitted?.abandon()
+        } else if (disposition.kind === 'physical') {
+          admitted?.commit(opts.sessionId, true)
+          await disposition.completion
+          deps.spawnGate?.onSessionExit(opts.sessionId)
+        }
       })
-    )
-  }
-
-  return {
-    isNew: true,
-    ...(opts.retainCanceledChild ? { switchCleanupWitness: session.captureSwitchWitness() } : {}),
-    snapshot: null,
-    pid: subprocess.pid,
-    shellState: session.shellState,
-    incarnationId: session.incarnationId,
-    ...getDaemonSessionResultMetadata(session),
-    ...(isSessionInputClosed(session) ? { inputClosed: true as const } : {}),
-    ...(cwdReadableByDaemon !== null ? { cwdReadableByDaemon } : {}),
-    attachToken: token
+    }
   }
 }
 
diff --git a/src/main/daemon/terminal-host-session-publish.ts b/src/main/daemon/terminal-host-session-publish.ts
new file mode 100644
index 000000000000..0b5cdd4e177d
--- /dev/null
+++ b/src/main/daemon/terminal-host-session-publish.ts
@@ -0,0 +1,280 @@
+import type { PtyCreationDisposition } from '../../shared/claimed-agent-pty-owner'
+import type { SubprocessHandle } from './session-subprocess-handle'
+import type { TerminalExitCause } from '../../shared/terminal-exit-cause'
+import { buildStartupCommandSubmission } from '../../shared/startup-command-submission'
+import {
+  discardStagedStartupCommand,
+  stageStartupCommand,
+  startupStagingFailureNotice,
+  type StartupCommandStaging
+} from '../../shared/startup-command-staging'
+import { resolvePtyOwnerBackend } from '../../shared/pty-owner-backend'
+import { getDaemonSessionResultMetadata } from './daemon-create-or-attach-result'
+import { Session } from './session'
+import { SessionTerminationController } from './session-termination-controller'
+import { shutdownOwnedTerminalProcess } from './terminal-host-session-shutdown'
+import { shellPathSupportsPtyStartupBarrier } from './shell-ready'
+import type { InternalCreateOrAttachOptions } from './terminal-host-agent-session-claim'
+import type { CreateOrAttachResult } from './terminal-host-create-contract'
+import { resolveDaemonSessionScrollbackRows } from './daemon-session-scrollback-window'
+import { TerminalAttachCanceledError } from './daemon-errors'
+import { recordSessionSpawnPaneKey } from './terminal-host-session-listing'
+import {
+  attachSessionInputViewer,
+  isSessionInputClosed,
+  trackSessionInput
+} from './session-input-path'
+import {
+  createSessionExitHandler,
+  isCwdReadableByThisProcess
+} from './terminal-host-session-process'
+import type { TerminalHostSessionCreateDependencies } from './terminal-host-session-create'
+export async function spawnAndPublishSession(
+  opts: InternalCreateOrAttachOptions,
+  deps: TerminalHostSessionCreateDependencies,
+  ctx: { size: { cols: number; rows: number }; wslDistro: string | undefined },
+  onPublished: (sessionId: string, isAlive: boolean) => void
+): Promise<CreateOrAttachResult> {
+  const { size, wslDistro } = ctx
+  // Only macOS needs the TCC probe; other hosts must not pin extra filesystem workers.
+  const cwdReadableByDaemon =
+    process.platform === 'darwin' && opts.cwd && !wslDistro
+      ? await isCwdReadableByThisProcess(opts.cwd, opts)
+      : null
+  deps.assertCreateAllowed()
+  const lower = Promise.withResolvers<PtyCreationDisposition>()
+  opts.creationWork?.join(lower.promise)
+  let lowerReported = false
+  let recoverCreated: (() => Promise<void>) | undefined
+  let subprocess: SubprocessHandle
+  try {
+    subprocess = await deps.spawnSubprocess({
+      onCreationDisposition: (disposition) => {
+        lowerReported = true
+        lower.resolve(disposition)
+      },
+      sessionId: opts.sessionId,
+      cols: size.cols,
+      rows: size.rows,
+      cwd: opts.cwd,
+      env: opts.env,
+      envToDelete: opts.envToDelete,
+      command: opts.command,
+      startupCommandDelivery: opts.startupCommandDelivery,
+      ...(opts.launchAgent ? { launchAgent: opts.launchAgent } : {}),
+      shellOverride: opts.shellOverride,
+      terminalShellArgs: opts.terminalShellArgs,
+      terminalWindowsWslDistro: opts.terminalWindowsWslDistro,
+      terminalWindowsPowerShellImplementation: opts.terminalWindowsPowerShellImplementation,
+      isCanceled: opts.isCanceled,
+      assertCreateAllowed: deps.assertCreateAllowed,
+      retainCanceledChild: opts.retainCanceledChild,
+      ...(opts.cancelSignal ? { cancelSignal: opts.cancelSignal } : {})
+    })
+    // External implementations returning a handle have transferred an actual resource.
+    const exited = Promise.withResolvers<void>()
+    let code: number | null = null
+    let exitCause: TerminalExitCause | undefined
+    let sessionExit: Parameters<typeof subprocess.onExit>[0] | undefined
+    const rawTermination = new SessionTerminationController({
+      sessionId: opts.sessionId,
+      subprocess,
+      isExited: () => code !== null,
+      releaseProducerPause: ({ resume }) => {
+        if (resume) {
+          subprocess.resume?.()
+        }
+      }
+    })
+    recoverCreated = () =>
+      shutdownOwnedTerminalProcess({
+        pid: subprocess.pid,
+        isAlive: () => code === null,
+        terminateOwnedTree: () => subprocess.terminateOwnedTree(),
+        close: async () => {
+          await rawTermination.forceKillAndWaitForExit()
+          rawTermination.disposeSubprocessHandle()
+        }
+      })
+    subprocess.onExit((value, cause) => {
+      code = value
+      exitCause = cause
+      rawTermination.markPhysicalExit()
+      deps.spawnGate?.onSessionExit(opts.sessionId)
+      exited.resolve()
+      sessionExit?.(value, cause)
+    })
+    subprocess.onExit = (callback) => {
+      sessionExit = callback
+      if (code !== null) {
+        callback(code, exitCause)
+      }
+    }
+    if (!lowerReported) {
+      lower.resolve({
+        kind: 'physical',
+        completion: exited.promise,
+        exitCode: () => code,
+        recover: async () => {
+          await recoverCreated?.()
+        }
+      })
+    }
+    opts.onPhysicalOwner?.(exited.promise, () => code)
+    onPublished(opts.sessionId, code === null)
+  } catch (error) {
+    if (!lowerReported) {
+      lower.resolve({ kind: 'unknown' })
+    }
+    throw error
+  }
+
+  let staging: StartupCommandStaging | undefined
+  // Reconcile fallback-shell capability or its first command could remain queued until timeout.
+  const shellReadySupported =
+    (opts.shellReadySupported ?? false) &&
+    (subprocess.shellPath === undefined || shellPathSupportsPtyStartupBarrier(subprocess.shellPath))
+  const session = new Session({
+    sessionId: opts.sessionId,
+    cols: size.cols,
+    rows: size.rows,
+    terminalHandle: opts.env?.ORCA_TERMINAL_HANDLE,
+    launchAgent: opts.launchAgent,
+    subprocess,
+    ownerBackend: resolvePtyOwnerBackend({
+      platform: process.platform,
+      shellPath: subprocess.shellPath,
+      wslDistro
+    }),
+    shellReadySupported,
+    scrollback: resolveDaemonSessionScrollbackRows(),
+    historySeedChunks: opts.historySeedChunks,
+    ...(opts.startupIngress ? { startupIngress: opts.startupIngress } : {}),
+    wslDistro,
+    onExit: createSessionExitHandler(
+      deps.onSessionExit,
+      opts.sessionId,
+      opts.agentSessionGeneration,
+      () => discardStagedStartupCommand(staging),
+      deps.spawnGate
+    ),
+    ...(deps.reportReadinessEvent ? { reportReadinessEvent: deps.reportReadinessEvent } : {}),
+    ...(opts.shellReadyTimeoutMs !== undefined
+      ? { shellReadyTimeoutMs: opts.shellReadyTimeoutMs }
+      : {})
+  })
+  recoverCreated = () =>
+    shutdownOwnedTerminalProcess({
+      pid: session.pid,
+      isAlive: () => session.isAlive,
+      terminateOwnedTree: () => session.terminateOwnedTree(),
+      close: async () => {
+        await session.forceKillAndWaitForExit()
+        session.dispose()
+      }
+    })
+  opts.onPhysicalOwner?.(session.physicalCompletion, () => session.exitCode)
+  recordSessionSpawnPaneKey(session, opts.env?.ORCA_PANE_KEY)
+
+  try {
+    trackSessionInput(session, subprocess, deps.reportReadinessEvent)
+  } catch (error) {
+    void session.physicalCompletion.then(() => session.dispose())
+    throw error
+  }
+
+  let revoked = false
+  try {
+    deps.assertCreateAllowed()
+  } catch {
+    revoked = true
+  }
+  if (revoked) {
+    // Retain cleanup ownership if the native child refuses to exit.
+    deps.sessions.set(opts.sessionId, session)
+    // Retain the live-cap charge until physical exit.
+    onPublished(opts.sessionId, session.isAlive)
+    await session.forceKillAndWaitForExit().catch(() => {})
+    if (!session.isAlive && deps.sessions.get(opts.sessionId) === session) {
+      session.dispose()
+      deps.sessions.delete(opts.sessionId)
+      deps.onDeadSessionRemoved(opts.sessionId)
+      deps.spawnGate?.onSessionExit(opts.sessionId)
+    }
+    if (!session.isAlive) {
+      throw new TerminalAttachCanceledError(opts.sessionId)
+    }
+    deps.onSessionCreated(opts.sessionId, opts.agentSessionGeneration, true)
+    return {
+      isNew: true,
+      switchOutcomeUnknown: true,
+      switchCleanupWitness: session.captureSwitchWitness(),
+      snapshot: session.getSnapshot(),
+      pid: session.pid,
+      shellState: session.shellState,
+      incarnationId: session.incarnationId,
+      ...getDaemonSessionResultMetadata(session),
+      attachToken: Symbol('retained-switch-child')
+    }
+  }
+
+  deps.sessions.set(opts.sessionId, session)
+  deps.onSessionCreated(opts.sessionId, opts.agentSessionGeneration, session.isAlive)
+  onPublished(opts.sessionId, session.isAlive)
+  const token = session.attachClient(opts.streamClient)
+  attachSessionInputViewer(session, opts.streamClient)
+
+  const startupCommandWritten =
+    Boolean(opts.command) && !subprocess.startupCommandDeliveredInShellArgs
+  // Distinguish absent from undelivered commands; log only length because command text may contain credentials.
+  try {
+    deps.reportReadinessEvent?.('startup-command-delivery', {
+      sessionId: opts.sessionId,
+      written: startupCommandWritten,
+      hasCommand: Boolean(opts.command),
+      commandLength: opts.command?.length ?? 0,
+      viaShellArgs: subprocess.startupCommandDeliveredInShellArgs === true,
+      queuedByShellReadyBarrier: shellReadySupported
+    })
+  } catch {
+    // Diagnostics must never turn a live PTY into a failed create.
+  }
+  if (startupCommandWritten && opts.command) {
+    staging = stageStartupCommand({
+      command: opts.command,
+      shellPath: subprocess.shellPath,
+      orcaBuiltLine: opts.launchAgent !== undefined
+    })
+    const notice = startupStagingFailureNotice(staging)
+    if (notice) {
+      session.startupIngress.accept(notice)
+      try {
+        deps.reportReadinessEvent?.('startup-command-stage-failed', {
+          sessionId: opts.sessionId,
+          reason: staging.failure
+        })
+      } catch {
+        // Diagnostics must never turn a live PTY into a failed create.
+      }
+    }
+    // Why: only Orca-wrapped shells advertise the paste-safe startup barrier.
+    session.writeStartupCommand(
+      buildStartupCommandSubmission(staging.command, {
+        bracketedPasteSafe: shellReadySupported
+      })
+    )
+  }
+
+  return {
+    isNew: true,
+    ...(opts.retainCanceledChild ? { switchCleanupWitness: session.captureSwitchWitness() } : {}),
+    snapshot: null,
+    pid: subprocess.pid,
+    shellState: session.shellState,
+    incarnationId: session.incarnationId,
+    ...getDaemonSessionResultMetadata(session),
+    ...(isSessionInputClosed(session) ? { inputClosed: true as const } : {}),
+    ...(cwdReadableByDaemon !== null ? { cwdReadableByDaemon } : {}),
+    attachToken: token
+  }
+}
diff --git a/src/main/daemon/terminal-host-session-shutdown.ts b/src/main/daemon/terminal-host-session-shutdown.ts
index d043ea1d7c5f..384739ee48e8 100644
--- a/src/main/daemon/terminal-host-session-shutdown.ts
+++ b/src/main/daemon/terminal-host-session-shutdown.ts
@@ -8,15 +8,29 @@ async function disposeLiveSession(session: Session): Promise<void> {
     await session.forceKillAndDisposeSubprocess()
     return
   }
+  await shutdownOwnedTerminalProcess({
+    pid: session.pid,
+    isAlive: () => session.isAlive,
+    terminateOwnedTree: () => session.terminateOwnedTree(),
+    close: () => session.forceKillAndDisposeSubprocess()
+  })
+}
+
+export async function shutdownOwnedTerminalProcess(owner: {
+  pid: number
+  isAlive: () => boolean
+  terminateOwnedTree: Session['terminateOwnedTree']
+  close: () => Promise<void>
+}): Promise<void> {
   try {
-    await killWithDescendantSweep(session.pid, () => {}, {
-      ownsRoot: () => session.isAlive,
-      terminateOwnedTree: () => session.terminateOwnedTree(),
+    await killWithDescendantSweep(owner.pid, () => {}, {
+      ownsRoot: owner.isAlive,
+      terminateOwnedTree: owner.terminateOwnedTree,
       terminateDescendants: terminateShutdownDescendants,
       awaitEscalation: true
     })
   } finally {
-    await session.forceKillAndDisposeSubprocess()
+    await owner.close()
   }
 }
 
diff --git a/src/main/daemon/terminal-host.ts b/src/main/daemon/terminal-host.ts
index 2f53f11c940b..3f07e629211c 100644
--- a/src/main/daemon/terminal-host.ts
+++ b/src/main/daemon/terminal-host.ts
@@ -1,12 +1,8 @@
+import { TerminalCreationWork, type PendingTerminalCreation } from './terminal-creation-work'
 import { beginTerminalHostFencedTermination } from './terminal-host-fenced-termination'
 import type { PtyFencedTerminationRequest } from '../../shared/pty-fenced-termination'
 import type { Session } from './session'
-import {
-  SessionNotFoundError,
-  type SessionInfo,
-  type TakePendingOutputResult,
-  type TerminalSnapshot
-} from './types'
+import { SessionNotFoundError, type SessionInfo } from './types'
 import type { CreateOrAttachResult } from './terminal-host-create-contract'
 import type { TerminalHostOptions } from './terminal-host-options'
 import { disposeTerminalHostSessions, killLiveSessionGroupsSync } from './terminal-host-disposal'
@@ -18,24 +14,13 @@ import { createOrAttachClaimedAgentSession } from './terminal-host-agent-session
 import type { InternalCreateOrAttachOptions } from './terminal-host-agent-session-claim'
 import { TerminalHostAgentSessionGenerations } from './terminal-host-agent-session-generations'
 import { TerminalHostTombstones } from './terminal-host-tombstones'
-import {
-  listLiveTerminalHostSessions,
-  hasLiveTerminalHostSessions
-} from './terminal-host-session-listing'
+import { listLiveTerminalHostSessions } from './terminal-host-session-listing'
 import { createOrAttachTerminalSession } from './terminal-host-session-create'
 import { TerminalAttachCanceledError } from './daemon-errors'
 import { waitForTerminalAttachOperation } from './terminal-attach-cancellation'
 import { randomUUID } from 'node:crypto'
 import { pruneRetiredPtyIncarnations } from '../../shared/retired-pty-incarnations'
-import {
-  getSettledTerminalHostSnapshot,
-  getTerminalHostAppliedSize,
-  getTerminalHostPartialEscapeTail,
-  getTerminalHostSnapshot,
-  takeTerminalHostPendingOutput
-} from './terminal-host-session-inspection-operations'
 import { TerminalHostInspection } from './terminal-host-inspection'
-
 export type { CreateOrAttachOptions, CreateOrAttachResult } from './terminal-host-create-contract'
 
 export type { TerminalHostOptions } from './terminal-host-options'
@@ -46,7 +31,7 @@ const REMOTE_FOREGROUND_TOMBSTONE_RETENTION_MS = 2_000
 export class TerminalHost extends TerminalHostInspection {
   protected sessions = new Map<string, Session>()
   // Serializes creates for one id across async spawn validation.
-  private pendingCreations = new Map<string, Promise<void>>()
+  private pendingCreations = new Map<string, PendingTerminalCreation>()
   private sessionTeardown = new TerminalSessionTeardown(this.sessions)
   private killedTombstones: TerminalHostTombstones
   private readonly spawnOptions: Pick<TerminalHostOptions, 'spawnSubprocess' | 'spawnGate'>
@@ -82,64 +67,125 @@ export class TerminalHost extends TerminalHostInspection {
   }
 
   async createOrAttach(opts: InternalCreateOrAttachOptions): Promise<CreateOrAttachResult> {
-    this.assertCreateOrAttachAllowed(opts)
-    for (
-      let inFlight = this.pendingCreations.get(opts.sessionId);
-      inFlight !== undefined;
-      inFlight = this.pendingCreations.get(opts.sessionId)
-    ) {
-      // Let canceled callers leave rather than wait behind a cwd probe stuck on an unreachable share.
-      await waitForTerminalAttachOperation(inFlight, opts.cancelSignal, opts.sessionId)
-      this.assertCreateOrAttachAllowed(opts)
+    const creation = new TerminalCreationWork()
+    const original = opts
+    opts = {
+      ...opts,
+      creationWork: creation,
+      onPhysicalOwner: (completion, exitCode) => {
+        creation.owner(completion, exitCode)
+        original.onPhysicalOwner?.(completion, exitCode)
+      }
     }
-    this.assertCreateOrAttachAllowed(opts)
-
-    this.sessions.get(opts.sessionId)?.noteUse()
-    let settleCreation: () => void = () => {}
-    this.pendingCreations.set(
-      opts.sessionId,
-      new Promise<void>((resolve) => {
-        settleCreation = resolve
-      })
-    )
     try {
-      return await createOrAttachClaimedAgentSession({
-        options: opts,
-        owners: this.agentSessionOwners,
-        check: opts.retainCanceledChild ? () => this.assertCreateOrAttachAllowed(opts) : undefined,
-        isLive: (owner) =>
-          this.agentSessionGenerations.isCurrent(
-            owner,
-            Boolean(
-              this.sessions.get(owner.ptyId)?.isAlive &&
-              !this.sessions.get(owner.ptyId)?.isTerminating
+      this.assertCreateOrAttachAllowed(opts)
+      for (
+        let inFlight = this.pendingCreations.get(opts.sessionId);
+        inFlight !== undefined;
+        inFlight = this.pendingCreations.get(opts.sessionId)
+      ) {
+        // Let canceled callers leave rather than wait behind a cwd probe stuck on an unreachable share.
+        const pending = inFlight
+        await waitForTerminalAttachOperation(
+          pending.recover().then(() => pending.completion),
+          opts.cancelSignal,
+          opts.sessionId
+        )
+        this.assertCreateOrAttachAllowed(opts)
+      }
+      this.assertCreateOrAttachAllowed(opts)
+
+      this.sessions.get(opts.sessionId)?.noteUse()
+      let settleCreation: () => void = () => {}
+      const pending: PendingTerminalCreation = {
+        completion: new Promise<void>((resolve) => {
+          settleCreation = resolve
+        }),
+        recover: async () => {
+          const disposition = await creation.completion
+          if (disposition.kind !== 'no-fork') {
+            await disposition.recover?.()
+          }
+        }
+      }
+      this.pendingCreations.set(opts.sessionId, pending)
+      let published = false
+      try {
+        const result = await createOrAttachClaimedAgentSession({
+          options: opts,
+          owners: this.agentSessionOwners,
+          check: opts.retainCanceledChild
+            ? () => this.assertCreateOrAttachAllowed(opts)
+            : undefined,
+          isLive: (owner) => {
+            const session = this.sessions.get(owner.ptyId)
+            const live = this.agentSessionGenerations.isCurrent(
+              owner,
+              Boolean(session?.isAlive && !session.isTerminating)
             )
-          ),
-        createOrAttach: async (options) => {
-          this.assertCreateOrAttachAllowed(options)
-          if (options.agentSessionGeneration && this.sessions.get(options.sessionId)?.isAlive) {
-            throw new Error('agent_session_claim_unavailable')
+            if (live && session) {
+              creation.owner(session.physicalCompletion, () => session.exitCode)
+            }
+            return live
+          },
+          createOrAttach: async (options) => {
+            this.assertCreateOrAttachAllowed(options)
+            if (options.agentSessionGeneration && this.sessions.get(options.sessionId)?.isAlive) {
+              throw new Error('agent_session_claim_unavailable')
+            }
+            return await createOrAttachTerminalSession(options, {
+              sessions: this.sessions,
+              assertCreateAllowed: () => this.assertCreateOrAttachAllowed(options),
+              sessionTeardown: this.sessionTeardown,
+              killedTombstones: this.killedTombstones,
+              spawnSubprocess: this.spawnOptions.spawnSubprocess,
+              spawnGate: this.spawnOptions.spawnGate,
+              onDeadSessionRemoved: (sessionId) => this.agentSessionGenerations.forget(sessionId),
+              onSessionCreated: (sessionId, generation, isAlive) =>
+                this.agentSessionGenerations.remember(sessionId, generation, isAlive),
+              ...(this.reportReadinessEvent
+                ? { reportReadinessEvent: this.reportReadinessEvent }
+                : {}),
+              onSessionExit: this.handleSessionExit.bind(this)
+            })
+          }
+        })
+        published = true
+        return result
+      } finally {
+        const finish = () => {
+          if (this.pendingCreations.get(opts.sessionId) === pending) {
+            this.pendingCreations.delete(opts.sessionId)
           }
-          return await createOrAttachTerminalSession(options, {
-            sessions: this.sessions,
-            assertCreateAllowed: () => this.assertCreateOrAttachAllowed(options),
-            sessionTeardown: this.sessionTeardown,
-            killedTombstones: this.killedTombstones,
-            spawnSubprocess: this.spawnOptions.spawnSubprocess,
-            spawnGate: this.spawnOptions.spawnGate,
-            onDeadSessionRemoved: (sessionId) => this.agentSessionGenerations.forget(sessionId),
-            onSessionCreated: (sessionId, generation, isAlive) =>
-              this.agentSessionGenerations.remember(sessionId, generation, isAlive),
-            ...(this.reportReadinessEvent
-              ? { reportReadinessEvent: this.reportReadinessEvent }
-              : {}),
-            onSessionExit: this.handleSessionExit.bind(this)
+          settleCreation()
+        }
+        if (published || this.sessions.has(opts.sessionId)) {
+          finish()
+        } else {
+          void creation.completion.then(async (disposition) => {
+            if (disposition.kind === 'unknown') {
+              return
+            }
+            if (disposition.kind === 'physical' || disposition.kind === 'failed') {
+              await disposition.completion
+            }
+            finish()
           })
         }
-      })
+      }
     } finally {
-      this.pendingCreations.delete(opts.sessionId)
-      settleCreation()
+      await creation.finish(async (release) => {
+        // Registered Sessions retain their ordinary current/use-fenced close authority.
+        if (!this.sessions.has(opts.sessionId)) {
+          await release()
+        }
+      })
+      const disposition = await creation.completion
+      original.onCreationDisposition?.(disposition)
+      if (!this.sessions.has(opts.sessionId) && disposition.kind !== 'no-fork') {
+        // Failed unpublished resources keep the same ordinary cleanup owner across Retry/disposal.
+        void disposition.recover?.().catch(() => {})
+      }
     }
   }
 
@@ -243,57 +289,12 @@ export class TerminalHost extends TerminalHostInspection {
     this.onSessionReaped?.(sessionId)
   }
 
-  signal(sessionId: string, sig: string): void {
-    getAliveTerminalHostSession(this.sessions, sessionId).signal(sig)
-  }
-
-  detach(sessionId: string, token: symbol): void {
-    this.detachClients([{ sessionId, token }])
-  }
-
-  detachClients(attachments: readonly { sessionId: string; token: symbol }[]): void {
-    for (const { sessionId, token } of attachments) {
-      this.sessions.get(sessionId)?.detachClient(token)
-    }
-  }
-
-  clearScrollback(sessionId: string): void {
-    getAliveTerminalHostSession(this.sessions, sessionId).clearScrollback()
-  }
-
-  resetInputModes(sessionId: string): void {
-    getAliveTerminalHostSession(this.sessions, sessionId).resetInputModes()
-  }
-
   // Checkpoint reads tolerate sessions that have just exited.
-  getSnapshot(sessionId: string, opts: { scrollbackRows?: number } = {}): TerminalSnapshot | null {
-    return getTerminalHostSnapshot(this.sessions.get(sessionId), opts)
-  }
-
-  async getSettledSnapshot(
-    sessionId: string,
-    opts: { scrollbackRows?: number } = {}
-  ): Promise<TerminalSnapshot | null> {
-    return getSettledTerminalHostSnapshot(this.sessions.get(sessionId), opts)
-  }
 
   // Seed scan-authority handoff with the incomplete escape at the current stream position.
-  getPartialEscapeTailAnsi(sessionId: string): string {
-    return getTerminalHostPartialEscapeTail(this.sessions.get(sessionId))
-  }
 
   // Let the renderer detect dropped or coerced resizes from the applied dimensions.
-  getAppliedSize(sessionId: string): { cols: number; rows: number } | null {
-    return getTerminalHostAppliedSize(this.sessions.get(sessionId))
-  }
 
-  takePendingOutput(
-    sessionId: string,
-    includeSnapshot: boolean,
-    opts: { teardownSnapshot?: boolean } = {}
-  ): TakePendingOutputResult | null {
-    return takeTerminalHostPendingOutput(this.sessions.get(sessionId), includeSnapshot, opts)
-  }
   isKilled(sessionId: string): boolean {
     return this.killedTombstones.has(sessionId)
   }
@@ -302,10 +303,6 @@ export class TerminalHost extends TerminalHostInspection {
     return listLiveTerminalHostSessions(this.sessions, this.agentSessionOwners)
   }
 
-  hasLiveSessions(): boolean {
-    return hasLiveTerminalHostSessions(this.sessions)
-  }
-
   /** Last resort when shutdown overruns its deadline: an async group sweep may not have signalled yet. */
   killLiveSessionGroupsSync(): void {
     killLiveSessionGroupsSync(this.sessions.values())
diff --git a/src/main/daemon/terminal-session-teardown.ts b/src/main/daemon/terminal-session-teardown.ts
index 266edeaa4763..b2a979c94436 100644
--- a/src/main/daemon/terminal-session-teardown.ts
+++ b/src/main/daemon/terminal-session-teardown.ts
@@ -84,22 +84,13 @@ export class TerminalSessionTeardown {
             if (!switchCheck()) {
               return false
             }
-            const children = ownedSpawn
-              ? 'no-children'
-              : await session.inspectChildProcesses(true, false)
-            if (
-              children !== 'no-children' ||
-              !switchCheck() ||
-              this.sessions.get(sessionId) !== session
-            ) {
+            if (!ownedSpawn || !switchCheck() || this.sessions.get(sessionId) !== session) {
               return false
             }
             committed = session.commitSwitchClose(switchCheck)
             return committed
           },
           terminateOwnedTree: () => session.terminateOwnedTree(),
-          // No child is ever an automatic-cleanup target. Recheck occurs after this sweep's census.
-          ...(ownedSpawn ? {} : { terminateDescendants: () => {} }),
           awaitEscalation: true
         })
         if (committed && this.sessions.get(sessionId) === session && session.isAlive) {
diff --git a/src/main/daemon/types.ts b/src/main/daemon/types.ts
index 808fd82408bd..a9feed168caf 100644
--- a/src/main/daemon/types.ts
+++ b/src/main/daemon/types.ts
@@ -1,3 +1,7 @@
+import type {
+  CreateOrAttachRequest,
+  CancelCreateOrAttachRequest
+} from './daemon-create-or-attach-contract'
 import type {
   AsyncIoHealthRequest,
   FullDiskAccessStatusRequest,
@@ -5,7 +9,6 @@ import type {
   PtySpawnHealthRequest,
   SystemResolverHealthRequest
 } from './daemon-health-requests'
-import type { SpawnIntent } from '../../shared/host-spawn-admission'
 import type { SessionInfo } from './daemon-session-info'
 import type {
   ConfirmForegroundProcessRequest,
@@ -13,17 +16,16 @@ import type {
   GetForegroundProcessRequest,
   InspectProcessRequest
 } from './daemon-foreground-process-protocol'
-import type { StartupCommandDelivery } from '../../shared/codex-startup-delivery'
-import type { TuiAgent } from '../../shared/tui-agent'
-import type { PtyStartupIngressIntent } from '../../shared/pty-startup-ingress'
-import type {
-  AgentSessionExecutionClaim,
-  AgentSessionSurfaceBinding
-} from '../../shared/agent-session-host-authority'
 import type * as HistorySeedProtocol from './terminal-history-seed-transfer-protocol'
 import type * as PtyOwnerQueryProtocol from './daemon-pty-owner-query-protocol'
 import type { TerminalSnapshot } from './terminal-snapshot'
 import type { PtyFencedTerminationRequest } from '../../shared/pty-fenced-termination'
+export {
+  type CreateOrAttachRequest,
+  type CreateOrAttachSettlement,
+  type CancelCreateOrAttachResult,
+  type CancelCreateOrAttachRequest
+} from './daemon-create-or-attach-contract'
 
 export type {
   ConfirmForegroundProcessRequest,
@@ -59,54 +61,6 @@ export type { TerminalCheckpointFile } from './daemon-checkpoint-file'
 
 export type { DaemonEndpointIdentity, HelloMessage, HelloResponse } from './daemon-hello-protocol'
 
-export type CreateOrAttachRequest = {
-  id: string
-  type: 'createOrAttach'
-  payload: HistorySeedProtocol.CreateOrAttachHistorySeedPayload & {
-    sessionId: string
-    cols: number
-    rows: number
-    cwd?: string
-    env?: Record<string, string>
-    envToDelete?: string[]
-    command?: string
-    startupCommandDelivery?: StartupCommandDelivery
-    launchAgent?: TuiAgent
-    /** Rejects an absent session instead of interpreting mount uncertainty as create permission. */
-    attachOnly?: boolean
-    /** Preserve the selected shell instead of defaulting to the daemon’s platform fallback. */
-    shellOverride?: string
-    terminalShellArgs?: string[]
-    /** Preferred WSL distro for generic `wsl.exe` launches. */
-    terminalWindowsWslDistro?: string | null
-    /** Preserve the selected PowerShell implementation so daemon and local spawns resolve the same executable. */
-    terminalWindowsPowerShellImplementation?: 'auto' | 'powershell.exe' | 'pwsh.exe'
-    shellReadySupported?: boolean
-    shellReadyTimeoutMs?: number
-    /** Server-side fence that prevents a client timeout from publishing an orphan PTY. */
-    switchExecution?: {
-      phase: 'prepare' | 'commit'
-      invocationId: string
-      anchor?: string
-      remainingMs?: number
-    }
-    cancelAfterMs?: number
-    startupIngress?: PtyStartupIngressIntent
-    /** Optional; an old daemon ignores it and an old client omits it (legacy pacing). */
-    spawnIntent?: SpawnIntent
-    agentSessionEnsure?: {
-      claim: AgentSessionExecutionClaim
-      surface: AgentSessionSurfaceBinding
-    }
-  }
-}
-
-export type CancelCreateOrAttachRequest = {
-  id: string
-  type: 'cancelCreateOrAttach'
-  payload: { sessionId: string; requestId?: string }
-}
-
 export type WriteRequest = {
   id: string
   type: 'write'
diff --git a/src/main/native-chat/agent-session-journal/journal-legacy-import-body.ts b/src/main/native-chat/agent-session-journal/journal-legacy-import-body.ts
new file mode 100644
index 000000000000..3a3d50750faf
--- /dev/null
+++ b/src/main/native-chat/agent-session-journal/journal-legacy-import-body.ts
@@ -0,0 +1,56 @@
+const MAX_LEGACY_IMPORT_SUBAGENTS = 64
+import type { AgentJournalItemBody } from '../../../shared/agent-session-journal-types'
+import type { NativeChatBlock, NativeChatMessage } from '../../../shared/native-chat-types'
+import { boundSubagentEntryId } from '../subagent-entry-id-bounds'
+import {
+  boundInlineText,
+  boundToolInput,
+  type JournalPayloadLimits
+} from './journal-payload-bounds'
+export const LEGACY_IMPORT_BLOCK_LIMITS: JournalPayloadLimits = { inlineHeadBytes: 16 * 1024 }
+
+export function legacyItemBody(
+  message: NativeChatMessage,
+  limits?: JournalPayloadLimits
+): AgentJournalItemBody {
+  const only = message.blocks.length === 1 ? message.blocks[0] : undefined
+  if (only?.type === 'tool-call') {
+    // Bound adoption before epoch publication; catch-up uses whole-batch admission.
+    return {
+      kind: 'tool-call',
+      name: only.name,
+      input: limits ? boundToolInput(only.input, limits) : only.input,
+      ...(only.callId !== undefined ? { callId: only.callId } : {}),
+      state: 'completed'
+    }
+  }
+  return {
+    kind: 'message',
+    role: message.role,
+    blocks: limits ? message.blocks.map((block) => boundBlock(block, limits)) : message.blocks
+  }
+}
+
+export function boundBlock(block: NativeChatBlock, limits: JournalPayloadLimits): NativeChatBlock {
+  if (block.type === 'text') {
+    return { ...block, text: boundInlineText(block.text, limits).text }
+  }
+  if (block.type === 'tool-result') {
+    return { ...block, output: boundInlineText(block.output, limits).text }
+  }
+  if (block.type === 'tool-call') {
+    return { ...block, input: boundToolInput(block.input, limits) }
+  }
+  if (block.type === 'subagent-group') {
+    return {
+      ...block,
+      agents: block.agents.slice(0, MAX_LEGACY_IMPORT_SUBAGENTS).map((agent) => ({
+        ...agent,
+        // Digest-based roster IDs keep children with shared prefixes distinct.
+        id: boundSubagentEntryId(agent.id),
+        label: boundInlineText(agent.label, limits).text
+      }))
+    }
+  }
+  return block
+}
diff --git a/src/main/native-chat/agent-session-journal/journal-legacy-import-contract.ts b/src/main/native-chat/agent-session-journal/journal-legacy-import-contract.ts
new file mode 100644
index 000000000000..1f2b52c87b57
--- /dev/null
+++ b/src/main/native-chat/agent-session-journal/journal-legacy-import-contract.ts
@@ -0,0 +1,31 @@
+import type { AdoptedTranscriptSource } from './adopted-transcript-source'
+import type { AgentJournalCursor } from '../../../shared/agent-session-journal-types'
+import type { NativeChatTurnLifecycle } from '../../../shared/native-chat-types'
+import type { ResolveSessionFileOptions } from '../session-file-resolver'
+import type { JournalReplacementItem } from './journal-epoch-replacement'
+import type { JournalPayloadLimits } from './journal-payload-bounds'
+export type LegacyImportOptions = ResolveSessionFileOptions & {
+  filePath?: string
+  source?: AdoptedTranscriptSource
+  limits?: JournalPayloadLimits
+  decodedMessageIdentities?: true
+}
+
+export type LegacyImportResult =
+  | {
+      ok: true
+      epoch: string
+      cursor: AgentJournalCursor
+      imported: number
+      replaced: boolean
+    }
+  | { ok: false; error: string }
+
+export type PreparedLegacyImport =
+  | {
+      ok: true
+      items: JournalReplacementItem[]
+      sourceEmpty: boolean
+      latestTurn?: NativeChatTurnLifecycle
+    }
+  | { ok: false; error: string }
diff --git a/src/main/native-chat/agent-session-journal/journal-legacy-import.ts b/src/main/native-chat/agent-session-journal/journal-legacy-import.ts
index 930615fbc8f5..8bc3f4830bef 100644
--- a/src/main/native-chat/agent-session-journal/journal-legacy-import.ts
+++ b/src/main/native-chat/agent-session-journal/journal-legacy-import.ts
@@ -1,66 +1,54 @@
-// Build a fresh epoch: import-scoped legacy identities cannot safely share structured sequence space.
-
+import type {
+  LegacyImportOptions,
+  LegacyImportResult,
+  PreparedLegacyImport
+} from './journal-legacy-import-contract'
+import { LEGACY_IMPORT_BLOCK_LIMITS, legacyItemBody } from './journal-legacy-import-body'
 import {
   adoptedTranscriptSourceObserver,
   validateAdoptedOpenCodeSource,
   type AdoptedTranscriptSource
 } from './adopted-transcript-source'
 import type { AgentType } from '../../../shared/agent-status-types'
-import type {
-  AgentJournalCursor,
-  AgentJournalItemBody,
-  AgentJournalItemIdentity
-} from '../../../shared/agent-session-journal-types'
-import type { NativeChatBlock, NativeChatMessage } from '../../../shared/native-chat-types'
+import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-types'
+import type { NativeChatMessage, NativeChatTurnLifecycle } from '../../../shared/native-chat-types'
 import { resolveNativeChatTranscriptAgent } from '../../../shared/native-chat-agent-support'
-import { resolveSessionFilePath, type ResolveSessionFileOptions } from '../session-file-resolver'
+import { resolveSessionFilePath } from '../session-file-resolver'
 import {
   decodeClaudeTranscriptLine,
   decodeCodexTranscriptLine,
   decodeGrokTranscriptLine,
   decodeOmpTranscriptLine
 } from '../transcript-line-decoders'
+import {
+  decodePiTurnLifecycle,
+  nativeChatTurnLifecycleDecoderForAgent
+} from '../transcript-turn-lifecycle'
 import { readLegacyImportTranscript } from './journal-legacy-transcript-stream'
 import { readOpenCodeNativeChatTranscriptFull } from '../transcript-opencode'
-import { boundSubagentEntryId } from '../subagent-entry-id-bounds'
 import { createLegacyIdentityTracker } from './journal-legacy-identity'
 import { createPiTranscriptCollector } from './journal-pi-active-branch'
+import { readGrokTurnLifecycle } from '../transcript-grok-turn-lifecycle'
 import { createNewestItemWindow } from './journal-newest-item-window'
 import type { JournalReplacementItem } from './journal-epoch-replacement'
-import {
-  boundInlineText,
-  boundToolInput,
-  type JournalPayloadLimits
-} from './journal-payload-bounds'
+import type { JournalPayloadLimits } from './journal-payload-bounds'
 import type { AgentSessionJournal } from './journal-store'
+export {
+  type LegacyImportOptions,
+  type LegacyImportResult,
+  type PreparedLegacyImport
+} from './journal-legacy-import-contract'
 
-export const LEGACY_IMPORT_BLOCK_LIMITS: JournalPayloadLimits = { inlineHeadBytes: 16 * 1024 }
-
-export type LegacyImportOptions = ResolveSessionFileOptions & {
-  filePath?: string
-  source?: AdoptedTranscriptSource
-  limits?: JournalPayloadLimits
-  decodedMessageIdentities?: true
-}
+export {
+  LEGACY_IMPORT_BLOCK_LIMITS,
+  legacyItemBody,
+  boundBlock
+} from './journal-legacy-import-body'
+// Build a fresh epoch: import-scoped legacy identities cannot safely share structured sequence space.
 
 const MAX_LEGACY_IMPORT_RECORD_BYTES = 16 * 1024 * 1024
 // Keep only recent history in memory; the provider resumes the complete source transcript.
 const MAX_LEGACY_IMPORT_RETAINED_BYTES = 16 * 1024 * 1024
-const MAX_LEGACY_IMPORT_SUBAGENTS = 64
-
-export type LegacyImportResult =
-  | {
-      ok: true
-      epoch: string
-      cursor: AgentJournalCursor
-      imported: number
-      replaced: boolean
-    }
-  | { ok: false; error: string }
-
-type PreparedLegacyImport =
-  | { ok: true; items: JournalReplacementItem[]; sourceEmpty: boolean }
-  | { ok: false; error: string }
 
 export async function importLegacyTranscriptIntoJournal(input: {
   journal: AgentSessionJournal
@@ -83,6 +71,7 @@ export async function importLegacyTranscriptIntoJournal(input: {
 
 export async function prepareLegacyTranscriptImport(input: {
   agent: AgentType
+  piAfterEntry?: string
   sessionId: string
   options?: LegacyImportOptions
 }): Promise<PreparedLegacyImport> {
@@ -104,8 +93,9 @@ export async function prepareLegacyTranscriptImport(input: {
   }
 
   try {
-    const { items, consumedBytes } = await decodeReplacementItems({
+    const { items, consumedBytes, latestTurn } = await decodeReplacementItems({
       filePath,
+      piAfterEntry: input.piAfterEntry,
       transcriptAgent,
       agent: input.agent,
       sessionId: input.sessionId,
@@ -116,7 +106,12 @@ export async function prepareLegacyTranscriptImport(input: {
       decodedMessageIdentities: options.decodedMessageIdentities,
       limits
     })
-    return { ok: true, items, sourceEmpty: consumedBytes === 0 }
+    return {
+      ok: true,
+      items,
+      sourceEmpty: consumedBytes === 0,
+      ...(latestTurn ? { latestTurn } : {})
+    }
   } catch (err) {
     return { ok: false, error: err instanceof Error ? err.message : String(err) }
   }
@@ -154,7 +149,12 @@ async function prepareOpenCodeImport(input: {
     recordId: message.id
   }))
   const items = replacementItems(read.messages, identities, input.limits)
-  return { ok: true, items, sourceEmpty: read.sourceEmpty === true }
+  return {
+    ok: true,
+    items,
+    sourceEmpty: read.sourceEmpty === true,
+    ...(read.lifecycle ? { latestTurn: read.lifecycle } : {})
+  }
 }
 
 function replacementItems(
@@ -197,6 +197,7 @@ const TRANSCRIPT_DECODERS = {
 /** Bound during decode so memory follows retained history rather than source-file size. */
 async function decodeReplacementItems(input: {
   filePath: string
+  piAfterEntry?: string
   transcriptAgent: keyof typeof TRANSCRIPT_DECODERS
   agent: AgentType
   sessionId: string
@@ -204,7 +205,11 @@ async function decodeReplacementItems(input: {
   source?: AdoptedTranscriptSource
   codexSessionsDirs?: string[]
   limits: JournalPayloadLimits
-}): Promise<{ items: JournalReplacementItem[]; consumedBytes: number }> {
+}): Promise<{
+  items: JournalReplacementItem[]
+  consumedBytes: number
+  latestTurn?: NativeChatTurnLifecycle
+}> {
   const source = input.source
     ? adoptedTranscriptSourceObserver({
         agent: input.agent,
@@ -216,15 +221,31 @@ async function decodeReplacementItems(input: {
   const tracker = createLegacyIdentityTracker({
     transcriptAgent: input.transcriptAgent,
     agent: input.agent,
-    sessionId: input.sessionId
+    sessionId: input.agent === 'pi' ? input.filePath : input.sessionId
   })
   const decode = TRANSCRIPT_DECODERS[input.transcriptAgent]
   const toItem = (message: NativeChatMessage, identity: AgentJournalItemIdentity) =>
     replacementItem(message, identity, input.limits)
   const retained = createNewestItemWindow(MAX_LEGACY_IMPORT_RETAINED_BYTES)
+  const lifecycle =
+    input.agent === 'pi'
+      ? decodePiTurnLifecycle
+      : nativeChatTurnLifecycleDecoderForAgent(input.agent, true)
+  let latestTurn: NativeChatTurnLifecycle | undefined
+  const observe = (line: string, fallbackId: string) => {
+    const next = lifecycle?.(line, fallbackId)
+    if (next) {
+      latestTurn =
+        next.state === 'working' || !latestTurn ? next : { ...next, turnId: latestTurn.turnId }
+    }
+  }
   const pi =
     input.agent === 'pi'
-      ? createPiTranscriptCollector(toItem, (line, lineIndex) => tracker.identify(line, lineIndex))
+      ? createPiTranscriptCollector(
+          toItem,
+          (line, lineIndex) => tracker.identify(line, lineIndex),
+          observe
+        )
       : null
   let lineIndex = 0
   try {
@@ -237,6 +258,9 @@ async function decodeReplacementItems(input: {
       (line, fallbackId, recordId, selected = true) => {
         if (selected) {
           source?.observe(line)
+          if (!pi) {
+            observe(line, fallbackId)
+          }
         }
         const currentLineIndex = lineIndex
         lineIndex += 1
@@ -267,57 +291,27 @@ async function decodeReplacementItems(input: {
       await source?.validate()
     }
     if (pi) {
-      await pi.project(retained.push)
+      await pi.project(retained.push, input.piAfterEntry)
     }
-    return { items: retained.items(), consumedBytes }
+    if (input.agent === 'grok') {
+      latestTurn = await readGrokTurnLifecycle(input.filePath, input.sessionId)
+      const user = retained
+        .items()
+        .findLast((item) => item.body.kind === 'message' && item.body.role === 'user')
+      if (
+        latestTurn &&
+        latestTurn.state !== 'working' &&
+        user?.observedAt != null &&
+        latestTurn.timestamp != null &&
+        latestTurn.timestamp < user.observedAt
+      ) {
+        latestTurn = undefined
+      }
+    }
+    return { items: retained.items(), consumedBytes, ...(latestTurn ? { latestTurn } : {}) }
   } finally {
     pi?.close()
   }
 }
 
-export function legacyItemBody(
-  message: NativeChatMessage,
-  limits?: JournalPayloadLimits
-): AgentJournalItemBody {
-  const only = message.blocks.length === 1 ? message.blocks[0] : undefined
-  if (only?.type === 'tool-call') {
-    // Bound adoption before epoch publication; catch-up uses whole-batch admission.
-    return {
-      kind: 'tool-call',
-      name: only.name,
-      input: limits ? boundToolInput(only.input, limits) : only.input,
-      ...(only.callId !== undefined ? { callId: only.callId } : {}),
-      state: 'completed'
-    }
-  }
-  return {
-    kind: 'message',
-    role: message.role,
-    blocks: limits ? message.blocks.map((block) => boundBlock(block, limits)) : message.blocks
-  }
-}
-
 /** Bound every bulk-bearing block, including mixed-message tool calls; the transcript retains full content. */
-function boundBlock(block: NativeChatBlock, limits: JournalPayloadLimits): NativeChatBlock {
-  if (block.type === 'text') {
-    return { ...block, text: boundInlineText(block.text, limits).text }
-  }
-  if (block.type === 'tool-result') {
-    return { ...block, output: boundInlineText(block.output, limits).text }
-  }
-  if (block.type === 'tool-call') {
-    return { ...block, input: boundToolInput(block.input, limits) }
-  }
-  if (block.type === 'subagent-group') {
-    return {
-      ...block,
-      agents: block.agents.slice(0, MAX_LEGACY_IMPORT_SUBAGENTS).map((agent) => ({
-        ...agent,
-        // Digest-based roster IDs keep children with shared prefixes distinct.
-        id: boundSubagentEntryId(agent.id),
-        label: boundInlineText(agent.label, limits).text
-      }))
-    }
-  }
-  return block
-}
diff --git a/src/main/native-chat/agent-session-journal/journal-pi-active-branch.ts b/src/main/native-chat/agent-session-journal/journal-pi-active-branch.ts
index 37b30d3f1b9b..e41989c7308c 100644
--- a/src/main/native-chat/agent-session-journal/journal-pi-active-branch.ts
+++ b/src/main/native-chat/agent-session-journal/journal-pi-active-branch.ts
@@ -16,10 +16,11 @@ function closePiImportDatabase(db: Database.Database | null): void {
 // Spool the full tree until the saved leaf identifies the active branch.
 export function createPiTranscriptCollector<T>(
   toItem: (message: NativeChatMessage, identity: AgentJournalItemIdentity) => T,
-  identify: (line: string, lineIndex: number) => AgentJournalItemIdentity
+  identify: (line: string, lineIndex: number) => AgentJournalItemIdentity,
+  observeSelected?: (line: string, fallbackId: string) => void
 ): {
   record(line: string, fallbackId: string, lineIndex: number): void
-  project(keep: (item: T) => void): Promise<void>
+  project(keep: (item: T) => void, afterEntry?: string): Promise<void>
   close(): void
 } {
   let db: Database.Database
@@ -113,7 +114,7 @@ export function createPiTranscriptCollector<T>(
         db.exec('COMMIT; BEGIN')
       }
     },
-    async project(keep) {
+    async project(keep, afterEntry) {
       db.exec('COMMIT')
       if (leafId === null) {
         return
@@ -147,6 +148,52 @@ export function createPiTranscriptCollector<T>(
         }
       }
       db.exec('COMMIT')
+      if (observeSelected) {
+        let processedRows = 0
+        let processedBytes = 0
+        let sliceStartedAt = performance.now()
+        for (const row of db
+          .prepare(
+            'SELECT raw_line, fallback_id FROM entries WHERE branch_depth IS NOT NULL ORDER BY branch_depth DESC'
+          )
+          .iterate()) {
+          if (typeof row.raw_line === 'string' && typeof row.fallback_id === 'string') {
+            observeSelected(row.raw_line, row.fallback_id)
+            processedRows += 1
+            processedBytes += Buffer.byteLength(row.raw_line, 'utf8')
+            if (
+              processedBytes >= 1024 * 1024 ||
+              performance.now() - sliceStartedAt >= 8 ||
+              processedRows >= 256
+            ) {
+              await new Promise<void>((resolve) => setImmediate(resolve))
+              processedRows = 0
+              processedBytes = 0
+              sliceStartedAt = performance.now()
+            }
+          }
+        }
+      }
+      let throughDepth = depth - 1
+      if (afterEntry) {
+        const visited = new Set<string>()
+        let boundary: string | null = afterEntry
+        for (;;) {
+          if (!boundary || visited.has(boundary)) {
+            throw new Error('Pi history claim is not in its tree')
+          }
+          visited.add(boundary)
+          const row = byId.get(boundary)
+          if (!row) {
+            throw new Error('Pi history claim is not in its tree')
+          }
+          if (typeof row.branch_depth === 'number') {
+            throughDepth = row.branch_depth - 1
+            break
+          }
+          boundary = typeof row.parent_id === 'string' ? row.parent_id : null
+        }
+      }
       const selected = db.prepare(`SELECT raw_line, fallback_id, line_index FROM entries
         WHERE branch_depth IS NOT NULL AND branch_depth >= ? AND branch_depth <= ?
         ORDER BY branch_depth DESC`)
@@ -154,7 +201,7 @@ export function createPiTranscriptCollector<T>(
         let processedRows = 0
         let processedBytes = 0
         let sliceStartedAt = performance.now()
-        for (const row of selected.iterate(from, through)) {
+        for (const row of selected.iterate(from, Math.min(through, throughDepth))) {
           if (
             typeof row.raw_line !== 'string' ||
             typeof row.fallback_id !== 'string' ||
diff --git a/src/main/native-chat/agent-session-wire/__fixtures__/claude-cli-switch-2.1.302.jsonl b/src/main/native-chat/agent-session-wire/__fixtures__/claude-cli-switch-2.1.302.jsonl
new file mode 100644
index 000000000000..2b6802a71956
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/__fixtures__/claude-cli-switch-2.1.302.jsonl
@@ -0,0 +1,4 @@
+{"type":"user","uuid":"124e6d1a-016e-46a5-8113-6a893a97b769","parentUuid":null,"sessionId":"402eff2b-84dc-4e05-8fe8-49fffb2cd3c3","timestamp":"2026-10-21T18:28:43.188Z","version":"2.1.302","message":{"role":"user","content":"Think briefly, then read notes.txt with the Read tool, then answer in two short paragraphs what it says."}}
+{"type":"assistant","uuid":"ec769311-5ca1-4473-9aef-6eb98c796aea","parentUuid":"b9d356ff-ca87-4328-963f-6d7f37e3b3a2","sessionId":"402eff2b-84dc-4e05-8fe8-49fffb2cd3c3","timestamp":"2026-10-21T18:28:47.931Z","version":"2.1.302","message":{"model":"claude-opus-5-5","id":"msg_011CgFrcPqGdULP5eSXarKBB","type":"message","role":"assistant","content":[{"type":"tool_use","id":"toolu_01JdDiY9LSSGER1aErtVjSW3","name":"Read","input":{"file_path":"/workspace/notes.txt"},"caller":{"type":"direct"}}],"container":null,"stop_reason":"tool_use","stop_sequence":null,"stop_details":null,"usage":{"input_tokens":2,"cache_creation_input_tokens":34604,"cache_read_input_tokens":0,"output_tokens":90,"output_tokens_details":{"thinking_tokens":0},"server_tool_use":{"web_search_requests":0,"web_fetch_requests":0},"service_tier":"standard","cache_creation":{"ephemeral_1h_input_tokens":0,"ephemeral_5m_input_tokens":34604},"inference_geo":"global","iterations":[],"speed":"standard","fallback_credit":null},"diagnostics":null,"context_management":null}}
+{"type":"user","uuid":"0b87375c-fa56-4da1-813d-82e9543630bf","parentUuid":"ec769311-5ca1-4473-9aef-6eb98c796aea","sessionId":"402eff2b-84dc-4e05-8fe8-49fffb2cd3c3","timestamp":"2026-10-21T18:28:47.959Z","version":"2.1.302","message":{"role":"user","content":[{"tool_use_id":"toolu_01JdDiY9LSSGER1aErtVjSW3","type":"tool_result","content":"1\thello\n2\t"}]}}
+{"type":"assistant","uuid":"0751a3af-972a-47fb-b4b4-aebfdc7ada82","parentUuid":"605a2f23-e76a-489a-a57c-03471e5d54e8","sessionId":"402eff2b-84dc-4e05-8fe8-49fffb2cd3c3","timestamp":"2026-10-21T18:28:58.471Z","version":"2.1.302","message":{"model":"claude-opus-5-5","id":"msg_011CgFrdCBJf5xTJsM8xiacb","type":"message","role":"assistant","content":[{"type":"text","text":"NOTHING NEEDED: I read notes.txt and nothing is running.\n\n`notes.txt` holds one line, the word \"hello\", followed by a newline.\n\nThat's all it says. There are no instructions, notes about the lane or anything else to act on."}],"container":null,"stop_reason":"end_turn","stop_sequence":null,"stop_details":null,"usage":{"input_tokens":2,"cache_creation_input_tokens":126,"cache_read_input_tokens":34604,"output_tokens":81,"output_tokens_details":{"thinking_tokens":0},"server_tool_use":{"web_search_requests":0,"web_fetch_requests":0},"service_tier":"standard","cache_creation":{"ephemeral_1h_input_tokens":0,"ephemeral_5m_input_tokens":126},"inference_geo":"global","iterations":[],"speed":"standard","fallback_credit":null},"diagnostics":null,"context_management":null}}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition.ts
index 64eb45870317..58c1b7d3ffa9 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition.ts
@@ -97,12 +97,15 @@ export async function acquireOwner(
     } else if (!sameOwnerProcess(record.lease.ownerProcess, acquired.process)) {
       throw new Error('agent_session_ownership_unknown')
     }
-    const proved = await input.store.proveOwner({
-      sessionId: record.sessionId,
-      fence,
-      ...(acquired.link ? { link: acquired.link } : {}),
-      now: input.now()
-    })
+    const proved = await input.store.proveOwner(
+      {
+        sessionId: record.sessionId,
+        fence,
+        ...(acquired.link ? { link: acquired.link } : {}),
+        now: input.now()
+      },
+      input.checkBeforeAcquire
+    )
     return { record: proved, acquisitionGeneration: acquired.acquisitionGeneration }
   } catch (error) {
     if (isAgentSessionPreSpawnError(error)) {
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-agent-start.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-agent-start.ts
index b91641bc746b..4b8c36f4f504 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-agent-start.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-agent-start.ts
@@ -62,6 +62,7 @@ const AGENT_START_CALLER_KEY = 'trusted-local:agent-start'
 
 export type StructuredAgentSessionStartClaim = {
   outcome: Promise<StructuredAgentSessionResumeOutcome>
+  ownsStart?: true
 }
 
 /** Claim under the ordered decision; wait outside its lane. */
@@ -69,7 +70,8 @@ export function claimStructuredAgentSessionAgent(
   context: StructuredAgentSessionAttachContext,
   sessionId: string,
   startedFor?: string,
-  check?: () => void
+  check?: () => void,
+  switchStart = false
 ): StructuredAgentSessionStartClaim {
   try {
     context.deps.store.requireWritableRecord(sessionId)
@@ -92,11 +94,14 @@ export function claimStructuredAgentSessionAgent(
     return { outcome: Promise.resolve({ ok: true }) }
   }
   return {
+    ownsStart: true,
     outcome: registerStructuredAgentSessionStart(
       context,
       sessionId,
       startedFor,
-      (lock, attemptId) => runStart(context, sessionId, startedFor, lock, attemptId, check)
+      (lock, attemptId) =>
+        runStart(context, sessionId, startedFor, lock, attemptId, check, switchStart),
+      switchStart
     )
   }
 }
@@ -124,11 +129,13 @@ export function startStructuredAgentSessionAgentForOperation(
 export function claimOperationStart(
   context: StructuredAgentSessionAttachContext,
   sessionId: string,
-  check?: () => void
+  check?: () => void,
+  switchStart = false
 ): StructuredAgentSessionStartClaim {
   check?.()
-  const claim = claimStructuredAgentSessionAgent(context, sessionId, undefined, check)
+  const claim = claimStructuredAgentSessionAgent(context, sessionId, undefined, check, switchStart)
   return {
+    ...claim,
     outcome: claim.outcome.catch((error: unknown) => {
       context.deps.logger.warn('starting the agent for an operation failed', {
         scope: 'operation-agent-start',
@@ -146,9 +153,10 @@ async function runStart(
   startedFor: string | undefined,
   lock: StructuredAgentSessionAttachLock,
   attemptId: string,
-  check?: () => void
+  check?: () => void,
+  switchStart = false
 ): Promise<StructuredAgentSessionResumeOutcome> {
-  if (context.waitSwitchPhysical) {
+  if (!switchStart && context.waitSwitchPhysical) {
     await lock.wait(context.waitSwitchPhysical(sessionId))
   }
   // Never start beside a closing child; unverifiable exit refuses the restart.
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.test.ts
index 6b177a31bebd..71f5ca8ccb69 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.test.ts
@@ -6,6 +6,10 @@ import { agentSessionSwitchDeadline } from '../../../shared/agent-session-switch
 import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding'
 import { createTrackedJournalOpener } from '../agent-session-journal/journal-host-database-test-support'
 import { readCodexHistoryJournalView } from '../../codex/codex-history-journal-view'
+import {
+  captureSwitchStoppedCliTurn,
+  catchUpSwitchedCliTranscript
+} from './structured-agent-session-switch-import'
 import { catchUpStructuredSessionAtRest } from './structured-agent-session-at-rest-catch-up'
 
 const journals = createTrackedJournalOpener()
@@ -140,3 +144,43 @@ it.each([100, 1000])(
     )
   }
 )
+
+it.each([false, true])(
+  'commits explicit stopped-turn evidence through import, preserving a terminal verdict=%s',
+  async (completedBeforeExit) => {
+    let journal = await journals.open(options())
+    const filePath = join(root, 'stopped.jsonl')
+    const source = { agent: 'codex' as const, sessionId: threadId, filePath }
+    const deadline = agentSessionSwitchDeadline()
+    deadlines.push(deadline)
+    await writeFile(filePath, transcript(false))
+    const stopped = await captureSwitchStoppedCliTurn(source, true, deadline)
+    expect(stopped?.turnId).toBe('turn-cli-1')
+    if (completedBeforeExit) {
+      await writeFile(filePath, transcript(true))
+    }
+    await catchUpStructuredSessionAtRest({
+      journal,
+      threadId,
+      filePath,
+      fence: 1,
+      deadline,
+      stoppedTurnId: stopped?.turnId
+    })
+    await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline, stopped })
+    const snapshot = journal.snapshot()
+    expect(
+      snapshot.items.filter((item) => item.body.kind === 'turn').map((item) => item.body)
+    ).toEqual([
+      expect.objectContaining({
+        turnId: 'turn-cli-1',
+        state: completedBeforeExit ? 'completed' : 'interrupted'
+      })
+    ])
+    expect(snapshot.items.filter((item) => item.body.kind === 'message')).toHaveLength(2)
+    await journal.close()
+    journal = await journals.open(options())
+    await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline, stopped })
+    expect(journal.snapshot()).toEqual(snapshot)
+  }
+)
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.ts
index ffa3b23b8405..339df19ee6c4 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.ts
@@ -30,6 +30,8 @@ export async function catchUpStructuredSessionAtRest(input: {
   filePath: string
   fence: number
   deadline: AgentSessionSwitchDeadline
+  stoppedTurnId?: string
+  check?: () => void
 }): Promise<void> {
   const { journal, threadId, deadline } = input
   const view = readCodexHistoryJournalView(journal, threadId)
@@ -146,7 +148,7 @@ export async function catchUpStructuredSessionAtRest(input: {
     })
   }
   // Incomplete source turns must remain retryable rather than being declared covered.
-  if (include) {
+  if (include && turn !== input.stoppedTurnId) {
     throw agentSessionRefusalError('agent_session_operation_invalid', {
       reason: 'messagesUnsettled'
     })
@@ -160,6 +162,7 @@ export async function catchUpStructuredSessionAtRest(input: {
     fence: input.fence,
     plan: () => {
       deadline.check()
+      input.check?.()
       if (!sameCodexHistoryJournalView(view, readCodexHistoryJournalView(journal, threadId))) {
         throw agentSessionRefusalError('agent_session_operation_invalid', {
           reason: 'messagesUnsettled'
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-chat-stop.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-chat-stop.ts
index bc1bf621978e..d223e958b1b8 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-chat-stop.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-chat-stop.ts
@@ -1,6 +1,4 @@
-// Atomically accept Stop/withdrawals/receipt before acting on the captured target.
-// Queue session-ending wind-down in the mutation’s tick; saved failures answer from the receipt.
-
+import { acceptCapturedChatStop } from './structured-agent-session-stop-acceptance'
 import type {
   AgentSessionCancelResult,
   AgentSessionMutationEnvelope,
@@ -20,7 +18,6 @@ import {
   openForWrite,
   structuredAgentSessionFailureWordsContext
 } from './structured-agent-session-send-preparation'
-import { acceptChatStop, acceptStopTarget } from './structured-agent-session-stop-acceptance'
 import {
   noteStructuredAgentSessionStopUnconfirmed,
   writeStructuredAgentSessionStopNote
@@ -38,6 +35,8 @@ import {
   structuredAgentSessionStopNoteIdentity,
   structuredAgentSessionCommandWasStopped
 } from './structured-agent-session-command-turn'
+// Atomically accept Stop/withdrawals/receipt before acting on the captured target.
+// Queue session-ending wind-down in the mutation’s tick; saved failures answer from the receipt.
 
 type ChatStopOutcome = TurnOutcome<AgentSessionCancelResult>
 
@@ -51,6 +50,8 @@ export function mutateWithChatStop<TValue>(
     turnId?: string
     stoppedPrePrompt?: boolean
     stoppedSend?: boolean
+    onAccepted?: (child: ChatStopTarget['child']) => void
+    waitForShutdown?: boolean
   },
   plan: MutationPlan<TValue>,
   run: (
@@ -78,46 +79,6 @@ export function mutateWithChatStop<TValue>(
       error
     })
   // Failed durable acceptance must leave the agent running.
-  const accept = async (
-    ctx: AgentSessionTurnContext,
-    target: ChatStopTarget
-  ): Promise<TurnOutcome<{ settled: boolean; turnId: string | null }>> => {
-    if (!target.marks) {
-      const accepted = await acceptStopTarget(ctx)
-      return accepted.ok ? { ok: true, value: { settled: false, turnId: null } } : accepted
-    }
-    const sinceStop = ctx.journal.queuedMessages.userStopInForce()?.sequence
-    const handed = ctx.journal
-      .submissions()
-      .some(
-        (entry) =>
-          entry.fence === ctx.fence &&
-          (entry.handoverRecorded !== true || entry.handedOverAt !== undefined) &&
-          (entry.dispatchState === 'pending' ||
-            (entry.dispatchState === 'unknown' && !entry.recovered)) &&
-          (sinceStop === undefined || (entry.submittedSequence ?? -1) > sinceStop)
-      )
-    const accepted = await acceptChatStop(ctx, {
-      event: {
-        reason: 'user-stop',
-        caller: caller.callerKey,
-        ...(target.eventTurnId !== null ? { turnId: target.eventTurnId } : {})
-      },
-      fence: ctx.fence
-    })
-    return accepted.ok
-      ? {
-          ok: true,
-          value: {
-            settled:
-              (accepted.value.withdrawn?.length ?? (target.queued ? 1 : 0)) > 0 ||
-              handed ||
-              params.stoppedSend === true,
-            turnId: accepted.value.turnId
-          }
-        }
-      : accepted
-  }
   const act = async (
     ctx: AgentSessionTurnContext,
     target: ChatStopTarget,
@@ -229,10 +190,11 @@ export function mutateWithChatStop<TValue>(
       target.turnId !== null &&
       isStructuredAgentSessionCommandTurnId(target.turnId) &&
       structuredAgentSessionCommandWasStopped(ctx.journal, target.turnId)
-    const accepted = await accept(ctx, target)
+    const accepted = await acceptCapturedChatStop(caller.callerKey, params.stoppedSend, ctx, target)
     if (!accepted.ok) {
       return accepted
     }
+    params.onAccepted?.(target.child)
     for (const abort of operations) {
       abort()
       reached = true
@@ -309,5 +271,10 @@ export function mutateWithChatStop<TValue>(
     }
   })
   void shutdown.catch(logChildEnd)
-  return result
+  return params.waitForShutdown
+    ? result.then(async (answer) => {
+        await shutdown
+        return answer
+      })
+    : result
 }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-conversation-lifetime.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-conversation-lifetime.ts
index 09e5d39ec1d5..307b0177bb37 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-conversation-lifetime.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-conversation-lifetime.ts
@@ -25,8 +25,6 @@ import { deferredStructuredAgentSessionLogger } from './structured-agent-session
 import type { ExecutionHostId } from '../../../shared/execution-host'
 import * as sleep from './structured-agent-session-workspace-sleep-stop'
 import type { StructuredAgentSessionExpiredStartup } from './structured-agent-session-startup-attempt'
-import * as switchAdmission from './structured-agent-session-switch-admission'
-import type { AgentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
 import { settleStructuredAgentSessionFailedStart } from './structured-agent-session-failed-start-settlement'
 import { createStructuredAgentSessionSwitchCommands } from './structured-agent-session-switch-commands'
 
@@ -268,34 +266,6 @@ export function createStructuredAgentSessionConversationLifetime(
         }
         await holdStopClose(sessionId, () => stopAgent(sessionId, { cause }))
       })
-    },
-    /** Idle admission and proven-exit stop share the session queue. */
-    switchToTerminal: (id: string, deadline?: AgentSessionSwitchDeadline): Promise<void> =>
-      serialize(id, () =>
-        switchAdmission.stopIdleStructuredAgentSessionForSwitch({
-          session: sessions.get(id),
-          delivering: host.deliveryActive(id),
-          idleSweep,
-          stop: async () => {
-            if (!deadline) {
-              return holdStopClose(id, () => stopAgent(id, { cause: 'user-close' }))
-            }
-            deadline.check()
-            await stopStructuredAgentSessionAgentUnderSerialize(
-              host.context(),
-              id,
-              { cause: 'user-close' },
-              deadline.check
-            )
-            deadline.check()
-            await closeConversation(id, false, true)
-          },
-          deps: deps(),
-          sessionId: id,
-          check: deadline?.check,
-          background: host.childWorkOpen(id),
-          ownCommand: deadline !== undefined
-        })
-      )
+    }
   }
 }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host-mutation-wiring.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host-mutation-wiring.ts
index 24045ddcc073..43aeba16a56f 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-host-mutation-wiring.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host-mutation-wiring.ts
@@ -47,8 +47,8 @@ export function createStructuredAgentSessionHostMutationContext(
     childWorkIncomplete: input.clientDelivery.childWorkIncomplete,
     serialize: input.serialize,
     openConversation: input.conversationDelivery.open,
-    claimAgent: (sessionId, check) =>
-      agentStart.claimOperationStart(input.attachContext(), sessionId, check),
+    claimAgent: (sessionId, check, switchStart) =>
+      agentStart.claimOperationStart(input.attachContext(), sessionId, check, switchStart),
     startFlights: input.runtimeState.startFlights,
     startupAttempts: input.runtimeState.startupAttempts,
     deliveryOrder: input.runtimeState.deliveryOrder,
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 119d89fbb30f..52bf7291952c 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
@@ -2,7 +2,10 @@ import { latestNativeChatUsageLimitCut } from '../../../shared/native-chat/nativ
 import { refuse } from '../../../shared/agent-session-wire'
 import { contextStructuredAgentSessionCurrentWork } from './structured-agent-session-current-work'
 import { shouldQueueStructuredAgentSessionSend } from './structured-agent-session-queued-messages'
-import { startStructuredAgentSessionForSwitch } from './structured-agent-session-switch-to-chat'
+import {
+  startStructuredAgentSessionForSwitch,
+  openStructuredAgentSessionForSwitch
+} from './structured-agent-session-switch-to-chat'
 import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types'
 import type {
   AgentSessionCancelResult,
@@ -131,6 +134,8 @@ export function cancelStructuredAgentSessionTurn(
     scope?: 'background-tasks'
     taskId?: string
     prompt?: { itemId: string; expectedRevision: number }
+    onAccepted?: Parameters<typeof mutateWithChatStop>[2]['onAccepted']
+    waitForShutdown?: boolean
   }
 ): Promise<AgentSessionMutationResult<AgentSessionCancelResult>> {
   if (params.scope) {
@@ -296,6 +301,8 @@ export function structuredAgentSessionMutationDelegates(
     ) => readStructuredAgentSessionOptions(context(), sessionId, reader),
     settleLateDispatch: (input: Parameters<typeof settleStructuredAgentSessionLateDispatch>[1]) =>
       settleStructuredAgentSessionLateDispatch(context(), input),
+    openSwitchToChat: (sessionId: string, deadline?: AgentSessionSwitchDeadline) =>
+      openStructuredAgentSessionForSwitch(context(), sessionId, deadline),
     switchToChat: (sessionId: string, deadline?: AgentSessionSwitchDeadline) =>
       startStructuredAgentSessionForSwitch(context(), sessionId, deadline)
   }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host-types.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host-types.ts
index 63de97654180..f577e9520867 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-host-types.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host-types.ts
@@ -166,10 +166,9 @@ export type StructuredAgentSessionHostDeps = {
   hasOpenDispatch?: (
     record: Pick<AgentSessionRecord, 'sessionId' | 'location' | 'conversationCommand'>
   ) => boolean
-  /** Explicit switch admission also includes direct chat assignments, even at rest. */
-  hasOwedSwitchWork?: (record: AgentSessionRecord) => boolean
   /** Advisory tab-hidden notice; failures are logged. */
   onSessionTabHidden?: (sessionId: string) => void
+  captureSessionSwitchStop?: (sessionId: string) => ((proven: boolean) => void) | undefined
   /** Throws while a terminal may still write the record's head conversation; run before a spawn. */
   assertNoTerminalWriter?: (record: AgentSessionRecord) => Promise<void>
   /** Where every failure the host carries on past is reported. Required: a host without one would
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
index 1496bd546656..062b388d3fe4 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
@@ -1,4 +1,4 @@
-import { catchUpStructuredSessionAtRest } from './structured-agent-session-at-rest-catch-up'
+import { structuredAgentSessionSwitchSource } from './structured-agent-session-switch-source'
 import { continuationContextReader as contextReader } from './structured-agent-session-continuation-context'
 import type { AgentSessionRewindParams } from '../../../shared/agent-session-rewind'
 import { rewindStructuredAgentSession } from './structured-agent-session-rewind'
@@ -28,8 +28,10 @@ import * as conversation from './structured-agent-session-host-delivery'
 import { wireStructuredAgentSessionQueuedMessages as wireQueuedMessages } from './structured-agent-session-queued-wiring'
 import * as sessionLogger from './structured-agent-session-logger'
 import { StructuredAgentSessionHostContexts } from './structured-agent-session-host-contexts'
-import type { AgentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
-
+import {
+  agentSessionSwitchDeadline,
+  type AgentSessionSwitchDeadline
+} from '../../../shared/agent-session-switch-execution'
 // Serialize durable mutations per conversation; open at rest and start a child only when work needs it.
 
 export type { StructuredAgentSessionHostDeps } from './structured-agent-session-host-types'
@@ -176,30 +178,50 @@ export class StructuredAgentSessionHost extends StructuredAgentSessionHostContex
   /** Release resources; user-close cancels cut turns, while eviction leaves their failure reportable. */
   close: lifetime.StructuredAgentSessionConversationLifetime['close'] = (sessionId, cause) =>
     this.lifetime.close(sessionId, cause)
-  switchToTerminal: lifetime.StructuredAgentSessionConversationLifetime['switchToTerminal'] = (
-    ...args
-  ) => this.lifetime.switchToTerminal(...args)
+  switchToTerminal = async (sessionId: string, deadline?: AgentSessionSwitchDeadline) => {
+    const budget = deadline ?? agentSessionSwitchDeadline()
+    try {
+      await this.stopForSwitch(sessionId, { callerKey: 'trusted-local:session-switch' }, budget)
+    } finally {
+      if (!deadline) {
+        budget.dispose()
+      }
+    }
+  }
   runSwitch: lifetime.StructuredAgentSessionConversationLifetime['runSwitch'] = (...args) =>
     this.lifetime.runSwitch(...args)
   adoptSwitch = (from: string, to: string) => this.lifetime.adoptSwitch(from, to)
   switchGeneration = (id: string) => this.lifetime.switchGeneration(id)
   retainSwitch = (id: string) => this.lifetime.retainSwitch(id)
-  trackSwitchPhysical = <T>(id: string, work: Promise<T>) =>
-    this.lifetime.trackSwitchPhysical(id, work)
-  presentSwitch: lifetime.StructuredAgentSessionConversationLifetime['presentSwitch'] = (...args) =>
-    this.lifetime.presentSwitch(...args)
-  openedSwitch: lifetime.StructuredAgentSessionConversationLifetime['openedSwitch'] = (...args) =>
-    this.lifetime.openedSwitch(...args)
-  captureSwitchWork = (id: string, deadline: AgentSessionSwitchDeadline) => {
-    const count = this.deps.store.admittedSendCount(id)
-    return () =>
-      !deadline.signal.aborted &&
-      deadline.remaining() > 0 &&
-      this.deps.store.admittedSendCount(id) === count &&
-      !this.sessions.get(id)?.child &&
-      !this.conversationDelivery.loop.isRunning(id) &&
-      !this.runtimeState.startFlights.has(id)
-  }
+  guardSwitchWork = (id: string, current: () => boolean) =>
+    this.lifetime.guardSwitchWork(id, current)
+  trackSwitchPhysical = <T>(id: string, work: Promise<T>, recover?: () => Promise<void>) =>
+    this.lifetime.trackSwitchPhysical(id, work, recover)
+
+  /** Ordinary Stop owns interruption; only its captured child may be physically closed. */
+
+  private switchSource = () =>
+    structuredAgentSessionSwitchSource({
+      deps: this.deps,
+      cancel: this.cancel,
+      switchGeneration: this.switchGeneration,
+      now: this.now,
+      lifetime: this.lifetime,
+      sessions: this.sessions,
+      serialize: this.serialize,
+      subscribers: this.subscribers
+    })
+  stopForSwitch = (
+    ...args: Parameters<ReturnType<typeof structuredAgentSessionSwitchSource>['stopForSwitch']>
+  ) => this.switchSource().stopForSwitch(...args)
+  refreshSwitchTranscript = (
+    ...args: Parameters<
+      ReturnType<typeof structuredAgentSessionSwitchSource>['refreshSwitchTranscript']
+    >
+  ) => this.switchSource().refreshSwitchTranscript(...args)
+  captureSwitchWork = (
+    ...args: Parameters<ReturnType<typeof structuredAgentSessionSwitchSource>['captureSwitchWork']>
+  ) => this.switchSource().captureSwitchWork(...args)
   switchExecuting = (id: string) => this.lifetime.switchExecuting(id)
 
   supportsCreate = (location: AgentSessionExecutionLocation, agent: string): boolean =>
@@ -272,6 +294,7 @@ export class StructuredAgentSessionHost extends StructuredAgentSessionHostContex
   readOptions = this.mutations.readOptions
   /** A terminal's conversation moves into this chat: its agent starts and is ready, or why not. */
   switchToChat = this.mutations.switchToChat
+  openSwitchToChat = this.mutations.openSwitchToChat
 
   rewind = (caller: HostTypes.StructuredAgentSessionCaller, params: AgentSessionRewindParams) =>
     rewindStructuredAgentSession(this.mutationContext(), this.attachContext(), caller, params)
@@ -294,22 +317,6 @@ export class StructuredAgentSessionHost extends StructuredAgentSessionHostContex
   journalSnapshot = async (sessionId: string) =>
     (await this.lifetime.conversation(sessionId)).journal.snapshot()
 
-  refreshSwitchTranscript = async (
-    sessionId: string,
-    source: { sessionId: string; filePath: string },
-    deadline: AgentSessionSwitchDeadline
-  ) => {
-    const session = await this.lifetime.conversation(sessionId)
-    await catchUpStructuredSessionAtRest({
-      journal: session.journal,
-      threadId: source.sessionId,
-      filePath: source.filePath,
-      fence: this.deps.store.getRecord(sessionId)?.lease.runtimeFence ?? 0,
-      deadline
-    })
-    this.subscribers.publish(sessionId, session.journal)
-  }
-
   currentWork = this.clientDelivery.readCurrentWork
   readCurrentRequests: StructuredAgentSessionBackgroundTaskChannel['currentRequests'] = (...args) =>
     this.backgroundTasks.currentRequests(...args)
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-mutation-context.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-mutation-context.ts
index d6f5aeb54e83..f8abe04d461e 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-mutation-context.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-mutation-context.ts
@@ -44,7 +44,11 @@ export type StructuredAgentSessionMutationContext = {
   /** Open within the caller’s existing serialization. */
   openConversation: (sessionId: string) => Promise<StructuredAgentSessionHostSession | null>
   /** Claim inside serialization; await the result outside. */
-  claimAgent: (sessionId: string, check?: () => void) => StructuredAgentSessionStartClaim
+  claimAgent: (
+    sessionId: string,
+    check?: () => void,
+    switchStart?: boolean
+  ) => StructuredAgentSessionStartClaim
   startFlights: Pick<StructuredAgentSessionStartFlights, 'get'>
   startupAttempts: Pick<StructuredAgentSessionStartupAttempts, 'readiness'>
   deliveryOrder: StructuredAgentSessionDeliveryOrder
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-start-attempts.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-start-attempts.ts
index fe56b9117888..252d20ee2fff 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-start-attempts.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-start-attempts.ts
@@ -31,7 +31,8 @@ export function registerStructuredAgentSessionStart(
   run: (
     lock: StructuredAgentSessionAttachLock,
     attemptId: string
-  ) => Promise<StructuredAgentSessionResumeOutcome>
+  ) => Promise<StructuredAgentSessionResumeOutcome>,
+  recordUnrequestedFailure = false
 ): Promise<StructuredAgentSessionResumeOutcome> {
   const { startFlights: flights, startupAttempts: attempts, acquireAborts } = context.runtimeState
   const acquire = acquireAborts.begin(sessionId)
@@ -146,7 +147,10 @@ export function registerStructuredAgentSessionStart(
                   : { aborted: true as const })
               }
             : result
-          if (!settled.aborted && (startedFor !== undefined || children.length > 0)) {
+          if (
+            !settled.aborted &&
+            (startedFor !== undefined || children.length > 0 || recordUnrequestedFailure)
+          ) {
             const session = context.sessions.get(sessionId)
             if (session) {
               const record = context.deps.store.getRecord(sessionId)
@@ -163,6 +167,9 @@ export function registerStructuredAgentSessionStart(
                 },
                 startedFor ?? null
               )
+              if (failureItemId) {
+                context.subscribers.publish(sessionId, session.journal)
+              }
               return { ...settled, ...(failureItemId ? { failureItemId } : {}) }
             }
           }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-stop-acceptance.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-stop-acceptance.ts
index 4d1c0a0b98ba..b9e7e6ed76ee 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-stop-acceptance.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-stop-acceptance.ts
@@ -1,5 +1,5 @@
-// Commit Stop receipt/effects before interrupting; failed acceptance acts on nothing and retries never retarget.
-
+import type { ChatStopTarget } from './structured-agent-session-chat-stop-target'
+import type { TurnOutcome } from './structured-agent-session-turns'
 import { agentSessionFailureSentence } from '../../../shared/agent-session-failure-words'
 import { refuse, type AgentSessionCancelResult } from '../../../shared/agent-session-wire'
 import {
@@ -25,6 +25,7 @@ import type {
   AgentSessionOperationReceipt,
   AgentSessionTurnContext
 } from './structured-agent-session-turns'
+// Commit Stop receipt/effects before interrupting; failed acceptance acts on nothing and retries never retarget.
 
 /** Preserve the first committed result, including no-op; later failures answer from that receipt. */
 export const STOP_COMMAND_RECEIPT: MutationCommandReceipt<AgentSessionCancelResult> = {
@@ -151,3 +152,46 @@ export function stopNotSaved(
   }
   return { ok: false, refusal: notSaved.refusal() }
 }
+
+export async function acceptCapturedChatStop(
+  callerKey: string,
+  stoppedSend: boolean | undefined,
+  ctx: AgentSessionTurnContext,
+  target: ChatStopTarget
+): Promise<TurnOutcome<{ settled: boolean; turnId: string | null }>> {
+  if (!target.marks) {
+    const accepted = await acceptStopTarget(ctx)
+    return accepted.ok ? { ok: true, value: { settled: false, turnId: null } } : accepted
+  }
+  const sinceStop = ctx.journal.queuedMessages.userStopInForce()?.sequence
+  const handed = ctx.journal
+    .submissions()
+    .some(
+      (entry) =>
+        entry.fence === ctx.fence &&
+        (entry.handoverRecorded !== true || entry.handedOverAt !== undefined) &&
+        (entry.dispatchState === 'pending' ||
+          (entry.dispatchState === 'unknown' && !entry.recovered)) &&
+        (sinceStop === undefined || (entry.submittedSequence ?? -1) > sinceStop)
+    )
+  const accepted = await acceptChatStop(ctx, {
+    event: {
+      reason: 'user-stop',
+      caller: callerKey,
+      ...(target.eventTurnId !== null ? { turnId: target.eventTurnId } : {})
+    },
+    fence: ctx.fence
+  })
+  return accepted.ok
+    ? {
+        ok: true,
+        value: {
+          settled:
+            (accepted.value.withdrawn?.length ?? (target.queued ? 1 : 0)) > 0 ||
+            handed ||
+            stoppedSend === true,
+          turnId: accepted.value.turnId
+        }
+      }
+    : accepted
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-admission.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-admission.ts
deleted file mode 100644
index 66dd3c1bdd6a..000000000000
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-admission.ts
+++ /dev/null
@@ -1,139 +0,0 @@
-import {
-  agentSessionLeaseOwnerVerdict,
-  agentSessionLeasePossiblyWriting
-} from '../../../shared/agent-session-lease-adjudication'
-import { heldStructuredAgentSessionCurrentWork } from './structured-agent-session-host-current-work'
-import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission'
-import {
-  agentSessionRefusalError,
-  isAgentSessionRefusalError
-} from '../../../shared/agent-session-wire-refusals'
-import type {
-  StructuredAgentSessionHostDeps,
-  StructuredAgentSessionHostSession
-} from './structured-agent-session-host-types'
-
-// The chat's half of a switch to its terminal. Unlike a tab close, a switch never cuts work short
-// (the user stops a reply first), so it is admitted only when the chat is idle, and its admission
-// has no effect of its own: no start is aborted and nothing is stopped before it passes.
-
-export type SwitchBlockedReason =
-  | 'turnActive'
-  | 'providerStarting'
-  | 'messagesUnsettled'
-  | 'backgroundTasksRunning'
-  | 'handoffInFlight'
-  | 'previousExitUnverifiable'
-
-export function structuredAgentSessionSwitchBlocked(input: {
-  session?: StructuredAgentSessionHostSession
-  deps: StructuredAgentSessionHostDeps
-  sessionId: string
-  delivering: boolean
-  starting?: boolean
-  background: boolean
-  ownCommand?: boolean
-  joinStart?: boolean
-}): SwitchBlockedReason | null {
-  const { session, deps, sessionId } = input
-  const record = deps.store.getRecord(sessionId)
-  if (!input.ownCommand && session?.switchCommand) {
-    return 'handoffInFlight'
-  }
-  if (session?.child?.close) {
-    return 'handoffInFlight'
-  }
-  if (!input.joinStart && (input.starting || session?.child?.phase === 'starting')) {
-    return 'providerStarting'
-  }
-  if (input.background) {
-    return 'backgroundTasksRunning'
-  }
-  const work = session?.child
-    ? heldStructuredAgentSessionCurrentWork(deps.store, sessionId, session.journal, session)
-    : null
-  if (work?.activeTurnId()) {
-    return 'turnActive'
-  }
-  if (
-    input.delivering ||
-    work?.holdsHandedOverSend() ||
-    (record && (deps.hasOwedSwitchWork ?? deps.hasOpenDispatch)?.(record)) ||
-    session?.journal.submissions().some(isQueuedAgentJournalSubmission)
-  ) {
-    return 'messagesUnsettled'
-  }
-  if (!session?.child && record && agentSessionLeasePossiblyWriting(record.lease)) {
-    return 'previousExitUnverifiable'
-  }
-  return null
-}
-
-/** In the chat's ordered step: refuses unless nothing is running, starting, queued or owed, then
- *  admits, stops through close's body, and proves the agent gone before anything starts elsewhere. */
-export async function stopIdleStructuredAgentSessionForSwitch(input: {
-  session: StructuredAgentSessionHostSession | undefined
-  delivering: boolean
-  idleSweep: {
-    owesWork: (sessionId: string, session: StructuredAgentSessionHostSession) => boolean
-  }
-  stop: () => Promise<unknown>
-  deps: StructuredAgentSessionHostDeps
-  sessionId: string
-  check?: () => void
-  ownCommand?: boolean
-  background?: boolean
-}): Promise<void> {
-  const { session, deps, sessionId, stop } = input
-  if (!input.check) {
-    const record = deps.store.getRecord(sessionId)
-    if (
-      input.delivering ||
-      (record && (deps.hasOwedSwitchWork ?? deps.hasOpenDispatch)?.(record)) ||
-      (session &&
-        (session.child?.phase === 'starting' ||
-          session.journal.submissions().some(isQueuedAgentJournalSubmission) ||
-          (session.child !== null && input.idleSweep.owesWork(sessionId, session))))
-    ) {
-      throw agentSessionRefusalError('agent_session_operation_invalid', { reason: 'turnActive' })
-    }
-  } else {
-    input.check()
-    const reason = structuredAgentSessionSwitchBlocked({
-      ...input,
-      background: input.background ?? false
-    })
-    if (reason === 'previousExitUnverifiable') {
-      throw agentSessionRefusalError('agent_session_ownership_unknown', { reason })
-    }
-    if (reason) {
-      throw agentSessionRefusalError('agent_session_operation_invalid', { reason })
-    }
-    if (session?.child && input.idleSweep.owesWork(sessionId, session)) {
-      throw agentSessionRefusalError('agent_session_operation_invalid', {
-        reason: 'backgroundTasksRunning'
-      })
-    }
-  }
-  try {
-    await stop()
-  } catch (error) {
-    if (
-      !input.check ||
-      (isAgentSessionRefusalError(error) &&
-        error.refusal.code === 'agent_session_operation_expired')
-    ) {
-      throw error
-    }
-    throw agentSessionRefusalError('agent_session_ownership_unknown', { reason: 'ownerUnproven' })
-  }
-  const lease = deps.store.getRecord(sessionId)?.lease
-  if (
-    !lease ||
-    (input.check
-      ? agentSessionLeasePossiblyWriting(lease)
-      : agentSessionLeaseOwnerVerdict(lease) !== 'exited')
-  ) {
-    throw agentSessionRefusalError('agent_session_ownership_unknown', { reason: 'ownerUnproven' })
-  }
-}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command-ordinary.test-fixture.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command-ordinary.test-fixture.ts
new file mode 100644
index 000000000000..4eac06c74880
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command-ordinary.test-fixture.ts
@@ -0,0 +1,143 @@
+import '../../daemon/mock-descendant-sweep'
+import type { DaemonServer } from '../../daemon/daemon-server'
+import type { DaemonPtyAdapter } from '../../daemon/daemon-pty-adapter'
+import type { createMockSubprocess } from '../../daemon/daemon-pty-adapter-test-harness'
+import type { setupMainOwnedWorkspace } from '../../runtime/main-owned-workspace-runtime-fixture'
+import { expect, vi } from 'vitest'
+import type { agentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
+import { restTestSend, type RestTestRig } from './structured-agent-session-rest-test-rig'
+import { CREATE_TEST_CALLER as caller } from './structured-agent-session-create-test-fixture'
+import { HOST_TEST_SESSION as id } from './structured-agent-session-host-test-data'
+export async function verifyOrdinarySwitchLostOutcome(fixture: {
+  ordinaryRequestId: string
+  boundary: string
+  dispatched: ReturnType<typeof Promise.withResolvers<void>>
+  release: ReturnType<typeof Promise.withResolvers<void>>
+  lateOrdinaryReply: (() => void) | undefined
+  destination: string
+  destinationTab: string
+  destinationPane: string
+  server: DaemonServer
+  time: { deadline: ReturnType<typeof agentSessionSwitchDeadline> }
+  outcome: Promise<{ ok: true; value: { status: string } } | { ok: false; error: unknown }>
+  runtime: ReturnType<typeof setupMainOwnedWorkspace>['runtime']
+  rig: RestTestRig
+  tabIds: () => string[]
+  run: () => Promise<{ status: 'completed'; sessionId: string }>
+  clock: () => { deadline: ReturnType<typeof agentSessionSwitchDeadline> }
+  acquisitions: number
+  stop: ReturnType<typeof vi.spyOn>
+  spawn: ReturnType<typeof vi.fn>
+  sibling: ReturnType<typeof createMockSubprocess>
+  subprocess: ReturnType<typeof createMockSubprocess>
+  adapter: DaemonPtyAdapter
+}) {
+  const {
+    boundary,
+    dispatched,
+    release,
+    server,
+    time,
+    outcome,
+    runtime,
+    rig,
+    tabIds,
+    run,
+    clock,
+    acquisitions,
+    stop,
+    spawn,
+    sibling,
+    subprocess,
+    adapter
+  } = fixture
+
+  if (boundary !== 'legacy-never-created') {
+    await dispatched.promise
+    release.resolve()
+    await vi.waitFor(() => expect(fixture.lateOrdinaryReply).toBeTypeOf('function'))
+    expect(
+      server.host
+        .listSessions()
+        .some((entry) => entry.sessionId === fixture.destination && entry.isAlive)
+    ).toBe(true)
+  } else {
+    await vi.waitFor(() => expect(fixture.ordinaryRequestId).not.toBe(''))
+  }
+  time.deadline.revoke()
+  expect(await outcome).toMatchObject({ ok: false })
+  expect(rig.host.switchExecuting(id)).toBe(true)
+  expect(tabIds()).toContain(fixture.destinationTab)
+  if (boundary === 'legacy-late-reply') {
+    fixture.lateOrdinaryReply!()
+    await vi.waitFor(() =>
+      expect(runtime.hasLiveTerminalForPaneKey(fixture.destinationPane)).toBe(true)
+    )
+  } else {
+    const duplicate = await rig.host
+      .runSwitch(id, 'other-viewer', clock().deadline, run, { direction: 'terminal' })
+      .catch((error: unknown) => error)
+    const first = await outcome
+    if (first.ok) {
+      throw new Error('original observer unexpectedly completed')
+    }
+    expect(duplicate).toBe(first.error)
+    const unavailable = await rig.host.send(
+      caller,
+      restTestSend(
+        'Recover the original ordinary outcome',
+        rig.store.getRecord(id)!.lease.runtimeFence
+      )
+    )
+    if (!unavailable.ok) {
+      throw new Error('ordinary send refused')
+    }
+    await vi.waitFor(async () =>
+      expect(
+        (await rig.host.journalSnapshot(id)).submissions.find(
+          (entry) => entry.clientMessageId === unavailable.value.clientMessageId
+        )?.dispatchState
+      ).toBe('rejected')
+    )
+    expect(rig.adapter.acquire).toHaveBeenCalledTimes(acquisitions)
+    expect(rig.host.switchExecuting(id)).toBe(true)
+    expect(run).toHaveBeenCalledOnce()
+    expect(stop).toHaveBeenCalledOnce()
+    if (boundary === 'legacy-never-created') {
+      expect(spawn).not.toHaveBeenCalled()
+      expect(server.host.listSessions()).toMatchObject([
+        { sessionId: 'unrelated-sibling', isAlive: true }
+      ])
+      return
+    }
+    expect(adapter.getActiveSessionIds()).toContain(fixture.destination)
+  }
+  expect(spawn).toHaveBeenCalledOnce()
+  expect(sibling.forceKill).not.toHaveBeenCalled()
+  subprocess._simulateExit(0)
+  await vi.waitFor(() => expect(rig.host.switchExecuting(id)).toBe(false), { timeout: 10000 })
+  const accepted = await rig.host.send(
+    caller,
+    restTestSend(
+      'After the original ordinary child exited',
+      rig.store.getRecord(id)!.lease.runtimeFence
+    )
+  )
+  expect(accepted.ok).toBe(true)
+  await vi.waitFor(() => expect(rig.adapter.dispatch).toHaveBeenCalledOnce())
+  await vi.waitFor(async () =>
+    expect(
+      (await rig.host.journalSnapshot(id)).submissions.some(
+        (entry) =>
+          entry.clientMessageId === (accepted.ok ? accepted.value.clientMessageId : '') &&
+          entry.dispatchState === 'accepted'
+      )
+    ).toBe(true)
+  )
+  expect(stop).toHaveBeenCalledOnce()
+  expect(run).toHaveBeenCalledOnce()
+  expect(spawn).toHaveBeenCalledOnce()
+  expect(
+    server.host.listSessions().find((entry) => entry.sessionId === 'unrelated-sibling')?.isAlive
+  ).toBe(true)
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command-selection.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command-selection.ts
index b2d7e4d8c21a..43ed15603a5b 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command-selection.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command-selection.ts
@@ -1,4 +1,3 @@
-import { randomUUID } from 'node:crypto'
 import type { StructuredAgentSessionConversationLifetimeHost } from './structured-agent-session-conversation-lifetime-host'
 import {
   AgentSessionRefusalError,
@@ -7,103 +6,84 @@ import {
 import { AGENT_SESSION_NOT_ATTACHED } from './structured-agent-session-mutation-admission'
 import type {
   AgentSessionSwitchDeadline,
-  AgentSessionSwitchResult,
-  AgentSessionSwitchReceipt
+  AgentSessionSwitchResult
 } from '../../../shared/agent-session-switch-execution'
 
-// Commands outlive the read handle they may close themselves.
 export type SwitchCommand = {
   invocationId: string
   generation: string
+  direction: 'chat' | 'terminal'
+  workCurrent?: () => boolean
   settled: boolean
-  present: (view: Extract<AgentSessionSwitchResult, { status: 'present' }>) => void
-  presentation: Promise<AgentSessionSwitchResult>
-  shown: Promise<boolean>
-  acknowledge: (shown: boolean) => void
-  opened: Promise<AgentSessionSwitchResult>
-  openedResult: (result: AgentSessionSwitchResult) => void
+  result?: AgentSessionSwitchResult
   deadline: AgentSessionSwitchDeadline
-  revokeOnSend: boolean
-  retain?: () => Promise<void>
+  retain: () => Promise<void>
   retentionAllowed: boolean
   completion: Promise<AgentSessionSwitchResult>
   physical?: Promise<void>
+  physicalRecovery?: Set<() => Promise<void>>
   cleanupTimer?: ReturnType<typeof setTimeout>
 }
 
+/** The command owns dispatched work even after its viewer gives up. */
 export function selectStructuredSessionSwitchCommand(args: {
   host: StructuredAgentSessionConversationLifetimeHost
   commands: Map<string, SwitchCommand>
   isDisposed: () => boolean
   id: string
   invocationId: string
+  direction: SwitchCommand['direction']
   deadline: AgentSessionSwitchDeadline
   run: () => Promise<AgentSessionSwitchResult>
-  revokeOnSend: boolean
-  phase?: { observe?: boolean; receipt?: AgentSessionSwitchReceipt }
   onRetained?: (check: () => void) => Promise<void>
-  allowUncreated: boolean
+  allowUncreated?: boolean
+  conversationKey?: string
 }): SwitchCommand {
-  const {
-    host,
-    commands,
-    isDisposed,
-    id,
-    invocationId,
-    deadline,
-    run,
-    revokeOnSend,
-    phase,
-    onRetained,
-    allowUncreated
-  } = args
+  const { host, commands, isDisposed, id, invocationId, direction, deadline, run, onRetained } =
+    args
   const { sessions, serialize } = host
-  const deps = () => host.context().deps
   deadline.check()
-  const prior = commands.get(id)
+  const prior =
+    (args.conversationKey ? commands.get(args.conversationKey) : undefined) ?? commands.get(id)
   if (prior) {
-    if (prior.invocationId !== invocationId && !prior.settled) {
+    if (
+      prior.invocationId === invocationId ||
+      (prior.direction === direction &&
+        (!prior.settled ||
+          (prior.result?.status === 'completed' &&
+            prior.deadline.remaining() > 0 &&
+            !prior.deadline.signal.aborted &&
+            (!prior.workCurrent || prior.workCurrent()))))
+    ) {
+      commands.set(id, prior)
+      if (args.conversationKey) {
+        commands.set(args.conversationKey, prior)
+      }
+      return prior
+    }
+    if (!prior.settled) {
       throw agentSessionRefusalError('agent_session_operation_invalid', {
         reason: 'handoffInFlight'
       })
     }
-    if (prior.invocationId === invocationId) {
-      return prior
-    }
     prior.retentionAllowed = false
     clearTimeout(prior.cleanupTimer)
     prior.deadline.revoke()
-    commands.delete(id)
-  }
-  if (phase?.observe || phase?.receipt) {
-    throw agentSessionRefusalError('agent_session_operation_unknown', {
-      reason: 'outcomeUnknown'
-    })
+    for (const [alias, current] of commands) {
+      if (current === prior) {
+        commands.delete(alias)
+      }
+    }
   }
-  const session = sessions.get(id)
-  if (!deps().store.getRecord(id) && !allowUncreated) {
+  if (!host.context().deps.store.getRecord(id) && !args.allowUncreated) {
     throw new AgentSessionRefusalError(AGENT_SESSION_NOT_ATTACHED)
   }
-  let present!: (view: Extract<AgentSessionSwitchResult, { status: 'present' }>) => void
-  let acknowledge!: (shown: boolean) => void
-  let openedResult!: (result: AgentSessionSwitchResult) => void
-  const presentation = new Promise<Extract<AgentSessionSwitchResult, { status: 'present' }>>(
-    (resolve) => {
-      present = resolve
-    }
-  )
-  const shown = new Promise<boolean>((resolve) => {
-    acknowledge = resolve
-  })
-  const opened = new Promise<AgentSessionSwitchResult>((resolve) => {
-    openedResult = resolve
-  })
   const command: SwitchCommand = {
     invocationId,
-    generation: randomUUID(),
+    generation: invocationId,
+    direction,
     settled: false,
     deadline,
-    revokeOnSend,
     retentionAllowed: true,
     retain: async () => {
       const check = () => {
@@ -116,52 +96,49 @@ export function selectStructuredSessionSwitchCommand(args: {
       check()
       await onRetained?.(check)
     },
-    present,
-    acknowledge,
-    presentation,
-    shown,
-    opened,
-    openedResult,
     completion: Promise.resolve().then(async () => {
-      if (deps().store.getRecord(id)) {
+      if (host.context().deps.store.getRecord(id)) {
         await serialize(id, async () => {
           deadline.check()
-          const opened = await host.open(id)
+          const session = await host.open(id)
           deadline.check()
-          if (opened) {
-            opened.switchCommand = command
+          if (session) {
+            session.switchCommand = command
           }
         })
       }
       try {
         const result = await run()
-        if (revokeOnSend && (result.status === 'refused' || result.status === 'uncertain')) {
-          await command.retain?.()
+        command.result = result
+        if (result.status !== 'completed') {
+          await command.retain()
         }
         return result
       } catch (error) {
-        if (revokeOnSend) {
-          await command.retain?.().catch(() => {})
-        }
+        await command.retain().catch(() => {})
         throw error
       }
     })
   }
   commands.set(id, command)
+  if (args.conversationKey) {
+    commands.set(args.conversationKey, command)
+  }
   const retainOnExpiry = () => {
-    if (revokeOnSend) {
-      void command.retain?.().catch(() => {})
-    }
+    void command.retain().catch(() => {})
   }
   deadline.signal.addEventListener('abort', retainOnExpiry, { once: true })
+  const session = sessions.get(id)
   if (session) {
     session.switchCommand = command
   }
   host.context().publishStatus?.(id)
   void command.completion
-    .finally(() => {
+    .finally(async () => {
+      await command.physical
       command.settled = true
       deadline.dispose()
+      deadline.signal.removeEventListener('abort', retainOnExpiry)
       for (const [key, current] of commands) {
         if (current === command && sessions.get(key)?.switchCommand === command) {
           delete sessions.get(key)!.switchCommand
@@ -173,15 +150,12 @@ export function selectStructuredSessionSwitchCommand(args: {
       }
       command.cleanupTimer = setTimeout(
         () => {
-          void Promise.resolve(command.physical).then(() => {
-            command.retentionAllowed = false
-            deadline.signal.removeEventListener('abort', retainOnExpiry)
-            for (const [key, current] of commands) {
-              if (current === command) {
-                commands.delete(key)
-              }
+          command.retentionAllowed = false
+          for (const [key, current] of commands) {
+            if (current === command) {
+              commands.delete(key)
             }
-          })
+          }
         },
         Math.max(1, deadline.remaining())
       )
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test-fixture.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test-fixture.ts
new file mode 100644
index 000000000000..672aec6fc9b2
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test-fixture.ts
@@ -0,0 +1,168 @@
+import type { DaemonClientConnections } from '../../daemon/daemon-client-connections'
+import type { DaemonServer } from '../../daemon/daemon-server'
+import { expect, vi } from 'vitest'
+import { restTestSend } from './structured-agent-session-rest-test-rig'
+import { CREATE_TEST_CALLER as caller } from './structured-agent-session-create-test-fixture'
+import { HOST_TEST_SESSION as id } from './structured-agent-session-host-test-data'
+import { TAB_ID } from '../../runtime/main-owned-workspace-runtime-fixture'
+import type { SwitchSocketFaultState } from './structured-agent-session-switch-socket.test-fixture'
+import type { verifyOrdinarySwitchLostOutcome } from './structured-agent-session-switch-command-ordinary.test-fixture'
+type OrdinaryFixture = Parameters<typeof verifyOrdinarySwitchLostOutcome>[0]
+type OutageFixture = Pick<
+  OrdinaryFixture,
+  | 'server'
+  | 'release'
+  | 'outcome'
+  | 'rig'
+  | 'sibling'
+  | 'acquisitions'
+  | 'spawn'
+  | 'stop'
+  | 'run'
+  | 'tabIds'
+> & {
+  noFork: boolean
+  nativeFailed: boolean
+  wire: SwitchSocketFaultState
+  stages: string[]
+  receiverCanceled: () => boolean
+  terminalOutcome: string
+  occupied: Awaited<ReturnType<DaemonServer['automaticWork']['gate']['admit']>>[]
+}
+export async function verifySwitchOutcomeOutage(fixture: OutageFixture) {
+  const {
+    noFork,
+    nativeFailed,
+    wire,
+    server,
+    stages,
+    receiverCanceled,
+    release,
+    outcome,
+    terminalOutcome,
+    rig,
+    sibling,
+    acquisitions,
+    occupied,
+    spawn,
+    stop,
+    run,
+    tabIds
+  } = fixture
+
+  if (!noFork && !nativeFailed) {
+    // Real loss before the held creation returns; no receiver outcome can reach this observer.
+    wire.connectionUnavailable = true
+    // SAFETY: exact fixture connection only.
+    const peers = (server as unknown as { connections: DaemonClientConnections }).connections
+    // The adapter is the second authenticated pair; preserve the unrelated sibling.
+    const sockets = [...peers.values()]
+    sockets.at(-1)?.controlSocket.destroy()
+    stages.push('waiting-receiver-cancel')
+    await vi.waitFor(() => expect(receiverCanceled()).toBe(true))
+    release.resolve()
+  }
+  expect(await outcome).toMatchObject({ ok: false })
+  // SAFETY: inspect the exact receiver owner, never write its disposition or resolve its work.
+  const retained = (
+    server as unknown as { preparations: { retained: Map<string, { outcome?: string }> } }
+  ).preparations.retained
+  await vi.waitFor(() =>
+    expect([...retained.values()]).toMatchObject([{ outcome: terminalOutcome }])
+  )
+  expect(rig.host.switchExecuting(id)).toBe(true)
+  await vi.advanceTimersByTimeAsync(720_001)
+  expect([...retained.values()]).toMatchObject([{ outcome: terminalOutcome }])
+  expect(Object.keys([...retained.values()][0])).not.toContain('controller')
+  expect(sibling.forceKill).not.toHaveBeenCalled()
+  const unavailable = await rig.host.send(
+    caller,
+    restTestSend('While exact recovery is unavailable', rig.store.getRecord(id)!.lease.runtimeFence)
+  )
+  if (!unavailable.ok) {
+    throw new Error('ordinary send was refused')
+  }
+  await vi.waitFor(async () =>
+    expect(
+      (await rig.host.journalSnapshot(id)).submissions.find(
+        (entry) => entry.clientMessageId === unavailable.value.clientMessageId
+      )?.dispatchState
+    ).toBe('rejected')
+  )
+  expect(rig.adapter.acquire).toHaveBeenCalledTimes(acquisitions)
+  occupied.forEach((lease) => lease.abandon())
+  wire.connectionUnavailable = false
+  const accepted = await rig.host.send(
+    caller,
+    restTestSend('After the same receiver recovers', rig.store.getRecord(id)!.lease.runtimeFence)
+  )
+  expect(accepted.ok).toBe(true)
+  await vi.waitFor(() => expect(rig.adapter.dispatch).toHaveBeenCalledOnce())
+  await vi.waitFor(async () =>
+    expect(
+      (await rig.host.journalSnapshot(id)).submissions.some(
+        (entry) =>
+          entry.clientMessageId === (accepted.ok ? accepted.value.clientMessageId : '') &&
+          entry.dispatchState === 'accepted'
+      )
+    ).toBe(true)
+  )
+  await vi.waitFor(() => expect(rig.host.switchExecuting(id)).toBe(false))
+  await vi.waitFor(() => expect(retained.size).toBe(0))
+  expect(wire.settlementOutcomes).toContain(terminalOutcome)
+  expect(spawn).toHaveBeenCalledTimes(noFork ? 0 : 1)
+  expect(stop).toHaveBeenCalledOnce()
+  expect(run).toHaveBeenCalledOnce()
+  await vi.waitFor(() => expect(tabIds()).toEqual([TAB_ID]))
+  expect(server.host.listSessions()).toMatchObject([
+    { sessionId: 'unrelated-sibling', isAlive: true }
+  ])
+}
+
+type FinalDeliveryFixture = Pick<
+  OrdinaryFixture,
+  'rig' | 'spawn' | 'tabIds' | 'adapter' | 'server' | 'stop' | 'run'
+> & {
+  boundary: string
+  noFork: boolean
+  mobile: boolean
+  wire: SwitchSocketFaultState
+  stages: string[]
+}
+export async function verifySwitchFinalDelivery(fixture: FinalDeliveryFixture) {
+  const { rig, spawn, boundary, noFork, mobile, tabIds, adapter, server, wire, stop, run, stages } =
+    fixture
+  await vi.waitFor(() => expect(rig.adapter.dispatch).toHaveBeenCalledOnce())
+  await vi.waitFor(async () =>
+    expect(
+      (await rig.host.journalSnapshot(id)).submissions.filter(
+        (entry) => entry.dispatchState === 'accepted'
+      )
+    ).toHaveLength(1)
+  )
+  await vi.waitFor(() => expect(rig.host.switchExecuting(id)).toBe(false))
+  expect(spawn).toHaveBeenCalledTimes(boundary === 'queued' || noFork ? 0 : 1)
+  if (mobile) {
+    await vi.waitFor(() => expect(tabIds()).toEqual([TAB_ID]))
+  }
+  if (boundary === 'gc-outage' || boundary === 'native-gc-outage') {
+    // SAFETY: only inspect the actual fixture owners; GC debt cannot hold the already delivered send.
+    const local = adapter as unknown as {
+      switchReleaseCleanup: Map<string, unknown>
+      switchReleaseDrain?: Promise<void>
+    }
+    const receiver = server as unknown as { preparations: { retained: Map<string, unknown> } }
+    expect(local.switchReleaseCleanup.size).toBe(1)
+    expect(receiver.preparations.retained.size).toBe(1)
+    await vi.waitFor(() => expect(local.switchReleaseDrain).toBeUndefined())
+    wire.connectionUnavailable = false
+    // Do not lose the next release; one ordinary successful connection drains only exact GC debt.
+    wire.boundaryGcDrained = true
+    await adapter.listProcesses()
+    await vi.waitFor(() => expect(local.switchReleaseCleanup.size).toBe(0))
+    expect(receiver.preparations.retained.size).toBe(0)
+  }
+  expect(stop).toHaveBeenCalledOnce()
+  expect(run).toHaveBeenCalledOnce()
+  expect(stages.filter((stage) => stage === 'controller-spawn')).toHaveLength(1)
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test.ts
index f54d6e804942..d5d5874ab3a4 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test.ts
@@ -1,21 +1,49 @@
-import { structuredAgentSessionSwitchBlocked } from './structured-agent-session-switch-admission'
-import { nativeConversationContent } from '../../ai-vault/structured-chat-cli-fork'
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import { agentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
+import { registerSwitchReservationTests } from './structured-agent-session-switch-reservation.test-fixture'
 import {
-  agentSessionLeaseNeverAcquired,
-  agentSessionLeasePossiblyWriting
-} from '../../../shared/agent-session-lease-adjudication'
+  verifySwitchOutcomeOutage,
+  verifySwitchFinalDelivery
+} from './structured-agent-session-switch-command.test-fixture'
 import {
-  createRestTestRig,
-  restTestSend,
-  type RestTestRig
-} from './structured-agent-session-rest-test-rig'
+  installSwitchSocketFaults,
+  type SwitchSocketFaultState
+} from './structured-agent-session-switch-socket.test-fixture'
+import '../../daemon/mock-descendant-sweep'
+import { mkdtemp, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { resolveAgentLaunchPaneVerdict } from '../../agent-launch/agent-launch-pane-attachment'
+import { createPtySubprocess } from '../../daemon/pty-subprocess'
+import { DaemonClient } from '../../daemon/client'
+import { DaemonServer } from '../../daemon/daemon-server'
+import type { DaemonClientConnections } from '../../daemon/daemon-client-connections'
+import { DaemonPtyAdapter } from '../../daemon/daemon-pty-adapter'
+import { getDaemonSocketPath } from '../../daemon/daemon-spawner'
+import { createMockSubprocess } from '../../daemon/daemon-pty-adapter-test-harness'
 import {
-  createTestParams,
-  CREATE_TEST_CALLER as caller
-} from './structured-agent-session-create-test-fixture'
+  setupMainOwnedWorkspace,
+  WORKTREE_ID,
+  TAB_ID
+} from '../../runtime/main-owned-workspace-runtime-fixture'
+import { expect, it, vi } from 'vitest'
+import { agentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
+import { DEFAULT_SPAWN_ADMISSION_LIMITS } from '../../../shared/host-spawn-admission'
+import { restTestSend, type RestTestRig } from './structured-agent-session-rest-test-rig'
+import { CREATE_TEST_CALLER as caller } from './structured-agent-session-create-test-fixture'
 import { HOST_TEST_SESSION as id } from './structured-agent-session-host-test-data'
+import { verifyOrdinarySwitchLostOutcome } from './structured-agent-session-switch-command-ordinary.test-fixture'
+import type * as LocalPtyUtils from '../../providers/local-pty-utils'
+import { afterEach, beforeEach } from 'vitest'
+import { createRestTestRig } from './structured-agent-session-rest-test-rig'
+import { createTestParams } from './structured-agent-session-create-test-fixture'
+const nativePty = vi.hoisted(() => ({ spawn: vi.fn() }))
+vi.mock('node-pty', () => nativePty)
+vi.mock('../../providers/local-pty-utils', async (importOriginal) => ({
+  ...(await importOriginal<typeof LocalPtyUtils>()),
+  ensureNodePtySpawnHelperExecutable: () => {},
+  getNodePtySpawnHelperCandidates: () => [process.execPath]
+}))
+
+vi.mock('../../../shared/layout-owner-switch', () => ({ ORCA_LAYOUT_OWNER_IS_MAIN: true }))
 
 let initial: ReturnType<typeof createTestParams>
 let rig: RestTestRig
@@ -41,247 +69,722 @@ afterEach(async () => {
   deadlines.length = 0
   await rig.dispose()
   vi.restoreAllMocks()
+  vi.useRealTimers()
+  vi.unstubAllEnvs()
 })
 
-it('admits an idle held child with no active turn and nothing delivering', async () => {
+it('joins same-direction viewers while an ordinary Stop runs outside the command selection lane', async () => {
+  const time = clock()
   expect(await rig.host.switchToChat(id)).toMatchObject({ ok: true })
-  const session = rig.host.collaboratorsForTests().sessions.get(id)!
-  expect(session.child).not.toBeNull()
-  expect(session.journal.runningTurn()).toBeNull()
-  expect(
-    structuredAgentSessionSwitchBlocked({
-      session,
-      deps: rig.host.deps,
-      sessionId: id,
-      delivering: false,
-      background: false
-    })
-  ).toBeNull()
-})
-
-it('joins the command across its own resource close, without holding the session queue while waiting', async () => {
-  const { deadline } = clock()
+  const exit = Promise.withResolvers<boolean>()
   const entered = Promise.withResolvers<void>()
-  const release = Promise.withResolvers<void>()
-  const run = vi.fn(async () => {
-    await rig.host.switchToTerminal(id, deadline)
+  rig.adapter.closeSession.mockImplementation(async () => {
     entered.resolve()
-    await release.promise
-    return { status: 'completed' as const, sessionId: id }
-  })
-  const first = rig.host.runSwitch(id, 'same-click', deadline, run)
-  await entered.promise
-  expect(rig.host.hasSession(id)).toBe(false)
-  expect(rig.host.switchExecuting(id)).toBe(true)
-  const duplicate = rig.host.runSwitch(id, 'same-click', deadline, run)
-  await expect(rig.host.runSwitch(id, 'another-click', deadline, run)).rejects.toMatchObject({
-    refusal: { details: { reason: 'handoffInFlight' } }
+    return exit.promise
   })
-  release.resolve()
-  expect(await first).toEqual(await duplicate)
-  expect(run).toHaveBeenCalledOnce()
-})
-
-it('revokes a command queued before expiry without executing its later effect', async () => {
-  const entered = Promise.withResolvers<void>()
-  const release = Promise.withResolvers<void>()
-  // A create publication occupies the real nonreentrant session queue.
-  const create = rig.host.create(caller, initial, {
-    publishTab: async () => {
-      entered.resolve()
-      await release.promise
-    }
-  })
-  await entered.promise
-  const time = clock()
-  const effect = vi.fn(async () => ({ status: 'completed' as const, sessionId: id }))
-  const waiting = rig.host.runSwitch(id, 'queued', time.deadline, effect)
-  const refused = expect(waiting).rejects.toMatchObject({
-    refusal: { code: 'agent_session_operation_expired' }
+  const run = vi.fn(async () => {
+    await rig.host.stopForSwitch(id, caller, time.deadline)
+    return { status: 'completed' as const, sessionId: id }
   })
-  time.expire()
-  release.resolve()
-  await create
-  await refused
-  expect(effect).not.toHaveBeenCalled()
-})
-
-it('checks expiry in the actual reservation transaction after the earlier acquire check', async () => {
-  const time = clock()
-  const reserve = rig.store.reserveOwner
-  vi.spyOn(rig.store, 'reserveOwner').mockImplementation((request, check) => {
-    time.expire()
-    return reserve(request, check)
+  const first = rig.host.runSwitch(id, 'first-viewer', time.deadline, run, {
+    direction: 'terminal'
   })
-  expect(await rig.host.switchToChat(id, time.deadline)).toMatchObject({ ok: false })
-  expect(rig.adapter.acquire).not.toHaveBeenCalled()
-  expect(agentSessionLeaseNeverAcquired(rig.store.getRecord(id)!.lease)).toBe(true)
-})
-
-it('shares the full never-acquired proof, while recovery-released ownership stays unavailable after restart', async () => {
-  const { deadline } = clock()
-  const founding = rig.store.getRecord(id)!.lease
-  expect(agentSessionLeaseNeverAcquired(founding)).toBe(true)
-  expect(agentSessionLeasePossiblyWriting(founding)).toBe(false)
-  await rig.host.switchToTerminal(id, deadline)
-  // Recovery can release without observing death: fence 1 alone must not grant a writer.
-  await rig.store.transitionHandoff(id, (record) => ({
-    ...record,
-    lease: { ...record.lease, minimumNextFence: 2 }
-  }))
-  expect(agentSessionLeasePossiblyWriting(rig.store.getRecord(id)!.lease)).toBe(true)
-  await rig.restart()
-  await expect(rig.host.switchToTerminal(id, deadline)).rejects.toMatchObject({
-    refusal: { details: { reason: 'previousExitUnverifiable' } }
+  await Promise.race([entered.promise, first])
+  const second = rig.host.runSwitch(id, 'second-viewer', clock().deadline, run, {
+    direction: 'terminal'
   })
-  expect(rig.adapter.closeSession).not.toHaveBeenCalled()
-  expect((await rig.host.journalSnapshot(id)).items).toBeDefined()
+  exit.resolve(true)
+  expect(await first).toEqual(await second)
+  expect(run).toHaveBeenCalledOnce()
 })
 
-it('preserves accepted work before retirement and never aborts the send that starts it', async () => {
-  const { deadline } = clock()
-  await rig.host.revealSession(id)
-  const current = rig.host.captureSwitchWork(id, deadline)
-  expect(current()).toBe(true)
-  const accepted = await rig.host.send(caller, restTestSend('Implement the CLI change', 1))
-  expect(accepted.ok).toBe(true)
-  expect(current()).toBe(false)
-  await expect(rig.host.switchToTerminal(id, deadline)).rejects.toHaveProperty('refusal')
-  expect(rig.adapter.closeSession).not.toHaveBeenCalled()
-})
+registerSwitchDaemonComposition(() => rig, clock, nativePty)
 
-it('rechecks source work at the actual queued visibility transaction and never retires a different tab', async () => {
-  await rig.store.setSessionTabVisibility(id, false)
-  await rig.store.setSessionTabVisibility(id, true, 'source-tab')
-  let current = true
-  const late = rig.store.setSwitchedSessionTabVisibility(id, 'source-tab', false, () => current)
-  current = false
-  expect(await late).toBe(false)
-  expect(rig.store.getSessionTabId(id)).toBe('source-tab')
-  expect(
-    await rig.store.setSwitchedSessionTabVisibility(id, 'another-tab', false, () => true)
-  ).toBe(false)
-  expect(rig.store.getSessionTabId(id)).toBe('source-tab')
-})
+registerSwitchReservationTests(() => rig, clock)
 
-it('accepts the first send against an empty transfer and revokes only the unsent switch effects', async () => {
-  const { deadline } = clock()
-  const empty = Promise.withResolvers<void>()
-  const continueSwitch = Promise.withResolvers<void>()
-  const physicalCreate = vi.fn()
-  await rig.host.revealSession(id)
-  const operation = rig.host.runSwitch(id, 'empty-first-send', deadline, async () => {
-    expect(nativeConversationContent(await rig.host.journalSnapshot(id))).toBe('empty')
-    empty.resolve()
-    await continueSwitch.promise
-    await rig.host.switchToTerminal(id, deadline)
-    deadline.check()
-    physicalCreate()
-    return { status: 'completed', sessionId: id }
-  })
-  const refused = expect(operation).rejects.toHaveProperty('refusal')
-  await empty.promise
-  const accepted = await rig.host.send(caller, restTestSend('Keep this first message', 1))
-  expect(accepted.ok).toBe(true)
-  continueSwitch.resolve()
-  await refused
-  expect(physicalCreate).not.toHaveBeenCalled()
-  expect(rig.adapter.closeSession).not.toHaveBeenCalled()
-  expect((await rig.host.journalSnapshot(id)).items.length).toBeGreaterThan(0)
-})
+function registerSwitchDaemonComposition(
+  getRig: () => RestTestRig,
+  clock: () => { deadline: ReturnType<typeof agentSessionSwitchDeadline>; expire: () => void },
+  nativePty: { spawn: ReturnType<typeof vi.fn> }
+) {
+  it.each([
+    'legacy-daemon',
+    'legacy-lost-reply',
+    'legacy-late-reply',
+    'legacy-never-created',
+    'stale-daemon-token',
+    'native-failed',
+    'native-outage',
+    'native-gc-outage',
+    'queued',
+    'commit-expired',
+    'host-cap',
+    'gc-outage',
+    'cap-outage',
+    'expired-outage',
+    'exit-outage',
+    'dispatched',
+    'disconnected',
+    'recovery-failed',
+    'recovery-used',
+    'lost-reply',
+    'missing-result',
+    'live-unknown'
+  ] as const)(
+    'composes Stop, ordinary runtime creation, daemon sockets and retained physical work: %s',
+    async (boundary) => {
+      const rig = getRig()
+      expect(await rig.host.switchToChat(id)).toMatchObject({ ok: true })
+      const acquisitions = rig.adapter.acquire.mock.calls.length
+      const stop = vi.spyOn(rig.host, 'stopForSwitch')
+      const directory = await mkdtemp(join(tmpdir(), 'switch-daemon-composition-'))
+      const time = clock()
+      const ordinaryLoss = [
+        'legacy-lost-reply',
+        'legacy-late-reply',
+        'legacy-never-created'
+      ].includes(boundary)
+      const compatible =
+        ordinaryLoss || boundary === 'legacy-daemon' || boundary === 'stale-daemon-token'
+      const nativeFailed = ['native-failed', 'native-outage', 'native-gc-outage'].includes(boundary)
+      const outage = ['cap-outage', 'expired-outage', 'exit-outage', 'native-outage'].includes(
+        boundary
+      )
+      const terminalOutcome = nativeFailed ? 'failed' : 'exited'
+      nativePty.spawn.mockReset()
+      nativePty.spawn.mockImplementation(() => {
+        throw new Error('opaque native fixture failure')
+      })
+      const cap = boundary === 'host-cap' || boundary === 'cap-outage' || boundary === 'gc-outage'
+      const expired = boundary === 'commit-expired' || boundary === 'expired-outage'
+      const noFork = cap || expired
+      const mobile =
+        ordinaryLoss ||
+        nativeFailed ||
+        noFork ||
+        outage ||
+        ['recovery-failed', 'recovery-used'].includes(boundary)
+      if (cap) {
+        vi.stubEnv('ORCA_DAEMON_MAX_HOST_TERMINALS', outage ? '2' : '1')
+      }
+      if (outage) {
+        vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] })
+      }
+      const stages: string[] = []
+      let destination = ''
+      let destinationTab = ''
+      let destinationPane = ''
+      const tabIds = () => session().tabsByWorktree[WORKTREE_ID]?.map((tab) => tab.id) ?? []
+      const monotonic = performance.now.bind(performance)
+      const wire: SwitchSocketFaultState = {
+        receiverDelay: 0,
+        connectionUnavailable: false,
+        boundaryGcDrained: false,
+        commitRequestId: '',
+        ordinaryRequestId: '',
+        lateOrdinaryReply: undefined,
+        settlementOutcomes: []
+      }
+      if (expired) {
+        vi.spyOn(performance, 'now').mockImplementation(() => monotonic() + wire.receiverDelay)
+      }
+      const dispatched = Promise.withResolvers<void>()
+      const release = Promise.withResolvers<void>()
+      const subprocess = createMockSubprocess()
+      let usedViewer: DaemonClient | undefined
+      let receiverCanceled = () => false
+      const sibling = createMockSubprocess()
+      const spawn = vi.fn(async (opts: { sessionId: string; isCanceled?: () => boolean }) => {
+        if (opts.sessionId === 'unrelated-sibling') {
+          return sibling
+        }
+        receiverCanceled = opts.isCanceled ?? (() => false)
+        dispatched.resolve()
+        if (nativeFailed) {
+          return createPtySubprocess({ ...opts, cols: 80, rows: 24, cwd: directory })
+        }
+        await release.promise
+        return subprocess
+      })
+      const server = new DaemonServer({
+        socketPath: getDaemonSocketPath(directory),
+        tokenPath: join(directory, 'test.token'),
+        ...(boundary.startsWith('legacy-') ? { protocolVersion: 53 } : {}),
+        spawnAdmission: 'enforce',
+        preparePtySpawn: async () => {},
+        ptySpawnHealthCheck: async () => {},
+        spawnSubprocess: spawn
+      })
+      await server.start()
 
-it('accepts immediately and waits only the prior physical acquisition before starting the accepted send', async () => {
-  const { deadline } = clock()
-  const entered = Promise.withResolvers<void>()
-  const physical = Promise.withResolvers<void>()
-  const operation = rig.host.runSwitch(id, 'prior-physical', deadline, async () => {
-    const acquisition = rig.host.trackSwitchPhysical(id, physical.promise)
-    entered.resolve()
-    await acquisition
-    return { status: 'completed', sessionId: id }
-  })
-  await entered.promise
-  const accepted = await rig.host.send(
-    caller,
-    restTestSend('Continue after the old launch settles', 1)
-  )
-  expect(accepted.ok).toBe(true)
-  expect(deadline.signal.aborted).toBe(true)
-  const start = rig.host.switchToChat(id)
-  await rig.host.journalSnapshot(id)
-  expect(rig.adapter.acquire).not.toHaveBeenCalled()
-  physical.resolve()
-  await operation
-  expect(await start).toMatchObject({ ok: true })
-  expect(rig.adapter.acquire).toHaveBeenCalledOnce()
-})
+      let omitSettlement = boundary === 'missing-result'
+      const omittedSettlement = Promise.withResolvers<void>()
 
-it('ordinary Close revokes a queued retention writer instead of resurrecting the source', async () => {
-  const { deadline } = clock()
-  const started = Promise.withResolvers<void>()
-  const finish = Promise.withResolvers<void>()
-  const restoring = Promise.withResolvers<void>()
-  const write = Promise.withResolvers<void>()
-  const retained = vi.fn(async (check: () => void) => {
-    restoring.resolve()
-    await write.promise
-    await rig.store.setSessionTabVisibility(id, true, undefined, check)
-  })
-  const operation = rig.host.runSwitch(
-    id,
-    'close-during-retain',
-    deadline,
-    async () => {
-      started.resolve()
-      await finish.promise
-      return { status: 'completed', sessionId: id }
-    },
-    true,
-    undefined,
-    retained
-  )
-  await started.promise
-  const retain = rig.host.retainSwitch(id)
-  const rejected = expect(retain).rejects.toHaveProperty('refusal')
-  await restoring.promise
-  await rig.host.close(id, 'user-close')
-  await rig.store.setSessionTabVisibility(id, false)
-  write.resolve()
-  await rejected
-  finish.resolve()
-  await operation
-  expect(rig.store.getSessionTabId(id)).toBeNull()
-})
+      installSwitchSocketFaults(boundary, ordinaryLoss, expired, outage, server, wire)
+      const respawn = vi.fn(async () => {
+        if (wire.connectionUnavailable) {
+          throw new Error('Recovery temporarily unavailable')
+        }
+      })
+      const adapter = new DaemonPtyAdapter({
+        socketPath: getDaemonSocketPath(directory),
+        tokenPath: join(directory, 'test.token'),
+        ...(boundary.startsWith('legacy-') ? { protocolVersion: 53 } : {}),
+        ...(['recovery-failed', 'recovery-used'].includes(boundary) ? { respawn } : {})
+      })
+      const { runtime, bindPty, session } = setupMainOwnedWorkspace()
+      Object.assign(runtime, {
+        resolveTerminalWorkspaceLaunchScope: async () => ({
+          id: WORKTREE_ID,
+          path: directory,
+          connectionId: null,
+          repo: null,
+          folderWorkspace: null
+        })
+      })
+      // The controller's external provider boundary; admission, registration and publication stay real.
+      runtime.setPtyController({
+        write: () => true,
+        kill: () => false,
+        getForegroundProcess: async () => null,
+        listProcesses: () => adapter.listProcesses(),
+        spawn: async (opts) => {
+          stages.push('controller-spawn')
+          destination = opts.sessionId!
+          destinationTab = opts.tabId!
+          destinationPane = `${opts.tabId}:${opts.leafId}`
+          const result = await adapter.spawn(opts)
+          if (!opts.tabId || !opts.leafId) {
+            throw new Error('ordinary pane identity missing')
+          }
+          bindPty({
+            worktreeId: WORKTREE_ID,
+            tabId: opts.tabId,
+            leafId: opts.leafId,
+            ptyId: result.id
+          })
+          return result
+        }
+      })
+      const siblingViewer =
+        outage || ordinaryLoss
+          ? new DaemonClient({
+              ...(boundary.startsWith('legacy-') ? { protocolVersion: 53 } : {}),
+              socketPath: getDaemonSocketPath(directory),
+              tokenPath: join(directory, 'test.token')
+            })
+          : undefined
+      if (siblingViewer) {
+        await siblingViewer.ensureConnected()
+        await siblingViewer.request('createOrAttach', {
+          sessionId: 'unrelated-sibling',
+          cols: 80,
+          rows: 24
+        })
+        spawn.mockClear()
+      }
+      const occupied = await Promise.all(
+        Array.from(
+          {
+            length: cap
+              ? 1
+              : outage || nativeFailed || compatible
+                ? 0
+                : DEFAULT_SPAWN_ADMISSION_LIMITS.userResumeConcurrency
+          },
+          (_, index) =>
+            server.automaticWork.gate.admit({
+              clientId: `other-${index}`,
+              declaredIntent: 'user-resume',
+              hasAgentSessionClaim: false,
+              hasHistorySeed: false,
+              deadlineAt: Infinity
+            })
+        )
+      )
+      let physical: Promise<unknown> = Promise.resolve()
+      const run = vi.fn(async () => {
+        const current = await rig.host.stopForSwitch(id, caller, time.deadline)
+        rig.host.guardSwitchWork(id, current)
+        stages.push('stopped')
+        const switchExecution = {
+          invocationId: 'socket-switch',
+          viewer: 'none' as const,
+          signal: time.deadline.signal,
+          remaining: time.deadline.remaining,
+          check: () => {
+            time.deadline.check()
+            if (!current()) {
+              throw new Error('newer work owns the source')
+            }
+          },
+          trackPhysical: <T>(work: Promise<T>, recover?: () => Promise<void>) => {
+            physical = Promise.allSettled([physical, work])
+            return rig.host.trackSwitchPhysical(id, work, recover)
+          }
+        }
+        await time.deadline.wait(
+          mobile
+            ? runtime.createMobileSessionTerminal(`id:${WORKTREE_ID}`, {
+                command: 'cx',
+                launchAgent: 'codex',
+                clientMutationId: 'socket-switch',
+                activate: false,
+                signal: time.deadline.signal,
+                switchExecution
+              })
+            : runtime.createTerminal(`id:${WORKTREE_ID}`, {
+                command: 'cx',
+                launchAgent: 'codex',
+                spawnIntent: 'user-resume',
+                sessionId: 'destination',
+                presentation: 'background',
+                signal: time.deadline.signal,
+                switchExecution
+              })
+        )
+        return { status: 'completed' as const, sessionId: id }
+      })
+      const operation = rig.host.runSwitch(id, 'socket-switch', time.deadline, run, {
+        direction: 'terminal'
+      })
+      const outcome = operation.then(
+        (value) => ({ ok: true as const, value }),
+        (error: unknown) => ({ ok: false as const, error })
+      )
+      try {
+        if (ordinaryLoss) {
+          await verifyOrdinarySwitchLostOutcome({
+            get ordinaryRequestId() {
+              return wire.ordinaryRequestId
+            },
+            boundary,
+            dispatched,
+            release,
+            get lateOrdinaryReply() {
+              return wire.lateOrdinaryReply
+            },
+            get destination() {
+              return destination
+            },
+            get destinationTab() {
+              return destinationTab
+            },
+            get destinationPane() {
+              return destinationPane
+            },
+            server,
+            time,
+            outcome,
+            rig,
+            tabIds,
+            runtime,
+            run,
+            clock,
+            acquisitions,
+            stop,
+            spawn,
+            sibling,
+            subprocess,
+            adapter
+          })
+          return
+        }
+        if (compatible) {
+          await dispatched.promise
+          expect(stop).toHaveBeenCalledOnce()
+          expect(rig.adapter.closeSession).toHaveBeenCalledOnce()
+          expect(rig.adapter.acquire).toHaveBeenCalledTimes(acquisitions)
+          release.resolve()
+          expect(await outcome).toMatchObject({ ok: true, value: { status: 'completed' } })
+          expect(spawn).toHaveBeenCalledOnce()
+          expect(wire.commitRequestId).toBe('')
+          expect(stages.filter((stage) => stage === 'controller-spawn')).toHaveLength(1)
+          expect(tabIds()).toHaveLength(2)
+          await adapter.write(destination, 'new terminal input')
+          await vi.waitFor(() =>
+            expect(subprocess.write).toHaveBeenCalledWith('new terminal input')
+          )
+          expect(nativePty.spawn).not.toHaveBeenCalled()
+          return
+        }
+        if (noFork || nativeFailed) {
+          await outcome
+        } else if (mobile) {
+          await dispatched.promise
+        } else {
+          await Promise.race([
+            vi.waitFor(
+              () => expect(server.automaticWork.gate.snapshot().waiting, stages.join(',')).toBe(1),
+              { timeout: 5000 }
+            ),
+            operation.then(() => {
+              throw new Error('completed before daemon gate')
+            })
+          ])
+        }
+        if (!mobile || noFork) {
+          expect(spawn).not.toHaveBeenCalled()
+        }
+        expect(rig.adapter.acquire).toHaveBeenCalledTimes(acquisitions)
+        expect(stop).toHaveBeenCalledOnce()
+        expect(rig.adapter.closeSession).toHaveBeenCalledOnce()
+        if (cap) {
+          expect(server.automaticWork.gate.snapshot()).toMatchObject({
+            hostCapRefused: 1,
+            waiting: 0
+          })
+        }
+        if (outage) {
+          await verifySwitchOutcomeOutage({
+            noFork,
+            nativeFailed,
+            wire,
+            server,
+            stages,
+            receiverCanceled,
+            release,
+            outcome,
+            terminalOutcome,
+            rig,
+            sibling,
+            acquisitions,
+            occupied,
+            spawn,
+            stop,
+            run,
+            tabIds
+          })
+          return
+        }
+        if (noFork || nativeFailed) {
+          occupied.forEach((lease) => lease.abandon())
+          expect(server.automaticWork.gate.snapshot()).toMatchObject({ terminals: 0, waiting: 0 })
+          expect(await outcome).toMatchObject({ ok: false })
+          if (nativeFailed) {
+            expect(spawn).toHaveBeenCalledOnce()
+            expect(nativePty.spawn).toHaveBeenCalledOnce()
+            const original = await outcome
+            await expect(
+              rig.host.runSwitch(id, 'socket-switch', clock().deadline, run, {
+                direction: 'terminal'
+              })
+            ).rejects.toBe(original.ok ? undefined : original.error)
+            expect(run).toHaveBeenCalledOnce()
+          } else {
+            expect(spawn).not.toHaveBeenCalled()
+          }
+          expect(
+            (
+              await rig.host.send(
+                caller,
+                restTestSend(
+                  'After receiver refused the expired commit',
+                  rig.store.getRecord(id)!.lease.runtimeFence
+                )
+              )
+            ).ok
+          ).toBe(true)
+        } else if (boundary === 'queued') {
+          expect(
+            (
+              await rig.host.send(
+                caller,
+                restTestSend('A new instruction', rig.store.getRecord(id)!.lease.runtimeFence)
+              )
+            ).ok
+          ).toBe(true)
+        } else {
+          occupied.forEach((lease) => lease.abandon())
+          await dispatched.promise
+          // Losing this observer does not settle the receiver's already-dispatched child.
+          if (
+            boundary === 'disconnected' ||
+            boundary === 'recovery-failed' ||
+            boundary === 'recovery-used'
+          ) {
+            // SAFETY: read this fixture server's connection registry only to break its exact external socket.
+            const connections = (server as unknown as { connections: DaemonClientConnections })
+              .connections
+            const client = connections.values().next().value
+            if (!client) {
+              throw new Error('authenticated fixture connection missing')
+            }
+            wire.connectionUnavailable = boundary === 'recovery-failed'
+            client.controlSocket.destroy()
+            if (boundary === 'recovery-used') {
+              subprocess.forceKill.mockImplementation(() => {
+                throw new Error('physical close unavailable')
+              })
+              release.resolve()
+            }
+          } else if (boundary === 'lost-reply' || boundary === 'missing-result') {
+            // Drop only this commit's external response bytes; the authenticated socket stays usable.
+            const daemon = server as unknown as {
+              connections: DaemonClientConnections
+              preparations: { pending: Map<string, Set<{ requestId: string }>> }
+            }
+            const requestId = [...(daemon.preparations.pending.get(destination) ?? [])][0]
+              ?.requestId
+            const socket = daemon.connections.values().next().value?.controlSocket
+            if (!requestId || !socket) {
+              throw new Error('fixture commit transport missing')
+            }
+            const write = socket.write.bind(socket)
+            vi.spyOn(socket, 'write').mockImplementation(
+              (...args: Parameters<typeof socket.write>) => {
+                const frame = JSON.parse(String(args[0]))
+                if (frame.id === requestId) {
+                  return true
+                }
+                if (omitSettlement && frame.payload?.settlement) {
+                  omittedSettlement.resolve()
+                  // A peer ignoring the optional field can acknowledge cancellation but cannot prove exit.
+                  return write(`${JSON.stringify({ ...frame, payload: { canceled: true } })}\n`)
+                }
+                return write(...args)
+              }
+            )
+            time.deadline.revoke()
+          } else {
+            time.deadline.revoke()
+          }
+        }
+        stages.push('waiting-observer')
+        expect(await outcome).toMatchObject({ ok: false })
+        stages.push('observer-failed')
+        if (boundary !== 'queued' && !noFork && !nativeFailed) {
+          expect(rig.host.switchExecuting(id)).toBe(true)
+          if (mobile) {
+            expect(tabIds()).toContain(destinationTab)
+            expect(runtime.hasLiveTerminalForPaneKey(destinationPane)).toBe(false)
+            expect(
+              await resolveAgentLaunchPaneVerdict(
+                { worktreeId: WORKTREE_ID, paneKey: destinationPane },
+                (paneKey) => runtime.hasLiveTerminalForPaneKey(paneKey)
+              )
+            ).toEqual({ kind: 'unconfirmed' })
+            const observed = await outcome
+            expect(observed).toMatchObject({
+              error: {
+                message: 'Connection lost'
+              }
+            })
+          }
+          stages.push('duplicate')
+          const duplicate = await rig.host
+            .runSwitch(id, 'other-viewer', clock().deadline, run, { direction: 'terminal' })
+            .catch((error: unknown) => error)
+          const observed = await outcome
+          if (observed.ok) {
+            throw new Error('revoked observer unexpectedly completed')
+          }
+          expect(duplicate).toBe(observed.error)
+          await expect(
+            rig.host.runSwitch(id, 'opposing-viewer', clock().deadline, run, { direction: 'chat' })
+          ).rejects.toMatchObject({ refusal: { details: { reason: 'handoffInFlight' } } })
+          expect(run).toHaveBeenCalledOnce()
+          if (boundary === 'recovery-failed') {
+            await vi.waitFor(() => expect(respawn).toHaveBeenCalled())
+            const accepted = await rig.host.send(
+              caller,
+              restTestSend(
+                'While recovery is unavailable',
+                rig.store.getRecord(id)!.lease.runtimeFence
+              )
+            )
+            expect(accepted.ok).toBe(true)
+            // Run the ordinary start/recovery iteration to its bounded failure, not a mocked join.
+            if (!accepted.ok) {
+              throw new Error('new send was refused')
+            }
+            await vi.waitFor(async () =>
+              expect(
+                (await rig.host.journalSnapshot(id)).submissions.find(
+                  (entry) => entry.clientMessageId === accepted.value.clientMessageId
+                )?.dispatchState
+              ).toBe('rejected')
+            )
+            expect(rig.adapter.acquire).toHaveBeenCalledTimes(acquisitions)
+            expect(rig.host.switchExecuting(id)).toBe(true)
+            wire.connectionUnavailable = false
+          }
+          stages.push('waiting-receiver-cancel')
+          await vi.waitFor(() => expect(receiverCanceled()).toBe(true))
+          if (boundary === 'recovery-failed') {
+            expect(
+              (
+                await rig.host.send(
+                  caller,
+                  restTestSend(
+                    'After recovery is restored',
+                    rig.store.getRecord(id)!.lease.runtimeFence
+                  )
+                )
+              ).ok
+            ).toBe(true)
+          }
+          if (boundary === 'live-unknown') {
+            subprocess.forceKill.mockImplementation(() => {
+              throw new Error('physical close unavailable')
+            })
+          }
+          release.resolve()
+          if (boundary === 'live-unknown' || boundary === 'recovery-used') {
+            await vi.waitFor(async () =>
+              expect(await adapter.listProcesses()).toMatchObject([{ id: destination }])
+            )
+            let killsBeforeUse = subprocess.forceKill.mock.calls.length
+            if (boundary === 'recovery-used') {
+              usedViewer = new DaemonClient({
+                socketPath: getDaemonSocketPath(directory),
+                tokenPath: join(directory, 'test.token')
+              })
+              await usedViewer.ensureConnected()
+              await usedViewer.request('createOrAttach', {
+                sessionId: destination,
+                cols: 80,
+                rows: 24,
+                attachOnly: true
+              })
+              killsBeforeUse = subprocess.forceKill.mock.calls.length
+            }
+            const accepted = await rig.host.send(
+              caller,
+              restTestSend(
+                'While the terminal is still alive',
+                rig.store.getRecord(id)!.lease.runtimeFence
+              )
+            )
+            if (!accepted.ok) {
+              throw new Error('new send was refused')
+            }
+            await vi.waitFor(async () =>
+              expect(
+                (await rig.host.journalSnapshot(id)).submissions.find(
+                  (entry) => entry.clientMessageId === accepted.value.clientMessageId
+                )?.dispatchState
+              ).toBe('rejected')
+            )
+            expect(rig.adapter.acquire).toHaveBeenCalledTimes(acquisitions)
+            expect(rig.host.switchExecuting(id)).toBe(true)
+            if (mobile) {
+              expect(tabIds()).toContain(destinationTab)
+            }
+            if (boundary === 'recovery-used') {
+              expect(subprocess.forceKill).toHaveBeenCalledTimes(killsBeforeUse)
+            }
+            expect(server.host.listSessions()).toMatchObject([{ isAlive: true }])
+            subprocess._simulateExit(137)
+          }
+          if (boundary === 'missing-result') {
+            await omittedSettlement.promise
+            expect(rig.host.switchExecuting(id)).toBe(true)
+            const accepted = await rig.host.send(
+              caller,
+              restTestSend('Missing settlement proof', rig.store.getRecord(id)!.lease.runtimeFence)
+            )
+            if (!accepted.ok) {
+              throw new Error('new send was refused')
+            }
+            await vi.waitFor(async () =>
+              expect(
+                (await rig.host.journalSnapshot(id)).submissions.find(
+                  (entry) => entry.clientMessageId === accepted.value.clientMessageId
+                )?.dispatchState
+              ).toBe('rejected')
+            )
+            expect(rig.adapter.acquire).toHaveBeenCalledTimes(acquisitions)
+            omitSettlement = false
+            expect(
+              (
+                await rig.host.send(
+                  caller,
+                  restTestSend(
+                    'After receiver proof is available',
+                    rig.store.getRecord(id)!.lease.runtimeFence
+                  )
+                )
+              ).ok
+            ).toBe(true)
+          }
+          stages.push('waiting-physical')
+          await physical.catch(() => {})
+          stages.push('physical-finished')
+          // The unused child is canceled through ordinary owned cleanup, with actual fake-I/O exit.
+          if (boundary !== 'recovery-used') {
+            expect(subprocess.forceKill).toHaveBeenCalled()
+          }
+          expect(server.host.listSessions().every((entry) => !entry.isAlive)).toBe(true)
+          if (boundary !== 'recovery-failed' && boundary !== 'missing-result') {
+            expect(
+              (
+                await rig.host.send(
+                  caller,
+                  restTestSend('After physical exit', rig.store.getRecord(id)!.lease.runtimeFence)
+                )
+              ).ok
+            ).toBe(true)
+          }
+        } else {
+          occupied.forEach((lease) => lease.abandon())
+          await physical.catch(() => {})
+          if (nativeFailed) {
+            expect(spawn).toHaveBeenCalledOnce()
+          } else {
+            expect(spawn).not.toHaveBeenCalled()
+          }
+          expect(server.host.listSessions()).toEqual([])
+          // Definitively unused publication is withdrawn by its ordinary owner.
+          await vi.waitFor(() => expect(tabIds()).toEqual([TAB_ID]))
+        }
+        await verifySwitchFinalDelivery({
+          rig,
+          spawn,
+          boundary,
+          noFork,
+          mobile,
+          tabIds,
+          adapter,
+          server,
+          wire,
+          stop,
+          run,
+          stages
+        })
+      } finally {
+        vi.useRealTimers()
+        time.deadline.revoke()
+        wire.connectionUnavailable = false
+        omitSettlement = false
+        occupied.forEach((lease) => lease.abandon())
+        release.resolve()
+        if (
+          compatible ||
+          boundary === 'live-unknown' ||
+          boundary === 'recovery-used' ||
+          boundary === 'exit-outage'
+        ) {
+          subprocess._simulateExit(137)
+        }
+        await outcome
+        // An ordinary retry wakes retained receiver completion after restoring external transport.
+        void rig.host
+          .runSwitch(id, 'cleanup-observer', clock().deadline, run, { direction: 'terminal' })
+          .catch(() => {})
+        if (!ordinaryLoss) {
+          await physical.catch(() => {})
+        }
 
-it('expiry retains a source through the command owner and cannot restore after external Close', async () => {
-  const { deadline } = clock()
-  const started = Promise.withResolvers<void>()
-  const finish = Promise.withResolvers<void>()
-  const retained = vi.fn(async (check: () => void) => {
-    check()
-    await rig.store.setSessionTabVisibility(id, true, undefined, check)
-  })
-  const operation = rig.host.runSwitch(
-    id,
-    'expire-retain',
-    deadline,
-    async () => {
-      started.resolve()
-      await finish.promise
-      return { status: 'completed', sessionId: id }
+        usedViewer?.disconnect()
+        sibling._simulateExit(0)
+        siblingViewer?.disconnect()
+        vi.useRealTimers()
+        adapter.dispose()
+        await server.shutdown()
+        await rm(directory, { recursive: true, force: true })
+      }
     },
-    true,
-    undefined,
-    retained
+    25_000
   )
-  await started.promise
-  deadline.revoke()
-  await rig.host.retainSwitch(id)
-  expect(rig.store.getSessionTabId(id)).not.toBeNull()
-  await rig.host.close(id, 'user-close')
-  await rig.store.setSessionTabVisibility(id, false)
-  await expect(rig.host.retainSwitch(id)).rejects.toHaveProperty('refusal')
-  finish.resolve()
-  await operation
-  expect(rig.store.getSessionTabId(id)).toBeNull()
-})
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-commands.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-commands.ts
index fc02bba47fbc..3c0837cc4e50 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-commands.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-commands.ts
@@ -2,8 +2,7 @@ import type { StructuredAgentSessionConversationLifetimeHost } from './structure
 import { agentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
 import type {
   AgentSessionSwitchDeadline,
-  AgentSessionSwitchResult,
-  AgentSessionSwitchReceipt
+  AgentSessionSwitchResult
 } from '../../../shared/agent-session-switch-execution'
 import {
   selectStructuredSessionSwitchCommand,
@@ -14,21 +13,15 @@ export function createStructuredAgentSessionSwitchCommands(
   host: StructuredAgentSessionConversationLifetimeHost,
   isDisposed: () => boolean
 ) {
-  const { serialize } = host
-  const deps = () => host.context().deps
   const commands = new Map<string, SwitchCommand>()
-  const unsubscribeAcceptance = deps().store.onAcceptedSend((id) => {
+  const unsubscribe = host.context().deps.store.onAcceptedSend((id) => {
     const command = commands.get(id)
-    if (!command?.revokeOnSend || command.settled) {
-      return
+    if (command?.workCurrent && !command.settled && !command.workCurrent()) {
+      command.deadline.revoke(
+        agentSessionRefusalError('agent_session_operation_invalid', { reason: 'messagesUnsettled' })
+      )
     }
-    command.deadline.revoke(
-      agentSessionRefusalError('agent_session_operation_invalid', {
-        reason: 'messagesUnsettled'
-      })
-    )
   })
-
   return {
     controls: {
       runSwitch: async (
@@ -36,18 +29,16 @@ export function createStructuredAgentSessionSwitchCommands(
         invocationId: string,
         deadline: AgentSessionSwitchDeadline,
         run: () => Promise<AgentSessionSwitchResult>,
-        revokeOnSend = true,
-        phase?: {
-          observe?: boolean
-          receipt?: AgentSessionSwitchReceipt
-        },
-        onRetained?: (check: () => void) => Promise<void>,
-        allowUncreated = false,
-        onConverged?: (generation: string) => void
+        options: {
+          conversationKey?: string
+          direction: SwitchCommand['direction']
+          onRetained?: (check: () => void) => Promise<void>
+          allowUncreated?: boolean
+        }
       ): Promise<AgentSessionSwitchResult> => {
         const selected = await deadline.wait(
-          serialize(id, async () => {
-            return selectStructuredSessionSwitchCommand({
+          host.serialize(options.conversationKey ?? id, async () =>
+            selectStructuredSessionSwitchCommand({
               host,
               commands,
               isDisposed,
@@ -55,45 +46,25 @@ export function createStructuredAgentSessionSwitchCommands(
               invocationId,
               deadline,
               run,
-              revokeOnSend,
-              phase,
-              onRetained,
-              allowUncreated
+              ...options
             })
-          })
+          )
         )
         if (selected.deadline !== deadline) {
           deadline.dispose()
         }
-        if (phase?.receipt) {
-          if (phase.receipt.generation !== selected.generation) {
-            throw agentSessionRefusalError('agent_session_operation_invalid', {
-              reason: 'handoffInFlight'
-            })
-          }
-          if (phase.receipt.converged) {
-            onConverged?.(selected.generation)
-            return { status: 'completed', sessionId: id }
-          }
-          if (phase.receipt.retained) {
-            selected.deadline.revoke(
-              agentSessionRefusalError('agent_session_operation_invalid', {
-                reason: 'messagesUnsettled'
-              })
-            )
-            await selected.retain?.()
-            return { status: 'completed', sessionId: id, sourceRetained: true }
-          }
-          selected.deadline.check()
-          selected.acknowledge(phase.receipt.shown)
-          return Promise.race([selected.completion, selected.opened])
+        try {
+          return await selected.completion
+        } catch (error) {
+          // Each ordinary retry drives the original receiver join, never another Stop/create.
+          void Promise.all(
+            [...(selected.physicalRecovery ?? [])].map((recover) => recover())
+          ).catch(() => {})
+          throw error
         }
-        return phase?.observe
-          ? selected.completion
-          : Promise.race([selected.completion, selected.presentation])
       },
       adoptSwitch: (from: string, to: string) =>
-        serialize(to, async () => {
+        host.serialize(to, async () => {
           const command = commands.get(from)
           const prior = commands.get(to)
           command?.deadline.check()
@@ -104,47 +75,37 @@ export function createStructuredAgentSessionSwitchCommands(
           }
           commands.set(to, command)
         }),
-      switchGeneration: (id: string) => commands.get(id)?.generation,
-      retainSwitch: async (id: string) => {
-        await commands.get(id)?.retain?.()
-      },
-      presentSwitch: async (
-        id: string,
-        view: Omit<
-          Extract<AgentSessionSwitchResult, { status: 'present' }>,
-          'status' | 'generation'
-        >
-      ) => {
+      guardSwitchWork: (id: string, current: () => boolean) => {
         const command = commands.get(id)
-        if (!command) {
-          throw agentSessionRefusalError('agent_session_operation_expired', {
-            reason: 'operationExpired'
-          })
-        }
-        command.deadline.check()
-        command.present({ ...view, status: 'present', generation: command.generation })
-        if (!(await command.deadline.wait(command.shown))) {
-          throw agentSessionRefusalError('agent_session_operation_unknown', {
-            reason: 'tabUnconfirmed'
-          })
+        if (command) {
+          command.workCurrent = current
         }
-        command.deadline.check()
       },
-      openedSwitch: (id: string, result: AgentSessionSwitchResult) =>
-        commands.get(id)?.openedResult(result),
+      switchGeneration: (id: string) => commands.get(id)?.generation,
+      retainSwitch: async (id: string) => {
+        await commands.get(id)?.retain()
+      },
       switchExecuting: (id: string) => Boolean(commands.get(id) && !commands.get(id)?.settled),
-      trackSwitchPhysical: <T>(id: string, work: Promise<T>): Promise<T> => {
+      trackSwitchPhysical: <T>(
+        id: string,
+        work: Promise<T>,
+        recover?: () => Promise<void>
+      ): Promise<T> => {
         const command = commands.get(id)
         if (command) {
-          command.physical = work.then(
-            () => {},
-            () => {}
-          )
+          command.physical = Promise.allSettled([command.physical, work]).then(() => {})
+          if (recover) {
+            const recoveries = (command.physicalRecovery ??= new Set())
+            recoveries.add(recover)
+            void work.finally(() => recoveries.delete(recover)).catch(() => {})
+          }
         }
         return work
       },
       waitSwitchPhysical: async (id: string): Promise<void> => {
-        await commands.get(id)?.physical
+        const command = commands.get(id)
+        await Promise.all([...(command?.physicalRecovery ?? [])].map((recover) => recover()))
+        await command?.physical
       }
     },
     revoke: (id: string) => {
@@ -155,7 +116,7 @@ export function createStructuredAgentSessionSwitchCommands(
       }
     },
     dispose: () => {
-      unsubscribeAcceptance()
+      unsubscribe()
       for (const command of commands.values()) {
         command.retentionAllowed = false
         clearTimeout(command.cleanupTimer)
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import-coverage.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import-coverage.ts
new file mode 100644
index 000000000000..3d942c0a57d4
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import-coverage.ts
@@ -0,0 +1,140 @@
+import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key'
+import type { AgentType } from '../../../shared/agent-status-types'
+import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
+import type { JournalReplacementItem } from '../agent-session-journal/journal-epoch-replacement'
+import { createClaudeTranscriptItemReader } from '../../claude/claude-transcript-item-reader'
+import { matchAcpHistoryTurns, type AcpHistoryCandidate } from '../../acp/acp-history-turn-matching'
+import { acpNamedTextKey } from '../../acp/acp-turn-messages'
+import { GROK_ACP_DIALECT } from '../../acp/acp-dialects/grok-dialect'
+import { OPENCODE_ACP_DIALECT } from '../../acp/acp-dialects/opencode-dialect'
+import { createLegacyProviderTimelineIdentityScheme } from '../agent-session-timeline/provider-timeline-identity'
+import { usableJournalHistoryOrigin } from '../agent-session-journal/journal-history-origin'
+
+/** Use the ordinary native-history coverage rules before appending disk history at rest. */
+export function switchTranscriptNativeCoverage(input: {
+  agent: AgentType
+  providerSessionId: string
+  journal: AgentSessionJournal
+  items: readonly JournalReplacementItem[]
+  check: () => void
+}): ReadonlySet<string> {
+  const snapshot = input.journal.snapshot()
+  const covered = new Set<string>()
+  const segments: JournalReplacementItem[][] = []
+  for (const item of input.items) {
+    if (item.body.kind === 'message' && item.body.role === 'user') {
+      segments.push([])
+    }
+    segments.at(-1)?.push(item)
+  }
+  if (input.agent === 'claude') {
+    const reader = createClaudeTranscriptItemReader(input.journal, snapshot.sessionId)
+    for (const segment of segments) {
+      const user = segment[0]
+      if (user.identity.provider !== 'claude') {
+        continue
+      }
+      const key = agentJournalItemKey(user.identity)
+      const native = reader.saved(key) ?? reader.localPrompt(user.identity.uuid)
+      if (native && native.itemId !== key) {
+        segment.forEach((item) => covered.add(agentJournalItemKey(item.identity)))
+      }
+    }
+    return covered
+  }
+  if (!['grok', 'opencode', 'opencode2'].includes(input.agent)) {
+    return covered
+  }
+  const scope = {
+    sessionId: snapshot.sessionId,
+    providerSessionId: input.providerSessionId,
+    agent: input.agent,
+    identity: input.agent === 'grok' ? ('prompt-id' as const) : ('user-message-id' as const),
+    dialect: input.agent === 'grok' ? GROK_ACP_DIALECT : OPENCODE_ACP_DIALECT
+  }
+  const scheme = createLegacyProviderTimelineIdentityScheme(scope)
+  const recordId = (item: JournalReplacementItem) =>
+    item.identity.provider === 'legacy' ? item.identity.recordId.replace(/^opencode:/, '') : ''
+  const candidates: AcpHistoryCandidate[] = segments.flatMap((segment) => {
+    const user = segment[0]
+    if (user.body.kind !== 'message') {
+      return []
+    }
+    const turn = recordId(user)
+    if (!turn) {
+      return []
+    }
+    return [
+      {
+        source: {
+          turn,
+          user: {
+            blocks: user.body.blocks,
+            boundary: { method: 'session/update', params: {} }
+          },
+          textOnly: user.body.blocks.every((block) => block.type === 'text'),
+          observations: [],
+          messageIds: segment.map(recordId),
+          startedAt: user.observedAt ?? null
+        },
+        items: segment.map((item) => ({
+          kind: 'item' as const,
+          identity: scheme.item({
+            namespace: scope.providerSessionId,
+            key: {
+              source: 'provider',
+              value: acpNamedTextKey(
+                recordId(item).replace(/:reasoning(?::\d+)?$/, ''),
+                item.body.kind === 'message' && item.body.role === 'reasoning'
+                  ? 'reasoning'
+                  : 'assistant'
+              )
+            },
+            family: 'item',
+            thread: scope.providerSessionId
+          }),
+          body: item.body,
+          turnScope: { kind: 'thread' as const }
+        }))
+      }
+    ]
+  })
+  const origin = usableJournalHistoryOrigin(input.journal.historyOrigin())
+  const handle = origin?.providerHandle
+  const importedAt =
+    origin &&
+    handle?.kind === 'opaque' &&
+    handle.agent === input.agent &&
+    handle.value === input.providerSessionId
+      ? origin.importedAt
+      : null
+  const requests = new Set(
+    input.journal
+      .submissions()
+      .filter((send) => send.handedOverAt !== undefined || send.handoverRecorded !== true)
+      .map((send) => `prompt:${send.clientMessageId}`)
+  )
+  const { kind } = matchAcpHistoryTurns(
+    scope,
+    {
+      items: new Map(
+        snapshot.items
+          .filter(
+            (item) =>
+              importedAt !== null || input.journal.itemProvenance(item.itemId).ownerFence !== 0
+          )
+          .map((item) => [item.itemId, item])
+      )
+    },
+    candidates,
+    importedAt,
+    requests,
+    input.check
+  )
+  for (const segment of segments) {
+    if (kind.get(recordId(segment[0])) === 'native') {
+      segment.forEach((item) => covered.add(agentJournalItemKey(item.identity)))
+    }
+  }
+  return covered
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.test.ts
new file mode 100644
index 000000000000..0de9b81ec842
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.test.ts
@@ -0,0 +1,651 @@
+import { mkdtemp, rm, writeFile, appendFile, readFile } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import type { AgentType } from '../../../shared/agent-status-types'
+import { agentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
+import {
+  claudeProviderHandle,
+  codexProviderHandle
+} from '../../../shared/agent-session-provider-handle-encoding'
+import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key'
+import Database from '../../sqlite/sync-database'
+import { claudePromptUuidForSubmission } from '../../claude/structured/claude-structured-session-id'
+import { encodePiHistoryClaim } from '../../pi/rpc-history-journal-view'
+import { createLegacyProviderTimelineIdentityScheme } from '../agent-session-timeline/provider-timeline-identity'
+import { acpNamedTextKey } from '../../acp/acp-turn-messages'
+import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key'
+import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
+import { piHistoryEntryIdentity } from '../../pi/rpc-history-import'
+import { createTrackedJournalOpener } from '../agent-session-journal/journal-host-database-test-support'
+import { createPiTranscriptCollector } from '../agent-session-journal/journal-pi-active-branch'
+import { decodePiTurnLifecycle } from '../transcript-turn-lifecycle'
+import {
+  captureSwitchStoppedCliTurn,
+  catchUpSwitchedCliTranscript
+} from './structured-agent-session-switch-import'
+
+vi.mock('../../ai-vault/session-scanner-opencode-sqlite-worker-spawn', async () => {
+  const query = await import('../transcript-opencode-sqlite-query')
+  return {
+    readOpenCodeTranscriptPageViaWorker: async (
+      args: Parameters<typeof query.readOpenCodeTranscriptPage>[0]
+    ) => query.readOpenCodeTranscriptPage(args),
+    readOpenCodeTranscriptSignalViaWorker: async (args: { dbPath: string; sessionId: string }) =>
+      query.readOpenCodeTranscriptSignal(args.dbPath, args.sessionId)
+  }
+})
+const journals = createTrackedJournalOpener()
+let root: string
+let deadline: ReturnType<typeof agentSessionSwitchDeadline>
+beforeEach(async () => {
+  root = await mkdtemp(join(tmpdir(), 'orca-switch-import-'))
+  deadline = agentSessionSwitchDeadline()
+})
+afterEach(async () => {
+  deadline.dispose()
+  await journals.closeAll()
+  await rm(root, { recursive: true, force: true })
+})
+function options() {
+  return {
+    stateDirectory: root,
+    identity: {
+      sessionId: 'native',
+      workspaceId: 'folder',
+      hostId: 'local',
+      agent: 'codex' as const,
+      providerHandle: codexProviderHandle('019aef12-1234-7000-8000-123456789abc')
+    }
+  }
+}
+const encode = (rows: unknown[]) => `${rows.map((row) => JSON.stringify(row)).join('\n')}\n`
+
+async function sourceFor(agent: AgentType) {
+  const filePath = join(
+    root,
+    agent === 'opencode' || agent === 'opencode2' ? 'opencode.db' : 'session.jsonl'
+  )
+  const sessionId = agent === 'pi' ? filePath : 'cli-session'
+  const source = { agent, sessionId, filePath }
+  if (agent === 'opencode' || agent === 'opencode2') {
+    const db = new Database(filePath)
+    if (agent === 'opencode') {
+      db.exec(`CREATE TABLE session (id TEXT PRIMARY KEY); INSERT INTO session VALUES ('cli-session');
+        CREATE TABLE message (id TEXT PRIMARY KEY, session_id TEXT, time_created INTEGER, time_updated INTEGER, data TEXT);
+        CREATE TABLE part (id TEXT PRIMARY KEY, session_id TEXT, message_id TEXT, time_created INTEGER, time_updated INTEGER, data TEXT);`)
+      db.prepare('INSERT INTO message VALUES (?, ?, 1, 1, ?)').run(
+        'user',
+        sessionId,
+        JSON.stringify({ role: 'user', time: { created: 1 } })
+      )
+      db.prepare('INSERT INTO message VALUES (?, ?, 2, 2, ?)').run(
+        'reply',
+        sessionId,
+        JSON.stringify({ role: 'assistant', parentID: 'user', time: { created: 2 } })
+      )
+      for (const [id, text] of [
+        ['user', 'Keep this prompt'],
+        ['reply', 'Partial response']
+      ]) {
+        db.prepare('INSERT INTO part VALUES (?, ?, ?, 1, 1, ?)').run(
+          id,
+          sessionId,
+          id,
+          JSON.stringify({ type: 'text', text })
+        )
+      }
+    } else {
+      db.exec(`CREATE TABLE session_v2 (id TEXT PRIMARY KEY); INSERT INTO session_v2 VALUES ('cli-session');
+        CREATE TABLE session_message (id TEXT PRIMARY KEY, session_id TEXT, type TEXT, seq INTEGER, data TEXT, time_created INTEGER, time_updated INTEGER);`)
+      const insert = db.prepare('INSERT INTO session_message VALUES (?, ?, ?, ?, ?, 1, 1)')
+      insert.run('user', sessionId, 'user', 1, JSON.stringify({ text: 'Keep this prompt' }))
+      insert.run(
+        'reply',
+        sessionId,
+        'assistant',
+        2,
+        JSON.stringify({ content: [{ type: 'text', text: 'Partial response' }] })
+      )
+    }
+    db.close()
+    return {
+      source,
+      finish: async () => {
+        const finished = new Database(filePath)
+        try {
+          if (agent === 'opencode') {
+            finished.prepare('UPDATE message SET data = ? WHERE id = ?').run(
+              JSON.stringify({
+                role: 'assistant',
+                parentID: 'user',
+                finish: 'stop',
+                time: { created: 2, completed: 3 }
+              }),
+              'reply'
+            )
+          } else {
+            finished
+              .prepare('INSERT INTO session_message VALUES (?, ?, ?, ?, ?, 3, 3)')
+              .run('end', sessionId, 'idle', 3, JSON.stringify({ outcome: 'succeeded' }))
+          }
+        } finally {
+          finished.close()
+        }
+      }
+    }
+  }
+  const rows =
+    agent === 'claude'
+      ? [
+          {
+            type: 'user',
+            uuid: 'user',
+            sessionId,
+            message: { role: 'user', content: 'Keep this prompt' }
+          },
+          {
+            type: 'assistant',
+            uuid: 'reply',
+            sessionId,
+            message: { role: 'assistant', content: [{ type: 'text', text: 'Partial response' }] }
+          }
+        ]
+      : agent === 'pi'
+        ? [
+            { type: 'session', version: 3, id: 'header-id' },
+            {
+              type: 'message',
+              id: 'user',
+              parentId: null,
+              message: { role: 'user', content: 'Keep this prompt' }
+            },
+            {
+              type: 'message',
+              id: 'abandoned',
+              parentId: 'user',
+              message: {
+                role: 'assistant',
+                content: [{ type: 'text', text: 'Abandoned answer' }],
+                stopReason: 'stop'
+              }
+            },
+            {
+              type: 'message',
+              id: 'reply',
+              parentId: 'user',
+              message: {
+                role: 'assistant',
+                content: [{ type: 'text', text: 'Partial response' }],
+                stopReason: 'toolUse'
+              }
+            }
+          ]
+        : [
+            {
+              type: 'user',
+              id: 'user',
+              timestamp: '2026-10-28T00:00:00Z',
+              content: 'Keep this prompt'
+            },
+            {
+              type: 'assistant',
+              id: 'reply',
+              timestamp: '2026-10-28T00:00:01Z',
+              content: 'Partial response'
+            }
+          ]
+  await writeFile(filePath, encode(rows))
+  const events = [
+    { type: 'turn_started', session_id: sessionId, turn_number: 1, ts: '2026-10-28T00:00:00Z' }
+  ]
+  if (agent === 'grok') {
+    await writeFile(join(root, 'events.jsonl'), encode(events))
+  }
+  return {
+    source,
+    finish: async () => {
+      if (agent === 'grok') {
+        await writeFile(
+          join(root, 'events.jsonl'),
+          encode([
+            ...events,
+            { type: 'turn_ended', outcome: 'completed', ts: '2026-10-28T00:00:02Z' }
+          ])
+        )
+      } else if (agent === 'claude') {
+        await writeFile(
+          filePath,
+          encode([
+            ...rows,
+            {
+              type: 'assistant',
+              uuid: 'end',
+              sessionId,
+              message: {
+                role: 'assistant',
+                content: [{ type: 'text', text: 'Final response' }],
+                stop_reason: 'end_turn'
+              }
+            }
+          ])
+        )
+      } else {
+        await writeFile(
+          filePath,
+          encode([
+            ...rows,
+            {
+              type: 'message',
+              id: 'end',
+              parentId: 'reply',
+              message: {
+                role: 'assistant',
+                content: [{ type: 'text', text: 'Final response' }],
+                stopReason: 'stop'
+              }
+            }
+          ])
+        )
+      }
+    }
+  }
+}
+
+it.each(['claude', 'pi', 'grok', 'opencode', 'opencode2'] as const)(
+  'imports stopped %s through the durable journal, preserves provider completion and deduplicates after reopen',
+  async (agent) => {
+    const { source, finish } = await sourceFor(agent)
+    let journal = await journals.open(options())
+    const stopped = await captureSwitchStoppedCliTurn(source, true, deadline)
+    expect(stopped).toBeDefined()
+    await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline, stopped })
+    expect(
+      journal
+        .snapshot()
+        .items.filter((item) => item.body.kind === 'turn')
+        .map((item) => item.body)
+    ).toEqual([expect.objectContaining({ state: 'interrupted' })])
+    if (agent === 'pi') {
+      expect(
+        journal.item(agentJournalItemKey(piHistoryEntryIdentity(source.filePath, 'user')))
+      ).not.toBeNull()
+      expect(
+        journal
+          .snapshot()
+          .items.some(
+            (item) =>
+              item.itemId ===
+              agentJournalItemKey(piHistoryEntryIdentity(source.filePath, 'abandoned'))
+          )
+      ).toBe(false)
+    }
+    const snapshot = journal.snapshot()
+    await journal.close()
+    journal = await journals.open(options())
+    await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline, stopped })
+    expect(journal.snapshot()).toEqual(snapshot)
+    // A different conversation journal sees a completion written before the exact source exited.
+    await finish()
+    const raced = await journals.open({
+      ...options(),
+      identity: { ...options().identity, sessionId: 'raced' }
+    })
+    await catchUpSwitchedCliTranscript({ journal: raced, source, fence: 1, deadline, stopped })
+    expect(
+      raced
+        .snapshot()
+        .items.filter((item) => item.body.kind === 'turn')
+        .map((item) => item.body)
+    ).toEqual([expect.objectContaining({ state: 'completed' })])
+  }
+)
+
+it('does not infer Interrupted from a historical truncated tail and checks newer work at the commit owner', async () => {
+  const { source } = await sourceFor('claude')
+  const journal = await journals.open(options())
+  await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline })
+  expect(journal.snapshot().items.some((item) => item.body.kind === 'turn')).toBe(false)
+  const stopped = await captureSwitchStoppedCliTurn(source, true, deadline)
+  const before = journal.snapshot()
+  await expect(
+    catchUpSwitchedCliTranscript({
+      journal,
+      source,
+      fence: 1,
+      deadline,
+      stopped,
+      check: () => {
+        throw new Error('newer accepted action')
+      }
+    })
+  ).rejects.toThrow('newer accepted action')
+  expect(journal.snapshot()).toEqual(before)
+})
+
+async function nativePrompt(journal: AgentSessionJournal) {
+  await journal.appendSubmission({
+    clientMessageId: 'native-prompt',
+    payloadFingerprint: 'native-fingerprint',
+    fence: 1,
+    body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'Keep this prompt' }] }
+  })
+  return agentJournalSubmissionKey('native-prompt')
+}
+
+it.each([false, true])(
+  'preserves a native Claude submission while importing a later CLI turn (acknowledged=%s)',
+  async (acknowledged) => {
+    const { source } = await sourceFor('claude')
+    const journal = await journals.open(options())
+    const native = await nativePrompt(journal)
+    const promptUuid = claudePromptUuidForSubmission('native', native)
+    if (acknowledged) {
+      await journal.resolveDispatch({
+        clientMessageId: 'native-prompt',
+        fence: 1,
+        state: 'accepted',
+        providerIdentity: { provider: 'claude', sessionId: source.sessionId, uuid: promptUuid }
+      })
+    }
+    const transcript = await readFile(source.filePath, 'utf8')
+    await writeFile(source.filePath, transcript.replace('"uuid":"user"', `"uuid":"${promptUuid}"`))
+    const before = journal.snapshot().items
+    await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline })
+    expect(journal.snapshot().items).toEqual(before)
+    await appendFile(
+      source.filePath,
+      encode([
+        {
+          type: 'user',
+          uuid: 'outside-user',
+          sessionId: source.sessionId,
+          message: { role: 'user', content: 'Outside prompt' }
+        },
+        {
+          type: 'assistant',
+          uuid: 'outside-answer',
+          sessionId: source.sessionId,
+          message: { role: 'assistant', content: [{ type: 'text', text: 'Outside partial' }] }
+        }
+      ])
+    )
+    const stopped = await captureSwitchStoppedCliTurn(source, true, deadline)
+    await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline, stopped })
+    expect(journal.item(native)).toEqual(before[0])
+    expect(
+      journal
+        .snapshot()
+        .items.filter((item) => item.body.kind === 'message' && item.body.role === 'user')
+    ).toHaveLength(2)
+  }
+)
+
+it.each([
+  { oldEntries: 600, payloadBytes: 32, stopReason: 'toolUse', state: 'working' },
+  { oldEntries: 6000, payloadBytes: 32, stopReason: 'stop', state: 'completed' },
+  { oldEntries: 80, payloadBytes: 16 * 1024, stopReason: 'toolUse', state: 'working' },
+  { oldEntries: 80, payloadBytes: 160 * 1024, stopReason: 'stop', state: 'completed' }
+])(
+  'yields during selected Pi lifecycle replay with $oldEntries old entries of $payloadBytes bytes and a fixed suffix',
+  async ({ oldEntries, payloadBytes, stopReason, state }) => {
+    const observed: string[] = []
+    const emitted: string[] = []
+    const slices: { rows: number; bytes: number; emitted: number }[] = []
+    const lifecycle: string[] = []
+    let rows = 0
+    let bytes = 0
+    let maxLineBytes = 0
+    let pending: ReturnType<typeof setImmediate> | undefined
+    const collector = createPiTranscriptCollector(
+      (message) => message.id,
+      (_line, lineIndex) => ({
+        provider: 'legacy',
+        agent: 'pi',
+        sessionId: 'synthetic-progress-control',
+        recordId: String(lineIndex)
+      }),
+      (line, fallbackId) => {
+        observed.push(fallbackId)
+        const next = decodePiTurnLifecycle(line, fallbackId)
+        if (next) {
+          lifecycle.push(next.state)
+        }
+        rows += 1
+        bytes += Buffer.byteLength(line, 'utf8')
+        if (!pending) {
+          pending = setImmediate(() => {
+            slices.push({ rows, bytes, emitted: emitted.length })
+            rows = 0
+            bytes = 0
+            pending = undefined
+          })
+        }
+      }
+    )
+    let lineIndex = 0
+    const record = (entry: Record<string, unknown>) => {
+      const line = JSON.stringify(entry)
+      maxLineBytes = Math.max(maxLineBytes, Buffer.byteLength(line, 'utf8'))
+      collector.record(line, typeof entry.id === 'string' ? entry.id : 'header', lineIndex++)
+    }
+    try {
+      record({ type: 'session', version: 3 })
+      record({ type: 'message', id: 'old-user', parentId: null, message: { role: 'user' } })
+      record({
+        type: 'message',
+        id: 'old-answer',
+        parentId: 'old-user',
+        message: { role: 'assistant', stopReason: 'stop' }
+      })
+      let parentId = 'old-answer'
+      const payload = 'x'.repeat(payloadBytes)
+      for (let i = 0; i < oldEntries; i += 1) {
+        const id = `old-${i}`
+        record({ type: 'custom', id, parentId, data: payload })
+        parentId = id
+      }
+      record({ type: 'custom', id: 'claim', parentId })
+      record({
+        type: 'compaction',
+        id: 'compaction',
+        parentId: 'claim',
+        firstKeptEntryId: 'old-user',
+        summary: 'Kept summary'
+      })
+      record({
+        type: 'message',
+        id: 'recent-user',
+        parentId: 'compaction',
+        message: { role: 'user', content: 'Current prompt' }
+      })
+      record({
+        type: 'message',
+        id: 'abandoned-answer',
+        parentId: 'recent-user',
+        message: { role: 'assistant', stopReason: 'error', content: 'Other branch' }
+      })
+      record({
+        type: 'message',
+        id: 'recent-answer',
+        parentId: 'recent-user',
+        message: { role: 'assistant', stopReason, content: 'Current answer' }
+      })
+      await collector.project((id) => emitted.push(id), 'claim')
+      await new Promise<void>((resolve) => setImmediate(resolve))
+      expect(observed).toHaveLength(oldEntries + 6)
+      expect(observed.slice(-4)).toEqual(['claim', 'compaction', 'recent-user', 'recent-answer'])
+      expect(observed).not.toContain('abandoned-answer')
+      expect(lifecycle).toEqual(
+        state === 'working'
+          ? ['working', 'completed', 'working']
+          : ['working', 'completed', 'working', 'completed']
+      )
+      expect(emitted).toEqual(['compaction', 'recent-user', 'recent-answer'])
+      expect(slices[0].emitted).toBe(0)
+      expect(slices.length).toBeGreaterThan(1)
+      expect(Math.max(...slices.map((slice) => slice.rows))).toBeLessThanOrEqual(256)
+      expect(Math.max(...slices.map((slice) => slice.bytes))).toBeLessThanOrEqual(
+        1024 * 1024 + maxLineBytes
+      )
+    } finally {
+      if (pending) {
+        clearImmediate(pending)
+      }
+      collector.close()
+    }
+  }
+)
+
+it('uses the existing Pi resume claim to import only the selected CLI suffix after native work', async () => {
+  const { source } = await sourceFor('pi')
+  const journal = await journals.open(options())
+  const native = await nativePrompt(journal)
+  const before = journal.item(native)
+  const cursor = journal.cursor()
+  const resumeCursor = encodePiHistoryClaim({
+    entry: 'reply',
+    epoch: cursor.epoch,
+    sequence: cursor.sequence
+  })
+  await appendFile(
+    source.filePath,
+    encode([
+      {
+        type: 'message',
+        id: 'outside-user',
+        parentId: 'reply',
+        message: { role: 'user', content: 'Outside prompt' }
+      },
+      {
+        type: 'message',
+        id: 'outside-answer',
+        parentId: 'outside-user',
+        message: { role: 'assistant', content: [{ type: 'text', text: 'Outside partial' }] }
+      }
+    ])
+  )
+  const stopped = await captureSwitchStoppedCliTurn(source, true, deadline)
+  await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline, stopped, resumeCursor })
+  expect(journal.item(native)).toEqual(before)
+  expect(
+    journal
+      .snapshot()
+      .items.filter((item) => item.body.kind === 'message' && item.body.role === 'user')
+  ).toHaveLength(2)
+  expect(
+    journal.item(agentJournalItemKey(piHistoryEntryIdentity(source.filePath, 'reply')))
+  ).toBeNull()
+  expect(
+    journal
+      .snapshot()
+      .items.filter((item) => item.body.kind === 'turn')
+      .map((item) => item.body)
+  ).toEqual([expect.objectContaining({ state: 'interrupted' })])
+})
+
+it.each(['grok', 'opencode', 'opencode2'] as const)(
+  'reuses native timeline coverage for %s instead of importing its native prompt and answer again',
+  async (agent) => {
+    const { source } = await sourceFor(agent)
+    const journal = await journals.open(options())
+    const native = await nativePrompt(journal)
+    const scheme = createLegacyProviderTimelineIdentityScheme({ agent, sessionId: 'native' })
+    const turn = {
+      namespace: source.sessionId,
+      key: { source: 'provider' as const, value: 'prompt:native-prompt' }
+    }
+    const turnIdentity = scheme.turn(turn)
+    await journal.appendLifecycleBatch({
+      settlementId: 'native-answer',
+      fence: 1,
+      mutations: [
+        {
+          kind: 'item',
+          identity: turnIdentity,
+          body: {
+            kind: 'turn',
+            turnId: scheme.turnId(turn),
+            state: 'completed',
+            userItemId: native
+          },
+          turnScope: { kind: 'thread' }
+        },
+        {
+          kind: 'item',
+          identity: scheme.item({
+            namespace: source.sessionId,
+            key: { source: 'provider', value: acpNamedTextKey('reply', 'assistant') },
+            family: 'item',
+            thread: source.sessionId
+          }),
+          body: {
+            kind: 'message',
+            role: 'assistant',
+            blocks: [{ type: 'text', text: 'Partial response' }]
+          },
+          turnScope: { kind: 'turn', turnItemId: agentJournalItemKey(turnIdentity) }
+        }
+      ]
+    })
+    const before = journal.snapshot().items
+    const stopped = await captureSwitchStoppedCliTurn(source, true, deadline)
+    await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline, stopped })
+    expect(journal.snapshot().items).toEqual(before)
+  }
+)
+
+it('imports a recorded Claude Code disk prefix through switch settlement and preserves completion on a racing final read', async () => {
+  const recording = await readFile(
+    join(import.meta.dirname, '__fixtures__', 'claude-cli-switch-2.1.302.jsonl'),
+    'utf8'
+  )
+  const rows = recording.trimEnd().split('\n')
+  expect(rows).toHaveLength(4)
+  const filePath = join(root, 'recorded-claude.jsonl')
+  const source = { agent: 'claude' as const, sessionId: JSON.parse(rows[0]!).sessionId, filePath }
+  const recordedOptions = {
+    ...options(),
+    identity: {
+      ...options().identity,
+      agent: 'claude' as const,
+      providerHandle: claudeProviderHandle(source.sessionId)
+    }
+  }
+  // A captured disk prefix at the tool-use frontier; this is not a recording of an actual Stop.
+  await writeFile(filePath, `${rows.slice(0, 2).join('\n')}\n`)
+  const historical = await journals.open({
+    ...recordedOptions,
+    identity: { ...recordedOptions.identity, sessionId: 'historical' }
+  })
+  await catchUpSwitchedCliTranscript({ journal: historical, source, fence: 1, deadline })
+  expect(historical.snapshot().items.some((item) => item.body.kind === 'turn')).toBe(false)
+  const stopped = await captureSwitchStoppedCliTurn(source, true, deadline)
+  expect(stopped).toBeDefined()
+  let journal = await journals.open(recordedOptions)
+  await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline, stopped })
+  const snapshot = journal.snapshot()
+  expect(
+    snapshot.items.filter((item) => item.body.kind === 'turn').map((item) => item.body)
+  ).toEqual([expect.objectContaining({ state: 'interrupted' })])
+  expect(snapshot.items.some((item) => item.body.kind === 'tool-call')).toBe(true)
+  await journal.close()
+  journal = await journals.open(recordedOptions)
+  await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline, stopped })
+  expect(journal.snapshot()).toEqual(snapshot)
+  await writeFile(filePath, recording)
+  const completed = await journals.open({
+    ...recordedOptions,
+    identity: { ...recordedOptions.identity, sessionId: 'completed' }
+  })
+  await catchUpSwitchedCliTranscript({ journal: completed, source, fence: 1, deadline, stopped })
+  expect(
+    completed
+      .snapshot()
+      .items.filter((item) => item.body.kind === 'turn')
+      .map((item) => item.body)
+  ).toEqual([expect.objectContaining({ state: 'completed' })])
+  const final = completed.snapshot()
+  await catchUpSwitchedCliTranscript({ journal: completed, source, fence: 1, deadline, stopped })
+  expect(completed.snapshot()).toEqual(final)
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.ts
new file mode 100644
index 000000000000..bd9e923a5fb3
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.ts
@@ -0,0 +1,164 @@
+import { switchTranscriptNativeCoverage } from './structured-agent-session-switch-import-coverage'
+import {
+  decodePiHistoryClaim,
+  readPiHistoryJournalView,
+  usablePiHistoryClaim
+} from '../../pi/rpc-history-journal-view'
+import { createHash } from 'node:crypto'
+import type { AgentType } from '../../../shared/agent-status-types'
+type SwitchTranscriptSource = { agent: AgentType; sessionId: string; filePath: string }
+import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key'
+import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types'
+import { agentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
+import type { AgentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
+import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
+import { prepareLegacyTranscriptImport } from '../agent-session-journal/journal-legacy-import'
+import type { JournalReplacementItem } from '../agent-session-journal/journal-epoch-replacement'
+
+export type SwitchStoppedCliTurn = {
+  sessionId: string
+  userItemKey: string
+  turnId: string
+}
+
+async function prepare(
+  source: SwitchTranscriptSource,
+  deadline: AgentSessionSwitchDeadline,
+  piAfterEntry?: string
+) {
+  deadline.check()
+  const prepared = await prepareLegacyTranscriptImport({
+    agent: source.agent,
+    piAfterEntry,
+    sessionId: source.sessionId,
+    options: { filePath: source.filePath }
+  })
+  deadline.check()
+  if (!prepared.ok) {
+    throw agentSessionRefusalError('agent_session_identity_required', {
+      reason: 'transcriptUnreadable'
+    })
+  }
+  return prepared
+}
+
+function lastUser(items: readonly JournalReplacementItem[]) {
+  return items.findLast((item) => item.body.kind === 'message' && item.body.role === 'user')
+}
+
+/** This capture is used only with an explicit Stop and positive exit of its exact CLI. */
+export async function captureSwitchStoppedCliTurn(
+  source: SwitchTranscriptSource,
+  working: boolean,
+  deadline: AgentSessionSwitchDeadline
+): Promise<SwitchStoppedCliTurn | undefined> {
+  if (!working) {
+    return undefined
+  }
+  const prepared = await prepare(source, deadline)
+  const user = lastUser(prepared.items)
+  if (!user || (prepared.latestTurn && prepared.latestTurn.state !== 'working')) {
+    return undefined
+  }
+  const key = agentJournalItemKey(user.identity)
+  return {
+    sessionId: source.sessionId,
+    userItemKey: key,
+    turnId: prepared.latestTurn?.turnId ?? key
+  }
+}
+
+/** Append through the existing journal owner: native submissions and imported identities survive. */
+export async function catchUpSwitchedCliTranscript(input: {
+  journal: AgentSessionJournal
+  source: SwitchTranscriptSource
+  fence: number
+  deadline: AgentSessionSwitchDeadline
+  stopped?: SwitchStoppedCliTurn
+  check?: () => void
+  resumeCursor?: string
+}) {
+  let piAfterEntry: string | undefined
+  if (input.source.agent === 'pi') {
+    const view = readPiHistoryJournalView(input.journal, new Set([input.source.filePath]))
+    const claim = usablePiHistoryClaim(decodePiHistoryClaim(input.resumeCursor), view)
+    if (view.ownWorkSequence > (claim?.sequence ?? 0)) {
+      throw agentSessionRefusalError('agent_session_identity_required', {
+        reason: 'transcriptUnreadable'
+      })
+    }
+    piAfterEntry = claim?.entry
+  }
+  const prepared = await prepare(input.source, input.deadline, piAfterEntry)
+  const items = prepared.items
+  const user = lastUser(items)
+  const userKey = user && agentJournalItemKey(user.identity)
+  const interrupted =
+    input.stopped?.sessionId === input.source.sessionId &&
+    input.stopped.userItemKey === userKey &&
+    (!prepared.latestTurn ||
+      (prepared.latestTurn.turnId === input.stopped.turnId &&
+        prepared.latestTurn.state === 'working'))
+  const covered = switchTranscriptNativeCoverage({
+    agent: input.source.agent,
+    providerSessionId: input.source.sessionId,
+    journal: input.journal,
+    items,
+    check: input.check ?? input.deadline.check
+  })
+  const additions =
+    input.source.agent === 'codex'
+      ? []
+      : items.filter((item) => !covered.has(agentJournalItemKey(item.identity)))
+  const ended =
+    prepared.latestTurn && prepared.latestTurn.state !== 'working' ? prepared.latestTurn : undefined
+  const turnId = interrupted ? input.stopped?.turnId : ended?.turnId
+  if (turnId && userKey && !covered.has(userKey)) {
+    additions.push({
+      identity: {
+        provider: 'legacy',
+        agent: input.source.agent,
+        sessionId: input.source.sessionId,
+        recordId: `turn-lifecycle:${turnId}`
+      },
+      ownerFence: 0,
+      turnScope: AGENT_JOURNAL_THREAD_SCOPE,
+      body: {
+        kind: 'turn',
+        turnId,
+        userItemId: userKey,
+        state: interrupted ? 'interrupted' : ended!.state,
+        ...(ended?.timestamp == null ? {} : { completedAt: ended.timestamp })
+      }
+    })
+  }
+  const digest = createHash('sha256').update(JSON.stringify(additions)).digest('hex')
+  await input.journal.appendPlannedLifecycleBatch({
+    settlementId: `switch-import:${digest}`,
+    fence: input.fence,
+    plan: () => {
+      input.deadline.check()
+      input.check?.()
+      return {
+        dispatches: [],
+        mutations: additions
+          .filter((item) => {
+            const current = input.journal.item(
+              input.journal.canonicalItemId(agentJournalItemKey(item.identity))
+            )
+            return (
+              !current ||
+              (item.body.kind === 'turn' &&
+                current.body.kind === 'turn' &&
+                current.body.state === 'working')
+            )
+          })
+          .map((item) => ({
+            kind: 'item' as const,
+            ...item,
+            turnScope: item.turnScope ?? AGENT_JOURNAL_THREAD_SCOPE
+          }))
+      }
+    }
+  })
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-reservation.test-fixture.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-reservation.test-fixture.ts
new file mode 100644
index 000000000000..b196acea45f8
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-reservation.test-fixture.ts
@@ -0,0 +1,60 @@
+import '../../daemon/mock-descendant-sweep'
+import { expect, it, vi } from 'vitest'
+import type { agentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
+import type { RestTestRig } from './structured-agent-session-rest-test-rig'
+import { HOST_TEST_SESSION as id } from './structured-agent-session-host-test-data'
+import {
+  agentSessionLeaseNeverAcquired,
+  agentSessionLeasePossiblyWriting
+} from '../../../shared/agent-session-lease-adjudication'
+export function registerSwitchReservationTests(
+  getRig: () => RestTestRig,
+  clock: () => { deadline: ReturnType<typeof agentSessionSwitchDeadline>; expire: () => void }
+) {
+  it('drops an expired operation at its actual queued reservation without acquiring', async () => {
+    const rig = getRig()
+
+    const time = clock()
+    const reserve = rig.store.reserveOwner
+    vi.spyOn(rig.store, 'reserveOwner').mockImplementation((request, check) => {
+      time.expire()
+      return reserve(request, check)
+    })
+    expect(await rig.host.switchToChat(id, time.deadline)).toMatchObject({ ok: false })
+    expect(rig.adapter.acquire).not.toHaveBeenCalled()
+    expect(agentSessionLeaseNeverAcquired(rig.store.getRecord(id)!.lease)).toBe(true)
+  })
+
+  it('distinguishes never-acquired ownership from recovery without physical exit proof', async () => {
+    const rig = getRig()
+
+    expect(agentSessionLeaseNeverAcquired(rig.store.getRecord(id)!.lease)).toBe(true)
+    await rig.host.switchToTerminal(id, clock().deadline)
+    await rig.store.transitionHandoff(id, (record) => ({
+      ...record,
+      lease: { ...record.lease, minimumNextFence: 2 }
+    }))
+    expect(agentSessionLeasePossiblyWriting(rig.store.getRecord(id)!.lease)).toBe(true)
+    await rig.restart()
+    await expect(rig.host.switchToTerminal(id, clock().deadline)).rejects.toMatchObject({
+      refusal: { details: { reason: 'ownerUnproven' } }
+    })
+    expect(rig.adapter.closeSession).not.toHaveBeenCalled()
+  })
+
+  it('rechecks source work at the actual queued visibility transaction and never retires a different tab', async () => {
+    const rig = getRig()
+
+    await rig.store.setSessionTabVisibility(id, false)
+    await rig.store.setSessionTabVisibility(id, true, 'source-tab')
+    let current = true
+    const late = rig.store.setSwitchedSessionTabVisibility(id, 'source-tab', false, () => current)
+    current = false
+    expect(await late).toBe(false)
+    expect(rig.store.getSessionTabId(id)).toBe('source-tab')
+    expect(
+      await rig.store.setSwitchedSessionTabVisibility(id, 'another-tab', false, () => true)
+    ).toBe(false)
+    expect(rig.store.getSessionTabId(id)).toBe('source-tab')
+  })
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-socket.test-fixture.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-socket.test-fixture.ts
new file mode 100644
index 000000000000..157673f63438
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-socket.test-fixture.ts
@@ -0,0 +1,133 @@
+import '../../daemon/mock-descendant-sweep'
+import type { DaemonServer } from '../../daemon/daemon-server'
+import type { DaemonClientConnections } from '../../daemon/daemon-client-connections'
+import * as transport from '../../daemon/daemon-client-socket-connect'
+import { vi } from 'vitest'
+export type SwitchSocketFaultState = {
+  receiverDelay: number
+  connectionUnavailable: boolean
+  boundaryGcDrained: boolean
+  commitRequestId: string
+  ordinaryRequestId: string
+  lateOrdinaryReply: (() => void) | undefined
+  settlementOutcomes: string[]
+}
+export function installSwitchSocketFaults(
+  boundary: string,
+  ordinaryLoss: boolean,
+  expired: boolean,
+  outage: boolean,
+  server: DaemonServer,
+  wire: SwitchSocketFaultState
+) {
+  const connect = transport.connectDaemonSocket
+  vi.spyOn(transport, 'connectDaemonSocket').mockImplementation(async (...args) => {
+    if (wire.connectionUnavailable) {
+      throw new Error('Connection lost')
+    }
+    const socket = await connect(...args)
+    let received = ''
+    socket.on('data', (chunk) => {
+      received += String(chunk)
+      const lines = received.split('\n')
+      received = lines.pop() ?? ''
+      for (const line of lines) {
+        const response = JSON.parse(line)
+        if (response.payload?.settlement) {
+          wire.settlementOutcomes.push(response.payload.settlement.outcome)
+        }
+      }
+    })
+    const write = socket.write.bind(socket)
+    vi.spyOn(socket, 'write').mockImplementation((...values: Parameters<typeof socket.write>) => {
+      const frame = JSON.parse(String(values[0]))
+      if (
+        ordinaryLoss &&
+        frame.type === 'createOrAttach' &&
+        frame.payload?.sessionId !== 'unrelated-sibling' &&
+        !frame.payload?.attachOnly
+      ) {
+        wire.ordinaryRequestId = frame.id
+        if (boundary === 'legacy-never-created') {
+          return true
+        }
+        // SAFETY: retain/drop only the owned original ordinary response bytes; sockets and sibling stay live.
+        const peers = (server as unknown as { connections: DaemonClientConnections }).connections
+        const peer = [...peers.values()].at(-1)?.controlSocket
+        if (!peer) {
+          throw new Error('ordinary fixture peer missing')
+        }
+        const respond = peer.write.bind(peer)
+        vi.spyOn(peer, 'write').mockImplementation((...args: Parameters<typeof peer.write>) => {
+          const response = JSON.parse(String(args[0]))
+          if (response.id === wire.ordinaryRequestId) {
+            wire.lateOrdinaryReply = () => {
+              respond(...args)
+            }
+            return true
+          }
+          return respond(...args)
+        })
+      }
+
+      if (
+        (boundary === 'gc-outage' || boundary === 'native-gc-outage') &&
+        frame.payload?.release &&
+        !wire.boundaryGcDrained &&
+        !wire.connectionUnavailable
+      ) {
+        wire.connectionUnavailable = true
+        socket.destroy()
+        return true
+      }
+      if (
+        boundary === 'stale-daemon-token' &&
+        frame.payload?.switchExecution?.phase === 'prepare'
+      ) {
+        // SAFETY: the fixture owns both authenticated sockets; simulate old development response bytes only.
+        const peers = (server as unknown as { connections: DaemonClientConnections }).connections
+        const peer = [...peers.values()].at(-1)?.controlSocket
+        if (!peer) {
+          throw new Error('fixture peer missing')
+        }
+        const respond = peer.write.bind(peer)
+        vi.spyOn(peer, 'write').mockImplementation((...args: Parameters<typeof peer.write>) => {
+          const reply = JSON.parse(String(args[0]))
+          if (reply.payload?.retention) {
+            reply.payload.retention = 'consumer-release-v1'
+          }
+          return respond(`${JSON.stringify(reply)}\n`)
+        })
+      }
+      if (frame.payload?.switchExecution?.phase === 'commit') {
+        wire.commitRequestId = frame.id
+        if (expired) {
+          wire.receiverDelay = 720_001
+        }
+        if (outage) {
+          // SAFETY: this fixture owns both ends of this authenticated transport.
+          const peers = (server as unknown as { connections: DaemonClientConnections }).connections
+          const peer = [...peers.values()].at(-1)?.controlSocket
+          if (!peer) {
+            throw new Error('fixture control socket missing')
+          }
+          const respond = peer.write.bind(peer)
+          vi.spyOn(peer, 'write').mockImplementation((...args: Parameters<typeof peer.write>) => {
+            const response = JSON.parse(String(args[0]))
+            if (response.payload?.settlement) {
+              wire.settlementOutcomes.push(response.payload.settlement.outcome)
+            }
+            if (outage && response.id === wire.commitRequestId) {
+              wire.connectionUnavailable = true
+              peer.destroy()
+              return true
+            }
+            return respond(...args)
+          })
+        }
+      }
+      return write(...values)
+    })
+    return socket
+  })
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts
new file mode 100644
index 000000000000..4eca75f26728
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts
@@ -0,0 +1,188 @@
+import { agentSessionProviderHandleChainHead } from '../../../shared/agent-session-provider-handle'
+import { randomUUID } from 'node:crypto'
+import { createStructuredAgentSessionOperationId } from '../../../shared/structured-agent-session-mutation'
+import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope'
+import { agentSessionLeasePossiblyWriting } from '../../../shared/agent-session-lease-adjudication'
+import {
+  AgentSessionRefusalError,
+  agentSessionRefusalError
+} from '../../../shared/agent-session-wire-refusals'
+import {
+  catchUpSwitchedCliTranscript,
+  type SwitchStoppedCliTurn
+} from './structured-agent-session-switch-import'
+import { catchUpStructuredSessionAtRest } from './structured-agent-session-at-rest-catch-up'
+import type * as HostTypes from './structured-agent-session-host-types'
+import type { AgentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
+import type { StructuredAgentSessionHost } from './structured-agent-session-host'
+import type { StructuredAgentSessionConversationLifetimeHost } from './structured-agent-session-conversation-lifetime-host'
+import type { StructuredAgentSessionConversationLifetime } from './structured-agent-session-conversation-lifetime'
+type SwitchSourceContext = Pick<
+  StructuredAgentSessionHost,
+  'deps' | 'cancel' | 'switchGeneration'
+> & {
+  now: () => number
+  lifetime: Pick<StructuredAgentSessionConversationLifetime, 'conversation' | 'stopAgent'>
+  sessions: StructuredAgentSessionConversationLifetimeHost['sessions']
+  serialize: StructuredAgentSessionConversationLifetimeHost['serialize']
+  subscribers: {
+    publish: (
+      sessionId: string,
+      journal: HostTypes.StructuredAgentSessionHostSession['journal']
+    ) => void
+  }
+}
+export function structuredAgentSessionSwitchSource(context: SwitchSourceContext) {
+  return {
+    captureSwitchWork: (id: string, deadline: AgentSessionSwitchDeadline) => {
+      const count = context.deps.store.admittedSendCount(id)
+      const command = context.switchGeneration(id)
+      return () =>
+        !deadline.signal.aborted &&
+        deadline.remaining() > 0 &&
+        context.deps.store.admittedSendCount(id) === count &&
+        context.switchGeneration(id) === command
+    },
+    stopForSwitch: async (
+      sessionId: string,
+      caller: HostTypes.StructuredAgentSessionCaller,
+      deadline: AgentSessionSwitchDeadline
+    ) => {
+      deadline.check()
+      await context.lifetime.conversation(sessionId)
+      deadline.check()
+      let child = context.sessions.get(sessionId)?.child ?? null
+      let admitted = context.deps.store.admittedSendCount(sessionId)
+      let accepted = false
+      const command = context.switchGeneration(sessionId)
+      const record = context.deps.store.getRecord(sessionId)
+      if (!record) {
+        throw agentSessionRefusalError('agent_session_identity_required', {
+          reason: 'recordMissing'
+        })
+      }
+      let settleWorker: ((proven: boolean) => void) | undefined
+      try {
+        settleWorker = context.deps.captureSessionSwitchStop?.(sessionId)
+      } catch {
+        context.deps.logger.warn('capturing worker Stop failed', {
+          scope: 'session-switch',
+          sessionId
+        })
+      }
+      let proven = false
+      try {
+        const answer = await context.cancel(caller, {
+          envelope: {
+            sessionId,
+            clientOperationId: createStructuredAgentSessionOperationId(randomUUID, context.now()),
+            expectedRuntimeFence: record.lease.runtimeFence,
+            payloadFingerprint: computeAgentSessionPayloadFingerprint({
+              method: 'agentSession.cancel',
+              sessionId,
+              fields: {}
+            })
+          },
+          onAccepted: (captured) => {
+            child = captured
+            admitted = context.deps.store.admittedSendCount(sessionId)
+            accepted = true
+          },
+          waitForShutdown: true
+        })
+        if (!answer.ok) {
+          throw new AgentSessionRefusalError(answer.refusal)
+        }
+        await context.serialize(sessionId, async () => {
+          const current = context.sessions.get(sessionId)?.child
+          if (
+            context.deps.store.admittedSendCount(sessionId) !== admitted ||
+            (current && current !== child)
+          ) {
+            throw agentSessionRefusalError('agent_session_operation_invalid', {
+              reason: 'messagesUnsettled'
+            })
+          }
+          if (current) {
+            try {
+              await context.lifetime.stopAgent(
+                sessionId,
+                accepted ? { recorded: 'user-stop' } : { cause: 'user-close' }
+              )
+            } catch {
+              context.deps.logger.warn('switch source exit was not confirmed', {
+                scope: 'session-switch',
+                sessionId,
+                source: 'chat',
+                exactChild: true
+              })
+              throw agentSessionRefusalError('agent_session_ownership_unknown', {
+                reason: 'ownerUnproven'
+              })
+            }
+          }
+          const lease = context.deps.store.getRecord(sessionId)?.lease
+          if (!lease || agentSessionLeasePossiblyWriting(lease)) {
+            throw agentSessionRefusalError('agent_session_ownership_unknown', {
+              reason: 'ownerUnproven'
+            })
+          }
+        })
+        proven = true
+      } finally {
+        try {
+          settleWorker?.(proven)
+        } catch {
+          context.deps.logger.warn('settling worker Stop failed', {
+            scope: 'session-switch',
+            sessionId,
+            proven
+          })
+        }
+      }
+
+      return () =>
+        !deadline.signal.aborted &&
+        deadline.remaining() > 0 &&
+        context.deps.store.admittedSendCount(sessionId) === admitted &&
+        context.switchGeneration(sessionId) === command
+    },
+    refreshSwitchTranscript: async (
+      sessionId: string,
+      source: {
+        sessionId: string
+        filePath: string
+        agent?: HostTypes.StructuredAgentSessionHostSession['params']['agent']
+      },
+      deadline: AgentSessionSwitchDeadline,
+      stopped?: SwitchStoppedCliTurn,
+      check: () => void = deadline.check
+    ) => {
+      const session = await context.lifetime.conversation(sessionId)
+      const transcript = { ...source, agent: source.agent ?? session.params.agent }
+      if (transcript.agent === 'codex') {
+        await catchUpStructuredSessionAtRest({
+          journal: session.journal,
+          threadId: source.sessionId,
+          filePath: source.filePath,
+          fence: context.deps.store.getRecord(sessionId)?.lease.runtimeFence ?? 0,
+          deadline,
+          stoppedTurnId: stopped?.turnId,
+          check
+        })
+      }
+      await catchUpSwitchedCliTranscript({
+        journal: session.journal,
+        source: transcript,
+        resumeCursor: agentSessionProviderHandleChainHead(
+          context.deps.store.getRecord(sessionId)?.providerHandleChain ?? []
+        )?.handle.resumeCursor,
+        fence: context.deps.store.getRecord(sessionId)?.lease.runtimeFence ?? 0,
+        deadline,
+        stopped,
+        check
+      })
+      context.subscribers.publish(sessionId, session.journal)
+    }
+  }
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-stop.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-stop.test.ts
new file mode 100644
index 000000000000..de745e76ae04
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-stop.test.ts
@@ -0,0 +1,68 @@
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { agentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
+import {
+  createRestTestRig,
+  foundRestTestChat,
+  REST_TEST_CALLER as caller,
+  REST_TEST_SESSION as id,
+  type RestTestRig
+} from './structured-agent-session-rest-test-rig'
+import { createTestParams } from './structured-agent-session-create-test-fixture'
+
+let rig: RestTestRig
+let deadline: ReturnType<typeof agentSessionSwitchDeadline>
+beforeEach(async () => {
+  rig = await createRestTestRig({ idleSweep: { intervalMs: 60_000 } })
+  deadline = agentSessionSwitchDeadline()
+})
+afterEach(async () => {
+  deadline.dispose()
+  await rig.dispose()
+})
+
+it.each(['idle', 'replying'] as const)(
+  'joins ordinary %s Stop and physical exit before reopening',
+  async (state) => {
+    if (state === 'replying') {
+      await foundRestTestChat(rig)
+    } else {
+      expect(await rig.host.create(caller, createTestParams())).toMatchObject({ ok: true })
+      expect(await rig.host.switchToChat(id)).toMatchObject({ ok: true })
+    }
+    const exit = Promise.withResolvers<boolean>()
+    const entered = Promise.withResolvers<void>()
+    rig.adapter.closeSession.mockImplementation(async () => {
+      entered.resolve()
+      return exit.promise
+    })
+    const acquired = rig.adapter.acquire.mock.calls.length
+    const dispatches = rig.adapter.dispatch.mock.calls.length
+    const destination = vi.fn(async () => rig.host.switchToChat(id))
+    const switched = rig.host.stopForSwitch(id, caller, deadline).then(destination)
+    await Promise.race([
+      entered.promise,
+      switched.then(() => {
+        throw new Error('destination opened without stopping the source')
+      })
+    ])
+    expect(destination).not.toHaveBeenCalled()
+    expect(rig.adapter.acquire).toHaveBeenCalledTimes(acquired)
+    exit.resolve(true)
+    expect(await switched).toMatchObject({ ok: true })
+    expect(destination).toHaveBeenCalledOnce()
+    expect(rig.adapter.acquire).toHaveBeenCalledTimes(acquired + 1)
+    expect(rig.adapter.dispatch).toHaveBeenCalledTimes(dispatches)
+  }
+)
+
+it('keeps an unproven source owned and never starts its destination', async () => {
+  expect(await rig.host.create(caller, createTestParams())).toMatchObject({ ok: true })
+  expect(await rig.host.switchToChat(id)).toMatchObject({ ok: true })
+  rig.adapter.closeSession.mockResolvedValue(false)
+  const destination = vi.fn()
+  await expect(rig.host.stopForSwitch(id, caller, deadline).then(destination)).rejects.toBeDefined()
+  expect(rig.adapter.closeSession).toHaveBeenCalled()
+  expect(destination).not.toHaveBeenCalled()
+  expect(rig.host.collaboratorsForTests().sessions.get(id)?.child).toBeTruthy()
+  expect((await rig.host.journalSnapshot(id)).items).toBeDefined()
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-to-chat.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-to-chat.ts
index b44fa9b35bd4..559c52f48be2 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-to-chat.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-to-chat.ts
@@ -1,8 +1,7 @@
 import {
   agentSessionRefusalFromReference,
   refuse,
-  refuseUnclassified,
-  agentSessionRefusalError
+  refuseUnclassified
 } from '../../../shared/agent-session-wire-refusals'
 import type { AgentSessionWireRefusal } from '../../../shared/agent-session-wire'
 import type { StructuredAgentSessionResumeOutcome } from './structured-agent-session-agent-start'
@@ -12,7 +11,6 @@ import {
   operationDidNotRun,
   selectStructuredAgentSessionOperationChild
 } from './structured-agent-session-operation-child'
-import { structuredAgentSessionSwitchBlocked } from './structured-agent-session-switch-admission'
 import { sameProviderChild } from './structured-agent-session-provider-child'
 import { recordStructuredAgentSessionStartFailure } from './structured-agent-session-start-failure-row'
 import { structuredAgentSessionEndedChildFailure } from './structured-agent-session-ended-child-failure'
@@ -34,41 +32,50 @@ export type StructuredAgentSessionSwitchToChatOutcome =
   | { ok: true }
   | { ok: false; refusal: AgentSessionWireRefusal; failureItemId?: string }
 
-export async function startStructuredAgentSessionForSwitch(
+async function selectSwitchStart(
   context: StructuredAgentSessionMutationContext,
   sessionId: string,
   deadline?: AgentSessionSwitchDeadline
-): Promise<StructuredAgentSessionSwitchToChatOutcome> {
-  const selected = await context.serialize(sessionId, async () => {
+) {
+  return context.serialize(sessionId, async () => {
     deadline?.check()
     if (!(await context.openConversation(sessionId))) {
       return operationDidNotRun()
     }
     deadline?.check()
-    if (deadline) {
-      const reason = structuredAgentSessionSwitchBlocked({
-        session: context.sessions.get(sessionId),
-        deps: context.deps,
-        sessionId,
-        delivering: context.deliveryOrder.hasActiveSend(sessionId),
-        background: context.childWorkOpen(sessionId),
-        ownCommand: true,
-        joinStart: true
-      })
-      if (reason) {
-        throw agentSessionRefusalError(
-          reason === 'previousExitUnverifiable'
-            ? 'agent_session_ownership_unknown'
-            : 'agent_session_operation_invalid',
-          { reason }
-        )
-      }
-    }
     const selection = selectStructuredAgentSessionOperationChild(context, sessionId)
     return selection.ok && !selection.child
-      ? { ...selection, start: context.claimAgent(sessionId, deadline?.check) }
+      ? { ...selection, start: context.claimAgent(sessionId, deadline?.check, true) }
       : { ...selection, start: null }
   })
+}
+
+export async function openStructuredAgentSessionForSwitch(
+  context: StructuredAgentSessionMutationContext,
+  sessionId: string,
+  deadline?: AgentSessionSwitchDeadline
+) {
+  const selected = await selectSwitchStart(context, sessionId, deadline)
+  return {
+    owned: selected.ok && Boolean(selected.start?.ownsStart),
+    outcome: finishSwitchStart(context, sessionId, selected, deadline)
+  }
+}
+
+export async function startStructuredAgentSessionForSwitch(
+  context: StructuredAgentSessionMutationContext,
+  sessionId: string,
+  deadline?: AgentSessionSwitchDeadline
+): Promise<StructuredAgentSessionSwitchToChatOutcome> {
+  return (await openStructuredAgentSessionForSwitch(context, sessionId, deadline)).outcome
+}
+
+async function finishSwitchStart(
+  context: StructuredAgentSessionMutationContext,
+  sessionId: string,
+  selected: Awaited<ReturnType<typeof selectSwitchStart>>,
+  deadline?: AgentSessionSwitchDeadline
+): Promise<StructuredAgentSessionSwitchToChatOutcome> {
   if (!selected.ok) {
     return { ok: false, refusal: selected.refusal }
   }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts
index 1843c34fe01a..4bfc20f43b12 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts
@@ -2,6 +2,8 @@ import {
   assertCliConversationWritersExited,
   posixCliWriterShellAlone
 } from '../../runtime/structured-agent-cli-writers'
+import { appendAgentSessionProviderHandleLink } from '../../../shared/agent-session-provider-handle'
+import { agentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
 import type { AgentSessionRecord } from '../../../shared/agent-session-record'
 import type { SleepingAgentSessionRecord } from '../../../shared/agent-session-resume'
 const physicalSnapshot = vi.hoisted(() => vi.fn())
@@ -20,7 +22,10 @@ import { agentSessionRefusalError } from '../../../shared/agent-session-wire-ref
 import { agentSessionLeaseOwnerVerdict } from '../../../shared/agent-session-lease-adjudication'
 import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding'
 import type { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
-import { openTestAgentSessionRecordStore } from '../../runtime/agent-session-record-store-test-harness'
+import {
+  seedTestAgentSessionRecordStore,
+  openTestAgentSessionRecordStore
+} from '../../runtime/agent-session-record-store-test-harness'
 import {
   closeTestJournalHostDatabase,
   openTestJournalHostDatabase
@@ -203,7 +208,7 @@ it('switches an idle chat to its terminal and a racing send starts no second wri
   expect(acquire.mock.calls.length).toBe(spawnsBefore)
 })
 
-it('refuses a switch while the chat is starting, without aborting that start', async () => {
+it('stops a starting chat without granting an unproven terminal handoff', async () => {
   await host.close(SESSION, 'evict')
   let release = (): void => undefined
   const started = new Promise<void>((resolve) => {
@@ -217,11 +222,14 @@ it('refuses a switch while the chat is starting, without aborting that start', a
   })
   await send('starts the agent')
   await vi.waitFor(() => expect(signal).toBeDefined())
-  await expect(host.switchToTerminal(SESSION)).rejects.toMatchObject({
-    refusal: { details: { reason: 'turnActive' } }
-  })
-  expect(signal?.aborted).toBe(false)
-  release()
+  try {
+    await expect(host.switchToTerminal(SESSION)).rejects.toMatchObject({
+      refusal: { details: { reason: 'ownerUnproven' } }
+    })
+    expect(signal?.aborted).toBe(true)
+  } finally {
+    release()
+  }
 })
 
 // Terminal to chat: the chat's agent starts with no send, and only its ready provider is success.
@@ -285,6 +293,105 @@ it('retires only after an explicit admitted launch without stopping a later nati
   expect(closeSession).toHaveBeenCalledTimes(closes)
 })
 
+it.each([10, 100])(
+  'retires distinct holders once despite %i matching resumed links',
+  async (count) => {
+    await host.switchToTerminal(SESSION)
+    await store.transitionHandoff(SESSION, (record) => {
+      let chain = record.providerHandleChain
+      for (let fence = 2; fence <= count; fence += 1) {
+        chain = appendAgentSessionProviderHandleLink(chain, {
+          ...chain.at(-1)!,
+          linkId: `retirement-link-${fence}`,
+          mintedAtFence: fence,
+          origin: 'resumed'
+        })
+      }
+      return {
+        ...record,
+        providerHandleChain: chain,
+        lease: { ...record.lease, runtimeFence: count }
+      }
+    })
+    const record = store.getRecord(SESSION)!
+    await seedTestAgentSessionRecordStore(root, {
+      records: [
+        record,
+        {
+          ...record,
+          sessionId: 'distinct-holder',
+          lease: { ...record.lease, sessionId: 'distinct-holder' }
+        },
+        {
+          ...record,
+          sessionId: 'wrong-workspace',
+          lease: { ...record.lease, sessionId: 'wrong-workspace' },
+          location: { ...record.location, workspaceId: 'another-workspace' }
+        },
+        {
+          ...record,
+          sessionId: 'wrong-host',
+          lease: { ...record.lease, sessionId: 'wrong-host' },
+          location: { ...record.location, executionHostId: 'ssh:another-host' }
+        },
+        {
+          ...record,
+          sessionId: 'strong-holder',
+          lease: { ...record.lease, sessionId: 'strong-holder' }
+        }
+      ]
+    })
+    store = await openTestAgentSessionRecordStore(root)
+    Object.assign(host.deps, { store })
+    setStructuredAgentSessionHost(host)
+    const held = Promise.withResolvers<void>()
+    const started = Promise.withResolvers<void>()
+    const deadline = agentSessionSwitchDeadline()
+    const strong = host.runSwitch(
+      'strong-holder',
+      'retirement-command',
+      deadline,
+      async () => {
+        started.resolve()
+        await held.promise
+        return { status: 'completed', sessionId: 'strong-holder' }
+      },
+      { direction: 'terminal' }
+    )
+    const visibility = vi.spyOn(host, 'setSessionTabVisibility')
+    const dismiss = vi.spyOn(host.restartResume, 'dismiss')
+    const runtime = { retireStructuredAgentSessionTabFromSnapshot: vi.fn(() => true) }
+    try {
+      await Promise.race([started.promise, strong])
+      await retireChatForAdmittedTerminalLaunch(
+        runtime,
+        {
+          resumeOrigin: 'switch',
+          worktreeId: record.location.workspaceId
+        },
+        {
+          savedResumeDecision: {
+            agent: 'codex',
+            providerSession: { key: 'session_id', id: THREAD },
+            verdict: 'admitted'
+          }
+        }
+      )
+      expect(visibility.mock.calls.map(([id]) => id)).toEqual([SESSION, 'distinct-holder'])
+      expect(dismiss.mock.calls).toEqual([[[SESSION]], [['distinct-holder']]])
+      expect(runtime.retireStructuredAgentSessionTabFromSnapshot.mock.calls).toEqual([
+        [SESSION],
+        ['distinct-holder']
+      ])
+      expect(closeSession).toHaveBeenCalledOnce()
+    } finally {
+      held.resolve()
+      await strong
+      deadline.dispose()
+    }
+  }
+)
+
 it.each(['ready', 'failed', 'closed', 'replaced'] as const)(
   'awaits provider open for the selected child, whose result is %s',
   async (ending) => {
diff --git a/src/main/native-chat/structured-conversation-key.ts b/src/main/native-chat/structured-conversation-key.ts
index 324dab504d61..399ac5e5bed8 100644
--- a/src/main/native-chat/structured-conversation-key.ts
+++ b/src/main/native-chat/structured-conversation-key.ts
@@ -48,7 +48,9 @@ export function terminalConversationKey(agent: string, id: string | null): Conve
 export function keysMayMatch(left: ConversationKey, right: ConversationKey): boolean {
   return (
     left.family === right.family &&
-    (left.id === null || right.id === null || sameConversationId(left.family, left.id, right.id)) &&
+    (left.id === null ||
+      right.id === null ||
+      conversationKeyId(left) === conversationKeyId(right)) &&
     (left.home === null ||
       right.home === null ||
       agentSessionAccountHomesEqual(left.home, right.home))
@@ -56,11 +58,9 @@ export function keysMayMatch(left: ConversationKey, right: ConversationKey): boo
 }
 
 // A session-file agent's terminal may name the file; Session History lists its file-name id.
-function sameConversationId(family: string, left: string, right: string): boolean {
-  if (family === 'opencode') {
-    return left === right
+export function conversationKeyId(key: ConversationKey): string | null {
+  if (key.id === null || key.family === 'opencode') {
+    return key.id
   }
-  const normalize = (id: string) =>
-    (/[\\/]/.test(id) ? sessionIdFromFileName(id) : id).toLowerCase()
-  return normalize(left) === normalize(right)
+  return (/[/\\]/.test(key.id) ? sessionIdFromFileName(key.id) : key.id).toLowerCase()
 }
diff --git a/src/main/native-chat/transcript-grok-turn-lifecycle.ts b/src/main/native-chat/transcript-grok-turn-lifecycle.ts
new file mode 100644
index 000000000000..deb6067951f3
--- /dev/null
+++ b/src/main/native-chat/transcript-grok-turn-lifecycle.ts
@@ -0,0 +1,47 @@
+import { createReadStream } from 'node:fs'
+import { dirname, join } from 'node:path'
+import type { NativeChatTurnLifecycle } from '../../shared/native-chat-types'
+import { asRecord, parseJsonObject, timestampMs } from '../ai-vault/session-scanner-values'
+import { isENOENT } from '../ipc/filesystem/filesystem-path-containment'
+import { splitTranscriptStreamLines } from './transcript-stream-lines'
+
+/** Grok writes turn boundaries beside its transcript, in the session's events log. */
+export async function readGrokTurnLifecycle(
+  filePath: string,
+  sessionId: string
+): Promise<NativeChatTurnLifecycle | undefined> {
+  let latest: NativeChatTurnLifecycle | undefined
+  try {
+    for await (const { line } of splitTranscriptStreamLines(
+      createReadStream(join(dirname(filePath), 'events.jsonl')),
+      16 * 1024 * 1024
+    )) {
+      const event = asRecord(parseJsonObject(line))
+      const parsed = timestampMs(event?.ts)
+      const timestamp = Number.isFinite(parsed) ? parsed : null
+      if (event?.type === 'turn_started') {
+        latest =
+          event.session_id === sessionId && typeof event.turn_number === 'number'
+            ? { state: 'working', turnId: `grok:${event.turn_number}:${event.ts}`, timestamp }
+            : undefined
+      } else if (event?.type === 'turn_ended' && latest) {
+        const state =
+          event.outcome === 'completed'
+            ? 'completed'
+            : event.outcome === 'error'
+              ? 'failed'
+              : event.outcome === 'cancelled' || event.outcome === 'interrupted'
+                ? 'interrupted'
+                : null
+        if (state) {
+          latest = { ...latest, state, timestamp }
+        }
+      }
+    }
+  } catch (error) {
+    if (!isENOENT(error)) {
+      throw error
+    }
+  }
+  return latest
+}
diff --git a/src/main/native-chat/transcript-opencode-message-rows.ts b/src/main/native-chat/transcript-opencode-message-rows.ts
new file mode 100644
index 000000000000..5c48bf5ef414
--- /dev/null
+++ b/src/main/native-chat/transcript-opencode-message-rows.ts
@@ -0,0 +1,96 @@
+import type { OpenCodeTranscriptItem } from './transcript-opencode-sqlite-query'
+import { zcodeTranscriptOrder } from '../ai-vault/session-scanner-zcode-order'
+import { extractString, parseJsonObject } from '../ai-vault/session-scanner-values'
+import type SyncDatabase from '../sqlite/sync-database'
+import { rowsWithinBudget } from './transcript-opencode-row-budget'
+import {
+  opencodeMessages,
+  OPENCODE_TRANSCRIPT_MAX_ROW_BYTES
+} from './transcript-opencode-part-blocks'
+export const PART_ID_BATCH = 100
+
+export type MessageRow = {
+  message_rowid: number
+  transcript_order: number
+  id: string
+  time_created: number
+  time_updated: number
+  data: string | null
+}
+
+export type PartRow = {
+  message_id: string
+  time_updated: number
+  data: string | null
+}
+
+export function mapMessageRows(
+  db: SyncDatabase,
+  sessionId: string,
+  rows: MessageRow[],
+  rawBudget: { bytes: number },
+  agent?: 'zcode'
+): OpenCodeTranscriptItem[] {
+  if (rows.length === 0) {
+    return []
+  }
+  const partsByMessage = new Map<string, PartRow[]>()
+  const ids = rows.map((row) => row.id)
+  for (let start = 0; start < ids.length; start += PART_ID_BATCH) {
+    const batch = ids.slice(start, start + PART_ID_BATCH)
+    const placeholders = batch.map(() => '?').join(', ')
+    const partRows = rowsWithinBudget<PartRow>(
+      db.prepare(
+        `SELECT message_id, time_updated, CASE WHEN length(CAST(data AS BLOB)) <= ${OPENCODE_TRANSCRIPT_MAX_ROW_BYTES} THEN data ELSE NULL END AS data FROM part p
+         WHERE session_id = ? AND message_id IN (${placeholders})
+         ORDER BY ${agent === 'zcode' ? zcodeTranscriptOrder(db, agent, 'part', 'p', 'ASC') : 'rowid'} LIMIT 10001`
+      ),
+      rawBudget,
+      sessionId,
+      ...batch
+    )
+    if (partRows.length > 10000) {
+      throw new Error('OpenCode transcript parts exceed their read limit')
+    }
+    for (const partRow of partRows) {
+      const list = partsByMessage.get(partRow.message_id)
+      if (list) {
+        list.push(partRow)
+      } else {
+        partsByMessage.set(partRow.message_id, [partRow])
+      }
+    }
+  }
+  const items: OpenCodeTranscriptItem[] = []
+  for (const row of rows) {
+    const partList = partsByMessage.get(row.id) ?? []
+    const record = row.data === null ? null : parseJsonObject(row.data)
+    const role = extractString(record?.role)
+    const messages = opencodeMessages(
+      {
+        id: row.id,
+        role: role === 'user' ? 'user' : role === 'assistant' ? 'assistant' : 'system',
+        timestamp: Number.isFinite(row.time_created) ? row.time_created : null
+      },
+      row.data === null
+        ? [{ message_id: row.id, time_updated: row.time_updated, data: null }]
+        : partList
+    )
+    const updated = partList.reduce(
+      (max, row) => (row.time_updated > max ? row.time_updated : max),
+      0
+    )
+    for (const message of messages.toReversed()) {
+      items.push({
+        rowid: row.message_rowid,
+        fingerprint: `${row.time_updated}:${partList.length}:${updated}`,
+        message: {
+          ...message,
+          transcriptOffset: row.message_rowid,
+          ...(agent === 'zcode' ? { transcriptOrder: row.transcript_order } : {})
+        }
+      })
+    }
+  }
+  return items
+}
diff --git a/src/main/native-chat/transcript-opencode-sqlite-query.ts b/src/main/native-chat/transcript-opencode-sqlite-query.ts
index e5509bd82b1e..c04a62ff8d2d 100644
--- a/src/main/native-chat/transcript-opencode-sqlite-query.ts
+++ b/src/main/native-chat/transcript-opencode-sqlite-query.ts
@@ -1,3 +1,5 @@
+import { mapMessageRows } from './transcript-opencode-message-rows'
+import type { MessageRow } from './transcript-opencode-message-rows'
 import { openOpenCodeDatabaseReadonly } from '../ai-vault/session-scanner-opencode-sqlite-open'
 import { zcodeVisibleMessageFilter } from '../ai-vault/session-scanner-zcode-visibility'
 import { zcodeTranscriptOrder } from '../ai-vault/session-scanner-zcode-order'
@@ -5,16 +7,20 @@ import {
   readOpenCode2TranscriptPage,
   readOpenCode2TranscriptSignal
 } from './transcript-opencode2-sqlite'
-import type { NativeChatMessage } from '../../shared/native-chat-types'
+import type { NativeChatMessage, NativeChatTurnLifecycle } from '../../shared/native-chat-types'
 import { openCodeTranscriptPageLimit } from '../../shared/opencode-transcript-page-limit'
 import { columnExists, tableExists } from '../opencode-usage/schema-helpers'
 import { asRecord, extractString, parseJsonObject } from '../ai-vault/session-scanner-values'
 import type SyncDatabase from '../sqlite/sync-database'
 import { rowsOf, rowsWithinBudget } from './transcript-opencode-row-budget'
-import {
-  opencodeMessages,
-  OPENCODE_TRANSCRIPT_MAX_ROW_BYTES
-} from './transcript-opencode-part-blocks'
+import { OPENCODE_TRANSCRIPT_MAX_ROW_BYTES } from './transcript-opencode-part-blocks'
+export {
+  PART_ID_BATCH,
+  type MessageRow,
+  type PartRow,
+  mapMessageRows
+} from './transcript-opencode-message-rows'
+
 // Cursors are opaque provider order: SQLite rowid in v1, session sequence in v2.
 
 export type OpenCodeTranscriptItem = {
@@ -27,6 +33,7 @@ export type OpenCodeTranscriptPage = {
   items: OpenCodeTranscriptItem[]
   hasMore: boolean
   beforeMessageRowId: number | null
+  lifecycle?: NativeChatTurnLifecycle
 }
 
 export type OpenCodeTranscriptSignal = {
@@ -37,8 +44,6 @@ export type OpenCodeTranscriptSignal = {
   maxPartTimeUpdated: number
 }
 
-const PART_ID_BATCH = 100
-
 function sessionExists(db: SyncDatabase, sessionId: string): boolean {
   return (
     tableExists(db, 'session') &&
@@ -157,6 +162,7 @@ export function readOpenCodeTranscriptPage(args: {
     const rawBudget = { bytes: 0 }
     let cursor: number | undefined = args.beforeMessageRowId
     let hasMore = false
+    let lifecycle: NativeChatTurnLifecycle | undefined
     for (;;) {
       const rows = rowsWithinBudget<MessageRow>(
         select,
@@ -175,6 +181,35 @@ export function readOpenCodeTranscriptPage(args: {
       }
       hasMore = rows.length > limit
       const selected = hasMore ? rows.slice(0, limit) : rows
+      for (const row of selected) {
+        if (lifecycle || row.data === null) {
+          continue
+        }
+        const record = parseJsonObject(row.data)
+        const time = asRecord(record?.time)
+        if (record?.role === 'user') {
+          lifecycle = { state: 'working', turnId: row.id, timestamp: row.time_created }
+        } else if (
+          record?.role === 'assistant' &&
+          typeof record.parentID === 'string' &&
+          typeof time?.completed === 'number'
+        ) {
+          const error = asRecord(record.error)
+          const state =
+            error?.name === 'MessageAbortedError'
+              ? 'interrupted'
+              : error || record.finish === 'error'
+                ? 'failed'
+                : typeof record.finish === 'string' &&
+                    record.finish !== 'tool-calls' &&
+                    record.finish !== 'unknown'
+                  ? 'completed'
+                  : null
+          if (state) {
+            lifecycle = { state, turnId: record.parentID, timestamp: time.completed }
+          }
+        }
+      }
       cursor = selected.at(-1)!.message_rowid
       const mapped = mapMessageRows(db, args.sessionId, selected, rawBudget, args.agent)
       pageBytes += Buffer.byteLength(JSON.stringify(mapped))
@@ -200,95 +235,10 @@ export function readOpenCodeTranscriptPage(args: {
     return {
       items,
       hasMore: hasMore || overshot,
-      beforeMessageRowId: overshot ? items[0]!.rowid : (cursor ?? null)
+      beforeMessageRowId: overshot ? items[0]!.rowid : (cursor ?? null),
+      ...(lifecycle ? { lifecycle } : {})
     }
   } finally {
     db.close()
   }
 }
-
-type MessageRow = {
-  message_rowid: number
-  transcript_order: number
-  id: string
-  time_created: number
-  time_updated: number
-  data: string | null
-}
-
-type PartRow = {
-  message_id: string
-  time_updated: number
-  data: string | null
-}
-
-function mapMessageRows(
-  db: SyncDatabase,
-  sessionId: string,
-  rows: MessageRow[],
-  rawBudget: { bytes: number },
-  agent?: 'zcode'
-): OpenCodeTranscriptItem[] {
-  if (rows.length === 0) {
-    return []
-  }
-  const partsByMessage = new Map<string, PartRow[]>()
-  const ids = rows.map((row) => row.id)
-  for (let start = 0; start < ids.length; start += PART_ID_BATCH) {
-    const batch = ids.slice(start, start + PART_ID_BATCH)
-    const placeholders = batch.map(() => '?').join(', ')
-    const partRows = rowsWithinBudget<PartRow>(
-      db.prepare(
-        `SELECT message_id, time_updated, CASE WHEN length(CAST(data AS BLOB)) <= ${OPENCODE_TRANSCRIPT_MAX_ROW_BYTES} THEN data ELSE NULL END AS data FROM part p
-         WHERE session_id = ? AND message_id IN (${placeholders})
-         ORDER BY ${agent === 'zcode' ? zcodeTranscriptOrder(db, agent, 'part', 'p', 'ASC') : 'rowid'} LIMIT 10001`
-      ),
-      rawBudget,
-      sessionId,
-      ...batch
-    )
-    if (partRows.length > 10000) {
-      throw new Error('OpenCode transcript parts exceed their read limit')
-    }
-    for (const partRow of partRows) {
-      const list = partsByMessage.get(partRow.message_id)
-      if (list) {
-        list.push(partRow)
-      } else {
-        partsByMessage.set(partRow.message_id, [partRow])
-      }
-    }
-  }
-  const items: OpenCodeTranscriptItem[] = []
-  for (const row of rows) {
-    const partList = partsByMessage.get(row.id) ?? []
-    const record = row.data === null ? null : parseJsonObject(row.data)
-    const role = extractString(record?.role)
-    const messages = opencodeMessages(
-      {
-        id: row.id,
-        role: role === 'user' ? 'user' : role === 'assistant' ? 'assistant' : 'system',
-        timestamp: Number.isFinite(row.time_created) ? row.time_created : null
-      },
-      row.data === null
-        ? [{ message_id: row.id, time_updated: row.time_updated, data: null }]
-        : partList
-    )
-    const updated = partList.reduce(
-      (max, row) => (row.time_updated > max ? row.time_updated : max),
-      0
-    )
-    for (const message of messages.toReversed()) {
-      items.push({
-        rowid: row.message_rowid,
-        fingerprint: `${row.time_updated}:${partList.length}:${updated}`,
-        message: {
-          ...message,
-          transcriptOffset: row.message_rowid,
-          ...(agent === 'zcode' ? { transcriptOrder: row.transcript_order } : {})
-        }
-      })
-    }
-  }
-  return items
-}
diff --git a/src/main/native-chat/transcript-opencode.ts b/src/main/native-chat/transcript-opencode.ts
index 5d5d16f77a2f..ae1a508f7c45 100644
--- a/src/main/native-chat/transcript-opencode.ts
+++ b/src/main/native-chat/transcript-opencode.ts
@@ -2,7 +2,7 @@ import {
   OPENCODE_CAPTURE_RECORD_LIMIT,
   OPENCODE_CAPTURE_TEXT_LIMIT
 } from '../ai-vault/opencode-transcript-capture-limits'
-import type { NativeChatMessage } from '../../shared/native-chat-types'
+import type { NativeChatMessage, NativeChatTurnLifecycle } from '../../shared/native-chat-types'
 import { errorMessage } from '../ai-vault/session-scanner-values'
 import type { ReadTranscriptResult } from './transcript-reader'
 import {
@@ -106,6 +106,7 @@ export async function readOpenCodeNativeChatTranscriptFull(
   let bytes = 0
   let cursor: number | undefined
   let sourceEmpty = false
+  let lifecycle: NativeChatTurnLifecycle | undefined
   try {
     const dbPath = await (deps.resolveDbPath ?? openCodeTranscriptDefaultDeps.resolveDbPath)(
       sessionId,
@@ -136,6 +137,7 @@ export async function readOpenCodeNativeChatTranscriptFull(
       if (pages.length === 0) {
         sourceEmpty = page.beforeMessageRowId === null && !page.hasMore
       }
+      lifecycle ??= page.lifecycle
       pages.push(page.items.map((item) => item.message))
       records += page.items.length
       bytes += Buffer.byteLength(JSON.stringify(page.items))
@@ -150,5 +152,12 @@ export async function readOpenCodeNativeChatTranscriptFull(
   } catch (err) {
     return { error: errorMessage(err) }
   }
-  return { messages: pages.toReversed().flat(), sourceEmpty }
+  const messages = pages.toReversed().flat()
+  if (lifecycle && !lifecycle.turnId) {
+    lifecycle = {
+      ...lifecycle,
+      turnId: messages.findLast((message) => message.role === 'user')?.id ?? ''
+    }
+  }
+  return { messages, sourceEmpty, ...(lifecycle ? { lifecycle } : {}) }
 }
diff --git a/src/main/native-chat/transcript-opencode2-sqlite.ts b/src/main/native-chat/transcript-opencode2-sqlite.ts
index 4a4c5a490d1e..a661e3046262 100644
--- a/src/main/native-chat/transcript-opencode2-sqlite.ts
+++ b/src/main/native-chat/transcript-opencode2-sqlite.ts
@@ -7,7 +7,7 @@ import {
   opencodeMessages,
   OPENCODE_TRANSCRIPT_MAX_ROW_BYTES
 } from './transcript-opencode-part-blocks'
-import type { NativeChatBlock } from '../../shared/native-chat-types'
+import type { NativeChatBlock, NativeChatTurnLifecycle } from '../../shared/native-chat-types'
 import type {
   OpenCodeTranscriptPage,
   OpenCodeTranscriptSignal,
@@ -199,6 +199,7 @@ export function readOpenCode2TranscriptPage(
   let bytes = 0
   let pageBytes = 0
   let hasMore = false
+  let lifecycle: NativeChatTurnLifecycle | undefined
   while (items.length < limit) {
     const rows = statement.all(args.sessionId, cursor, Math.min(limit + 1, 8))
     hasMore = rows.length === Math.min(limit + 1, 8)
@@ -217,6 +218,32 @@ export function readOpenCode2TranscriptPage(
       if (++scannedRows > MAX_SCAN_ROWS || bytes > MAX_PAGE_BYTES) {
         throw new Error('OpenCode transcript page exceeds its read limit')
       }
+      if (!lifecycle && typeof row.data === 'string') {
+        const record = parseJsonObject(row.data)
+        if (row.type === 'user' && typeof row.id === 'string') {
+          lifecycle = {
+            state: 'working',
+            turnId: `opencode:${row.id}`,
+            timestamp: typeof row.time_created === 'number' ? row.time_created : null
+          }
+        } else if (row.type === 'idle' && record) {
+          const state =
+            record.outcome === 'succeeded'
+              ? 'completed'
+              : record.outcome === 'interrupted'
+                ? 'interrupted'
+                : record.outcome === 'failed'
+                  ? 'failed'
+                  : null
+          if (state) {
+            lifecycle = {
+              state,
+              turnId: '',
+              timestamp: typeof row.time_created === 'number' ? row.time_created : null
+            }
+          }
+        }
+      }
       const mapped = messageItems(value)
       cursor = row.cursor
       for (const item of mapped) {
@@ -238,5 +265,10 @@ export function readOpenCode2TranscriptPage(
       break
     }
   }
-  return { items: items.toReversed(), hasMore, beforeMessageRowId: scannedRows ? cursor : null }
+  return {
+    items: items.toReversed(),
+    hasMore,
+    beforeMessageRowId: scannedRows ? cursor : null,
+    ...(lifecycle ? { lifecycle } : {})
+  }
 }
diff --git a/src/main/native-chat/transcript-turn-lifecycle.ts b/src/main/native-chat/transcript-turn-lifecycle.ts
index 7082b4efb2af..5bdad77b2a56 100644
--- a/src/main/native-chat/transcript-turn-lifecycle.ts
+++ b/src/main/native-chat/transcript-turn-lifecycle.ts
@@ -22,14 +22,15 @@ export type NativeChatTurnLifecycleDecoder = (
 ) => NativeChatTurnLifecycle | null
 
 export function nativeChatTurnLifecycleDecoderForAgent(
-  agent: AgentType
+  agent: AgentType,
+  explicitOnly = false
 ): NativeChatTurnLifecycleDecoder | null {
   const transcriptAgent = resolveNativeChatTranscriptAgent(agent)
   if (transcriptAgent === 'codex') {
     return decodeCodexTurnLifecycle
   }
   if (transcriptAgent === 'claude') {
-    return decodeClaudeTurnLifecycle
+    return (line, fallbackId) => decodeClaudeTurnLifecycle(line, fallbackId, explicitOnly)
   }
   return null
 }
@@ -71,7 +72,8 @@ function isClaudeTerminalStopReason(value: unknown): boolean {
 
 export function decodeClaudeTurnLifecycle(
   line: string,
-  fallbackId: string
+  fallbackId: string,
+  explicitOnly = false
 ): NativeChatTurnLifecycle | null {
   const record = parseJsonObject(line)
   if (!record) {
@@ -89,7 +91,8 @@ export function decodeClaudeTurnLifecycle(
     // Legacy rows may omit stop_reason; only complete prose without tool_use can supply that fallback.
     const isTerminal =
       isClaudeTerminalStopReason(stopReason) ||
-      (stopReason == null &&
+      (!explicitOnly &&
+        stopReason == null &&
         assistantHasRenderableContent(message) &&
         !assistantHasToolUse(message))
     if (isTerminal) {
@@ -167,3 +170,32 @@ function assistantHasToolUse(message: Record<string, unknown> | null): boolean {
   }
   return content.some((block) => asRecord(block)?.type === 'tool_use')
 }
+
+/** Pi persists explicit assistant stop reasons on the selected session branch. */
+export function decodePiTurnLifecycle(
+  line: string,
+  fallbackId: string
+): NativeChatTurnLifecycle | null {
+  const record = parseJsonObject(line)
+  const message = asRecord(record?.message)
+  if (record?.type !== 'message' || !message) {
+    return null
+  }
+  const turnId = extractString(record.id) ?? fallbackId
+  const timestamp = lifecycleTimestamp(record.timestamp)
+  if (message.role === 'user') {
+    return { state: 'working', turnId, timestamp }
+  }
+  if (message.role !== 'assistant') {
+    return null
+  }
+  const state =
+    message.stopReason === 'aborted'
+      ? 'interrupted'
+      : message.stopReason === 'error'
+        ? 'failed'
+        : message.stopReason === 'stop' || message.stopReason === 'length'
+          ? 'completed'
+          : null
+  return state ? { state, turnId, timestamp } : null
+}
diff --git a/src/main/providers/local-pty-provider.ts b/src/main/providers/local-pty-provider.ts
index 8be8ce399a28..987e194f2ef2 100644
--- a/src/main/providers/local-pty-provider.ts
+++ b/src/main/providers/local-pty-provider.ts
@@ -30,7 +30,6 @@ import {
 } from '../../shared/pty-owner-color-query-colors'
 import {
   ptyPhysicalExits,
-  ptyWslDistroById,
   noteLocalPtyUse,
   advanceLoadGeneration,
   clearPtyState,
@@ -229,7 +228,7 @@ export class LocalPtyProvider implements IPtyProvider {
     if (!condition || !witness || condition.token !== witness.token) {
       return { outcome: 'refused', reason: 'unsupported' }
     }
-    if (!condition.ownedSpawn && ptyWslDistroById.get(request.id)) {
+    if (!condition.ownedSpawn) {
       return { outcome: 'refused', reason: 'unsupported' }
     }
     const deadline = witness.at + condition.remainingMs
@@ -238,7 +237,6 @@ export class LocalPtyProvider implements IPtyProvider {
       ptyPhysicalExits.get(request.id) === owner &&
       owner?.useRevision === witness.revision &&
       !owner?.closing &&
-      (condition.ownedSpawn || !owner?.pendingCommand) &&
       !pendingLocalPtySpawns.has(request.id) &&
       performance.now() < deadline
     if (!current()) {
diff --git a/src/main/providers/local-pty-switch-cleanup.test.ts b/src/main/providers/local-pty-switch-cleanup.test.ts
index 77071c83762f..89f0a959ccf3 100644
--- a/src/main/providers/local-pty-switch-cleanup.test.ts
+++ b/src/main/providers/local-pty-switch-cleanup.test.ts
@@ -8,8 +8,7 @@ import {
   ptyShellPath,
   ptyPhysicalExits,
   LocalPtyPhysicalExit,
-  clearPtyState,
-  ptyWslDistroById
+  clearPtyState
 } from './local-pty-provider-state'
 import type * as PtyDescendantTerminationModule from '../pty-descendant-termination'
 import type * as ProcessTableSnapshotReaderModule from '../../shared/process-table-snapshot-reader'
@@ -21,7 +20,8 @@ vi.mock('../../shared/process-table-snapshot-reader', async (importOriginal) =>
   getStrictProcessTableSnapshotWithAge: () => table()
 }))
 vi.mock('../pty/posix-pty-process-groups', () => ({
-  forceKillPosixPtyProcessGroups: (_pid: number, killRoot: () => void) => killRoot()
+  forceKillPosixPtyProcessGroups: (_pid: number, killRoot: () => void) => killRoot(),
+  forceKillPosixPtyProcessGroupsSync: (_pid: number, killRoot: () => void) => killRoot()
 }))
 vi.mock('../pty-descendant-termination', async (importOriginal) => {
   const sweep = await importOriginal<typeof PtyDescendantTerminationModule>()
@@ -35,7 +35,10 @@ vi.mock('../pty-descendant-termination', async (importOriginal) => {
       sweep.killWithDescendantSweep(pid, killRoot, {
         ...options,
         platform: 'linux',
-        readTable: async () => ({ rows: [], capturedAtMs: 0 })
+        readTable: async () => {
+          await table()
+          return { rows: [], capturedAtMs: 0 }
+        }
       })
   }
 })
@@ -94,10 +97,14 @@ const request = () => ({
   expectedIncarnationId: incarnation,
   requireNoAgentOwner: true,
   requireUnattached: false,
-  switchCondition: { token: 'captured-before-probe', remainingMs: 10_000 }
+  switchCondition: {
+    token: 'captured-before-probe',
+    remainingMs: 10_000,
+    ownedSpawn: true as const
+  }
 })
 
-it.each(['input', 'attachment', 'preparing launch', 'suspended child', 'unknown'] as const)(
+it.each(['input', 'attachment', 'preparing launch'] as const)(
   'keeps the real local owner usable when %s races the final probe',
   async (change) => {
     const { provider, proc, kill } = setup()
@@ -106,24 +113,7 @@ it.each(['input', 'attachment', 'preparing launch', 'suspended child', 'unknown'
     table.mockImplementation(async () => {
       entered.resolve()
       await release.promise
-      if (change === 'unknown') {
-        throw new Error('unreadable table')
-      }
-      return snapshot(
-        change === 'suspended child'
-          ? [
-              shell,
-              {
-                ...shell,
-                pid: 12001,
-                ppid: shell.pid,
-                pgid: 12001,
-                stat: 'T',
-                command: 'codex resume 019aef12-1234-7000-8000-123456789abc'
-              }
-            ]
-          : [shell]
-      )
+      return snapshot([shell])
     })
     const closing = provider.killFenced(request())
     await entered.promise
@@ -150,16 +140,17 @@ it.each(['input', 'attachment', 'preparing launch', 'suspended child', 'unknown'
     await launching
   }
 )
-it('closes indistinguishable pre-capture builtin work, while a Windows WSL wrapper is not Linux job proof', async () => {
+it('cleans up only a captured unused new spawn; obsolete source-shell witnesses never authorize it', async () => {
   const { provider, kill } = setup()
-  // No post-capture input, child or pending emission is observable in this authorized boundary case.
-  ptyWslDistroById.set(id, 'Ubuntu')
-  expect(await provider.killFenced(request())).toMatchObject({
+  const sourceRequest = {
+    ...request(),
+    switchCondition: { token: 'captured-before-probe', remainingMs: 10_000 }
+  }
+  expect(await provider.killFenced(sourceRequest)).toEqual({
     outcome: 'refused',
     reason: 'unsupported'
   })
   expect(kill).not.toHaveBeenCalled()
-  ptyWslDistroById.delete(id)
   expect(await provider.killFenced(request())).toEqual({ outcome: 'ended' })
   expect(kill).toHaveBeenCalledOnce()
 })
diff --git a/src/main/providers/local-pty-termination.ts b/src/main/providers/local-pty-termination.ts
index 5d612788e683..517b57d210ef 100644
--- a/src/main/providers/local-pty-termination.ts
+++ b/src/main/providers/local-pty-termination.ts
@@ -1,4 +1,3 @@
-import { inspectLocalPtyChildProcesses } from './local-pty-foreground-inspection'
 import type * as pty from 'node-pty'
 import { killWithDescendantSweep } from '../pty-descendant-termination'
 import { terminateShutdownDescendants } from '../daemon/terminal-descendant-shutdown'
@@ -204,10 +203,7 @@ async function shutdownTrackedPty(
               if (!switchCheck()) {
                 return false
               }
-              const evidence = switchOwnedSpawn
-                ? 'no-children'
-                : await inspectLocalPtyChildProcesses(id, true, false, true)
-              if (evidence !== 'no-children' || !switchCheck()) {
+              if (!switchOwnedSpawn || !switchCheck()) {
                 return false
               }
               const owner = ptyPhysicalExits.get(id)
@@ -220,8 +216,7 @@ async function shutdownTrackedPty(
           }
         : {}),
       terminateOwnedTree: () => terminatePtyJob(proc),
-      terminateDescendants:
-        switchCheck && !switchOwnedSpawn ? () => {} : terminateShutdownDescendants,
+      terminateDescendants: terminateShutdownDescendants,
       // Group SIGKILL must wait out the SIGTERM grace so agents can run exit hooks (Claude SessionEnd).
       awaitEscalation: () => operation.immediate
     })
diff --git a/src/main/runtime/agent-session-record-publication.ts b/src/main/runtime/agent-session-record-publication.ts
index bb532bfbde4f..a33b1366e14b 100644
--- a/src/main/runtime/agent-session-record-publication.ts
+++ b/src/main/runtime/agent-session-record-publication.ts
@@ -1,6 +1,11 @@
+import {
+  agentSessionVisibleTabIndex,
+  listVisibleAgentSessionIds,
+  setAgentSessionTabVisibility,
+  showAgentSessionTabs
+} from './agent-session/agent-session-tab-table'
 import type { AgentSessionStoreState } from './agent-session-store-state'
 import type { AgentSessionStoreTransactions } from './agent-session-store-transactions'
-
 export abstract class AgentSessionRecordPublication {
   constructor(protected readonly transactions: AgentSessionStoreTransactions) {}
   abstract holdsRecords(): boolean
@@ -49,4 +54,52 @@ export abstract class AgentSessionRecordPublication {
     }
     return result
   }
+
+  protected get state(): AgentSessionStoreState {
+    return this.transactions.state
+  }
+
+  listVisibleSessionIds = (): string[] => listVisibleAgentSessionIds(this.state)
+
+  getVisibleSessionTabIndex = (): { present: boolean; sessionIds: string[] } =>
+    agentSessionVisibleTabIndex(this.state)
+
+  getSessionTabId = (sessionId: string): string | null =>
+    this.state.sessionTabs?.tabIdFor(sessionId) ?? null
+
+  setSessionTabVisibility(
+    sessionId: string,
+    visible: boolean,
+    tabId?: string,
+    check?: () => void
+  ): Promise<void> {
+    return this.transact((draft) => {
+      check?.()
+      return setAgentSessionTabVisibility(draft, sessionId, visible, tabId)
+    })
+  }
+
+  setSwitchedSessionTabVisibility(
+    sessionId: string,
+    tabId: string,
+    visible: boolean,
+    admit: () => boolean
+  ): Promise<boolean> {
+    return this.transact((draft) => {
+      if (
+        (visible
+          ? draft.sessionTabs?.tabIdFor(sessionId) !== undefined
+          : draft.sessionTabs?.tabIdFor(sessionId) !== tabId) ||
+        !admit()
+      ) {
+        return false
+      }
+      setAgentSessionTabVisibility(draft, sessionId, visible, tabId)
+      return true
+    })
+  }
+
+  showSessionTabs(sessionIds: readonly string[]): Promise<void> {
+    return this.transact((draft) => showAgentSessionTabs(draft, sessionIds))
+  }
 }
diff --git a/src/main/runtime/agent-session-record-store.ts b/src/main/runtime/agent-session-record-store.ts
index 13bb3da15669..a97dc05dc499 100644
--- a/src/main/runtime/agent-session-record-store.ts
+++ b/src/main/runtime/agent-session-record-store.ts
@@ -62,15 +62,8 @@ import {
   selectWritableAgentSessionRecord,
   listAgentSessionConversations,
   requireWritableAgentSessionRecord,
-  heldAgentSessionIds,
-  type AgentSessionStoreState
+  heldAgentSessionIds
 } from './agent-session-store-state'
-import {
-  agentSessionVisibleTabIndex,
-  listVisibleAgentSessionIds,
-  setAgentSessionTabVisibility,
-  showAgentSessionTabs
-} from './agent-session/agent-session-tab-table'
 import type { JournalHostDatabase } from '../native-chat/agent-session-journal/journal-host-database'
 import type { JournalOperationReceipt } from '../native-chat/agent-session-journal/journal-row-writer'
 import { agentSessionOperationOutcomeReceipt } from './agent-session-operation-receipt'
@@ -85,7 +78,6 @@ import {
   setAgentSessionRecordUserNameThrough
 } from './agent-session-record-conversation-name'
 import { AgentSessionRecordPublication } from './agent-session-record-publication'
-
 /** Single-writer records/operation ledger in the host chat-journal database. */
 
 export const AGENT_SESSION_LEASE_TTL_MS = 30_000,
@@ -113,10 +105,6 @@ export class AgentSessionRecordStore extends AgentSessionRecordPublication {
     return new AgentSessionRecordStore(transactions, args.hostId)
   }
 
-  private get state(): AgentSessionStoreState {
-    return this.transactions.state
-  }
-
   /** Newer-build databases permit reads, never writes. */
   get readOnly(): boolean {
     return this.transactions.readOnly
@@ -146,51 +134,9 @@ export class AgentSessionRecordStore extends AgentSessionRecordPublication {
   /** Record presence is permanent, including unreadable rows. */
   holdsRecords = (): boolean => this.state.records.size > 0 || this.state.unreadableRecords.size > 0
 
-  listVisibleSessionIds = (): string[] => listVisibleAgentSessionIds(this.state)
-
-  getVisibleSessionTabIndex = (): { present: boolean; sessionIds: string[] } =>
-    agentSessionVisibleTabIndex(this.state)
-
-  getSessionTabId = (sessionId: string): string | null =>
-    this.state.sessionTabs?.tabIdFor(sessionId) ?? null
-
   /** Persist chat-tab identity separately from rollback-sensitive profile tabs; explicit tabId restores hidden tabs under their old ids. */
-  setSessionTabVisibility(
-    sessionId: string,
-    visible: boolean,
-    tabId?: string,
-    check?: () => void
-  ): Promise<void> {
-    return this.transact((draft) => {
-      check?.()
-      return setAgentSessionTabVisibility(draft, sessionId, visible, tabId)
-    })
-  }
-
-  setSwitchedSessionTabVisibility(
-    sessionId: string,
-    tabId: string,
-    visible: boolean,
-    admit: () => boolean
-  ): Promise<boolean> {
-    return this.transact((draft) => {
-      if (
-        (visible
-          ? draft.sessionTabs?.tabIdFor(sessionId) !== undefined
-          : draft.sessionTabs?.tabIdFor(sessionId) !== tabId) ||
-        !admit()
-      ) {
-        return false
-      }
-      setAgentSessionTabVisibility(draft, sessionId, visible, tabId)
-      return true
-    })
-  }
 
   /** Publish the complete tab index in one write; a partial index would drop remaining chats on restart. */
-  showSessionTabs(sessionIds: readonly string[]): Promise<void> {
-    return this.transact((draft) => showAgentSessionTabs(draft, sessionIds))
-  }
 
   listByScope(location: AgentSessionExecutionLocation): AgentSessionRecord[] {
     const scope = agentSessionScopeKey(location)
@@ -241,22 +187,26 @@ export class AgentSessionRecordStore extends AgentSessionRecordPublication {
   commitProcessIdentity = (args: AgentSessionProcessIdentityCommit): Promise<AgentSessionRecord> =>
     this.mutate(args.sessionId, (record) => commitAgentSessionProcessIdentity({ ...args, record }))
 
-  async proveOwner(args: {
-    sessionId: string
-    fence: number
-    link?: AgentSessionProviderHandleLink
-    now: number
-    leaseTtlMs?: number
-  }): Promise<AgentSessionRecord> {
-    return this.mutate(args.sessionId, (record) =>
-      proveAgentSessionOwner({
+  async proveOwner(
+    args: {
+      sessionId: string
+      fence: number
+      link?: AgentSessionProviderHandleLink
+      now: number
+      leaseTtlMs?: number
+    },
+    check?: () => void
+  ): Promise<AgentSessionRecord> {
+    return this.mutate(args.sessionId, (record) => {
+      check?.()
+      return proveAgentSessionOwner({
         record,
         fence: args.fence,
         ...(args.link ? { link: args.link } : {}),
         now: args.now,
         leaseTtlMs: args.leaseTtlMs ?? AGENT_SESSION_LEASE_TTL_MS
       })
-    )
+    })
   }
 
   settleFailedAcquisition = (args: AgentSessionFailedAcquisitionSettlement) =>
diff --git a/src/main/runtime/agent-session/agent-session-tab-layout.ts b/src/main/runtime/agent-session/agent-session-tab-layout.ts
index bfce5765c218..7aa5fef84969 100644
--- a/src/main/runtime/agent-session/agent-session-tab-layout.ts
+++ b/src/main/runtime/agent-session/agent-session-tab-layout.ts
@@ -14,7 +14,7 @@ import { getStructuredAgentSessionHost } from '../../native-chat/agent-session-w
 import { structuredAgentSessionTabId } from '../../../shared/structured-agent-session-projection'
 
 /** Placement in the creating client's host-owned group/tab ids. */
-export type ChatTabPlacement = { groupId?: string; afterTabId?: string }
+export type ChatTabPlacement = { groupId?: string; afterTabId?: string; index?: number }
 
 export type ChatTabChange =
   | { open: { sessionId: string; agent: AgentType; tabId: string; placement?: ChatTabPlacement } }
@@ -34,11 +34,12 @@ export function chatTabLayoutCommand(
   const placement = 'open' in change ? change.open.placement : undefined
   const holds = (id: string | undefined) => workspace?.groups.some((group) => group.id === id)
   // Prefer an existing client group, then the active group; otherwise open creates one.
+  const afterGroupId = workspace?.groups.find((group) =>
+    group.tabOrder.includes(placement?.afterTabId ?? '')
+  )?.id
   const groupId = holds(placement?.groupId)
     ? placement?.groupId
-    : holds(activeGroupId)
-      ? activeGroupId
-      : undefined
+    : (afterGroupId ?? (holds(activeGroupId) ? activeGroupId : undefined))
   const after = placement?.afterTabId
   const afterTabId =
     after &&
@@ -63,7 +64,11 @@ export function chatTabLayoutCommand(
     agent,
     tabId: openedTabId,
     ...(groupId ? { groupId } : {}),
-    ...(afterTabId ? { afterTabId } : {})
+    ...(afterTabId
+      ? { afterTabId }
+      : placement?.index !== undefined
+        ? { index: placement.index }
+        : {})
   }
 }
 
@@ -111,3 +116,41 @@ export function chatTabId(sessionId: string): string {
     structuredAgentSessionTabId(sessionId)
   )
 }
+
+/** Select in the existing view without rebuilding membership from a partial runtime snapshot. */
+export function withSelectedChatTab(
+  hostId: ExecutionHostId,
+  session: WorkspaceSessionState,
+  worktreeId: string,
+  sessionId: string
+): WorkspaceSessionState | null {
+  const { loaded } = loadChatTabLayout(hostId, session, worktreeId)
+  const workspace = loaded.layout.workspaces[worktreeId]
+  const tab = workspace?.tabs.find(
+    (row) => row.kind === 'agent-session' && row.entityId === sessionId
+  )
+  const group = tab && workspace?.groups.find((row) => row.tabOrder.includes(tab.id))
+  if (!tab || !group) {
+    return null
+  }
+  const view = loaded.desktopView
+  return saveWorkspaceLayout({
+    ...loaded,
+    desktopView: {
+      ...view,
+      activeTabTypeByWorktree: { ...view.activeTabTypeByWorktree, [worktreeId]: 'agent-session' },
+      activeFileIdByWorktree: { ...view.activeFileIdByWorktree, [worktreeId]: tab.id },
+      activeGroupIdByWorktree: { ...view.activeGroupIdByWorktree, [worktreeId]: group.id },
+      groups: {
+        ...view.groups,
+        [worktreeId]: {
+          ...view.groups[worktreeId],
+          [group.id]: {
+            ...view.groups[worktreeId]?.[group.id],
+            activeTabId: tab.id
+          }
+        }
+      }
+    }
+  })
+}
diff --git a/src/main/runtime/agent-session/ownership/agent-session-reservation-admission.ts b/src/main/runtime/agent-session/ownership/agent-session-reservation-admission.ts
index 89b4e653e397..68bcb4df4720 100644
--- a/src/main/runtime/agent-session/ownership/agent-session-reservation-admission.ts
+++ b/src/main/runtime/agent-session/ownership/agent-session-reservation-admission.ts
@@ -3,6 +3,10 @@
 import { agentSessionRefusalError } from '../../../../shared/agent-session-wire-refusals'
 import { assertAgentSessionOptionsAdmitted } from '../../agent-session-record-options'
 import { chatAgentsShareConversations } from '../../../../shared/structured-agent-cli-conversation-adoption'
+import {
+  keysMayMatch,
+  recordConversationKey
+} from '../../../native-chat/structured-conversation-key'
 import {
   agentSessionOperationKey,
   evaluateAgentSessionOperation,
@@ -228,19 +232,25 @@ export function assertAdoptedConversationUnowned(
     return
   }
   const root = agentSessionProviderHandleRoot(adopted.handle)
+  const key = recordConversationKey(request, adopted)
   for (const record of listAgentSessionConversations(state)) {
     if (record.sessionId === request.sessionId) {
       continue
     }
     // Only the conversation a chat continues now: an earlier link no longer holds anything.
     const head = record.providerHandleChain.at(-1)
+    const headKey = head ? recordConversationKey(record, head) : null
     const holdsSameConversation =
       !!head &&
-      (agentSessionProviderHandleRoot(head.handle) === root ||
-        // One id from two chat agents that open the same conversations (`opencode`, `opencode2`).
-        (head.handle.transport === adopted.handle.transport &&
-          head.handle.nativeId === adopted.handle.nativeId &&
-          chatAgentsShareConversations(head.handle.agent, adopted.handle.agent)))
+      record.location.executionHostId === request.location.executionHostId &&
+      record.location.wslDistro === request.location.wslDistro &&
+      agentSessionAccountHomesEqual(record.accountHome, request.accountHome) &&
+      (key && headKey
+        ? keysMayMatch(headKey, key)
+        : agentSessionProviderHandleRoot(head.handle) === root ||
+          (head.handle.transport === adopted.handle.transport &&
+            head.handle.nativeId === adopted.handle.nativeId &&
+            chatAgentsShareConversations(head.handle.agent, adopted.handle.agent)))
     if (holdsSameConversation) {
       throw agentSessionRefusalError('agent_session_conflict', {
         reason: 'conversationHeldElsewhere',
diff --git a/src/main/runtime/main-owned-workspace-runtime-fixture.ts b/src/main/runtime/main-owned-workspace-runtime-fixture.ts
index 3fa704592186..438e4925ea3e 100644
--- a/src/main/runtime/main-owned-workspace-runtime-fixture.ts
+++ b/src/main/runtime/main-owned-workspace-runtime-fixture.ts
@@ -3,10 +3,14 @@ import type { WorkspaceSessionState } from '../../shared/workspace-session-state
 import type { TerminalPaneLayoutNode } from '../../shared/terminal-tab-types'
 import type { LayoutCommand } from '../../shared/workspace-layout/workspace-layout-command-types'
 import { HEADLESS_RUNTIME_WINDOW_ID } from '../../shared/runtime-session-contracts'
+import { applyPtyBinding } from '../persistence/loading-store/pty-binding-session-update'
+import type { PersistPtyBindingArgs } from '../persistence/loading-store/pty-binding-persistence'
 import { applyCommandToSession } from '../persistence/terminal-topology/terminal-pane-admission'
 import { resolveHostId } from '../persistence/loading-store/session-host-partitions'
 import { withDurableRuntimeStore, withRuntimePaneAdmission } from './runtime-durable-store-fixture'
 import { OrcaRuntimeService } from './orca-runtime'
+import type { RuntimePtyWorktreeRecord } from './runtime-terminal-state-records'
+import { partialRuntimeStore } from './runtime-store-partial-fixture'
 
 // Windowless main-owned layout fixture: apply in memory and notify writes so terminal listings refresh.
 
@@ -61,7 +65,13 @@ function session(split: boolean, pinned: boolean): WorkspaceSessionState {
   }
 }
 
-export function setupMainOwnedWorkspace(opts: { split?: boolean; pinned?: boolean } = {}) {
+export function setupMainOwnedWorkspace(
+  opts: {
+    split?: boolean
+    pinned?: boolean
+    runtimeDeps?: ConstructorParameters<typeof OrcaRuntimeService>[2]
+  } = {}
+) {
   let current = session(opts.split === true, opts.pinned === true)
   const written = new Set<(hostId: string | null) => void>()
   const write = (next: WorkspaceSessionState): void => {
@@ -72,6 +82,7 @@ export function setupMainOwnedWorkspace(opts: { split?: boolean; pinned?: boolea
   }
   const store = withDurableRuntimeStore(
     withRuntimePaneAdmission({
+      ...partialRuntimeStore(),
       getRepos: () => [REPO],
       getRepo: (id: string) => (id === REPO.id ? REPO : undefined),
       getWorkspaceSession: () => current,
@@ -104,17 +115,8 @@ export function setupMainOwnedWorkspace(opts: { split?: boolean; pinned?: boolea
     })
   )
   // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the fake carries every store method a close, rename and sleep reach.
-  const runtime = new OrcaRuntimeService(store as never)
+  const runtime = new OrcaRuntimeService(store as never, undefined, opts.runtimeDeps)
   const stopped: string[] = []
-  runtime.setPtyController({
-    write: () => true,
-    kill: () => true,
-    stopAndWait: async (ptyId: string) => {
-      stopped.push(ptyId)
-      return true
-    },
-    getForegroundProcess: async () => null
-  })
   runtime.syncWindowGraph(HEADLESS_RUNTIME_WINDOW_ID, { tabs: [], leaves: [] })
   const ptyIds = opts.split ? [PTY_A, PTY_B] : [PTY_A]
   for (const [index, ptyId] of ptyIds.entries()) {
@@ -124,10 +126,30 @@ export function setupMainOwnedWorkspace(opts: { split?: boolean; pinned?: boolea
   // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: both members are declared on OrcaRuntimeService's inheritance chain.
   const internals = runtime as unknown as {
     issuePtyHandle: (pty: unknown) => string
-    ptysById: Map<string, { title?: string | null; titleUpdatedAt?: number }>
+    ptysById: Map<string, RuntimePtyWorktreeRecord>
   }
   const handleOf = (ptyId: string): string =>
     internals.issuePtyHandle(internals.ptysById.get(ptyId))
+  runtime.setPtyController({
+    write: () => true,
+    kill: () => true,
+    stopAndWait: async (ptyId: string) => {
+      stopped.push(ptyId)
+      return true
+    },
+    getForegroundProcess: async () => null,
+    listProcesses: async () =>
+      [...internals.ptysById.values()]
+        .filter((pty) => pty.connected)
+        .map((pty) => ({
+          id: pty.ptyId,
+          cwd: REPO.path,
+          title: pty.title ?? '',
+          worktreeId: pty.worktreeId,
+          terminalHandle: handleOf(pty.ptyId),
+          ...(pty.incarnationId ? { incarnationId: pty.incarnationId } : {})
+        }))
+  })
   let frames = 0
   runtime.subscribeWorkspaceLayouts(() => {
     frames += 1
@@ -135,6 +157,10 @@ export function setupMainOwnedWorkspace(opts: { split?: boolean; pinned?: boolea
   return {
     runtime,
     stopped,
+    bindPty: (binding: PersistPtyBindingArgs) => {
+      applyPtyBinding(binding, current, WORKTREE_ID, `${binding.tabId}:${binding.leafId}`)
+      write(current)
+    },
     frames: () => frames,
     handleOf,
     ptyRecord: (ptyId: string) => internals.ptysById.get(ptyId),
diff --git a/src/main/runtime/orca-runtime-structured-agent-session-create-intent.test.ts b/src/main/runtime/orca-runtime-structured-agent-session-create-intent.test.ts
index 2b5bb462b20c..89afa5e29a05 100644
--- a/src/main/runtime/orca-runtime-structured-agent-session-create-intent.test.ts
+++ b/src/main/runtime/orca-runtime-structured-agent-session-create-intent.test.ts
@@ -1,4 +1,3 @@
-import { agentSessionConversationView } from '../../shared/agent-session-conversation-view'
 import { prepareAdoptedTranscript } from '../native-chat/agent-session-wire/structured-agent-session-adopted-import'
 import { mkdir, mkdtemp, realpath, rm, writeFile } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
@@ -10,8 +9,6 @@ vi.mock('../agent-workspace-trust', () => ({ applyAgentWorkspaceTrust }))
 
 import { OrcaRuntimeService } from './orca-runtime'
 import { setStructuredAgentSessionHost } from '../native-chat/agent-session-wire/structured-agent-session-registry'
-import type { StructuredAgentSessionHost } from '../native-chat/agent-session-wire/structured-agent-session-host'
-import { agentSessionRecordFixture } from '../../shared/agent-session-record.test-fixture'
 import { FLOATING_TERMINAL_WORKTREE_ID } from '../../shared/constants'
 import { attachFingerprintFields } from '../native-chat/agent-session-wire/structured-agent-session-attach'
 
@@ -103,72 +100,6 @@ describe('structured Codex folder trust', () => {
 })
 
 describe('structured agent-session create intent', () => {
-  it('returns the recorded owner, once no terminal still runs it, before launch support or account preparation', async () => {
-    const record = agentSessionRecordFixture()
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: early ownership admission only reads the host's record list.
-    setStructuredAgentSessionHost({
-      deps: { store: { listConversations: () => [agentSessionConversationView(record)] } }
-    } as unknown as StructuredAgentSessionHost)
-    const runtime = new OrcaRuntimeService()
-    const support = vi
-      .spyOn(runtime, 'getStructuredAgentSessionCreateSupport')
-      .mockRejectedValue(new Error('fresh launch is unavailable'))
-    const writers = vi
-      .spyOn(runtime, 'assertStructuredAdoptionTerminalWritersExited')
-      .mockResolvedValue()
-    await expect(
-      runtime.resolveStructuredAgentSessionCreateIntent({
-        envelope: { sessionId: 'new-chat', clientOperationId: 'operation-1' },
-        worktree: 'id:another-workspace',
-        agent: 'claude',
-        resumeFrom: { providerSessionId: 'provider-session-alpha-1' }
-      })
-    ).rejects.toMatchObject({
-      refusal: {
-        code: 'agent_session_conflict',
-        details: {
-          reason: 'conversationHeldElsewhere',
-          owner: { sessionId: record.sessionId, workspaceId: record.location.workspaceId }
-        }
-      }
-    })
-    expect(support).not.toHaveBeenCalled()
-    expect(writers).toHaveBeenCalledWith('claude', 'provider-session-alpha-1', undefined)
-  })
-
-  it('refuses a switch out of a live terminal before naming the chat that owns the conversation', async () => {
-    const record = agentSessionRecordFixture()
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: early ownership admission only reads the host's record list.
-    setStructuredAgentSessionHost({
-      deps: { store: { listConversations: () => [agentSessionConversationView(record)] } }
-    } as unknown as StructuredAgentSessionHost)
-    const runtime = new OrcaRuntimeService()
-    const writers = vi.spyOn(runtime, 'assertStructuredAdoptionTerminalWritersExited')
-    const intent = () =>
-      runtime.resolveStructuredAgentSessionCreateIntent({
-        envelope: { sessionId: 'new-chat', clientOperationId: 'operation-1' },
-        worktree: 'id:another-workspace',
-        agent: 'claude',
-        resumeFrom: {
-          providerSessionId: 'provider-session-alpha-1',
-          cliSource: { workspaceId: 'another-workspace', paneKey: 'pane-1' }
-        }
-      })
-    const liveWriter = Object.assign(new Error('live'), {
-      refusal: { code: 'agent_session_conflict', details: { reason: 'conversationHeldElsewhere' } }
-    })
-    writers.mockRejectedValueOnce(liveWriter)
-    await expect(intent()).rejects.toBe(liveWriter)
-    writers.mockResolvedValueOnce()
-    await expect(intent()).rejects.toMatchObject({
-      refusal: { details: { owner: { sessionId: record.sessionId } } }
-    })
-    expect(writers).toHaveBeenCalledWith('claude', 'provider-session-alpha-1', {
-      workspaceId: 'another-workspace',
-      paneKey: 'pane-1'
-    })
-  })
-
   it('pins the selected Codex launch home after normal launch preparation', async () => {
     const prepareCodexStructuredLaunch = vi.fn(() => '/accounts/selected/home')
     const runtime = new OrcaRuntimeService(
@@ -525,7 +456,8 @@ describe('adopting a conversation recorded outside Orca', () => {
         transcriptPath: file,
         source: {
           providerSessionId: '0198c2a4-7d1e-7c3a-9a4b-1f2e3d4c5b6a',
-          workspaceCwd: '/repos/workspace-1'
+          workspaceCwd: '/repos/workspace-1',
+          conversationStore: accountHome
         }
       })
 
diff --git a/src/main/runtime/orchestration/structured-session-mail-target.ts b/src/main/runtime/orchestration/structured-session-mail-target.ts
index 1ac6bb2940f5..a6841d82a149 100644
--- a/src/main/runtime/orchestration/structured-session-mail-target.ts
+++ b/src/main/runtime/orchestration/structured-session-mail-target.ts
@@ -1,5 +1,4 @@
-/** Resolve structured-owned mail to a session turn, covering Run, session, Dispatch and worker-handle addresses. */
-
+import { resolveStructuredWorkerAuthority } from '../structured-worker-authority'
 import {
   ORCA_SESSION_ADDRESS_PREFIX,
   isOrcaSessionId,
@@ -19,6 +18,7 @@ import {
 } from './structured-session-lineage'
 import type { DispatchContextRow, RunRow } from './types'
 import { chatAssigneeSessionId } from './chat-assignee'
+/** Resolve structured-owned mail to a session turn, covering Run, session, Dispatch and worker-handle addresses. */
 
 /** A handle-less coordinator uses its generation-current session id; structured workers resolve by handle. */
 export function handleLessCoordinatorSessionId(
@@ -109,3 +109,20 @@ export function structuredSessionIdleEdgeMailboxes(
   }
   return db ? structuredSessionOwnedMailboxes(sessionId, db) : []
 }
+
+export function resolveStructuredCoordinatorMailboxTarget(
+  db: OrchestrationDb | null,
+  runId: string
+): StructuredPointerTarget | null {
+  const run = db?.getRun?.(runId)
+  const sessionId = run ? handleLessCoordinatorSessionId(run) : null
+  if (sessionId) {
+    return structuredSessionMailTarget(sessionId, db)
+  }
+  const coordinator = run?.coordinator_handle
+  if (!coordinator) {
+    return null
+  }
+  const workerSessionId = resolveStructuredWorkerAuthority(coordinator, db)?.running.sessionId
+  return workerSessionId ? { sessionId: workerSessionId, dispatchId: null } : null
+}
diff --git a/src/main/runtime/orchestration/structured-worker-switch-stop.test.ts b/src/main/runtime/orchestration/structured-worker-switch-stop.test.ts
new file mode 100644
index 000000000000..47cb2d96594b
--- /dev/null
+++ b/src/main/runtime/orchestration/structured-worker-switch-stop.test.ts
@@ -0,0 +1,96 @@
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { OrchestrationDb } from './db'
+import { captureStructuredWorkerSwitchStop } from './structured-worker-switch-stop'
+import {
+  mintStructuredWorkerHandle,
+  mintStructuredWorkerPaneKey,
+  structuredWorkerIdentities,
+  structuredWorkerProcessIncarnation
+} from '../structured-worker-identity'
+import { setStructuredAgentSessionHost } from '../../native-chat/agent-session-wire/structured-agent-session-registry'
+import {
+  createRestTestRig,
+  foundRestTestChat,
+  REST_TEST_SESSION as id,
+  REST_TEST_CALLER as caller,
+  type RestTestRig
+} from '../../native-chat/agent-session-wire/structured-agent-session-rest-test-rig'
+import { agentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
+
+let rig: RestTestRig
+let db: OrchestrationDb
+let deadline: ReturnType<typeof agentSessionSwitchDeadline>
+const forgetStructuredSessionMail = vi.fn()
+beforeEach(async () => {
+  db = new OrchestrationDb(':memory:')
+  deadline = agentSessionSwitchDeadline()
+  forgetStructuredSessionMail.mockClear()
+  rig = await createRestTestRig({
+    captureSessionSwitchStop: (sessionId) =>
+      captureStructuredWorkerSwitchStop(sessionId, db, 'test-runtime', {
+        forgetStructuredSessionMail
+      })
+  })
+  setStructuredAgentSessionHost(rig.host)
+})
+afterEach(async () => {
+  setStructuredAgentSessionHost(null)
+  structuredWorkerIdentities.clear()
+  deadline.dispose()
+  await rig.dispose()
+  db.close()
+})
+
+it.each([false, true])(
+  'settles worker Stop only after proven physical exit=%s and releases ordinary mail redrive',
+  async (proven) => {
+    await foundRestTestChat(rig)
+    const identity = structuredWorkerIdentities.register({
+      handle: mintStructuredWorkerHandle(),
+      sessionId: id,
+      agent: 'codex',
+      paneKey: mintStructuredWorkerPaneKey(id),
+      processIncarnation: structuredWorkerProcessIncarnation(id),
+      worktreeId: 'workspace',
+      hostScope: { kind: 'local', hostId: 'local' }
+    })
+    const task = db.createTask({ runId: 'run_legacy_local', spec: 'Captured worker turn' })
+    const { dispatch } = db.createStartingWorkerDispatch({
+      taskId: task.id,
+      startOptions: {},
+      creator: { kind: 'system' },
+      maxDepth: 9
+    })
+    db.prepareStartingWorkerAuthority({
+      dispatchId: dispatch.id,
+      handle: identity.handle,
+      paneKey: identity.paneKey,
+      processIncarnation: identity.processIncarnation,
+      worktreeId: identity.worktreeId,
+      effects: [],
+      setupState: 'not_configured',
+      hostScope: JSON.stringify(identity.hostScope),
+      terminalOwnership: 'created'
+    })
+    db.markWorkerDispatchReady(dispatch.id)
+    const entered = Promise.withResolvers<void>()
+    const exit = Promise.withResolvers<boolean>()
+    rig.adapter.closeSession.mockImplementation(async () => {
+      entered.resolve()
+      return exit.promise
+    })
+    const stopping = rig.host.stopForSwitch(id, caller, deadline)
+    const observed = stopping.then(
+      () => true,
+      () => false
+    )
+    await entered.promise
+    expect(db.getWorkerDispatch(dispatch.id)?.state).toBe('stopping')
+    expect(forgetStructuredSessionMail).not.toHaveBeenCalled()
+    exit.resolve(proven)
+    expect(await observed).toBe(proven)
+    expect(db.getWorkerDispatch(dispatch.id)?.state).toBe(proven ? 'stopped' : 'stop_unknown')
+    expect(forgetStructuredSessionMail).toHaveBeenCalledWith(id)
+    expect(db.getDispatchContextById(dispatch.id)?.status).toBe(proven ? 'failed' : 'dispatched')
+  }
+)
diff --git a/src/main/runtime/orchestration/structured-worker-switch-stop.ts b/src/main/runtime/orchestration/structured-worker-switch-stop.ts
new file mode 100644
index 000000000000..e3e35ea3d00f
--- /dev/null
+++ b/src/main/runtime/orchestration/structured-worker-switch-stop.ts
@@ -0,0 +1,54 @@
+import type { OrchestrationDb } from './db'
+import { resolveStructuredWorkerIdentityForSession } from '../structured-worker-authority'
+import { releaseStructuredWorkerSession } from '../rpc/methods/orchestration-structured-worker-session'
+
+/** Capture the ordinary worker Stop before closing; release redrive even when exit is unknown. */
+export function captureStructuredWorkerSwitchStop(
+  sessionId: string,
+  db: OrchestrationDb | null,
+  runtimeEpoch: string,
+  runtime: { forgetStructuredSessionMail(sessionId: string): void }
+): ((proven: boolean) => void) | undefined {
+  const identity = resolveStructuredWorkerIdentityForSession(sessionId, db)
+  const resource = identity && db?.getWorkerTerminalResourceByHandle(identity.handle)
+  const dispatchId = resource?.owner_dispatch_id
+  if (
+    !identity ||
+    !dispatchId ||
+    !db ||
+    !db.isDispatchProcessCurrent({
+      dispatchId,
+      paneKey: identity.paneKey,
+      processIncarnation: identity.processIncarnation
+    })
+  ) {
+    return undefined
+  }
+  const worker = db.getWorkerDispatch(dispatchId)
+  if (worker && ['ready', 'start_unknown'].includes(worker.state)) {
+    db.beginWorkerStop(dispatchId, runtimeEpoch)
+  }
+  return (proven) => {
+    try {
+      if (
+        db.isDispatchProcessCurrent({
+          dispatchId,
+          paneKey: identity.paneKey,
+          processIncarnation: identity.processIncarnation
+        }) &&
+        db.getWorkerDispatch(dispatchId)?.state === 'stopping'
+      ) {
+        if (proven) {
+          db.settleWorkerStop(dispatchId)
+        } else {
+          db.markWorkerStopUnknown(
+            dispatchId,
+            'The agent stop could not be confirmed. Retry Stop to check its exit.'
+          )
+        }
+      }
+    } finally {
+      releaseStructuredWorkerSession(dispatchId, runtime, identity.sessionId)
+    }
+  }
+}
diff --git a/src/main/runtime/orchestration/terminal-pane-mail-routing.ts b/src/main/runtime/orchestration/terminal-pane-mail-routing.ts
index f42f9b9e87da..5c1dc7d19150 100644
--- a/src/main/runtime/orchestration/terminal-pane-mail-routing.ts
+++ b/src/main/runtime/orchestration/terminal-pane-mail-routing.ts
@@ -1,3 +1,4 @@
+import { resolveStructuredCoordinatorMailboxTarget } from './structured-session-mail-target'
 import type { RuntimeTerminalAgentPresenceOptions } from '../runtime-terminal-agent-presence'
 import { OrcaRuntimeWithPruneMobileSessionTabGroupLayout } from '../session-lifecycle/projection/prune-mobile-session-tab-group-layout'
 import type { RuntimePtyWorktreeRecord } from '../runtime-terminal-state-records'
@@ -18,15 +19,13 @@ import type { StructuredPointerTarget } from './structured-mailbox-pointer-deliv
 import type { OrchestrationMailboxLeaf } from './mailbox-owner'
 import {
   chatDispatchMailTarget,
-  handleLessCoordinatorSessionId,
   structuredSessionAddressTarget,
-  structuredSessionMailTarget,
   structuredSessionIdleEdgeMailboxes
 } from './structured-session-mail-target'
+import { captureStructuredWorkerSwitchStop } from './structured-worker-switch-stop'
 import { exitedChatDispatchesForSession } from './chat-assignee'
 import { OPERATOR_CLOSE_EXIT_CAUSE } from '../../../shared/terminal-exit-cause'
 import { resolveTerminalIdentityFromProbes } from '../terminal-identity-probe'
-
 export abstract class OrcaRuntimeWithGetPtyRecordForPaneKey extends OrcaRuntimeWithPruneMobileSessionTabGroupLayout {
   protected getPtyRecordForPaneKey(paneKey: string): RuntimePtyWorktreeRecord | null {
     const parsed = parsePaneKey(paneKey)
@@ -208,6 +207,15 @@ export abstract class OrcaRuntimeWithGetPtyRecordForPaneKey extends OrcaRuntimeW
     }
   }
 
+  captureSessionSwitchStop(sessionId: string) {
+    return captureStructuredWorkerSwitchStop(
+      sessionId,
+      this.getExistingOrchestrationDb(),
+      this.runtimeId,
+      this
+    )
+  }
+
   /** Settle ended chat Dispatches on tab hide; /clear successors retain their work. */
   onStructuredSessionTabHidden(sessionId: string): void {
     this.removeWindowlessAgentSessionTab(sessionId)
@@ -258,17 +266,7 @@ export abstract class OrcaRuntimeWithGetPtyRecordForPaneKey extends OrcaRuntimeW
   protected resolveStructuredCoordinatorMailboxTarget(
     runId: string
   ): StructuredPointerTarget | null {
-    const run = this._orchestrationDb?.getRun?.(runId)
-    const sessionId = run ? handleLessCoordinatorSessionId(run) : null
-    if (sessionId) {
-      return structuredSessionMailTarget(sessionId, this._orchestrationDb)
-    }
-    const coordinator = run?.coordinator_handle
-    if (!coordinator) {
-      return null
-    }
-    const workerSessionId = this.liveStructuredWorkerSessionId(coordinator)
-    return workerSessionId ? { sessionId: workerSessionId, dispatchId: null } : null
+    return resolveStructuredCoordinatorMailboxTarget(this._orchestrationDb, runId)
   }
 
   /** Route direct worker mail through its active Dispatch or a session-scoped ledger between Dispatches; downstream idle/lease gates decide safety. */
diff --git a/src/main/runtime/rpc/methods/orchestration/cli-runtime-boundary.test.ts b/src/main/runtime/rpc/methods/orchestration/cli-runtime-boundary.test.ts
index 232bd9139066..0bb015023e87 100644
--- a/src/main/runtime/rpc/methods/orchestration/cli-runtime-boundary.test.ts
+++ b/src/main/runtime/rpc/methods/orchestration/cli-runtime-boundary.test.ts
@@ -1,8 +1,28 @@
+import {
+  createRestTestRig,
+  type RestTestRig
+} from '../../../../native-chat/agent-session-wire/structured-agent-session-rest-test-rig'
+import { openTestJournalHostDatabase } from '../../../../native-chat/agent-session-journal/journal-host-database-test-support'
+import { setStructuredAgentSessionHost } from '../../../../native-chat/agent-session-wire/structured-agent-session-registry'
+import {
+  HOST_TEST_NOW,
+  hostTestAttachParams,
+  hostTestMessage,
+  hostTestOperationId
+} from '../../../../native-chat/agent-session-wire/structured-agent-session-host-test-data'
+import {
+  createStructuredWorkerSession,
+  releaseStructuredWorkerSession
+} from '../orchestration-structured-worker-session'
+import { structuredWorkerIdentities } from '../../../structured-worker-identity'
+import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../../../shared/agent-session-journal-types'
+import { computeAgentSessionPayloadFingerprint } from '../../../../../shared/agent-session-mutation-envelope'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { partialRuntimeStore } from '../../../runtime-store-partial-fixture'
 import type { RpcContext } from '../../core'
 import { createOrchestrationRpcHarness } from './rpc-test-harness'
 import type { OrchestrationDb } from '../../../orchestration/db'
+import { OrchestrationError } from '../../../orchestration/orchestration-error'
 
 type CliRuntimeClient = {
   isRemote?: boolean
@@ -23,8 +43,26 @@ describe('orchestration CLI/runtime boundary', () => {
   const { findMethod } = h
   let db: OrchestrationDb
   let ctx: RpcContext
+  let rig: RestTestRig | undefined
+  const structuredDispatches: string[] = []
+  const originalExitCode = process.exitCode
 
-  afterEach(() => {
+  afterEach(async () => {
+    for (const dispatchId of structuredDispatches.splice(0)) {
+      releaseStructuredWorkerSession(dispatchId, ctx.runtime)
+    }
+    if (rig) {
+      rig.adapter.closeSession.mockResolvedValue(true)
+      openTestJournalHostDatabase(rig.root).db.exec(
+        'DROP TRIGGER IF EXISTS cli_refuse_lease_release'
+      )
+      await rig.dispose()
+      rig = undefined
+    }
+    setStructuredAgentSessionHost(null)
+    structuredWorkerIdentities.clear()
+    vi.useRealTimers()
+    process.exitCode = originalExitCode
     h.cleanup()
     restoreTerminalHandle()
     vi.doUnmock('../../../../../cli/format')
@@ -51,7 +89,20 @@ describe('orchestration CLI/runtime boundary', () => {
             result: { identity: { handle: objectParams(params).terminal, live: true } } as T
           }
         }
-        return { result: (await callRpc(method, objectParams(params))) as T }
+        try {
+          return { result: (await callRpc(method, objectParams(params))) as T }
+        } catch (error) {
+          if (!(error instanceof OrchestrationError)) {
+            throw error
+          }
+          const cliClientPath = '../../../../../cli/runtime-client'
+          const {
+            RuntimeClientError
+          }: {
+            RuntimeClientError: new (code: string, message: string, data?: unknown) => Error
+          } = await import(cliClientPath)
+          throw new RuntimeClientError(error.code, error.message, error.data)
+        }
       }
     }
   }
@@ -171,6 +222,281 @@ describe('orchestration CLI/runtime boundary', () => {
     }
   })
 
+  it.each(['proven', 'lease-release-failed', 'failed-close'] as const)(
+    'CLI Stop/read/release preserves the actual structured close outcome: %s',
+    async (closeKind) => {
+      ;({ db, ctx } = h.setup(true, partialRuntimeStore()))
+      const { runtime } = ctx
+      vi.useFakeTimers({ toFake: ['Date', 'setTimeout', 'clearTimeout'] })
+      vi.setSystemTime(HOST_TEST_NOW)
+      rig = await createRestTestRig()
+      const { host, store, adapter } = rig
+      setStructuredAgentSessionHost(host)
+      // External installation and workspace/account lookup; creation, binding and lifecycle stay real.
+      vi.spyOn(runtime, 'ensureStructuredAgentSessionHost').mockResolvedValue(undefined)
+      vi.spyOn(runtime, 'resolveStructuredAgentSessionCreateIntent').mockImplementation(
+        async (input) =>
+          hostTestAttachParams(null, {
+            providerHandle: undefined,
+            envelope: {
+              ...input.envelope,
+              expectedRuntimeFence: null,
+              payloadFingerprint: ''
+            }
+          })
+      )
+      const notify = vi.spyOn(runtime, 'notifyStructuredSessionJournalActivity')
+      const forget = vi.spyOn(runtime, 'forgetStructuredSessionMail')
+      const subscriptions = new Map<string, ReturnType<typeof vi.fn<() => void>>>()
+      const observe = host.observeJournalPublications.bind(host)
+      vi.spyOn(host, 'observeJournalPublications').mockImplementation((sessionId, listener) => {
+        const dispose = vi.fn(observe(sessionId, listener))
+        subscriptions.set(sessionId, dispose)
+        return dispose
+      })
+      const start = async (spec: string) => {
+        const task = db.createTask({ spec })
+        const { dispatch } = db.createStartingWorkerDispatch({
+          taskId: task.id,
+          startOptions: {},
+          creator: { kind: 'system' },
+          maxDepth: 9,
+          runtimeEpoch: runtime.getRuntimeId()
+        })
+        structuredDispatches.push(dispatch.id)
+        const { identity } = await createStructuredWorkerSession({
+          runtime,
+          worktreeId: 'workspace-1',
+          agent: 'codex',
+          dispatchId: dispatch.id,
+          onJournalActivity: (id) => runtime.notifyStructuredSessionJournalActivity(id)
+        })
+        db.prepareStartingWorkerAuthority({
+          dispatchId: dispatch.id,
+          handle: identity.handle,
+          paneKey: identity.paneKey,
+          processIncarnation: identity.processIncarnation,
+          worktreeId: identity.worktreeId,
+          effects: [],
+          setupState: 'not_configured',
+          terminalOwnership: 'created',
+          hostScope: JSON.stringify(identity.hostScope)
+        })
+        db.markWorkerDispatchReady(dispatch.id)
+        const session = host.collaboratorsForTests().sessions.get(identity.sessionId)
+        if (!session) {
+          throw new Error('The actual worker create did not open its journal')
+        }
+        const append = (text: string) =>
+          session.journal.appendItem(
+            { provider: 'orca', clientMessageId: text },
+            { kind: 'status', text },
+            {
+              fence: store.requireWritableRecord(identity.sessionId).lease.runtimeFence,
+              turnScope: AGENT_JOURNAL_THREAD_SCOPE
+            }
+          )
+        return { identity, dispatch, task, journal: session.journal, append }
+      }
+      const worker = await start('worker with retained output')
+      const sibling = await start('sibling must stay bound')
+      const sessionId = worker.identity.sessionId
+      const body = hostTestMessage('Retain this worker output')
+      const sent = await host.send(
+        { callerKey: 'cli-lifecycle-fixture' },
+        {
+          envelope: {
+            sessionId,
+            clientOperationId: hostTestOperationId(),
+            expectedRuntimeFence: store.requireWritableRecord(sessionId).lease.runtimeFence,
+            payloadFingerprint: computeAgentSessionPayloadFingerprint({
+              method: 'agentSession.send',
+              sessionId,
+              fields: { body }
+            })
+          },
+          body
+        }
+      )
+      expect(sent.ok).toBe(true)
+      await vi.waitFor(() => expect(adapter.dispatch).toHaveBeenCalledOnce())
+      const mailbox = `dispatch:${worker.dispatch.id}`
+      const held = db.insertMessage({
+        from: 'term_coord',
+        to: mailbox,
+        subject: 'Held by the current turn',
+        deliveryContract: 'current_delivery'
+      })
+      expect(
+        db
+          .getOrCreateMailboxDelivery({
+            runId: db.getDispatchContextById(worker.dispatch.id)!.run_id,
+            mailboxHandle: mailbox,
+            consumerGeneration: db.getDispatchContextById(worker.dispatch.id)!.consumer_generation
+          })
+          ?.messages.map((message) => message.id)
+      ).toEqual([held.id])
+      const pending = db.insertMessage({
+        from: 'term_coord',
+        to: mailbox,
+        subject: 'Never redrive after a completed close'
+      })
+      await worker.journal.appendItem(
+        { provider: 'orca', clientMessageId: 'busy-turn' },
+        { kind: 'turn', turnId: 'busy-turn', state: 'running' },
+        {
+          fence: store.requireWritableRecord(sessionId).lease.runtimeFence,
+          turnScope: AGENT_JOURNAL_THREAD_SCOPE
+        }
+      )
+      expect(host.currentWork(sessionId)?.working()).toBe(true)
+      runtime.deliverPendingMessagesForHandle(mailbox)
+      await vi.advanceTimersByTimeAsync(300)
+      expect(db.getMessageById(pending.id)?.delivered_at).toBeNull()
+      adapter.dispatch.mockClear()
+      notify.mockClear()
+      await worker.append('publication queued before close')
+      const childBeforeClose = host.collaboratorsForTests().sessions.get(sessionId)?.child
+      const leaseBeforeClose = store.getRecord(sessionId)?.lease
+      expect(childBeforeClose).toBeTruthy()
+      if (closeKind === 'lease-release-failed') {
+        // Fail the actual durable release write, preserving the real transition/rollback owners.
+        openTestJournalHostDatabase(rig.root).db.exec(`
+          CREATE TEMP TRIGGER cli_refuse_lease_release BEFORE UPDATE ON agent_session_records
+          WHEN json_extract(NEW.record_json, '$.lease.claimStatus') = 'released'
+          BEGIN SELECT RAISE(ABORT, 'fixture disk full'); END
+        `)
+      }
+      const close = vi.spyOn(host, 'close')
+      adapter.closeSession.mockResolvedValue(closeKind !== 'failed-close')
+      for (const name of ['ORCA_PAIRING_CODE', 'ORCA_ENVIRONMENT', 'ORCA_AGENT_SESSION_ID']) {
+        vi.stubEnv(name, '')
+      }
+      process.env.ORCA_TERMINAL_HANDLE = 'term_coord'
+      vi.doMock('../../../../../cli/runtime-client', async (importOriginal) => ({
+        ...(await importOriginal<Record<string, unknown>>()),
+        RuntimeClient: client
+      }))
+      const output = vi.fn()
+      const printed = vi.spyOn(console, 'log').mockImplementation(() => {})
+      vi.doMock('../../../../../cli/format', () => ({ printResult: output }))
+      const cliPath = '../../../../../cli/index'
+      const { main }: { main(argv: string[]): Promise<void> } = await import(cliPath)
+      const command = async (name: string, extra: string[] = []) => {
+        output.mockClear()
+        process.exitCode = undefined
+        await main(['orchestration', name, '--dispatch', worker.dispatch.id, ...extra, '--json'])
+        expect(output).toHaveBeenCalledOnce()
+        return output.mock.calls[0][0].result
+      }
+      const refusedCommand = async (
+        name: string,
+        code: string,
+        message: string,
+        extra: string[] = []
+      ) => {
+        output.mockClear()
+        printed.mockClear()
+        process.exitCode = undefined
+        await main(['orchestration', name, '--dispatch', worker.dispatch.id, ...extra, '--json'])
+        expect(process.exitCode).toBe(1)
+        expect(output).not.toHaveBeenCalled()
+        expect(printed).toHaveBeenCalledOnce()
+        const error: unknown = JSON.parse(String(printed.mock.calls[0][0]))
+        expect(error).toMatchObject({
+          ok: false,
+          error: { code, message: expect.stringContaining(message) }
+        })
+      }
+      const stopped = await command('worker-stop')
+      expect(stopped).toMatchObject({
+        state: closeKind === 'proven' ? 'stopped' : 'stop_unknown',
+        processAction: 'closed_agent_terminal'
+      })
+      expect(process.exitCode).toBe(closeKind === 'proven' ? undefined : 1)
+      expect(db.getWorkerDispatch(worker.dispatch.id)?.state).toBe(stopped.state)
+      expect(db.getDispatchContextById(worker.dispatch.id)?.status).toBe(
+        closeKind === 'proven' ? 'failed' : 'dispatched'
+      )
+      expect(close).toHaveBeenCalledExactlyOnceWith(sessionId, 'evict')
+      expect(adapter.closeSession).toHaveBeenCalledExactlyOnceWith(sessionId, undefined)
+      if (closeKind === 'lease-release-failed') {
+        expect(store.getRecord(sessionId)?.lease.claimStatus).toBe('live')
+        expect(host.collaboratorsForTests().sessions.get(sessionId)?.lastEndedChild).toMatchObject({
+          rootGone: true
+        })
+      }
+      await vi.advanceTimersByTimeAsync(300)
+      if (closeKind !== 'failed-close') {
+        expect(subscriptions.get(sessionId)).toHaveBeenCalledOnce()
+        expect(forget).toHaveBeenCalledWith(sessionId)
+        expect(notify).not.toHaveBeenCalledWith(sessionId)
+        const snapshot = vi.spyOn(host, 'journalSnapshot')
+        runtime.notifyStructuredSessionJournalActivity(sessionId)
+        expect(snapshot).not.toHaveBeenCalled()
+      } else {
+        expect(subscriptions.get(sessionId)).not.toHaveBeenCalled()
+        expect(forget).not.toHaveBeenCalledWith(sessionId)
+        expect(host.collaboratorsForTests().sessions.get(sessionId)?.child).toBe(childBeforeClose)
+        expect(store.getRecord(sessionId)?.lease).toEqual(leaseBeforeClose)
+        expect(structuredWorkerIdentities.get(worker.identity.handle)).toEqual(worker.identity)
+      }
+      const current = await command('worker-read', ['--source', 'transcript'])
+      expect(current.source).toBe('transcript')
+      expect(JSON.stringify(current.transcript.messages)).toContain('Retain this worker output')
+      expect(current.status.liveness).toBe(closeKind === 'proven' ? 'exited' : 'live')
+      const newer = await start('newer worker must stay bound')
+      const siblingResource = db.getWorkerTerminalResourceByOwner(sibling.dispatch.id)
+      const newerResource = db.getWorkerTerminalResourceByOwner(newer.dispatch.id)
+      if (closeKind === 'proven') {
+        const release = await command('worker-release')
+        const repeated = await command('worker-release')
+        expect(release).toMatchObject({ state: 'released', archive: { status: 'unavailable' } })
+        expect(repeated).toMatchObject({ state: 'already_released', processAction: 'none' })
+        await refusedCommand(
+          'worker-read',
+          'archive_unavailable',
+          'without a preserved output archive',
+          ['--source', 'transcript']
+        )
+        const history = await host.history({ sessionId, direction: 'tail' })
+        expect(history.ok).toBe(true)
+        if (!history.ok) {
+          throw new Error('The retained conversation history could not be read')
+        }
+        expect(JSON.stringify(history.page.items)).toContain('Retain this worker output')
+      } else {
+        const resourceBeforeRelease = db.getWorkerTerminalResourceByOwner(worker.dispatch.id)
+        for (let attempt = 0; attempt < 2; attempt += 1) {
+          await refusedCommand(
+            'worker-release',
+            'dispatch_inactive',
+            'stop_unknown; only a settled worker can release'
+          )
+        }
+        expect(db.getWorkerDispatch(worker.dispatch.id)?.state).toBe('stop_unknown')
+        expect(db.getWorkerTerminalResourceByOwner(worker.dispatch.id)).toEqual(
+          resourceBeforeRelease
+        )
+      }
+      expect(adapter.closeSession).toHaveBeenCalledExactlyOnceWith(sessionId, undefined)
+      notify.mockClear()
+      await sibling.append('sibling still has a retry edge')
+      await newer.append('newer still has a retry edge')
+      await vi.advanceTimersByTimeAsync(300)
+      expect(db.getWorkerTerminalResourceByOwner(sibling.dispatch.id)).toEqual(siblingResource)
+      expect(db.getWorkerTerminalResourceByOwner(newer.dispatch.id)).toEqual(newerResource)
+      expect(structuredWorkerIdentities.get(sibling.identity.handle)).toEqual(sibling.identity)
+      expect(structuredWorkerIdentities.get(newer.identity.handle)).toEqual(newer.identity)
+      expect(subscriptions.get(sibling.identity.sessionId)).not.toHaveBeenCalled()
+      expect(subscriptions.get(newer.identity.sessionId)).not.toHaveBeenCalled()
+      expect(notify).toHaveBeenCalledWith(sibling.identity.sessionId)
+      expect(notify).toHaveBeenCalledWith(newer.identity.sessionId)
+      expect(adapter.dispatch).not.toHaveBeenCalled()
+      expect(db.getMessageById(pending.id)?.delivered_at).toBeNull()
+    }
+  )
+
   function taskBySpec(spec: string) {
     const task = db.listTasks().find((candidate) => candidate.spec === spec)
     if (!task) {
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-adoption-replay.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-adoption-replay.test.ts
index ec0b159e9c83..59308095dda6 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-adoption-replay.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-adoption-replay.test.ts
@@ -380,13 +380,18 @@ describe('committed adopting create RPC replay', () => {
     expect(sessionAdapter.acquire).toHaveBeenCalledTimes(1)
     expect(internal.publishStructuredAgentSessionTab).toHaveBeenCalledTimes(2)
     expect(selectAccountHome).toHaveBeenCalledTimes(1)
-    // The switched-out terminal is checked before the owner is named; an unavailable scan refuses.
+    // A new adopter needs readable account-qualified identity; an unavailable writer scan still refuses first.
     const another = await call(dispatcher, createParams(OPERATION, 'another-chat'))
     expect(another).toMatchObject({
       ok: true,
-      result: { ok: false, refusal: { details: { reason: 'conversationHeldElsewhere' } } }
+      result: {
+        ok: false,
+        refusal: unary
+          ? { code: 'agent_session_identity_required' }
+          : { code: 'agent_session_conflict', details: { reason: 'conversationHeldElsewhere' } }
+      }
     })
-    expect(JSON.stringify(another).includes(`"owner"`)).toBe(unary)
+    expect(JSON.stringify(another).includes(`"owner"`)).toBe(false)
 
     // Only an exact committed replay bypasses an unavailable writer scan.
     const freshRefusal = unary
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
index 7a85bd875872..9d517c91029f 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
@@ -1,17 +1,12 @@
 import { writeFile } from 'node:fs/promises'
 import { join } from 'node:path'
 import * as cliTranscript from '../../../ai-vault/structured-chat-cli-fork'
-import * as processTable from '../../../../shared/process-table-snapshot-reader'
-import {
-  assertCliConversationWritersExited,
-  posixCliWriterShellAlone
-} from '../../structured-agent-cli-writers'
 import { structuredAgentRuntimeMetadata } from '../../structured-agent-runtime-metadata'
 import { agentSessionProviderHandleChainHead } from '../../../../shared/agent-session-provider-handle'
-import { captureTerminalSurfaceIdentity } from '../../../../shared/terminal-tab-close'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import {
   createRestTestRig,
+  restTestSend,
   type RestTestRig
 } from '../../../native-chat/agent-session-wire/structured-agent-session-rest-test-rig'
 import {
@@ -24,7 +19,10 @@ import {
   setupMainOwnedWorkspace,
   WORKTREE_ID,
   TAB_ID,
-  LEAF_A
+  LEAF_A,
+  PTY_A,
+  PTY_B,
+  LEAF_B
 } from '../../main-owned-workspace-runtime-fixture'
 import { executeStructuredSessionSwitch } from './structured-agent-session-switch-execution'
 import { SwitchToChatParams, SwitchToTerminalParams } from './structured-agent-session-schemas'
@@ -88,159 +86,240 @@ it('executes empty/fresh through the ordinary terminal owner without requesting
   expect(rig.adapter.acquire).not.toHaveBeenCalled()
 })
 
-it('returns readable chat before selected provider readiness without starting it twice', async () => {
-  const { runtime } = setupMainOwnedWorkspace()
-  const acquired = Promise.withResolvers<void>()
-  const original = rig.adapter.acquire.getMockImplementation()!
-  rig.adapter.acquire.mockImplementation(async (...args) => {
-    await acquired.promise
-    return original(...args)
-  })
-  vi.spyOn(runtime, 'publishStructuredAgentSessionTab').mockImplementation(async (input) => {
-    input.check?.()
-    await rig.store.setSessionTabVisibility(id, true)
-  })
-  const close = vi.spyOn(runtime, 'closeSwitchedSourceTerminal')
-  const params = { sessionId: id, execution: { invocationId: 'chat' } }
-  const view = await executeStructuredSessionSwitch(params, { runtime }, 'chat')
-  expect(view.status).toBe('present')
-  expect(rig.adapter.acquire).not.toHaveBeenCalled()
-  if (view.status !== 'present') {
-    throw new Error('missing shown handshake')
+it.each([false, true])(
+  'publishes before slow startup and preserves a first send accepted during publication=%s',
+  async (sendDuringPublication) => {
+    const { runtime } = setupMainOwnedWorkspace()
+    const acquired = Promise.withResolvers<void>()
+    const original = rig.adapter.acquire.getMockImplementation()!
+    rig.adapter.acquire.mockImplementation(async (...args) => {
+      await acquired.promise
+      return original(...args)
+    })
+    const publish = vi
+      .spyOn(runtime, 'publishStructuredAgentSessionTab')
+      .mockImplementation(async (input) => {
+        input.check?.()
+        await rig.store.setSessionTabVisibility(id, true)
+        if (sendDuringPublication) {
+          const sent = await rig.host.send(
+            caller,
+            restTestSend('A new explicit instruction', rig.store.getRecord(id)!.lease.runtimeFence)
+          )
+          expect(sent.ok).toBe(true)
+        }
+      })
+    const result = await executeStructuredSessionSwitch(
+      { sessionId: id, execution: { invocationId: 'slow-open' } },
+      { runtime },
+      'chat'
+    )
+    expect(result).toEqual({ status: 'completed', sessionId: id })
+    expect(publish).toHaveBeenCalledOnce()
+    expect(rig.store.getSessionTabId(id)).not.toBeNull()
+    acquired.resolve()
+    await vi.waitFor(() => expect(rig.adapter.acquire).toHaveBeenCalledOnce())
+    await vi.waitFor(() => expect(rig.host.switchExecuting(id)).toBe(false))
+    await vi.waitFor(() =>
+      expect(rig.adapter.dispatch).toHaveBeenCalledTimes(sendDuringPublication ? 1 : 0)
+    )
   }
-  const opened = await executeStructuredSessionSwitch(
-    {
-      ...params,
-      execution: {
-        ...params.execution,
-        receipt: { generation: view.generation, shown: true }
-      }
-    },
-    { runtime },
-    'chat'
-  )
-  expect(opened).toMatchObject({ status: 'completed', startupPending: true })
-  const completion = executeStructuredSessionSwitch(
-    {
-      ...params,
-      execution: {
-        ...params.execution,
-        observe: true
-      }
-    },
-    { runtime },
-    'chat'
-  )
-  acquired.resolve()
-  expect(await completion).toMatchObject({ status: 'completed', sourceRetained: false })
-  expect(rig.adapter.acquire).toHaveBeenCalledOnce()
-  expect(close).not.toHaveBeenCalled()
-})
+)
 
-it('keeps opened chat visible and returns the exact committed selected start failure separately', async () => {
-  const { runtime } = setupMainOwnedWorkspace()
-  vi.spyOn(runtime, 'publishStructuredAgentSessionTab').mockImplementation(async () => {
-    await rig.store.setSessionTabVisibility(id, true)
-  })
-  vi.spyOn(rig.host.deps.adapter, 'open').mockRejectedValue(new Error('provider launch failed'))
-  const params = { sessionId: id, execution: { invocationId: 'failed' } }
-  const view = await executeStructuredSessionSwitch(params, { runtime }, 'chat')
-  if (view.status !== 'present') {
-    throw new Error('missing shown handshake')
-  }
-  await executeStructuredSessionSwitch(
-    {
-      ...params,
-      execution: {
-        ...params.execution,
-        receipt: { generation: view.generation, shown: true }
-      }
-    },
-    { runtime },
-    'chat'
-  )
-  const result = await executeStructuredSessionSwitch(
-    {
-      ...params,
-      execution: {
-        ...params.execution,
-        observe: true
+async function savedTranscript() {
+  await rig.host.switchToChat(id)
+  await rig.host.switchToTerminal(id)
+  const record = rig.store.getRecord(id)!
+  const head = agentSessionProviderHandleChainHead(record.providerHandleChain)!
+  const filePath = join(rig.root, 'switch-source.jsonl')
+  const nativeId = head.handle.nativeId
+  await writeFile(
+    filePath,
+    `${[
+      { type: 'session_meta', payload: { id: nativeId } },
+      {
+        timestamp: '2026-10-26T12:00:00Z',
+        type: 'event_msg',
+        payload: { type: 'task_started', turn_id: 'cli-turn' }
+      },
+      {
+        type: 'response_item',
+        payload: {
+          type: 'message',
+          role: 'user',
+          content: [{ type: 'input_text', text: 'A terminal prompt' }]
+        }
+      },
+      {
+        timestamp: '2026-10-26T12:00:01Z',
+        type: 'event_msg',
+        payload: { type: 'task_complete', turn_id: 'cli-turn' }
       }
-    },
-    { runtime },
-    'chat'
-  )
-  expect(result).toMatchObject({ status: 'refused', failureItemId: expect.any(String) })
-  if (result.status !== 'refused') {
-    throw new Error('missing selected failure')
-  }
-  const failures = (await rig.host.journalSnapshot(id)).items.filter(
-    (item) => item.body.kind === 'status' && item.body.failure
+    ]
+      .map((row) => JSON.stringify(row))
+      .join('\n')}\n`
   )
-  expect(failures).toHaveLength(1)
-  expect(failures[0].itemId).toBe(result.failureItemId)
-  expect(
-    await executeStructuredSessionSwitch(
-      { ...params, execution: { ...params.execution, observe: true } },
-      { runtime },
-      'chat'
-    )
-  ).toEqual(result)
-  expect(rig.store.getRecord(id)).not.toBeNull()
-  expect(rig.store.getSessionTabId(id)).not.toBeNull()
-})
+  vi.spyOn(cliTranscript, 'resolveStructuredChatCliSource').mockResolvedValue({
+    host: rig.host,
+    record,
+    head,
+    agent: 'codex',
+    cwd: rig.root,
+    providerSessionId: nativeId,
+    requireCurrent: vi.fn(),
+    metadata: structuredAgentRuntimeMetadata('codex')!
+  })
+  vi.spyOn(cliTranscript, 'prepareStructuredChatCliTranscript').mockResolvedValue({
+    useRealCodexHome: false,
+    cliForkSource: {
+      agent: 'codex',
+      sourceAgent: 'codex',
+      sessionId: nativeId,
+      filePath,
+      cwd: rig.root,
+      codexHome: null,
+      executionHostPlatform: process.platform
+    }
+  })
+}
 
-it.each(['children', 'unknown'] as const)(
-  'retains the source with a factual typed refusal when inspection reports %s',
-  async (evidence) => {
-    const { runtime, session } = setupMainOwnedWorkspace()
-    const identity = captureTerminalSurfaceIdentity(session(), WORKTREE_ID, TAB_ID, LEAF_A)
-    if (!identity) {
-      throw new Error('Expected the workspace fixture terminal surface')
+it.each(['single', 'split', 'split-during-stop'] as const)(
+  'uses ordinary exact physical exit and source placement, retaining siblings: %s',
+  async (shape) => {
+    const split = shape !== 'single'
+    await savedTranscript()
+    const { runtime, session, bindPty } = setupMainOwnedWorkspace({ split: shape === 'split' })
+    const incarnationId = '11111111-1111-4111-8111-111111111111'
+    runtime.registerPty(PTY_A, WORKTREE_ID, null, { tabId: TAB_ID, leafId: LEAF_A, incarnationId })
+    const source = runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_A}`, WORKTREE_ID)
+    if (!source.presentation) {
+      throw new Error('missing captured source')
     }
-    vi.spyOn(runtime, 'inspectTerminalProcess').mockResolvedValue(
-      evidence === 'children'
-        ? { foregroundProcess: 'codex', hasChildProcesses: true, childProcessEvidence: 'children' }
-        : {
-            foregroundProcess: null,
-            hasChildProcesses: false,
-            verdict: 'unverifiable',
-            reason: 'timeout'
-          }
-    )
-    const close = vi.spyOn(runtime, 'closeSwitchedSourceTerminal')
-    const result = await executeStructuredSessionSwitch(
+    const exit = Promise.withResolvers<void>()
+    const entered = Promise.withResolvers<void>()
+    const stopped = vi.fn(async (ptyId: string) => {
+      expect(ptyId).toBe(PTY_A)
+      entered.resolve()
+      await exit.promise
+      await runtime.onPtyExit(PTY_A, 0, incarnationId, { hostExitConfirmed: true })
+      return true
+    })
+    runtime.setPtyController({
+      write: () => true,
+      kill: () => false,
+      stopAndWait: stopped,
+      getForegroundProcess: async () => 'codex'
+    })
+    expect(
+      await runtime.applyLayoutCommand({
+        type: 'openAgentSessionTab',
+        workspace: WORKTREE_ID,
+        sessionId: 'later-tab',
+        agent: 'codex',
+        tabId: 'agent-session:later-tab'
+      })
+    ).toMatchObject({ ok: true })
+    const acquisitions = rig.adapter.acquire.mock.calls.length
+    const operation = executeStructuredSessionSwitch(
       {
         sessionId: id,
         execution: {
-          invocationId: 'inspection',
+          invocationId: 'from-pane',
           source: {
-            terminal: 'source',
-            expectedIncarnationId: 'source-incarnation',
-            originalPresentation: { identity, holders: [{ hostId: 'local', identity }] }
+            terminal: source.handle,
+            expectedIncarnationId: incarnationId,
+            originalPresentation: source.presentation
           }
         }
       },
       { runtime },
       'chat'
     )
-    expect(result).toMatchObject({
-      status: evidence === 'children' ? 'refused' : 'uncertain',
-      refusal: {
-        code:
-          evidence === 'children'
-            ? 'agent_session_operation_invalid'
-            : 'agent_session_operation_unknown',
-        details: {
-          reason: evidence === 'children' ? 'conversationOpenInTerminal' : 'outcomeUnknown'
-        }
-      }
-    })
-    expect(rig.adapter.acquire).not.toHaveBeenCalled()
-    expect(close).not.toHaveBeenCalled()
+    await Promise.race([
+      entered.promise,
+      operation.then((answer) => {
+        throw new Error(JSON.stringify(answer))
+      })
+    ])
+    expect(rig.adapter.acquire).toHaveBeenCalledTimes(acquisitions)
+    if (shape === 'split-during-stop') {
+      expect(
+        await runtime.applyLayoutCommand({
+          type: 'splitPane',
+          workspace: WORKTREE_ID,
+          tabId: TAB_ID,
+          leafId: LEAF_A,
+          direction: 'vertical',
+          newLeafId: LEAF_B
+        })
+      ).toMatchObject({ ok: true })
+      bindPty({ worktreeId: WORKTREE_ID, tabId: TAB_ID, leafId: LEAF_B, ptyId: PTY_B })
+      runtime.registerPty(PTY_B, WORKTREE_ID, null, { tabId: TAB_ID, leafId: LEAF_B })
+    }
+    exit.resolve()
+    expect(await operation).toEqual({ status: 'completed', sessionId: id })
+    await vi.waitFor(() => expect(rig.adapter.acquire).toHaveBeenCalledTimes(acquisitions + 1))
+    expect(stopped).toHaveBeenCalledOnce()
+    const destination = `agent-session:${id}`
+    const group = session().tabGroups?.[WORKTREE_ID]?.find((row) =>
+      row.tabOrder.includes(destination)
+    )
+    expect(group?.tabOrder).toEqual([
+      ...(split ? [TAB_ID] : []),
+      destination,
+      'agent-session:later-tab'
+    ])
+    expect(group?.activeTabId).toBe(destination)
+    expect((await runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)).activeTabId).toBe(destination)
+    const layout = session().terminalLayoutsByTabId[TAB_ID]
+    if (split) {
+      expect(layout?.ptyIdsByLeafId?.[LEAF_B]).toBe(PTY_B)
+      expect(layout?.root).toEqual({ type: 'leaf', leafId: LEAF_B })
+    } else {
+      expect(session().tabsByWorktree[WORKTREE_ID]?.some((tab) => tab.id === TAB_ID)).toBe(false)
+    }
+    expect(rig.adapter.dispatch).not.toHaveBeenCalled()
   }
 )
 
+it('does not acquire or retire a terminal whose physical stop is unproven', async () => {
+  await savedTranscript()
+  const { runtime, session } = setupMainOwnedWorkspace()
+  const incarnationId = '11111111-1111-4111-8111-111111111111'
+  runtime.registerPty(PTY_A, WORKTREE_ID, null, { tabId: TAB_ID, leafId: LEAF_A, incarnationId })
+  const source = runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_A}`, WORKTREE_ID)
+  if (!source.presentation) {
+    throw new Error('missing captured source')
+  }
+  const acquisitions = rig.adapter.acquire.mock.calls.length
+  const stop = vi.fn(async () => false)
+  runtime.setPtyController({
+    write: () => true,
+    kill: () => false,
+    stopAndWait: stop,
+    getForegroundProcess: async () => null
+  })
+  const result = await executeStructuredSessionSwitch(
+    {
+      sessionId: id,
+      execution: {
+        invocationId: 'unproven',
+        source: {
+          terminal: source.handle,
+          expectedIncarnationId: incarnationId,
+          originalPresentation: source.presentation
+        }
+      }
+    },
+    { runtime },
+    'chat'
+  )
+  expect(result.status).toBe('refused')
+  expect(stop).toHaveBeenCalledOnce()
+  expect(rig.adapter.acquire).toHaveBeenCalledTimes(acquisitions)
+  expect(session().tabsByWorktree[WORKTREE_ID]?.some((tab) => tab.id === TAB_ID)).toBe(true)
+})
+
 it('reports a dispatched terminal with a lost answer as uncertain, preserving its source', async () => {
   const { runtime } = setupMainOwnedWorkspace()
   await rig.store.setSessionTabVisibility(id, false)
@@ -308,195 +387,6 @@ it('preserves the v1 request/result and start-only side effects when execution i
   expect(create).not.toHaveBeenCalled()
 })
 
-it.each([false, true])('keeps chat with cleanup=%s', async (cleanupCompletes) => {
-  await rig.host.switchToChat(id)
-  await rig.host.switchToTerminal(id)
-  const record = rig.store.getRecord(id)!
-  const head = agentSessionProviderHandleChainHead(record.providerHandleChain)!
-  const filePath = join(rig.root, 'cleanup-source.jsonl')
-  const nativeId = head.handle.nativeId
-  let shellExited = false
-  const phases: string[] = []
-  const acquisition = Promise.withResolvers<void>()
-  vi.spyOn(processTable, 'getFreshShellForegroundSnapshot').mockImplementation(async () => {
-    phases.push(shellExited ? 'census-exited' : 'census-live')
-    return shellExited ? [] : [{ pid: 101, ppid: 1, stat: 'S+', command: '-/bin/zsh -l' }]
-  })
-  const writer = vi.fn(async () => {
-    await acquisition.promise
-    await assertCliConversationWritersExited(
-      {
-        rows: () => [
-          {
-            paneKey: 'source',
-            worktreeId: WORKTREE_ID,
-            connectionId: null,
-            agentType: 'codex',
-            receivedAt: 1,
-            stateStartedAt: 1,
-            state: 'done',
-            prompt: '',
-            providerSession: { key: 'session_id', id: nativeId }
-          }
-        ],
-        saved: () => [],
-        observation: () => ({
-          current: () => true,
-          topology: 'pane-owned',
-          presence: async () => 'exited'
-        }),
-        terminal: () => ({
-          pane: {
-            ptyId: 'source',
-            incarnationId: 'source-incarnation',
-            identity: 'source:original'
-          }
-        }),
-        links: () => [],
-        sleeping: () => false,
-        shellAlone: () => posixCliWriterShellAlone(101)
-      },
-      'codex',
-      nativeId
-    )
-  })
-  rig.host.deps.assertNoTerminalWriter = writer
-  await writeFile(
-    filePath,
-    `${[
-      { type: 'session_meta', payload: { id: nativeId } },
-      {
-        timestamp: '2026-10-26T12:00:00Z',
-        type: 'event_msg',
-        payload: { type: 'task_started', turn_id: 'terminal-turn' }
-      },
-      {
-        type: 'response_item',
-        payload: {
-          type: 'message',
-          role: 'user',
-          content: [{ type: 'input_text', text: 'Finish the change' }]
-        }
-      },
-      {
-        timestamp: '2026-10-26T12:00:01Z',
-        type: 'event_msg',
-        payload: { type: 'task_complete', turn_id: 'terminal-turn' }
-      }
-    ]
-      .map((row) => JSON.stringify(row))
-      .join('\n')}\n`
-  )
-  // External source lookup/preparation is the I/O boundary; journal catch-up and host/start ownership stay real.
-  vi.spyOn(cliTranscript, 'resolveStructuredChatCliSource').mockResolvedValue({
-    host: rig.host,
-    record,
-    head,
-    agent: 'codex',
-    cwd: rig.root,
-    providerSessionId: nativeId,
-    requireCurrent: vi.fn(),
-    metadata: structuredAgentRuntimeMetadata('codex')!
-  })
-  vi.spyOn(cliTranscript, 'prepareStructuredChatCliTranscript').mockResolvedValue({
-    useRealCodexHome: false,
-    cliForkSource: {
-      agent: 'codex',
-      sourceAgent: 'codex',
-      sessionId: nativeId,
-      filePath,
-      cwd: rig.root,
-      codexHome: null,
-      executionHostPlatform: process.platform
-    }
-  })
-  const { runtime } = setupMainOwnedWorkspace()
-  vi.spyOn(runtime, 'inspectTerminalProcess').mockResolvedValue({
-    foregroundProcess: 'zsh',
-    hasChildProcesses: false,
-    childProcessEvidence: 'no-children',
-    switchWitness: 'before-probe'
-  })
-  vi.spyOn(runtime, 'publishStructuredAgentSessionTab').mockImplementation(async (input) => {
-    input.check?.()
-    await rig.store.setSessionTabVisibility(id, true)
-  })
-  const cleanup = vi.spyOn(runtime, 'closeSwitchedSourceTerminal').mockImplementation(async () => {
-    if (cleanupCompletes) {
-      shellExited = true
-      phases.push('shell-exit')
-    }
-    return cleanupCompletes
-  })
-  const params = {
-    sessionId: id,
-    execution: {
-      invocationId: 'cleanup-refused',
-      source: {
-        terminal: 'term_source',
-        expectedIncarnationId: '11111111-1111-4111-8111-111111111111'
-      }
-    }
-  }
-  const view = await executeStructuredSessionSwitch(params, { runtime }, 'chat')
-  if (view.status !== 'present') {
-    throw new Error('missing shown handshake')
-  }
-  const opened = await executeStructuredSessionSwitch(
-    {
-      ...params,
-      execution: { ...params.execution, receipt: { generation: view.generation, shown: true } }
-    },
-    { runtime },
-    'chat'
-  )
-  expect(opened).toMatchObject({ status: 'completed', startupPending: true })
-  acquisition.resolve()
-  const result = await executeStructuredSessionSwitch(
-    { ...params, execution: { ...params.execution, observe: true } },
-    { runtime },
-    'chat'
-  )
-  expect.soft(phases).toEqual(['census-live', ...(cleanupCompletes ? ['shell-exit'] : [])])
-  await expect.soft(writer.mock.results[0]?.value).resolves.toBeUndefined()
-  expect(result).toMatchObject({ status: 'completed', sourceRetained: !cleanupCompletes })
-  expect(cleanup).toHaveBeenCalledOnce()
-  expect(rig.store.getSessionTabId(id)).not.toBeNull()
-})
-
-it('does not invent a failed journal item when acquisition fails before a selected child exists', async () => {
-  const { runtime } = setupMainOwnedWorkspace()
-  vi.spyOn(runtime, 'publishStructuredAgentSessionTab').mockImplementation(async () => {
-    await rig.store.setSessionTabVisibility(id, true)
-  })
-  rig.adapter.acquire.mockRejectedValue(new Error('acquire refused'))
-  const params = { sessionId: id, execution: { invocationId: 'pre-child-failure' } }
-  const view = await executeStructuredSessionSwitch(params, { runtime }, 'chat')
-  if (view.status !== 'present') {
-    throw new Error('missing shown handshake')
-  }
-  await executeStructuredSessionSwitch(
-    {
-      ...params,
-      execution: { ...params.execution, receipt: { generation: view.generation, shown: true } }
-    },
-    { runtime },
-    'chat'
-  )
-  const result = await executeStructuredSessionSwitch(
-    { ...params, execution: { ...params.execution, observe: true } },
-    { runtime },
-    'chat'
-  )
-  expect(result).toMatchObject({ status: 'refused' })
-  expect(result).not.toHaveProperty('failureItemId')
-  expect(
-    (await rig.host.journalSnapshot(id)).items.filter(
-      (item) => item.body.kind === 'status' && item.body.failure
-    )
-  ).toEqual([])
-})
-
 it('keeps strict v1 envelopes and journal effects for both a selected and already-starting failed child', async () => {
   const { runtime } = setupMainOwnedWorkspace()
   const opening = Promise.withResolvers<void>()
@@ -526,3 +416,135 @@ it('keeps strict v1 envelopes and journal effects for both a selected and alread
   )
   expect(failures).toHaveLength(1)
 })
+
+it('publishes ordinary late startup failure once after the destination transcript is already visible', async () => {
+  const { runtime } = setupMainOwnedWorkspace()
+  const release = Promise.withResolvers<void>()
+  const entered = Promise.withResolvers<void>()
+  rig.adapter.acquire.mockImplementation(async () => {
+    entered.resolve()
+    await release.promise
+    throw new Error('raw provider startup detail')
+  })
+  const result = await executeStructuredSessionSwitch(
+    { sessionId: id, execution: { invocationId: 'late-failure' } },
+    { runtime },
+    'chat'
+  )
+  expect(result).toEqual({ status: 'completed', sessionId: id })
+  await entered.promise
+  expect(rig.store.getSessionTabId(id)).not.toBeNull()
+  release.resolve()
+  await vi.waitFor(async () => {
+    const failures = (await rig.host.journalSnapshot(id)).items.filter(
+      (item) => item.body.kind === 'status' && item.body.failure
+    )
+    expect(failures).toHaveLength(1)
+    expect(JSON.stringify(failures)).not.toContain('raw provider startup detail')
+  })
+  expect(
+    await executeStructuredSessionSwitch(
+      { sessionId: id, execution: { invocationId: 'other-viewer' } },
+      { runtime },
+      'chat'
+    )
+  ).toEqual(result)
+  expect(rig.adapter.acquire).toHaveBeenCalledOnce()
+  expect(rig.adapter.dispatch).not.toHaveBeenCalled()
+})
+
+it.each([false, true])(
+  'captures selection before native Stop and consumes it at the ordinary terminal snapshot: newer navigation=%s',
+  async (navigate) => {
+    const { runtime, bindPty, handleOf } = setupMainOwnedWorkspace()
+    Object.assign(runtime, {
+      resolveTerminalWorkspaceLaunchScope: async () => ({
+        id: WORKTREE_ID,
+        path: rig.root,
+        connectionId: null,
+        repo: null,
+        folderWorkspace: null
+      })
+    })
+    await runtime.publishStructuredAgentSessionTab({
+      workspaceId: WORKTREE_ID,
+      sessionId: id,
+      agent: 'codex',
+      activate: true,
+      check: () => {}
+    })
+    await rig.host.switchToChat(id)
+    const stopping = Promise.withResolvers<void>()
+    const stopped = Promise.withResolvers<void>()
+    rig.adapter.closeSession.mockImplementation(async () => {
+      stopping.resolve()
+      await stopped.promise
+      return true
+    })
+    const spawn = vi
+      .spyOn(runtime, 'createTerminal')
+      .mockImplementation(async (_selector, opts = {}) => {
+        opts.beforePtySpawn?.()
+        opts.onPtySpawnDispatched?.({
+          launchAgent: 'codex',
+          ...(opts.launchConfig ? { launchConfig: opts.launchConfig } : {})
+        })
+        if (!opts.tabId || !opts.leafId) {
+          throw new Error('missing ordinary published pane')
+        }
+        bindPty({
+          worktreeId: WORKTREE_ID,
+          tabId: opts.tabId,
+          leafId: opts.leafId,
+          ptyId: 'switch-destination'
+        })
+        runtime.registerPty('switch-destination', WORKTREE_ID, null, {
+          tabId: opts.tabId,
+          leafId: opts.leafId,
+          terminalHandle: opts.preAllocatedHandle
+        })
+        return {
+          handle: handleOf('switch-destination'),
+          ptyId: 'switch-destination',
+          tabId: opts.tabId,
+          paneKey: `${opts.tabId}:${opts.leafId}`,
+          worktreeId: WORKTREE_ID,
+          title: null,
+          surface: 'background'
+        }
+      })
+    const operation = executeStructuredSessionSwitch(
+      {
+        sessionId: id,
+        execution: { invocationId: 'ordinary-native-stop', sourceTabId: `agent-session:${id}` }
+      },
+      { runtime },
+      'terminal'
+    )
+    await Promise.race([
+      stopping.promise,
+      operation.then((answer) => {
+        throw new Error(JSON.stringify(answer))
+      })
+    ])
+    expect(spawn).not.toHaveBeenCalled()
+    if (navigate) {
+      runtime.projectStructuredAgentSessionTab({
+        workspaceId: WORKTREE_ID,
+        sessionId: 'newer-navigation',
+        agent: 'codex',
+        activate: true
+      })
+    }
+    stopped.resolve()
+    const answer = await operation
+    expect(answer).toMatchObject({ status: 'completed' })
+    expect(spawn).toHaveBeenCalledOnce()
+    const snapshot = await runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)
+    expect(snapshot.activeTabId).toBe(
+      navigate
+        ? 'agent-session:newer-navigation'
+        : `${spawn.mock.calls[0]![1]!.tabId}::${spawn.mock.calls[0]![1]!.leafId}`
+    )
+  }
+)
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
index 6987cd199340..71e029de6c5f 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
@@ -1,7 +1,9 @@
+import { requireStructuredSwitchRecord } from './structured-agent-session-switch-preparation'
+import { retainStructuredSwitchSource } from './structured-agent-session-switch-retention'
+import { structuredSessionSwitchFailure } from './structured-agent-session-switch-failure'
+import { prepareStructuredSessionSwitch } from './structured-agent-session-switch-preparation'
 import type { z } from 'zod'
 import type { RpcContext } from '../core'
-import { DaemonConnectionLostError, DaemonRequestTimeoutError } from '../../../daemon/daemon-errors'
-import { isAgentSessionOperationOutcomeUnknown } from '../../runtime-agent-launch-resolution'
 import type { SwitchToChatParams, SwitchToTerminalParams } from './structured-agent-session-schemas'
 import {
   agentSessionSwitchDeadline,
@@ -10,32 +12,24 @@ import {
 import {
   AgentSessionRefusalError,
   agentSessionRefusalError,
-  isAgentSessionRefusalError,
-  refuseUnclassified
+  isAgentSessionRefusalError
 } from '../../../../shared/agent-session-wire-refusals'
 import {
   nativeConversationContent,
   prepareStructuredChatCliTranscript,
   resolveStructuredChatCliSource
 } from '../../../ai-vault/structured-chat-cli-fork'
-import {
-  ensureStructuredHostInstalled,
-  requireStructuredSessionHost,
-  requireStructuredHost,
-  structuredCallerFor
-} from './structured-agent-session-gate'
+import { structuredCallerFor } from './structured-agent-session-gate'
 import {
   prepareStructuredAgentSessionCreateForWorktree,
   commitStructuredAgentSessionCreate
 } from './structured-agent-session-create'
-import { inPlaceSwitchEnabled } from '../../../../shared/structured-agent-cli-conversation-adoption'
-import {
-  cleanupSwitchedSourceShell,
-  recordWorkspace,
-  switchRetainedOwner
-} from './structured-agent-session-switch-source'
+import { recordWorkspace, switchRetainedOwner } from './structured-agent-session-switch-source'
 import { executeStructuredSessionTerminalSwitch } from './structured-agent-session-switch-terminal-execution'
-
+import { agentLaunchMovesHostWindow } from './agent-launch-tab-publication'
+import { interruptWorkingAgent } from '../../terminal-agent-interrupt'
+import { mainAgentState } from '../../../../shared/main-agent-status'
+import { captureSwitchStoppedCliTurn } from '../../../native-chat/agent-session-wire/structured-agent-session-switch-import'
 export async function executeStructuredSessionSwitch(
   params: z.infer<typeof SwitchToChatParams> | z.infer<typeof SwitchToTerminalParams>,
   ctx: RpcContext,
@@ -43,194 +37,249 @@ export async function executeStructuredSessionSwitch(
 ): Promise<AgentSessionSwitchResult> {
   const deadline = agentSessionSwitchDeadline()
   let sessionId = params.sessionId
+  const selectionCurrent = ctx.runtime.captureSessionSwitchSelection()
   let commandOwned = false
   const operation = (async (): Promise<AgentSessionSwitchResult> => {
-    await ensureStructuredHostInstalled(ctx)
-    deadline.check()
-    const execution = params.execution
-    if (!execution) {
-      throw agentSessionRefusalError('agent_session_operation_invalid', {
-        reason: 'requestMalformed'
-      })
-    }
-    const create = 'create' in execution ? execution.create : undefined
-    const host = create
-      ? requireStructuredHost(ctx, create.agent)
-      : requireStructuredSessionHost(ctx, sessionId)
+    const prepared = await prepareStructuredSessionSwitch(params, ctx, sessionId, deadline)
+    const {
+      host,
+      execution,
+      create,
+      sourceEvidence,
+      createIdentity,
+      providerSessionId,
+      conversation
+    } = prepared
+    sessionId = prepared.sessionId
     commandOwned = true
     return host.runSwitch(
       sessionId,
       execution.invocationId,
       deadline,
       async () => {
-        if (create && !execution.receipt && !execution.observe) {
-          if (
-            direction !== 'chat' ||
-            create.envelope.sessionId !== sessionId ||
-            create.agent !== 'codex'
-          ) {
-            throw agentSessionRefusalError('agent_session_operation_invalid', {
-              reason: 'requestMalformed'
+        if (direction === 'terminal') {
+          const record = requireStructuredSwitchRecord(host, sessionId)
+          return executeStructuredSessionTerminalSwitch(
+            params,
+            record,
+            ctx,
+            host,
+            sessionId,
+            deadline,
+            execution,
+            selectionCurrent
+          )
+        }
+        deadline.check()
+        const source = 'source' in execution ? execution.source : undefined
+        const close = source
+          ? (() => {
+              try {
+                return ctx.runtime.captureTerminalSwitchClose(
+                  source.terminal,
+                  source.expectedIncarnationId,
+                  source.originalPresentation
+                )
+              } catch {
+                host.deps.logger.warn('switch source owner was not confirmed', {
+                  scope: 'session-switch',
+                  sessionId,
+                  direction,
+                  source: 'terminal',
+                  exactIncarnation: false
+                })
+                throw agentSessionRefusalError('agent_session_ownership_unknown', {
+                  reason: 'ownerUnproven'
+                })
+              }
+            })()
+          : undefined
+        const paneKey = close ? `${close.source.tabId}:${close.source.leafId}` : undefined
+        const row = paneKey ? ctx.runtime.agentTransitions.latestRow(paneKey) : null
+        const adopt = createIdentity?.adopt
+        const retainedSource =
+          !adopt && source
+            ? await prepareStructuredChatCliTranscript(
+                await resolveStructuredChatCliSource(
+                  { sessionId, workspaceId: recordWorkspace(host, sessionId) },
+                  false
+                ),
+                (args) => ctx.runtime.prepareAiVaultSessionResume(args),
+                false
+              )
+            : undefined
+        const before = adopt?.transcriptPath
+          ? {
+              agent: create!.agent,
+              sessionId: adopt.providerHandle.nativeId,
+              filePath: adopt.transcriptPath
+            }
+          : retainedSource?.cliForkSource
+        const stopped = before
+          ? await captureSwitchStoppedCliTurn(
+              before,
+              Boolean(row && mainAgentState(row) === 'working'),
+              deadline
+            )
+          : undefined
+        deadline.check()
+        if (close) {
+          if (paneKey) {
+            await interruptWorkingAgent(
+              ctx.runtime,
+              (key) => ctx.runtime.agentTransitions.latestRow(key),
+              paneKey,
+              {
+                signal: deadline.signal,
+                beforeWrite: async () => {
+                  deadline.check()
+                }
+              }
+            )
+          }
+          // Shutdown already accepted must finish even when the observing request expires.
+          try {
+            await host.trackSwitchPhysical(sessionId, close.stop())
+          } catch {
+            host.deps.logger.warn('switch source exit was not confirmed', {
+              scope: 'session-switch',
+              sessionId,
+              direction,
+              source: 'terminal',
+              exactIncarnation: true
+            })
+            throw agentSessionRefusalError('agent_session_ownership_unknown', {
+              reason: 'ownerUnproven'
             })
           }
+        }
+        deadline.check()
+        if (create) {
           try {
-            const prepared = await prepareStructuredAgentSessionCreateForWorktree({
+            const preparedCreate = await prepareStructuredAgentSessionCreateForWorktree({
               ...create,
               runtime: ctx.runtime,
               caller: structuredCallerFor(ctx),
               atRest: true,
-              ensureHost: async () => requireStructuredHost(ctx, create.agent),
-              structuredAgentCliSourceEvidence: ctx.structuredAgentCliSourceEvidence
+              ensureHost: async () => host,
+              structuredAgentCliSourceEvidence: sourceEvidence
             })
             deadline.check()
             const created = await commitStructuredAgentSessionCreate({
               runtime: ctx.runtime,
               caller: structuredCallerFor(ctx),
-              prepared,
-              activate: true,
-              tabPlacement: create.tabPlacement,
+              prepared: { ...preparedCreate, tab: null },
+              activate: false,
               check: deadline.check
             })
             if (!created.ok) {
-              const owner = switchRetainedOwner(host, create, created.refusal)
-              if (!owner) {
-                return { status: 'refused', sessionId, refusal: created.refusal }
-              }
-              sessionId = owner
+              throw new AgentSessionRefusalError(created.refusal)
             }
+            sessionId = created.value.sessionId
           } catch (error) {
-            const owner = isAgentSessionRefusalError(error)
-              ? switchRetainedOwner(host, create, error.refusal)
-              : null
-            if (!owner) {
+            const owner =
+              isAgentSessionRefusalError(error) &&
+              (error.refusal.code === 'agent_session_conflict' ||
+                error.refusal.code === 'agent_session_ownership_unknown') &&
+              createIdentity &&
+              providerSessionId &&
+              switchRetainedOwner(host, createIdentity, providerSessionId)
+            if (
+              !owner ||
+              !isAgentSessionRefusalError(error) ||
+              error.refusal.details?.owner?.sessionId !== owner
+            ) {
               throw error
             }
             sessionId = owner
           }
-          if (sessionId !== params.sessionId) {
-            await host.adoptSwitch(params.sessionId, sessionId)
-          }
-        }
-        const record = host.deps.store.getRecord(sessionId)
-        if (!record || !inPlaceSwitchEnabled(record.provider)) {
-          throw agentSessionRefusalError('structured_agent_session_unsupported', {
-            reason: 'hostUnsupported'
-          })
+          await host.adoptSwitch(conversation?.commandKey ?? params.sessionId, sessionId)
         }
+        const record = requireStructuredSwitchRecord(host, sessionId)
         const workCurrent = host.captureSwitchWork(sessionId, deadline)
-        if (direction === 'chat') {
-          const source = 'source' in execution ? execution.source : undefined
-          let switchWitness: string | undefined
-          let witnessBudget = 0
-          if (source) {
-            const inspection = await ctx.runtime.inspectTerminalProcess(source.terminal, {
-              expectedIncarnationId: source.expectedIncarnationId,
-              scanChildProcesses: true,
-              captureSwitchWitness: execution.invocationId
+        const check = () => {
+          deadline.check()
+          if (!workCurrent()) {
+            host.deps.logger.warn('switch destination was superseded by newer work', {
+              scope: 'session-switch',
+              sessionId,
+              direction
+            })
+            throw agentSessionRefusalError('agent_session_operation_invalid', {
+              reason: 'messagesUnsettled'
             })
-            deadline.check()
-            switchWitness = 'switchWitness' in inspection ? inspection.switchWitness : undefined
-            witnessBudget = deadline.remaining()
-            if (inspection.childProcessEvidence !== 'no-children') {
-              throw inspection.childProcessEvidence === 'children'
-                ? agentSessionRefusalError('agent_session_operation_invalid', {
-                    reason: 'conversationOpenInTerminal'
-                  })
-                : agentSessionRefusalError('agent_session_operation_unknown', {
-                    reason: 'outcomeUnknown'
-                  })
-            }
           }
-          // Initial creation already imported this source before committing its record.
-          if (
-            (!create || sessionId !== params.sessionId) &&
-            (source || nativeConversationContent(await host.journalSnapshot(sessionId)) === 'saved')
-          ) {
-            const prepared = await prepareStructuredChatCliTranscript(
-              await resolveStructuredChatCliSource(
-                { sessionId, workspaceId: record.location.workspaceId },
-                false
-              ),
-              (args) => ctx.runtime.prepareAiVaultSessionResume(args),
+        }
+        if (
+          source ||
+          nativeConversationContent(await host.journalSnapshot(sessionId)) === 'saved'
+        ) {
+          const transcript = await prepareStructuredChatCliTranscript(
+            await resolveStructuredChatCliSource(
+              { sessionId, workspaceId: record.location.workspaceId },
               false
-            )
-            deadline.check()
-            if (!prepared.cliForkSource) {
-              throw agentSessionRefusalError('agent_session_identity_required', {
-                reason: 'transcriptUnreadable'
-              })
-            }
-            await host.refreshSwitchTranscript(sessionId, prepared.cliForkSource, deadline)
-          }
-          const revealed = await host.revealSession(sessionId)
-          deadline.check()
-          if (!revealed.readable && revealed.openRefusal) {
-            throw new AgentSessionRefusalError(revealed.openRefusal)
+            ),
+            (args) => ctx.runtime.prepareAiVaultSessionResume(args),
+            false
+          )
+          check()
+          if (!transcript.cliForkSource) {
+            throw agentSessionRefusalError('agent_session_identity_required', {
+              reason: 'transcriptUnreadable'
+            })
           }
-          await ctx.runtime.publishStructuredAgentSessionTab({
-            ...revealed,
-            activate: true,
-            check: deadline.check
-          })
-          deadline.check()
-          await host.presentSwitch(sessionId, {
-            sessionId,
-            workspaceId: revealed.workspaceId,
-            agent: 'codex',
-            tabId: host.getSessionTabId(sessionId) ?? `agent-session:${sessionId}`,
-            ...(create?.tabPlacement ? { placement: create.tabPlacement } : {})
-          })
-          const starting = host.switchToChat(sessionId, deadline)
-          host.openedSwitch(sessionId, {
-            status: 'completed',
+          await host.refreshSwitchTranscript(
             sessionId,
-            startupPending: true
-          })
-          const started = await starting
-          if (!started.ok) {
-            return {
-              status: 'refused',
-              sessionId,
-              refusal: started.refusal,
-              ...(started.failureItemId ? { failureItemId: started.failureItemId } : {})
-            }
-          }
-          const cleanup = source
-            ? cleanupSwitchedSourceShell(ctx, source, switchWitness, witnessBudget, deadline)
-            : Promise.resolve(true)
-          return { status: 'completed', sessionId, sourceRetained: !(await cleanup) }
+            transcript.cliForkSource,
+            deadline,
+            stopped,
+            check
+          )
         }
-        return executeStructuredSessionTerminalSwitch(
-          params,
-          record,
-          ctx,
-          host,
-          sessionId,
-          deadline,
-          workCurrent,
-          execution
-        )
-      },
-      direction === 'terminal',
-      execution,
-      async (check) => {
-        check()
         const revealed = await host.revealSession(sessionId)
         check()
-        await ctx.runtime.publishStructuredAgentSessionTab({ ...revealed, activate: false, check })
-        check()
-        ctx.runtime.retainSessionSwitchProjection(
-          recordWorkspace(host, sessionId),
-          sessionId,
-          execution.invocationId,
-          host.switchGeneration(sessionId) ??
-            execution.receipt?.generation ??
-            execution.invocationId
-        )
+        if (!revealed.readable && revealed.openRefusal) {
+          throw new AgentSessionRefusalError(revealed.openRefusal)
+        }
+        await ctx.runtime.publishStructuredAgentSessionTab({
+          ...revealed,
+          activate: true,
+          check,
+          selectionCurrent,
+          viewerSelection: execution.viewerSelection,
+          focusWindow: agentLaunchMovesHostWindow(ctx),
+          placement: close?.placement() ?? create?.tabPlacement
+        })
+        deadline.check()
+        if (close) {
+          await close.retire()
+        }
+        deadline.check()
+        // Publication is complete; a first new send may already own the ordinary start.
+        const starting = await host.openSwitchToChat(sessionId, deadline)
+        if (starting.owned) {
+          void host.trackSwitchPhysical(sessionId, starting.outcome).catch(() => {})
+        } else {
+          void starting.outcome.catch(() => {})
+        }
+        return { status: 'completed', sessionId }
       },
-      Boolean(create),
-      (generation) =>
-        ctx.runtime.convergeSessionSwitchProjection(recordWorkspace(host, sessionId), generation)
+      {
+        direction,
+        conversationKey: conversation?.commandKey,
+        allowUncreated: Boolean(create),
+        onRetained:
+          direction === 'terminal'
+            ? (check) =>
+                retainStructuredSwitchSource(
+                  ctx.runtime,
+                  host,
+                  sessionId,
+                  execution.invocationId,
+                  check
+                )
+            : undefined
+      }
     )
   })()
   void operation
@@ -243,25 +292,6 @@ export async function executeStructuredSessionSwitch(
   try {
     return await deadline.wait(operation)
   } catch (error) {
-    const refusal = isAgentSessionRefusalError(error)
-      ? error.refusal
-      : isAgentSessionOperationOutcomeUnknown(error) ||
-          error instanceof DaemonConnectionLostError ||
-          error instanceof DaemonRequestTimeoutError
-        ? agentSessionRefusalError('agent_session_operation_unknown', { reason: 'outcomeUnknown' })
-            .refusal
-        : refuseUnclassified(
-            'agent_session_owner_restart_failed',
-            'The agent could not switch. Try again.'
-          )
-    return {
-      status:
-        refusal.code === 'agent_session_operation_expired' ||
-        refusal.code === 'agent_session_operation_unknown'
-          ? 'uncertain'
-          : 'refused',
-      sessionId,
-      refusal
-    }
+    return structuredSessionSwitchFailure(error, sessionId)
   }
 }
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-failure.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-failure.ts
new file mode 100644
index 000000000000..e746fdc5c2d8
--- /dev/null
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-failure.ts
@@ -0,0 +1,33 @@
+import { DaemonConnectionLostError, DaemonRequestTimeoutError } from '../../../daemon/daemon-errors'
+import { isAgentSessionOperationOutcomeUnknown } from '../../runtime-agent-launch-resolution'
+import type { AgentSessionSwitchResult } from '../../../../shared/agent-session-switch-execution'
+import {
+  agentSessionRefusalError,
+  isAgentSessionRefusalError,
+  refuseUnclassified
+} from '../../../../shared/agent-session-wire-refusals'
+export function structuredSessionSwitchFailure(
+  error: unknown,
+  sessionId: string
+): AgentSessionSwitchResult {
+  const refusal = isAgentSessionRefusalError(error)
+    ? error.refusal
+    : isAgentSessionOperationOutcomeUnknown(error) ||
+        error instanceof DaemonConnectionLostError ||
+        error instanceof DaemonRequestTimeoutError
+      ? agentSessionRefusalError('agent_session_operation_unknown', { reason: 'outcomeUnknown' })
+          .refusal
+      : refuseUnclassified(
+          'agent_session_owner_restart_failed',
+          'The agent could not switch. Try again.'
+        )
+  return {
+    status:
+      refusal.code === 'agent_session_operation_expired' ||
+      refusal.code === 'agent_session_operation_unknown'
+        ? 'uncertain'
+        : 'refused',
+    sessionId,
+    refusal
+  }
+}
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-generated.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-generated.test.ts
new file mode 100644
index 000000000000..a56bae49210a
--- /dev/null
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-generated.test.ts
@@ -0,0 +1,477 @@
+import type * as ProcessHost from '@orca/process-host'
+import { mkdir, writeFile } from 'node:fs/promises'
+import { basename, join } from 'node:path'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { createStructuredAgentSessionLaunchIntent } from '../../../../renderer/src/lib/launch-structured-agent-session'
+import {
+  createRestTestRig,
+  type RestTestRig
+} from '../../../native-chat/agent-session-wire/structured-agent-session-rest-test-rig'
+import { setStructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-registry'
+import { HOST_TEST_THREAD } from '../../../native-chat/agent-session-wire/structured-agent-session-host-test-data'
+import {
+  setupMainOwnedWorkspace,
+  WORKTREE_ID,
+  TAB_ID,
+  LEAF_A,
+  PTY_A
+} from '../../main-owned-workspace-runtime-fixture'
+import type { AgentStatusIpcPayload } from '../../../../shared/agent-status-types'
+import * as writerProcess from '../../structured-agent-cli-writers'
+import { executeStructuredSessionSwitch } from './structured-agent-session-switch-execution'
+import { SwitchToChatParams } from './structured-agent-session-schemas'
+import {
+  switchConversationIdentity,
+  switchRetainedOwner
+} from './structured-agent-session-switch-source'
+import { createTestParams } from '../../../native-chat/agent-session-wire/structured-agent-session-create-test-fixture'
+import { PI_RPC_AGENT } from '../../../pi/rpc-agent-definition'
+import { StructuredAgentRegistry } from '../../../native-chat/agent-session-wire/structured-agent-registry'
+
+vi.mock('@/store', () => ({ useAppStore: { getState: () => ({ settings: {} }) } }))
+vi.mock('../../structured-agent-shell-environment', () => ({
+  resolveHostAgentBaseEnvironment: async () => ({}),
+  refreshHostAgentBaseEnvironmentAfterMiss: async () => {}
+}))
+vi.mock('../../../agent-workspace-trust', () => ({ applyAgentWorkspaceTrust: async () => ({}) }))
+vi.mock('@orca/process-host', async (importOriginal) => ({
+  ...(await importOriginal<typeof ProcessHost>()),
+  runProcess: async () => ({
+    stdout: 'codex 0.200.0',
+    stderr: '',
+    code: 0,
+    timedOut: false,
+    outputTruncated: false
+  })
+}))
+
+let rig: RestTestRig
+beforeEach(async () => {
+  rig = await createRestTestRig({
+    idleSweep: { intervalMs: 60_000 },
+    resolveWorkspacePath: async () => rig.root,
+    resolveLaunchEnv: async () => ({ CODEX_HOME: rig.root })
+  })
+  vi.stubEnv('HOME', join(rig.root, 'home'))
+  vi.stubEnv('USERPROFILE', join(rig.root, 'home'))
+  vi.stubEnv('ORCA_USER_DATA_PATH', join(rig.root, 'user-data'))
+  vi.stubEnv('CODEX_HOME', rig.root)
+  vi.spyOn(Date, 'now').mockImplementation(() => rig.clock.now)
+  const acquire = rig.adapter.acquire.getMockImplementation()!
+  rig.adapter.acquire.mockImplementation(async (input) => {
+    const acquired = await acquire(input)
+    return {
+      ...acquired,
+      ...(acquired.link ? { link: { ...acquired.link, origin: 'resumed' as const } } : {})
+    }
+  })
+  setStructuredAgentSessionHost(rig.host)
+})
+afterEach(async () => {
+  setStructuredAgentSessionHost(null)
+  await rig.dispose()
+  vi.unstubAllEnvs()
+  vi.restoreAllMocks()
+})
+
+it.each([
+  { retained: false, working: false, navigation: 'none', otherAccount: false },
+  { retained: false, working: true, navigation: 'preparation', otherAccount: false },
+  { retained: true, working: false, navigation: 'stop', otherAccount: false },
+  { retained: false, working: false, navigation: 'none', otherAccount: true }
+] as const)(
+  'composes generated viewer envelopes through actual create admission and exact Stop: %j',
+  async ({ retained, working, navigation, otherAccount }) => {
+    const filePath = join(
+      rig.root,
+      'sessions',
+      `rollout-2026-10-28T00-00-00-${HOST_TEST_THREAD}.jsonl`
+    )
+    await mkdir(join(rig.root, 'sessions'), { recursive: true })
+    const transcript = `${[
+      { type: 'session_meta', payload: { id: HOST_TEST_THREAD, cwd: rig.root } },
+      {
+        timestamp: '2026-10-28T00:00:00Z',
+        type: 'event_msg',
+        payload: { type: 'task_started', turn_id: 'cli-turn' }
+      },
+      {
+        type: 'response_item',
+        payload: {
+          type: 'message',
+          role: 'user',
+          content: [{ type: 'input_text', text: 'A saved prompt' }]
+        }
+      },
+      ...(working
+        ? []
+        : [
+            {
+              timestamp: '2026-10-28T00:00:01Z',
+              type: 'event_msg',
+              payload: { type: 'task_complete', turn_id: 'cli-turn' }
+            }
+          ])
+    ]
+      .map((row) => JSON.stringify(row))
+      .join('\n')}\n`
+    await writeFile(filePath, transcript)
+    const preparing = Promise.withResolvers<void>()
+    const prepared = Promise.withResolvers<void>()
+    let holdPreparation = false
+    let selectedHome = rig.root
+    const prepareHome = vi.fn(async () => {
+      if (holdPreparation && navigation === 'preparation') {
+        preparing.resolve()
+        await prepared.promise
+      }
+      return selectedHome
+    })
+    let exited = false
+    const launchHome = vi.fn(async () => rig.root)
+    const { runtime, session, handleOf } = setupMainOwnedWorkspace({
+      runtimeDeps: {
+        resolveCodexStructuredLaunchHome: prepareHome,
+        prepareCodexStructuredLaunch: launchHome,
+        readHookCliWriterObservation: () => ({
+          current: () => true,
+          topology: 'pane-owned',
+          presence: async () => (exited ? 'exited' : 'live')
+        })
+      }
+    })
+    // Only workspace filesystem lookup and external process/account I/O are supplied by the fixture.
+    vi.spyOn(runtime, 'resolveRuntimeFileTarget').mockResolvedValue({
+      executionHostId: 'local',
+      worktree: {
+        id: WORKTREE_ID,
+        repoId: 'repo-1',
+        parentWorktreeId: null,
+        childWorktreeIds: [],
+        lineage: null,
+        path: rig.root,
+        displayName: 'workspace',
+        comment: '',
+        linkedIssue: null,
+        linkedPR: null,
+        linkedLinearIssue: null,
+        isArchived: false,
+        isUnread: false,
+        isPinned: false,
+        sortOrder: 0,
+        lastActivityAt: 0,
+        branch: 'main',
+        head: 'head',
+        isBare: false,
+        isMainWorktree: true,
+        git: { path: rig.root, head: 'head', branch: 'main', isBare: false, isMainWorktree: true }
+      }
+    })
+    vi.spyOn(runtime, 'prepareAiVaultSessionResume').mockResolvedValue({ useRealCodexHome: false })
+    vi.spyOn(writerProcess, 'posixCliWriterShellAlone').mockResolvedValue(false)
+    const incarnationId = '11111111-1111-4111-8111-111111111111'
+    runtime.registerPty(PTY_A, WORKTREE_ID, null, { tabId: TAB_ID, leafId: LEAF_A, incarnationId })
+    const row: AgentStatusIpcPayload = {
+      paneKey: `${TAB_ID}:${LEAF_A}`,
+      worktreeId: WORKTREE_ID,
+      connectionId: null,
+      agentType: 'codex',
+      state: working ? 'working' : 'waiting',
+      prompt: '',
+      receivedAt: 1,
+      stateStartedAt: 1,
+      providerSession: { key: 'session_id', id: HOST_TEST_THREAD, transcriptPath: filePath }
+    }
+    vi.spyOn(runtime, 'getAgentProviderSessionRows').mockImplementation(() => (exited ? [] : [row]))
+    vi.spyOn(runtime.agentTransitions, 'latestRow').mockImplementation(() => (exited ? null : row))
+    const stopEntered = Promise.withResolvers<void>()
+    const exit = Promise.withResolvers<void>()
+    const stop = vi.fn(async () => {
+      stopEntered.resolve()
+      await exit.promise
+      exited = true
+      await runtime.onPtyExit(PTY_A, 0, incarnationId, { hostExitConfirmed: true })
+      return true
+    })
+    runtime.setPtyController({
+      write: () => true,
+      kill: () => false,
+      stopAndWait: stop,
+      getForegroundProcess: async () => 'codex',
+      listProcesses: async () =>
+        exited
+          ? []
+          : [
+              {
+                id: PTY_A,
+                cwd: rig.root,
+                title: 'Codex',
+                worktreeId: WORKTREE_ID,
+                terminalHandle: handleOf(PTY_A),
+                rootProcessId: 10,
+                incarnationId
+              }
+            ]
+    })
+    const source = runtime.resolveTerminalPane(row.paneKey, WORKTREE_ID)
+    if (!source.presentation) {
+      throw new Error('missing source presentation')
+    }
+    const resumeFrom = {
+      providerSessionId: HOST_TEST_THREAD,
+      cliSource: { workspaceId: WORKTREE_ID, paneKey: row.paneKey }
+    }
+    const first = createStructuredAgentSessionLaunchIntent(
+      WORKTREE_ID,
+      'codex',
+      'local',
+      resumeFrom,
+      undefined,
+      false
+    )
+    const second = createStructuredAgentSessionLaunchIntent(
+      WORKTREE_ID,
+      'codex',
+      'local',
+      resumeFrom,
+      undefined,
+      false
+    )
+    expect(first.sessionId).not.toBe(second.sessionId)
+    let canonical = first.sessionId
+    if (otherAccount) {
+      const otherHome = join(rig.root, 'other-account')
+      await mkdir(join(otherHome, 'sessions'), { recursive: true })
+      await writeFile(join(otherHome, 'sessions', basename(filePath)), transcript)
+      selectedHome = otherHome
+      const attach = await runtime.resolveStructuredAgentSessionCreateIdentity({
+        ...first.params,
+        resumeFrom: { providerSessionId: HOST_TEST_THREAD }
+      })
+      selectedHome = rig.root
+      expect(attach.accountHome).toEqual({ variable: 'CODEX_HOME', path: otherHome })
+      expect(
+        await rig.host.create(
+          { callerKey: 'setup' },
+          createTestParams(undefined, {
+            ...attach,
+            envelope: { ...attach.envelope, sessionId: 'other-account-native' }
+          })
+        )
+      ).toMatchObject({ ok: true })
+    }
+    if (retained) {
+      const attach = await runtime.resolveStructuredAgentSessionCreateIdentity(first.params)
+      const created = await rig.host.create(
+        { callerKey: 'setup' },
+        createTestParams(undefined, {
+          ...attach,
+          envelope: { ...attach.envelope, sessionId: first.sessionId }
+        })
+      )
+      expect(created).toMatchObject({ ok: true })
+      await rig.host.switchToChat(first.sessionId)
+      await rig.host.switchToTerminal(first.sessionId)
+      canonical = first.sessionId
+    }
+    const generated = (intent: typeof first, invocationId: string) =>
+      SwitchToChatParams.parse({
+        sessionId: intent.sessionId,
+        execution: {
+          invocationId,
+          create: intent.params,
+          source: {
+            terminal: source.handle,
+            expectedIncarnationId: incarnationId,
+            originalPresentation: source.presentation
+          }
+        }
+      })
+    // Retained return still carries a fresh renderer-generated ID, never the known native owner.
+    const a = retained ? second : first
+    const b = createStructuredAgentSessionLaunchIntent(
+      WORKTREE_ID,
+      'codex',
+      'local',
+      resumeFrom,
+      undefined,
+      false
+    )
+    await expect(runtime.resolveStructuredAgentSessionCreateIntent(a.params)).rejects.toMatchObject(
+      {
+        refusal: {
+          code: 'agent_session_conflict',
+          details: { reason: 'conversationHeldElsewhere' }
+        }
+      }
+    )
+    const commands = vi.spyOn(rig.host, 'runSwitch')
+    const acquisitions = rig.adapter.acquire.mock.calls.length
+    const launchPreparations = launchHome.mock.calls.length
+    holdPreparation = true
+    const operation = executeStructuredSessionSwitch(generated(a, 'viewer-a'), { runtime }, 'chat')
+    const navigate = () =>
+      runtime.projectStructuredAgentSessionTab({
+        workspaceId: WORKTREE_ID,
+        sessionId: 'newer-navigation',
+        agent: 'codex',
+        activate: true
+      })
+    if (navigation === 'preparation') {
+      await preparing.promise
+      navigate()
+      prepared.resolve()
+    }
+    await Promise.race([
+      stopEntered.promise,
+      operation.then((answer) => {
+        throw new Error(JSON.stringify(answer))
+      })
+    ])
+    const duplicate = executeStructuredSessionSwitch(generated(b, 'viewer-b'), { runtime }, 'chat')
+    expect(rig.adapter.acquire).toHaveBeenCalledTimes(acquisitions)
+    expect(rig.store.getRecord(a.sessionId)).toBeNull()
+    expect(launchHome).toHaveBeenCalledTimes(launchPreparations)
+    await vi.waitFor(() => expect(commands).toHaveBeenCalledTimes(2))
+    if (navigation === 'stop') {
+      navigate()
+    }
+    exit.resolve()
+    const answer = await operation
+    expect(answer).toEqual({ status: 'completed', sessionId: canonical })
+    expect(await duplicate).toEqual(answer)
+    if (working) {
+      expect(
+        (await rig.host.journalSnapshot(canonical)).items
+          .filter((item) => item.body.kind === 'turn')
+          .map((item) => item.body)
+      ).toContainEqual(expect.objectContaining({ state: 'interrupted' }))
+    }
+    expect(stop).toHaveBeenCalledOnce()
+    await vi.waitFor(() => expect(rig.adapter.acquire).toHaveBeenCalledTimes(acquisitions + 1))
+    await vi.waitFor(() => expect(rig.store.getRecord(canonical)?.lease.claimStatus).toBe('live'))
+    expect(rig.adapter.dispatch).not.toHaveBeenCalled()
+    const snapshot = await runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)
+    expect(snapshot.activeTabId).toBe(
+      `agent-session:${navigation === 'none' ? canonical : 'newer-navigation'}`
+    )
+    expect(session().unifiedTabs?.[WORKTREE_ID]?.some((tab) => tab.entityId === canonical)).toBe(
+      true
+    )
+  }
+)
+
+it('uses registered Pi History IDs and isolates account and owning host for prefounding/native command identity', async () => {
+  const filePath = join(rig.root, `2026-10-28T00-00-00_${HOST_TEST_THREAD}.jsonl`)
+  const transcript = `${[
+    { type: 'session', version: 3, id: HOST_TEST_THREAD },
+    {
+      type: 'message',
+      id: 'pi-user',
+      parentId: null,
+      message: { role: 'user', content: 'Saved Pi prompt' }
+    },
+    {
+      type: 'message',
+      id: 'pi-reply',
+      parentId: 'pi-user',
+      message: {
+        role: 'assistant',
+        content: [{ type: 'text', text: 'Saved reply' }],
+        stopReason: 'stop'
+      }
+    }
+  ]
+    .map((row) => JSON.stringify(row))
+    .join('\n')}\n`
+  await writeFile(filePath, transcript)
+  const identity = {
+    provider: 'pi' as const,
+    accountHome: { variable: 'PI_CODING_AGENT_DIR', path: rig.root },
+    location: {
+      executionHostId: 'local' as const,
+      wslDistro: null,
+      workspaceId: WORKTREE_ID,
+      workspaceKind: 'git-worktree' as const
+    }
+  }
+  const piRig = await createRestTestRig({
+    agents: new StructuredAgentRegistry([
+      {
+        definition: PI_RPC_AGENT,
+        adapter: {
+          ...rig.host.deps.adapter,
+          compact: async () => {
+            throw new Error('identity-only fixture never contacts the provider')
+          }
+        }
+      }
+    ])
+  })
+  try {
+    const created = await piRig.host.create(
+      { callerKey: 'setup' },
+      createTestParams(undefined, {
+        ...identity,
+        agent: 'pi',
+        adopt: {
+          providerHandle: { transport: 'jsonl-rpc', agent: 'pi', nativeId: filePath },
+          transcriptPath: filePath
+        }
+      })
+    )
+    // Use the actual ordinary import/founding owner, with a valid registered transcript.
+    expect(created).toMatchObject({ ok: true })
+    expect(switchRetainedOwner(piRig.host, identity, HOST_TEST_THREAD)).toBe(
+      created.ok ? created.value.sessionId : null
+    )
+    const key = switchConversationIdentity(identity, HOST_TEST_THREAD).commandKey
+    expect(switchConversationIdentity(identity, filePath).commandKey).toBe(key)
+    for (const [index, scoped] of [
+      {
+        ...identity,
+        accountHome: { ...identity.accountHome, path: join(rig.root, 'other-account') }
+      },
+      { ...identity, location: { ...identity.location, executionHostId: 'runtime:other' } },
+      { ...identity, location: { ...identity.location, wslDistro: 'Ubuntu' } }
+    ].entries()) {
+      expect(switchRetainedOwner(piRig.host, scoped, HOST_TEST_THREAD)).toBeNull()
+      await mkdir(scoped.accountHome.path, { recursive: true })
+      const scopedPath = join(scoped.accountHome.path, basename(filePath))
+      await writeFile(scopedPath, transcript)
+      const params = createTestParams(undefined, {
+        ...scoped,
+        agent: 'pi',
+        envelope: { ...createTestParams().envelope, sessionId: `pi-scoped-${index}` },
+        adopt: {
+          providerHandle: { transport: 'jsonl-rpc', agent: 'pi', nativeId: scopedPath },
+          transcriptPath: scopedPath
+        }
+      })
+      expect(await piRig.host.create({ callerKey: 'setup' }, params)).toMatchObject({ ok: true })
+      expect(switchRetainedOwner(piRig.host, scoped, HOST_TEST_THREAD)).toBe(
+        params.envelope.sessionId
+      )
+      expect(switchConversationIdentity(scoped, HOST_TEST_THREAD).commandKey).not.toBe(key)
+    }
+    const aliasPath = join(rig.root, 'same-account-copy', `copy_${HOST_TEST_THREAD}.jsonl`)
+    await mkdir(join(rig.root, 'same-account-copy'))
+    await writeFile(aliasPath, transcript)
+    const duplicate = createTestParams(undefined, {
+      ...identity,
+      agent: 'pi',
+      envelope: { ...createTestParams().envelope, sessionId: 'pi-duplicate' },
+      adopt: {
+        providerHandle: { transport: 'jsonl-rpc', agent: 'pi', nativeId: aliasPath },
+        transcriptPath: aliasPath
+      }
+    })
+    expect(await piRig.host.create({ callerKey: 'setup' }, duplicate)).toMatchObject({
+      ok: false,
+      refusal: { code: 'agent_session_conflict', details: { reason: 'conversationHeldElsewhere' } }
+    })
+    expect(piRig.store.listRecords()).toHaveLength(4)
+  } finally {
+    await piRig.dispose()
+  }
+})
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-preparation.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-preparation.ts
new file mode 100644
index 000000000000..0464c7b7c927
--- /dev/null
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-preparation.ts
@@ -0,0 +1,97 @@
+import type { StructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-host'
+import type { z } from 'zod'
+import type { RpcContext } from '../core'
+import type { SwitchToChatParams, SwitchToTerminalParams } from './structured-agent-session-schemas'
+import { agentSessionRefusalError } from '../../../../shared/agent-session-wire-refusals'
+import {
+  ensureStructuredHostInstalled,
+  requireStructuredSessionHost,
+  requireStructuredHost,
+  structuredCallerFor
+} from './structured-agent-session-gate'
+import { inPlaceSwitchEnabled } from '../../../../shared/structured-agent-cli-conversation-adoption'
+import {
+  switchRetainedOwner,
+  switchConversationIdentity
+} from './structured-agent-session-switch-source'
+import { captureStructuredAgentCliSource } from '../../../native-chat/structured-agent-cli-source'
+import { agentSessionProviderHandleChainHead } from '../../../../shared/agent-session-provider-handle'
+import { structuredAgentRuntimeMetadata } from '../../structured-agent-runtime-metadata'
+import type { AgentSessionSwitchDeadline } from '../../../../shared/agent-session-switch-execution'
+export async function prepareStructuredSessionSwitch(
+  params: z.infer<typeof SwitchToChatParams> | z.infer<typeof SwitchToTerminalParams>,
+  ctx: RpcContext,
+  sessionId: string,
+  deadline: AgentSessionSwitchDeadline
+) {
+  await ensureStructuredHostInstalled(ctx)
+  deadline.check()
+  const execution = params.execution
+  if (!execution) {
+    throw agentSessionRefusalError('agent_session_operation_invalid', {
+      reason: 'requestMalformed'
+    })
+  }
+  const create = 'create' in execution ? execution.create : undefined
+  const host = create
+    ? requireStructuredHost(ctx, create.agent)
+    : requireStructuredSessionHost(ctx, sessionId)
+  if (
+    create &&
+    (create.envelope.sessionId !== params.sessionId || !inPlaceSwitchEnabled(create.agent))
+  ) {
+    throw agentSessionRefusalError('agent_session_operation_invalid', {
+      reason: 'requestMalformed'
+    })
+  }
+  const sourceEvidence =
+    ctx.structuredAgentCliSourceEvidence ??
+    (create?.resumeFrom?.cliSource
+      ? captureStructuredAgentCliSource(() => ctx.runtime.getAgentProviderSessionRows())
+      : undefined)
+  const createIdentity = create
+    ? await ctx.runtime.resolveStructuredAgentSessionCreateIdentity({
+        ...create,
+        callerKey: structuredCallerFor(ctx).callerKey,
+        structuredAgentCliSourceEvidence: sourceEvidence
+      })
+    : undefined
+  const identity = createIdentity ?? host.deps.store.getRecord(sessionId)
+  const providerSessionId =
+    create?.resumeFrom?.providerSessionId ??
+    (() => {
+      const record = host.deps.store.getRecord(sessionId)
+      const head = record && agentSessionProviderHandleChainHead(record.providerHandleChain)
+      return (
+        head && structuredAgentRuntimeMetadata(record!.provider)?.sessionHistory?.rowSessionId(head)
+      )
+    })()
+  const conversation =
+    identity && providerSessionId
+      ? switchConversationIdentity(identity, providerSessionId)
+      : undefined
+  if (create && identity && providerSessionId) {
+    sessionId = switchRetainedOwner(host, identity, providerSessionId) ?? sessionId
+  }
+
+  return {
+    sessionId,
+    host,
+    execution,
+    create,
+    sourceEvidence,
+    createIdentity,
+    providerSessionId,
+    conversation
+  }
+}
+
+export function requireStructuredSwitchRecord(host: StructuredAgentSessionHost, sessionId: string) {
+  const record = host.deps.store.getRecord(sessionId)
+  if (!record || !inPlaceSwitchEnabled(record.provider)) {
+    throw agentSessionRefusalError('structured_agent_session_unsupported', {
+      reason: 'hostUnsupported'
+    })
+  }
+  return record
+}
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-retention.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-retention.ts
new file mode 100644
index 000000000000..be4da359ad14
--- /dev/null
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-retention.ts
@@ -0,0 +1,28 @@
+import type { RpcContext } from '../core'
+import { recordWorkspace } from './structured-agent-session-switch-source'
+import type { StructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-host'
+export async function retainStructuredSwitchSource(
+  runtime: RpcContext['runtime'],
+  host: StructuredAgentSessionHost,
+  sessionId: string,
+  invocationId: string,
+  check: () => void
+): Promise<void> {
+  if (!host.deps.store.getRecord(sessionId)) {
+    return
+  }
+  check()
+  const revealed = await host.revealSession(sessionId)
+  check()
+  await runtime.publishStructuredAgentSessionTab({
+    ...revealed,
+    activate: false,
+    check
+  })
+  runtime.retainSessionSwitchProjection(
+    recordWorkspace(host, sessionId),
+    sessionId,
+    invocationId,
+    host.switchGeneration(sessionId) ?? invocationId
+  )
+}
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-source.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-source.ts
index fb3d8b678abb..8b4981122181 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-source.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-source.ts
@@ -1,36 +1,15 @@
-import { agentSessionProviderHandleChainHead } from '../../../../shared/agent-session-provider-handle'
 import type { StructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-host'
-import type { z } from 'zod'
-import type { RpcContext } from '../core'
 
-import type { SwitchToChatParams } from './structured-agent-session-schemas'
-import type { agentSessionSwitchDeadline } from '../../../../shared/agent-session-switch-execution'
 import { agentSessionRefusalError } from '../../../../shared/agent-session-wire-refusals'
 
-import type { AgentSessionWireRefusal } from '../../../../shared/agent-session-wire'
-
-/** The switch alone owns this captured-shell cleanup; ordinary Close keeps its semantics. */
-export async function cleanupSwitchedSourceShell(
-  ctx: RpcContext,
-  source: NonNullable<NonNullable<z.infer<typeof SwitchToChatParams>['execution']>['source']>,
-  witness: string | undefined,
-  witnessBudget: number,
-  deadline: ReturnType<typeof agentSessionSwitchDeadline>
-): Promise<boolean> {
-  try {
-    deadline.check()
-    if (!witness) {
-      return false
-    }
-    return await ctx.runtime.closeSwitchedSourceTerminal(
-      source.terminal,
-      source.expectedIncarnationId,
-      { token: witness, remainingMs: witnessBudget }
-    )
-  } catch {
-    return false
-  }
-}
+import type { AgentSessionAttachParams } from '../../../native-chat/agent-session-wire/structured-agent-session-attach'
+import { listStructuredProviderSessionOwnership } from '../../../native-chat/agent-session-wire/structured-provider-session-ownership'
+import {
+  conversationKeyId,
+  keysMayMatch,
+  terminalConversationKey
+} from '../../../native-chat/structured-conversation-key'
+import { canonicalAgentSessionDigest } from '../../../../shared/agent-session-mutation-envelope'
 
 export function recordWorkspace(host: StructuredAgentSessionHost, id: string) {
   const record = host.deps.store.getRecord(id)
@@ -40,28 +19,41 @@ export function recordWorkspace(host: StructuredAgentSessionHost, id: string) {
   return record.location.workspaceId
 }
 
+/** Registered History IDs include file-backed agents; account and host remain part of identity. */
+export function switchConversationIdentity(
+  identity: Pick<AgentSessionAttachParams, 'provider' | 'accountHome' | 'location'>,
+  providerSessionId: string
+) {
+  const key = {
+    ...terminalConversationKey(identity.provider, providerSessionId),
+    home: identity.accountHome
+  }
+  return {
+    key,
+    commandKey: `conversation:${canonicalAgentSessionDigest({
+      conversation: { ...key, id: conversationKeyId(key) },
+      executionHostId: identity.location.executionHostId,
+      wslDistro: identity.location.wslDistro
+    })}`
+  }
+}
+
 export function switchRetainedOwner(
   host: StructuredAgentSessionHost,
-  create: NonNullable<NonNullable<z.infer<typeof SwitchToChatParams>['execution']>['create']>,
-  refusal: AgentSessionWireRefusal
+  identity: Pick<AgentSessionAttachParams, 'provider' | 'accountHome' | 'location'>,
+  providerSessionId: string
 ): string | null {
-  if (
-    refusal.code !== 'agent_session_conflict' &&
-    refusal.code !== 'agent_session_ownership_unknown'
-  ) {
-    return null
-  }
-  const owner = refusal.details?.owner
-  if (!owner || !create.resumeFrom?.providerSessionId) {
-    return null
-  }
-  const record = host.deps.store.getRecord(owner.sessionId)
-  const head = record && agentSessionProviderHandleChainHead(record.providerHandleChain)
-  return record?.provider === create.agent &&
-    head?.handle.nativeId === create.resumeFrom.providerSessionId &&
-    record.location.executionHostId === 'local' &&
-    !record.location.wslDistro &&
-    owner.workspaceId === record.location.workspaceId
-    ? owner.sessionId
-    : null
+  const { key } = switchConversationIdentity(identity, providerSessionId)
+  return (
+    listStructuredProviderSessionOwnership(host.deps.store.listConversations()).find((owner) => {
+      const record = host.deps.store.getRecord(owner.sessionId)
+      return (
+        owner.role === 'head' &&
+        keysMayMatch(owner.key, key) &&
+        record &&
+        record.location.executionHostId === identity.location.executionHostId &&
+        record.location.wslDistro === identity.location.wslDistro
+      )
+    })?.sessionId ?? null
+  )
 }
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts
index 2a7d278f66af..ac2bcfd1121d 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts
@@ -22,16 +22,17 @@ export async function executeStructuredSessionTerminalSwitch(
   host: StructuredAgentSessionHost,
   sessionId: string,
   deadline: ReturnType<typeof agentSessionSwitchDeadline>,
-  workCurrent: () => boolean,
-  execution: NonNullable<z.infer<typeof SwitchToTerminalParams>['execution']>
+  execution: NonNullable<z.infer<typeof SwitchToTerminalParams>['execution']>,
+  selectionCurrent: () => boolean
 ): Promise<AgentSessionSwitchResult> {
   const terminalExecution = SwitchToTerminalParams.parse(params).execution
   const sourceTabId = terminalExecution?.sourceTabId
+  let workCurrent = () => false
   const retire = ctx.runtime.captureSessionSwitchRetirement(
     record.location.workspaceId,
     sessionId,
     sourceTabId,
-    workCurrent,
+    () => workCurrent(),
     () => host.retainSwitch(sessionId),
     {
       invocationId: execution.invocationId,
@@ -41,6 +42,12 @@ export async function executeStructuredSessionTerminalSwitch(
       phase: 'prepare'
     }
   )
+  workCurrent = await host.stopForSwitch(
+    sessionId,
+    { callerKey: 'trusted-local:session-switch' },
+    deadline
+  )
+  host.guardSwitchWork(sessionId, workCurrent)
   const snapshot = await host.journalSnapshot(sessionId)
   deadline.check()
   const content = nativeConversationContent(snapshot)
@@ -66,11 +73,11 @@ export async function executeStructuredSessionTerminalSwitch(
       reason: 'transcriptNotFound'
     })
   }
-  await host.switchToTerminal(sessionId, deadline)
   deadline.check()
   const terminal = await ctx.runtime.createSessionSwitchTerminal(record.location.workspaceId, {
     invocationId: execution.invocationId,
     sessionId,
+    agent: record.provider,
     source: prepared?.cliForkSource,
     commandOverride: terminalExecution?.commandOverride,
     options: record.options,
@@ -79,7 +86,7 @@ export async function executeStructuredSessionTerminalSwitch(
     execution: {
       invocationId: execution.invocationId,
       signal: deadline.signal,
-      trackPhysical: (work) => host.trackSwitchPhysical(sessionId, work),
+      trackPhysical: (work, recover) => host.trackSwitchPhysical(sessionId, work, recover),
       remaining: deadline.remaining,
       check: () => {
         deadline.check()
@@ -89,14 +96,9 @@ export async function executeStructuredSessionTerminalSwitch(
           })
         }
       },
-      viewer: agentLaunchTabViewerRule(ctx, 'focused'),
-      shown: (pane) =>
-        host.presentSwitch(sessionId, {
-          ...pane,
-          surface: 'terminal',
-          sessionId,
-          agent: 'codex'
-        })
+      selectionCurrent,
+      viewerSelection: execution.viewerSelection,
+      viewer: agentLaunchTabViewerRule(ctx, 'focused')
     }
   })
   if (terminal.agentResumeRefused || terminal.agentResumeUnavailable) {
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-to-terminal.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-to-terminal.ts
index 6577bfe916c6..704d148ad42c 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-to-terminal.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-to-terminal.ts
@@ -14,7 +14,7 @@ import {
 } from './structured-agent-session-gate'
 import { SwitchToTerminalParams } from './structured-agent-session-schemas'
 
-// Prepare the ordinary same-id resume recipe before the ordered idle-only, proven-exit stop.
+// Prepare the ordinary same-id resume recipe, then join Stop and positive physical exit.
 
 export const STRUCTURED_AGENT_SESSION_SWITCH_TO_TERMINAL_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/runtime-notifier-contract.ts b/src/main/runtime/runtime-notifier-contract.ts
index 30c6ce3d2c88..52a7251ff298 100644
--- a/src/main/runtime/runtime-notifier-contract.ts
+++ b/src/main/runtime/runtime-notifier-contract.ts
@@ -132,7 +132,7 @@ export type RuntimeNotifier = {
   focusTerminal(tabId: string, worktreeId: string, leafId?: string | null): void
   /** Raises the window onto a pane it shows; resolves false when the window does not know the worktree. */
   revealTerminalPane?(target: TerminalPaneRevealTarget): Promise<boolean>
-  focusEditorTab?(tabId: string, worktreeId: string): void
+  focusEditorTab?(tabId: string, worktreeId: string, viewerSelection?: string): void
   closeSessionTab?(
     tabId: string,
     worktreeId: string,
diff --git a/src/main/runtime/session-tabs/explicit-terminal-close-stops.ts b/src/main/runtime/session-tabs/explicit-terminal-close-stops.ts
index f782fda6d126..197d662ff346 100644
--- a/src/main/runtime/session-tabs/explicit-terminal-close-stops.ts
+++ b/src/main/runtime/session-tabs/explicit-terminal-close-stops.ts
@@ -1,10 +1,6 @@
-import { windowListsTab } from '../terminal/surface/main-terminal-surfaces'
-import { isOriginalTerminalHandle } from '../workspace-session-terminal-tab-retirement-identity'
+import { OrcaRuntimeWithTerminalSwitchCloseCapture } from './terminal-switch-close-capture'
 import { NO_STOP } from './explicit-terminal-close-pty-stops'
-import {
-  matchesTerminalSurfaceCapture,
-  type TerminalSurfaceCloseCapture
-} from '../../../shared/terminal-tab-close'
+import type { TerminalSurfaceCloseCapture } from '../../../shared/terminal-tab-close'
 import type { WorktreePtyHostFence } from '../worktree-pty-host-fence'
 import type { RuntimeTerminalClose } from '../../../shared/runtime-types'
 import type { RuntimePtyTabCloseAuthority } from '../runtime-terminal-state-records'
@@ -14,14 +10,12 @@ import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../shared/layout-owner-switch'
 import type { LayoutApplyReply } from '../../../shared/workspace-layout/workspace-layout-command-types'
 import type { WindowLayoutCommand } from '../runtime-layout-apply'
 import { closeMainOwnedPaneByHandle } from './main-handle-close'
-import { OrcaRuntimeWithExplicitTerminalTabClose } from './explicit-terminal-tab-close'
 import {
   closeTerminalOnPairedHost,
   getPairedHostTerminal,
   isTerminalTabPinnedInSession
 } from './paired-host-terminal-close'
-
-export abstract class OrcaRuntimeWithStopExplicitlyClosedTabPtys extends OrcaRuntimeWithExplicitTerminalTabClose {
+export abstract class OrcaRuntimeWithStopExplicitlyClosedTabPtys extends OrcaRuntimeWithTerminalSwitchCloseCapture {
   protected abstract getResolvedWorktreeMap(): Promise<Map<string, ResolvedWorktree>>
   abstract applyLayoutCommand(command: WindowLayoutCommand): Promise<LayoutApplyReply>
   protected abstract refreshPtyWorktreeRecordsFromController(
@@ -75,63 +69,36 @@ export abstract class OrcaRuntimeWithStopExplicitlyClosedTabPtys extends OrcaRun
         )
         return { handle, tabId: leaf.tabId, ...close }
       }
-      const source = originalPresentation.identity
-      const record = this.handles.get(handle)
-      const currentPty = source.ptyId ? this.ptysById.get(source.ptyId) : null
-      const leaf = this.leaves.get(this.getLeafKey(source.tabId, source.leafId))
-      if (
-        !source.ptyId ||
-        !incarnation ||
-        !isOriginalTerminalHandle({
-          runtimeId: this.runtimeId,
-          record,
-          currentPty,
-          paneOfPty: (current) => this.paneOfPty(current),
-          leaf,
-          source,
-          incarnation
-        }) ||
-        !matchesTerminalSurfaceCapture(
-          originalPresentation,
-          this.getWorkspaceSessionHostIdsForTab(source.worktreeId, source.tabId),
-          (hostId) => this.store?.getWorkspaceSession?.(hostId)
-        )
-      ) {
-        throw new Error('terminal_handle_stale')
-      }
-      const target = { kind: 'pane' as const, tabId: source.tabId, leafId: source.leafId }
-      const rendererOwnsPresentation = windowListsTab(this, this.tabs, source.tabId)
-      const proof = {
-        parentTabId: source.tabId,
-        leafId: source.leafId,
-        ptyId: source.ptyId,
-        terminal: handle,
-        incarnationId: incarnation
+      const captured = this.captureTerminalSwitchClose(
+        handle,
+        incarnation ?? '',
+        originalPresentation,
+        false
+      )
+      const target = {
+        kind: 'pane' as const,
+        tabId: originalPresentation.identity.tabId,
+        leafId: originalPresentation.identity.leafId
       }
       if (
-        this.resolveTerminalCloseTarget(source.worktreeId, target) === 'last-pane' &&
-        this.getWorkspaceSessionHostIdsForTab(source.worktreeId, source.tabId).some((hostId) =>
-          isTerminalTabPinnedInSession(this.store?.getWorkspaceSession?.(hostId), source)
+        this.resolveTerminalCloseTarget(originalPresentation.identity.worktreeId, target) ===
+          'last-pane' &&
+        this.getWorkspaceSessionHostIdsForTab(
+          originalPresentation.identity.worktreeId,
+          target.tabId
+        ).some((id) =>
+          isTerminalTabPinnedInSession(
+            this.store?.getWorkspaceSession?.(id),
+            originalPresentation.identity
+          )
         )
       ) {
         throw new Error('terminal_tab_pinned')
       }
-      const stop = await this.stopExplicitlyClosedTabPtys([source.ptyId], source.ptyId, incarnation)
-      if (!stop.stopped) {
-        throw new Error('terminal_close_unverifiable')
-      }
-      const outcome = await this.closeMobileSessionTab(`id:${source.worktreeId}`, source.tabId, {
-        originalPresentation,
-        rendererOwnsPresentation,
-        localPtyTeardownOwnedExternally: true,
-        retirementProofs: [proof]
-      })
-      if (outcome.refused) {
-        throw new Error('terminal_pane_close_failed')
-      }
-      this.claudeAgentTeams.removeTeamForLeaderHandle(handle)
-      return this.describeTerminalClose(handle, source.tabId, source.ptyId, stop)
+      await captured.stop()
+      return captured.retire()
     }
+
     if (incarnation && pty?.pty.incarnationId !== incarnation) {
       throw new Error('terminal_handle_stale')
     }
diff --git a/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.ts b/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.ts
index 52655006efb4..b6ecc1f38dc2 100644
--- a/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.ts
+++ b/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.ts
@@ -63,7 +63,8 @@ export abstract class OrcaRuntimeWithMainLayoutAgentLaunchTabs extends OrcaRunti
   /** The launch's tab in main's layout; null for a workspace main does not own (today's path). */
   publishAgentLaunchTabInMainLayout(
     request: Omit<AgentLaunchTabPublishRequest, 'requestId'>,
-    check?: () => void
+    check?: () => void,
+    selectionCurrent?: () => boolean
   ): Promise<AgentLaunchTabPublished> | null {
     const { worktreeId, tabId, leafId, placement } = request
     if (!this.ownsLaunchTab(worktreeId, tabId)) {
@@ -103,7 +104,10 @@ export abstract class OrcaRuntimeWithMainLayoutAgentLaunchTabs extends OrcaRunti
       if (!landed) {
         throw new Error('agent_launch_tab_unplaced')
       }
-      this.showLaunchTabInWindow(request, { frameSeq: reply.frameSeq, created: !existed })
+      this.showLaunchTabInWindow(
+        { ...request, viewer: (selectionCurrent?.() ?? true) ? request.viewer : 'none' },
+        { frameSeq: reply.frameSeq, created: !existed }
+      )
       // A retry naming the same tab finds it: the launch made no tab, so it takes none back.
       if (existed) {
         return { tabId, created: false, placement: { groupId: landed } }
diff --git a/src/main/runtime/session-tabs/structured-session-account-home.ts b/src/main/runtime/session-tabs/structured-session-account-home.ts
index 99484b2a3dca..68360f4bf41e 100644
--- a/src/main/runtime/session-tabs/structured-session-account-home.ts
+++ b/src/main/runtime/session-tabs/structured-session-account-home.ts
@@ -1,8 +1,9 @@
+import { agentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
+import { structuredLaunchSeedOptions } from '../../../shared/native-chat/input/native-chat-session-option-defaults'
 import type { StructuredAgentId } from '../../../shared/agent-session-provider-handle'
 import { structuredAgentRuntimeMetadata } from '../structured-agent-runtime-metadata'
 import { getProfileUserDataPath } from '../../orca-profiles/profile-storage-paths'
 import { OrcaRuntimeWithStructuredSessionCliWriterHost } from './structured-session-cli-writer-host'
-
 export abstract class OrcaRuntimeWithStructuredSessionAccountHome extends OrcaRuntimeWithStructuredSessionCliWriterHost {
   /** Resolve account home through this host's agent registration; null means unregistered and create refuses. */
   protected structuredAgentAccountHomeResolver(
@@ -38,4 +39,20 @@ export abstract class OrcaRuntimeWithStructuredSessionAccountHome extends OrcaRu
         }
       )
   }
+
+  protected requireRegisteredStructuredAgent(agent: StructuredAgentId) {
+    const definition = structuredAgentRuntimeMetadata(agent)?.definition
+    if (!definition) {
+      throw agentSessionRefusalError('structured_agent_session_unsupported', {
+        reason: 'hostUnsupported'
+      })
+    }
+    return definition
+  }
+
+  structuredAgentSessionLaunchSeedOptions(
+    agent: StructuredAgentId
+  ): Record<string, string> | undefined {
+    return structuredLaunchSeedOptions(this.requireStore().getSettings(), agent)
+  }
 }
diff --git a/src/main/runtime/session-tabs/structured-session-create-support.ts b/src/main/runtime/session-tabs/structured-session-create-support.ts
index 4917d6f8aaad..276adbfeff6b 100644
--- a/src/main/runtime/session-tabs/structured-session-create-support.ts
+++ b/src/main/runtime/session-tabs/structured-session-create-support.ts
@@ -22,7 +22,6 @@ import {
 } from '../structured-agent-launch-support'
 import { structuredAgentRuntimeMetadata } from '../structured-agent-runtime-metadata'
 import { structuredAgentChatProgramNeedsInstall } from '../structured-agent-availability'
-import { structuredLaunchSeedOptions } from '../../../shared/native-chat/input/native-chat-session-option-defaults'
 import { hasPersistedStructuredAgentSessionStore as hasPersistedStructuredAgentSessionStoreOnDisk } from '../structured-agent-session-runtime'
 import { ensureStructuredAgentSessionHostUnlessRefused } from '../structured-agent-session-host-refusal'
 import { getProfileUserDataPath } from '../../orca-profiles/profile-storage-paths'
@@ -34,7 +33,6 @@ import {
 import { parseWorkspaceKey } from '../../../shared/workspace-scope'
 import type { AgentSessionAccountHome } from '../../../shared/agent-session-account-home'
 import type { StructuredAgentId } from '../../../shared/agent-session-provider-handle'
-
 export abstract class OrcaRuntimeWithGetStructuredAgentSessionCreateSupport extends OrcaRuntimeWithStructuredSessionAccountHome {
   protected abstract restoreStructuredAgentSessionTabsOnce(
     ...args: Parameters<
@@ -67,22 +65,8 @@ export abstract class OrcaRuntimeWithGetStructuredAgentSessionCreateSupport exte
   }
 
   /** Use this runtime's registered definition to pin account home; reads/create must not install the host just to inspect it. */
-  protected requireRegisteredStructuredAgent(agent: StructuredAgentId) {
-    const definition = structuredAgentRuntimeMetadata(agent)?.definition
-    if (!definition) {
-      throw agentSessionRefusalError('structured_agent_session_unsupported', {
-        reason: 'hostUnsupported'
-      })
-    }
-    return definition
-  }
 
   /** Share new-chat selection between create and createSupport so client pickers show what create will run. */
-  structuredAgentSessionLaunchSeedOptions(
-    agent: StructuredAgentId
-  ): Record<string, string> | undefined {
-    return structuredLaunchSeedOptions(this.requireStore().getSettings(), agent)
-  }
 
   protected async resolveStructuredAgentSessionLocation(worktreeSelector: string) {
     const target = await this.resolveRuntimeFileTarget(worktreeSelector)
@@ -123,25 +107,29 @@ export abstract class OrcaRuntimeWithGetStructuredAgentSessionCreateSupport exte
   async resolveStructuredAgentSessionCreateIntent(
     input: StructuredAgentSessionCreateIntentInput
   ): Promise<AgentSessionAttachParams & { hostLaunchDirectory?: string }> {
-    if (input.resumeFrom) {
-      const { providerSessionId, cliSource } = input.resumeFrom
-      try {
-        requireUnownedStructuredAgentSessionAdoption({
-          host: getStructuredAgentSessionHost(),
-          agent: input.agent,
-          providerSessionId,
-          selfSessionId: input.envelope.sessionId
-        })
-      } catch (ownerConflict) {
-        // Refuse transfer from a live terminal or the chat's first send starts a second writer.
-        await this.assertStructuredAdoptionTerminalWritersExited(
-          input.agent,
-          providerSessionId,
-          cliSource
-        )
-        throw ownerConflict
-      }
+    const resolved = await this.resolveStructuredAgentSessionCreateIdentity(input, 'launch')
+    const replay = resolveCommittedStructuredAgentSessionAdoptionIntent({
+      host: getStructuredAgentSessionHost(),
+      ...input,
+      location: resolved.location
+    })
+    if (input.resumeFrom && !replay) {
+      requireUnownedStructuredAgentSessionAdoption({
+        host: getStructuredAgentSessionHost(),
+        agent: input.agent,
+        providerSessionId: input.resumeFrom.providerSessionId,
+        selfSessionId: input.envelope.sessionId,
+        identity: resolved
+      })
     }
+    return resolved
+  }
+
+  /** Resolve registered account/transcript identity without acquiring or admitting a writer. */
+  async resolveStructuredAgentSessionCreateIdentity(
+    input: StructuredAgentSessionCreateIntentInput,
+    purpose: 'read' | 'launch' = 'read'
+  ): Promise<AgentSessionAttachParams & { hostLaunchDirectory?: string }> {
     const structuredAgentCliSourceEvidence =
       input.structuredAgentCliSourceEvidence ??
       (input.resumeFrom?.cliSource
@@ -153,7 +141,7 @@ export abstract class OrcaRuntimeWithGetStructuredAgentSessionCreateSupport exte
     const resolveAccountHome = this.structuredAgentAccountHomeResolver(
       input.agent,
       input.worktree,
-      'launch',
+      purpose,
       hostLaunchDirectory
     )
     if (!resolveAccountHome) {
@@ -163,7 +151,8 @@ export abstract class OrcaRuntimeWithGetStructuredAgentSessionCreateSupport exte
     }
     const resolved = await this.resolveStructuredAgentSessionIntent(
       { ...input, structuredAgentCliSourceEvidence },
-      resolveAccountHome
+      resolveAccountHome,
+      purpose
     )
     return hostLaunchDirectory ? { ...resolved, hostLaunchDirectory } : resolved
   }
@@ -192,7 +181,8 @@ export abstract class OrcaRuntimeWithGetStructuredAgentSessionCreateSupport exte
         workspaceId: string
         workspaceKind: 'folder' | 'git-worktree'
       }
-    }) => AgentSessionAccountHome | Promise<AgentSessionAccountHome>
+    }) => AgentSessionAccountHome | Promise<AgentSessionAccountHome>,
+    purpose: 'read' | 'launch' = 'launch'
   ): Promise<AgentSessionAttachParams> {
     const support = await this.getStructuredAgentSessionCreateSupport(input.worktree, input.agent)
     // Adopting a conversation reads the agent's own transcript, so only an agent registered with an
@@ -219,7 +209,7 @@ export abstract class OrcaRuntimeWithGetStructuredAgentSessionCreateSupport exte
       return committedReplay
     }
     const resumeFrom = input.resumeFrom
-    if (resumeFrom) {
+    if (purpose === 'launch' && resumeFrom) {
       await this.assertStructuredAdoptionTerminalWritersExited(
         input.agent,
         resumeFrom.providerSessionId,
@@ -245,7 +235,8 @@ export abstract class OrcaRuntimeWithGetStructuredAgentSessionCreateSupport exte
                 workspaceId: location.workspaceId,
                 evidence: input.structuredAgentCliSourceEvidence
               }),
-            prepareCodexResume: this.prepareAiVaultSessionResumeFn ?? undefined,
+            prepareCodexResume:
+              purpose === 'launch' ? (this.prepareAiVaultSessionResumeFn ?? undefined) : undefined,
             selectedAccountHome,
             launchEnv: await resolveHostStructuredAgentLaunchEnvironment(input.agent, settings),
             workspaceCwd: workspaceCwd
diff --git a/src/main/runtime/session-tabs/structured-session-launch-runtime.ts b/src/main/runtime/session-tabs/structured-session-launch-runtime.ts
index c1bfae7f1ff7..74ae6c2a8f7e 100644
--- a/src/main/runtime/session-tabs/structured-session-launch-runtime.ts
+++ b/src/main/runtime/session-tabs/structured-session-launch-runtime.ts
@@ -23,25 +23,6 @@ import type {
 } from '../../providers/pty-process-inspection'
 
 export abstract class OrcaRuntimeWithStructuredSessionLaunchRuntime extends OrcaRuntimeWithGetStructuredAgentSessionCreateSupport {
-  async closeSwitchedSourceTerminal(
-    terminal: string,
-    expectedIncarnationId: string,
-    condition: { token: string; remainingMs: number }
-  ): Promise<boolean> {
-    const leaf = this.resolveLiveLeafForHandle(terminal)
-    if (!leaf?.ptyId || !this.ptyController?.killFenced) {
-      return false
-    }
-    const result = await this.ptyController.killFenced({
-      id: leaf.ptyId,
-      expectedIncarnationId,
-      requireNoAgentOwner: true,
-      requireUnattached: false,
-      switchCondition: condition
-    })
-    return result.outcome === 'ended' || result.outcome === 'already_exited'
-  }
-
   async inspectTerminalProcess(
     terminalSelector: string,
     options?: PtyProcessInspectionOptions
diff --git a/src/main/runtime/session-tabs/structured-session-switch-projection.ts b/src/main/runtime/session-tabs/structured-session-switch-projection.ts
index dfc88935e55e..84d2060e1ebd 100644
--- a/src/main/runtime/session-tabs/structured-session-switch-projection.ts
+++ b/src/main/runtime/session-tabs/structured-session-switch-projection.ts
@@ -161,17 +161,13 @@ export abstract class OrcaRuntimeWithStructuredSessionSwitchProjection extends O
         await restore()
         return false
       }
-      if (
-        !snapshot?.tabs.some((tab) => tab.type === 'agent-session' && tab.sessionId === sessionId)
-      ) {
-        return false
-      }
-      const next = retireStructuredAgentSessionTabFrom(snapshot, sessionId)
+      const next = snapshot && retireStructuredAgentSessionTabFrom(snapshot, sessionId)
       if (next) {
         this.storeMobileSessionSnapshot(worktreeId, next)
         this.emitMobileSessionTabsSnapshot(next)
       }
       announce('retire')
+      host.notifySessionTabHidden(sessionId)
       return true
     }
   }
diff --git a/src/main/runtime/session-tabs/structured-session-switch-publication.test.ts b/src/main/runtime/session-tabs/structured-session-switch-publication.test.ts
new file mode 100644
index 000000000000..9a6509eacb21
--- /dev/null
+++ b/src/main/runtime/session-tabs/structured-session-switch-publication.test.ts
@@ -0,0 +1,232 @@
+import { afterEach, expect, it, vi } from 'vitest'
+import {
+  setupMainOwnedWorkspace,
+  WORKTREE_ID,
+  TAB_ID,
+  LEAF_A,
+  PTY_A
+} from '../main-owned-workspace-runtime-fixture'
+import { chatTabCommandsSettled } from '../session-layout-apply.test-fixture'
+
+vi.mock('../../../shared/layout-owner-switch', () => ({ ORCA_LAYOUT_OWNER_IS_MAIN: true }))
+afterEach(() => vi.restoreAllMocks())
+
+it('selects a newly published or already listed chat through the real main layout and headless view', async () => {
+  const { runtime, session } = setupMainOwnedWorkspace()
+  const input = {
+    workspaceId: WORKTREE_ID,
+    sessionId: 'destination',
+    agent: 'codex' as const,
+    activate: true,
+    check: () => {},
+    placement: { afterTabId: TAB_ID }
+  }
+  for (let repeat = 0; repeat < 2; repeat++) {
+    await runtime.publishStructuredAgentSessionTab(input)
+    await chatTabCommandsSettled()
+    const snapshot = await runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)
+    expect(snapshot.activeTabId).toBe('agent-session:destination')
+    const group = session().tabGroups?.[WORKTREE_ID]?.find((row) =>
+      row.tabOrder.includes('agent-session:destination')
+    )
+    expect(group?.activeTabId).toBe('agent-session:destination')
+    expect(group?.tabOrder).toEqual([TAB_ID, 'agent-session:destination'])
+  }
+})
+
+it('publishes readable history while a queued main write preserves newer navigation', async () => {
+  const { runtime } = setupMainOwnedWorkspace()
+  await runtime.publishStructuredAgentSessionTab({
+    workspaceId: WORKTREE_ID,
+    sessionId: 'current-chat',
+    agent: 'codex',
+    activate: true,
+    check: () => {}
+  })
+  const selectionCurrent = runtime.captureSessionSwitchSelection(WORKTREE_ID)
+  const entered = Promise.withResolvers<void>()
+  const release = Promise.withResolvers<void>()
+  const original = runtime.applyLayoutCommand.bind(runtime)
+  vi.spyOn(runtime, 'applyLayoutCommand').mockImplementation(async (...args) => {
+    entered.resolve()
+    await release.promise
+    return original(...args)
+  })
+  const publishing = runtime.publishStructuredAgentSessionTab({
+    workspaceId: WORKTREE_ID,
+    sessionId: 'destination',
+    agent: 'codex',
+    activate: true,
+    check: () => {},
+    selectionCurrent
+  })
+  await entered.promise
+  runtime.projectStructuredAgentSessionTab({
+    workspaceId: WORKTREE_ID,
+    sessionId: 'newer-chat',
+    agent: 'codex',
+    activate: true
+  })
+  release.resolve()
+  await publishing
+  const snapshot = await runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)
+  expect(
+    snapshot.tabs.some((tab) => tab.type === 'agent-session' && tab.sessionId === 'destination')
+  ).toBe(true)
+  expect(snapshot.activeTabId).toBe('agent-session:newer-chat')
+})
+
+it('keeps the captured source slot when natural-exit retirement reaches layout before publication', async () => {
+  const { runtime, session } = setupMainOwnedWorkspace()
+  const incarnationId = '11111111-1111-4111-8111-111111111111'
+  runtime.registerPty(PTY_A, WORKTREE_ID, null, { tabId: TAB_ID, leafId: LEAF_A, incarnationId })
+  await runtime.publishStructuredAgentSessionTab({
+    workspaceId: WORKTREE_ID,
+    sessionId: 'later-tab',
+    agent: 'codex',
+    activate: false,
+    check: () => {}
+  })
+  const source = runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_A}`, WORKTREE_ID)
+  if (!source.presentation) {
+    throw new Error('missing source')
+  }
+  const close = runtime.captureTerminalSwitchClose(
+    source.handle,
+    incarnationId,
+    source.presentation
+  )
+  await runtime.onPtyExit(PTY_A, 0, incarnationId, { hostExitConfirmed: true })
+  expect(
+    await runtime.applyLayoutCommand({
+      type: 'closeTabs',
+      workspace: WORKTREE_ID,
+      tabIds: [TAB_ID],
+      force: true
+    })
+  ).toMatchObject({ ok: true })
+  await close.stop()
+  await runtime.publishStructuredAgentSessionTab({
+    workspaceId: WORKTREE_ID,
+    sessionId: 'destination',
+    agent: 'codex',
+    activate: true,
+    check: () => {},
+    placement: close.placement()
+  })
+  const group = session().tabGroups?.[WORKTREE_ID]?.find((row) =>
+    row.tabOrder.includes('agent-session:destination')
+  )
+  expect(group?.tabOrder).toEqual(['agent-session:destination', 'agent-session:later-tab'])
+  expect(group?.activeTabId).toBe('agent-session:destination')
+})
+
+it.each(['none', 'publication', 'spawn'] as const)(
+  'keeps original selection through ordinary terminal publication and owned snapshot: navigation during %s',
+  async (navigation) => {
+    const { runtime, session, handleOf, bindPty } = setupMainOwnedWorkspace()
+    Object.assign(runtime, {
+      resolveTerminalWorkspaceLaunchScope: async () => ({
+        id: WORKTREE_ID,
+        path: '/workspace',
+        connectionId: null,
+        repo: null,
+        folderWorkspace: null
+      })
+    })
+    const selectionCurrent = runtime.captureSessionSwitchSelection(WORKTREE_ID)
+    const entered = Promise.withResolvers<void>()
+    const release = Promise.withResolvers<void>()
+    const apply = runtime.applyLayoutCommand.bind(runtime)
+    if (navigation === 'publication') {
+      vi.spyOn(runtime, 'applyLayoutCommand').mockImplementation(async (...args) => {
+        if (args[0].type === 'createTerminalTab') {
+          entered.resolve()
+          await release.promise
+        }
+        return apply(...args)
+      })
+    }
+    vi.spyOn(runtime, 'createTerminal').mockImplementation(async (_selector, opts = {}) => {
+      opts.beforePtySpawn?.()
+      opts.onPtySpawnDispatched?.({
+        launchAgent: 'codex',
+        ...(opts.launchConfig ? { launchConfig: opts.launchConfig } : {})
+      })
+      if (navigation === 'spawn') {
+        entered.resolve()
+        await release.promise
+      }
+      if (!opts.tabId || !opts.leafId) {
+        throw new Error('missing ordinary published identity')
+      }
+      bindPty({
+        worktreeId: WORKTREE_ID,
+        tabId: opts.tabId,
+        leafId: opts.leafId,
+        ptyId: 'destination-pty'
+      })
+      runtime.registerPty('destination-pty', WORKTREE_ID, null, {
+        tabId: opts.tabId,
+        leafId: opts.leafId,
+        terminalHandle: opts.preAllocatedHandle
+      })
+      return {
+        handle: handleOf('destination-pty'),
+        ptyId: 'destination-pty',
+        tabId: opts.tabId,
+        paneKey: `${opts.tabId}:${opts.leafId}`,
+        worktreeId: WORKTREE_ID,
+        title: null,
+        surface: 'background'
+      }
+    })
+    const operation = runtime.createMobileSessionTerminal(`id:${WORKTREE_ID}`, {
+      command: 'cx',
+      launchAgent: 'codex',
+      clientMutationId: `ordinary-${navigation}`,
+      switchExecution: {
+        invocationId: `ordinary-${navigation}`,
+        check: () => {},
+        signal: new AbortController().signal,
+        remaining: () => 60_000,
+        viewer: 'focus-in-workspace',
+        viewerSelection: 'original-viewer',
+        selectionCurrent
+      }
+    })
+    const settled = operation.then(
+      () => {},
+      () => {}
+    )
+    try {
+      if (navigation !== 'none') {
+        await Promise.race([
+          entered.promise,
+          operation.then(() => {
+            throw new Error('ordinary create settled before the held stage')
+          })
+        ])
+        runtime.projectStructuredAgentSessionTab({
+          workspaceId: WORKTREE_ID,
+          sessionId: 'later-navigation',
+          agent: 'codex',
+          activate: true
+        })
+      }
+    } finally {
+      release.resolve()
+      await settled
+    }
+    const result = await operation
+    const snapshot = await runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)
+    expect(snapshot.activeTabId).toBe(
+      navigation === 'none' ? result.tab.id : 'agent-session:later-navigation'
+    )
+    expect(
+      session().terminalLayoutsByTabId[result.tab.parentTabId!]?.ptyIdsByLeafId?.[
+        result.tab.leafId!
+      ]
+    ).toBe('destination-pty')
+  }
+)
diff --git a/src/main/runtime/session-tabs/structured-session-tab-restoration.ts b/src/main/runtime/session-tabs/structured-session-tab-restoration.ts
index dc2fd246b9d8..d21cb5f986ec 100644
--- a/src/main/runtime/session-tabs/structured-session-tab-restoration.ts
+++ b/src/main/runtime/session-tabs/structured-session-tab-restoration.ts
@@ -1,3 +1,4 @@
+import { withSelectedChatTab } from '../agent-session/agent-session-tab-layout'
 import type { OrcaRuntimeWithScheduleMobileSessionTabsChanged as ScheduleMobileSessionTabsChangedMethods } from './session-tabs-change-publication'
 import { defaultAgentChatLabel } from '../../../shared/agent-session/agent-session-chat-label'
 import { getStructuredAgentSessionHost } from '../../native-chat/agent-session-wire/structured-agent-session-registry'
@@ -76,12 +77,48 @@ export abstract class OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce exten
     }
   }
 
+  captureSessionSwitchSelection(worktreeId?: string): () => boolean {
+    const worktrees = worktreeId
+      ? [worktreeId]
+      : [
+          ...new Set([
+            ...this.getKnownWorkspaceSessionWorktreeIds(),
+            ...this.mobileSessionTabsByWorktree.keys()
+          ])
+        ].sort()
+    for (const id of worktrees) {
+      this.hydrateHeadlessMobileSessionTabsFromWorkspaceSession(id)
+    }
+    const read = () => {
+      return JSON.stringify(
+        worktrees.map((id) => {
+          const snapshot = this.mobileSessionTabsByWorktree.get(id)
+          const session = this.getWorkspaceSessionForWorktree(id)
+          return [
+            snapshot?.activeTabId,
+            snapshot?.activeGroupId,
+            session?.activeTabIdByWorktree?.[id],
+            session?.activeGroupIdByWorktree?.[id],
+            session?.tabGroups?.[id]
+              ?.filter((group) => group.activeTabId != null)
+              .map((group) => [group.id, group.activeTabId]) ?? []
+          ]
+        })
+      )
+    }
+    const captured = read()
+    return () => captured === read()
+  }
+
   async publishStructuredAgentSessionTab(input: {
     workspaceId: string
     sessionId: string
     agent: StructuredAgentId
     activate: boolean
     check?: () => void
+    selectionCurrent?: () => boolean
+    viewerSelection?: string
+    focusWindow?: boolean
     notify?: boolean
     /** The host tab id a create reserved; a session that already has a tab keeps its own. */
     tabId?: string
@@ -89,7 +126,7 @@ export abstract class OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce exten
     placedByWindow?: boolean
     /** Where the creating paired client opens the chat. */
     /** A ChatTabPlacement, typed in place: this file is at its line limit. */
-    placement?: { groupId?: string; afterTabId?: string }
+    placement?: { groupId?: string; afterTabId?: string; index?: number }
   }): Promise<void> {
     const host = getStructuredAgentSessionHost()
     input.check?.()
@@ -130,7 +167,34 @@ export abstract class OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce exten
       this.saveWindowlessAgentSessionTab(input.workspaceId, input)
     }
     input.check?.()
-    this.projectStructuredAgentSessionTab(input)
+    const activate = input.activate && (input.selectionCurrent?.() ?? true)
+    this.projectStructuredAgentSessionTab({ ...input, activate })
+    if (activate) {
+      input.check?.()
+      if (!this.getAvailableAuthoritativeWindow()) {
+        const session = this.getWorkspaceSessionForWorktree(input.workspaceId)
+        const next =
+          session &&
+          withSelectedChatTab(
+            this.getWorkspaceSessionHostIdForWorktree(input.workspaceId),
+            session,
+            input.workspaceId,
+            input.sessionId
+          )
+        if (next) {
+          this.setWorkspaceSessionForWorktree(input.workspaceId, next)
+        }
+      }
+      if (input.focusWindow !== false) {
+        this.notifier?.focusEditorTab?.(
+          input.tabId ??
+            host?.getSessionTabId(input.sessionId) ??
+            `agent-session:${input.sessionId}`,
+          input.workspaceId,
+          input.viewerSelection
+        )
+      }
+    }
   }
 
   /** The runtime's own snapshot of a chat tab. Records nothing: the caller owns the store write. */
diff --git a/src/main/runtime/session-tabs/structured-session-terminal-launch-retirement.ts b/src/main/runtime/session-tabs/structured-session-terminal-launch-retirement.ts
index 9e1e91db0c27..986c2aeff059 100644
--- a/src/main/runtime/session-tabs/structured-session-terminal-launch-retirement.ts
+++ b/src/main/runtime/session-tabs/structured-session-terminal-launch-retirement.ts
@@ -31,11 +31,11 @@ export async function retireChatForAdmittedTerminalLaunch(
   const holders = listStructuredProviderSessionOwnership(
     host.deps.store.listConversations()
   ).filter((holding) => holding.role === 'head' && keysMayMatch(holding.key, key))
-  for (const holding of holders) {
-    if (host.switchExecuting(holding.sessionId)) {
+  for (const sessionId of new Set(holders.map((holding) => holding.sessionId))) {
+    if (host.switchExecuting(sessionId)) {
       continue
     }
-    const record = host.deps.store.getRecord(holding.sessionId)
+    const record = host.deps.store.getRecord(sessionId)
     if (
       record?.location.executionHostId !== LOCAL_EXECUTION_HOST_ID ||
       record.location.workspaceId !== args.worktreeId
@@ -43,21 +43,21 @@ export async function retireChatForAdmittedTerminalLaunch(
       continue
     }
     try {
-      await host.setSessionTabVisibility(holding.sessionId, false)
+      await host.setSessionTabVisibility(sessionId, false)
     } catch (error) {
       // The terminal is admitted regardless of a failed visibility write; never stop another child.
       host.deps.logger.warn('recording a switched chat tab retirement failed', {
         scope: 'switch-tab-retirement',
-        sessionId: holding.sessionId,
+        sessionId: sessionId,
         error
       })
     }
     try {
-      runtime?.retireStructuredAgentSessionTabFromSnapshot(holding.sessionId)
+      runtime?.retireStructuredAgentSessionTabFromSnapshot(sessionId)
     } catch (error) {
       host.deps.logger.warn('publishing a switched chat tab retirement failed', {
         scope: 'switch-tab-retirement',
-        sessionId: holding.sessionId,
+        sessionId: sessionId,
         error
       })
     }
diff --git a/src/main/runtime/session-tabs/terminal-switch-close-capture.ts b/src/main/runtime/session-tabs/terminal-switch-close-capture.ts
new file mode 100644
index 000000000000..0109e787b194
--- /dev/null
+++ b/src/main/runtime/session-tabs/terminal-switch-close-capture.ts
@@ -0,0 +1,100 @@
+import { loadChatTabLayout, type ChatTabPlacement } from '../agent-session/agent-session-tab-layout'
+import { windowListsTab } from '../terminal/surface/main-terminal-surfaces'
+import { isOriginalTerminalHandle } from '../workspace-session-terminal-tab-retirement-identity'
+import {
+  matchesTerminalSurfaceCapture,
+  type TerminalSurfaceCloseCapture
+} from '../../../shared/terminal-tab-close'
+import { OrcaRuntimeWithExplicitTerminalTabClose } from './explicit-terminal-tab-close'
+export abstract class OrcaRuntimeWithTerminalSwitchCloseCapture extends OrcaRuntimeWithExplicitTerminalTabClose {
+  captureTerminalSwitchClose(
+    handle: string,
+    incarnation: string,
+    originalPresentation: TerminalSurfaceCloseCapture,
+    replacement = true
+  ) {
+    const source = originalPresentation.identity
+    const record = this.handles.get(handle)
+    const currentPty = source.ptyId ? this.ptysById.get(source.ptyId) : null
+    const leaf = this.leaves.get(this.getLeafKey(source.tabId, source.leafId))
+    if (
+      !source.ptyId ||
+      !incarnation ||
+      !isOriginalTerminalHandle({
+        runtimeId: this.runtimeId,
+        record,
+        currentPty,
+        paneOfPty: (current) => this.paneOfPty(current),
+        leaf,
+        source,
+        incarnation
+      }) ||
+      !matchesTerminalSurfaceCapture(
+        originalPresentation,
+        this.getWorkspaceSessionHostIdsForTab(source.worktreeId, source.tabId),
+        (hostId) => this.store?.getWorkspaceSession?.(hostId)
+      )
+    ) {
+      throw new Error('terminal_handle_stale')
+    }
+    const readPlacement = (): ChatTabPlacement | undefined => {
+      const session = this.getWorkspaceSessionForWorktree(source.worktreeId)
+      if (!session) {
+        return undefined
+      }
+      const { loaded } = loadChatTabLayout(
+        this.getWorkspaceSessionHostIdForWorktree(source.worktreeId),
+        session,
+        source.worktreeId
+      )
+      const group = loaded.layout.workspaces[source.worktreeId]?.groups.find((row) =>
+        row.tabOrder.includes(source.tabId)
+      )
+      return group
+        ? {
+            groupId: group.id,
+            afterTabId: source.tabId,
+            index: group.tabOrder.indexOf(source.tabId)
+          }
+        : undefined
+    }
+    const originalPlacement = readPlacement()
+    const addressedPty = source.ptyId
+    const rendererOwnsPresentation = windowListsTab(this, this.tabs, source.tabId)
+    const proof = {
+      parentTabId: source.tabId,
+      leafId: source.leafId,
+      ptyId: source.ptyId,
+      terminal: handle,
+      incarnationId: incarnation
+    }
+    return {
+      source,
+      placement: () => readPlacement() ?? originalPlacement,
+      stop: async () => {
+        const stop = await this.stopExplicitlyClosedTabPtys(
+          [addressedPty],
+          addressedPty,
+          incarnation
+        )
+        if (!stop.stopped) {
+          throw new Error('terminal_close_unverifiable')
+        }
+      },
+      retire: async () => {
+        const outcome = await this.closeMobileSessionTab(`id:${source.worktreeId}`, source.tabId, {
+          originalPresentation,
+          rendererOwnsPresentation,
+          localPtyTeardownOwnedExternally: true,
+          force: replacement,
+          retirementProofs: [proof]
+        })
+        if (outcome.refused) {
+          throw new Error('terminal_pane_close_failed')
+        }
+        this.claudeAgentTeams.removeTeamForLeaderHandle(handle)
+        return this.describeTerminalClose(handle, source.tabId, source.ptyId, { stopped: true })
+      }
+    }
+  }
+}
diff --git a/src/main/runtime/structured-agent-session-create-adoption.ts b/src/main/runtime/structured-agent-session-create-adoption.ts
index b7b6e7231581..92859d91a705 100644
--- a/src/main/runtime/structured-agent-session-create-adoption.ts
+++ b/src/main/runtime/structured-agent-session-create-adoption.ts
@@ -19,10 +19,10 @@ import type { StructuredAgentSessionHost } from '../native-chat/agent-session-wi
 import { listStructuredProviderSessionOwnership } from '../native-chat/agent-session-wire/structured-provider-session-ownership'
 import {
   findCommittedStructuredAgentSessionAdoptionReplay,
-  findConflictingStructuredAdoption,
   resolveStructuredAgentSessionAdoption,
   structuredAdoptionConflictError
 } from '../native-chat/structured-agent-session-history-adoption'
+import { keysMayMatch, terminalConversationKey } from '../native-chat/structured-conversation-key'
 import { structuredAgentRuntimeMetadata } from './structured-agent-runtime-metadata'
 import type {
   StructuredAgentTranscriptImport,
@@ -86,13 +86,33 @@ export function requireUnownedStructuredAgentSessionAdoption(input: {
   agent: StructuredAgentId
   providerSessionId: string
   selfSessionId: string
+  identity?: AgentSessionAttachParams
 }): void {
-  const conflict = input.host
-    ? findConflictingStructuredAdoption({
-        ...input,
-        ownership: listStructuredProviderSessionOwnership(input.host.deps.store.listConversations())
-      })
-    : null
+  const key = input.identity && {
+    ...terminalConversationKey(input.agent, input.providerSessionId),
+    home: input.identity.accountHome
+  }
+  const conflict =
+    input.host &&
+    listStructuredProviderSessionOwnership(input.host.deps.store.listConversations()).find(
+      (owner) => {
+        if (owner.sessionId === input.selfSessionId || owner.role !== 'head') {
+          return false
+        }
+        if (key && input.identity) {
+          const record = input.host?.deps.store.getRecord(owner.sessionId)
+          return (
+            keysMayMatch(owner.key, key) &&
+            record?.location.executionHostId === input.identity.location.executionHostId &&
+            record?.location.wslDistro === input.identity.location.wslDistro
+          )
+        }
+        return keysMayMatch(
+          owner.key,
+          terminalConversationKey(input.agent, input.providerSessionId)
+        )
+      }
+    )
   if (conflict) {
     throw structuredAdoptionConflictError(conflict)
   }
diff --git a/src/main/runtime/structured-agent-session-host-assembly.ts b/src/main/runtime/structured-agent-session-host-assembly.ts
index fe80ada9e1bb..08f81ad2c375 100644
--- a/src/main/runtime/structured-agent-session-host-assembly.ts
+++ b/src/main/runtime/structured-agent-session-host-assembly.ts
@@ -73,8 +73,10 @@ export async function installOnJournal(
     ...(deps.statusSink ? { statusSink: deps.statusSink } : {}),
     ...(deps.conversationNaming ? { conversationNaming: deps.conversationNaming } : {}),
     ...(deps.hasOpenDispatch ? { hasOpenDispatch: deps.hasOpenDispatch } : {}),
-    ...(deps.hasOwedSwitchWork ? { hasOwedSwitchWork: deps.hasOwedSwitchWork } : {}),
     ...(deps.startupLimits ? { startupLimits: deps.startupLimits } : {}),
+    ...(deps.captureSessionSwitchStop
+      ? { captureSessionSwitchStop: deps.captureSessionSwitchStop }
+      : {}),
     ...(deps.onSessionTabHidden ? { onSessionTabHidden: deps.onSessionTabHidden } : {}),
     ...(deps.assertNoTerminalWriter ? { assertNoTerminalWriter: deps.assertNoTerminalWriter } : {}),
     ...(await modelCatalogHostDeps({
diff --git a/src/main/runtime/structured-agent-session-runtime.ts b/src/main/runtime/structured-agent-session-runtime.ts
index 577cb4009761..b620b345c915 100644
--- a/src/main/runtime/structured-agent-session-runtime.ts
+++ b/src/main/runtime/structured-agent-session-runtime.ts
@@ -66,12 +66,12 @@ export type StructuredAgentSessionRuntimeDeps = StructuredAgentSessionTransportO
   conversationNaming?: StructuredAgentSessionHostDeps['conversationNaming']
   /** See `StructuredAgentSessionHostDeps.hasOpenDispatch`. */
   hasOpenDispatch?: StructuredAgentSessionHostDeps['hasOpenDispatch']
-  hasOwedSwitchWork?: StructuredAgentSessionHostDeps['hasOwedSwitchWork']
   resolveCodexAccountKind?: (home: string) => AgentSessionAccountKind | undefined
   /** Launch prep's sync for a probed home; see `CodexModelCatalogProbeDeps.prepareHome`. */
   prepareCodexCatalogProbeHome?: (homePath: string) => void
   /** See `StructuredAgentSessionHostDeps.onSessionTabHidden`. */
   onSessionTabHidden?: StructuredAgentSessionHostDeps['onSessionTabHidden']
+  captureSessionSwitchStop?: StructuredAgentSessionHostDeps['captureSessionSwitchStop']
   /** See `StructuredAgentSessionHostDeps.assertNoTerminalWriter`. */
   assertNoTerminalWriter?: StructuredAgentSessionHostDeps['assertNoTerminalWriter']
   /** Host-owned phone delivery and reconciliation from the current journal projection. */
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-create-options.ts b/src/main/runtime/terminal/launch/mobile-terminal-create-options.ts
index e9b2b3c59426..4f6f48799804 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-create-options.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-create-options.ts
@@ -37,12 +37,7 @@ export type MobileTerminalCreateOptions = {
   signal?: AbortSignal
   switchExecution?: AgentSessionSwitchAuthority & {
     afterTabId?: string
-    shown?: (pane: {
-      workspaceId: string
-      tabId: string
-      leafId: string
-      placement?: { groupId?: string; afterTabId?: string }
-    }) => Promise<void>
     viewer: AgentLaunchTabViewerRule
+    viewerSelection?: string
   }
 }
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts b/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
index 42a712d08da3..ef9b4decc521 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
@@ -225,6 +225,7 @@ export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal ext
       existingSurface?.customTitle !== undefined
         ? existingSurface.customTitle
         : this.getPtyManualTitle(livePty.pty, false) || undefined
+    activate = activate && (opts.switchExecution?.selectionCurrent?.() ?? true)
     const tab: RuntimeMobileSessionTerminalTab = {
       type: 'terminal',
       id: `${parentTabId}::${leafId}`,
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-renderer-create.ts b/src/main/runtime/terminal/launch/mobile-terminal-renderer-create.ts
index 13ca6b20d1ea..d76d9d2e2c0c 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-renderer-create.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-renderer-create.ts
@@ -86,7 +86,10 @@ export abstract class OrcaRuntimeWithRunCreateMobileSessionTerminal extends Orca
     let destinationCurrent = () => {}
     let dispatched = false
     let targetGroupId = opts.targetGroupId
-    const createOwned = (identity?: { tabId: string; leafId: string }) =>
+    const createOwned = (
+      identity?: { tabId: string; leafId: string },
+      trackPhysical = opts.switchExecution?.trackPhysical
+    ) =>
       this.createRuntimeOwnedMobileSessionTerminal(
         worktreeId,
         opts.activate !== false,
@@ -130,6 +133,7 @@ export abstract class OrcaRuntimeWithRunCreateMobileSessionTerminal extends Orca
           switchExecution: opts.switchExecution
             ? {
                 ...opts.switchExecution,
+                trackPhysical,
                 check: () => {
                   opts.switchExecution?.check()
                   destinationCurrent()
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-startup.ts b/src/main/runtime/terminal/launch/mobile-terminal-startup.ts
index 6f6d6475148f..54f6da8f6c09 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-startup.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-startup.ts
@@ -74,6 +74,7 @@ export abstract class OrcaRuntimeWithResolveMobileSessionTerminalCommand extends
     workspaceId: string,
     args: {
       source?: AiVaultChatForkSource
+      agent: TuiAgent
       options?: Record<string, string>
       commandOverride?: string
       invocationId: string
@@ -86,7 +87,7 @@ export abstract class OrcaRuntimeWithResolveMobileSessionTerminalCommand extends
     const workspace = await this.resolveTerminalWorkspaceLaunchScope(`id:${workspaceId}`)
     args.execution.check()
     const source = args.source
-    const runtime = this.resolveAgentLaunchRuntime(workspace, 'codex')
+    const runtime = this.resolveAgentLaunchRuntime(workspace, args.agent)
     const startup = source
       ? buildAiVaultLocalResumeStartup({
           session: source,
@@ -108,10 +109,10 @@ export abstract class OrcaRuntimeWithResolveMobileSessionTerminalCommand extends
             launchRuntime: runtime,
             resumeProviderSession: startup.providerSession,
             resumeOrigin: 'switch' as const,
-            launchAgent: 'codex' as const
+            launchAgent: args.agent
           }
         : {
-            agent: 'codex' as const,
+            agent: args.agent,
             commandOverride: args.commandOverride,
             sessionOptions: args.options
           }),
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-switch-publication.ts b/src/main/runtime/terminal/launch/mobile-terminal-switch-publication.ts
index bcafbdfbe0bd..9dc4fe55e935 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-switch-publication.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-switch-publication.ts
@@ -1,6 +1,5 @@
 import type { OrcaRuntimeWithMobileTerminalCreateOwner } from './mobile-terminal-create-owner'
 import type { MobileTerminalCreateOptions } from './mobile-terminal-create-options'
-import { DaemonConnectionLostError, DaemonRequestTimeoutError } from '../../../daemon/daemon-errors'
 import { trackRunningAgentLaunchPane } from '../../../agent-launch/agent-launch-pane-attachment'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
 import type { AgentLaunchTabPublished } from '../../../../shared/agent-launch-tab-publication'
@@ -8,7 +7,7 @@ import type { AgentLaunchPaneVerdict } from '../../../../shared/agent-launch-pan
 import type { MobileTerminalCommand } from './mobile-terminal-startup'
 import type { RuntimeMobileSessionCreateTerminalResult } from '../../../../shared/runtime-types'
 import { randomUUID } from 'node:crypto'
-import { isAgentSessionOperationOutcomeUnknown } from '../../runtime-agent-launch-resolution'
+import type { AgentSessionSwitchAuthority } from '../../../../shared/agent-session-switch-execution'
 
 export async function createPublishedSwitchTerminal(args: {
   owner: Pick<
@@ -24,10 +23,10 @@ export async function createPublishedSwitchTerminal(args: {
   opts: MobileTerminalCreateOptions
   startupCommand: MobileTerminalCommand
   afterDesktopTabId: string | undefined
-  createOwned: (identity: {
-    tabId: string
-    leafId: string
-  }) => Promise<RuntimeMobileSessionCreateTerminalResult>
+  createOwned: (
+    identity: { tabId: string; leafId: string },
+    trackPhysical: NonNullable<AgentSessionSwitchAuthority['trackPhysical']>
+  ) => Promise<RuntimeMobileSessionCreateTerminalResult>
   setDestinationCurrent: (check: () => void) => void
   setTargetGroup: (group: string) => void
   wasDispatched: () => boolean
@@ -56,12 +55,42 @@ export async function createPublishedSwitchTerminal(args: {
   })
   let shown: AgentLaunchTabPublished | undefined
   let publicationOwner: 'main' | 'window' = 'window'
+  const physicalOwners = new Set<Promise<unknown>>()
+  const trackPhysical: NonNullable<AgentSessionSwitchAuthority['trackPhysical']> = (
+    work,
+    recover
+  ) => {
+    // Recovery-bearing work is the receiver settlement, independent of acquisition observation.
+    if (recover) {
+      physicalOwners.add(work)
+      void work.then(() => physicalOwners.delete(work)).catch(() => {})
+    }
+    return opts.switchExecution!.trackPhysical?.(work, recover) ?? work
+  }
+  const withdrawUnused = async () => {
+    if (shown?.created !== true || !running.current() || owner.hasLiveTerminalForPaneKey(paneKey)) {
+      return
+    }
+    const withdrawn = await owner.withdrawAgentLaunchPaneInMainLayout(
+      pane,
+      running.current,
+      shown.withdrawalRoot,
+      publicationOwner
+    )
+    if (withdrawn && running.current()) {
+      owner.reportAgentLaunchPaneVerdict(pane, { kind: 'withdrawn' })
+    }
+  }
   try {
     const request = {
       ...pane,
       launchAgent: startupCommand.launchAgent ?? 'codex',
       viewMode: 'terminal' as const,
-      viewer: opts.switchExecution!.viewer,
+      viewer:
+        (opts.switchExecution!.selectionCurrent?.() ?? true)
+          ? opts.switchExecution!.viewer
+          : ('none' as const),
+      viewerSelection: opts.switchExecution!.viewerSelection,
       placement: {
         afterTabId: opts.switchExecution!.afterTabId ?? afterDesktopTabId,
         groupId: opts.targetGroupId
@@ -70,7 +99,11 @@ export async function createPublishedSwitchTerminal(args: {
     }
     const mainPublication =
       ORCA_LAYOUT_OWNER_IS_MAIN || !windowAvailable()
-        ? owner.publishAgentLaunchTabInMainLayout(request, opts.switchExecution!.check)
+        ? owner.publishAgentLaunchTabInMainLayout(
+            request,
+            opts.switchExecution!.check,
+            opts.switchExecution!.selectionCurrent
+          )
         : null
     publicationOwner = mainPublication ? 'main' : 'window'
     const publishing = mainPublication ?? owner.publishAgentLaunchTab(request)
@@ -79,16 +112,11 @@ export async function createPublishedSwitchTerminal(args: {
     }
     shown = await publishing
     setTargetGroup(shown.placement.groupId)
-    await opts.switchExecution!.shown?.({
-      workspaceId: worktreeId,
-      ...identity,
-      placement: request.placement
-    })
     opts.switchExecution!.check()
     if (!running.current()) {
       throw new Error('tab_not_found')
     }
-    const result = await createOwned(identity)
+    const result = await createOwned(identity, trackPhysical)
     running.agentBound()
     running.finish({ kind: 'proceed' })
     owner.reportAgentLaunchPaneVerdict(pane, { kind: 'proceed' })
@@ -96,15 +124,7 @@ export async function createPublishedSwitchTerminal(args: {
   } catch (error) {
     const live = owner.hasLiveTerminalForPaneKey(paneKey)
     const withdraw =
-      shown?.created === true &&
-      running.current() &&
-      !live &&
-      (!wasDispatched() ||
-        !(
-          isAgentSessionOperationOutcomeUnknown(error) ||
-          error instanceof DaemonConnectionLostError ||
-          error instanceof DaemonRequestTimeoutError
-        ))
+      shown?.created === true && running.current() && !live && physicalOwners.size === 0
     const verdict: AgentLaunchPaneVerdict = withdraw
       ? { kind: 'withdrawn' }
       : wasDispatched() && !live
@@ -112,18 +132,16 @@ export async function createPublishedSwitchTerminal(args: {
         : { kind: 'proceed' }
     running.finish(verdict)
     if (withdraw) {
-      const withdrawn = await owner.withdrawAgentLaunchPaneInMainLayout(
-        pane,
-        running.current,
-        shown?.withdrawalRoot,
-        publicationOwner
-      )
-      if (withdrawn && running.current()) {
-        owner.reportAgentLaunchPaneVerdict(pane, verdict)
-      }
+      await withdrawUnused()
     } else if (running.current() || live) {
       owner.reportAgentLaunchPaneVerdict(pane, verdict)
     }
+    if (physicalOwners.size > 0) {
+      // The receiver's real completion, not this observer's error, permits unused cleanup.
+      void Promise.all(physicalOwners)
+        .then(withdrawUnused)
+        .catch(() => {})
+    }
     throw error
   }
 }
diff --git a/src/main/runtime/workspaces/workspace-process-listing-dependencies.ts b/src/main/runtime/workspaces/workspace-process-listing-dependencies.ts
index 4cc34eedb4be..916560f85a0c 100644
--- a/src/main/runtime/workspaces/workspace-process-listing-dependencies.ts
+++ b/src/main/runtime/workspaces/workspace-process-listing-dependencies.ts
@@ -47,6 +47,7 @@ export abstract class OrcaRuntimeWithWorktreePsDependencies extends OrcaRuntimeW
     record: AgentSessionRecord
   ): Promise<void>
   abstract isChatWorkerErrorEscalationEnabled(): boolean
+  abstract captureSessionSwitchStop: OrcaRuntimeWithGetPtyRecordForPaneKey['captureSessionSwitchStop']
   abstract onStructuredSessionTabHidden(
     ...args: Parameters<OrcaRuntimeWithGetPtyRecordForPaneKey['onStructuredSessionTabHidden']>
   ): ReturnType<OrcaRuntimeWithGetPtyRecordForPaneKey['onStructuredSessionTabHidden']>
diff --git a/src/main/runtime/workspaces/workspace-process-listing.ts b/src/main/runtime/workspaces/workspace-process-listing.ts
index 4d6136996e5f..2355bbfefa4d 100644
--- a/src/main/runtime/workspaces/workspace-process-listing.ts
+++ b/src/main/runtime/workspaces/workspace-process-listing.ts
@@ -1,4 +1,3 @@
-import { chatAssigneeOwesWork } from '../orchestration/chat-assignee'
 import { resolveStructuredCodexAccountKind } from '../structured-agent-account-home'
 import { getStructuredAgentSessionHost } from '../../native-chat/agent-session-wire/structured-agent-session-registry'
 import { collectRuntimeWorktreeAgentSources } from '../runtime-worktree-agent-sources'
@@ -290,6 +289,7 @@ export abstract class OrcaRuntimeWithGetWorktreePs extends OrcaRuntimeWithWorktr
       },
       ...(this.structuredAgentStatusSinkFn ? { statusSink: this.structuredAgentStatusSinkFn } : {}),
       conversationNaming: nameChat,
+      captureSessionSwitchStop: (sessionId) => this.captureSessionSwitchStop(sessionId),
       onSessionTabHidden: (sessionId) => this.onStructuredSessionTabHidden(sessionId),
       assertNoTerminalWriter: (record) => this.assertStructuredChatAcquireAdmissible(record),
       attentionDelivery: createStructuredAttentionMobileDelivery({
@@ -301,10 +301,6 @@ export abstract class OrcaRuntimeWithGetWorktreePs extends OrcaRuntimeWithWorktr
         reconcile: (state) => this.mobileNotifications.reconcileStructuredPromptAttention(state),
         now: () => Date.now()
       }),
-      hasOwedSwitchWork: (record) => {
-        const db = this.getOrchestrationDbIfAvailable?.() ?? null
-        return structuredWorkerOwesWork(db, record) || chatAssigneeOwesWork(db, record.sessionId)
-      },
       // Read per sweep tick from the orchestration database: a worker whose dispatch is open keeps
       // its agent running. No database answers no.
       hasOpenDispatch: (record) =>
diff --git a/src/main/window/runtime-window-lifecycle.ts b/src/main/window/runtime-window-lifecycle.ts
index ccecc8f8688a..2a4bf8862a60 100644
--- a/src/main/window/runtime-window-lifecycle.ts
+++ b/src/main/window/runtime-window-lifecycle.ts
@@ -178,7 +178,12 @@ export function registerRuntimeWindowLifecycle(
     focusTerminal: (tabId, worktreeId, leafId) =>
       send('ui:focusTerminal', { tabId, worktreeId, leafId }),
     revealTerminalPane: (target) => revealTerminalPaneInWindow(mainWindow, target),
-    focusEditorTab: (tabId, worktreeId) => send('ui:focusEditorTab', { tabId, worktreeId }),
+    focusEditorTab: (tabId, worktreeId, viewerSelection) =>
+      send('ui:focusEditorTab', {
+        tabId,
+        worktreeId,
+        ...(viewerSelection !== undefined ? { viewerSelection } : {})
+      }),
     closeSessionTab: (tabId, worktreeId, switchProjection) =>
       requestSessionTabCloseFromRenderer(mainWindow, tabId, worktreeId, switchProjection),
     moveSessionTab: (worktreeId: string, move: RuntimeMobileSessionTabMove) =>
diff --git a/src/preload/api/ui-bridge-terminal-and-session-tabs.ts b/src/preload/api/ui-bridge-terminal-and-session-tabs.ts
index 62423bf50b60..59615da3bbc6 100644
--- a/src/preload/api/ui-bridge-terminal-and-session-tabs.ts
+++ b/src/preload/api/ui-bridge-terminal-and-session-tabs.ts
@@ -221,11 +221,16 @@ export const uiTerminalAndSessionTabsApi = {
     return () => ipcRenderer.removeListener('ui:focusTerminal', listener)
   },
   onFocusEditorTab: (
-    callback: (data: { tabId: string; worktreeId: string; userInitiated?: boolean }) => void
+    callback: (data: {
+      tabId: string
+      worktreeId: string
+      viewerSelection?: string
+      userInitiated?: boolean
+    }) => void
   ): (() => void) => {
     const listener = (
       _event: Electron.IpcRendererEvent,
-      data: { tabId: string; worktreeId: string; userInitiated?: boolean }
+      data: { tabId: string; worktreeId: string; viewerSelection?: string; userInitiated?: boolean }
     ) => callback(data)
     ipcRenderer.on('ui:focusEditorTab', listener)
     return () => ipcRenderer.removeListener('ui:focusEditorTab', listener)
diff --git a/src/preload/api/ui-command-event-api.ts b/src/preload/api/ui-command-event-api.ts
index ac5cbebe8833..3368941024af 100644
--- a/src/preload/api/ui-command-event-api.ts
+++ b/src/preload/api/ui-command-event-api.ts
@@ -259,6 +259,7 @@ export type UiCommandEventApi = {
     callback: (data: {
       tabId: string
       worktreeId: string
+      viewerSelection?: string
       /** A notification click authorizes revealing the tab. */
       userInitiated?: boolean
     }) => void
diff --git a/src/renderer/src/components/native-chat/NativeChatResumeInCliButton.tsx b/src/renderer/src/components/native-chat/NativeChatResumeInCliButton.tsx
index 6ac5ed20bd81..2a835e8b8070 100644
--- a/src/renderer/src/components/native-chat/NativeChatResumeInCliButton.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatResumeInCliButton.tsx
@@ -3,7 +3,6 @@ import { SquareTerminal } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import { useAppStore } from '@/store'
-import { useInPlaceSwitchCapability } from '@/lib/in-place-switch-support'
 import { isNativeChatEnabled } from '../../../../shared/structured-native-chat-launch-route'
 import type { AppState } from '@/store/types'
 import { selectFolderWorkspaces, selectWorktreesByRepo } from '@/store/workspace-record-selectors'
@@ -75,13 +74,12 @@ export function NativeChatResumeInCliButton({
   )
   const commandOverrides = useAppStore((state) => state.settings?.agentCmdOverrides)
   const agent = AI_VAULT_AGENTS.find((candidate) => candidate === nativeChat.agent)
-  const inPlace = useInPlaceSwitchCapability(executionHostScope, agent)
   const enabled = useAppStore((state) => isNativeChatEnabled(state.settings))
   const label = translate(
     'components.tab.bar.SortableTabContextMenu.switchToTerminalView',
     'Continue with Terminal Agent'
   )
-  if (!executionHostScope || !agent || (enabled && (inPlace !== false || agent === 'omp'))) {
+  if (!executionHostScope || !agent || enabled) {
     return null
   }
   return (
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx
index a9f71dbd7589..9780baf7be3a 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx
@@ -9,7 +9,7 @@ import { makeTabGroup } from '@/store/slices/store-test-helpers'
 import * as cliFork from '../tab-bar/native-chat-cli-fork-run'
 // @vitest-environment happy-dom
 
-import { act, cleanup, fireEvent, render, screen, within } from '@testing-library/react'
+import { act, cleanup, render, screen, within } from '@testing-library/react'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { TooltipProvider } from '@/components/ui/tooltip'
 import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types'
@@ -299,9 +299,7 @@ it('keeps the recorded OMP reply readable with its CLI switch unavailable', () =
     />,
     { wrapper: TooltipProvider }
   )
-  const button = screen.getByRole('button', { name: 'Switch to CLI' })
-  expect(button.hasAttribute('disabled')).toBe(true)
-  fireEvent.click(button)
+  expect(screen.queryByRole('button', { name: 'Switch to CLI' })).toBeNull()
   expect(invoke).not.toHaveBeenCalled()
   expect(mocks.messageListProps?.session).toMatchObject({ sessionId, messages: mocks.messages })
 })
@@ -401,11 +399,14 @@ it('gates eligible native header hover and menu switches through capability hydr
     throw new Error('Expected status fixture')
   }
   await act(async () => {
-    answer({ ...response.result, capabilities: ['agent-session.structured.switch.v1:codex'] })
+    answer({
+      ...response.result,
+      capabilities: ['agent-session.structured.switch.creation-settlement-v1:codex']
+    })
     await status
   })
   expect(readLocalRuntimeCapabilitiesOrUnknown()).toContain(
-    'agent-session.structured.switch.v1:codex'
+    'agent-session.structured.switch.creation-settlement-v1:codex'
   )
   const buttons = screen.getAllByRole('button', { name: 'Switch to CLI', hidden: true })
   expect(buttons).toHaveLength(2)
@@ -432,14 +433,31 @@ it('gates eligible native header hover and menu switches through capability hydr
   await act(async () => {
     await refreshLocalRuntimeCapabilities()
   })
-  expect(screen.queryAllByRole('button', { name: 'Switch to CLI', hidden: true })).toHaveLength(0)
-  expect(screen.queryByRole('menuitem', { name: 'Switch to CLI' })).toBeNull()
-  expect(screen.getAllByRole('button', { name: legacyName, hidden: true })).toHaveLength(1)
-  expect(screen.getByRole('menuitem', { name: 'Resume in New Terminal' })).toBeTruthy()
+  const oldPeerButtons = screen.getAllByRole('button', { name: 'Switch to CLI', hidden: true })
+  expect(oldPeerButtons).toHaveLength(2)
+  for (const button of oldPeerButtons) {
+    expect(button.hasAttribute('disabled')).toBe(false)
+  }
+  expect(
+    screen.getByRole('menuitem', { name: 'Switch to CLI' }).getAttribute('data-disabled')
+  ).toBeNull()
+  expect(screen.queryByRole('button', { name: legacyName, hidden: true })).toBeNull()
+  expect(screen.queryByRole('menuitem', { name: 'Resume in New Terminal' })).toBeNull()
   expect(screen.getByRole('separator')).toBeTruthy()
   expect(screen.getByTestId('message-list')).toBe(transcript)
   expect(readLocalRuntimeCapabilitiesOrUnknown()).toEqual([])
   expect(getStatus).toHaveBeenCalledTimes(2)
   expect(forkToCli).not.toHaveBeenCalled()
   expect(switchToCli).not.toHaveBeenCalled()
+  act(() => {
+    useAppStore.setState({
+      settings: createGlobalSettingsFixture({ experimentalNativeChat: false })
+    })
+  })
+  expectHidden()
 })
+
+vi.mock('@/components/confirmation-dialog-context', async (original) => ({
+  ...(await original<Record<string, unknown>>()),
+  useConfirmationDialog: () => vi.fn(async () => false)
+}))
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx
index 295587c0a1b9..aef57ca3eb8d 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx
@@ -23,11 +23,7 @@ import { useStructuredNativeChatSubmitReveal } from './use-structured-native-cha
 import { useStructuredPromptResponseHold } from './use-structured-prompt-response-hold'
 import { NativeChatStructuredQuestionCard } from './NativeChatStructuredQuestionCard'
 import { NativeChatStructuredAsyncQuestion } from './NativeChatStructuredAsyncQuestion'
-import {
-  selectNativeChatViewState,
-  structuredChatHistoryPhase,
-  structuredChatSwitchTranscriptState
-} from './native-chat-view-state'
+import { selectNativeChatViewState, structuredChatHistoryPhase } from './native-chat-view-state'
 import { useNativeChatRootInputRouting } from './use-native-chat-root-input-routing'
 import { useNativeChatFontSize } from './use-native-chat-font-size'
 import { useNativeChatFind } from './use-native-chat-find'
@@ -144,12 +140,7 @@ export function NativeChatStructuredSession(
   // Final read refusal replaces the pane because no existing action can succeed.
   const readFailedFinally = readFailure?.final === true
   const viewState = selectNativeChatViewState(session, { readRetries: !readFailedFinally })
-  const switchPresentation = useSwitchPresentation(
-    props.target,
-    props.sessionId,
-    props.isVisible,
-    structuredChatSwitchTranscriptState(controller, provisionalLaunch, viewState)
-  )
+  const switchPresentation = useSwitchPresentation(props.target, props.sessionId, props.isVisible)
   const paneActive = props.isVisible && props.isFocusedGroup
   useNativeChatFontSize(viewState.kind === 'ready' && paneActive, rootRef)
   const find = useNativeChatFind(paneActive, rootRef, composerRef, submits.messageListRef)
diff --git a/src/renderer/src/components/native-chat/NativeChatTopRightControls.tsx b/src/renderer/src/components/native-chat/NativeChatTopRightControls.tsx
index d872d5a663e8..516ff74e2eef 100644
--- a/src/renderer/src/components/native-chat/NativeChatTopRightControls.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatTopRightControls.tsx
@@ -1,3 +1,5 @@
+import { inPlaceSwitchEnabled } from '../../../../shared/structured-agent-cli-conversation-adoption'
+import { useConfirmationDialog } from '@/components/confirmation-dialog-context'
 import {
   useConversationSwitchReadiness,
   runNativeChatCliSwitch
@@ -8,7 +10,6 @@ import { Button } from '@/components/ui/button'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import { translate } from '@/i18n/i18n'
 import { useAppStore } from '@/store'
-import { useInPlaceSwitchCapability } from '@/lib/in-place-switch-support'
 import { AI_VAULT_AGENTS } from '../../../../shared/ai-vault-types'
 import { SwitchToCliTooltipText } from '../right-sidebar/ai-vault-session-cli-fork-copy'
 import { resolveTabSessionHistorySubject } from '../tab-bar/tab-session-history-switch'
@@ -40,7 +41,7 @@ export function NativeChatTopRightControls({
     return subject?.kind === 'chat' ? subject.request.executionHostScope : null
   })
   const agent = AI_VAULT_AGENTS.find((candidate) => candidate === session.agent)
-  const inPlace = useInPlaceSwitchCapability(hostId, agent)
+  const confirm = useConfirmationDialog()
   const readiness = useConversationSwitchReadiness(
     worktreeId && hostId && agent
       ? {
@@ -57,7 +58,7 @@ export function NativeChatTopRightControls({
   if (find.isOpen) {
     return <NativeChatFindBar find={find} isVisible={session.isVisible} />
   }
-  if (!enabled || !worktreeId || !hostId || !agent || (inPlace === false && agent !== 'omp')) {
+  if (!enabled || !worktreeId || !hostId || !agent || !inPlaceSwitchEnabled(agent)) {
     return null
   }
   const label = translate('components.tab.bar.switch.toCli', 'Switch to CLI')
@@ -71,10 +72,11 @@ export function NativeChatTopRightControls({
             size="icon-xs"
             aria-label={label}
             aria-disabled={!readiness.ready || undefined}
-            disabled={!readiness.ready || inPlace !== true}
+            disabled={!readiness.ready}
             onClick={() => {
-              if (readiness.ready && inPlace === true) {
+              if (readiness.ready) {
                 void runNativeChatCliSwitch({
+                  confirm,
                   sessionId: session.sessionId,
                   workspaceId: worktreeId,
                   executionHostId: hostId,
@@ -88,17 +90,7 @@ export function NativeChatTopRightControls({
           </Button>
         </TooltipTrigger>
         <TooltipContent side="bottom" sideOffset={4}>
-          {inPlace === false ? (
-            translate(
-              'components.tab.bar.switch.unavailable',
-              'Switching {{agent}} is not available yet.',
-              { agent: session.agent }
-            )
-          ) : readiness.explanation ? (
-            readiness.explanation
-          ) : (
-            <SwitchToCliTooltipText agent={agent} />
-          )}
+          {readiness.explanation ?? <SwitchToCliTooltipText agent={agent} />}
         </TooltipContent>
       </Tooltip>
     </div>
diff --git a/src/renderer/src/components/native-chat/native-chat-view-state.ts b/src/renderer/src/components/native-chat/native-chat-view-state.ts
index 4529591e5ade..bd7646c1d3d7 100644
--- a/src/renderer/src/components/native-chat/native-chat-view-state.ts
+++ b/src/renderer/src/components/native-chat/native-chat-view-state.ts
@@ -61,18 +61,3 @@ export function structuredChatHistoryPhase(
     ? 'unread'
     : 'known'
 }
-
-export function structuredChatSwitchTranscriptState(
-  controller: { readCurrent: boolean; status: 'idle' | 'loading' | 'ready' | 'error' },
-  provisionalLaunch: { launch: { kind: 'new' | 'resume' } | undefined },
-  viewState: NativeChatViewState
-): 'pending' | 'readable' | 'empty' | 'failed' {
-  return (controller.readCurrent || provisionalLaunch.launch?.kind === 'new') &&
-    (viewState.kind === 'ready' || viewState.kind === 'empty')
-    ? viewState.kind === 'empty'
-      ? 'empty'
-      : 'readable'
-    : controller.status === 'error'
-      ? 'failed'
-      : 'pending'
-}
diff --git a/src/renderer/src/components/right-sidebar/AiVaultVirtualRow.test.tsx b/src/renderer/src/components/right-sidebar/AiVaultVirtualRow.test.tsx
index f763a4416936..27b350c855b1 100644
--- a/src/renderer/src/components/right-sidebar/AiVaultVirtualRow.test.tsx
+++ b/src/renderer/src/components/right-sidebar/AiVaultVirtualRow.test.tsx
@@ -1,6 +1,7 @@
 // @vitest-environment happy-dom
 
-import { cleanup, fireEvent, render, screen } from '@testing-library/react'
+import { act, cleanup, fireEvent, render, screen } from '@testing-library/react'
+import { Profiler } from 'react'
 import userEvent from '@testing-library/user-event'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { TooltipProvider } from '@/components/ui/tooltip'
@@ -8,6 +9,12 @@ import type { AiVaultSession } from '../../../../shared/ai-vault-types'
 import type { AiVaultSearchHit } from '../../../../shared/ai-vault-search-types'
 import { AiVaultVirtualRow } from './AiVaultVirtualRow'
 import { setLocalRuntimeCapabilitiesForTests } from '@/runtime/local-runtime-capabilities'
+import { useAppStore } from '@/store'
+import { createCompatibleRuntimeStatusResponse } from '@/runtime/runtime-compatibility-test-fixture'
+import {
+  lastVerifiedRuntimeStatus,
+  type RuntimeHostStatusSnapshot
+} from '../../../../shared/runtime-host-status'
 
 const cliSession: AiVaultSession = {
   id: 'local:codex:session-1:/tmp/session-1.jsonl',
@@ -35,65 +42,89 @@ const cliSession: AiVaultSession = {
 afterEach(() => {
   cleanup()
   setLocalRuntimeCapabilitiesForTests(null)
+  vi.restoreAllMocks()
 })
 
-function renderSession(
+function sessionRowFixture(
   session: AiVaultSession,
   blocked = false,
   searchHit?: AiVaultSearchHit,
-  searchHitHostLabels?: ReadonlyMap<string, string>
+  searchHitHostLabels?: ReadonlyMap<string, string>,
+  index = 0,
+  resumeInChat = false
 ) {
   const buildResumeStartup = vi.fn(() => ({ command: session.resumeCommand }))
   const onCopyResume = vi.fn()
   const onResume = vi.fn()
   const onResumeInNewCli = vi.fn()
-  render(
-    <TooltipProvider>
-      <AiVaultVirtualRow
-        row={{ type: 'session', groupKey: 'today', session }}
-        index={0}
-        start={0}
-        activeStickyHeaderIndex={null}
-        measureElement={vi.fn()}
-        collapsedGroups={new Set()}
-        expandedSessionIds={new Set()}
-        vaultScope="all"
-        searchHits={searchHit ? new Map([[session.id, searchHit]]) : undefined}
-        searchHitHostLabels={searchHitHostLabels}
-        buildResumeStartup={buildResumeStartup}
-        getOriginalPaneTarget={() => null}
-        isStructuredSessionOpen={() => false}
-        getSessionLiveState={() => null}
-        getWorktreeInfo={() => null}
-        getSessionResumeState={() => ({
-          blocked,
-          worktreeId: blocked ? null : 'worktree-1',
-          usesSessionWorktree: false
-        })}
-        getSessionResumeActions={() => ({
-          worktree: { worktreeId: null, disabled: true },
-          newTab: { worktreeId: 'worktree-1', disabled: blocked }
-        })}
-        getSessionResumeInChat={() => ({ available: false, reason: 'already-structured' })}
-        onToggleGroup={vi.fn()}
-        onToggleSessionDetails={vi.fn()}
-        onJumpToOriginalPane={vi.fn()}
-        onJumpToWorktree={vi.fn()}
-        onResume={onResume}
-        onContinueInNewSession={vi.fn()}
-        onResumeInNewChat={vi.fn()}
-        onResumeInNewCli={onResumeInNewCli}
-        onCopyResume={onCopyResume}
-        onCopyId={vi.fn()}
-        onCopyPath={vi.fn()}
-        onOpenLog={vi.fn()}
-        onRevealLog={vi.fn()}
-        onOpenCwd={vi.fn()}
-        onRequestDelete={vi.fn()}
-      />
-    </TooltipProvider>
+  const getOriginalPaneTarget = vi.fn(() => null)
+  const element = (
+    <AiVaultVirtualRow
+      row={{ type: 'session', groupKey: 'today', session }}
+      index={index}
+      start={index * 52}
+      activeStickyHeaderIndex={null}
+      measureElement={vi.fn()}
+      collapsedGroups={new Set()}
+      expandedSessionIds={new Set()}
+      vaultScope="all"
+      searchHits={searchHit ? new Map([[session.id, searchHit]]) : undefined}
+      searchHitHostLabels={searchHitHostLabels}
+      buildResumeStartup={buildResumeStartup}
+      getOriginalPaneTarget={getOriginalPaneTarget}
+      isStructuredSessionOpen={() => false}
+      getSessionLiveState={() => null}
+      getWorktreeInfo={() => null}
+      getSessionResumeState={() => ({
+        blocked,
+        worktreeId: blocked ? null : 'worktree-1',
+        usesSessionWorktree: false
+      })}
+      getSessionResumeActions={() => ({
+        worktree: { worktreeId: null, disabled: true },
+        newTab: { worktreeId: 'worktree-1', disabled: blocked }
+      })}
+      getSessionResumeInChat={() =>
+        resumeInChat
+          ? { available: true, workspaceId: 'worktree-1' }
+          : { available: false, reason: 'already-structured' }
+      }
+      onToggleGroup={vi.fn()}
+      onToggleSessionDetails={vi.fn()}
+      onJumpToOriginalPane={vi.fn()}
+      onJumpToWorktree={vi.fn()}
+      onResume={onResume}
+      onContinueInNewSession={vi.fn()}
+      onResumeInNewChat={vi.fn()}
+      onResumeInNewCli={onResumeInNewCli}
+      onCopyResume={onCopyResume}
+      onCopyId={vi.fn()}
+      onCopyPath={vi.fn()}
+      onOpenLog={vi.fn()}
+      onRevealLog={vi.fn()}
+      onOpenCwd={vi.fn()}
+      onRequestDelete={vi.fn()}
+    />
   )
-  return { buildResumeStartup, onCopyResume, onResume, onResumeInNewCli }
+  return {
+    element,
+    getOriginalPaneTarget,
+    buildResumeStartup,
+    onCopyResume,
+    onResume,
+    onResumeInNewCli
+  }
+}
+
+function renderSession(
+  session: AiVaultSession,
+  blocked = false,
+  searchHit?: AiVaultSearchHit,
+  searchHitHostLabels?: ReadonlyMap<string, string>
+) {
+  const fixture = sessionRowFixture(session, blocked, searchHit, searchHitHostLabels)
+  render(<TooltipProvider>{fixture.element}</TooltipProvider>)
+  return fixture
 }
 
 describe('AiVaultVirtualRow search hit source host', () => {
@@ -194,23 +225,26 @@ describe('AiVaultVirtualRow resume command actions', () => {
   })
 })
 
-describe('AiVaultVirtualRow Resume in New Terminal', () => {
+describe('AiVaultVirtualRow CLI surface actions', () => {
   const owner = { sessionId: 'chat-1', workspaceId: 'worktree-1' }
 
   it.each(['claude', 'codex'] as const)(
-    'offers the fork on an unsupported host for a chat-owned %s row from both menus',
+    'offers the ordinary CLI switch on an older host for a chat-owned %s row from both menus',
     async (agent) => {
+      useAppStore.setState((state) => ({
+        settings: { ...state.settings, experimentalNativeChat: true }
+      }))
       setLocalRuntimeCapabilitiesForTests([])
       const session: AiVaultSession = { ...cliSession, agent, structuredSession: owner }
       const { onResumeInNewCli, onResume } = renderSession(session)
       const user = userEvent.setup()
 
       await user.click(screen.getByTestId('ai-vault-session-more-actions'))
-      await user.click(await screen.findByRole('menuitem', { name: 'Resume in New Terminal' }))
+      await user.click(await screen.findByRole('menuitem', { name: 'Switch to CLI' }))
       expect(onResumeInNewCli).toHaveBeenCalledExactlyOnceWith(session, 'worktree-1')
 
       fireEvent.contextMenu(screen.getByText('CLI session'))
-      await user.click(await screen.findByRole('menuitem', { name: 'Resume in New Terminal' }))
+      await user.click(await screen.findByRole('menuitem', { name: 'Switch to CLI' }))
       expect(onResumeInNewCli).toHaveBeenCalledTimes(2)
       expect(onResume).not.toHaveBeenCalled()
     }
@@ -231,3 +265,192 @@ describe('AiVaultVirtualRow Resume in New Terminal', () => {
     expect(screen.queryByRole('menuitem', { name: 'Resume in New Terminal' })).toBeNull()
   })
 })
+
+it.each([
+  { rows: 10, hosts: 3 },
+  { rows: 100, hosts: 3 },
+  { rows: 10, hosts: 30 }
+])(
+  'isolates $rows mounted History rows across $hosts registered hosts',
+  async ({ rows, hosts }) => {
+    useAppStore.setState(useAppStore.getInitialState(), true)
+    useAppStore.setState((state) => ({
+      settings: { ...state.settings, experimentalNativeChat: true }
+    }))
+    setLocalRuntimeCapabilitiesForTests([])
+    const getStatus = vi.fn()
+    const previousApi = window.api
+    Object.assign(window, {
+      api: { ...previousApi, runtime: { ...previousApi?.runtime, getStatus } }
+    })
+    const environments = Array.from({ length: hosts }, (_, index) => ({
+      id: `history-host-${index}`,
+      name: `Host ${index}`,
+      createdAt: 1,
+      updatedAt: 1,
+      pairingRevision: 1,
+      lastUsedAt: null,
+      runtimeId: `history-host-${index}`,
+      preferredEndpointId: 'endpoint',
+      endpoints: [
+        { id: 'endpoint', kind: 'websocket' as const, label: 'Host', endpoint: 'ws://host' }
+      ]
+    }))
+    useAppStore.getState().setRuntimeEnvironments(environments)
+    const addressed = environments.at(-1)!.id
+    const snapshot = (id: string, sequence: number, blocked = false): RuntimeHostStatusSnapshot => {
+      const response = createCompatibleRuntimeStatusResponse(id)
+      if (!response.ok) {
+        throw new Error('Expected compatible status')
+      }
+      return {
+        environmentId: id,
+        pairingRevision: 1,
+        sequence,
+        checkedAt: sequence,
+        transport: 'ready',
+        verification: blocked ? 'blocked' : 'verified',
+        status: {
+          ...response.result,
+          capabilities: ['agent-session.structured.switch.creation-settlement-v1:codex']
+        }
+      }
+    }
+    for (const environment of environments) {
+      useAppStore.getState().applyRuntimeHostStatusSnapshot(snapshot(environment.id, 1))
+    }
+    const fixtures = Array.from({ length: rows }, (_, index) =>
+      sessionRowFixture(
+        {
+          ...cliSession,
+          id: `history-${index}`,
+          sessionId: `conversation-${index}`,
+          title: `History ${index}`,
+          executionHostId: `runtime:${index === 0 ? addressed : environments[0].id}`
+        },
+        false,
+        undefined,
+        undefined,
+        index,
+        true
+      )
+    )
+    const commits = new Map<string, number>()
+    const rendered = render(
+      <TooltipProvider>
+        {fixtures.map((fixture, index) => (
+          <Profiler
+            key={index}
+            id={String(index)}
+            onRender={(id) => {
+              commits.set(id, (commits.get(id) ?? 0) + 1)
+            }}
+          >
+            {fixture.element}
+          </Profiler>
+        ))}
+      </TooltipProvider>
+    )
+    try {
+      await act(async () => {})
+      const user = userEvent.setup()
+      await user.click(screen.getAllByTestId('ai-vault-session-more-actions')[0])
+      const control = await screen.findByRole('menuitem', { name: 'Switch to native chat' })
+      expect(control.getAttribute('data-disabled')).toBeNull()
+      await act(async () => {})
+      const clearCounts = () => {
+        commits.clear()
+        fixtures.forEach((fixture) => fixture.getOriginalPaneTarget.mockClear())
+      }
+      clearCounts()
+      const registered = useAppStore.getState().runtimeEnvironments
+      let membershipEntries = 0
+      const originalSome = registered.some.bind(registered)
+      const membership = vi.spyOn(registered, 'some').mockImplementation((predicate, thisArg) =>
+        originalSome((value, index, array) => {
+          membershipEntries += 1
+          return predicate.call(thisArg, value, index, array)
+        })
+      )
+      const status = useAppStore.getState().runtimeStatusByEnvironmentId.get(addressed)
+      const learned = lastVerifiedRuntimeStatus(status)
+      if (!learned?.capabilities) {
+        throw new Error('Expected learned capabilities')
+      }
+      const capabilities = vi.spyOn(learned.capabilities, 'includes')
+      await act(async () => {
+        useAppStore.getState().applyRuntimeHostStatusSnapshot(snapshot(environments[1].id, 2))
+      })
+      expect([...commits.values()]).toEqual([])
+      expect(
+        fixtures.every((fixture) => fixture.getOriginalPaneTarget.mock.calls.length === 0)
+      ).toBe(true)
+      const membershipLookups = membership.mock.calls.length
+      const capabilityLookups = capabilities.mock.calls.length
+      expect(membershipLookups).toBeGreaterThanOrEqual(rows)
+      expect(membershipLookups).toBeLessThanOrEqual(16 * rows)
+      expect(capabilityLookups).toBeGreaterThan(0)
+      expect(capabilityLookups).toBeLessThanOrEqual(16)
+      expect(membershipEntries).toBeGreaterThanOrEqual(membershipLookups)
+      expect(membershipEntries).toBeLessThanOrEqual(membershipLookups * hosts)
+      membership.mockClear()
+      capabilities.mockClear()
+      await act(async () => {
+        useAppStore.setState({ activeWorktreeId: 'unused-workspace' })
+      })
+      expect([...commits.values()]).toEqual([])
+      expect(
+        fixtures.every((fixture) => fixture.getOriginalPaneTarget.mock.calls.length === 0)
+      ).toBe(true)
+      expect(membership).not.toHaveBeenCalled()
+      const unusedSwitchLookups = capabilities.mock.calls.filter(
+        ([capability]) =>
+          capability === 'agent-session.structured.switch.creation-settlement-v1:codex'
+      ).length
+      expect(unusedSwitchLookups).toBe(0)
+      const unusedDeleteLookups = capabilities.mock.calls.filter(
+        ([capability]) => capability === 'aiVault.delete-session.v1'
+      ).length
+      expect(unusedDeleteLookups).toBe(1)
+      await act(async () => {
+        useAppStore.getState().applyRuntimeHostStatusSnapshot(snapshot(addressed, 2, true))
+      })
+      expect(commits.get('0')).toBeGreaterThan(0)
+      expect([...commits.keys()]).toEqual(['0'])
+      expect(fixtures[0].getOriginalPaneTarget).toHaveBeenCalledTimes(1)
+      expect(
+        fixtures.slice(1).every((fixture) => fixture.getOriginalPaneTarget.mock.calls.length === 0)
+      ).toBe(true)
+      expect(
+        screen
+          .getByRole('menuitem', { name: 'Switch to native chat' })
+          .getAttribute('data-disabled')
+      ).not.toBeNull()
+      clearCounts()
+      await act(async () => {
+        useAppStore.getState().applyRuntimeHostStatusSnapshot(snapshot(addressed, 3))
+      })
+      expect([...commits.keys()]).toEqual(['0'])
+      expect(
+        screen
+          .getByRole('menuitem', { name: 'Switch to native chat' })
+          .getAttribute('data-disabled')
+      ).toBeNull()
+      expect(getStatus).not.toHaveBeenCalled()
+      console.info('HISTORY_ROW_COUNTS', {
+        rows,
+        hosts,
+        unrelatedRowCommits: 0,
+        unrelatedWrapperRenders: 0,
+        membershipLookups,
+        membershipEntries,
+        capabilityLookups,
+        unusedSwitchLookups,
+        unusedDeleteLookups
+      })
+    } finally {
+      rendered.unmount()
+      Object.assign(window, { api: previousApi })
+    }
+  }
+)
diff --git a/src/renderer/src/components/right-sidebar/AiVaultVirtualRow.tsx b/src/renderer/src/components/right-sidebar/AiVaultVirtualRow.tsx
index d793110dbac7..c785b8330b46 100644
--- a/src/renderer/src/components/right-sidebar/AiVaultVirtualRow.tsx
+++ b/src/renderer/src/components/right-sidebar/AiVaultVirtualRow.tsx
@@ -1,3 +1,4 @@
+import { useInPlaceSwitchCapability } from '@/lib/in-place-switch-support'
 import type { AgentStatusState } from '../../../../shared/agent-status-types'
 import { isAntigravityReferenceSession } from '../../../../shared/antigravity-session-origin'
 import type { AiVaultScope, AiVaultSession } from '../../../../shared/ai-vault-types'
@@ -113,6 +114,10 @@ export function AiVaultVirtualRow({
   /** Set in `/resume`'s picker; see VaultSessionRow's `onPick`. */
   onPickSession?: (session: AiVaultSession) => void
 }): React.JSX.Element | null {
+  useInPlaceSwitchCapability(
+    row?.type === 'session' ? row.session.executionHostId : undefined,
+    row?.type === 'session' ? row.session.agent : undefined
+  )
   if (!row) {
     return null
   }
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx b/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx
index c4dd8e9361b8..82bb067cd407 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx
+++ b/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx
@@ -63,7 +63,7 @@ vi.mock('@/lib/ai-vault-tab-title-requests', async (original) => ({
   collectAgentPaneConversations: mocks.panes
 }))
 
-const SWITCH = 'agent-session.structured.switch.v1:codex'
+const SWITCH = 'agent-session.structured.switch.creation-settlement-v1:codex'
 const paired = {
   id: 'paired',
   name: 'Paired',
@@ -214,7 +214,9 @@ it.each(['local', 'runtime:paired'] as const)(
     })
     const session = { ...row, executionHostId: host }
     render(<History session={session} />)
-    expect(screen.queryByRole('button', { name: 'Switch to native chat' })).toBeNull()
+    expect(
+      screen.getByRole('button', { name: 'Switch to native chat' }).hasAttribute('disabled')
+    ).toBe(true)
     await act(async () => {
       answer({ capabilities: [HISTORY, SWITCH] })
       if (host !== 'local') {
@@ -300,11 +302,6 @@ it('routes a capable paired unowned row with a matching terminal through the sam
 })
 
 it.each([
-  {
-    executionHostId: 'runtime:paired' as const,
-    agent: 'codex' as const,
-    filePath: '/rollout.jsonl'
-  },
   { executionHostId: 'ssh:box' as const, agent: 'codex' as const, filePath: '/rollout.jsonl' },
   {
     executionHostId: 'local' as const,
@@ -326,28 +323,28 @@ it.each([
   expect(mocks.startOwner).not.toHaveBeenCalled()
 })
 
-it.each(['codex', 'claude', 'grok', 'omp', 'opencode', 'opencode2', 'pi'] as const)(
-  'keeps ordinary local History resume and owned fork usable for %s',
+it.each(['codex', 'claude', 'grok', 'opencode', 'opencode2', 'pi'] as const)(
+  'routes the %s History action through the common switch on supported older hosts',
   async (agent) => {
     setLocalRuntimeCapabilitiesForTests([HISTORY])
     mocks.probe.mockResolvedValue(false)
     const session = { ...row, agent, structuredSession: undefined }
-    const view = render(<History session={session} />)
-    const resume = await screen.findByRole('button', { name: 'Resume in New Chat' })
-    await userEvent.setup().click(resume)
-    expect(mocks.newChat).toHaveBeenCalledExactlyOnceWith(
-      session,
-      agent,
-      'workspace',
-      expect.any(String)
-    )
-    expect(mocks.run).not.toHaveBeenCalled()
-    expect(mocks.startOwner).not.toHaveBeenCalled()
-    view.rerender(<History session={{ ...session, structuredSession: row.structuredSession }} />)
+    render(<History session={session} />)
     await userEvent
       .setup()
-      .click(await screen.findByRole('button', { name: 'Resume in New Terminal' }))
-    expect(mocks.fork).toHaveBeenCalledOnce()
-    expect(screen.queryByRole('button', { name: 'Switch to CLI' })).toBeNull()
+      .click(await screen.findByRole('button', { name: 'Switch to native chat' }))
+    expect(mocks.startOwner).toHaveBeenCalledExactlyOnceWith(
+      expect.objectContaining({
+        direction: 'chat',
+        agent,
+        history: session
+      })
+    )
+    expect(mocks.newChat).not.toHaveBeenCalled()
   }
 )
+
+vi.mock('@/components/confirmation-dialog-context', async (original) => ({
+  ...(await original<Record<string, unknown>>()),
+  useConfirmationDialog: () => vi.fn(async () => false)
+}))
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts b/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts
index 42f2964f218c..dc9d1fcc219f 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts
@@ -1,10 +1,11 @@
+import type { ConfirmationDialogContextValue } from '@/components/confirmation-dialog-context'
 import type { AiVaultOriginalPaneTarget } from './ai-vault-original-pane'
 import {
   cliConversationRowsShareAgent,
   adoptsCliConversations
 } from '../../../../shared/structured-agent-cli-conversation-adoption'
 import { useAppStore } from '@/store'
-import { inPlaceSwitchSupportedNow } from '@/lib/in-place-switch-support'
+import { inPlaceSwitchEnabled } from '../../../../shared/structured-agent-cli-conversation-adoption'
 import type { AiVaultSession } from '../../../../shared/ai-vault-types'
 import { resolveCliChatResumeSource } from '../tab-bar/cli-chat-resume-source'
 import {
@@ -15,9 +16,12 @@ import {
 
 /** History's "Switch to CLI": in the chat tab's slot when that tab is open in this window, else a
  *  new tab. False when the row's host doesn't switch this agent in place, so the row forks. */
-export function switchAiVaultSessionToCli(session: AiVaultSession): boolean {
+export function switchAiVaultSessionToCli(
+  session: AiVaultSession,
+  confirm?: ConfirmationDialogContextValue
+): boolean {
   const chat = session.structuredSession
-  if (!chat || !inPlaceSwitchSupportedNow(session.executionHostId, session.agent)) {
+  if (!chat || !inPlaceSwitchEnabled(session.agent)) {
     return false
   }
   const chatTab = useAppStore
@@ -26,6 +30,7 @@ export function switchAiVaultSessionToCli(session: AiVaultSession): boolean {
       (tab) => tab.contentType === 'agent-session' && tab.entityId === chat.sessionId
     )
   void runNativeChatCliSwitch({
+    confirm,
     sessionId: chat.sessionId,
     workspaceId: chat.workspaceId,
     executionHostId: session.executionHostId,
@@ -41,12 +46,10 @@ export function switchAiVaultSessionToCli(session: AiVaultSession): boolean {
 export function switchAiVaultSessionToNativeChat(
   session: AiVaultSession,
   workspaceId?: string,
-  originalPaneTarget?: AiVaultOriginalPaneTarget | null
+  originalPaneTarget?: AiVaultOriginalPaneTarget | null,
+  confirm?: ConfirmationDialogContextValue
 ): boolean {
-  if (
-    !adoptsCliConversations(session.agent) ||
-    !inPlaceSwitchSupportedNow(session.executionHostId, session.agent)
-  ) {
+  if (!adoptsCliConversations(session.agent) || !inPlaceSwitchEnabled(session.agent)) {
     return false
   }
   const source = historyPaneSource(session, originalPaneTarget)
@@ -55,10 +58,10 @@ export function switchAiVaultSessionToNativeChat(
     if (!subject) {
       return false
     }
-    void runConversationSwitch(subject)
+    void runConversationSwitch({ ...subject, confirm })
     return true
   }
-  void runConversationSwitch({ direction: 'chat', ...source, source, history: session })
+  void runConversationSwitch({ direction: 'chat', ...source, source, history: session, confirm })
   return true
 }
 
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-session-launch-actions.test.ts b/src/renderer/src/components/right-sidebar/ai-vault-session-launch-actions.test.ts
index d79f9d3c06d9..041b36625e96 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-session-launch-actions.test.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault-session-launch-actions.test.ts
@@ -1,7 +1,8 @@
 import type * as ForkStartup from '@/lib/ai-vault-session-fork-startup'
 // @vitest-environment happy-dom
 import { renderHook, waitFor } from '@testing-library/react'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import * as sessionSwitch from './ai-vault-session-in-place-switch'
 import type { AiVaultSession } from '../../../../shared/ai-vault-types'
 import type { WebRuntimeTerminalCreateOutcome } from '@/runtime/web-runtime-session-types'
 
@@ -14,6 +15,8 @@ const mocks = vi.hoisted(() => ({
   prepareAiVaultSessionForTerminalResume: vi.fn(),
   launchAiVaultSessionInNewTab: vi.fn(),
   activateAiVaultResumeWorkspace: vi.fn(),
+  switchToCli: vi.fn(async () => {}),
+  confirm: vi.fn(async () => false),
   toastError: vi.fn(),
   toastSuccess: vi.fn()
 }))
@@ -42,6 +45,10 @@ vi.mock('@/lib/ai-vault-session-resume-preparation', () => ({
 vi.mock('@/lib/launch-ai-vault-session', () => ({
   launchAiVaultSessionInNewTab: mocks.launchAiVaultSessionInNewTab
 }))
+vi.mock('@/lib/conversation-surface-switch', () => ({
+  runNativeChatCliSwitch: mocks.switchToCli,
+  runConversationSwitch: vi.fn(async () => false)
+}))
 vi.mock('./ai-vault-session-launch-target', () => ({
   resolveAiVaultSessionLaunchTarget: (args: { targetWorktreeId?: string }) => ({
     status: 'ready',
@@ -99,10 +106,17 @@ function renderActions(agentCmdOverrides?: { opencode?: string }) {
   ).result.current
 }
 
-describe('Switch to Terminal launch', () => {
+afterEach(() => vi.restoreAllMocks())
+
+describe('ordinary CLI copy launch when the switch action does not apply', () => {
   beforeEach(() => {
     vi.clearAllMocks()
-    mocks.getState.mockReturnValue({ activeWorktreeId: 'worktree-1', settings: {} })
+    vi.spyOn(sessionSwitch, 'switchAiVaultSessionToCli').mockReturnValue(false)
+    mocks.getState.mockReturnValue({
+      activeWorktreeId: 'worktree-1',
+      settings: {},
+      unifiedTabsByWorktree: {}
+    })
     mocks.prepareAiVaultSessionForFork.mockImplementation(async (session) => ({
       session,
       copied: false
@@ -229,6 +243,35 @@ describe('Switch to Terminal launch', () => {
   })
 })
 
+it.each(['claude', 'codex', 'grok', 'opencode', 'opencode2', 'pi'] as const)(
+  'routes supported %s History chats through the common same-conversation switch',
+  (agent) => {
+    vi.clearAllMocks()
+    const chat = { ...owned, agent }
+    mocks.getState.mockReturnValue({
+      activeWorktreeId: 'worktree-1',
+      settings: {},
+      unifiedTabsByWorktree: {
+        'worktree-1': [{ id: 'chat-tab', contentType: 'agent-session', entityId: 'chat-1' }]
+      }
+    })
+    renderActions().handleResumeInNewCli(chat, 'worktree-2')
+    expect(mocks.switchToCli).toHaveBeenCalledExactlyOnceWith({
+      confirm: mocks.confirm,
+      sessionId: 'chat-1',
+      workspaceId: 'worktree-1',
+      executionHostId: 'local',
+      agent,
+      chatTabId: 'chat-tab',
+      history: chat
+    })
+    expect(mocks.prepareAiVaultSessionForFork).not.toHaveBeenCalled()
+    expect(mocks.buildAiVaultForkStartupForWorktree).not.toHaveBeenCalled()
+    expect(mocks.launchAiVaultSessionInNewTab).not.toHaveBeenCalled()
+    expect(mocks.toastError).not.toHaveBeenCalled()
+  }
+)
+
 it('refuses the stale OMP row before creating a second terminal writer', async () => {
   vi.clearAllMocks()
   mocks.prepareAiVaultSessionForTerminalResume.mockRejectedValue(
@@ -246,3 +289,8 @@ it('refuses the stale OMP row before creating a second terminal writer', async (
   )
   expect(mocks.launchAiVaultSessionInNewTab).not.toHaveBeenCalled()
 })
+
+vi.mock('@/components/confirmation-dialog-context', async (original) => ({
+  ...(await original<Record<string, unknown>>()),
+  useConfirmationDialog: () => mocks.confirm
+}))
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 595797f8986c..25a85b8a87a5 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
@@ -1,3 +1,4 @@
+import { useConfirmationDialog } from '@/components/confirmation-dialog-context'
 import type { AiVaultOriginalPaneTarget } from './ai-vault-original-pane'
 import {
   notifyAiVaultSessionPreparationFailure,
@@ -53,6 +54,7 @@ export function useAiVaultSessionLaunchActions({
   targetState: AiVaultSessionResumeTargetState
   agentCmdOverrides?: Partial<Record<AiVaultAgent, string | null>>
 }) {
+  const confirm = useConfirmationDialog()
   const [continuationRequest, setContinuationRequest] =
     useState<AgentSessionContinuationRequest | null>(null)
 
@@ -149,10 +151,10 @@ export function useAiVaultSessionLaunchActions({
     [buildResumeStartup, launchInTerminal]
   )
 
-  // Native chat keeps the conversation it owns; the terminal gets a copy (see the fork builder).
+  // Supported chats transfer the same conversation; other history rows keep their ordinary resume.
   const handleResumeInNewCli = useCallback(
     (session: AiVaultSession, targetWorktreeId: string): void => {
-      if (switchAiVaultSessionToCli(session)) {
+      if (switchAiVaultSessionToCli(session, confirm)) {
         return
       }
       const prepareStartup = async (worktreeId: string): Promise<AiVaultResumeStartup> => {
@@ -193,7 +195,7 @@ export function useAiVaultSessionLaunchActions({
       }
       launchInTerminal(session, targetWorktreeId, prepareStartup, describeAiVaultCliForkFailure)
     },
-    [agentCmdOverrides, launchInTerminal]
+    [agentCmdOverrides, launchInTerminal, confirm]
   )
 
   const handleResumeInNewChat = useCallback(
@@ -207,7 +209,8 @@ export function useAiVaultSessionLaunchActions({
         switchAiVaultSessionToNativeChat(
           session,
           targetWorktreeId ?? activeWorktreeId ?? activeWorktree?.id,
-          pane
+          pane,
+          confirm
         )
       ) {
         return
@@ -229,7 +232,7 @@ export function useAiVaultSessionLaunchActions({
         newAgentLaunchRequestId()
       )
     },
-    [activeWorktree?.id, activeWorktreeId]
+    [activeWorktree?.id, activeWorktreeId, confirm]
   )
 
   const handleContinueInNewSession = useCallback(
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.ts b/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.ts
index 99ceb2a35e2c..2b70b934e8c6 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.ts
@@ -1,3 +1,4 @@
+import { conversationSwitchViewerSelectionCurrent } from '@/lib/conversation-switch-selection'
 import { toast } from 'sonner'
 import {
   parseRoutableExecutionHostId,
@@ -55,7 +56,8 @@ export async function resumeAiVaultSessionInNewChat(
   rowAgent: CliConversationRowAgent,
   worktreeId: string,
   requestId: AgentLaunchRequestId,
-  replacing?: AiVaultChatReplacement
+  replacing?: AiVaultChatReplacement,
+  viewerSelection?: string
 ): Promise<void> {
   try {
     const recordingHost = parseRoutableExecutionHostId(session.executionHostId)
@@ -86,12 +88,18 @@ export async function resumeAiVaultSessionInNewChat(
     const launch = beginStructuredAgentSessionProvisionalLaunch({
       plan,
       hooks: {},
+      ...(viewerSelection !== undefined
+        ? { canActivate: () => conversationSwitchViewerSelectionCurrent(viewerSelection) }
+        : {}),
       ...(replacing
         ? { afterTabId: replacing.afterTabId, focusIntent: replacing.focusIntent }
         : {}),
       beforeOpen: waitForCreate
         ? undefined
         : () => {
+            if (!conversationSwitchViewerSelectionCurrent(viewerSelection)) {
+              return true
+            }
             if (
               useAppStore.getState().activeWorktreeId !== worktreeId ||
               structuredLaunchOwner({ route: 'structured-native-chat' }, worktreeId)
@@ -109,6 +117,7 @@ export async function resumeAiVaultSessionInNewChat(
     void launch.settlement.then((settlement) => {
       const state = useAppStore.getState()
       if (
+        conversationSwitchViewerSelectionCurrent(viewerSelection) &&
         waitForCreate &&
         settlement.kind === 'structured' &&
         state.activeWorktreeId !== worktreeId &&
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-workspace.ts b/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-workspace.ts
index 1bdef2ca26d1..16f11736f23d 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-workspace.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-workspace.ts
@@ -1,4 +1,4 @@
-import { inPlaceSwitchCapabilityNow } from '@/lib/in-place-switch-support'
+import { inPlaceSwitchEnabled } from '../../../../shared/structured-agent-cli-conversation-adoption'
 import { resolveHostCapabilities, workspaceKindForWorktreeId } from '@/lib/agent-launch-route-input'
 import {
   structuredAgentSessionLaunchFeasible,
@@ -51,25 +51,26 @@ export function resolveAiVaultSessionResumeInChatForWorkspace(args: {
     inPlaceSwitchAvailable:
       targetOwner !== null &&
       targetOwner === normalizeExecutionHostId(args.session.executionHostId) &&
-      inPlaceSwitchCapabilityNow(targetOwner, args.session.agent) !== false,
+      inPlaceSwitchEnabled(args.session.agent),
     structuredRouteAvailable:
-      adoptsCliConversations(args.session.agent) &&
-      targetWorkspaceId !== null &&
-      targetOwner !== null &&
-      targetOwner === normalizeExecutionHostId(args.session.executionHostId) &&
-      CLI_CONVERSATION_ADOPTING_AGENTS[args.session.agent].some((agent) =>
-        structuredAgentSessionLaunchFeasible(state, {
-          agent,
-          workspace: {
-            kind: workspaceKindForWorktreeId(targetWorkspaceId),
-            worktreeId: targetWorkspaceId
-          },
-          settings: args.settings
-        })
-      ) &&
-      resolveHostCapabilities(state, targetOwner)?.includes(
-        STRUCTURED_AGENT_SESSION_RESUME_HISTORY_RUNTIME_CAPABILITY
-      ) === true
+      Boolean(args.session.structuredSession && inPlaceSwitchEnabled(args.session.agent)) ||
+      (adoptsCliConversations(args.session.agent) &&
+        targetWorkspaceId !== null &&
+        targetOwner !== null &&
+        targetOwner === normalizeExecutionHostId(args.session.executionHostId) &&
+        CLI_CONVERSATION_ADOPTING_AGENTS[args.session.agent].some((agent) =>
+          structuredAgentSessionLaunchFeasible(state, {
+            agent,
+            workspace: {
+              kind: workspaceKindForWorktreeId(targetWorkspaceId),
+              worktreeId: targetWorkspaceId
+            },
+            settings: args.settings
+          })
+        ) &&
+        resolveHostCapabilities(state, targetOwner)?.includes(
+          STRUCTURED_AGENT_SESSION_RESUME_HISTORY_RUNTIME_CAPABILITY
+        ) === true)
   })
 }
 
diff --git a/src/renderer/src/components/right-sidebar/use-ai-vault-panel-session-resume.ts b/src/renderer/src/components/right-sidebar/use-ai-vault-panel-session-resume.ts
index 98ac66b304be..50b12b481f03 100644
--- a/src/renderer/src/components/right-sidebar/use-ai-vault-panel-session-resume.ts
+++ b/src/renderer/src/components/right-sidebar/use-ai-vault-panel-session-resume.ts
@@ -1,5 +1,4 @@
 import { useCallback } from 'react'
-import { useInPlaceSwitchRevision } from '@/lib/in-place-switch-support'
 import type { AiVaultSession } from '../../../../shared/ai-vault-types'
 import type { Repo } from '../../../../shared/repo-types'
 import type { Worktree } from '../../../../shared/worktree/types'
@@ -26,7 +25,6 @@ export function useAiVaultPanelSessionResume(args: {
   settings: AppState['settings']
 }) {
   const { sessions, repos, allWorktrees, workspaceId, resumeTargetState, settings } = args
-  useInPlaceSwitchRevision()
   // Folder workspaces own their sessions by cwd too, so they resume and jump like a worktree.
   const ownerWorkspaces = useAiVaultSessionOwnerWorkspaces(allWorktrees, resumeTargetState)
   const sessionWorktreeById = useAiVaultSessionWorktreeMap({
@@ -69,7 +67,6 @@ export function useAiVaultPanelSessionResume(args: {
   // workspace host a PTY" but "will the provider still find this conversation from the workspace we
   // would run it in". The workspace it targets is the session's own when that is open, because
   // Claude looks its transcript up under a directory derived from the launch cwd.
-  // Capability updates rerender this hook and refresh memoized row readers.
   const getSessionResumeInChat = (session: AiVaultSession): AiVaultResumeInChatEligibility =>
     resolveAiVaultHistoryRowResume({ ...getSessionRowResumeArgs(session), settings }).resumeInChat
   return {
diff --git a/src/renderer/src/components/tab-bar/CliChatResumeMenuItems.tsx b/src/renderer/src/components/tab-bar/CliChatResumeMenuItems.tsx
index 093a986c311b..7da70264ed36 100644
--- a/src/renderer/src/components/tab-bar/CliChatResumeMenuItems.tsx
+++ b/src/renderer/src/components/tab-bar/CliChatResumeMenuItems.tsx
@@ -1,3 +1,4 @@
+import { useConfirmationDialog } from '@/components/confirmation-dialog-context'
 import { useConversationSwitchReadiness, runCliChatResume } from '@/lib/conversation-surface-switch'
 import { isNativeChatEnabled } from '../../../../shared/structured-native-chat-launch-route'
 import { useShallow } from 'zustand/react/shallow'
@@ -5,7 +6,7 @@ import { useAppStore } from '@/store'
 import { DropdownMenuSeparator } from '@/components/ui/dropdown-menu'
 import type { TerminalTab } from '../../../../shared/terminal-tab-types'
 import { AiVaultSessionSurfaceSwitchMenuItems } from '../right-sidebar/AiVaultSessionSurfaceSwitchMenuItems'
-import { resolveCliChatResumeSource, useCliChatResumeCapability } from './cli-chat-resume-source'
+import { resolveCliChatResumeSource } from './cli-chat-resume-source'
 
 export function CliChatResumeMenuItems({
   tab,
@@ -17,7 +18,7 @@ export function CliChatResumeMenuItems({
   onComplete?: () => void
 }): React.JSX.Element | null {
   const source = useAppStore(useShallow((state) => resolveCliChatResumeSource(state, { tab })))
-  const capability = useCliChatResumeCapability(tab.worktreeId, source?.agent)
+  const confirm = useConfirmationDialog()
   const readiness = useConversationSwitchReadiness(
     source ? { direction: 'chat', ...source, source } : null
   )
@@ -29,7 +30,7 @@ export function CliChatResumeMenuItems({
     <>
       {leadingSeparator ? <DropdownMenuSeparator /> : null}
       <AiVaultSessionSurfaceSwitchMenuItems
-        action={capability === false ? 'resume' : 'switch'}
+        action="switch"
         switchLoading={!readiness.ready}
         switchExplanation={readiness.explanation}
         menuKind="dropdown"
@@ -37,7 +38,7 @@ export function CliChatResumeMenuItems({
         chatPending={readiness.pending}
         onResumeInNewChat={(event) => {
           event.preventDefault()
-          void runCliChatResume(source).finally(() => onComplete?.())
+          void runCliChatResume(source, confirm).finally(() => onComplete?.())
         }}
       />
     </>
diff --git a/src/renderer/src/components/tab-bar/NativeChatCliForkMenuItems.tsx b/src/renderer/src/components/tab-bar/NativeChatCliForkMenuItems.tsx
index a7b73d3c8d8f..91b7c901ff6a 100644
--- a/src/renderer/src/components/tab-bar/NativeChatCliForkMenuItems.tsx
+++ b/src/renderer/src/components/tab-bar/NativeChatCliForkMenuItems.tsx
@@ -1,3 +1,4 @@
+import { useConfirmationDialog } from '@/components/confirmation-dialog-context'
 import {
   useConversationSwitchReadiness,
   runNativeChatCliSwitch
@@ -10,13 +11,11 @@ import { AI_VAULT_AGENTS } from '../../../../shared/ai-vault-types'
 import { AiVaultSessionSurfaceSwitchMenuItems } from '../right-sidebar/AiVaultSessionSurfaceSwitchMenuItems'
 import {
   resolveNativeChatCliForkIdentity,
-  resolveTabSessionHistorySubject,
   type NativeChatTabSession
 } from './tab-session-history-switch'
-import { runNativeChatCliFork, useNativeChatCliForkPending } from './native-chat-cli-fork-run'
-import { useInPlaceSwitchCapability } from '@/lib/in-place-switch-support'
+import { inPlaceSwitchEnabled } from '../../../../shared/structured-agent-cli-conversation-adoption'
 
-/** "Switch to CLI" where the chat's host switches its agent in place; otherwise the fork. */
+/** Every supported chat switch uses the same consent and owning-host command. */
 export function NativeChatCliForkMenuItems({
   tab,
   nativeChat,
@@ -31,12 +30,8 @@ export function NativeChatCliForkMenuItems({
   const chat = useAppStore(
     useShallow((state) => resolveNativeChatCliForkIdentity(state, { tab, nativeChat }))
   )
-  const forkPending = useNativeChatCliForkPending(
-    chat ? { executionHostScope: chat.executionHostScope, sessionId: chat.sessionId } : null
-  )
-  const commandOverrides = useAppStore((state) => state.settings?.agentCmdOverrides)
   const agent = AI_VAULT_AGENTS.find((candidate) => candidate === nativeChat.agent)
-  const inPlace = useInPlaceSwitchCapability(chat?.executionHostScope, agent)
+  const confirm = useConfirmationDialog()
   const readiness = useConversationSwitchReadiness(
     chat && agent
       ? {
@@ -50,7 +45,7 @@ export function NativeChatCliForkMenuItems({
       : null
   )
   const enabled = useAppStore((state) => isNativeChatEnabled(state.settings))
-  if (!chat || !agent || !enabled) {
+  if (!chat || !agent || !enabled || !inPlaceSwitchEnabled(agent)) {
     return null
   }
   return (
@@ -60,30 +55,21 @@ export function NativeChatCliForkMenuItems({
         action="switch"
         menuKind="dropdown"
         tooltipSide="right"
-        cliPending={inPlace !== false ? readiness.pending : forkPending}
-        switchLoading={inPlace !== false && !readiness.ready}
+        cliPending={readiness.pending}
+        switchLoading={!readiness.ready}
         switchExplanation={readiness.explanation}
-        {...(inPlace !== false ? { inPlaceAgent: agent } : {})}
+        inPlaceAgent={agent}
         onResumeInNewCli={(event) => {
           event.preventDefault()
-          void (inPlace === true
-            ? runNativeChatCliSwitch({
-                sessionId: chat.sessionId,
-                workspaceId: chat.workspaceId,
-                executionHostId: chat.executionHostScope,
-                agent,
-                chatTabId: tab.id,
-                onComplete
-              })
-            : (() => {
-                const subject = resolveTabSessionHistorySubject(useAppStore.getState(), {
-                  tab,
-                  nativeChat
-                })
-                return subject?.kind === 'chat'
-                  ? runNativeChatCliFork({ subject, tab, agent, commandOverrides, onComplete })
-                  : Promise.resolve()
-              })())
+          void runNativeChatCliSwitch({
+            confirm,
+            sessionId: chat.sessionId,
+            workspaceId: chat.workspaceId,
+            executionHostId: chat.executionHostScope,
+            agent,
+            chatTabId: tab.id,
+            onComplete
+          })
         }}
       />
     </>
diff --git a/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx b/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx
index 9549556535d6..4a204255f465 100644
--- a/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx
+++ b/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx
@@ -24,6 +24,7 @@ const mocks = vi.hoisted(() => {
     pending: false,
     pendingListeners: new Set<() => void>(),
     runNativeChatCliFork: vi.fn(),
+    runNativeChatCliSwitch: vi.fn(),
     runCliChatResume: vi.fn(async () => {}),
     listSessions: vi.fn()
   }
@@ -52,7 +53,17 @@ vi.mock('./cli-chat-resume-source', () => ({
 }))
 vi.mock('@/lib/conversation-surface-switch', () => ({
   runCliChatResume: mocks.runCliChatResume,
-  useConversationSwitchReadiness: () => ({ ready: true, pending: false })
+  runNativeChatCliSwitch: mocks.runNativeChatCliSwitch,
+  useConversationSwitchReadiness: () => {
+    const pending = useSyncExternalStore(
+      (listener) => {
+        mocks.pendingListeners.add(listener)
+        return () => mocks.pendingListeners.delete(listener)
+      },
+      () => mocks.pending
+    )
+    return { ready: !pending, pending }
+  }
 }))
 
 const CHAT_SUBJECT = {
@@ -73,6 +84,7 @@ beforeEach(() => {
   mocks.cliSource = null
   mocks.pending = false
   mocks.runNativeChatCliFork.mockReset()
+  mocks.runNativeChatCliSwitch.mockReset()
   mocks.runCliChatResume.mockClear()
   mocks.listSessions.mockReset()
   mocks.listSessions.mockReturnValue(new Promise(() => {}))
@@ -121,11 +133,12 @@ describe('TabSessionSurfaceSwitchMenuItems', () => {
     mocks.subject = CHAT_SUBJECT
     renderItemsNow('orca-chat-1')
     expect(mocks.listSessions).not.toHaveBeenCalled()
-    fireEvent.click(screen.getByRole('menuitem', { name: 'Resume in New Terminal' }))
-    expect(mocks.runNativeChatCliFork).toHaveBeenCalledWith(
+    fireEvent.click(screen.getByRole('menuitem', { name: 'Switch to CLI' }))
+    expect(mocks.runNativeChatCliSwitch).toHaveBeenCalledWith(
       expect.objectContaining({
-        subject: CHAT_SUBJECT,
-        tab: { id: 'tab-1', worktreeId: 'wt-1' },
+        sessionId: 'orca-chat-1',
+        workspaceId: 'wt-1',
+        chatTabId: 'tab-1',
         agent: 'claude'
       })
     )
@@ -142,23 +155,28 @@ describe('TabSessionSurfaceSwitchMenuItems', () => {
     }
     mocks.cliSource = source
     renderItemsNow()
-    fireEvent.click(screen.getByRole('menuitem', { name: 'Resume in New Chat' }))
+    fireEvent.click(screen.getByRole('menuitem', { name: 'Switch to native chat' }))
     await act(async () => {})
-    expect(mocks.runCliChatResume).toHaveBeenCalledWith(source)
+    expect(mocks.runCliChatResume).toHaveBeenCalledWith(source, expect.any(Function))
     expect(mocks.listSessions).not.toHaveBeenCalled()
   })
 })
 
 it('keeps an accepted native action visible with shared disabled spinner feedback', async () => {
   mocks.subject = CHAT_SUBJECT
-  mocks.runNativeChatCliFork.mockImplementation(() => {
+  mocks.runNativeChatCliSwitch.mockImplementation(() => {
     mocks.pending = true
     mocks.pendingListeners.forEach((listener) => listener())
   })
   await renderItems('orca-chat-1')
-  fireEvent.click(screen.getByRole('menuitem', { name: 'Resume in New Terminal' }))
-  const item = screen.getByRole('menuitem', { name: 'Resume in New Terminal' })
+  fireEvent.click(screen.getByRole('menuitem', { name: 'Switch to CLI' }))
+  const item = screen.getByRole('menuitem', { name: 'Switch to CLI' })
   expect(item.getAttribute('aria-busy')).toBe('true')
   expect(item.getAttribute('data-disabled')).not.toBeNull()
   expect(item.querySelector('.animate-spin')).not.toBeNull()
 })
+
+vi.mock('@/components/confirmation-dialog-context', async (original) => ({
+  ...(await original<Record<string, unknown>>()),
+  useConfirmationDialog: () => vi.fn(async () => false)
+}))
diff --git a/src/renderer/src/components/tab-bar/TabSessionSwitchHoverAction.tsx b/src/renderer/src/components/tab-bar/TabSessionSwitchHoverAction.tsx
index bdc5e773038f..fc6915bfd964 100644
--- a/src/renderer/src/components/tab-bar/TabSessionSwitchHoverAction.tsx
+++ b/src/renderer/src/components/tab-bar/TabSessionSwitchHoverAction.tsx
@@ -1,3 +1,4 @@
+import { useConfirmationDialog } from '@/components/confirmation-dialog-context'
 import {
   useConversationSwitchReadiness,
   runCliChatResume,
@@ -9,9 +10,9 @@ import { MessagesSquare, SquareTerminal } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import { translate } from '@/i18n/i18n'
 import { useAppStore } from '@/store'
-import { useInPlaceSwitchCapability } from '@/lib/in-place-switch-support'
+import { inPlaceSwitchEnabled } from '../../../../shared/structured-agent-cli-conversation-adoption'
 import { AI_VAULT_AGENTS } from '../../../../shared/ai-vault-types'
-import { resolveCliChatResumeSource, useCliChatResumeCapability } from './cli-chat-resume-source'
+import { resolveCliChatResumeSource } from './cli-chat-resume-source'
 import {
   resolveNativeChatCliForkIdentity,
   type NativeChatTabSession
@@ -47,7 +48,7 @@ function ChatSwitchAction({
     useShallow((state) => resolveNativeChatCliForkIdentity(state, { tab, nativeChat }))
   )
   const agent = AI_VAULT_AGENTS.find((candidate) => candidate === nativeChat.agent)
-  const inPlace = useInPlaceSwitchCapability(chat?.executionHostScope, agent)
+  const confirm = useConfirmationDialog()
   const readiness = useConversationSwitchReadiness(
     chat && agent
       ? {
@@ -60,7 +61,7 @@ function ChatSwitchAction({
         }
       : null
   )
-  if (!chat || !agent || inPlace === false) {
+  if (!chat || !agent || !inPlaceSwitchEnabled(agent)) {
     return null
   }
   return (
@@ -71,6 +72,7 @@ function ChatSwitchAction({
       title={readiness.explanation}
       onClick={() =>
         void runNativeChatCliSwitch({
+          confirm,
           sessionId: chat.sessionId,
           workspaceId: chat.workspaceId,
           executionHostId: chat.executionHostScope,
@@ -91,11 +93,11 @@ function TerminalSwitchAction({
   tab: { id: string; worktreeId: string }
 }): React.JSX.Element | null {
   const source = useAppStore(useShallow((state) => resolveCliChatResumeSource(state, { tab })))
-  const capability = useCliChatResumeCapability(tab.worktreeId, source?.agent)
+  const confirm = useConfirmationDialog()
   const readiness = useConversationSwitchReadiness(
     source ? { direction: 'chat', ...source, source } : null
   )
-  if (!source || capability === false) {
+  if (!source || !inPlaceSwitchEnabled(source.agent)) {
     return null
   }
   return (
@@ -104,7 +106,7 @@ function TerminalSwitchAction({
       size="xs"
       disabled={!readiness.ready}
       title={readiness.explanation}
-      onClick={() => void runCliChatResume(source)}
+      onClick={() => void runCliChatResume(source, confirm)}
     >
       <MessagesSquare />
       {translate('components.tab.bar.switch.toNativeChat', 'Switch to native chat')}
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-exit-return.test-fixture.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-exit-return.test-fixture.ts
deleted file mode 100644
index 79296a69e984..000000000000
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-exit-return.test-fixture.ts
+++ /dev/null
@@ -1,302 +0,0 @@
-import { expect, vi } from 'vitest'
-import { Terminal } from '@xterm/xterm'
-import { FitAddon } from '@xterm/addon-fit'
-import { SearchAddon } from '@xterm/addon-search'
-import { SerializeAddon } from '@xterm/addon-serialize'
-import { PaneManager } from '@/lib/pane-manager/pane-manager'
-import { isTerminalLeafId } from '../../../../shared/stable-pane-id'
-import { useAppStore } from '@/store'
-import {
-  makeTerminalTab,
-  TEST_REPO,
-  makeWorktree
-} from '@/store/slices/worktrees-slice-test-fixtures'
-import type { StructuredAgentSessionCreateParams } from '../../../../shared/structured-agent-session-create'
-import type { CliChatResumeTestMocks } from './cli-chat-resume-mocks.test-fixture'
-import { resolveCliChatResumeSource } from './cli-chat-resume-source'
-import { canPaneOfferResumeInNewChat } from './tab-session-history-switch'
-import { collectAgentPaneConversations } from '@/lib/ai-vault-tab-title-requests'
-import { adoptsCliConversations } from '../../../../shared/structured-agent-cli-conversation-adoption'
-import { inPlaceSwitchSupportedNow } from '@/lib/in-place-switch-support'
-import { switchAiVaultSessionToNativeChat } from '../right-sidebar/ai-vault-session-in-place-switch'
-import { installPaneAgentIdentity } from '../terminal-pane/pty-connection/pane-agent-identity'
-import { installSleepingRecordAccess } from '../terminal-pane/pty-connection/sleeping-record-access'
-import type { ConnectPanePtySession } from '../terminal-pane/pty-connection/connect-pane-pty-session'
-import { TerminalIdleCursorReset } from '../terminal-pane/terminal-idle-cursor-reset'
-import { LEAF_1, LEAF_2 } from '../terminal-pane/pty-connection-test-pane-fixtures'
-import { createExitReturnTransport } from './cli-chat-resume-transport.test-fixture'
-import type { AiVaultSession } from '../../../../shared/ai-vault-types'
-import { installExitedPaneRetirement } from './cli-chat-resume-parked-retirement.test-fixture'
-import {
-  capturedPanesByTabId,
-  parkedWatchersByTabId
-} from '../terminal-pane/terminal-parked-watcher-registry'
-
-export async function verifyExitedPaneHistoryReturn(
-  mocks: CliChatResumeTestMocks,
-  redrawFromMain: () => Promise<void>,
-  settleMain: () => Promise<void>,
-  deferred: <T>() => { promise: Promise<T>; resolve: (value: T) => void }
-): Promise<void> {
-  const tabs = () => useAppStore.getState().unifiedTabsByWorktree['wt-1'] ?? []
-  mocks.realSource = true
-  mocks.switchCapability.mockResolvedValue(true)
-  useAppStore.setState({
-    repos: [TEST_REPO],
-    worktreesByRepo: { repo1: [makeWorktree({ id: 'wt-1', repoId: 'repo1' })] },
-    tabsByWorktree: { 'wt-1': [makeTerminalTab({ id: 'shell', worktreeId: 'wt-1' })] },
-    terminalLayoutsByTabId: {
-      shell: {
-        root: {
-          type: 'split',
-          direction: 'horizontal',
-          first: { type: 'leaf', leafId: LEAF_1 },
-          second: { type: 'leaf', leafId: LEAF_2 }
-        },
-        activeLeafId: LEAF_2,
-        expandedLeafId: null,
-        ptyIdsByLeafId: { [LEAF_1]: 'pty-1', [LEAF_2]: 'pty-2' }
-      }
-    }
-  })
-  const pinned = useAppStore
-    .getState()
-    .createUnifiedTab('wt-1', 'editor', { entityId: 'pinned', isPinned: true })
-  const source = useAppStore
-    .getState()
-    .createUnifiedTab('wt-1', 'terminal', { id: 'shell', entityId: 'shell' })
-  const next = useAppStore.getState().createUnifiedTab('wt-1', 'editor', { entityId: 'next' })
-  await redrawFromMain()
-  const paneKey = `shell:${LEAF_1}`
-  const pane = { worktreeId: 'wt-1', paneKey }
-  useAppStore
-    .getState()
-    .setAgentStatus(
-      paneKey,
-      { agentType: 'codex', state: 'working', prompt: 'CLI_OK' },
-      undefined,
-      undefined,
-      { worktreeId: 'wt-1', tabId: 'shell' },
-      { providerSession: { key: 'session_id', id: 'conversation-C' } }
-    )
-  const sibling = `shell:${LEAF_2}`
-  useAppStore
-    .getState()
-    .setAgentStatus(
-      sibling,
-      { agentType: 'codex', state: 'working', prompt: 'D stays working' },
-      undefined,
-      undefined,
-      { worktreeId: 'wt-1', tabId: 'shell' },
-      { providerSession: { key: 'session_id', id: 'conversation-D' } }
-    )
-  const siblingStatus = useAppStore.getState().agentStatusByPaneKey[sibling]
-  // The existing host exit row carries identity without claiming a running agent.
-  useAppStore
-    .getState()
-    .recordAgentProviderSession(
-      paneKey,
-      'codex',
-      { key: 'session_id', id: 'conversation-C' },
-      undefined,
-      {
-        worktreeId: 'wt-1',
-        tabId: 'shell'
-      }
-    )
-  useAppStore.getState().setPaneForegroundAgent(paneKey, {
-    agent: 'codex',
-    agentEvidence: 'process-read',
-    shellForeground: false
-  })
-  if (!isTerminalLeafId(LEAF_1)) {
-    throw new Error('Expected a valid fixture leaf ID')
-  }
-  const terminal = new Terminal({ cols: 120, rows: 40 })
-  const manager = new PaneManager(document.createElement('div'), { linkOpenHint: () => '' })
-  const connection: ConnectPanePtySession = {
-    cacheKey: paneKey,
-    pane: {
-      id: 1,
-      leafId: LEAF_1,
-      stablePaneId: LEAF_1,
-      terminal,
-      container: document.createElement('div'),
-      linkTooltip: document.createElement('div'),
-      fitAddon: new FitAddon(),
-      searchAddon: new SearchAddon(),
-      serializeAddon: new SerializeAddon()
-    },
-    manager,
-    deps: {
-      tabId: 'shell',
-      worktreeId: 'wt-1',
-      mountFollowsTerminalPark: false,
-      paneTransportsRef: { current: new Map() },
-      paneMode2031Ref: { current: new Map() },
-      paneKittyKeyboardModesRef: { current: new Map() },
-      paneLastThemeModeRef: { current: new Map() },
-      replayingPanesRef: { current: new Map() },
-      isActiveRef: { current: true },
-      isVisibleRef: { current: true },
-      onPtyExitRef: { current: vi.fn() },
-      onAgentExitedRef: { current: vi.fn() },
-      clearTabPtyId: vi.fn(),
-      consumeSuppressedPtyExit: vi.fn(() => false),
-      isPtyShutdownPending: vi.fn(() => false),
-      updateTabTitle: vi.fn(),
-      setRuntimePaneTitle: vi.fn(),
-      clearRuntimePaneTitle: vi.fn(),
-      updateTabPtyId: vi.fn(),
-      markTerminalBell: vi.fn(),
-      onShowSessionRestoredBanner: vi.fn(),
-      dispatchNotification: vi.fn(),
-      setCacheTimerStartedAt: vi.fn(),
-      syncPanePtyLayoutBinding: vi.fn(),
-      clearExitedPanePtyLayoutBinding: vi.fn()
-    },
-    transport: createExitReturnTransport('pty-1'),
-    hiddenOutputRestoreUnhideSeq: null,
-    idleCursorReset: new TerminalIdleCursorReset(),
-    paneStartup: null,
-    writeInputModeGround: vi.fn()
-  }
-  installSleepingRecordAccess(connection)
-  installPaneAgentIdentity(connection)
-  connection.paneForegroundAgentTracker.onProcessExitConfirmed({
-    agent: 'codex',
-    processName: 'codex'
-  })
-  expect(useAppStore.getState().agentStatusByPaneKey[paneKey]).toBeUndefined()
-  expect(useAppStore.getState().sleepingAgentSessionsByPaneKey[paneKey]).toBeUndefined()
-  expect(
-    collectAgentPaneConversations(useAppStore.getState(), adoptsCliConversations, {
-      runningAgentsOnly: true
-    })
-  ).toMatchObject([{ providerSession: { id: 'conversation-D' } }])
-  expect(
-    collectAgentPaneConversations(useAppStore.getState(), adoptsCliConversations, {
-      allPanes: true
-    })
-  ).toEqual(
-    expect.arrayContaining([
-      expect.objectContaining({
-        paneKey,
-        providerSession: { key: 'session_id', id: 'conversation-C' }
-      })
-    ])
-  )
-  expect(canPaneOfferResumeInNewChat(useAppStore.getState(), pane)).toBe(true)
-  expect(
-    resolveCliChatResumeSource(useAppStore.getState(), {
-      tab: { id: 'shell', worktreeId: 'wt-1' },
-      paneKey
-    })
-  ).toMatchObject({ providerSessionId: 'conversation-C', paneKey, ptyId: 'pty-1' })
-  const history: AiVaultSession = {
-    id: 'history-C',
-    sessionId: 'conversation-C',
-    agent: 'codex',
-    executionHostId: 'local',
-    title: 'Conversation',
-    cwd: null,
-    branch: null,
-    model: null,
-    filePath: '',
-    codexHome: null,
-    createdAt: null,
-    updatedAt: null,
-    modifiedAt: '',
-    messageCount: 0,
-    totalTokens: 0,
-    previewMessages: [],
-    queuedMessageCount: 0,
-    subagentTranscriptCount: 0,
-    resumeCommand: 'codex resume conversation-C',
-    subagent: null
-  }
-  await vi.waitFor(() => expect(inPlaceSwitchSupportedNow('local', 'codex')).toBe(true))
-  mocks.source = resolveCliChatResumeSource(useAppStore.getState(), {
-    tab: { id: 'shell', worktreeId: 'wt-1' },
-    paneKey
-  })
-  mocks.call.mockResolvedValueOnce({
-    ok: false,
-    refusal: {
-      code: 'agent_session_identity_required',
-      message: 'private host error',
-      details: { reason: 'transcriptUnreadable' },
-      createAttemptRefusedBeforeCommit: true
-    }
-  })
-  expect(
-    switchAiVaultSessionToNativeChat(history, 'wt-1', {
-      worktreeId: 'wt-1',
-      tabId: 'shell',
-      leafId: LEAF_1,
-      paneKey: pane.paneKey
-    })
-  ).toBe(true)
-  await vi.waitFor(() => expect(mocks.toast).toHaveBeenCalledOnce())
-  expect(mocks.call.mock.calls.some(([, method]) => method === 'agentSession.create')).toBe(true)
-  expect(mocks.toast).toHaveBeenCalledWith(
-    "Codex couldn't open this conversation's history. Check that its saved conversation is available, then try again."
-  )
-  expect(tabs().map((tab) => tab.id)).toContain('shell')
-  expect(mocks.rpc.mock.calls.some(([, method]) => method === 'terminal.close')).toBe(false)
-  expect(canPaneOfferResumeInNewChat(useAppStore.getState(), pane)).toBe(true)
-
-  const ready = deferred<unknown>()
-  mocks.call.mockImplementation(
-    async (_target, method, params: StructuredAgentSessionCreateParams) =>
-      method === 'agentSession.switchToChat'
-        ? ready.promise
-        : { ok: true, value: { sessionId: params.envelope.sessionId, fence: 1 } }
-  )
-  const { closed, siblingWatcher } = installExitedPaneRetirement(mocks)
-  try {
-    expect(
-      switchAiVaultSessionToNativeChat(history, 'wt-1', {
-        worktreeId: 'wt-1',
-        tabId: 'shell',
-        leafId: LEAF_1,
-        paneKey: pane.paneKey
-      })
-    ).toBe(true)
-    await vi.waitFor(() =>
-      expect(
-        mocks.call.mock.calls.some(([, method]) => method === 'agentSession.switchToChat')
-      ).toBe(true)
-    )
-    expect(closed).not.toHaveBeenCalled()
-    ready.resolve({ ok: true })
-    await vi.waitFor(() => expect(closed).toHaveBeenCalledOnce())
-    await settleMain()
-    const chat = tabs().find((tab) => tab.contentType === 'agent-session')!
-    expect(
-      useAppStore.getState().groupsByWorktree['wt-1'].find((group) => group.id === source.groupId)
-        ?.tabOrder
-    ).toEqual([pinned.id, source.id, chat.id, next.id])
-    expect(chat.groupId).toBe(source.groupId)
-    expect(chat.isPinned).not.toBe(true)
-    expect(tabs().find((tab) => tab.id === pinned.id)?.isPinned).toBe(true)
-    expect(useAppStore.getState().agentStatusByPaneKey[sibling]).toBe(siblingStatus)
-    expect(useAppStore.getState().terminalLayoutsByTabId.shell.ptyIdsByLeafId).toEqual({
-      [LEAF_2]: 'pty-2'
-    })
-    expect(
-      collectAgentPaneConversations(useAppStore.getState(), adoptsCliConversations)
-    ).toMatchObject([{ paneKey: sibling }])
-    expect(useAppStore.getState().agentConversationsByPaneKey[paneKey]).toBeUndefined()
-    expect(siblingWatcher).not.toHaveBeenCalled()
-    expect(capturedPanesByTabId.get('shell')?.panes.map((pane) => pane.leafId)).toEqual([LEAF_2])
-    expect([...parkedWatchersByTabId.get('shell')!.paneIdByPtyId.keys()]).toEqual(['pty-2'])
-  } finally {
-    capturedPanesByTabId.delete('shell')
-    parkedWatchersByTabId.delete('shell')
-    connection.paneForegroundAgentTracker.dispose()
-    connection.commandLifecycle.dispose()
-    manager.destroy()
-    terminal.dispose()
-  }
-}
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
index eb4f5c77b798..f50d8e51a0b1 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
@@ -1,3 +1,4 @@
+import { conversationSwitchViewerSelectionCurrent } from '@/lib/conversation-switch-selection'
 import { conversationSwitchFailureText } from '@/lib/conversation-switch-feedback'
 import { useAppStore } from '@/store'
 import { parseWorkspaceKey } from '../../../../shared/workspace-scope'
@@ -25,11 +26,12 @@ import type { CliChatResumeSource } from './cli-chat-resume-source'
 export async function reportCliChatResumeFailure(
   source: CliChatResumeSource,
   error: unknown,
-  target: RuntimeClientTarget
+  target: RuntimeClientTarget,
+  viewerSelection?: string
 ): Promise<boolean> {
   const owner = structuredLaunchFailure(error)?.owner
   if (owner) {
-    return switchIntoOwnerLegacy(source, owner, target)
+    return switchIntoOwnerLegacy(source, owner, target, viewerSelection)
   }
   toastCliChatResumeFailure(source, error)
   return false
@@ -38,11 +40,17 @@ export async function reportCliChatResumeFailure(
 export async function switchIntoOwnerLegacy(
   source: Pick<AiVaultSession, 'agent'> & Pick<CliChatResumeSource, 'tabId' | 'workspaceId'>,
   structuredSession: NonNullable<AiVaultSession['structuredSession']>,
-  target: RuntimeClientTarget
+  target: RuntimeClientTarget,
+  viewerSelection?: string
 ): Promise<boolean> {
   // A host without the switch keeps the earlier behaviour: the chat is shown, the terminal stays.
   if (!(await supportsInPlaceSwitch(target, source.agent))) {
-    await activateAiVaultStructuredSession({ structuredSession }, undefined, target)
+    await activateAiVaultStructuredSession(
+      { structuredSession },
+      undefined,
+      target,
+      viewerSelection
+    )
     return false
   }
   if (!(await startCliChatReturn(source, structuredSession.sessionId, target))) {
@@ -51,7 +59,8 @@ export async function switchIntoOwnerLegacy(
   const shown = await activateAiVaultStructuredSessionVerified(
     { structuredSession },
     undefined,
-    target
+    target,
+    viewerSelection
   )
   if (shown !== 'activated') {
     return false
@@ -95,7 +104,10 @@ export async function switchIntoOwnerLegacy(
         order.splice(index, 0, chat.id)
         state.reorderUnifiedTabs(group.id, order)
       } else {
-        state.moveUnifiedTabToGroup(chat.id, group.id, { index, activate: true })
+        state.moveUnifiedTabToGroup(chat.id, group.id, {
+          index,
+          activate: conversationSwitchViewerSelectionCurrent(viewerSelection)
+        })
       }
     }
   }
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-mocks.test-fixture.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-mocks.test-fixture.ts
deleted file mode 100644
index 6a4fe100e334..000000000000
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-mocks.test-fixture.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import type { Mock } from 'vitest'
-import type { CliChatResumeSource } from './cli-chat-resume-source'
-
-export type CliChatResumeTestMocks = {
-  source: CliChatResumeSource | null
-  realSource: boolean
-  frameDrawn: boolean
-  sourceCapability: Mock
-  createCapability: Mock
-  call: Mock
-  toast: Mock
-  success: Mock
-  info: Mock
-  activate: Mock<() => Promise<boolean>>
-  activateVerified: Mock<() => Promise<string>>
-  switchCapability: Mock<() => Promise<boolean>>
-  exitWatchers: Map<string, () => void>
-  rpc: Mock<(...args: unknown[]) => Promise<object>>
-  inspect: Mock<(ptyId: string) => Promise<{ foregroundProcessEvidence?: unknown }>>
-}
-
-export function seedCliChatResumeRpc(mocks: CliChatResumeTestMocks): void {
-  mocks.rpc.mockImplementation(async (_target, method) =>
-    method === 'terminal.resolvePane'
-      ? {
-          terminal: {
-            handle: 'handle-1',
-            ptyId: 'pty-1',
-            incarnationId: 'i1',
-            presentation: {
-              identity: {
-                worktreeId: 'wt-1',
-                tabId: mocks.source?.tabId ?? 'tab-1',
-                leafId: mocks.source?.paneKey.split(':')[1] ?? 'leaf-1',
-                createdAt: 1,
-                generation: 0,
-                hasLeaf: true,
-                ptyId: 'pty-1',
-                incarnationId: 'i1'
-              },
-              holders: []
-            }
-          }
-        }
-      : { close: { ptyKilled: true } }
-  )
-}
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-parked-retirement.test-fixture.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-parked-retirement.test-fixture.ts
deleted file mode 100644
index fdc3aa45995c..000000000000
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-parked-retirement.test-fixture.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import { vi, type Mock } from 'vitest'
-import { useAppStore } from '@/store'
-import type { CliChatResumeTestMocks } from './cli-chat-resume-mocks.test-fixture'
-import { LEAF_1, LEAF_2 } from '../terminal-pane/pty-connection-test-pane-fixtures'
-import { captureTerminalSurfaceIdentity } from '../../../../shared/terminal-tab-close'
-import { TerminalClose } from '../../../../shared/rpc-contract/terminal-unary-params'
-import { retireTerminalPresentation } from '../terminal-pane/terminal-presentation-retirement'
-import {
-  capturedPanesByTabId,
-  parkedWatchersByTabId
-} from '../terminal-pane/terminal-parked-watcher-registry'
-
-export function installExitedPaneRetirement(mocks: CliChatResumeTestMocks): {
-  closed: Mock
-  siblingWatcher: Mock
-} {
-  const closed = vi.fn()
-  const siblingWatcher = vi.fn()
-  capturedPanesByTabId.set('shell', {
-    worktreeId: 'wt-1',
-    panes: [
-      { paneId: 1, leafId: LEAF_1, ptyId: 'pty-1', drivesTabTitle: false },
-      { paneId: 2, leafId: LEAF_2, ptyId: 'pty-2', drivesTabTitle: true }
-    ]
-  })
-  parkedWatchersByTabId.set('shell', {
-    worktreeId: 'wt-1',
-    tabPtyId: 'pty-2',
-    paneIdByPtyId: new Map([
-      ['pty-1', 1],
-      ['pty-2', 2]
-    ]),
-    disposersByPtyId: new Map([
-      ['pty-1', closed],
-      ['pty-2', siblingWatcher]
-    ])
-  })
-  mocks.rpc.mockImplementation(async (_target, method, params: unknown) => {
-    if (method === 'terminal.resolvePane') {
-      const identity = captureTerminalSurfaceIdentity(
-        useAppStore.getState(),
-        'wt-1',
-        'shell',
-        LEAF_1
-      )
-      if (!identity) {
-        throw new Error('Missing original terminal')
-      }
-      return {
-        terminal: {
-          handle: 'handle-1',
-          ptyId: 'pty-1',
-          incarnationId: 'i1',
-          presentation: { identity: { ...identity, incarnationId: 'i1' }, holders: [] }
-        }
-      }
-    }
-    if (method !== 'terminal.close') {
-      throw new Error('Unexpected RPC')
-    }
-    const close = TerminalClose.parse(params)
-    if (!close.originalPresentation) {
-      throw new Error('Missing original presentation')
-    }
-    retireTerminalPresentation(close.originalPresentation.identity)
-    return { close: { ptyKilled: true } }
-  })
-  return { closed, siblingWatcher }
-}
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
index 8407d2a032a5..d1ee070f6b86 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
@@ -1,834 +1,151 @@
-import { verifyCliChatResumeSlotOrder } from './cli-chat-resume-slot-order.test-fixture'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { CliChatResumeSource } from './cli-chat-resume-source'
-import type * as ResumeSourceModule from './cli-chat-resume-source'
-import type * as RuntimeRpcModule from '@/runtime/runtime-rpc-client'
-import type { AgentSessionWireRefusal } from '../../../../shared/agent-session-wire'
-import type { StructuredAgentSessionCreateParams } from '../../../../shared/structured-agent-session-create'
-import type * as FrameDrawnChatTabPlacementModule from '@/lib/frame-drawn-chat-tab-placement'
-import {
-  seedCliChatResumeRpc,
-  type CliChatResumeTestMocks
-} from './cli-chat-resume-mocks.test-fixture'
-import {
-  STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY,
-  STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY
-} from '../../../../shared/protocol-version'
-import { adoptAgentSessionLaunchVerdict } from '@/lib/agent-session-launch-plan'
-import { newAgentLaunchRequestId } from '@/lib/agent-launch-request-id'
-import { beginStructuredAgentSessionProvisionalLaunch } from '@/lib/agent-session/structured-agent-session-provisional-tab'
-import {
-  getStructuredAgentSessionLaunchLifecycle,
-  retryStructuredAgentSessionLaunch
-} from '@/lib/structured-agent-session-launch'
-import {
-  readStructuredAgentLaunchRecord,
-  writeStructuredAgentLaunchRecord,
-  resetStructuredAgentLaunchPersistenceForTests
-} from '@/lib/agent-session/launch/structured-agent-session-launch-persistence'
-import {
-  reserveStructuredLaunchSlot,
-  restoreStructuredLaunchSurfaces,
-  stopStructuredLaunchSlotTracking
-} from '@/lib/structured-agent-session-launch-surface'
-import { applyStructuredSessionTabSnapshots } from '@/runtime/local-structured-session-tabs-sync/snapshot-apply'
-import { resetLocalStructuredSessionVersionForTests } from '@/runtime/local-structured-session-tabs-sync/inventory-generation-fence'
-import { resetWebSessionTabsSnapshotFreshnessForTests } from '@/runtime/web-session-tabs-sync/tracking-lifecycle'
-import { buildWorkspaceSessionPayload } from '@/lib/workspace-session'
-import { buildHydratedTabState } from '@/store/slices/tabs-hydration'
-import { makeTerminalTab, makeWorktree } from '@/store/slices/worktrees-slice-test-fixtures'
-import { useAppStore } from '@/store'
-import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
-import { layoutApplyTestTransport } from '@/runtime/layout-apply-test-transport.test-fixture'
-import { runLegacyCliChatResume as runCliChatResume } from './cli-chat-resume-run'
-import { verifyExitedPaneHistoryReturn } from './cli-chat-resume-exit-return.test-fixture'
-import { switchIntoOwnerLegacy as switchIntoOwner } from './cli-chat-resume-feedback'
-import { toWebTerminalSurfaceTabId } from '../../../../shared/terminal-surface-id'
-import {
-  resetStructuredAgentLaunchRegistryForTests,
-  structuredLaunchStates
-} from '@/lib/agent-session/launch/structured-agent-session-launch-registry'
-import { isEmptyWorkspaceDefaultSurfacePending } from '@/lib/empty-workspace-default-surface-claims'
-import {
-  peekWebSessionFocusIntent,
-  resetWebSessionFocusIntentForTests
-} from '@/runtime/web-session-focus-intent'
-import { structuredAgentSessionFocusOwner } from '@/runtime/structured-agent-session-owner'
-import {
-  drawTabsFromMain,
-  type TabsDrawnFromMain
-} from '@/store/slices/tabs-drawn-from-main.test-fixture'
-import { snapshot } from './cli-chat-resume-snapshot.test-fixture'
-
 // @vitest-environment happy-dom
+import { beforeEach, expect, it, vi } from 'vitest'
+import { runLegacyCliChatResume } from './cli-chat-resume-run'
+import type { CliChatResumeSource } from './cli-chat-resume-source'
 
-const mocks: CliChatResumeTestMocks = vi.hoisted(() => {
-  const state: { source: CliChatResumeSource | null } = { source: null }
+const mocks = vi.hoisted(() => {
+  const live: { source: CliChatResumeSource | null } = { source: null }
   return {
-    ...state,
-    realSource: false,
-    sourceCapability: vi.fn(),
-    createCapability: vi.fn(),
-    call: vi.fn(),
-    toast: vi.fn(),
-    frameDrawn: false,
-    success: vi.fn(),
+    rpc: vi.fn(),
+    launch: vi.fn(),
+    report: vi.fn(),
     info: vi.fn(),
-    activate: vi.fn(async () => true),
-    activateVerified: vi.fn(async () => 'activated'),
-    switchCapability: vi.fn(async () => false),
-    exitWatchers: new Map<string, () => void>(),
-    rpc: vi.fn(async (..._args: unknown[]) => ({})),
-    inspect: vi.fn(async (_ptyId: string): Promise<{ foregroundProcessEvidence?: unknown }> => ({}))
-  }
-})
-
-vi.mock('@/runtime/runtime-terminal-inspection', () => ({
-  inspectRuntimeTerminalProcess: mocks.inspect
-}))
-vi.mock('../terminal-pane/pty-dispatcher', () => ({
-  subscribeToPtyExit: (ptyId: string, watcher: () => void) => {
-    mocks.exitWatchers.set(ptyId, watcher)
-    return () => mocks.exitWatchers.delete(ptyId)
-  }
-}))
-vi.mock('./cli-chat-resume-source', async (importOriginal) => {
-  const actual = await importOriginal<typeof ResumeSourceModule>()
-  return {
-    ...actual,
-    resolveCliChatResumeSource: (...args: Parameters<typeof actual.resolveCliChatResumeSource>) =>
-      mocks.realSource ? actual.resolveCliChatResumeSource(...args) : mocks.source
+    error: vi.fn(),
+    live,
+    state: {
+      activeView: 'worktrees',
+      groupsByWorktree: {},
+      tabsByWorktree: { workspace: [{ id: 'tab', createdAt: 1 }] },
+      terminalLayoutsByTabId: {
+        tab: {
+          root: { type: 'leaf', leafId: 'leaf' },
+          ptyIdsByLeafId: { leaf: 'pty' }
+        }
+      }
+    }
   }
 })
-vi.mock('@/runtime/structured-agent-session-client', () => ({
-  supportsStructuredAgentSessionCliSource: mocks.sourceCapability,
-  supportsStructuredAgentSessionCreateMessage: mocks.createCapability,
-  supportsInPlaceSwitch: (_target: unknown, _agent: string, execution = false) =>
-    execution ? Promise.resolve(false) : mocks.switchCapability(),
-  callStructuredAgentSession: (...args: unknown[]) =>
-    args[1] === 'agentSession.createSupport'
-      ? Promise.resolve({ supported: true })
-      : mocks.call(...args)
-}))
-vi.mock('@/runtime/local-runtime-capabilities', async (importOriginal) => ({
-  ...(await importOriginal<Record<string, unknown>>()),
-  readLocalRuntimeCapabilitiesOrUnknown: () => [
-    STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY,
-    STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY,
-    'agent-session.structured.switch.v1:codex'
-  ]
+vi.mock('sonner', () => ({ toast: { info: mocks.info, error: mocks.error } }))
+vi.mock('@/runtime/runtime-rpc-client', () => ({ callRuntimeRpc: mocks.rpc }))
+vi.mock('@/runtime/structured-agent-session-owner', () => ({
+  structuredAgentSessionTargetForHost: () => ({ kind: 'local' })
 }))
-vi.mock('@/runtime/host-structured-agents', async (importOriginal) => ({
-  ...(await importOriginal<Record<string, unknown>>()),
-  readHostStructuredAgents: () => [
-    { agent: 'codex', capabilities: {} },
-    { agent: 'claude', capabilities: {} }
-  ]
+vi.mock('./cli-chat-resume-terminal-capture', () => ({
+  captureSourceTerminal: async () => ({
+    target: { kind: 'local' },
+    handle: 'exact',
+    incarnationId: 'incarnation',
+    presentation: { identity: { ptyId: 'pty' } }
+  })
 }))
-vi.mock('@/runtime/structured-session-tab-inventory', () => ({
-  readStructuredSessionTabInventory: async () => {
-    throw new Error('Reply unavailable')
-  }
+vi.mock('./cli-chat-resume-source', () => ({ resolveCliChatResumeSource: () => mocks.live.source }))
+vi.mock('../right-sidebar/ai-vault-session-resume-in-chat-launch', () => ({
+  adoptingAgentOnHost: async (agent: string) => agent
 }))
-vi.mock('@/lib/structured-agent-session-create-hydration', () => ({
-  publishStructuredAgentSessionCreateHydration: vi.fn()
+vi.mock('./cli-chat-resume-feedback', () => ({ reportCliChatResumeFailure: mocks.report }))
+vi.mock('@/lib/agent-session/structured-agent-session-provisional-tab', () => ({
+  beginStructuredAgentSessionProvisionalLaunch: mocks.launch
 }))
-vi.mock('sonner', () => ({
-  toast: { error: mocks.toast, success: mocks.success, info: mocks.info }
+vi.mock('@/lib/agent-session-launch-plan', () => ({
+  adoptAgentSessionLaunchVerdict: (args: unknown) => args
 }))
-// A frame-drawn server workspace's create carries the tab's place, read as it is sent.
-vi.mock('@/lib/frame-drawn-chat-tab-placement', async (importOriginal) => {
-  const actual = await importOriginal<typeof FrameDrawnChatTabPlacementModule>()
-  return {
-    ...actual,
-    withFrameDrawnChatTabPlacement: (
-      intent: Parameters<typeof actual.withFrameDrawnChatTabPlacement>[0]
-    ) =>
-      mocks.frameDrawn
-        ? { ...intent.params, tabPlacement: { groupId: 'g-1' } }
-        : actual.withFrameDrawnChatTabPlacement(intent)
-  }
-})
-vi.mock('@/lib/activate-ai-vault-structured-session', () => ({
-  activateAiVaultStructuredSession: mocks.activate,
-  activateAiVaultStructuredSessionVerified: mocks.activateVerified
-}))
-// Switch-on, main opens the chat's tab and its frame draws it.
-vi.mock('@/runtime/runtime-rpc-client', async (importOriginal) => {
-  const actual = await importOriginal<typeof RuntimeRpcModule>()
-  const layout = (
-    await import('@/runtime/layout-apply-test-transport.test-fixture')
-  ).runtimeRpcClientWithLayoutApply(actual)
-  return {
-    ...layout,
-    runtimeEnvironmentSupportsCapability: async () => true,
-    callRuntimeRpc: (...args: Parameters<typeof actual.callRuntimeRpc>) =>
-      args[1] === 'layout.apply' ? layout.callRuntimeRpc(...args) : mocks.rpc(...args)
-  }
-})
-vi.mock('@/runtime/runtime-layout-client', async (importOriginal) =>
-  (
-    await import('@/runtime/layout-apply-test-transport.test-fixture')
-  ).runtimeLayoutClientWithTestFrames(await importOriginal())
-)
+vi.mock('@/store', () => ({ useAppStore: { getState: () => mocks.state } }))
 
-const SOURCE: CliChatResumeSource = {
-  tabId: 'tab-1',
-  workspaceId: 'wt-1',
-  paneKey: 'tab-1:leaf',
-  agent: 'claude',
-  providerSessionId: 'provider-1',
+const source: CliChatResumeSource = {
+  agent: 'codex',
   executionHostId: 'local',
-  ptyId: 'pty-1'
-}
-const tabs = () => useAppStore.getState().unifiedTabsByWorktree['wt-1'] ?? []
-let main: TabsDrawnFromMain | undefined
-const deferredCleanups: (() => void)[] = []
-afterEach(async () => {
-  for (const finish of deferredCleanups.splice(0)) {
-    finish()
-  }
-  // Settle fixture-owned replies even when an assertion prevented its normal resolver.
-  await new Promise((resolve) => setTimeout(resolve, 0))
-  vi.unstubAllGlobals()
-  main?.close()
-  main = undefined
-})
-function deferred<T>() {
-  let resolve: (value: T) => void = () => {}
-  const promise = new Promise<T>((done) => {
-    resolve = done
-  })
-  deferredCleanups.push(() => resolve(undefined!))
-  return { promise, resolve }
+  workspaceId: 'workspace',
+  tabId: 'tab',
+  paneKey: 'tab:leaf',
+  ptyId: 'pty',
+  providerSessionId: 'conversation'
 }
-function refuse(reason: 'transcriptNotFound' | 'transcriptUnreadable'): AgentSessionWireRefusal {
-  return {
-    code: 'agent_session_identity_required',
-    message: 'private host error',
-    details: { reason },
-    createAttemptRefusedBeforeCommit: true
-  }
-}
-
-beforeEach(async () => {
+beforeEach(() => {
   vi.clearAllMocks()
-  mocks.call.mockReset()
-  mocks.rpc.mockReset()
-  mocks.createCapability.mockReset()
-  mocks.sourceCapability.mockReset()
-  resetLocalStructuredSessionVersionForTests()
-  resetWebSessionTabsSnapshotFreshnessForTests()
-  stopStructuredLaunchSlotTracking()
-  localStorage.clear()
-  resetStructuredAgentLaunchPersistenceForTests()
-  resetStructuredAgentLaunchRegistryForTests()
-  resetWebSessionFocusIntentForTests()
-  useAppStore.setState(useAppStore.getInitialState(), true)
-  useAppStore.setState({ activeWorktreeId: 'wt-1' })
-  mocks.source = SOURCE
-  mocks.realSource = false
-  mocks.switchCapability.mockResolvedValue(false)
-  seedCliChatResumeRpc(mocks)
-  mocks.frameDrawn = false
-  mocks.sourceCapability.mockResolvedValue(true)
-  mocks.createCapability.mockResolvedValue(true)
-  mocks.call.mockImplementation(
-    async (_target, method, params: StructuredAgentSessionCreateParams) => {
-      expect(method).toBe('agentSession.create')
-      return { ok: true, value: { sessionId: params.envelope.sessionId, fence: 1 } }
-    }
-  )
-  main = await drawTabsFromMain(useAppStore)
-  useAppStore.setState({
-    tabsByWorktree: {
-      'wt-1': [makeTerminalTab({ id: 'tab-1', worktreeId: 'wt-1', createdAt: 1 })]
-    },
-    terminalLayoutsByTabId: {
-      'tab-1': {
-        root: { type: 'leaf', leafId: 'leaf' },
-        activeLeafId: 'leaf',
-        expandedLeafId: null,
-        ptyIdsByLeafId: { leaf: 'pty-1' }
-      }
-    }
+  mocks.live.source = source
+  mocks.state = {
+    ...mocks.state,
+    activeView: 'worktrees',
+    tabsByWorktree: { workspace: [{ id: 'tab', createdAt: 1 }] }
+  }
+  mocks.rpc.mockResolvedValue({ stoppedPtyIds: ['pty'], postStopVerified: true })
+  mocks.launch.mockReturnValue({
+    settlement: Promise.resolve({ kind: 'structured', sessionId: 'same' })
   })
 })
 
-/** Main takes the store's current layout, as after a restart; seeding after it is invisible to main. */
-async function redrawFromMain(): Promise<void> {
-  main?.close()
-  main = await drawTabsFromMain(useAppStore)
-}
-
-async function seedTabs() {
-  const seeded = ['E', 'S', 'B'].map((id) =>
-    useAppStore.getState().createUnifiedTab('wt-1', 'editor', { id, entityId: id })
-  )
-  await redrawFromMain()
-  return seeded
-}
-
-const HOST_LEAF = '11111111-1111-4111-8111-111111111111'
-
-describe('CLI identity resume through the existing launch owner', () => {
-  it('returns an exited inactive pane from History after shell cleanup and preserves its selected sibling', async () => {
-    await verifyExitedPaneHistoryReturn(
-      mocks,
-      redrawFromMain,
-      async () => {
-        await main?.settle()
-      },
-      deferred
-    )
-  })
-
-  it.each([true, false])(
-    'resumes on the owning server with optional CLI-source capability: %s',
-    async (supported) => {
-      // A desktop sees the host's pane through its mirrored surface key.
-      const source: CliChatResumeSource = {
-        ...SOURCE,
-        executionHostId: 'runtime:server-1',
-        paneKey: `${toWebTerminalSurfaceTabId('host-tab-1')}:${HOST_LEAF}`
-      }
-      mocks.source = source
-      mocks.sourceCapability.mockResolvedValue(supported)
-      useAppStore.setState({
-        worktreesByRepo: {
-          repo: [
-            makeWorktree({
-              id: 'wt-1',
-              repoId: 'repo',
-              hostId: 'runtime:server-1',
-              runtimeOwnerEnvironmentId: 'server-1'
-            })
-          ]
-        }
-      })
-      mocks.call.mockImplementation(
-        async (_target, _method, params: StructuredAgentSessionCreateParams) => ({
-          ok: true,
-          value: { sessionId: params.envelope.sessionId, fence: 1 }
-        })
-      )
-      await runCliChatResume(source)
-      expect(mocks.sourceCapability).toHaveBeenCalledWith({
-        kind: 'environment',
-        environmentId: 'server-1'
-      })
-      expect(mocks.call).toHaveBeenCalledOnce()
-      expect(mocks.call).toHaveBeenCalledWith(
-        { kind: 'environment', environmentId: 'server-1' },
-        'agentSession.create',
-        expect.objectContaining({
-          resumeFrom: {
-            providerSessionId: 'provider-1',
-            ...(supported
-              ? { cliSource: { workspaceId: 'wt-1', paneKey: `host-tab-1:${HOST_LEAF}` } }
-              : {})
-          }
-        })
-      )
-      expect(mocks.toast).not.toHaveBeenCalled()
-    }
-  )
-
-  it('opens an existing conversation owner on the source server after a conflict', async () => {
-    const source: CliChatResumeSource = { ...SOURCE, executionHostId: 'runtime:server-1' }
-    mocks.source = source
-    useAppStore.setState({
-      worktreesByRepo: {
-        repo: [
-          makeWorktree({
-            id: 'wt-1',
-            repoId: 'repo',
-            hostId: 'runtime:server-1',
-            runtimeOwnerEnvironmentId: 'server-1'
-          })
-        ]
-      }
-    })
-    const owner = { sessionId: 'owner-chat', workspaceId: 'owner-workspace' }
-    mocks.call.mockResolvedValue({
-      ok: false,
-      refusal: {
-        code: 'agent_session_conflict',
-        message: 'owner',
-        details: { reason: 'conversationHeldElsewhere', owner },
-        createAttemptRefusedBeforeCommit: true
-      }
-    })
-    await runCliChatResume(source)
-    expect(mocks.activate).toHaveBeenCalledWith({ structuredSession: owner }, undefined, {
-      kind: 'environment',
-      environmentId: 'server-1'
-    })
-    expect(tabs()).toEqual([])
-  })
-
-  it('shares pending, sends only an advertised source, and survives source closure after dispatch', async () => {
-    const reply = deferred<unknown>()
-    mocks.call.mockReturnValue(reply.promise)
-    const running = runCliChatResume(SOURCE)
-    await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-    await runCliChatResume({ ...SOURCE, paneKey: 'another-pane' })
-    expect(mocks.call).toHaveBeenCalledOnce()
-    expect(tabs()).toEqual([])
-    expect(isEmptyWorkspaceDefaultSurfacePending('wt-1')).toBe(true)
-    const params: StructuredAgentSessionCreateParams = mocks.call.mock.calls[0][2]
-    expect(params.resumeFrom).toEqual({
-      providerSessionId: 'provider-1',
-      cliSource: { workspaceId: 'wt-1', paneKey: 'tab-1:leaf' }
+it('uses only the old ordinary exact-stop envelope and starts adoption after proven exit', async () => {
+  const stopped = Promise.withResolvers<unknown>()
+  mocks.rpc.mockReturnValue(stopped.promise)
+  const running = runLegacyCliChatResume(source)
+  await vi.waitFor(() => expect(mocks.rpc).toHaveBeenCalledOnce())
+  expect(mocks.launch).not.toHaveBeenCalled()
+  expect(mocks.rpc).toHaveBeenCalledWith({ kind: 'local' }, 'terminal.stopExact', {
+    worktree: 'id:workspace',
+    expectedPtyIds: ['pty'],
+    targetOnly: true,
+    keepHistory: true
+  })
+  // Ordinary stop may remove the source from the live map; that is no failure or busy refusal.
+  mocks.live.source = null
+  stopped.resolve({ stoppedPtyIds: ['pty'], postStopVerified: true })
+  await running
+  expect(mocks.launch).toHaveBeenCalledExactlyOnceWith(
+    expect.objectContaining({
+      plan: expect.objectContaining({ resumeFrom: { providerSessionId: 'conversation' } })
     })
-    mocks.source = null
-    useAppStore.setState({})
-    reply.resolve({ ok: true, value: { sessionId: params.envelope.sessionId, fence: 1 } })
-    await running
-    expect(tabs()).toHaveLength(1)
-    expect(isEmptyWorkspaceDefaultSurfacePending('wt-1')).toBe(false)
-  })
-
-  it('publishes the returning chat after its source in the source group even while another group is active', async () => {
-    const [source] = await seedTabs()
-    const other = useAppStore.getState().createEmptySplitGroup('wt-1', source.groupId, 'right')!
-    useAppStore.getState().focusGroup('wt-1', other)
-    mocks.source = { ...SOURCE, tabId: source.id, paneKey: `${source.id}:leaf` }
-    await runCliChatResume(mocks.source)
-    const chat = tabs().find((tab) => tab.contentType === 'agent-session')!
-    const group = useAppStore
-      .getState()
-      .groupsByWorktree['wt-1'].find((g) => g.id === source.groupId)!
-    expect(chat.groupId).toBe(source.groupId)
-    expect(group.tabOrder[group.tabOrder.indexOf(source.id) + 1]).toBe(chat.id)
-  })
-
-  it('moves an existing owner back to the source group and position after readiness', async () => {
-    const [source] = await seedTabs()
-    const other = useAppStore.getState().createEmptySplitGroup('wt-1', source.groupId, 'right')!
-    const chat = useAppStore
-      .getState()
-      .createUnifiedTab('wt-1', 'agent-session', { entityId: 'owner-chat', targetGroupId: other })
-    mocks.switchCapability.mockResolvedValue(true)
-    mocks.call.mockResolvedValue({ ok: true })
-    expect(
-      await switchIntoOwner(
-        { agent: 'codex', tabId: source.id, workspaceId: 'wt-1' },
-        { sessionId: 'owner-chat', workspaceId: 'wt-1' },
-        { kind: 'local' }
-      )
-    ).toBe(true)
-    const group = useAppStore
-      .getState()
-      .groupsByWorktree['wt-1'].find((g) => g.id === source.groupId)!
-    expect(group.tabOrder[group.tabOrder.indexOf(source.id) + 1]).toBe(chat.id)
-    expect(tabs().find((tab) => tab.id === chat.id)?.groupId).toBe(source.groupId)
-  })
-
-  it('reorders an owner already in the source group and retains a cross-workspace source', async () => {
-    const [a, source, b] = await seedTabs()
-    const chat = useAppStore
-      .getState()
-      .createUnifiedTab('wt-1', 'agent-session', { entityId: 'owner-chat' })
-    useAppStore.getState().reorderUnifiedTabs(source.groupId, [chat.id, a.id, source.id, b.id])
-    mocks.switchCapability.mockResolvedValue(true)
-    mocks.call.mockResolvedValue({ ok: true })
-    expect(
-      await switchIntoOwner(
-        { ...SOURCE, tabId: source.id },
-        { sessionId: 'owner-chat', workspaceId: 'wt-1' },
-        { kind: 'local' }
-      )
-    ).toBe(true)
-    useAppStore.getState().closeUnifiedTab(source.id)
-    expect(useAppStore.getState().groupsByWorktree['wt-1'][0].tabOrder).toEqual([
-      a.id,
-      chat.id,
-      b.id
-    ])
-    mocks.activateVerified.mockResolvedValueOnce('unconfirmed')
-    useAppStore.setState({
-      worktreesByRepo: {
-        repo: [
-          makeWorktree({ id: 'another-workspace', repoId: 'repo', displayName: 'Owner workspace' })
-        ]
-      }
-    })
-    const owner = { sessionId: 'owner-chat', workspaceId: 'another-workspace' }
-    expect(await switchIntoOwner(SOURCE, owner, { kind: 'local' })).toBe(false)
-    expect(mocks.success).not.toHaveBeenCalled()
-    expect(await switchIntoOwner(SOURCE, owner, { kind: 'local' })).toBe(false)
-    expect(mocks.success).toHaveBeenCalledExactlyOnceWith('Opened chat in Owner workspace.')
-    expect(mocks.rpc.mock.calls.filter(([, method]) => method === 'terminal.close')).toHaveLength(0)
-  })
-
-  it.each([true, false, null])(
-    'holds a new at-rest receipt until its selected child answers %s',
-    async (ready) => {
-      mocks.switchCapability.mockResolvedValue(true)
-      const start = deferred<unknown>()
-      mocks.call.mockImplementation(
-        async (_target, method, params: StructuredAgentSessionCreateParams) =>
-          method === 'agentSession.switchToChat'
-            ? start.promise
-            : { ok: true, value: { sessionId: params.envelope.sessionId, fence: 1 } }
-      )
-      const running = runCliChatResume(SOURCE)
-      await vi.waitFor(() =>
-        expect(
-          mocks.call.mock.calls.some(([, method]) => method === 'agentSession.switchToChat')
-        ).toBe(true)
-      )
-      expect(mocks.rpc.mock.calls.some(([, method]) => method === 'terminal.close')).toBe(false)
-      start.resolve(
-        ready === null
-          ? null
-          : ready
-            ? { ok: true }
-            : {
-                ok: false,
-                refusal: {
-                  code: 'agent_session_operation_invalid',
-                  details: { reason: 'conversationOpenElsewhere' },
-                  message: 'Cannot start'
-                }
-              }
-      )
-      await running
-      expect(mocks.rpc.mock.calls.filter(([, method]) => method === 'terminal.close')).toHaveLength(
-        ready ? 1 : 0
-      )
-      const created = mocks.call.mock.calls.find(
-        ([, method]) => method === 'agentSession.create'
-      )![2]
-      expect(created.firstMessage).toBeUndefined()
-      expect(
-        mocks.call.mock.calls.find(([, method]) => method === 'agentSession.switchToChat')![2]
-      ).toEqual({ sessionId: created.envelope.sessionId })
-    }
   )
+  expect(mocks.error).not.toHaveBeenCalled()
+  expect(mocks.info).toHaveBeenCalledOnce()
+})
 
-  it('retires an unsent click during create capability waiting, even if the same source returns', async () => {
-    const capability = deferred<boolean>()
-    mocks.createCapability.mockReturnValue(capability.promise)
-    const running = runCliChatResume(SOURCE)
-    await vi.waitFor(() => expect(mocks.createCapability).toHaveBeenCalledOnce())
-    mocks.source = null
-    useAppStore.setState({})
-    await running
-    mocks.source = SOURCE
-    mocks.switchCapability.mockResolvedValue(false)
-    capability.resolve(true)
-    await vi.waitFor(() => expect([...structuredLaunchStates()]).toHaveLength(0))
-    expect(mocks.call).not.toHaveBeenCalled()
-    expect(tabs()).toEqual([])
-    expect(mocks.toast).not.toHaveBeenCalled()
-  })
-
-  it('uses ID-only create for an older host and retains uncertainty without pre-commit proof', async () => {
-    mocks.sourceCapability.mockResolvedValue(false)
-    mocks.call.mockResolvedValue({
-      ok: false,
-      refusal: { code: 'agent_session_conflict', message: 'old host' }
-    })
-    await runCliChatResume(SOURCE)
-    expect(mocks.call.mock.calls[0][2].resumeFrom).toEqual({ providerSessionId: 'provider-1' })
-    expect(tabs()).toHaveLength(1)
-    expect(mocks.activate).not.toHaveBeenCalled()
-    expect(mocks.toast).not.toHaveBeenCalled()
-  })
-
-  it('keeps ordinary refusals hidden and distinguishes unsaved from unreadable content', async () => {
-    for (const reason of ['transcriptNotFound', 'transcriptUnreadable'] as const) {
-      mocks.call.mockResolvedValue({ ok: false, refusal: refuse(reason) })
-      await runCliChatResume(SOURCE)
-      expect(tabs()).toEqual([])
-      expect([...structuredLaunchStates()]).toEqual([])
-      expect(mocks.toast.mock.calls.at(-1)?.[0]).toMatch(
-        reason === 'transcriptUnreadable' ? /couldn't open.*history/i : /hasn't saved/
-      )
-    }
-  })
-
-  it('keeps the terminal and directs an addressed refused writer to quit here and retry', async () => {
-    mocks.call.mockResolvedValue({
-      ok: false,
-      refusal: {
-        code: 'agent_session_conflict',
-        message: 'private host evidence',
-        details: { reason: 'conversationHeldElsewhere', source: true },
-        createAttemptRefusedBeforeCommit: true
-      }
-    })
-    await runCliChatResume(SOURCE)
-    expect(mocks.toast).toHaveBeenCalledTimes(1)
-    expect(mocks.toast.mock.calls[0]?.[0]).toBe(
-      'Orca could not confirm Claude stopped in this terminal. Quit Claude here, then try this action again.'
-    )
-    expect(mocks.activate).not.toHaveBeenCalled()
-    expect(tabs()).toEqual([])
-    expect([...structuredLaunchStates()]).toEqual([])
-  })
-
-  it('starts the chat that holds the conversation before the terminal closes; a refusal keeps it', async () => {
-    const owner = { sessionId: 'owner-chat', workspaceId: 'wt-1' }
-    let switched: unknown = {
-      ok: false,
-      refusal: {
-        code: 'agent_session_operation_invalid',
-        message: 'x',
-        details: { reason: 'conversationOpenElsewhere' }
-      }
-    }
-    mocks.call.mockImplementation(async (_target, method) =>
-      method === 'agentSession.switchToChat'
-        ? switched
-        : {
-            ok: false,
-            refusal: {
-              code: 'agent_session_conflict',
-              message: 'owner',
-              details: { reason: 'conversationHeldElsewhere', owner },
-              createAttemptRefusedBeforeCommit: true
-            }
-          }
-    )
-    const leafId = '11111111-1111-4111-8111-111111111111'
-    mocks.source = { ...SOURCE, paneKey: `tab-1:${leafId}` }
-    useAppStore.setState({
-      terminalLayoutsByTabId: {
-        'tab-1': {
-          root: { type: 'leaf', leafId },
-          activeLeafId: leafId,
-          expandedLeafId: null,
-          ptyIdsByLeafId: { [leafId]: 'pty-1' }
-        }
-      }
-    })
-    const closed = vi.fn()
-    window.addEventListener('orca-close-terminal-pane', closed)
-    // A host without the switch only shows the chat; it never receives the switch.
-    await runCliChatResume(mocks.source)
-    expect(mocks.activate).toHaveBeenCalledWith({ structuredSession: owner }, undefined, {
-      kind: 'local'
-    })
-    mocks.switchCapability.mockResolvedValue(true)
-    await runCliChatResume(mocks.source)
-    expect(mocks.toast).toHaveBeenCalledOnce()
-    expect(mocks.activateVerified).not.toHaveBeenCalled()
-    expect(closed).not.toHaveBeenCalled()
-
-    switched = { ok: true, sessionId: 'owner-chat' }
-    // A bookkeeping refusal after READY settles once and leaves the existing chat usable.
-    mocks.rpc
-      .mockImplementationOnce(async () => ({
-        terminal: {
-          handle: 'handle-1',
-          ptyId: 'pty-1',
-          incarnationId: 'i1',
-          presentation: {
-            identity: {
-              worktreeId: 'wt-1',
-              tabId: 'tab-1',
-              leafId,
-              createdAt: 1,
-              generation: 0,
-              hasLeaf: true,
-              ptyId: 'pty-1',
-              incarnationId: 'i1'
-            },
-            holders: []
-          }
-        }
-      }))
-      .mockRejectedValueOnce(new Error('required write failed'))
-    await runCliChatResume(mocks.source)
-    expect(mocks.rpc.mock.calls.filter(([, method]) => method === 'terminal.close')).toHaveLength(1)
-    expect(mocks.toast).toHaveBeenCalledOnce()
-    expect(mocks.info).toHaveBeenCalledWith(expect.stringContaining('opened successfully'))
-    expect(mocks.activateVerified).toHaveBeenCalledWith({ structuredSession: owner }, undefined, {
-      kind: 'local'
-    })
-    expect(closed).not.toHaveBeenCalled()
-    window.removeEventListener('orca-close-terminal-pane', closed)
-  })
-
-  it('keeps the eager History joiner failed and retryable after the hidden starter is refused', async () => {
-    const reply = deferred<unknown>()
-    mocks.call.mockReturnValue(reply.promise)
-    const running = runCliChatResume(SOURCE)
-    await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-    const sessionId: string = mocks.call.mock.calls[0][2].envelope.sessionId
-    const eager = beginStructuredAgentSessionProvisionalLaunch({
-      hooks: {},
-      plan: adoptAgentSessionLaunchVerdict({
-        route: 'structured-native-chat',
-        requestId: newAgentLaunchRequestId(),
-        agent: 'claude',
-        worktreeId: 'wt-1',
-        executionHostId: 'local',
-        resumeFrom: { providerSessionId: 'provider-1' }
-      })
-    })
-    await vi.waitFor(() => expect(tabs()).toHaveLength(1))
-    reply.resolve({ ok: false, refusal: refuse('transcriptUnreadable') })
-    await Promise.all([running, eager?.settlement])
-    expect(mocks.call).toHaveBeenCalledOnce()
-    expect(getStructuredAgentSessionLaunchLifecycle('wt-1', sessionId)).toBe('failed')
-    expect(readStructuredAgentLaunchRecord(sessionId)?.lifecycle).toBe('failed')
-    mocks.call.mockResolvedValue({ ok: true, value: { sessionId, fence: 1 } })
-    expect(retryStructuredAgentSessionLaunch('wt-1', sessionId)).toBe(true)
-    await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(2))
-    expect(mocks.call.mock.calls[1][2].envelope.sessionId).toBe(sessionId)
-    await vi.waitFor(() =>
-      expect(getStructuredAgentSessionLaunchLifecycle('wt-1', sessionId)).toBeNull()
-    )
-    expect(tabs()).toHaveLength(1)
-  })
-
-  it.each([false, true])(
-    'still opens an eager History joiner after the terminal closes before create (frame-drawn: %s)',
-    async (frameDrawn) => {
-      mocks.frameDrawn = frameDrawn
-      const capability = deferred<boolean>()
-      mocks.createCapability.mockReturnValue(capability.promise)
-      const running = runCliChatResume(SOURCE)
-      await vi.waitFor(() => expect(mocks.createCapability).toHaveBeenCalledOnce())
-      const eager = beginStructuredAgentSessionProvisionalLaunch({
-        hooks: {},
-        plan: adoptAgentSessionLaunchVerdict({
-          route: 'structured-native-chat',
-          requestId: newAgentLaunchRequestId(),
-          agent: 'claude',
-          worktreeId: 'wt-1',
-          executionHostId: 'local',
-          resumeFrom: { providerSessionId: 'provider-1' }
-        })
-      })
-      mocks.source = null
-      useAppStore.setState({})
-      capability.resolve(true)
-      await Promise.all([running, eager?.settlement])
-      expect(mocks.call).toHaveBeenCalledOnce()
-      expect(mocks.call.mock.calls[0][2].resumeFrom).toEqual({ providerSessionId: 'provider-1' })
-      expect(mocks.call.mock.calls[0][2].tabPlacement).toEqual(
-        frameDrawn ? { groupId: 'g-1' } : undefined
-      )
-      expect(tabs()).toHaveLength(1)
-      expect(mocks.toast).not.toHaveBeenCalled()
-    }
+it.each([
+  null,
+  {},
+  { ptyKilled: true },
+  { stoppedPtyIds: ['other'], postStopVerified: true },
+  { stoppedPtyIds: ['pty'], postStopVerified: false },
+  { stoppedPtyIds: ['pty'], postStopVerified: true, remainingLivePtyIds: ['pty'] }
+])('does not create on an insufficient old receipt %j', async (receipt) => {
+  mocks.rpc.mockResolvedValue(receipt)
+  await runLegacyCliChatResume(source)
+  expect(mocks.launch).not.toHaveBeenCalled()
+  expect(mocks.error).toHaveBeenCalledExactlyOnceWith(
+    expect.stringContaining('could not confirm Codex stopped')
   )
+})
 
-  it.each([
-    ['reply', 'B', 'B E S R', 'B E S D R'],
-    ['inventory', 'E', 'S B R E', 'S B D R E'],
-    ['reply', 'E', 'S B E R', 'S B D E R'],
-    ['inventory', 'B', 'R S E B', 'R S E D B']
-  ])(
-    'keeps canonical membership through registered IPC (%s first, move %s to %s)',
-    async (first, mover, requested, expected) => {
-      await verifyCliChatResumeSlotOrder(
-        { mocks, redrawFromMain, seedTabs, deferred, source: SOURCE },
-        { first, mover, requested, expected }
-      )
-    }
+it('reports an unconfirmed old Stop once and never launches after a lost Stop result', async () => {
+  mocks.rpc.mockRejectedValue(new Error('raw stop transport failure'))
+  await runLegacyCliChatResume(source)
+  expect(mocks.launch).not.toHaveBeenCalled()
+  expect(mocks.error).toHaveBeenCalledExactlyOnceWith(
+    'Orca could not confirm Codex stopped. Check Codex in the original terminal, then try switching again.'
   )
+})
 
-  // Main's publish of a window's create places nothing switch-on, so the resume's own open must.
-  it('opens a resumed chat once, through main, after the tab before its hidden slot', async () => {
-    const [, , browser] = await seedTabs()
-    await runCliChatResume(SOURCE)
-    await main?.settle()
-    const sessionId: string = mocks.call.mock.calls[0][2].envelope.sessionId
-    const slotId = `structured-agent-session-${sessionId}`
-    expect(tabs().find((tab) => tab.entityId === sessionId)?.id).toBe(slotId)
-    expect(useAppStore.getState().groupsByWorktree['wt-1'][0].tabOrder.at(-1)).toBe(slotId)
-    if (ORCA_LAYOUT_OWNER_IS_MAIN) {
-      expect(layoutApplyTestTransport.sentOfType('openAgentSessionTab')).toEqual([
-        expect.objectContaining({ tabId: slotId, sessionId, afterTabId: browser.id })
-      ])
-    }
+it('lets a replacement source win while exact Stop is pending', async () => {
+  mocks.rpc.mockImplementation(async () => {
+    mocks.live.source = { ...source, ptyId: 'replacement' }
+    return { stoppedPtyIds: ['pty'], postStopVerified: true }
   })
+  await runLegacyCliChatResume(source)
+  expect(mocks.launch).not.toHaveBeenCalled()
+  expect(mocks.error).not.toHaveBeenCalled()
+})
 
-  it.each([false, true])(
-    'keeps overlapping requests in their canonical order (second finishes first: %s)',
-    async (reverse) => {
-      const initial = await seedTabs()
-      const replies = [deferred<unknown>(), deferred<unknown>()]
-      mocks.call
-        .mockImplementationOnce(() => replies[0].promise)
-        .mockImplementationOnce(() => replies[1].promise)
-      const first = runCliChatResume(SOURCE)
-      await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(1))
-      const secondSource = { ...SOURCE, providerSessionId: 'provider-2' }
-      mocks.source = secondSource
-      const second = runCliChatResume(secondSource)
-      await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(2))
-      const ids: string[] = mocks.call.mock.calls.map((call) => call[2].envelope.sessionId)
-      for (const index of reverse ? [1, 0] : [0, 1]) {
-        replies[index].resolve({ ok: true, value: { sessionId: ids[index], fence: 1 } })
-        await (index === 0 ? first : second)
-      }
-      expect(useAppStore.getState().groupsByWorktree['wt-1'][0].tabOrder).toEqual([
-        ...initial.map((tab) => tab.id),
-        ...ids.map((id) => `structured-agent-session-${id}`)
-      ])
-    }
-  )
-
-  it('restores a pending-only group as unknown without sending create or restoring focus', async () => {
-    const record = {
-      sessionId: 'reload-pending',
-      executionHostId: 'local' as const,
-      agent: 'claude' as const,
-      lifecycle: 'pending' as const,
-      clientOperationId: 'original-operation',
-      payloadFingerprint: 'fingerprint',
-      expectedRuntimeFence: null,
-      surfaceAddress: { worktreeId: 'wt-1', precedingTabIds: [] }
-    }
-    writeStructuredAgentLaunchRecord(record)
-    const firstGroup = vi.fn()
-    const unsubscribe = useAppStore.subscribe((state) => {
-      const group = state.groupsByWorktree['wt-1']?.[0]
-      if (group) {
-        firstGroup(group)
-      }
-    })
-    reserveStructuredLaunchSlot(record)
-    unsubscribe()
-    expect(firstGroup).toHaveBeenCalledTimes(1)
-    expect(firstGroup.mock.calls[0][0]).toMatchObject({
-      tabOrder: ['structured-agent-session-reload-pending'],
-      activeTabId: null
+it.each(['navigate', 'close'] as const)(
+  'lets a later %s win while exact Stop is pending',
+  async (action) => {
+    mocks.rpc.mockImplementation(async () => {
+      mocks.state =
+        action === 'navigate'
+          ? { ...mocks.state, activeView: 'settings' }
+          : { ...mocks.state, tabsByWorktree: { workspace: [] } }
+      return { stoppedPtyIds: ['pty'], postStopVerified: true }
     })
-    expect(firstGroup.mock.calls[0][0].recentTabIds ?? []).toEqual([])
-    expect(tabs()).toHaveLength(0)
-    const session = buildWorkspaceSessionPayload(useAppStore.getState())
-    stopStructuredLaunchSlotTracking()
-    resetStructuredAgentLaunchPersistenceForTests()
-    resetStructuredAgentLaunchRegistryForTests()
-    useAppStore.setState(useAppStore.getInitialState(), true)
-    useAppStore.setState({
-      ...buildHydratedTabState(session, new Set(['wt-1'])),
-      worktreesByRepo: { repo: [makeWorktree({ id: 'wt-1', repoId: 'repo', hostId: 'local' })] }
-    })
-    await redrawFromMain()
-    restoreStructuredLaunchSurfaces()
-    restoreStructuredLaunchSurfaces()
-    applyStructuredSessionTabSnapshots([snapshot()])
-    await main?.settle()
-    expect(mocks.call).not.toHaveBeenCalled()
-    expect(
-      peekWebSessionFocusIntent(structuredAgentSessionFocusOwner({ kind: 'local' }), 'wt-1')
-    ).toBeNull()
-    expect(tabs()).toHaveLength(1)
-    expect(getStructuredAgentSessionLaunchLifecycle('wt-1', 'reload-pending')).toBe(
-      'visibility-unknown'
-    )
-    expect(readStructuredAgentLaunchRecord('reload-pending')?.clientOperationId).toBe(
-      'original-operation'
-    )
-    expect(useAppStore.getState().groupsByWorktree['wt-1'][0].recentTabIds ?? []).toEqual([])
-  })
-})
+    await runLegacyCliChatResume(source)
+    expect(mocks.launch).not.toHaveBeenCalled()
+    expect(mocks.error).not.toHaveBeenCalled()
+  }
+)
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
index 6cd94f1d1de2..89f7576b1ded 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
@@ -1,5 +1,12 @@
+import {
+  captureTerminalSurfaceIdentity,
+  isRetainedTerminalSurfaceIdentity
+} from '../../../../shared/terminal-tab-close'
 import { toast } from 'sonner'
-import { conversationSwitchSourceKept } from '@/lib/conversation-switch-feedback'
+import {
+  conversationSwitchFailureText,
+  conversationSwitchSourceKept
+} from '@/lib/conversation-switch-feedback'
 import {
   conversationSwitchChanged,
   isCliChatResumePending,
@@ -9,211 +16,160 @@ import { useAppStore } from '@/store'
 import { newAgentLaunchRequestId } from '@/lib/agent-launch-request-id'
 import { adoptAgentSessionLaunchVerdict } from '@/lib/agent-session-launch-plan'
 import { beginStructuredAgentSessionProvisionalLaunch } from '@/lib/agent-session/structured-agent-session-provisional-tab'
-import {
-  supportsInPlaceSwitch,
-  supportsStructuredAgentSessionCliSource
-} from '@/runtime/structured-agent-session-client'
 import { structuredAgentSessionTargetForHost } from '@/runtime/structured-agent-session-owner'
-import { waitForPromiseWithSignal } from '../../../../shared/abort-signal-reason'
-import { CLI_CONVERSATION_ADOPTING_AGENTS } from '../../../../shared/structured-agent-cli-conversation-adoption'
-import { toHostSessionPaneKey } from '../../../../shared/terminal-surface-id'
 import { resolveCliChatResumeSource, type CliChatResumeSource } from './cli-chat-resume-source'
-import { reportCliChatResumeFailure, startCliChatReturn } from './cli-chat-resume-feedback'
+import { reportCliChatResumeFailure } from './cli-chat-resume-feedback'
 import { adoptingAgentOnHost } from '../right-sidebar/ai-vault-session-resume-in-chat-launch'
 import { callRuntimeRpc } from '@/runtime/runtime-rpc-client'
 import { captureSourceTerminal } from './cli-chat-resume-terminal-capture'
+import { agentSessionRefusalError } from '../../../../shared/agent-session-wire-refusals'
+import { captureConversationSwitchSelection } from '@/lib/conversation-switch-state'
 
-/** The execution host closes only the captured shell; refused or unknown closes leave it alone. */
-async function retireSwitchedTerminalPane(
-  expected: ReturnType<typeof captureSourceTerminal>
+/** Old peers stop the addressed PTY before ordinary adoption; a kill acknowledgement is never exit proof. */
+export async function runLegacyCliChatResume(
+  source: CliChatResumeSource,
+  viewerSelection?: string
 ): Promise<void> {
-  const captured = await expected
-  if (!captured?.presentation) {
-    throw new Error('terminal_close_unverifiable')
-  }
-  await callRuntimeRpc(captured.target, 'terminal.close', {
-    terminal: captured.handle,
-    expectedIncarnationId: captured.incarnationId,
-    originalPresentation: captured.presentation
-  })
-}
-
-const changed = conversationSwitchChanged
-const keyFor = (source: CliChatResumeSource) =>
-  [
-    source.executionHostId,
-    CLI_CONVERSATION_ADOPTING_AGENTS[source.agent],
-    source.providerSessionId
-  ].join('\0')
-/** Switches a terminal's conversation into a chat in the terminal's slot: a new chat, or the chat
- *  that already holds it, revealed. The terminal pane closes once the chat has it. */
-export async function runLegacyCliChatResume(source: CliChatResumeSource): Promise<void> {
-  const key = keyFor(source)
-  if (isCliChatResumePending(key) || source.hostUpdateRequired) {
-    return
-  }
+  const key = `${source.executionHostId}\0${source.agent}\0${source.providerSessionId}`
   const target = structuredAgentSessionTargetForHost(source.executionHostId)
-  if (!target) {
+  if (!target || source.hostUpdateRequired || isCliChatResumePending(key)) {
     return
   }
+  const stillSelected = captureConversationSwitchSelection(viewerSelection)
+  const leafId = source.paneKey.slice(source.tabId.length + 1)
+  const rendererIdentity = captureTerminalSurfaceIdentity(
+    useAppStore.getState(),
+    source.workspaceId,
+    source.tabId,
+    leafId
+  )
+  const stillCaptured = () => {
+    const current = captureTerminalSurfaceIdentity(
+      useAppStore.getState(),
+      source.workspaceId,
+      source.tabId,
+      leafId
+    )
+    return (
+      rendererIdentity !== null &&
+      current !== null &&
+      isRetainedTerminalSurfaceIdentity(rendererIdentity, current)
+    )
+  }
   const controller = new AbortController()
   const isCurrent = () => {
-    if (controller.signal.aborted) {
-      return false
-    }
     const current = resolveCliChatResumeSource(useAppStore.getState(), {
       tab: { id: source.tabId, worktreeId: source.workspaceId },
       paneKey: source.paneKey
     })
     return (
-      !!current &&
-      current.ptyId === source.ptyId &&
-      current.executionHostId === source.executionHostId &&
-      current.providerSessionId === source.providerSessionId &&
-      CLI_CONVERSATION_ADOPTING_AGENTS[current.agent] ===
-        CLI_CONVERSATION_ADOPTING_AGENTS[source.agent]
+      current?.ptyId === source.ptyId &&
+      current?.executionHostId === source.executionHostId &&
+      current?.providerSessionId === source.providerSessionId &&
+      current?.agent === source.agent
     )
   }
-  if (!isCurrent()) {
-    return
-  }
-  const release = () => {
-    const operation = pending.get(controller)
-    if (operation?.key === key) {
-      operation.key = null
-      changed()
-    }
-  }
   pending.set(controller, { key, source })
-  let stopSource = () => {}
-  let timer: ReturnType<typeof setTimeout> | undefined
-  let dispatched = false
-  const handoff = () => {
-    if (dispatched) {
-      return true
+  conversationSwitchChanged()
+  try {
+    const captured = await captureSourceTerminal(source)
+    const ptyId = captured?.presentation.identity.ptyId
+    if (!captured || !ptyId || !isCurrent()) {
+      throw stopUnknown()
     }
-    if (!isCurrent()) {
-      return false
+    if (!stillCaptured() || !stillSelected()) {
+      return
     }
-    dispatched = true
-    stopSource()
-    clearTimeout(timer)
-    return true
-  }
-  let inPlace = false
-  try {
-    changed()
-    const sourceIncarnation = captureSourceTerminal(source)
-    stopSource = useAppStore.subscribe(() => {
-      if (!isCurrent()) {
-        controller.abort()
-        release()
-      }
+    const agent = await adoptingAgentOnHost(
+      source.agent,
+      source.workspaceId,
+      source.executionHostId
+    )
+    if (!isCurrent() || !stillCaptured() || !stillSelected()) {
+      return
+    }
+    const stopped = await callRuntimeRpc<{
+      stoppedPtyIds?: string[]
+      postStopVerified?: boolean
+      remainingLivePtyIds?: string[]
+    }>(captured.target, 'terminal.stopExact', {
+      worktree: `id:${source.workspaceId}`,
+      expectedPtyIds: [ptyId],
+      targetOnly: true,
+      keepHistory: true
+    }).catch(() => {
+      throw stopUnknown()
+    })
+    if (
+      !stopped ||
+      stopped.postStopVerified !== true ||
+      !Array.isArray(stopped.stoppedPtyIds) ||
+      stopped.stoppedPtyIds.length !== 1 ||
+      stopped.stoppedPtyIds[0] !== ptyId ||
+      (stopped.remainingLivePtyIds !== undefined &&
+        (!Array.isArray(stopped.remainingLivePtyIds) ||
+          stopped.remainingLivePtyIds.includes(ptyId)))
+    ) {
+      throw stopUnknown()
+    }
+    const current = resolveCliChatResumeSource(useAppStore.getState(), {
+      tab: { id: source.tabId, worktreeId: source.workspaceId },
+      paneKey: source.paneKey
     })
-    timer = setTimeout(
-      () => controller.abort(new Error('Conversation preparation timed out.')),
-      30_000
+    if (current && !isCurrent()) {
+      return
+    }
+    const state = useAppStore.getState()
+    if (!stillCaptured() || !stillSelected()) {
+      return
+    }
+    const group = state.groupsByWorktree[source.workspaceId]?.find((row) =>
+      row.tabOrder.includes(source.tabId)
     )
-    let retireSource = false
-    try {
-      await waitForPromiseWithSignal(sourceIncarnation, controller.signal)
-      if (!isCurrent()) {
-        return
-      }
-      inPlace = await waitForPromiseWithSignal(
-        supportsInPlaceSwitch(target, source.agent),
-        controller.signal
-      )
-      const cliSourceSupported = await waitForPromiseWithSignal(
-        supportsStructuredAgentSessionCliSource(target),
-        controller.signal
-      )
-      if (!isCurrent()) {
-        return
-      }
-      const agent = await waitForPromiseWithSignal(
-        adoptingAgentOnHost(source.agent, source.workspaceId, source.executionHostId),
-        controller.signal
-      )
-      if (!isCurrent()) {
-        return
-      }
-      const plan = adoptAgentSessionLaunchVerdict({
-        route: 'structured-native-chat',
-        requestId: newAgentLaunchRequestId(),
-        agent,
-        worktreeId: source.workspaceId,
-        executionHostId: source.executionHostId,
-        resumeFrom: {
-          providerSessionId: source.providerSessionId,
-          ...(cliSourceSupported
-            ? {
-                cliSource: {
-                  workspaceId: source.workspaceId,
-                  paneKey: toHostSessionPaneKey(source.paneKey)
-                }
-              }
-            : {})
-        }
-      })
-      const state = useAppStore.getState()
-      const group = state.groupsByWorktree[source.workspaceId]?.find((g) =>
-        g.tabOrder.includes(source.tabId)
-      )
-      const launch = beginStructuredAgentSessionProvisionalLaunch({
-        plan,
-        hooks: { beforeCreate: handoff },
-        afterTabId: source.tabId,
-        target: group
-          ? {
-              surfaceAddress: {
-                worktreeId: source.workspaceId,
-                targetGroupId: group.id,
-                precedingTabIds: group.tabOrder.slice(0, group.tabOrder.indexOf(source.tabId) + 1)
-              }
+    const plan = adoptAgentSessionLaunchVerdict({
+      route: 'structured-native-chat',
+      requestId: newAgentLaunchRequestId(),
+      agent,
+      worktreeId: source.workspaceId,
+      executionHostId: source.executionHostId,
+      resumeFrom: { providerSessionId: source.providerSessionId }
+    })
+    const launch = beginStructuredAgentSessionProvisionalLaunch({
+      plan,
+      hooks: { beforeCreate: stillCaptured },
+      canActivate: stillSelected,
+      afterTabId: source.tabId,
+      target: group
+        ? {
+            surfaceAddress: {
+              worktreeId: source.workspaceId,
+              targetGroupId: group.id,
+              precedingTabIds: group.tabOrder.slice(0, group.tabOrder.indexOf(source.tabId) + 1)
             }
-          : undefined,
-        deferPublication: true
-      })
-      if (!launch) {
-        return
-      }
-      const result = await waitForPromiseWithSignal(launch.settlement, controller.signal)
-      if (result.kind === 'structured' && inPlace) {
-        retireSource = await startCliChatReturn(source, result.sessionId, target)
-      } else if (
-        result.kind === 'failed' &&
-        !result.notified &&
-        pending.get(controller)?.key === key &&
-        (await reportCliChatResumeFailure(source, result.error, target))
-      ) {
-        retireSource = inPlace
-      }
-    } catch (error) {
-      if (
-        pending.get(controller)?.key === key &&
-        (await reportCliChatResumeFailure(source, error, target))
-      ) {
-        retireSource = inPlace
-      }
+          }
+        : undefined
+    })
+    if (!launch) {
+      return
     }
-    if (retireSource) {
-      try {
-        await retireSwitchedTerminalPane(sourceIncarnation)
-      } catch {
-        toast.info(conversationSwitchSourceKept(source.agent))
-      }
+    const result = await launch.settlement
+    if (result.kind === 'structured') {
+      // Old close envelopes cannot condition retirement on this captured incarnation after adoption.
+      toast.info(conversationSwitchSourceKept(source.agent))
+    } else if (result.kind === 'failed' && !result.notified) {
+      await reportCliChatResumeFailure(source, result.error, target, viewerSelection)
     }
+  } catch (error) {
+    // A stopped shell can cease being busy or disappear; that never turns proven Stop into a failure.
+    toast.error(
+      conversationSwitchFailureText(error, { agent: source.agent, direction: 'chat', source })
+    )
   } finally {
-    clearTimeout(timer)
-    stopSource()
-    try {
-      release()
-    } finally {
-      pending.delete(controller)
-      useAppStore.setState((state) => ({
-        agentConversationsByPaneKey: state.agentConversationsByPaneKey
-      }))
-    }
+    pending.delete(controller)
+    conversationSwitchChanged()
   }
 }
+
+function stopUnknown() {
+  return agentSessionRefusalError('agent_session_ownership_unknown', { reason: 'ownerUnproven' })
+}
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-slot-order.test-fixture.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-slot-order.test-fixture.ts
deleted file mode 100644
index a4b0a273ae43..000000000000
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-slot-order.test-fixture.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-import { expect, vi } from 'vitest'
-import { useAppStore } from '@/store'
-import { registerSessionTabIpcBridge } from '@/hooks/ipc-events/session-tab-ipc-bridge'
-import { readStructuredAgentLaunchRecord } from '@/lib/agent-session/launch/structured-agent-session-launch-persistence'
-import { clearWebSessionFocusIntent } from '@/runtime/web-session-focus-intent'
-import { structuredAgentSessionFocusOwner } from '@/runtime/structured-agent-session-owner'
-import { applyStructuredSessionTabSnapshots } from '@/runtime/local-structured-session-tabs-sync/snapshot-apply'
-import { runLegacyCliChatResume as runCliChatResume } from './cli-chat-resume-run'
-import { snapshot } from './cli-chat-resume-snapshot.test-fixture'
-import type { CliChatResumeSource } from './cli-chat-resume-source'
-import type { CliChatResumeTestMocks } from './cli-chat-resume-mocks.test-fixture'
-import type { AppState } from '@/store/types'
-
-export async function verifyCliChatResumeSlotOrder(
-  {
-    mocks,
-    redrawFromMain,
-    seedTabs,
-    deferred,
-    source: initialSource
-  }: {
-    mocks: CliChatResumeTestMocks
-    redrawFromMain: () => Promise<void>
-    seedTabs: () => Promise<AppState['unifiedTabsByWorktree'][string]>
-    deferred: <T>() => { promise: Promise<T>; resolve: (value: T) => void }
-    source: CliChatResumeSource
-  },
-  {
-    first,
-    mover,
-    requested,
-    expected
-  }: {
-    first: string
-    mover: string
-    requested: string
-    expected: string
-  }
-): Promise<void> {
-  const tabs = () => useAppStore.getState().unifiedTabsByWorktree['wt-1'] ?? []
-  const [e, source, browser] = await seedTabs()
-  let move: Parameters<typeof window.api.ui.onMoveSessionTab>[0] = () => {}
-  vi.stubGlobal('api', {
-    ...window.api,
-    ui: {
-      ...window.api?.ui,
-      onCloseSessionTab: () => () => {},
-      onSessionTabCloseRequest: () => () => {},
-      onMoveSessionTab: (callback: typeof move) => {
-        move = callback
-        return () => {}
-      }
-    }
-  })
-  registerSessionTabIpcBridge([])
-  const reply = deferred<unknown>()
-  mocks.call.mockReturnValue(reply.promise)
-  const running = runCliChatResume(initialSource)
-  await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-  const sessionId: string = mocks.call.mock.calls[0][2].envelope.sessionId
-  const slotId = `structured-agent-session-${sessionId}`
-  const store = useAppStore.getState()
-  const order = store.groupsByWorktree['wt-1'][0].tabOrder
-  expect(order).toEqual([e.id, source.id, browser.id, slotId])
-  const later = useAppStore
-    .getState()
-    .createUnifiedTab('wt-1', 'editor', { id: 'R', entityId: 'R' })
-  await redrawFromMain()
-  const beforeNoop = useAppStore.getState()
-  move({
-    kind: 'reorder',
-    worktreeId: 'wt-1',
-    targetGroupId: e.groupId,
-    tabId: browser.id,
-    tabOrder: [e.id, source.id, browser.id, later.id]
-  })
-  expect(useAppStore.getState()).toBe(beforeNoop)
-  move({
-    kind: 'reorder',
-    worktreeId: 'wt-1',
-    targetGroupId: e.groupId,
-    tabId: mover,
-    tabOrder: requested.split(' ')
-  })
-  const expectedOrder = expected.split(' ').map((id) => (id === 'D' ? slotId : id))
-  expect(useAppStore.getState().groupsByWorktree['wt-1'][0].tabOrder).toEqual(expectedOrder)
-  expect(readStructuredAgentLaunchRecord(sessionId)?.surfaceAddress).toEqual({
-    worktreeId: 'wt-1',
-    targetGroupId: e.groupId,
-    precedingTabIds: expectedOrder.slice(0, expectedOrder.indexOf(slotId))
-  })
-  const other = useAppStore.getState().createUnifiedTab('wt-1', 'editor', {
-    entityId: 'other',
-    split: { splitDirection: 'right', sourceGroupId: e.groupId }
-  })
-  await redrawFromMain()
-  clearWebSessionFocusIntent(structuredAgentSessionFocusOwner({ kind: 'local' }), 'wt-1')
-  if (first === 'inventory') {
-    applyStructuredSessionTabSnapshots([snapshot(sessionId)])
-  }
-  reply.resolve({ ok: true, value: { sessionId, fence: 1 } })
-  await running
-  expect(
-    useAppStore.getState().groupsByWorktree['wt-1'].find((group) => group.id === e.groupId)
-      ?.tabOrder
-  ).toEqual(expectedOrder)
-  expect(useAppStore.getState().activeGroupIdByWorktree['wt-1']).toBe(other.groupId)
-  useAppStore.getState().moveUnifiedTabToGroup(slotId, other.groupId)
-  applyStructuredSessionTabSnapshots([{ ...snapshot(sessionId), snapshotVersion: Date.now() + 1 }])
-  expect(tabs().find((tab) => tab.entityId === sessionId)?.groupId).toBe(other.groupId)
-}
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-snapshot.test-fixture.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-snapshot.test-fixture.ts
deleted file mode 100644
index efc273e2ad62..000000000000
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-snapshot.test-fixture.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import type { RuntimeMobileSessionTabsResult } from '../../../../shared/runtime-types'
-
-export function snapshot(sessionId?: string): RuntimeMobileSessionTabsResult {
-  return {
-    worktree: 'wt-1',
-    publicationEpoch: 'publication-test',
-    snapshotVersion: Date.now(),
-    activeGroupId: null,
-    activeTabId: null,
-    activeTabType: null,
-    tabs: sessionId
-      ? [
-          {
-            type: 'agent-session',
-            id: `agent-session:${sessionId}`,
-            sessionId,
-            agent: 'claude',
-            title: 'Chat',
-            isActive: false
-          }
-        ]
-      : []
-  }
-}
diff --git a/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.test.ts b/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.test.ts
index 1e2541a1b547..a3e446e68adb 100644
--- a/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.test.ts
+++ b/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.test.ts
@@ -1,21 +1,46 @@
+import { EMPTY_STRUCTURED_AGENT_SESSION } from '../../../../shared/structured-agent-session-reducer'
+import type { StructuredAgentSessionReadSnapshot } from '@/components/native-chat/structured-agent-session-read-owner-contract'
 import { beforeEach, expect, it, vi } from 'vitest'
 
-const mocks = vi.hoisted(() => ({
-  supported: true,
-  call: vi.fn(),
-  launch: vi.fn((_args: unknown): { tabId: string | null; runtimeLaunch?: Promise<unknown> } => ({
-    tabId: 'terminal-tab'
-  })),
-  closeUnifiedTab: vi.fn(),
-  toast: vi.fn()
-}))
+const mocks = vi.hoisted(() => {
+  const live: { held?: StructuredAgentSessionReadSnapshot; view: string } = { view: 'worktrees' }
+  return {
+    supported: true,
+    live,
+    call: vi.fn(),
+    launch: vi.fn((_args: unknown): { tabId: string | null; runtimeLaunch?: Promise<unknown> } => ({
+      tabId: 'terminal-tab'
+    })),
+    closeUnifiedTab: vi.fn(),
+    toast: vi.fn()
+  }
+})
 vi.mock('sonner', () => ({ toast: { error: mocks.toast } }))
 vi.mock('@/store', () => ({
   useAppStore: {
     setState: vi.fn(),
-    getState: () => ({ settings: {}, closeUnifiedTab: mocks.closeUnifiedTab })
+    getState: () => ({
+      settings: {},
+      closeUnifiedTab: mocks.closeUnifiedTab,
+      activeView: mocks.live.view
+    })
   }
 }))
+vi.mock('@/runtime/local-runtime-capabilities', () => ({
+  subscribeLocalRuntimeCapabilityObservation: () => () => {},
+  readLocalRuntimeCapabilitiesOrUnknown: () => [],
+  ensureLocalRuntimeCapabilities: async () =>
+    mocks.supported
+      ? ['agent-session.structured.switch.v1:codex', 'agent-session.conversation-stop.v1']
+      : []
+}))
+vi.mock('@/runtime/runtime-rpc-client', () => ({
+  runtimeEnvironmentSupportsCapability: async () => false
+}))
+vi.mock('@/components/native-chat/structured-agent-session-read-owner-registry', () => ({
+  findStructuredAgentSessionReadOwner: () =>
+    mocks.live.held ? { getSnapshot: () => mocks.live.held } : undefined
+}))
 vi.mock('@/runtime/structured-agent-session-client', () => ({
   supportsInPlaceSwitch: async () => mocks.supported,
   callStructuredAgentSession: mocks.call
@@ -52,6 +77,8 @@ const SOURCE = {
 beforeEach(() => {
   vi.clearAllMocks()
   mocks.supported = true
+  mocks.live.held = undefined
+  mocks.live.view = 'worktrees'
   mocks.call.mockResolvedValue({ source: SOURCE })
 })
 
@@ -75,25 +102,73 @@ it('stops the chat on its host, opens the same-id resume in its slot, leaves ret
   expect(mocks.closeUnifiedTab).not.toHaveBeenCalled()
 })
 
-it('never sends a switch to a host that does not advertise it', async () => {
+it('preserves readable recovery and never launches from an old Close acknowledgement', async () => {
   mocks.supported = false
   await runNativeChatCliSwitch(SWITCH)
-  expect(mocks.call).not.toHaveBeenCalled()
+  expect(mocks.call.mock.calls.map((call) => call[1])).toEqual([
+    'agentSession.close',
+    'agentSession.reveal'
+  ])
   expect(mocks.launch).not.toHaveBeenCalled()
   expect(mocks.closeUnifiedTab).not.toHaveBeenCalled()
   expect(mocks.toast).toHaveBeenCalledOnce()
 })
 
-it('keeps the chat when the host refuses a busy chat, and says why', async () => {
+it('keeps the chat when old owner cannot complete Stop, with factual guidance', async () => {
   mocks.call.mockRejectedValue({
     data: {
-      refusal: { code: 'agent_session_operation_invalid', details: { reason: 'turnActive' } }
+      refusal: { code: 'agent_session_ownership_unknown', details: { reason: 'ownerUnproven' } }
     }
   })
   await runNativeChatCliSwitch(SWITCH)
   expect(mocks.launch).not.toHaveBeenCalled()
   expect(mocks.closeUnifiedTab).not.toHaveBeenCalled()
   expect(mocks.toast).toHaveBeenCalledWith(
-    'Codex is replying. Wait for the reply or stop it, then switch.'
+    expect.stringContaining('could not confirm Codex stopped')
+  )
+})
+
+it('composes ordinary Stop before the old strict proven-close switch envelope', async () => {
+  mocks.live.held = {
+    current: true,
+    loadingOlder: false,
+    olderHistoryGeneration: 0,
+    state: {
+      ...EMPTY_STRUCTURED_AGENT_SESSION,
+      fence: 8,
+      working: true,
+      latestTurn: { itemId: 'turn', observedAt: 1, turn: { turnId: 'turn', state: 'running' } }
+    }
+  }
+  const stop = Promise.withResolvers<{ ok: boolean }>()
+  mocks.call.mockImplementation((_target, method) =>
+    method === 'agentSession.cancel' ? stop.promise : Promise.resolve({ source: SOURCE })
   )
+  const switching = runNativeChatCliSwitch(SWITCH)
+  await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
+  expect(mocks.launch).not.toHaveBeenCalled()
+  expect(mocks.call.mock.calls[0][2]).toEqual({
+    envelope: expect.objectContaining({
+      sessionId: SWITCH.sessionId,
+      expectedRuntimeFence: 8
+    })
+  })
+  stop.resolve({ ok: true })
+  await switching
+  expect(mocks.call.mock.calls.map((call) => call[1])).toEqual([
+    'agentSession.cancel',
+    'agentSession.switchToTerminal'
+  ])
+  expect(mocks.call.mock.calls[1][2]).toEqual({ sessionId: SWITCH.sessionId })
+  expect(mocks.launch).toHaveBeenCalledOnce()
+})
+
+it('does not override navigation while the old proven-close owner is pending', async () => {
+  mocks.call.mockImplementation(async () => {
+    mocks.live.view = 'settings'
+    return { source: SOURCE }
+  })
+  await runNativeChatCliSwitch(SWITCH)
+  expect(mocks.launch).not.toHaveBeenCalled()
+  expect(mocks.toast).not.toHaveBeenCalled()
 })
diff --git a/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts b/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts
index 355a0bc03bb8..a52a663e7ec7 100644
--- a/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts
+++ b/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts
@@ -1,3 +1,11 @@
+import { findStructuredAgentSessionReadOwner } from '@/components/native-chat/structured-agent-session-read-owner-registry'
+import { runningStructuredAgentSessionTurnId } from '../../../../shared/structured-agent-session-live-turn'
+import { structuredAgentSessionPayloadFingerprint } from '../../../../shared/structured-agent-session-mutation'
+import { createBrowserUuid } from '@/lib/browser-uuid'
+import { agentSessionRefusalError } from '../../../../shared/agent-session-wire-refusals'
+import { ensureLocalRuntimeCapabilities } from '@/runtime/local-runtime-capabilities'
+import { runtimeEnvironmentSupportsCapability } from '@/runtime/runtime-rpc-client'
+import { AGENT_SESSION_CONVERSATION_STOP_RUNTIME_CAPABILITY } from '../../../../shared/protocol-version'
 import {
   conversationSwitchChanged,
   pendingNativeChatCliSwitches as pending
@@ -7,18 +15,16 @@ import { toast } from 'sonner'
 import { useAppStore } from '@/store'
 import { buildAiVaultResumeStartupForWorktree } from '@/lib/ai-vault-resume-command'
 import { launchAiVaultSessionInNewTab } from '@/lib/launch-ai-vault-session'
-import {
-  callStructuredAgentSession,
-  supportsInPlaceSwitch
-} from '@/runtime/structured-agent-session-client'
+import { callStructuredAgentSession } from '@/runtime/structured-agent-session-client'
 import { structuredAgentSessionTargetForHost } from '@/runtime/structured-agent-session-owner'
 import { AiVaultChatForkSourceSchema } from '../../../../shared/ai-vault-chat-fork-contract'
 import type { AiVaultAgent } from '../../../../shared/ai-vault-types'
 import { getExecutionHostIdForWorktree } from '@/lib/worktree-runtime-owner'
 import { parseExecutionHostId } from '../../../../shared/execution-host'
+import { captureConversationSwitchSelection } from '@/lib/conversation-switch-state'
 
 const changed = conversationSwitchChanged
-/** Moves a chat's conversation into a terminal on the same id: the host stops the idle chat, the
+/** Moves a chat's conversation into a terminal on the same id: the host proves the chat stopped, the
  *  terminal opens in the chat's slot, then the chat tab closes. `chatTabId` null opens a new tab. */
 export async function runLegacyNativeChatCliSwitch(args: {
   sessionId: string
@@ -27,6 +33,7 @@ export async function runLegacyNativeChatCliSwitch(args: {
   agent: AiVaultAgent
   chatTabId: string | null
   onComplete?: () => void
+  viewerSelection?: string
 }): Promise<void> {
   const key = `${args.executionHostId}\0${args.sessionId}\0legacy`
   const target = structuredAgentSessionTargetForHost(args.executionHostId)
@@ -34,6 +41,25 @@ export async function runLegacyNativeChatCliSwitch(args: {
   if (pending.has(key) || !target || !hostId) {
     return
   }
+  const stillSelected = captureConversationSwitchSelection(args.viewerSelection)
+  const sourceTab = useAppStore
+    .getState()
+    .unifiedTabsByWorktree?.[args.workspaceId]?.find((tab) => tab.id === args.chatTabId)
+  const stillCaptured = () => {
+    const state = useAppStore.getState()
+    const current = state.unifiedTabsByWorktree?.[args.workspaceId]?.find(
+      (tab) => tab.id === args.chatTabId
+    )
+    return (
+      getExecutionHostIdForWorktree(state, args.workspaceId) === args.executionHostId &&
+      (!sourceTab ||
+        Boolean(
+          current &&
+          current.entityId === sourceTab.entityId &&
+          current.groupId === sourceTab.groupId
+        ))
+    )
+  }
   pending.set(key, args)
   try {
     changed()
@@ -43,11 +69,54 @@ export async function runLegacyNativeChatCliSwitch(args: {
     ) {
       throw new Error('source unavailable')
     }
-    // Fail closed: a host that doesn't advertise the switch never receives it.
-    if (!(await supportsInPlaceSwitch(target, args.agent))) {
-      throw new Error(
-        conversationSwitchFailureText(null, { agent: args.agent, direction: 'terminal' })
-      )
+    const supports = async (capability: string) =>
+      target.kind === 'local'
+        ? (await ensureLocalRuntimeCapabilities())?.includes(capability) === true
+        : runtimeEnvironmentSupportsCapability(target.environmentId, capability)
+    const held = findStructuredAgentSessionReadOwner(args.sessionId, target)?.getSnapshot()
+    if (held?.current && held.state.fence !== null) {
+      const conversationStop = await supports(AGENT_SESSION_CONVERSATION_STOP_RUNTIME_CAPABILITY)
+      const turnId = runningStructuredAgentSessionTurnId(held.state)
+      if (conversationStop || turnId) {
+        const fields = conversationStop ? {} : { turnId }
+        const stopped = await callStructuredAgentSession<{ ok: boolean }>(
+          target,
+          'agentSession.cancel',
+          {
+            envelope: {
+              sessionId: args.sessionId,
+              clientOperationId: createBrowserUuid(),
+              expectedRuntimeFence: held.state.fence,
+              payloadFingerprint: structuredAgentSessionPayloadFingerprint({
+                method: 'agentSession.cancel',
+                sessionId: args.sessionId,
+                fields
+              })
+            },
+            ...fields
+          }
+        )
+        if (!stopped.ok) {
+          throw agentSessionRefusalError('agent_session_ownership_unknown', {
+            reason: 'ownerUnproven'
+          })
+        }
+      }
+    }
+    if (!(await supports(`agent-session.structured.switch.v1:${args.agent}`))) {
+      // Ordinary old Close can hide before proving exit; reveal readable recovery and never infer proof from its ACK.
+      try {
+        await callStructuredAgentSession(target, 'agentSession.close', {
+          sessionId: args.sessionId
+        })
+      } catch {
+        // The original Close has no positive exit receipt on this peer.
+      } finally {
+        await callStructuredAgentSession(target, 'agentSession.reveal', {
+          sessionId: args.sessionId
+        }).catch(() => {})
+      }
+      throw agentSessionRefusalError('agent_session_ownership_unknown', { reason: 'ownerUnproven' })
     }
     const answered = await callStructuredAgentSession<{ source: unknown }>(
       target,
@@ -55,6 +124,9 @@ export async function runLegacyNativeChatCliSwitch(args: {
       { sessionId: args.sessionId }
     )
     const source = AiVaultChatForkSourceSchema.parse(answered.source)
+    if (!stillSelected() || !stillCaptured()) {
+      return
+    }
     const state = useAppStore.getState()
     const startup = buildAiVaultResumeStartupForWorktree({
       state,
@@ -67,7 +139,8 @@ export async function runLegacyNativeChatCliSwitch(args: {
       worktreeId: args.workspaceId,
       ...startup,
       ...(args.chatTabId ? { afterTabId: args.chatTabId } : {}),
-      resumeOrigin: 'switch'
+      resumeOrigin: 'switch',
+      canActivate: stillSelected
     })
     const outcome = launch.tabId === null ? await launch.runtimeLaunch : null
     if (outcome && outcome.status !== 'created') {
diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.held-job.test.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.held-job.test.tsx
index 88b4ef8aecbf..fe1e386a5635 100644
--- a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.held-job.test.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.held-job.test.tsx
@@ -27,7 +27,7 @@ vi.mock('@/runtime/local-runtime-capabilities', () => ({
 }))
 afterEach(cleanup)
 it.each(['foreground', 'suspended'] as const)(
-  'keeps the real Claude legacy header/menu disabled for held %s work and available after exit',
+  'keeps the real Claude header/menu switchable during held %s work and after exit',
   (job) => {
     useAppStore.setState(useAppStore.getInitialState(), true)
     const paneKey = 'shell:3f2504e0-4f89-41d3-9a0c-0305e82c3301'
@@ -78,17 +78,17 @@ it.each(['foreground', 'suspended'] as const)(
         </DropdownMenu>
       </TooltipProvider>
     )
-    const header = screen.getByRole('button', { name: 'Resume in New Chat', hidden: true })
-    expect(header.hasAttribute('disabled')).toBe(true)
+    const header = screen.getByRole('button', { name: 'Switch to native chat', hidden: true })
+    expect(header.hasAttribute('disabled')).toBe(false)
     expect(
-      screen.getByRole('menuitem', { name: 'Resume in New Chat' }).getAttribute('aria-disabled')
-    ).toBe('true')
+      screen.getByRole('menuitem', { name: 'Switch to native chat' }).getAttribute('aria-disabled')
+    ).not.toBe('true')
     act(() =>
       useAppStore.getState().setPaneForegroundAgent(paneKey, { agent: null, shellForeground: true })
     )
     expect(header.hasAttribute('disabled')).toBe(false)
     expect(
-      screen.getByRole('menuitem', { name: 'Resume in New Chat' }).getAttribute('aria-disabled')
+      screen.getByRole('menuitem', { name: 'Switch to native chat' }).getAttribute('aria-disabled')
     ).not.toBe('true')
     expect(
       resolveCliChatResumeSource(useAppStore.getState(), {
@@ -126,3 +126,8 @@ it.each(['foreground', 'suspended'] as const)(
     ).toBe('Claude is open in another chat or terminal. Continue there, then try switching again.')
   }
 )
+
+vi.mock('@/components/confirmation-dialog-context', async (original) => ({
+  ...(await original<Record<string, unknown>>()),
+  useConfirmationDialog: () => vi.fn(async () => false)
+}))
diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.test.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.test.tsx
index d915edebfae3..eee6ccd38e73 100644
--- a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.test.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.test.tsx
@@ -50,7 +50,7 @@ beforeEach(() => {
 })
 
 it.each([
-  ['claude', 'Resume in New Chat'],
+  ['claude', 'Switch to native chat'],
   ['codex', 'Switch to native chat']
 ] as const)('offers the %s action for the exact pane and shares pending', (agent, label) => {
   mocks.source.agent = agent
@@ -67,7 +67,7 @@ it.each([
     tab: { id: 'tab-1', worktreeId: 'wt-1' },
     paneKey: 'tab-1:leaf'
   })
-  expect(mocks.run).toHaveBeenCalledWith(mocks.source)
+  expect(mocks.run).toHaveBeenCalledWith(mocks.source, expect.any(Function))
   mocks.pending = true
   rerender(
     <TooltipProvider>
@@ -131,7 +131,7 @@ it('keeps an older host visible but disabled, telling the user to update it', as
     </TooltipProvider>
   )
   const button = screen.getByRole('button', {
-    name: 'Resume in New Chat. Update Orca on this host to continue in Chat UI.'
+    name: 'Switch to native chat. Update Orca on this host to continue in Chat UI.'
   })
   expect(button.hasAttribute('disabled')).toBe(true)
   const trigger = button.parentElement
@@ -143,3 +143,8 @@ it('keeps an older host visible but disabled, telling the user to update it', as
   ).toBeGreaterThan(0)
   expect(mocks.run).not.toHaveBeenCalled()
 })
+
+vi.mock('@/components/confirmation-dialog-context', async (original) => ({
+  ...(await original<Record<string, unknown>>()),
+  useConfirmationDialog: () => vi.fn(async () => false)
+}))
diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx
index 11d3684225b2..25b7446088dc 100644
--- a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx
@@ -1,3 +1,4 @@
+import { useConfirmationDialog } from '@/components/confirmation-dialog-context'
 import { useConversationSwitchReadiness, runCliChatResume } from '@/lib/conversation-surface-switch'
 import { isNativeChatEnabled } from '../../../../shared/structured-native-chat-launch-route'
 import { useShallow } from 'zustand/react/shallow'
@@ -26,6 +27,7 @@ export function TerminalPaneResumeInChatButton({
     )
   )
   const capability = useCliChatResumeCapability(worktreeId, source?.agent)
+  const confirm = useConfirmationDialog()
   const readiness = useConversationSwitchReadiness(
     source ? { direction: 'chat', ...source, source } : null
   )
@@ -33,13 +35,7 @@ export function TerminalPaneResumeInChatButton({
   if (!enabled) {
     return null
   }
-  const label =
-    capability === false
-      ? translate(
-          'auto.components.right.sidebar.AiVaultSessionRow.resumeInNewNativeChat',
-          'Resume in New Chat'
-        )
-      : translate('components.tab.bar.switch.toNativeChat', 'Switch to native chat')
+  const label = translate('components.tab.bar.switch.toNativeChat', 'Switch to native chat')
   const updateRequired = source?.hostUpdateRequired === true
   const tooltip = updateRequired
     ? translate(
@@ -75,7 +71,7 @@ export function TerminalPaneResumeInChatButton({
             onClick={(event) => {
               event.stopPropagation()
               if (source && readiness.ready) {
-                void runCliChatResume(source)
+                void runCliChatResume(source, confirm)
               }
             }}
           >
diff --git a/src/renderer/src/hooks/ipc-events/floating-workspace-reveal-routing.test.ts b/src/renderer/src/hooks/ipc-events/floating-workspace-reveal-routing.test.ts
index 30ce3d0f47eb..15acff738912 100644
--- a/src/renderer/src/hooks/ipc-events/floating-workspace-reveal-routing.test.ts
+++ b/src/renderer/src/hooks/ipc-events/floating-workspace-reveal-routing.test.ts
@@ -1,3 +1,4 @@
+import { captureConversationSwitchViewerSelection } from '@/lib/conversation-switch-selection'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { FLOATING_TERMINAL_WORKTREE_ID, getDefaultSettings } from '../../../../shared/constants'
 import { TOGGLE_FLOATING_TERMINAL_EVENT } from '@/lib/floating-terminal'
@@ -282,3 +283,34 @@ describe('taking the user to a folder workspace terminal', () => {
     expect(panelToggles(dispatchEvent)).toBe(0)
   })
 })
+
+it.each(['unchanged', 'navigate'] as const)(
+  'checks original viewer at the editor focus event writer: %s',
+  async (action) => {
+    const { emit } = setup()
+    const state = testStore().getState()
+    const source = state.createUnifiedTab(MAIN, 'agent-session', {
+      entityId: 'source',
+      agentSessionAgent: 'codex'
+    })
+    const destination = state.createUnifiedTab(MAIN, 'agent-session', {
+      entityId: 'canonical-C',
+      agentSessionAgent: 'codex',
+      activate: false
+    })
+    const other = state.createUnifiedTab(MAIN, 'agent-session', {
+      entityId: 'other',
+      activate: false
+    })
+    state.activateTab(source.id)
+    const viewerSelection = captureConversationSwitchViewerSelection()
+    if (action === 'navigate') {
+      state.activateTab(other.id)
+    }
+    emit('onFocusEditorTab', { tabId: destination.id, worktreeId: MAIN, viewerSelection })
+    expect(testStore().getState().getActiveTab(MAIN)?.id).toBe(
+      action === 'unchanged' ? destination.id : other.id
+    )
+    expect(testStore().getState().getTab(destination.id)?.entityId).toBe('canonical-C')
+  }
+)
diff --git a/src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge.ts
index 7538f0fc793b..d0d6fc1425c5 100644
--- a/src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge.ts
@@ -1,3 +1,4 @@
+import { conversationSwitchViewerSelectionCurrent } from '@/lib/conversation-switch-selection'
 import type { SplitTerminalPaneDetail } from '@/constants/terminal'
 import { requestBackgroundTerminalWorktreeMount } from '@/components/terminal/background-terminal-worktree-mount'
 import {
@@ -150,7 +151,10 @@ export function registerTerminalUiRoutingIpcBridge(unsubs: (() => void)[]): void
   )
 
   unsubs.push(
-    window.api.ui.onFocusEditorTab(({ tabId, worktreeId, userInitiated }) => {
+    window.api.ui.onFocusEditorTab(({ tabId, worktreeId, userInitiated, viewerSelection }) => {
+      if (!conversationSwitchViewerSelectionCurrent(viewerSelection)) {
+        return
+      }
       const localTabId = resolveWindowTabIdForHostTab(worktreeId, tabId)
       const store = useAppStore.getState()
       const tab = (store.unifiedTabsByWorktree[worktreeId] ?? []).find(
diff --git a/src/renderer/src/hooks/useIpcEvents-agent-conversation-cap.test.ts b/src/renderer/src/hooks/useIpcEvents-agent-conversation-cap.test.ts
index 51f090ac1196..e0037d996938 100644
--- a/src/renderer/src/hooks/useIpcEvents-agent-conversation-cap.test.ts
+++ b/src/renderer/src/hooks/useIpcEvents-agent-conversation-cap.test.ts
@@ -2,7 +2,6 @@ import { afterEach, expect, it, vi } from 'vitest'
 import type { UseBoundStore, StoreApi } from 'zustand'
 import type { AppState } from '../store/types'
 import type { AgentStatusIpcPayload } from '../../../shared/agent-status-types'
-import { agentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
 import type { AgentStatusSetData } from './ipc-events-agent-status-store-test-fixtures'
 import {
   createTestStore,
@@ -12,7 +11,6 @@ import {
 } from '../store/slices/store-test-helpers'
 import { buildWindowApi } from './ipc-events-agent-status-window-test-fixtures'
 import { collectLeafIds } from '../../../shared/terminal-pane-layout-tree'
-import { captureTerminalSurfaceIdentity } from '../../../shared/terminal-tab-close'
 import { adoptsCliConversations } from '../../../shared/structured-agent-cli-conversation-adoption'
 import {
   collectAgentPaneConversations,
@@ -66,13 +64,11 @@ vi.mock('./agent-hook-completion-notifications', () => ({
 }))
 vi.mock('sonner', () => ({ toast: { error: mocks.toast } }))
 const cleanup: (() => void)[] = []
-const running: Promise<void>[] = []
 afterEach(async () => {
   cleanup
     .splice(0)
     .toReversed()
     .forEach((close) => close())
-  await Promise.allSettled(running.splice(0))
   resetAgentPaneAuthorityAliasesForTests()
   vi.restoreAllMocks()
   vi.useRealTimers()
@@ -120,12 +116,8 @@ it.each([600, 6000])(
       })
     )
     const { registerAgentStatusIpcBridge } = await import('./ipc-events/agent-status-ipc-bridge')
-    const { runLegacyCliChatResume: runCliChatResume } =
-      await import('../components/tab-bar/cli-chat-resume-run')
     const { resolveCliChatResumeSource } =
       await import('../components/tab-bar/cli-chat-resume-source')
-    const { runLegacyNativeChatCliSwitch: runNativeChatCliSwitch } =
-      await import('../components/tab-bar/native-chat-cli-switch-run')
     const unsubs: (() => void)[] = []
     const bridge = registerAgentStatusIpcBridge(unsubs)
     cleanup.push(bridge.disposeAsyncState, bridge.unsubscribeStore, ...unsubs)
@@ -175,65 +167,26 @@ it.each([600, 6000])(
     })!
     expect(first.providerSessionId).toBe('conversation')
     expect(retry.providerSessionId).toBe('conversation')
-    mocks.rpc.mockImplementation(async (_target, method, args) => {
-      expect(method).toBe('terminal.resolvePane')
-      const tabId = args.paneKey.split(':')[0]
-      const identity = captureTerminalSurfaceIdentity(store.getState(), 'wt', tabId, leaf(1))!
-      return {
-        terminal: {
-          handle: `handle-${tabId}`,
-          ptyId: identity.ptyId,
-          incarnationId: 'incarnation',
-          presentation: { identity: { ...identity, incarnationId: 'incarnation' }, holders: [] }
-        }
-      }
+    const firstController = new AbortController()
+    const retryController = new AbortController()
+    switches.pendingCliChatResumes.set(firstController, { key: null, source: first })
+    switches.pendingNativeChatCliSwitches.set('native', {
+      chatTabId: 'native',
+      workspaceId: 'wt',
+      executionHostId: 'local'
     })
-    const refusal = {
-      ok: false as const,
-      refusal: { code: 'agent_session_operation_invalid', message: 'Not admitted' }
-    }
-    const oldAnswer = Promise.withResolvers<typeof refusal>()
-    const newAnswer = Promise.withResolvers<typeof refusal>()
-    const nativeAnswer = Promise.withResolvers<{ source: unknown }>()
-    const nativeLaunch = Promise.withResolvers<{ status: 'created' }>()
     cleanup.push(() => {
-      oldAnswer.resolve(refusal)
-      newAnswer.resolve(refusal)
-      nativeAnswer.resolve({ source: null })
-      nativeLaunch.resolve({ status: 'created' })
-    })
-    const returns = [oldAnswer, newAnswer]
-    mocks.call.mockImplementation((_target, method) =>
-      method === 'agentSession.switchToChat' ? returns.shift()!.promise : nativeAnswer.promise
-    )
-    mocks.launch.mockReturnValue({ tabId: null, runtimeLaunch: nativeLaunch.promise })
-    const ownerRefusal = agentSessionRefusalError('agent_session_conflict', {
-      reason: 'conversationHeldElsewhere',
-      owner: { sessionId: 'existing', workspaceId: 'wt' }
-    })
-    mocks.support.mockRejectedValueOnce(ownerRefusal)
-    const old = runCliChatResume(first)
-    running.push(old)
-    await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(1))
-    const native = runNativeChatCliSwitch({
-      sessionId: 'native-session',
-      workspaceId: 'wt',
-      executionHostId: 'local',
-      agent: 'codex',
-      chatTabId: 'native'
+      switches.pendingCliChatResumes.delete(firstController)
+      switches.pendingCliChatResumes.delete(retryController)
+      switches.pendingNativeChatCliSwitches.delete('native')
     })
-    running.push(native)
-    await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(2))
     transferAgentPaneAuthorityAlias({ fromPaneKey: first.paneKey, toPaneKey: pane('alias-old') })
     const { cli: _removed, ...withoutCli } = store.getState().terminalLayoutsByTabId
     store.setState({
       terminalLayoutsByTabId: withoutCli,
       tabsByWorktree: { wt: tabs.filter((tab) => tab.id !== 'cli') }
     })
-    mocks.support.mockRejectedValueOnce(ownerRefusal)
-    const newer = runCliChatResume(retry)
-    running.push(newer)
-    await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(3))
+    switches.pendingCliChatResumes.set(retryController, { key: 'retry', source: retry })
     transferAgentPaneAuthorityAlias({ fromPaneKey: retry.paneKey, toPaneKey: pane('alias-new') })
     let protectedKeys = [
       first.paneKey,
@@ -319,31 +272,18 @@ it.each([600, 6000])(
     stopNested()
     expect(nestedWrites).toBe(2)
     protectedKeys = [retry.paneKey, pane('retry', 2), pane('alias-new'), pane('native')]
-    oldAnswer.resolve(refusal)
-    await old
+    switches.pendingCliChatResumes.delete(firstController)
+    store.setState((state) => ({ agentConversationsByPaneKey: state.agentConversationsByPaneKey }))
     expect(Object.keys(store.getState().agentConversationsByPaneKey)).toHaveLength(506)
     expect(store.getState().agentConversationsByPaneKey[pane('alias-new')]).toBeDefined()
-    expect(mocks.call).toHaveBeenCalledTimes(3)
     protectedKeys = [pane('native')]
-    newAnswer.resolve(refusal)
-    await newer
+    switches.pendingCliChatResumes.delete(retryController)
+    store.setState((state) => ({ agentConversationsByPaneKey: state.agentConversationsByPaneKey }))
     expect(Object.keys(store.getState().agentConversationsByPaneKey)).toHaveLength(504)
-    nativeAnswer.resolve({
-      source: {
-        agent: 'codex',
-        sourceAgent: 'codex',
-        sessionId: 'native-provider',
-        filePath: '/repo/rollout.jsonl',
-        cwd: '/repo',
-        codexHome: null,
-        executionHostPlatform: 'darwin'
-      }
-    })
-    await vi.waitFor(() => expect(mocks.launch).toHaveBeenCalledOnce())
     await emit(pane('pressure-after-native-receipt', n + 11))
     protectedKeys = []
-    nativeLaunch.resolve({ status: 'created' })
-    await native
+    switches.pendingNativeChatCliSwitches.delete('native')
+    store.setState((state) => ({ agentConversationsByPaneKey: state.agentConversationsByPaneKey }))
     expect(Object.keys(store.getState().agentConversationsByPaneKey)).toHaveLength(503)
     for (const key of roots) {
       expect(
@@ -375,3 +315,122 @@ it.each([600, 6000])(
   },
   120_000
 )
+
+it.each([600, 6000])(
+  'skips retention reconstruction for unchanged identities among %i rooted conversations',
+  async (n) => {
+    vi.useFakeTimers()
+    vi.setSystemTime(1_800_000_000_000)
+    const store = createTestStore()
+    mocks.store.current = store
+    vi.stubGlobal('window', { api: { gh: { enqueuePRRefresh: vi.fn(async () => true) } } })
+    const identities = Object.fromEntries(
+      Array.from({ length: n }, (_, index) => {
+        const paneKey = pane(`root-${index}`)
+        return [
+          paneKey,
+          {
+            paneKey,
+            worktreeId: 'wt',
+            executionHostId: 'local' as const,
+            connectionId: null,
+            agent: 'codex' as const,
+            providerSession: { key: 'session_id' as const, id: `conversation-${index}` }
+          }
+        ]
+      })
+    )
+    store.setState({
+      repos: [TEST_REPO],
+      worktreesByRepo: { [TEST_REPO.id]: [makeWorktree({ id: 'wt', repoId: TEST_REPO.id })] },
+      tabsByWorktree: { wt: [makeTab({ id: 'root-0', worktreeId: 'wt' })] },
+      terminalLayoutsByTabId: Object.fromEntries(
+        Array.from({ length: n }, (_, index) => [`root-${index}`, layout(1)])
+      ),
+      agentConversationsByPaneKey: identities
+    })
+    const key = pane('root-0')
+    let updatedAt = Date.now()
+    const status = (state: 'working' | 'done') =>
+      store
+        .getState()
+        .setAgentStatus(
+          key,
+          { state, agentType: 'codex', prompt: 'Existing conversation' },
+          undefined,
+          { updatedAt: ++updatedAt },
+          { worktreeId: 'wt', connectionId: null },
+          { providerSession: identities[key].providerSession }
+        )
+    status('working')
+    const keys = vi.spyOn(Object, 'keys')
+    const classifier = vi.spyOn(capacity, 'classifyPaneKeyLiveness')
+    const protection = vi.spyOn(switches, 'protectedConversationPaneKeys')
+    status('done')
+    expect(store.getState().agentStatusByPaneKey[key].state).toBe('done')
+    store
+      .getState()
+      .recordAgentProviderSession(
+        key,
+        'codex',
+        identities[key].providerSession,
+        { updatedAt: ++updatedAt },
+        { worktreeId: 'wt', connectionId: null }
+      )
+    expect(store.getState().agentStatusByPaneKey[key]).toBeUndefined()
+    store.getState().setAgentStatuses([
+      {
+        paneKey: key,
+        payload: { state: 'working', agentType: 'codex', prompt: 'Next turn' },
+        timing: { updatedAt: ++updatedAt },
+        routing: { worktreeId: 'wt', connectionId: null },
+        metadata: { providerSession: identities[key].providerSession }
+      }
+    ])
+    expect(store.getState().agentStatusByPaneKey[key].state).toBe('working')
+    expect(store.getState().agentConversationsByPaneKey).toBe(identities)
+    const unchangedEnumerations = keys.mock.calls.filter(([map]) => map === identities).length
+    expect(unchangedEnumerations).toBe(0)
+    expect(classifier).not.toHaveBeenCalled()
+    expect(protection).not.toHaveBeenCalled()
+    store
+      .getState()
+      .recordAgentProviderSession(
+        key,
+        'codex',
+        { key: 'session_id', id: 'replacement' },
+        { updatedAt: ++updatedAt },
+        { worktreeId: 'wt', connectionId: null }
+      )
+    expect(store.getState().agentConversationsByPaneKey[key].providerSession.id).toBe('replacement')
+    expect(classifier).toHaveBeenCalledTimes(1)
+    expect(protection).toHaveBeenCalledTimes(1)
+    switches.pendingNativeChatCliSwitches.set('retention-test', {
+      chatTabId: 'root-0',
+      workspaceId: 'wt',
+      executionHostId: 'local'
+    })
+    cleanup.push(() => switches.pendingNativeChatCliSwitches.delete('retention-test'))
+    store.setState({
+      terminalLayoutsByTabId: Object.fromEntries(
+        Object.entries(store.getState().terminalLayoutsByTabId).slice(501)
+      )
+    })
+    expect(classifier).toHaveBeenCalledTimes(2)
+    expect(store.getState().agentConversationsByPaneKey[key]).toBeDefined()
+    expect(Object.keys(store.getState().agentConversationsByPaneKey)).toHaveLength(n)
+    switches.pendingNativeChatCliSwitches.delete('retention-test')
+    store.setState((state) => ({ agentConversationsByPaneKey: state.agentConversationsByPaneKey }))
+    expect(classifier).toHaveBeenCalledTimes(3)
+    expect(store.getState().agentConversationsByPaneKey[key]).toBeUndefined()
+    expect(Object.keys(store.getState().agentConversationsByPaneKey)).toHaveLength(n - 1)
+    expect(store.getState().agentConversationsByPaneKey[pane('root-501')]).toBeDefined()
+    console.info('UNCHANGED_RETENTION_COUNTS', {
+      n,
+      acceptedUpdates: 3,
+      unchangedEnumerations,
+      changedInputRebuilds: classifier.mock.calls.length
+    })
+    await Promise.resolve()
+  }
+)
diff --git a/src/renderer/src/i18n/en-runtime-required.json b/src/renderer/src/i18n/en-runtime-required.json
index c053a5dccc82..0d90e42d8e2e 100644
--- a/src/renderer/src/i18n/en-runtime-required.json
+++ b/src/renderer/src/i18n/en-runtime-required.json
@@ -941,15 +941,8 @@
           "right": "Close tabs to the right?"
         },
         "switch": {
-          "replyBusy": "{{agent}} is replying. Wait for the reply or stop it, then switch.",
-          "startBusy": "{{agent}} is starting. Wait, then switch.",
-          "switchBusy": "{{agent}} is already switching. Wait, then try again.",
           "openElsewhere": "{{agent}} is open in another chat or terminal. Continue there, then try switching again.",
-          "workBusy": "{{agent}} still has work waiting. Finish or cancel it, then switch.",
-          "terminalBusy": "{{agent}} cannot switch while this terminal has a running job. Exit the job, then switch.",
-          "terminalBusyPosix": "{{agent}} cannot switch while this terminal has a running job. If you suspended a job, run fg and exit it, then switch.",
-          "unavailableNow": "Switching {{agent}} is unavailable for this chat now. You can keep using chat.",
-          "stopUnknown": "Orca could not confirm {{agent}} stopped. Restart Orca, then check this chat before trying again. Switching may remain unavailable.",
+          "stopUnknown": "Orca could not confirm {{agent}} stopped. Check its open chats and terminals, then try switching again.",
           "outcomeUnknown": "Orca could not confirm the {{agent}} switch. Check the open chat and terminal before trying again.",
           "historyUnavailable": "{{agent}} couldn't open this conversation's history. Check that its saved conversation is available, then try again.",
           "chatStartFailed": "{{agent}} could not start in chat. Check its setup and try again.",
diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index c50846b9f0d2..3a355b37fde3 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -18576,21 +18576,16 @@
           "toCliTooltip": "Switch to CLI: stops {{agent}} in native chat and continues the same conversation in a terminal.",
           "openedInWorkspace": "Opened chat in {{workspace}}.",
           "toNativeChatTooltip": "Switch to native chat: continues the same conversation in a chat, in this tab.",
-          "exitAgentFirst": "Exit {{agent}} in this terminal to switch.",
-          "waitForReply": "Wait for the reply to finish or stop it, then switch.",
           "stopUnconfirmed": "Couldn't confirm {{agent}} stopped. Try again.",
           "failed": "Couldn't switch this conversation to the CLI.",
           "noConversation": "No saved conversation is available in this terminal yet.",
           "unavailable": "Switching {{agent}} is not available yet.",
-          "replyBusy": "{{agent}} is replying. Wait for the reply or stop it, then switch.",
-          "startBusy": "{{agent}} is starting. Wait, then switch.",
-          "switchBusy": "{{agent}} is already switching. Wait, then try again.",
           "openElsewhere": "{{agent}} is open in another chat or terminal. Continue there, then try switching again.",
-          "workBusy": "{{agent}} still has work waiting. Finish or cancel it, then switch.",
-          "terminalBusy": "{{agent}} cannot switch while this terminal has a running job. Exit the job, then switch.",
-          "terminalBusyPosix": "{{agent}} cannot switch while this terminal has a running job. If you suspended a job, run fg and exit it, then switch.",
           "unavailableNow": "Switching {{agent}} is unavailable for this chat now. You can keep using chat.",
-          "stopUnknown": "Orca could not confirm {{agent}} stopped. Restart Orca, then check this chat before trying again. Switching may remain unavailable.",
+          "stopUnknown": "Orca could not confirm {{agent}} stopped. Check its open chats and terminals, then try switching again.",
+          "sourceStopUnknown": "Orca could not confirm {{agent}} stopped. Check {{agent}} in the original terminal, then try switching again.",
+          "stopAndSwitchTitle": "{{agent}} is replying. Stop it and switch?",
+          "stopAndSwitch": "Stop and switch",
           "outcomeUnknown": "Orca could not confirm the {{agent}} switch. Check the open chat and terminal before trying again.",
           "historyUnavailable": "{{agent}} couldn't open this conversation's history. Check that its saved conversation is available, then try again.",
           "chatStartFailed": "{{agent}} could not start in chat. Check its setup and try again.",
diff --git a/src/renderer/src/i18n/locales/pt.json b/src/renderer/src/i18n/locales/pt.json
index c4b41c2dac56..1bef1d7fee37 100644
--- a/src/renderer/src/i18n/locales/pt.json
+++ b/src/renderer/src/i18n/locales/pt.json
@@ -18914,6 +18914,12 @@
           "switchToTerminalView": "Alternar para visualização de terminal",
           "switchToChatView": "Alternar para visualização de chat"
         },
+        "switch": {
+          "stopAndSwitchTitle": "{{agent}} está respondendo. Interromper e alternar?",
+          "stopAndSwitch": "Interromper e alternar",
+          "stopUnknown": "O Orca não pôde confirmar que {{agent}} parou. Verifique os chats e terminais abertos e tente alternar novamente.",
+          "sourceStopUnknown": "O Orca não pôde confirmar que {{agent}} parou. Verifique {{agent}} no terminal original e tente alternar novamente."
+        },
         "BrowserTab": {
           "closeOthers": "Fechar Outras",
           "muteTab": "Silenciar Aba",
diff --git a/src/renderer/src/lib/activate-ai-vault-structured-session.ts b/src/renderer/src/lib/activate-ai-vault-structured-session.ts
index 31e5aaba1489..8897882e02f4 100644
--- a/src/renderer/src/lib/activate-ai-vault-structured-session.ts
+++ b/src/renderer/src/lib/activate-ai-vault-structured-session.ts
@@ -1,3 +1,4 @@
+import { conversationSwitchViewerSelectionCurrent } from './conversation-switch-selection'
 import { toast } from 'sonner'
 import type { AiVaultSession } from '../../../shared/ai-vault-types'
 import { translate } from '@/i18n/i18n'
@@ -79,9 +80,13 @@ const defaultDeps: StructuredSessionActivationDeps = {
 export async function activateAiVaultStructuredSession(
   session: Pick<AiVaultSession, 'structuredSession'>,
   deps: StructuredSessionActivationDeps = defaultDeps,
-  target?: RuntimeClientTarget
+  target?: RuntimeClientTarget,
+  viewerSelection?: string
 ): Promise<boolean> {
-  return (await activateAiVaultStructuredSessionVerified(session, deps, target)) !== 'none'
+  return (
+    (await activateAiVaultStructuredSessionVerified(session, deps, target, viewerSelection)) !==
+    'none'
+  )
 }
 
 /** `activated` only when the chat's tab is really active; `reported` means the click's toast said why
@@ -89,7 +94,8 @@ export async function activateAiVaultStructuredSession(
 export async function activateAiVaultStructuredSessionVerified(
   session: Pick<AiVaultSession, 'structuredSession'>,
   deps: StructuredSessionActivationDeps = defaultDeps,
-  target?: RuntimeClientTarget
+  target?: RuntimeClientTarget,
+  viewerSelection?: string
 ): Promise<'activated' | 'reported' | 'none'> {
   const structured = session.structuredSession
   if (!structured) {
@@ -102,12 +108,12 @@ export async function activateAiVaultStructuredSessionVerified(
         runtimeEnvironmentIdOrLocalUnlessTwin(useAppStore.getState(), structured.workspaceId)
       )
   )
-  const key = `${hostKey}\0${structured.workspaceId}\0${structured.sessionId}`
+  const key = `${hostKey}\0${structured.workspaceId}\0${structured.sessionId}\0${viewerSelection ?? ''}`
   const inFlight = activationsInFlight.get(key)
   if (inFlight) {
     return inFlight
   }
-  const activation = activateStructuredSession(structured, deps, target)
+  const activation = activateStructuredSession(structured, deps, target, viewerSelection)
   activationsInFlight.set(key, activation)
   try {
     return await activation
@@ -116,22 +122,28 @@ export async function activateAiVaultStructuredSessionVerified(
   }
 }
 
-const activationsInFlight = new Map<string, Promise<'activated' | 'reported'>>()
+const activationsInFlight = new Map<string, Promise<'activated' | 'reported' | 'none'>>()
 
 async function activateStructuredSession(
   structured: NonNullable<AiVaultSession['structuredSession']>,
   deps: StructuredSessionActivationDeps,
-  host?: RuntimeClientTarget
-): Promise<'activated' | 'reported'> {
+  host?: RuntimeClientTarget,
+  viewerSelection?: string
+): Promise<'activated' | 'reported' | 'none'> {
   const target = {
     worktreeId: structured.workspaceId,
     sessionId: structured.sessionId,
     ...(host ? { target: host } : {})
   }
-  if (!deps.activate(target)) {
+  const activate = () =>
+    conversationSwitchViewerSelectionCurrent(viewerSelection) && deps.activate(target)
+  if (!activate()) {
     // Refresh can avoid reveal, but failure must fall through: host republication is the actual repair.
     const refreshed = await refreshedWithoutThrowing(deps, structured.workspaceId, host)
-    if (!refreshed || !deps.activate(target)) {
+    if (!refreshed || !activate()) {
+      if (!conversationSwitchViewerSelectionCurrent(viewerSelection)) {
+        return 'none'
+      }
       // Ask the host to republish a closed or unpublished tab from its persisted record.
       const revealed = await deps.reveal(target)
       if (revealed !== 'revealed') {
@@ -145,7 +157,10 @@ async function activateStructuredSession(
         return 'reported'
       }
       await refreshedWithoutThrowing(deps, structured.workspaceId, host)
-      if (!deps.activate(target)) {
+      if (!activate()) {
+        if (!conversationSwitchViewerSelectionCurrent(viewerSelection)) {
+          return 'none'
+        }
         deps.unavailable()
         return 'reported'
       }
diff --git a/src/renderer/src/lib/agent-launch-tab-main-written.test.ts b/src/renderer/src/lib/agent-launch-tab-main-written.test.ts
index 2984b504ad47..5f8db8a5cbbb 100644
--- a/src/renderer/src/lib/agent-launch-tab-main-written.test.ts
+++ b/src/renderer/src/lib/agent-launch-tab-main-written.test.ts
@@ -1,3 +1,5 @@
+import { _resetLayoutFramePositionForTests } from '@/runtime/layout-frame-position'
+import { captureConversationSwitchViewerSelection } from './conversation-switch-selection'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type * as AgentStatusModule from '@/lib/agent-status'
 import type { AgentLaunchTabPublishRequest } from '../../../shared/agent-launch-tab-publication'
@@ -24,6 +26,8 @@ vi.mock('@/store', () => {
   return {
     useAppStore: {
       getState: () => current().getState(),
+      setState: (...args: Parameters<ReturnType<typeof createTestStore>['setState']>) =>
+        current().setState(...args),
       subscribe: (listener: () => void) => current().subscribe(listener)
     }
   }
@@ -87,6 +91,7 @@ const launchPane = () =>
   store.getState().tabsByWorktree[WT]?.find((tab) => tab.id === TAB_ID)?.agentLaunchPane
 
 beforeEach(() => {
+  _resetLayoutFramePositionForTests()
   store = createTestStore()
   testStore.current = store
   focusTerminalInitiatedTab.mockClear()
@@ -131,6 +136,7 @@ describe("a launch tab main wrote, in a layout-owner build's window", () => {
       worktreeId: WT,
       tabId: TAB_ID,
       leafId: LEAF_ID,
+      operationId: 'op-1',
       verdict: { kind: 'not-started', code: 'boom' }
     })
 
@@ -147,6 +153,7 @@ describe("a launch tab main wrote, in a layout-owner build's window", () => {
       worktreeId: WT,
       tabId: TAB_ID,
       leafId: LEAF_ID,
+      operationId: 'op-1',
       verdict: { kind: 'unconfirmed' }
     })
 
@@ -165,6 +172,7 @@ describe("a launch tab main wrote, in a layout-owner build's window", () => {
       worktreeId: WT,
       tabId: TAB_ID,
       leafId: LEAF_ID,
+      operationId: 'op-1',
       verdict: { kind: 'proceed' }
     })
 
@@ -174,7 +182,7 @@ describe("a launch tab main wrote, in a layout-owner build's window", () => {
     expect(agentLaunchPanePrompt(TAB_ID)).toBeNull()
   })
 
-  it('leaves the close of a withdrawn tab to main, and drops what it kept', () => {
+  it('withdraws an unused main-written projection and drops what it kept', () => {
     drawMainTab()
     keepAgentLaunchTabMainWrote(request({ prompt: 'fix the build' }))
 
@@ -182,10 +190,11 @@ describe("a launch tab main wrote, in a layout-owner build's window", () => {
       worktreeId: WT,
       tabId: TAB_ID,
       leafId: LEAF_ID,
+      operationId: 'op-1',
       verdict: { kind: 'withdrawn' }
     })
 
-    expect(store.getState().tabsByWorktree[WT]?.map((tab) => tab.id)).toEqual([TAB_ID])
+    expect(store.getState().tabsByWorktree[WT]?.map((tab) => tab.id)).toEqual([])
     expect(launchPane()).toBeUndefined()
     expect(agentLaunchPanePrompt(TAB_ID)).toBeNull()
   })
@@ -212,3 +221,21 @@ describe("a launch tab main wrote, in a layout-owner build's window", () => {
     expect(agentLaunchPanePrompt(TAB_ID)).toBeNull()
   })
 })
+
+it.each(['unchanged', 'navigate'] as const)(
+  'checks original viewer when main-written publication finally draws: %s',
+  (action) => {
+    const source = store.getState().createTab(WT)
+    const other = store.getState().createTab(WT)
+    store.getState().setActiveTab(source.id)
+    const viewerSelection = captureConversationSwitchViewerSelection()
+    keepAgentLaunchTabMainWrote(request({ viewer: 'focus-in-workspace', viewerSelection }))
+    if (action === 'navigate') {
+      store.getState().setActiveTab(other.id)
+    }
+    drawMainTab()
+    expect(launchPane()).toEqual({ leafId: LEAF_ID, operationId: 'op-1' })
+    expect(store.getState().getActiveTab(WT)?.id).toBe(action === 'unchanged' ? TAB_ID : other.id)
+    expect(focusTerminalInitiatedTab).toHaveBeenCalledTimes(action === 'unchanged' ? 1 : 0)
+  }
+)
diff --git a/src/renderer/src/lib/agent-launch-tab-main-written.ts b/src/renderer/src/lib/agent-launch-tab-main-written.ts
index 61c2b555f8da..3cd87d7a942b 100644
--- a/src/renderer/src/lib/agent-launch-tab-main-written.ts
+++ b/src/renderer/src/lib/agent-launch-tab-main-written.ts
@@ -1,3 +1,4 @@
+import { conversationSwitchViewerSelectionCurrent } from '@/lib/conversation-switch-selection'
 import { agentLaunchPaneAttemptCurrent } from './agent-launch-pane-start'
 import { afterLayoutFrame, layoutFramesFlowing } from '@/runtime/layout-frame-position'
 import type { AgentLaunchPaneVerdictEvent } from '../../../shared/agent-launch-pane-verdict'
@@ -78,9 +79,18 @@ function keepWhenDrawn(request: AgentLaunchTabPublishRequest, present: () => voi
   const { worktreeId, tabId } = request
   undrawn.get(tabId)?.stop()
 
+  const forgetIfGone = () => {
+    if (
+      undrawn.get(tabId)?.pane.operationId === request.operationId &&
+      goneFromFrames(worktreeId, tabId)
+    ) {
+      dropUndrawn(tabId)
+    }
+  }
   const stop = useAppStore.subscribe(() => {
     const tab = drawnTab(worktreeId, tabId)
     if (!tab) {
+      afterLayoutFrame(request.shownByMain?.frameSeq, forgetIfGone)
       return
     }
     const entry = undrawn.get(tabId)
@@ -93,16 +103,9 @@ function keepWhenDrawn(request: AgentLaunchTabPublishRequest, present: () => voi
   })
   undrawn.set(tabId, { pane: launchPaneOf(request), present, stop })
   if (request.shownByMain) {
-    afterLayoutFrame(request.shownByMain.frameSeq, () => {
-      if (
-        undrawn.get(tabId)?.pane.operationId === request.operationId &&
-        goneFromFrames(worktreeId, tabId)
-      ) {
-        dropUndrawn(tabId)
-      }
-    })
+    afterLayoutFrame(request.shownByMain.frameSeq, forgetIfGone)
   }
-  return true
+  return undrawn.has(tabId)
 }
 
 export function keepAgentLaunchTabMainWrote(
@@ -120,21 +123,27 @@ export function keepAgentLaunchTabMainWrote(
   // Only the launch that made the tab moves anyone, as the window's own publication.
   const present = (): void => {
     if (created) {
-      presentAgentLaunchTab(viewer, worktreeId, tabId, leafId)
+      presentAgentLaunchTab(viewer, worktreeId, tabId, leafId, request.viewerSelection)
     }
   }
   const tab = drawnTab(worktreeId, tabId)
   if (tab) {
     keepLaunchPane(tabId, tab, launchPaneOf(request))
     present()
-  } else if (created && viewer === 'focus-window') {
+  } else if (
+    created &&
+    viewer === 'focus-window' &&
+    conversationSwitchViewerSelectionCurrent(request.viewerSelection)
+  ) {
     // Reveal the workspace while awaiting its tab frame, unless main already closed the tab.
     if (keepWhenDrawn(request, present)) {
-      revealWorkspaceSurface(useAppStore.getState(), worktreeId, [tabId])
+      if (request.viewerSelection === undefined) {
+        revealWorkspaceSurface(useAppStore.getState(), worktreeId, [tabId])
+      }
     }
   } else {
     // Nobody is moved to an undrawn workspace; its tab keeps the launch when it draws.
-    keepWhenDrawn(request, () => {})
+    keepWhenDrawn(request, present)
   }
   const groupId =
     useAppStore
diff --git a/src/renderer/src/lib/agent-launch-tab-presentation.ts b/src/renderer/src/lib/agent-launch-tab-presentation.ts
index 90cfdfd39e36..c49f9cb8a4e0 100644
--- a/src/renderer/src/lib/agent-launch-tab-presentation.ts
+++ b/src/renderer/src/lib/agent-launch-tab-presentation.ts
@@ -1,3 +1,4 @@
+import { conversationSwitchViewerSelectionCurrent } from '@/lib/conversation-switch-selection'
 import type { AgentLaunchTabViewerRule } from '../../../shared/agent-launch-tab-publication'
 import { focusTerminalInitiatedTab } from '../hooks/ipc-events/terminal-command-state'
 import { useAppStore } from '../store'
@@ -8,8 +9,12 @@ export function presentAgentLaunchTab(
   viewer: AgentLaunchTabViewerRule,
   worktreeId: string,
   tabId: string,
-  leafId?: string
+  leafId?: string,
+  viewerSelection?: string
 ): void {
+  if (!conversationSwitchViewerSelectionCurrent(viewerSelection)) {
+    return
+  }
   if (viewer === 'focus-window') {
     revealWorkspaceSurface(useAppStore.getState(), worktreeId, [tabId])
   }
diff --git a/src/renderer/src/lib/agent-launch-tab-publication.test.ts b/src/renderer/src/lib/agent-launch-tab-publication.test.ts
index ccd28a1b73c8..2240b6722b63 100644
--- a/src/renderer/src/lib/agent-launch-tab-publication.test.ts
+++ b/src/renderer/src/lib/agent-launch-tab-publication.test.ts
@@ -1,3 +1,4 @@
+import { captureConversationSwitchViewerSelection } from './conversation-switch-selection'
 import type { AppState } from '@/store/types'
 import {
   acceptAgentLaunchPaneAttempt,
@@ -452,3 +453,27 @@ describe('the ordinary window actual verdict producer', () => {
     expect(store.getState().tabsByWorktree[WT]?.some((row) => row.id === TAB_ID)).toBe(true)
   })
 })
+
+it.each(['unchanged', 'navigate', 'close'] as const)(
+  'conditions ordinary terminal creation and presentation on the original viewer: %s',
+  (action) => {
+    const source = store.getState().createTab(WT)
+    const other = store.getState().createTab(WT)
+    store.getState().setActiveTab(source.id)
+    const viewerSelection = captureConversationSwitchViewerSelection()
+    if (action === 'navigate') {
+      store.getState().setActiveTab(other.id)
+    }
+    if (action === 'close') {
+      store.getState().closeTab(source.id)
+    }
+    const selected = store.getState().getActiveTab(WT)?.id
+    const published = publishAgentLaunchTab(
+      request({ viewer: 'focus-in-workspace', viewerSelection })
+    )
+    expect(published.created).toBe(true)
+    expect(launchTab()?.entityId).toBe(TAB_ID)
+    expect(store.getState().getActiveTab(WT)?.id).toBe(action === 'unchanged' ? TAB_ID : selected)
+    expect(focusTerminalInitiatedTab).toHaveBeenCalledTimes(action === 'unchanged' ? 1 : 0)
+  }
+)
diff --git a/src/renderer/src/lib/agent-launch-tab-publication.ts b/src/renderer/src/lib/agent-launch-tab-publication.ts
index 568c8c143614..d6bc5f8857f5 100644
--- a/src/renderer/src/lib/agent-launch-tab-publication.ts
+++ b/src/renderer/src/lib/agent-launch-tab-publication.ts
@@ -1,3 +1,4 @@
+import { conversationSwitchViewerSelectionCurrent } from '@/lib/conversation-switch-selection'
 import { applyAgentLaunchPaneVerdict } from './agent-launch-pane-verdict-application'
 import { launchTabWithdrawalIdentity } from '../../../shared/agent-launch-tab-publication'
 import { agentLaunchPaneAttemptCurrent } from './agent-launch-pane-start'
@@ -105,14 +106,18 @@ export function publishAgentLaunchTab(
         ...(selectFolderWorkspaces(store) ?? []).map(folderWorkspaceToWorktree)
       ].filter((worktree) => worktree.id === worktreeId)
   })
-  const focuses = request.viewer === 'focus-window' || request.viewer === 'focus-in-workspace'
+  const focuses =
+    (request.viewer === 'focus-window' || request.viewer === 'focus-in-workspace') &&
+    conversationSwitchViewerSelectionCurrent(request.viewerSelection)
   const tab = store.createTab(worktreeId, placement.groupId, undefined, {
     id: tabId,
     initialLeafId: leafId,
     agentLaunchPane: launchPaneFor(request),
     launchAgent: request.launchAgent,
     viewMode: request.viewMode,
-    ...(focuses ? {} : { activate: false, recordInteraction: false })
+    ...(focuses && request.viewerSelection === undefined
+      ? {}
+      : { activate: false, recordInteraction: false })
   })
   if (request.prompt) {
     rememberAgentLaunchPanePrompt(tabId, request.prompt)
@@ -125,7 +130,7 @@ export function publishAgentLaunchTab(
       insertUnifiedTabAfterAnchor(worktreeId, unifiedTabId, placement.anchorTabId)
     }
   }
-  presentAgentLaunchTab(request.viewer, worktreeId, tab.id, leafId)
+  presentAgentLaunchTab(request.viewer, worktreeId, tab.id, leafId, request.viewerSelection)
   const landed = landedGroupId(worktreeId, tab.id) ?? placement.groupId ?? ''
   const fallback = placementFallback(request, landed, placement.anchorTabId !== undefined)
   return {
diff --git a/src/renderer/src/lib/agent-session/structured-agent-session-provisional-tab.test.ts b/src/renderer/src/lib/agent-session/structured-agent-session-provisional-tab.test.ts
index be96646180c3..c053d493fa0f 100644
--- a/src/renderer/src/lib/agent-session/structured-agent-session-provisional-tab.test.ts
+++ b/src/renderer/src/lib/agent-session/structured-agent-session-provisional-tab.test.ts
@@ -1,4 +1,17 @@
 // @vitest-environment happy-dom
+import type * as CliChatResumeSourceModule from '@/components/tab-bar/cli-chat-resume-source'
+import type * as CliChatResumeTerminalCapture from '@/components/tab-bar/cli-chat-resume-terminal-capture'
+import type { CliChatResumeSource } from '@/components/tab-bar/cli-chat-resume-source'
+import { runLegacyCliChatResume } from '@/components/tab-bar/cli-chat-resume-run'
+import { captureConversationSwitchViewerSelection } from '../conversation-switch-selection'
+import { runConversationSwitch } from '../conversation-surface-switch'
+import { setLocalRuntimeCapabilitiesForTests } from '@/runtime/local-runtime-capabilities'
+import type * as SessionClient from '@/runtime/structured-agent-session-client'
+import type {
+  AgentSessionAttachResult,
+  AgentSessionMutationResult
+} from '../../../../shared/agent-session-wire'
+import type { StructuredAgentSessionCreateParams } from '../../../../shared/structured-agent-session-create'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { useAppStore } from '@/store/index'
 import type * as launchModule from '../structured-agent-session-launch-create-call'
@@ -31,22 +44,96 @@ import {
   type TabsDrawnFromMain
 } from '@/store/slices/tabs-drawn-from-main.test-fixture'
 
-vi.mock('@/runtime/runtime-rpc-client', async (importOriginal) =>
-  (
+vi.mock('@/runtime/runtime-rpc-client', async (importOriginal) => {
+  const rpc = (
     await import('@/runtime/layout-apply-test-transport.test-fixture')
   ).runtimeRpcClientWithLayoutApply(await importOriginal())
-)
+  return {
+    ...rpc,
+    callRuntimeRpc: (...args: Parameters<typeof rpc.callRuntimeRpc>) => {
+      if (mocks.source.current && args[1] === 'terminal.stopExact') {
+        mocks.stopped(args[2])
+        return Promise.resolve({ stoppedPtyIds: ['source-pty'], postStopVerified: true })
+      }
+      return rpc.callRuntimeRpc(...args)
+    }
+  }
+})
+vi.mock('@/runtime/structured-agent-session-client', async (original) => {
+  const client = await original<typeof SessionClient>()
+  return {
+    ...client,
+    supportsStructuredAgentSessionCreateMessage: (
+      ...args: Parameters<typeof client.supportsStructuredAgentSessionCreateMessage>
+    ) =>
+      mocks.source.current
+        ? Promise.resolve(false)
+        : client.supportsStructuredAgentSessionCreateMessage(...args),
+    callStructuredAgentSession: (...args: Parameters<typeof client.callStructuredAgentSession>) => {
+      if (mocks.source.current && args[1] === 'agentSession.createSupport') {
+        return mocks.support()
+      }
+      if (mocks.source.current && args[1] === 'agentSession.create') {
+        return mocks.create(args[2])
+      }
+      return client.callStructuredAgentSession(...args)
+    }
+  }
+})
+vi.mock('@/components/tab-bar/cli-chat-resume-source', async (original) => {
+  const actual = await original<typeof CliChatResumeSourceModule>()
+  return {
+    ...actual,
+    resolveCliChatResumeSource: (...args: Parameters<typeof actual.resolveCliChatResumeSource>) =>
+      mocks.source.current ?? actual.resolveCliChatResumeSource(...args)
+  }
+})
+vi.mock('@/components/tab-bar/cli-chat-resume-terminal-capture', async (original) => {
+  const actual = await original<typeof CliChatResumeTerminalCapture>()
+  return {
+    ...actual,
+    captureSourceTerminal: (...args: Parameters<typeof actual.captureSourceTerminal>) =>
+      mocks.source.current
+        ? Promise.resolve({
+            target: { kind: 'local' },
+            handle: 'source-handle',
+            incarnationId: 'source-incarnation',
+            presentation: { identity: { ptyId: 'source-pty' } }
+          })
+        : actual.captureSourceTerminal(...args)
+  }
+})
 vi.mock('@/runtime/runtime-layout-client', async (importOriginal) =>
   (
     await import('@/runtime/layout-apply-test-transport.test-fixture')
   ).runtimeLayoutClientWithTestFrames(await importOriginal())
 )
 
-const mocks = vi.hoisted(() => ({ text: '', focus: vi.fn(), toast: vi.fn(), launch: vi.fn() }))
-vi.mock('../structured-agent-session-launch-create-call', async (original) => ({
-  ...(await original<typeof launchModule>()),
-  launchStructuredAgentSession: mocks.launch
-}))
+const mocks = vi.hoisted(() => {
+  function makeSource(): { current: CliChatResumeSource | null } {
+    return { current: null }
+  }
+  return {
+    text: '',
+    focus: vi.fn(),
+    toast: vi.fn(),
+    launch: vi.fn(),
+    create: vi.fn(),
+    support: vi.fn(),
+    stopped: vi.fn(),
+    source: makeSource()
+  }
+})
+vi.mock('../structured-agent-session-launch-create-call', async (original) => {
+  const actual = await original<typeof launchModule>()
+  return {
+    ...actual,
+    launchStructuredAgentSession: (
+      ...args: Parameters<typeof actual.launchStructuredAgentSession>
+    ) =>
+      mocks.source.current ? actual.launchStructuredAgentSession(...args) : mocks.launch(...args)
+  }
+})
 vi.mock('sonner', () => ({ toast: { info: mocks.toast, error: vi.fn() } }))
 vi.mock('../focus-terminal-tab-surface', () => ({ focusTerminalTabSurface: vi.fn() }))
 vi.mock('@/components/native-chat/native-chat-composer-draft-store', () => ({
@@ -89,6 +176,8 @@ let main: TabsDrawnFromMain
 beforeEach(async () => {
   vi.clearAllMocks()
   mocks.text = ''
+  mocks.source.current = null
+  setLocalRuntimeCapabilitiesForTests([])
   resetStructuredAgentLaunchRegistryForTests()
   clearNativeChatPendingAttachmentsForTests()
   useAppStore.setState({
@@ -446,3 +535,109 @@ it.each(['expiry', 'purge'])('created pane publication: %s', async (order) => {
     )
   }
 })
+
+it.each(['unchanged', 'navigate', 'strict-old-runtime', 'stale-v2-runtime'] as const)(
+  'strict legacy Stop through real host admission and provisional/layout writers: %s',
+  async (action) => {
+    const source = useAppStore
+      .getState()
+      .createUnifiedTab('wt-1', 'terminal', { id: 'source-terminal', entityId: 'source-terminal' })
+    const other = useAppStore
+      .getState()
+      .createUnifiedTab('wt-1', 'agent-session', { entityId: 'D', activate: false })
+    useAppStore.setState({
+      tabsByWorktree: { 'wt-1': [terminalRecord(source.id)] },
+      terminalLayoutsByTabId: {
+        [source.id]: {
+          root: { type: 'leaf', leafId: 'leaf' },
+          ptyIdsByLeafId: { leaf: 'source-pty' }
+        }
+      }
+    })
+    await mainLoadsStoreLayout()
+    useAppStore.getState().activateTab(source.id)
+    useAppStore.getState().setActiveTabType('terminal', 'wt-1')
+    mocks.source.current = {
+      agent: 'codex',
+      executionHostId: 'local',
+      workspaceId: 'wt-1',
+      tabId: source.id,
+      paneKey: `${source.id}:leaf`,
+      ptyId: 'source-pty',
+      providerSessionId: 'saved-provider'
+    }
+    const admission = Promise.withResolvers<{ supported: true }>()
+    mocks.support.mockReturnValue(admission.promise)
+    mocks.create.mockImplementation(
+      async (
+        params: StructuredAgentSessionCreateParams
+      ): Promise<AgentSessionMutationResult<AgentSessionAttachResult>> => {
+        const sessionId = params.envelope.sessionId
+        const cursor = { epoch: 'fixture-epoch', sequence: 0 }
+        return {
+          ok: true,
+          replayed: false,
+          fence: 1,
+          cursor,
+          value: {
+            sessionId,
+            fence: 1,
+            unconfirmedClientMessageIds: [],
+            page: {
+              sessionId,
+              epoch: cursor.epoch,
+              direction: 'tail',
+              items: [],
+              removedItemIds: [],
+              submissions: [],
+              window: { oldest: null, newest: null, nextCursor: cursor },
+              hasOlder: false,
+              hasNewer: false
+            }
+          }
+        }
+      }
+    )
+    const fromCommon = action === 'strict-old-runtime' || action === 'stale-v2-runtime'
+    setLocalRuntimeCapabilitiesForTests(
+      action === 'stale-v2-runtime' ? ['agent-session.structured.switch.v2:codex'] : []
+    )
+    useAppStore.setState((state) => ({
+      settings: { ...state.settings, experimentalNativeChat: true }
+    }))
+    const running = fromCommon
+      ? runConversationSwitch({
+          direction: 'chat',
+          ...mocks.source.current,
+          source: mocks.source.current
+        })
+      : runLegacyCliChatResume(mocks.source.current, captureConversationSwitchViewerSelection())
+    await vi.waitFor(() => expect(mocks.support).toHaveBeenCalledOnce())
+    expect(mocks.stopped).toHaveBeenCalledExactlyOnceWith({
+      worktree: 'id:wt-1',
+      expectedPtyIds: ['source-pty'],
+      targetOnly: true,
+      keepHistory: true
+    })
+    expect(mocks.create).not.toHaveBeenCalled()
+    if (action === 'navigate') {
+      useAppStore.getState().activateTab(other.id)
+    }
+    await main.settle()
+    admission.resolve({ supported: true })
+    await running
+    await main.settle()
+    const chats = useAppStore
+      .getState()
+      .unifiedTabsByWorktree['wt-1'].filter(
+        (tab) => tab.contentType === 'agent-session' && tab.entityId !== 'D'
+      )
+    expect(mocks.create).toHaveBeenCalledOnce()
+    expect(chats).toHaveLength(1)
+    expect(useAppStore.getState().getActiveTab('wt-1')?.id).toBe(
+      action === 'navigate' ? other.id : chats[0].id
+    )
+    expect(mocks.create.mock.calls[0][0].resumeFrom.providerSessionId).toBe('saved-provider')
+    expect(mocks.create.mock.calls[0][0].envelope.sessionId).toBe(chats[0].entityId)
+  }
+)
diff --git a/src/renderer/src/lib/agent-session/structured-agent-session-provisional-tab.ts b/src/renderer/src/lib/agent-session/structured-agent-session-provisional-tab.ts
index 8cf8075cdb6f..74d1d69dd520 100644
--- a/src/renderer/src/lib/agent-session/structured-agent-session-provisional-tab.ts
+++ b/src/renderer/src/lib/agent-session/structured-agent-session-provisional-tab.ts
@@ -57,7 +57,9 @@ export function structuredLaunchOwner(
 
 /** Only a launch that takes the user to its chat may ask host publication to select it. */
 function launchHooks(args: ProvisionalLaunchArgs): StructuredAgentLaunchHooks {
-  return args.activate === false ? { ...args.hooks, activate: false } : args.hooks
+  return args.activate === false || args.canActivate
+    ? { ...args.hooks, activate: false }
+    : args.hooks
 }
 
 export type ProvisionalLaunchArgs = {
@@ -68,6 +70,7 @@ export type ProvisionalLaunchArgs = {
   targetGroupId?: string
   afterTabId?: string
   activate?: boolean
+  canActivate?: () => boolean
   /** Identity-only resumes publish on commit; unknown outcomes keep their recovery tab. */
   deferPublication?: true
   /** Allow workspace reveal before host acquisition, when the launch has no session ID or owned chat tab yet. */
@@ -102,7 +105,7 @@ export function beginStructuredAgentSessionProvisionalLaunch(
   ): ReturnType<typeof beginLocalProvisionalLaunch> => {
     if (launch?.tab) {
       tabOpened = true
-      if (args.activate !== false) {
+      if (args.activate !== false && args.canActivate?.() !== false) {
         focusIntent?.request(launch.tab.id)
       }
     } else if (!launch) {
@@ -204,7 +207,8 @@ function beginLocalProvisionalLaunch(
       agent: args.plan.agent,
       ...(args.targetGroupId ? { targetGroupId: args.targetGroupId } : {}),
       ...(args.afterTabId ? { afterTabId: args.afterTabId } : {}),
-      ...(args.activate !== undefined ? { activate: args.activate } : {})
+      ...(args.activate !== undefined ? { activate: args.activate } : {}),
+      canActivate: args.canActivate
     })
     return { ...handle, tab }
   } catch (error) {
diff --git a/src/renderer/src/lib/agent-session/structured-agent-session-tab-activation.ts b/src/renderer/src/lib/agent-session/structured-agent-session-tab-activation.ts
index bc560cad8ca8..01af74c8598c 100644
--- a/src/renderer/src/lib/agent-session/structured-agent-session-tab-activation.ts
+++ b/src/renderer/src/lib/agent-session/structured-agent-session-tab-activation.ts
@@ -32,6 +32,7 @@ export function activateStructuredAgentSessionTab(args: {
   worktreeId: string
   tabId: string
   target?: RuntimeClientTarget
+  callerOnly?: boolean
 }): boolean {
   const state = useAppStore.getState()
   const tab = (state.unifiedTabsByWorktree[args.worktreeId] ?? []).find(
@@ -49,7 +50,9 @@ export function activateStructuredAgentSessionTab(args: {
   state.activateTab(tab.id, { worktreeId: args.worktreeId })
   state.setActiveTabType('agent-session', args.worktreeId)
   requestNativeChatComposerFocus(tab.id)
-  activateStructuredAgentSessionTabOnOwner(args.worktreeId, tab.entityId, args.target)
+  activateStructuredAgentSessionTabOnOwner(args.worktreeId, tab.entityId, args.target, {
+    callerOnly: args.callerOnly
+  })
   return true
 }
 
@@ -77,6 +80,7 @@ export function activateStructuredAgentSessionById(args: {
   worktreeId: string
   sessionId: string
   target?: RuntimeClientTarget
+  callerOnly?: boolean
 }): boolean {
   const tab = findStructuredAgentSessionTab(useAppStore.getState().unifiedTabsByWorktree, {
     workspaceId: args.worktreeId,
@@ -87,7 +91,8 @@ export function activateStructuredAgentSessionById(args: {
     ? activateStructuredAgentSessionTab({
         worktreeId: args.worktreeId,
         tabId: tab.id,
-        target: args.target
+        target: args.target,
+        callerOnly: args.callerOnly
       })
     : false
 }
diff --git a/src/renderer/src/lib/conversation-surface-switch.test.tsx b/src/renderer/src/lib/conversation-surface-switch.test.tsx
index d7e11e10a7b6..fd3e3e130ff2 100644
--- a/src/renderer/src/lib/conversation-surface-switch.test.tsx
+++ b/src/renderer/src/lib/conversation-surface-switch.test.tsx
@@ -1,6 +1,19 @@
+import { structuredAgentSessionTabId } from '../../../shared/structured-agent-session-projection'
 // @vitest-environment happy-dom
 import { act, cleanup, renderHook } from '@testing-library/react'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { applyWebSessionTabsSnapshot } from '@/runtime/web-session-tabs-sync/snapshot-api'
+import {
+  makeSnapshot,
+  resetWebSessionTabsSyncTestState
+} from '@/runtime/web-session-tabs-sync-test-harness'
+import { toWebTerminalSurfaceTabId } from '../../../shared/terminal-surface-id'
+import { createTabsSliceMockApi } from '../store/slices/tabs-slice-test-harness'
+import { captureConversationSwitchViewerSelection } from './conversation-switch-selection'
+import { publishAgentLaunchTab } from './agent-launch-tab-publication'
+import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
+import type { CliChatResumeSource } from '@/components/tab-bar/cli-chat-resume-source'
+import type * as SessionOwner from '@/runtime/structured-agent-session-owner'
 import { useAppStore } from '@/store'
 import { EMPTY_STRUCTURED_AGENT_SESSION } from '../../../shared/structured-agent-session-reducer'
 import type { StructuredAgentSessionReadSnapshot } from '@/components/native-chat/structured-agent-session-read-owner-contract'
@@ -11,32 +24,54 @@ import {
 } from './conversation-surface-switch'
 import { pendingNativeChatCliSwitches } from './pending-conversation-surface-switches'
 
-const mocks = vi.hoisted(() => ({
-  support: vi.fn(),
-  call: vi.fn(),
-  legacy: vi.fn(async () => {}),
-  refresh: vi.fn(async () => {}),
-  error: vi.fn(),
-  info: vi.fn(),
-  reader: vi.fn(),
-  listeners: new Set<() => void>(),
-  subscribe: (listener: () => void) => {
-    mocks.listeners.add(listener)
-    return () => mocks.listeners.delete(listener)
+const mocks = vi.hoisted(() => {
+  function makeTarget(): { current: RuntimeClientTarget } {
+    return { current: { kind: 'local' } }
   }
-}))
+  return {
+    target: makeTarget(),
+    support: vi.fn(),
+    rpc: vi.fn(),
+    capture: vi.fn(),
+    prepare: vi.fn(),
+    pairedRefresh: vi.fn(),
+    call: vi.fn(),
+    legacy: vi.fn(async () => {}),
+    refresh: vi.fn(async () => {}),
+    error: vi.fn(),
+    info: vi.fn(),
+    reader: vi.fn(),
+    listeners: new Set<() => void>(),
+    subscribe: (listener: () => void) => {
+      mocks.listeners.add(listener)
+      return () => mocks.listeners.delete(listener)
+    }
+  }
+})
 vi.mock('sonner', () => ({ toast: { error: mocks.error, info: mocks.info } }))
 vi.mock('@/runtime/structured-agent-session-client', () => ({
   supportsInPlaceSwitch: mocks.support,
   callStructuredAgentSession: mocks.call
 }))
-vi.mock('@/runtime/structured-agent-session-owner', () => ({
-  structuredAgentSessionTargetForHost: () => ({ kind: 'local' }),
-  executionHostIdForStructuredTarget: () => 'local'
+vi.mock('@/runtime/structured-agent-session-owner', async (original) => ({
+  ...(await original<typeof SessionOwner>()),
+  structuredAgentSessionTargetForHost: () => mocks.target.current
+}))
+vi.mock('@/runtime/runtime-rpc-client', async (original) => ({
+  ...(await original<object>()),
+  callRuntimeRpc: mocks.rpc
+}))
+vi.mock('@/components/tab-bar/cli-chat-resume-terminal-capture', () => ({
+  captureSourceTerminal: mocks.capture
+}))
+vi.mock('./ai-vault-session-resume-preparation', () => ({
+  prepareAiVaultSessionForResume: mocks.prepare
+}))
+vi.mock('@/runtime/web-runtime-session-snapshot', () => ({
+  refreshWebRuntimeSessionTabsSnapshot: mocks.pairedRefresh
 }))
 vi.mock('./in-place-switch-support', () => ({
-  useInPlaceSwitchRevision: () => 0,
-  inPlaceSwitchCapabilityNow: () => true
+  useInPlaceSwitchCapability: () => true
 }))
 vi.mock('@/runtime/structured-agent-session-status-feed', () => ({
   getStructuredAgentSessionStatusFeed: () => ({
@@ -60,7 +95,8 @@ vi.mock('@/runtime/local-structured-session-tabs-sync/inventory-refresh', () =>
   refreshLocalStructuredSessionWorktreeTabs: mocks.refresh
 }))
 vi.mock('@/components/right-sidebar/ai-vault-session-resume-in-chat-launch', () => ({
-  resumeAiVaultSessionInNewChat: mocks.legacy
+  resumeAiVaultSessionInNewChat: mocks.legacy,
+  adoptingAgentOnHost: async (agent: string) => agent
 }))
 
 const subject = {
@@ -73,10 +109,23 @@ const subject = {
 }
 beforeEach(() => {
   vi.clearAllMocks()
+  createTabsSliceMockApi()
+  resetWebSessionTabsSyncTestState()
+  mocks.target.current = { kind: 'local' }
+  mocks.rpc.mockResolvedValue({})
+  mocks.pairedRefresh.mockResolvedValue(undefined)
+  mocks.capture.mockResolvedValue({
+    handle: 'terminal-source',
+    incarnationId: 'incarnation',
+    presentation: {}
+  })
   mocks.reader.mockReturnValue(undefined)
   mocks.support.mockResolvedValue(true)
   mocks.call.mockResolvedValue({ status: 'completed', sessionId: subject.sessionId })
   useAppStore.setState(useAppStore.getInitialState(), true)
+  useAppStore.setState({
+    settings: { ...useAppStore.getState().settings!, experimentalNativeChat: true }
+  })
 })
 afterEach(() => {
   cleanup()
@@ -187,8 +236,8 @@ it.each(['chat', 'terminal'] as const)(
       }
       mocks.listeners.forEach((listener) => listener())
     })
-    expect(result.current.ready).toBe(false)
-    expect(result.current.explanation).toContain('Codex is replying')
+    expect(result.current.ready).toBe(true)
+    expect(result.current.explanation).toBeUndefined()
     act(() => {
       held = { ...held, current: false }
       mocks.listeners.forEach((listener) => listener())
@@ -198,7 +247,7 @@ it.each(['chat', 'terminal'] as const)(
   }
 )
 
-it('keeps suspended and live jobs disabled, with fg guidance only for suspension', () => {
+it('keeps suspended and live jobs available for Stop and switch', () => {
   const paneKey = 'terminal:leaf'
   const source = {
     tabId: 'terminal',
@@ -217,30 +266,363 @@ it('keeps suspended and live jobs disabled, with fg guidance only for suspension
   const { result } = renderHook(() =>
     useConversationSwitchReadiness({ ...subject, direction: 'chat', source })
   )
-  expect(result.current.ready).toBe(false)
-  expect(result.current.explanation).toContain('If you suspended a job, run fg and exit it')
+  expect(result.current.ready).toBe(true)
+  expect(result.current.explanation).toBeUndefined()
   act(() => {
     useAppStore.getState().setPaneForegroundAgent(paneKey, {
       agent: 'codex',
       shellForeground: false
     })
   })
-  expect(result.current.ready).toBe(false)
-  expect(result.current.explanation).toContain('Exit the job, then switch.')
-  expect(result.current.explanation).not.toContain('fg')
+  expect(result.current.ready).toBe(true)
+  expect(result.current.explanation).toBeUndefined()
 })
 
 it('formats real refusal categories once, with agent and next step, never raw errors or platform-wrong job control', async () => {
   const text = (reason: string, platform = 'darwin') =>
     conversationSwitchFailureText(null, { ...subject, platform }, reason)
-  expect(text('messagesUnsettled')).toContain('work waiting')
-  expect(text('ownerUnproven')).toContain('Restart Orca')
+  expect(text('ownerUnproven')).toContain('Check its open chats and terminals')
   expect(text('previousExitUnverifiable')).not.toContain('Restart')
-  expect(text('conversationOpenInTerminal')).toContain('If you suspended a job, run fg')
-  expect(text('conversationOpenInTerminal', 'win32')).not.toContain('fg')
   mocks.call.mockRejectedValue(new Error('secret raw transport/provider failure'))
   await runConversationSwitch({ ...subject, direction: 'chat' })
   expect(mocks.error).toHaveBeenCalledExactlyOnceWith(
     'Codex could not start in chat. Check its setup and try again.'
   )
 })
+
+it.each([false, true])(
+  'asks once for a live reply; consent=%s has only the authorized effects',
+  async (yes) => {
+    mocks.reader.mockReturnValue({
+      getSnapshot: () => ({
+        current: true,
+        state: {
+          ...EMPTY_STRUCTURED_AGENT_SESSION,
+          working: true,
+          latestTurn: { itemId: 'turn', observedAt: 1, turn: { turnId: 'turn', state: 'running' } }
+        }
+      })
+    })
+    const answer = Promise.withResolvers<boolean>()
+    const confirm = vi.fn(() => answer.promise)
+    const first = runConversationSwitch({ ...subject, confirm })
+    expect(await runConversationSwitch({ ...subject, confirm })).toBe(false)
+    expect(confirm).toHaveBeenCalledExactlyOnceWith(
+      expect.objectContaining({
+        title: 'Codex is replying. Stop it and switch?',
+        compact: true
+      })
+    )
+    expect(mocks.support).not.toHaveBeenCalled()
+    expect(mocks.call).not.toHaveBeenCalled()
+    answer.resolve(yes)
+    expect(await first).toBe(yes)
+    expect(mocks.call).toHaveBeenCalledTimes(yes ? 1 : 0)
+    expect(mocks.refresh).toHaveBeenCalledTimes(yes ? 1 : 0)
+  }
+)
+
+it('does nothing with Chat UI off, including History and direct action dispatch', async () => {
+  useAppStore.setState({
+    settings: { ...useAppStore.getState().settings!, experimentalNativeChat: false }
+  })
+  expect(await runConversationSwitch(subject)).toBe(false)
+  expect(mocks.support).not.toHaveBeenCalled()
+  expect(mocks.call).not.toHaveBeenCalled()
+  expect(mocks.refresh).not.toHaveBeenCalled()
+})
+
+it.each(['claude', 'codex', 'grok', 'opencode', 'opencode2', 'pi'] as const)(
+  'dispatches idle %s once through the common host command, preserving configured commands',
+  async (agent) => {
+    const confirm = vi.fn()
+    useAppStore.setState({
+      settings: {
+        ...useAppStore.getState().settings!,
+        agentCmdOverrides: { [agent]: 'my-alias --option' }
+      }
+    })
+    expect(await runConversationSwitch({ ...subject, agent, confirm })).toBe(true)
+    expect(confirm).not.toHaveBeenCalled()
+    expect(mocks.call).toHaveBeenCalledExactlyOnceWith(
+      { kind: 'local' },
+      'agentSession.switchToTerminal',
+      expect.objectContaining({
+        sessionId: subject.sessionId,
+        execution: expect.objectContaining({ commandOverride: 'my-alias --option' })
+      }),
+      expect.any(Object)
+    )
+  }
+)
+it('keeps the disabled agent out of the switch contract', async () => {
+  expect(await runConversationSwitch({ ...subject, agent: 'omp' })).toBe(false)
+  expect(mocks.call).not.toHaveBeenCalled()
+})
+
+it.each(['support', 'Stop'] as const)(
+  'uses the original viewer through native %s and real terminal publication',
+  async (heldAt) => {
+    const source = useAppStore.getState().createUnifiedTab('workspace', 'agent-session', {
+      id: 'source',
+      entityId: subject.sessionId,
+      agentSessionAgent: 'codex'
+    })
+    const other = useAppStore.getState().createTab('workspace')
+    useAppStore.setState({ activeWorktreeId: 'workspace' })
+    useAppStore.getState().activateTab(source.id)
+    const original = captureConversationSwitchViewerSelection()
+    const held = Promise.withResolvers<void>()
+    if (heldAt === 'support') {
+      mocks.support.mockImplementation(async () => {
+        await held.promise
+        return true
+      })
+    }
+    mocks.call.mockImplementation(async (_target, _method, request) => {
+      if (heldAt === 'Stop') {
+        await held.promise
+      }
+      publishAgentLaunchTab({
+        requestId: 'publication',
+        tabId: 'destination-terminal',
+        leafId: 'destination-leaf',
+        worktreeId: 'workspace',
+        launchAgent: 'codex',
+        viewer: 'focus-in-workspace',
+        viewerSelection: request.execution.viewerSelection
+      })
+      return { status: 'completed', sessionId: subject.sessionId, terminal: 'destination-terminal' }
+    })
+    const running = runConversationSwitch(subject)
+    if (heldAt === 'Stop') {
+      await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
+    }
+    useAppStore.getState().setActiveTab(other.id)
+    held.resolve()
+    expect(await running).toBe(true)
+    expect(mocks.call.mock.calls[0][2].execution.viewerSelection).toBe(original)
+    expect(useAppStore.getState().getActiveTab('workspace')?.id).toBe(other.id)
+    expect(
+      useAppStore
+        .getState()
+        .tabsByWorktree.workspace.some((tab) => tab.id === 'destination-terminal')
+    ).toBe(true)
+  }
+)
+
+it.each(['unchanged', 'unchanged-retained', 'prepare-navigation', 'result-navigation'] as const)(
+  'paired generated chat request consumes canonical C at the real selection writer: %s',
+  async (action) => {
+    mocks.target.current = { kind: 'environment', environmentId: 'paired' }
+    const host = 'runtime:paired' as const
+    const leaf = '11111111-1111-4111-8111-111111111111'
+    const source = { id: toWebTerminalSurfaceTabId('host-source') }
+    const canonical = {
+      id: structuredAgentSessionTabId('codex_canonical-C'),
+      entityId: 'codex_canonical-C'
+    }
+    const other = { id: structuredAgentSessionTabId('codex_D') }
+    const canonicalRow = {
+      type: 'agent-session' as const,
+      id: `agent-session:${canonical.entityId}`,
+      sessionId: canonical.entityId,
+      agent: 'codex' as const,
+      title: 'Canonical',
+      isActive: false
+    }
+    const otherRow = {
+      type: 'agent-session' as const,
+      id: 'agent-session:codex_D',
+      sessionId: 'codex_D',
+      agent: 'codex' as const,
+      title: 'D',
+      isActive: false
+    }
+    const sourceRow = {
+      type: 'terminal' as const,
+      id: `host-source::${leaf}`,
+      parentTabId: 'host-source',
+      leafId: leaf,
+      terminal: 'source-process',
+      title: 'Source',
+      status: 'ready' as const,
+      isActive: true
+    }
+    const snapshot = (retired: boolean) =>
+      makeSnapshot(retired ? [canonicalRow, otherRow] : [sourceRow, canonicalRow, otherRow], {
+        worktree: 'workspace',
+        snapshotVersion: retired ? 2 : 1,
+        activeTabId: retired ? canonicalRow.id : sourceRow.id,
+        activeTabType: retired ? 'agent-session' : 'terminal',
+        tabGroups: [
+          {
+            id: 'host-group-1',
+            activeTabId: retired ? canonicalRow.id : 'host-source',
+            tabOrder: retired
+              ? [canonicalRow.id, otherRow.id]
+              : ['host-source', canonicalRow.id, otherRow.id]
+          }
+        ]
+      })
+    useAppStore.setState({ activeWorktreeId: 'workspace', activeWorkspaceExecutionHostId: host })
+    useAppStore.setState((state) => applyWebSessionTabsSnapshot(state, snapshot(false), 'paired'))
+    useAppStore.getState().activateTab(source.id)
+    const original = captureConversationSwitchViewerSelection()
+    const preparing = Promise.withResolvers<{
+      handle: string
+      incarnationId: string
+      presentation: object
+    }>()
+    mocks.capture.mockReturnValue(preparing.promise)
+    const listing = Promise.withResolvers<void>()
+    mocks.pairedRefresh.mockImplementation(async () => {
+      await listing.promise
+      useAppStore.setState((state) =>
+        applyWebSessionTabsSnapshot(state, snapshot(action !== 'unchanged-retained'), 'paired')
+      )
+    })
+    mocks.call.mockResolvedValue({ status: 'completed', sessionId: canonical.entityId })
+    const cli: CliChatResumeSource = {
+      agent: 'codex',
+      executionHostId: host,
+      workspaceId: 'workspace',
+      tabId: source.id,
+      paneKey: `${source.id}:leaf`,
+      ptyId: 'pty',
+      providerSessionId: 'saved-conversation'
+    }
+    const running = runConversationSwitch({
+      direction: 'chat',
+      executionHostId: host,
+      workspaceId: 'workspace',
+      agent: 'codex',
+      source: cli
+    })
+    await vi.waitFor(() => expect(mocks.capture).toHaveBeenCalledOnce())
+    if (action === 'prepare-navigation') {
+      useAppStore.getState().activateTab(other.id)
+    }
+    preparing.resolve({
+      handle: 'original-source',
+      incarnationId: 'original-incarnation',
+      presentation: {}
+    })
+    await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
+    const request = mocks.call.mock.calls[0][2]
+    expect(request.sessionId).not.toBe(canonical.entityId)
+    expect(request.execution.create.envelope.sessionId).toBe(request.sessionId)
+    expect(request.execution.create.resumeFrom.providerSessionId).toBe(cli.providerSessionId)
+    expect(request.execution.viewerSelection).toBe(original)
+    await vi.waitFor(() => expect(mocks.pairedRefresh).toHaveBeenCalledOnce())
+    if (action === 'result-navigation') {
+      useAppStore.getState().activateTab(other.id)
+    }
+    listing.resolve()
+    expect(await running).toBe(true)
+    expect(useAppStore.getState().getActiveTab('workspace')?.id).toBe(
+      action.startsWith('unchanged') ? canonical.id : other.id
+    )
+    expect(useAppStore.getState().getTab(canonical.id)?.entityId).toBe(canonical.entityId)
+    expect(mocks.rpc).toHaveBeenCalledTimes(action === 'unchanged-retained' ? 1 : 0)
+    if (action === 'unchanged-retained') {
+      expect(mocks.rpc).toHaveBeenCalledWith(
+        mocks.target.current,
+        'session.tabs.activate',
+        expect.objectContaining({
+          tabId: `agent-session:${canonical.entityId}`,
+          navigation: 'caller',
+          notifyClients: false
+        })
+      )
+    }
+  }
+)
+
+it.each(['unchanged', 'result-navigation'] as const)(
+  'paired terminal result preserves caller selection and readable membership: %s',
+  async (action) => {
+    mocks.target.current = { kind: 'environment', environmentId: 'paired' }
+    const leaf = '11111111-1111-4111-8111-111111111111'
+    const sourceId = structuredAgentSessionTabId(subject.sessionId)
+    const destination = toWebTerminalSurfaceTabId('host-terminal')
+    const other = structuredAgentSessionTabId('codex_D')
+    const sourceRow = {
+      type: 'agent-session' as const,
+      id: `agent-session:${subject.sessionId}`,
+      sessionId: subject.sessionId,
+      agent: 'codex' as const,
+      title: 'Source',
+      isActive: true
+    }
+    const otherRow = {
+      type: 'agent-session' as const,
+      id: 'agent-session:codex_D',
+      sessionId: 'codex_D',
+      agent: 'codex' as const,
+      title: 'D',
+      isActive: false
+    }
+    const terminalRow = {
+      type: 'terminal' as const,
+      id: `host-terminal::${leaf}`,
+      parentTabId: 'host-terminal',
+      leafId: leaf,
+      terminal: 'new-process',
+      title: 'Destination',
+      status: 'ready' as const,
+      isActive: false
+    }
+    const snapshot = (published: boolean) =>
+      makeSnapshot(published ? [sourceRow, terminalRow, otherRow] : [sourceRow, otherRow], {
+        worktree: 'workspace',
+        snapshotVersion: published ? 2 : 1,
+        activeTabId: sourceRow.id,
+        activeTabType: 'agent-session',
+        tabGroups: [
+          {
+            id: 'host-group-1',
+            activeTabId: sourceRow.id,
+            tabOrder: published
+              ? [sourceRow.id, 'host-terminal', otherRow.id]
+              : [sourceRow.id, otherRow.id]
+          }
+        ]
+      })
+    useAppStore.setState({
+      activeWorktreeId: 'workspace',
+      activeWorkspaceExecutionHostId: 'runtime:paired'
+    })
+    useAppStore.setState((state) => applyWebSessionTabsSnapshot(state, snapshot(false), 'paired'))
+    useAppStore.getState().activateTab(sourceId)
+    const listed = Promise.withResolvers<void>()
+    mocks.pairedRefresh.mockImplementation(async () => {
+      await listed.promise
+      useAppStore.setState((state) => applyWebSessionTabsSnapshot(state, snapshot(true), 'paired'))
+    })
+    mocks.call.mockResolvedValue({
+      status: 'completed',
+      sessionId: subject.sessionId,
+      terminal: 'host-terminal',
+      sourceRetained: true
+    })
+    const running = runConversationSwitch({
+      ...subject,
+      executionHostId: 'runtime:paired',
+      chatTabId: sourceId
+    })
+    await vi.waitFor(() => expect(mocks.pairedRefresh).toHaveBeenCalledOnce())
+    if (action === 'result-navigation') {
+      useAppStore.getState().activateTab(other)
+    }
+    listed.resolve()
+    expect(await running).toBe(true)
+    expect(useAppStore.getState().getActiveTab('workspace')?.id).toBe(
+      action === 'unchanged' ? destination : other
+    )
+    expect(
+      useAppStore.getState().tabsByWorktree.workspace.some((tab) => tab.id === destination)
+    ).toBe(true)
+    expect(mocks.error).not.toHaveBeenCalled()
+  }
+)
diff --git a/src/renderer/src/lib/conversation-surface-switch.ts b/src/renderer/src/lib/conversation-surface-switch.ts
index 62ebf2a7033e..d1b33dcdbe8b 100644
--- a/src/renderer/src/lib/conversation-surface-switch.ts
+++ b/src/renderer/src/lib/conversation-surface-switch.ts
@@ -1,3 +1,12 @@
+import { adoptingAgentOnHost } from '@/components/right-sidebar/ai-vault-session-resume-in-chat-launch'
+import { translate } from '@/i18n/i18n'
+import { agentLabel } from '../../../shared/ai-vault-session-filters'
+import type { ConfirmationDialogContextValue } from '@/components/confirmation-dialog-context'
+import { isNativeChatEnabled } from '../../../shared/structured-native-chat-launch-route'
+import {
+  inPlaceSwitchEnabled,
+  adoptsCliConversations
+} from '../../../shared/structured-agent-cli-conversation-adoption'
 import { toHostSessionPaneKey } from '../../../shared/terminal-surface-id'
 import {
   captureSwitchProjection,
@@ -9,10 +18,6 @@ import {
   settleSwitchPresentation,
   type SwitchPresentationVisit
 } from './conversation-switch-presentation'
-import { publishAgentLaunchTab } from './agent-launch-tab-publication'
-import { openStructuredAgentSessionProvisionalTab } from './structured-agent-session-launch-surface'
-import { activateAndRevealWorkspace } from './worktree-activation'
-import { afterPendingTab } from '@/runtime/layout-owner-pending-tabs'
 import { parseExecutionHostId } from '../../../shared/execution-host'
 import { toast } from 'sonner'
 import { useAppStore } from '@/store'
@@ -41,18 +46,26 @@ import {
 import { AgentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
 import { prepareAiVaultSessionForResume } from './ai-vault-session-resume-preparation'
 import type { CliChatResumeSource } from '@/components/tab-bar/cli-chat-resume-source'
+import { captureConversationSwitchViewerSelection } from './conversation-switch-selection'
+import { presentConversationSwitchResult } from './conversation-switch-result-selection'
 import { runLegacyConversationSwitch } from './conversation-switch-legacy'
 import {
   type ConversationSwitch,
   keyFor,
   pendingNow,
-  rederiveConversationSwitch
+  rederiveConversationSwitch,
+  conversationSwitchReplying
 } from './conversation-switch-state'
 
 export { conversationSwitchFailureText } from './conversation-switch-feedback'
 
-export function runCliChatResume(source: CliChatResumeSource): Promise<void> {
-  return runConversationSwitch({ direction: 'chat', ...source, source }).then(() => undefined)
+export function runCliChatResume(
+  source: CliChatResumeSource,
+  confirm?: ConfirmationDialogContextValue
+): Promise<void> {
+  return runConversationSwitch({ direction: 'chat', ...source, source, confirm }).then(
+    () => undefined
+  )
 }
 export function runNativeChatCliSwitch(
   args: Omit<ConversationSwitch, 'direction'> & { onComplete?: () => void }
@@ -63,9 +76,14 @@ export function runNativeChatCliSwitch(
 }
 
 export async function runConversationSwitch(args: ConversationSwitch): Promise<boolean> {
-  if (pendingNow(args)) {
+  if (
+    !isNativeChatEnabled(useAppStore.getState().settings) ||
+    !inPlaceSwitchEnabled(args.agent) ||
+    pendingNow(args)
+  ) {
     return false
   }
+  const viewerSelection = captureConversationSwitchViewerSelection()
   const platform = resolveWorktreeExecutionHostPlatform(
     useAppStore.getState(),
     args.workspaceId,
@@ -91,30 +109,47 @@ export async function runConversationSwitch(args: ConversationSwitch): Promise<b
   })
   conversationSwitchChanged()
   const invocationId = createBrowserUuid()
-  if (args.direction === 'terminal' && args.sessionId && args.chatTabId) {
-    captureSwitchProjection(
-      useAppStore.getState(),
-      args.workspaceId,
-      {
-        invocationId,
-        generation: invocationId,
-        sessionId: args.sessionId,
-        tabId: args.chatTabId,
-        phase: 'prepare'
-      },
-      () => {}
-    )
-  }
+  let consented = false
   let sent = false
-  let observing = false
   let presentation: SwitchPresentationVisit | undefined
   try {
+    if (conversationSwitchReplying(args)) {
+      const confirmed = await args.confirm?.({
+        title: translate(
+          'components.tab.bar.switch.stopAndSwitchTitle',
+          '{{agent}} is replying. Stop it and switch?',
+          { agent: agentLabel(args.agent) }
+        ),
+        confirmLabel: translate('components.tab.bar.switch.stopAndSwitch', 'Stop and switch'),
+        cancelLabel: translate('common.cancel', 'Cancel'),
+        compact: true,
+        ignoresOpeningGesture: true
+      })
+      if (!confirmed) {
+        return false
+      }
+    }
+    consented = true
+    if (args.direction === 'terminal' && args.sessionId && args.chatTabId) {
+      captureSwitchProjection(
+        useAppStore.getState(),
+        args.workspaceId,
+        {
+          invocationId,
+          generation: invocationId,
+          sessionId: args.sessionId,
+          tabId: args.chatTabId,
+          phase: 'prepare'
+        },
+        () => {}
+      )
+    }
     if (!(await deadline.wait(supportsInPlaceSwitch(target, args.agent, true)))) {
-      await runLegacyConversationSwitch(args, target)
+      await runLegacyConversationSwitch(args, target, viewerSelection)
       return false
     }
     let sessionId = args.sessionId
-    let execution: Record<string, unknown> = { invocationId }
+    let execution: Record<string, unknown> = { invocationId, viewerSelection }
     if (args.direction === 'chat' && args.source) {
       const captured = await deadline.wait(captureSourceTerminal(args.source))
       if (!captured) {
@@ -122,7 +157,9 @@ export async function runConversationSwitch(args: ConversationSwitch): Promise<b
       }
       const intent = createStructuredAgentSessionLaunchIntent(
         args.workspaceId,
-        'codex',
+        await deadline.wait(
+          adoptingAgentOnHost(args.source.agent, args.workspaceId, args.source.executionHostId)
+        ),
         args.source.executionHostId,
         {
           providerSessionId: args.source.providerSessionId,
@@ -130,7 +167,9 @@ export async function runConversationSwitch(args: ConversationSwitch): Promise<b
             workspaceId: args.workspaceId,
             paneKey: toHostSessionPaneKey(args.source.paneKey)
           }
-        }
+        },
+        undefined,
+        false
       )
       sessionId = intent.sessionId
       const group = useAppStore
@@ -150,11 +189,23 @@ export async function runConversationSwitch(args: ConversationSwitch): Promise<b
           originalPresentation: captured.presentation
         }
       }
-    } else if (args.direction === 'chat' && !sessionId && args.history) {
+    } else if (
+      args.direction === 'chat' &&
+      !sessionId &&
+      args.history &&
+      adoptsCliConversations(args.history.agent)
+    ) {
       const prepared = await deadline.wait(prepareAiVaultSessionForResume(args.history))
-      const intent = createStructuredAgentSessionLaunchIntent(args.workspaceId, 'codex', hostId, {
-        providerSessionId: prepared.sessionId
-      })
+      const intent = createStructuredAgentSessionLaunchIntent(
+        args.workspaceId,
+        await deadline.wait(adoptingAgentOnHost(args.history.agent, args.workspaceId, hostId)),
+        hostId,
+        {
+          providerSessionId: prepared.sessionId
+        },
+        undefined,
+        false
+      )
       sessionId = intent.sessionId
       execution = { ...execution, create: intent.params }
     } else if (args.direction === 'terminal') {
@@ -170,12 +221,12 @@ export async function runConversationSwitch(args: ConversationSwitch): Promise<b
     }
     const method =
       args.direction === 'chat' ? 'agentSession.switchToChat' : 'agentSession.switchToTerminal'
-    const invoke = (extra: Record<string, unknown> = {}) =>
+    const invoke = () =>
       deadline.wait(
         callStructuredAgentSession<AgentSessionSwitchResult>(
           target,
           method,
-          { sessionId, execution: { ...execution, ...extra } },
+          { sessionId, execution },
           {
             signal: deadline.signal,
             dispatchObservation: deadline.delegateSend,
@@ -186,55 +237,15 @@ export async function runConversationSwitch(args: ConversationSwitch): Promise<b
           }
         )
       )
-    let answer = await invoke()
-    if (answer.status === 'present') {
-      const view = answer
-      sessionId = answer.sessionId
-      if (view.surface !== 'terminal') {
-        presentation = beginSwitchPresentation(target, sessionId)
-      }
-      const opened =
-        view.surface === 'terminal' && view.leafId
-          ? {
-              id: publishAgentLaunchTab({
-                requestId: invocationId,
-                operationId: invocationId,
-                worktreeId: view.workspaceId,
-                tabId: view.tabId,
-                leafId: view.leafId,
-                launchAgent: view.agent,
-                viewMode: 'terminal',
-                placement: view.placement,
-                viewer: 'focus-window'
-              }).tabId
-            }
-          : openStructuredAgentSessionProvisionalTab({
-              worktreeId: answer.workspaceId,
-              executionHostId: hostId,
-              sessionId,
-              agent: answer.agent,
-              targetGroupId: answer.placement?.groupId,
-              afterTabId: answer.placement?.afterTabId,
-              activate: true
-            })
-      await deadline.wait(
-        new Promise<void>((resolve, reject) =>
-          afterPendingTab(opened.id, (id) => {
-            if (!id || activateAndRevealWorkspace(view.workspaceId) === false) {
-              reject(new Error('chat unavailable'))
-            } else {
-              resolve()
-            }
-          })
-        )
-      )
-      const shown = presentation ? await deadline.wait(presentation.shown) : true
-      answer = await invoke({ receipt: { generation: answer.generation, shown } })
+    if (args.direction === 'chat' && sessionId) {
+      presentation = beginSwitchPresentation(target, sessionId)
+    }
+    const answer = await invoke()
+    if (args.direction === 'chat' && answer.sessionId !== sessionId) {
+      presentation?.release()
+      presentation = beginSwitchPresentation(target, answer.sessionId)
     }
     if (answer.status !== 'completed') {
-      if (answer.status === 'present') {
-        throw new Error('chat unavailable')
-      }
       if (!presentation || reportSwitchPresentationFailure(presentation, answer.failureItemId)) {
         feedback(
           conversationSwitchFailureText(new AgentSessionRefusalError(answer.refusal), args),
@@ -243,56 +254,29 @@ export async function runConversationSwitch(args: ConversationSwitch): Promise<b
       }
       return false
     }
+    if (target.kind === 'environment') {
+      await presentConversationSwitchResult(args, target, answer, viewerSelection)
+    }
     if (answer.sourceRetained) {
       feedback(conversationSwitchSourceKept(args.agent), 'info')
     }
-    if (answer.startupPending) {
-      observing = true
-      const selectedVisit = presentation
-      void invoke({ observe: true })
-        .then((settled) => {
-          if (settled.status === 'completed' && settled.sourceRetained) {
-            feedback(conversationSwitchSourceKept(args.agent), 'info')
-          }
-          if (
-            (settled.status === 'refused' || settled.status === 'uncertain') &&
-            (!selectedVisit ||
-              reportSwitchPresentationFailure(selectedVisit, settled.failureItemId))
-          ) {
-            feedback(
-              conversationSwitchFailureText(new AgentSessionRefusalError(settled.refusal), args),
-              'error'
-            )
-          }
-        })
-        .catch((error: unknown) => {
-          if (deadline.signal.aborted) {
-            rederiveConversationSwitch({ ...args, sessionId })
-          }
-          if (!selectedVisit || reportSwitchPresentationFailure(selectedVisit)) {
-            feedback(conversationSwitchFailureText(error, args), 'error')
-          }
-        })
-        .finally(() => {
-          settleSwitchPresentation(selectedVisit)
-          deadline.dispose()
-        })
-    }
     return true
   } catch (error) {
-    feedback(conversationSwitchFailureText(error, args), 'error')
+    if (!presentation || reportSwitchPresentationFailure(presentation)) {
+      feedback(conversationSwitchFailureText(error, args), 'error')
+    }
     return false
   } finally {
     if (!sent) {
       releaseUnsentSwitchProjection(invocationId)
     }
-    if (!observing) {
-      settleSwitchPresentation(presentation)
-      deadline.dispose()
-    }
+    settleSwitchPresentation(presentation)
+    deadline.dispose()
     pending.delete(key)
     conversationSwitchChanged()
-    rederiveConversationSwitch(args)
+    if (consented) {
+      rederiveConversationSwitch(args)
+    }
   }
 }
 
diff --git a/src/renderer/src/lib/conversation-switch-feedback.ts b/src/renderer/src/lib/conversation-switch-feedback.ts
index 7267585f4364..89a57c80b2e8 100644
--- a/src/renderer/src/lib/conversation-switch-feedback.ts
+++ b/src/renderer/src/lib/conversation-switch-feedback.ts
@@ -12,40 +12,11 @@ export function conversationSwitchFailureText(
     history?: unknown
     platform?: string
   },
-  reasonOverride?: string,
-  context?: { suspended: boolean }
+  reasonOverride?: string
 ): string {
   const failure = structuredLaunchFailure(error)
   const reason = reasonOverride ?? failure?.details?.reason
   const values = { agent: agentLabel(args.agent) }
-  if (reason === 'turnActive') {
-    return translate(
-      'components.tab.bar.switch.replyBusy',
-      '{{agent}} is replying. Wait for the reply or stop it, then switch.',
-      values
-    )
-  }
-  if (reason === 'handoffInFlight') {
-    return translate(
-      'components.tab.bar.switch.switchBusy',
-      '{{agent}} is already switching. Wait, then try again.',
-      values
-    )
-  }
-  if (reason === 'providerStarting') {
-    return translate(
-      'components.tab.bar.switch.startBusy',
-      '{{agent}} is starting. Wait, then switch.',
-      values
-    )
-  }
-  if (reason === 'messagesUnsettled' || reason === 'backgroundTasksRunning') {
-    return translate(
-      'components.tab.bar.switch.workBusy',
-      '{{agent}} still has work waiting. Finish or cancel it, then switch.',
-      values
-    )
-  }
   if (reason === 'conversationHeldElsewhere') {
     return failure?.source
       ? translate(
@@ -65,30 +36,14 @@ export function conversationSwitchFailureText(
             values
           )
   }
-  if (reason === 'conversationOpenInTerminal') {
-    const suspended =
-      context?.suspended ?? (args.platform === 'darwin' || args.platform === 'linux')
-    return translate(
-      suspended
-        ? 'components.tab.bar.switch.terminalBusyPosix'
-        : 'components.tab.bar.switch.terminalBusy',
-      suspended
-        ? '{{agent}} cannot switch while this terminal has a running job. If you suspended a job, run fg and exit it, then switch.'
-        : '{{agent}} cannot switch while this terminal has a running job. Exit the job, then switch.',
-      values
-    )
-  }
-  if (reason === 'previousExitUnverifiable') {
-    return translate(
-      'components.tab.bar.switch.unavailableNow',
-      'Switching {{agent}} is unavailable for this chat now. You can keep using chat.',
-      values
-    )
-  }
-  if (reason === 'ownerUnproven') {
+  if (reason === 'ownerUnproven' || reason === 'previousExitUnverifiable') {
     return translate(
-      'components.tab.bar.switch.stopUnknown',
-      'Orca could not confirm {{agent}} stopped. Restart Orca, then check this chat before trying again. Switching may remain unavailable.',
+      args.source
+        ? 'components.tab.bar.switch.sourceStopUnknown'
+        : 'components.tab.bar.switch.stopUnknown',
+      args.source
+        ? 'Orca could not confirm {{agent}} stopped. Check {{agent}} in the original terminal, then try switching again.'
+        : 'Orca could not confirm {{agent}} stopped. Check its open chats and terminals, then try switching again.',
       values
     )
   }
diff --git a/src/renderer/src/lib/conversation-switch-legacy.ts b/src/renderer/src/lib/conversation-switch-legacy.ts
index 2d51a3cb0e67..ab3636a2aceb 100644
--- a/src/renderer/src/lib/conversation-switch-legacy.ts
+++ b/src/renderer/src/lib/conversation-switch-legacy.ts
@@ -1,3 +1,4 @@
+import { adoptsCliConversations } from '../../../shared/structured-agent-cli-conversation-adoption'
 import { runLegacyCliChatResume } from '@/components/tab-bar/cli-chat-resume-run'
 import { runLegacyNativeChatCliSwitch } from '@/components/tab-bar/native-chat-cli-switch-run'
 import { switchIntoOwnerLegacy } from '@/components/tab-bar/cli-chat-resume-feedback'
@@ -7,27 +8,35 @@ import { resumeAiVaultSessionInNewChat } from '@/components/right-sidebar/ai-vau
 
 import type { ConversationSwitch } from './conversation-switch-state'
 import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
-export function runLegacyConversationSwitch(args: ConversationSwitch, target: RuntimeClientTarget) {
+export function runLegacyConversationSwitch(
+  args: ConversationSwitch,
+  target: RuntimeClientTarget,
+  viewerSelection: string
+) {
   if (args.direction === 'terminal' && args.sessionId) {
     return runLegacyNativeChatCliSwitch({
       ...args,
       sessionId: args.sessionId,
-      chatTabId: args.chatTabId ?? null
+      chatTabId: args.chatTabId ?? null,
+      viewerSelection
     })
   } else if (args.source) {
-    return runLegacyCliChatResume(args.source)
+    return runLegacyCliChatResume(args.source, viewerSelection)
   } else if (args.sessionId) {
     return switchIntoOwnerLegacy(
       { agent: args.agent, tabId: args.chatTabId ?? '', workspaceId: args.workspaceId },
       { sessionId: args.sessionId, workspaceId: args.workspaceId },
-      target
+      target,
+      viewerSelection
     )
-  } else if (args.history && args.agent === 'codex') {
+  } else if (args.history && adoptsCliConversations(args.agent)) {
     return resumeAiVaultSessionInNewChat(
       args.history,
       args.agent,
       args.workspaceId,
-      newAgentLaunchRequestId()
+      newAgentLaunchRequestId(),
+      undefined,
+      viewerSelection
     )
   }
   return undefined
diff --git a/src/renderer/src/lib/conversation-switch-presentation.test.tsx b/src/renderer/src/lib/conversation-switch-presentation.test.tsx
index 001c3a8c4840..14704d6f0ac3 100644
--- a/src/renderer/src/lib/conversation-switch-presentation.test.tsx
+++ b/src/renderer/src/lib/conversation-switch-presentation.test.tsx
@@ -86,7 +86,6 @@ it('uses the currently visible exact row, never an older equal failure', async (
   vi.spyOn(HTMLElement.prototype, 'getBoundingClientRect').mockImplementation(() => bounds(0))
   const visit = beginSwitchPresentation(target, 'conversation')
   const view = render(<Visit item="old-failure" />)
-  expect(await visit.shown).toBe(true)
   view.rerender(<Visit item="selected-failure" />)
   act(() => {
     expect(reportSwitchPresentationFailure(visit, 'selected-failure')).toBe(false)
@@ -162,3 +161,51 @@ it.each([100, 1000])(
     visit.release()
   }
 )
+
+it.each([10, 100])(
+  'isolates actual visit and notice subscriptions across %i mounted consumers',
+  (count) => {
+    let renders = 0
+    const visits: ReturnType<typeof beginSwitchPresentation>[] = []
+    function Reader({
+      id,
+      host = target
+    }: {
+      id: string
+      host?: typeof target | { kind: 'environment'; environmentId: string }
+    }) {
+      renders++
+      const visit = useSwitchPresentation(host, id, true)
+      return (
+        <SwitchPresentationContext.Provider value={visit}>
+          <List item="failure" />
+        </SwitchPresentationContext.Provider>
+      )
+    }
+    render(
+      <>
+        {Array.from({ length: count }, (_, i) => (
+          <Reader key={i} id={`unrelated-${i}`} />
+        ))}
+        <Reader id="addressed" />
+        <Reader id="addressed" host={{ kind: 'environment', environmentId: 'other' }} />
+      </>
+    )
+    renders = 0
+    act(() => {
+      visits.push(beginSwitchPresentation(target, 'foreign'))
+    })
+    expect(renders).toBe(0)
+    act(() => {
+      visits.push(beginSwitchPresentation(target, 'addressed'))
+    })
+    expect(renders).toBe(1)
+    renders = 0
+    act(() => {
+      reportSwitchPresentationFailure(visits[1], 'failure')
+    })
+    expect(renders).toBe(0)
+    cleanup()
+    visits.forEach((visit) => visit.release())
+  }
+)
diff --git a/src/renderer/src/lib/conversation-switch-presentation.tsx b/src/renderer/src/lib/conversation-switch-presentation.tsx
index a2ef91e8787a..e4d02e7cef7a 100644
--- a/src/renderer/src/lib/conversation-switch-presentation.tsx
+++ b/src/renderer/src/lib/conversation-switch-presentation.tsx
@@ -4,35 +4,33 @@ import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
 import { executionHostIdForStructuredTarget } from '@/runtime/structured-agent-session-owner'
 
 export type SwitchPresentationVisit = {
+  subscribe: (listener: () => void) => () => void
+  changed: () => void
   stopObserving?: () => void
-  captureVisible?: () => void
+  observeRows?: () => void
   itemVisible?: (id: string) => boolean
   presentedItems: Set<string>
-  readable: boolean
   settled: boolean
   failureItemId?: string
   reporter?: 'inline' | 'clicked'
-  shown: Promise<boolean>
-  show: (shown: boolean) => void
   mounted: boolean
   visible: boolean
   release: () => void
 }
 const visits = new Map<string, SwitchPresentationVisit>()
-const listeners = new Set<() => void>()
-let revision = 0
-const changed = () => {
-  revision++
-  for (const listener of listeners) {
-    listener()
-  }
-}
-const subscribe = (listener: () => void) => {
-  listeners.add(listener)
+const listeners = new Map<string, Set<() => void>>()
+const subscribe = (key: string, listener: () => void) => {
+  const rows = listeners.get(key) ?? new Set<() => void>()
+  rows.add(listener)
+  listeners.set(key, rows)
   return () => {
-    listeners.delete(listener)
+    rows.delete(listener)
+    if (!rows.size) {
+      listeners.delete(key)
+    }
   }
 }
+const changed = (key: string) => listeners.get(key)?.forEach((listener) => listener())
 const keyFor = (target: RuntimeClientTarget, id: string) =>
   `${executionHostIdForStructuredTarget(target)}\0${id}`
 export const SwitchPresentationContext = createContext<SwitchPresentationVisit | undefined>(
@@ -46,29 +44,23 @@ export function beginSwitchPresentation(
 ): SwitchPresentationVisit {
   const key = keyFor(target, id)
   visits.get(key)?.release()
-  let show!: (shown: boolean) => void
-  const shown = new Promise<boolean>((resolve) => {
-    show = resolve
-  })
   const visit: SwitchPresentationVisit = {
-    shown,
-    show,
+    subscribe: (listener) => subscribe(key, listener),
+    changed: () => changed(key),
     presentedItems: new Set(),
-    readable: false,
     settled: false,
     mounted: false,
     visible: false,
     release: () => {
       if (visits.get(key) === visit) {
-        visit.show(false)
         visit.stopObserving?.()
         visits.delete(key)
-        changed()
+        changed(key)
       }
     }
   }
   visits.set(key, visit)
-  changed()
+  changed(key)
   return visit
 }
 export function reportSwitchPresentationFailure(
@@ -93,28 +85,26 @@ export function settleSwitchPresentation(visit: SwitchPresentationVisit | undefi
   visit.settled = true
   visit.stopObserving?.()
   visit.presentedItems.clear()
-  visit.captureVisible = undefined
   visit.itemVisible = undefined
-  changed()
+  if (!visit.mounted && !visit.reporter) {
+    visit.release()
+  }
+  visit.changed()
 }
-export function useSwitchPresentation(
-  target: RuntimeClientTarget,
-  id: string,
-  visible: boolean,
-  transcript: 'pending' | 'readable' | 'empty' | 'failed' = 'readable'
-) {
-  useSyncExternalStore(
-    subscribe,
-    () => revision,
-    () => revision
+export function useSwitchPresentation(target: RuntimeClientTarget, id: string, visible: boolean) {
+  const key = keyFor(target, id)
+  const visit = useSyncExternalStore(
+    (listener) => subscribe(key, listener),
+    () => visits.get(key),
+    () => undefined
   )
-  const visit = visits.get(keyFor(target, id))
   useLayoutEffect(() => {
     if (!visit) {
       return
     }
     visit.mounted = true
     visit.visible = visible
+    visit.observeRows?.()
 
     if (!visible) {
       visit.release()
@@ -124,19 +114,6 @@ export function useSwitchPresentation(
       visit.release()
     }
   }, [visit, visible])
-  useLayoutEffect(() => {
-    if (!visit || !visible) {
-      return
-    }
-    visit.readable = transcript === 'readable'
-    if (transcript === 'empty') {
-      visit.show(true)
-    } else if (transcript === 'readable') {
-      visit.captureVisible?.()
-    } else if (transcript === 'failed') {
-      visit.show(false)
-    }
-  }, [visit, visible, transcript])
   return visit
 }
 export function useSwitchPresentationRows(root: RefObject<HTMLDivElement | null>): void {
@@ -177,20 +154,14 @@ export function useSwitchPresentationRows(root: RefObject<HTMLDivElement | null>
       if (!visit.visible || visit.settled) {
         return
       }
-      let shown = false
       for (const row of root.current?.querySelectorAll<HTMLElement>('[data-switch-item-id]') ??
         []) {
         const id = row.dataset.switchItemId
         if (id && rowVisible(row)) {
           visit.presentedItems.add(id)
-          shown = true
         }
       }
-      if (shown && visit.readable) {
-        visit.show(true)
-      }
     }
-    visit.captureVisible = observe
     observe()
     const element = root.current
     element?.addEventListener('scroll', observe, { passive: true })
@@ -199,14 +170,15 @@ export function useSwitchPresentationRows(root: RefObject<HTMLDivElement | null>
       if (visit.itemVisible === itemVisible) {
         visit.itemVisible = undefined
       }
-      if (visit.captureVisible === observe) {
-        visit.captureVisible = undefined
-      }
       if (visit.stopObserving === stop) {
         visit.stopObserving = undefined
       }
+      if (visit.observeRows === observe) {
+        visit.observeRows = undefined
+      }
     }
     visit.stopObserving = stop
+    visit.observeRows = observe
     return () => {
       observe()
       stop()
@@ -215,10 +187,9 @@ export function useSwitchPresentationRows(root: RefObject<HTMLDivElement | null>
 }
 export function useSwitchFailureSuppressed(itemId: string | undefined): boolean {
   const visit = useContext(SwitchPresentationContext)
-  useSyncExternalStore(
-    subscribe,
-    () => revision,
-    () => revision
+  return useSyncExternalStore(
+    visit?.subscribe ?? (() => () => {}),
+    () => Boolean(itemId && visit?.failureItemId === itemId && visit.reporter === 'clicked'),
+    () => false
   )
-  return Boolean(itemId && visit?.failureItemId === itemId && visit.reporter === 'clicked')
 }
diff --git a/src/renderer/src/lib/conversation-switch-result-selection.ts b/src/renderer/src/lib/conversation-switch-result-selection.ts
new file mode 100644
index 000000000000..733c5724f179
--- /dev/null
+++ b/src/renderer/src/lib/conversation-switch-result-selection.ts
@@ -0,0 +1,40 @@
+import type { AgentSessionSwitchResult } from '../../../shared/agent-session-switch-execution'
+import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
+import { toWebTerminalSurfaceTabId } from '../../../shared/terminal-surface-id'
+import { refreshWebRuntimeSessionTabsSnapshot } from '@/runtime/web-runtime-session-snapshot'
+import { activateStructuredAgentSessionById } from './agent-session/structured-agent-session-tab-activation'
+import { presentAgentLaunchTab } from './agent-launch-tab-presentation'
+import { conversationSwitchViewerSelectionCurrent } from './conversation-switch-selection'
+import type { ConversationSwitch } from './conversation-switch-state'
+
+/** The owning host published membership; this caller alone may move its viewer. */
+export async function presentConversationSwitchResult(
+  args: ConversationSwitch,
+  target: Extract<RuntimeClientTarget, { kind: 'environment' }>,
+  result: Extract<AgentSessionSwitchResult, { status: 'completed' }>,
+  viewerSelection: string
+): Promise<void> {
+  await refreshWebRuntimeSessionTabsSnapshot(target.environmentId, args.workspaceId, {
+    acceptCurrentSnapshot: true,
+    afterCurrentInFlight: true
+  }).catch(() => {})
+  if (!conversationSwitchViewerSelectionCurrent(viewerSelection)) {
+    return
+  }
+  if (args.direction === 'chat') {
+    activateStructuredAgentSessionById({
+      worktreeId: args.workspaceId,
+      sessionId: result.sessionId,
+      target,
+      callerOnly: true
+    })
+  } else if (result.terminal) {
+    presentAgentLaunchTab(
+      'focus-window',
+      args.workspaceId,
+      toWebTerminalSurfaceTabId(result.terminal),
+      undefined,
+      viewerSelection
+    )
+  }
+}
diff --git a/src/renderer/src/lib/conversation-switch-selection.ts b/src/renderer/src/lib/conversation-switch-selection.ts
new file mode 100644
index 000000000000..04a8ff2efd04
--- /dev/null
+++ b/src/renderer/src/lib/conversation-switch-selection.ts
@@ -0,0 +1,26 @@
+import { structuredAgentSessionDomainFingerprint } from '../../../shared/structured-agent-session-mutation'
+import { useAppStore } from '@/store'
+import { resolveWebSessionVisibleTabId } from '@/runtime/web-session-focus-intent'
+
+/** Presentation freshness only; the execution host retains all process authority. */
+export function captureConversationSwitchViewerSelection(): string {
+  const state = useAppStore.getState()
+  const workspaceId = state.activeWorktreeId ?? ''
+  return structuredAgentSessionDomainFingerprint({
+    domain: 'conversation-switch-viewer',
+    sessionId: workspaceId,
+    fields: {
+      workspaceId: state.activeWorktreeId,
+      executionHostId: state.activeWorkspaceExecutionHostId,
+      view: state.activeView,
+      history: state.worktreeNavHistory,
+      historyIndex: state.worktreeNavHistoryIndex,
+      groupId: state.activeGroupIdByWorktree?.[workspaceId],
+      tabId: resolveWebSessionVisibleTabId(state, workspaceId)
+    }
+  })
+}
+
+export function conversationSwitchViewerSelectionCurrent(selection?: string): boolean {
+  return selection === undefined || selection === captureConversationSwitchViewerSelection()
+}
diff --git a/src/renderer/src/lib/conversation-switch-state.ts b/src/renderer/src/lib/conversation-switch-state.ts
index d73045cc2140..9fbdd2462144 100644
--- a/src/renderer/src/lib/conversation-switch-state.ts
+++ b/src/renderer/src/lib/conversation-switch-state.ts
@@ -1,12 +1,17 @@
 import { translate } from '@/i18n/i18n'
-import { useMemo, useSyncExternalStore } from 'react'
+import { useSyncExternalStore } from 'react'
 import { useAppStore } from '@/store'
-import { conversationSwitchFailureText } from './conversation-switch-feedback'
+import type { ConfirmationDialogContextValue } from '@/components/confirmation-dialog-context'
+import { getStructuredAgentSessionStatusFeed } from '@/runtime/structured-agent-session-status-feed'
 import { findStructuredAgentSessionReadOwner } from '@/components/native-chat/structured-agent-session-read-owner-registry'
 import { runningStructuredAgentSessionTurnId } from '../../../shared/structured-agent-session-live-turn'
-import { inPlaceSwitchCapabilityNow, useInPlaceSwitchRevision } from './in-place-switch-support'
+import { useInPlaceSwitchCapability } from './in-place-switch-support'
 import { structuredAgentSessionTargetForHost } from '@/runtime/structured-agent-session-owner'
 import { refreshLocalStructuredSessionWorktreeTabs } from '@/runtime/local-structured-session-tabs-sync/inventory-refresh'
+import {
+  captureConversationSwitchViewerSelection,
+  conversationSwitchViewerSelectionCurrent
+} from './conversation-switch-selection'
 import {
   pendingNativeChatCliSwitches as pending,
   pendingCliChatResumes,
@@ -16,6 +21,7 @@ import type { AiVaultSession, AiVaultAgent } from '../../../shared/ai-vault-type
 import type { CliChatResumeSource } from '@/components/tab-bar/cli-chat-resume-source'
 
 export type ConversationSwitch = {
+  confirm?: ConfirmationDialogContextValue
   direction: 'chat' | 'terminal'
   executionHostId: string
   workspaceId: string
@@ -51,49 +57,37 @@ export function useConversationSwitchPending(args: ConversationSwitch | null): b
   )
 }
 
-export function useConversationSwitchReadiness(args: ConversationSwitch | null) {
-  useInPlaceSwitchRevision()
-  const target = useMemo(
-    () => structuredAgentSessionTargetForHost(args?.executionHostId),
-    [args?.executionHostId]
-  )
-  const reader =
-    args?.sessionId && target
-      ? findStructuredAgentSessionReadOwner(args.sessionId, target)
-      : undefined
-  const held = useSyncExternalStore(
-    reader?.subscribe ?? subscribe,
-    () => reader?.getSnapshot(),
-    () => undefined
-  )
-  const runningTurn = useMemo(
-    () =>
-      Boolean(
-        held?.current &&
-        held.state.working !== false &&
-        runningStructuredAgentSessionTurnId(held.state)
-      ),
-    [held]
+/** Live facts choose consent only; never open a reader to classify saved work. */
+export function conversationSwitchReplying(args: ConversationSwitch): boolean {
+  const state = useAppStore.getState()
+  if (args.source) {
+    return state.agentStatusByPaneKey[args.source.paneKey]?.state === 'working'
+  }
+  const target = structuredAgentSessionTargetForHost(args.executionHostId)
+  if (!args.sessionId || !target) {
+    return false
+  }
+  const held = findStructuredAgentSessionReadOwner(args.sessionId, target)?.getSnapshot()
+  return Boolean(
+    (held?.current &&
+      held.state.working !== false &&
+      runningStructuredAgentSessionTurnId(held.state)) ||
+    getStructuredAgentSessionStatusFeed(target).getSnapshot().get(args.sessionId)?.status ===
+      'working'
   )
-  const terminalJob = useAppStore((state) => {
-    const key = args?.source?.paneKey
-    if (!key) {
-      return false
-    }
-    const foreground = state.paneForegroundAgentByPaneKey[key]
-    return foreground?.suspendedAgent
-      ? 'suspended'
-      : foreground?.agent && !foreground.shellForeground
-        ? 'live'
-        : false
-  })
+}
+
+export function useConversationSwitchReadiness(args: ConversationSwitch | null) {
+  const capability = useInPlaceSwitchCapability(args?.executionHostId, args?.agent)
   const pending = useConversationSwitchPending(args)
-  const capability = args ? inPlaceSwitchCapabilityNow(args.executionHostId, args.agent) : undefined
   const updateRequired = args?.source?.hostUpdateRequired === true
-  const reason = terminalJob ? 'conversationOpenInTerminal' : runningTurn ? 'turnActive' : undefined
   return {
     ready: Boolean(
-      args && target && capability !== undefined && !pending && !reason && !updateRequired
+      args &&
+      structuredAgentSessionTargetForHost(args.executionHostId) &&
+      capability !== undefined &&
+      !pending &&
+      !updateRequired
     ),
     pending,
     explanation: updateRequired
@@ -101,14 +95,16 @@ export function useConversationSwitchReadiness(args: ConversationSwitch | null)
           'components.native-chat.resumeInNewChat.hostUpdateRequired',
           'Update Orca on this host to continue in Chat UI.'
         )
-      : args && reason
-        ? conversationSwitchFailureText(null, args, reason, {
-            suspended: terminalJob === 'suspended'
-          })
-        : undefined
+      : undefined
   }
 }
 
+export function captureConversationSwitchSelection(
+  selection = captureConversationSwitchViewerSelection()
+): () => boolean {
+  return () => conversationSwitchViewerSelectionCurrent(selection)
+}
+
 export function rederiveConversationSwitch(args: ConversationSwitch): void {
   const target = structuredAgentSessionTargetForHost(args.executionHostId)
   if (!target) {
diff --git a/src/renderer/src/lib/in-place-switch-support.test.tsx b/src/renderer/src/lib/in-place-switch-support.test.tsx
index 81f235ad18f7..c51e33ec7d60 100644
--- a/src/renderer/src/lib/in-place-switch-support.test.tsx
+++ b/src/renderer/src/lib/in-place-switch-support.test.tsx
@@ -1,4 +1,6 @@
 // @vitest-environment happy-dom
+import { useConversationSwitchReadiness } from './conversation-surface-switch'
+import { supportsInPlaceSwitch } from '@/runtime/structured-agent-session-client'
 import { act, cleanup, render, screen } from '@testing-library/react'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import { useAppStore } from '@/store'
@@ -10,7 +12,7 @@ import { createCompatibleRuntimeStatusResponse } from '@/runtime/runtime-compati
 import type { RuntimeHostStatusSnapshot } from '../../../shared/runtime-host-status'
 import { inPlaceSwitchCapabilityNow, useInPlaceSwitchCapability } from './in-place-switch-support'
 
-const SWITCH = 'agent-session.structured.switch.v1:codex'
+const SWITCH = 'agent-session.structured.switch.creation-settlement-v1:codex'
 const environment = {
   id: 'paired',
   name: 'Host',
@@ -121,3 +123,69 @@ it('derives only the addressed catalog owner across publication, lost contact, r
   expect(screen.getByRole('button').textContent).toBe('undefined')
   expect(getStatus).not.toHaveBeenCalled()
 })
+
+it.each([10, 100])(
+  'keeps %i production switch controls idle for unrelated host updates',
+  async (count) => {
+    setLocalRuntimeCapabilitiesForTests([SWITCH])
+    useAppStore.getState().setRuntimeEnvironments([environment])
+    useAppStore.getState().applyRuntimeHostStatusSnapshot(snapshot(1))
+    const renders = new Map<string, number>()
+    function Control({ host }: { host: string }) {
+      renders.set(host, (renders.get(host) ?? 0) + 1)
+      const state = useConversationSwitchReadiness({
+        executionHostId: host,
+        workspaceId: 'workspace',
+        direction: 'terminal',
+        agent: 'codex',
+        sessionId: host
+      })
+      return <button>{String(state.ready)}</button>
+    }
+    render(
+      <>
+        {Array.from({ length: count }, (_, i) => (
+          <Control key={i} host="local" />
+        ))}
+        <Control host="runtime:paired" />
+      </>
+    )
+    await act(async () => {})
+    renders.clear()
+    act(() => useAppStore.getState().applyRuntimeHostStatusSnapshot(snapshot(2)))
+    expect([...renders.values()]).toEqual([])
+    act(() =>
+      useAppStore
+        .getState()
+        .applyRuntimeHostStatusSnapshot(snapshot(3, { verification: 'blocked' }))
+    )
+    expect(renders.get('local')).toBeUndefined()
+    expect(renders.get('runtime:paired')).toBe(1)
+    renders.clear()
+    act(() => useAppStore.setState({ activeWorktreeId: 'unrelated' }))
+    expect([...renders.values()]).toEqual([])
+    expect(getStatus).not.toHaveBeenCalled()
+  }
+)
+
+it('uses the same complete capability for learned readiness and strong dispatch, rejecting stale development support', async () => {
+  useAppStore.getState().setRuntimeEnvironments([environment])
+  const stale = 'agent-session.structured.switch.v2:codex'
+  setLocalRuntimeCapabilitiesForTests([stale])
+  expect(inPlaceSwitchCapabilityNow('local', 'codex')).toBe(false)
+  expect(inPlaceSwitchCapabilityNow('local', 'codex', true)).toBe(false)
+  expect(await supportsInPlaceSwitch({ kind: 'local' }, 'codex', true)).toBe(false)
+  setLocalRuntimeCapabilitiesForTests([SWITCH])
+  expect(inPlaceSwitchCapabilityNow('local', 'codex')).toBe(true)
+  expect(await supportsInPlaceSwitch({ kind: 'local' }, 'codex', true)).toBe(true)
+  const old = snapshot(1)
+  if (!old.status) {
+    throw new Error('Expected status')
+  }
+  old.status.capabilities = [stale]
+  useAppStore.getState().applyRuntimeHostStatusSnapshot(old)
+  expect(inPlaceSwitchCapabilityNow('runtime:paired', 'codex', true)).toBe(false)
+  useAppStore.getState().applyRuntimeHostStatusSnapshot(snapshot(2))
+  expect(inPlaceSwitchCapabilityNow('runtime:paired', 'codex', true)).toBe(true)
+  expect(getStatus).not.toHaveBeenCalled()
+})
diff --git a/src/renderer/src/lib/in-place-switch-support.ts b/src/renderer/src/lib/in-place-switch-support.ts
index 1a339a2e5975..4f113d542f4e 100644
--- a/src/renderer/src/lib/in-place-switch-support.ts
+++ b/src/renderer/src/lib/in-place-switch-support.ts
@@ -22,9 +22,7 @@ import {
 import type { AiVaultAgent } from '../../../shared/ai-vault-types'
 
 const listeners = new Set<() => void>()
-let revision = 0
 const changed = () => {
-  revision += 1
   listeners.forEach((listener) => listener())
 }
 onRuntimeEnvironmentRevisionsChanged(changed)
@@ -56,14 +54,6 @@ const subscribe = (listener: () => void) => {
   }
 }
 
-export function useInPlaceSwitchRevision(): number {
-  return useSyncExternalStore(
-    subscribe,
-    () => revision,
-    () => 0
-  )
-}
-
 /** The addressed runtime owner's learned answer; reading never starts a probe. */
 export function inPlaceSwitchCapabilityNow(
   executionHostId: string | null | undefined,
@@ -123,8 +113,6 @@ export function useAiVaultInPlaceAgent(session: {
   agent: AiVaultAgent
   executionHostId?: string | null
 }): AiVaultAgent | undefined {
-  return useInPlaceSwitchCapability(session.executionHostId, session.agent) !== false &&
-    inPlaceSwitchEnabled(session.agent)
-    ? session.agent
-    : undefined
+  useInPlaceSwitchCapability(session.executionHostId, session.agent)
+  return inPlaceSwitchEnabled(session.agent) ? session.agent : undefined
 }
diff --git a/src/renderer/src/lib/launch-ai-vault-session.ts b/src/renderer/src/lib/launch-ai-vault-session.ts
index 3f4200cdb66c..baf2e7843f41 100644
--- a/src/renderer/src/lib/launch-ai-vault-session.ts
+++ b/src/renderer/src/lib/launch-ai-vault-session.ts
@@ -32,6 +32,7 @@ export function launchAiVaultSessionInNewTab(args: {
   afterTabId?: string
   /** A chat's switch, whose ordinary spawn admits the resume; set only for a capable host. */
   resumeOrigin?: 'switch'
+  canActivate?: () => boolean
 }): LaunchAiVaultSessionInNewTabResult {
   const store = useAppStore.getState()
   const slot = args.afterTabId
@@ -69,11 +70,13 @@ export function launchAiVaultSessionInNewTab(args: {
         ...(args.launchConfig ? { agentArgs: args.launchConfig.agentArgs } : {}),
         activate: true
       },
-      { notifyFailure: false }
+      { notifyFailure: false, canActivate: args.canActivate }
     )
     const observedRuntimeLaunch = runtimeLaunch.then((outcome) => {
       if (outcome.status === 'created') {
-        useAppStore.getState().setActiveTabType('terminal', args.worktreeId)
+        if (args.canActivate?.() !== false) {
+          useAppStore.getState().setActiveTabType('terminal', args.worktreeId)
+        }
       } else if (splitGroupId) {
         // A refused or failed drop must not leave a blank pane behind.
         useAppStore.getState().closeEmptyGroup(args.worktreeId, splitGroupId)
@@ -83,8 +86,10 @@ export function launchAiVaultSessionInNewTab(args: {
     return { tabId: null, runtimeLaunch: observedRuntimeLaunch }
   }
 
+  const activate = args.canActivate?.() !== false
   const tab = store.createTab(args.worktreeId, sourceGroupId, undefined, {
     ...(split ? { split } : {}),
+    ...(activate ? {} : { activate: false, recordInteraction: false }),
     ...(args.cwd ? { startupCwd: args.cwd } : {}),
     pendingStartup: {
       command: args.command,
@@ -100,7 +105,9 @@ export function launchAiVaultSessionInNewTab(args: {
       }
     }
   })
-  store.setActiveTabType('terminal', args.worktreeId)
+  if (activate) {
+    store.setActiveTabType('terminal', args.worktreeId)
+  }
 
   persistAgentLaunchTabOrder(args.worktreeId, tab.id)
   if (slot && !split && (!args.targetGroupId || args.targetGroupId === slot.groupId)) {
diff --git a/src/renderer/src/lib/structured-agent-session-launch-surface.ts b/src/renderer/src/lib/structured-agent-session-launch-surface.ts
index 416637fcf1b4..447802971e5e 100644
--- a/src/renderer/src/lib/structured-agent-session-launch-surface.ts
+++ b/src/renderer/src/lib/structured-agent-session-launch-surface.ts
@@ -154,11 +154,12 @@ export function openStructuredAgentSessionProvisionalTab(args: {
   /** The tab the chat opens right after, in that tab's group. */
   afterTabId?: string
   activate?: boolean
+  canActivate?: () => boolean
 }): OpenedAgentSessionTab {
   const state = useAppStore.getState()
   const existing = findStructuredLaunchTab(args)
   if (existing) {
-    if (args.activate !== false) {
+    if (args.activate !== false && args.canActivate?.() !== false) {
       state.focusGroup(args.worktreeId, existing.groupId)
       state.activateTab(existing.id, { worktreeId: args.worktreeId })
       state.setActiveTabType('agent-session', args.worktreeId)
@@ -176,6 +177,7 @@ export function openStructuredAgentSessionProvisionalTab(args: {
     group?.id ??
     (address?.worktreeId === args.worktreeId ? address.targetGroupId : args.targetGroupId)
   const drawHere = (): Tab => {
+    const activate = args.activate !== false && args.canActivate?.() !== false
     const tab = state.createUnifiedTab(args.worktreeId, 'agent-session', {
       id: tabId,
       entityId: args.sessionId,
@@ -184,11 +186,11 @@ export function openStructuredAgentSessionProvisionalTab(args: {
       label: defaultAgentChatLabel(args.agent),
       targetGroupId,
       ...(args.afterTabId ? { afterTabId: args.afterTabId } : {}),
-      activate: args.activate !== false
+      activate
     })
     const target = structuredAgentSessionTargetForHost(args.executionHostId)
     holdFrameDrawnProvisionalChatTab(target, args.worktreeId, tab.id)
-    if (args.activate !== false) {
+    if (activate) {
       state.setActiveTabType('agent-session', args.worktreeId)
     }
     return tab
@@ -206,6 +208,7 @@ export function openStructuredAgentSessionProvisionalTab(args: {
           ? { afterTabId: args.afterTabId }
           : slotAnchor(address, args.worktreeId)),
         activate: args.activate !== false,
+        canActivate: args.canActivate,
         drawHere
       })
     : null
diff --git a/src/renderer/src/lib/structured-agent-session-tab-open-through-layout-owner.ts b/src/renderer/src/lib/structured-agent-session-tab-open-through-layout-owner.ts
index 0375143af756..774c372b0961 100644
--- a/src/renderer/src/lib/structured-agent-session-tab-open-through-layout-owner.ts
+++ b/src/renderer/src/lib/structured-agent-session-tab-open-through-layout-owner.ts
@@ -18,6 +18,7 @@ export type AgentSessionTabOpen = {
   targetGroupId?: string
   afterTabId?: string
   activate: boolean
+  canActivate?: () => boolean
   /** Today's draw, for a twin main may route to a paired server. */
   drawHere: () => Tab
 }
@@ -52,7 +53,7 @@ export function openAgentSessionTabThroughLayoutOwner(
     command: { type: 'openAgentSessionTab', tabId, sessionId, agent: open.agent, ...placement },
     facts: { label },
     shown: (shownId) => {
-      if (!open.activate) {
+      if (!open.activate || open.canActivate?.() === false) {
         return
       }
       // As the window's own open: the chat is selected in its group; the focused group stays.
diff --git a/src/renderer/src/runtime/web-runtime-agent-terminal-host-authority.ts b/src/renderer/src/runtime/web-runtime-agent-terminal-host-authority.ts
new file mode 100644
index 000000000000..39f060f24e95
--- /dev/null
+++ b/src/renderer/src/runtime/web-runtime-agent-terminal-host-authority.ts
@@ -0,0 +1,91 @@
+import { buildDefaultTerminalOptions } from '@/lib/pane-manager/pane-terminal-options'
+import type { TuiAgent } from '../../../shared/tui-agent'
+import { createAgentSessionKeyboardOptions } from './agent-session-keyboard-capability'
+import { agentProviderSessionForHostEnsure } from './agent-session-ensure-provider-session'
+import {
+  createAgentSessionCreateOperation,
+  withAgentSessionCreateOperationId
+} from './agent-session-create-operation'
+import { unwrapRuntimeRpcResult } from './runtime-rpc-result'
+import { toRuntimeWorktreeSelector } from './runtime-worktree-selector'
+import type { captureRuntimeEnvironmentCall } from './web-runtime-session-environment'
+import type { CreateWebRuntimeSessionTerminalArgs } from './web-runtime-session-types'
+import { readCreatedAgentTerminalIdentity } from './web-runtime-terminal-identity'
+
+export function createWebRuntimeAgentTerminalHostAuthority(
+  environmentId: string,
+  args: CreateWebRuntimeSessionTerminalArgs,
+  agent: TuiAgent,
+  agentArgsOverride: string | null | undefined,
+  callEnvironment: ReturnType<typeof captureRuntimeEnvironmentCall>
+) {
+  // Paired panes retain the default keyboard advertisement, including on Windows clients.
+  const keyboardProtocol = buildDefaultTerminalOptions().vtExtensions?.kittyKeyboard
+  const keyboardOptions = createAgentSessionKeyboardOptions(keyboardProtocol)
+  // Why: structured creation cannot yet express afterTabId; keep the exact legacy placement contract until it can.
+  // Why: focus belongs to the paired client; a headless execution host has no renderer to focus.
+  // Why: rebuilding a prepared command through host authority can discard its embedded prompt and delivery flags.
+  // A switch uses the ordinary prepared command and admission.
+  const mustUseLegacyAgentCreate =
+    args.preparedAgentCommand || args.afterTabId || args.resumeOrigin === 'switch'
+  return mustUseLegacyAgentCreate
+    ? undefined
+    : args.agentSessionKind === 'resume'
+      ? args.providerSession
+        ? async () =>
+            readCreatedAgentTerminalIdentity(
+              unwrapRuntimeRpcResult(
+                await callEnvironment({
+                  method: 'terminal.ensureAgentSession',
+                  params: {
+                    ...(await keyboardOptions(environmentId)),
+                    kind: 'explicit',
+                    worktree: toRuntimeWorktreeSelector(args.worktreeId),
+                    agent,
+                    providerSession: await agentProviderSessionForHostEnsure(
+                      environmentId,
+                      args.providerSession!
+                    ),
+                    ...(args.launchConfig?.ompResumeFilePath
+                      ? { ompResumeFilePath: args.launchConfig.ompResumeFilePath }
+                      : {}),
+                    ...(agentArgsOverride !== undefined ? { agentArgs: agentArgsOverride } : {}),
+                    ...(args.launchPreferences
+                      ? { launchPreferences: args.launchPreferences }
+                      : {}),
+                    presentation: 'background'
+                  },
+                  timeoutMs: 15_000
+                })
+              )
+            )
+        : undefined
+      : async () =>
+          await createAgentSessionCreateOperation().run(async (clientOperationId) =>
+            readCreatedAgentTerminalIdentity(
+              unwrapRuntimeRpcResult(
+                await callEnvironment({
+                  method: 'terminal.createAgentSession',
+                  params: withAgentSessionCreateOperationId(
+                    {
+                      ...(await keyboardOptions(environmentId)),
+                      worktree: toRuntimeWorktreeSelector(args.worktreeId),
+                      agent,
+                      ...(args.prompt ? { prompt: args.prompt } : {}),
+                      ...(args.promptDelivery ? { promptDelivery: args.promptDelivery } : {}),
+                      ...(agentArgsOverride !== undefined ? { agentArgs: agentArgsOverride } : {}),
+                      ...(args.launchPreferences
+                        ? { launchPreferences: args.launchPreferences }
+                        : {}),
+                      ...(args.cwd ? { startupCwd: args.cwd } : {}),
+                      ...(args.viewMode ? { viewMode: args.viewMode } : {}),
+                      presentation: 'background'
+                    },
+                    clientOperationId
+                  ),
+                  timeoutMs: 15_000
+                })
+              )
+            )
+          )
+}
diff --git a/src/renderer/src/runtime/web-runtime-session-terminal-workspace-routing.test.ts b/src/renderer/src/runtime/web-runtime-session-terminal-workspace-routing.test.ts
index df8551c642b1..a97525aa7b57 100644
--- a/src/renderer/src/runtime/web-runtime-session-terminal-workspace-routing.test.ts
+++ b/src/renderer/src/runtime/web-runtime-session-terminal-workspace-routing.test.ts
@@ -1,3 +1,15 @@
+import { createTestStore } from '../store/slices/store-test-helpers'
+import {
+  captureConversationSwitchViewerSelection,
+  conversationSwitchViewerSelectionCurrent
+} from '../lib/conversation-switch-selection'
+import { structuredAgentSessionTabId } from '../../../shared/structured-agent-session-projection'
+import { toWebTerminalSurfaceTabId } from '../../../shared/terminal-surface-id'
+import type * as SnapshotApi from './web-session-tabs-sync/snapshot-api'
+import type * as StorePatch from './web-session-tabs-sync/store-patch'
+import type * as TrackingMappings from './web-session-tabs-sync/tracking-mappings'
+import type * as TrackingDecisions from './web-session-tabs-sync/tracking-decisions'
+import type * as TrackingLifecycle from './web-session-tabs-sync/tracking-lifecycle'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type { ExecutionHostId } from '../../../shared/execution-host'
 import { createWebRuntimeSessionTerminal } from './web-runtime-terminal-creation'
@@ -13,6 +25,7 @@ import {
 import { stubRuntimeEnvironmentBridge } from './runtime-environment-bridge-fixture'
 
 const mocks = vi.hoisted(() => ({
+  realStore: false,
   getState: vi.fn(),
   setState: vi.fn(),
   subscribe: vi.fn(),
@@ -23,7 +36,9 @@ const mocks = vi.hoisted(() => ({
   setRemoteBrowserPageHandle: vi.fn(),
   focusBrowserTabInWorktree: vi.fn(),
   applyWebSessionTabsSnapshot: vi.fn(),
-  decideWebSessionTabsSnapshot: vi.fn(() => ({ apply: true, settlesHostMirror: true })),
+  decideWebSessionTabsSnapshot: vi.fn<typeof TrackingDecisions.decideWebSessionTabsSnapshot>(
+    () => ({ apply: true, settlesHostMirror: true })
+  ),
   acceptReplayedWebSessionTabsSnapshot: vi.fn(),
   resolveHostSessionTabIdForWebSessionTab: vi.fn(),
   trackTerminalPaneSplit: vi.fn(),
@@ -40,24 +55,61 @@ vi.mock('../store', () => ({
   }
 }))
 
-vi.mock('./web-session-tabs-sync/tracking-lifecycle', () => ({
-  acceptReplayedWebSessionTabsSnapshot: mocks.acceptReplayedWebSessionTabsSnapshot
-}))
-vi.mock('./web-session-tabs-sync/snapshot-api', () => ({
+vi.mock('./web-session-tabs-sync/tracking-lifecycle', async (original) => {
+  const actual = await original<typeof TrackingLifecycle>()
+  return {
+    ...actual,
+    acceptReplayedWebSessionTabsSnapshot: (
+      ...args: Parameters<typeof actual.acceptReplayedWebSessionTabsSnapshot>
+    ) =>
+      mocks.realStore
+        ? actual.acceptReplayedWebSessionTabsSnapshot(...args)
+        : mocks.acceptReplayedWebSessionTabsSnapshot(...args)
+  }
+})
+vi.mock('./web-session-tabs-sync/snapshot-api', async (original) => ({
+  ...(await original<object>()),
   applyWebSessionTabsSnapshot: mocks.applyWebSessionTabsSnapshot
 }))
-vi.mock('./web-session-tabs-sync/tracking-decisions', () => ({
-  decideWebSessionTabsSnapshot: mocks.decideWebSessionTabsSnapshot
-}))
-vi.mock('./web-session-tabs-sync/store-patch', () => ({
-  applyWebSessionTabsStorePatch: (buildPatch: (state: unknown) => unknown) => {
-    mocks.setState(buildPatch)
-    return () => {}
+vi.mock('./web-session-tabs-sync/tracking-decisions', async (original) => {
+  const actual = await original<typeof TrackingDecisions>()
+  return {
+    ...actual,
+    decideWebSessionTabsSnapshot: (
+      ...args: Parameters<typeof actual.decideWebSessionTabsSnapshot>
+    ) =>
+      mocks.realStore
+        ? actual.decideWebSessionTabsSnapshot(...args)
+        : mocks.decideWebSessionTabsSnapshot(...args)
   }
-}))
-vi.mock('./web-session-tabs-sync/tracking-mappings', () => ({
-  resolveHostSessionTabIdForWebSessionTab: mocks.resolveHostSessionTabIdForWebSessionTab
-}))
+})
+vi.mock('./web-session-tabs-sync/store-patch', async (original) => {
+  const actual = await original<typeof StorePatch>()
+  return {
+    ...actual,
+    applyWebSessionTabsStorePatch: (
+      ...args: Parameters<typeof actual.applyWebSessionTabsStorePatch>
+    ) => {
+      if (mocks.realStore) {
+        return actual.applyWebSessionTabsStorePatch(...args)
+      }
+      mocks.setState(args[0])
+      return () => {}
+    }
+  }
+})
+vi.mock('./web-session-tabs-sync/tracking-mappings', async (original) => {
+  const actual = await original<typeof TrackingMappings>()
+  return {
+    ...actual,
+    resolveHostSessionTabIdForWebSessionTab: (
+      ...args: Parameters<typeof actual.resolveHostSessionTabIdForWebSessionTab>
+    ) =>
+      mocks.realStore
+        ? actual.resolveHostSessionTabIdForWebSessionTab(...args)
+        : mocks.resolveHostSessionTabIdForWebSessionTab(...args)
+  }
+})
 
 vi.mock('@/lib/feature-education-telemetry', () => ({
   trackTerminalPaneSplit: mocks.trackTerminalPaneSplit
@@ -95,7 +147,12 @@ function stubSelectableWorkspaceStore(selection: MutableSelection): void {
 afterEach(() => resetWebSessionCloseIntentForTests())
 
 describe('web-runtime-session terminal workspace routing', () => {
-  beforeEach(() => {
+  beforeEach(async () => {
+    const tracking = await vi.importActual<typeof TrackingLifecycle>(
+      './web-session-tabs-sync/tracking-lifecycle'
+    )
+    tracking.resetWebSessionTabsSnapshotFreshnessForTests()
+    mocks.realStore = false
     stubTerminalCreateEnvironment(mocks)
   })
 
@@ -276,4 +333,136 @@ describe('web-runtime-session terminal workspace routing', () => {
     expect(selection.activeWorktreeId).toBe('repo::/other')
     expect(selection.activeWorkspaceExecutionHostId).toBe('local')
   })
+  it.each(['unchanged', 'create-navigation', 'list-navigation'] as const)(
+    'strict paired ordinary create/list/placement respects original caller selection: %s',
+    async (action) => {
+      mocks.realStore = true
+      const api = await vi.importActual<typeof SnapshotApi>('./web-session-tabs-sync/snapshot-api')
+      const store = createTestStore()
+      mocks.getState.mockImplementation(store.getState)
+      mocks.setState.mockImplementation(store.setState)
+      mocks.subscribe.mockImplementation(store.subscribe)
+      mocks.applyWebSessionTabsSnapshot.mockImplementation(api.applyWebSessionTabsSnapshot)
+      store.setState({
+        activeWorktreeId: WORKTREE_ID,
+        activeWorkspaceExecutionHostId: RUNTIME_EXECUTION_HOST_ID
+      })
+      const sourceId = structuredAgentSessionTabId('codex_source')
+      const otherId = structuredAgentSessionTabId('codex_D')
+      const destId = toWebTerminalSurfaceTabId('host-destination')
+      const leaf = '11111111-1111-4111-8111-111111111111'
+      const source = {
+        type: 'agent-session' as const,
+        id: 'agent-session:codex_source',
+        sessionId: 'codex_source',
+        agent: 'codex' as const,
+        title: 'Source',
+        isActive: true
+      }
+      const other = {
+        type: 'agent-session' as const,
+        id: 'agent-session:codex_D',
+        sessionId: 'codex_D',
+        agent: 'codex' as const,
+        title: 'D',
+        isActive: false
+      }
+      const destination = {
+        type: 'terminal' as const,
+        id: `host-destination::${leaf}`,
+        parentTabId: 'host-destination',
+        leafId: leaf,
+        terminal: 'destination-process',
+        title: 'Destination',
+        status: 'ready' as const,
+        isActive: false
+      }
+      const snapshot = (created: boolean) => ({
+        ...makeSnapshot(),
+        snapshotVersion: created ? 2 : 1,
+        activeTabId: source.id,
+        activeTabType: 'agent-session' as const,
+        tabs: created ? [source, destination, other] : [source, other],
+        tabGroups: [
+          {
+            id: 'group-1',
+            activeTabId: source.id,
+            tabOrder: created ? [source.id, 'host-destination', other.id] : [source.id, other.id]
+          }
+        ]
+      })
+      store.setState((state) =>
+        api.applyWebSessionTabsSnapshot(state, snapshot(false), ENVIRONMENT_ID)
+      )
+      store.getState().activateTab(sourceId)
+      const original = captureConversationSwitchViewerSelection()
+      const created = Promise.withResolvers<void>()
+      const listed = Promise.withResolvers<void>()
+      const runtimeCall = vi.fn(async (request: { method: string }) => {
+        if (request.method === 'session.tabs.createTerminal') {
+          await created.promise
+          return {
+            id: 'create',
+            ok: true,
+            result: { tab: { id: 'host-destination', leafId: leaf } }
+          }
+        }
+        if (request.method === 'session.tabs.list') {
+          await listed.promise
+          return { id: 'list', ok: true, result: snapshot(true) }
+        }
+        throw new Error(`Unexpected external method ${request.method}`)
+      })
+      stubRuntimeEnvironmentBridge({ call: runtimeCall })
+      const running = createWebRuntimeSessionTerminal(
+        {
+          worktreeId: WORKTREE_ID,
+          environmentId: ENVIRONMENT_ID,
+          agentSessionKind: 'resume',
+          launchAgent: 'codex',
+          resumeOrigin: 'switch',
+          command: 'codex resume saved',
+          providerSession: { key: 'session_id', id: 'saved' },
+          afterTabId: sourceId,
+          targetGroupId: 'group-1',
+          activate: true
+        },
+        {
+          notifyFailure: false,
+          canActivate: () => conversationSwitchViewerSelectionCurrent(original)
+        }
+      )
+      await vi.waitFor(() =>
+        expect(runtimeCall).toHaveBeenCalledWith(
+          expect.objectContaining({
+            method: 'session.tabs.createTerminal',
+            params: expect.objectContaining({
+              activate: false,
+              select: false,
+              navigation: 'caller'
+            })
+          })
+        )
+      )
+      if (action === 'create-navigation') {
+        store.getState().activateTab(otherId)
+      }
+      created.resolve()
+      await vi.waitFor(() =>
+        expect(runtimeCall).toHaveBeenCalledWith(
+          expect.objectContaining({ method: 'session.tabs.list' })
+        )
+      )
+      if (action === 'list-navigation') {
+        store.getState().activateTab(otherId)
+      }
+      listed.resolve()
+      expect(await running).toEqual({ status: 'created' })
+      expect(store.getState().getActiveTab(WORKTREE_ID)?.id).toBe(
+        action === 'unchanged' ? destId : otherId
+      )
+      expect(store.getState().getTab(destId)?.contentType).toBe('terminal')
+      expect(store.getState().getTab(sourceId)?.entityId).toBe('codex_source')
+    }
+  )
 })
diff --git a/src/renderer/src/runtime/web-runtime-terminal-create-operation.ts b/src/renderer/src/runtime/web-runtime-terminal-create-operation.ts
index 839b57e764de..40fdda9de7f5 100644
--- a/src/renderer/src/runtime/web-runtime-terminal-create-operation.ts
+++ b/src/renderer/src/runtime/web-runtime-terminal-create-operation.ts
@@ -1,21 +1,18 @@
-import { buildDefaultTerminalOptions } from '@/lib/pane-manager/pane-terminal-options'
-import { createAgentSessionKeyboardOptions } from './agent-session-keyboard-capability'
+import { createWebRuntimeAgentTerminalHostAuthority } from './web-runtime-agent-terminal-host-authority'
 import type { RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope'
 import type { RuntimeMobileSessionCreateTerminalResult } from '../../../shared/runtime-types'
 import { toRuntimeExecutionHostId } from '../../../shared/execution-host'
-import { agentProviderSessionForHostEnsure } from './agent-session-ensure-provider-session'
 import { translate } from '../i18n/i18n'
 import { useAppStore } from '../store'
 import { agentResumeHostAuthorityCapability } from './agent-resume-host-authority-capability'
-import {
-  createAgentSessionCreateOperation,
-  withAgentSessionCreateOperationId
-} from './agent-session-create-operation'
 import { runRemoteAgentSessionLaunch } from './remote-agent-session-launch'
 import { unwrapRuntimeRpcResult } from './runtime-rpc-result'
 import { toRuntimeWorktreeSelector } from './runtime-worktree-selector'
 import { resolveWebRuntimeSessionEnvironmentId } from './web-runtime-session-workspace-routing'
-import { recordWebSessionFocusIntent } from './web-session-focus-intent'
+import {
+  recordWebSessionFocusIntent,
+  resolveWebSessionVisibleTabId
+} from './web-session-focus-intent'
 import {
   forgetWebSessionTerminalPlacement,
   recordWebSessionTerminalPlacement,
@@ -40,10 +37,7 @@ import {
   selectWebRuntimeSessionWorktree,
   type WebRuntimeSessionWorkspaceSelectionRollback
 } from './web-runtime-session-workspace-selection'
-import {
-  createdTerminalLeafId,
-  readCreatedAgentTerminalIdentity
-} from './web-runtime-terminal-identity'
+import { createdTerminalLeafId } from './web-runtime-terminal-identity'
 import {
   captureWebRuntimeTerminalPlacement,
   settleWebRuntimeTerminalPlacement
@@ -51,7 +45,8 @@ import {
 import { buildPlainCreateTerminalParams } from './web-runtime-plain-terminal-create-params'
 
 export async function createWebRuntimeSessionTerminalResult(
-  args: CreateWebRuntimeSessionTerminalArgs
+  args: CreateWebRuntimeSessionTerminalArgs,
+  canActivate?: () => boolean
 ): Promise<CreatedWebRuntimeSessionTerminal> {
   const environmentId = resolveWebRuntimeSessionEnvironmentId(
     args.environmentId,
@@ -72,7 +67,7 @@ export async function createWebRuntimeSessionTerminalResult(
   const callEnvironment = captureRuntimeEnvironmentCall(environmentId, intentOwner.pairingRevision)
 
   let workspaceSelectionRollback: WebRuntimeSessionWorkspaceSelectionRollback | null = null
-  if (args.selectWorktree !== false) {
+  if (args.selectWorktree !== false && !canActivate) {
     const previous = readActiveWorkspaceSelection()
     selectWebRuntimeSessionWorktree(args.worktreeId, environmentId)
     workspaceSelectionRollback = {
@@ -92,80 +87,14 @@ export async function createWebRuntimeSessionTerminalResult(
     const agentArgsOverride =
       args.agentArgs !== undefined ? args.agentArgs : args.launchConfig?.agentArgs
     if (agent) {
-      // Paired panes retain the default keyboard advertisement, including on Windows clients.
-      const keyboardProtocol = buildDefaultTerminalOptions().vtExtensions?.kittyKeyboard
-      const keyboardOptions = createAgentSessionKeyboardOptions(keyboardProtocol)
       let legacyAlreadyPlacedInGroup = false
-      // Why: structured creation cannot yet express afterTabId; keep the exact legacy placement contract until it can.
-      // Why: focus belongs to the paired client; a headless execution host has no renderer to focus.
-      // Why: rebuilding a prepared command through host authority can discard its embedded prompt and delivery flags.
-      // A switch uses the ordinary prepared command and admission.
-      const mustUseLegacyAgentCreate =
-        args.preparedAgentCommand || args.afterTabId || args.resumeOrigin === 'switch'
-      const hostAuthority = mustUseLegacyAgentCreate
-        ? undefined
-        : args.agentSessionKind === 'resume'
-          ? args.providerSession
-            ? async () =>
-                readCreatedAgentTerminalIdentity(
-                  unwrapRuntimeRpcResult(
-                    await callEnvironment({
-                      method: 'terminal.ensureAgentSession',
-                      params: {
-                        ...(await keyboardOptions(environmentId)),
-                        kind: 'explicit',
-                        worktree: toRuntimeWorktreeSelector(args.worktreeId),
-                        agent,
-                        providerSession: await agentProviderSessionForHostEnsure(
-                          environmentId,
-                          args.providerSession!
-                        ),
-                        ...(args.launchConfig?.ompResumeFilePath
-                          ? { ompResumeFilePath: args.launchConfig.ompResumeFilePath }
-                          : {}),
-                        ...(agentArgsOverride !== undefined
-                          ? { agentArgs: agentArgsOverride }
-                          : {}),
-                        ...(args.launchPreferences
-                          ? { launchPreferences: args.launchPreferences }
-                          : {}),
-                        presentation: 'background'
-                      },
-                      timeoutMs: 15_000
-                    })
-                  )
-                )
-            : undefined
-          : async () =>
-              await createAgentSessionCreateOperation().run(async (clientOperationId) =>
-                readCreatedAgentTerminalIdentity(
-                  unwrapRuntimeRpcResult(
-                    await callEnvironment({
-                      method: 'terminal.createAgentSession',
-                      params: withAgentSessionCreateOperationId(
-                        {
-                          ...(await keyboardOptions(environmentId)),
-                          worktree: toRuntimeWorktreeSelector(args.worktreeId),
-                          agent,
-                          ...(args.prompt ? { prompt: args.prompt } : {}),
-                          ...(args.promptDelivery ? { promptDelivery: args.promptDelivery } : {}),
-                          ...(agentArgsOverride !== undefined
-                            ? { agentArgs: agentArgsOverride }
-                            : {}),
-                          ...(args.launchPreferences
-                            ? { launchPreferences: args.launchPreferences }
-                            : {}),
-                          ...(args.cwd ? { startupCwd: args.cwd } : {}),
-                          ...(args.viewMode ? { viewMode: args.viewMode } : {}),
-                          presentation: 'background'
-                        },
-                        clientOperationId
-                      ),
-                      timeoutMs: 15_000
-                    })
-                  )
-                )
-              )
+      const hostAuthority = createWebRuntimeAgentTerminalHostAuthority(
+        environmentId,
+        args,
+        agent,
+        agentArgsOverride,
+        callEnvironment
+      )
       const resumeHostAuthorityCapability =
         args.agentSessionKind === 'resume' ? agentResumeHostAuthorityCapability(agent) : undefined
       const created = await runRemoteAgentSessionLaunch<{
@@ -198,7 +127,7 @@ export async function createWebRuntimeSessionTerminalResult(
               ...(args.viewMode ? { viewMode: args.viewMode } : {}),
               // Old hosts use activate:false; new hosts use select/navigation for caller-local focus.
               activate: false,
-              select: args.activate !== false,
+              select: args.activate !== false && !canActivate,
               navigation: 'caller'
             },
             timeoutMs: 15_000
@@ -255,9 +184,22 @@ export async function createWebRuntimeSessionTerminalResult(
         groupId: placementGroupId
       })
     }
-    if (args.activate !== false && createdTabId && matchesWebSessionIntentOwner(intentOwner)) {
+    if (
+      args.activate !== false &&
+      canActivate?.() !== false &&
+      createdTabId &&
+      matchesWebSessionIntentOwner(intentOwner)
+    ) {
       // Intent lets reconciliation focus this new terminal instead of sticky-keeping the previous tab.
-      recordWebSessionFocusIntent(intentOwner, args.worktreeId, createdTabId, createdLeafId)
+      recordWebSessionFocusIntent(
+        intentOwner,
+        args.worktreeId,
+        createdTabId,
+        createdLeafId,
+        canActivate
+          ? resolveWebSessionVisibleTabId(useAppStore.getState(), args.worktreeId)
+          : undefined
+      )
     }
     const placementTabId =
       createdTabId && (args.targetGroupId || args.afterTabId) ? createdTabId : undefined
@@ -278,7 +220,8 @@ export async function createWebRuntimeSessionTerminalResult(
           groupId: placementGroupId,
           afterTabId: args.afterTabId,
           captured,
-          activate: args.activate !== false
+          activate: args.activate !== false,
+          canActivate
         }
       )
     }
diff --git a/src/renderer/src/runtime/web-runtime-terminal-creation.ts b/src/renderer/src/runtime/web-runtime-terminal-creation.ts
index 810f4d0c20d6..f7dbd19bc1db 100644
--- a/src/renderer/src/runtime/web-runtime-terminal-creation.ts
+++ b/src/renderer/src/runtime/web-runtime-terminal-creation.ts
@@ -14,9 +14,9 @@ import type {
 /** Toast host failure here because no mirrored pane can show it; callers reporting themselves use notifyFailure:false. */
 export async function createWebRuntimeSessionTerminal(
   args: CreateWebRuntimeSessionTerminalArgs,
-  options: { notifyFailure?: boolean } = {}
+  options: { notifyFailure?: boolean; canActivate?: () => boolean } = {}
 ): Promise<WebRuntimeTerminalCreateOutcome> {
-  const created = await createWebRuntimeSessionTerminalResult(args)
+  const created = await createWebRuntimeSessionTerminalResult(args, options.canActivate)
   if (
     created.hostFailed &&
     created.outcome.status === 'failed' &&
diff --git a/src/renderer/src/runtime/web-runtime-terminal-placement-settlement.ts b/src/renderer/src/runtime/web-runtime-terminal-placement-settlement.ts
index 8f38a7bbc84b..a39d5dd9eb40 100644
--- a/src/renderer/src/runtime/web-runtime-terminal-placement-settlement.ts
+++ b/src/renderer/src/runtime/web-runtime-terminal-placement-settlement.ts
@@ -54,6 +54,7 @@ export async function settleWebRuntimeTerminalPlacement(
     groupId?: string
     afterTabId?: string
     activate: boolean
+    canActivate?: () => boolean
     captured?: CapturedSessionTabPlacement
   }
 ): Promise<void> {
@@ -88,7 +89,7 @@ export async function settleWebRuntimeTerminalPlacement(
     if (tab.groupId !== targetGroup.id) {
       // Snapshot may beat placement recording; repair through the same client-owned move as user drags.
       state.moveUnifiedTabToGroup(unifiedTabId, targetGroup.id, {
-        activate: placement.activate,
+        activate: placement.activate && placement.canActivate?.() !== false,
         recordInteraction: false
       })
     }
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/store-patch.ts b/src/renderer/src/runtime/web-session-tabs-sync/store-patch.ts
index f2123c931ed6..b47d2cfcc985 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/store-patch.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/store-patch.ts
@@ -2,9 +2,6 @@ import {
   observeSwitchProjections,
   protectSwitchProjections
 } from '@/lib/conversation-switch-projection'
-import { callStructuredAgentSession } from '@/runtime/structured-agent-session-client'
-import { structuredAgentSessionTargetForHost } from '@/runtime/structured-agent-session-owner'
-import { getExecutionHostIdForWorktree } from '@/lib/worktree-runtime-owner'
 import {
   markStructuredAgentSessionLaunchesPublished,
   publishedStructuredSessions
@@ -66,24 +63,7 @@ export function applyWebSessionTabsStorePatch(
         ? agentStatusSnapshots
         : [agentStatusSnapshots]
       : []) {
-      observeSwitchProjections(state, snapshot, (proposal, converged) => {
-        const target = structuredAgentSessionTargetForHost(
-          getExecutionHostIdForWorktree(state, snapshot.worktree)
-        )
-        if (target) {
-          void callStructuredAgentSession(target, 'agentSession.switchToTerminal', {
-            sessionId: proposal.sessionId,
-            execution: {
-              invocationId: proposal.invocationId,
-              receipt: {
-                generation: proposal.generation,
-                shown: true,
-                ...(converged ? { converged: true } : { retained: true })
-              }
-            }
-          }).catch(() => {})
-        }
-      })
+      observeSwitchProjections(state, snapshot, () => {})
     }
     const patch = protectSwitchProjections(state, buildPatch(state))
     mirroredAgentStatusChanged = patch !== state && Object.hasOwn(patch, 'agentStatusByPaneKey')
diff --git a/src/renderer/src/store/agent-conversation-retention.ts b/src/renderer/src/store/agent-conversation-retention.ts
index 2fa21f7ca948..414ff46c757a 100644
--- a/src/renderer/src/store/agent-conversation-retention.ts
+++ b/src/renderer/src/store/agent-conversation-retention.ts
@@ -53,8 +53,9 @@ export function withAgentConversationRetention(
           write((state) => {
             const requested = typeof partial === 'function' ? partial(state) : partial
             if (
-              !Object.hasOwn(requested, 'agentConversationsByPaneKey') &&
-              !Object.hasOwn(requested, 'terminalLayoutsByTabId')
+              requested === state ||
+              (!Object.hasOwn(requested, 'agentConversationsByPaneKey') &&
+                !Object.hasOwn(requested, 'terminalLayoutsByTabId'))
             ) {
               return requested
             }
diff --git a/src/renderer/src/store/slices/agent-status/agent-status-live-reducer.ts b/src/renderer/src/store/slices/agent-status/agent-status-live-reducer.ts
index f5cd232c6a76..7c0d99279718 100644
--- a/src/renderer/src/store/slices/agent-status/agent-status-live-reducer.ts
+++ b/src/renderer/src/store/slices/agent-status/agent-status-live-reducer.ts
@@ -109,9 +109,12 @@ export function reduceAgentStatusLiveUpdate(
     nextSleepingAgentSessions = removePaneKeys(nextSleepingAgentSessions, evicted)
     nextLaunchConfigs = removePaneKeys(nextLaunchConfigs, evicted)
   }
+  const nextConversations = projectConversation(state, entry)
   const patch: Partial<AppState> = {
     agentStatusByPaneKey: nextLive,
-    agentConversationsByPaneKey: projectConversation(state, entry),
+    ...(nextConversations !== state.agentConversationsByPaneKey
+      ? { agentConversationsByPaneKey: nextConversations }
+      : {}),
     retainedAgentsByPaneKey: nextRetainedAgents,
     sleepingAgentSessionsByPaneKey: nextSleepingAgentSessions,
     agentLaunchConfigByPaneKey: nextLaunchConfigs,
diff --git a/src/renderer/src/store/slices/agent-status/agent-status-provider-session-actions.ts b/src/renderer/src/store/slices/agent-status/agent-status-provider-session-actions.ts
index 13f52d9c7b7e..5f182720cedc 100644
--- a/src/renderer/src/store/slices/agent-status/agent-status-provider-session-actions.ts
+++ b/src/renderer/src/store/slices/agent-status/agent-status-provider-session-actions.ts
@@ -147,12 +147,12 @@ export function createAgentStatusProviderSessionActions(
             nextLaunchConfigs = { ...nextLaunchConfigs }
             delete nextLaunchConfigs[paneKey]
           }
+          const nextConversations = projectConversation(s, { ...record, agentType: agent })
           return {
             agentStatusByPaneKey: nextLive,
-            agentConversationsByPaneKey: projectConversation(s, {
-              ...record,
-              agentType: agent
-            }),
+            ...(nextConversations !== s.agentConversationsByPaneKey
+              ? { agentConversationsByPaneKey: nextConversations }
+              : {}),
             retainedAgentsByPaneKey: nextRetained,
             sleepingAgentSessionsByPaneKey: {
               ...s.sleepingAgentSessionsByPaneKey,
diff --git a/src/shared/agent-launch-tab-publication.ts b/src/shared/agent-launch-tab-publication.ts
index 648b138d17d1..e1730e5a2694 100644
--- a/src/shared/agent-launch-tab-publication.ts
+++ b/src/shared/agent-launch-tab-publication.ts
@@ -29,6 +29,8 @@ export type AgentLaunchTabPublishRequest = {
   viewMode: 'terminal' | 'chat'
   placement?: AgentLaunchPlacement
   viewer: AgentLaunchTabViewerRule
+  /** Original caller navigation, compared by the addressed viewer at its final selection writer. */
+  viewerSelection?: string
   /** The launch's prompt, so a pane whose agent did not start can offer to copy it. */
   prompt?: string
   /** Which launch this is: a retry of the same one never resets what the tab keeps about it. */
diff --git a/src/shared/agent-session-switch-execution.ts b/src/shared/agent-session-switch-execution.ts
index a92dac631d54..1910fefdc682 100644
--- a/src/shared/agent-session-switch-execution.ts
+++ b/src/shared/agent-session-switch-execution.ts
@@ -11,18 +11,6 @@ export type AgentSessionSwitchResult =
       sessionId: string
       terminal?: string
       sourceRetained?: boolean
-      startupPending?: boolean
-    }
-  | {
-      status: 'present'
-      surface?: 'terminal'
-      leafId?: string
-      sessionId: string
-      generation: string
-      workspaceId: string
-      tabId: string
-      agent: 'codex'
-      placement?: { groupId?: string; afterTabId?: string }
     }
   | {
       status: 'refused' | 'uncertain'
@@ -31,13 +19,6 @@ export type AgentSessionSwitchResult =
       failureItemId?: string
     }
 
-export type AgentSessionSwitchReceipt = {
-  generation: string
-  shown: boolean
-  retained?: boolean
-  converged?: boolean
-}
-
 /** Expiry revokes new effects; already dispatched owners still reconcile their real outcome. */
 export function agentSessionSwitchDeadline(
   now = () => performance.now(),
@@ -110,11 +91,13 @@ export type AgentSessionSwitchDeadline = ReturnType<typeof agentSessionSwitchDea
 /** In-process authority; never serialize the callbacks as a transport permit. */
 export type AgentSessionSwitchAuthority = {
   invocationId: string
+  /** View freshness is independent of process authority. */
+  selectionCurrent?: () => boolean
   check: () => void
   remaining: () => number
   signal: AbortSignal
-  /** Existing physical acquisition only, excluding placement and presentation. */
-  trackPhysical?: <T>(work: Promise<T>) => Promise<T>
+  /** Existing acquisition/creation settlement only; logical failure never proves source exit. */
+  trackPhysical?: <T>(work: Promise<T>, recover?: () => Promise<void>) => Promise<T>
 }
 
 export type SessionSwitchProjection = {
diff --git a/src/shared/claimed-agent-pty-ensure-options.ts b/src/shared/claimed-agent-pty-ensure-options.ts
new file mode 100644
index 000000000000..cd5b5a7958ab
--- /dev/null
+++ b/src/shared/claimed-agent-pty-ensure-options.ts
@@ -0,0 +1,25 @@
+import type { PtyCreationDisposition } from './pty-creation-disposition'
+import type {
+  AgentSessionClaimedSpawnResult,
+  AgentSessionExecutionClaim,
+  AgentSessionOwnerBinding,
+  AgentSessionSurfaceBinding
+} from './agent-session-host-authority'
+import type { LiveAgentSessionOwner } from './claimed-agent-pty-owner-snapshot'
+export type ClaimedAgentPtyEnsureOptions = {
+  claim: AgentSessionExecutionClaim
+  surface: AgentSessionSurfaceBinding
+  spawn: (reservation: { generation: string }) => Promise<{
+    ptyId: string
+    owner?: AgentSessionOwnerBinding
+    disposition?: AgentSessionClaimedSpawnResult['disposition']
+  }>
+  isLive?: (owner: LiveAgentSessionOwner) => boolean | Promise<boolean>
+  /** Called when this request waits on another request's start instead of starting its own. */
+  creation?: Promise<PtyCreationDisposition>
+  onJoin?: (creation?: Promise<PtyCreationDisposition>) => void
+  /** Checked at mutation, including after asynchronous liveness proof. */
+  check?: () => void
+  /** Reconcile an already dispatched creator without granting new attach authority. */
+  onDispatchedRevoked?: () => void
+}
diff --git a/src/shared/claimed-agent-pty-owner.ts b/src/shared/claimed-agent-pty-owner.ts
index ef284f179b9d..9e9cbd3358ed 100644
--- a/src/shared/claimed-agent-pty-owner.ts
+++ b/src/shared/claimed-agent-pty-owner.ts
@@ -1,9 +1,10 @@
+import type { ClaimedAgentPtyEnsureOptions } from './claimed-agent-pty-ensure-options'
+import type { PtyCreationDisposition } from './pty-creation-disposition'
 import { randomUUID } from 'node:crypto'
 import type {
   AgentSessionClaimedSpawnResult,
   AgentSessionExecutionClaim,
-  AgentSessionOwnerBinding,
-  AgentSessionSurfaceBinding
+  AgentSessionOwnerBinding
 } from './agent-session-host-authority'
 import {
   agentSessionClaimKey,
@@ -18,6 +19,7 @@ import {
   scopedAgentSessionClaimsEqual,
   type LiveAgentSessionOwner
 } from './claimed-agent-pty-owner-snapshot'
+export { type PtyCreationDisposition } from './pty-creation-disposition'
 
 export { agentSessionOwnerBindingsEqual } from './claimed-agent-pty-owner-snapshot'
 
@@ -29,48 +31,22 @@ type ReservedOwner = {
   generation: string
   phase: 'reserved'
   promise: Promise<AgentSessionClaimedSpawnResult>
+  creation?: Promise<PtyCreationDisposition>
 }
 
 type LiveOwner = LiveAgentSessionOwner
 
-function cloneClaim(claim: AgentSessionExecutionClaim): AgentSessionExecutionClaim {
-  return cloneAgentSessionClaim(claim)
-}
-
-function cloneSurface(surface: AgentSessionSurfaceBinding): AgentSessionSurfaceBinding {
-  return cloneAgentSessionSurface(surface)
-}
-
-function cloneOwner(owner: LiveOwner): LiveOwner {
-  return cloneAgentSessionOwner(owner)
-}
-
 export class ClaimedAgentPtyOwnerRegistry {
   private readonly reserved = new Map<string, ReservedOwner>()
   private readonly live = new Map<string, LiveOwner>()
   private readonly conflicts = new Map<string, LiveOwner[]>()
   private keysByPtyId = new Map<string, Set<string>>()
 
-  async ensure(args: {
-    claim: AgentSessionExecutionClaim
-    surface: AgentSessionSurfaceBinding
-    spawn: (reservation: { generation: string }) => Promise<{
-      ptyId: string
-      owner?: AgentSessionOwnerBinding
-      disposition?: AgentSessionClaimedSpawnResult['disposition']
-    }>
-    isLive?: (owner: LiveAgentSessionOwner) => boolean | Promise<boolean>
-    /** Called when this request waits on another request's start instead of starting its own. */
-    onJoin?: () => void
-    /** Checked at mutation, including after asynchronous liveness proof. */
-    check?: () => void
-    /** Reconcile an already dispatched creator without granting new attach authority. */
-    onDispatchedRevoked?: () => void
-  }): Promise<AgentSessionClaimedSpawnResult> {
+  async ensure(args: ClaimedAgentPtyEnsureOptions): Promise<AgentSessionClaimedSpawnResult> {
     // Snapshot reused retry arguments before awaits so caller mutations cannot change registry keys.
     args.check?.()
-    const requestedClaim = cloneClaim(args.claim)
-    const requestedSurface = cloneSurface(args.surface)
+    const requestedClaim = cloneAgentSessionClaim(args.claim)
+    const requestedSurface = cloneAgentSessionSurface(args.surface)
     const key = agentSessionClaimKey(requestedClaim)
     if (this.conflicts.has(key)) {
       throw new Error('agent_session_conflict')
@@ -83,11 +59,11 @@ export class ClaimedAgentPtyOwnerRegistry {
       if (live.claim.worktreeScopeDigest !== requestedClaim.worktreeScopeDigest) {
         throw new Error('agent_session_conflict')
       }
-      if (!args.isLive || (await args.isLive(cloneOwner(live)))) {
+      if (!args.isLive || (await args.isLive(cloneAgentSessionOwner(live)))) {
         args.check?.()
         const current = this.live.get(key)
         if (current?.ptyId === live.ptyId && current.generation === live.generation) {
-          return { disposition: 'adopted', owner: cloneOwner(current) }
+          return { disposition: 'adopted', owner: cloneAgentSessionOwner(current) }
         }
         return await this.ensure(args)
       }
@@ -100,10 +76,10 @@ export class ClaimedAgentPtyOwnerRegistry {
       if (reserved.worktreeScopeDigest !== requestedClaim.worktreeScopeDigest) {
         throw new Error('agent_session_conflict')
       }
-      args.onJoin?.()
+      args.onJoin?.(reserved.creation)
       const result = await reserved.promise
       args.check?.()
-      return { disposition: 'adopted', owner: cloneOwner(result.owner as LiveOwner) }
+      return { disposition: 'adopted', owner: cloneAgentSessionOwner(result.owner as LiveOwner) }
     }
 
     args.check?.()
@@ -122,18 +98,20 @@ export class ClaimedAgentPtyOwnerRegistry {
       worktreeScopeDigest: requestedClaim.worktreeScopeDigest,
       generation,
       phase: 'reserved',
+      creation: args.creation,
       promise
     })
 
+    let published = false
     try {
       const spawned = await args.spawn({ generation })
       const owner: LiveOwner = spawned.owner
         ? {
-            claim: cloneClaim(spawned.owner.claim),
+            claim: cloneAgentSessionClaim(spawned.owner.claim),
             generation: spawned.owner.generation,
             phase: 'live',
             ptyId: spawned.owner.ptyId,
-            surface: cloneSurface(spawned.owner.surface)
+            surface: cloneAgentSessionSurface(spawned.owner.surface)
           }
         : {
             claim: requestedClaim,
@@ -175,7 +153,7 @@ export class ClaimedAgentPtyOwnerRegistry {
       keys.add(key)
       this.keysByPtyId.set(owner.ptyId, keys)
       // Index before awaited proof so an exit beating spawn completion can remove the matching generation.
-      if (args.isLive && !(await args.isLive(cloneOwner(owner)))) {
+      if (args.isLive && !(await args.isLive(cloneAgentSessionOwner(owner)))) {
         this.release(owner.ptyId, owner.generation)
         throw new Error('agent_session_exited_during_start')
       }
@@ -186,18 +164,33 @@ export class ClaimedAgentPtyOwnerRegistry {
       }
       const result: AgentSessionClaimedSpawnResult = {
         disposition: spawned.disposition ?? 'created',
-        owner: cloneOwner(owner)
+        owner: cloneAgentSessionOwner(owner)
       }
       // Dispatch already happened: reconcile its real owner even if this observer expired.
       resolveReservation(result)
+      published = true
       return result
     } catch (error) {
       rejectReservation(error)
       throw error
     } finally {
-      const current = this.reserved.get(key)
-      if (current?.generation === generation) {
-        this.reserved.delete(key)
+      const finish = () => {
+        if (this.reserved.get(key)?.generation === generation) {
+          this.reserved.delete(key)
+        }
+      }
+      if (published || !args.creation) {
+        finish()
+      } else {
+        void args.creation.then(async (disposition) => {
+          if (disposition.kind === 'unknown') {
+            return
+          }
+          if (disposition.kind === 'physical' || disposition.kind === 'failed') {
+            await disposition.completion
+          }
+          finish()
+        })
       }
     }
   }
@@ -299,7 +292,9 @@ export class ClaimedAgentPtyOwnerRegistry {
 
   find(claim: AgentSessionExecutionClaim): AgentSessionOwnerBinding | null {
     const owner = this.live.get(agentSessionClaimKey(claim))
-    return owner && scopedAgentSessionClaimsEqual(owner.claim, claim) ? cloneOwner(owner) : null
+    return owner && scopedAgentSessionClaimsEqual(owner.claim, claim)
+      ? cloneAgentSessionOwner(owner)
+      : null
   }
 
   private rebuildPtyIndex(): void {
diff --git a/src/shared/pty-creation-disposition.ts b/src/shared/pty-creation-disposition.ts
new file mode 100644
index 000000000000..d1adbc8ae52e
--- /dev/null
+++ b/src/shared/pty-creation-disposition.ts
@@ -0,0 +1,11 @@
+export type PtyCreationDisposition =
+  | { kind: 'no-fork' }
+  | { kind: 'unknown'; recover?: () => Promise<void> }
+  // Exact native call threw without exporting a handle; physical outcome is unknown.
+  | { kind: 'failed'; completion: Promise<void>; recover?: () => Promise<void> }
+  | {
+      kind: 'physical'
+      completion: Promise<void>
+      exitCode: () => number | null
+      recover?: () => Promise<void>
+    }
diff --git a/src/shared/rpc-contract/structured-agent-session-params.ts b/src/shared/rpc-contract/structured-agent-session-params.ts
index 8d3d95d69af5..5efa11d2b9f9 100644
--- a/src/shared/rpc-contract/structured-agent-session-params.ts
+++ b/src/shared/rpc-contract/structured-agent-session-params.ts
@@ -214,16 +214,7 @@ export const SwitchToChatParams = OptionsParams.extend({
   execution: z
     .object({
       invocationId: Identifier('Invalid invocation'),
-      observe: z.boolean().optional(),
-      receipt: z
-        .object({
-          generation: Identifier('Invalid generation'),
-          shown: z.boolean(),
-          retained: z.boolean().optional(),
-          converged: z.boolean().optional()
-        })
-        .strict()
-        .optional(),
+      viewerSelection: z.string().max(16384).optional(),
       create: CreateIntentParams.omit({ firstMessage: true }).optional(),
       source: TerminalClose.required().optional()
     })
@@ -234,16 +225,7 @@ export const SwitchToTerminalParams = OptionsParams.extend({
   execution: z
     .object({
       invocationId: Identifier('Invalid invocation'),
-      observe: z.boolean().optional(),
-      receipt: z
-        .object({
-          generation: Identifier('Invalid generation'),
-          shown: z.boolean(),
-          retained: z.boolean().optional(),
-          converged: z.boolean().optional()
-        })
-        .strict()
-        .optional(),
+      viewerSelection: z.string().max(16384).optional(),
       sourceTabId: Identifier('Invalid tab').optional(),
       groupId: Identifier('Invalid group').optional(),
       commandOverride: z.string().max(8192).optional()
diff --git a/src/shared/structured-agent-cli-conversation-adoption.ts b/src/shared/structured-agent-cli-conversation-adoption.ts
index c949bd7b5159..fa68a5e3e5cd 100644
--- a/src/shared/structured-agent-cli-conversation-adoption.ts
+++ b/src/shared/structured-agent-cli-conversation-adoption.ts
@@ -39,7 +39,14 @@ export function cliConversationRowsShareAgent(
 
 /** The one enablement source for moving a conversation between chat and terminal in place: the
  *  agents whose chat catches up on turns made elsewhere and whose terminal start Orca can watch. */
-export const IN_PLACE_SWITCH_AGENTS: readonly CliConversationRowAgent[] = ['codex']
+export const IN_PLACE_SWITCH_AGENTS: readonly CliConversationRowAgent[] = [
+  'claude',
+  'codex',
+  'grok',
+  'opencode',
+  'opencode2',
+  'pi'
+]
 
 export function inPlaceSwitchEnabled(agent: unknown): boolean {
   return adoptsCliConversations(agent) && IN_PLACE_SWITCH_AGENTS.includes(agent)
@@ -47,16 +54,15 @@ export function inPlaceSwitchEnabled(agent: unknown): boolean {
 
 /** What a host advertises per enabled agent; a peer without it never receives a switch. */
 export function inPlaceSwitchCapability(agent: string): string {
-  return `agent-session.structured.switch.v1:${agent}`
+  return `agent-session.structured.switch.creation-settlement-v1:${agent}`
 }
 
-export const IN_PLACE_SWITCH_RUNTIME_CAPABILITIES = IN_PLACE_SWITCH_AGENTS.flatMap((agent) => [
-  inPlaceSwitchCapability(agent),
-  inPlaceSwitchExecutionCapability(agent)
-])
+export const IN_PLACE_SWITCH_RUNTIME_CAPABILITIES = IN_PLACE_SWITCH_AGENTS.map(
+  inPlaceSwitchExecutionCapability
+)
 
 export function inPlaceSwitchExecutionCapability(agent: string): string {
-  return `agent-session.structured.switch-execution.v1:${agent}`
+  return `agent-session.structured.switch.creation-settlement-v1:${agent}`
 }
 
 /** `saved`: built from a pane's saved facts; `switch`: the terminal half of a chat's switch. */

From 392d9d18a2648a22ffc868689e71c078cedf5f05 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Wed, 28 Oct 2026 17:55:54 -0700
Subject: [PATCH 093/207] Correct switch lifecycle outcomes and CI contracts

---
 .../codex/codex-structured-session-acquire.ts |   1 +
 ...pty-adapter-protocol-compatibility.test.ts |   4 +-
 .../daemon/daemon-pty-adapter-test-harness.ts |   1 +
 src/main/daemon/daemon-terminal-admission.ts  |   9 +-
 .../codex/completed.jsonl                     |  17 ++
 .../codex/recorded-prefix.jsonl               |  11 ++
 .../grok/completed/chat_history.jsonl         |   5 +
 .../grok/completed/events.jsonl               |   2 +
 .../interrupted-prefix/chat_history.jsonl     |   2 +
 .../grok/interrupted-prefix/events.jsonl      |   1 +
 .../opencode/completed.db                     | Bin 0 -> 28672 bytes
 .../opencode/recorded-prefix.db               | Bin 0 -> 28672 bytes
 .../opencode2/completed.db                    | Bin 0 -> 20480 bytes
 .../opencode2/recorded-prefix.db              | Bin 0 -> 20480 bytes
 .../recorded-native-switch/pi/completed.jsonl |   7 +
 .../recorded-native-switch/provenance.json    | 101 +++++++++++
 ...ructured-agent-session-at-rest-catch-up.ts |   1 +
 ...tured-agent-session-switch-command.test.ts |   5 +-
 ...ctured-agent-session-switch-import.test.ts | 164 +++++++++++++++++-
 .../structured-agent-session-switch-import.ts |   6 +-
 .../transcript-grok-turn-lifecycle.ts         |   7 +-
 .../transcript-opencode-sqlite-query.ts       |   7 +-
 .../transcript-opencode2-sqlite.ts            |   3 +-
 .../native-chat/transcript-turn-lifecycle.ts  |   9 +-
 ...red-agent-session-switch-generated.test.ts |  55 +++---
 ...agent-session-switch-terminal-execution.ts |   9 +-
 ...-chat-coordinator-mail-rig.test-fixture.ts |   5 +-
 .../workspace-process-listing-dependencies.ts |   4 +-
 .../native-chat-runtime-contract.ts           |   3 +
 .../native-chat-session-transport.test.ts     |  36 +++-
 .../right-sidebar/AiVaultVirtualRow.test.tsx  |  13 +-
 .../components/tab-bar/cli-chat-resume-run.ts |   2 +-
 ...ured-agent-session-provisional-tab.test.ts |   9 +-
 .../lib/conversation-surface-switch.test.tsx  |   1 +
 .../launch-structured-agent-session.test.ts   |  47 +++++
 ...session-terminal-workspace-routing.test.ts |  31 ++--
 src/shared/claimed-agent-pty-owner.ts         |   4 +-
 src/shared/native-chat-types.ts               |   2 +
 38 files changed, 512 insertions(+), 72 deletions(-)
 create mode 100644 src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/codex/completed.jsonl
 create mode 100644 src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/codex/recorded-prefix.jsonl
 create mode 100644 src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/grok/completed/chat_history.jsonl
 create mode 100644 src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/grok/completed/events.jsonl
 create mode 100644 src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/grok/interrupted-prefix/chat_history.jsonl
 create mode 100644 src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/grok/interrupted-prefix/events.jsonl
 create mode 100644 src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/opencode/completed.db
 create mode 100644 src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/opencode/recorded-prefix.db
 create mode 100644 src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/opencode2/completed.db
 create mode 100644 src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/opencode2/recorded-prefix.db
 create mode 100644 src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/pi/completed.jsonl
 create mode 100644 src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/provenance.json

diff --git a/src/main/codex/codex-structured-session-acquire.ts b/src/main/codex/codex-structured-session-acquire.ts
index 91b8805670d7..1b8fb17d4c68 100644
--- a/src/main/codex/codex-structured-session-acquire.ts
+++ b/src/main/codex/codex-structured-session-acquire.ts
@@ -4,6 +4,7 @@ import {
   isAgentSessionProviderHandleInNamespace
 } from '../../shared/agent-session-provider-handle-encoding'
 import {
+  AgentSessionPreSpawnError,
   launchPreparationFailure,
   type AgentSessionAcquisition,
   type StructuredAgentSessionAcquireInput
diff --git a/src/main/daemon/daemon-pty-adapter-protocol-compatibility.test.ts b/src/main/daemon/daemon-pty-adapter-protocol-compatibility.test.ts
index a5a0f88cd3e7..296ebd7a45a9 100644
--- a/src/main/daemon/daemon-pty-adapter-protocol-compatibility.test.ts
+++ b/src/main/daemon/daemon-pty-adapter-protocol-compatibility.test.ts
@@ -472,7 +472,7 @@ describe('DaemonPtyAdapter (IPtyProvider)', () => {
 
     function createProbeAdapter(
       protocolVersion: number,
-      request: ReturnType<typeof vi.fn>
+      request: (...args: Parameters<DaemonClient['request']>) => Promise<unknown>
     ): DaemonPtyAdapter {
       const probeAdapter = new DaemonPtyAdapter({ socketPath, tokenPath, protocolVersion })
       // SAFETY: stub external RPC answers while keeping the actual client's transport lifetime.
@@ -681,7 +681,7 @@ describe('DaemonPtyAdapter (IPtyProvider)', () => {
   describe('inspectProcess on pre-inspection daemon protocols', () => {
     function createInspectionAdapter(
       protocolVersion: number,
-      request: ReturnType<typeof vi.fn>
+      request: (...args: Parameters<DaemonClient['request']>) => Promise<unknown>
     ): DaemonPtyAdapter {
       const inspectionAdapter = new DaemonPtyAdapter({
         socketPath,
diff --git a/src/main/daemon/daemon-pty-adapter-test-harness.ts b/src/main/daemon/daemon-pty-adapter-test-harness.ts
index 4e8b520024a3..74483bc4561b 100644
--- a/src/main/daemon/daemon-pty-adapter-test-harness.ts
+++ b/src/main/daemon/daemon-pty-adapter-test-harness.ts
@@ -26,6 +26,7 @@ function createTestDir(): string {
 }
 
 export function createMockSubprocess(dataOnSubscribe?: string): SubprocessHandle & {
+  forceKill: ReturnType<typeof vi.fn<SubprocessHandle['forceKill']>>
   write: ReturnType<typeof vi.fn<(data: string) => void>>
   pause: ReturnType<typeof vi.fn<() => void>>
   resume: ReturnType<typeof vi.fn<() => void>>
diff --git a/src/main/daemon/daemon-terminal-admission.ts b/src/main/daemon/daemon-terminal-admission.ts
index 10c067f69328..09bd40432954 100644
--- a/src/main/daemon/daemon-terminal-admission.ts
+++ b/src/main/daemon/daemon-terminal-admission.ts
@@ -87,9 +87,7 @@ export class DaemonTerminalAdmission {
     let routedSessionId = payload.sessionId
     let result: CreateOrAttachResult
     let spawnPreparation: PendingPtySpawnPreparation | null = null
-    let hostDisposition: PtyCreationDisposition = {
-      kind: 'no-fork'
-    }
+    const creation: { current: PtyCreationDisposition } = { current: { kind: 'no-fork' } }
     try {
       if (
         payload.agentSessionEnsure !== undefined &&
@@ -123,7 +121,7 @@ export class DaemonTerminalAdmission {
           : payload.historySeed !== undefined
             ? [payload.historySeed]
             : undefined
-      hostDisposition = { kind: 'unknown' }
+      creation.current = { kind: 'unknown' }
       result = await this.options.host.createOrAttach({
         sessionId: payload.sessionId,
         cols: payload.cols,
@@ -153,7 +151,7 @@ export class DaemonTerminalAdmission {
         },
         retainCanceledChild: Boolean(payload.switchExecution),
         onCreationDisposition: (disposition) => {
-          hostDisposition = disposition
+          creation.current = disposition
         },
         isCanceled: () =>
           spawnPreparation !== null && this.options.preparations.isCanceled(spawnPreparation),
@@ -192,6 +190,7 @@ export class DaemonTerminalAdmission {
         }
       }
     } finally {
+      const hostDisposition = creation.current
       if (spawnPreparation) {
         const preparation = spawnPreparation
         const settlement = preparation.settlement
diff --git a/src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/codex/completed.jsonl b/src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/codex/completed.jsonl
new file mode 100644
index 000000000000..dc08f7a2087a
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/codex/completed.jsonl
@@ -0,0 +1,17 @@
+{"timestamp":"2026-10-28T18:52:57.513Z","ordinal":0,"type":"session_meta","payload":{"session_id":"[redacted]","id":"01a183db-b8d6-7170-af39-e004651c1e1e","timestamp":"2026-10-28T18:52:57.454Z","cwd":"/qa-owned/scratch","runtime_workspace_roots":["[redacted]"],"originator":"codex_exec","cli_version":"0.162.1","source":"exec","thread_source":"[redacted]","model_provider":"existing_lb","base_instructions":{"text":"[redacted]","provenance":{"type":"model","model":"gpt-6.1-sol"}},"history_mode":"paginated","context_window":{"window_id":"[redacted]"},"git":{"commit_hash":"[redacted]","branch":"[redacted]"}}}
+{"timestamp":"2026-10-28T20:31:39.367Z","ordinal":424,"type":"event_msg","payload":{"type":"task_started","turn_attribution":{"turn_id":"01a18436-1564-7692-8f31-ebe85b09f74f","turn_trigger":"[redacted]","parent_turn_id":null,"initiating_agent_path":null,"root_turn_id":"[redacted]"},"turn_id":"01a18436-1564-7692-8f31-ebe85b09f74f","root_turn_id":"[redacted]","started_at":1793219499,"model_context_window":258400,"collaboration_mode_kind":"[redacted]"}}
+{"timestamp":"2026-10-28T20:31:39.369Z","ordinal":425,"type":"turn_context","payload":{"turn_id":"01a18436-1564-7692-8f31-ebe85b09f74f","root_turn_id":"[redacted]","disabled_plugin_ids":[],"cwd":"/qa-owned/scratch","approval_policy":"[redacted]","approvals_reviewer":"[redacted]","sandbox_policy":{"type":"danger-full-access"},"permission_profile":{"type":"disabled"},"model":"gpt-6.1-sol","comp_hash":"[redacted]","collaboration_mode":{"mode":"[redacted]","settings":{"model":"gpt-6.1-sol","reasoning_effort":"high","developer_instructions":null}},"multi_agent_version":"[redacted]","realtime_active":false,"effort":"high","summary":"[redacted]"}}
+{"timestamp":"2026-10-28T20:31:39.371Z","ordinal":426,"type":"response_item","payload":{"type":"message","id":"msg_01a18436-156b-7201-99c4-d4f6fd74424c","role":"user","content":[{"type":"input_text","text":"[redacted]"}],"internal_chat_message_metadata_passthrough":{"turn_id":"01a18436-1564-7692-8f31-ebe85b09f74f","create_time":1793219499.371831,"content_item_kinds":["[redacted]"]}},"metadata":{"retained_source":{"id":{"message_id":"[redacted]","turn_id":"01a18436-1564-7692-8f31-ebe85b09f74f","role":"user"},"revision":"[redacted]","complete":true},"client_authored":false,"user_input_order":67,"mcp_attribution":{"status":"none"}}}
+{"timestamp":"2026-10-28T20:31:39.372Z","ordinal":427,"type":"event_msg","payload":{"type":"item_completed","thread_id":"[redacted]","turn_id":"01a18436-1564-7692-8f31-ebe85b09f74f","item":{"type":"UserMessage","id":"01a18436-156b-7201-99c4-d506a478fc0d","content":[{"type":"text","text":"[redacted]","text_elements":[]}]},"started_at_ms":1793219499372,"completed_at_ms":1793219499372}}
+{"timestamp":"2026-10-28T20:32:19.591Z","ordinal":428,"type":"event_msg","payload":{"type":"item_completed","thread_id":"[redacted]","turn_id":"01a18436-1564-7692-8f31-ebe85b09f74f","item":{"type":"AgentMessage","id":"msg_0c86421a39dd238c016ae25bd2c5f48199961b2ddbe0a5fd13","content":[{"type":"Text","text":"[redacted]"}],"phase":"commentary"},"started_at_ms":1793219539591,"completed_at_ms":1793219539591}}
+{"timestamp":"2026-10-28T20:32:19.594Z","ordinal":429,"type":"response_item","payload":{"type":"message","id":"msg_0c86421a39dd238c016ae25bd2c5f48199961b2ddbe0a5fd13","role":"assistant","content":[{"type":"output_text","text":"[redacted]"}],"phase":"commentary","internal_chat_message_metadata_passthrough":{"turn_id":"01a18436-1564-7692-8f31-ebe85b09f74f","create_time":1793219538.782227,"content_item_kinds":["[redacted]"]}},"metadata":{"retained_source":{"id":{"message_id":"[redacted]","turn_id":"01a18436-1564-7692-8f31-ebe85b09f74f","role":"assistant"},"revision":"[redacted]","complete":true},"client_authored":false,"user_input_order":68}}
+{"timestamp":"2026-10-28T20:32:23.372Z","ordinal":430,"type":"response_item","payload":{"type":"custom_tool_call","id":"ctc_0c86421a39dd238c016ae25bd310848199973af0c0b9614a3b","status":"completed","call_id":"call_7aa9bb3a03fc4709a96ba91c3200a189","name":"exec","input":"[redacted]","internal_chat_message_metadata_passthrough":{"turn_id":"01a18436-1564-7692-8f31-ebe85b09f74f","create_time":1793219539.0680492}}}
+{"timestamp":"2026-10-28T20:32:23.476Z","ordinal":431,"type":"event_msg","payload":{"type":"item_completed","thread_id":"[redacted]","turn_id":"01a18436-1564-7692-8f31-ebe85b09f74f","item":{"type":"CommandExecution","id":"exec-a23370e1-7bc9-4b2e-af2e-ffd99e3419dd","process_id":"[redacted]","command":["[redacted]","[redacted]","[redacted]"],"cwd":"/qa-owned/scratch","parsed_cmd":[{"type":"unknown","cmd":"[redacted]"}],"source":"unified_exec_startup","status":"completed","aggregated_output":"[redacted]","exit_code":0,"duration":{"secs":0,"nanos":3959}},"started_at_ms":1793219543476,"completed_at_ms":1793219543476}}
+{"timestamp":"2026-10-28T20:32:23.599Z","ordinal":432,"type":"token_usage_record","payload":{"thread_id":"[redacted]","turn_id":"01a18436-1564-7692-8f31-ebe85b09f74f","session_id":"[redacted]","root_turn_id":"[redacted]","response_id":"[redacted]","usage":{"input_tokens":30860,"cached_input_tokens":30464,"cache_write_input_tokens":0,"output_tokens":441,"reasoning_output_tokens":0,"total_tokens":31301},"turn_token_usage":{"input_tokens":30860,"cached_input_tokens":30464,"cache_write_input_tokens":0,"output_tokens":441,"reasoning_output_tokens":0,"total_tokens":31301},"thread_token_usage":{"input_tokens":1048727,"cached_input_tokens":968320,"cache_write_input_tokens":0,"output_tokens":10386,"reasoning_output_tokens":197,"total_tokens":1059113}}}
+{"timestamp":"2026-10-28T20:32:23.599Z","ordinal":433,"type":"response_item","payload":{"type":"custom_tool_call_output","id":"ctco_01a18436-c22f-70a3-8d5b-fae16bd363df","call_id":"call_7aa9bb3a03fc4709a96ba91c3200a189","output":[{"type":"input_text","text":"[redacted]"},{"type":"input_text","text":"[redacted]"}],"internal_chat_message_metadata_passthrough":{"turn_id":"01a18436-1564-7692-8f31-ebe85b09f74f","create_time":1793219543.599943}},"metadata":{"client_authored":false,"fallback_token_limit_override":12000}}
+{"timestamp":"2026-10-28T20:32:23.600Z","ordinal":434,"type":"event_msg","payload":{"type":"token_count","info":{"total_token_usage":{"input_tokens":1048727,"cached_input_tokens":968320,"cache_write_input_tokens":0,"output_tokens":10386,"reasoning_output_tokens":197,"total_tokens":1059113},"last_token_usage":{"input_tokens":30860,"cached_input_tokens":30464,"cache_write_input_tokens":0,"output_tokens":441,"reasoning_output_tokens":0,"total_tokens":31301},"model_context_window":258400},"rate_limits":{"limit_id":"[redacted]","limit_name":null,"primary":null,"secondary":{"used_percent":44.57142857142857,"window_minutes":10080,"resets_at":1793774136},"credits":{"has_credits":true,"unlimited":false,"balance":"[redacted]"},"individual_limit":null,"spend_control_reached":null,"plan_type":null,"rate_limit_reached_type":null}}}
+{"timestamp":"2026-10-28T20:33:00.077Z","ordinal":435,"type":"event_msg","payload":{"type":"item_completed","thread_id":"[redacted]","turn_id":"01a18436-1564-7692-8f31-ebe85b09f74f","item":{"type":"AgentMessage","id":"msg_0c86421a39dd238c016ae25bfa61e0819983333e6ccd7e20fd","content":[{"type":"Text","text":"[redacted]"}],"phase":"final_answer"},"started_at_ms":1793219578648,"completed_at_ms":1793219580077}}
+{"timestamp":"2026-10-28T20:33:00.081Z","ordinal":436,"type":"response_item","payload":{"type":"message","id":"msg_0c86421a39dd238c016ae25bfa61e0819983333e6ccd7e20fd","role":"assistant","content":[{"type":"output_text","text":"[redacted]"}],"phase":"final_answer","internal_chat_message_metadata_passthrough":{"turn_id":"01a18436-1564-7692-8f31-ebe85b09f74f","create_time":1793219578.409068,"content_item_kinds":["[redacted]"]}},"metadata":{"retained_source":{"id":{"message_id":"[redacted]","turn_id":"01a18436-1564-7692-8f31-ebe85b09f74f","role":"assistant"},"revision":"[redacted]","complete":true},"client_authored":false,"user_input_order":69}}
+{"timestamp":"2026-10-28T20:33:00.152Z","ordinal":437,"type":"token_usage_record","payload":{"thread_id":"[redacted]","turn_id":"01a18436-1564-7692-8f31-ebe85b09f74f","session_id":"[redacted]","root_turn_id":"[redacted]","response_id":"[redacted]","usage":{"input_tokens":32026,"cached_input_tokens":31104,"cache_write_input_tokens":0,"output_tokens":75,"reasoning_output_tokens":0,"total_tokens":32101},"turn_token_usage":{"input_tokens":62886,"cached_input_tokens":61568,"cache_write_input_tokens":0,"output_tokens":516,"reasoning_output_tokens":0,"total_tokens":63402},"thread_token_usage":{"input_tokens":1080753,"cached_input_tokens":999424,"cache_write_input_tokens":0,"output_tokens":10461,"reasoning_output_tokens":197,"total_tokens":1091214}}}
+{"timestamp":"2026-10-28T20:33:00.152Z","ordinal":438,"type":"event_msg","payload":{"type":"token_count","info":{"total_token_usage":{"input_tokens":1080753,"cached_input_tokens":999424,"cache_write_input_tokens":0,"output_tokens":10461,"reasoning_output_tokens":197,"total_tokens":1091214},"last_token_usage":{"input_tokens":32026,"cached_input_tokens":31104,"cache_write_input_tokens":0,"output_tokens":75,"reasoning_output_tokens":0,"total_tokens":32101},"model_context_window":258400},"rate_limits":{"limit_id":"[redacted]","limit_name":null,"primary":null,"secondary":{"used_percent":44.57142857142857,"window_minutes":10080,"resets_at":1793774136},"credits":{"has_credits":true,"unlimited":false,"balance":"[redacted]"},"individual_limit":null,"spend_control_reached":null,"plan_type":null,"rate_limit_reached_type":null}}}
+{"timestamp":"2026-10-28T20:33:00.155Z","ordinal":439,"type":"event_msg","payload":{"type":"task_complete","root_turn_id":"[redacted]","turn_id":"01a18436-1564-7692-8f31-ebe85b09f74f","last_agent_message":"[redacted]","started_at":1793219499,"completed_at":1793219580,"duration_ms":80787,"time_to_first_token_ms":40224}}
diff --git a/src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/codex/recorded-prefix.jsonl b/src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/codex/recorded-prefix.jsonl
new file mode 100644
index 000000000000..08850a92fe21
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/codex/recorded-prefix.jsonl
@@ -0,0 +1,11 @@
+{"timestamp":"2026-10-28T18:52:57.513Z","ordinal":0,"type":"session_meta","payload":{"session_id":"[redacted]","id":"01a183db-b8d6-7170-af39-e004651c1e1e","timestamp":"2026-10-28T18:52:57.454Z","cwd":"/qa-owned/scratch","runtime_workspace_roots":["[redacted]"],"originator":"codex_exec","cli_version":"0.162.1","source":"exec","thread_source":"[redacted]","model_provider":"existing_lb","base_instructions":{"text":"[redacted]","provenance":{"type":"model","model":"gpt-6.1-sol"}},"history_mode":"paginated","context_window":{"window_id":"[redacted]"},"git":{"commit_hash":"[redacted]","branch":"[redacted]"}}}
+{"timestamp":"2026-10-28T20:31:39.367Z","ordinal":424,"type":"event_msg","payload":{"type":"task_started","turn_attribution":{"turn_id":"01a18436-1564-7692-8f31-ebe85b09f74f","turn_trigger":"[redacted]","parent_turn_id":null,"initiating_agent_path":null,"root_turn_id":"[redacted]"},"turn_id":"01a18436-1564-7692-8f31-ebe85b09f74f","root_turn_id":"[redacted]","started_at":1793219499,"model_context_window":258400,"collaboration_mode_kind":"[redacted]"}}
+{"timestamp":"2026-10-28T20:31:39.369Z","ordinal":425,"type":"turn_context","payload":{"turn_id":"01a18436-1564-7692-8f31-ebe85b09f74f","root_turn_id":"[redacted]","disabled_plugin_ids":[],"cwd":"/qa-owned/scratch","approval_policy":"[redacted]","approvals_reviewer":"[redacted]","sandbox_policy":{"type":"danger-full-access"},"permission_profile":{"type":"disabled"},"model":"gpt-6.1-sol","comp_hash":"[redacted]","collaboration_mode":{"mode":"[redacted]","settings":{"model":"gpt-6.1-sol","reasoning_effort":"high","developer_instructions":null}},"multi_agent_version":"[redacted]","realtime_active":false,"effort":"high","summary":"[redacted]"}}
+{"timestamp":"2026-10-28T20:31:39.371Z","ordinal":426,"type":"response_item","payload":{"type":"message","id":"msg_01a18436-156b-7201-99c4-d4f6fd74424c","role":"user","content":[{"type":"input_text","text":"[redacted]"}],"internal_chat_message_metadata_passthrough":{"turn_id":"01a18436-1564-7692-8f31-ebe85b09f74f","create_time":1793219499.371831,"content_item_kinds":["[redacted]"]}},"metadata":{"retained_source":{"id":{"message_id":"[redacted]","turn_id":"01a18436-1564-7692-8f31-ebe85b09f74f","role":"user"},"revision":"[redacted]","complete":true},"client_authored":false,"user_input_order":67,"mcp_attribution":{"status":"none"}}}
+{"timestamp":"2026-10-28T20:31:39.372Z","ordinal":427,"type":"event_msg","payload":{"type":"item_completed","thread_id":"[redacted]","turn_id":"01a18436-1564-7692-8f31-ebe85b09f74f","item":{"type":"UserMessage","id":"01a18436-156b-7201-99c4-d506a478fc0d","content":[{"type":"text","text":"[redacted]","text_elements":[]}]},"started_at_ms":1793219499372,"completed_at_ms":1793219499372}}
+{"timestamp":"2026-10-28T20:32:19.591Z","ordinal":428,"type":"event_msg","payload":{"type":"item_completed","thread_id":"[redacted]","turn_id":"01a18436-1564-7692-8f31-ebe85b09f74f","item":{"type":"AgentMessage","id":"msg_0c86421a39dd238c016ae25bd2c5f48199961b2ddbe0a5fd13","content":[{"type":"Text","text":"[redacted]"}],"phase":"commentary"},"started_at_ms":1793219539591,"completed_at_ms":1793219539591}}
+{"timestamp":"2026-10-28T20:32:19.594Z","ordinal":429,"type":"response_item","payload":{"type":"message","id":"msg_0c86421a39dd238c016ae25bd2c5f48199961b2ddbe0a5fd13","role":"assistant","content":[{"type":"output_text","text":"[redacted]"}],"phase":"commentary","internal_chat_message_metadata_passthrough":{"turn_id":"01a18436-1564-7692-8f31-ebe85b09f74f","create_time":1793219538.782227,"content_item_kinds":["[redacted]"]}},"metadata":{"retained_source":{"id":{"message_id":"[redacted]","turn_id":"01a18436-1564-7692-8f31-ebe85b09f74f","role":"assistant"},"revision":"[redacted]","complete":true},"client_authored":false,"user_input_order":68}}
+{"timestamp":"2026-10-28T20:32:23.372Z","ordinal":430,"type":"response_item","payload":{"type":"custom_tool_call","id":"ctc_0c86421a39dd238c016ae25bd310848199973af0c0b9614a3b","status":"completed","call_id":"call_7aa9bb3a03fc4709a96ba91c3200a189","name":"exec","input":"[redacted]","internal_chat_message_metadata_passthrough":{"turn_id":"01a18436-1564-7692-8f31-ebe85b09f74f","create_time":1793219539.0680492}}}
+{"timestamp":"2026-10-28T20:32:23.476Z","ordinal":431,"type":"event_msg","payload":{"type":"item_completed","thread_id":"[redacted]","turn_id":"01a18436-1564-7692-8f31-ebe85b09f74f","item":{"type":"CommandExecution","id":"exec-a23370e1-7bc9-4b2e-af2e-ffd99e3419dd","process_id":"[redacted]","command":["[redacted]","[redacted]","[redacted]"],"cwd":"/qa-owned/scratch","parsed_cmd":[{"type":"unknown","cmd":"[redacted]"}],"source":"unified_exec_startup","status":"completed","aggregated_output":"[redacted]","exit_code":0,"duration":{"secs":0,"nanos":3959}},"started_at_ms":1793219543476,"completed_at_ms":1793219543476}}
+{"timestamp":"2026-10-28T20:32:23.599Z","ordinal":432,"type":"token_usage_record","payload":{"thread_id":"[redacted]","turn_id":"01a18436-1564-7692-8f31-ebe85b09f74f","session_id":"[redacted]","root_turn_id":"[redacted]","response_id":"[redacted]","usage":{"input_tokens":30860,"cached_input_tokens":30464,"cache_write_input_tokens":0,"output_tokens":441,"reasoning_output_tokens":0,"total_tokens":31301},"turn_token_usage":{"input_tokens":30860,"cached_input_tokens":30464,"cache_write_input_tokens":0,"output_tokens":441,"reasoning_output_tokens":0,"total_tokens":31301},"thread_token_usage":{"input_tokens":1048727,"cached_input_tokens":968320,"cache_write_input_tokens":0,"output_tokens":10386,"reasoning_output_tokens":197,"total_tokens":1059113}}}
+{"timestamp":"2026-10-28T20:32:23.599Z","ordinal":433,"type":"response_item","payload":{"type":"custom_tool_call_output","id":"ctco_01a18436-c22f-70a3-8d5b-fae16bd363df","call_id":"call_7aa9bb3a03fc4709a96ba91c3200a189","output":[{"type":"input_text","text":"[redacted]"},{"type":"input_text","text":"[redacted]"}],"internal_chat_message_metadata_passthrough":{"turn_id":"01a18436-1564-7692-8f31-ebe85b09f74f","create_time":1793219543.599943}},"metadata":{"client_authored":false,"fallback_token_limit_override":12000}}
diff --git a/src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/grok/completed/chat_history.jsonl b/src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/grok/completed/chat_history.jsonl
new file mode 100644
index 000000000000..bbd7c9ecf0a2
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/grok/completed/chat_history.jsonl
@@ -0,0 +1,5 @@
+{"type":"user","content":[{"type":"text","text":"[redacted]"}]}
+{"type":"assistant","content":"[redacted]","tool_calls":[{"id":"call-7acd954c-193d-404b-9131-abefbcf73701-0","name":"read_file","arguments":"{\"target_file\":\"[redacted]\"}"},{"id":"call-7acd954c-193d-404b-9131-abefbcf73701-1","name":"read_file","arguments":"{\"target_file\":\"[redacted]\"}"}],"model_id":"grok-4.7-build","model_fingerprint":"fp_5719f1aec35dd73c","reasoning_effort":"high"}
+{"type":"tool_result","tool_call_id":"call-7acd954c-193d-404b-9131-abefbcf73701-0","content":"[redacted]"}
+{"type":"tool_result","tool_call_id":"call-7acd954c-193d-404b-9131-abefbcf73701-1","content":"[redacted]"}
+{"type":"assistant","content":"[redacted]","model_id":"grok-4.7-build","model_fingerprint":"fp_5719f1aec35dd73c","reasoning_effort":"high"}
diff --git a/src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/grok/completed/events.jsonl b/src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/grok/completed/events.jsonl
new file mode 100644
index 000000000000..51cda866d106
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/grok/completed/events.jsonl
@@ -0,0 +1,2 @@
+{"ts":"2026-10-04T07:40:39.234Z","type":"turn_started","session_id":"01a105db-937d-7ec0-b1d1-5396ae618abf","turn_number":0,"model_id":"grok-4.7","yolo_mode":true,"conversation_message_count":3,"schema_version":"1.0"}
+{"ts":"2026-10-04T07:54:24.927Z","type":"turn_ended","outcome":"completed"}
diff --git a/src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/grok/interrupted-prefix/chat_history.jsonl b/src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/grok/interrupted-prefix/chat_history.jsonl
new file mode 100644
index 000000000000..a42a7b9802a3
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/grok/interrupted-prefix/chat_history.jsonl
@@ -0,0 +1,2 @@
+{"type":"user","content":[{"type":"text","text":"[redacted]"}]}
+{"type":"assistant","content":"[redacted]","tool_calls":[{"id":"call-7acd954c-193d-404b-9131-abefbcf73701-0","name":"read_file","arguments":"{\"target_file\":\"[redacted]\"}"},{"id":"call-7acd954c-193d-404b-9131-abefbcf73701-1","name":"read_file","arguments":"{\"target_file\":\"[redacted]\"}"}],"model_id":"grok-4.7-build","model_fingerprint":"fp_5719f1aec35dd73c","reasoning_effort":"high"}
diff --git a/src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/grok/interrupted-prefix/events.jsonl b/src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/grok/interrupted-prefix/events.jsonl
new file mode 100644
index 000000000000..2e60b5a167f9
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/grok/interrupted-prefix/events.jsonl
@@ -0,0 +1 @@
+{"ts":"2026-10-04T07:40:39.234Z","type":"turn_started","session_id":"01a105db-937d-7ec0-b1d1-5396ae618abf","turn_number":0,"model_id":"grok-4.7","yolo_mode":true,"conversation_message_count":3,"schema_version":"1.0"}
diff --git a/src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/opencode/completed.db b/src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/opencode/completed.db
new file mode 100644
index 0000000000000000000000000000000000000000..870602a7128800f4a8c70f96f26aa1a58d7f84f2
GIT binary patch
literal 28672
zcmeI4UuYZ29mgfxvTP@|`-k8Lx7<dBy9DBNSNlh+E3}a%IZ>?0v24e2njo*FS!?Z;
zR$i@aC&6%bdIyC<DW!1Gr&8!kIqs=Xg+3OJKKG$7rG>uqa$NgRn#+}P{mp7uyDP6H
zJ3a?rJBwwFc7D4%`}xjqM*96mTA0r&2BKt5uSy2R2EG&s1_ReADi8<^z#|L~d+Ub+
z-e+$?yU^u%AaL!czaJg{Brq5*1xEfb{=x9;BfkunhW^v#7*a(D5CVh%AwUTHFA#V-
z5eiRSxDb5j%Z5}`QC-pv{1{B;(}~42wV0UBrm0oDYn8e@LbbP5rMyZRXvd)L<TJMu
z`4wt5y>iuUP(_V~w1x_8!`$2=m0QYYJys2{QnXqRD?_QGLP<xGf#9-A%|L5Nr+iOn
znl|g@Bbb7XWZi_{sgiTKg~fa#lUt-#<&6SnP;hR_U6eOgshPQaI&&k3F;JIR9lO;l
zR6aeE&Zl$9^a5p9tX{?duTXP2DwWQrfpjvlkW8e~ZGu<c7#y7V_Jv?Tsg==AV^f89
zLItU5Xy)ryYZ%<7@cwRpcw%xg`1ZUhp>=8NX}~L_wfDGMesNT?!8<K3xQYjbaw<E7
zvMP=s)YQP>L}KzVq3i}RRw49*&7djQPvWLr)^)6>KCfJMBaZ2MbzNIWC8LK^ZEN~Q
zqb`*k7xj21^et3#&f%$RsLi!5p0iq3bhy5zKk8;wmyAlQ-g9n4F;vv;xGkjPA)}i~
zqXLaDG<DVI{EcR{D(R03Qn{=caGpkcK=CxgHY+0)9l=aiRMhKCiY$W(9yC2ysv<*j
zh9XZ@No&Bk3*(*&!^BKtDZ5C~hYWk#2C6j*O0C|6BkU3KXa{Lc<0X!QRyDMmQiG0g
zyvvoOQUw*@aMw_Nw1&2h+}2?zJn}_#1pNh&9Kc>jdQ~weAD>E?xN3d}RW;}jKK7?G
zLAB1RRl!LOH)u~EF^wd>R8h8ElcU?DV<NK#m4Y)$xQhpeNXM>Yh_ot>GDP-u8zSun
zF;)S8mLI}zu14Vz9FGRzk8FehAwUQa0)zk|KnM^5ga9Ex2oM5<03pyOus0igEpsst
zxCGn9z|atUj1Kqp4fVnE#9n_W6bQg)>;j5Ovcz!ZxGW>RR!97fCb1~WEM(VItthGA
z(@_~h4ygRFdx^Qm#INz+{n`89_|b#UetqS7FjaZ0*i_W=lZaA|yct=m8&kqHW~!m7
zk*g617i=kIq-Ro4rPWbQQef|vq$^U*fL#@3trFP{{`~FGv)AGO;N-tX;J$+6e+s}K
z*$4qbfDj-A2mwNX5Fi8y0YZQfAOr{jLf{KY;8K5PxO+4L=l?_D9|y*VN2ku^hHFqH
z8zDdl5CVh%AwUScY64I1hr*dmDD=)ZtBth+Bl5IBmt~r!nWB+w)Ohh;aymC(TIoKm
z<KX`2Kg<ySM^7THb;dX;Kt=4c@~FrnIIFHJbJNQ+sq)f7y1E&;N=0-{Mc7h;m75I%
zCk|jIUX_V=nz;wO!(6`U+0#xlP^~-z7~%EDVDn@b%6OqIl<8|U9p!m83cCz*MJ+af
zq9LhJVrY(Mpvqij3$LRre$`q&YgUW!vb`=A_R#R!T(k=1ClPbus<js{e>D$bnCLEU
zfw{7@MZuFcfp)s`CU7+?aRLp5FGZN=wZ0gEPZx``QI=(*Vw~gfwPEcjEMG?ErK~zO
z%12pzMOmpS4NM@?FtmDP_vyodmbh1J83dZ)1d!pTdPk@#H>7)yg!;W^Z*hY&ro?|g
zd*bqOxN%=)qj4;jtt=x(v85v|hm}5-v?3d&PeEBeM&sV;rz}>zLs>)9)TxrBstwTh
zL4Ql%H*9@*IWB<rGWX-s%yxclDYhaf*nCfYLoYO}Z!mrK^kumCA-*eeaqJOofmz<I
zFN@Va3-Yo;95>8YUXY&gI<80FmA;m|m)i285{t*?ydY$k?(XEX`T4usmEQ7x#DKh^
z7qv4dFB78=@n4an-2=183SN1I<H~y)u1mA@q1uA(+~L~p89`Iq{bfg6zZtT(w$Hv}
z4$c33(w<3SJlFA@*=;(ZX(5VRcW_=cr!8|9I&7Lcd}8aIlkpX-uifA??(X9Je`q`p
z`Tz0XjK4eHgd*7p0YZQfAOr{jLVyq;1PB2_fDj-A2mwN%CxJ+RCTNEc{6qI4uZdp(
zc))GqA4BZ-nE1w_`f&c=Zi|1wALsu^`yv0oKK9qq_49M*J{XxBW`=$hW(L0!`r*KP
zP(?OEfDm|91okhE4rOoxaKBWCU&AsJfJ_ld5M)l>xK){-E9wh3rDQW>`?dcV(=$vt
zIQbzCQ%-&eVM_C7X4+XQ9H@L$H?w^W1J$RjBo^NNYV&oS8N=PZ2j^RC_7sN=&oRJe
zy^&tyZe=p;MxLv(CuMUXVY2xx<RvW<__uA$5H5a(e4g{IEl*$<@})Yix3h#SEiy46
zhicyZAQuyHDAxX6qE;++um2o`ph5b$`|fahLEG37?=8%(>1mc<;7)vZ*YVw5xbEDY
zsdKCCyZc`su{xjwnJy!oD~?VV>3BVrxizcDiY~~0Gg$8qIQp>}C;!;p0bSXaV|K&S
zOD?*)As^q}-yUw^`TlEdmFSpU1U&O)hK^<v+mB~+F=N9~>E-Z*|83&=qoWdrWA--u
zjC1i4<dy*wPCmBM+PGAZQM@Sgj4Vh|nS<oAM2j5sH$<~+F)DHbJ_NKjTA6KJYBuoc
zoP-z{*hxGyb>Gg>c657B_r-eQ-xb5BI-++(MUlhl8n1Uijy1}((z@2qcG>PR)af1o
z9uJJmo6C!_3ZpOIt}j2DKQZ`EG5GMO4tS4yOolD@SabAeILHDr%d>*s6qW4l^0H8=
z*v;^N_tx7zf=S$rVCwU5k5kLcx_krYg~2-pJH3O4Z@}Uay3RblA#dMNb7dn_UN|A0
z&}V<abOO&DkvhG@T>b%_tHV1ukuJv=nc)%3aI(n91yPbknH4xDD)Vvf40#7H&^W2u
z;T^odSeerf@4)MZ+>-|ek0+12Gt={%&711>PDzM~CkFp#01x;b@E-5@+JNO9lI<P1
z|Cg}-TT7*ccK`l8bzyF&*=~mK2bZ4S5qhEGX1q{8AMZGo%(mkjIH?Y<(SOi2Vr&f1
z<X6_Y&FJz>CZA8uwkHn$CDA;OVKkq>y07+|myU_!5Z8zo1r+B>hy}0U*b+RIisfP{
zE($a%a;$WQT!RHKIOrO%m-C%C@UjiBYs6T*>Pj-yySK7;Q;*l1N+oyFKKWe0;GYW)
zc(-fpeHAY-fL5%uJp-s>2c6lNPiphZOln&wZP89EUUK=tG;YPSq|=Hn?_JIO|LEA8
zuKfS_x5m$p{cY@bW4{=CYwRIZk&O@_1PB2_fDj-A2mwNX5Fi8y0Yc#angC8e+n;0w
z-wf5L*TgSTbH3B$V7B9&$HX@iG2%7xi^dOknjDN94|z@eV!C0siGN^ou+!vV2+qv^
g+vxnmV`l!}G4Tr%nfZUW$-#hzng4H__(mK43n@V5*Z=?k

literal 0
HcmV?d00001

diff --git a/src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/opencode/recorded-prefix.db b/src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/opencode/recorded-prefix.db
new file mode 100644
index 0000000000000000000000000000000000000000..d065fc08d18cd410245572c3208ebf5b3514cfc8
GIT binary patch
literal 28672
zcmeI4&u`mQ9KfBVZMsS&AT(7|h34e|tF%^jowyB1u&hZ@SV(F5W2yipj`PyEb?nr3
z+Kws`-Pj~f91s!`CoWt$apEsPoVjx1)*TTW2L#`*<HSjurWq56q3=@@Kfm|&dtZOP
z_H+Hd-<P%3tmZJjVp=uD;U(@xE)d{u@;t|JBk&2sr=3EO!LoJ=v@-*?Bi!5<KTbxT
zaARSWoA@d6!=+azz6q=2e+)Q=s)zs)AOb{y2>c%i+@Bf^PhGwoc=(c|lyp{CEC)Yh
zOZjwiJ<YEtZ)MYb5sQla^$EU{idwnIJM7Tm-^*v-P3E`w+v%+v-2ydc+sZa8bOduN
z>wIn_o9&UZK}s`?3#1&a#tN#%6o)~#n&Gf*X7PO+bVVEW@(`jRqj)FLuc@V#+}e6R
znaQp5#ma6085I1J>dsbni~RCRKAm|xhZy+lMPIHs!{^h>>3ll3lwRZ86~*faaE4#W
z@u_q+4WyTnYfH&gx<hd0wXw0OH!cS_%_y@&dryb|gbGT-G2Q)^HX`a2zSj(er>3U^
z4^~|hdR=>)kzPZ3rB7?i=f_HI@V>@{uIyPu`IV;(<y8z}sM(RRspRx|hH5J$dYREr
z_X4iDK2Nyj^7`>M!CrH<m3YcquWp$;Om!}}sSZqQ*RCt7e~b3qnQ(0}!*8Rf&ej{-
z1MZw+S+k&j)4DrIsIEBGR((&~j^^lW&~f|B!Xaajh+PHc3k^%})4tuP)fDS)K`ECt
z2imba14@q?ZLu=b*$`qCO=lOiq*W>)f`evHPc`N!{!r9YrJ6R3yD;wQFib2bH?r%z
zaL%x2?lQwJXhyvON3=)C;SMqz&fho+w6aY@GvGpay6#j(t+E0f-ZhjDr)cZQ0}F=2
zp*yu0TrYs+4E8#+YMT4-=~D?0E~DQ;H50CfKJx#}1FF@kS%aI@=?2|%jkrRJrB=25
zu7_i{$f*aJH>ec+QKCD0c8K)lP7RS>#V|u;aL^FhR!H<R_%1(=|6EPNClHzE;Exg!
zAOb{y2oM1xKm>>Y5g-CYfCvx)BG4gld^>P8bA{usLAt_?kHc$pI2arc!glI7G&;(0
z@Qz(z3ra;1W93Ap!YrfC;)kXpv3YSVyRDlgMStI7Wtehc<qrqv#5plB7k}%kZ(sTB
zgFnBUxfw`RKQ1*iy?hka%F)-O+jVDFo)c$nQ;*(=!gRsDR%TWv1yyF98Hxs_`--J0
zh66=aZMzz62EKkUdh#lKk4^tJ0p}Hn{LH~0B_coshyW2F0z`la5CI}U1c(3;AOb|-
zxg>Bcl({r`HUj<s!O2-JatXdD5dk7V1c(3;AOb{y2oM1xKm>?Di@^P@U^tT*9esGM
zW^Wh7#kde>sw4=4n3v`3#^zx@n_t~Ls1APRLig(<5x;*oj-stKAn35=qkgL;i9xHD
zrLEk$vz#h#tfgyv(Hnf!GIfTM3Pjc04mx$A5F_TX(De&rfg4)iQ_^t(^DQ4R2;tfg
zkU45X9v4ACUYHZa1t9?ij=R<Yt0C(sI^-5(f(SM4@(0|N<T&iM7B;}XB*R{3!2%Qr
zu<x!Wfc#O^T~Xkb;<^OPHnD3r+`o1DJ-%#Eu*;bZ9eLht&<$3qxovu@)gUh}B&2ys
z66Xa;K&?~==!Z2W47=&nNpd2FJytYBv+>m7)J%O=Rdn5sHjkZvYukHw23z4`+n&6M
zuJy@Zk2=<B*vvw^4AfkZ=TW<}wsQ%&Cwv}}^BJDDJNDo$yTKNlP4xc<Bj1DnAHFCN
z0U|&IhyW2F0z`la5CI}U1c(3;AOin20?|+=;Lla`n}-Ub|KAtsH>rgF|Ip+P7uk8?
z7uZlD0z`la5CI}U1c(3;AOb{y2oQm1CUEZ{G@ileflsd1;b%_W=z+?Dw1CkATRXA6
z`8&&*d_Hx1*MDK__fB`Q|M~F(#uhwz1g`tLbvG~o{oJnq8Mol~b{+8G2}aj<%k_@A
zLZT$IL`-GUVmuL(RM@Dca!E}r$^t9JBn6v*paZAneaBqG#^!u)I|#Jn1KhZRPIN%j
zU*(Riw11D$^+ChF`-7C&RIgaaUk-g)7@*+$^5ZfFBQT@a!ylJpt)K$$_a5E$o5vvx
z+W_*3ZtyaIR~&uwo$O}nqn(CU%{?=C8Nol6eekx!>a#87o5wF>fB|T+)zJc|V(`fF
z?&^}csx7AuWOZNgwdnW0ezEyaZlM+@OTHHPyNs^+aoY>o_5X(=U%LK(*ia$@M1Tko
v0U|&IhyW2F0z`la5CI}U1pY+==-ltj6ZD-X3Y``?JE7tF|2wVpoo)CF0qMPd

literal 0
HcmV?d00001

diff --git a/src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/opencode2/completed.db b/src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/opencode2/completed.db
new file mode 100644
index 0000000000000000000000000000000000000000..4279107e21d2b825d1921a287627ee9117171f69
GIT binary patch
literal 20480
zcmeHO&2J+~6}J<6GqY$gLK;QDVLL6Yn9(?yuKw;I#F~sVcsJur63?!(tC3x<u8w<R
zcRT&z%rdgX2+#^477idduoB$%Fx)^KIKqts{{a_n`~z^@R~>(KrsH^aXZet-<&WyF
zS5>cm^?t9~ub&V0cHD>xjvw@JBq+Hr<?{L58-kF_<(A=Hg!lMZf<j?@0^j+W@<qkv
z+{Q2ddad;DTw&$o+||F8{=D+>)t_A?%&&6<I0762jsQo1BalYm`*e9__13NY2l)uM
zyELR>==xr>2jBSU{ApopzglTjg+}GuJ5`}|PPir9cvYAjE!S=d5q%s9_xEe}D*K1R
zTh+tztiZVWM6kZw5b6(hc2ZK&`+Yj<D6>AKCoRGCB6>svAyXo9d$dUciX#dtT`n5;
z?FB?Z2G7xJYqx&T*ss*;4WZ>6H^*}w;W{~Y?MZPUH{r}VZVB7F`_<arIs;6&F+mw%
zx+&~ex2yZr`d0N|3jaWE-C$_n6n5*vo$5{%R%okouvNKJoxpwbn}t_a_ip8Lu4mK7
z;Yk;6&YC!m{N#M1!&p6ZPT%5>Px33PYis#muBXgoAddwH@=~^OfOaov7yZD0L`ei_
z%)z&H>IcVR9}_x}OPNg{2h^MPk*b56(&>tfM|obN?Z=*tgZIz0NY#hk_-LMTwj00<
z{BhfCyX@nrlhJqNM%|Icr^X!6fKhYauwe&g-Hd~7Mz>+y>%nB2*tXpW`UxjgNR2WU
zvuT$uAm+H>GcM`LbsP|3t{^p1k4AV(qEr>}!>A<yW4mC_+m#194MEDrF!GP77dBn5
zA47{Vw-;;V$I+)~1zLr^=X$XIFE$*(q(hs~e8vears!GA(*QWT@Sp(&djUwEgS}6K
zo|`!Nj7o6%URI-?5B88D|M|Gqq*vEwEEqwYvW}#B;L_6>cb*bpO`EW~#P4Mh=}c+A
z2hJm!UB^@(i4YD*#~oZWOd=A-VV{Ceoi1vsn}7nLz|%$%?e(K6Q!cUV3w96KBBsu9
zw)p(6F_k;FYm6!u*fNx*S61(?<uBPXK&Q!WF_77B`z!1Y;~Kp4rE(5l{NM<11ULd5
z0geDifFr;W;0SO8I0762jsQmh5O}(mf4%k<2F2R#wY8*>%dIReU0Gs3rE#%X%)JJM
zD-dgKQlm{YO;w5G(ECQvh<EJ)Iqu$*y`!$*#@+V<YC~Lu+7EA^;C27hqxS8P1UMp{
zY1OnOZ%7+R{noF){G02)|EOGkmM^~by(gk;i<{z6KU&u}(0b^1#j*%tgMn+)pmqnU
zd<c19R~+Vl`-9DA_t@tj5qy5*YhMpzLMVlB$g7}mzV!DTy!gQp;0SO8I0762jsQo1
zBft^h2yg^A0vrL3!2cxzYs<B(^P>^$`G2wSZm#5f;iHw`75)iDesBah0vv(Qh``fp
z#VfVi^?b27?1e{7WU5LVwPiz+P^ET!c=*WF)xEc4$C&S+Sd!RR&w`d`pHD=V&?Rm@
z5l6Yg;wCaIMMjn>n;No)WpR{K1`*InoKqbB@QuRNTJ1H^=ST016~a_eR8Yux+=%uR
zPg3f1Z}8@Pg)k)Lg%S3m>nx!9k9QNTUZ0~CQe{Ogi(v#gg*^%(+o`&$VU$Hkf9pdM
zXSzm1I!q+V^Mh%$W4CKVbT`TGV^d!+@>>=MIB-E%=)<NCj=PZv-4Y-2u-V1;KyAp|
zhFX??2m>Tvo8mO^4A)??QGz$*HTG&O<jmlc47n{MRUwjQE0#_rq+=>;gc6J#$wZc6
z8afD=R41}ZG-9&obO(oQw3+^g!-p`0hx=j22aTSv;R2@bj7(XC)V=eUl9X1M!b6yl
z<9cq`0f{j3`)r(16#QVUI^_5DA(xgW>a&xJ^|wr0QxpAlDjTqL5^fWRk~V{a1_PJS
zhD(FAIti#Ds4Z<sl5FZo2P~7E*JQO=+N-!JYbdeJ<OC^jGD%W}hOjIw^OVW6<Wn#c
zNwuJxB%c)Ohr{6qz2%V!e~2a~OjOGR6TZ8<yLG>Qk2Vg02fGWJ@E4g0|K$&fA#cnv
zVM$j^E6aqDid3k`Fkz@M85jS9ChR9qKoV*Y-0e0^$Hdscs)eznDvpJ1wXK*4=?ZPz
zq^-k(dca6n$)kWWv!RbEi4!6^xEs<8JDO0yAs1VaYU(m!7KBx~ZD?&|63a1FLu1^V
zu!$Ao5C)%uR~C~5X=VbDbRN;bOIsNz1i9$xYl-D8PG`opaYi>A2mbX5Mh9vrV6Z{#
z5%!k~aWk3!5c<B**CJV0!FdH3bR0W0q)H}uy6J>wYb^ccQays@UT5nZen!H}j-!~#
zav@z;F_?)>BpX@U!i3i(O_4JQj|@edGTs1+&n3KRvR-ESzP&W!`%lP(@0eIR@cqHo
z-I^|ar_)fY-#w8Q<ogO^`m=u}tpE8uzDo)M_w@Xh1&%-lpOmq}P@`#JF#koqOW2Vu
zS=LPpS*m3qY}t~5z!|p*QWQy=@;z~|FN^QCZ8&<ucN1ZPDGaANuxaS@#rXbmiTy%k
zmNZQUOHGkk(q%Q9%&f-z-z2jQ_ZswU_cn>{fa68BVYM~gT9nMllry<(n#RoT%{INc
zTn4Vs5c%n99*E5Dg`bvYh^)y#WaU&nd9?jzW!sb9Ic6#Pb8-h_xB)379R4u*{OMc{
z%M!bX%(|tU-aE19|HaZiJpV8Ksr0K-3`Kr$1ULd50geDifFr;W;0SO8I0762jsQo1
uBXB7K;&LrN{*9mgz^gbblKlv(kP^uZ@h_)DGNXb^?D_v#7mP_pyx|jU;i-TC

literal 0
HcmV?d00001

diff --git a/src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/opencode2/recorded-prefix.db b/src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/opencode2/recorded-prefix.db
new file mode 100644
index 0000000000000000000000000000000000000000..7bda539be6491e92ca6f343d21b60fddfac4f853
GIT binary patch
literal 20480
zcmeI3&2Jk;6u@_#xM_;2Afzfn9J*Nv(W*|myIy}H1SWNgX_~Z&D^yjLJ)WISwps5w
zyR%M9WQhu-9uOY~5Em-Jt%n|wIB<j;2mS;84LI^<6MrSPlOiENdMkUq>v{9$&F{_3
z+B5SuZ?8I>DYhRp30Kn6%aSZh?<k5SNmKAn!n=DU;9|Oa1E2E1^|;F^Y3b`<&(HlS
zP0u`&W`CRedFI*dm*a%-dnAAakN^@u0!Uz(z{hNAX8y_*`H9R)!(|~0L&x`OP52~R
zM{lQ>H_D}IS*e!ZT`ep1Bf@p%(mADf)E%p?aQ2WZw>By_OB;8U8|AyHL4j`ep5WSg
zRav{Ux;iAqAGO$_qLJw#+pQ~($JrJOl#vqLX|fs(7~u>|I$1PoS*H*M88X4H<@L4A
z>PD%uR#ocuPOV$lL$1Ah$Ld|SjT+q9J9TAceWP5tz9xVvmwJ=|(`99&yi(pMuPv81
z`}o^N{gR-4Sy^9Gu9a8I;GyNx=5py;xrh7mThnLeZ(orm$FtbOaMy(&XEhRWKfdqT
z&^1p#VsG-(U3q4HVL|?8aj2QJjjmwZNQ`bAVBHJ0i&o%2V3Y%m34H5&ey|g^2xUFF
zp=Q$}0rUDghSK0iY2PE=QjSYB{K&IN@aVvbq4dy=wk8>8IRVtb@8%udE?b0ekI>B>
z?jE-Ip)%Vn5M6UpvEeq<x)ufQ2(@9<Y(iyf#IhU?dcs~;7%HVJW-*tYLd<qx%s4@l
zW7{AihJvAznv9cvCmKqke#q+z^jH_#^GfN?YE{ujGvxjb^TL|rwIayT?c1lz<VXB(
z<N~Wg-*Y_h|BDqz3EgHj$UZO#ozBpMoO=QE*;5x9FlaA;<QVoA3z|+m$d5>bA>SL7
zsp&&|7$N`946U(N#}d8Z5b;p!h?Cn6+Z!0phXh2{8hDrb%~2icz-Ye-g9jh<<B*P6
zhy--oX^$%=773%U#b8YBJ9S7+z@S6HNXt2Ews^m%oY1bvJU!qM(H|TKFONSp`f^8}
z8ixs|cx0p#XXdXj$R|89z^2~QqHT!(_GiT}jPvl8=TZ{9@IV4c00|%gB!C2v01`j~
zNB{{S0VIF~fWYJ1^6QmX1&W2M3k&guB+VoeXA|PDG)X3t(nYv93v;bCmTS;V#x$vI
zvs<~K8m(Jxy5rt7ye-#n5cgidEST3|*8QuyWYORAm~}Oz0pWDJpVYrHmb4|^eEZv1
zzPs?l(^TrYoV@YTzUo+NQQd0s#q5&482YZ7QeoPl?N}_RT!SPZraXwFcI59rDL%g`
z&OhpKe)F|A!iZAFU^?U+7%b2IF2M^AB!C2v01`j~NB{{S0VIF~kN^@u0!ZM0Nnl~B
zGCO%TLahHMUV19c*>J)G2_OL^fCP{L5<mh-00|(0e~-YEmBehNa#2nuKcmfXtET78
zG$FK*)inLi^7TqqdvCjHmOtFpCjZDMu#Y_C#N#vZO5h*j{L5GSs@NH=7WdV|pc}QQ
z=L%^<FXS~Xt?MZ@<gg9C$zYYSmyk^x*^~-9wp$Q)a3m#@>7>+nYdWkwHX_HhU_mn8
zk}e84<zi(@ZIi$OTS14#Y!bO#1+~<N&>`{VJun+WjUbi#@rq}xmlD^lX~Z@PhLOz|
z^nzK)>7-z3IX$1%8&prHH4UuspgNFM?Cys<_K?viu7yq9ko8wjH#tNW#YV$^@QPSv
zwP{Vu84W`>(^Sh?=|YxidX_LFLoF+3XK7w9<nlV9gh6qpt&v8S3B!T=fhutkg`lbr
zFQvu-5uzXwWCCgZ72k1{hVTrqT!af85x)<t4?{JCLLNjO74cDOF|J$(Y#HzGOvcEh
z)PQ({t~N|_jH?YZ-|0Ysp+{QbwhyN4i;4zEYy!fbfHzR9lp2SkfFJLJLAK*Lp{Td;
z<)Uz62$k!uVfVZMyYpKR3BzJfh@0`gpoYoJ*cW-4wez%~Te(6blP!SWkOggrvZ}*^
zVWYqj5z3+#wIxl@8)*Yj#Q`gE6A&>gYB8VBL610yMNx}p0cdq2Odua95Md)iK5kp$
zn>Y{z(mI{a<9Qi6@&)L~kLLzDa>js;oZd5cAFRAzTJf|GcElF_33~@3sKRvIhd+<c
zUrg-7hL#mhKh{(ReIVBV6LUYo`ahiTKmter2_OL^fCP{L5<mh-00|%gB!C3|YXsD(
ViaaoxFk)6PA=du~L`KXv`~?}^M!o<5

literal 0
HcmV?d00001

diff --git a/src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/pi/completed.jsonl b/src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/pi/completed.jsonl
new file mode 100644
index 000000000000..adec39cb0665
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/pi/completed.jsonl
@@ -0,0 +1,7 @@
+{"type":"session","version":3,"id":"01a1841b-2daa-7238-ade8-4b2474dcac14","timestamp":"2026-10-28T20:02:16.106Z","cwd":"C:\\qa\\g31595qg\\scratch"}
+{"type":"model_change","id":"d254652a","parentId":null,"timestamp":"2026-10-28T20:02:16.130Z","provider":"openai-codex","modelId":"gpt-5.6-sol"}
+{"type":"thinking_level_change","id":"a2eb46ce","parentId":"d254652a","timestamp":"2026-10-28T20:02:16.130Z","thinkingLevel":"high"}
+{"type":"message","id":"53b89244","parentId":"a2eb46ce","timestamp":"2026-10-28T20:02:16.135Z","message":{"role":"user","content":[{"type":"text","text":"Use the read tool to read ./sum.js, then explain the return value of score([2, 3, 5]). Read only that file. Do not change any files. Complete in one reply."}],"timestamp":1793217736134}}
+{"type":"message","id":"f2248d5e","parentId":"53b89244","timestamp":"2026-10-28T20:02:17.582Z","message":{"role":"assistant","content":[{"type":"toolCall","id":"call_120d5b1b968943569603ef84266f5b30|fc_02beebbc0507808c016ae254cc653881968462199fde88d391","name":"read","arguments":{"path":"./sum.js"}}],"api":"openai-codex-responses","provider":"openai-codex","model":"gpt-5.6-sol","usage":{"input":608,"output":19,"cacheRead":0,"cacheWrite":0,"reasoning":0,"totalTokens":627,"cost":{"input":0.00304,"output":0.00057,"cacheRead":0,"cacheWrite":0,"total":0.0036100000000000004}},"stopReason":"toolUse","timestamp":1793217736143,"responseId":"resp_02beebbc0507808c016ae254cba01881968ab9d27bdfb10d09","rawStopReason":"completed"}}
+{"type":"message","id":"6abe1199","parentId":"f2248d5e","timestamp":"2026-10-28T20:02:17.595Z","message":{"role":"toolResult","toolCallId":"call_120d5b1b968943569603ef84266f5b30|fc_02beebbc0507808c016ae254cc653881968462199fde88d391","toolName":"read","content":[{"type":"text","text":"export function score(values) {\n  return values.reduce((total, value) => total + value * 2, 0);\n}\n"}],"isError":false,"timestamp":1793217737595}}
+{"type":"message","id":"e7d94382","parentId":"6abe1199","timestamp":"2026-10-28T20:02:19.222Z","message":{"role":"assistant","content":[{"type":"text","text":"`score([2, 3, 5])` returns **20**.\n\nEach value is doubled and summed: `2×2 + 3×2 + 5×2 = 20`.","textSignature":"{\"v\":1,\"id\":\"msg_02beebbc0507808c016ae254cdaa6c8196a50ba2698b836f73\",\"phase\":\"final_answer\"}"}],"api":"openai-codex-responses","provider":"openai-codex","model":"gpt-5.6-sol","usage":{"input":664,"output":46,"cacheRead":0,"cacheWrite":0,"reasoning":0,"totalTokens":710,"cost":{"input":0.0033200000000000005,"output":0.00138,"cacheRead":0,"cacheWrite":0,"total":0.0047}},"stopReason":"stop","timestamp":1793217737595,"responseId":"resp_02beebbc0507808c016ae254ccd1ec8196a266c0f85bab35e8","rawStopReason":"completed"}}
diff --git a/src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/provenance.json b/src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/provenance.json
new file mode 100644
index 000000000000..c5424c990659
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/__fixtures__/recorded-native-switch/provenance.json
@@ -0,0 +1,101 @@
+{
+  "purpose": "Recorded native storage importer contracts; no Stop, physical-exit, app QA or performance evidence. Prefixes are fixture truncations, never captured Stop outcomes.",
+  "files": [
+    {
+      "path": "pi/completed.jsonl",
+      "sha256": "7d35c76440f43d76e14c6d5e90063c9c065c76d5d1c42167aef84ffc60fe8f84"
+    },
+    {
+      "path": "codex/completed.jsonl",
+      "sha256": "66931dc8b21ee48b0e1b00a30e51a686843eecd8c56992372cb93089a93cfe7f"
+    },
+    {
+      "path": "codex/recorded-prefix.jsonl",
+      "sha256": "20fc1985b2723e08f60d3aad3fa0b594686f047aee93e6a44f729a5f248a7df1"
+    },
+    {
+      "path": "opencode2/completed.db",
+      "sha256": "6adff2c3503c63dddd9eddc44fc18ce45654bc0eca5ce271a493ce6375591692"
+    },
+    {
+      "path": "opencode2/recorded-prefix.db",
+      "sha256": "c327cc7bdbccfea88194c06b62e46007fb1704726aa384b6010e64b163d5018b"
+    },
+    {
+      "path": "grok/completed/chat_history.jsonl",
+      "sha256": "4a4249ad3118af75a6c15dd4074af8dc8625e759bcc35bdc1cc5ebae7584d72f"
+    },
+    {
+      "path": "grok/completed/events.jsonl",
+      "sha256": "b9e466e7d2145627d73f225291da8904caa4f9c26db897cc5e0674e42d667a16"
+    },
+    {
+      "path": "grok/interrupted-prefix/chat_history.jsonl",
+      "sha256": "91df4258a54ad9ccb2891f5a6efb2d3a5c481ac9b64fe109c7505aafce48558e"
+    },
+    {
+      "path": "grok/interrupted-prefix/events.jsonl",
+      "sha256": "63f5a0033085f5ae31a2527e822883e65095bc15e66d70f549fce1615d7d25b0"
+    },
+    {
+      "path": "opencode/completed.db",
+      "sha256": "94dae9fa553166f0753de273ace65aec7fed74ac87d32249360cc35671e1b64d"
+    },
+    {
+      "path": "opencode/recorded-prefix.db",
+      "sha256": "aec91e63b5339a76639bd7082321722334e5cdbd31c83bc65567c21ef279b671"
+    }
+  ],
+  "agents": {
+    "pi": {
+      "provenanceReceipt": "pi-provenance.json",
+      "provenanceSha256": "55761da8a698d10dec3a035a1c4537bb82ebd9d9438612156200d792820d6efc",
+      "version": "0.84.2",
+      "sourceSha256": "7d35c76440f43d76e14c6d5e90063c9c065c76d5d1c42167aef84ffc60fe8f84",
+      "sanitization": "Safety checked; seven native session rows retained byte-for-byte; no event record converted or relabelled.",
+      "prefix": "First six of seven unchanged native session rows, generated by the test."
+    },
+    "codex": {
+      "provenanceReceipt": "codex-provenance.json",
+      "provenanceSha256": "956f2b99a7870ac074d4760efd075bb7fa2ea82d141806015b8a0a1bfef0a7cf",
+      "version": "codex-cli 0.162.1",
+      "sourceSha256": "2f740185ee6c19a97572e532a74f8cb4b3bf3742d012777f78c849ed45635af9",
+      "sanitization": "all transcript/instructions/reasoning/tool argument/output/path strings recursively redacted; structural types, roles, IDs, timestamps, model metadata and native lifecycle retained",
+      "scope": "One genuine completed turn (17 native records) from partial22 capture; not a qualified40-turn benchmark."
+    },
+    "opencode2": {
+      "provenanceReceipt": "opencode2-provenance.json",
+      "provenanceSha256": "58c144732793334f719fc8d78f00d1e73f65eea5c9660c40892ebf543d7ad2a3",
+      "version": "2.0.14",
+      "sourceSha256": "6123e6b120eb62f130692d0523ec5f325343f7955f3559491e42a5d00f735699",
+      "sanitization": "all text, reasoning/encrypted state, tool input/output, error bodies, snapshot/path/title strings redacted recursively; native types/IDs/sequences/timestamps/model/finish/status/outcome retained; output DB uses original native CREATE TABLE statements",
+      "schema": "Original native CREATE TABLE statements: session_v2 and session_message; no v1 representation or alias conversion."
+    },
+    "grok": {
+      "provenanceReceipt": "grok-provenance.json",
+      "provenanceSha256": "62c67158a506942bbabfe374e211061d88718f8a2f4cfdfb969cda36784f23a5",
+      "version": "not persisted by this saved source; do not infer from installed version",
+      "sourceSha256": null,
+      "sanitization": "Content text recursively replaced, tool argument JSON leaves redacted; actual types/roles/tool names/IDs/lifecycle metadata preserved; no native records synthesized; sidecar is minimal actual turn_started/turn_ended selection with whitelisted lifecycle scalar fields only",
+      "sourceFiles": [
+        {
+          "name": "chat_history.jsonl",
+          "sha256": "e18512f205cd220147c5075cf415aee25a4a11e46711ca2c27f9dce860bd4b88"
+        },
+        {
+          "name": "events.jsonl",
+          "sha256": "9a8e0721c9a67a16f2d7b6ced8ad35457da062600fe8afd54f0440416de99282"
+        }
+      ]
+    },
+    "opencode": {
+      "version": "1.19.5",
+      "provenanceReceipt": "opencode1-provenance.json",
+      "provenanceSha256": "69e0f03485173ceb90229a89d86984da2e9a335a5cf69e8f6543eef3c94fcc85",
+      "sourceSha256": "1798f746d34efe4d1bbd6bfa9695940f43bb78d94d8c9e2138ca0340517d7a41",
+      "sanitization": "native schema/IDs/order/model/finish/times/status retained; content/tool input/output/path/title redacted recursively",
+      "schema": "Actual v1 session/message/part; no v2 aliases or synthesized rows.",
+      "prefix": "fixture truncation after first completed real tool; not Stop/exit proof"
+    }
+  }
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.ts
index 339df19ee6c4..0cc2b0f1f144 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.ts
@@ -111,6 +111,7 @@ export async function catchUpStructuredSessionAtRest(input: {
           kind: 'turn',
           turnId: turn,
           state: lifecycle.state,
+          ...(lifecycle.outcome ? { outcome: lifecycle.outcome } : {}),
           ...(lifecycle.timestamp === null ? {} : { completedAt: lifecycle.timestamp })
         },
         ownerFence: 0,
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test.ts
index d5d5874ab3a4..3f76e46f9463 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test.ts
@@ -323,7 +323,10 @@ function registerSwitchDaemonComposition(
             return rig.host.trackSwitchPhysical(id, work, recover)
           }
         }
-        await time.deadline.wait(
+        await time.deadline.wait<
+          | Awaited<ReturnType<typeof runtime.createMobileSessionTerminal>>
+          | Awaited<ReturnType<typeof runtime.createTerminal>>
+        >(
           mobile
             ? runtime.createMobileSessionTerminal(`id:${WORKTREE_ID}`, {
                 command: 'cx',
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.test.ts
index 0de9b81ec842..f590bb1a3048 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.test.ts
@@ -1,4 +1,4 @@
-import { mkdtemp, rm, writeFile, appendFile, readFile } from 'node:fs/promises'
+import { mkdtemp, rm, writeFile, appendFile, readFile, copyFile } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
@@ -8,6 +8,7 @@ import {
   claudeProviderHandle,
   codexProviderHandle
 } from '../../../shared/agent-session-provider-handle-encoding'
+import { agentTurnVerdict } from '../../../shared/agent-turn-outcome'
 import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key'
 import Database from '../../sqlite/sync-database'
 import { claudePromptUuidForSubmission } from '../../claude/structured/claude-structured-session-id'
@@ -18,6 +19,7 @@ import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal
 import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
 import { piHistoryEntryIdentity } from '../../pi/rpc-history-import'
 import { createTrackedJournalOpener } from '../agent-session-journal/journal-host-database-test-support'
+import { importLegacyTranscriptIntoJournal } from '../agent-session-journal/journal-legacy-import'
 import { createPiTranscriptCollector } from '../agent-session-journal/journal-pi-active-branch'
 import { decodePiTurnLifecycle } from '../transcript-turn-lifecycle'
 import {
@@ -609,7 +611,7 @@ it('imports a recorded Claude Code disk prefix through switch settlement and pre
     identity: {
       ...options().identity,
       agent: 'claude' as const,
-      providerHandle: claudeProviderHandle(source.sessionId)
+      providerHandle: claudeProviderHandle(source.sessionId, null)
     }
   }
   // A captured disk prefix at the tool-use frontier; this is not a recording of an actual Stop.
@@ -649,3 +651,161 @@ it('imports a recorded Claude Code disk prefix through switch settlement and pre
   await catchUpSwitchedCliTranscript({ journal: completed, source, fence: 1, deadline, stopped })
   expect(completed.snapshot()).toEqual(final)
 })
+
+it.each([
+  ['codex', '01a183db-b8d6-7170-af39-e004651c1e1e'],
+  ['pi', '01a1841b-2daa-7238-ade8-4b2474dcac14'],
+  ['grok', '01a105db-937d-7ec0-b1d1-5396ae618abf'],
+  ['opencode', 'ses_e7afa14d9ffernpe5xoa3e21SL'],
+  ['opencode2', 'ses_e7bc5544cffeP7rTuOdvcklM2n']
+] as const)(
+  'settles recorded %s storage durably without replacing native completion or duplicating imported tools',
+  async (agent, recordedId) => {
+    const fixtures = join(import.meta.dirname, '__fixtures__', 'recorded-native-switch', agent)
+    const sqlite = agent === 'opencode' || agent === 'opencode2'
+    const filePath = join(root, sqlite ? 'native.db' : 'native.jsonl')
+    const source = { agent, sessionId: agent === 'pi' ? filePath : recordedId, filePath }
+    async function install(completed: boolean) {
+      if (agent === 'grok') {
+        const directory = join(fixtures, completed ? 'completed' : 'interrupted-prefix')
+        await copyFile(join(directory, 'chat_history.jsonl'), filePath)
+        await copyFile(join(directory, 'events.jsonl'), join(root, 'events.jsonl'))
+      } else if (agent === 'pi') {
+        const recording = await readFile(join(fixtures, 'completed.jsonl'), 'utf8')
+        const rows = recording.trimEnd().split('\n')
+        expect(JSON.parse(rows[0]!).id).toBe(recordedId)
+        expect(source.sessionId).not.toBe(recordedId)
+        // Fixture truncation at a genuine tool result; no captured Stop or physical exit.
+        await writeFile(filePath, completed ? recording : `${rows.slice(0, 6).join('\n')}\n`)
+      } else {
+        await copyFile(
+          join(
+            fixtures,
+            `${completed ? 'completed' : 'recorded-prefix'}.${sqlite ? 'db' : 'jsonl'}`
+          ),
+          filePath
+        )
+      }
+    }
+    const recordedOptions = {
+      ...options(),
+      identity: {
+        ...options().identity,
+        agent,
+        providerHandle: agent === 'codex' ? codexProviderHandle(recordedId) : null
+      }
+    }
+    async function imported(sessionId: string) {
+      const journal = await journals.open({
+        ...recordedOptions,
+        identity: { ...recordedOptions.identity, sessionId }
+      })
+      const result = await importLegacyTranscriptIntoJournal({
+        journal,
+        agent,
+        sessionId: source.sessionId,
+        fence: 1,
+        options: { filePath }
+      })
+      expect(result).toMatchObject({ ok: true, replaced: true })
+      return journal
+    }
+    const turns = (journal: AgentSessionJournal) =>
+      journal
+        .snapshot()
+        .items.filter((item) => item.body.kind === 'turn')
+        .map((item) => item.body)
+    const blocks = (journal: AgentSessionJournal) =>
+      journal
+        .snapshot()
+        .items.flatMap(({ body }) =>
+          body.kind === 'message'
+            ? body.blocks.map((block) => block.type)
+            : body.kind === 'tool-call'
+              ? ['tool-call']
+              : []
+        )
+    await install(false)
+    const historical = await imported('historical-recording')
+    await catchUpSwitchedCliTranscript({ journal: historical, source, fence: 1, deadline })
+    expect(turns(historical)).toEqual([])
+    const stopped = await captureSwitchStoppedCliTurn(source, true, deadline)
+    expect(stopped).toMatchObject({ sessionId: source.sessionId })
+    let journal = await imported('switched-recording')
+    const content = journal.snapshot().items
+    expect(
+      content.filter(({ body }) => body.kind === 'message' && body.role === 'user')
+    ).toHaveLength(1)
+    expect(blocks(journal)).toContain('tool-call')
+    await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline, stopped })
+    expect(turns(journal)).toEqual([expect.objectContaining({ state: 'interrupted' })])
+    expect(journal.snapshot().items.filter(({ body }) => body.kind !== 'turn')).toEqual(content)
+    const interrupted = journal.snapshot()
+    await journal.close()
+    journal = await journals.open({
+      ...recordedOptions,
+      identity: { ...recordedOptions.identity, sessionId: 'switched-recording' }
+    })
+    await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline, stopped })
+    expect(journal.snapshot()).toEqual(interrupted)
+    await install(true)
+    const completed = await imported('completed-recording')
+    await catchUpSwitchedCliTranscript({ journal: completed, source, fence: 1, deadline, stopped })
+    expect(turns(completed)).toEqual([expect.objectContaining({ state: 'completed' })])
+    expect(blocks(completed)).toContain('tool-result')
+    const final = completed.snapshot()
+    await catchUpSwitchedCliTranscript({ journal: completed, source, fence: 1, deadline, stopped })
+    expect(completed.snapshot()).toEqual(final)
+  }
+)
+
+it.each(['pi', 'grok', 'opencode', 'opencode2'] as const)(
+  'preserves %s provider failure through actual transcript import and durable turn outcome',
+  async (agent) => {
+    const { source, finish } = await sourceFor(agent)
+    const stopped = await captureSwitchStoppedCliTurn(source, true, deadline)
+    await finish()
+    // Synthetic controls of the existing fixture, separate from the recorded capture cases.
+    if (agent === 'grok') {
+      const eventsPath = join(root, 'events.jsonl')
+      await writeFile(
+        eventsPath,
+        (await readFile(eventsPath, 'utf8')).replace('"outcome":"completed"', '"outcome":"error"')
+      )
+    } else if (agent === 'pi') {
+      const rows = (await readFile(source.filePath, 'utf8')).trimEnd().split('\n')
+      const terminal = JSON.parse(rows.pop()!)
+      terminal.message.stopReason = 'error'
+      await writeFile(source.filePath, `${rows.join('\n')}\n${JSON.stringify(terminal)}\n`)
+    } else {
+      const db = new Database(source.filePath)
+      try {
+        if (agent === 'opencode') {
+          db.prepare(
+            "UPDATE message SET data = json_set(data, '$.finish', 'error') WHERE id = 'reply'"
+          ).run()
+        } else {
+          db.prepare('UPDATE session_message SET data = ? WHERE id = ?').run(
+            JSON.stringify({ outcome: 'failed' }),
+            'end'
+          )
+        }
+      } finally {
+        db.close()
+      }
+    }
+    let journal = await journals.open(options())
+    await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline, stopped })
+    const snapshot = journal.snapshot()
+    const turns = snapshot.items.flatMap(({ body }) => (body.kind === 'turn' ? [body] : []))
+    expect(turns).toHaveLength(1)
+    expect(turns[0]).toMatchObject({ state: 'completed', outcome: 'failure' })
+    expect(agentTurnVerdict({ state: turns[0]!.state, outcome: turns[0]!.outcome ?? null })).toBe(
+      'failure'
+    )
+    await journal.close()
+    journal = await journals.open(options())
+    await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline, stopped })
+    expect(journal.snapshot()).toEqual(snapshot)
+  }
+)
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.ts
index bd9e923a5fb3..97080994dc9f 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.ts
@@ -110,8 +110,9 @@ export async function catchUpSwitchedCliTranscript(input: {
     input.source.agent === 'codex'
       ? []
       : items.filter((item) => !covered.has(agentJournalItemKey(item.identity)))
+  const latest = prepared.latestTurn
   const ended =
-    prepared.latestTurn && prepared.latestTurn.state !== 'working' ? prepared.latestTurn : undefined
+    latest && latest.state !== 'working' ? { ...latest, state: latest.state } : undefined
   const turnId = interrupted ? input.stopped?.turnId : ended?.turnId
   if (turnId && userKey && !covered.has(userKey)) {
     additions.push({
@@ -128,6 +129,7 @@ export async function catchUpSwitchedCliTranscript(input: {
         turnId,
         userItemId: userKey,
         state: interrupted ? 'interrupted' : ended!.state,
+        ...(ended?.outcome ? { outcome: ended.outcome } : {}),
         ...(ended?.timestamp == null ? {} : { completedAt: ended.timestamp })
       }
     })
@@ -150,7 +152,7 @@ export async function catchUpSwitchedCliTranscript(input: {
               !current ||
               (item.body.kind === 'turn' &&
                 current.body.kind === 'turn' &&
-                current.body.state === 'working')
+                current.body.state === 'running')
             )
           })
           .map((item) => ({
diff --git a/src/main/native-chat/transcript-grok-turn-lifecycle.ts b/src/main/native-chat/transcript-grok-turn-lifecycle.ts
index deb6067951f3..14bfa6c90dd5 100644
--- a/src/main/native-chat/transcript-grok-turn-lifecycle.ts
+++ b/src/main/native-chat/transcript-grok-turn-lifecycle.ts
@@ -34,7 +34,12 @@ export async function readGrokTurnLifecycle(
                 ? 'interrupted'
                 : null
         if (state) {
-          latest = { ...latest, state, timestamp }
+          latest = {
+            turnId: latest.turnId,
+            state: state === 'failed' ? 'completed' : state,
+            timestamp,
+            ...(state === 'failed' ? { outcome: 'failure' as const } : {})
+          }
         }
       }
     }
diff --git a/src/main/native-chat/transcript-opencode-sqlite-query.ts b/src/main/native-chat/transcript-opencode-sqlite-query.ts
index c04a62ff8d2d..cae548b68da8 100644
--- a/src/main/native-chat/transcript-opencode-sqlite-query.ts
+++ b/src/main/native-chat/transcript-opencode-sqlite-query.ts
@@ -206,7 +206,12 @@ export function readOpenCodeTranscriptPage(args: {
                   ? 'completed'
                   : null
           if (state) {
-            lifecycle = { state, turnId: record.parentID, timestamp: time.completed }
+            lifecycle = {
+              state: state === 'failed' ? 'completed' : state,
+              ...(state === 'failed' ? { outcome: 'failure' as const } : {}),
+              turnId: record.parentID,
+              timestamp: time.completed
+            }
           }
         }
       }
diff --git a/src/main/native-chat/transcript-opencode2-sqlite.ts b/src/main/native-chat/transcript-opencode2-sqlite.ts
index a661e3046262..df6b737f8458 100644
--- a/src/main/native-chat/transcript-opencode2-sqlite.ts
+++ b/src/main/native-chat/transcript-opencode2-sqlite.ts
@@ -237,7 +237,8 @@ export function readOpenCode2TranscriptPage(
                   : null
           if (state) {
             lifecycle = {
-              state,
+              state: state === 'failed' ? 'completed' : state,
+              ...(state === 'failed' ? { outcome: 'failure' as const } : {}),
               turnId: '',
               timestamp: typeof row.time_created === 'number' ? row.time_created : null
             }
diff --git a/src/main/native-chat/transcript-turn-lifecycle.ts b/src/main/native-chat/transcript-turn-lifecycle.ts
index 5bdad77b2a56..bb9e0925cc50 100644
--- a/src/main/native-chat/transcript-turn-lifecycle.ts
+++ b/src/main/native-chat/transcript-turn-lifecycle.ts
@@ -197,5 +197,12 @@ export function decodePiTurnLifecycle(
         : message.stopReason === 'stop' || message.stopReason === 'length'
           ? 'completed'
           : null
-  return state ? { state, turnId, timestamp } : null
+  return state
+    ? {
+        state: state === 'failed' ? 'completed' : state,
+        ...(state === 'failed' ? { outcome: 'failure' as const } : {}),
+        turnId,
+        timestamp
+      }
+    : null
 }
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-generated.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-generated.test.ts
index a56bae49210a..71cddf224b71 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-generated.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-generated.test.ts
@@ -1,8 +1,13 @@
+import { randomUUID } from 'node:crypto'
 import type * as ProcessHost from '@orca/process-host'
 import { mkdir, writeFile } from 'node:fs/promises'
 import { basename, join } from 'node:path'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import { createStructuredAgentSessionLaunchIntent } from '../../../../renderer/src/lib/launch-structured-agent-session'
+import {
+  createStructuredAgentSessionId,
+  structuredAgentSessionCreateParams
+} from '../../../../shared/structured-agent-session-create'
+import { toRuntimeExecutionHostId } from '../../../../shared/execution-host'
 import {
   createRestTestRig,
   type RestTestRig
@@ -28,7 +33,6 @@ import { createTestParams } from '../../../native-chat/agent-session-wire/struct
 import { PI_RPC_AGENT } from '../../../pi/rpc-agent-definition'
 import { StructuredAgentRegistry } from '../../../native-chat/agent-session-wire/structured-agent-registry'
 
-vi.mock('@/store', () => ({ useAppStore: { getState: () => ({ settings: {} }) } }))
 vi.mock('../../structured-agent-shell-environment', () => ({
   resolveHostAgentBaseEnvironment: async () => ({}),
   refreshHostAgentBaseEnvironmentAfterMiss: async () => {}
@@ -221,22 +225,21 @@ it.each([
       providerSessionId: HOST_TEST_THREAD,
       cliSource: { workspaceId: WORKTREE_ID, paneKey: row.paneKey }
     }
-    const first = createStructuredAgentSessionLaunchIntent(
-      WORKTREE_ID,
-      'codex',
-      'local',
-      resumeFrom,
-      undefined,
-      false
-    )
-    const second = createStructuredAgentSessionLaunchIntent(
-      WORKTREE_ID,
-      'codex',
-      'local',
-      resumeFrom,
-      undefined,
-      false
-    )
+    const createIntent = () => {
+      const sessionId = createStructuredAgentSessionId('codex', randomUUID)
+      return {
+        sessionId,
+        params: structuredAgentSessionCreateParams({
+          sessionId,
+          worktree: `id:${WORKTREE_ID}`,
+          agent: 'codex',
+          resumeFrom,
+          randomUuid: randomUUID
+        })
+      }
+    }
+    const first = createIntent()
+    const second = createIntent()
     expect(first.sessionId).not.toBe(second.sessionId)
     let canonical = first.sessionId
     if (otherAccount) {
@@ -287,16 +290,9 @@ it.each([
           }
         }
       })
-    // Retained return still carries a fresh renderer-generated ID, never the known native owner.
+    // Retained return still carries a fresh generated ID, never the known native owner.
     const a = retained ? second : first
-    const b = createStructuredAgentSessionLaunchIntent(
-      WORKTREE_ID,
-      'codex',
-      'local',
-      resumeFrom,
-      undefined,
-      false
-    )
+    const b = createIntent()
     await expect(runtime.resolveStructuredAgentSessionCreateIntent(a.params)).rejects.toMatchObject(
       {
         refusal: {
@@ -432,7 +428,10 @@ it('uses registered Pi History IDs and isolates account and owning host for pref
         ...identity,
         accountHome: { ...identity.accountHome, path: join(rig.root, 'other-account') }
       },
-      { ...identity, location: { ...identity.location, executionHostId: 'runtime:other' } },
+      {
+        ...identity,
+        location: { ...identity.location, executionHostId: toRuntimeExecutionHostId('other') }
+      },
       { ...identity, location: { ...identity.location, wslDistro: 'Ubuntu' } }
     ].entries()) {
       expect(switchRetainedOwner(piRig.host, scoped, HOST_TEST_THREAD)).toBeNull()
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts
index ac2bcfd1121d..79ee477539d8 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts
@@ -1,3 +1,4 @@
+import { isTuiAgent } from '../../../../shared/tui-agent-config'
 import type { AgentSessionRecord } from '../../../../shared/agent-session-record'
 import type { StructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-host'
 import type { z } from 'zod'
@@ -25,6 +26,12 @@ export async function executeStructuredSessionTerminalSwitch(
   execution: NonNullable<z.infer<typeof SwitchToTerminalParams>['execution']>,
   selectionCurrent: () => boolean
 ): Promise<AgentSessionSwitchResult> {
+  const agent = record.provider
+  if (!isTuiAgent(agent)) {
+    throw agentSessionRefusalError('structured_agent_session_unsupported', {
+      reason: 'hostUnsupported'
+    })
+  }
   const terminalExecution = SwitchToTerminalParams.parse(params).execution
   const sourceTabId = terminalExecution?.sourceTabId
   let workCurrent = () => false
@@ -77,7 +84,7 @@ export async function executeStructuredSessionTerminalSwitch(
   const terminal = await ctx.runtime.createSessionSwitchTerminal(record.location.workspaceId, {
     invocationId: execution.invocationId,
     sessionId,
-    agent: record.provider,
+    agent,
     source: prepared?.cliForkSource,
     commandOverride: terminalExecution?.commandOverride,
     options: record.options,
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
index 4081926e978e..56dcf8c2738d 100644
--- a/src/main/runtime/structured-chat-coordinator-mail-rig.test-fixture.ts
+++ b/src/main/runtime/structured-chat-coordinator-mail-rig.test-fixture.ts
@@ -10,8 +10,6 @@ import { ORCHESTRATION_CONTRACT_VERSION } from '../../shared/protocol-version'
 import type { StructuredAgentSessionHost } from '../native-chat/agent-session-wire/structured-agent-session-host'
 import { activeProviderContext } from '../../shared/agent-session-provider-context'
 import { OrcaRuntimeService } from './orca-runtime'
-import { chatAssigneeOwesWork } from './orchestration/chat-assignee'
-import { structuredWorkerOwesWork } from './structured-worker-custody'
 import { OrchestrationDb } from './orchestration/db'
 import { localOrchestrationCliCommand } from './orchestration/cli-command'
 import { formatMessagePointer } from './orchestration/formatter'
@@ -255,8 +253,7 @@ beforeEach(async () => {
     onRequestFailure: (failure) => runtime.onStructuredRequestFailureForErrorMail(failure),
     onSessionStatusChanged: (summary) => runtime.onStructuredSessionStatusForMail(summary),
     onSessionTabHidden: (sessionId) => runtime.onStructuredSessionTabHidden(sessionId),
-    hasOwedSwitchWork: (record) =>
-      structuredWorkerOwesWork(db, record) || chatAssigneeOwesWork(db, record.sessionId)
+    captureSessionSwitchStop: (sessionId) => runtime.captureSessionSwitchStop(sessionId)
   })
   dispatcher = new RpcDispatcher({ runtime, methods: ORCHESTRATION_METHODS })
 })
diff --git a/src/main/runtime/workspaces/workspace-process-listing-dependencies.ts b/src/main/runtime/workspaces/workspace-process-listing-dependencies.ts
index 916560f85a0c..376bdd06f8c1 100644
--- a/src/main/runtime/workspaces/workspace-process-listing-dependencies.ts
+++ b/src/main/runtime/workspaces/workspace-process-listing-dependencies.ts
@@ -47,7 +47,9 @@ export abstract class OrcaRuntimeWithWorktreePsDependencies extends OrcaRuntimeW
     record: AgentSessionRecord
   ): Promise<void>
   abstract isChatWorkerErrorEscalationEnabled(): boolean
-  abstract captureSessionSwitchStop: OrcaRuntimeWithGetPtyRecordForPaneKey['captureSessionSwitchStop']
+  abstract captureSessionSwitchStop(
+    ...args: Parameters<OrcaRuntimeWithGetPtyRecordForPaneKey['captureSessionSwitchStop']>
+  ): ReturnType<OrcaRuntimeWithGetPtyRecordForPaneKey['captureSessionSwitchStop']>
   abstract onStructuredSessionTabHidden(
     ...args: Parameters<OrcaRuntimeWithGetPtyRecordForPaneKey['onStructuredSessionTabHidden']>
   ): ReturnType<OrcaRuntimeWithGetPtyRecordForPaneKey['onStructuredSessionTabHidden']>
diff --git a/src/renderer/src/components/native-chat/native-chat-runtime-contract.ts b/src/renderer/src/components/native-chat/native-chat-runtime-contract.ts
index 09d71657eee6..76c167a786d1 100644
--- a/src/renderer/src/components/native-chat/native-chat-runtime-contract.ts
+++ b/src/renderer/src/components/native-chat/native-chat-runtime-contract.ts
@@ -3,6 +3,7 @@ import type {
   NativeChatReadSessionResult
 } from '../../../../preload/api-types'
 import type { NativeChatTurnLifecycle } from '../../../../shared/native-chat-types'
+import { AGENT_JOURNAL_TURN_OUTCOMES } from '../../../../shared/agent-turn-outcome'
 
 export const RUNTIME_NATIVE_CHAT_READ_ERROR = "Couldn't read agent chat from the remote runtime."
 
@@ -27,9 +28,11 @@ export function parseRuntimeNativeChatTurnLifecycle(
   ) {
     return undefined
   }
+  const outcome = AGENT_JOURNAL_TURN_OUTCOMES.find((known) => known === record.outcome)
   return {
     state: record.state,
     turnId: record.turnId.trim(),
+    ...(outcome ? { outcome } : {}),
     // Missing timestamps are valid; normalize them without dropping the lifecycle record.
     timestamp: record.timestamp ?? null
   }
diff --git a/src/renderer/src/components/native-chat/native-chat-session-transport.test.ts b/src/renderer/src/components/native-chat/native-chat-session-transport.test.ts
index fa37984706f7..5bb6094e6407 100644
--- a/src/renderer/src/components/native-chat/native-chat-session-transport.test.ts
+++ b/src/renderer/src/components/native-chat/native-chat-session-transport.test.ts
@@ -89,7 +89,12 @@ describe('getNativeChatSessionTransport — selection', () => {
 
   it('validates lifecycle metadata on runtime read responses', async () => {
     markRuntimeEnvironmentCompatible(ENV)
-    const lifecycle = { state: 'completed', turnId: 'turn-1', timestamp: 42 } as const
+    const lifecycle = {
+      state: 'completed',
+      outcome: 'failure',
+      turnId: 'turn-1',
+      timestamp: 42
+    } as const
     runtimeEnvironmentsCall
       .mockResolvedValueOnce(okEnvelope({ messages: [message('valid')], lifecycle }))
       .mockResolvedValueOnce(
@@ -109,6 +114,28 @@ describe('getNativeChatSessionTransport — selection', () => {
     })
   })
 
+  it('carries known optional outcomes and omits unrecognized ones without dropping lifecycle', async () => {
+    markRuntimeEnvironmentCompatible(ENV)
+    const transport = getNativeChatSessionTransport(ENV)
+    const lifecycle = { state: 'completed', turnId: 'outcome-turn', timestamp: 42 }
+    for (const [received, expected] of [
+      ['success', 'success'],
+      ['cancellation', 'cancellation'],
+      ['superseded', 'superseded'],
+      ['future-verdict', undefined],
+      [null, undefined],
+      [7, undefined]
+    ] as const) {
+      runtimeEnvironmentsCall.mockResolvedValueOnce(
+        okEnvelope({ messages: [], lifecycle: { ...lifecycle, outcome: received } })
+      )
+      await expect(transport.readSession('codex', 'sess-1')).resolves.toEqual({
+        messages: [],
+        lifecycle: { ...lifecycle, ...(expected ? { outcome: expected } : {}) }
+      })
+    }
+  })
+
   it('accepts interrupted lifecycle metadata from a remote runtime', async () => {
     markRuntimeEnvironmentCompatible(ENV)
     const lifecycle = { state: 'interrupted', turnId: 'turn-2', timestamp: 43 } as const
@@ -224,7 +251,12 @@ describe('runtime subscribe', () => {
     const { deliver } = stubSubscribe()
     const onFrame = vi.fn()
     const transport = getNativeChatSessionTransport(ENV)
-    const lifecycle = { state: 'completed', turnId: 'turn-1', timestamp: 42 } as const
+    const lifecycle = {
+      state: 'completed',
+      outcome: 'failure',
+      turnId: 'turn-1',
+      timestamp: 42
+    } as const
 
     transport.subscribe({ subscriptionId: 's-1', agent: 'claude', sessionId: 'sess-1' }, onFrame)
     await Promise.resolve()
diff --git a/src/renderer/src/components/right-sidebar/AiVaultVirtualRow.test.tsx b/src/renderer/src/components/right-sidebar/AiVaultVirtualRow.test.tsx
index cb783f2d3dc4..96a3259eb8a9 100644
--- a/src/renderer/src/components/right-sidebar/AiVaultVirtualRow.test.tsx
+++ b/src/renderer/src/components/right-sidebar/AiVaultVirtualRow.test.tsx
@@ -1,4 +1,5 @@
 // @vitest-environment happy-dom
+import { getDefaultSettings } from '../../../../shared/constants'
 
 import { act, cleanup, fireEvent, render, screen } from '@testing-library/react'
 import { Profiler } from 'react'
@@ -248,7 +249,11 @@ describe('AiVaultVirtualRow CLI surface actions', () => {
     'offers the ordinary CLI switch on an older host for a chat-owned %s row from both menus',
     async (agent) => {
       useAppStore.setState((state) => ({
-        settings: { ...state.settings, experimentalNativeChat: true }
+        settings: {
+          ...getDefaultSettings('/home/test'),
+          ...state.settings,
+          experimentalNativeChat: true
+        }
       }))
       setLocalRuntimeCapabilitiesForTests([])
       const session: AiVaultSession = { ...cliSession, agent, structuredSession: owner }
@@ -291,7 +296,11 @@ it.each([
   async ({ rows, hosts }) => {
     useAppStore.setState(useAppStore.getInitialState(), true)
     useAppStore.setState((state) => ({
-      settings: { ...state.settings, experimentalNativeChat: true }
+      settings: {
+        ...getDefaultSettings('/home/test'),
+        ...state.settings,
+        experimentalNativeChat: true
+      }
     }))
     setLocalRuntimeCapabilitiesForTests([])
     const getStatus = vi.fn()
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
index 89f7576b1ded..2f419c4e5a8d 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
@@ -73,7 +73,7 @@ export async function runLegacyCliChatResume(
   conversationSwitchChanged()
   try {
     const captured = await captureSourceTerminal(source)
-    const ptyId = captured?.presentation.identity.ptyId
+    const ptyId = captured?.presentation?.identity.ptyId
     if (!captured || !ptyId || !isCurrent()) {
       throw stopUnknown()
     }
diff --git a/src/renderer/src/lib/agent-session/structured-agent-session-provisional-tab.test.ts b/src/renderer/src/lib/agent-session/structured-agent-session-provisional-tab.test.ts
index c053d493fa0f..64efeb8f24ca 100644
--- a/src/renderer/src/lib/agent-session/structured-agent-session-provisional-tab.test.ts
+++ b/src/renderer/src/lib/agent-session/structured-agent-session-provisional-tab.test.ts
@@ -1,4 +1,5 @@
 // @vitest-environment happy-dom
+import { getDefaultSettings } from '../../../../shared/constants'
 import type * as CliChatResumeSourceModule from '@/components/tab-bar/cli-chat-resume-source'
 import type * as CliChatResumeTerminalCapture from '@/components/tab-bar/cli-chat-resume-terminal-capture'
 import type { CliChatResumeSource } from '@/components/tab-bar/cli-chat-resume-source'
@@ -550,6 +551,8 @@ it.each(['unchanged', 'navigate', 'strict-old-runtime', 'stale-v2-runtime'] as c
       terminalLayoutsByTabId: {
         [source.id]: {
           root: { type: 'leaf', leafId: 'leaf' },
+          activeLeafId: 'leaf',
+          expandedLeafId: null,
           ptyIdsByLeafId: { leaf: 'source-pty' }
         }
       }
@@ -603,7 +606,11 @@ it.each(['unchanged', 'navigate', 'strict-old-runtime', 'stale-v2-runtime'] as c
       action === 'stale-v2-runtime' ? ['agent-session.structured.switch.v2:codex'] : []
     )
     useAppStore.setState((state) => ({
-      settings: { ...state.settings, experimentalNativeChat: true }
+      settings: {
+        ...getDefaultSettings('/home/test'),
+        ...state.settings,
+        experimentalNativeChat: true
+      }
     }))
     const running = fromCommon
       ? runConversationSwitch({
diff --git a/src/renderer/src/lib/conversation-surface-switch.test.tsx b/src/renderer/src/lib/conversation-surface-switch.test.tsx
index fd3e3e130ff2..73975344ba7c 100644
--- a/src/renderer/src/lib/conversation-surface-switch.test.tsx
+++ b/src/renderer/src/lib/conversation-surface-switch.test.tsx
@@ -390,6 +390,7 @@ it.each(['support', 'Stop'] as const)(
         worktreeId: 'workspace',
         launchAgent: 'codex',
         viewer: 'focus-in-workspace',
+        viewMode: 'terminal',
         viewerSelection: request.execution.viewerSelection
       })
       return { status: 'completed', sessionId: subject.sessionId, terminal: 'destination-terminal' }
diff --git a/src/renderer/src/lib/launch-structured-agent-session.test.ts b/src/renderer/src/lib/launch-structured-agent-session.test.ts
index df609da79925..931886c97c3b 100644
--- a/src/renderer/src/lib/launch-structured-agent-session.test.ts
+++ b/src/renderer/src/lib/launch-structured-agent-session.test.ts
@@ -1,3 +1,5 @@
+import { structuredAgentSessionFocusOwner } from '@/runtime/structured-agent-session-owner'
+import { CreateIntentParams } from '../../../shared/rpc-contract/structured-agent-session-params'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { structuredAgentSessionPayloadFingerprint } from '../../../shared/structured-agent-session-mutation'
 import { callStructuredAgentSession } from '@/runtime/structured-agent-session-client'
@@ -58,6 +60,51 @@ describe('structured agent session launch', () => {
     expect(peekWebSessionFocusIntent(owner, worktreeId)).toBeNull()
   })
 
+  it('generates fresh CLI-switch intents accepted by the shared create contract', () => {
+    const worktreeId = 'switch-generated-workspace'
+    const resumeFrom = {
+      providerSessionId: 'saved-provider',
+      cliSource: { workspaceId: worktreeId, paneKey: 'source-tab:source-leaf' }
+    }
+    const create = () =>
+      createStructuredAgentSessionLaunchIntent(
+        worktreeId,
+        'codex',
+        'local',
+        resumeFrom,
+        undefined,
+        false
+      )
+    const first = create()
+    const second = create()
+    expect(first.sessionId).not.toBe(second.sessionId)
+    expect(first.params.envelope.clientOperationId).not.toBe(
+      second.params.envelope.clientOperationId
+    )
+    for (const intent of [first, second]) {
+      expect(intent.target).toEqual({ kind: 'local' })
+      expect(CreateIntentParams.parse(intent.params)).toEqual(intent.params)
+      expect(intent.params).toEqual({
+        worktree: `id:${worktreeId}`,
+        agent: 'codex',
+        resumeFrom,
+        envelope: {
+          sessionId: intent.sessionId,
+          clientOperationId: expect.stringMatching(/^\d{13}-[0-9a-f]{32}$/),
+          expectedRuntimeFence: null,
+          payloadFingerprint: structuredAgentSessionPayloadFingerprint({
+            method: 'agentSession.create',
+            sessionId: intent.sessionId,
+            fields: { worktree: `id:${worktreeId}`, agent: 'codex', resumeFrom }
+          })
+        }
+      })
+    }
+    expect(
+      peekWebSessionFocusIntent(structuredAgentSessionFocusOwner(first.target), worktreeId)
+    ).toBeNull()
+  })
+
   // The chat opens before its host answers, so the create is the last thing that can say no.
   it('issues no create to a host held for its access, or after its chat closed', async () => {
     vi.mocked(callStructuredAgentSession).mockResolvedValue({ supported: true })
diff --git a/src/renderer/src/runtime/web-runtime-session-terminal-workspace-routing.test.ts b/src/renderer/src/runtime/web-runtime-session-terminal-workspace-routing.test.ts
index a97525aa7b57..bb117d54b4e8 100644
--- a/src/renderer/src/runtime/web-runtime-session-terminal-workspace-routing.test.ts
+++ b/src/renderer/src/runtime/web-runtime-session-terminal-workspace-routing.test.ts
@@ -1,3 +1,5 @@
+import { applyWebSessionTabsSnapshot } from './web-session-tabs-sync/snapshot-api'
+import { resetWebSessionTabsSnapshotFreshnessForTests } from './web-session-tabs-sync/tracking-lifecycle'
 import { createTestStore } from '../store/slices/store-test-helpers'
 import {
   captureConversationSwitchViewerSelection,
@@ -67,10 +69,18 @@ vi.mock('./web-session-tabs-sync/tracking-lifecycle', async (original) => {
         : mocks.acceptReplayedWebSessionTabsSnapshot(...args)
   }
 })
-vi.mock('./web-session-tabs-sync/snapshot-api', async (original) => ({
-  ...(await original<object>()),
-  applyWebSessionTabsSnapshot: mocks.applyWebSessionTabsSnapshot
-}))
+vi.mock('./web-session-tabs-sync/snapshot-api', async (original) => {
+  const actual = await original<typeof SnapshotApi>()
+  return {
+    ...actual,
+    applyWebSessionTabsSnapshot: (
+      ...args: Parameters<typeof actual.applyWebSessionTabsSnapshot>
+    ) =>
+      mocks.realStore
+        ? actual.applyWebSessionTabsSnapshot(...args)
+        : mocks.applyWebSessionTabsSnapshot(...args)
+  }
+})
 vi.mock('./web-session-tabs-sync/tracking-decisions', async (original) => {
   const actual = await original<typeof TrackingDecisions>()
   return {
@@ -147,11 +157,8 @@ function stubSelectableWorkspaceStore(selection: MutableSelection): void {
 afterEach(() => resetWebSessionCloseIntentForTests())
 
 describe('web-runtime-session terminal workspace routing', () => {
-  beforeEach(async () => {
-    const tracking = await vi.importActual<typeof TrackingLifecycle>(
-      './web-session-tabs-sync/tracking-lifecycle'
-    )
-    tracking.resetWebSessionTabsSnapshotFreshnessForTests()
+  beforeEach(() => {
+    resetWebSessionTabsSnapshotFreshnessForTests()
     mocks.realStore = false
     stubTerminalCreateEnvironment(mocks)
   })
@@ -337,12 +344,10 @@ describe('web-runtime-session terminal workspace routing', () => {
     'strict paired ordinary create/list/placement respects original caller selection: %s',
     async (action) => {
       mocks.realStore = true
-      const api = await vi.importActual<typeof SnapshotApi>('./web-session-tabs-sync/snapshot-api')
       const store = createTestStore()
       mocks.getState.mockImplementation(store.getState)
       mocks.setState.mockImplementation(store.setState)
       mocks.subscribe.mockImplementation(store.subscribe)
-      mocks.applyWebSessionTabsSnapshot.mockImplementation(api.applyWebSessionTabsSnapshot)
       store.setState({
         activeWorktreeId: WORKTREE_ID,
         activeWorkspaceExecutionHostId: RUNTIME_EXECUTION_HOST_ID
@@ -391,9 +396,7 @@ describe('web-runtime-session terminal workspace routing', () => {
           }
         ]
       })
-      store.setState((state) =>
-        api.applyWebSessionTabsSnapshot(state, snapshot(false), ENVIRONMENT_ID)
-      )
+      store.setState((state) => applyWebSessionTabsSnapshot(state, snapshot(false), ENVIRONMENT_ID))
       store.getState().activateTab(sourceId)
       const original = captureConversationSwitchViewerSelection()
       const created = Promise.withResolvers<void>()
diff --git a/src/shared/claimed-agent-pty-owner.ts b/src/shared/claimed-agent-pty-owner.ts
index 9e9cbd3358ed..9ce42f70a77f 100644
--- a/src/shared/claimed-agent-pty-owner.ts
+++ b/src/shared/claimed-agent-pty-owner.ts
@@ -276,7 +276,7 @@ export class ClaimedAgentPtyOwnerRegistry {
   }
 
   list(): AgentSessionOwnerBinding[] {
-    return [...this.live.values()].map(cloneOwner)
+    return [...this.live.values()].map(cloneAgentSessionOwner)
   }
 
   listForPty(ptyId: string): AgentSessionOwnerBinding[] {
@@ -287,7 +287,7 @@ export class ClaimedAgentPtyOwnerRegistry {
     return [...keys]
       .map((key) => this.live.get(key))
       .filter((owner): owner is LiveOwner => owner !== undefined)
-      .map(cloneOwner)
+      .map(cloneAgentSessionOwner)
   }
 
   find(claim: AgentSessionExecutionClaim): AgentSessionOwnerBinding | null {
diff --git a/src/shared/native-chat-types.ts b/src/shared/native-chat-types.ts
index 2d3fc247bef0..4ed49f16aa3d 100644
--- a/src/shared/native-chat-types.ts
+++ b/src/shared/native-chat-types.ts
@@ -1,3 +1,4 @@
+import type { AgentJournalTurnOutcome } from './agent-turn-outcome'
 import type { AgentSessionProviderContextBoundary } from './agent-session-provider-context'
 // IPC-serializable conversation contract: plain JSON only, no classes/Maps/Dates. Sources prefer transcripts, then hooks,
 // then degraded scrollback; docs/plans/2026-06-17-001-feat-native-chat-view-plan.md (KTD2).
@@ -281,6 +282,7 @@ export const NATIVE_CHAT_INTERRUPTED_STATUS_TEXT = 'Conversation interrupted'
 /** Replay-safe provider completion/interruption evidence recovered from transcripts, unlike assistant prose. */
 export type NativeChatTurnLifecycle = {
   state: NativeChatTurnLifecycleState
+  outcome?: AgentJournalTurnOutcome
   /** Stable provider id when available, otherwise the JSONL record position. */
   turnId: string
   /** Provider timestamp; null only when the transcript omitted one. */

From ce73b46276329a2e2dfcee8f47dfbc7dd32c1867 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Wed, 28 Oct 2026 20:20:49 -0700
Subject: [PATCH 094/207] Fix switch integration checks and test fixtures

---
 src/main/daemon/daemon-pty-spawn-preparations.ts |  6 ++++--
 src/main/daemon/terminal-creation-work.ts        |  2 +-
 .../daemon/terminal-host-agent-session-claim.ts  |  6 ++++--
 src/main/daemon/terminal-host-inspection.ts      |  6 ++----
 .../structured-agent-session-stop-acceptance.ts  |  4 ++--
 ...ructured-agent-session-switch-command.test.ts | 16 ++++++++++------
 ...tructured-agent-session-switch-import.test.ts |  6 ++++--
 .../transcript-grok-turn-lifecycle.ts            |  6 +++++-
 .../orchestration/terminal-pane-mail-routing.ts  |  2 +-
 .../structured-agent-session-switch-execution.ts |  6 ++++--
 .../terminal-close-slow-agent-exit.test.ts       |  6 +++---
 .../ai-vault-session-in-place-switch.ts          |  4 ++--
 .../ai-vault-session-resume-in-chat-workspace.ts |  4 ++--
 13 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/src/main/daemon/daemon-pty-spawn-preparations.ts b/src/main/daemon/daemon-pty-spawn-preparations.ts
index e9e658aad0c6..25f0a4fc1d2c 100644
--- a/src/main/daemon/daemon-pty-spawn-preparations.ts
+++ b/src/main/daemon/daemon-pty-spawn-preparations.ts
@@ -1,5 +1,7 @@
-import { compactDaemonSpawnPreparation } from './daemon-pty-spawn-preparation-release'
-import { releaseDaemonSpawnPreparation } from './daemon-pty-spawn-preparation-release'
+import {
+  compactDaemonSpawnPreparation,
+  releaseDaemonSpawnPreparation
+} from './daemon-pty-spawn-preparation-release'
 import type {
   PendingPtySpawnPreparation,
   CompletedPreparation
diff --git a/src/main/daemon/terminal-creation-work.ts b/src/main/daemon/terminal-creation-work.ts
index de441f9dc1bd..f9a5e41729cc 100644
--- a/src/main/daemon/terminal-creation-work.ts
+++ b/src/main/daemon/terminal-creation-work.ts
@@ -41,7 +41,7 @@ export class TerminalCreationWork {
     ]
     const release = async () => {
       await Promise.all(
-        [...this.owners, ...joined.filter((entry) => entry.kind !== 'no-fork')].map((entry) =>
+        [...this.owners, ...joined.filter((entry) => entry.kind !== 'no-fork')].map(async (entry) =>
           entry.recover?.()
         )
       )
diff --git a/src/main/daemon/terminal-host-agent-session-claim.ts b/src/main/daemon/terminal-host-agent-session-claim.ts
index 929329715344..1b1a2f000fc0 100644
--- a/src/main/daemon/terminal-host-agent-session-claim.ts
+++ b/src/main/daemon/terminal-host-agent-session-claim.ts
@@ -1,6 +1,8 @@
-import type { PtyCreationDisposition } from '../../shared/claimed-agent-pty-owner'
 import type { TerminalCreationWork } from './terminal-creation-work'
-import type { ClaimedAgentPtyOwnerRegistry } from '../../shared/claimed-agent-pty-owner'
+import type {
+  ClaimedAgentPtyOwnerRegistry,
+  PtyCreationDisposition
+} from '../../shared/claimed-agent-pty-owner'
 import type { AgentSessionOwnerBinding } from '../../shared/agent-session-host-authority'
 import type { SpawnIntent } from '../../shared/host-spawn-admission'
 import type { CreateOrAttachOptions, CreateOrAttachResult } from './terminal-host-create-contract'
diff --git a/src/main/daemon/terminal-host-inspection.ts b/src/main/daemon/terminal-host-inspection.ts
index dcedf4e7ccbe..13828f6628f2 100644
--- a/src/main/daemon/terminal-host-inspection.ts
+++ b/src/main/daemon/terminal-host-inspection.ts
@@ -1,6 +1,8 @@
 import { hasLiveTerminalHostSessions } from './terminal-host-session-listing'
 import type { TakePendingOutputResult, TerminalSnapshot } from './types'
 import {
+  confirmTerminalHostForegroundProcess,
+  confirmTerminalHostShellForeground,
   getSettledTerminalHostSnapshot,
   getTerminalHostAppliedSize,
   getTerminalHostPartialEscapeTail,
@@ -15,10 +17,6 @@ import {
   inspectTerminalHostSession,
   type TerminalHostProcessInspection
 } from './terminal-host-process-inspection'
-import {
-  confirmTerminalHostForegroundProcess,
-  confirmTerminalHostShellForeground
-} from './terminal-host-session-inspection-operations'
 export abstract class TerminalHostInspection {
   protected abstract sessions: Map<string, Session>
   protected abstract readonly retiredIncarnations: Map<
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-stop-acceptance.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-stop-acceptance.ts
index b9e7e6ed76ee..1a2a2917ac4a 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-stop-acceptance.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-stop-acceptance.ts
@@ -1,5 +1,4 @@
 import type { ChatStopTarget } from './structured-agent-session-chat-stop-target'
-import type { TurnOutcome } from './structured-agent-session-turns'
 import { agentSessionFailureSentence } from '../../../shared/agent-session-failure-words'
 import { refuse, type AgentSessionCancelResult } from '../../../shared/agent-session-wire'
 import {
@@ -23,7 +22,8 @@ import {
 } from './structured-agent-session-mutation-plans'
 import type {
   AgentSessionOperationReceipt,
-  AgentSessionTurnContext
+  AgentSessionTurnContext,
+  TurnOutcome
 } from './structured-agent-session-turns'
 // Commit Stop receipt/effects before interrupting; failed acceptance acts on nothing and retries never retarget.
 
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test.ts
index 3f76e46f9463..ed16e454f52b 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test.ts
@@ -24,17 +24,21 @@ import {
   WORKTREE_ID,
   TAB_ID
 } from '../../runtime/main-owned-workspace-runtime-fixture'
-import { expect, it, vi } from 'vitest'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import { agentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
 import { DEFAULT_SPAWN_ADMISSION_LIMITS } from '../../../shared/host-spawn-admission'
-import { restTestSend, type RestTestRig } from './structured-agent-session-rest-test-rig'
-import { CREATE_TEST_CALLER as caller } from './structured-agent-session-create-test-fixture'
+import {
+  createRestTestRig,
+  restTestSend,
+  type RestTestRig
+} from './structured-agent-session-rest-test-rig'
+import {
+  CREATE_TEST_CALLER as caller,
+  createTestParams
+} from './structured-agent-session-create-test-fixture'
 import { HOST_TEST_SESSION as id } from './structured-agent-session-host-test-data'
 import { verifyOrdinarySwitchLostOutcome } from './structured-agent-session-switch-command-ordinary.test-fixture'
 import type * as LocalPtyUtils from '../../providers/local-pty-utils'
-import { afterEach, beforeEach } from 'vitest'
-import { createRestTestRig } from './structured-agent-session-rest-test-rig'
-import { createTestParams } from './structured-agent-session-create-test-fixture'
 const nativePty = vi.hoisted(() => ({ spawn: vi.fn() }))
 vi.mock('node-pty', () => nativePty)
 vi.mock('../../providers/local-pty-utils', async (importOriginal) => ({
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.test.ts
index f590bb1a3048..be41e9a4c25b 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.test.ts
@@ -9,13 +9,15 @@ import {
   codexProviderHandle
 } from '../../../shared/agent-session-provider-handle-encoding'
 import { agentTurnVerdict } from '../../../shared/agent-turn-outcome'
-import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key'
+import {
+  agentJournalItemKey,
+  agentJournalSubmissionKey
+} from '../../../shared/agent-session-journal-item-key'
 import Database from '../../sqlite/sync-database'
 import { claudePromptUuidForSubmission } from '../../claude/structured/claude-structured-session-id'
 import { encodePiHistoryClaim } from '../../pi/rpc-history-journal-view'
 import { createLegacyProviderTimelineIdentityScheme } from '../agent-session-timeline/provider-timeline-identity'
 import { acpNamedTextKey } from '../../acp/acp-turn-messages'
-import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key'
 import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
 import { piHistoryEntryIdentity } from '../../pi/rpc-history-import'
 import { createTrackedJournalOpener } from '../agent-session-journal/journal-host-database-test-support'
diff --git a/src/main/native-chat/transcript-grok-turn-lifecycle.ts b/src/main/native-chat/transcript-grok-turn-lifecycle.ts
index 14bfa6c90dd5..5f5b9eada09a 100644
--- a/src/main/native-chat/transcript-grok-turn-lifecycle.ts
+++ b/src/main/native-chat/transcript-grok-turn-lifecycle.ts
@@ -22,7 +22,11 @@ export async function readGrokTurnLifecycle(
       if (event?.type === 'turn_started') {
         latest =
           event.session_id === sessionId && typeof event.turn_number === 'number'
-            ? { state: 'working', turnId: `grok:${event.turn_number}:${event.ts}`, timestamp }
+            ? {
+                state: 'working',
+                turnId: `grok:${event.turn_number}:${String(event.ts)}`,
+                timestamp
+              }
             : undefined
       } else if (event?.type === 'turn_ended' && latest) {
         const state =
diff --git a/src/main/runtime/orchestration/terminal-pane-mail-routing.ts b/src/main/runtime/orchestration/terminal-pane-mail-routing.ts
index 5c1dc7d19150..be74d152b6be 100644
--- a/src/main/runtime/orchestration/terminal-pane-mail-routing.ts
+++ b/src/main/runtime/orchestration/terminal-pane-mail-routing.ts
@@ -1,4 +1,3 @@
-import { resolveStructuredCoordinatorMailboxTarget } from './structured-session-mail-target'
 import type { RuntimeTerminalAgentPresenceOptions } from '../runtime-terminal-agent-presence'
 import { OrcaRuntimeWithPruneMobileSessionTabGroupLayout } from '../session-lifecycle/projection/prune-mobile-session-tab-group-layout'
 import type { RuntimePtyWorktreeRecord } from '../runtime-terminal-state-records'
@@ -19,6 +18,7 @@ import type { StructuredPointerTarget } from './structured-mailbox-pointer-deliv
 import type { OrchestrationMailboxLeaf } from './mailbox-owner'
 import {
   chatDispatchMailTarget,
+  resolveStructuredCoordinatorMailboxTarget,
   structuredSessionAddressTarget,
   structuredSessionIdleEdgeMailboxes
 } from './structured-session-mail-target'
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
index 71e029de6c5f..6721ff6e8e34 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
@@ -1,7 +1,9 @@
-import { requireStructuredSwitchRecord } from './structured-agent-session-switch-preparation'
 import { retainStructuredSwitchSource } from './structured-agent-session-switch-retention'
 import { structuredSessionSwitchFailure } from './structured-agent-session-switch-failure'
-import { prepareStructuredSessionSwitch } from './structured-agent-session-switch-preparation'
+import {
+  prepareStructuredSessionSwitch,
+  requireStructuredSwitchRecord
+} from './structured-agent-session-switch-preparation'
 import type { z } from 'zod'
 import type { RpcContext } from '../core'
 import type { SwitchToChatParams, SwitchToTerminalParams } from './structured-agent-session-schemas'
diff --git a/src/main/runtime/terminal-close-slow-agent-exit.test.ts b/src/main/runtime/terminal-close-slow-agent-exit.test.ts
index 0158f3927daf..93d07cef6be0 100644
--- a/src/main/runtime/terminal-close-slow-agent-exit.test.ts
+++ b/src/main/runtime/terminal-close-slow-agent-exit.test.ts
@@ -110,9 +110,9 @@ describe('worker release of an agent that is slow to exit after its terminal clo
     const harness = await startLateExitHarness()
     try {
       const subprocess = harness.subprocess
-      subprocess.forceKill = () => {
+      subprocess.forceKill.mockImplementation(() => {
         setTimeout(() => subprocess._simulateExit(0), SLOW_EXIT_MS)
-      }
+      })
       const startedAt = Date.now()
       const { receipt, fallbackKill } = await closeThroughDaemon(harness)
       expect(Date.now() - startedAt).toBeGreaterThanOrEqual(SLOW_EXIT_MS)
@@ -148,7 +148,7 @@ describe('worker release of an agent that is slow to exit after its terminal clo
     vi.useFakeTimers({ toFake: ['Date'] })
     try {
       // A wedged agent ignores SIGKILL, so only the close deadline can end the kill.
-      harness.subprocess.forceKill = () => {}
+      harness.subprocess.forceKill.mockImplementation(() => {})
       let budgetMs = 0
       const expiringStop: typeof stopAndWaitPtyFromRuntimeController = async (deps, id, opts) => {
         const deadlineMs = opts?.deadlineMs ?? 0
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts b/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts
index dc9d1fcc219f..5a6c41130103 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts
@@ -2,10 +2,10 @@ import type { ConfirmationDialogContextValue } from '@/components/confirmation-d
 import type { AiVaultOriginalPaneTarget } from './ai-vault-original-pane'
 import {
   cliConversationRowsShareAgent,
-  adoptsCliConversations
+  adoptsCliConversations,
+  inPlaceSwitchEnabled
 } from '../../../../shared/structured-agent-cli-conversation-adoption'
 import { useAppStore } from '@/store'
-import { inPlaceSwitchEnabled } from '../../../../shared/structured-agent-cli-conversation-adoption'
 import type { AiVaultSession } from '../../../../shared/ai-vault-types'
 import { resolveCliChatResumeSource } from '../tab-bar/cli-chat-resume-source'
 import {
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-workspace.ts b/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-workspace.ts
index 16f11736f23d..77feb5e3897e 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-workspace.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-workspace.ts
@@ -1,4 +1,3 @@
-import { inPlaceSwitchEnabled } from '../../../../shared/structured-agent-cli-conversation-adoption'
 import { resolveHostCapabilities, workspaceKindForWorktreeId } from '@/lib/agent-launch-route-input'
 import {
   structuredAgentSessionLaunchFeasible,
@@ -10,7 +9,8 @@ import type { AiVaultSession } from '../../../../shared/ai-vault-types'
 import { normalizeExecutionHostId } from '../../../../shared/execution-host'
 import {
   adoptsCliConversations,
-  CLI_CONVERSATION_ADOPTING_AGENTS
+  CLI_CONVERSATION_ADOPTING_AGENTS,
+  inPlaceSwitchEnabled
 } from '../../../../shared/structured-agent-cli-conversation-adoption'
 import { STRUCTURED_AGENT_SESSION_RESUME_HISTORY_RUNTIME_CAPABILITY } from '../../../../shared/protocol-version'
 import { resolveAiVaultTargetWorkspacePath } from './ai-vault-session-launch-target'

From 0a29d50455cd7638d5534e9d972842f90312b02f Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Thu, 29 Oct 2026 02:55:31 -0700
Subject: [PATCH 095/207] Preserve conversation switch placement through
 ordinary publication

---
 ...on-pty-adapter-concurrent-recovery.test.ts |   2 +-
 ...on-pty-adapter-history-checkpoints.test.ts |   1 +
 ...pty-adapter-protocol-compatibility.test.ts |   4 +-
 ...on-pty-adapter-steady-state-compat.test.ts |   2 +-
 ...apter-switch-compatibility.test-fixture.ts |   4 +-
 ...on-server-async-spawn-cancellation.test.ts |   7 +-
 ...on-server-creation-failure.test-fixture.ts |   4 +-
 ...ent-session-switch-command.test-fixture.ts |  13 +-
 ...tured-agent-session-switch-command.test.ts |   3 +-
 ...gent-session-switch-socket.test-fixture.ts |   6 +-
 .../construction/runtime-identity-state.ts    |  14 +-
 .../mobile-session-snapshot-equality.ts       |  14 +
 src/main/runtime/orca-runtime.ts              |   6 +
 .../runtime/published-pane-live-titles.ts     |  10 +
 ...red-agent-session-switch-execution.test.ts |  13 +-
 ...ructured-agent-session-switch-execution.ts |  46 +-
 .../structured-agent-session-switch-source.ts |  25 +
 ...agent-session-switch-terminal-execution.ts |  11 +
 .../runtime-mobile-session-projection.ts      |   1 +
 .../main-layout-agent-launch-tabs.test.ts     |  56 ++
 .../main-layout-agent-launch-tabs.ts          |  25 +
 .../session-tabs/main-session-tab-rows.ts     |   6 +-
 ...session-tab-open-placement-scaling.test.ts | 204 +++++++
 .../session-tab-open-placement.ts             |  81 +++
 .../structured-session-switch-projection.ts   |  10 +-
 ...uctured-session-switch-publication.test.ts | 186 ++++++-
 .../structured-session-tab-projection.ts      |  96 ++++
 .../structured-session-tab-restoration.ts     | 103 +---
 .../terminal-switch-close-capture.ts          |   9 +-
 .../terminal/launch/mobile-terminal-create.ts |  13 +
 .../launch/mobile-terminal-owned-create.ts    |  26 +-
 .../mobile-terminal-switch-publication.ts     |   5 +-
 src/main/runtime/workspace-layout-stream.ts   |  25 +-
 .../floating-workspace-reveal-routing.test.ts |  42 ++
 .../ipc-events/session-tab-ipc-bridge.ts      |  19 +-
 .../terminal-ui-routing-ipc-bridge.ts         |   1 +
 .../lib/agent-launch-tab-publication.test.ts  |  65 +++
 .../src/lib/agent-launch-tab-publication.ts   |  27 +-
 .../src/lib/conversation-switch-selection.ts  |  23 +-
 .../lib/session-tab-open-placement-order.ts   |  27 +
 .../src/runtime/layout-frame-stream.ts        |   2 +-
 .../src/runtime/server-layout-frames.ts       |  14 +-
 .../session-tab-open-placement.test.ts        | 521 ++++++++++++++++++
 .../web-session-client-owned-tab-placement.ts |  14 +-
 .../apply-preparation-base.ts                 |   3 +
 .../apply-preparation-groups.ts               |  48 +-
 .../web-session-tabs-sync/apply-snapshot.ts   |  10 +-
 .../open-placement-read.ts                    | 135 +++++
 .../open-placement-selection.ts               |  69 +++
 .../web-session-tabs-sync/open-placement.ts   |  82 +++
 .../runtime/web-session-tabs-sync/state.ts    |  10 +
 .../terminal-surfaces.ts                      |  42 +-
 ...workspace-layout-frame-drawn-workspaces.ts |  10 +-
 .../workspace-layout-frame-flush-plan.ts      |  70 +++
 .../workspace-layout-frame-open-selection.ts  |  65 +++
 .../workspace-layout-frame-sync.test.ts       | 163 ++++++
 .../runtime/workspace-layout-frame-sync.ts    |  79 +--
 .../store/slices/tabs/moved-tab-selection.ts  |   9 +-
 .../store/slices/terminal-orphan-helpers.ts   |  33 ++
 .../src/store/terminals/terminal-actions.ts   |   2 +
 .../store/terminals/terminal-tab-creation.ts  |  37 +-
 src/shared/agent-launch-intent.ts             |   2 +-
 src/shared/agent-launch-tab-publication.ts    |   2 +
 src/shared/agent-session-switch-execution.ts  |   2 +
 src/shared/claimed-agent-pty-owner.ts         |   3 +-
 .../runtime-mobile-session-tab-contracts.ts   |   3 +
 src/shared/session-tab-placement.ts           |  12 +
 .../workspace-layout-published.ts             |   3 +
 68 files changed, 2370 insertions(+), 310 deletions(-)
 create mode 100644 src/main/runtime/session-tabs/session-tab-open-placement-scaling.test.ts
 create mode 100644 src/main/runtime/session-tabs/session-tab-open-placement.ts
 create mode 100644 src/main/runtime/session-tabs/structured-session-tab-projection.ts
 create mode 100644 src/renderer/src/lib/session-tab-open-placement-order.ts
 create mode 100644 src/renderer/src/runtime/session-tab-open-placement.test.ts
 create mode 100644 src/renderer/src/runtime/web-session-tabs-sync/open-placement-read.ts
 create mode 100644 src/renderer/src/runtime/web-session-tabs-sync/open-placement-selection.ts
 create mode 100644 src/renderer/src/runtime/web-session-tabs-sync/open-placement.ts
 create mode 100644 src/renderer/src/runtime/workspace-layout-frame-flush-plan.ts
 create mode 100644 src/renderer/src/runtime/workspace-layout-frame-open-selection.ts

diff --git a/src/main/daemon/daemon-pty-adapter-concurrent-recovery.test.ts b/src/main/daemon/daemon-pty-adapter-concurrent-recovery.test.ts
index bea9023eb93b..4c607dcd8566 100644
--- a/src/main/daemon/daemon-pty-adapter-concurrent-recovery.test.ts
+++ b/src/main/daemon/daemon-pty-adapter-concurrent-recovery.test.ts
@@ -138,7 +138,7 @@ it.skipIf(process.platform === 'win32')(
         spawnSubprocess: replacementSpawn
       })
       await replacement.start()
-      // SAFETY: this is the exact owned fixture server's authenticated connection registry.
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: this is the exact owned fixture server's authenticated connection registry.
       const connections = (original as unknown as { connections: DaemonClientConnections })
         .connections
       connections.values().next().value?.controlSocket.destroy()
diff --git a/src/main/daemon/daemon-pty-adapter-history-checkpoints.test.ts b/src/main/daemon/daemon-pty-adapter-history-checkpoints.test.ts
index ff255a9cae12..87563f108016 100644
--- a/src/main/daemon/daemon-pty-adapter-history-checkpoints.test.ts
+++ b/src/main/daemon/daemon-pty-adapter-history-checkpoints.test.ts
@@ -183,6 +183,7 @@ describe('DaemonPtyAdapter (IPtyProvider)', () => {
       const checkpoint = vi.fn(async () => 'committed' as const)
       const appendIncrements = vi.fn(async () => 'ok' as const)
       const dispose = vi.fn(async () => {})
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: replace only the owned history fixture dependencies with their typed stubs.
       const internals = historyAdapter as unknown as {
         client: { request: typeof request; disconnect: () => void }
         historyManager: {
diff --git a/src/main/daemon/daemon-pty-adapter-protocol-compatibility.test.ts b/src/main/daemon/daemon-pty-adapter-protocol-compatibility.test.ts
index 296ebd7a45a9..1210bc78e6f4 100644
--- a/src/main/daemon/daemon-pty-adapter-protocol-compatibility.test.ts
+++ b/src/main/daemon/daemon-pty-adapter-protocol-compatibility.test.ts
@@ -475,7 +475,7 @@ describe('DaemonPtyAdapter (IPtyProvider)', () => {
       request: (...args: Parameters<DaemonClient['request']>) => Promise<unknown>
     ): DaemonPtyAdapter {
       const probeAdapter = new DaemonPtyAdapter({ socketPath, tokenPath, protocolVersion })
-      // SAFETY: stub external RPC answers while keeping the actual client's transport lifetime.
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: stub external RPC answers while keeping the actual client's transport lifetime.
       const client = (probeAdapter as unknown as { client: DaemonClient }).client
       vi.spyOn(client, 'request').mockImplementation(request)
       return probeAdapter
@@ -688,7 +688,7 @@ describe('DaemonPtyAdapter (IPtyProvider)', () => {
         tokenPath,
         protocolVersion
       })
-      // SAFETY: stub external RPC answers while keeping the actual client's transport lifetime.
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: stub external RPC answers while keeping the actual client's transport lifetime.
       const client = (inspectionAdapter as unknown as { client: DaemonClient }).client
       vi.spyOn(client, 'request').mockImplementation(request)
       return inspectionAdapter
diff --git a/src/main/daemon/daemon-pty-adapter-steady-state-compat.test.ts b/src/main/daemon/daemon-pty-adapter-steady-state-compat.test.ts
index df62bd8872cc..849a92cce05a 100644
--- a/src/main/daemon/daemon-pty-adapter-steady-state-compat.test.ts
+++ b/src/main/daemon/daemon-pty-adapter-steady-state-compat.test.ts
@@ -15,7 +15,7 @@ function createAdapter(
     tokenPath: '/tmp/orca-steady-state-compat.token',
     protocolVersion
   })
-  // SAFETY: replace only external RPC answers; preserve the actual client lifetime.
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: replace only external RPC answers; preserve the actual client lifetime.
   ;(adapter as unknown as ClientInternals).client.request = request
   return adapter
 }
diff --git a/src/main/daemon/daemon-pty-adapter-switch-compatibility.test-fixture.ts b/src/main/daemon/daemon-pty-adapter-switch-compatibility.test-fixture.ts
index ef1967e963e5..f5d8dce6abb3 100644
--- a/src/main/daemon/daemon-pty-adapter-switch-compatibility.test-fixture.ts
+++ b/src/main/daemon/daemon-pty-adapter-switch-compatibility.test-fixture.ts
@@ -85,7 +85,7 @@ export function registerDaemonSwitchCompatibilityTests(fixture: {
                 (stale && frame.type === 'cancelCreateOrAttach'))
             ) {
               receiverObserved = true
-              // SAFETY: modify only this fixture's actual authenticated response bytes.
+              // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: modify only this fixture's actual authenticated response bytes.
               const peers = (fixture.server as unknown as { connections: DaemonClientConnections })
                 .connections
               const peer = [...peers.values()].at(-1)?.controlSocket
@@ -154,7 +154,7 @@ export function registerDaemonSwitchCompatibilityTests(fixture: {
             throw new Error('known old anchor lost its ordinary settlement owner')
           }
           await tracked
-          // SAFETY: inspect only the owned fixture receiver's retained handoff state.
+          // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: inspect only the owned fixture receiver's retained handoff state.
           const receiver = fixture.server as unknown as {
             preparations: { hasOwedOutcomes(): boolean }
           }
diff --git a/src/main/daemon/daemon-server-async-spawn-cancellation.test.ts b/src/main/daemon/daemon-server-async-spawn-cancellation.test.ts
index a8b48f379d77..1223bd8d39af 100644
--- a/src/main/daemon/daemon-server-async-spawn-cancellation.test.ts
+++ b/src/main/daemon/daemon-server-async-spawn-cancellation.test.ts
@@ -108,12 +108,12 @@ describe('daemon async spawn cancellation', () => {
       let releaseReplyDropped = false
       let originalReply: (() => void) | undefined
       let lateReply: (() => void) | undefined
-      // SAFETY: inspect only this fixture's receiver and adapter ownership maps.
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: inspect only this fixture's receiver and adapter ownership maps.
       const receiver = server as unknown as {
         preparations: { retained: Map<string, unknown> }
         connections: DaemonClientConnections
       }
-      // SAFETY: read-only assertions on the actual local owners, never resolve/remove them from a test.
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: read-only assertions on the actual local owners, never resolve/remove them from a test.
       const local = adapter as unknown as {
         switchReleaseCleanup: Map<string, unknown>
         switchReleaseDrain?: Promise<void>
@@ -317,11 +317,12 @@ describe('daemon async spawn cancellation', () => {
           if (!successor) {
             throw new Error('successor missing')
           }
-          // SAFETY: actual successor transport/outcome maps, never mutate them.
+          // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: actual successor transport/outcome maps, never mutate them.
           const replacement = server as unknown as {
             preparations: { retained: Map<string, unknown> }
             connections: DaemonClientConnections
           }
+          // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: read only the successor adapter cleanup maps; tests never settle or delete physical ownership.
           const cleanup = successor as unknown as {
             switchReleaseCleanup: Map<string, unknown>
             switchReleaseDrain?: Promise<void>
diff --git a/src/main/daemon/daemon-server-creation-failure.test-fixture.ts b/src/main/daemon/daemon-server-creation-failure.test-fixture.ts
index fd6ad0807a85..0dce60caf449 100644
--- a/src/main/daemon/daemon-server-creation-failure.test-fixture.ts
+++ b/src/main/daemon/daemon-server-creation-failure.test-fixture.ts
@@ -156,7 +156,7 @@ export function registerDaemonCreationFailureTests(fixture: DaemonCreationFailur
           throw new Error('known preparation lost its ordinary owner')
         }
         await owner.work
-        // SAFETY: inspect only this fixture receiver's actual outcome owner.
+        // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: inspect only this fixture receiver's actual outcome owner.
         const receiver = fixture.server as unknown as {
           preparations: { hasOwedOutcomes(): boolean }
           connections: DaemonClientConnections
@@ -196,6 +196,7 @@ export function registerDaemonCreationFailureTests(fixture: DaemonCreationFailur
       30_000,
       abort.signal
     )
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: inspect only the fixture receiver pending cancellation registrations.
     const daemon = fixture.server as unknown as {
       preparations: { pending: Map<string, Set<{ canceled: boolean }>> }
     }
@@ -222,6 +223,7 @@ export function registerDaemonCreationFailureTests(fixture: DaemonCreationFailur
       abort.signal
     )
     await fixture.spawnStarted
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: inspect only the fixture receiver pending map after its real spawn admission.
     const daemon = fixture.server as unknown as DaemonServerInternals
     await vi.waitFor(() => expect(daemon.preparations.pending.get('shared-session')?.size).toBe(2))
 
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test-fixture.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test-fixture.ts
index 672aec6fc9b2..9f115e11a99a 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test-fixture.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test-fixture.ts
@@ -53,7 +53,7 @@ export async function verifySwitchOutcomeOutage(fixture: OutageFixture) {
   if (!noFork && !nativeFailed) {
     // Real loss before the held creation returns; no receiver outcome can reach this observer.
     wire.connectionUnavailable = true
-    // SAFETY: exact fixture connection only.
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: exact fixture connection only.
     const peers = (server as unknown as { connections: DaemonClientConnections }).connections
     // The adapter is the second authenticated pair; preserve the unrelated sibling.
     const sockets = [...peers.values()]
@@ -63,10 +63,10 @@ export async function verifySwitchOutcomeOutage(fixture: OutageFixture) {
     release.resolve()
   }
   expect(await outcome).toMatchObject({ ok: false })
-  // SAFETY: inspect the exact receiver owner, never write its disposition or resolve its work.
-  const retained = (
-    server as unknown as { preparations: { retained: Map<string, { outcome?: string }> } }
-  ).preparations.retained
+  const retained =
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: inspect the exact receiver owner without changing disposition or resolving work.
+    (server as unknown as { preparations: { retained: Map<string, { outcome?: string }> } })
+      .preparations.retained
   await vi.waitFor(() =>
     expect([...retained.values()]).toMatchObject([{ outcome: terminalOutcome }])
   )
@@ -146,11 +146,12 @@ export async function verifySwitchFinalDelivery(fixture: FinalDeliveryFixture) {
     await vi.waitFor(() => expect(tabIds()).toEqual([TAB_ID]))
   }
   if (boundary === 'gc-outage' || boundary === 'native-gc-outage') {
-    // SAFETY: only inspect the actual fixture owners; GC debt cannot hold the already delivered send.
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: only inspect the actual fixture owners; GC debt cannot hold the already delivered send.
     const local = adapter as unknown as {
       switchReleaseCleanup: Map<string, unknown>
       switchReleaseDrain?: Promise<void>
     }
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: inspect the actual fixture receiver retention map without mutating its ownership.
     const receiver = server as unknown as { preparations: { retained: Map<string, unknown> } }
     expect(local.switchReleaseCleanup.size).toBe(1)
     expect(receiver.preparations.retained.size).toBe(1)
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test.ts
index ed16e454f52b..1cd75f34e0cc 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test.ts
@@ -510,7 +510,7 @@ function registerSwitchDaemonComposition(
             boundary === 'recovery-failed' ||
             boundary === 'recovery-used'
           ) {
-            // SAFETY: read this fixture server's connection registry only to break its exact external socket.
+            // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: read this fixture server's connection registry only to break its exact external socket.
             const connections = (server as unknown as { connections: DaemonClientConnections })
               .connections
             const client = connections.values().next().value
@@ -527,6 +527,7 @@ function registerSwitchDaemonComposition(
             }
           } else if (boundary === 'lost-reply' || boundary === 'missing-result') {
             // Drop only this commit's external response bytes; the authenticated socket stays usable.
+            // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the fixture owns this server's exact response socket and retained commit lookup.
             const daemon = server as unknown as {
               connections: DaemonClientConnections
               preparations: { pending: Map<string, Set<{ requestId: string }>> }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-socket.test-fixture.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-socket.test-fixture.ts
index 157673f63438..6827bb6af814 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-socket.test-fixture.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-socket.test-fixture.ts
@@ -51,7 +51,7 @@ export function installSwitchSocketFaults(
         if (boundary === 'legacy-never-created') {
           return true
         }
-        // SAFETY: retain/drop only the owned original ordinary response bytes; sockets and sibling stay live.
+        // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: retain/drop only the owned original ordinary response bytes; sockets and sibling stay live.
         const peers = (server as unknown as { connections: DaemonClientConnections }).connections
         const peer = [...peers.values()].at(-1)?.controlSocket
         if (!peer) {
@@ -84,7 +84,7 @@ export function installSwitchSocketFaults(
         boundary === 'stale-daemon-token' &&
         frame.payload?.switchExecution?.phase === 'prepare'
       ) {
-        // SAFETY: the fixture owns both authenticated sockets; simulate old development response bytes only.
+        // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the fixture owns both authenticated sockets; simulate old development response bytes only.
         const peers = (server as unknown as { connections: DaemonClientConnections }).connections
         const peer = [...peers.values()].at(-1)?.controlSocket
         if (!peer) {
@@ -105,7 +105,7 @@ export function installSwitchSocketFaults(
           wire.receiverDelay = 720_001
         }
         if (outage) {
-          // SAFETY: this fixture owns both ends of this authenticated transport.
+          // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: this fixture owns both ends of this authenticated transport.
           const peers = (server as unknown as { connections: DaemonClientConnections }).connections
           const peer = [...peers.values()].at(-1)?.controlSocket
           if (!peer) {
diff --git a/src/main/runtime/construction/runtime-identity-state.ts b/src/main/runtime/construction/runtime-identity-state.ts
index 542f9832985b..71e58e9274f6 100644
--- a/src/main/runtime/construction/runtime-identity-state.ts
+++ b/src/main/runtime/construction/runtime-identity-state.ts
@@ -1,12 +1,10 @@
 import { randomUUID } from 'node:crypto'
+import { preserveSessionTabOpenPlacements } from '../session-tabs/session-tab-open-placement'
 import { preserveTerminalRetirementProofs } from '../mobile-session-terminal-retirement-proof'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../shared/layout-owner-switch'
 import { startedMainTerminalSurfaces } from '../terminal/surface/main-terminal-surfaces'
 import { mainBindsUnendedTerminal } from '../terminal/surface/main-pane-verdict'
-import {
-  headlessMobileSnapshotContentUnchanged,
-  mobileSnapshotIdentityUnchanged
-} from '../mobile-session-snapshot-equality'
+import { unchangedMainSessionSnapshotRebuild } from '../mobile-session-snapshot-equality'
 import type { TuiAgent } from '../../../shared/tui-agent'
 import { isTuiAgent } from '../../../shared/tui-agent-config'
 import type { RuntimeStore } from '../runtime-store-contract'
@@ -116,18 +114,14 @@ export abstract class OrcaRuntimeWithRuntimeId extends RuntimeConstructionServic
     snapshot: RuntimeMobileSessionTabsSnapshot
   ): RuntimeMobileSessionTabsSnapshot {
     const existing = this.mobileSessionTabsByWorktree.get(worktreeId)
+    snapshot = preserveSessionTabOpenPlacements(snapshot, existing)
     if (snapshot.switchProjections === undefined && existing?.switchProjections) {
       snapshot = { ...snapshot, switchProjections: existing.switchProjections }
     }
     if (ORCA_LAYOUT_OWNER_IS_MAIN) {
       const merged = startedMainTerminalSurfaces(this)?.withMainOrder(snapshot) ?? snapshot
       // Main-order-only rebuilds are no-ops unless occupant/publication/retirement evidence changed.
-      if (
-        existing &&
-        mobileSnapshotIdentityUnchanged(existing, snapshot) &&
-        headlessMobileSnapshotContentUnchanged(existing, merged) &&
-        !headlessMobileSnapshotContentUnchanged(snapshot, merged)
-      ) {
+      if (unchangedMainSessionSnapshotRebuild(existing, snapshot, merged)) {
         return existing
       }
       snapshot = merged
diff --git a/src/main/runtime/mobile-session-snapshot-equality.ts b/src/main/runtime/mobile-session-snapshot-equality.ts
index d3f1a067be51..0298a725ab04 100644
--- a/src/main/runtime/mobile-session-snapshot-equality.ts
+++ b/src/main/runtime/mobile-session-snapshot-equality.ts
@@ -74,3 +74,17 @@ export function mobileSnapshotIdentityUnchanged(
       mobileSnapshotValueEqual(next.retiredTerminalSurfaces, existing.retiredTerminalSurfaces))
   )
 }
+
+/** Main-order reconciliation can reuse an unchanged occupant without publishing a new version. */
+export function unchangedMainSessionSnapshotRebuild(
+  existing: RuntimeMobileSessionTabsSnapshot | undefined,
+  snapshot: RuntimeMobileSessionTabsSnapshot,
+  merged: RuntimeMobileSessionTabsSnapshot
+): existing is RuntimeMobileSessionTabsSnapshot {
+  return Boolean(
+    existing &&
+    mobileSnapshotIdentityUnchanged(existing, snapshot) &&
+    headlessMobileSnapshotContentUnchanged(existing, merged) &&
+    !headlessMobileSnapshotContentUnchanged(snapshot, merged)
+  )
+}
diff --git a/src/main/runtime/orca-runtime.ts b/src/main/runtime/orca-runtime.ts
index 43629dbed081..076b0a6e5516 100644
--- a/src/main/runtime/orca-runtime.ts
+++ b/src/main/runtime/orca-runtime.ts
@@ -1,3 +1,4 @@
+import { withPublishedSessionTabOpenPlacements } from './session-tabs/session-tab-open-placement'
 import { parsePaneKey } from '../../shared/stable-pane-id'
 import { noteAgentLaunchPaneAccepted } from '../agent-launch/agent-launch-pane-attachment'
 import { conversationRecordReader } from './orchestration/structured-session-lineage'
@@ -243,6 +244,11 @@ class OrcaRuntimeService extends OrcaRuntimeSidebarBase {
     store: () => this.store,
     homeHostId: (key) => this.tryGetWorkspaceSessionHostIdForWorktree(key),
     liveTitle: (ptyId) => this.getTrackedDisplayTitleForPty(ptyId) || null,
+    withOpenPlacements: (layout) =>
+      withPublishedSessionTabOpenPlacements(
+        layout,
+        this.mobileSessionTabsByWorktree.get(layout.worktreeId)
+      ),
     ...this.paneFactSources()
   })
 
diff --git a/src/main/runtime/published-pane-live-titles.ts b/src/main/runtime/published-pane-live-titles.ts
index c6d15166cd98..7a0a9066895e 100644
--- a/src/main/runtime/published-pane-live-titles.ts
+++ b/src/main/runtime/published-pane-live-titles.ts
@@ -27,3 +27,13 @@ export function withLiveTitles(
     )
   }
 }
+
+/** Collect titles in the same tab/pane order used by the ordinary live overlay. */
+export function paneLiveTitlesOf(
+  layout: PublishedWorkspaceLayout,
+  source: { liveTitle: (ptyId: string) => string | null }
+): (string | null)[] {
+  return layout.tabs.flatMap((tab) =>
+    (tab.terminal?.panes ?? []).map((pane) => (pane.ptyId ? source.liveTitle(pane.ptyId) : null))
+  )
+}
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
index 9d517c91029f..813c9d09af3c 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
@@ -225,6 +225,7 @@ it.each(['single', 'split', 'split-during-stop'] as const)(
         sessionId: id,
         execution: {
           invocationId: 'from-pane',
+          viewerSelection: 'source-viewer',
           source: {
             terminal: source.handle,
             expectedIncarnationId: incarnationId,
@@ -270,7 +271,17 @@ it.each(['single', 'split', 'split-during-stop'] as const)(
       'agent-session:later-tab'
     ])
     expect(group?.activeTabId).toBe(destination)
-    expect((await runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)).activeTabId).toBe(destination)
+    const published = await runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)
+    expect(published.activeTabId).toBe(destination)
+    expect(published.tabs.find((tab) => tab.id === destination)).toMatchObject({
+      openPlacement: {
+        invocationId: 'from-pane',
+        generation: expect.any(String),
+        viewerSelection: 'source-viewer',
+        placement: { afterTabId: TAB_ID, index: 0 },
+        source: source.presentation.identity
+      }
+    })
     const layout = session().terminalLayoutsByTabId[TAB_ID]
     if (split) {
       expect(layout?.ptyIdsByLeafId?.[LEAF_B]).toBe(PTY_B)
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
index 6721ff6e8e34..579921cd555d 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
@@ -26,7 +26,11 @@ import {
   prepareStructuredAgentSessionCreateForWorktree,
   commitStructuredAgentSessionCreate
 } from './structured-agent-session-create'
-import { recordWorkspace, switchRetainedOwner } from './structured-agent-session-switch-source'
+import {
+  captureStructuredSwitchTerminalSource,
+  recordWorkspace,
+  switchRetainedOwner
+} from './structured-agent-session-switch-source'
 import { executeStructuredSessionTerminalSwitch } from './structured-agent-session-switch-terminal-execution'
 import { agentLaunchMovesHostWindow } from './agent-launch-tab-publication'
 import { interruptWorkingAgent } from '../../terminal-agent-interrupt'
@@ -75,26 +79,15 @@ export async function executeStructuredSessionSwitch(
         deadline.check()
         const source = 'source' in execution ? execution.source : undefined
         const close = source
-          ? (() => {
-              try {
-                return ctx.runtime.captureTerminalSwitchClose(
-                  source.terminal,
-                  source.expectedIncarnationId,
-                  source.originalPresentation
-                )
-              } catch {
-                host.deps.logger.warn('switch source owner was not confirmed', {
-                  scope: 'session-switch',
-                  sessionId,
-                  direction,
-                  source: 'terminal',
-                  exactIncarnation: false
-                })
-                throw agentSessionRefusalError('agent_session_ownership_unknown', {
-                  reason: 'ownerUnproven'
-                })
-              }
-            })()
+          ? captureStructuredSwitchTerminalSource(
+              ctx.runtime,
+              host,
+              sessionId,
+              direction,
+              source.terminal,
+              source.expectedIncarnationId,
+              source.originalPresentation
+            )
           : undefined
         const paneKey = close ? `${close.source.tabId}:${close.source.leafId}` : undefined
         const row = paneKey ? ctx.runtime.agentTransitions.latestRow(paneKey) : null
@@ -243,6 +236,7 @@ export async function executeStructuredSessionSwitch(
         if (!revealed.readable && revealed.openRefusal) {
           throw new AgentSessionRefusalError(revealed.openRefusal)
         }
+        const placement = (close ? close.placement() : create?.tabPlacement) ?? {}
         await ctx.runtime.publishStructuredAgentSessionTab({
           ...revealed,
           activate: true,
@@ -250,7 +244,15 @@ export async function executeStructuredSessionSwitch(
           selectionCurrent,
           viewerSelection: execution.viewerSelection,
           focusWindow: agentLaunchMovesHostWindow(ctx),
-          placement: close?.placement() ?? create?.tabPlacement
+          placement,
+          openPlacement: {
+            invocationId: execution.invocationId,
+            generation: host.switchGeneration(sessionId)!,
+            placement,
+            activate: true,
+            viewerSelection: execution.viewerSelection,
+            ...(close ? { source: close.source } : {})
+          }
         })
         deadline.check()
         if (close) {
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-source.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-source.ts
index 8b4981122181..5b638b983c93 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-source.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-source.ts
@@ -1,3 +1,4 @@
+import type { RpcContext } from '../core'
 import type { StructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-host'
 
 import { agentSessionRefusalError } from '../../../../shared/agent-session-wire-refusals'
@@ -57,3 +58,27 @@ export function switchRetainedOwner(
     })?.sessionId ?? null
   )
 }
+
+/** Translate only an unconfirmed exact terminal capture into the existing ownership refusal. */
+export function captureStructuredSwitchTerminalSource(
+  runtime: RpcContext['runtime'],
+  host: StructuredAgentSessionHost,
+  sessionId: string,
+  direction: 'chat' | 'terminal',
+  ...source: Parameters<RpcContext['runtime']['captureTerminalSwitchClose']>
+) {
+  try {
+    return runtime.captureTerminalSwitchClose(...source)
+  } catch {
+    host.deps.logger.warn('switch source owner was not confirmed', {
+      scope: 'session-switch',
+      sessionId,
+      direction,
+      source: 'terminal',
+      exactIncarnation: false
+    })
+    throw agentSessionRefusalError('agent_session_ownership_unknown', {
+      reason: 'ownerUnproven'
+    })
+  }
+}
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts
index 79ee477539d8..43fbfbdc22ad 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts
@@ -81,6 +81,10 @@ export async function executeStructuredSessionTerminalSwitch(
     })
   }
   deadline.check()
+  const placement = retire.placement() ?? {
+    afterTabId: sourceTabId,
+    groupId: terminalExecution?.groupId
+  }
   const terminal = await ctx.runtime.createSessionSwitchTerminal(record.location.workspaceId, {
     invocationId: execution.invocationId,
     sessionId,
@@ -92,6 +96,13 @@ export async function executeStructuredSessionTerminalSwitch(
     groupId: terminalExecution?.groupId,
     execution: {
       invocationId: execution.invocationId,
+      openPlacement: {
+        invocationId: execution.invocationId,
+        generation: host.switchGeneration(sessionId)!,
+        placement,
+        activate: true,
+        viewerSelection: execution.viewerSelection
+      },
       signal: deadline.signal,
       trackPhysical: (work, recover) => host.trackSwitchPhysical(sessionId, work, recover),
       remaining: deadline.remaining,
diff --git a/src/main/runtime/runtime-mobile-session-projection.ts b/src/main/runtime/runtime-mobile-session-projection.ts
index 7d75109ec3fe..65269a539311 100644
--- a/src/main/runtime/runtime-mobile-session-projection.ts
+++ b/src/main/runtime/runtime-mobile-session-projection.ts
@@ -282,6 +282,7 @@ export function projectRuntimeMobileSessionTabs(
       : {}
     tabs.push({
       type: 'terminal',
+      ...(tab.openPlacement ? { openPlacement: tab.openPlacement } : {}),
       id: tab.id,
       parentTabId: tab.parentTabId,
       leafId: tab.leafId,
diff --git a/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.test.ts b/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.test.ts
index 231b9149ced7..79d5dba00933 100644
--- a/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.test.ts
+++ b/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.test.ts
@@ -8,6 +8,7 @@ import {
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { WORKTREE_ID, setupMainOwnedWorkspace } from '../main-owned-workspace-runtime-fixture'
 import { publishAgentLaunchTabEarly } from '../rpc/methods/agent-launch-tab-publication'
+import type { PublishedTab } from '../../../shared/workspace-layout/workspace-layout-published'
 
 // Layout-owner build, no window: an agent launch's early tab in a workspace main owns is written by
 // main, a retry finds it, and a withdrawn launch pane is taken back by main.
@@ -201,3 +202,58 @@ describe('conditional launch withdrawal at the durable writer', () => {
     ).toBe(false)
   })
 })
+
+it('uses a captured index through ordinary launch publication when its source already retired', async () => {
+  const { fixture } = launchHost()
+  const published: Pick<PublishedTab, 'id' | 'openPlacement'>[] = []
+  const subscription = fixture.runtime.subscribeWorkspaceLayouts((event) => {
+    if (event.type === 'workspace') {
+      published.push(...event.layout.tabs)
+    }
+    if (event.type === 'records') {
+      for (const change of event.workspaces) {
+        if (change.change === 'layout') {
+          published.push(...change.layout.tabs)
+        }
+        if (change.change === 'records') {
+          published.push(...(change.tabs?.set ?? []))
+        }
+      }
+    }
+  })
+  const request = {
+    worktreeId: WORKTREE_ID,
+    tabId: NEW_TAB,
+    leafId: NEW_LEAF,
+    launchAgent: 'codex' as const,
+    viewMode: 'terminal' as const,
+    viewer: 'none' as const,
+    placement: { afterTabId: 'naturally-retired-source', index: 0 },
+    openPlacement: {
+      invocationId: 'captured-open',
+      generation: 'captured-generation',
+      placement: { afterTabId: 'naturally-retired-source', index: 0 },
+      activate: false,
+      viewerSelection: 'original-viewer'
+    }
+  }
+  await fixture.runtime.publishAgentLaunchTabInMainLayout(request)
+  const result = await fixture.runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)
+  const group = fixture
+    .session()
+    .tabGroups?.[WORKTREE_ID]?.find((row) => row.tabOrder.includes(NEW_TAB))
+  expect(group?.tabOrder[0]).toBe(NEW_TAB)
+  const row = result.tabs.find((tab) => tab.type === 'terminal' && tab.parentTabId === NEW_TAB)
+  expect(row).toMatchObject({ openPlacement: request.openPlacement })
+  expect(published.find((tab) => tab.id === NEW_TAB)).toMatchObject({
+    openPlacement: request.openPlacement
+  })
+  expect(JSON.stringify(fixture.session())).not.toContain('openPlacement')
+  fixture.runtime.hydrateHeadlessMobileSessionTabsFromWorkspaceSession(WORKTREE_ID, { force: true })
+  expect(
+    (await fixture.runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)).tabs.find(
+      (tab) => tab.id === row?.id
+    )
+  ).toMatchObject({ openPlacement: request.openPlacement })
+  subscription.unsubscribe()
+})
diff --git a/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.ts b/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.ts
index b6ecc1f38dc2..7c7105bdb87e 100644
--- a/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.ts
+++ b/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.ts
@@ -81,6 +81,7 @@ export abstract class OrcaRuntimeWithMainLayoutAgentLaunchTabs extends OrcaRunti
         viewMode: request.viewMode,
         ...(placement?.groupId ? { groupId: placement.groupId } : {}),
         ...(placement?.afterTabId ? { afterTabId: placement.afterTabId } : {}),
+        ...(placement?.index !== undefined ? { index: placement.index } : {}),
         creation: { launchAgent: request.launchAgent }
       },
       {
@@ -94,6 +95,30 @@ export abstract class OrcaRuntimeWithMainLayoutAgentLaunchTabs extends OrcaRunti
           : {}),
         onApplied: () => {
           withdrawalRoot = this.launchWithdrawalIdentity(worktreeId, tabId)
+          if (request.openPlacement) {
+            this.hydrateHeadlessMobileSessionTabsFromWorkspaceSession(worktreeId, {
+              allowAttachedWindow: true,
+              force: true
+            })
+            const snapshot = this.mobileSessionTabsByWorktree.get(worktreeId)
+            if (snapshot) {
+              this.storeMobileSessionSnapshot(worktreeId, {
+                ...snapshot,
+                tabs: snapshot.tabs.map((tab) =>
+                  tab.type === 'terminal' && tab.parentTabId === tabId && tab.leafId === leafId
+                    ? {
+                        ...tab,
+                        openPlacement: {
+                          ...request.openPlacement,
+                          activate: request.openPlacement.activate && (selectionCurrent?.() ?? true)
+                        }
+                      }
+                    : tab
+                )
+              })
+              this.markPaneLiveTitlesDirty()
+            }
+          }
         }
       }
     ).then((reply) => {
diff --git a/src/main/runtime/session-tabs/main-session-tab-rows.ts b/src/main/runtime/session-tabs/main-session-tab-rows.ts
index 0fd652a42fe6..fcfeab4588bc 100644
--- a/src/main/runtime/session-tabs/main-session-tab-rows.ts
+++ b/src/main/runtime/session-tabs/main-session-tab-rows.ts
@@ -1,5 +1,6 @@
 // Use main's rows/order/groups, augmented by window-only rows and live view facts (selection, dirty state, titles, theme/status and editor drafts).
 
+import { preserveSessionTabOpenPlacement } from './session-tab-open-placement'
 import type { RuntimeMobileSessionSnapshotTab } from '../../../shared/runtime-mobile-session-tab-contracts'
 import { orderIdOf, placeInMainGroups, withStrayIn } from './main-session-tab-group-placement'
 import type {
@@ -127,7 +128,10 @@ export function withMainSessionTabRows(
   // A main-held row is main's; a browser or chat row stays the window's while both list it.
   const rows = projected.tabs.map((row) =>
     isMainRow(row)
-      ? withWindowFacts(row, windowRows.get(row.id), rules)
+      ? preserveSessionTabOpenPlacement(
+          withWindowFacts(row, windowRows.get(row.id), rules),
+          windowRows.get(row.id)
+        )
       : (windowRows.get(row.id) ?? row)
   )
   const windowOnlyIds = new Set(windowOnly.map((row) => row.id))
diff --git a/src/main/runtime/session-tabs/session-tab-open-placement-scaling.test.ts b/src/main/runtime/session-tabs/session-tab-open-placement-scaling.test.ts
new file mode 100644
index 000000000000..7415309d412a
--- /dev/null
+++ b/src/main/runtime/session-tabs/session-tab-open-placement-scaling.test.ts
@@ -0,0 +1,204 @@
+// Production snapshot storage and frame overlays execute; only external workspace/process I/O uses the existing fixture.
+import { expect, it, vi } from 'vitest'
+import * as placementProjection from './session-tab-open-placement'
+import type { PublishedWorkspaceLayout } from '../../../shared/workspace-layout/workspace-layout-published'
+import { applyWorkspaceLayoutRecordChange } from '../../../shared/workspace-layout/workspace-layout-records'
+import {
+  setupMainOwnedWorkspace,
+  WORKTREE_ID,
+  TAB_ID,
+  LEAF_A,
+  PTY_A
+} from '../main-owned-workspace-runtime-fixture'
+
+vi.mock('../../../shared/layout-owner-switch', () => ({ ORCA_LAYOUT_OWNER_IS_MAIN: true }))
+
+/** Count reads without replacing the production owner, lookup, equality or overlay. */
+function observeFieldReads(
+  rows: readonly object[],
+  keys: readonly string[],
+  count: () => void
+): void {
+  for (const row of rows) {
+    for (const key of keys) {
+      if (!Object.hasOwn(row, key)) {
+        continue
+      }
+      const value: unknown = Reflect.get(row, key)
+      Object.defineProperty(row, key, {
+        configurable: true,
+        enumerable: true,
+        get: () => {
+          count()
+          return value
+        }
+      })
+    }
+  }
+}
+
+it('bounds retained placement work linearly on ordinary snapshot and unchanged frame replay at N/10N', async () => {
+  const samples: { n: number; snapshotReads: number; frameReads: number }[] = []
+  for (const n of [32, 320]) {
+    const { runtime, bindPty } = setupMainOwnedWorkspace()
+    for (let index = 0; index < n; index++) {
+      const openPlacement = {
+        invocationId: `switched-${index}`,
+        generation: `generation-${index}`,
+        placement: { afterTabId: `retired-source-${index}`, index },
+        activate: false,
+        viewerSelection: 'original-viewer'
+      }
+      await (index % 2 === 0
+        ? runtime.publishStructuredAgentSessionTab({
+            workspaceId: WORKTREE_ID,
+            sessionId: `retained-${index}`,
+            agent: 'codex',
+            activate: false,
+            check: () => {},
+            openPlacement
+          })
+        : runtime.publishAgentLaunchTabInMainLayout({
+            worktreeId: WORKTREE_ID,
+            tabId: `retained-terminal-${index}`,
+            leafId: `11111111-1111-4111-8111-${String(index).padStart(12, '0')}`,
+            launchAgent: 'codex',
+            viewMode: 'terminal',
+            viewer: 'none',
+            placement: openPlacement.placement,
+            openPlacement
+          }))
+    }
+    let measuring: 'snapshot' | 'frame' | undefined
+    const rowKeys = ['id', 'sessionId', 'parentTabId', 'leafId', 'openPlacement']
+    let snapshotReads = 0
+    let frameReads = 0
+    const countRead = () => {
+      if (measuring === 'snapshot') {
+        snapshotReads++
+      } else if (measuring === 'frame') {
+        frameReads++
+      }
+    }
+    const preserve = placementProjection.preserveSessionTabOpenPlacements
+    const overlay = placementProjection.withPublishedSessionTabOpenPlacements
+    // Observe the added owners while running their real bodies; unrelated title/status readers are outside this contract.
+    const preserveObservation = vi
+      .spyOn(placementProjection, 'preserveSessionTabOpenPlacements')
+      .mockImplementation((...args) => {
+        measuring = 'snapshot'
+        try {
+          return preserve(...args)
+        } finally {
+          measuring = undefined
+        }
+      })
+    const overlayObservation = vi
+      .spyOn(placementProjection, 'withPublishedSessionTabOpenPlacements')
+      .mockImplementation((...args) => {
+        observeFieldReads(args[0].tabs, ['id', 'entityId', 'terminal'], countRead)
+        observeFieldReads(
+          args[0].tabs.flatMap((tab) => tab.terminal?.panes ?? []),
+          ['leafId', 'ptyId'],
+          countRead
+        )
+        measuring = 'frame'
+        try {
+          return overlay(...args)
+        } finally {
+          measuring = undefined
+        }
+      })
+    let frames = 0
+    const layouts = new Map<string, PublishedWorkspaceLayout>()
+    const subscription = runtime.subscribeWorkspaceLayouts((event) => {
+      frames++
+      if (event.type === 'records') {
+        for (const change of event.workspaces) {
+          const next = applyWorkspaceLayoutRecordChange(layouts.get(change.key), change)
+          if (next) {
+            layouts.set(change.key, next)
+          } else {
+            layouts.delete(change.key)
+          }
+        }
+      }
+    })
+    for (const entry of subscription.snapshot) {
+      layouts.set(entry.key, entry.layout)
+    }
+    try {
+      const existing = runtime.mobileSessionTabsByWorktree.get(WORKTREE_ID)
+      if (!existing) {
+        throw new Error('missing actual publication rows')
+      }
+      expect(existing.tabs.filter((row) => 'openPlacement' in row)).toHaveLength(n)
+      // An ordinary graph replay omits optional metadata; the same destination retains it.
+      const replay = {
+        ...existing,
+        tabs: existing.tabs.map((row) => {
+          if (row.type !== 'agent-session' && row.type !== 'terminal') {
+            return { ...row }
+          }
+          const { openPlacement: _placement, ...rest } = row
+          return rest
+        })
+      }
+      observeFieldReads(existing.tabs, rowKeys, countRead)
+      observeFieldReads(replay.tabs, rowKeys, countRead)
+      runtime.storeMobileSessionSnapshot(WORKTREE_ID, replay)
+      const retained = runtime.mobileSessionTabsByWorktree.get(WORKTREE_ID)
+      if (!retained) {
+        throw new Error('ordinary replay lost rows')
+      }
+      expect(retained.tabs.filter((row) => 'openPlacement' in row)).toHaveLength(n)
+      const replayReads = snapshotReads
+      observeFieldReads(retained.tabs, rowKeys, countRead)
+      const before = frames
+      // An unchanged ordinary Store write still runs projection/overlay, but emits no duplicate frame.
+      bindPty({ worktreeId: WORKTREE_ID, tabId: TAB_ID, leafId: LEAF_A, ptyId: PTY_A })
+      await Promise.resolve()
+      await Promise.resolve()
+      expect(frames).toBe(before)
+      expect(frameReads).toBeGreaterThanOrEqual(n)
+      expect(snapshotReads).toBeGreaterThanOrEqual(n)
+      const shown = [...layouts.values()].find((layout) => layout.worktreeId === WORKTREE_ID)
+      expect(shown?.tabs.filter((tab) => tab.openPlacement)).toHaveLength(n)
+      const unchangedFrameReads = frameReads
+      // A real metadata change still publishes through the same ordinary live overlay.
+      runtime.projectStructuredAgentSessionTab({
+        workspaceId: WORKTREE_ID,
+        sessionId: 'retained-0',
+        agent: 'codex',
+        activate: false,
+        openPlacement: {
+          invocationId: 'reopened-0',
+          generation: 'reopened-generation',
+          placement: { index: 0 },
+          activate: false,
+          viewerSelection: 'current-viewer'
+        }
+      })
+      await Promise.resolve()
+      await Promise.resolve()
+      expect(frames).toBe(before + 1)
+      expect(
+        [...layouts.values()]
+          .flatMap((layout) => layout.tabs)
+          .find((tab) => tab.entityId === 'retained-0')?.openPlacement
+      ).toMatchObject({ generation: 'reopened-generation', viewerSelection: 'current-viewer' })
+      samples.push({ n, snapshotReads: replayReads, frameReads: unchangedFrameReads })
+    } finally {
+      subscription.unsubscribe()
+      preserveObservation.mockRestore()
+      overlayObservation.mockRestore()
+    }
+  }
+  console.info('MAIN_OPEN_PLACEMENT_WORK', JSON.stringify(samples))
+  for (const sample of samples) {
+    expect(sample.snapshotReads).toBeLessThanOrEqual(32 * (sample.n + 1))
+    expect(sample.frameReads).toBeLessThanOrEqual(32 * (sample.n + 1))
+  }
+  expect(samples[1].snapshotReads).toBeLessThanOrEqual(samples[0].snapshotReads * 11)
+  expect(samples[1].frameReads).toBeLessThanOrEqual(samples[0].frameReads * 11)
+})
diff --git a/src/main/runtime/session-tabs/session-tab-open-placement.ts b/src/main/runtime/session-tabs/session-tab-open-placement.ts
new file mode 100644
index 000000000000..e451bd608c48
--- /dev/null
+++ b/src/main/runtime/session-tabs/session-tab-open-placement.ts
@@ -0,0 +1,81 @@
+import type { PublishedWorkspaceLayout } from '../../../shared/workspace-layout/workspace-layout-published'
+import type { RuntimeMobileSessionSnapshotTab as Row } from '../../../shared/runtime-mobile-session-tab-contracts'
+import type { RuntimeMobileSessionTabsSnapshot } from '../../../shared/runtime-types'
+
+/** Rebuilds retain the open intent only for the same ordinary destination resource. */
+export function preserveSessionTabOpenPlacement(row: Row, prior: Row | undefined): Row {
+  if (row.type === 'agent-session' && prior?.type === 'agent-session') {
+    return row.openPlacement || row.id !== prior.id || row.sessionId !== prior.sessionId
+      ? row
+      : { ...row, ...(prior.openPlacement ? { openPlacement: prior.openPlacement } : {}) }
+  }
+  if (
+    row.type === 'terminal' &&
+    prior?.type === 'terminal' &&
+    !row.openPlacement &&
+    prior.openPlacement &&
+    row.id === prior.id &&
+    row.parentTabId === prior.parentTabId &&
+    row.leafId === prior.leafId &&
+    (!prior.ptyId || row.ptyId === prior.ptyId) &&
+    (!prior.incarnationId || row.incarnationId === prior.incarnationId)
+  ) {
+    return { ...row, openPlacement: prior.openPlacement }
+  }
+  return row
+}
+
+export function preserveSessionTabOpenPlacements(
+  snapshot: RuntimeMobileSessionTabsSnapshot,
+  existing: RuntimeMobileSessionTabsSnapshot | undefined
+): RuntimeMobileSessionTabsSnapshot {
+  if (
+    !existing ||
+    (snapshot.worktreeInstanceId &&
+      existing.worktreeInstanceId &&
+      snapshot.worktreeInstanceId !== existing.worktreeInstanceId)
+  ) {
+    return snapshot
+  }
+  const prior = new Map(existing.tabs.map((row) => [row.id, row]))
+  return {
+    ...snapshot,
+    tabs: snapshot.tabs.map((row) => preserveSessionTabOpenPlacement(row, prior.get(row.id)))
+  }
+}
+
+/** Frames and snapshots carry the same unsaved intent from the ordinary row owner. */
+export function withPublishedSessionTabOpenPlacements(
+  layout: PublishedWorkspaceLayout,
+  snapshot: RuntimeMobileSessionTabsSnapshot | undefined
+): PublishedWorkspaceLayout {
+  const chats = new Map<string, Extract<Row, { type: 'agent-session' }>>()
+  const terminals = new Map<string, Extract<Row, { type: 'terminal' }>[]>()
+  for (const row of snapshot?.tabs ?? []) {
+    if (row.type === 'agent-session' && row.openPlacement) {
+      chats.set(row.sessionId, row)
+    } else if (row.type === 'terminal' && row.openPlacement) {
+      const siblings = terminals.get(row.parentTabId) ?? []
+      siblings.push(row)
+      terminals.set(row.parentTabId, siblings)
+    }
+  }
+  if (chats.size === 0 && terminals.size === 0) {
+    return layout
+  }
+  return {
+    ...layout,
+    tabs: layout.tabs.map((tab) => {
+      let openPlacement =
+        tab.kind === 'agent-session' ? chats.get(tab.entityId)?.openPlacement : undefined
+      if (tab.kind === 'terminal') {
+        const panes = new Map(tab.terminal?.panes.map((pane) => [pane.leafId, pane]))
+        openPlacement = terminals.get(tab.id)?.find((row) => {
+          const pane = panes.get(row.leafId)
+          return pane && (!row.ptyId || pane.ptyId === row.ptyId)
+        })?.openPlacement
+      }
+      return openPlacement ? { ...tab, openPlacement } : tab
+    })
+  }
+}
diff --git a/src/main/runtime/session-tabs/structured-session-switch-projection.ts b/src/main/runtime/session-tabs/structured-session-switch-projection.ts
index 84d2060e1ebd..74bc7a2aab2a 100644
--- a/src/main/runtime/session-tabs/structured-session-switch-projection.ts
+++ b/src/main/runtime/session-tabs/structured-session-switch-projection.ts
@@ -109,7 +109,7 @@ export abstract class OrcaRuntimeWithStructuredSessionSwitchProjection extends O
             this.notifier?.closeSessionTab?.(tabId, worktreeId, { ...projection, phase: 'prepare' })
           ).catch(() => false)
         : undefined
-    return async () => {
+    const retire = async () => {
       const host = getStructuredAgentSessionHost()
       if (!host || !tabId) {
         return false
@@ -170,6 +170,14 @@ export abstract class OrcaRuntimeWithStructuredSessionSwitchProjection extends O
       host.notifySessionTabHidden(sessionId)
       return true
     }
+    return Object.assign(retire, {
+      placement: () => {
+        const current = read()
+        return current
+          ? { groupId: current.group, afterTabId: current.tab.id, index: current.before.length }
+          : undefined
+      }
+    })
   }
 
   abstract applyLayoutCommand(
diff --git a/src/main/runtime/session-tabs/structured-session-switch-publication.test.ts b/src/main/runtime/session-tabs/structured-session-switch-publication.test.ts
index 9a6509eacb21..1de6a5c81c70 100644
--- a/src/main/runtime/session-tabs/structured-session-switch-publication.test.ts
+++ b/src/main/runtime/session-tabs/structured-session-switch-publication.test.ts
@@ -1,4 +1,4 @@
-import { afterEach, expect, it, vi } from 'vitest'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import {
   setupMainOwnedWorkspace,
   WORKTREE_ID,
@@ -7,19 +7,56 @@ import {
   PTY_A
 } from '../main-owned-workspace-runtime-fixture'
 import { chatTabCommandsSettled } from '../session-layout-apply.test-fixture'
+import { applyWorkspaceLayoutRecordChange } from '../../../shared/workspace-layout/workspace-layout-records'
+import type { PublishedWorkspaceLayout } from '../../../shared/workspace-layout/workspace-layout-published'
+import { workspaceLayoutFromPublished } from '../../../shared/workspace-layout/workspace-layout-from-published'
 
-vi.mock('../../../shared/layout-owner-switch', () => ({ ORCA_LAYOUT_OWNER_IS_MAIN: true }))
+const owner = vi.hoisted(() => ({ main: true }))
+vi.mock('../../../shared/layout-owner-switch', () => ({
+  get ORCA_LAYOUT_OWNER_IS_MAIN() {
+    return owner.main
+  }
+}))
+beforeEach(() => {
+  owner.main = true
+})
 afterEach(() => vi.restoreAllMocks())
 
 it('selects a newly published or already listed chat through the real main layout and headless view', async () => {
   const { runtime, session } = setupMainOwnedWorkspace()
+  const frames: PublishedWorkspaceLayout[] = []
+  const layouts = new Map<string, PublishedWorkspaceLayout>()
+  const subscription = runtime.subscribeWorkspaceLayouts((event) => {
+    if (event.type !== 'records') {
+      return
+    }
+    for (const change of event.workspaces) {
+      const next = applyWorkspaceLayoutRecordChange(layouts.get(change.key), change)
+      if (next) {
+        layouts.set(change.key, next)
+        frames.push(next)
+      } else {
+        layouts.delete(change.key)
+      }
+    }
+  })
+  for (const entry of subscription.snapshot) {
+    layouts.set(entry.key, entry.layout)
+  }
   const input = {
     workspaceId: WORKTREE_ID,
     sessionId: 'destination',
     agent: 'codex' as const,
     activate: true,
     check: () => {},
-    placement: { afterTabId: TAB_ID }
+    placement: { afterTabId: TAB_ID },
+    openPlacement: {
+      invocationId: 'chat-frame-open',
+      generation: 'chat-frame-generation',
+      placement: { afterTabId: TAB_ID },
+      activate: true,
+      viewerSelection: 'original-viewer'
+    }
   }
   for (let repeat = 0; repeat < 2; repeat++) {
     await runtime.publishStructuredAgentSessionTab(input)
@@ -32,6 +69,23 @@ it('selects a newly published or already listed chat through the real main layou
     expect(group?.activeTabId).toBe('agent-session:destination')
     expect(group?.tabOrder).toEqual([TAB_ID, 'agent-session:destination'])
   }
+  const first = frames.find((layout) => layout.tabs.some((tab) => tab.entityId === 'destination'))
+  expect(first?.tabs.find((tab) => tab.entityId === 'destination')).toMatchObject({
+    openPlacement: input.openPlacement
+  })
+  if (!first) {
+    throw new Error('missing actual destination frame')
+  }
+  expect(JSON.stringify(workspaceLayoutFromPublished(first))).not.toContain('openPlacement')
+  expect(JSON.stringify(session())).not.toContain('openPlacement')
+  const late = runtime.subscribeWorkspaceLayouts(() => {})
+  expect(
+    late.snapshot
+      .flatMap((entry) => entry.layout.tabs)
+      .find((tab) => tab.entityId === 'destination')
+  ).toMatchObject({ openPlacement: input.openPlacement })
+  late.unsubscribe()
+  subscription.unsubscribe()
 })
 
 it('publishes readable history while a queued main write preserves newer navigation', async () => {
@@ -58,9 +112,23 @@ it('publishes readable history while a queued main write preserves newer navigat
     agent: 'codex',
     activate: true,
     check: () => {},
-    selectionCurrent
+    selectionCurrent,
+    openPlacement: {
+      invocationId: 'held-publication',
+      generation: 'held-generation',
+      placement: { afterTabId: TAB_ID, index: 0 },
+      activate: true,
+      viewerSelection: 'original-viewer'
+    }
   })
   await entered.promise
+  expect(
+    runtime.mobileSessionTabsByWorktree
+      .get(WORKTREE_ID)
+      ?.tabs.find((tab) => tab.type === 'agent-session' && tab.sessionId === 'destination')
+  ).toMatchObject({
+    openPlacement: { invocationId: 'held-publication', viewerSelection: 'original-viewer' }
+  })
   runtime.projectStructuredAgentSessionTab({
     workspaceId: WORKTREE_ID,
     sessionId: 'newer-chat',
@@ -80,6 +148,16 @@ it('keeps the captured source slot when natural-exit retirement reaches layout b
   const { runtime, session } = setupMainOwnedWorkspace()
   const incarnationId = '11111111-1111-4111-8111-111111111111'
   runtime.registerPty(PTY_A, WORKTREE_ID, null, { tabId: TAB_ID, leafId: LEAF_A, incarnationId })
+  expect(
+    await runtime.applyLayoutCommand({
+      type: 'openAgentSessionTab',
+      workspace: WORKTREE_ID,
+      sessionId: 'before-tab',
+      agent: 'codex',
+      tabId: 'agent-session:before-tab',
+      index: 0
+    })
+  ).toMatchObject({ ok: true })
   await runtime.publishStructuredAgentSessionTab({
     workspaceId: WORKTREE_ID,
     sessionId: 'later-tab',
@@ -112,13 +190,33 @@ it('keeps the captured source slot when natural-exit retirement reaches layout b
     agent: 'codex',
     activate: true,
     check: () => {},
-    placement: close.placement()
+    placement: close.placement(),
+    openPlacement: {
+      invocationId: 'natural-exit',
+      generation: 'natural-generation',
+      placement: close.placement()!,
+      activate: true,
+      source: close.source
+    }
   })
   const group = session().tabGroups?.[WORKTREE_ID]?.find((row) =>
     row.tabOrder.includes('agent-session:destination')
   )
-  expect(group?.tabOrder).toEqual(['agent-session:destination', 'agent-session:later-tab'])
+  expect(group?.tabOrder).toEqual([
+    'agent-session:before-tab',
+    'agent-session:destination',
+    'agent-session:later-tab'
+  ])
   expect(group?.activeTabId).toBe('agent-session:destination')
+  expect(
+    await runtime.applyLayoutCommand({
+      type: 'createTerminalTab',
+      workspace: WORKTREE_ID,
+      tabId: TAB_ID,
+      leafId: LEAF_A
+    })
+  ).toMatchObject({ ok: true })
+  expect(close.placement()).toBeUndefined()
 })
 
 it.each(['none', 'publication', 'spawn'] as const)(
@@ -153,6 +251,15 @@ it.each(['none', 'publication', 'spawn'] as const)(
         launchAgent: 'codex',
         ...(opts.launchConfig ? { launchConfig: opts.launchConfig } : {})
       })
+      const published = runtime.mobileSessionTabsByWorktree
+        .get(WORKTREE_ID)
+        ?.tabs.find(
+          (tab) =>
+            tab.type === 'terminal' && tab.parentTabId === opts.tabId && tab.leafId === opts.leafId
+        )
+      expect(published).toMatchObject({
+        openPlacement: { generation: 'terminal-generation', viewerSelection: 'original-viewer' }
+      })
       if (navigation === 'spawn') {
         entered.resolve()
         await release.promise
@@ -187,6 +294,13 @@ it.each(['none', 'publication', 'spawn'] as const)(
       clientMutationId: `ordinary-${navigation}`,
       switchExecution: {
         invocationId: `ordinary-${navigation}`,
+        openPlacement: {
+          invocationId: `ordinary-${navigation}`,
+          generation: 'terminal-generation',
+          placement: { afterTabId: TAB_ID, index: 0 },
+          activate: true,
+          viewerSelection: 'original-viewer'
+        },
         check: () => {},
         signal: new AbortController().signal,
         remaining: () => 60_000,
@@ -223,6 +337,9 @@ it.each(['none', 'publication', 'spawn'] as const)(
     expect(snapshot.activeTabId).toBe(
       navigation === 'none' ? result.tab.id : 'agent-session:later-navigation'
     )
+    expect(snapshot.tabs.find((tab) => tab.id === result.tab.id)).toMatchObject({
+      openPlacement: { generation: 'terminal-generation', activate: navigation === 'none' }
+    })
     expect(
       session().terminalLayoutsByTabId[result.tab.parentTabId!]?.ptyIdsByLeafId?.[
         result.tab.leafId!
@@ -230,3 +347,60 @@ it.each(['none', 'publication', 'spawn'] as const)(
     ).toBe('destination-pty')
   }
 )
+
+it.each(['window', 'main', 'headless'] as const)(
+  'carries addressed membership through %s publication and ordinary row rebuilds',
+  async (mode) => {
+    owner.main = mode === 'main'
+    const { runtime, session } = setupMainOwnedWorkspace()
+    await runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)
+    if (mode !== 'headless') {
+      Object.assign(runtime, { getAvailableAuthoritativeWindow: () => ({}) })
+    }
+    for (const agent of ['claude', 'codex'] as const) {
+      const input = {
+        workspaceId: WORKTREE_ID,
+        sessionId: `placed-${agent}`,
+        agent,
+        activate: true,
+        check: () => {},
+        placement: { afterTabId: TAB_ID, index: 0 },
+        openPlacement: {
+          invocationId: `switch-${agent}`,
+          generation: `generation-${agent}`,
+          placement: { afterTabId: TAB_ID, index: 0 },
+          activate: true,
+          viewerSelection: 'original-history-viewer'
+        }
+      }
+      await runtime.publishStructuredAgentSessionTab(input)
+      const id = `agent-session:placed-${agent}`
+      const snapshot = await runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)
+      expect(snapshot.tabs.find((tab) => tab.id === id)).toMatchObject({
+        openPlacement: input.openPlacement
+      })
+      expect(
+        snapshot.tabGroups?.find((group) => group.tabOrder.includes(id))?.tabOrder.slice(0, 2)
+      ).toEqual([TAB_ID, id])
+      // The ordinary graph can omit optional metadata; the same destination retains its intent.
+      runtime.storeMobileSessionSnapshot(WORKTREE_ID, {
+        ...snapshot,
+        tabs: snapshot.tabs.map((tab) => {
+          if (tab.type !== 'agent-session') {
+            return tab
+          }
+          const { openPlacement: _placement, ...row } = tab
+          return row
+        })
+      })
+      expect(
+        (await runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)).tabs.find((tab) => tab.id === id)
+      ).toMatchObject({ openPlacement: input.openPlacement })
+      if (mode === 'window') {
+        expect(
+          session().unifiedTabs?.[WORKTREE_ID]?.some((tab) => tab.entityId === input.sessionId)
+        ).not.toBe(true)
+      }
+    }
+  }
+)
diff --git a/src/main/runtime/session-tabs/structured-session-tab-projection.ts b/src/main/runtime/session-tabs/structured-session-tab-projection.ts
new file mode 100644
index 000000000000..c8855c833b48
--- /dev/null
+++ b/src/main/runtime/session-tabs/structured-session-tab-projection.ts
@@ -0,0 +1,96 @@
+import { defaultAgentChatLabel } from '../../../shared/agent-session/agent-session-chat-label'
+import type { StructuredAgentId } from '../../../shared/agent-session-provider-handle'
+import type { SessionTabOpenPlacement } from '../../../shared/session-tab-placement'
+import {
+  insertTabIdIntoOrder,
+  partitionPinnedTabOrder
+} from '../../../shared/workspace-layout/tab-order'
+import type { RuntimeMobileSessionTabsSnapshot } from '../../../shared/runtime-types'
+import { getHeadlessMobileSessionGroupId } from '../mobile-session-layout-projection'
+
+export type StructuredSessionTabProjection = {
+  workspaceId: string
+  sessionId: string
+  agent: StructuredAgentId
+  activate: boolean
+  openPlacement?: SessionTabOpenPlacement
+}
+
+/** Publish membership and its addressed open together; existing destinations keep their current place. */
+export function projectStructuredSessionTab(
+  existing: RuntimeMobileSessionTabsSnapshot | undefined,
+  input: StructuredSessionTabProjection
+): RuntimeMobileSessionTabsSnapshot | null {
+  const id = `agent-session:${input.sessionId}`
+  const listed = existing?.tabs.some((tab) => tab.id === id)
+  if (listed && !input.activate && !input.openPlacement) {
+    return null
+  }
+  const tabs = [...(existing?.tabs ?? [])].map((tab) => ({
+    ...tab,
+    isActive: input.activate ? tab.id === id : tab.isActive,
+    ...(tab.id === id && input.openPlacement ? { openPlacement: input.openPlacement } : {})
+  }))
+  if (!listed) {
+    tabs.push({
+      type: 'agent-session',
+      id,
+      title: defaultAgentChatLabel(input.agent),
+      sessionId: input.sessionId,
+      agent: input.agent,
+      isActive: input.activate,
+      ...(input.openPlacement ? { openPlacement: input.openPlacement } : {})
+    })
+  }
+  const priorGroups = existing?.tabGroups ?? [
+    {
+      id: getHeadlessMobileSessionGroupId(input.workspaceId),
+      activeTabId: existing?.activeTabId ?? null,
+      tabOrder: []
+    }
+  ]
+  const placement = input.openPlacement?.placement
+  const listedGroup = priorGroups.find((group) => group.tabOrder.includes(id))
+  const anchorGroup = priorGroups.find((group) =>
+    group.tabOrder.includes(placement?.afterTabId ?? '')
+  )
+  const groupId =
+    listedGroup?.id ??
+    priorGroups.find((group) => group.id === placement?.groupId)?.id ??
+    anchorGroup?.id ??
+    priorGroups.find((group) => group.id === existing?.activeGroupId)?.id ??
+    priorGroups[0]?.id
+  const tabGroups = priorGroups.map((group) => {
+    if (group.id !== groupId) {
+      return group
+    }
+    let tabOrder = group.tabOrder
+    if (!listedGroup) {
+      const after = placement?.afterTabId
+      if (after && tabOrder.includes(after)) {
+        tabOrder = insertTabIdIntoOrder(tabOrder, tabs, id, false, after)
+      } else if (placement?.index !== undefined) {
+        const preceding = tabOrder[Math.max(0, Math.min(placement.index, tabOrder.length)) - 1]
+        tabOrder = preceding
+          ? insertTabIdIntoOrder(tabOrder, tabs, id, false, preceding)
+          : partitionPinnedTabOrder([...tabOrder, id], tabs, id)
+      } else {
+        tabOrder = [...tabOrder, id]
+      }
+    }
+    return { ...group, tabOrder, activeTabId: input.activate ? id : group.activeTabId }
+  })
+  return {
+    ...existing,
+    worktree: input.workspaceId,
+    publicationEpoch: existing?.publicationEpoch ?? `structured:${Date.now().toString(36)}`,
+    snapshotVersion: (existing?.snapshotVersion ?? 0) + 1,
+    activeGroupId: input.activate
+      ? (groupId ?? null)
+      : (existing?.activeGroupId ?? groupId ?? null),
+    activeTabId: input.activate ? id : (existing?.activeTabId ?? null),
+    activeTabType: input.activate ? 'agent-session' : (existing?.activeTabType ?? null),
+    tabGroups,
+    tabs
+  }
+}
diff --git a/src/main/runtime/session-tabs/structured-session-tab-restoration.ts b/src/main/runtime/session-tabs/structured-session-tab-restoration.ts
index d21cb5f986ec..00ef9e2b703b 100644
--- a/src/main/runtime/session-tabs/structured-session-tab-restoration.ts
+++ b/src/main/runtime/session-tabs/structured-session-tab-restoration.ts
@@ -1,18 +1,14 @@
 import { withSelectedChatTab } from '../agent-session/agent-session-tab-layout'
 import type { OrcaRuntimeWithScheduleMobileSessionTabsChanged as ScheduleMobileSessionTabsChangedMethods } from './session-tabs-change-publication'
-import { defaultAgentChatLabel } from '../../../shared/agent-session/agent-session-chat-label'
 import { getStructuredAgentSessionHost } from '../../native-chat/agent-session-wire/structured-agent-session-registry'
 import { collectSavedStructuredAgentSessionIds } from '../saved-structured-agent-session-restoration'
 import { LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host'
 import { seedStructuredAgentSessionTabIndex } from '../agent-session/structured-agent-session-tab-index-seed'
 import { restoredChatTabChanges } from './restored-chat-tab-changes'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../shared/layout-owner-switch'
-import type {
-  RuntimeMobileSessionAgentTab,
-  RuntimeMobileSessionTabsSnapshot
-} from '../../../shared/runtime-types'
-import { getHeadlessMobileSessionGroupId } from '../mobile-session-layout-projection'
 import type { StructuredAgentId } from '../../../shared/agent-session-provider-handle'
+import type { SessionTabOpenPlacement } from '../../../shared/session-tab-placement'
+import { projectStructuredSessionTab } from './structured-session-tab-projection'
 import { OrcaRuntimeWithStructuredSessionLaunchRuntime } from './structured-session-launch-runtime'
 
 export type AgentLaunchScope = Parameters<
@@ -127,9 +123,14 @@ export abstract class OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce exten
     /** Where the creating paired client opens the chat. */
     /** A ChatTabPlacement, typed in place: this file is at its line limit. */
     placement?: { groupId?: string; afterTabId?: string; index?: number }
+    openPlacement?: SessionTabOpenPlacement
   }): Promise<void> {
     const host = getStructuredAgentSessionHost()
     input.check?.()
+    // First membership includes placement, even while visibility or the durable queue is awaited.
+    if (input.openPlacement) {
+      this.projectStructuredAgentSessionTab({ ...input, activate: false, notify: false })
+    }
     if (input.check && host) {
       await host.deps.store.setSessionTabVisibility(input.sessionId, true, input.tabId, input.check)
     } else if (typeof host?.setSessionTabVisibility === 'function') {
@@ -168,7 +169,11 @@ export abstract class OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce exten
     }
     input.check?.()
     const activate = input.activate && (input.selectionCurrent?.() ?? true)
-    this.projectStructuredAgentSessionTab({ ...input, activate })
+    this.projectStructuredAgentSessionTab({
+      ...input,
+      activate,
+      ...(input.openPlacement ? { openPlacement: { ...input.openPlacement, activate } } : {})
+    })
     if (activate) {
       input.check?.()
       if (!this.getAvailableAuthoritativeWindow()) {
@@ -204,85 +209,19 @@ export abstract class OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce exten
     agent: StructuredAgentId
     activate: boolean
     notify?: boolean
+    openPlacement?: SessionTabOpenPlacement
   }): void {
-    const existing = this.mobileSessionTabsByWorktree.get(input.workspaceId)
-    const id = `agent-session:${input.sessionId}`
-    if (existing?.tabs.some((tab) => tab.id === id)) {
-      // Background republish does not write/emit; healing missing client mirrors needs activate or explicit republish.
-      if (!input.activate) {
-        return
-      }
-      const priorGroups = existing.tabGroups ?? []
-      const groupId =
-        priorGroups.find((group) => group.tabOrder.includes(id))?.id ??
-        (priorGroups.some((group) => group.id === existing.activeGroupId)
-          ? existing.activeGroupId
-          : priorGroups[0]?.id)
-      const snapshot: RuntimeMobileSessionTabsSnapshot = {
-        ...existing,
-        snapshotVersion: existing.snapshotVersion + 1,
-        activeGroupId: groupId ?? existing.activeGroupId,
-        activeTabId: id,
-        activeTabType: 'agent-session',
-        tabGroups: priorGroups.map((group) =>
-          group.id === groupId ? { ...group, activeTabId: id } : group
-        ),
-        tabs: existing.tabs.map((tab) => ({ ...tab, isActive: tab.id === id }))
-      }
-      const stored = this.storeMobileSessionSnapshot(input.workspaceId, snapshot)
-      if (input.notify !== false) {
-        this.emitMobileSessionTabsSnapshot(stored)
-      }
+    const next = projectStructuredSessionTab(
+      this.mobileSessionTabsByWorktree.get(input.workspaceId),
+      input
+    )
+    if (!next) {
       return
     }
-    const tab: RuntimeMobileSessionAgentTab = {
-      type: 'agent-session',
-      id,
-      title: defaultAgentChatLabel(input.agent),
-      sessionId: input.sessionId,
-      agent: input.agent,
-      isActive: input.activate
-    }
-    const tabs = [...(existing?.tabs ?? [])].map((candidate) => ({
-      ...candidate,
-      isActive: input.activate ? false : candidate.isActive
-    }))
-    tabs.push(tab)
-    const priorGroups = existing?.tabGroups ?? [
-      {
-        id: getHeadlessMobileSessionGroupId(input.workspaceId),
-        activeTabId: existing?.activeTabId ?? null,
-        tabOrder: []
-      }
-    ]
-    // Why: the window can list the chat before main restores its row; keep the place it gave it.
-    const listingGroupId = priorGroups.find((group) => group.tabOrder.includes(id))?.id
-    const groupId =
-      listingGroupId ??
-      (priorGroups.some((group) => group.id === existing?.activeGroupId)
-        ? existing!.activeGroupId!
-        : priorGroups[0]!.id)
-    const tabGroups = priorGroups.map((group) =>
-      group.id === groupId
-        ? {
-            ...group,
-            activeTabId: input.activate ? id : group.activeTabId,
-            tabOrder: listingGroupId ? group.tabOrder : [...group.tabOrder, id]
-          }
-        : group
-    )
-    const snapshot: RuntimeMobileSessionTabsSnapshot = {
-      worktree: input.workspaceId,
-      publicationEpoch: existing?.publicationEpoch ?? `structured:${Date.now().toString(36)}`,
-      snapshotVersion: (existing?.snapshotVersion ?? 0) + 1,
-      activeGroupId: input.activate ? groupId : (existing?.activeGroupId ?? groupId),
-      activeTabId: input.activate ? id : (existing?.activeTabId ?? null),
-      activeTabType: input.activate ? 'agent-session' : (existing?.activeTabType ?? null),
-      tabGroups,
-      ...(existing?.tabGroupLayout ? { tabGroupLayout: existing.tabGroupLayout } : {}),
-      tabs
+    const stored = this.storeMobileSessionSnapshot(input.workspaceId, next)
+    if (input.openPlacement) {
+      this.markPaneLiveTitlesDirty()
     }
-    const stored = this.storeMobileSessionSnapshot(input.workspaceId, snapshot)
     if (input.notify !== false) {
       this.emitMobileSessionTabsSnapshot(stored)
     }
diff --git a/src/main/runtime/session-tabs/terminal-switch-close-capture.ts b/src/main/runtime/session-tabs/terminal-switch-close-capture.ts
index 0109e787b194..607d63cf3a06 100644
--- a/src/main/runtime/session-tabs/terminal-switch-close-capture.ts
+++ b/src/main/runtime/session-tabs/terminal-switch-close-capture.ts
@@ -70,7 +70,14 @@ export abstract class OrcaRuntimeWithTerminalSwitchCloseCapture extends OrcaRunt
     }
     return {
       source,
-      placement: () => readPlacement() ?? originalPlacement,
+      placement: () =>
+        matchesTerminalSurfaceCapture(
+          originalPresentation,
+          this.getWorkspaceSessionHostIdsForTab(source.worktreeId, source.tabId),
+          (hostId) => this.store?.getWorkspaceSession?.(hostId)
+        )
+          ? (readPlacement() ?? originalPlacement)
+          : undefined,
       stop: async () => {
         const stop = await this.stopExplicitlyClosedTabPtys(
           [addressedPty],
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-create.ts b/src/main/runtime/terminal/launch/mobile-terminal-create.ts
index e388a1a1bbfb..0b4fcbd0315b 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-create.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-create.ts
@@ -27,6 +27,19 @@ export type OwnedMobileTerminalDispatchRecipe = {
   recordedAt: number
 }
 
+const OWNED_MOBILE_DISPATCH_RECIPE_TTL_MS = 15 * 60_000
+
+export function pruneOwnedMobileTerminalDispatchRecipes(
+  recipes: Map<string, OwnedMobileTerminalDispatchRecipe>
+): void {
+  const now = Date.now()
+  for (const [handle, recipe] of recipes) {
+    if (now - recipe.recordedAt >= OWNED_MOBILE_DISPATCH_RECIPE_TTL_MS) {
+      recipes.delete(handle)
+    }
+  }
+}
+
 export type OwnedMobileTerminalCreateOptions = {
   command?: string
   shellOverride?: string
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts b/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
index ef9b4decc521..43b3d2dfdeeb 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
@@ -4,9 +4,10 @@ import type {
   RuntimeMobileSessionTabsSnapshot,
   RuntimeMobileSessionTerminalTab
 } from '../../../../shared/runtime-types'
-import type {
-  OwnedMobileTerminalCreateOptions,
-  OwnedMobileTerminalDispatchRecipe
+import {
+  pruneOwnedMobileTerminalDispatchRecipes,
+  type OwnedMobileTerminalCreateOptions,
+  type OwnedMobileTerminalDispatchRecipe
 } from './mobile-terminal-create'
 import { randomUUID } from 'node:crypto'
 import { copySleepingAgentLaunchConfig } from '../../runtime-agent-launch-resolution'
@@ -26,8 +27,6 @@ import {
 
 export type { OwnedMobileTerminalCreateOptions } from './mobile-terminal-create'
 
-const OWNED_MOBILE_DISPATCH_RECIPE_TTL_MS = 15 * 60_000
-
 export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal extends OrcaRuntimeWithResolveMobileSessionTerminalCommand {
   protected abstract getPtyManualTitle(
     ...args: Parameters<PtyTerminalSummaryMethods['getPtyManualTitle']>
@@ -35,22 +34,13 @@ export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal ext
 
   private readonly ownedMobileDispatchRecipes = new Map<string, OwnedMobileTerminalDispatchRecipe>()
 
-  private pruneOwnedMobileDispatchRecipes(): void {
-    const now = Date.now()
-    for (const [handle, recipe] of this.ownedMobileDispatchRecipes) {
-      if (now - recipe.recordedAt >= OWNED_MOBILE_DISPATCH_RECIPE_TTL_MS) {
-        this.ownedMobileDispatchRecipes.delete(handle)
-      }
-    }
-  }
-
   protected async createRuntimeOwnedMobileSessionTerminal(
     worktreeId: string,
     activate: boolean,
     afterTabId?: string,
     opts: OwnedMobileTerminalCreateOptions = {}
   ): Promise<RuntimeMobileSessionCreateTerminalResult> {
-    this.pruneOwnedMobileDispatchRecipes()
+    pruneOwnedMobileTerminalDispatchRecipes(this.ownedMobileDispatchRecipes)
     const workspace = await this.resolveTerminalWorkspaceLaunchScope(`id:${worktreeId}`)
     const cwd = this.resolveWorkspaceTerminalStartupCwd(workspace, opts.cwd)
     // Why: an SSH sessionId means reattach; only synthesize local serve ids so SSH fresh terminals still call pty.spawn.
@@ -228,6 +218,9 @@ export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal ext
     activate = activate && (opts.switchExecution?.selectionCurrent?.() ?? true)
     const tab: RuntimeMobileSessionTerminalTab = {
       type: 'terminal',
+      ...(opts.switchExecution?.openPlacement
+        ? { openPlacement: { ...opts.switchExecution.openPlacement, activate } }
+        : {}),
       id: `${parentTabId}::${leafId}`,
       parentTabId,
       leafId,
@@ -287,6 +280,9 @@ export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal ext
     }
     // Store adds retirement proofs; emit that snapshot because version-deduping subscribers would miss proofs from a pre-store frame.
     const stored = this.storeMobileSessionSnapshot(worktreeId, next)
+    if (opts.switchExecution?.openPlacement) {
+      this.markPaneLiveTitlesDirty()
+    }
     const result = this.toMobileSessionTabsResult(stored)
     const changeSequence = ++this.mobileSessionTabsChangeSequence
     for (const subscription of this.mobileSessionTabListeners) {
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-switch-publication.ts b/src/main/runtime/terminal/launch/mobile-terminal-switch-publication.ts
index 9dc4fe55e935..75bc4700d719 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-switch-publication.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-switch-publication.ts
@@ -91,10 +91,13 @@ export async function createPublishedSwitchTerminal(args: {
           ? opts.switchExecution!.viewer
           : ('none' as const),
       viewerSelection: opts.switchExecution!.viewerSelection,
-      placement: {
+      placement: opts.switchExecution!.openPlacement?.placement ?? {
         afterTabId: opts.switchExecution!.afterTabId ?? afterDesktopTabId,
         groupId: opts.targetGroupId
       },
+      ...(opts.switchExecution!.openPlacement
+        ? { openPlacement: opts.switchExecution!.openPlacement }
+        : {}),
       operationId: opts.clientMutationId
     }
     const mainPublication =
diff --git a/src/main/runtime/workspace-layout-stream.ts b/src/main/runtime/workspace-layout-stream.ts
index 674db9ad62c9..de968ad87caf 100644
--- a/src/main/runtime/workspace-layout-stream.ts
+++ b/src/main/runtime/workspace-layout-stream.ts
@@ -17,7 +17,7 @@ import type {
   WorkspaceLayoutStreamEvent
 } from '../../shared/workspace-layout/workspace-layout-stream-frames'
 import type { RuntimeStore } from './runtime-store-contract'
-import { withLiveTitles } from './published-pane-live-titles'
+import { paneLiveTitlesOf, withLiveTitles } from './published-pane-live-titles'
 import { paneStartFactsOf, withPaneStartFacts, type PaneFactSources } from './pane-start-statuses'
 import {
   workspaceLayoutFrameObserver,
@@ -79,6 +79,7 @@ export class WorkspaceLayoutStream {
       store: () => StreamStore | null
       homeHostId: (key: string) => ExecutionHostId | null
       liveTitle: (ptyId: string) => string | null
+      withOpenPlacements?: (layout: PublishedWorkspaceLayout) => PublishedWorkspaceLayout
     }
   ) {
     this.projection = new WorkspaceLayoutProjection(deps)
@@ -230,14 +231,6 @@ export class WorkspaceLayoutStream {
     }
   }
 
-  private liveTitlesOf(layout: PublishedWorkspaceLayout): (string | null)[] {
-    return layout.tabs.flatMap((tab) =>
-      (tab.terminal?.panes ?? []).map((pane) =>
-        pane.ptyId ? this.deps.liveTitle(pane.ptyId) : null
-      )
-    )
-  }
-
   private reconcile(reproject: boolean): void {
     const next = reproject ? this.projection.project() : this.projection.published
     const removed: string[] = []
@@ -250,16 +243,21 @@ export class WorkspaceLayoutStream {
     const shown = new Map<string, Shown>()
     const changed: string[] = []
     for (const [key, { layout, json }] of next) {
-      const titles = this.liveTitlesOf(layout)
+      const titles = paneLiveTitlesOf(layout, this.deps)
       // Switch point: a pane's start facts are live state, laid over as its title is.
       const starts = ORCA_LAYOUT_OWNER_IS_MAIN ? paneStartFactsOf(layout, this.deps) : null
-      const liveTitles = JSON.stringify(starts ? [titles, starts] : titles)
+      const placed = this.deps.withOpenPlacements?.(layout) ?? layout
+      const liveTitles = JSON.stringify([
+        titles,
+        starts,
+        placed.tabs.map((tab) => tab.openPlacement)
+      ])
       const previous = before.get(key)
       if (previous?.json === json && previous.liveTitles === liveTitles) {
         shown.set(key, previous)
         continue
       }
-      const shownLayout = withLiveTitles(layout, titles)
+      const shownLayout = withLiveTitles(placed, titles)
       const laid = starts ? withPaneStartFacts(shownLayout, starts) : shownLayout
       shown.set(key, { json, liveTitles, layout: laid })
       changed.push(key)
@@ -311,7 +309,8 @@ export class WorkspaceLayoutStream {
   private freshLayouts(): Map<string, PublishedWorkspaceLayout> {
     const fresh = new Map<string, PublishedWorkspaceLayout>()
     for (const [key, { layout }] of this.projection.projectFresh()) {
-      const titled = withLiveTitles(layout, this.liveTitlesOf(layout))
+      const placed = this.deps.withOpenPlacements?.(layout) ?? layout
+      const titled = withLiveTitles(placed, paneLiveTitlesOf(layout, this.deps))
       const starts = ORCA_LAYOUT_OWNER_IS_MAIN ? paneStartFactsOf(layout, this.deps) : null
       fresh.set(key, starts ? withPaneStartFacts(titled, starts) : titled)
     }
diff --git a/src/renderer/src/hooks/ipc-events/floating-workspace-reveal-routing.test.ts b/src/renderer/src/hooks/ipc-events/floating-workspace-reveal-routing.test.ts
index 15acff738912..e2dda585175e 100644
--- a/src/renderer/src/hooks/ipc-events/floating-workspace-reveal-routing.test.ts
+++ b/src/renderer/src/hooks/ipc-events/floating-workspace-reveal-routing.test.ts
@@ -314,3 +314,45 @@ it.each(['unchanged', 'navigate'] as const)(
     expect(testStore().getState().getTab(destination.id)?.entityId).toBe('canonical-C')
   }
 )
+
+it.each(['unchanged', 'navigate', 'courtesy'] as const)(
+  'uses original viewer authority for cross-workspace native focus: %s',
+  (action) => {
+    const { emit } = setup()
+    const state = testStore().getState()
+    const source = state.createUnifiedTab(MAIN, 'agent-session', { entityId: 'visible-source' })
+    state.activateTab(source.id)
+    const destinationWorktree = 'repo1::/repo1/other'
+    const viewerSelection = captureConversationSwitchViewerSelection()
+    // The advisory focus can precede adoption; ordinary membership must still be usable later.
+    emit('onFocusEditorTab', {
+      tabId: 'future-chat',
+      worktreeId: destinationWorktree,
+      viewerSelection
+    })
+    expect(testStore().getState().activeWorktreeId).toBe(MAIN)
+    const destination = state.createUnifiedTab(destinationWorktree, 'agent-session', {
+      id: 'future-chat',
+      entityId: 'canonical-cross-workspace',
+      activate: false
+    })
+    if (action === 'navigate') {
+      state.createUnifiedTab(MAIN, 'agent-session', { entityId: 'newer-view' })
+    }
+    emit('onFocusEditorTab', {
+      tabId: destination.id,
+      worktreeId: destinationWorktree,
+      ...(action === 'courtesy' ? {} : { viewerSelection })
+    })
+    expect(testStore().getState().activeWorktreeId).toBe(
+      action === 'unchanged' ? destinationWorktree : MAIN
+    )
+    expect(testStore().getState().getTab(destination.id)?.entityId).toBe(
+      'canonical-cross-workspace'
+    )
+    if (action === 'unchanged') {
+      expect(testStore().getState().getActiveTab(destinationWorktree)?.id).toBe(destination.id)
+      expect(testStore().getState().activeTabType).toBe('agent-session')
+    }
+  }
+)
diff --git a/src/renderer/src/hooks/ipc-events/session-tab-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/session-tab-ipc-bridge.ts
index 2e22a8639771..3da47a74cd7c 100644
--- a/src/renderer/src/hooks/ipc-events/session-tab-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/session-tab-ipc-bridge.ts
@@ -1,4 +1,3 @@
-import { callStructuredAgentSession } from '@/runtime/structured-agent-session-client'
 import {
   disposeSwitchProjections,
   captureSwitchProjection,
@@ -66,23 +65,7 @@ export function registerSessionTabIpcBridge(unsubs: (() => void)[]): void {
               return state
             }
             if (switchProjection.phase === 'prepare') {
-              captureSwitchProjection(state, worktreeId, switchProjection, (converged) => {
-                void callStructuredAgentSession(
-                  { kind: 'local' },
-                  'agentSession.switchToTerminal',
-                  {
-                    sessionId: switchProjection.sessionId,
-                    execution: {
-                      invocationId: switchProjection.invocationId,
-                      receipt: {
-                        generation: switchProjection.generation,
-                        shown: true,
-                        ...(converged ? { converged: true } : { retained: true })
-                      }
-                    }
-                  }
-                ).catch(() => {})
-              })
+              captureSwitchProjection(state, worktreeId, switchProjection, () => {})
               switchApplied = true
               return state
             }
diff --git a/src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge.ts
index d0d6fc1425c5..ac86024e9376 100644
--- a/src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge.ts
@@ -164,6 +164,7 @@ export function registerTerminalUiRoutingIpcBridge(unsubs: (() => void)[]): void
       // Courtesy completion reveals must not undo user navigation; explicit notification clicks may reveal before async activation updates the active ID.
       if (
         !userInitiated &&
+        viewerSelection === undefined &&
         tab?.contentType === 'agent-session' &&
         store.activeWorktreeId !== worktreeId
       ) {
diff --git a/src/renderer/src/lib/agent-launch-tab-publication.test.ts b/src/renderer/src/lib/agent-launch-tab-publication.test.ts
index 2240b6722b63..fb0be10690de 100644
--- a/src/renderer/src/lib/agent-launch-tab-publication.test.ts
+++ b/src/renderer/src/lib/agent-launch-tab-publication.test.ts
@@ -1,3 +1,5 @@
+import { registerSessionTabIpcBridge } from '@/hooks/ipc-events/session-tab-ipc-bridge'
+import * as structuredSessionClient from '@/runtime/structured-agent-session-client'
 import { captureConversationSwitchViewerSelection } from './conversation-switch-selection'
 import type { AppState } from '@/store/types'
 import {
@@ -231,6 +233,69 @@ describe('placement', () => {
     expect(retain).toHaveBeenCalledOnce()
   })
 
+  it('keeps actual IPC-captured source use protected without sending obsolete execution receipts', async () => {
+    const source = store.getState().createUnifiedTab(WT, 'agent-session', {
+      id: 'ipc-source',
+      entityId: 'ipc-conversation',
+      agentSessionAgent: 'codex'
+    })
+    const originalUi = window.api.ui
+    let receive: Parameters<typeof originalUi.onSessionTabCloseRequest>[0] | undefined
+    const respond = vi.fn<typeof originalUi.respondSessionTabClose>()
+    const rpc = vi
+      .spyOn(structuredSessionClient, 'callStructuredAgentSession')
+      .mockRejectedValue(new Error('obsolete receipt must not dispatch'))
+    const unsubs: (() => void)[] = []
+    window.api.ui = {
+      ...originalUi,
+      onCloseSessionTab: () => () => {},
+      onMoveSessionTab: () => () => {},
+      onSessionTabCloseRequest: (callback) => {
+        receive = callback
+        return () => {}
+      },
+      respondSessionTabClose: respond
+    }
+    try {
+      registerSessionTabIpcBridge(unsubs)
+      const projection = {
+        invocationId: 'ipc-switch',
+        generation: 'ipc-generation',
+        sessionId: source.entityId,
+        tabId: source.id,
+        phase: 'prepare' as const
+      }
+      receive!({
+        requestId: 'prepare',
+        tabId: source.id,
+        worktreeId: WT,
+        switchProjection: projection
+      })
+      expect(respond).toHaveBeenCalledWith({ requestId: 'prepare', switchApplied: true })
+      store.getState().activateTab(source.id)
+      await Promise.resolve()
+      const usedSource = store.getState().getActiveTab(WT)
+      receive!({
+        requestId: 'retire',
+        tabId: source.id,
+        worktreeId: WT,
+        switchProjection: { ...projection, phase: 'retire' }
+      })
+      expect(respond).toHaveBeenLastCalledWith({ requestId: 'retire', switchApplied: false })
+      expect(store.getState().getActiveTab(WT)?.id).toBe(source.id)
+      expect(store.getState().unifiedTabsByWorktree[WT]).toContainEqual(usedSource)
+      for (const unsubscribe of unsubs) {
+        unsubscribe()
+      }
+      await Promise.resolve()
+      expect(rpc).not.toHaveBeenCalled()
+    } finally {
+      disposeSwitchProjections()
+      window.api.ui = originalUi
+      rpc.mockRestore()
+    }
+  })
+
   it('releases retirement on actual use or rollback without clearing a newer close', () => {
     const fixedNow = 1_000_000
     const clock = vi.spyOn(Date, 'now').mockReturnValue(fixedNow)
diff --git a/src/renderer/src/lib/agent-launch-tab-publication.ts b/src/renderer/src/lib/agent-launch-tab-publication.ts
index d6bc5f8857f5..cf3d3bffd992 100644
--- a/src/renderer/src/lib/agent-launch-tab-publication.ts
+++ b/src/renderer/src/lib/agent-launch-tab-publication.ts
@@ -14,6 +14,7 @@ import { resolveUnifiedTabCreatePlacement } from '../store/slices/tabs/tabs-crea
 import { insertUnifiedTabAfterAnchor } from './unified-tab-anchor-insertion'
 import { rememberAgentLaunchPanePrompt } from './agent-launch-pane-prompt'
 import { selectFolderWorkspaces } from '@/store/workspace-record-selectors'
+import { openPlacementSourceCurrent } from '@/runtime/web-session-tabs-sync/open-placement'
 
 /** Publish under host-reserved IDs before the agent exists so PTY routing names this pane and retries reuse its tab; the pane’s spawn waits in main and attaches to the host’s process. */
 
@@ -94,12 +95,18 @@ export function publishAgentLaunchTab(
     return { tabId, created: false, placement: { groupId } }
   }
 
+  const openPlacement =
+    request.openPlacement && openPlacementSourceCurrent(store, worktreeId, request.openPlacement)
+      ? request.openPlacement
+      : undefined
+  const requestedPlacement = request.openPlacement ? openPlacement?.placement : request.placement
+  const viewerSelection = openPlacement?.viewerSelection ?? request.viewerSelection
   const placement = resolveUnifiedTabCreatePlacement({
     groups: store.groupsByWorktree[worktreeId] ?? [],
     tabs: store.unifiedTabsByWorktree[worktreeId] ?? [],
     activeGroupId: store.activeGroupIdByWorktree[worktreeId],
-    targetGroupId: request.placement?.groupId,
-    afterTabId: request.placement?.afterTabId,
+    targetGroupId: requestedPlacement?.groupId,
+    afterTabId: requestedPlacement?.afterTabId,
     lookupWorktrees: () =>
       [
         ...(store.allWorktrees?.() ?? []),
@@ -108,21 +115,25 @@ export function publishAgentLaunchTab(
   })
   const focuses =
     (request.viewer === 'focus-window' || request.viewer === 'focus-in-workspace') &&
-    conversationSwitchViewerSelectionCurrent(request.viewerSelection)
+    (!request.openPlacement || openPlacement?.activate === true) &&
+    conversationSwitchViewerSelectionCurrent(viewerSelection)
   const tab = store.createTab(worktreeId, placement.groupId, undefined, {
     id: tabId,
     initialLeafId: leafId,
     agentLaunchPane: launchPaneFor(request),
     launchAgent: request.launchAgent,
     viewMode: request.viewMode,
-    ...(focuses && request.viewerSelection === undefined
+    ...(openPlacement
+      ? { placement: { ...openPlacement.placement, afterTabId: placement.anchorTabId } }
+      : {}),
+    ...(focuses && viewerSelection === undefined
       ? {}
       : { activate: false, recordInteraction: false })
   })
   if (request.prompt) {
     rememberAgentLaunchPanePrompt(tabId, request.prompt)
   }
-  if (placement.anchorTabId) {
+  if (placement.anchorTabId && !request.openPlacement) {
     const unifiedTabId = useAppStore
       .getState()
       .unifiedTabsByWorktree[worktreeId]?.find((item) => item.entityId === tab.id)?.id
@@ -130,7 +141,11 @@ export function publishAgentLaunchTab(
       insertUnifiedTabAfterAnchor(worktreeId, unifiedTabId, placement.anchorTabId)
     }
   }
-  presentAgentLaunchTab(request.viewer, worktreeId, tab.id, leafId, request.viewerSelection)
+  if (focuses) {
+    presentAgentLaunchTab(request.viewer, worktreeId, tab.id, leafId, viewerSelection)
+  } else if (!request.openPlacement) {
+    presentAgentLaunchTab(request.viewer, worktreeId, tab.id, leafId, viewerSelection)
+  }
   const landed = landedGroupId(worktreeId, tab.id) ?? placement.groupId ?? ''
   const fallback = placementFallback(request, landed, placement.anchorTabId !== undefined)
   return {
diff --git a/src/renderer/src/lib/conversation-switch-selection.ts b/src/renderer/src/lib/conversation-switch-selection.ts
index 04a8ff2efd04..5d93c40d891f 100644
--- a/src/renderer/src/lib/conversation-switch-selection.ts
+++ b/src/renderer/src/lib/conversation-switch-selection.ts
@@ -3,8 +3,20 @@ import { useAppStore } from '@/store'
 import { resolveWebSessionVisibleTabId } from '@/runtime/web-session-focus-intent'
 
 /** Presentation freshness only; the execution host retains all process authority. */
-export function captureConversationSwitchViewerSelection(): string {
-  const state = useAppStore.getState()
+type ViewerState = Parameters<typeof resolveWebSessionVisibleTabId>[0] &
+  Partial<
+    Pick<
+      ReturnType<typeof useAppStore.getState>,
+      | 'activeWorkspaceExecutionHostId'
+      | 'activeView'
+      | 'worktreeNavHistory'
+      | 'worktreeNavHistoryIndex'
+    >
+  >
+
+export function captureConversationSwitchViewerSelection(
+  state: ViewerState = useAppStore.getState()
+): string {
   const workspaceId = state.activeWorktreeId ?? ''
   return structuredAgentSessionDomainFingerprint({
     domain: 'conversation-switch-viewer',
@@ -21,6 +33,9 @@ export function captureConversationSwitchViewerSelection(): string {
   })
 }
 
-export function conversationSwitchViewerSelectionCurrent(selection?: string): boolean {
-  return selection === undefined || selection === captureConversationSwitchViewerSelection()
+export function conversationSwitchViewerSelectionCurrent(
+  selection?: string,
+  state?: ViewerState
+): boolean {
+  return selection === undefined || selection === captureConversationSwitchViewerSelection(state)
 }
diff --git a/src/renderer/src/lib/session-tab-open-placement-order.ts b/src/renderer/src/lib/session-tab-open-placement-order.ts
new file mode 100644
index 000000000000..2fa50d711c05
--- /dev/null
+++ b/src/renderer/src/lib/session-tab-open-placement-order.ts
@@ -0,0 +1,27 @@
+import type { SessionTabOpenPlacement } from '../../../shared/session-tab-placement'
+import type { Tab } from '../../../shared/tab-types'
+import {
+  insertTabIdIntoOrder,
+  partitionPinnedTabOrder
+} from '../../../shared/workspace-layout/tab-order'
+
+/** Explicit fallback index retains information absent from a coalesced inventory's neighbours. */
+export function insertOpenPlacementTab(
+  order: readonly string[],
+  tabs: readonly Tab[],
+  tabId: string,
+  placement: SessionTabOpenPlacement['placement']
+): string[] {
+  const tab = tabs.find((row) => row.id === tabId)
+  const without = order.filter((id) => id !== tabId)
+  if (placement.afterTabId && without.includes(placement.afterTabId)) {
+    return insertTabIdIntoOrder(without, tabs, tabId, tab?.isPinned === true, placement.afterTabId)
+  }
+  if (placement.index !== undefined) {
+    const index = Math.max(0, Math.min(Math.trunc(placement.index), without.length))
+    return index === 0
+      ? partitionPinnedTabOrder([...without], tabs, tabId)
+      : insertTabIdIntoOrder(without, tabs, tabId, tab?.isPinned === true, without[index - 1])
+  }
+  return insertTabIdIntoOrder(without, tabs, tabId, tab?.isPinned === true)
+}
diff --git a/src/renderer/src/runtime/layout-frame-stream.ts b/src/renderer/src/runtime/layout-frame-stream.ts
index 76320e1b1880..437db9d053db 100644
--- a/src/renderer/src/runtime/layout-frame-stream.ts
+++ b/src/renderer/src/runtime/layout-frame-stream.ts
@@ -17,7 +17,7 @@ import { framesDrawWorkspace } from './workspace-layout-frame-drawn-workspaces'
 /** Whose layout stream a sync shows, and which of the window's workspaces it draws. */
 export type LayoutFrameSource = {
   target: RuntimeClientTarget
-  draws: (state: AppState) => (key: string) => boolean
+  draws: (state: AppState, openedWorkspaces?: ReadonlySet<string>) => (key: string) => boolean
   /** Tabs this window draws that the source's frames never carry: every build keeps them as drawn. */
   heldTabs?: HeldDrawnTabs
   /** Frames under this window's ids; the local stream's already are. */
diff --git a/src/renderer/src/runtime/server-layout-frames.ts b/src/renderer/src/runtime/server-layout-frames.ts
index 6140b7f2b00e..180ba6f8c3c4 100644
--- a/src/renderer/src/runtime/server-layout-frames.ts
+++ b/src/renderer/src/runtime/server-layout-frames.ts
@@ -47,9 +47,13 @@ type ServerFrames = {
 }
 
 /** Workspaces this server's stream draws: ones the window holds that it mirrors from this server. */
-function serverDraws(environmentId: string): (state: AppState) => (key: string) => boolean {
-  return (state) => (key) =>
-    (key in state.groupsByWorktree || key in state.unifiedTabsByWorktree) &&
+function serverDraws(
+  environmentId: string
+): (state: AppState, openedWorkspaces?: ReadonlySet<string>) => (key: string) => boolean {
+  return (state, openedWorkspaces) => (key) =>
+    (key in state.groupsByWorktree ||
+      key in state.unifiedTabsByWorktree ||
+      openedWorkspaces?.has(key) === true) &&
     mirroredRuntimeEnvironmentIdForWorkspace(state, key) === environmentId
 }
 
@@ -153,8 +157,8 @@ function openServerFrames(
   const sync = openWorkspaceLayoutFrameSync(frameStore, {
     target: { kind: 'environment', environmentId },
     // Only gated workspaces: a handed-back one is the mirror's, whatever the frozen frames still hold.
-    draws: (state) => {
-      const ours = draws(state)
+    draws: (state, openedWorkspaces) => {
+      const ours = draws(state, openedWorkspaces)
       return (key) => gated.has(key) && ours(key)
     },
     heldTabs: DESKTOP_CREATED_SERVER_TAB_HOLDS,
diff --git a/src/renderer/src/runtime/session-tab-open-placement.test.ts b/src/renderer/src/runtime/session-tab-open-placement.test.ts
new file mode 100644
index 000000000000..218489a46d0c
--- /dev/null
+++ b/src/renderer/src/runtime/session-tab-open-placement.test.ts
@@ -0,0 +1,521 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { AppState } from '@/store/types'
+import type { RuntimeMobileSessionTabsResult } from '../../../shared/runtime-types'
+import type { SessionTabOpenPlacement } from '../../../shared/session-tab-placement'
+import { captureTerminalSurfaceIdentity } from '../../../shared/terminal-tab-close'
+import { structuredAgentSessionTabId } from '../../../shared/structured-agent-session-projection'
+import { toWebTerminalSurfaceTabId } from '../../../shared/terminal-surface-id'
+import { createTestStore } from '../store/slices/store-test-helpers'
+import { createTabsSliceMockApi } from '../store/slices/tabs-slice-test-harness'
+import { captureConversationSwitchViewerSelection } from '../lib/conversation-switch-selection'
+import { publishAgentLaunchTab } from '../lib/agent-launch-tab-publication'
+import { retireTerminalPresentation } from '../components/terminal-pane/terminal-presentation-retirement'
+import { applyLocalStructuredSessionTabSnapshots } from './local-structured-session-tabs-sync/snapshot-apply'
+import { resetLocalStructuredSessionVersionForTests } from './local-structured-session-tabs-sync/inventory-generation-fence'
+import { applyWebSessionTabsSnapshot } from './web-session-tabs-sync/snapshot-api'
+import { hostSessionTabIdByLocalKey } from './web-session-tabs-sync/state'
+import { resetWebSessionTabsSyncTestState } from './web-session-tabs-sync-test-harness'
+
+const ref = vi.hoisted(() => {
+  const current: { store: ReturnType<typeof createTestStore> | null } = { store: null }
+  return current
+})
+vi.mock('@/store', () => ({
+  useAppStore: {
+    getState: () => ref.store!.getState(),
+    setState: (patch: Partial<AppState>) => ref.store!.setState(patch)
+  }
+}))
+// DOM focus is external I/O; publication, adoption and selection remain production owners.
+vi.mock('@/lib/focus-terminal-tab-surface', () => ({ focusTerminalTabSurface: vi.fn() }))
+vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } }))
+
+const api = createTabsSliceMockApi()
+const WT = 'placement::workspace'
+const OTHER = 'placement::other'
+const A = 'source-terminal'
+const C = 'neighbour-terminal'
+const LEAF = '11111111-1111-4111-8111-111111111111'
+const SIBLING = '22222222-2222-4222-8222-222222222222'
+const DESTINATION = '33333333-3333-4333-8333-333333333333'
+const ENV = 'placement-server'
+let store: ReturnType<typeof createTestStore>
+let version = 0
+
+function frame(tabs: RuntimeMobileSessionTabsResult['tabs']): RuntimeMobileSessionTabsResult {
+  return {
+    worktree: WT,
+    publicationEpoch: 'placement-host',
+    snapshotVersion: ++version,
+    activeGroupId: 'host-group',
+    activeTabId: null,
+    activeTabType: 'terminal',
+    tabGroups: [{ id: 'host-group', activeTabId: null, tabOrder: tabs.map((tab) => tab.id) }],
+    tabs
+  }
+}
+function terminal(
+  id: string
+): Extract<RuntimeMobileSessionTabsResult['tabs'][number], { type: 'terminal' }> {
+  return {
+    type: 'terminal',
+    id: `${id}::${LEAF}`,
+    parentTabId: id,
+    leafId: LEAF,
+    title: id,
+    isActive: false,
+    status: 'ready',
+    terminal: `handle-${id}`
+  }
+}
+function apply(snapshot: RuntimeMobileSessionTabsResult, paired: boolean): void {
+  store.setState((state) =>
+    paired
+      ? applyWebSessionTabsSnapshot(state, snapshot, ENV)
+      : applyLocalStructuredSessionTabSnapshots(state, [snapshot])
+  )
+}
+function order(): string[] {
+  return store.getState().groupsByWorktree[WT]!.flatMap((group) => group.tabOrder)
+}
+function seed(paired: boolean, extra = false) {
+  store.setState({
+    activeWorktreeId: WT,
+    activeWorkspaceExecutionHostId: paired ? `runtime:${ENV}` : 'local'
+  })
+  let original: NonNullable<ReturnType<typeof captureTerminalSurfaceIdentity>>
+  if (paired) {
+    // External host facts; presentation membership is created only by the ordinary mirror writer.
+    original = {
+      worktreeId: WT,
+      tabId: A,
+      leafId: LEAF,
+      createdAt: 123,
+      generation: 0,
+      hasLeaf: true,
+      ptyId: 'source-host-pty',
+      incarnationId: 'source-host-incarnation'
+    }
+    apply(
+      frame([
+        { ...terminal(A), ptyId: original.ptyId, incarnationId: original.incarnationId },
+        terminal(C)
+      ]),
+      true
+    )
+  } else {
+    store.getState().createTab(WT, undefined, undefined, { id: A, initialLeafId: LEAF })
+    original = captureTerminalSurfaceIdentity(store.getState(), WT, A, LEAF)!
+  }
+  const a = paired ? toWebTerminalSurfaceTabId(A) : A
+  const c = paired ? toWebTerminalSurfaceTabId(C) : C
+  const group = store.getState().unifiedTabsByWorktree[WT]!.find((tab) => tab.id === a)!.groupId
+  if (!paired) {
+    store.getState().createTab(WT, group, undefined, { id: C, initialLeafId: LEAF })
+  }
+  const editor = (name: string): string => {
+    const fileId = store.getState().openFile(
+      {
+        filePath: `/tmp/placement-${name}.ts`,
+        relativePath: `${name}.ts`,
+        worktreeId: WT,
+        language: 'typescript',
+        runtimeEnvironmentId: null,
+        mode: 'edit'
+      },
+      { targetGroupId: group, selection: 'none', suppressActiveRuntimeFallback: true }
+    )
+    return store.getState().unifiedTabsByWorktree[WT]!.find((tab) => tab.entityId === fileId)!.id
+  }
+  const b = editor('B')
+  const x = extra ? editor('X') : null
+  store.getState().reorderUnifiedTabs(group, x ? [a, x, b, c] : [a, b, c])
+  store.getState().setActiveTab(a)
+  return { group, original, b, x, a, c }
+}
+function intent(groupId: string, afterTabId?: string): SessionTabOpenPlacement {
+  return {
+    invocationId: 'switch-invocation',
+    generation: 'switch-generation',
+    placement: { groupId, afterTabId, index: 0 },
+    activate: true,
+    viewerSelection: captureConversationSwitchViewerSelection(store.getState())
+  }
+}
+function chat(
+  agent: 'claude' | 'codex',
+  openPlacement?: SessionTabOpenPlacement
+): Extract<RuntimeMobileSessionTabsResult['tabs'][number], { type: 'agent-session' }> {
+  return {
+    type: 'agent-session',
+    id: `agent-session:${agent}-conversation`,
+    sessionId: `${agent}-conversation`,
+    agent,
+    title: agent,
+    isActive: false,
+    ...(openPlacement ? { openPlacement } : {})
+  }
+}
+
+beforeEach(() => {
+  store = createTestStore()
+  ref.store = store
+  version = 0
+  resetLocalStructuredSessionVersionForTests()
+  resetWebSessionTabsSyncTestState()
+})
+afterEach(() => {
+  resetLocalStructuredSessionVersionForTests()
+  resetWebSessionTabsSyncTestState()
+})
+
+describe('explicit open placement at the actual ordinary store owner', () => {
+  it.each([
+    ['claude', false],
+    ['codex', false],
+    ['claude', true],
+    ['codex', true]
+  ] as const)(
+    'keeps the source slot and canonical one-click selection in both directions: %s paired=%s',
+    (agent, paired) => {
+      const seeded = seed(paired)
+      const open = { ...intent(seeded.group, A), source: seeded.original }
+      apply(frame([terminal(A), chat(agent, open), terminal(C)]), paired)
+      const canonical = structuredAgentSessionTabId(`${agent}-conversation`)
+      expect(order()).toEqual([seeded.a, canonical, seeded.b, seeded.c])
+      expect(store.getState().getActiveTab(WT)?.entityId).toBe(`${agent}-conversation`)
+      if (paired) {
+        apply(frame([chat(agent, open), terminal(C)]), true)
+      } else {
+        retireTerminalPresentation(seeded.original)
+      }
+      expect(order()).toEqual([canonical, seeded.b, seeded.c])
+      const reverse = intent(seeded.group, `agent-session:${agent}-conversation`)
+      if (paired) {
+        apply(frame([{ ...terminal(DESTINATION), openPlacement: reverse }, terminal(C)]), true)
+      } else {
+        publishAgentLaunchTab({
+          requestId: 'reverse',
+          worktreeId: WT,
+          tabId: DESTINATION,
+          leafId: LEAF,
+          launchAgent: agent,
+          viewMode: 'terminal',
+          viewer: 'focus-in-workspace',
+          openPlacement: { ...reverse, placement: { ...reverse.placement, afterTabId: canonical } }
+        })
+        apply(frame([]), false)
+      }
+      const destination = paired ? toWebTerminalSurfaceTabId(DESTINATION) : DESTINATION
+      expect(order()).toEqual([destination, seeded.b, seeded.c])
+      expect(store.getState().getActiveTab(WT)?.id).toBe(destination)
+    }
+  )
+
+  it('uses the explicit index for a coalesced retired source without moving client-only X or a later used destination', () => {
+    const seeded = seed(true, true)
+    const open = { ...intent(seeded.group, A), source: seeded.original }
+    const snapshot = frame([chat('codex', open), terminal(C)])
+    apply(snapshot, true)
+    const canonical = structuredAgentSessionTabId('codex-conversation')
+    expect(order()).toEqual([canonical, seeded.x, seeded.b, seeded.c])
+    store.getState().reorderUnifiedTabs(seeded.group, [seeded.x!, seeded.b, seeded.c, canonical])
+    store.getState().activateTab(seeded.b)
+    apply({ ...snapshot, snapshotVersion: ++version }, true)
+    expect(order()).toEqual([seeded.x!, seeded.b, seeded.c, canonical])
+    expect(store.getState().getActiveTab(WT)?.id).toBe(seeded.b)
+  })
+
+  it.each([false, true])(
+    'selects a source-free History conversation across workspaces and preserves newer navigation: paired=%s',
+    (paired) => {
+      const seeded = seed(paired)
+      store.setState({ activeWorktreeId: OTHER, activeTabId: null, activeTabType: 'terminal' })
+      const open = intent(seeded.group)
+      apply(frame([terminal(A), terminal(C), chat('codex', open)]), paired)
+      expect(store.getState().activeWorktreeId).toBe(WT)
+      expect(store.getState().activeTabType).toBe('agent-session')
+      expect(store.getState().getActiveTab(WT)?.entityId).toBe('codex-conversation')
+      const stale = intent(seeded.group)
+      store.setState({ activeWorktreeId: OTHER })
+      apply(frame([terminal(A), terminal(C), chat('claude', stale), chat('codex', open)]), paired)
+      expect(store.getState().activeWorktreeId).toBe(OTHER)
+      expect(store.getState().getActiveTab(WT)?.entityId).toBe('codex-conversation')
+    }
+  )
+
+  it.each(['publication-first', 'inventory-first'] as const)(
+    'keeps first terminal materialization placed across both ordinary arrival orders: %s',
+    (arrival) => {
+      const seeded = seed(false)
+      const open = intent(seeded.group, A)
+      const publish = () =>
+        publishAgentLaunchTab({
+          requestId: 'terminal-open',
+          worktreeId: WT,
+          tabId: DESTINATION,
+          leafId: LEAF,
+          launchAgent: 'codex',
+          viewMode: 'terminal',
+          viewer: 'focus-in-workspace',
+          openPlacement: open
+        })
+      const snapshot = frame([
+        { ...terminal(DESTINATION), openPlacement: open },
+        terminal(A),
+        terminal(C)
+      ])
+      const observed: string[][] = []
+      const stop = store.subscribe(() => {
+        const ids = order()
+        if (ids.includes(DESTINATION) || ids.includes(toWebTerminalSurfaceTabId(DESTINATION))) {
+          observed.push(ids)
+        }
+      })
+      if (arrival === 'publication-first') {
+        publish()
+        apply(snapshot, false)
+      } else {
+        apply(snapshot, false)
+        publish()
+      }
+      stop()
+      expect(observed.length).toBeGreaterThan(0)
+      for (const ids of observed) {
+        expect(
+          ids.findIndex((id) => id === DESTINATION || id === toWebTerminalSurfaceTabId(DESTINATION))
+        ).toBe(1)
+      }
+      expect(order()).toHaveLength(4)
+    }
+  )
+
+  it.each(['reused', 'closed', 'split'] as const)(
+    'retains exact source/sibling authority during placement: %s',
+    (change) => {
+      const seeded = seed(false)
+      const open = { ...intent(seeded.group, A), source: seeded.original }
+      if (change === 'reused') {
+        store.setState((state) => ({
+          tabsByWorktree: {
+            ...state.tabsByWorktree,
+            [WT]: state.tabsByWorktree[WT]!.map((row) =>
+              row.id === A ? { ...row, generation: 1 } : row
+            )
+          }
+        }))
+      } else if (change === 'closed') {
+        store.getState().closeTab(A)
+      } else {
+        store.getState().setTabLayout(A, {
+          root: {
+            type: 'split',
+            direction: 'horizontal',
+            first: { type: 'leaf', leafId: LEAF },
+            second: { type: 'leaf', leafId: SIBLING }
+          },
+          activeLeafId: SIBLING,
+          expandedLeafId: null,
+          ptyIdsByLeafId: { [SIBLING]: 'sibling-pty' }
+        })
+      }
+      api.pty.kill.mockClear()
+      apply(frame([chat('claude', open)]), false)
+      const canonical = structuredAgentSessionTabId('claude-conversation')
+      if (change === 'split') {
+        expect(order()).toEqual([A, canonical, seeded.b, C])
+        retireTerminalPresentation(seeded.original)
+        expect(store.getState().terminalLayoutsByTabId[A]?.root).toEqual({
+          type: 'leaf',
+          leafId: SIBLING
+        })
+        expect(store.getState().terminalLayoutsByTabId[A]?.ptyIdsByLeafId).toEqual({
+          [SIBLING]: 'sibling-pty'
+        })
+        expect(order()).toEqual([A, canonical, seeded.b, C])
+      } else {
+        expect(order().at(-1)).toBe(canonical)
+      }
+      expect(api.pty.kill).not.toHaveBeenCalled()
+    }
+  )
+
+  it('preserves first canonical identity and ordered duplicate replacement candidates in ordinary adoption', () => {
+    store.setState({ activeWorktreeId: WT })
+    const first = store.getState().createUnifiedTab(WT, 'agent-session', {
+      id: 'old-first',
+      entityId: 'old-conversation',
+      agentSessionAgent: 'codex'
+    })
+    const second = store.getState().createUnifiedTab(WT, 'agent-session', {
+      id: 'old-second',
+      entityId: 'old-conversation',
+      agentSessionAgent: 'codex'
+    })
+    const canonical = store.getState().createUnifiedTab(WT, 'agent-session', {
+      id: 'canonical-first',
+      entityId: 'canonical-conversation',
+      agentSessionAgent: 'codex'
+    })
+    store.getState().createUnifiedTab(WT, 'agent-session', {
+      id: 'canonical-duplicate',
+      entityId: 'canonical-conversation',
+      agentSessionAgent: 'codex'
+    })
+    apply(
+      frame([
+        {
+          ...chat('codex'),
+          id: 'host-canonical',
+          sessionId: 'canonical-conversation',
+          replacesSessionId: 'old-conversation'
+        },
+        {
+          ...chat('claude'),
+          id: 'host-new-first',
+          sessionId: 'new-first',
+          replacesSessionId: 'old-conversation'
+        },
+        {
+          ...chat('codex'),
+          id: 'host-new-second',
+          sessionId: 'new-second',
+          replacesSessionId: 'old-conversation'
+        }
+      ]),
+      true
+    )
+    const rows = store.getState().unifiedTabsByWorktree[WT]!
+    expect(
+      rows.filter((row) => row.entityId === 'canonical-conversation').map((row) => row.id)
+    ).toEqual([canonical.id])
+    expect(rows.find((row) => row.entityId === 'new-first')).toMatchObject({
+      id: first.id,
+      groupId: first.groupId
+    })
+    expect(rows.find((row) => row.entityId === 'new-second')).toMatchObject({
+      id: second.id,
+      groupId: second.groupId
+    })
+    expect(new Set(rows.map((row) => row.id)).size).toBe(rows.length)
+  })
+
+  it.each([false, true])(
+    'bounds retained source-absent snapshot replay work at N/10N: paired=%s',
+    (paired) => {
+      const measure = (count: number) => {
+        store = createTestStore()
+        ref.store = store
+        resetLocalStructuredSessionVersionForTests()
+        resetWebSessionTabsSyncTestState()
+        store.setState({
+          activeWorktreeId: WT,
+          activeWorkspaceExecutionHostId: paired ? `runtime:${ENV}` : 'local',
+          worktreeNavHistory: Array.from({ length: 50 }, (_, i) => `history-${i}`),
+          worktreeNavHistoryIndex: 49
+        })
+        const sourceIds = Array.from({ length: count }, (_, i) => `retired-source-${i}`)
+        if (paired) {
+          apply(frame(sourceIds.map(terminal)), true)
+        } else {
+          for (const id of sourceIds) {
+            store.getState().createTab(WT, undefined, undefined, { id, initialLeafId: LEAF })
+          }
+        }
+        const group = store.getState().groupsByWorktree[WT]![0]!.id
+        const captured = sourceIds.map((id) =>
+          captureTerminalSurfaceIdentity(
+            store.getState(),
+            WT,
+            paired ? toWebTerminalSurfaceTabId(id) : id,
+            LEAF
+          )!
+        )
+        const viewerSelection = captureConversationSwitchViewerSelection(store.getState())
+        const destinations = sourceIds.map((sourceId, i) => ({
+          ...chat(i % 2 ? 'claude' : 'codex'),
+          id: `agent-session:retained-${i}`,
+          sessionId: `retained-${i}`,
+          openPlacement: {
+            ...intent(group, sourceId),
+            viewerSelection,
+            invocationId: `retained-${i}`,
+            generation: `generation-${i}`,
+            source: { ...captured[i]!, tabId: sourceId }
+          }
+        }))
+        apply(frame([...sourceIds.map(terminal), ...destinations]), paired)
+        if (paired) {
+          apply(frame(destinations), true)
+        } else {
+          for (const original of captured) {
+            retireTerminalPresentation(original)
+          }
+        }
+        expect(store.getState().tabsByWorktree[WT]).toHaveLength(0)
+        const before = store.getState()
+        const beforeOrder = order()
+        const beforeActiveId = before.getActiveTab(WT)?.id
+        let tabReads = 0
+        let historyReads = 0
+        store.setState({
+          unifiedTabsByWorktree: {
+            ...before.unifiedTabsByWorktree,
+            [WT]: before.unifiedTabsByWorktree[WT]!.map(
+              (row) =>
+                new Proxy(row, {
+                  get: (target, key, receiver) => {
+                    if (key === 'id' || key === 'entityId' || key === 'contentType') {
+                      tabReads++
+                    }
+                    return Reflect.get(target, key, receiver)
+                  }
+                })
+            )
+          },
+          worktreeNavHistory: new Proxy(before.worktreeNavHistory, {
+            get: (target, key, receiver) => {
+              if (typeof key === 'string' && /^\d+$/.test(key)) {
+                historyReads++
+              }
+              return Reflect.get(target, key, receiver)
+            }
+          })
+        })
+        const mappings = vi.spyOn(hostSessionTabIdByLocalKey, 'get')
+        try {
+          apply(frame(destinations), paired)
+          const mappingReads = mappings.mock.calls.length
+          const membershipReads = tabReads
+          expect(order()).toEqual(beforeOrder)
+          expect(store.getState().getActiveTab(WT)?.id).toBe(beforeActiveId)
+          expect(store.getState().activeWorktreeId).toBe(before.activeWorktreeId)
+          expect(order()).toHaveLength(count)
+          expect(historyReads).toBeGreaterThan(0)
+          expect(historyReads).toBeLessThanOrEqual(100)
+          expect(mappingReads).toBeLessThanOrEqual(30 * count + 300)
+          expect(membershipReads).toBeGreaterThan(0)
+          expect(membershipReads).toBeLessThanOrEqual(50 * count + 500)
+          return { count, mappingReads, membershipReads, historyReads }
+        } finally {
+          mappings.mockRestore()
+        }
+      }
+      const small = measure(10)
+      const large = measure(100)
+      expect(large.mappingReads).toBeLessThanOrEqual(12 * Math.max(1, small.mappingReads))
+      expect(large.membershipReads).toBeLessThanOrEqual(12 * small.membershipReads)
+      expect(large.historyReads).toBeLessThanOrEqual(2 * small.historyReads)
+      process.stdout.write(
+        `retained snapshot operation counts ${JSON.stringify({ paired, small, large })}\n`
+      )
+    }
+  )
+
+  it('retains the ordinary append and unsolicited-selection policy without placement metadata', () => {
+    const seeded = seed(false)
+    apply(frame([chat('claude')]), false)
+    expect(order()).toEqual([A, seeded.b, C, structuredAgentSessionTabId('claude-conversation')])
+    expect(store.getState().getActiveTab(WT)?.id).toBe(A)
+  })
+})
diff --git a/src/renderer/src/runtime/web-session-client-owned-tab-placement.ts b/src/renderer/src/runtime/web-session-client-owned-tab-placement.ts
index 9ac23eefd73f..678ec187a97b 100644
--- a/src/renderer/src/runtime/web-session-client-owned-tab-placement.ts
+++ b/src/renderer/src/runtime/web-session-client-owned-tab-placement.ts
@@ -1,5 +1,8 @@
 import { structuredLaunchSlotIds } from '@/lib/agent-session/launch/structured-agent-session-launch-persistence'
 import type { TabGroup, TabGroupLayoutNode } from '../../../shared/tab-types'
+import type { Tab } from '../../../shared/tab-types'
+import type { SessionTabOpenPlacement } from '../../../shared/session-tab-placement'
+import { insertOpenPlacementTab } from '../lib/session-tab-open-placement-order'
 import {
   pickNextActiveTab,
   pushRecentTabId,
@@ -10,6 +13,7 @@ import {
 export type ClientOwnedAdoptedTab = {
   tabId: string
   groupId: string
+  openPlacement?: SessionTabOpenPlacement['placement']
 }
 
 export type ClientOwnedPlacementInput = {
@@ -19,6 +23,7 @@ export type ClientOwnedPlacementInput = {
   validUnifiedTabIds: ReadonlySet<string>
   /** Never-seen tabs in snapshot order; groupId is a hint (host group or fallback). */
   adoptedTabs: readonly ClientOwnedAdoptedTab[]
+  tabs?: readonly Tab[]
   /** Client-recorded placements; these are authoritative and may move an already-placed tab. */
   placementMoves: readonly ClientOwnedAdoptedTab[]
   /** Identity rekeys (provisional/local unified id → mirrored id); placement carries over. */
@@ -175,7 +180,14 @@ export function reconcileClientOwnedTabPlacement(
     }
     const target = ensureGroup(targetGroupId)
     if (!target.tabOrder.includes(adopted.tabId)) {
-      target.tabOrder.push(adopted.tabId)
+      target.tabOrder = adopted.openPlacement
+        ? insertOpenPlacementTab(
+            target.tabOrder,
+            input.tabs ?? [],
+            adopted.tabId,
+            adopted.openPlacement
+          )
+        : [...target.tabOrder, adopted.tabId]
     }
   }
 
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-base.ts b/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-base.ts
index 02f59921677b..bcc7b4ee70b3 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-base.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-base.ts
@@ -34,6 +34,7 @@ import {
   isTerminalRowRetiredByHost
 } from './host-retired-terminal-rows'
 import { hostSnapshotAffirmsWorktreeContents } from '../host-session-snapshot-authority'
+import { prepareSnapshotOpenPlacements } from './open-placement'
 
 export function prepareWebSessionTabsSnapshotBase(
   state: WebSessionTabsSyncState,
@@ -44,6 +45,7 @@ export function prepareWebSessionTabsSnapshotBase(
   batchContext: WebSessionTabsBatchContext | undefined,
   options: WebSessionTabsSnapshotApplyOptions | undefined
 ) {
+  const openPlacements = prepareSnapshotOpenPlacements(state, rawSnapshot, environmentId, now)
   const snapshotHostTabId = (tab: RuntimeMobileSessionTabsResult['tabs'][number]): string =>
     tab.type === 'terminal' ? tab.parentTabId : tab.id
   reconcileWebSessionCloseIntents(
@@ -219,6 +221,7 @@ export function prepareWebSessionTabsSnapshotBase(
     now,
     batchContext,
     options,
+    openPlacements,
     focusIntent,
     matchingFocusIntentTab,
     callerFocusIntentTab,
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-groups.ts b/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-groups.ts
index d73a113b6fe7..8cdeab57ce66 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-groups.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-groups.ts
@@ -9,6 +9,7 @@ import { peekWebSessionTerminalPlacementGroup } from '../web-session-terminal-pl
 import { reconcileClientOwnedTabPlacement } from '../web-session-client-owned-tab-placement'
 import { buildMirroredHostGroups, retainClientPlacedMirroredTabs } from './layout-groups'
 import { sanitizeRecentTabIds, pushRecentTabId } from './state-equality-core'
+import { insertOpenPlacementTab } from '../../lib/session-tab-open-placement-order'
 
 export function prepareWebSessionTabsSnapshotGroups(
   base: ReturnType<typeof prepareWebSessionTabsSnapshotUnified>
@@ -38,6 +39,36 @@ export function prepareWebSessionTabsSnapshotGroups(
     reservedEmptyPreviewFallbackTabId
   } = base
   const currentGroups = state.groupsByWorktree[worktreeId] ?? []
+  const currentGroupIds = new Set<string | undefined>(currentGroups.map((group) => group.id))
+  const currentTabsById = new Map<
+    string | undefined,
+    (typeof state.unifiedTabsByWorktree)[string][number]
+  >()
+  for (const tab of state.unifiedTabsByWorktree[worktreeId] ?? []) {
+    if (!currentTabsById.has(tab.id)) {
+      currentTabsById.set(tab.id, tab)
+    }
+  }
+  const openPlacementByTabId = new Map(
+    base.openPlacements.flatMap((entry) => {
+      const tabId = hostToLocalTabId.get(entry.hostTabId)
+      if (!tabId) {
+        return []
+      }
+      const anchor = currentTabsById.get(entry.placement.afterTabId)
+      return [
+        [
+          tabId,
+          {
+            ...entry.placement,
+            groupId: currentGroupIds.has(entry.placement.groupId)
+              ? entry.placement.groupId
+              : (anchor?.groupId ?? entry.placement.groupId)
+          }
+        ] as const
+      ]
+    })
+  )
   const clientGroupIdByLocalTabId = new Map(
     mirroredBrowserTabs.flatMap((entry) =>
       entry.clientGroupId ? [[entry.unifiedTab.id, entry.clientGroupId]] : []
@@ -97,13 +128,18 @@ export function prepareWebSessionTabsSnapshotGroups(
       .filter((tab) => !knownGroupTabIds.has(tab.id))
       .map((tab) => ({
         tabId: tab.id,
-        groupId: clientGroupIdByLocalTabId.get(tab.id) ?? tab.groupId
+        groupId:
+          openPlacementByTabId.get(tab.id)?.groupId ??
+          clientGroupIdByLocalTabId.get(tab.id) ??
+          tab.groupId,
+        openPlacement: openPlacementByTabId.get(tab.id)
       }))
     return reconcileClientOwnedTabPlacement({
       currentGroups,
       worktreeId,
       validUnifiedTabIds,
       adoptedTabs,
+      tabs: nextUnifiedTabs,
       placementMoves,
       rekeyedTabIds,
       intentTabId: honorSnapshotActiveFocus ? (intentUnifiedTabId ?? null) : null,
@@ -213,7 +249,15 @@ export function prepareWebSessionTabsSnapshotGroups(
     for (const tabId of hostOrMirroredOrder) {
       push(tabId)
     }
-    return next
+    const currentIds = new Set(current)
+    let placed = next
+    for (const [tabId, placement] of openPlacementByTabId) {
+      if (currentIds.has(tabId) || !validTabBarIds.has(tabId)) {
+        continue
+      }
+      placed = insertOpenPlacementTab(placed, nextUnifiedTabs ?? [], tabId, placement)
+    }
+    return placed
   })()
   return {
     ...base,
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/apply-snapshot.ts b/src/renderer/src/runtime/web-session-tabs-sync/apply-snapshot.ts
index 87333d16dfcf..27d124635e6d 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/apply-snapshot.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/apply-snapshot.ts
@@ -20,6 +20,7 @@ import { buildWebSessionTabsFinalPatch } from './apply-final-patch'
 import { isFrameDrawnServerWorkspace } from './frame-drawn-server-workspaces'
 import { buildFrameDrawnWorkspaceStatusPatch } from './frame-drawn-workspace-status-patch'
 import { indexMirroredTerminalSurfaces } from './mirrored-terminal-handle-index'
+import { applySnapshotOpenSelection } from './open-placement-selection'
 
 export function applyWebSessionTabsSnapshotWithContext(
   state: WebSessionTabsSyncState,
@@ -78,5 +79,12 @@ export function applyWebSessionTabsSnapshotWithContext(
   const browserRecords = applyBrowserRecordUpdates(terminalRecords)
   const worktreeRecords = applyWorktreeRecordUpdates(browserRecords)
   const activeState = applyActiveStateUpdates(worktreeRecords)
-  return buildWebSessionTabsFinalPatch(activeState)
+  return applySnapshotOpenSelection(
+    state,
+    buildWebSessionTabsFinalPatch(activeState),
+    worktreeId,
+    environmentId,
+    base.openPlacements,
+    unified.hostToLocalTabId
+  )
 }
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/open-placement-read.ts b/src/renderer/src/runtime/web-session-tabs-sync/open-placement-read.ts
new file mode 100644
index 000000000000..9f8b5ae1355f
--- /dev/null
+++ b/src/renderer/src/runtime/web-session-tabs-sync/open-placement-read.ts
@@ -0,0 +1,135 @@
+import type { SessionTabOpenPlacement } from '../../../../shared/session-tab-placement'
+import type { RuntimeMobileSessionTabsResult } from '../../../../shared/runtime-types'
+import {
+  captureTerminalSurfaceIdentity,
+  isRetainedTerminalSurfaceIdentity
+} from '../../../../shared/terminal-tab-close'
+import { toWebTerminalSurfaceTabId } from '../../../../shared/terminal-surface-id'
+import { captureConversationSwitchViewerSelection } from '../../lib/conversation-switch-selection'
+import { isWebSessionCloseIntentPending } from '../web-session-close-intent'
+import { LOCAL_STRUCTURED_SESSION_OWNER } from '../local-structured-session-owner'
+import { getRemoteRuntimePtyOwner } from '../runtime-terminal-stream'
+import { hostSessionTabIdsByLocalTabForWorktree } from './tracking-mappings'
+import type { WebSessionTabsSyncState } from './state'
+
+/** Call-local indexes of the same ordinary transaction input, never retained across applies. */
+export function createOpenPlacementRead(
+  state: WebSessionTabsSyncState,
+  worktreeId: string,
+  environmentId: string,
+  snapshot?: RuntimeMobileSessionTabsResult,
+  now = Date.now()
+) {
+  const tabs = state.unifiedTabsByWorktree[worktreeId] ?? []
+  const tabIds = new Set(tabs.map((tab) => tab.id))
+  const entityIds = new Map<string, Set<string>>()
+  for (const tab of tabs) {
+    const ids = entityIds.get(tab.contentType) ?? new Set<string>()
+    ids.add(tab.entityId)
+    entityIds.set(tab.contentType, ids)
+  }
+  const localByHost = new Map<string, string>()
+  for (const [localId, hostId] of hostSessionTabIdsByLocalTabForWorktree(
+    environmentId,
+    worktreeId
+  )) {
+    if (!localByHost.has(hostId)) {
+      localByHost.set(hostId, localId)
+    }
+  }
+  const terminalRows = new Map<string, (typeof state.tabsByWorktree)[string][number]>()
+  for (const row of state.tabsByWorktree[worktreeId] ?? []) {
+    if (!terminalRows.has(row.id)) {
+      terminalRows.set(row.id, row)
+    }
+  }
+  type Surface = Extract<NonNullable<typeof snapshot>['tabs'][number], { type: 'terminal' }>
+  const surfaces = new Map<string, Map<string, Surface>>()
+  for (const tab of snapshot?.tabs ?? []) {
+    if (tab.type === 'terminal') {
+      const leaves = surfaces.get(tab.parentTabId) ?? new Map<string, Surface>()
+      if (!leaves.has(tab.leafId)) {
+        leaves.set(tab.leafId, tab)
+      }
+      surfaces.set(tab.parentTabId, leaves)
+    }
+  }
+  const closingHostIds = new Set<string>()
+  for (const close of state.pairedTerminalTabCloseIntentsByEnvironment?.[environmentId] ?? []) {
+    if (close.worktreeId === worktreeId) {
+      for (const hostId of close.hostTabIds) {
+        closingHostIds.add(hostId)
+      }
+    }
+  }
+  const localTabId = (hostId: string): string => {
+    const mirroredId = toWebTerminalSurfaceTabId(hostId)
+    return (
+      localByHost.get(hostId) ??
+      (tabIds.has(hostId) ? hostId : tabIds.has(mirroredId) ? mirroredId : hostId)
+    )
+  }
+  let viewerSelection: string | undefined
+  return {
+    localTabId,
+    hasTab: (id: string) => tabIds.has(id),
+    hasEntity: (kind: string, id: string) => entityIds.get(kind)?.has(id) === true,
+    viewerSelectionCurrent: (original?: string): boolean => {
+      if (original === undefined) {
+        return true
+      }
+      viewerSelection ??= captureConversationSwitchViewerSelection(state)
+      return original === viewerSelection
+    },
+    sourceCurrent: (intent: SessionTabOpenPlacement): boolean => {
+      const source = intent.source
+      if (!source) {
+        return true
+      }
+      const tabId = localTabId(source.tabId)
+      if (
+        source.worktreeId !== worktreeId ||
+        state.closedTerminalTabTombstonesByTabId?.[tabId] ||
+        closingHostIds.has(source.tabId) ||
+        isWebSessionCloseIntentPending({ environmentId }, worktreeId, source.tabId, now)
+      ) {
+        return false
+      }
+      const row = terminalRows.get(tabId)
+      const current = captureTerminalSurfaceIdentity(
+        {
+          tabsByWorktree: { [worktreeId]: row ? [row] : [] },
+          terminalLayoutsByTabId: state.terminalLayoutsByTabId,
+          terminalPtyIncarnationsByPaneKey: state.terminalPtyIncarnationsByPaneKey
+        },
+        worktreeId,
+        tabId,
+        source.leafId
+      )
+      if (environmentId === LOCAL_STRUCTURED_SESSION_OWNER || tabId === source.tabId) {
+        return isRetainedTerminalSurfaceIdentity(source, current)
+      }
+      const surface = surfaces.get(source.tabId)?.get(source.leafId)
+      if (surface) {
+        if (
+          (surface.ptyId != null && surface.ptyId !== source.ptyId) ||
+          (surface.incarnationId != null && surface.incarnationId !== source.incarnationId)
+        ) {
+          return false
+        }
+        if (
+          current?.ptyId &&
+          typeof surface.terminal === 'string' &&
+          getRemoteRuntimePtyOwner(current.ptyId)?.terminal !== surface.terminal
+        ) {
+          return false
+        }
+      }
+      // Mirror creation times belong to this viewer; host PTY/incarnation facts belong to the source.
+      return (
+        current === null ||
+        (current.generation === source.generation && (!current.hasLeaf || source.hasLeaf))
+      )
+    }
+  }
+}
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/open-placement-selection.ts b/src/renderer/src/runtime/web-session-tabs-sync/open-placement-selection.ts
new file mode 100644
index 000000000000..ab126f661fb5
--- /dev/null
+++ b/src/renderer/src/runtime/web-session-tabs-sync/open-placement-selection.ts
@@ -0,0 +1,69 @@
+import { isFloatingWorkspaceId } from '../../../../shared/floating-workspace-worktree'
+import { isWorkspaceKey, worktreeWorkspaceKey } from '../../../../shared/workspace-scope'
+import { appendHistoryEntry } from '../../store/slices/worktree-nav-history'
+import { tabActivationPatch } from '../../store/slices/tabs/tabs-focus-actions'
+import { deriveActiveSurfaceForWorktree } from '../../store/slices/tabs/tabs-surface'
+import { executionHostIdForSessionTabsOwner } from '../local-structured-session-owner'
+import type { SnapshotOpenPlacement } from './open-placement'
+import type { WebSessionTabsSyncState } from './state'
+
+/** Membership and original-view admission share one synchronous ordinary snapshot transaction. */
+export function applySnapshotOpenSelection(
+  state: WebSessionTabsSyncState,
+  patch: WebSessionTabsSyncState | Partial<WebSessionTabsSyncState>,
+  worktreeId: string,
+  environmentId: string,
+  placements: readonly SnapshotOpenPlacement[],
+  hostToLocalTabId: ReadonlyMap<string, string>
+): WebSessionTabsSyncState | Partial<WebSessionTabsSyncState> {
+  const requested = placements.find((entry) => entry.activate)
+  if (!requested) {
+    return patch
+  }
+  const next = { ...state, ...patch }
+  const localId = requested && hostToLocalTabId.get(requested.hostTabId)
+  const tab = localId && next.unifiedTabsByWorktree[worktreeId]?.find((row) => row.id === localId)
+  if (
+    !tab ||
+    !next.groupsByWorktree[worktreeId]?.some((group) => group.tabOrder.includes(tab.id))
+  ) {
+    return patch
+  }
+  const activation = tabActivationPatch(next, tab, worktreeId, { recordFocus: false }, true)
+  const activated = { ...next, ...activation }
+  const surface = deriveActiveSurfaceForWorktree(activated, worktreeId, tab.groupId, {
+    preferredTabId: tab.id
+  })
+  return {
+    ...patch,
+    ...activation,
+    activeTabIdByWorktree: { ...next.activeTabIdByWorktree, [worktreeId]: surface.activeTabId },
+    activeTabTypeByWorktree: {
+      ...next.activeTabTypeByWorktree,
+      [worktreeId]: surface.activeTabType
+    },
+    ...(isFloatingWorkspaceId(worktreeId)
+      ? {}
+      : {
+          ...surface,
+          ...(state.worktreeNavHistory &&
+          state.worktreeNavHistoryIndex !== undefined &&
+          !state.isNavigatingHistory
+            ? appendHistoryEntry(
+                {
+                  worktreeNavHistory: state.worktreeNavHistory,
+                  worktreeNavHistoryIndex: state.worktreeNavHistoryIndex
+                },
+                worktreeId
+              )
+            : {}),
+          activeWorktreeId: worktreeId,
+          activeWorkspaceKey: isWorkspaceKey(worktreeId)
+            ? worktreeId
+            : worktreeWorkspaceKey(worktreeId),
+          activeWorkspaceExecutionHostId: executionHostIdForSessionTabsOwner(environmentId),
+          activePendingCreationId: null,
+          activeView: 'terminal' as const
+        })
+  }
+}
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/open-placement.ts b/src/renderer/src/runtime/web-session-tabs-sync/open-placement.ts
new file mode 100644
index 000000000000..050720394a20
--- /dev/null
+++ b/src/renderer/src/runtime/web-session-tabs-sync/open-placement.ts
@@ -0,0 +1,82 @@
+import type { SessionTabOpenPlacement } from '../../../../shared/session-tab-placement'
+import type { RuntimeMobileSessionTabsResult } from '../../../../shared/runtime-types'
+import { createOpenPlacementRead } from './open-placement-read'
+import { LOCAL_STRUCTURED_SESSION_OWNER } from '../local-structured-session-owner'
+import type { WebSessionTabsSyncState } from './state'
+
+export type SnapshotOpenPlacement = {
+  hostTabId: string
+  intent: SessionTabOpenPlacement
+  placement: SessionTabOpenPlacement['placement']
+  activate: boolean
+}
+
+export function localOpenPlacementTabId(
+  state: WebSessionTabsSyncState,
+  worktreeId: string,
+  hostTabId: string,
+  environmentId: string
+): string {
+  return createOpenPlacementRead(state, worktreeId, environmentId).localTabId(hostTabId)
+}
+
+/** Placement never grants authority over a source the user closed or replaced. */
+export function openPlacementSourceCurrent(
+  state: WebSessionTabsSyncState,
+  worktreeId: string,
+  intent: SessionTabOpenPlacement,
+  environmentId = LOCAL_STRUCTURED_SESSION_OWNER,
+  snapshot?: RuntimeMobileSessionTabsResult,
+  now = Date.now()
+): boolean {
+  return (
+    !intent.source ||
+    createOpenPlacementRead(state, worktreeId, environmentId, snapshot, now).sourceCurrent(intent)
+  )
+}
+
+/** Read before close-ledger reconciliation and identity-map replacement in the same apply. */
+export function prepareSnapshotOpenPlacements(
+  state: WebSessionTabsSyncState,
+  snapshot: RuntimeMobileSessionTabsResult,
+  environmentId: string,
+  now: number
+): SnapshotOpenPlacement[] {
+  let read: ReturnType<typeof createOpenPlacementRead> | undefined
+  return snapshot.tabs.flatMap((tab) => {
+    if (tab.type !== 'terminal' && tab.type !== 'agent-session') {
+      return []
+    }
+    const intent = tab.openPlacement
+    if (!intent) {
+      return []
+    }
+    read ??= createOpenPlacementRead(state, snapshot.worktree, environmentId, snapshot, now)
+    if (!read.sourceCurrent(intent)) {
+      return []
+    }
+    const hostTabId = tab.type === 'terminal' ? tab.parentTabId : tab.id
+    const currentId = read.localTabId(hostTabId)
+    const alreadyPresent =
+      read.hasTab(currentId) ||
+      (tab.type === 'agent-session' && read.hasEntity('agent-session', tab.sessionId))
+    return [
+      {
+        hostTabId,
+        intent,
+        placement: {
+          ...intent.placement,
+          ...(intent.placement.afterTabId
+            ? {
+                afterTabId: read.localTabId(intent.placement.afterTabId)
+              }
+            : {})
+        },
+        activate:
+          intent.activate &&
+          (!alreadyPresent || intent.viewerSelection !== undefined) &&
+          read.viewerSelectionCurrent(intent.viewerSelection)
+      }
+    ]
+  })
+}
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/state.ts b/src/renderer/src/runtime/web-session-tabs-sync/state.ts
index 6174bd963b82..da0a165e797c 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/state.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/state.ts
@@ -228,6 +228,16 @@ export type WebSessionTabsSyncState = Pick<
   Partial<
     Pick<
       AppState,
+      | 'activeWorkspaceExecutionHostId'
+      | 'activeWorkspaceKey'
+      | 'activePendingCreationId'
+      | 'activeView'
+      | 'worktreeNavHistory'
+      | 'worktreeNavHistoryIndex'
+      | 'isNavigatingHistory'
+      | 'terminalPtyIncarnationsByPaneKey'
+      | 'closedTerminalTabTombstonesByTabId'
+      | 'pairedTerminalTabCloseIntentsByEnvironment'
       | 'acknowledgedAgentsByPaneKey'
       | 'activityClearedAtByPaneKey'
       | 'agentLaunchConfigByPaneKey'
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/terminal-surfaces.ts b/src/renderer/src/runtime/web-session-tabs-sync/terminal-surfaces.ts
index 82d20206d892..a5c11e99418a 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/terminal-surfaces.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/terminal-surfaces.ts
@@ -81,35 +81,41 @@ export function buildMirroredAgentTabs(
   const assignedIds = new Set<string>()
   const replacementTabs = new Map<string, Tab>()
   const replacementIds = new Set<string>()
+  const currentAgentTabs = new Map<string, { tabs: Tab[]; nextAvailable: number }>()
+  for (const tab of currentUnifiedTabs) {
+    if (tab.contentType === 'agent-session') {
+      const indexed = currentAgentTabs.get(tab.entityId) ?? { tabs: [], nextAvailable: 0 }
+      indexed.tabs.push(tab)
+      currentAgentTabs.set(tab.entityId, indexed)
+    }
+  }
+  const firstUnreplaced = (sessionId: string): Tab | undefined => {
+    const indexed = currentAgentTabs.get(sessionId)
+    if (!indexed) {
+      return undefined
+    }
+    // Exclusions only grow during this apply; retain original candidate order, including duplicates.
+    while (
+      indexed.nextAvailable < indexed.tabs.length &&
+      replacementIds.has(indexed.tabs[indexed.nextAvailable]!.id)
+    ) {
+      indexed.nextAvailable++
+    }
+    return indexed.tabs[indexed.nextAvailable]
+  }
   for (const tab of agentTabs) {
     if (!tab.replacesSessionId) {
       continue
     }
     const existing =
-      currentUnifiedTabs.find(
-        (candidate) =>
-          candidate.contentType === 'agent-session' && candidate.entityId === tab.sessionId
-      ) ??
-      currentUnifiedTabs.find(
-        (candidate) =>
-          !replacementIds.has(candidate.id) &&
-          candidate.contentType === 'agent-session' &&
-          candidate.entityId === tab.replacesSessionId
-      )
+      currentAgentTabs.get(tab.sessionId)?.tabs[0] ?? firstUnreplaced(tab.replacesSessionId)
     if (existing) {
       replacementTabs.set(tab.sessionId, existing)
       replacementIds.add(existing.id)
     }
   }
   return agentTabs.map((tab, index) => {
-    const existing =
-      replacementTabs.get(tab.sessionId) ??
-      currentUnifiedTabs.find(
-        (candidate) =>
-          !replacementIds.has(candidate.id) &&
-          candidate.contentType === 'agent-session' &&
-          candidate.entityId === tab.sessionId
-      )
+    const existing = replacementTabs.get(tab.sessionId) ?? firstUnreplaced(tab.sessionId)
     const launch = readStructuredAgentLaunchRecord(tab.sessionId)
     const address =
       executionHostId === 'local' &&
diff --git a/src/renderer/src/runtime/workspace-layout-frame-drawn-workspaces.ts b/src/renderer/src/runtime/workspace-layout-frame-drawn-workspaces.ts
index 532f3d493f28..d66d6957aa3a 100644
--- a/src/renderer/src/runtime/workspace-layout-frame-drawn-workspaces.ts
+++ b/src/renderer/src/runtime/workspace-layout-frame-drawn-workspaces.ts
@@ -10,10 +10,16 @@ type HeldWorkspacesStore = {
 }
 
 /** Which workspaces frames draw: ones the window holds that no paired server mirrors. */
-export function framesDrawWorkspace(state: AppState): (key: string) => boolean {
+export function framesDrawWorkspace(
+  state: AppState,
+  openedWorkspaces?: ReadonlySet<string>
+): (key: string) => boolean {
   const mirrored = pairedServerMirrors(state)
   return (key) =>
-    (key in state.groupsByWorktree || key in state.unifiedTabsByWorktree) && !mirrored(key)
+    (key in state.groupsByWorktree ||
+      key in state.unifiedTabsByWorktree ||
+      openedWorkspaces?.has(key) === true) &&
+    !mirrored(key)
 }
 
 /** Notify first visits to main-only workspaces; no later frame is guaranteed to trigger drawing. */
diff --git a/src/renderer/src/runtime/workspace-layout-frame-flush-plan.ts b/src/renderer/src/runtime/workspace-layout-frame-flush-plan.ts
new file mode 100644
index 000000000000..7575810c29d0
--- /dev/null
+++ b/src/renderer/src/runtime/workspace-layout-frame-flush-plan.ts
@@ -0,0 +1,70 @@
+import type { AppState } from '@/store/types'
+import type { WorkspaceLayoutCache } from '@/store/workspace-layout-cache'
+import type { TerminalTabTitleUpdate } from '@/store/slices/terminal-tab-title-batch'
+import type { PendingWorkspaceChanges } from './workspace-layout-frame-pending'
+import type { LayoutFrameSource } from './layout-frame-stream'
+import { LOCAL_STRUCTURED_SESSION_OWNER } from './local-structured-session-owner'
+import { frameOpenPlacements } from './workspace-layout-frame-open-selection'
+import { liveTitleUpdates } from './workspace-layout-frame-changes'
+
+/** Classify and take accumulated frame work before the ordinary store writer builds it. */
+export function planLayoutFrameFlush(
+  state: AppState,
+  cache: WorkspaceLayoutCache,
+  pending: Map<string, PendingWorkspaceChanges>,
+  shown: Set<string>,
+  source: LayoutFrameSource
+) {
+  const owner =
+    source.target.kind === 'environment'
+      ? source.target.environmentId
+      : LOCAL_STRUCTURED_SESSION_OWNER
+  const drawn = source.draws(state)
+  const changed: string[] = []
+  const fullBuilt: string[] = []
+  const workspaceBuilt: string[] = []
+  const rebound = new Map<string, ReadonlySet<string>>()
+  const titleUpdates: TerminalTabTitleUpdate[] = []
+  for (const [key, layout] of Object.entries(cache)) {
+    const changes = pending.get(key)
+    const opensHere =
+      !drawn(key) &&
+      frameOpenPlacements(state, layout, owner).some((entry) => entry.activate) &&
+      source.draws(state, new Set([key]))(key)
+    if (!drawn(key) && !opensHere) {
+      // Frames the window did not draw: its next draw takes the full build.
+      if (changes) {
+        shown.delete(key)
+      }
+      continue
+    }
+    if (shown.has(key) && !changes) {
+      continue
+    }
+    changed.push(key)
+    if (!shown.has(key)) {
+      fullBuilt.push(key)
+    } else if (changes?.rebuild) {
+      workspaceBuilt.push(key)
+    } else if (changes) {
+      titleUpdates.push(
+        ...liveTitleUpdates(
+          changes.titled,
+          layout,
+          (tabId) => state.terminalLayoutsByTabId[tabId]?.activeLeafId
+        )
+      )
+      if (changes.rebound.size > 0) {
+        rebound.set(key, changes.rebound)
+      }
+    }
+  }
+  pending.clear()
+  // A workspace main stopped publishing keeps what the window shows; main has nothing to say.
+  for (const key of shown) {
+    if (!(key in cache)) {
+      shown.delete(key)
+    }
+  }
+  return { changed, fullBuilt, workspaceBuilt, rebound, titleUpdates }
+}
diff --git a/src/renderer/src/runtime/workspace-layout-frame-open-selection.ts b/src/renderer/src/runtime/workspace-layout-frame-open-selection.ts
new file mode 100644
index 000000000000..21dcac8729ee
--- /dev/null
+++ b/src/renderer/src/runtime/workspace-layout-frame-open-selection.ts
@@ -0,0 +1,65 @@
+import type { AppState } from '@/store/types'
+import type { PublishedWorkspaceLayout } from '../../../shared/workspace-layout/workspace-layout-published'
+import type { WorkspaceLayoutCache } from '@/store/workspace-layout-cache'
+import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
+import { LOCAL_STRUCTURED_SESSION_OWNER } from './local-structured-session-owner'
+import type { SnapshotOpenPlacement } from './web-session-tabs-sync/open-placement'
+import { createOpenPlacementRead } from './web-session-tabs-sync/open-placement-read'
+import { applySnapshotOpenSelection } from './web-session-tabs-sync/open-placement-selection'
+
+/** Frames already carry main's applied layout; only original-view selection remains window-owned. */
+export function frameOpenSelectionPatch(
+  before: AppState,
+  patch: Partial<AppState>,
+  cache: WorkspaceLayoutCache,
+  keys: readonly string[],
+  target: RuntimeClientTarget
+): Partial<AppState> {
+  const owner =
+    target.kind === 'environment' ? target.environmentId : LOCAL_STRUCTURED_SESSION_OWNER
+  let next = patch
+  for (const key of keys) {
+    const layout = cache[key]
+    if (!layout) {
+      continue
+    }
+    const placements = frameOpenPlacements(before, layout, owner)
+    next = applySnapshotOpenSelection(
+      before,
+      next,
+      key,
+      owner,
+      placements,
+      new Map(layout.tabs.map((tab) => [tab.id, tab.id]))
+    )
+  }
+  return next
+}
+
+/** Only an admitted explicit open asks the existing draw owner to materialize an unheld workspace. */
+export function frameOpenPlacements(
+  before: AppState,
+  layout: PublishedWorkspaceLayout,
+  owner: string
+): SnapshotOpenPlacement[] {
+  let read: ReturnType<typeof createOpenPlacementRead> | undefined
+  return layout.tabs.flatMap((tab) => {
+    const intent = tab.openPlacement
+    if (!intent?.activate) {
+      return []
+    }
+    read ??= createOpenPlacementRead(before, layout.worktreeId, owner)
+    if (!read.viewerSelectionCurrent(intent.viewerSelection) || !read.sourceCurrent(intent)) {
+      return []
+    }
+    const alreadyPresent = read.hasTab(tab.id) || read.hasEntity(tab.kind, tab.entityId)
+    return [
+      {
+        hostTabId: tab.id,
+        intent,
+        placement: intent.placement,
+        activate: !alreadyPresent || intent.viewerSelection !== undefined
+      }
+    ]
+  })
+}
diff --git a/src/renderer/src/runtime/workspace-layout-frame-sync.test.ts b/src/renderer/src/runtime/workspace-layout-frame-sync.test.ts
index cf5fdaf884cf..b79cb8f232d5 100644
--- a/src/renderer/src/runtime/workspace-layout-frame-sync.test.ts
+++ b/src/renderer/src/runtime/workspace-layout-frame-sync.test.ts
@@ -1,6 +1,8 @@
+import { captureConversationSwitchViewerSelection } from '@/lib/conversation-switch-selection'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type * as AgentStatusModule from '@/lib/agent-status'
 import type { ExecutionHostId } from '../../../shared/execution-host'
+import type { PublishedTab } from '../../../shared/workspace-layout/workspace-layout-published'
 import type { WorkspaceSessionState } from '../../../shared/workspace-session-state-types'
 import { LEGACY_WORKSPACE_LAYOUT_PROFILES } from '../../../shared/workspace-layout/workspace-layout-legacy-profile.test-fixture'
 import {
@@ -140,6 +142,167 @@ describe('the window drawn from layout frames', () => {
     sync.close()
   })
 
+  it.each(['unchanged', 'navigate', 'unheld'] as const)(
+    'selects explicit native opens only after ordinary frame membership: %s',
+    async (action) => {
+      const { store, sync, layouts, frames } = await bootWithFrames('local', localDesktopSession())
+      sync.start()
+      await flushMicrotasks()
+      const before = store.getState()
+      const viewerSelection = captureConversationSwitchViewerSelection(before)
+      const destination = structuredClone(layouts[GIT_KEY]!)
+      const destinationKey = action === 'unheld' ? 'repo::history-other-workspace' : GIT_KEY
+      destination.worktreeId = destinationKey
+      if (action === 'unheld') {
+        destination.tabs = []
+        destination.groups = [{ id: 'history-destination-root', tabIds: [] }]
+        destination.groupLayout = { type: 'leaf', groupId: 'history-destination-root' }
+        destination.editorFiles = []
+        destination.browserTabs = []
+      }
+      const group = destination.groups[0]!
+      const tabId = 'native-frame-destination'
+      destination.tabs.push({
+        id: tabId,
+        kind: 'agent-session',
+        entityId: 'canonical-native-frame',
+        executionHostId: 'local',
+        createdAt: 123,
+        customTitle: null,
+        color: null,
+        agentSessionAgent: 'codex',
+        openPlacement: {
+          invocationId: 'frame-open',
+          generation: 'frame-generation',
+          placement: { groupId: group.id, index: 0 },
+          activate: true,
+          viewerSelection
+        }
+      })
+      group.tabIds.unshift(tabId)
+      // Main already placed it; the frame consumer must draw that order without inserting again.
+      if (action === 'navigate') {
+        store.setState({ activeWorktreeId: 'repo::newer-selection' })
+      }
+      stream.onFrame!(frames.records(destinationKey, destination))
+      await flushMicrotasks()
+      expect(
+        store.getState().unifiedTabsByWorktree[destinationKey]?.filter((tab) => tab.id === tabId)
+      ).toHaveLength(1)
+      expect(
+        store.getState().groupsByWorktree[destinationKey]?.find((entry) => entry.id === group.id)
+          ?.tabOrder
+      ).toEqual(group.tabIds)
+      if (action !== 'navigate') {
+        expect(store.getState().activeWorktreeId).toBe(destinationKey)
+        expect(store.getState().getActiveTab(destinationKey)?.id).toBe(tabId)
+        expect(store.getState().activeTabType).toBe('agent-session')
+      } else {
+        expect(store.getState().activeWorktreeId).toBe('repo::newer-selection')
+      }
+      sync.close()
+    }
+  )
+
+  it('bounds retained unheld metadata work during another workspace frame at N/10N', async () => {
+    const measure = async (count: number) => {
+      const { store, sync, layouts, frames } = await bootWithFrames('local', localDesktopSession())
+      sync.start()
+      await flushMicrotasks()
+      store.setState({
+        worktreeNavHistory: Array.from({ length: 50 }, (_, i) => `history-${i}`),
+        worktreeNavHistoryIndex: 49
+      })
+      const viewerSelection = captureConversationSwitchViewerSelection(store.getState())
+      const key = 'retained::unheld-workspace'
+      let carriers = 0
+      let historyReads = 0
+      const tabs: PublishedTab[] = Array.from({ length: count }, (_, i) => {
+        const openPlacement = {
+          invocationId: `retained-${i}`,
+          generation: `generation-${i}`,
+          placement: { groupId: 'retained-group', index: i },
+          activate: true,
+          viewerSelection,
+          source: {
+            worktreeId: key,
+            tabId: `naturally-retired-${i}`,
+            leafId: 'source-leaf',
+            createdAt: 123,
+            generation: 0,
+            hasLeaf: true,
+            ptyId: null,
+            incarnationId: null
+          }
+        }
+        return {
+          id: `retained-${i}`,
+          kind: 'agent-session',
+          entityId: `retained-${i}`,
+          executionHostId: 'local',
+          createdAt: 123,
+          customTitle: null,
+          color: null,
+          agentSessionAgent: i % 2 ? 'claude' : 'codex',
+          get openPlacement() {
+            carriers++
+            return openPlacement
+          }
+        }
+      })
+      // A different viewer already navigated: these host destinations remain readable inventory only.
+      store.setState({ activeWorktreeId: GIT_KEY, activeView: 'tasks' })
+      stream.onFrame!(
+        frames.records(key, {
+          worktreeId: key,
+          tabs,
+          groups: [{ id: 'retained-group', tabIds: tabs.map((tab) => tab.id) }],
+          groupLayout: { type: 'leaf', groupId: 'retained-group' },
+          editorFiles: [],
+          browserTabs: []
+        })
+      )
+      await flushMicrotasks()
+      const before = store.getState()
+      store.setState({
+        worktreeNavHistory: new Proxy(before.worktreeNavHistory, {
+          get: (target, property, receiver) => {
+            if (typeof property === 'string' && /^\d+$/.test(property)) {
+              historyReads++
+            }
+            return Reflect.get(target, property, receiver)
+          }
+        })
+      })
+      carriers = 0
+      try {
+        const renamed = structuredClone(layouts[GIT_KEY]!)
+        renamed.tabs.find((tab) => tab.id === 'tab-shell')!.customTitle = 'another-workspace-update'
+        stream.onFrame!(frames.records(GIT_KEY, renamed))
+        await flushMicrotasks()
+        expect(store.getState().unifiedTabsByWorktree[key]).toBeUndefined()
+        expect(store.getState().activeWorktreeId).toBe(GIT_KEY)
+        expect(store.getState().activeView).toBe('tasks')
+        expect(
+          store.getState().tabsByWorktree[GIT_KEY]!.find((tab) => tab.id === 'tab-shell')
+            ?.customTitle
+        ).toBe('another-workspace-update')
+        expect(carriers).toBeGreaterThanOrEqual(count)
+        expect(carriers).toBeLessThanOrEqual(4 * count)
+        expect(historyReads).toBeGreaterThan(0)
+        expect(historyReads).toBeLessThanOrEqual(100)
+        return { count, carriers, historyReads }
+      } finally {
+        sync.close()
+      }
+    }
+    const small = await measure(10)
+    const large = await measure(100)
+    expect(large.carriers).toBeLessThanOrEqual(12 * small.carriers)
+    expect(large.historyReads).toBeLessThanOrEqual(2 * small.historyReads)
+    process.stdout.write(`unrelated frame operation counts ${JSON.stringify({ small, large })}\n`)
+  })
+
   it('shows a structure change main publishes, keeping what only the window knows', async () => {
     const session = localDesktopSession()
     const { store, sync, layouts, frames } = await bootWithFrames('local', session)
diff --git a/src/renderer/src/runtime/workspace-layout-frame-sync.ts b/src/renderer/src/runtime/workspace-layout-frame-sync.ts
index e1368fc8ec0b..5a5112f92a02 100644
--- a/src/renderer/src/runtime/workspace-layout-frame-sync.ts
+++ b/src/renderer/src/runtime/workspace-layout-frame-sync.ts
@@ -1,5 +1,6 @@
 // Layout-owner windows draw main’s locally owned, held workspaces; paired servers remain mirror-owned. Local tab changes stay drawn until main answers (layout-owner-drawn-tab-holds). Records frames apply binding/title deltas directly and rebuild other changed workspaces from store. Startup/reopen/new/whole workspaces use full save/Loader builds (E2a/E2b).
 
+import { frameOpenSelectionPatch } from './workspace-layout-frame-open-selection'
 import { showFramePatch, withMovedTabsSelected } from '@/store/slices/tabs/moved-tab-selection'
 import { useAppStore } from '@/store'
 import type { AppState } from '@/store/types'
@@ -11,9 +12,8 @@ import {
   layoutHoldsBoundPane,
   onWorkspaceStartsDrawing
 } from './workspace-layout-frame-drawn-workspaces'
-import type { TerminalTabTitleUpdate } from '@/store/slices/terminal-tab-title-batch'
 import type { WorkspaceLayoutChangeFrame } from '../../../shared/workspace-layout/workspace-layout-stream-frames'
-import { liveTitleUpdates } from './workspace-layout-frame-changes'
+import { planLayoutFrameFlush } from './workspace-layout-frame-flush-plan'
 import { terminalLayoutsWithFramePaneTrees } from './workspace-layout-frame-pane-trees'
 import { framePaneFactsShown, showFramePaneStarts } from './workspace-layout-frame-pane-starts'
 import {
@@ -88,7 +88,9 @@ export function openWorkspaceLayoutFrameSync(
 
   /** The moved tabs' selections this flush's writes took. */
   let selectionsTaken: MovedTabSelection[] = []
-  const show = (patch: LayoutFrameBuildPatch): void => {
+  const show = (
+    patch: LayoutFrameBuildPatch | ((current: AppState) => LayoutFrameBuildPatch)
+  ): void => {
     selectionsTaken.push(...showFramePatch(store, patch))
   }
 
@@ -131,7 +133,6 @@ export function openWorkspaceLayoutFrameSync(
       return
     }
     const state = store.getState()
-    const drawn = source.draws(state)
     const rowFieldsTaken = new Map<string, Partial<TerminalTab>>()
     const holds: LayoutFrameBuildHolds = {
       ...FRAME_BUILD_HOLDS,
@@ -144,55 +145,29 @@ export function openWorkspaceLayoutFrameSync(
         return fields
       }
     }
-    const changed: string[] = []
-    const fullBuilt: string[] = []
-    const workspaceBuilt: string[] = []
-    const rebound = new Map<string, ReadonlySet<string>>()
-    const titleUpdates: TerminalTabTitleUpdate[] = []
-    for (const [key, layout] of Object.entries(cache)) {
-      const changes = pending.get(key)
-      if (!drawn(key)) {
-        // Frames the window did not draw: its next draw takes the full build.
-        if (changes) {
-          shown.delete(key)
-        }
-        continue
-      }
-      if (shown.has(key) && !changes) {
-        continue
-      }
-      changed.push(key)
-      if (!shown.has(key)) {
-        fullBuilt.push(key)
-      } else if (changes?.rebuild) {
-        workspaceBuilt.push(key)
-      } else if (changes) {
-        titleUpdates.push(
-          ...liveTitleUpdates(
-            changes.titled,
-            layout,
-            (tabId) => state.terminalLayoutsByTabId[tabId]?.activeLeafId
-          )
-        )
-        if (changes.rebound.size > 0) {
-          rebound.set(key, changes.rebound)
-        }
-      }
-    }
-    pending.clear()
-    // A workspace main stopped publishing keeps what the window shows; main has nothing to say.
-    for (const key of shown) {
-      if (!(key in cache)) {
-        shown.delete(key)
-      }
-    }
+    const { changed, fullBuilt, workspaceBuilt, rebound, titleUpdates } = planLayoutFrameFlush(
+      state,
+      cache,
+      pending,
+      shown,
+      source
+    )
     // One update: a move's or rename's content rekeys with the frame that shows it.
     const rekeyed = shownContentRekeyPatch(state, cache)
     const base: AppState = { ...state, ...rekeyed }
-    show({
+    const membership = {
       ...rekeyed,
       ...layoutFrameFlushPatch(base, cache, { fullBuilt, workspaceBuilt, rebound }, holds)
-    })
+    }
+    show((current) =>
+      frameOpenSelectionPatch(
+        current,
+        membership,
+        cache,
+        [...fullBuilt, ...workspaceBuilt],
+        source.target
+      )
+    )
     if (titleUpdates.length > 0) {
       store.getState().updateTabTitles(titleUpdates)
     }
@@ -222,7 +197,13 @@ export function openWorkspaceLayoutFrameSync(
       workspaceBuilt,
       rowFieldsTaken,
       held: holds.held,
-      selectTakenMovedTabs: (state) => withMovedTabsSelected(state, selectionsTaken)
+      selectTakenMovedTabs: (built) => {
+        const moved = withMovedTabsSelected(built, selectionsTaken)
+        return {
+          ...moved,
+          ...frameOpenSelectionPatch(state, moved, cache, builtKeys, source.target)
+        }
+      }
     })
     followHeldTabs()
   }
diff --git a/src/renderer/src/store/slices/tabs/moved-tab-selection.ts b/src/renderer/src/store/slices/tabs/moved-tab-selection.ts
index e49e5a486783..67de58814f38 100644
--- a/src/renderer/src/store/slices/tabs/moved-tab-selection.ts
+++ b/src/renderer/src/store/slices/tabs/moved-tab-selection.ts
@@ -89,14 +89,17 @@ export function showFramePatch(
     getState: () => AppState
     setState: (patch: Partial<AppState> | ((state: AppState) => Partial<AppState>)) => void
   },
-  patch: Partial<AppState>
+  patch: Partial<AppState> | ((current: AppState) => Partial<AppState>)
 ): MovedTabSelection[] {
-  if (Object.keys(patch).length === 0) {
+  if (typeof patch !== 'function' && Object.keys(patch).length === 0) {
     return []
   }
   let taken: MovedTabSelection[] = []
   store.setState((current) => {
-    const shown = withMovedTabSelections(current, patch)
+    const shown = withMovedTabSelections(
+      current,
+      typeof patch === 'function' ? patch(current) : patch
+    )
     taken = shown.taken
     return protectSwitchProjections(current, shown.patch)
   })
diff --git a/src/renderer/src/store/slices/terminal-orphan-helpers.ts b/src/renderer/src/store/slices/terminal-orphan-helpers.ts
index b2ee9f350a6e..13285cfc6374 100644
--- a/src/renderer/src/store/slices/terminal-orphan-helpers.ts
+++ b/src/renderer/src/store/slices/terminal-orphan-helpers.ts
@@ -1,3 +1,6 @@
+import type { TabGroup } from '../../../../shared/tab-types'
+import { dedupeTabOrder } from '../../../../shared/workspace-layout/tab-order'
+import { pushRecentTabId, sanitizeRecentTabIds } from './tab-group-state'
 import type { AppState } from '../types'
 
 type TerminalTabReconnectState = Pick<
@@ -192,3 +195,33 @@ export function buildOrphanTerminalCleanupPatch(
       state.activeTabId && orphanTerminalIds.has(state.activeTabId) ? null : state.activeTabId
   }
 }
+
+/** Repair every group before adding a tab, including inactive/background creation. */
+export function removeOrphanTerminalsFromGroups(
+  groups: TabGroup[],
+  orphanTerminalIds: ReadonlySet<string>
+): TabGroup[] {
+  return orphanTerminalIds.size === 0
+    ? groups
+    : groups.map((entry) => {
+        // Why: repair every group before adding the new tab, or inactive/background creation can revive stale focus.
+        const tabOrder = dedupeTabOrder(entry.tabOrder).filter(
+          (tabId) => !orphanTerminalIds.has(tabId)
+        )
+        const recentTabIds = sanitizeRecentTabIds(entry.recentTabIds, tabOrder)
+        const replacedActiveTabId = Boolean(
+          entry.activeTabId && orphanTerminalIds.has(entry.activeTabId)
+        )
+        const fallbackActiveTabId = recentTabIds.at(-1) ?? tabOrder[0] ?? null
+        const activeTabId = replacedActiveTabId ? fallbackActiveTabId : entry.activeTabId
+        return {
+          ...entry,
+          activeTabId,
+          tabOrder,
+          recentTabIds:
+            replacedActiveTabId && activeTabId
+              ? pushRecentTabId(recentTabIds, activeTabId)
+              : recentTabIds
+        }
+      })
+}
diff --git a/src/renderer/src/store/terminals/terminal-actions.ts b/src/renderer/src/store/terminals/terminal-actions.ts
index 77695a87b3d5..05e2894ebacc 100644
--- a/src/renderer/src/store/terminals/terminal-actions.ts
+++ b/src/renderer/src/store/terminals/terminal-actions.ts
@@ -1,5 +1,6 @@
 import type { TerminalState } from './terminal-state'
 import type { Tab } from '../../../../shared/tab-types'
+import type { SessionTabOpenPlacement } from '../../../../shared/session-tab-placement'
 import type { TabSplitTarget } from '../slices/tabs/tabs-slice-contract'
 import type { TerminalLayoutSnapshot, TerminalTab } from '../../../../shared/terminal-tab-types'
 import type { TuiAgent } from '../../../../shared/tui-agent'
@@ -76,6 +77,7 @@ export type TerminalActions = {
       /** Published atomically with pendingStartup for automatic resume ownership. */
       automaticResumeClaim?: AutomaticAgentResumeClaim
       activate?: boolean
+      placement?: SessionTabOpenPlacement['placement']
       /** Creates the tab in a new split group instead of targetGroupId. */
       split?: TabSplitTarget
       recordInteraction?: boolean
diff --git a/src/renderer/src/store/terminals/terminal-tab-creation.ts b/src/renderer/src/store/terminals/terminal-tab-creation.ts
index ba4a4de7f6fd..d4d6ea523015 100644
--- a/src/renderer/src/store/terminals/terminal-tab-creation.ts
+++ b/src/renderer/src/store/terminals/terminal-tab-creation.ts
@@ -10,6 +10,7 @@ import { singlePaneLayoutSnapshot } from '../slices/terminal-helpers'
 import { isTerminalLeafId } from '../../../../shared/stable-pane-id'
 import {
   buildOrphanTerminalCleanupPatch,
+  removeOrphanTerminalsFromGroups,
   getOrphanTerminalIds
 } from '../slices/terminal-orphan-helpers'
 import {
@@ -20,6 +21,7 @@ import {
   updateGroup
 } from '../slices/tab-group-state'
 import { dedupeTabOrder } from '../../../../shared/workspace-layout/tab-order'
+import { insertOpenPlacementTab } from '../../lib/session-tab-open-placement-order'
 import { createBrowserUuid } from '@/lib/browser-uuid'
 import { emptySplitGroup, insertSplitGroup } from '../slices/tabs/tabs-group-actions'
 import { ownsGlobalSelection } from '../global-selection-owner'
@@ -179,30 +181,7 @@ export function createTerminalTabCreationActions(
           'terminal'
         )
         const groupsForWorktree = groupsByWorktree[worktreeId] ?? []
-        const cleanedGroups =
-          orphanTerminalIds.size === 0
-            ? groupsForWorktree
-            : groupsForWorktree.map((entry) => {
-                // Why: repair every group before adding the new tab, or inactive/background creation can revive stale focus.
-                const tabOrder = dedupeTabOrder(entry.tabOrder).filter(
-                  (tabId) => !orphanTerminalIds.has(tabId)
-                )
-                const recentTabIds = sanitizeRecentTabIds(entry.recentTabIds, tabOrder)
-                const replacedActiveTabId = Boolean(
-                  entry.activeTabId && orphanTerminalIds.has(entry.activeTabId)
-                )
-                const fallbackActiveTabId = recentTabIds.at(-1) ?? tabOrder[0] ?? null
-                const activeTabId = replacedActiveTabId ? fallbackActiveTabId : entry.activeTabId
-                return {
-                  ...entry,
-                  activeTabId,
-                  tabOrder,
-                  recentTabIds:
-                    replacedActiveTabId && activeTabId
-                      ? pushRecentTabId(recentTabIds, activeTabId)
-                      : recentTabIds
-                }
-              })
+        const cleanedGroups = removeOrphanTerminalsFromGroups(groupsForWorktree, orphanTerminalIds)
         const cleanedTargetGroup = cleanedGroups.find((entry) => entry.id === group.id) ?? group
         const cleanedGroupOrder = dedupeTabOrder(cleanedTargetGroup.tabOrder).filter(
           (tabId) => !orphanTerminalIds.has(tabId)
@@ -224,7 +203,15 @@ export function createTerminalTabCreationActions(
           // Why: omit for non-agent tabs so they keep the implicit 'terminal' view mode.
           ...(options?.viewMode ? { viewMode: options.viewMode } : {})
         }
-        const nextGroupOrder = dedupeTabOrder([...cleanedGroupOrder, unifiedTab.id])
+        const nextGroupOrder =
+          options?.placement && !existingTerminalTab
+            ? insertOpenPlacementTab(
+                cleanedGroupOrder,
+                [...existingUnifiedTabs, unifiedTab],
+                unifiedTab.id,
+                options.placement
+              )
+            : dedupeTabOrder([...cleanedGroupOrder, unifiedTab.id])
         const nextRecent = shouldActivate
           ? pushRecentTabId(sanitizeRecentTabIds(group.recentTabIds, nextGroupOrder), unifiedTab.id)
           : sanitizeRecentTabIds(cleanedTargetGroup.recentTabIds, nextGroupOrder)
diff --git a/src/shared/agent-launch-intent.ts b/src/shared/agent-launch-intent.ts
index 20a15af56c5c..c848ec033b57 100644
--- a/src/shared/agent-launch-intent.ts
+++ b/src/shared/agent-launch-intent.ts
@@ -61,7 +61,7 @@ export type AgentLaunchIntent = {
 }
 
 /** Placement cannot fail a launch: missing groups fall back to the anchor's group, then the active group. */
-export type AgentLaunchPlacement = { groupId?: string; afterTabId?: string }
+export type AgentLaunchPlacement = { groupId?: string; afterTabId?: string; index?: number }
 
 /** Whether the caller's own view moves to the new tab. Never names another viewer's screen. */
 export type AgentLaunchPresentation = 'focused' | 'background'
diff --git a/src/shared/agent-launch-tab-publication.ts b/src/shared/agent-launch-tab-publication.ts
index e1730e5a2694..d41abfade4c9 100644
--- a/src/shared/agent-launch-tab-publication.ts
+++ b/src/shared/agent-launch-tab-publication.ts
@@ -2,6 +2,7 @@
 
 import type { AgentLaunchPlacement, AgentLaunchPlacementReceipt } from './agent-launch-intent'
 import type { TuiAgent } from './tui-agent'
+import type { SessionTabOpenPlacement } from './session-tab-placement'
 
 /**
  * Whose screen moves, decided on the host from who called. Mirrors the browser-tab split between
@@ -28,6 +29,7 @@ export type AgentLaunchTabPublishRequest = {
   launchAgent: TuiAgent
   viewMode: 'terminal' | 'chat'
   placement?: AgentLaunchPlacement
+  openPlacement?: SessionTabOpenPlacement
   viewer: AgentLaunchTabViewerRule
   /** Original caller navigation, compared by the addressed viewer at its final selection writer. */
   viewerSelection?: string
diff --git a/src/shared/agent-session-switch-execution.ts b/src/shared/agent-session-switch-execution.ts
index 1910fefdc682..e533b4b7d3d3 100644
--- a/src/shared/agent-session-switch-execution.ts
+++ b/src/shared/agent-session-switch-execution.ts
@@ -1,3 +1,4 @@
+import type { SessionTabOpenPlacement } from './session-tab-placement'
 import type { AgentSessionWireRefusal } from './agent-session-wire'
 import { agentSessionRefusalError } from './agent-session-wire-refusals'
 import { waitForPromiseWithSignal } from './abort-signal-reason'
@@ -91,6 +92,7 @@ export type AgentSessionSwitchDeadline = ReturnType<typeof agentSessionSwitchDea
 /** In-process authority; never serialize the callbacks as a transport permit. */
 export type AgentSessionSwitchAuthority = {
   invocationId: string
+  openPlacement?: SessionTabOpenPlacement
   /** View freshness is independent of process authority. */
   selectionCurrent?: () => boolean
   check: () => void
diff --git a/src/shared/claimed-agent-pty-owner.ts b/src/shared/claimed-agent-pty-owner.ts
index 9ce42f70a77f..e6fe9195afd4 100644
--- a/src/shared/claimed-agent-pty-owner.ts
+++ b/src/shared/claimed-agent-pty-owner.ts
@@ -13,6 +13,7 @@ import {
   buildClaimedAgentPtyOwnerIndex,
   cloneAgentSessionClaim,
   cloneAgentSessionOwner,
+  cloneAgentSessionOwnerBinding,
   cloneAgentSessionSurface,
   prepareRegisteredAgentSessionOwner,
   reconcileClaimedAgentPtyOwnerSnapshot,
@@ -79,7 +80,7 @@ export class ClaimedAgentPtyOwnerRegistry {
       args.onJoin?.(reserved.creation)
       const result = await reserved.promise
       args.check?.()
-      return { disposition: 'adopted', owner: cloneAgentSessionOwner(result.owner as LiveOwner) }
+      return { disposition: 'adopted', owner: cloneAgentSessionOwnerBinding(result.owner) }
     }
 
     args.check?.()
diff --git a/src/shared/runtime-mobile-session-tab-contracts.ts b/src/shared/runtime-mobile-session-tab-contracts.ts
index 57c5ff0c9d89..6da635295128 100644
--- a/src/shared/runtime-mobile-session-tab-contracts.ts
+++ b/src/shared/runtime-mobile-session-tab-contracts.ts
@@ -1,3 +1,4 @@
+import type { SessionTabOpenPlacement } from './session-tab-placement'
 import type { AgentStatusEntry } from './agent-status-types'
 import type { BrowserCertificateFailure, BrowserLoadError } from './browser-workspace-types'
 import type { RuntimeBrowserPlacement } from './runtime-browser-placement'
@@ -7,6 +8,7 @@ import type { TuiAgent } from './tui-agent'
 import type { StructuredAgentId } from './agent-session-provider-handle'
 
 export type RuntimeMobileSessionTerminalTab = {
+  openPlacement?: SessionTabOpenPlacement
   type: 'terminal'
   id: string
   title: string
@@ -103,6 +105,7 @@ export type RuntimeMobileSessionBrowserTab = {
 }
 
 export type RuntimeMobileSessionAgentTab = {
+  openPlacement?: SessionTabOpenPlacement
   type: 'agent-session'
   id: string
   title: string
diff --git a/src/shared/session-tab-placement.ts b/src/shared/session-tab-placement.ts
index 0727f809675c..1ef2d30cc733 100644
--- a/src/shared/session-tab-placement.ts
+++ b/src/shared/session-tab-placement.ts
@@ -1,5 +1,17 @@
+import type { TerminalSurfaceCloseIdentity } from './terminal-tab-close'
 import { insertTabIdIntoOrder, partitionPinnedTabOrder } from './workspace-layout/tab-order'
 
+/** The existing host command's open intent, carried with membership to the actual layout owner. */
+export type SessionTabOpenPlacement = {
+  invocationId: string
+  generation: string
+  placement: { groupId?: string; afterTabId?: string; index?: number }
+  activate: boolean
+  viewerSelection?: string
+  /** Present for terminal-to-chat; source reuse cannot turn its captured index into authority. */
+  source?: TerminalSurfaceCloseIdentity
+}
+
 /** Call-local neighbors survive an anchor retiring while creation is awaited. */
 export type CapturedSessionTabPlacement = { preceding: string[]; following: string[] }
 
diff --git a/src/shared/workspace-layout/workspace-layout-published.ts b/src/shared/workspace-layout/workspace-layout-published.ts
index ad435a572519..6b86bc46c619 100644
--- a/src/shared/workspace-layout/workspace-layout-published.ts
+++ b/src/shared/workspace-layout/workspace-layout-published.ts
@@ -1,5 +1,6 @@
 // Explicit layout.subscribe wire projection includes terminal startup inputs and permits live pane titles/status. Persistence-only records and view selection stay private.
 
+import type { SessionTabOpenPlacement } from '../session-tab-placement'
 import type { AgentType } from '../agent-status-types'
 import type { AiVaultSessionTitle } from '../ai-vault-session-title'
 import type { ExecutionHostId } from '../execution-host'
@@ -55,6 +56,8 @@ export type PublishedTerminal = {
 >
 
 export type PublishedTab = {
+  /** Ephemeral ordinary open intent, overlaid by the runtime; never a stored LayoutTab field. */
+  openPlacement?: SessionTabOpenPlacement
   id: string
   kind: TabContentType
   entityId: string

From 4cdd3fe84f3953ad2f478fffb75d2fa1a7f4b324 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Thu, 29 Oct 2026 03:33:11 -0700
Subject: [PATCH 096/207] Fix switch placement types and count instrumentation

---
 .../session-tabs/main-layout-agent-launch-tabs.ts  |  7 ++++---
 .../session-tab-open-placement-scaling.test.ts     | 14 +++++++-------
 .../src/runtime/session-tab-open-placement.test.ts |  2 ++
 .../src/runtime/web-session-tabs-sync/state.ts     |  5 +++--
 .../runtime/workspace-layout-frame-sync.test.ts    |  1 +
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.ts b/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.ts
index 7c7105bdb87e..01a629b750f1 100644
--- a/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.ts
+++ b/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.ts
@@ -95,7 +95,8 @@ export abstract class OrcaRuntimeWithMainLayoutAgentLaunchTabs extends OrcaRunti
           : {}),
         onApplied: () => {
           withdrawalRoot = this.launchWithdrawalIdentity(worktreeId, tabId)
-          if (request.openPlacement) {
+          const openPlacement = request.openPlacement
+          if (openPlacement) {
             this.hydrateHeadlessMobileSessionTabsFromWorkspaceSession(worktreeId, {
               allowAttachedWindow: true,
               force: true
@@ -109,8 +110,8 @@ export abstract class OrcaRuntimeWithMainLayoutAgentLaunchTabs extends OrcaRunti
                     ? {
                         ...tab,
                         openPlacement: {
-                          ...request.openPlacement,
-                          activate: request.openPlacement.activate && (selectionCurrent?.() ?? true)
+                          ...openPlacement,
+                          activate: openPlacement.activate && (selectionCurrent?.() ?? true)
                         }
                       }
                     : tab
diff --git a/src/main/runtime/session-tabs/session-tab-open-placement-scaling.test.ts b/src/main/runtime/session-tabs/session-tab-open-placement-scaling.test.ts
index 7415309d412a..f6a9aed873f0 100644
--- a/src/main/runtime/session-tabs/session-tab-open-placement-scaling.test.ts
+++ b/src/main/runtime/session-tabs/session-tab-open-placement-scaling.test.ts
@@ -14,9 +14,9 @@ import {
 vi.mock('../../../shared/layout-owner-switch', () => ({ ORCA_LAYOUT_OWNER_IS_MAIN: true }))
 
 /** Count reads without replacing the production owner, lookup, equality or overlay. */
-function observeFieldReads(
-  rows: readonly object[],
-  keys: readonly string[],
+function observeFieldReads<K extends PropertyKey, T extends Partial<Record<K, unknown>>>(
+  rows: readonly T[],
+  keys: readonly K[],
   count: () => void
 ): void {
   for (const row of rows) {
@@ -24,7 +24,7 @@ function observeFieldReads(
       if (!Object.hasOwn(row, key)) {
         continue
       }
-      const value: unknown = Reflect.get(row, key)
+      const value = row[key]
       Object.defineProperty(row, key, {
         configurable: true,
         enumerable: true,
@@ -70,7 +70,7 @@ it('bounds retained placement work linearly on ordinary snapshot and unchanged f
           }))
     }
     let measuring: 'snapshot' | 'frame' | undefined
-    const rowKeys = ['id', 'sessionId', 'parentTabId', 'leafId', 'openPlacement']
+    const rowKeys = ['id', 'sessionId', 'parentTabId', 'leafId', 'openPlacement'] as const
     let snapshotReads = 0
     let frameReads = 0
     const countRead = () => {
@@ -96,10 +96,10 @@ it('bounds retained placement work linearly on ordinary snapshot and unchanged f
     const overlayObservation = vi
       .spyOn(placementProjection, 'withPublishedSessionTabOpenPlacements')
       .mockImplementation((...args) => {
-        observeFieldReads(args[0].tabs, ['id', 'entityId', 'terminal'], countRead)
+        observeFieldReads(args[0].tabs, ['id', 'entityId', 'terminal'] as const, countRead)
         observeFieldReads(
           args[0].tabs.flatMap((tab) => tab.terminal?.panes ?? []),
-          ['leafId', 'ptyId'],
+          ['leafId', 'ptyId'] as const,
           countRead
         )
         measuring = 'frame'
diff --git a/src/renderer/src/runtime/session-tab-open-placement.test.ts b/src/renderer/src/runtime/session-tab-open-placement.test.ts
index 218489a46d0c..63e91d38e9f5 100644
--- a/src/renderer/src/runtime/session-tab-open-placement.test.ts
+++ b/src/renderer/src/runtime/session-tab-open-placement.test.ts
@@ -468,6 +468,7 @@ describe('explicit open placement at the actual ordinary store owner', () => {
                     if (key === 'id' || key === 'entityId' || key === 'contentType') {
                       tabReads++
                     }
+                    // oxlint-disable-next-line anti-slop/no-reflect-get -- Proxy `get` trap: only Reflect.get forwards a raw string|symbol key with the proxy receiver.
                     return Reflect.get(target, key, receiver)
                   }
                 })
@@ -478,6 +479,7 @@ describe('explicit open placement at the actual ordinary store owner', () => {
               if (typeof key === 'string' && /^\d+$/.test(key)) {
                 historyReads++
               }
+              // oxlint-disable-next-line anti-slop/no-reflect-get -- Proxy `get` trap: only Reflect.get forwards a raw string|symbol key with the proxy receiver.
               return Reflect.get(target, key, receiver)
             }
           })
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/state.ts b/src/renderer/src/runtime/web-session-tabs-sync/state.ts
index da0a165e797c..569283a910a9 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/state.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/state.ts
@@ -18,6 +18,7 @@ import type { Tab } from '../../../../shared/tab-types'
 import type { TerminalLayoutSnapshot, TerminalTab } from '../../../../shared/terminal-tab-types'
 import type { OpenFile } from '../../store/slices/editor'
 import type { RuntimeBrowserPlacement } from '../../../../shared/runtime-browser-placement'
+import type { WorkspaceSessionState } from '../../../../shared/workspace-session-state-types'
 
 export const WEB_SESSION_GROUP_PREFIX = 'web-session-tabs:'
 export const WEB_SESSION_TABS_VISIBILITY_RESUME_STAGGER_MS = 100
@@ -235,7 +236,6 @@ export type WebSessionTabsSyncState = Pick<
       | 'worktreeNavHistory'
       | 'worktreeNavHistoryIndex'
       | 'isNavigatingHistory'
-      | 'terminalPtyIncarnationsByPaneKey'
       | 'closedTerminalTabTombstonesByTabId'
       | 'pairedTerminalTabCloseIntentsByEnvironment'
       | 'acknowledgedAgentsByPaneKey'
@@ -258,7 +258,8 @@ export type WebSessionTabsSyncState = Pick<
       | 'retentionSuppressedPaneKeys'
       | 'runtimePaneTitlesByTabId'
     >
-  >
+  > &
+  Partial<Pick<WorkspaceSessionState, 'terminalPtyIncarnationsByPaneKey'>>
 
 export type WebSessionTabsBatchRecordKey =
   | 'activeBrowserTabIdByWorktree'
diff --git a/src/renderer/src/runtime/workspace-layout-frame-sync.test.ts b/src/renderer/src/runtime/workspace-layout-frame-sync.test.ts
index b79cb8f232d5..b56c53c4bbdd 100644
--- a/src/renderer/src/runtime/workspace-layout-frame-sync.test.ts
+++ b/src/renderer/src/runtime/workspace-layout-frame-sync.test.ts
@@ -270,6 +270,7 @@ describe('the window drawn from layout frames', () => {
             if (typeof property === 'string' && /^\d+$/.test(property)) {
               historyReads++
             }
+            // oxlint-disable-next-line anti-slop/no-reflect-get -- Proxy `get` trap: only Reflect.get forwards a raw string|symbol key with the proxy receiver.
             return Reflect.get(target, property, receiver)
           }
         })

From 76e20b84365f52a52f9f35ad021ea7ae7029bb75 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Thu, 29 Oct 2026 03:44:21 -0700
Subject: [PATCH 097/207] Consolidate switch placement type imports

---
 .../src/runtime/web-session-client-owned-tab-placement.ts      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/renderer/src/runtime/web-session-client-owned-tab-placement.ts b/src/renderer/src/runtime/web-session-client-owned-tab-placement.ts
index 678ec187a97b..bfa23453c901 100644
--- a/src/renderer/src/runtime/web-session-client-owned-tab-placement.ts
+++ b/src/renderer/src/runtime/web-session-client-owned-tab-placement.ts
@@ -1,6 +1,5 @@
 import { structuredLaunchSlotIds } from '@/lib/agent-session/launch/structured-agent-session-launch-persistence'
-import type { TabGroup, TabGroupLayoutNode } from '../../../shared/tab-types'
-import type { Tab } from '../../../shared/tab-types'
+import type { Tab, TabGroup, TabGroupLayoutNode } from '../../../shared/tab-types'
 import type { SessionTabOpenPlacement } from '../../../shared/session-tab-placement'
 import { insertOpenPlacementTab } from '../lib/session-tab-open-placement-order'
 import {

From f4b48f51cf4c8600f15e1d8706e2829272c84936 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Thu, 29 Oct 2026 04:22:56 -0700
Subject: [PATCH 098/207] Align switch ownership fixtures and build
 compatibility

---
 .../locale-cross-locale-key-overrides.mjs     |  50 ++++
 .../structured-session-tab-close.ts           |  18 +-
 .../structured-session-tab-restoration.ts     |  22 +-
 .../tab-bar/SortableTabContextMenu.tsx        |   2 +-
 .../src/i18n/en-runtime-required.json         |   3 +-
 src/renderer/src/i18n/locales/de.json         |   7 +-
 src/renderer/src/i18n/locales/en.json         |  10 +-
 src/renderer/src/i18n/locales/es.json         |  13 +-
 src/renderer/src/i18n/locales/fr.json         |  13 +-
 src/renderer/src/i18n/locales/ja.json         |  13 +-
 src/renderer/src/i18n/locales/ko.json         |  13 +-
 src/renderer/src/i18n/locales/pt.json         |   9 +-
 src/renderer/src/i18n/locales/ru.json         |   7 +-
 src/renderer/src/i18n/locales/tr.json         |   7 +-
 src/renderer/src/i18n/locales/zh-Hant.json    |   7 +-
 src/renderer/src/i18n/locales/zh.json         |  13 +-
 .../src/lib/cli-conversation-exit-guidance.ts |   5 +-
 .../open-placement-read.ts                    |  11 +-
 .../open-placement-selection.ts               |   7 +-
 .../web-session-tabs-sync/store-patch.ts      |  14 +
 .../local-build-compatibility-contract.json   |   4 +-
 .../local-build-compatibility-contract.ts     |   4 +-
 src/shared/terminal-tab-close.ts              |  16 +-
 .../native-chat-switch-readable-source.ts     |  76 +++++
 ...obile-terminal-session-switch.unit.test.ts | 119 ++++++--
 .../native-chat-switch-readable.unit.test.tsx | 263 ++++++++----------
 26 files changed, 452 insertions(+), 274 deletions(-)
 create mode 100644 tests/e2e/helpers/native-chat-switch-readable-source.ts

diff --git a/config/scripts/locale-cross-locale-key-overrides.mjs b/config/scripts/locale-cross-locale-key-overrides.mjs
index bd649ac99f18..07d288b8656e 100644
--- a/config/scripts/locale-cross-locale-key-overrides.mjs
+++ b/config/scripts/locale-cross-locale-key-overrides.mjs
@@ -1,4 +1,54 @@
 export const CROSS_LOCALE_KEY_OVERRIDES = {
+  'components.native-chat.resumeInNewChat.exitUnconfirmedFromTerminal': {
+    de: 'Orca konnte nicht bestätigen, dass {{agent}} in diesem Terminal beendet wurde. Beende {{agent}} hier und versuche diese Aktion erneut.',
+    es: 'Orca no pudo confirmar que {{agent}} se detuvo en esta terminal. Sal de {{agent}} aquí y vuelve a intentar esta acción.',
+    fr: 'Orca n’a pas pu confirmer l’arrêt de {{agent}} dans ce terminal. Quittez {{agent}} ici, puis réessayez cette action.',
+    ja: 'Orca は、このターミナルで {{agent}} が停止したことを確認できませんでした。ここで {{agent}} を終了してから、この操作をもう一度試してください。',
+    ko: 'Orca가 이 터미널에서 {{agent}}이(가) 중지되었는지 확인할 수 없습니다. 여기서 {{agent}}을(를) 종료한 다음 이 작업을 다시 시도하세요.',
+    pt: 'O Orca não pôde confirmar que {{agent}} parou neste terminal. Encerre {{agent}} aqui e tente esta ação novamente.',
+    ru: 'Orca не удалось подтвердить, что {{agent}} остановлен в этом терминале. Завершите {{agent}} здесь и повторите это действие.',
+    tr: 'Orca, {{agent}} uygulamasının bu terminalde durduğunu doğrulayamadı. Burada {{agent}} uygulamasından çıkın ve bu işlemi yeniden deneyin.',
+    zh: 'Orca 无法确认 {{agent}} 已在此终端中停止。请在此处退出 {{agent}}，然后重试此操作。',
+    'zh-Hant':
+      'Orca 無法確認 {{agent}} 已在此終端機中停止。請在此處結束 {{agent}}，然後重試此操作。'
+  },
+  'components.native-chat.resumeInNewChat.exitUnconfirmed': {
+    de: 'Orca konnte nicht bestätigen, dass {{agent}} beendet wurde. Beende {{agent}} in seinem Terminal und versuche diese Aktion erneut.',
+    es: 'Orca no pudo confirmar que {{agent}} se detuvo. Sal de {{agent}} en su terminal y vuelve a intentar esta acción.',
+    fr: 'Orca n’a pas pu confirmer l’arrêt de {{agent}}. Quittez {{agent}} dans son terminal, puis réessayez cette action.',
+    ja: 'Orca は {{agent}} が停止したことを確認できませんでした。{{agent}} を実行中のターミナルで終了してから、この操作をもう一度試してください。',
+    ko: 'Orca가 {{agent}}이(가) 중지되었는지 확인할 수 없습니다. 해당 터미널에서 {{agent}}을(를) 종료한 다음 이 작업을 다시 시도하세요.',
+    pt: 'O Orca não pôde confirmar que {{agent}} parou. Encerre {{agent}} no terminal em que está sendo executado e tente esta ação novamente.',
+    ru: 'Orca не удалось подтвердить, что {{agent}} остановлен. Завершите {{agent}} в его терминале и повторите это действие.',
+    tr: 'Orca, {{agent}} uygulamasının durduğunu doğrulayamadı. {{agent}} uygulamasından çalıştığı terminalde çıkın ve bu işlemi yeniden deneyin.',
+    zh: 'Orca 无法确认 {{agent}} 已停止。请在其所在的终端中退出 {{agent}}，然后重试此操作。',
+    'zh-Hant':
+      'Orca 無法確認 {{agent}} 已停止。請在其所在的終端機中結束 {{agent}}，然後重試此操作。'
+  },
+  'components.tab.bar.SortableTabContextMenu.showAsTerminal': {
+    de: 'Als Terminal anzeigen',
+    es: 'Mostrar como terminal',
+    fr: 'Afficher en terminal',
+    ja: 'ターミナルとして表示',
+    ko: '터미널로 표시',
+    pt: 'Mostrar como terminal',
+    ru: 'Показать как терминал',
+    tr: 'Terminal olarak göster',
+    zh: '以终端显示',
+    'zh-Hant': '以終端機顯示'
+  },
+  'components.tab.bar.SortableTabContextMenu.switchToTerminalView': {
+    de: 'Mit Terminal-Agenten fortfahren',
+    es: 'Continuar con el agente de terminal',
+    fr: 'Continuer avec l’agent de terminal',
+    ja: 'ターミナル Agent で続ける',
+    ko: '터미널 에이전트로 계속하기',
+    pt: 'Continuar com o agente de terminal',
+    ru: 'Продолжить с агентом в терминале',
+    tr: 'Terminal ajanıyla devam et',
+    zh: '使用终端智能体继续',
+    'zh-Hant': '使用終端機代理程式繼續'
+  },
   // The live status describes ongoing reasoning; the composer option names the feature.
   'components.native-chat.status.thinking': {
     zh: '思考中',
diff --git a/src/main/runtime/session-tabs/structured-session-tab-close.ts b/src/main/runtime/session-tabs/structured-session-tab-close.ts
index cab412066f2f..74a39b11a12d 100644
--- a/src/main/runtime/session-tabs/structured-session-tab-close.ts
+++ b/src/main/runtime/session-tabs/structured-session-tab-close.ts
@@ -1,3 +1,4 @@
+import type { WorkspaceSessionState } from '../../../shared/workspace-session-state-types'
 import type { OrcaRuntimeWithStoredMobileSnapshotHasStalePreservedTab as BrowserOwnership } from './mobile-session-publication-preservation'
 import type { OrcaRuntimeWithPruneMobileSessionTabGroupLayout as PruneMobileSessionTabGroupLayoutMethods } from '../session-lifecycle/projection/prune-mobile-session-tab-group-layout'
 import type { RuntimeHeadlessTabGroups as HeadlessTabGroupsMethods } from './headless-tab-group-moves'
@@ -304,17 +305,24 @@ export abstract class OrcaRuntimeWithCloseStructuredAgentSessionTab extends Orca
       this.queueChatTabChanges(() => changes.map((change) => ({ worktreeId, change })))
       return
     }
-    const session = this.getAvailableAuthoritativeWindow()
-      ? null
-      : this.getWorkspaceSessionForWorktree(worktreeId)
-    const next =
-      session &&
+    this.commitWindowlessChatSession(worktreeId, (session) =>
       withChatTabChanges(
         this.getWorkspaceSessionHostIdForWorktree(worktreeId),
         session,
         worktreeId,
         changes
       )
+    )
+  }
+
+  protected commitWindowlessChatSession(
+    worktreeId: string,
+    update: (session: WorkspaceSessionState) => WorkspaceSessionState | null
+  ): void {
+    const session = this.getAvailableAuthoritativeWindow()
+      ? null
+      : this.getWorkspaceSessionForWorktree(worktreeId)
+    const next = session && update(session)
     if (next) {
       this.setWorkspaceSessionForWorktree(worktreeId, next)
     }
diff --git a/src/main/runtime/session-tabs/structured-session-tab-restoration.ts b/src/main/runtime/session-tabs/structured-session-tab-restoration.ts
index 00ef9e2b703b..223140c02615 100644
--- a/src/main/runtime/session-tabs/structured-session-tab-restoration.ts
+++ b/src/main/runtime/session-tabs/structured-session-tab-restoration.ts
@@ -176,20 +176,14 @@ export abstract class OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce exten
     })
     if (activate) {
       input.check?.()
-      if (!this.getAvailableAuthoritativeWindow()) {
-        const session = this.getWorkspaceSessionForWorktree(input.workspaceId)
-        const next =
-          session &&
-          withSelectedChatTab(
-            this.getWorkspaceSessionHostIdForWorktree(input.workspaceId),
-            session,
-            input.workspaceId,
-            input.sessionId
-          )
-        if (next) {
-          this.setWorkspaceSessionForWorktree(input.workspaceId, next)
-        }
-      }
+      this.commitWindowlessChatSession(input.workspaceId, (session) =>
+        withSelectedChatTab(
+          this.getWorkspaceSessionHostIdForWorktree(input.workspaceId),
+          session,
+          input.workspaceId,
+          input.sessionId
+        )
+      )
       if (input.focusWindow !== false) {
         this.notifier?.focusEditorTab?.(
           input.tabId ??
diff --git a/src/renderer/src/components/tab-bar/SortableTabContextMenu.tsx b/src/renderer/src/components/tab-bar/SortableTabContextMenu.tsx
index f8b8b64a315a..a9b558863062 100644
--- a/src/renderer/src/components/tab-bar/SortableTabContextMenu.tsx
+++ b/src/renderer/src/components/tab-bar/SortableTabContextMenu.tsx
@@ -174,7 +174,7 @@ export function SortableTabContextMenu({
             <DropdownMenuItem onSelect={onToggleViewMode}>
               <SquareTerminal className="size-3.5 shrink-0" />
               {translate(
-                'components.tab.bar.SortableTabContextMenu.switchToTerminalView',
+                'components.tab.bar.SortableTabContextMenu.showAsTerminal',
                 'Show as terminal'
               )}
             </DropdownMenuItem>
diff --git a/src/renderer/src/i18n/en-runtime-required.json b/src/renderer/src/i18n/en-runtime-required.json
index 804b00efeae8..59843d873610 100644
--- a/src/renderer/src/i18n/en-runtime-required.json
+++ b/src/renderer/src/i18n/en-runtime-required.json
@@ -1888,8 +1888,7 @@
           "sourceKept": "{{agent}} opened successfully. The original tab was kept; continue in the new tab."
         },
         "SortableTabContextMenu": {
-          "closeTabsToLeft": "Close All Tabs To The Left",
-          "switchToTerminalView": "Show as terminal"
+          "switchToTerminalView": "Continue with Terminal Agent"
         }
       }
     },
diff --git a/src/renderer/src/i18n/locales/de.json b/src/renderer/src/i18n/locales/de.json
index 52024a800725..d797b00df2ff 100644
--- a/src/renderer/src/i18n/locales/de.json
+++ b/src/renderer/src/i18n/locales/de.json
@@ -19067,8 +19067,8 @@
       },
       "resumeInNewChat": {
         "hostUpdateRequired": "Orca auf diesem Host aktualisieren, um in der Chat-Oberfläche fortzufahren.",
-        "exitUnconfirmedFromTerminal": "{{agent}} führt diese Unterhaltung bereits in einem anderen Terminal aus. Dort {{agent}} beenden oder das Terminal schließen und anschließend diese Unterhaltung über den Sitzungsverlauf öffnen.",
-        "exitUnconfirmed": "{{agent}} führt diese Unterhaltung bereits in einem anderen Terminal aus. Dort {{agent}} beenden oder das Terminal schließen und anschließend diese Unterhaltung über den Sitzungsverlauf öffnen.",
+        "exitUnconfirmedFromTerminal": "Orca konnte nicht bestätigen, dass {{agent}} in diesem Terminal beendet wurde. Beende {{agent}} hier und versuche diese Aktion erneut.",
+        "exitUnconfirmed": "Orca konnte nicht bestätigen, dass {{agent}} beendet wurde. Beende {{agent}} in seinem Terminal und versuche diese Aktion erneut.",
         "notSavedYet": "{{agent}} hat diese Unterhaltung noch nicht gespeichert. Nach der Antwort erneut versuchen."
       },
       "state": {
@@ -19473,7 +19473,8 @@
       "bar": {
         "SortableTabContextMenu": {
           "switchToTerminalView": "Mit Terminal-Agenten fortfahren",
-          "switchToChatView": "In der Chat-Oberfläche fortfahren"
+          "switchToChatView": "In der Chat-Oberfläche fortfahren",
+          "showAsTerminal": "Als Terminal anzeigen"
         },
         "BrowserTab": {
           "closeOthers": "Andere schließen",
diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index 1e3e48629d0b..0362b0175c5d 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -19494,7 +19494,7 @@
       "resumeInNewChat": {
         "hostUpdateRequired": "Update Orca on this host to continue in Chat UI.",
         "exitUnconfirmedFromTerminal": "Orca could not confirm {{agent}} stopped in this terminal. Quit {{agent}} here, then try this action again.",
-        "exitUnconfirmed": "Orca could not confirm {{agent}} stopped in this terminal. Quit {{agent}} here, then try this action again.",
+        "exitUnconfirmed": "Orca could not confirm {{agent}} stopped. Quit {{agent}} in its terminal, then try this action again.",
         "notSavedYet": "{{agent}} hasn't saved this conversation yet. Try again after it replies."
       },
       "state": {
@@ -19898,9 +19898,9 @@
     "tab": {
       "bar": {
         "SortableTabContextMenu": {
-          "switchToTerminalView": "Show as terminal",
+          "switchToTerminalView": "Continue with Terminal Agent",
           "switchToChatView": "Show as chat",
-          "closeTabsToLeft": "Close All Tabs To The Left"
+          "showAsTerminal": "Show as terminal"
         },
         "switch": {
           "toCli": "Switch to CLI",
@@ -19908,12 +19908,8 @@
           "toCliTooltip": "Switch to CLI: stops {{agent}} in native chat and continues the same conversation in a terminal.",
           "openedInWorkspace": "Opened chat in {{workspace}}.",
           "toNativeChatTooltip": "Switch to native chat: continues the same conversation in a chat, in this tab.",
-          "stopUnconfirmed": "Couldn't confirm {{agent}} stopped. Try again.",
-          "failed": "Couldn't switch this conversation to the CLI.",
           "noConversation": "No saved conversation is available in this terminal yet.",
-          "unavailable": "Switching {{agent}} is not available yet.",
           "openElsewhere": "{{agent}} is open in another chat or terminal. Continue there, then try switching again.",
-          "unavailableNow": "Switching {{agent}} is unavailable for this chat now. You can keep using chat.",
           "stopUnknown": "Orca could not confirm {{agent}} stopped. Check its open chats and terminals, then try switching again.",
           "sourceStopUnknown": "Orca could not confirm {{agent}} stopped. Check {{agent}} in the original terminal, then try switching again.",
           "stopAndSwitchTitle": "{{agent}} is replying. Stop it and switch?",
diff --git a/src/renderer/src/i18n/locales/es.json b/src/renderer/src/i18n/locales/es.json
index 7923d868d318..63b0903635ce 100644
--- a/src/renderer/src/i18n/locales/es.json
+++ b/src/renderer/src/i18n/locales/es.json
@@ -19103,8 +19103,8 @@
       "resumeInNewChat": {
         "hostUpdateRequired": "Actualiza Orca en este host para continuar en la interfaz de chat.",
         "notSavedYet": "{{agent}} aún no ha guardado esta conversación. Inténtalo de nuevo cuando responda.",
-        "exitUnconfirmed": "{{agent}} ya está ejecutando esta conversación en otra terminal. Sal de {{agent}} allí o cierra esa terminal; luego abre esta conversación desde el Historial de sesiones.",
-        "exitUnconfirmedFromTerminal": "{{agent}} ya está ejecutando esta conversación en otra terminal. Sal de {{agent}} allí o cierra esa terminal; luego abre esta conversación desde el Historial de sesiones."
+        "exitUnconfirmed": "Orca no pudo confirmar que {{agent}} se detuvo. Sal de {{agent}} en su terminal y vuelve a intentar esta acción.",
+        "exitUnconfirmedFromTerminal": "Orca no pudo confirmar que {{agent}} se detuvo en esta terminal. Sal de {{agent}} aquí y vuelve a intentar esta acción."
       },
       "state": {
         "loading": {
@@ -19628,9 +19628,9 @@
     "tab": {
       "bar": {
         "SortableTabContextMenu": {
-          "switchToTerminalView": "Mostrar como terminal",
+          "switchToTerminalView": "Continuar con el agente de terminal",
           "switchToChatView": "Mostrar como chat",
-          "closeTabsToLeft": "Cerrar todas las pestañas a la izquierda"
+          "showAsTerminal": "Mostrar como terminal"
         },
         "switch": {
           "toCli": "Cambiar a la CLI",
@@ -19640,10 +19640,7 @@
           "toNativeChatTooltip": "Cambiar al chat nativo: continúa la misma conversación en un chat, en esta pestaña.",
           "exitAgentFirst": "Salga de {{agent}} en esta terminal para cambiar.",
           "waitForReply": "Espere a que termine la respuesta o deténgala y luego cambie.",
-          "stopUnconfirmed": "No se pudo confirmar que {{agent}} se detuvo. Vuelva a intentarlo.",
-          "failed": "No se pudo cambiar esta conversación a la CLI.",
-          "noConversation": "Todavía no hay una conversación guardada disponible en este terminal.",
-          "unavailable": "Cambiar {{agent}} todavía no está disponible."
+          "noConversation": "Todavía no hay una conversación guardada disponible en este terminal."
         },
         "BrowserTab": {
           "closeOthers": "Cerrar otras",
diff --git a/src/renderer/src/i18n/locales/fr.json b/src/renderer/src/i18n/locales/fr.json
index 3a10c8a61d42..cf69b0577913 100644
--- a/src/renderer/src/i18n/locales/fr.json
+++ b/src/renderer/src/i18n/locales/fr.json
@@ -19323,8 +19323,8 @@
       "resumeInNewChat": {
         "hostUpdateRequired": "Mettez à jour Orca sur cet hôte pour continuer dans l'interface de chat.",
         "notSavedYet": "{{agent}} n'a pas encore enregistré cette conversation. Réessayez après sa réponse.",
-        "exitUnconfirmedFromTerminal": "{{agent}} exécute déjà cette conversation dans un autre terminal. Quittez {{agent}} là-bas ou fermez ce terminal, puis ouvrez cette conversation depuis l’historique des sessions.",
-        "exitUnconfirmed": "{{agent}} exécute déjà cette conversation dans un autre terminal. Quittez {{agent}} là-bas ou fermez ce terminal, puis ouvrez cette conversation depuis l’historique des sessions."
+        "exitUnconfirmedFromTerminal": "Orca n’a pas pu confirmer l’arrêt de {{agent}} dans ce terminal. Quittez {{agent}} ici, puis réessayez cette action.",
+        "exitUnconfirmed": "Orca n’a pas pu confirmer l’arrêt de {{agent}}. Quittez {{agent}} dans son terminal, puis réessayez cette action."
       },
       "state": {
         "loading": {
@@ -19848,9 +19848,9 @@
     "tab": {
       "bar": {
         "SortableTabContextMenu": {
-          "switchToTerminalView": "Afficher en terminal",
+          "switchToTerminalView": "Continuer avec l’agent de terminal",
           "switchToChatView": "Afficher en chat",
-          "closeTabsToLeft": "Fermer tous les onglets à gauche"
+          "showAsTerminal": "Afficher en terminal"
         },
         "switch": {
           "toCli": "Passer à la CLI",
@@ -19860,10 +19860,7 @@
           "toNativeChatTooltip": "Passer au chat natif : poursuit la même conversation dans un chat, dans cet onglet.",
           "exitAgentFirst": "Quittez {{agent}} dans ce terminal pour basculer.",
           "waitForReply": "Attendez la fin de la réponse ou arrêtez-la, puis basculez.",
-          "stopUnconfirmed": "Impossible de confirmer l'arrêt de {{agent}}. Réessayez.",
-          "failed": "Impossible de basculer cette conversation vers la CLI.",
-          "noConversation": "Aucune conversation enregistrée n’est encore disponible dans ce terminal.",
-          "unavailable": "Le changement de {{agent}} n’est pas encore disponible."
+          "noConversation": "Aucune conversation enregistrée n’est encore disponible dans ce terminal."
         },
         "BrowserTab": {
           "closeOthers": "Fermer les autres",
diff --git a/src/renderer/src/i18n/locales/ja.json b/src/renderer/src/i18n/locales/ja.json
index ca1475f48fdc..8e4e8e86b0cf 100644
--- a/src/renderer/src/i18n/locales/ja.json
+++ b/src/renderer/src/i18n/locales/ja.json
@@ -18633,8 +18633,8 @@
       "resumeInNewChat": {
         "hostUpdateRequired": "チャット UI で続けるには、このホストの Orca を更新してください。",
         "notSavedYet": "{{agent}} はまだこの会話を保存していません。応答してから再度お試しください。",
-        "exitUnconfirmedFromTerminal": "{{agent}} は別のターミナルですでにこの会話を実行しています。そちらの {{agent}} を終了するか、そのターミナルを閉じてから、セッション履歴でこの会話を開いてください。",
-        "exitUnconfirmed": "{{agent}} は別のターミナルですでにこの会話を実行しています。そちらの {{agent}} を終了するか、そのターミナルを閉じてから、セッション履歴でこの会話を開いてください。"
+        "exitUnconfirmedFromTerminal": "Orca は、このターミナルで {{agent}} が停止したことを確認できませんでした。ここで {{agent}} を終了してから、この操作をもう一度試してください。",
+        "exitUnconfirmed": "Orca は {{agent}} が停止したことを確認できませんでした。{{agent}} を実行中のターミナルで終了してから、この操作をもう一度試してください。"
       },
       "state": {
         "loading": {
@@ -19113,9 +19113,9 @@
     "tab": {
       "bar": {
         "SortableTabContextMenu": {
-          "switchToTerminalView": "ターミナルとして表示",
+          "switchToTerminalView": "ターミナル Agent で続ける",
           "switchToChatView": "チャットとして表示",
-          "closeTabsToLeft": "左側のすべてのタブを閉じる"
+          "showAsTerminal": "ターミナルとして表示"
         },
         "switch": {
           "toCli": "CLI に切り替える",
@@ -19125,10 +19125,7 @@
           "toNativeChatTooltip": "ネイティブチャットに切り替え: このタブのチャットで同じ会話を続けます。",
           "exitAgentFirst": "切り替えるには、このターミナルで {{agent}} を終了してください。",
           "waitForReply": "応答が終わるまで待つか停止してから、切り替えてください。",
-          "stopUnconfirmed": "{{agent}} が停止したことを確認できませんでした。もう一度お試しください。",
-          "failed": "この会話を CLI に切り替えられませんでした。",
-          "noConversation": "このターミナルには、保存された会話がまだありません。",
-          "unavailable": "{{agent}} の切り替えはまだ利用できません。"
+          "noConversation": "このターミナルには、保存された会話がまだありません。"
         },
         "BrowserTab": {
           "closeOthers": "その他を閉じる",
diff --git a/src/renderer/src/i18n/locales/ko.json b/src/renderer/src/i18n/locales/ko.json
index b35e6038f30d..098c0a8c3d0c 100644
--- a/src/renderer/src/i18n/locales/ko.json
+++ b/src/renderer/src/i18n/locales/ko.json
@@ -18633,8 +18633,8 @@
       "resumeInNewChat": {
         "hostUpdateRequired": "채팅 UI에서 계속하려면 이 호스트의 Orca를 업데이트하세요.",
         "notSavedYet": "{{agent}}이(가) 아직 이 대화를 저장하지 않았습니다. 응답한 후 다시 시도하세요.",
-        "exitUnconfirmedFromTerminal": "{{agent}}이(가) 다른 터미널에서 이미 이 대화를 실행 중입니다. 그곳에서 {{agent}}을(를) 종료하거나 해당 터미널을 닫은 다음 세션 기록에서 이 대화를 여세요.",
-        "exitUnconfirmed": "{{agent}}이(가) 다른 터미널에서 이미 이 대화를 실행 중입니다. 그곳에서 {{agent}}을(를) 종료하거나 해당 터미널을 닫은 다음 세션 기록에서 이 대화를 여세요."
+        "exitUnconfirmedFromTerminal": "Orca가 이 터미널에서 {{agent}}이(가) 중지되었는지 확인할 수 없습니다. 여기서 {{agent}}을(를) 종료한 다음 이 작업을 다시 시도하세요.",
+        "exitUnconfirmed": "Orca가 {{agent}}이(가) 중지되었는지 확인할 수 없습니다. 해당 터미널에서 {{agent}}을(를) 종료한 다음 이 작업을 다시 시도하세요."
       },
       "state": {
         "loading": {
@@ -19113,9 +19113,9 @@
     "tab": {
       "bar": {
         "SortableTabContextMenu": {
-          "switchToTerminalView": "터미널로 표시",
+          "switchToTerminalView": "터미널 에이전트로 계속하기",
           "switchToChatView": "채팅으로 표시",
-          "closeTabsToLeft": "왼쪽의 모든 탭 닫기"
+          "showAsTerminal": "터미널로 표시"
         },
         "switch": {
           "toCli": "CLI로 전환",
@@ -19125,10 +19125,7 @@
           "toNativeChatTooltip": "네이티브 채팅으로 전환: 이 탭의 채팅에서 같은 대화를 이어갑니다.",
           "exitAgentFirst": "전환하려면 이 터미널에서 {{agent}}을(를) 종료하세요.",
           "waitForReply": "응답이 끝날 때까지 기다리거나 응답을 중지한 후 전환하세요.",
-          "stopUnconfirmed": "{{agent}}이(가) 중지되었는지 확인할 수 없습니다. 다시 시도하세요.",
-          "failed": "이 대화를 CLI로 전환할 수 없습니다.",
-          "noConversation": "이 터미널에는 아직 저장된 대화가 없습니다.",
-          "unavailable": "{{agent}} 전환은 아직 사용할 수 없습니다."
+          "noConversation": "이 터미널에는 아직 저장된 대화가 없습니다."
         },
         "BrowserTab": {
           "closeOthers": "다른 탭 닫기",
diff --git a/src/renderer/src/i18n/locales/pt.json b/src/renderer/src/i18n/locales/pt.json
index 95429c4b5f6a..633e521d8f7e 100644
--- a/src/renderer/src/i18n/locales/pt.json
+++ b/src/renderer/src/i18n/locales/pt.json
@@ -20082,8 +20082,8 @@
       "transcriptLabel": "Conversa",
       "resumeInNewChat": {
         "hostUpdateRequired": "Atualize o Orca neste host para continuar na interface de chat.",
-        "exitUnconfirmedFromTerminal": "{{agent}} já está executando esta conversa em outro terminal. Encerre o {{agent}} lá ou feche esse terminal e abra esta conversa no Histórico de sessões.",
-        "exitUnconfirmed": "{{agent}} já está executando esta conversa em outro terminal. Encerre o {{agent}} lá ou feche esse terminal e abra esta conversa no Histórico de sessões.",
+        "exitUnconfirmedFromTerminal": "O Orca não pôde confirmar que {{agent}} parou neste terminal. Encerre {{agent}} aqui e tente esta ação novamente.",
+        "exitUnconfirmed": "O Orca não pôde confirmar que {{agent}} parou. Encerre {{agent}} no terminal em que está sendo executado e tente esta ação novamente.",
         "notSavedYet": "O {{agent}} ainda não salvou esta conversa. Tente novamente depois que ele responder."
       },
       "loadingEarlierMessages": "Carregando mensagens anteriores…",
@@ -20389,8 +20389,9 @@
     "tab": {
       "bar": {
         "SortableTabContextMenu": {
-          "switchToTerminalView": "Alternar para visualização de terminal",
-          "switchToChatView": "Alternar para visualização de chat"
+          "switchToTerminalView": "Continuar com o agente de terminal",
+          "switchToChatView": "Alternar para visualização de chat",
+          "showAsTerminal": "Mostrar como terminal"
         },
         "switch": {
           "stopAndSwitchTitle": "{{agent}} está respondendo. Interromper e alternar?",
diff --git a/src/renderer/src/i18n/locales/ru.json b/src/renderer/src/i18n/locales/ru.json
index 64b93056e6a7..9998c275ed05 100644
--- a/src/renderer/src/i18n/locales/ru.json
+++ b/src/renderer/src/i18n/locales/ru.json
@@ -19652,8 +19652,8 @@
       },
       "resumeInNewChat": {
         "hostUpdateRequired": "Обновите Orca на этом хосте, чтобы продолжить в чате.",
-        "exitUnconfirmedFromTerminal": "{{agent}} уже работает с этим разговором в другом терминале. Завершите {{agent}} там или закройте этот терминал, затем откройте разговор из истории сессий.",
-        "exitUnconfirmed": "{{agent}} уже работает с этим разговором в другом терминале. Завершите {{agent}} там или закройте этот терминал, затем откройте разговор из истории сессий.",
+        "exitUnconfirmedFromTerminal": "Orca не удалось подтвердить, что {{agent}} остановлен в этом терминале. Завершите {{agent}} здесь и повторите это действие.",
+        "exitUnconfirmed": "Orca не удалось подтвердить, что {{agent}} остановлен. Завершите {{agent}} в его терминале и повторите это действие.",
         "notSavedYet": "{{agent}} ещё не сохранил этот разговор. Повторите попытку после его ответа."
       },
       "state": {
@@ -20073,7 +20073,8 @@
       "bar": {
         "SortableTabContextMenu": {
           "switchToTerminalView": "Продолжить с агентом в терминале",
-          "switchToChatView": "Продолжить в чате"
+          "switchToChatView": "Продолжить в чате",
+          "showAsTerminal": "Показать как терминал"
         },
         "BrowserTab": {
           "closeOthers": "Закрыть остальные",
diff --git a/src/renderer/src/i18n/locales/tr.json b/src/renderer/src/i18n/locales/tr.json
index f83b1a345f7f..09d4c2b9dab1 100644
--- a/src/renderer/src/i18n/locales/tr.json
+++ b/src/renderer/src/i18n/locales/tr.json
@@ -19054,8 +19054,8 @@
       },
       "resumeInNewChat": {
         "hostUpdateRequired": "Sohbet arayüzünde devam etmek için bu sunucudaki Orca'yı güncelleyin.",
-        "exitUnconfirmedFromTerminal": "{{agent}} bu sohbeti zaten başka bir terminalde yürütüyor. O terminalde {{agent}} uygulamasından çıkın veya terminali kapatın, ardından bu sohbeti Oturum geçmişi bölümünden açın.",
-        "exitUnconfirmed": "{{agent}} bu sohbeti zaten başka bir terminalde yürütüyor. O terminalde {{agent}} uygulamasından çıkın veya terminali kapatın, ardından bu sohbeti Oturum geçmişi bölümünden açın.",
+        "exitUnconfirmedFromTerminal": "Orca, {{agent}} uygulamasının bu terminalde durduğunu doğrulayamadı. Burada {{agent}} uygulamasından çıkın ve bu işlemi yeniden deneyin.",
+        "exitUnconfirmed": "Orca, {{agent}} uygulamasının durduğunu doğrulayamadı. {{agent}} uygulamasından çalıştığı terminalde çıkın ve bu işlemi yeniden deneyin.",
         "notSavedYet": "{{agent}} bu sohbeti henüz kaydetmedi. Yanıt verdikten sonra yeniden deneyin."
       },
       "state": {
@@ -19457,7 +19457,8 @@
       "bar": {
         "SortableTabContextMenu": {
           "switchToTerminalView": "Terminal ajanıyla devam et",
-          "switchToChatView": "Sohbet arayüzünde devam et"
+          "switchToChatView": "Sohbet arayüzünde devam et",
+          "showAsTerminal": "Terminal olarak göster"
         },
         "BrowserTab": {
           "closeOthers": "Diğerlerini Kapat",
diff --git a/src/renderer/src/i18n/locales/zh-Hant.json b/src/renderer/src/i18n/locales/zh-Hant.json
index 0285482033d8..e7d149515197 100644
--- a/src/renderer/src/i18n/locales/zh-Hant.json
+++ b/src/renderer/src/i18n/locales/zh-Hant.json
@@ -18803,8 +18803,8 @@
       },
       "resumeInNewChat": {
         "hostUpdateRequired": "請更新此主機上的 Orca，以便在聊天介面中繼續。",
-        "exitUnconfirmedFromTerminal": "{{agent}} 已在另一個終端機中執行此對話。請在該處結束 {{agent}} 或關閉該終端機，再從「工作階段歷史記錄」開啟此對話。",
-        "exitUnconfirmed": "{{agent}} 已在另一個終端機中執行此對話。請在該處結束 {{agent}} 或關閉該終端機，再從「工作階段歷史記錄」開啟此對話。",
+        "exitUnconfirmedFromTerminal": "Orca 無法確認 {{agent}} 已在此終端機中停止。請在此處結束 {{agent}}，然後重試此操作。",
+        "exitUnconfirmed": "Orca 無法確認 {{agent}} 已停止。請在其所在的終端機中結束 {{agent}}，然後重試此操作。",
         "notSavedYet": "{{agent}} 尚未儲存此對話。請在它回覆後重試。"
       },
       "state": {
@@ -19198,7 +19198,8 @@
       "bar": {
         "SortableTabContextMenu": {
           "switchToTerminalView": "使用終端機代理程式繼續",
-          "switchToChatView": "在聊天介面中繼續"
+          "switchToChatView": "在聊天介面中繼續",
+          "showAsTerminal": "以終端機顯示"
         },
         "BrowserTab": {
           "closeOthers": "關閉其他",
diff --git a/src/renderer/src/i18n/locales/zh.json b/src/renderer/src/i18n/locales/zh.json
index 8556e6254c4d..0b0e4de5ac38 100644
--- a/src/renderer/src/i18n/locales/zh.json
+++ b/src/renderer/src/i18n/locales/zh.json
@@ -18599,8 +18599,8 @@
       "resumeInNewChat": {
         "hostUpdateRequired": "请更新此主机上的 Orca 以在聊天界面中继续。",
         "notSavedYet": "{{agent}} 尚未保存此对话。请在它回复后重试。",
-        "exitUnconfirmed": "{{agent}} 已在另一个终端中运行此对话。请退出那里的 {{agent}} 或关闭该终端，然后从会话历史记录中打开此对话。",
-        "exitUnconfirmedFromTerminal": "{{agent}} 已在另一个终端中运行此对话。请退出那里的 {{agent}} 或关闭该终端，然后从会话历史记录中打开此对话。"
+        "exitUnconfirmed": "Orca 无法确认 {{agent}} 已停止。请在其所在的终端中退出 {{agent}}，然后重试此操作。",
+        "exitUnconfirmedFromTerminal": "Orca 无法确认 {{agent}} 已在此终端中停止。请在此处退出 {{agent}}，然后重试此操作。"
       },
       "state": {
         "loading": {
@@ -19079,9 +19079,9 @@
     "tab": {
       "bar": {
         "SortableTabContextMenu": {
-          "switchToTerminalView": "以终端显示",
+          "switchToTerminalView": "使用终端智能体继续",
           "switchToChatView": "以聊天显示",
-          "closeTabsToLeft": "关闭左侧的所有选项卡"
+          "showAsTerminal": "以终端显示"
         },
         "switch": {
           "toCli": "切换到 CLI",
@@ -19091,10 +19091,7 @@
           "toNativeChatTooltip": "切换到原生聊天：在此标签页的聊天中继续同一对话。",
           "exitAgentFirst": "请先在此终端中退出 {{agent}}，然后再切换。",
           "waitForReply": "请等待回复完成或停止回复，然后再切换。",
-          "stopUnconfirmed": "无法确认 {{agent}} 已停止。请重试。",
-          "failed": "无法将此对话切换到 CLI。",
-          "noConversation": "此终端中尚无可用的已保存对话。",
-          "unavailable": "暂不支持切换 {{agent}}。"
+          "noConversation": "此终端中尚无可用的已保存对话。"
         },
         "BrowserTab": {
           "closeOthers": "关闭其他",
diff --git a/src/renderer/src/lib/cli-conversation-exit-guidance.ts b/src/renderer/src/lib/cli-conversation-exit-guidance.ts
index fd50d3cb552a..71d7e68182dc 100644
--- a/src/renderer/src/lib/cli-conversation-exit-guidance.ts
+++ b/src/renderer/src/lib/cli-conversation-exit-guidance.ts
@@ -2,7 +2,6 @@ import { translate } from '@/i18n/i18n'
 import { agentLabel } from '../../../shared/ai-vault-session-filters'
 import type { CliConversationRowAgent } from '../../../shared/structured-agent-cli-conversation-adoption'
 
-/** The header action disappears once the agent exits, so that surface points to Session History. */
 export function cliConversationExitGuidance(
   agent: CliConversationRowAgent,
   fromTerminal = false
@@ -11,12 +10,12 @@ export function cliConversationExitGuidance(
   return fromTerminal
     ? translate(
         'components.native-chat.resumeInNewChat.exitUnconfirmedFromTerminal',
-        '{{agent}} is already running this conversation in another terminal. Quit {{agent}} there or close that terminal, then open this conversation from Session History.',
+        'Orca could not confirm {{agent}} stopped in this terminal. Quit {{agent}} here, then try this action again.',
         values
       )
     : translate(
         'components.native-chat.resumeInNewChat.exitUnconfirmed',
-        '{{agent}} is already running this conversation in another terminal. Quit {{agent}} there or close that terminal, then open this conversation from Session History.',
+        'Orca could not confirm {{agent}} stopped. Quit {{agent}} in its terminal, then try this action again.',
         values
       )
 }
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/open-placement-read.ts b/src/renderer/src/runtime/web-session-tabs-sync/open-placement-read.ts
index 9f8b5ae1355f..8e6ea631bd9b 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/open-placement-read.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/open-placement-read.ts
@@ -1,7 +1,7 @@
 import type { SessionTabOpenPlacement } from '../../../../shared/session-tab-placement'
 import type { RuntimeMobileSessionTabsResult } from '../../../../shared/runtime-types'
 import {
-  captureTerminalSurfaceIdentity,
+  captureTerminalSurfaceIdentityFromRow,
   isRetainedTerminalSurfaceIdentity
 } from '../../../../shared/terminal-tab-close'
 import { toWebTerminalSurfaceTabId } from '../../../../shared/terminal-surface-id'
@@ -96,12 +96,9 @@ export function createOpenPlacementRead(
         return false
       }
       const row = terminalRows.get(tabId)
-      const current = captureTerminalSurfaceIdentity(
-        {
-          tabsByWorktree: { [worktreeId]: row ? [row] : [] },
-          terminalLayoutsByTabId: state.terminalLayoutsByTabId,
-          terminalPtyIncarnationsByPaneKey: state.terminalPtyIncarnationsByPaneKey
-        },
+      const current = captureTerminalSurfaceIdentityFromRow(
+        state,
+        row,
         worktreeId,
         tabId,
         source.leafId
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/open-placement-selection.ts b/src/renderer/src/runtime/web-session-tabs-sync/open-placement-selection.ts
index ab126f661fb5..ccb6a65c995d 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/open-placement-selection.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/open-placement-selection.ts
@@ -6,6 +6,7 @@ import { deriveActiveSurfaceForWorktree } from '../../store/slices/tabs/tabs-sur
 import { executionHostIdForSessionTabsOwner } from '../local-structured-session-owner'
 import type { SnapshotOpenPlacement } from './open-placement'
 import type { WebSessionTabsSyncState } from './state'
+import { snapshotOpenSelectionRecords } from './store-patch'
 
 /** Membership and original-view admission share one synchronous ordinary snapshot transaction. */
 export function applySnapshotOpenSelection(
@@ -37,11 +38,7 @@ export function applySnapshotOpenSelection(
   return {
     ...patch,
     ...activation,
-    activeTabIdByWorktree: { ...next.activeTabIdByWorktree, [worktreeId]: surface.activeTabId },
-    activeTabTypeByWorktree: {
-      ...next.activeTabTypeByWorktree,
-      [worktreeId]: surface.activeTabType
-    },
+    ...snapshotOpenSelectionRecords(next, worktreeId, surface),
     ...(isFloatingWorkspaceId(worktreeId)
       ? {}
       : {
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/store-patch.ts b/src/renderer/src/runtime/web-session-tabs-sync/store-patch.ts
index 222fcfbe2cd2..520ec3657b59 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/store-patch.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/store-patch.ts
@@ -33,6 +33,20 @@ import {
   type HostSessionMirrorSettle
 } from './mirror-settle'
 
+export function snapshotOpenSelectionRecords(
+  state: WebSessionTabsSyncState,
+  worktreeId: string,
+  surface: Pick<WebSessionTabsSyncState, 'activeTabId' | 'activeTabType'>
+): Pick<WebSessionTabsSyncState, 'activeTabIdByWorktree' | 'activeTabTypeByWorktree'> {
+  return {
+    activeTabIdByWorktree: { ...state.activeTabIdByWorktree, [worktreeId]: surface.activeTabId },
+    activeTabTypeByWorktree: {
+      ...state.activeTabTypeByWorktree,
+      [worktreeId]: surface.activeTabType
+    }
+  }
+}
+
 /** Commit a reconciliation patch and return a receipt for its host evidence. */
 export function applyWebSessionTabsStorePatch(
   buildPatch: (
diff --git a/src/shared/local-build-compatibility-contract.json b/src/shared/local-build-compatibility-contract.json
index a832ce1301ee..f878cefa3d2c 100644
--- a/src/shared/local-build-compatibility-contract.json
+++ b/src/shared/local-build-compatibility-contract.json
@@ -3,10 +3,10 @@
   "appId": "com.stablyai.orca",
   "stateSchemaVersion": 1,
   "readableStateSchemaVersions": [1],
-  "daemonProtocolVersion": 53,
+  "daemonProtocolVersion": 54,
   "attachableDaemonProtocolVersions": [
     1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
     27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
-    51, 52, 53
+    51, 52, 53, 54
   ]
 }
diff --git a/src/shared/local-build-compatibility-contract.ts b/src/shared/local-build-compatibility-contract.ts
index e04456f5009a..244e01dc6a1c 100644
--- a/src/shared/local-build-compatibility-contract.ts
+++ b/src/shared/local-build-compatibility-contract.ts
@@ -3,10 +3,10 @@ export const LOCAL_BUILD_COMPATIBILITY_CONTRACT = {
   appId: 'com.stablyai.orca',
   stateSchemaVersion: 1,
   readableStateSchemaVersions: [1],
-  daemonProtocolVersion: 53,
+  daemonProtocolVersion: 54,
   attachableDaemonProtocolVersions: [
     1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
     27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
-    51, 52, 53
+    51, 52, 53, 54
   ]
 } as const
diff --git a/src/shared/terminal-tab-close.ts b/src/shared/terminal-tab-close.ts
index 61f33b35ffe6..df15ce7c146c 100644
--- a/src/shared/terminal-tab-close.ts
+++ b/src/shared/terminal-tab-close.ts
@@ -1,6 +1,6 @@
 import type { ExecutionHostId } from './execution-host'
 import type { WorkspaceSessionState } from './workspace-session-state-types'
-import type { TerminalPaneLayoutNode } from './terminal-tab-types'
+import type { TerminalPaneLayoutNode, TerminalTab } from './terminal-tab-types'
 
 export type TerminalTabCloseRequest = {
   requestId: string
@@ -72,6 +72,20 @@ export function captureTerminalSurfaceIdentity(
   leafId: string
 ): TerminalSurfaceCloseIdentity | null {
   const row = state?.tabsByWorktree[worktreeId]?.find((tab) => tab.id === tabId)
+  return captureTerminalSurfaceIdentityFromRow(state, row, worktreeId, tabId, leafId)
+}
+
+export function captureTerminalSurfaceIdentityFromRow(
+  state:
+    | (Pick<WorkspaceSessionState, 'terminalLayoutsByTabId'> &
+        Partial<Pick<WorkspaceSessionState, 'terminalPtyIncarnationsByPaneKey'>>)
+    | null
+    | undefined,
+  row: TerminalTab | undefined,
+  worktreeId: string,
+  tabId: string,
+  leafId: string
+): TerminalSurfaceCloseIdentity | null {
   if (!row || !state) {
     return null
   }
diff --git a/tests/e2e/helpers/native-chat-switch-readable-source.ts b/tests/e2e/helpers/native-chat-switch-readable-source.ts
new file mode 100644
index 000000000000..1d1447be30c1
--- /dev/null
+++ b/tests/e2e/helpers/native-chat-switch-readable-source.ts
@@ -0,0 +1,76 @@
+import { writeFile } from 'node:fs/promises'
+import { join } from 'node:path'
+import { expect, vi } from 'vitest'
+import * as cliTranscript from '../../../src/main/ai-vault/structured-chat-cli-fork'
+import type { RestTestRig } from '../../../src/main/native-chat/agent-session-wire/structured-agent-session-rest-test-rig'
+import {
+  createTestParams,
+  CREATE_TEST_CALLER
+} from '../../../src/main/native-chat/agent-session-wire/structured-agent-session-create-test-fixture'
+import { HOST_TEST_SESSION } from '../../../src/main/native-chat/agent-session-wire/structured-agent-session-host-test-data'
+import { structuredAgentRuntimeMetadata } from '../../../src/main/runtime/structured-agent-runtime-metadata'
+import { agentSessionProviderHandleChainHead } from '../../../src/shared/agent-session-provider-handle'
+
+export async function prepareReadableSwitchSource(rig: RestTestRig, workspaceId: string) {
+  const params = createTestParams()
+  await rig.host.create(
+    CREATE_TEST_CALLER,
+    createTestParams(undefined, {
+      location: { ...params.location, workspaceId }
+    })
+  )
+  await rig.host.switchToChat(HOST_TEST_SESSION)
+  await rig.host.switchToTerminal(HOST_TEST_SESSION)
+  rig.adapter.acquire.mockClear()
+  const record = rig.store.getRecord(HOST_TEST_SESSION)!
+  const head = agentSessionProviderHandleChainHead(record.providerHandleChain)!
+  const nativeId = head.handle.nativeId
+  const filePath = join(rig.root, 'readable.jsonl')
+  await writeFile(
+    filePath,
+    `${[
+      { type: 'session_meta', payload: { id: nativeId } },
+      { type: 'event_msg', payload: { type: 'task_started', turn_id: 'terminal-turn' } },
+      {
+        type: 'response_item',
+        payload: {
+          type: 'message',
+          role: 'assistant',
+          content: [{ type: 'output_text', text: 'Readable before Codex is ready' }]
+        }
+      },
+      { type: 'event_msg', payload: { type: 'task_complete', turn_id: 'terminal-turn' } }
+    ]
+      .map((row) => JSON.stringify({ timestamp: '2026-10-26T12:00:00Z', ...row }))
+      .join('\n')}\n`
+  )
+  // External lookup is the I/O boundary; import, journal, command and root stay real.
+  vi.spyOn(cliTranscript, 'resolveStructuredChatCliSource').mockResolvedValue({
+    host: rig.host,
+    record,
+    head,
+    agent: 'codex',
+    cwd: rig.root,
+    providerSessionId: nativeId,
+    metadata: structuredAgentRuntimeMetadata('codex')!,
+    requireCurrent: () => {
+      const current = rig.store.requireWritableRecord(record.sessionId)
+      expect(current.location).toEqual(record.location)
+      expect(agentSessionProviderHandleChainHead(current.providerHandleChain)?.linkId).toBe(
+        head.linkId
+      )
+    }
+  })
+  vi.spyOn(cliTranscript, 'prepareStructuredChatCliTranscript').mockResolvedValue({
+    useRealCodexHome: false,
+    cliForkSource: {
+      agent: 'codex',
+      sourceAgent: 'codex',
+      sessionId: nativeId,
+      filePath,
+      cwd: rig.root,
+      codexHome: null,
+      executionHostPlatform: process.platform
+    }
+  })
+}
diff --git a/tests/e2e/mobile-terminal-session-switch.unit.test.ts b/tests/e2e/mobile-terminal-session-switch.unit.test.ts
index a699c36057b0..61272c19fd74 100644
--- a/tests/e2e/mobile-terminal-session-switch.unit.test.ts
+++ b/tests/e2e/mobile-terminal-session-switch.unit.test.ts
@@ -20,7 +20,15 @@ import {
 import { withChatTabChanges } from '../../src/main/runtime/agent-session/agent-session-tab-layout'
 import { committingSpawn } from '../../src/main/runtime/bind-first-pane.test-fixture'
 import type { RuntimeNotifier } from '../../src/main/runtime/runtime-notifier-contract'
-import { DaemonRequestTimeoutError } from '../../src/main/daemon/daemon-errors'
+import '../../src/main/daemon/mock-descendant-sweep'
+import { mkdtempSync, rmSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { DaemonPtyAdapter } from '../../src/main/daemon/daemon-pty-adapter'
+import { DaemonServer } from '../../src/main/daemon/daemon-server'
+import { getDaemonSocketPath } from '../../src/main/daemon/daemon-spawner'
+import { createMockSubprocess } from '../../src/main/daemon/daemon-pty-adapter-test-harness'
+import type { DaemonClientConnections } from '../../src/main/daemon/daemon-client-connections'
 import type { RuntimePtyController } from '../../src/main/runtime/runtime-pty-controller-contract'
 
 const renderer = vi.hoisted(() => {
@@ -40,7 +48,9 @@ vi.mock('@/hooks/ipc-events/terminal-command-state', () => ({
 
 vi.mock('../../src/shared/layout-owner-switch', () => ({ ORCA_LAYOUT_OWNER_IS_MAIN: false }))
 
-async function setup(outcome: 'ready' | 'failed' | 'unknown' = 'ready') {
+type Spawn = NonNullable<RuntimePtyController['spawn']>
+
+async function setup(outcome: 'ready' | 'failed' = 'ready', create?: Spawn) {
   createTabsSliceMockApi()
   renderer.store = createTestStore()
   renderer.store.getState().setActiveWorktree(wt)
@@ -57,18 +67,16 @@ async function setup(outcome: 'ready' | 'failed' | 'unknown' = 'ready') {
   const fixture = makeRuntimeStoreWithWorkspaceSession(session)
   const service = new OrcaRuntimeService(fixture.runtimeStore)
   const events: string[] = []
-  const spawn = vi.fn(
-    async (_options: Parameters<NonNullable<RuntimePtyController['spawn']>>[0]) => {
-      events.push('spawn')
-      if (outcome === 'failed') {
-        throw new Error('spawn rejected')
-      }
-      if (outcome === 'unknown') {
-        throw new DaemonRequestTimeoutError('spawn timed out')
-      }
-      return { id: 'pty-switch', incarnationId: '45454545-4545-4545-8545-454545454545' }
+  const spawn = vi.fn(async (options: Parameters<Spawn>[0]) => {
+    events.push('spawn')
+    if (outcome === 'failed') {
+      throw new Error('spawn rejected')
     }
-  )
+    if (create) {
+      return create(options)
+    }
+    return { id: 'pty-switch', incarnationId: '45454545-4545-4545-8545-454545454545' }
+  })
   service.setPtyController({
     spawn: committingSpawn(service, spawn),
     write: () => true,
@@ -130,11 +138,11 @@ function execution() {
   return {
     ...deadline,
     invocationId: 'click-1',
-    viewer: 'focus-in-workspace' as const,
-    shown: async () => {}
+    viewer: 'focus-in-workspace' as const
   }
 }
 const args = () => ({
+  agent: 'codex' as const,
   invocationId: 'click-1',
   sessionId: 'source-chat',
   afterTabId: 'custom-source',
@@ -155,22 +163,79 @@ it('publishes before ordinary fresh startup, forwards caller choices and never s
   expect(created.tab.terminal).toBeDefined()
 })
 
-it.each(['failed', 'unknown'] as const)(
-  'withdraws only a definitely unused destination after %s spawn',
-  async (outcome) => {
-    const { service, report, publish } = await setup(outcome)
-    await expect(service.createSessionSwitchTerminal(wt, args())).rejects.toThrow()
+it('withdraws a definitely unused destination after failed spawn', async () => {
+  const { service, report, publish } = await setup('failed')
+  await expect(service.createSessionSwitchTerminal(wt, args())).rejects.toThrow()
+  expect(report).toHaveBeenCalledWith(expect.objectContaining({ worktreeId: wt }), {
+    kind: 'withdrawn'
+  })
+  const published = await publish.mock.results[0]!.value
+  expect(renderer.store!.getState().terminalLayoutsByTabId[published.tabId]).toBeUndefined()
+})
+
+it('retains an unresolved receiver destination until real no-fork settlement permits unused cleanup', async () => {
+  const directory = mkdtempSync(join(tmpdir(), 'mobile-switch-receiver-'))
+  const socketPath = getDaemonSocketPath(directory)
+  const tokenPath = join(directory, 'test.token')
+  const entered = Promise.withResolvers<void>()
+  const releasePreparation = Promise.withResolvers<void>()
+  const nativeSpawn = vi.fn(() => createMockSubprocess())
+  const preparation = vi.fn(async () => {
+    entered.resolve()
+    await releasePreparation.promise
+    throw new Error('workspace preparation failed')
+  })
+  const server = new DaemonServer({
+    socketPath,
+    tokenPath,
+    spawnSubprocess: nativeSpawn,
+    preparePtySpawn: preparation
+  })
+  const adapter = new DaemonPtyAdapter({ socketPath, tokenPath })
+  let operation: Promise<unknown> | undefined
+  try {
+    await server.start()
+    const { service, report, publish, spawn } = await setup('ready', (options) =>
+      adapter.spawn(options)
+    )
+    operation = service.createSessionSwitchTerminal(wt, args()).catch((error: unknown) => error)
+    await entered.promise
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: access only this fixture's authenticated server sockets to inject transport loss.
+    const connections = (server as unknown as { connections: DaemonClientConnections }).connections
+    const peer = [...connections.values()].find((connection) => connection.controlSocket)
+    if (!peer) {
+      throw new Error('authenticated receiver connection missing')
+    }
+    peer.controlSocket.destroy()
+    expect(await operation).toBeInstanceOf(Error)
+    const published = await publish.mock.results[0]!.value
     expect(report).toHaveBeenCalledWith(expect.objectContaining({ worktreeId: wt }), {
-      kind: outcome === 'failed' ? 'withdrawn' : 'unconfirmed'
+      kind: 'unconfirmed'
     })
-    const published = await publish.mock.results[0]!.value
-    if (outcome === 'unknown') {
-      expect(renderer.store!.getState().terminalLayoutsByTabId[published.tabId]?.root).toBeDefined()
-    } else {
+    expect(renderer.store!.getState().terminalLayoutsByTabId[published.tabId]?.root).toBeDefined()
+    expect(report.mock.calls.some(([, verdict]) => verdict.kind === 'withdrawn')).toBe(false)
+    expect(nativeSpawn).not.toHaveBeenCalled()
+    releasePreparation.resolve()
+    await adapter.settleSwitchWorkForReplacement()
+    await vi.waitFor(() => {
       expect(renderer.store!.getState().terminalLayoutsByTabId[published.tabId]).toBeUndefined()
-    }
+      expect(report).toHaveBeenLastCalledWith(expect.objectContaining({ worktreeId: wt }), {
+        kind: 'withdrawn'
+      })
+    })
+    expect(preparation).toHaveBeenCalledOnce()
+    expect(spawn).toHaveBeenCalledOnce()
+    expect(nativeSpawn).not.toHaveBeenCalled()
+    expect(server.host.listSessions()).toEqual([])
+  } finally {
+    releasePreparation.resolve()
+    await operation
+    await adapter.settleSwitchWorkForReplacement()
+    adapter.dispose()
+    await server.shutdown()
+    rmSync(directory, { recursive: true, force: true })
   }
-)
+})
 
 it('expires after preparation/publication without dispatching spawn, keeping the source', async () => {
   const { service, spawn, publish, report } = await setup()
diff --git a/tests/e2e/native-chat-switch-readable.unit.test.tsx b/tests/e2e/native-chat-switch-readable.unit.test.tsx
index f725740061e6..9f03eddc4477 100644
--- a/tests/e2e/native-chat-switch-readable.unit.test.tsx
+++ b/tests/e2e/native-chat-switch-readable.unit.test.tsx
@@ -1,25 +1,23 @@
-import { writeFile } from 'node:fs/promises'
-import { join } from 'node:path'
-import * as cliTranscript from '../../src/main/ai-vault/structured-chat-cli-fork'
+import { prepareReadableSwitchSource } from './helpers/native-chat-switch-readable-source'
 import { createRestTestRig } from '../../src/main/native-chat/agent-session-wire/structured-agent-session-rest-test-rig'
-import {
-  createTestParams,
-  CREATE_TEST_CALLER
-} from '../../src/main/native-chat/agent-session-wire/structured-agent-session-create-test-fixture'
 import { HOST_TEST_SESSION } from '../../src/main/native-chat/agent-session-wire/structured-agent-session-host-test-data'
 import { setStructuredAgentSessionHost } from '../../src/main/native-chat/agent-session-wire/structured-agent-session-registry'
 import {
   setupMainOwnedWorkspace,
-  WORKTREE_ID
+  WORKTREE_ID,
+  TAB_ID,
+  LEAF_A,
+  PTY_A
 } from '../../src/main/runtime/main-owned-workspace-runtime-fixture'
 import { executeStructuredSessionSwitch } from '../../src/main/runtime/rpc/methods/structured-agent-session-switch-execution'
-import { structuredAgentRuntimeMetadata } from '../../src/main/runtime/structured-agent-runtime-metadata'
-import { agentSessionProviderHandleChainHead } from '../../src/shared/agent-session-provider-handle'
 import { act, cleanup, render, screen, waitFor } from '@testing-library/react'
 import { afterEach, expect, it, vi } from 'vitest'
 import { agentSessionRefusalError } from '../../src/shared/agent-session-wire-refusals'
+import { RuntimeRpcCallError } from '@/runtime/runtime-rpc-result'
 import { beginSwitchPresentation } from '@/lib/conversation-switch-presentation'
 import { NativeChatStructuredSession } from '../../src/renderer/src/components/native-chat/NativeChatStructuredSession'
+import { ConfirmationDialogProvider } from '@/components/confirmation-dialog'
+import { TooltipProvider } from '@/components/ui/tooltip'
 import {
   stubLayout,
   stubResizeObserver,
@@ -100,7 +98,7 @@ afterEach(async () => {
   vi.restoreAllMocks()
 })
 it.each(['readable', 'refused', 'unmounted'] as const)(
-  'acknowledges the real cold root only after its first history is %s',
+  'completes one physical switch independently of slow provider readiness and renderer history: %s',
   async (outcome) => {
     const restoreLayout = stubLayout()
     const restoreResize = stubResizeObserver()
@@ -118,91 +116,78 @@ it.each(['readable', 'refused', 'unmounted'] as const)(
     }))
     const rig = await createRestTestRig({ idleSweep: { intervalMs: 60_000 } })
     disposals.push(rig.dispose)
-    const params = createTestParams()
-    await rig.host.create(
-      CREATE_TEST_CALLER,
-      createTestParams(undefined, {
-        location: { ...params.location, workspaceId: WORKTREE_ID }
-      })
-    )
     setStructuredAgentSessionHost(rig.host)
-    await rig.host.switchToChat(HOST_TEST_SESSION)
-    await rig.host.switchToTerminal(HOST_TEST_SESSION)
-    rig.adapter.acquire.mockClear()
-    const record = rig.store.getRecord(HOST_TEST_SESSION)!
-    const head = agentSessionProviderHandleChainHead(record.providerHandleChain)!
-    const nativeId = head.handle.nativeId
-    const filePath = join(rig.root, 'readable.jsonl')
-    await writeFile(
-      filePath,
-      `${[
-        { type: 'session_meta', payload: { id: nativeId } },
-        { type: 'event_msg', payload: { type: 'task_started', turn_id: 'terminal-turn' } },
-        {
-          type: 'response_item',
-          payload: {
-            type: 'message',
-            role: 'assistant',
-            content: [{ type: 'output_text', text: 'Readable before Codex is ready' }]
-          }
-        },
-        { type: 'event_msg', payload: { type: 'task_complete', turn_id: 'terminal-turn' } }
-      ]
-        .map((row) => JSON.stringify({ timestamp: '2026-10-26T12:00:00Z', ...row }))
-        .join('\n')}\n`
-    )
-    // External lookup is the I/O boundary; import, journal, command, receipt and root stay real.
-    vi.spyOn(cliTranscript, 'resolveStructuredChatCliSource').mockResolvedValue({
-      host: rig.host,
-      record,
-      head,
-      agent: 'codex',
-      cwd: rig.root,
-      providerSessionId: nativeId,
-      metadata: structuredAgentRuntimeMetadata('codex')!,
-      requireCurrent: () => {
-        const current = rig.store.requireWritableRecord(record.sessionId)
-        expect(current.location).toEqual(record.location)
-        expect(agentSessionProviderHandleChainHead(current.providerHandleChain)?.linkId).toBe(
-          head.linkId
-        )
-      }
-    })
-    vi.spyOn(cliTranscript, 'prepareStructuredChatCliTranscript').mockResolvedValue({
-      useRealCodexHome: false,
-      cliForkSource: {
-        agent: 'codex',
-        sourceAgent: 'codex',
-        sessionId: nativeId,
-        filePath,
-        cwd: rig.root,
-        codexHome: null,
-        executionHostPlatform: process.platform
-      }
+    await prepareReadableSwitchSource(rig, WORKTREE_ID)
+    const { runtime, session } = setupMainOwnedWorkspace()
+    const incarnationId = '11111111-1111-4111-8111-111111111111'
+    runtime.registerPty(PTY_A, WORKTREE_ID, null, { tabId: TAB_ID, leafId: LEAF_A, incarnationId })
+    const source = runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_A}`, WORKTREE_ID)
+    if (!source.presentation) {
+      throw new Error('missing captured source')
+    }
+    const exit = Promise.withResolvers<void>()
+    const stopping = Promise.withResolvers<void>()
+    disposals.unshift(async () => exit.resolve())
+    const stopped = vi.fn(async (ptyId: string) => {
+      expect(ptyId).toBe(PTY_A)
+      stopping.resolve()
+      await exit.promise
+      await runtime.onPtyExit(PTY_A, 0, incarnationId, { hostExitConfirmed: true })
+      return true
     })
-    const { runtime } = setupMainOwnedWorkspace()
-    vi.spyOn(runtime, 'inspectTerminalProcess').mockResolvedValue({
-      foregroundProcess: 'zsh',
-      hasChildProcesses: false,
-      childProcessEvidence: 'no-children',
-      switchWitness: 'before-probe'
+    runtime.setPtyController({
+      write: () => true,
+      kill: () => false,
+      stopAndWait: stopped,
+      getForegroundProcess: async () => 'codex'
     })
-    vi.spyOn(runtime, 'publishStructuredAgentSessionTab').mockImplementation(async (input) => {
-      input.check?.()
-      await rig.store.setSessionTabVisibility(HOST_TEST_SESSION, true)
+    const acquire = rig.adapter.acquire.getMockImplementation()
+    if (!acquire) {
+      throw new Error('missing provider acquisition')
+    }
+    const provider = Promise.withResolvers<void>()
+    disposals.unshift(async () => provider.resolve())
+    const providerReady = vi.fn()
+    rig.adapter.acquire.mockImplementation(async (...args) => {
+      await provider.promise
+      const acquired = await acquire(...args)
+      providerReady()
+      return acquired
     })
-    const close = vi.spyOn(runtime, 'closeSwitchedSourceTerminal').mockResolvedValue(true)
+    const publish = vi.spyOn(runtime, 'publishStructuredAgentSessionTab')
     const invocation = {
       sessionId: HOST_TEST_SESSION,
       execution: {
         invocationId: 'root-readable',
-        source: { terminal: 'source', expectedIncarnationId: 'source-incarnation' }
+        source: {
+          terminal: source.handle,
+          expectedIncarnationId: incarnationId,
+          originalPresentation: source.presentation
+        }
       }
     }
-    const viewResult = await executeStructuredSessionSwitch(invocation, { runtime }, 'chat')
-    if (viewResult.status !== 'present') {
-      throw new Error('missing presentation')
-    }
+    const operation = executeStructuredSessionSwitch(invocation, { runtime }, 'chat')
+    await Promise.race([
+      stopping.promise,
+      operation.then((result) => {
+        throw new Error(`switch finished before physical Stop: ${JSON.stringify(result)}`)
+      })
+    ])
+    expect(publish).not.toHaveBeenCalled()
+    expect(rig.adapter.acquire).not.toHaveBeenCalled()
+    exit.resolve()
+    const completed = await operation
+    expect(completed).toEqual({ status: 'completed', sessionId: HOST_TEST_SESSION })
+    expect(stopped).toHaveBeenCalledOnce()
+    expect(publish).toHaveBeenCalledOnce()
+    expect(session().tabsByWorktree[WORKTREE_ID]).toEqual([])
+    expect(session().unifiedTabs?.[WORKTREE_ID]).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ entityId: HOST_TEST_SESSION, contentType: 'agent-session' })
+      ])
+    )
+    await vi.waitFor(() => expect(rig.adapter.acquire).toHaveBeenCalledOnce())
+    expect(providerReady).not.toHaveBeenCalled()
     const page = await rig.host.history({ sessionId: HOST_TEST_SESSION, direction: 'tail' })
     if (!page.ok || !page.page.liveCursor) {
       throw new Error('missing imported history')
@@ -216,30 +201,19 @@ it.each(['readable', 'refused', 'unmounted'] as const)(
       return { ok: true, models: [], current: { model: '' } }
     })
     const visit = beginSwitchPresentation({ kind: 'local' }, HOST_TEST_SESSION)
-    const shown = vi.fn()
-    const completion = visit.shown.then(async (readable) => {
-      shown(readable)
-      return executeStructuredSessionSwitch(
-        {
-          ...invocation,
-          execution: {
-            ...invocation.execution,
-            receipt: { generation: viewResult.generation, shown: readable }
-          }
-        },
-        { runtime },
-        'chat'
-      )
-    })
     const view = render(
-      <NativeChatStructuredSession
-        isVisible
-        isFocusedGroup
-        tabId="cold-tab"
-        sessionId={HOST_TEST_SESSION}
-        target={{ kind: 'local' }}
-        agent="codex"
-      />
+      <ConfirmationDialogProvider>
+        <TooltipProvider>
+          <NativeChatStructuredSession
+            isVisible
+            isFocusedGroup
+            tabId="cold-tab"
+            sessionId={HOST_TEST_SESSION}
+            target={{ kind: 'local' }}
+            agent="codex"
+          />
+        </TooltipProvider>
+      </ConfirmationDialogProvider>
     )
     await waitFor(() =>
       expect(mocks.call).toHaveBeenCalledWith(
@@ -248,9 +222,9 @@ it.each(['readable', 'refused', 'unmounted'] as const)(
         expect.anything()
       )
     )
-    expect(shown).not.toHaveBeenCalled()
-    expect(rig.adapter.acquire).not.toHaveBeenCalled()
-    expect(close).not.toHaveBeenCalled()
+    expect(visit.mounted).toBe(true)
+    expect(visit.visible).toBe(true)
+    expect(providerReady).not.toHaveBeenCalled()
     expect(screen.getByRole('status', { name: 'Loading chat' })).toBeTruthy()
     if (outcome === 'unmounted') {
       view.unmount()
@@ -258,43 +232,48 @@ it.each(['readable', 'refused', 'unmounted'] as const)(
     await act(async () =>
       outcome === 'refused'
         ? read.reject(
-            agentSessionRefusalError('agent_session_journal_unreadable', {
-              reason: 'journalCorrupt'
+            new RuntimeRpcCallError({
+              id: 'history-read',
+              ok: false,
+              error: {
+                code: 'runtime_error',
+                message: 'agent_session_journal_unreadable',
+                data: {
+                  refusal: agentSessionRefusalError('agent_session_journal_unreadable', {
+                    reason: 'journalCorrupt'
+                  }).refusal
+                }
+              }
             })
           )
         : read.resolve(page)
     )
-    await waitFor(() => {
-      act(() => {
-        deliverResizes()
-      })
-      expect(shown).toHaveBeenCalledExactlyOnceWith(outcome === 'readable')
-    })
-    const opened = await completion
     if (outcome === 'readable') {
-      expect(screen.getByText('Readable before Codex is ready')).toBeTruthy()
-      expect(opened).toMatchObject({ status: 'completed', startupPending: true })
-      await executeStructuredSessionSwitch(
-        {
-          ...invocation,
-          execution: {
-            ...invocation.execution,
-            observe: true
-          }
-        },
-        { runtime },
-        'chat'
-      )
-      expect(rig.adapter.acquire).toHaveBeenCalledOnce()
-      expect(close).toHaveBeenCalledOnce()
-    } else {
-      expect(opened).toMatchObject({
-        status: 'uncertain',
-        refusal: { details: { reason: 'tabUnconfirmed' } }
+      await waitFor(() => {
+        act(() => deliverResizes())
+        expect(screen.getByText('Readable before Codex is ready')).toBeTruthy()
+        expect(visit.presentedItems.size).toBeGreaterThan(0)
       })
-      expect(rig.adapter.acquire).not.toHaveBeenCalled()
-      expect(close).not.toHaveBeenCalled()
+    } else if (outcome === 'refused') {
+      await waitFor(() => expect(screen.getByText('Unable to load this chat.')).toBeTruthy())
+      expect(screen.queryByText('Readable before Codex is ready')).toBeNull()
+    } else {
+      expect(visit.mounted).toBe(true)
+      expect(visit.visible).toBe(false)
+      expect(screen.queryByText('Readable before Codex is ready')).toBeNull()
     }
+    expect(providerReady).not.toHaveBeenCalled()
+    expect(stopped).toHaveBeenCalledOnce()
+    expect(publish).toHaveBeenCalledOnce()
+    expect(
+      await rig.host.history({ sessionId: HOST_TEST_SESSION, direction: 'tail' })
+    ).toMatchObject({
+      ok: true
+    })
+    provider.resolve()
+    await vi.waitFor(() => expect(providerReady).toHaveBeenCalledOnce())
+    await vi.waitFor(() => expect(rig.host.switchExecuting(HOST_TEST_SESSION)).toBe(false))
+    expect(rig.adapter.acquire).toHaveBeenCalledOnce()
     visit.release()
   }
 )

From 6d0b2603c0227076a76ef134e7117969020d7df7 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Thu, 29 Oct 2026 04:45:57 -0700
Subject: [PATCH 099/207] Keep presentation-only terminal menu labels accurate

---
 .../src/components/native-chat/use-native-chat-context-menu.tsx | 2 +-
 .../src/components/terminal-pane/TerminalContextMenu.tsx        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/renderer/src/components/native-chat/use-native-chat-context-menu.tsx b/src/renderer/src/components/native-chat/use-native-chat-context-menu.tsx
index 1318744944ee..395ac61fdd95 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-context-menu.tsx
+++ b/src/renderer/src/components/native-chat/use-native-chat-context-menu.tsx
@@ -297,7 +297,7 @@ export function useNativeChatContextMenu({
                 <DropdownMenuItem onSelect={onSwitchToTerminal}>
                   <SquareTerminal />
                   {translate(
-                    'components.tab.bar.SortableTabContextMenu.switchToTerminalView',
+                    'components.tab.bar.SortableTabContextMenu.showAsTerminal',
                     'Show as terminal'
                   )}
                   {shortcutLabel ? (
diff --git a/src/renderer/src/components/terminal-pane/TerminalContextMenu.tsx b/src/renderer/src/components/terminal-pane/TerminalContextMenu.tsx
index fb3a7836c26b..ba007b41e4d5 100644
--- a/src/renderer/src/components/terminal-pane/TerminalContextMenu.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalContextMenu.tsx
@@ -236,7 +236,7 @@ function TerminalContextMenuItems({
           {isNativeChatView ? <SquareTerminal /> : <MessageSquare />}
           {isNativeChatView
             ? translate(
-                'components.tab.bar.SortableTabContextMenu.switchToTerminalView',
+                'components.tab.bar.SortableTabContextMenu.showAsTerminal',
                 'Show as terminal'
               )
             : translate(

From f31d395e0da1f1e7c4c9ebc7b33457805637ac59 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Thu, 29 Oct 2026 07:55:47 -0700
Subject: [PATCH 100/207] Preserve terminal recovery and dispatch contracts

---
 .../daemon/daemon-init-dependency-mocks.ts    |   4 +
 src/main/daemon/daemon-init-mock-types.ts     |   3 +
 .../daemon-init-restart-sequence.test.ts      |   8 +
 .../daemon-pty-adapter-wsl-sleep-cwd.test.ts  |   1 +
 .../conpty-startup-input-reader.ts            |  63 +--
 .../daemon-pty-physical-owner.ts              |  75 +++-
 .../native-pty-spawn-windows.test.ts          | 113 +++++-
 .../daemon/pty-subprocess/native-pty-spawn.ts |  23 +-
 .../pty-subprocess/subprocess-handle.ts       |   9 +-
 src/main/daemon/terminal-creation-work.ts     |  90 +++++
 .../daemon/terminal-host-returned-process.ts  |  84 ++++
 .../daemon/terminal-host-session-create.ts    |  26 +-
 .../daemon/terminal-host-session-process.ts   |   8 +-
 .../daemon/terminal-host-session-publish.ts   |  89 +----
 ...erminal-host-spawn-input-retention.test.ts |  86 ++++-
 src/main/daemon/terminal-host.ts              |  67 +---
 src/main/daemon/terminal-spawn-gate.test.ts   |   6 +-
 .../pty-attach-view-joins-main-start.test.ts  |   1 +
 .../pty-spawn-saved-resume-admission.test.ts  |   1 +
 src/main/ipc/pty/pty-ipc-mock-registry.ts     |   5 +-
 src/main/ipc/pty/pty-ipc-suite-environment.ts |   2 +-
 .../ipc/pty/pty-launch-race-parity.test.ts    |   1 +
 src/main/ipc/pty/spawn-commit-binding.ts      |   5 +-
 .../agent-session-inventory-scale.test.ts     |   4 +-
 ...gent-session-reservation-admission.test.ts |  19 +-
 ...rminal-create-host-session-binding.test.ts |  21 +
 .../orca-runtime-report-pty-spawn-commit.ts   |  15 +
 ...der-mobile-resume-adoption-scaling.test.ts | 158 ++++++++
 .../qoder-mobile-resume-adoption.test.ts      | 254 +++++++++++-
 ...red-agent-session-switch-execution.test.ts |   8 +-
 .../runtime/runtime-terminal-contracts.ts     |   2 +
 ...uctured-session-switch-publication.test.ts | 122 +++++-
 ...red-chat-dispatch-worker-lifecycle.test.ts |  31 +-
 .../mobile-terminal-create-reconciliation.ts  | 165 ++++++++
 .../terminal/launch/mobile-terminal-create.ts |   2 +
 .../launch/mobile-terminal-owned-create.ts    | 131 +++----
 .../mobile-terminal-switch-publication.ts     |  34 +-
 .../terminal/launch/terminal-create.ts        |  18 +-
 .../terminal/launch/terminal-launch-result.ts |   9 +-
 .../bind-first-registration-census.test.ts    |   4 +-
 .../native-chat/NativeChatPaneHeader.test.tsx |   6 +-
 ...ession.approval-and-start-failure.test.tsx |  92 +++--
 ...veChatStructuredSession.goal-dock.test.tsx |  20 +-
 ...ChatStructuredSession.host-outage.test.tsx |  20 +-
 ...ChatStructuredSession.notice-card.test.tsx |  20 +-
 ...ucturedSession.orca-stop-continue.test.tsx |  22 +-
 ...StructuredSession.refusal-notices.test.tsx |  56 +--
 ...tructuredSession.wsl-host-stopped.test.tsx |  20 +-
 ...ve-chat-agent-message-sender-host.test.tsx |  10 +-
 ...ault-session-resume-in-chat-launch.test.ts |   2 +-
 .../tab-session-history-switch.parity.test.ts |  44 ++-
 ...onnection-command-finished-cleanup.spec.ts |  52 ++-
 .../src/i18n/en-runtime-required.json         |   3 +-
 src/renderer/src/i18n/locales/es.json         |   2 -
 src/renderer/src/i18n/locales/fr.json         |   2 -
 src/renderer/src/i18n/locales/ja.json         |   2 -
 src/renderer/src/i18n/locales/ko.json         |   2 -
 src/renderer/src/i18n/locales/zh.json         |   2 -
 ...nt-launch-pane-verdict-application.test.ts |  58 ++-
 .../runtime-rpc-client-capabilities.test.ts   | 291 ++++++++++++++
 .../runtime/runtime-rpc-client-test-bridge.ts |  25 ++
 .../src/runtime/runtime-rpc-client.test.ts    | 365 ++++--------------
 .../runtime/runtime-rpc-environment-call.ts   |   1 +
 .../slices/github-pr-checks-fetch.test.ts     |   4 +
 .../store/slices/tabs/moved-tab-selection.ts  |   3 +-
 65 files changed, 2128 insertions(+), 763 deletions(-)
 create mode 100644 src/main/daemon/terminal-host-returned-process.ts
 create mode 100644 src/main/runtime/qoder-mobile-resume-adoption-scaling.test.ts
 create mode 100644 src/main/runtime/terminal/launch/mobile-terminal-create-reconciliation.ts
 create mode 100644 src/renderer/src/runtime/runtime-rpc-client-capabilities.test.ts
 create mode 100644 src/renderer/src/runtime/runtime-rpc-client-test-bridge.ts

diff --git a/src/main/daemon/daemon-init-dependency-mocks.ts b/src/main/daemon/daemon-init-dependency-mocks.ts
index c7891cd20ef4..027ef6f10e02 100644
--- a/src/main/daemon/daemon-init-dependency-mocks.ts
+++ b/src/main/daemon/daemon-init-dependency-mocks.ts
@@ -124,6 +124,8 @@ export function createDaemonInitModuleFactories(state: DaemonInitMockState) {
     readonly listProcesses: Mock
     readonly listSessions: Mock
     readonly establishLifecycleLease: Mock
+    readonly settleSwitchWorkForReplacement: MockAdapter['settleSwitchWorkForReplacement']
+    readonly inheritSwitchReleaseCleanup: MockAdapter['inheritSwitchReleaseCleanup']
     readonly shutdown: Mock
     readonly dispose: Mock
     readonly disconnectOnly: Mock
@@ -149,6 +151,8 @@ export function createDaemonInitModuleFactories(state: DaemonInitMockState) {
           throw lifecycleLeaseError
         }
       })
+      this.settleSwitchWorkForReplacement = vi.fn(async () => {})
+      this.inheritSwitchReleaseCleanup = vi.fn()
       this.shutdown = vi.fn(async () => {})
       this.dispose = vi.fn()
       const disconnectOnlyError = disconnectOnlyErrors.shift()
diff --git a/src/main/daemon/daemon-init-mock-types.ts b/src/main/daemon/daemon-init-mock-types.ts
index 187136a66425..06d730c2f916 100644
--- a/src/main/daemon/daemon-init-mock-types.ts
+++ b/src/main/daemon/daemon-init-mock-types.ts
@@ -1,4 +1,5 @@
 import type { Mock } from 'vitest'
+import type { DaemonPtyAdapter } from './daemon-pty-adapter'
 
 export type MockSpawner = {
   ensureRunning: Mock
@@ -27,6 +28,8 @@ export type MockAdapter = {
   listProcesses: Mock
   listSessions: Mock
   establishLifecycleLease: Mock
+  settleSwitchWorkForReplacement: Mock<DaemonPtyAdapter['settleSwitchWorkForReplacement']>
+  inheritSwitchReleaseCleanup: Mock<DaemonPtyAdapter['inheritSwitchReleaseCleanup']>
   shutdown: Mock
   dispose: Mock
   disconnectOnly: Mock
diff --git a/src/main/daemon/daemon-init-restart-sequence.test.ts b/src/main/daemon/daemon-init-restart-sequence.test.ts
index 56e34a5c0d8d..e24f4bcfd1ce 100644
--- a/src/main/daemon/daemon-init-restart-sequence.test.ts
+++ b/src/main/daemon/daemon-init-restart-sequence.test.ts
@@ -97,6 +97,14 @@ describe('daemon-init: runRestartDaemon (7-step sequence)', () => {
       replacedByRestart: true
     })
     expect(order).toEqual(['fanout', 'unbind'])
+    expect(originalAdapter.settleSwitchWorkForReplacement).toHaveBeenCalledOnce()
+    expect(originalAdapter.settleSwitchWorkForReplacement.mock.invocationCallOrder[0]).toBeLessThan(
+      originalAdapter.fanoutSyntheticExits.mock.invocationCallOrder[0]
+    )
+    expect(adapterInstances[1].inheritSwitchReleaseCleanup).toHaveBeenCalledWith(originalAdapter)
+    expect(
+      adapterInstances[1].inheritSwitchReleaseCleanup.mock.invocationCallOrder[0]
+    ).toBeLessThan(originalAdapter.dispose.mock.invocationCallOrder[0])
     expect(recoverRetired).toHaveBeenCalledOnce()
     expect(recoverRetired.mock.invocationCallOrder[0]).toBeLessThan(
       originalAdapter.fanoutSyntheticExits.mock.invocationCallOrder[0]
diff --git a/src/main/daemon/daemon-pty-adapter-wsl-sleep-cwd.test.ts b/src/main/daemon/daemon-pty-adapter-wsl-sleep-cwd.test.ts
index e61437041432..54172da8af14 100644
--- a/src/main/daemon/daemon-pty-adapter-wsl-sleep-cwd.test.ts
+++ b/src/main/daemon/daemon-pty-adapter-wsl-sleep-cwd.test.ts
@@ -56,6 +56,7 @@ describe('a sleeping bridge WSL pane keeps its shell folder', () => {
     const harness = await startDaemonAdapterHarness((opts) => {
       spawnCwds.push(opts.cwd)
       if (opts.cwd && deletedCwds.has(opts.cwd)) {
+        opts.onCreationDisposition?.({ kind: 'no-fork' })
         throw new Error(`Working directory "${opts.cwd}" does not exist. It may have been deleted.`)
       }
       lastSubprocess = createMockSubprocess()
diff --git a/src/main/daemon/pty-subprocess/conpty-startup-input-reader.ts b/src/main/daemon/pty-subprocess/conpty-startup-input-reader.ts
index 2d5f6ca1c3f7..a3b8b41ba6ff 100644
--- a/src/main/daemon/pty-subprocess/conpty-startup-input-reader.ts
+++ b/src/main/daemon/pty-subprocess/conpty-startup-input-reader.ts
@@ -1,3 +1,4 @@
+import type { DaemonPtyPhysicalOwner } from './subprocess-handle'
 import type * as pty from 'node-pty'
 import { killConptyNow, terminatePtyJob } from '../../windows/windows-pty-job'
 import { CONPTY_DA1_RESPONSE } from '../../../shared/conpty-device-attributes'
@@ -44,20 +45,22 @@ export function classifyConptyStartupOutput(output: string): ConptyStartupVerdic
 
 export type ConptyStartupEvents = {
   data: string[]
-  exit: { exitCode: number; signal?: number } | null
 }
 
 export type ConptyStartupWatch = {
   /** Settles on the first output that decides, or on exit before any did. */
   verdict: Promise<ConptyStartupOutcome>
-  /** Hands buffered output and exit to the caller and stops buffering. */
+  /** Hands buffered output to the caller and stops buffering. */
   claim(): ConptyStartupEvents
   exited: Promise<void>
 }
 
 /** Buffers a fresh ConPTY's output until its owner claims it, so no startup byte is lost. */
-export function watchConptyStartup(proc: pty.IPty): ConptyStartupWatch {
-  const events: ConptyStartupEvents = { data: [], exit: null }
+export function watchConptyStartup(
+  proc: pty.IPty,
+  exitSource: Pick<pty.IPty, 'onExit'> = proc
+): ConptyStartupWatch {
+  const events: ConptyStartupEvents = { data: [] }
   let ended!: () => void
   const exited = new Promise<void>((resolve) => {
     ended = resolve
@@ -89,9 +92,8 @@ export function watchConptyStartup(proc: pty.IPty): ConptyStartupWatch {
       settle(classified)
     }
   })
-  const exitSubscription = proc.onExit(({ exitCode, signal }) => {
+  const exitSubscription = exitSource.onExit(() => {
     ended()
-    events.exit = { exitCode, ...(signal !== undefined ? { signal } : {}) }
     decided = true
     settle('exited')
   })
@@ -109,13 +111,14 @@ export function watchConptyStartup(proc: pty.IPty): ConptyStartupWatch {
 async function decideConptyStartup(
   proc: pty.IPty,
   signal: AbortSignal | undefined,
-  retainCanceledChild = false
+  retainCanceledChild = false,
+  exitSource: Pick<pty.IPty, 'onExit'> = proc
 ): Promise<{
   outcome: ConptyStartupOutcome
   claim: () => ConptyStartupEvents
   exited: Promise<void>
 }> {
-  const watch = watchConptyStartup(proc)
+  const watch = watchConptyStartup(proc, exitSource)
   let limit: ReturnType<typeof setTimeout> | undefined
   let onAbort = (): void => {}
   try {
@@ -172,7 +175,7 @@ function withNotice(claim: () => ConptyStartupEvents): () => ConptyStartupEvents
 
 // Verify ConPTY input before exposing the pane, so respawning cannot repeat user input.
 export async function spawnConptyWithInputReader(
-  spawn: () => Promise<pty.IPty>,
+  spawn: () => Promise<{ proc: pty.IPty; physicalOwner: DaemonPtyPhysicalOwner }>,
   opts: {
     label: string
     signal?: AbortSignal
@@ -180,22 +183,32 @@ export async function spawnConptyWithInputReader(
     retainCanceledChild?: boolean
     respawnSafe: boolean
   }
-): Promise<{ proc: pty.IPty; claimStartupEvents: () => ConptyStartupEvents }> {
-  const first = await spawn()
+): Promise<{
+  proc: pty.IPty
+  physicalOwner: DaemonPtyPhysicalOwner
+  claimStartupEvents: () => ConptyStartupEvents
+}> {
+  const firstSpawn = await spawn()
+  const { proc: first, physicalOwner: firstOwner } = firstSpawn
   if (announcementUntrusted) {
-    return { proc: first, claimStartupEvents: () => ({ data: [], exit: null }) }
+    return { ...firstSpawn, claimStartupEvents: () => ({ data: [] }) }
   }
-  const firstStartup = await decideConptyStartup(first, opts.signal, opts.retainCanceledChild)
+  const firstStartup = await decideConptyStartup(
+    first,
+    opts.signal,
+    opts.retainCanceledChild,
+    firstOwner
+  )
   if (firstStartup.outcome === 'input-reader') {
     announcementObserved = true
   }
   if (firstStartup.outcome !== 'no-input-reader') {
-    return { proc: first, claimStartupEvents: firstStartup.claim }
+    return { ...firstSpawn, claimStartupEvents: firstStartup.claim }
   }
   if (!opts.respawnSafe) {
     console.warn(`[daemon/pty] ConPTY for "${opts.label}" started without an input reader`)
     const claim = firstStartup.claim
-    return { proc: first, claimStartupEvents: announcementObserved ? withNotice(claim) : claim }
+    return { ...firstSpawn, claimStartupEvents: announcementObserved ? withNotice(claim) : claim }
   }
   respawnCount += 1
   console.warn(
@@ -217,32 +230,38 @@ export async function spawnConptyWithInputReader(
         })
       ])
       if (!exited) {
-        return { proc: first, claimStartupEvents: withNotice(firstStartup.claim) }
+        return { ...firstSpawn, claimStartupEvents: withNotice(firstStartup.claim) }
       }
       firstStartup.claim()
     } catch {
-      return { proc: first, claimStartupEvents: withNotice(firstStartup.claim) }
+      return { ...firstSpawn, claimStartupEvents: withNotice(firstStartup.claim) }
     } finally {
       clearTimeout(limit)
     }
   } else {
     discardConpty(first, firstStartup)
   }
-  const retry = await spawn()
-  const retryStartup = await decideConptyStartup(retry, opts.signal, opts.retainCanceledChild)
+  const retrySpawn = await spawn()
+  const { proc: retry, physicalOwner: retryOwner } = retrySpawn
+  const retryStartup = await decideConptyStartup(
+    retry,
+    opts.signal,
+    opts.retainCanceledChild,
+    retryOwner
+  )
   if (retryStartup.outcome === 'input-reader') {
     announcementObserved = true
   }
   if (retryStartup.outcome !== 'no-input-reader') {
-    return { proc: retry, claimStartupEvents: retryStartup.claim }
+    return { ...retrySpawn, claimStartupEvents: retryStartup.claim }
   }
   if (!announcementObserved) {
     // Two misses and no pane ever announced: distrust the check rather than respawn every pane.
     announcementUntrusted = true
     console.warn('[daemon/pty] ConPTY never announced an input reader; disabling the startup check')
-    return { proc: retry, claimStartupEvents: retryStartup.claim }
+    return { ...retrySpawn, claimStartupEvents: retryStartup.claim }
   }
   console.warn(`[daemon/pty] ConPTY for "${opts.label}" again started without an input reader`)
   // After one respawn, show the failure on screen instead of silently ignoring keystrokes.
-  return { proc: retry, claimStartupEvents: withNotice(retryStartup.claim) }
+  return { ...retrySpawn, claimStartupEvents: withNotice(retryStartup.claim) }
 }
diff --git a/src/main/daemon/pty-subprocess/daemon-pty-physical-owner.ts b/src/main/daemon/pty-subprocess/daemon-pty-physical-owner.ts
index 8e5b3dec4b5f..dabeb0af20b0 100644
--- a/src/main/daemon/pty-subprocess/daemon-pty-physical-owner.ts
+++ b/src/main/daemon/pty-subprocess/daemon-pty-physical-owner.ts
@@ -7,8 +7,8 @@ import { SessionTerminationController } from '../session-termination-controller'
 import { shutdownOwnedTerminalProcess } from '../terminal-host-session-shutdown'
 export function createDaemonPtyPhysicalOwner(proc: pty.IPty) {
   const nativeProc: DisposableNativePty = proc
-  let exited = false
-  let code: number | null = null
+  let exit: { exitCode: number; signal?: number } | null = null
+  const exitListeners = new Set<Parameters<pty.IPty['onExit']>[0]>()
   let disposed = false
   let nodePtyKillIssued = false
   const groupSweep = new PendingPtyGroupSweep()
@@ -25,19 +25,19 @@ export function createDaemonPtyPhysicalOwner(proc: pty.IPty) {
     }
   }
   const forceKillPosix = async (): Promise<void> => {
-    if (exited) {
+    if (exit) {
       return
     }
     // A reaped root frees its pid and TTY for reuse, so a table read that outlives it signals nothing.
     await groupSweep.track(
-      forceKillPosixPtyProcessGroups(proc.pid, killRoot, { ownsRoot: () => !exited }).catch(
+      forceKillPosixPtyProcessGroups(proc.pid, killRoot, { ownsRoot: () => exit === null }).catch(
         fallBackToNodePtyKill
       )
     )
   }
   // Stays synchronous: dispose() reads nodePtyKillIssued right after to avoid double-closing ConPTY.
   const forceKillConpty = (): void => {
-    if (exited) {
+    if (exit) {
       return
     }
     // Escalate a ConPTY kill through the job without double-closing node-pty's shell handle.
@@ -53,7 +53,7 @@ export function createDaemonPtyPhysicalOwner(proc: pty.IPty) {
   }
 
   const kill = (): void => {
-    if (exited) {
+    if (exit) {
       return
     }
     nodePtyKillIssued = true
@@ -85,29 +85,78 @@ export function createDaemonPtyPhysicalOwner(proc: pty.IPty) {
   const termination = new SessionTerminationController({
     sessionId: String(proc.pid),
     subprocess: { kill, forceKill, signal: (signal) => proc.kill(signal), dispose },
-    isExited: () => exited,
+    isExited: () => exit !== null,
     releaseProducerPause: ({ resume }) => {
       if (resume) {
         proc.resume()
       }
     }
   })
-  proc.onExit(({ exitCode }) => {
-    exited = true
-    code = exitCode
+  let nativeExitSubscription: pty.IDisposable | undefined
+  const retireNativeExitSubscription = (): void => {
+    const subscription = nativeExitSubscription
+    nativeExitSubscription = undefined
+    subscription?.dispose()
+  }
+  nativeExitSubscription = proc.onExit((event) => {
+    if (exit) {
+      return
+    }
+    exit = {
+      exitCode: event.exitCode,
+      ...(event.signal !== undefined ? { signal: event.signal } : {})
+    }
     termination.markPhysicalExit()
+    const errors: unknown[] = []
+    try {
+      retireNativeExitSubscription()
+    } catch (error) {
+      errors.push(error)
+    }
+    try {
+      const listeners = [...exitListeners]
+      for (const listener of listeners) {
+        if (exitListeners.delete(listener)) {
+          try {
+            listener(exit)
+          } catch (error) {
+            errors.push(error)
+          }
+        }
+      }
+    } finally {
+      exitListeners.clear()
+    }
+    if (errors.length > 0) {
+      throw errors[0]
+    }
   })
+  if (exit) {
+    retireNativeExitSubscription()
+  }
   return {
     completion: termination.physicalCompletion,
-    exitCode: () => code,
-    hasExited: () => exited,
+    exitCode: () => exit?.exitCode ?? null,
+    onExit: (listener: Parameters<pty.IPty['onExit']>[0]): pty.IDisposable => {
+      if (exit) {
+        listener(exit)
+      } else {
+        exitListeners.add(listener)
+      }
+      return {
+        dispose: () => {
+          exitListeners.delete(listener)
+        }
+      }
+    },
+    hasExited: () => exit !== null,
     kill,
     forceKill,
     dispose,
     recover: () =>
       shutdownOwnedTerminalProcess({
         pid: proc.pid,
-        isAlive: () => !exited,
+        isAlive: () => exit === null,
         terminateOwnedTree: () => terminatePtyJob(proc),
         close: async () => {
           await termination.forceKillAndWaitForExit()
diff --git a/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts b/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts
index e71e25aa04fc..2c9403b536ba 100644
--- a/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts
+++ b/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts
@@ -1,5 +1,6 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { spawnNativeDaemonPty } from './native-pty-spawn'
+import { createDaemonPtySubprocessHandle } from './subprocess-handle'
 import { TerminalCreationWork } from '../terminal-creation-work'
 import {
   _resetConptyStartupTrustForTest,
@@ -39,22 +40,23 @@ const CONPTY_PRELUDE = '\x1b[1t\x1b[c\x1b[?1004h\x1b[?9001h'
 /** A pane that writes `chunks` on later ticks, as ConPTY's output socket does. */
 function fakePane(pid: number, chunks: string[], exitCode?: number) {
   const dataListeners = new Set<(data: string) => void>()
-  const exitListeners = new Set<(event: { exitCode: number }) => void>()
+  const exitListeners = new Set<(event: { exitCode: number; signal?: number }) => void>()
   const pane = {
     pid,
     kill: vi.fn(),
     resume: vi.fn(),
     write: vi.fn(),
-    exit: (code: number) => {
+    exitSubscriberCount: () => exitListeners.size,
+    exit: (code: number, signal?: number) => {
       for (const listener of exitListeners) {
-        listener({ exitCode: code })
+        listener({ exitCode: code, ...(signal !== undefined ? { signal } : {}) })
       }
     },
     onData: (listener: (data: string) => void) => {
       dataListeners.add(listener)
       return { dispose: () => dataListeners.delete(listener) }
     },
-    onExit: (listener: (event: { exitCode: number }) => void) => {
+    onExit: (listener: (event: { exitCode: number; signal?: number }) => void) => {
       exitListeners.add(listener)
       return { dispose: () => exitListeners.delete(listener) }
     }
@@ -355,7 +357,108 @@ describe('Windows shell fallback over node-pty ConPTY', () => {
     const result = await spawnNativeDaemonPty(args)
 
     expect(nodePty.spawn).toHaveBeenCalledOnce()
-    expect(result.claimStartupEvents?.().exit).toEqual({ exitCode: 3 })
+    const exits = vi.fn()
+    result.physicalOwner?.onExit(exits)
+    expect(exits).toHaveBeenCalledExactlyOnceWith({ exitCode: 3 })
+    expect(result.claimStartupEvents?.().data).toEqual([])
+  })
+
+  it('commits one receipt before reentrant, disposed and throwing consumers receive it', async () => {
+    const pane = healthyPane(990001)
+    const subscribe = pane.onExit
+    let nativeExit: Parameters<typeof subscribe>[0] | undefined
+    pane.onExit = (listener) => {
+      nativeExit = listener
+      return subscribe(listener)
+    }
+    nodePty.spawn.mockReturnValue(pane)
+    const result = await spawnNativeDaemonPty(args)
+    result.claimStartupEvents?.()
+    const owner = result.physicalOwner
+    if (!owner) {
+      throw new Error('selected physical owner missing')
+    }
+    const late = vi.fn()
+    const removed = vi.fn()
+    const surviving = vi.fn()
+    const first = vi.fn()
+    let remove = (): void => {}
+    const failure = new Error('exit consumer failed')
+    owner.onExit((event) => {
+      first(event)
+      expect(owner.hasExited()).toBe(true)
+      expect(owner.exitCode()).toBe(7)
+      owner.onExit(late)
+      remove()
+      throw failure
+    })
+    const subscription = owner.onExit(removed)
+    remove = () => subscription.dispose()
+    owner.onExit(surviving)
+    expect(() => pane.exit(7, 15)).toThrow(failure)
+    await owner.completion
+    expect(first).toHaveBeenCalledExactlyOnceWith({ exitCode: 7, signal: 15 })
+    expect(late).toHaveBeenCalledExactlyOnceWith({ exitCode: 7, signal: 15 })
+    expect(surviving).toHaveBeenCalledExactlyOnceWith({ exitCode: 7, signal: 15 })
+    expect(removed).not.toHaveBeenCalled()
+    expect(pane.exitSubscriberCount()).toBe(0)
+    nativeExit?.({ exitCode: 99 })
+    const replay = vi.fn()
+    owner.onExit(replay).dispose()
+    expect(replay).toHaveBeenCalledExactlyOnceWith({ exitCode: 7, signal: 15 })
+    expect(first).toHaveBeenCalledOnce()
+    expect(surviving).toHaveBeenCalledOnce()
+    expect(pane.kill).not.toHaveBeenCalled()
+  })
+
+  it('retires native observation even when exit arrives during subscription installation', async () => {
+    const pane = fakePane(990001, [])
+    const retired = vi.fn(() => true)
+    pane.onExit = (listener) => {
+      listener({ exitCode: 3, signal: 15 })
+      return { dispose: retired }
+    }
+    nodePty.spawn.mockReturnValue(pane)
+    const result = await spawnNativeDaemonPty(args)
+    const exits = vi.fn()
+    result.physicalOwner?.onExit(exits)
+    expect(exits).toHaveBeenCalledExactlyOnceWith({ exitCode: 3, signal: 15 })
+    expect(retired).toHaveBeenCalledOnce()
+    expect(result.claimStartupEvents?.().data).toEqual([])
+    expect(nodePty.spawn).toHaveBeenCalledOnce()
+  })
+
+  it('does not deliver a queued exit into a handle disposed by an earlier consumer', async () => {
+    const pane = healthyPane(990001)
+    nodePty.spawn.mockReturnValue(pane)
+    const result = await spawnNativeDaemonPty(args)
+    const owner = result.physicalOwner
+    if (!owner) {
+      throw new Error('selected physical owner missing')
+    }
+    const retire = owner.onExit(() => handle.dispose())
+    const handle = createDaemonPtySubprocessHandle({
+      process: result.process,
+      physicalOwner: owner,
+      shellPath: result.shellPath,
+      spawnCwd: result.spawnCwd,
+      env: {},
+      reportsChildExitStatus: result.reportsChildExitStatus,
+      startupCommandDeliveredInShellArgs: false,
+      startupAgentRecognition: null,
+      sessionId: 'disposed-during-exit',
+      startupEvents: result.claimStartupEvents?.()
+    })
+    const exits = vi.fn()
+    handle.onExit(exits)
+    pane.exit(0)
+    await owner.completion
+    expect(exits).not.toHaveBeenCalled()
+    expect(pane.exitSubscriberCount()).toBe(0)
+    handle.write('after disposal')
+    expect(pane.write).toHaveBeenCalledExactlyOnceWith('\x1b[?61;4c')
+    retire.dispose()
+    handle.dispose()
   })
 
   it('kills the pane tree when the spawn is canceled while startup is awaited', async () => {
diff --git a/src/main/daemon/pty-subprocess/native-pty-spawn.ts b/src/main/daemon/pty-subprocess/native-pty-spawn.ts
index 1c7d6b1a99ce..0aadcc25d5d3 100644
--- a/src/main/daemon/pty-subprocess/native-pty-spawn.ts
+++ b/src/main/daemon/pty-subprocess/native-pty-spawn.ts
@@ -33,11 +33,15 @@ export type SpawnedDaemonPty = {
   startupCommandDeliveredInShellArgs?: boolean
   /** False when a wrapper owns the reported status, so no exit code may be read from it. */
   reportsChildExitStatus: boolean
-  /** Windows: output and exit seen while confirming ConPTY reads input; claim before subscribing. */
+  /** Windows: output seen while confirming ConPTY reads input; claim before subscribing. */
   claimStartupEvents?: () => ConptyStartupEvents
 }
 
-type SpawnedNativePty = { proc: pty.IPty; claimStartupEvents?: () => ConptyStartupEvents }
+type SpawnedNativePty = {
+  proc: pty.IPty
+  physicalOwner: DaemonPtyPhysicalOwner
+  claimStartupEvents?: () => ConptyStartupEvents
+}
 
 export async function spawnNativeDaemonPty(args: {
   creationWork?: TerminalCreationWork
@@ -57,12 +61,11 @@ export async function spawnNativeDaemonPty(args: {
 }): Promise<SpawnedDaemonPty> {
   let reportsChildExitStatus = true
   let lastAttempt: Promise<PtyCreationDisposition> | undefined
-  const physicalOwners = new WeakMap<pty.IPty, DaemonPtyPhysicalOwner>()
   const spawnOnce = async (
     shellPath: string,
     shellArgs: string[],
     cwd: string
-  ): Promise<pty.IPty> => {
+  ): Promise<{ proc: pty.IPty; physicalOwner: DaemonPtyPhysicalOwner }> => {
     args.signal?.throwIfAborted()
     assertWslDistroAllowed(shellPath, shellArgs)
     const tcc = wrapShellSpawnForMacosTccAttribution(shellPath, shellArgs, args.env)
@@ -92,9 +95,9 @@ export async function spawnNativeDaemonPty(args: {
       attempt.resolve({ kind: 'failed', completion: Promise.resolve() })
       throw error
     }
+    let physical: DaemonPtyPhysicalOwner
     try {
-      const physical = createDaemonPtyPhysicalOwner(proc)
-      physicalOwners.set(proc, physical)
+      physical = createDaemonPtyPhysicalOwner(proc)
       attempt.resolve({
         kind: 'physical',
         completion: physical.completion,
@@ -111,7 +114,7 @@ export async function spawnNativeDaemonPty(args: {
     } catch {
       /* Diagnostics cannot revoke an owned child. */
     }
-    return proc
+    return { proc, physicalOwner: physical }
   }
   const spawnAt = async (
     shellPath: string,
@@ -120,7 +123,7 @@ export async function spawnNativeDaemonPty(args: {
     respawnSafe: boolean
   ): Promise<SpawnedNativePty> => {
     if (process.platform !== 'win32') {
-      return { proc: await spawnOnce(shellPath, shellArgs, cwd) }
+      return await spawnOnce(shellPath, shellArgs, cwd)
     }
     return spawnConptyWithInputReader(() => spawnOnce(shellPath, shellArgs, cwd), {
       label: shellPath,
@@ -139,7 +142,7 @@ export async function spawnNativeDaemonPty(args: {
     )
     return {
       process: spawned.proc,
-      physicalOwner: physicalOwners.get(spawned.proc),
+      physicalOwner: spawned.physicalOwner,
       shellPath: args.shellPath,
       spawnCwd: args.spawnCwd,
       reportsChildExitStatus,
@@ -167,7 +170,7 @@ export async function spawnNativeDaemonPty(args: {
         )
         return {
           process: spawned.proc,
-          physicalOwner: physicalOwners.get(spawned.proc),
+          physicalOwner: spawned.physicalOwner,
           shellPath: attempt.shellPath,
           spawnCwd: attempt.effectiveCwd,
           startupCommandDeliveredInShellArgs: attempt.startupCommandDeliveredInShellArgs,
diff --git a/src/main/daemon/pty-subprocess/subprocess-handle.ts b/src/main/daemon/pty-subprocess/subprocess-handle.ts
index fc284f9cc0a1..23947ee2b187 100644
--- a/src/main/daemon/pty-subprocess/subprocess-handle.ts
+++ b/src/main/daemon/pty-subprocess/subprocess-handle.ts
@@ -36,7 +36,7 @@ export function createDaemonPtySubprocessHandle(args: {
   requestedCwd?: string
   sessionId: string
   startupAgentRecognition: RecognizedAgentProcess | null
-  /** Output and exit buffered before this handle subscribed; replayed ahead of live events. */
+  /** Output buffered before this handle subscribed; replayed ahead of live events. */
   startupEvents?: ConptyStartupEvents
 }): SubprocessHandle {
   const reportsChildExitStatus = args.reportsChildExitStatus
@@ -125,11 +125,7 @@ export function createDaemonPtySubprocessHandle(args: {
       hostReportsChildExitStatus: reportsChildExitStatus
     })
   }
-  if (args.startupEvents?.exit) {
-    acceptExit(args.startupEvents.exit)
-  } else {
-    proc.onExit(acceptExit)
-  }
+  const exitSubscription = physical.onExit(acceptExit)
 
   const slavePath = readPtySlavePath(proc)
   return {
@@ -255,6 +251,7 @@ export function createDaemonPtySubprocessHandle(args: {
       dead = true
       clearMasterRetiredTimer()
       inputClosedListener = null
+      exitSubscription.dispose()
       events.clear()
       physical.dispose()
     }
diff --git a/src/main/daemon/terminal-creation-work.ts b/src/main/daemon/terminal-creation-work.ts
index f9a5e41729cc..390d5a432383 100644
--- a/src/main/daemon/terminal-creation-work.ts
+++ b/src/main/daemon/terminal-creation-work.ts
@@ -1,4 +1,5 @@
 import type { PtyCreationDisposition } from '../../shared/claimed-agent-pty-owner'
+import type { TerminalSpawnGate, TerminalSpawnLease } from './terminal-spawn-gate'
 
 export type PendingTerminalCreation = {
   completion: Promise<void>
@@ -17,6 +18,15 @@ export class TerminalCreationWork {
   }[] = []
   private uncertain = false
 
+  physicalObserver(
+    report: ((completion: Promise<void>, exitCode: () => number | null) => void) | undefined
+  ): (completion: Promise<void>, exitCode: () => number | null) => void {
+    return (completion, exitCode) => {
+      this.owner(completion, exitCode)
+      report?.(completion, exitCode)
+    }
+  }
+
   join(disposition: Promise<PtyCreationDisposition>): void {
     this.dependencies.push(disposition)
   }
@@ -76,3 +86,83 @@ export class TerminalCreationWork {
     }
   }
 }
+
+export function reconcileUnpublishedTerminalCreation(
+  sessions: ReadonlyMap<string, unknown>,
+  sessionId: string
+): (release: () => Promise<void>) => Promise<void> {
+  return async (release) => {
+    // Registered Sessions retain their ordinary current/use-fenced close authority.
+    if (!sessions.has(sessionId)) {
+      await release()
+    }
+  }
+}
+
+/** Keep pending recovery and exact-entry retirement outside the completed request's scope. */
+export function registerPendingTerminalCreation(
+  pendingCreations: Map<string, PendingTerminalCreation>,
+  sessionId: string,
+  creation: TerminalCreationWork
+): (published: boolean) => void {
+  const settled = Promise.withResolvers<void>()
+  const pending: PendingTerminalCreation = {
+    completion: settled.promise,
+    recover: async () => {
+      const disposition = await creation.completion
+      if (disposition.kind !== 'no-fork') {
+        await disposition.recover?.()
+      }
+    }
+  }
+  pendingCreations.set(sessionId, pending)
+  const finish = () => {
+    if (pendingCreations.get(sessionId) === pending) {
+      pendingCreations.delete(sessionId)
+    }
+    settled.resolve()
+  }
+  return (published) => {
+    if (published) {
+      finish()
+    } else {
+      void creation.completion.then(async (disposition) => {
+        if (disposition.kind === 'unknown') {
+          return
+        }
+        if (disposition.kind === 'physical' || disposition.kind === 'failed') {
+          await disposition.completion
+        }
+        finish()
+      })
+    }
+  }
+}
+
+/** An unpublished attempt keeps its existing lease until its actual disposition permits release. */
+export function settleUnpublishedTerminalSpawnLease(
+  completion: Promise<PtyCreationDisposition>,
+  admitted: TerminalSpawnLease | undefined,
+  sessionId: string,
+  spawnGate: TerminalSpawnGate | undefined
+): void {
+  void completion.then(async (disposition) => {
+    if (disposition.kind === 'no-fork') {
+      admitted?.abandon()
+    } else if (disposition.kind === 'failed') {
+      await disposition.completion
+      admitted?.abandon()
+    } else if (disposition.kind === 'physical') {
+      admitted?.commit(sessionId, true)
+      await disposition.completion
+      spawnGate?.onSessionExit(sessionId)
+    }
+  })
+}
+
+/** Recovery may outlive the observer; its rejection observer needs only the actual outcome. */
+export function recoverUnpublishedTerminalCreation(disposition: PtyCreationDisposition): void {
+  if (disposition.kind !== 'no-fork') {
+    void disposition.recover?.().catch(() => {})
+  }
+}
diff --git a/src/main/daemon/terminal-host-returned-process.ts b/src/main/daemon/terminal-host-returned-process.ts
new file mode 100644
index 000000000000..09f1926293a0
--- /dev/null
+++ b/src/main/daemon/terminal-host-returned-process.ts
@@ -0,0 +1,84 @@
+import type { Session } from './session'
+import type { SubprocessHandle } from './session-subprocess-handle'
+import type { TerminalExitCause } from '../../shared/terminal-exit-cause'
+import type { TerminalSpawnGate } from './terminal-spawn-gate'
+import { SessionTerminationController } from './session-termination-controller'
+import { shutdownOwnedTerminalProcess } from './terminal-host-session-shutdown'
+
+/** Retain the returned resource, not the completed create request or publication dependencies. */
+export function observeReturnedTerminalProcess(
+  subprocess: SubprocessHandle,
+  sessionId: string,
+  spawnGate: TerminalSpawnGate | undefined
+) {
+  const exited = Promise.withResolvers<void>()
+  let code: number | null = null
+  let exitCause: TerminalExitCause | undefined
+  let sessionExit: Parameters<SubprocessHandle['onExit']>[0] | undefined
+  const rawTermination = new SessionTerminationController({
+    sessionId,
+    subprocess,
+    isExited: () => code !== null,
+    releaseProducerPause: ({ resume }) => {
+      if (resume) {
+        subprocess.resume?.()
+      }
+    }
+  })
+  let recoverCreated = () =>
+    shutdownOwnedTerminalProcess({
+      pid: subprocess.pid,
+      isAlive: () => code === null,
+      terminateOwnedTree: () => subprocess.terminateOwnedTree(),
+      close: async () => {
+        await rawTermination.forceKillAndWaitForExit()
+        rawTermination.disposeSubprocessHandle()
+      }
+    })
+  subprocess.onExit((value, cause) => {
+    code = value
+    exitCause = cause
+    rawTermination.markPhysicalExit()
+    spawnGate?.onSessionExit(sessionId)
+    exited.resolve()
+    sessionExit?.(value, cause)
+  })
+  subprocess.onExit = (callback) => {
+    sessionExit = callback
+    if (code !== null) {
+      callback(code, exitCause)
+    }
+  }
+  return {
+    completion: exited.promise,
+    exitCode: () => code,
+    recover: async () => {
+      await recoverCreated()
+    },
+    useRecovery: (recover: () => Promise<void>) => {
+      recoverCreated = recover
+    }
+  }
+}
+
+export function recoverUnpublishedTerminalSession(
+  session: Pick<
+    Session,
+    'pid' | 'isAlive' | 'terminateOwnedTree' | 'forceKillAndWaitForExit' | 'dispose'
+  >
+): () => Promise<void> {
+  return () =>
+    shutdownOwnedTerminalProcess({
+      pid: session.pid,
+      isAlive: () => session.isAlive,
+      terminateOwnedTree: () => session.terminateOwnedTree(),
+      close: async () => {
+        await session.forceKillAndWaitForExit()
+        session.dispose()
+      }
+    })
+}
+
+export function terminalSessionExitCode(session: Pick<Session, 'exitCode'>): () => number | null {
+  return () => session.exitCode
+}
diff --git a/src/main/daemon/terminal-host-session-create.ts b/src/main/daemon/terminal-host-session-create.ts
index 2ef35993cf14..1974449fcdd8 100644
--- a/src/main/daemon/terminal-host-session-create.ts
+++ b/src/main/daemon/terminal-host-session-create.ts
@@ -1,3 +1,5 @@
+import { terminalSessionExitCode } from './terminal-host-returned-process'
+import { settleUnpublishedTerminalSpawnLease } from './terminal-creation-work'
 import { spawnAndPublishSession } from './terminal-host-session-publish'
 import { getDaemonSessionResultMetadata } from './daemon-create-or-attach-result'
 import { normalizePtySize } from './daemon-pty-size'
@@ -59,7 +61,10 @@ export async function createOrAttachTerminalSession(
   if (existing && existing.isAlive && !existing.isTerminating) {
     deps.assertCreateAllowed()
     const attachedSession = existing
-    opts.onPhysicalOwner?.(attachedSession.physicalCompletion, () => attachedSession.exitCode)
+    opts.onPhysicalOwner?.(
+      attachedSession.physicalCompletion,
+      terminalSessionExitCode(attachedSession)
+    )
     const snapshot = existing.getSnapshot()
     existing.detachAllClients()
     const token = existing.attachClient(opts.streamClient)
@@ -95,6 +100,7 @@ export async function createOrAttachTerminalSession(
   const size = normalizePtySize(opts.cols, opts.rows)
   const wslDistro = resolveWslSessionContext(opts)?.distro
   const sessionId = opts.sessionId
+  const spawnGate = deps.spawnGate
   let lease = deps.spawnGate?.admit(
     {
       clientId: opts.spawnAdmission?.clientId ?? 'in-process',
@@ -131,18 +137,12 @@ export async function createOrAttachTerminalSession(
     if (published || !opts.creationWork) {
       admitted?.abandon()
     } else {
-      void opts.creationWork.completion.then(async (disposition) => {
-        if (disposition.kind === 'no-fork') {
-          admitted?.abandon()
-        } else if (disposition.kind === 'failed') {
-          await disposition.completion
-          admitted?.abandon()
-        } else if (disposition.kind === 'physical') {
-          admitted?.commit(opts.sessionId, true)
-          await disposition.completion
-          deps.spawnGate?.onSessionExit(opts.sessionId)
-        }
-      })
+      settleUnpublishedTerminalSpawnLease(
+        opts.creationWork.completion,
+        admitted,
+        sessionId,
+        spawnGate
+      )
     }
   }
 }
diff --git a/src/main/daemon/terminal-host-session-process.ts b/src/main/daemon/terminal-host-session-process.ts
index bcdd2c70cf62..1a0357eb34e3 100644
--- a/src/main/daemon/terminal-host-session-process.ts
+++ b/src/main/daemon/terminal-host-session-process.ts
@@ -1,3 +1,7 @@
+import {
+  discardStagedStartupCommand,
+  type StartupCommandStaging
+} from '../../shared/startup-command-staging'
 import type { TerminalHostSessionCreateDependencies } from './terminal-host-session-create'
 import { enumerateDirectoryOnce } from './directory-enumeration-probe'
 import type { InternalCreateOrAttachOptions } from './terminal-host-agent-session-claim'
@@ -10,11 +14,11 @@ export function createSessionExitHandler(
   onSessionExit: TerminalHostSessionCreateDependencies['onSessionExit'],
   sessionId: string,
   generation: string | undefined,
-  discardStagedCommand: () => void,
+  staging: { current?: StartupCommandStaging },
   spawnGate: TerminalSpawnGate | undefined
 ): () => void {
   return () => {
-    discardStagedCommand()
+    discardStagedStartupCommand(staging.current)
     spawnGate?.onSessionExit(sessionId)
     onSessionExit(sessionId, generation)
   }
diff --git a/src/main/daemon/terminal-host-session-publish.ts b/src/main/daemon/terminal-host-session-publish.ts
index 0b5cdd4e177d..067b01e70719 100644
--- a/src/main/daemon/terminal-host-session-publish.ts
+++ b/src/main/daemon/terminal-host-session-publish.ts
@@ -1,9 +1,7 @@
 import type { PtyCreationDisposition } from '../../shared/claimed-agent-pty-owner'
 import type { SubprocessHandle } from './session-subprocess-handle'
-import type { TerminalExitCause } from '../../shared/terminal-exit-cause'
 import { buildStartupCommandSubmission } from '../../shared/startup-command-submission'
 import {
-  discardStagedStartupCommand,
   stageStartupCommand,
   startupStagingFailureNotice,
   type StartupCommandStaging
@@ -11,8 +9,11 @@ import {
 import { resolvePtyOwnerBackend } from '../../shared/pty-owner-backend'
 import { getDaemonSessionResultMetadata } from './daemon-create-or-attach-result'
 import { Session } from './session'
-import { SessionTerminationController } from './session-termination-controller'
-import { shutdownOwnedTerminalProcess } from './terminal-host-session-shutdown'
+import {
+  observeReturnedTerminalProcess,
+  recoverUnpublishedTerminalSession,
+  terminalSessionExitCode
+} from './terminal-host-returned-process'
 import { shellPathSupportsPtyStartupBarrier } from './shell-ready'
 import type { InternalCreateOrAttachOptions } from './terminal-host-agent-session-claim'
 import type { CreateOrAttachResult } from './terminal-host-create-contract'
@@ -45,7 +46,7 @@ export async function spawnAndPublishSession(
   const lower = Promise.withResolvers<PtyCreationDisposition>()
   opts.creationWork?.join(lower.promise)
   let lowerReported = false
-  let recoverCreated: (() => Promise<void>) | undefined
+  let physical: ReturnType<typeof observeReturnedTerminalProcess>
   let subprocess: SubprocessHandle
   try {
     subprocess = await deps.spawnSubprocess({
@@ -72,56 +73,17 @@ export async function spawnAndPublishSession(
       ...(opts.cancelSignal ? { cancelSignal: opts.cancelSignal } : {})
     })
     // External implementations returning a handle have transferred an actual resource.
-    const exited = Promise.withResolvers<void>()
-    let code: number | null = null
-    let exitCause: TerminalExitCause | undefined
-    let sessionExit: Parameters<typeof subprocess.onExit>[0] | undefined
-    const rawTermination = new SessionTerminationController({
-      sessionId: opts.sessionId,
-      subprocess,
-      isExited: () => code !== null,
-      releaseProducerPause: ({ resume }) => {
-        if (resume) {
-          subprocess.resume?.()
-        }
-      }
-    })
-    recoverCreated = () =>
-      shutdownOwnedTerminalProcess({
-        pid: subprocess.pid,
-        isAlive: () => code === null,
-        terminateOwnedTree: () => subprocess.terminateOwnedTree(),
-        close: async () => {
-          await rawTermination.forceKillAndWaitForExit()
-          rawTermination.disposeSubprocessHandle()
-        }
-      })
-    subprocess.onExit((value, cause) => {
-      code = value
-      exitCause = cause
-      rawTermination.markPhysicalExit()
-      deps.spawnGate?.onSessionExit(opts.sessionId)
-      exited.resolve()
-      sessionExit?.(value, cause)
-    })
-    subprocess.onExit = (callback) => {
-      sessionExit = callback
-      if (code !== null) {
-        callback(code, exitCause)
-      }
-    }
+    physical = observeReturnedTerminalProcess(subprocess, opts.sessionId, deps.spawnGate)
     if (!lowerReported) {
       lower.resolve({
         kind: 'physical',
-        completion: exited.promise,
-        exitCode: () => code,
-        recover: async () => {
-          await recoverCreated?.()
-        }
+        completion: physical.completion,
+        exitCode: physical.exitCode,
+        recover: physical.recover
       })
     }
-    opts.onPhysicalOwner?.(exited.promise, () => code)
-    onPublished(opts.sessionId, code === null)
+    opts.onPhysicalOwner?.(physical.completion, physical.exitCode)
+    onPublished(opts.sessionId, physical.exitCode() === null)
   } catch (error) {
     if (!lowerReported) {
       lower.resolve({ kind: 'unknown' })
@@ -129,7 +91,7 @@ export async function spawnAndPublishSession(
     throw error
   }
 
-  let staging: StartupCommandStaging | undefined
+  const staging: { current?: StartupCommandStaging } = {}
   // Reconcile fallback-shell capability or its first command could remain queued until timeout.
   const shellReadySupported =
     (opts.shellReadySupported ?? false) &&
@@ -155,7 +117,7 @@ export async function spawnAndPublishSession(
       deps.onSessionExit,
       opts.sessionId,
       opts.agentSessionGeneration,
-      () => discardStagedStartupCommand(staging),
+      staging,
       deps.spawnGate
     ),
     ...(deps.reportReadinessEvent ? { reportReadinessEvent: deps.reportReadinessEvent } : {}),
@@ -163,23 +125,14 @@ export async function spawnAndPublishSession(
       ? { shellReadyTimeoutMs: opts.shellReadyTimeoutMs }
       : {})
   })
-  recoverCreated = () =>
-    shutdownOwnedTerminalProcess({
-      pid: session.pid,
-      isAlive: () => session.isAlive,
-      terminateOwnedTree: () => session.terminateOwnedTree(),
-      close: async () => {
-        await session.forceKillAndWaitForExit()
-        session.dispose()
-      }
-    })
-  opts.onPhysicalOwner?.(session.physicalCompletion, () => session.exitCode)
+  physical.useRecovery(recoverUnpublishedTerminalSession(session))
+  opts.onPhysicalOwner?.(session.physicalCompletion, terminalSessionExitCode(session))
   recordSessionSpawnPaneKey(session, opts.env?.ORCA_PANE_KEY)
 
   try {
     trackSessionInput(session, subprocess, deps.reportReadinessEvent)
   } catch (error) {
-    void session.physicalCompletion.then(() => session.dispose())
+    void session.physicalCompletion.then(session.dispose.bind(session))
     throw error
   }
 
@@ -240,18 +193,18 @@ export async function spawnAndPublishSession(
     // Diagnostics must never turn a live PTY into a failed create.
   }
   if (startupCommandWritten && opts.command) {
-    staging = stageStartupCommand({
+    staging.current = stageStartupCommand({
       command: opts.command,
       shellPath: subprocess.shellPath,
       orcaBuiltLine: opts.launchAgent !== undefined
     })
-    const notice = startupStagingFailureNotice(staging)
+    const notice = startupStagingFailureNotice(staging.current)
     if (notice) {
       session.startupIngress.accept(notice)
       try {
         deps.reportReadinessEvent?.('startup-command-stage-failed', {
           sessionId: opts.sessionId,
-          reason: staging.failure
+          reason: staging.current.failure
         })
       } catch {
         // Diagnostics must never turn a live PTY into a failed create.
@@ -259,7 +212,7 @@ export async function spawnAndPublishSession(
     }
     // Why: only Orca-wrapped shells advertise the paste-safe startup barrier.
     session.writeStartupCommand(
-      buildStartupCommandSubmission(staging.command, {
+      buildStartupCommandSubmission(staging.current.command, {
         bracketedPasteSafe: shellReadySupported
       })
     )
diff --git a/src/main/daemon/terminal-host-spawn-input-retention.test.ts b/src/main/daemon/terminal-host-spawn-input-retention.test.ts
index 4738380c773c..4b499dd25436 100644
--- a/src/main/daemon/terminal-host-spawn-input-retention.test.ts
+++ b/src/main/daemon/terminal-host-spawn-input-retention.test.ts
@@ -2,6 +2,8 @@ import { describe, expect, it, vi } from 'vitest'
 import type { SubprocessHandle } from './session-subprocess-handle'
 import type { InternalCreateOrAttachOptions } from './terminal-host-agent-session-claim'
 import { TerminalHost } from './terminal-host'
+import { TerminalSpawnGate } from './terminal-spawn-gate'
+import type { PtyCreationDisposition } from '../../shared/claimed-agent-pty-owner'
 
 import './mock-descendant-sweep'
 
@@ -45,12 +47,17 @@ function subprocess() {
 
 const streamClient = { onData() {}, onExit() {} }
 
-function startWithInputs(host: TerminalHost, sessionId: string) {
+function startWithInputs(
+  host: TerminalHost,
+  sessionId: string,
+  onCreationDisposition?: InternalCreateOrAttachOptions['onCreationDisposition']
+) {
   const controller = new AbortController()
   const env = { RETENTION_FIXTURE: 'x'.repeat(1024) }
   const historySeedChunks = ['retention-seed\r\n']
   const options: InternalCreateOrAttachOptions = {
     sessionId,
+    ...(onCreationDisposition ? { onCreationDisposition } : {}),
     cols: 80,
     rows: 24,
     env,
@@ -208,3 +215,80 @@ describe('TerminalHost completed spawn inputs', () => {
     }
   })
 })
+
+it('collects completed inputs while unpublished physical work still owns recovery, capacity and same-ID exclusion', async () => {
+  const handle = {
+    ...subprocess(),
+    forceKill: vi.fn(() => {}),
+    onInputClosed() {
+      throw new Error('input-observer-install-failed')
+    }
+  }
+  let spawns = 0
+  const spawn = async () => (++spawns === 1 ? handle : subprocess())
+  const spawnGate = new TerminalSpawnGate({ log: () => {} })
+  const host = new TerminalHost({ spawnSubprocess: spawn, spawnGate })
+  const retained: { disposition?: PtyCreationDisposition } = {}
+  const refs = await observeUnpublishedFailure(host, retained)
+  try {
+    expect(retained.disposition?.kind).toBe('physical')
+    expect(host.listSessions()).toEqual([])
+    expect(spawnGate.snapshot().terminals).toBe(1)
+    await collect()
+    expect(refs.map((ref) => ref.deref() === undefined)).toEqual(Array(4).fill(true))
+    const canceled = new AbortController()
+    const blocked = host.createOrAttach({
+      sessionId: 'unpublished-retained',
+      cols: 80,
+      rows: 24,
+      streamClient,
+      cancelSignal: canceled.signal,
+      isCanceled: () => canceled.signal.aborted
+    })
+    const rejected = expect(blocked).rejects.toThrow('canceled')
+    canceled.abort()
+    await rejected
+    expect(spawns).toBe(1)
+    expect(spawnGate.snapshot().terminals).toBe(1)
+    const recovered =
+      retained.disposition?.kind !== 'no-fork' ? retained.disposition?.recover?.() : undefined
+    handle.emitExit(7)
+    await recovered
+    if (retained.disposition?.kind !== 'physical') {
+      throw new Error('missing physical owner')
+    }
+    await retained.disposition.completion
+    expect(retained.disposition.exitCode()).toBe(7)
+    await new Promise<void>((resolve) => setImmediate(resolve))
+    expect(spawnGate.snapshot().terminals).toBe(0)
+    expect(
+      (
+        await host.createOrAttach({
+          sessionId: 'unpublished-retained',
+          cols: 80,
+          rows: 24,
+          streamClient
+        })
+      ).isNew
+    ).toBe(true)
+    expect(spawns).toBe(2)
+  } finally {
+    handle.emitExit(7)
+    await host.dispose()
+  }
+})
+
+async function observeUnpublishedFailure(
+  host: TerminalHost,
+  retained: { disposition?: PtyCreationDisposition }
+): Promise<WeakRef<object>[]> {
+  const created = startWithInputs(host, 'unpublished-retained', (disposition) => {
+    retained.disposition = disposition
+  })
+  const failure = await created.creation.then(
+    () => 'unexpected-success',
+    (error: unknown) => (error instanceof Error ? error.message : 'unexpected-error')
+  )
+  expect(failure).toBe('input-observer-install-failed')
+  return created.refs
+}
diff --git a/src/main/daemon/terminal-host.ts b/src/main/daemon/terminal-host.ts
index db3627ea5476..3446a7b127da 100644
--- a/src/main/daemon/terminal-host.ts
+++ b/src/main/daemon/terminal-host.ts
@@ -1,4 +1,11 @@
-import { TerminalCreationWork, type PendingTerminalCreation } from './terminal-creation-work'
+import { terminalSessionExitCode } from './terminal-host-returned-process'
+import {
+  reconcileUnpublishedTerminalCreation,
+  registerPendingTerminalCreation,
+  recoverUnpublishedTerminalCreation,
+  TerminalCreationWork,
+  type PendingTerminalCreation
+} from './terminal-creation-work'
 import { beginTerminalHostFencedTermination } from './terminal-host-fenced-termination'
 import type { PtyFencedTerminationRequest } from '../../shared/pty-fenced-termination'
 import type { Session } from './session'
@@ -67,14 +74,11 @@ export class TerminalHost extends TerminalHostInspection {
 
   async createOrAttach(opts: InternalCreateOrAttachOptions): Promise<CreateOrAttachResult> {
     const creation = new TerminalCreationWork()
-    const original = opts
+    const reportDisposition = opts.onCreationDisposition
     opts = {
       ...opts,
       creationWork: creation,
-      onPhysicalOwner: (completion, exitCode) => {
-        creation.owner(completion, exitCode)
-        original.onPhysicalOwner?.(completion, exitCode)
-      }
+      onPhysicalOwner: creation.physicalObserver(opts.onPhysicalOwner)
     }
     try {
       this.assertCreateOrAttachAllowed(opts)
@@ -95,19 +99,11 @@ export class TerminalHost extends TerminalHostInspection {
       this.assertCreateOrAttachAllowed(opts)
 
       this.sessions.get(opts.sessionId)?.noteUse()
-      let settleCreation: () => void = () => {}
-      const pending: PendingTerminalCreation = {
-        completion: new Promise<void>((resolve) => {
-          settleCreation = resolve
-        }),
-        recover: async () => {
-          const disposition = await creation.completion
-          if (disposition.kind !== 'no-fork') {
-            await disposition.recover?.()
-          }
-        }
-      }
-      this.pendingCreations.set(opts.sessionId, pending)
+      const finishPending = registerPendingTerminalCreation(
+        this.pendingCreations,
+        opts.sessionId,
+        creation
+      )
       let published = false
       try {
         const result = await createOrAttachClaimedAgentSession({
@@ -123,7 +119,7 @@ export class TerminalHost extends TerminalHostInspection {
               Boolean(session?.isAlive && !session.isTerminating)
             )
             if (live && session) {
-              creation.owner(session.physicalCompletion, () => session.exitCode)
+              creation.owner(session.physicalCompletion, terminalSessionExitCode(session))
             }
             return live
           },
@@ -152,38 +148,15 @@ export class TerminalHost extends TerminalHostInspection {
         published = true
         return result
       } finally {
-        const finish = () => {
-          if (this.pendingCreations.get(opts.sessionId) === pending) {
-            this.pendingCreations.delete(opts.sessionId)
-          }
-          settleCreation()
-        }
-        if (published || this.sessions.has(opts.sessionId)) {
-          finish()
-        } else {
-          void creation.completion.then(async (disposition) => {
-            if (disposition.kind === 'unknown') {
-              return
-            }
-            if (disposition.kind === 'physical' || disposition.kind === 'failed') {
-              await disposition.completion
-            }
-            finish()
-          })
-        }
+        finishPending(published || this.sessions.has(opts.sessionId))
       }
     } finally {
-      await creation.finish(async (release) => {
-        // Registered Sessions retain their ordinary current/use-fenced close authority.
-        if (!this.sessions.has(opts.sessionId)) {
-          await release()
-        }
-      })
+      await creation.finish(reconcileUnpublishedTerminalCreation(this.sessions, opts.sessionId))
       const disposition = await creation.completion
-      original.onCreationDisposition?.(disposition)
+      reportDisposition?.(disposition)
       if (!this.sessions.has(opts.sessionId) && disposition.kind !== 'no-fork') {
         // Failed unpublished resources keep the same ordinary cleanup owner across Retry/disposal.
-        void disposition.recover?.().catch(() => {})
+        recoverUnpublishedTerminalCreation(disposition)
       }
     }
   }
diff --git a/src/main/daemon/terminal-spawn-gate.test.ts b/src/main/daemon/terminal-spawn-gate.test.ts
index 3da9de6af159..f77c331746b2 100644
--- a/src/main/daemon/terminal-spawn-gate.test.ts
+++ b/src/main/daemon/terminal-spawn-gate.test.ts
@@ -153,7 +153,8 @@ describe('TerminalSpawnGate', () => {
     expect(gate.snapshot()).toMatchObject({ liveAutomatic: 0, inFlight: { interactive: 0 } })
     expect(log).not.toHaveBeenCalled()
 
-    spawnSubprocess.mockImplementationOnce(() => {
+    spawnSubprocess.mockImplementationOnce((options) => {
+      options.onCreationDisposition?.({ kind: 'no-fork' })
       throw new Error('spawn failed')
     })
     await expect(restore('restore-fails')).rejects.toThrow('spawn failed')
@@ -269,7 +270,8 @@ describe('TerminalSpawnGate', () => {
 
     it('frees the slot of a fork that failed', async () => {
       capAt(1)
-      spawnSubprocess.mockImplementationOnce(() => {
+      spawnSubprocess.mockImplementationOnce((options) => {
+        options.onCreationDisposition?.({ kind: 'no-fork' })
         throw new Error('spawn failed')
       })
       await expect(shell('a')).rejects.toThrow('spawn failed')
diff --git a/src/main/ipc/pty-attach-view-joins-main-start.test.ts b/src/main/ipc/pty-attach-view-joins-main-start.test.ts
index ad0e460994a6..d66a4be93664 100644
--- a/src/main/ipc/pty-attach-view-joins-main-start.test.ts
+++ b/src/main/ipc/pty-attach-view-joins-main-start.test.ts
@@ -226,6 +226,7 @@ describe('a window view of a pane main is starting', () => {
       })
     )
     const records: AgentSessionRecordStore = Object.create(AgentSessionRecordStore.prototype)
+    records.getRecord = (sessionId) => (sessionId === chat.sessionId ? chat : null)
     const list = vi.fn(() => [agentSessionConversationView(chat)])
     records.listConversations = list
     records.getVisibleSessionTabIndex = () => ({ present: true, sessionIds: [chat.sessionId] })
diff --git a/src/main/ipc/pty-spawn-saved-resume-admission.test.ts b/src/main/ipc/pty-spawn-saved-resume-admission.test.ts
index 38f91127f080..a328031c3c34 100644
--- a/src/main/ipc/pty-spawn-saved-resume-admission.test.ts
+++ b/src/main/ipc/pty-spawn-saved-resume-admission.test.ts
@@ -77,6 +77,7 @@ describe('a pane restore of a conversation a native chat continues', () => {
         throw new Error('records unavailable')
       }
       const store: AgentSessionRecordStore = Object.create(AgentSessionRecordStore.prototype)
+      store.getRecord = (sessionId) => (sessionId === chat.sessionId ? chat : null)
       store.listConversations = () => [agentSessionConversationView(chat)]
       store.getVisibleSessionTabIndex = () => ({ present: true, sessionIds: openTabs })
       return store
diff --git a/src/main/ipc/pty/pty-ipc-mock-registry.ts b/src/main/ipc/pty/pty-ipc-mock-registry.ts
index a841e2bdbf57..66ea77d16cfa 100644
--- a/src/main/ipc/pty/pty-ipc-mock-registry.ts
+++ b/src/main/ipc/pty/pty-ipc-mock-registry.ts
@@ -2,6 +2,7 @@ import { vi } from 'vitest'
 import type { Mock } from 'vitest'
 import type * as Wsl from '../../wsl'
 import type * as FsPromises from 'node:fs/promises'
+import type { classifyError } from '../../telemetry/classify-error'
 
 // vi.mock hoists per file; shared factories keep every split suite on the same spy instances.
 export const handleMock: Mock = vi.fn()
@@ -34,7 +35,7 @@ export const forgetRefusedPaneResumeMock: Mock = vi.fn()
 export const piBuildPtyEnvMock: Mock = vi.fn()
 export const piClearPtyMock: Mock = vi.fn()
 export const trackMock: Mock = vi.fn()
-export const classifyErrorMock: Mock = vi.fn()
+export const classifyErrorMock = vi.fn<typeof classifyError>(() => ({ error_class: 'unknown' }))
 export const registerPtyMock: Mock = vi.fn()
 export const unregisterPtyMock: Mock = vi.fn()
 export const setMigrationUnsupportedPtyMock: Mock = vi.fn()
@@ -135,6 +136,8 @@ export const mimoHookServiceModuleMock = (): {
 export const noChatsRuntimeMembers = () => ({
   openAgentSessionRecordStore: vi.fn(async () => ({
     listRecords: () => [],
+    listConversations: () => [],
+    getRecord: () => null,
     getVisibleSessionTabIndex: () => ({ present: true, sessionIds: [] })
   }))
 })
diff --git a/src/main/ipc/pty/pty-ipc-suite-environment.ts b/src/main/ipc/pty/pty-ipc-suite-environment.ts
index 80da663b3af3..da89bcbfce5d 100644
--- a/src/main/ipc/pty/pty-ipc-suite-environment.ts
+++ b/src/main/ipc/pty/pty-ipc-suite-environment.ts
@@ -156,7 +156,7 @@ export function createPtyIpcSuiteEnvironment(): PtyIpcSuiteEnvironment {
     wslUncDirectoryExistsAsyncMock.mockReset()
     wslUncDirectoryExistsAsyncMock.mockResolvedValue(null)
     trackMock.mockReset()
-    classifyErrorMock.mockReset()
+    classifyErrorMock.mockReset().mockReturnValue({ error_class: 'unknown' })
     registerPtyMock.mockReset()
     unregisterPtyMock.mockReset()
     setMigrationUnsupportedPtyMock.mockReset()
diff --git a/src/main/ipc/pty/pty-launch-race-parity.test.ts b/src/main/ipc/pty/pty-launch-race-parity.test.ts
index 2ce06d43e68e..a2a8edb1c959 100644
--- a/src/main/ipc/pty/pty-launch-race-parity.test.ts
+++ b/src/main/ipc/pty/pty-launch-race-parity.test.ts
@@ -758,6 +758,7 @@ describe('launch race parity, both spawn lanes', () => {
           })
         )
         const records: AgentSessionRecordStore = Object.create(AgentSessionRecordStore.prototype)
+        records.getRecord = (sessionId) => (sessionId === chat.sessionId ? chat : null)
         records.listConversations = () => [agentSessionConversationView(chat)]
         records.getVisibleSessionTabIndex = () => ({ present: true, sessionIds: [chat.sessionId] })
         const forget = vi.fn(async () => {})
diff --git a/src/main/ipc/pty/spawn-commit-binding.ts b/src/main/ipc/pty/spawn-commit-binding.ts
index 8fc5e217db7d..171386ea7b29 100644
--- a/src/main/ipc/pty/spawn-commit-binding.ts
+++ b/src/main/ipc/pty/spawn-commit-binding.ts
@@ -107,8 +107,8 @@ export async function savePtySpawnPaneBinding(
 
 /** Runs inside the existing durable mutation, after source/topology checks and before any bind. */
 export async function persistFreshPaneBinding(
-  store: Store,
-  binding: PersistPtyBindingArgs,
+  store: Pick<Store, 'persistPtyBinding' | 'getWorkspaceSession'>,
+  input: PersistPtyBindingArgs | (() => PersistPtyBindingArgs),
   connectionId?: string | null,
   absentOwner?: AbsentPaneBinding,
   observeAuthority?: () => void
@@ -117,6 +117,7 @@ export async function persistFreshPaneBinding(
   const hostId = connectionId ? toSshExecutionHostId(connectionId) : undefined
   const persisted = await store.persistPtyBinding(() => {
     observeAuthority?.()
+    const binding = typeof input === 'function' ? input() : input
     const session = store.getWorkspaceSession(hostId)
     const paneKey = makePaneKey(binding.tabId, binding.leafId)
     if (ptyBindingIsRefused(binding, session, binding.worktreeId, paneKey, [])) {
diff --git a/src/main/runtime/agent-session-inventory-scale.test.ts b/src/main/runtime/agent-session-inventory-scale.test.ts
index 2a4b6d6dad8f..cb343c68b311 100644
--- a/src/main/runtime/agent-session-inventory-scale.test.ts
+++ b/src/main/runtime/agent-session-inventory-scale.test.ts
@@ -524,8 +524,8 @@ describe('real conversation inventory work', () => {
       expect(slept.stoppedSessionIds).not.toContain('damaged-chat')
       expect(slept.failures?.some((row) => row.sessionId === 'damaged-chat')).toBe(true)
       expect(work.counts.inventories).toBe(1)
-      // One inventory and six checked observations per selected healthy member.
-      expect(work.counts.views).toBe(n + 1 + 6 * (n / 2 + 1))
+      // One inventory and seven checked observations, including post-revocation membership, per selected healthy member.
+      expect(work.counts.views).toBe(n + 1 + 7 * (n / 2 + 1))
       expect(rig.store.getConversation(rig.rows[1]!.sessionId)?.location.workspaceId).toBe('other')
       work.reset()
       expect(rig.host.knownAgentIds()).toContain('claude')
diff --git a/src/main/runtime/agent-session/ownership/agent-session-reservation-admission.test.ts b/src/main/runtime/agent-session/ownership/agent-session-reservation-admission.test.ts
index c2644c8287bb..6d3c00e3dad3 100644
--- a/src/main/runtime/agent-session/ownership/agent-session-reservation-admission.test.ts
+++ b/src/main/runtime/agent-session/ownership/agent-session-reservation-admission.test.ts
@@ -110,8 +110,8 @@ describe('floating launch directory reservation', () => {
 
 describe('adopted conversation ownership', () => {
   it('refuses when another record already holds the same conversation root', () => {
-    // Compare conversation roots, not exact leaves, or branches could admit two writers onto one conversation.
-    const holder = agentSessionRecordFixture()
+    // Compare conversation roots, not exact leaves, within the same account.
+    const holder = { ...agentSessionRecordFixture(), accountHome: reserveRequest().accountHome }
 
     expect(() =>
       applyAgentSessionReservation(
@@ -122,8 +122,20 @@ describe('adopted conversation ownership', () => {
     ).toThrow('agent_session_conflict')
   })
 
-  it('admits an adoption of a conversation no record holds', () => {
+  it('admits the same conversation root in a distinct account', () => {
     const holder = agentSessionRecordFixture()
+    expect(holder.accountHome).not.toEqual(reserveRequest().accountHome)
+    expect(() =>
+      applyAgentSessionReservation(
+        storeState([holder]),
+        reserveRequest({ adoptedHandleLink: adoptedLink() }),
+        LEASE_TTL_MS
+      )
+    ).not.toThrow()
+  })
+
+  it('admits an adoption of a conversation no record holds', () => {
+    const holder = { ...agentSessionRecordFixture(), accountHome: reserveRequest().accountHome }
 
     expect(() =>
       applyAgentSessionReservation(
@@ -142,6 +154,7 @@ describe('adopted conversation ownership', () => {
     const fixture = agentSessionRecordFixture()
     const holder: AgentSessionRecord = {
       ...fixture,
+      accountHome: reserveRequest().accountHome,
       providerHandleChain: [
         ...fixture.providerHandleChain,
         adoptedLink({
diff --git a/src/main/runtime/cli-terminal-create-host-session-binding.test.ts b/src/main/runtime/cli-terminal-create-host-session-binding.test.ts
index daf302469b1b..6531bd5aa47f 100644
--- a/src/main/runtime/cli-terminal-create-host-session-binding.test.ts
+++ b/src/main/runtime/cli-terminal-create-host-session-binding.test.ts
@@ -355,6 +355,27 @@ it.each(['refused', 'adopted', 'stable-adopted', 'ensure-adopted', 'fresh-unavai
   }
 )
 
+it('does not fill missing unavailable launch facts from the rejected request', async () => {
+  const { runtime, spawn } = createRuntimeWithAttachedWindow()
+  spawn.mockResolvedValue({ id: 'effective-pty', agentResumeUnavailable: true })
+  const result = await runtime.createTerminal('id:repo-1::/tmp/wt-cli', {
+    launchAgent: 'claude',
+    title: 'Rejected C',
+    resumeOrigin: 'saved',
+    resumeProviderSession: { key: 'session_id', id: 'C' },
+    launchConfig: { agentCommand: 'claude', agentArgs: '', agentEnv: {} }
+  })
+  expect(result).toMatchObject({
+    ptyId: 'effective-pty',
+    title: 'Rejected C',
+    agentResumeUnavailable: true
+  })
+  expect(result.launchAgent).toBeUndefined()
+  expect(result.launchConfig).toBeUndefined()
+  expect(result.launchToken).toBeUndefined()
+  expect(spawn).toHaveBeenCalledOnce()
+})
+
 it.each(['unchanged', 'hook', 'config', 'incarnation', 'handle'] as const)(
   'samples the actual created PTY after snapshot awaits and revalidates %s on reconnect',
   async (change) => {
diff --git a/src/main/runtime/orca-runtime-report-pty-spawn-commit.ts b/src/main/runtime/orca-runtime-report-pty-spawn-commit.ts
index b0aa9a6a3dca..3ef23174150b 100644
--- a/src/main/runtime/orca-runtime-report-pty-spawn-commit.ts
+++ b/src/main/runtime/orca-runtime-report-pty-spawn-commit.ts
@@ -1,3 +1,5 @@
+import type { TerminalCreateOptions } from './runtime-terminal-contracts'
+
 export function createIdempotentCallback(callback?: () => void): () => void {
   let reported = false
   return () => {
@@ -8,3 +10,16 @@ export function createIdempotentCallback(callback?: () => void): () => void {
     callback?.()
   }
 }
+
+/** Observe the admitted dispatch using the identity and effective recipe sent to spawn. */
+export function reportTerminalSpawnDispatched(
+  opts: TerminalCreateOptions,
+  launch: () => NonNullable<
+    Parameters<NonNullable<TerminalCreateOptions['onPtySpawnDispatched']>>[0]
+  >
+): () => void {
+  return () => {
+    opts.beforePtySpawn?.()
+    opts.onPtySpawnDispatched?.(launch())
+  }
+}
diff --git a/src/main/runtime/qoder-mobile-resume-adoption-scaling.test.ts b/src/main/runtime/qoder-mobile-resume-adoption-scaling.test.ts
new file mode 100644
index 000000000000..2da739784dcb
--- /dev/null
+++ b/src/main/runtime/qoder-mobile-resume-adoption-scaling.test.ts
@@ -0,0 +1,158 @@
+import './rpc/unused-default-rpc-methods.test-fixture'
+import { expect, it, vi } from 'vitest'
+import type { OwnedMobileTerminalCreateOptions } from './terminal/launch/mobile-terminal-create'
+
+await import('./orca-runtime-test-mocks.spec')
+await import('./orca-runtime-test-lifecycle.spec')
+const { OrcaRuntimeService } = await import('./orca-runtime-test-mocks.spec')
+
+type SpawnPane = { worktreeId?: string; tabId?: string; leafId?: string }
+
+class QoderScaleRuntime extends OrcaRuntimeService {
+  createOwned(worktreeId: string, opts: OwnedMobileTerminalCreateOptions) {
+    return this.createRuntimeOwnedMobileSessionTerminal(worktreeId, false, undefined, opts)
+  }
+}
+
+it('bounds lost-reply persisted-surface reconciliation at N/10N without replaying the create', async () => {
+  const { fixture } =
+    await import('../persistence/loading-store/profile-state-delayed-authority-fixture')
+  const samples: { n: number; tabReads: number; bindingReads: number }[] = []
+  for (const n of [10, 100]) {
+    const { store: durable } = await fixture()
+    const worktreeId = 'repo-local::/fixture/local'
+    const runtime = new QoderScaleRuntime(durable)
+    Object.assign(runtime, {
+      resolveTerminalWorkspaceLaunchScope: async () => ({
+        id: worktreeId,
+        path: '/fixture/local',
+        connectionId: null,
+        repo: null,
+        folderWorkspace: null
+      })
+    })
+    runtime.syncWindowGraph(0, { tabs: [], leaves: [] })
+    const request = {
+      command: 'qodercli --resume original',
+      launchAgent: 'qoder' as const,
+      launchConfig: { agentCommand: 'qodercli', agentArgs: '--original' },
+      createMutation: { clientIdentity: 'scale-phone', id: 'scale-operation' }
+    }
+    const inventory: {
+      id: string
+      worktreeId: string
+      terminalHandle: string
+      cwd: string
+      title: string
+    }[] = []
+    const spawn = vi.fn(async (args: SpawnPane & { preAllocatedHandle?: string }) => {
+      if (!args.preAllocatedHandle) {
+        throw new Error('missing actual handle')
+      }
+      inventory.push({
+        id: 'scale-live',
+        worktreeId,
+        terminalHandle: args.preAllocatedHandle,
+        cwd: '/fixture/local',
+        title: 'Qoder'
+      })
+      throw new Error('lost-spawn-reply')
+    })
+    const kill = vi.fn()
+    runtime.setPtyController({
+      spawn,
+      kill,
+      write: () => true,
+      getForegroundProcess: async () => null,
+      listProcesses: async () => inventory
+    })
+    await expect(runtime.createOwned(worktreeId, request)).rejects.toThrow('lost-spawn-reply')
+    let current = { tabId: '', leafId: '' }
+    for (let index = 0; index < n; index++) {
+      current = {
+        tabId: `11111111-1111-4111-8111-${String(index).padStart(12, '0')}`,
+        leafId: `22222222-2222-4222-8222-${String(index).padStart(12, '0')}`
+      }
+      await durable.admitTerminalPane({
+        type: 'createTerminalTab',
+        workspace: worktreeId,
+        ...current
+      })
+      await durable.persistPtyBinding({
+        worktreeId,
+        ...current,
+        ptyId: index === n - 1 ? 'scale-live' : `unrelated-${index}`
+      })
+    }
+    let measuring = true
+    let tabReads = 0
+    let bindingReads = 0
+    const observedTabs = new WeakSet<object>()
+    const observedBindings = new WeakSet<object>()
+    const read = runtime.getWorkspaceSessionForWorktree.bind(runtime)
+    const observer = vi
+      .spyOn(runtime, 'getWorkspaceSessionForWorktree')
+      .mockImplementation((id) => {
+        const session = read(id)
+        measuring = false
+        for (const tab of session?.tabsByWorktree[worktreeId] ?? []) {
+          if (!observedTabs.has(tab)) {
+            observedTabs.add(tab)
+            const value = tab.id
+            Object.defineProperty(tab, 'id', {
+              configurable: true,
+              enumerable: true,
+              get: () => {
+                if (measuring) {
+                  tabReads++
+                }
+                return value
+              }
+            })
+          }
+          const bindings = session?.terminalLayoutsByTabId[tab.id]?.ptyIdsByLeafId
+          if (bindings && !observedBindings.has(bindings)) {
+            observedBindings.add(bindings)
+            for (const [leafId, value] of Object.entries(bindings)) {
+              Object.defineProperty(bindings, leafId, {
+                configurable: true,
+                enumerable: true,
+                get: () => {
+                  if (measuring) {
+                    bindingReads++
+                  }
+                  return value
+                }
+              })
+            }
+          }
+        }
+        measuring = true
+        return session
+      })
+    try {
+      const result = await runtime.createOwned(worktreeId, {
+        ...request,
+        identity: { tabId: 'unrelated-retry', leafId: '99999999-9999-4999-8999-999999999999' }
+      })
+      expect(result.tab).toMatchObject({
+        parentTabId: current.tabId,
+        leafId: current.leafId,
+        ptyId: 'scale-live'
+      })
+      expect(result.tab.parentTabId).not.toBe(spawn.mock.calls[0][0].tabId)
+      expect(spawn).toHaveBeenCalledOnce()
+      expect(kill).not.toHaveBeenCalled()
+      samples.push({ n, tabReads, bindingReads })
+    } finally {
+      observer.mockRestore()
+    }
+  }
+  for (const sample of samples) {
+    expect(sample.bindingReads).toBeGreaterThanOrEqual(2 * sample.n)
+    expect(sample.bindingReads).toBeLessThanOrEqual(2 * sample.n + 5)
+    expect(sample.tabReads).toBeLessThanOrEqual(7 * sample.n + 9)
+  }
+  expect(samples[1].bindingReads).toBeLessThanOrEqual(10 * samples[0].bindingReads)
+  expect(samples[1].tabReads).toBeLessThanOrEqual(10 * samples[0].tabReads)
+})
diff --git a/src/main/runtime/qoder-mobile-resume-adoption.test.ts b/src/main/runtime/qoder-mobile-resume-adoption.test.ts
index 45afe0247c7d..9cfb275d0f1c 100644
--- a/src/main/runtime/qoder-mobile-resume-adoption.test.ts
+++ b/src/main/runtime/qoder-mobile-resume-adoption.test.ts
@@ -1,5 +1,6 @@
 import './rpc/unused-default-rpc-methods.test-fixture'
 import { expect, it, vi } from 'vitest'
+import type { OwnedMobileTerminalCreateOptions } from './terminal/launch/mobile-terminal-create'
 import type { SleepingAgentLaunchConfig } from '../../shared/agent-session-resume'
 import { buildAgentResumeStartupPlan } from '../../shared/tui-agent-startup'
 
@@ -14,6 +15,10 @@ const { bindPaneFirst, committingSpawn, registerBoundPty } =
 type SpawnPane = { worktreeId?: string; tabId?: string; leafId?: string }
 
 class QoderAdoptionRuntime extends OrcaRuntimeService {
+  createOwned(worktreeId: string, opts: OwnedMobileTerminalCreateOptions) {
+    return this.createRuntimeOwnedMobileSessionTerminal(worktreeId, false, undefined, opts)
+  }
+
   retainedRecipe(ptyId: string, worktreeId: string) {
     return this.recordPtyWorktree(ptyId, worktreeId)
   }
@@ -192,6 +197,7 @@ it.each([
         ).rejects.toThrow('runtime_unavailable')
         inventoryUnavailable = false
       }
+      let retryError: unknown
       const retryPromise = runtime
         .createMobileSessionTerminal(`id:${TEST_WORKTREE_ID}`, {
           ...resume,
@@ -200,7 +206,10 @@ it.each([
             : {}),
           signal: connection.signal
         })
-        .catch(() => null)
+        .catch((error: unknown) => {
+          retryError = error
+          return null
+        })
       await vi.advanceTimersByTimeAsync(10_001)
       const retry = await retryPromise
       expect(acceptedCommands).toHaveLength(1)
@@ -209,7 +218,10 @@ it.each([
           ? "qoder '--resume' 'same-qoder-session'"
           : "qoder '--captured-option' '--resume' 'same-qoder-session'"
       )
-      expect(retry?.tab).toMatchObject({ ptyId: 'qoder-live-resume', launchAgent: 'qoder' })
+      expect(
+        retry?.tab,
+        retryError instanceof Error ? retryError.message : undefined
+      ).toMatchObject({ ptyId: 'qoder-live-resume', launchAgent: 'qoder' })
       expect(spawn).toHaveBeenCalledTimes(1)
       expect(send).not.toHaveBeenCalled()
       if (!retry) {
@@ -468,3 +480,241 @@ it('releases abandoned dispatch capacity without guessing an expired live recipe
     vi.useRealTimers()
   }
 }, 30_000)
+
+it('recovers an unhinted allocated pane across a lost reply and a publication error, ignoring the retry pair', async () => {
+  const { TEST_WORKTREE_ID } = await import('./orca-runtime-test-fixtures.spec')
+  const runtime = new QoderAdoptionRuntime({ ...store })
+  runtime.syncWindowGraph(0, { tabs: [], leaves: [] })
+  const request = {
+    command: 'qodercli --resume original',
+    launchAgent: 'qoder' as const,
+    launchConfig: { agentCommand: 'qodercli', agentArgs: '--original' },
+    createMutation: { clientIdentity: 'unhinted-phone', id: 'unhinted-operation' }
+  }
+  const inventory: {
+    id: string
+    worktreeId: string
+    terminalHandle: string
+    cwd: string
+    title: string
+  }[] = []
+  let allocated: { tabId: string; leafId: string } | undefined
+  const spawn = vi.fn(async (args: SpawnPane & { preAllocatedHandle?: string }) => {
+    if (!args.tabId || !args.leafId || !args.preAllocatedHandle) {
+      throw new Error('missing actual allocation')
+    }
+    allocated = { tabId: args.tabId, leafId: args.leafId }
+    inventory.push({
+      id: 'unhinted-live',
+      worktreeId: TEST_WORKTREE_ID,
+      terminalHandle: args.preAllocatedHandle,
+      cwd: TEST_WORKTREE_PATH,
+      title: 'Qoder'
+    })
+    throw new Error('lost-spawn-reply')
+  })
+  const kill = vi.fn()
+  runtime.setPtyController({
+    spawn,
+    kill,
+    write: () => true,
+    getForegroundProcess: async () => null,
+    listProcesses: async () => inventory
+  })
+  await expect(runtime.createOwned(TEST_WORKTREE_ID, request)).rejects.toThrow('lost-spawn-reply')
+  expect(allocated).toBeDefined()
+  await expect(
+    runtime.createOwned(TEST_WORKTREE_ID, { ...request, launchAgent: 'codex' })
+  ).rejects.toThrow('terminal_create_identity_conflict')
+  expect(runtime.retainedRecipe('unhinted-live', TEST_WORKTREE_ID).runtimeSessionOwned).toBe(false)
+  const retry = {
+    ...request,
+    identity: { tabId: 'retry-tab', leafId: '99999999-9999-4999-8999-999999999999' }
+  }
+  const unsubscribe = runtime.onMobileSessionTabsChanged(() => {
+    throw new Error('publication-observer-failed')
+  })
+  try {
+    await expect(runtime.createOwned(TEST_WORKTREE_ID, retry)).rejects.toThrow(
+      'publication-observer-failed'
+    )
+    expect(runtime['ownedMobileDispatchRecipes'].size).toBe(1)
+  } finally {
+    unsubscribe()
+  }
+  const result = await runtime.createOwned(TEST_WORKTREE_ID, retry)
+  expect(result.tab).toMatchObject({
+    parentTabId: allocated?.tabId,
+    leafId: allocated?.leafId,
+    ptyId: 'unhinted-live',
+    launchAgent: 'qoder',
+    status: 'ready'
+  })
+  expect(result.tab.parentTabId).not.toBe(retry.identity.tabId)
+  expect(runtime.resolveTerminalPane(`${result.tab.parentTabId}:${result.tab.leafId}`).ptyId).toBe(
+    'unhinted-live'
+  )
+  expect(runtime['ownedMobileDispatchRecipes'].size).toBe(0)
+  expect(spawn).toHaveBeenCalledOnce()
+  expect(kill).not.toHaveBeenCalled()
+})
+
+it.each(['moved', 'closed', 'replaced'] as const)(
+  'retains ordinary %s authority while inventory reconciliation waits',
+  async (change) => {
+    const { fixture } =
+      await import('../persistence/loading-store/profile-state-delayed-authority-fixture')
+    const { store: durable } = await fixture()
+    const worktreeId = 'repo-local::/fixture/local'
+    const runtime = new QoderAdoptionRuntime(durable)
+    Object.assign(runtime, {
+      resolveTerminalWorkspaceLaunchScope: async () => ({
+        id: worktreeId,
+        path: '/fixture/local',
+        connectionId: null,
+        repo: null,
+        folderWorkspace: null
+      })
+    })
+    runtime.syncWindowGraph(0, { tabs: [], leaves: [] })
+    const request = {
+      command: 'qodercli --resume original',
+      launchAgent: 'qoder' as const,
+      launchConfig: { agentCommand: 'qodercli', agentArgs: '--original' },
+      keepPaneOnStartFailure: true as const,
+      createMutation: { clientIdentity: 'authority-phone', id: 'authority-operation' },
+      identity: {
+        tabId: '11111111-1111-4111-8111-111111111111',
+        leafId: '22222222-2222-4222-8222-222222222222'
+      }
+    }
+    const incarnationId = '33333333-3333-4333-8333-333333333333'
+    const inventory: {
+      id: string
+      worktreeId: string
+      terminalHandle: string
+      cwd: string
+      title: string
+      incarnationId: string
+    }[] = []
+    const spawn = vi.fn(async (args: SpawnPane & { preAllocatedHandle?: string }) => {
+      if (!args.preAllocatedHandle) {
+        throw new Error('missing actual handle')
+      }
+      inventory.push({
+        id: 'original-live',
+        worktreeId,
+        terminalHandle: args.preAllocatedHandle,
+        cwd: '/fixture/local',
+        title: 'Qoder',
+        incarnationId
+      })
+      throw new Error('lost-spawn-reply')
+    })
+    const entered = Promise.withResolvers<void>()
+    const release = Promise.withResolvers<void>()
+    let hold = false
+    const kill = vi.fn()
+    runtime.setPtyController({
+      spawn,
+      kill,
+      write: () => true,
+      getForegroundProcess: async () => null,
+      listProcesses: async () => {
+        if (hold) {
+          entered.resolve()
+          await release.promise
+        }
+        return inventory
+      }
+    })
+    await expect(runtime.createOwned(worktreeId, request)).rejects.toThrow('lost-spawn-reply')
+    await durable.persistPtyBinding({
+      worktreeId,
+      ...request.identity,
+      ptyId: 'original-live',
+      incarnationId
+    })
+    runtime.registerPty('original-live', worktreeId, null, {
+      ...request.identity,
+      terminalHandle: inventory[0].terminalHandle,
+      incarnationId
+    })
+    hold = true
+    const retry = runtime.createOwned(worktreeId, {
+      ...request,
+      identity: {
+        tabId: 'unrelated-retry',
+        leafId: '99999999-9999-4999-8999-999999999999'
+      }
+    })
+    const observed = retry.then(
+      (value) => ({ value, error: null }),
+      (error: unknown) => ({ value: null, error })
+    )
+    await entered.promise
+    let movedTabId: string | undefined
+    try {
+      if (change === 'closed') {
+        await runtime.closeTerminalSurfaceFromRenderer({
+          worktreeId,
+          target: { kind: 'tab', tabId: request.identity.tabId },
+          reason: 'user'
+        })
+      } else {
+        expect(
+          await durable.persistPtyBinding({
+            worktreeId,
+            ...request.identity,
+            ptyId: change === 'replaced' ? 'successor-live' : 'original-live',
+            incarnationId
+          })
+        ).toBe(true)
+        if (change === 'moved') {
+          const moved = await durable.moveTerminalLeafToNewTab({
+            worktreeId,
+            sourceTabId: request.identity.tabId,
+            targetTabId: '44444444-4444-4444-8444-444444444444',
+            leafId: request.identity.leafId,
+            ptyId: 'original-live'
+          })
+          expect(moved.status).toBe('moved')
+          movedTabId =
+            moved.status === 'moved'
+              ? (moved.tabId ?? '44444444-4444-4444-8444-444444444444')
+              : undefined
+        }
+      }
+    } finally {
+      release.resolve()
+    }
+    const outcome = await observed
+    const session = durable.getWorkspaceSession()
+    if (change === 'moved') {
+      expect(outcome.error).toBeNull()
+      expect(outcome.value?.tab).toMatchObject({
+        parentTabId: movedTabId,
+        leafId: request.identity.leafId,
+        ptyId: 'original-live'
+      })
+      expect(
+        session.terminalLayoutsByTabId[request.identity.tabId]?.ptyIdsByLeafId?.[
+          request.identity.leafId
+        ]
+      ).not.toBe('original-live')
+    } else {
+      expect(outcome.error).toBeInstanceOf(Error)
+      expect(outcome.value).toBeNull()
+      expect(
+        session.terminalLayoutsByTabId[request.identity.tabId]?.ptyIdsByLeafId?.[
+          request.identity.leafId
+        ]
+      ).toBe(change === 'replaced' ? 'successor-live' : undefined)
+    }
+    expect(session.tabsByWorktree[worktreeId].some((tab) => tab.id === 'unrelated-retry')).toBe(
+      false
+    )
+    expect(spawn).toHaveBeenCalledOnce()
+    expect(kill).not.toHaveBeenCalled()
+  }
+)
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
index 813c9d09af3c..985693f6c80b 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
@@ -495,14 +495,16 @@ it.each([false, true])(
     const spawn = vi
       .spyOn(runtime, 'createTerminal')
       .mockImplementation(async (_selector, opts = {}) => {
+        if (!opts.tabId || !opts.leafId) {
+          throw new Error('missing ordinary published pane')
+        }
         opts.beforePtySpawn?.()
         opts.onPtySpawnDispatched?.({
+          tabId: opts.tabId,
+          leafId: opts.leafId,
           launchAgent: 'codex',
           ...(opts.launchConfig ? { launchConfig: opts.launchConfig } : {})
         })
-        if (!opts.tabId || !opts.leafId) {
-          throw new Error('missing ordinary published pane')
-        }
         bindPty({
           worktreeId: WORKTREE_ID,
           tabId: opts.tabId,
diff --git a/src/main/runtime/runtime-terminal-contracts.ts b/src/main/runtime/runtime-terminal-contracts.ts
index b8ec96e29fbf..639fd0e621a8 100644
--- a/src/main/runtime/runtime-terminal-contracts.ts
+++ b/src/main/runtime/runtime-terminal-contracts.ts
@@ -114,6 +114,8 @@ export type TerminalCreateOptions = {
   /** Called before the spawn request leaves this process; a throw before it proves nothing spawned. */
   beforePtySpawn?: () => void
   onPtySpawnDispatched?: (launch?: {
+    tabId: string
+    leafId: string
     launchConfig?: SleepingAgentLaunchConfig
     launchAgent?: TuiAgent
   }) => void
diff --git a/src/main/runtime/session-tabs/structured-session-switch-publication.test.ts b/src/main/runtime/session-tabs/structured-session-switch-publication.test.ts
index 1de6a5c81c70..5e228573e3da 100644
--- a/src/main/runtime/session-tabs/structured-session-switch-publication.test.ts
+++ b/src/main/runtime/session-tabs/structured-session-switch-publication.test.ts
@@ -246,8 +246,13 @@ it.each(['none', 'publication', 'spawn'] as const)(
       })
     }
     vi.spyOn(runtime, 'createTerminal').mockImplementation(async (_selector, opts = {}) => {
+      if (!opts.tabId || !opts.leafId) {
+        throw new Error('missing ordinary published identity')
+      }
       opts.beforePtySpawn?.()
       opts.onPtySpawnDispatched?.({
+        tabId: opts.tabId,
+        leafId: opts.leafId,
         launchAgent: 'codex',
         ...(opts.launchConfig ? { launchConfig: opts.launchConfig } : {})
       })
@@ -264,9 +269,6 @@ it.each(['none', 'publication', 'spawn'] as const)(
         entered.resolve()
         await release.promise
       }
-      if (!opts.tabId || !opts.leafId) {
-        throw new Error('missing ordinary published identity')
-      }
       bindPty({
         worktreeId: WORKTREE_ID,
         tabId: opts.tabId,
@@ -404,3 +406,117 @@ it.each(['window', 'main', 'headless'] as const)(
     }
   }
 )
+
+it('settles a random retry placeholder around the original live switch destination without another dispatch', async () => {
+  const { fixture, admitRuntimeSpawnPane } =
+    await import('../../persistence/loading-store/profile-state-delayed-authority-fixture')
+  const { OrcaRuntimeService } = await import('../orca-runtime')
+  const { store } = await fixture()
+  const worktreeId = 'repo-local::/fixture/local'
+  const runtime = new OrcaRuntimeService(store)
+  runtime.syncWindowGraph(0, { tabs: [], leaves: [] })
+  await admitRuntimeSpawnPane(store, { worktreeId, tabId: TAB_ID, leafId: LEAF_A })
+  await store.persistPtyBinding({ worktreeId, tabId: TAB_ID, leafId: LEAF_A, ptyId: PTY_A })
+  runtime.registerPty(PTY_A, worktreeId, null, { tabId: TAB_ID, leafId: LEAF_A })
+  const session = () => store.getWorkspaceSession()
+  Object.assign(runtime, {
+    resolveTerminalWorkspaceLaunchScope: async () => ({
+      id: worktreeId,
+      path: '/fixture/local',
+      connectionId: null,
+      repo: null,
+      folderWorkspace: null
+    })
+  })
+  const inventory: {
+    id: string
+    worktreeId: string
+    terminalHandle: string
+    cwd: string
+    title: string
+  }[] = []
+  let original: { tabId: string; leafId: string } | undefined
+  const spawn = vi.fn(
+    async (args: { tabId?: string; leafId?: string; preAllocatedHandle?: string }) => {
+      if (!args.tabId || !args.leafId || !args.preAllocatedHandle) {
+        throw new Error('missing actual dispatch identity')
+      }
+      original = { tabId: args.tabId, leafId: args.leafId }
+      await store.persistPtyBinding({ worktreeId, ...original, ptyId: 'original-switch-live' })
+      // The lower spawn publication arrives; only its observer reply is lost.
+      runtime.registerPty('original-switch-live', worktreeId, null, {
+        ...original,
+        terminalHandle: args.preAllocatedHandle
+      })
+      inventory.push({
+        id: 'original-switch-live',
+        worktreeId,
+        terminalHandle: args.preAllocatedHandle,
+        cwd: '/fixture/local',
+        title: 'Codex'
+      })
+      throw new Error('lost-successful-reply')
+    }
+  )
+  const kill = vi.fn()
+  runtime.setPtyController({
+    spawn,
+    kill,
+    write: () => true,
+    getForegroundProcess: async () => null,
+    listProcesses: async () => inventory
+  })
+  const publish = vi.spyOn(runtime, 'publishAgentLaunchTabInMainLayout')
+  const verdict = vi.spyOn(runtime, 'reportAgentLaunchPaneVerdict')
+  const request = {
+    command: 'cx',
+    launchAgent: 'codex' as const,
+    clientMutationId: 'same-switch-operation',
+    switchExecution: {
+      invocationId: 'same-switch-invocation',
+      check: () => {},
+      signal: new AbortController().signal,
+      remaining: () => 60_000,
+      viewer: 'none' as const,
+      selectionCurrent: () => true
+    }
+  }
+  await expect(runtime.createMobileSessionTerminal(`id:${worktreeId}`, request)).rejects.toThrow(
+    'lost-successful-reply'
+  )
+  if (!original) {
+    throw new Error('missing accepted original dispatch')
+  }
+  expect(session().terminalLayoutsByTabId[original.tabId]?.ptyIdsByLeafId?.[original.leafId]).toBe(
+    'original-switch-live'
+  )
+  const result = await runtime.createMobileSessionTerminal(`id:${worktreeId}`, request)
+  expect(result.tab).toMatchObject({
+    parentTabId: original?.tabId,
+    leafId: original?.leafId,
+    ptyId: 'original-switch-live',
+    status: 'ready'
+  })
+  expect(publish).toHaveBeenCalledTimes(2)
+  const retryPane = publish.mock.calls[1][0]
+  expect(retryPane.tabId).not.toBe(original?.tabId)
+  await chatTabCommandsSettled()
+  expect(session().tabsByWorktree[worktreeId].some((tab) => tab.id === retryPane.tabId)).toBe(false)
+  expect(session().terminalLayoutsByTabId[original.tabId]?.ptyIdsByLeafId?.[original.leafId]).toBe(
+    'original-switch-live'
+  )
+  expect(session().terminalLayoutsByTabId[TAB_ID]?.ptyIdsByLeafId?.[LEAF_A]).toBe(PTY_A)
+  expect(
+    verdict.mock.calls.some(
+      ([pane, outcome]) => pane.tabId === retryPane.tabId && outcome.kind === 'proceed'
+    )
+  ).toBe(false)
+  expect(verdict).toHaveBeenCalledWith(expect.objectContaining({ tabId: retryPane.tabId }), {
+    kind: 'withdrawn'
+  })
+  expect(runtime.resolveTerminalPane(`${result.tab.parentTabId}:${result.tab.leafId}`).ptyId).toBe(
+    'original-switch-live'
+  )
+  expect(spawn).toHaveBeenCalledOnce()
+  expect(kill).not.toHaveBeenCalled()
+})
diff --git a/src/main/runtime/structured-chat-dispatch-worker-lifecycle.test.ts b/src/main/runtime/structured-chat-dispatch-worker-lifecycle.test.ts
index fa9681ecf87d..92bf9e147176 100644
--- a/src/main/runtime/structured-chat-dispatch-worker-lifecycle.test.ts
+++ b/src/main/runtime/structured-chat-dispatch-worker-lifecycle.test.ts
@@ -234,28 +234,45 @@ describe("a chat assignee's liveness, stop and close", () => {
   })
 })
 
-// An idle reply does not settle an assignment; the same chat/caller must still finish it.
+// Stop ends the provider turn; the same chat/caller still owns its direct assignment.
 it.each(['pending', 'dispatched'] as const)(
-  'keeps %s direct work at rest through switch refusal and original completion',
+  'Stops %s direct work for a switch and resumes the same assignment on the next send',
   async (status) => {
     const { taskId, dispatchId } = await dispatchToChat()
     await clearChat(PEER_CHAT)
     await host.close(PEER_CHAT, 'evict')
     db.db.prepare('UPDATE dispatch_contexts SET status = ? WHERE id = ?').run(status, dispatchId)
+    await startClearedContext(PEER_CHAT)
+    const worker = connectionFor(PEER_CHAT)
+    expect(await sendUserMessage(PEER_CHAT, 'continue original work')).toMatchObject({ ok: true })
+    await vi.waitFor(() => expect(worker.turns).toHaveLength(2), WAIT)
+    worker.handlers.onNotification?.('turn/started', { turn: { id: 'turn-2' } })
+    await host.flushStreamedEvents(PEER_CHAT)
     const before = db.getDispatchContextById(dispatchId)
-    const close = vi.spyOn(host.deps.adapter, 'closeSession')
+    const close = vi.spyOn(host.deps.adapter, 'disposeSession')
     const acquire = vi.spyOn(host.deps.adapter, 'acquire')
-    await expect(host.switchToTerminal(PEER_CHAT)).rejects.toMatchObject({
-      refusal: { details: { reason: 'turnActive' } }
-    })
-    expect(close).not.toHaveBeenCalled()
+    await host.switchToTerminal(PEER_CHAT)
+    expect(worker.methods).toContain('turn/interrupt')
+    expect(close).toHaveBeenCalled()
+    expect(worker.closed).toBe(true)
     expect(acquire).not.toHaveBeenCalled()
+    expect(host.deps.store.getRecord(PEER_CHAT)?.lease.claimStatus).toBe('released')
+    expect((await host.journalSnapshot(PEER_CHAT)).items).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          body: expect.objectContaining({ kind: 'turn', turnId: 'turn-2', state: 'interrupted' })
+        })
+      ])
+    )
     expect(db.getDispatchContextById(dispatchId)).toEqual(before)
     expect(host.deps.store.getVisibleSessionTabIndex().sessionIds).toContain(PEER_CHAT)
     db.db
       .prepare('UPDATE dispatch_contexts SET status = ? WHERE id = ?')
       .run('dispatched', dispatchId)
     await startClearedContext(PEER_CHAT)
+    expect(connectionFor(PEER_CHAT)).not.toBe(worker)
+    expect(acquire).toHaveBeenCalledTimes(1)
+    expect(host.deps.store.getRecord(PEER_CHAT)?.lease.claimStatus).toBe('live')
     await call(
       'orchestration.send',
       { to: WORKER, subject: 'follow up', body: 'finish original work' },
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-create-reconciliation.ts b/src/main/runtime/terminal/launch/mobile-terminal-create-reconciliation.ts
new file mode 100644
index 000000000000..496ad2519b98
--- /dev/null
+++ b/src/main/runtime/terminal/launch/mobile-terminal-create-reconciliation.ts
@@ -0,0 +1,165 @@
+import { OrcaRuntimeWithResolveMobileSessionTerminalCommand } from './mobile-terminal-startup'
+import type {
+  OwnedMobileTerminalCreateOptions,
+  OwnedMobileTerminalDispatchRecipe
+} from './mobile-terminal-create'
+import type { RuntimeTerminalCreate } from '../../../../shared/runtime-types'
+import type { RuntimePtyWorktreeRecord } from '../../runtime-terminal-state-records'
+import { copySleepingAgentLaunchConfig } from '../../runtime-agent-launch-resolution'
+import { parsePaneKey } from '../../../../shared/stable-pane-id'
+import { ptyHoldsRecordedSurface } from '../../pty-recorded-surface-topology'
+import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
+import { persistFreshPaneBinding } from '../../../ipc/pty/spawn-commit-binding'
+
+export abstract class OrcaRuntimeWithReconcileOwnedMobileTerminal extends OrcaRuntimeWithResolveMobileSessionTerminalCommand {
+  protected validateOwnedMobileDispatch(
+    pty: RuntimePtyWorktreeRecord,
+    terminal: RuntimeTerminalCreate,
+    opts: OwnedMobileTerminalCreateOptions,
+    dispatched: OwnedMobileTerminalDispatchRecipe | undefined,
+    connectionId: string | null
+  ): OwnedMobileTerminalDispatchRecipe | undefined {
+    const recipe =
+      dispatched?.connectionId === connectionId &&
+      (!pty.launchAgent || pty.launchAgent === dispatched.launchAgent)
+        ? dispatched
+        : undefined
+    const originalAgent = pty.launchAgent ?? recipe?.launchAgent
+    if (originalAgent && opts.launchAgent && originalAgent !== opts.launchAgent) {
+      throw new Error('terminal_create_identity_conflict')
+    }
+    if (
+      !terminal.agentResumeRefused &&
+      !terminal.agentResumeUnavailable &&
+      opts.launchConfig &&
+      !pty.launchConfig &&
+      !recipe?.launchConfig
+    ) {
+      throw new Error('runtime_unavailable')
+    }
+    if (recipe && !terminal.agentResumeRefused && !terminal.agentResumeUnavailable) {
+      pty.launchAgent ??= recipe.launchAgent ?? null
+      if (!pty.launchConfig && recipe.launchConfig) {
+        pty.launchConfig = copySleepingAgentLaunchConfig(recipe.launchConfig)
+      }
+    }
+    return recipe
+  }
+
+  private currentOwnedMobileSurface(pty: RuntimePtyWorktreeRecord) {
+    const recorded = this.paneOfPty(pty)
+    if (!ORCA_LAYOUT_OWNER_IS_MAIN) {
+      const leaf = this.getLeavesForPty(pty.ptyId).find((row) => row.worktreeId === pty.worktreeId)
+      if (leaf) {
+        return { tabId: leaf.tabId, leafId: leaf.leafId }
+      }
+    }
+    const pane = parsePaneKey(recorded.paneKey ?? '')
+    if (ORCA_LAYOUT_OWNER_IS_MAIN && pane) {
+      return pane
+    }
+    const session = this.getWorkspaceSessionForWorktree(pty.worktreeId)
+    for (const tab of session?.tabsByWorktree[pty.worktreeId] ?? []) {
+      for (const [leafId, id] of Object.entries(
+        session?.terminalLayoutsByTabId[tab.id]?.ptyIdsByLeafId ?? {}
+      )) {
+        if (
+          id === pty.ptyId &&
+          (!pty.incarnationId ||
+            session?.terminalPtyIncarnationsByPaneKey?.[`${tab.id}:${leafId}`] ===
+              pty.incarnationId)
+        ) {
+          return { tabId: tab.id, leafId }
+        }
+      }
+    }
+    if (pane && ptyHoldsRecordedSurface(pty.ptyId, recorded, this.ptySurfaceTopology())) {
+      return pane
+    }
+    if (recorded.tabId || recorded.paneKey) {
+      throw new Error('terminal_handle_stale')
+    }
+    return null
+  }
+
+  protected async reconcileOwnedMobileTerminalSurface(
+    worktreeId: string,
+    connectionId: string | null,
+    terminal: RuntimeTerminalCreate,
+    pty: RuntimePtyWorktreeRecord,
+    recipe: OwnedMobileTerminalDispatchRecipe | undefined
+  ) {
+    const incarnationId = pty.incarnationId
+    const resolve = () => {
+      const live = this.getLivePtyForHandle(terminal.handle)?.pty
+      if (
+        live !== pty ||
+        !pty.connected ||
+        pty.incarnationId !== incarnationId ||
+        pty.worktreeId !== worktreeId ||
+        terminal.worktreeId !== worktreeId ||
+        pty.connectionId !== connectionId ||
+        (terminal.ptyId && terminal.ptyId !== pty.ptyId) ||
+        (terminal.incarnationId && terminal.incarnationId !== incarnationId)
+      ) {
+        throw new Error('terminal_handle_stale')
+      }
+      const current = this.currentOwnedMobileSurface(pty)
+      if (current) {
+        return current
+      }
+      const returned = terminal.tabId && terminal.paneKey ? parsePaneKey(terminal.paneKey) : null
+      if (terminal.tabId && terminal.paneKey && (!returned || returned.tabId !== terminal.tabId)) {
+        throw new Error('terminal_handle_stale')
+      }
+      const candidate = returned ?? recipe
+      if (!candidate) {
+        throw new Error('terminal_handle_stale')
+      }
+      const leaf = this.leaves.get(this.getLeafKey(candidate.tabId, candidate.leafId))
+      if (leaf && (leaf.worktreeId !== worktreeId || (leaf.ptyId && leaf.ptyId !== pty.ptyId))) {
+        throw new Error('terminal_handle_stale')
+      }
+      return { tabId: candidate.tabId, leafId: candidate.leafId }
+    }
+    const store = this.store
+    if (store?.persistPtyBinding && store.getWorkspaceSession) {
+      const { persistPtyBinding, getWorkspaceSession } = store
+      const persisted = await persistFreshPaneBinding(
+        {
+          persistPtyBinding: persistPtyBinding.bind(store),
+          getWorkspaceSession: getWorkspaceSession.bind(store)
+        },
+        () => ({
+          ...resolve(),
+          worktreeId,
+          ptyId: pty.ptyId,
+          ...(incarnationId ? { incarnationId } : {}),
+          mayReviveRetiredSurface: false
+        }),
+        connectionId
+      )
+      if (!persisted) {
+        throw new Error('terminal_handle_stale')
+      }
+    }
+    const surface = resolve()
+    if (
+      ORCA_LAYOUT_OWNER_IS_MAIN &&
+      this.paneOfPty(pty).paneKey !== `${surface.tabId}:${surface.leafId}`
+    ) {
+      throw new Error('terminal_handle_stale')
+    }
+    if (
+      !ORCA_LAYOUT_OWNER_IS_MAIN &&
+      this.paneOfPty(pty).paneKey !== `${surface.tabId}:${surface.leafId}`
+    ) {
+      this.registerPty(pty.ptyId, worktreeId, connectionId, {
+        ...surface,
+        terminalHandle: terminal.handle,
+        ...(incarnationId ? { incarnationId } : {})
+      })
+    }
+    return surface
+  }
+}
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-create.ts b/src/main/runtime/terminal/launch/mobile-terminal-create.ts
index ff445dea0510..7c1e260d52d5 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-create.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-create.ts
@@ -21,6 +21,8 @@ import { seedResumeLaunchIdentity } from '../../../ipc/pty/pane/resume-launch-id
 import type { AgentSessionSwitchAuthority } from '../../../../shared/agent-session-switch-execution'
 
 export type OwnedMobileTerminalDispatchRecipe = {
+  tabId: string
+  leafId: string
   launchConfig?: SleepingAgentLaunchConfig
   launchAgent?: TuiAgent
   connectionId: string | null
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts b/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
index 511e738b1f14..194853995dd2 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
@@ -1,4 +1,4 @@
-import { OrcaRuntimeWithResolveMobileSessionTerminalCommand } from './mobile-terminal-startup'
+import { OrcaRuntimeWithReconcileOwnedMobileTerminal } from './mobile-terminal-create-reconciliation'
 import type {
   RuntimeMobileSessionCreateTerminalResult,
   RuntimeMobileSessionTabsSnapshot,
@@ -12,7 +12,6 @@ import {
 import { randomUUID } from 'node:crypto'
 import { copySleepingAgentLaunchConfig } from '../../runtime-agent-launch-resolution'
 import { deriveRemoteRuntimeTerminalCreateHandle } from '../../remote-runtime-terminal-create-identity'
-import { parsePaneKey } from '../../../../shared/stable-pane-id'
 import {
   placeCreatedSessionTab,
   captureSessionTabPlacement
@@ -27,7 +26,7 @@ import {
 
 export type { OwnedMobileTerminalCreateOptions } from './mobile-terminal-create'
 
-export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal extends OrcaRuntimeWithResolveMobileSessionTerminalCommand {
+export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal extends OrcaRuntimeWithReconcileOwnedMobileTerminal {
   protected abstract getPtyManualTitle(
     ...args: Parameters<PtyTerminalSummaryMethods['getPtyManualTitle']>
   ): ReturnType<PtyTerminalSummaryMethods['getPtyManualTitle']>
@@ -72,6 +71,8 @@ export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal ext
             }
             // Retain original dispatch evidence across an ambiguous response; retry payloads cannot replace it.
             this.ownedMobileDispatchRecipes.set(mutationHandle, {
+              tabId: launch.tabId,
+              leafId: launch.leafId,
               connectionId: workspace.connectionId ?? null,
               recordedAt: Date.now(),
               ...(launch.launchConfig
@@ -125,7 +126,7 @@ export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal ext
     const sourceGroup = beforeCreate?.tabGroups?.find((group) =>
       group.tabOrder.includes(anchorParentId ?? '')
     )
-    const targetGroupId = opts.targetGroupId ?? sourceGroup?.id
+    let targetGroupId = opts.targetGroupId ?? sourceGroup?.id
     const capturedOrder = captureSessionTabPlacement(sourceGroup?.tabOrder ?? [], anchorParentId)
     const capturedTabs = captureSessionTabPlacement(
       beforeCreate?.tabs.map((tab) => tab.id) ?? [],
@@ -147,57 +148,29 @@ export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal ext
     if (!livePty) {
       throw new Error('terminal_handle_stale')
     }
+    const dispatched =
+      mutationHandle === terminal.handle
+        ? this.ownedMobileDispatchRecipes.get(terminal.handle)
+        : undefined
+    const recipe = opts.createMutation
+      ? this.validateOwnedMobileDispatch(
+          livePty.pty,
+          terminal,
+          opts,
+          dispatched,
+          workspace.connectionId ?? null
+        )
+      : undefined
+    const { tabId: parentTabId, leafId } = await this.reconcileOwnedMobileTerminalSurface(
+      worktreeId,
+      workspace.connectionId ?? null,
+      terminal,
+      livePty.pty,
+      recipe
+    )
     if (opts.createMutation) {
-      if (
-        livePty.pty.launchAgent &&
-        opts.launchAgent &&
-        livePty.pty.launchAgent !== opts.launchAgent
-      ) {
-        throw new Error('terminal_create_identity_conflict')
-      }
-      const dispatchedRecipe =
-        mutationHandle === terminal.handle && this.ownedMobileDispatchRecipes.get(terminal.handle)
-      const recipe =
-        dispatchedRecipe &&
-        dispatchedRecipe.connectionId === (workspace.connectionId ?? null) &&
-        (!livePty.pty.launchAgent || livePty.pty.launchAgent === dispatchedRecipe.launchAgent)
-          ? dispatchedRecipe
-          : null
-      if (
-        !terminal.agentResumeRefused &&
-        !terminal.agentResumeUnavailable &&
-        opts.launchConfig &&
-        !livePty.pty.launchConfig &&
-        !recipe?.launchConfig
-      ) {
-        // Missing original dispatch evidence cannot authorize a retry's captured recipe.
-        throw new Error('runtime_unavailable')
-      }
-      if (recipe && !terminal.agentResumeRefused && !terminal.agentResumeUnavailable) {
-        livePty.pty.launchAgent ??= recipe.launchAgent ?? null
-        if (!livePty.pty.launchConfig && recipe.launchConfig) {
-          livePty.pty.launchConfig = copySleepingAgentLaunchConfig(recipe.launchConfig)
-        }
-      }
       livePty.pty.runtimeSessionOwned = true
-      if (mutationHandle) {
-        this.ownedMobileDispatchRecipes.delete(mutationHandle)
-      }
     }
-    if (opts.createMutation && terminal.tabId && terminal.paneKey && terminal.ptyId) {
-      const actual = parsePaneKey(terminal.paneKey)
-      if (!actual || actual.tabId !== terminal.tabId) {
-        throw new Error('terminal_handle_stale')
-      }
-      this.registerPty(terminal.ptyId, worktreeId, workspace.connectionId ?? null, {
-        tabId: terminal.tabId,
-        leafId: actual.leafId,
-        terminalHandle: terminal.handle
-      })
-    }
-    const recorded = this.paneOfPty(livePty.pty)
-    const parentTabId = recorded.tabId ?? `pty:${livePty.pty.ptyId}`
-    const leafId = parsePaneKey(recorded.paneKey ?? '')?.leafId ?? randomUUID()
     const existing = this.mobileSessionTabsByWorktree.get(worktreeId)
     const existingSurface =
       existing?.tabs.find(
@@ -206,6 +179,9 @@ export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal ext
           candidate.parentTabId === parentTabId &&
           candidate.leafId === leafId
       ) ?? null
+    if (existingSurface) {
+      targetGroupId = existing?.tabGroups?.find((group) => group.tabOrder.includes(parentTabId))?.id
+    }
     const parentLayout = buildMaterializedHeadlessParentLayout(
       leafId,
       livePty.pty.ptyId,
@@ -219,15 +195,22 @@ export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal ext
     activate = activate && (opts.switchExecution?.selectionCurrent?.() ?? true)
     const tab: RuntimeMobileSessionTerminalTab = {
       type: 'terminal',
-      ...(opts.switchExecution?.openPlacement
-        ? { openPlacement: { ...opts.switchExecution.openPlacement, activate } }
-        : {}),
+      ...(existingSurface?.openPlacement
+        ? {
+            openPlacement: {
+              ...existingSurface.openPlacement,
+              activate: existingSurface.openPlacement.activate && activate
+            }
+          }
+        : opts.switchExecution?.openPlacement
+          ? { openPlacement: { ...opts.switchExecution.openPlacement, activate } }
+          : {}),
       id: `${parentTabId}::${leafId}`,
       parentTabId,
       leafId,
       ptyId: livePty.pty.ptyId,
       incarnationId: livePty.pty.incarnationId,
-      title: terminal.title ?? livePty.pty.title ?? 'Terminal',
+      title: existingSurface?.title ?? terminal.title ?? livePty.pty.title ?? 'Terminal',
       ...(customTitle !== undefined ? { customTitle } : {}),
       // Omit only a proven root correction; an unverifiable fallback keeps its saved request.
       ...((terminal.savedStartupCwd ?? cwd) && (terminal.savedStartupCwd ?? cwd) !== workspace.path
@@ -238,20 +221,21 @@ export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal ext
         ? { viewMode: opts.viewMode }
         : {}),
       parentLayout,
-      isActive: activate
+      isActive: activate || (existingSurface?.isActive ?? false)
     }
-    const tabs = placeCreatedSessionTab(
-      (existing?.tabs ?? []).map((candidate) => ({
-        ...candidate,
-        ...(candidate.type === 'terminal' && candidate.parentTabId === parentTabId
-          ? { parentLayout }
-          : {}),
-        isActive: activate ? false : candidate.isActive
-      })),
-      tab,
-      afterTabId,
-      { afterParentGroup: opts.supportsSplitGroupPlacement !== false, captured: capturedTabs }
-    )
+    const currentTabs = (existing?.tabs ?? []).map((candidate) => ({
+      ...candidate,
+      ...(candidate.type === 'terminal' && candidate.parentTabId === parentTabId
+        ? { parentLayout }
+        : {}),
+      isActive: activate ? false : candidate.isActive
+    }))
+    const tabs = existingSurface
+      ? currentTabs.map((candidate) => (candidate.id === tab.id ? tab : candidate))
+      : placeCreatedSessionTab(currentTabs, tab, afterTabId, {
+          afterParentGroup: opts.supportsSplitGroupPlacement !== false,
+          captured: capturedTabs
+        })
     const tabGroups = buildHeadlessMobileSessionTabGroups(
       worktreeId,
       tabs,
@@ -259,7 +243,11 @@ export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal ext
       existing?.tabGroups,
       targetGroupId ? { tabId: parentTabId, groupId: targetGroupId } : undefined
     )
-    if (capturedOrder && (!opts.targetGroupId || opts.targetGroupId === sourceGroup?.id)) {
+    if (
+      !existingSurface &&
+      capturedOrder &&
+      (!opts.targetGroupId || opts.targetGroupId === sourceGroup?.id)
+    ) {
       placeHeadlessSessionTabAtCapture(tabGroups, tabs, parentTabId, capturedOrder)
     }
     const next: RuntimeMobileSessionTabsSnapshot = {
@@ -296,6 +284,9 @@ export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal ext
     if (!created || created.type !== 'terminal') {
       throw new Error('terminal_handle_stale')
     }
+    if (recipe && this.ownedMobileDispatchRecipes.get(terminal.handle) === recipe) {
+      this.ownedMobileDispatchRecipes.delete(terminal.handle)
+    }
     return {
       tab: created,
       ...(terminal.switchOutcomeUnknown ? { switchOutcomeUnknown: true as const } : {}),
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-switch-publication.ts b/src/main/runtime/terminal/launch/mobile-terminal-switch-publication.ts
index 75bc4700d719..05a9fee9f65a 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-switch-publication.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-switch-publication.ts
@@ -69,7 +69,7 @@ export async function createPublishedSwitchTerminal(args: {
   }
   const withdrawUnused = async () => {
     if (shown?.created !== true || !running.current() || owner.hasLiveTerminalForPaneKey(paneKey)) {
-      return
+      return false
     }
     const withdrawn = await owner.withdrawAgentLaunchPaneInMainLayout(
       pane,
@@ -80,6 +80,7 @@ export async function createPublishedSwitchTerminal(args: {
     if (withdrawn && running.current()) {
       owner.reportAgentLaunchPaneVerdict(pane, { kind: 'withdrawn' })
     }
+    return withdrawn
   }
   try {
     const request = {
@@ -120,9 +121,34 @@ export async function createPublishedSwitchTerminal(args: {
       throw new Error('tab_not_found')
     }
     const result = await createOwned(identity, trackPhysical)
-    running.agentBound()
-    running.finish({ kind: 'proceed' })
-    owner.reportAgentLaunchPaneVerdict(pane, { kind: 'proceed' })
+    if (result.tab.parentTabId === identity.tabId && result.tab.leafId === identity.leafId) {
+      running.agentBound()
+      running.finish({ kind: 'proceed' })
+      owner.reportAgentLaunchPaneVerdict(pane, { kind: 'proceed' })
+    } else {
+      const { parentTabId, leafId } = result.tab
+      if (!parentTabId || !leafId) {
+        throw new Error('terminal_handle_stale')
+      }
+      owner.reportAgentLaunchPaneVerdict(
+        {
+          worktreeId,
+          tabId: parentTabId,
+          leafId,
+          operationId: opts.clientMutationId
+        },
+        { kind: 'proceed' }
+      )
+      const cleanup =
+        physicalOwners.size > 0
+          ? Promise.all(physicalOwners).then(withdrawUnused)
+          : withdrawUnused()
+      void cleanup
+        .then((withdrawn) => {
+          running.finish(withdrawn ? { kind: 'withdrawn' } : { kind: 'unconfirmed' })
+        })
+        .catch(() => running.finish({ kind: 'unconfirmed' }))
+    }
     return result
   } catch (error) {
     const live = owner.hasLiveTerminalForPaneKey(paneKey)
diff --git a/src/main/runtime/terminal/launch/terminal-create.ts b/src/main/runtime/terminal/launch/terminal-create.ts
index 8e55338778c7..c58ae3d4642c 100644
--- a/src/main/runtime/terminal/launch/terminal-create.ts
+++ b/src/main/runtime/terminal/launch/terminal-create.ts
@@ -4,7 +4,10 @@ import { OrcaRuntimeWithTerminalCreateDeduplication } from './terminal-create-de
 import * as dependencies from '../../orca-runtime-create-terminal-dependencies'
 import { createDesktopTerminal } from '../../orca-runtime-create-terminal-desktop'
 import { terminalCreateTeamAllocation } from './terminal-create-team-allocation'
-import { createIdempotentCallback } from '../../orca-runtime-report-pty-spawn-commit'
+import {
+  createIdempotentCallback,
+  reportTerminalSpawnDispatched
+} from '../../orca-runtime-report-pty-spawn-commit'
 import { recordPtySurface, spawnSurfaceClaimSequence } from '../../pty-recorded-surface-topology'
 import { agentLaunchTokenFor, withAgentLaunchToken } from '../../../agent-launch/agent-launch-token'
 import { seedPtyLaunchTitle } from './pty-launch-title'
@@ -110,13 +113,12 @@ export abstract class OrcaRuntimeWithCreateTerminal extends OrcaRuntimeWithTermi
           result = await dependencies.spawnInAdmittedPane(this.store, ptyController, {
             keepOnFailure: launchOpts.keepPaneOnStartFailure,
             beforeAdmission: launchOpts.beforePtySpawn,
-            beforeSpawn: () => {
-              launchOpts.beforePtySpawn?.()
-              launchOpts.onPtySpawnDispatched?.({
-                launchConfig: effectiveLaunchConfig,
-                launchAgent
-              })
-            },
+            beforeSpawn: reportTerminalSpawnDispatched(launchOpts, () => ({
+              tabId,
+              leafId,
+              launchConfig: effectiveLaunchConfig,
+              launchAgent
+            })),
             ...initialSize,
             cwd,
             command: sequencedStartupCommand
diff --git a/src/main/runtime/terminal/launch/terminal-launch-result.ts b/src/main/runtime/terminal/launch/terminal-launch-result.ts
index cb5218d4aa7d..1a4e689f7e3e 100644
--- a/src/main/runtime/terminal/launch/terminal-launch-result.ts
+++ b/src/main/runtime/terminal/launch/terminal-launch-result.ts
@@ -22,7 +22,8 @@ export function resolveTerminalLaunchResult(
     stablePaneAdopted ||
     result.isReattach === true ||
     result.agentSessionEnsure?.disposition === 'adopted'
-  const refused = Boolean(result.agentResumeRefused || result.agentResumeUnavailable)
+  const refused = Boolean(result.agentResumeRefused)
+  const requestedRecipeUnavailable = refused || result.agentResumeUnavailable || adoptedStablePane
   const owner = result.stablePaneOwner
   const surface =
     (result.switchRecoveredSurface
@@ -40,13 +41,13 @@ export function resolveTerminalLaunchResult(
     surface,
     launchAgent: refused
       ? undefined
-      : (result.launchAgent ?? (adoptedStablePane ? undefined : requested.launchAgent)),
+      : (result.launchAgent ?? (requestedRecipeUnavailable ? undefined : requested.launchAgent)),
     launchConfig: refused
       ? undefined
-      : (result.launchConfig ?? (adoptedStablePane ? undefined : requested.launchConfig)),
+      : (result.launchConfig ?? (requestedRecipeUnavailable ? undefined : requested.launchConfig)),
     launchToken: refused
       ? undefined
-      : (result.launchToken ?? (adoptedStablePane ? undefined : requested.launchToken)),
+      : (result.launchToken ?? (requestedRecipeUnavailable ? undefined : requested.launchToken)),
     effectiveTitle: refused || adoptedStablePane ? null : requested.title,
     effectiveViewMode: refused || adoptedStablePane ? undefined : requested.viewMode
   }
diff --git a/src/main/runtime/terminal/lifecycle/bind-first-registration-census.test.ts b/src/main/runtime/terminal/lifecycle/bind-first-registration-census.test.ts
index bd25d49beb61..bc72aff65b93 100644
--- a/src/main/runtime/terminal/lifecycle/bind-first-registration-census.test.ts
+++ b/src/main/runtime/terminal/lifecycle/bind-first-registration-census.test.ts
@@ -15,9 +15,9 @@ const CREATE_PATHS = [
     bindsWith: 'savePtySpawnPaneBinding('
   },
   {
-    // An adoption attaches to a live owner whose pane already binds it; nothing is written.
+    // Adoption reuses the live owner surface; switch reconciliation binds it before registration.
     path: 'spawn commit, an adopted live owner',
-    file: 'src/main/ipc/pty/spawn-commit-assembly.ts',
+    file: 'src/main/ipc/pty/spawn-commit-adopted-session.ts',
     bindsWith: 'adopted.owner'
   },
   {
diff --git a/src/renderer/src/components/native-chat/NativeChatPaneHeader.test.tsx b/src/renderer/src/components/native-chat/NativeChatPaneHeader.test.tsx
index d8977a50d43f..2087eaf617fa 100644
--- a/src/renderer/src/components/native-chat/NativeChatPaneHeader.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatPaneHeader.test.tsx
@@ -77,16 +77,16 @@ it('puts Hand Off first like the terminal header, only on the focused pane, and
 it('offers the terminal header action order and targets Resume and Close at the displayed chat', () => {
   const source = renderHeader()
   expect(screen.getAllByRole('button').map((button) => button.getAttribute('aria-label'))).toEqual([
-    'Show as terminal',
+    'Continue with Terminal Agent',
     'Split Chat Right',
     'Close tab'
   ])
   const folder = useAppStore.getState().folderWorkspaces[0]
   act(() => useAppStore.setState({ folderWorkspaces: [{ ...folder, executionHostId: 'ssh:dev' }] }))
-  expect(screen.queryByRole('button', { name: 'Show as terminal' })).toBeNull()
+  expect(screen.queryByRole('button', { name: 'Continue with Terminal Agent' })).toBeNull()
   act(() => useAppStore.setState({ folderWorkspaces: [folder] }))
   expect(fullRequest).not.toHaveBeenCalled()
-  fireEvent.click(screen.getByRole('button', { name: 'Show as terminal' }))
+  fireEvent.click(screen.getByRole('button', { name: 'Continue with Terminal Agent' }))
   expect(fullRequest).toHaveBeenCalledTimes(1)
   expect(mocks.resume).toHaveBeenCalledExactlyOnceWith(
     expect.objectContaining({
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.approval-and-start-failure.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.approval-and-start-failure.test.tsx
index 26db39993030..8447ace6840e 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.approval-and-start-failure.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.approval-and-start-failure.test.tsx
@@ -1,5 +1,7 @@
 // @vitest-environment happy-dom
 
+import { ConfirmationDialogProvider } from '@/components/confirmation-dialog'
+
 import { cleanup, render, screen, waitFor, within } from '@testing-library/react'
 import { afterEach, expect, it, vi } from 'vitest'
 import type { AgentSessionFailureFact } from '../../../../shared/agent-session-failure'
@@ -58,14 +60,16 @@ afterEach(() => {
     mocks.turnId = 'turn-1'
     mocks.promptItems = [NEWER_APPROVAL]
     render(
-      <NativeChatStructuredSession
-        isVisible
-        isFocusedGroup
-        tabId="newer-approval-tab"
-        sessionId="newer-approval-session"
-        target={{ kind: 'local' }}
-        agent="claude"
-      />
+      <ConfirmationDialogProvider>
+        <NativeChatStructuredSession
+          isVisible
+          isFocusedGroup
+          tabId="newer-approval-tab"
+          sessionId="newer-approval-session"
+          target={{ kind: 'local' }}
+          agent="claude"
+        />
+      </ConfirmationDialogProvider>
     )
     expect(mocks.approvalCardProps).toMatchObject({
       approval: { subject: { kind: 'diff' } }
@@ -81,14 +85,16 @@ afterEach(() => {
   it('sends nothing for the card when no turn is running', () => {
     mocks.promptItems = [NEWER_APPROVAL]
     render(
-      <NativeChatStructuredSession
-        isVisible
-        isFocusedGroup
-        tabId="newer-approval-tab"
-        sessionId="newer-approval-session"
-        target={{ kind: 'local' }}
-        agent="claude"
-      />
+      <ConfirmationDialogProvider>
+        <NativeChatStructuredSession
+          isVisible
+          isFocusedGroup
+          tabId="newer-approval-tab"
+          sessionId="newer-approval-session"
+          target={{ kind: 'local' }}
+          agent="claude"
+        />
+      </ConfirmationDialogProvider>
     )
     mocks.approvalCardProps?.onCancel?.()
     expect(mocks.cancel).not.toHaveBeenCalled()
@@ -97,14 +103,16 @@ afterEach(() => {
   it('cancels a Pi extension dialog outside a model turn', () => {
     mocks.promptItems = [NEWER_APPROVAL]
     render(
-      <NativeChatStructuredSession
-        isVisible
-        isFocusedGroup
-        tabId="pi-dialog-tab"
-        sessionId="pi-dialog-session"
-        target={{ kind: 'local' }}
-        agent="pi"
-      />
+      <ConfirmationDialogProvider>
+        <NativeChatStructuredSession
+          isVisible
+          isFocusedGroup
+          tabId="pi-dialog-tab"
+          sessionId="pi-dialog-session"
+          target={{ kind: 'local' }}
+          agent="pi"
+        />
+      </ConfirmationDialogProvider>
     )
     mocks.approvalCardProps?.onCancel?.()
     expect(mocks.cancel).toHaveBeenCalledWith(undefined, {
@@ -115,14 +123,16 @@ afterEach(() => {
 
   function renderSession() {
     render(
-      <NativeChatStructuredSession
-        isVisible
-        isFocusedGroup
-        tabId="newer-approval-tab"
-        sessionId="newer-approval-session"
-        target={{ kind: 'local' }}
-        agent="claude"
-      />
+      <ConfirmationDialogProvider>
+        <NativeChatStructuredSession
+          isVisible
+          isFocusedGroup
+          tabId="newer-approval-tab"
+          sessionId="newer-approval-session"
+          target={{ kind: 'local' }}
+          agent="claude"
+        />
+      </ConfirmationDialogProvider>
     )
   }
 
@@ -205,14 +215,16 @@ afterEach(() => {
       JSON.stringify(messages.map((message) => message.outbox))
     )
     render(
-      <NativeChatStructuredSession
-        isVisible
-        isFocusedGroup
-        tabId="start-failure-tab"
-        sessionId={SESSION_ID}
-        target={{ kind: 'local' }}
-        agent={agent}
-      />
+      <ConfirmationDialogProvider>
+        <NativeChatStructuredSession
+          isVisible
+          isFocusedGroup
+          tabId="start-failure-tab"
+          sessionId={SESSION_ID}
+          target={{ kind: 'local' }}
+          agent={agent}
+        />
+      </ConfirmationDialogProvider>
     )
   }
 
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.goal-dock.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.goal-dock.test.tsx
index 4657ae95f4e0..1beaa27cf8f5 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.goal-dock.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.goal-dock.test.tsx
@@ -1,5 +1,7 @@
 // @vitest-environment happy-dom
 
+import { ConfirmationDialogProvider } from '@/components/confirmation-dialog'
+
 import { cleanup, fireEvent, render, screen } from '@testing-library/react'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { TooltipProvider } from '@/components/ui/tooltip'
@@ -61,14 +63,16 @@ function goal(status: AgentJournalThreadGoal['status']): AgentJournalThreadGoal
 function sessionView(agent: 'codex' | 'claude' = 'codex'): React.JSX.Element {
   return (
     <TooltipProvider>
-      <NativeChatStructuredSession
-        isVisible
-        isFocusedGroup
-        tabId="structured-tab-goal"
-        sessionId="session-goal"
-        target={{ kind: 'local' }}
-        agent={agent}
-      />
+      <ConfirmationDialogProvider>
+        <NativeChatStructuredSession
+          isVisible
+          isFocusedGroup
+          tabId="structured-tab-goal"
+          sessionId="session-goal"
+          target={{ kind: 'local' }}
+          agent={agent}
+        />
+      </ConfirmationDialogProvider>
     </TooltipProvider>
   )
 }
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.host-outage.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.host-outage.test.tsx
index 8ca69738c83a..7c065e8aebb5 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.host-outage.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.host-outage.test.tsx
@@ -1,5 +1,7 @@
 // @vitest-environment happy-dom
 
+import { ConfirmationDialogProvider } from '@/components/confirmation-dialog'
+
 import '@testing-library/jest-dom/vitest'
 import { act, cleanup, fireEvent, render, screen } from '@testing-library/react'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
@@ -74,14 +76,16 @@ function setHost(status: RuntimeEnvironmentStatus): void {
 
 function paneElement(): React.JSX.Element {
   return (
-    <NativeChatStructuredSession
-      isVisible
-      isFocusedGroup
-      tabId="structured-host-outage-tab"
-      sessionId="host-outage-session"
-      target={{ kind: 'environment', environmentId: 'remote-host' }}
-      agent="claude"
-    />
+    <ConfirmationDialogProvider>
+      <NativeChatStructuredSession
+        isVisible
+        isFocusedGroup
+        tabId="structured-host-outage-tab"
+        sessionId="host-outage-session"
+        target={{ kind: 'environment', environmentId: 'remote-host' }}
+        agent="claude"
+      />
+    </ConfirmationDialogProvider>
   )
 }
 
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.notice-card.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.notice-card.test.tsx
index 426c13ed8e67..31903fdb7877 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.notice-card.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.notice-card.test.tsx
@@ -1,5 +1,7 @@
 // @vitest-environment happy-dom
 
+import { ConfirmationDialogProvider } from '@/components/confirmation-dialog'
+
 import { act, cleanup, fireEvent, render, screen } from '@testing-library/react'
 import { afterEach, expect, it, vi } from 'vitest'
 
@@ -35,14 +37,16 @@ afterEach(() => {
 
 function renderPane(): void {
   render(
-    <NativeChatStructuredSession
-      isVisible
-      isFocusedGroup
-      tabId="structured-notice-card-tab"
-      sessionId={SESSION_ID}
-      target={{ kind: 'local' }}
-      agent="codex"
-    />
+    <ConfirmationDialogProvider>
+      <NativeChatStructuredSession
+        isVisible
+        isFocusedGroup
+        tabId="structured-notice-card-tab"
+        sessionId={SESSION_ID}
+        target={{ kind: 'local' }}
+        agent="codex"
+      />
+    </ConfirmationDialogProvider>
   )
 }
 
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.orca-stop-continue.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.orca-stop-continue.test.tsx
index 7ddccafd0289..60d02e0cefd5 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.orca-stop-continue.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.orca-stop-continue.test.tsx
@@ -1,4 +1,6 @@
 // @vitest-environment happy-dom
+
+import { ConfirmationDialogProvider } from '@/components/confirmation-dialog'
 import '@testing-library/jest-dom/vitest'
 import { cleanup, render, screen } from '@testing-library/react'
 import { useImperativeHandle } from 'react'
@@ -107,15 +109,17 @@ it('offers one Continue, in the card that says Orca stopped, and the card does n
   mocks.journalItems = cutChat
   render(
     <TooltipProvider>
-      <NativeChatStructuredSession
-        isVisible
-        isFocusedGroup
-        tabId="orca-stop-tab"
-        sessionId="orca-stop-session"
-        // A paired server with no name to show.
-        target={{ kind: 'environment', environmentId: 'env-unnamed' }}
-        agent="codex"
-      />
+      <ConfirmationDialogProvider>
+        <NativeChatStructuredSession
+          isVisible
+          isFocusedGroup
+          tabId="orca-stop-tab"
+          sessionId="orca-stop-session"
+          // A paired server with no name to show.
+          target={{ kind: 'environment', environmentId: 'env-unnamed' }}
+          agent="codex"
+        />
+      </ConfirmationDialogProvider>
     </TooltipProvider>
   )
 
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.refusal-notices.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.refusal-notices.test.tsx
index fd48b135d832..db4859415b1f 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.refusal-notices.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.refusal-notices.test.tsx
@@ -1,5 +1,7 @@
 // @vitest-environment happy-dom
 
+import { ConfirmationDialogProvider } from '@/components/confirmation-dialog'
+
 import { act, cleanup, render, screen } from '@testing-library/react'
 import { afterEach, expect, it, vi } from 'vitest'
 import type { StructuredAgentSessionCommandRefusalCause } from '../../../../shared/structured-agent-session-composer'
@@ -29,14 +31,16 @@ afterEach(() => {
 {
   function renderPane(): void {
     render(
-      <NativeChatStructuredSession
-        isVisible
-        isFocusedGroup
-        tabId="structured-read-error-tab"
-        sessionId="read-error-session"
-        target={{ kind: 'local' }}
-        agent="codex"
-      />
+      <ConfirmationDialogProvider>
+        <NativeChatStructuredSession
+          isVisible
+          isFocusedGroup
+          tabId="structured-read-error-tab"
+          sessionId="read-error-session"
+          target={{ kind: 'local' }}
+          agent="codex"
+        />
+      </ConfirmationDialogProvider>
     )
   }
 
@@ -141,14 +145,16 @@ afterEach(() => {
     mocks.status = 'error'
 
     render(
-      <NativeChatStructuredSession
-        isVisible
-        isFocusedGroup
-        tabId="structured-read-error-tab"
-        sessionId="read-error-session"
-        target={{ kind: 'environment', environmentId: 'remote-host' }}
-        agent="codex"
-      />
+      <ConfirmationDialogProvider>
+        <NativeChatStructuredSession
+          isVisible
+          isFocusedGroup
+          tabId="structured-read-error-tab"
+          sessionId="read-error-session"
+          target={{ kind: 'environment', environmentId: 'remote-host' }}
+          agent="codex"
+        />
+      </ConfirmationDialogProvider>
     )
 
     expect(screen.getByTestId('message-list')).toBeTruthy()
@@ -175,14 +181,16 @@ afterEach(() => {
 
   function renderPane() {
     const pane = () => (
-      <NativeChatStructuredSession
-        isVisible
-        isFocusedGroup
-        tabId="refusal-line-tab"
-        sessionId="refusal-line-session"
-        target={{ kind: 'local' }}
-        agent="claude"
-      />
+      <ConfirmationDialogProvider>
+        <NativeChatStructuredSession
+          isVisible
+          isFocusedGroup
+          tabId="refusal-line-tab"
+          sessionId="refusal-line-session"
+          target={{ kind: 'local' }}
+          agent="claude"
+        />
+      </ConfirmationDialogProvider>
     )
     const view = render(pane())
     // A fresh element: the mocked controller reads the chat's state only when the pane renders.
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.wsl-host-stopped.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.wsl-host-stopped.test.tsx
index 68e70688e355..3a192fbcde30 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.wsl-host-stopped.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.wsl-host-stopped.test.tsx
@@ -1,5 +1,7 @@
 // @vitest-environment happy-dom
 
+import { ConfirmationDialogProvider } from '@/components/confirmation-dialog'
+
 import '@testing-library/jest-dom/vitest'
 import { act, cleanup, fireEvent, render, screen } from '@testing-library/react'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
@@ -46,14 +48,16 @@ function setWslStatus(state: WslHostStatus['state']): void {
 
 function renderPane() {
   return render(
-    <NativeChatStructuredSession
-      isVisible
-      isFocusedGroup
-      tabId="structured-wsl-stopped-tab"
-      sessionId="wsl-stopped-session"
-      target={{ kind: 'environment', environmentId: 'wsl:ubuntu' }}
-      agent="claude"
-    />
+    <ConfirmationDialogProvider>
+      <NativeChatStructuredSession
+        isVisible
+        isFocusedGroup
+        tabId="structured-wsl-stopped-tab"
+        sessionId="wsl-stopped-session"
+        target={{ kind: 'environment', environmentId: 'wsl:ubuntu' }}
+        agent="claude"
+      />
+    </ConfirmationDialogProvider>
   )
 }
 
diff --git a/src/renderer/src/components/native-chat/native-chat-agent-message-sender-host.test.tsx b/src/renderer/src/components/native-chat/native-chat-agent-message-sender-host.test.tsx
index f15219ee60c9..ef7811c0d2c0 100644
--- a/src/renderer/src/components/native-chat/native-chat-agent-message-sender-host.test.tsx
+++ b/src/renderer/src/components/native-chat/native-chat-agent-message-sender-host.test.tsx
@@ -1,4 +1,6 @@
 // @vitest-environment happy-dom
+
+import { ConfirmationDialogProvider } from '@/components/confirmation-dialog'
 import '@testing-library/jest-dom/vitest'
 import { act, cleanup, fireEvent, render, screen } from '@testing-library/react'
 import { afterAll, afterEach, beforeAll, beforeEach, expect, it, vi } from 'vitest'
@@ -159,9 +161,11 @@ async function mount(): Promise<ReturnType<typeof render>> {
   let view: ReturnType<typeof render>
   await act(async () => {
     view = render(
-      <TooltipProvider>
-        <StructuredAgentSessionPaneOverlayLayer worktreeId={WORKSPACE} isWorktreeActive />
-      </TooltipProvider>
+      <ConfirmationDialogProvider>
+        <TooltipProvider>
+          <StructuredAgentSessionPaneOverlayLayer worktreeId={WORKSPACE} isWorktreeActive />
+        </TooltipProvider>
+      </ConfirmationDialogProvider>
     )
   })
   return view!
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.test.ts b/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.test.ts
index 0e084d8e890c..bad5c66bef00 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.test.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.test.ts
@@ -257,7 +257,7 @@ describe('resumeAiVaultSessionInNewChat', () => {
     [
       'agent_session_conflict',
       'conversationHeldElsewhere',
-      'Codex is already running this conversation in another terminal. Quit Codex there or close that terminal, then open this conversation from Session History.'
+      'Orca could not confirm Codex stopped. Quit Codex in its terminal, then try this action again.'
     ],
     [
       'agent_session_identity_required',
diff --git a/src/renderer/src/components/tab-bar/tab-session-history-switch.parity.test.ts b/src/renderer/src/components/tab-bar/tab-session-history-switch.parity.test.ts
index a5f0c35f00cc..022d5763cada 100644
--- a/src/renderer/src/components/tab-bar/tab-session-history-switch.parity.test.ts
+++ b/src/renderer/src/components/tab-bar/tab-session-history-switch.parity.test.ts
@@ -122,22 +122,36 @@ describe('the tab menu offers exactly what the Session History row offers', () =
     })
   })
 
-  it('nothing for a CLI conversation a native chat already holds', () => {
-    const state = useAppStore.getState()
-    const owned = row({
-      structuredSession: { sessionId: 'orca-chat-1', workspaceId: WORKTREE_ID }
-    })
-    expect(panelTargets(state, owned).resumeInNewChatWorkspaceId).toBeNull()
-    expect(
-      resolveTabSessionSwitch(state, owned, {
-        kind: 'cli',
-        agent: 'claude',
-        providerSessionId: owned.sessionId,
-        workspaceId: WORKTREE_ID,
-        request
+  it.each(['local', 'ssh:unavailable'] as const)(
+    'keeps an owned conversation eligible only on its supported switch route (%s)',
+    (executionHostId) => {
+      useAppStore.setState((state) => ({
+        repos: state.repos.map((repo) => ({ ...repo, executionHostId }))
+      }))
+      const state = useAppStore.getState()
+      const owned = row({
+        executionHostId,
+        structuredSession: { sessionId: 'orca-chat-1', workspaceId: WORKTREE_ID }
       })
-    ).toBeNull()
-  })
+      const panel = panelTargets(state, owned)
+      expect(panel.resumeInNewChatWorkspaceId).toBe(
+        executionHostId === 'local' ? WORKTREE_ID : null
+      )
+      expect(
+        resolveTabSessionSwitch(state, owned, {
+          kind: 'cli',
+          agent: 'claude',
+          providerSessionId: owned.sessionId,
+          workspaceId: WORKTREE_ID,
+          request: { ...request, executionHostScope: executionHostId }
+        })
+      ).toEqual(
+        executionHostId === 'local'
+          ? { action: 'resume-in-new-chat', worktreeId: WORKTREE_ID }
+          : null
+      )
+    }
+  )
 
   it("Switch to Chat in the conversation's own worktree when that differs", () => {
     const state = useAppStore.getState()
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-command-finished-cleanup.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection-command-finished-cleanup.spec.ts
index df0a0abbf4f2..8082aac8f226 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-command-finished-cleanup.spec.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-command-finished-cleanup.spec.ts
@@ -159,8 +159,8 @@ export function registerPtyConnectionCommandFinishedCleanupTests(): void {
     it('keeps Droid routing visible through command-finished foreground confirmation', async () => {
       vi.useFakeTimers()
       const { connectPanePty } = await import('./pty-connection')
-      const getForegroundProcess = vi.mocked(window.api.pty.confirmForegroundProcess)
-      getForegroundProcess.mockResolvedValue('droid')
+      const inspectProcess = vi.mocked(window.api.pty.inspectProcess)
+      inspectProcess.mockResolvedValue({ foregroundProcess: 'droid', hasChildProcesses: false })
       const dataCallbackRef: { current: ((data: string) => void) | null } = { current: null }
       const ptyId = 'pty-droid-confirmation-window'
       const transport = createMockTransport(ptyId)
@@ -190,7 +190,7 @@ export function registerPtyConnectionCommandFinishedCleanupTests(): void {
         delete mockStoreState.agentLaunchConfigByPaneKey[key]
       })
 
-      const readsBeforeFinish = getForegroundProcess.mock.calls.length
+      const readsBeforeFinish = inspectProcess.mock.calls.length
       dataCallbackRef.current?.('\x1b]133;D;0\x07')
       expect(mockStoreState.clearAgentLaunchConfig).not.toHaveBeenCalled()
       expect(resolveMockPaneWindowsShiftEnterEncoding(mockStoreState, paneKey)).toBe('alt-enter')
@@ -199,7 +199,7 @@ export function registerPtyConnectionCommandFinishedCleanupTests(): void {
       expect(mockStoreState.clearAgentLaunchConfig).not.toHaveBeenCalled()
       expect(resolveMockPaneWindowsShiftEnterEncoding(mockStoreState, paneKey)).toBe('csi-u')
 
-      expect(getForegroundProcess).toHaveBeenCalledTimes(readsBeforeFinish + 1)
+      expect(inspectProcess).toHaveBeenCalledTimes(readsBeforeFinish + 1)
       expect(mockStoreState.clearAgentLaunchConfig).not.toHaveBeenCalled()
       expect(mockStoreState.paneForegroundAgentByPaneKey[paneKey]).toEqual({
         agent: 'droid',
@@ -213,7 +213,10 @@ export function registerPtyConnectionCommandFinishedCleanupTests(): void {
     it('retires pane launch routing after one fresh scan confirms shell', async () => {
       vi.useFakeTimers()
       const { connectPanePty } = await import('./pty-connection')
-      vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue('powershell.exe')
+      vi.mocked(window.api.pty.inspectProcess).mockResolvedValue({
+        foregroundProcess: 'powershell.exe',
+        hasChildProcesses: false
+      })
       const dataCallbackRef: { current: ((data: string) => void) | null } = { current: null }
       const ptyId = 'pty-droid-confirmed-shell'
       const transport = createMockTransport(ptyId)
@@ -259,7 +262,10 @@ export function registerPtyConnectionCommandFinishedCleanupTests(): void {
     ])('%s', async (_label, stoppingOnPurpose) => {
       vi.useFakeTimers()
       const { connectPanePty } = await import('./pty-connection')
-      vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue('zsh')
+      vi.mocked(window.api.pty.inspectProcess).mockResolvedValue({
+        foregroundProcess: 'zsh',
+        hasChildProcesses: false
+      })
       const dataCallbackRef: { current: ((data: string) => void) | null } = { current: null }
       const ptyId = 'pty-sleeping-confirmed-shell'
       const transport = createMockTransport(ptyId)
@@ -368,7 +374,10 @@ export function registerPtyConnectionCommandFinishedCleanupTests(): void {
       // Import after resetModules to share pty-connection’s registry; static imports would assert against a different instance.
       const { createCommandFinishedStatusStore } =
         await import('./command-finished-status-store-test-fixture')
-      vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue('powershell.exe')
+      vi.mocked(window.api.pty.inspectProcess).mockResolvedValue({
+        foregroundProcess: 'powershell.exe',
+        hasChildProcesses: false
+      })
       vi.mocked(window.api.agentStatus.reconcileEndedProcess).mockClear()
       const dataCallbackRef: { current: ((data: string) => void) | null } = { current: null }
       const ptyId = 'pty-claude-row-confirmed-shell'
@@ -414,7 +423,10 @@ export function registerPtyConnectionCommandFinishedCleanupTests(): void {
     it('does NOT reconcile when the process check could not confirm a shell', async () => {
       vi.useFakeTimers()
       const { connectPanePty } = await import('./pty-connection')
-      vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue(null)
+      vi.mocked(window.api.pty.inspectProcess).mockResolvedValue({
+        foregroundProcess: null,
+        hasChildProcesses: false
+      })
       vi.mocked(window.api.agentStatus.reconcileEndedProcess).mockClear()
       const dataCallbackRef: { current: ((data: string) => void) | null } = { current: null }
       const ptyId = 'pty-unconfirmed-shell'
@@ -458,7 +470,10 @@ export function registerPtyConnectionCommandFinishedCleanupTests(): void {
     it('disarms stale TUI modes in the emulator after a confirmed return to shell', async () => {
       vi.useFakeTimers()
       const { connectPanePty } = await import('./pty-connection')
-      vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue('bash')
+      vi.mocked(window.api.pty.inspectProcess).mockResolvedValue({
+        foregroundProcess: 'bash',
+        hasChildProcesses: false
+      })
       const dataCallbackRef: { current: ((data: string) => void) | null } = { current: null }
       const ptyId = 'pty-stale-mode-disarm'
       const transport = createMockTransport(ptyId)
@@ -504,8 +519,9 @@ export function registerPtyConnectionCommandFinishedCleanupTests(): void {
     it('grounds xterm and the input mirror in stream order when output is still queued', async () => {
       vi.useFakeTimers()
       const { connectPanePty } = await import('./pty-connection')
-      const confirmRead = createDeferred<string>()
-      vi.mocked(window.api.pty.confirmForegroundProcess).mockReturnValue(confirmRead.promise)
+      const confirmRead =
+        createDeferred<Awaited<ReturnType<typeof window.api.pty.inspectProcess>>>()
+      vi.mocked(window.api.pty.inspectProcess).mockReturnValue(confirmRead.promise)
       const dataCallbackRef: { current: ((data: string) => void) | null } = { current: null }
       const ptyId = 'pty-stale-mode-queued-output'
       const transport = createMockTransport(ptyId)
@@ -531,12 +547,12 @@ export function registerPtyConnectionCommandFinishedCleanupTests(): void {
       dataCallbackRef.current?.('\x1b]133;D;0\x07')
       await vi.advanceTimersByTimeAsync(350)
       await flushAsyncTicks()
-      expect(window.api.pty.confirmForegroundProcess).toHaveBeenCalled()
+      expect(window.api.pty.inspectProcess).toHaveBeenCalled()
 
       // Hidden-pane output sits in the background queue when the shell proof lands.
       dataCallbackRef.current?.('\x1b[>5u')
       expect(writes.some((w) => w.includes('\x1b[>5u'))).toBe(false)
-      confirmRead.resolve('bash')
+      confirmRead.resolve({ foregroundProcess: 'bash', hasChildProcesses: false })
       await flushAsyncTicks()
       await vi.advanceTimersByTimeAsync(100)
 
@@ -589,7 +605,10 @@ export function registerPtyConnectionCommandFinishedCleanupTests(): void {
     it('retires stale routing after unavailable command-finish reads without asserting shell', async () => {
       vi.useFakeTimers()
       const { connectPanePty } = await import('./pty-connection')
-      vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue(null)
+      vi.mocked(window.api.pty.inspectProcess).mockResolvedValue({
+        foregroundProcess: null,
+        hasChildProcesses: false
+      })
       const dataCallbackRef: { current: ((data: string) => void) | null } = { current: null }
       const ptyId = 'pty-droid-unavailable-finish'
       const tabId = 'tab-droid-unavailable-finish'
@@ -635,7 +654,10 @@ export function registerPtyConnectionCommandFinishedCleanupTests(): void {
     it('cancels deferred cleanup on a new command and retires identity at its later shell', async () => {
       vi.useFakeTimers()
       const { connectPanePty } = await import('./pty-connection')
-      vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue('powershell.exe')
+      vi.mocked(window.api.pty.inspectProcess).mockResolvedValue({
+        foregroundProcess: 'powershell.exe',
+        hasChildProcesses: false
+      })
       const dataCallbackRef: { current: ((data: string) => void) | null } = { current: null }
       const ptyId = 'pty-droid-superseded-confirmation'
       const transport = createMockTransport(ptyId)
diff --git a/src/renderer/src/i18n/en-runtime-required.json b/src/renderer/src/i18n/en-runtime-required.json
index cfd626950220..6459a1033389 100644
--- a/src/renderer/src/i18n/en-runtime-required.json
+++ b/src/renderer/src/i18n/en-runtime-required.json
@@ -1912,7 +1912,8 @@
           "terminalStartFailed": "{{agent}} could not start in a terminal. Check its setup and try again.",
           "writerUnconfirmed": "Orca could not confirm {{agent}} stopped. Check its open chats and terminals, then try this action again.",
           "sourceExitUnconfirmed": "Orca could not confirm {{agent}} stopped in this terminal. Quit {{agent}} here, then try this action again.",
-          "sourceKept": "{{agent}} opened successfully. The original tab was kept; continue in the new tab."
+          "sourceKept": "{{agent}} opened successfully. The original tab was kept; continue in the new tab.",
+          "sourceStopUnknown": "Orca could not confirm {{agent}} stopped. Check {{agent}} in the original terminal, then try switching again."
         },
         "SortableTabContextMenu": {
           "switchToTerminalView": "Continue with Terminal Agent"
diff --git a/src/renderer/src/i18n/locales/es.json b/src/renderer/src/i18n/locales/es.json
index e97c1dd2a8f6..9337c103273e 100644
--- a/src/renderer/src/i18n/locales/es.json
+++ b/src/renderer/src/i18n/locales/es.json
@@ -19656,8 +19656,6 @@
           "toCliTooltip": "Cambiar a la CLI: detiene {{agent}} en el chat nativo y continúa la misma conversación en una terminal.",
           "openedInWorkspace": "Chat abierto en {{workspace}}.",
           "toNativeChatTooltip": "Cambiar al chat nativo: continúa la misma conversación en un chat, en esta pestaña.",
-          "exitAgentFirst": "Salga de {{agent}} en esta terminal para cambiar.",
-          "waitForReply": "Espere a que termine la respuesta o deténgala y luego cambie.",
           "noConversation": "Todavía no hay una conversación guardada disponible en este terminal."
         },
         "BrowserTab": {
diff --git a/src/renderer/src/i18n/locales/fr.json b/src/renderer/src/i18n/locales/fr.json
index 7efd02efca55..05cc7450d9ba 100644
--- a/src/renderer/src/i18n/locales/fr.json
+++ b/src/renderer/src/i18n/locales/fr.json
@@ -19876,8 +19876,6 @@
           "toCliTooltip": "Passer à la CLI : arrête {{agent}} dans le chat natif et poursuit la même conversation dans un terminal.",
           "openedInWorkspace": "Chat ouvert dans {{workspace}}.",
           "toNativeChatTooltip": "Passer au chat natif : poursuit la même conversation dans un chat, dans cet onglet.",
-          "exitAgentFirst": "Quittez {{agent}} dans ce terminal pour basculer.",
-          "waitForReply": "Attendez la fin de la réponse ou arrêtez-la, puis basculez.",
           "noConversation": "Aucune conversation enregistrée n’est encore disponible dans ce terminal."
         },
         "BrowserTab": {
diff --git a/src/renderer/src/i18n/locales/ja.json b/src/renderer/src/i18n/locales/ja.json
index d5fdb833821a..02ec54c0a2af 100644
--- a/src/renderer/src/i18n/locales/ja.json
+++ b/src/renderer/src/i18n/locales/ja.json
@@ -19124,8 +19124,6 @@
           "toCliTooltip": "CLI に切り替え: ネイティブチャットで {{agent}} を停止し、ターミナルで同じ会話を続けます。",
           "openedInWorkspace": "{{workspace}} でチャットを開きました。",
           "toNativeChatTooltip": "ネイティブチャットに切り替え: このタブのチャットで同じ会話を続けます。",
-          "exitAgentFirst": "切り替えるには、このターミナルで {{agent}} を終了してください。",
-          "waitForReply": "応答が終わるまで待つか停止してから、切り替えてください。",
           "noConversation": "このターミナルには、保存された会話がまだありません。"
         },
         "BrowserTab": {
diff --git a/src/renderer/src/i18n/locales/ko.json b/src/renderer/src/i18n/locales/ko.json
index 37956d93c865..fe359b0d3732 100644
--- a/src/renderer/src/i18n/locales/ko.json
+++ b/src/renderer/src/i18n/locales/ko.json
@@ -19124,8 +19124,6 @@
           "toCliTooltip": "CLI로 전환: 네이티브 채팅에서 {{agent}}을(를) 중지하고 터미널에서 같은 대화를 이어갑니다.",
           "openedInWorkspace": "{{workspace}}에서 채팅을 열었습니다.",
           "toNativeChatTooltip": "네이티브 채팅으로 전환: 이 탭의 채팅에서 같은 대화를 이어갑니다.",
-          "exitAgentFirst": "전환하려면 이 터미널에서 {{agent}}을(를) 종료하세요.",
-          "waitForReply": "응답이 끝날 때까지 기다리거나 응답을 중지한 후 전환하세요.",
           "noConversation": "이 터미널에는 아직 저장된 대화가 없습니다."
         },
         "BrowserTab": {
diff --git a/src/renderer/src/i18n/locales/zh.json b/src/renderer/src/i18n/locales/zh.json
index 3e7b191a4800..cb4b5873ea38 100644
--- a/src/renderer/src/i18n/locales/zh.json
+++ b/src/renderer/src/i18n/locales/zh.json
@@ -19090,8 +19090,6 @@
           "toCliTooltip": "切换到 CLI：停止原生聊天中的 {{agent}}，并在终端中继续同一对话。",
           "openedInWorkspace": "已在 {{workspace}} 中打开聊天。",
           "toNativeChatTooltip": "切换到原生聊天：在此标签页的聊天中继续同一对话。",
-          "exitAgentFirst": "请先在此终端中退出 {{agent}}，然后再切换。",
-          "waitForReply": "请等待回复完成或停止回复，然后再切换。",
           "noConversation": "此终端中尚无可用的已保存对话。"
         },
         "BrowserTab": {
diff --git a/src/renderer/src/lib/agent-launch-pane-verdict-application.test.ts b/src/renderer/src/lib/agent-launch-pane-verdict-application.test.ts
index 0fff7f97a1f8..f497ca3b9483 100644
--- a/src/renderer/src/lib/agent-launch-pane-verdict-application.test.ts
+++ b/src/renderer/src/lib/agent-launch-pane-verdict-application.test.ts
@@ -22,6 +22,12 @@ const testStore = vi.hoisted(() => {
 })
 vi.mock('@/store', () => ({
   useAppStore: {
+    setState: (patch: Parameters<ReturnType<typeof createTestStore>['setState']>[0]) => {
+      if (!testStore.current) {
+        throw new Error('no test store')
+      }
+      testStore.current.setState(patch)
+    },
     getState: () => {
       if (!testStore.current) {
         throw new Error('no test store')
@@ -40,7 +46,11 @@ createTabsSliceMockApi()
 const { applyAgentLaunchPaneVerdict } = await import('./agent-launch-pane-verdict-application')
 const { agentLaunchPanePrompt, rememberAgentLaunchPanePrompt } =
   await import('./agent-launch-pane-prompt')
-const { wasAgentLaunchPaneClosedByUser } = await import('./agent-launch-pane-closes')
+const { noteAgentLaunchPaneClosedByUser, wasAgentLaunchPaneClosedByUser } =
+  await import('./agent-launch-pane-closes')
+const { awaitAgentLaunchPaneStart } = await import('./agent-launch-pane-start')
+const { agentLaunchPaneOutcomeForLeaf } =
+  await import('../components/terminal-pane/agent-launch-pane-notice-text')
 
 const WT = 'repo1::/tmp/feature'
 const LEAF = '3f2504e0-4f89-41d3-9a0c-0305e82c3301'
@@ -52,7 +62,7 @@ function launchTab() {
 }
 
 function apply(verdict: AgentLaunchPaneVerdict, leafId = LEAF): void {
-  applyAgentLaunchPaneVerdict({ worktreeId: WT, tabId, leafId, verdict })
+  applyAgentLaunchPaneVerdict({ worktreeId: WT, tabId, leafId, operationId: 'op-1', verdict })
 }
 
 beforeEach(() => {
@@ -64,6 +74,14 @@ beforeEach(() => {
     initialLeafId: LEAF,
     agentLaunchPane: { leafId: LEAF, operationId: 'op-1' }
   }).id
+  applyAgentLaunchPaneVerdict({
+    worktreeId: WT,
+    tabId,
+    leafId: LEAF,
+    operationId: 'op-1',
+    accepted: true,
+    verdict: { kind: 'proceed' }
+  })
   rememberAgentLaunchPanePrompt(tabId, 'fix the build')
 })
 
@@ -91,15 +109,31 @@ describe("a launch pane's verdict in the window", () => {
     expect(launchTab()?.agentLaunchPane).toBeUndefined()
   })
 
-  it('final, for a launch pane the user already closed out of a split: nothing is kept', () => {
+  it('final after a user closes the launch leaf does not affect its surviving sibling', async () => {
+    const sibling = '9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d'
+    const started = awaitAgentLaunchPaneStart(tabId, LEAF)
+    // The ordinary split-close owner records the user close before persisting the surviving tree.
+    noteAgentLaunchPaneClosedByUser(tabId, LEAF)
     store.getState().setTabLayout(tabId, {
-      root: { type: 'leaf', leafId: '9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d' },
-      activeLeafId: '9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d',
+      root: { type: 'leaf', leafId: sibling },
+      activeLeafId: sibling,
       expandedLeafId: null
     })
+    const layout = store.getState().terminalLayoutsByTabId[tabId]
+    await expect(started).resolves.toBeNull()
+    expect(wasAgentLaunchPaneClosedByUser(tabId, LEAF)).toBe(true)
+
     apply({ kind: 'not-started', code: 'agent_launch_tab_closed' })
-    expect(launchTab()?.agentLaunchPane).toBeUndefined()
-    expect(agentLaunchPanePrompt(tabId)).toBeNull()
+
+    expect(store.getState().terminalLayoutsByTabId[tabId]).toBe(layout)
+    expect(launchTab()?.agentLaunchPane).toEqual({
+      leafId: LEAF,
+      operationId: 'op-1',
+      outcome: { kind: 'not-started', code: 'agent_launch_tab_closed' }
+    })
+    expect(agentLaunchPanePrompt(tabId)).toBe('fix the build')
+    expect(agentLaunchPaneOutcomeForLeaf(launchTab(), sibling)).toBeNull()
+    expect(applyClosedTerminalLeafNotice).not.toHaveBeenCalled()
   })
 
   it('withdrawn: a tab with only the launch pane goes', () => {
@@ -107,7 +141,7 @@ describe("a launch pane's verdict in the window", () => {
     expect(launchTab()).toBeUndefined()
   })
 
-  it('withdrawn: a split the user added stays; only the launch pane closes', () => {
+  it('withdrawn: a split the user added keeps both panes without closing either', () => {
     store.getState().setTabLayout(tabId, {
       root: {
         type: 'split',
@@ -118,9 +152,13 @@ describe("a launch pane's verdict in the window", () => {
       activeLeafId: LEAF,
       expandedLeafId: null
     })
+    const layout = store.getState().terminalLayoutsByTabId[tabId]
+    const tab = launchTab()
     apply({ kind: 'withdrawn' })
-    expect(launchTab()).toBeDefined()
-    expect(applyClosedTerminalLeafNotice).toHaveBeenCalledWith(tabId, LEAF)
+    expect(launchTab()).toBe(tab)
+    expect(store.getState().terminalLayoutsByTabId[tabId]).toBe(layout)
+    expect(agentLaunchPanePrompt(tabId)).toBe('fix the build')
+    expect(applyClosedTerminalLeafNotice).not.toHaveBeenCalled()
   })
 
   it('never touches a pane no launch laid out', () => {
diff --git a/src/renderer/src/runtime/runtime-rpc-client-capabilities.test.ts b/src/renderer/src/runtime/runtime-rpc-client-capabilities.test.ts
new file mode 100644
index 000000000000..cbffcf99dfa1
--- /dev/null
+++ b/src/renderer/src/runtime/runtime-rpc-client-capabilities.test.ts
@@ -0,0 +1,291 @@
+import { describe, expect, it, vi } from 'vitest'
+import type { RuntimeStatus } from '../../../shared/runtime-types'
+import {
+  MIN_COMPATIBLE_RUNTIME_CLIENT_VERSION,
+  RUNTIME_PROTOCOL_VERSION
+} from '../../../shared/protocol-version'
+import {
+  assertRuntimeEnvironmentCapability,
+  callRuntimeRpc,
+  clearRecentRuntimeCompatibilityFailure,
+  runtimeEnvironmentSupportsCapability
+} from './runtime-rpc-client'
+import {
+  installRuntimeRpcClientTestBridge,
+  runtimeEnvironmentCall
+} from './runtime-rpc-client-test-bridge'
+
+installRuntimeRpcClientTestBridge()
+
+describe('runtime RPC capability compatibility', () => {
+  it('checks advertised runtime capabilities after protocol compatibility', async () => {
+    runtimeEnvironmentCall.mockResolvedValue({
+      id: 'status',
+      ok: true,
+      result: {
+        runtimeId: 'remote-runtime',
+        graphStatus: 'ready',
+        runtimeProtocolVersion: RUNTIME_PROTOCOL_VERSION,
+        minCompatibleRuntimeClientVersion: MIN_COMPATIBLE_RUNTIME_CLIENT_VERSION,
+        capabilities: ['project-host-setup.v1']
+      },
+      _meta: { runtimeId: 'remote-runtime' }
+    })
+
+    await expect(
+      assertRuntimeEnvironmentCapability(
+        'env-1',
+        'project-host-setup.v1',
+        'Project setup is unavailable.'
+      )
+    ).resolves.toBeUndefined()
+  })
+
+  it('re-probes capability support after a failed compatibility cache entry', async () => {
+    let statusCalls = 0
+    runtimeEnvironmentCall.mockImplementation(({ method }: { method: string }) => {
+      if (method === 'status.get') {
+        statusCalls += 1
+        if (statusCalls === 1) {
+          return Promise.resolve({
+            id: 'status',
+            ok: false,
+            error: { code: 'runtime_unavailable', message: 'offline' },
+            _meta: { runtimeId: 'remote-runtime' }
+          })
+        }
+        return Promise.resolve({
+          id: 'status',
+          ok: true,
+          result: {
+            runtimeId: 'remote-runtime',
+            graphStatus: 'ready',
+            runtimeProtocolVersion: RUNTIME_PROTOCOL_VERSION,
+            minCompatibleRuntimeClientVersion: MIN_COMPATIBLE_RUNTIME_CLIENT_VERSION,
+            capabilities: ['linear.issue-attribute-filter.v1']
+          },
+          _meta: { runtimeId: 'remote-runtime' }
+        })
+      }
+      return Promise.resolve({
+        id: method,
+        ok: true,
+        result: { ok: true },
+        _meta: { runtimeId: 'remote-runtime' }
+      })
+    })
+    const target = { kind: 'environment', environmentId: 'env-cap-recover' } as const
+
+    await expect(callRuntimeRpc(target, 'repo.list')).rejects.toThrow('offline')
+    await expect(
+      runtimeEnvironmentSupportsCapability('env-cap-recover', 'linear.issue-attribute-filter.v1')
+    ).resolves.toBe(true)
+    expect(statusCalls).toBe(2)
+  })
+
+  it('re-probes a missing capability on retry so a runtime upgrade can recover', async () => {
+    let statusCalls = 0
+    runtimeEnvironmentCall.mockImplementation(() => {
+      statusCalls += 1
+      return Promise.resolve({
+        id: 'status',
+        ok: true,
+        result: {
+          runtimeId: 'remote-runtime',
+          graphStatus: 'ready',
+          runtimeProtocolVersion: RUNTIME_PROTOCOL_VERSION,
+          minCompatibleRuntimeClientVersion: MIN_COMPATIBLE_RUNTIME_CLIENT_VERSION,
+          capabilities: statusCalls === 1 ? [] : ['linear.issue-attribute-filter.v1']
+        },
+        _meta: { runtimeId: 'remote-runtime' }
+      })
+    })
+
+    await expect(
+      runtimeEnvironmentSupportsCapability('env-cap-upgrade', 'linear.issue-attribute-filter.v1')
+    ).resolves.toBe(false)
+    await expect(
+      runtimeEnvironmentSupportsCapability('env-cap-upgrade', 'linear.issue-attribute-filter.v1')
+    ).resolves.toBe(true)
+    expect(statusCalls).toBe(2)
+  })
+
+  it('dispatches capability-selected legacy without a redundant status probe', async () => {
+    const methods: string[] = []
+    runtimeEnvironmentCall.mockImplementation(({ method }: { method: string }) => {
+      methods.push(method)
+      if (method === 'status.get') {
+        return Promise.resolve({
+          id: 'status',
+          ok: true,
+          result: {
+            runtimeId: 'old-runtime',
+            graphStatus: 'ready',
+            runtimeProtocolVersion: RUNTIME_PROTOCOL_VERSION,
+            minCompatibleRuntimeClientVersion: MIN_COMPATIBLE_RUNTIME_CLIENT_VERSION,
+            capabilities: []
+          },
+          _meta: { runtimeId: 'old-runtime' }
+        })
+      }
+      return Promise.resolve({
+        id: method,
+        ok: true,
+        result: { terminal: { handle: 'legacy' } },
+        _meta: { runtimeId: 'old-runtime' }
+      })
+    })
+    const target = { kind: 'environment', environmentId: 'env-legacy' } as const
+
+    await expect(
+      runtimeEnvironmentSupportsCapability('env-legacy', 'agent-session.host-authority.v1')
+    ).resolves.toBe(false)
+    await callRuntimeRpc(target, 'terminal.create', {}, { skipCompatibilityCheck: true })
+
+    expect(methods).toEqual(['status.get', 'terminal.create'])
+  })
+
+  it('coalesces concurrent cold-cache capability probes onto one status.get', async () => {
+    let statusCalls = 0
+    runtimeEnvironmentCall.mockImplementation(() => {
+      statusCalls += 1
+      return Promise.resolve({
+        id: 'status',
+        ok: true,
+        result: {
+          runtimeId: 'remote-runtime',
+          graphStatus: 'ready',
+          runtimeProtocolVersion: RUNTIME_PROTOCOL_VERSION,
+          minCompatibleRuntimeClientVersion: MIN_COMPATIBLE_RUNTIME_CLIENT_VERSION,
+          capabilities: ['linear.issue-attribute-filter.v1']
+        },
+        _meta: { runtimeId: 'remote-runtime' }
+      })
+    })
+
+    const [a, b, c] = await Promise.all([
+      runtimeEnvironmentSupportsCapability(
+        'env-cap-concurrent',
+        'linear.issue-attribute-filter.v1'
+      ),
+      runtimeEnvironmentSupportsCapability(
+        'env-cap-concurrent',
+        'linear.issue-attribute-filter.v1'
+      ),
+      runtimeEnvironmentSupportsCapability('env-cap-concurrent', 'linear.issue-attribute-filter.v1')
+    ])
+
+    expect([a, b, c]).toEqual([true, true, true])
+    expect(statusCalls).toBe(1)
+  })
+
+  it('expires a supported capability verdict so a runtime downgrade is detected', async () => {
+    vi.useFakeTimers()
+    vi.setSystemTime(new Date(0))
+    try {
+      let statusCalls = 0
+      runtimeEnvironmentCall.mockImplementation(() => {
+        statusCalls += 1
+        return Promise.resolve({
+          id: 'status',
+          ok: true,
+          result: {
+            runtimeId: 'remote-runtime',
+            graphStatus: 'ready',
+            runtimeProtocolVersion: RUNTIME_PROTOCOL_VERSION,
+            minCompatibleRuntimeClientVersion: MIN_COMPATIBLE_RUNTIME_CLIENT_VERSION,
+            capabilities: statusCalls === 1 ? ['linear.issue-attribute-filter.v1'] : []
+          },
+          _meta: { runtimeId: 'remote-runtime' }
+        })
+      })
+
+      await expect(
+        runtimeEnvironmentSupportsCapability(
+          'env-cap-downgrade',
+          'linear.issue-attribute-filter.v1'
+        )
+      ).resolves.toBe(true)
+      vi.setSystemTime(new Date(59_999))
+      await expect(
+        runtimeEnvironmentSupportsCapability(
+          'env-cap-downgrade',
+          'linear.issue-attribute-filter.v1'
+        )
+      ).resolves.toBe(true)
+      vi.setSystemTime(new Date(60_000))
+      await expect(
+        runtimeEnvironmentSupportsCapability(
+          'env-cap-downgrade',
+          'linear.issue-attribute-filter.v1'
+        )
+      ).resolves.toBe(false)
+      expect(statusCalls).toBe(2)
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
+  it('invalidates a positive capability verdict when the endpoint runtime changes', async () => {
+    let statusCalls = 0
+    runtimeEnvironmentCall.mockImplementation(() => {
+      statusCalls += 1
+      const runtimeId = statusCalls === 1 ? 'runtime-before-restart' : 'runtime-after-restart'
+      return Promise.resolve({
+        id: 'status',
+        ok: true,
+        result: {
+          runtimeId,
+          graphStatus: 'ready',
+          runtimeProtocolVersion: RUNTIME_PROTOCOL_VERSION,
+          minCompatibleRuntimeClientVersion: MIN_COMPATIBLE_RUNTIME_CLIENT_VERSION,
+          capabilities: statusCalls === 1 ? ['agent-session.host-authority.v1'] : []
+        },
+        _meta: { runtimeId }
+      })
+    })
+
+    await expect(
+      runtimeEnvironmentSupportsCapability(
+        'env-runtime-replaced',
+        'agent-session.host-authority.v1'
+      )
+    ).resolves.toBe(true)
+    clearRecentRuntimeCompatibilityFailure('env-runtime-replaced', {
+      runtimeId: 'runtime-after-restart',
+      graphStatus: 'ready',
+      runtimeProtocolVersion: RUNTIME_PROTOCOL_VERSION,
+      minCompatibleRuntimeClientVersion: MIN_COMPATIBLE_RUNTIME_CLIENT_VERSION
+    } as RuntimeStatus)
+    await expect(
+      runtimeEnvironmentSupportsCapability(
+        'env-runtime-replaced',
+        'agent-session.host-authority.v1'
+      )
+    ).resolves.toBe(false)
+    expect(statusCalls).toBe(2)
+  })
+
+  it('rejects missing advertised runtime capabilities with the caller message', async () => {
+    runtimeEnvironmentCall.mockResolvedValue({
+      id: 'status',
+      ok: true,
+      result: {
+        runtimeId: 'remote-runtime',
+        graphStatus: 'ready',
+        runtimeProtocolVersion: RUNTIME_PROTOCOL_VERSION,
+        minCompatibleRuntimeClientVersion: MIN_COMPATIBLE_RUNTIME_CLIENT_VERSION,
+        capabilities: []
+      },
+      _meta: { runtimeId: 'remote-runtime' }
+    })
+
+    await expect(
+      assertRuntimeEnvironmentCapability(
+        'env-1',
+        'project-host-setup.v1',
+        'Project setup is unavailable.'
+      )
+    ).rejects.toThrow('Project setup is unavailable.')
+  })
+})
diff --git a/src/renderer/src/runtime/runtime-rpc-client-test-bridge.ts b/src/renderer/src/runtime/runtime-rpc-client-test-bridge.ts
new file mode 100644
index 000000000000..026018fad31d
--- /dev/null
+++ b/src/renderer/src/runtime/runtime-rpc-client-test-bridge.ts
@@ -0,0 +1,25 @@
+import { beforeEach, vi } from 'vitest'
+import { clearRuntimeCompatibilityCacheForTests } from './runtime-rpc-client'
+
+export const runtimeCall = vi.fn()
+export const runtimeEnvironmentCall = vi.fn()
+export const runtimeEnvironmentSubscribe = vi.fn()
+
+export function installRuntimeRpcClientTestBridge(): void {
+  beforeEach(() => {
+    clearRuntimeCompatibilityCacheForTests()
+    runtimeCall.mockReset()
+    runtimeEnvironmentCall.mockReset()
+    runtimeEnvironmentSubscribe.mockReset()
+    vi.stubGlobal('window', {
+      api: {
+        runtime: { call: runtimeCall },
+        runtimeEnvironments: {
+          call: runtimeEnvironmentCall,
+          cancelSubscription: vi.fn().mockResolvedValue(undefined),
+          subscribe: runtimeEnvironmentSubscribe
+        }
+      }
+    })
+  })
+}
diff --git a/src/renderer/src/runtime/runtime-rpc-client.test.ts b/src/renderer/src/runtime/runtime-rpc-client.test.ts
index 342f6547986b..026686104593 100644
--- a/src/renderer/src/runtime/runtime-rpc-client.test.ts
+++ b/src/renderer/src/runtime/runtime-rpc-client.test.ts
@@ -1,12 +1,5 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import type { RuntimeStatus } from '../../../shared/runtime-types'
-import {
-  callRuntimeRpc,
-  assertRuntimeEnvironmentCapability,
-  clearRecentRuntimeCompatibilityFailure,
-  clearRuntimeCompatibilityCacheForTests,
-  runtimeEnvironmentSupportsCapability
-} from './runtime-rpc-client'
+import { describe, expect, it, vi } from 'vitest'
+import { callRuntimeRpc, clearRecentRuntimeCompatibilityFailure } from './runtime-rpc-client'
 import { RuntimeRpcCallError, unwrapRuntimeRpcResult } from './runtime-rpc-result'
 import {
   MIN_COMPATIBLE_RUNTIME_CLIENT_VERSION,
@@ -17,27 +10,74 @@ import {
   ORCA_RUNTIME_RPC_FEATURE_INTERACTION_SOURCE_KEY
 } from '../../../shared/runtime-rpc-feature-interaction-source'
 
-const runtimeCall = vi.fn()
-const runtimeEnvironmentCall = vi.fn()
-const runtimeEnvironmentSubscribe = vi.fn()
-
-beforeEach(() => {
-  clearRuntimeCompatibilityCacheForTests()
-  runtimeCall.mockReset()
-  runtimeEnvironmentCall.mockReset()
-  runtimeEnvironmentSubscribe.mockReset()
-  vi.stubGlobal('window', {
-    api: {
-      runtime: { call: runtimeCall },
-      runtimeEnvironments: {
-        call: runtimeEnvironmentCall,
-        subscribe: runtimeEnvironmentSubscribe
-      }
+import {
+  installRuntimeRpcClientTestBridge,
+  runtimeCall,
+  runtimeEnvironmentCall,
+  runtimeEnvironmentSubscribe
+} from './runtime-rpc-client-test-bridge'
+
+installRuntimeRpcClientTestBridge()
+
+describe('runtime RPC client routing', () => {
+  it.each(['local', 'environment'] as const)(
+    'runs the %s dispatch veto once and does not send when it throws',
+    async (kind) => {
+      const target = kind === 'local' ? { kind } : { kind, environmentId: 'env-1' }
+      const dispatch = kind === 'local' ? runtimeCall : runtimeEnvironmentCall
+      const beforeSend = vi.fn((): void => {
+        expect(dispatch).not.toHaveBeenCalled()
+        throw new Error('operation retired')
+      })
+      await expect(callRuntimeRpc(target, 'status.get', undefined, { beforeSend })).rejects.toThrow(
+        'operation retired'
+      )
+      expect(beforeSend).toHaveBeenCalledOnce()
+      expect(dispatch).not.toHaveBeenCalled()
+
+      beforeSend.mockImplementation(() => {
+        expect(dispatch).not.toHaveBeenCalled()
+      })
+      dispatch.mockRejectedValue(new Error('reply lost'))
+      await expect(callRuntimeRpc(target, 'status.get', undefined, { beforeSend })).rejects.toThrow(
+        'reply lost'
+      )
+      expect(beforeSend).toHaveBeenCalledTimes(2)
+      expect(dispatch).toHaveBeenCalledOnce()
     }
+  )
+
+  it('observes an abortable host dispatch once, without marking subscription setup sent', async () => {
+    let callbacks: Parameters<typeof window.api.runtimeEnvironments.subscribe>[1] | undefined
+    const unsubscribe = vi.fn()
+    runtimeEnvironmentSubscribe.mockImplementation((_args, incoming) => {
+      callbacks = incoming
+      return Promise.resolve({ unsubscribe })
+    })
+    const beforeSend = vi.fn()
+    const request = callRuntimeRpc(
+      { kind: 'environment', environmentId: 'env-1' },
+      'status.get',
+      undefined,
+      { signal: new AbortController().signal, beforeSend }
+    )
+    expect(runtimeEnvironmentSubscribe).toHaveBeenCalledOnce()
+    expect(beforeSend).not.toHaveBeenCalled()
+    callbacks?.onSent?.(123)
+    callbacks?.onSent?.(456)
+    callbacks?.onResponse({
+      id: 'response',
+      ok: true,
+      result: 'done',
+      _meta: { runtimeId: 'remote-runtime' }
+    })
+    await expect(request).resolves.toBe('done')
+    expect(beforeSend).toHaveBeenCalledExactlyOnceWith(123)
+    callbacks?.onSent?.(789)
+    expect(beforeSend).toHaveBeenCalledOnce()
+    expect(runtimeEnvironmentCall).not.toHaveBeenCalled()
   })
-})
 
-describe('runtime RPC client routing', () => {
   it('routes local runtime calls through window.api.runtime.call', async () => {
     runtimeCall.mockResolvedValue({
       id: 'local',
@@ -465,277 +505,6 @@ describe('runtime RPC client routing', () => {
     ])
   })
 
-  it('checks advertised runtime capabilities after protocol compatibility', async () => {
-    runtimeEnvironmentCall.mockResolvedValue({
-      id: 'status',
-      ok: true,
-      result: {
-        runtimeId: 'remote-runtime',
-        graphStatus: 'ready',
-        runtimeProtocolVersion: RUNTIME_PROTOCOL_VERSION,
-        minCompatibleRuntimeClientVersion: MIN_COMPATIBLE_RUNTIME_CLIENT_VERSION,
-        capabilities: ['project-host-setup.v1']
-      },
-      _meta: { runtimeId: 'remote-runtime' }
-    })
-
-    await expect(
-      assertRuntimeEnvironmentCapability(
-        'env-1',
-        'project-host-setup.v1',
-        'Project setup is unavailable.'
-      )
-    ).resolves.toBeUndefined()
-  })
-
-  it('re-probes capability support after a failed compatibility cache entry', async () => {
-    let statusCalls = 0
-    runtimeEnvironmentCall.mockImplementation(({ method }: { method: string }) => {
-      if (method === 'status.get') {
-        statusCalls += 1
-        if (statusCalls === 1) {
-          return Promise.resolve({
-            id: 'status',
-            ok: false,
-            error: { code: 'runtime_unavailable', message: 'offline' },
-            _meta: { runtimeId: 'remote-runtime' }
-          })
-        }
-        return Promise.resolve({
-          id: 'status',
-          ok: true,
-          result: {
-            runtimeId: 'remote-runtime',
-            graphStatus: 'ready',
-            runtimeProtocolVersion: RUNTIME_PROTOCOL_VERSION,
-            minCompatibleRuntimeClientVersion: MIN_COMPATIBLE_RUNTIME_CLIENT_VERSION,
-            capabilities: ['linear.issue-attribute-filter.v1']
-          },
-          _meta: { runtimeId: 'remote-runtime' }
-        })
-      }
-      return Promise.resolve({
-        id: method,
-        ok: true,
-        result: { ok: true },
-        _meta: { runtimeId: 'remote-runtime' }
-      })
-    })
-    const target = { kind: 'environment', environmentId: 'env-cap-recover' } as const
-
-    await expect(callRuntimeRpc(target, 'repo.list')).rejects.toThrow('offline')
-    await expect(
-      runtimeEnvironmentSupportsCapability('env-cap-recover', 'linear.issue-attribute-filter.v1')
-    ).resolves.toBe(true)
-    expect(statusCalls).toBe(2)
-  })
-
-  it('re-probes a missing capability on retry so a runtime upgrade can recover', async () => {
-    let statusCalls = 0
-    runtimeEnvironmentCall.mockImplementation(() => {
-      statusCalls += 1
-      return Promise.resolve({
-        id: 'status',
-        ok: true,
-        result: {
-          runtimeId: 'remote-runtime',
-          graphStatus: 'ready',
-          runtimeProtocolVersion: RUNTIME_PROTOCOL_VERSION,
-          minCompatibleRuntimeClientVersion: MIN_COMPATIBLE_RUNTIME_CLIENT_VERSION,
-          capabilities: statusCalls === 1 ? [] : ['linear.issue-attribute-filter.v1']
-        },
-        _meta: { runtimeId: 'remote-runtime' }
-      })
-    })
-
-    await expect(
-      runtimeEnvironmentSupportsCapability('env-cap-upgrade', 'linear.issue-attribute-filter.v1')
-    ).resolves.toBe(false)
-    await expect(
-      runtimeEnvironmentSupportsCapability('env-cap-upgrade', 'linear.issue-attribute-filter.v1')
-    ).resolves.toBe(true)
-    expect(statusCalls).toBe(2)
-  })
-
-  it('dispatches capability-selected legacy without a redundant status probe', async () => {
-    const methods: string[] = []
-    runtimeEnvironmentCall.mockImplementation(({ method }: { method: string }) => {
-      methods.push(method)
-      if (method === 'status.get') {
-        return Promise.resolve({
-          id: 'status',
-          ok: true,
-          result: {
-            runtimeId: 'old-runtime',
-            graphStatus: 'ready',
-            runtimeProtocolVersion: RUNTIME_PROTOCOL_VERSION,
-            minCompatibleRuntimeClientVersion: MIN_COMPATIBLE_RUNTIME_CLIENT_VERSION,
-            capabilities: []
-          },
-          _meta: { runtimeId: 'old-runtime' }
-        })
-      }
-      return Promise.resolve({
-        id: method,
-        ok: true,
-        result: { terminal: { handle: 'legacy' } },
-        _meta: { runtimeId: 'old-runtime' }
-      })
-    })
-    const target = { kind: 'environment', environmentId: 'env-legacy' } as const
-
-    await expect(
-      runtimeEnvironmentSupportsCapability('env-legacy', 'agent-session.host-authority.v1')
-    ).resolves.toBe(false)
-    await callRuntimeRpc(target, 'terminal.create', {}, { skipCompatibilityCheck: true })
-
-    expect(methods).toEqual(['status.get', 'terminal.create'])
-  })
-
-  it('coalesces concurrent cold-cache capability probes onto one status.get', async () => {
-    let statusCalls = 0
-    runtimeEnvironmentCall.mockImplementation(() => {
-      statusCalls += 1
-      return Promise.resolve({
-        id: 'status',
-        ok: true,
-        result: {
-          runtimeId: 'remote-runtime',
-          graphStatus: 'ready',
-          runtimeProtocolVersion: RUNTIME_PROTOCOL_VERSION,
-          minCompatibleRuntimeClientVersion: MIN_COMPATIBLE_RUNTIME_CLIENT_VERSION,
-          capabilities: ['linear.issue-attribute-filter.v1']
-        },
-        _meta: { runtimeId: 'remote-runtime' }
-      })
-    })
-
-    const [a, b, c] = await Promise.all([
-      runtimeEnvironmentSupportsCapability(
-        'env-cap-concurrent',
-        'linear.issue-attribute-filter.v1'
-      ),
-      runtimeEnvironmentSupportsCapability(
-        'env-cap-concurrent',
-        'linear.issue-attribute-filter.v1'
-      ),
-      runtimeEnvironmentSupportsCapability('env-cap-concurrent', 'linear.issue-attribute-filter.v1')
-    ])
-
-    expect([a, b, c]).toEqual([true, true, true])
-    expect(statusCalls).toBe(1)
-  })
-
-  it('expires a supported capability verdict so a runtime downgrade is detected', async () => {
-    vi.useFakeTimers()
-    vi.setSystemTime(new Date(0))
-    try {
-      let statusCalls = 0
-      runtimeEnvironmentCall.mockImplementation(() => {
-        statusCalls += 1
-        return Promise.resolve({
-          id: 'status',
-          ok: true,
-          result: {
-            runtimeId: 'remote-runtime',
-            graphStatus: 'ready',
-            runtimeProtocolVersion: RUNTIME_PROTOCOL_VERSION,
-            minCompatibleRuntimeClientVersion: MIN_COMPATIBLE_RUNTIME_CLIENT_VERSION,
-            capabilities: statusCalls === 1 ? ['linear.issue-attribute-filter.v1'] : []
-          },
-          _meta: { runtimeId: 'remote-runtime' }
-        })
-      })
-
-      await expect(
-        runtimeEnvironmentSupportsCapability(
-          'env-cap-downgrade',
-          'linear.issue-attribute-filter.v1'
-        )
-      ).resolves.toBe(true)
-      vi.setSystemTime(new Date(59_999))
-      await expect(
-        runtimeEnvironmentSupportsCapability(
-          'env-cap-downgrade',
-          'linear.issue-attribute-filter.v1'
-        )
-      ).resolves.toBe(true)
-      vi.setSystemTime(new Date(60_000))
-      await expect(
-        runtimeEnvironmentSupportsCapability(
-          'env-cap-downgrade',
-          'linear.issue-attribute-filter.v1'
-        )
-      ).resolves.toBe(false)
-      expect(statusCalls).toBe(2)
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('invalidates a positive capability verdict when the endpoint runtime changes', async () => {
-    let statusCalls = 0
-    runtimeEnvironmentCall.mockImplementation(() => {
-      statusCalls += 1
-      const runtimeId = statusCalls === 1 ? 'runtime-before-restart' : 'runtime-after-restart'
-      return Promise.resolve({
-        id: 'status',
-        ok: true,
-        result: {
-          runtimeId,
-          graphStatus: 'ready',
-          runtimeProtocolVersion: RUNTIME_PROTOCOL_VERSION,
-          minCompatibleRuntimeClientVersion: MIN_COMPATIBLE_RUNTIME_CLIENT_VERSION,
-          capabilities: statusCalls === 1 ? ['agent-session.host-authority.v1'] : []
-        },
-        _meta: { runtimeId }
-      })
-    })
-
-    await expect(
-      runtimeEnvironmentSupportsCapability(
-        'env-runtime-replaced',
-        'agent-session.host-authority.v1'
-      )
-    ).resolves.toBe(true)
-    clearRecentRuntimeCompatibilityFailure('env-runtime-replaced', {
-      runtimeId: 'runtime-after-restart',
-      graphStatus: 'ready',
-      runtimeProtocolVersion: RUNTIME_PROTOCOL_VERSION,
-      minCompatibleRuntimeClientVersion: MIN_COMPATIBLE_RUNTIME_CLIENT_VERSION
-    } as RuntimeStatus)
-    await expect(
-      runtimeEnvironmentSupportsCapability(
-        'env-runtime-replaced',
-        'agent-session.host-authority.v1'
-      )
-    ).resolves.toBe(false)
-    expect(statusCalls).toBe(2)
-  })
-
-  it('rejects missing advertised runtime capabilities with the caller message', async () => {
-    runtimeEnvironmentCall.mockResolvedValue({
-      id: 'status',
-      ok: true,
-      result: {
-        runtimeId: 'remote-runtime',
-        graphStatus: 'ready',
-        runtimeProtocolVersion: RUNTIME_PROTOCOL_VERSION,
-        minCompatibleRuntimeClientVersion: MIN_COMPATIBLE_RUNTIME_CLIENT_VERSION,
-        capabilities: []
-      },
-      _meta: { runtimeId: 'remote-runtime' }
-    })
-
-    await expect(
-      assertRuntimeEnvironmentCapability(
-        'env-1',
-        'project-host-setup.v1',
-        'Project setup is unavailable.'
-      )
-    ).rejects.toThrow('Project setup is unavailable.')
-  })
-
   it('marks remote UI-owned runtime calls so feature interaction tracking can ignore them', async () => {
     runtimeEnvironmentCall.mockImplementation(({ method }: { method: string }) => {
       const result =
diff --git a/src/renderer/src/runtime/runtime-rpc-environment-call.ts b/src/renderer/src/runtime/runtime-rpc-environment-call.ts
index f5cb82d85514..dbbf59389cbf 100644
--- a/src/renderer/src/runtime/runtime-rpc-environment-call.ts
+++ b/src/renderer/src/runtime/runtime-rpc-environment-call.ts
@@ -32,6 +32,7 @@ async function callRuntimeEnvironmentOnce(args: {
       args.dispatchObservation?.()
     )
   }
+  args.beforeSend?.()
   return window.api.runtimeEnvironments.call({
     selector: args.environmentId,
     method: args.method,
diff --git a/src/renderer/src/store/slices/github-pr-checks-fetch.test.ts b/src/renderer/src/store/slices/github-pr-checks-fetch.test.ts
index 74d29b79d53a..be98c242a3ac 100644
--- a/src/renderer/src/store/slices/github-pr-checks-fetch.test.ts
+++ b/src/renderer/src/store/slices/github-pr-checks-fetch.test.ts
@@ -578,6 +578,8 @@ describe('createGitHubSlice.fetchPRCheckDetails', () => {
       selector: 'env-1',
       expectedEnvironmentPairingRevision: undefined,
       expectedEnvironmentRuntimeId: undefined,
+      dispatchObservation: undefined,
+      observeDispatch: false,
       method: 'github.prCheckDetails',
       params: {
         repo: repoId,
@@ -678,6 +680,8 @@ describe('createGitHubSlice.fetchPRCheckDetails', () => {
         selector: 'env-1',
         expectedEnvironmentPairingRevision: undefined,
         expectedEnvironmentRuntimeId: undefined,
+        dispatchObservation: undefined,
+        observeDispatch: false,
         method: 'github.prCheckDetails',
         params: {
           repo: repoId,
diff --git a/src/renderer/src/store/slices/tabs/moved-tab-selection.ts b/src/renderer/src/store/slices/tabs/moved-tab-selection.ts
index 67de58814f38..92a5bb1c1d8c 100644
--- a/src/renderer/src/store/slices/tabs/moved-tab-selection.ts
+++ b/src/renderer/src/store/slices/tabs/moved-tab-selection.ts
@@ -101,7 +101,8 @@ export function showFramePatch(
       typeof patch === 'function' ? patch(current) : patch
     )
     taken = shown.taken
-    return protectSwitchProjections(current, shown.patch)
+    const next = protectSwitchProjections(current, shown.patch)
+    return Object.keys(next).length === 0 ? current : next
   })
   return taken
 }

From b60da0bdd7d2d4e46b351199b1360a575b5fc731 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Thu, 29 Oct 2026 08:15:54 -0700
Subject: [PATCH 101/207] Fix switch recovery fixture and declaration types

---
 src/main/daemon/daemon-pty-adapter-test-harness.ts         | 3 ++-
 .../runtime/qoder-mobile-resume-adoption-scaling.test.ts   | 2 +-
 src/main/runtime/qoder-mobile-resume-adoption.test.ts      | 4 ++--
 .../launch/mobile-terminal-create-reconciliation.ts        | 7 ++++++-
 src/renderer/src/runtime/runtime-rpc-client-test-bridge.ts | 7 ++++---
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/main/daemon/daemon-pty-adapter-test-harness.ts b/src/main/daemon/daemon-pty-adapter-test-harness.ts
index 74483bc4561b..7e52d636c3ef 100644
--- a/src/main/daemon/daemon-pty-adapter-test-harness.ts
+++ b/src/main/daemon/daemon-pty-adapter-test-harness.ts
@@ -7,9 +7,10 @@ import type { DaemonPtyAdapterOptions } from './daemon-pty-runtime-state'
 import { DaemonServer } from './daemon-server'
 import { getDaemonSocketPath } from './daemon-spawner'
 import type { SubprocessHandle } from './session-subprocess-handle'
+import type { TerminalHostOptions } from './terminal-host-options'
 import type { DaemonFileLog } from './daemon-file-log'
 
-export type SpawnSubprocess = ConstructorParameters<typeof DaemonServer>[0]['spawnSubprocess']
+export type SpawnSubprocess = TerminalHostOptions['spawnSubprocess']
 
 export type DaemonAdapterHarness = {
   dir: string
diff --git a/src/main/runtime/qoder-mobile-resume-adoption-scaling.test.ts b/src/main/runtime/qoder-mobile-resume-adoption-scaling.test.ts
index 2da739784dcb..a5e9edc9b0c0 100644
--- a/src/main/runtime/qoder-mobile-resume-adoption-scaling.test.ts
+++ b/src/main/runtime/qoder-mobile-resume-adoption-scaling.test.ts
@@ -35,7 +35,7 @@ it('bounds lost-reply persisted-surface reconciliation at N/10N without replayin
     const request = {
       command: 'qodercli --resume original',
       launchAgent: 'qoder' as const,
-      launchConfig: { agentCommand: 'qodercli', agentArgs: '--original' },
+      launchConfig: { agentCommand: 'qodercli', agentArgs: '--original', agentEnv: {} },
       createMutation: { clientIdentity: 'scale-phone', id: 'scale-operation' }
     }
     const inventory: {
diff --git a/src/main/runtime/qoder-mobile-resume-adoption.test.ts b/src/main/runtime/qoder-mobile-resume-adoption.test.ts
index 9cfb275d0f1c..bd1b336bb49d 100644
--- a/src/main/runtime/qoder-mobile-resume-adoption.test.ts
+++ b/src/main/runtime/qoder-mobile-resume-adoption.test.ts
@@ -488,7 +488,7 @@ it('recovers an unhinted allocated pane across a lost reply and a publication er
   const request = {
     command: 'qodercli --resume original',
     launchAgent: 'qoder' as const,
-    launchConfig: { agentCommand: 'qodercli', agentArgs: '--original' },
+    launchConfig: { agentCommand: 'qodercli', agentArgs: '--original', agentEnv: {} },
     createMutation: { clientIdentity: 'unhinted-phone', id: 'unhinted-operation' }
   }
   const inventory: {
@@ -580,7 +580,7 @@ it.each(['moved', 'closed', 'replaced'] as const)(
     const request = {
       command: 'qodercli --resume original',
       launchAgent: 'qoder' as const,
-      launchConfig: { agentCommand: 'qodercli', agentArgs: '--original' },
+      launchConfig: { agentCommand: 'qodercli', agentArgs: '--original', agentEnv: {} },
       keepPaneOnStartFailure: true as const,
       createMutation: { clientIdentity: 'authority-phone', id: 'authority-operation' },
       identity: {
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-create-reconciliation.ts b/src/main/runtime/terminal/launch/mobile-terminal-create-reconciliation.ts
index 496ad2519b98..a09310dea554 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-create-reconciliation.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-create-reconciliation.ts
@@ -7,11 +7,16 @@ import type { RuntimeTerminalCreate } from '../../../../shared/runtime-types'
 import type { RuntimePtyWorktreeRecord } from '../../runtime-terminal-state-records'
 import { copySleepingAgentLaunchConfig } from '../../runtime-agent-launch-resolution'
 import { parsePaneKey } from '../../../../shared/stable-pane-id'
-import { ptyHoldsRecordedSurface } from '../../pty-recorded-surface-topology'
+import {
+  ptyHoldsRecordedSurface,
+  type PtySurfaceTopology
+} from '../../pty-recorded-surface-topology'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
 import { persistFreshPaneBinding } from '../../../ipc/pty/spawn-commit-binding'
 
 export abstract class OrcaRuntimeWithReconcileOwnedMobileTerminal extends OrcaRuntimeWithResolveMobileSessionTerminalCommand {
+  protected abstract ptySurfaceTopology(): PtySurfaceTopology
+
   protected validateOwnedMobileDispatch(
     pty: RuntimePtyWorktreeRecord,
     terminal: RuntimeTerminalCreate,
diff --git a/src/renderer/src/runtime/runtime-rpc-client-test-bridge.ts b/src/renderer/src/runtime/runtime-rpc-client-test-bridge.ts
index 026018fad31d..569c40913b02 100644
--- a/src/renderer/src/runtime/runtime-rpc-client-test-bridge.ts
+++ b/src/renderer/src/runtime/runtime-rpc-client-test-bridge.ts
@@ -1,9 +1,10 @@
 import { beforeEach, vi } from 'vitest'
+import type { Mock } from 'vitest'
 import { clearRuntimeCompatibilityCacheForTests } from './runtime-rpc-client'
 
-export const runtimeCall = vi.fn()
-export const runtimeEnvironmentCall = vi.fn()
-export const runtimeEnvironmentSubscribe = vi.fn()
+export const runtimeCall: Mock = vi.fn()
+export const runtimeEnvironmentCall: Mock = vi.fn()
+export const runtimeEnvironmentSubscribe: Mock = vi.fn()
 
 export function installRuntimeRpcClientTestBridge(): void {
   beforeEach(() => {

From e9ff3d9105134f274349d8a984e1ea73fecffe63 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Thu, 29 Oct 2026 09:02:28 -0700
Subject: [PATCH 102/207] Align switch recovery and UI test owner contracts

---
 .../scripts/pr-unit-support-routing.test.mjs  |   1 +
 .../terminal-host-concurrent-create.test.ts   |  22 +-
 .../terminal-host-cwd-readability.test.ts     |   7 +-
 src/main/ipc/pty/spawn-commit-binding.ts      |  19 +
 .../runtime/bind-first-pane.test-fixture.ts   |  56 +--
 .../orca-runtime-test-fixtures.spec.ts        |  34 +-
 ...rgeted-agent-resume-claim-lifetime.spec.ts | 206 +++++++++++
 ...session-tabs-targeted-agent-resume.spec.ts | 328 +-----------------
 .../targeted-agent-resume.test-fixture.ts     | 121 +++++++
 src/main/runtime/orca-runtime.test.ts         |   1 +
 .../profile-session-store.test-fixture.ts     |   8 +-
 ...runtime-fake-spawn-binding.test-fixture.ts |  94 +++++
 .../mobile-terminal-create-reconciliation.ts  |  35 +-
 .../bind-first-registration-census.test.ts    |   4 +-
 ...cturedSession.availability-notice.test.tsx |  19 +-
 ...ucturedSession.history-read-state.test.tsx |   2 +-
 ...tructuredSession.launch-lifecycle.test.tsx |  19 +-
 ...iveChatStructuredSession.stopping.test.tsx |  19 +-
 .../NativeChatStructuredSession.test.tsx      |  14 +-
 .../native-chat-header-ownership.test.tsx     |   2 +-
 ...onnection-foreground-agent-routing.spec.ts |  63 +++-
 ...nnection-foreground-agent-sampling.spec.ts |  36 +-
 ...on-foreground-routing-confirmation.spec.ts |  14 +-
 ...-hibernation-kill-shell-foreground.test.ts |  17 +-
 .../src/lib/agent-launch-through-host.test.ts |   6 +
 .../check-details-failure-mapping.test.ts     |   4 +-
 26 files changed, 663 insertions(+), 488 deletions(-)
 create mode 100644 src/main/runtime/orca-runtime-tests/mobile-session-tabs-targeted-agent-resume-claim-lifetime.spec.ts
 create mode 100644 src/main/runtime/orca-runtime-tests/targeted-agent-resume.test-fixture.ts
 create mode 100644 src/main/runtime/runtime-fake-spawn-binding.test-fixture.ts

diff --git a/config/scripts/pr-unit-support-routing.test.mjs b/config/scripts/pr-unit-support-routing.test.mjs
index 6b50ca830ce0..4212a8bbbc8a 100644
--- a/config/scripts/pr-unit-support-routing.test.mjs
+++ b/config/scripts/pr-unit-support-routing.test.mjs
@@ -22,6 +22,7 @@ const unitHarnesses = [
   'src/renderer/src/runtime/sync-runtime-graph-test-harness.ts'
 ]
 const supportBridges = new Set([
+  'src/renderer/src/components/tab-bar/tab-session-history-fixtures.test-fixture.ts',
   'src/renderer/src/runtime/web-runtime-browser-creation-placement-test-rig.ts',
   'src/renderer/src/components/editor/editor-model-lifetime-fixture.ts',
   // Autosave suites' store rig; it takes the editor harness's tab-layout maps.
diff --git a/src/main/daemon/terminal-host-concurrent-create.test.ts b/src/main/daemon/terminal-host-concurrent-create.test.ts
index 85dd89799295..9f631b20a7b6 100644
--- a/src/main/daemon/terminal-host-concurrent-create.test.ts
+++ b/src/main/daemon/terminal-host-concurrent-create.test.ts
@@ -1,5 +1,6 @@
 import { describe, expect, it, vi } from 'vitest'
 import type { SubprocessHandle } from './session-subprocess-handle'
+import type { TerminalHostOptions } from './terminal-host-options'
 import { TerminalHost } from './terminal-host'
 
 vi.mock('../pty-descendant-termination', () => ({ killWithDescendantSweep: vi.fn() }))
@@ -95,8 +96,11 @@ describe('concurrent createOrAttach across the async spawn', () => {
 
   it('lets the next caller spawn after a failed spawn releases the gate', async () => {
     const spawnSubprocess = vi
-      .fn<() => Promise<SubprocessHandle>>()
-      .mockRejectedValueOnce(new Error('Working directory "X" does not exist.'))
+      .fn<TerminalHostOptions['spawnSubprocess']>()
+      .mockImplementationOnce((opts) => {
+        opts.onCreationDisposition?.({ kind: 'no-fork' })
+        throw new Error('Working directory "X" does not exist.')
+      })
       .mockImplementation(async () => mockSubprocess())
     const host = new TerminalHost({ spawnSubprocess })
 
@@ -174,6 +178,7 @@ describe('concurrent createOrAttach across the async spawn', () => {
     })
 
     const creation = host.createOrAttach(createOptions('shutdown-race'))
+    const canceled = expect(creation).rejects.toThrow('Attach canceled')
     const disposal = host.dispose()
     let disposed = false
     void disposal.then(() => {
@@ -184,7 +189,7 @@ describe('concurrent createOrAttach across the async spawn', () => {
     expect(disposed).toBe(false)
 
     releaseSpawn()
-    await creation
+    await canceled
     await disposal
 
     expect(subprocess.forceKill).toHaveBeenCalledOnce()
@@ -197,9 +202,14 @@ describe('concurrent createOrAttach across the async spawn', () => {
       rejectSpawn = () => reject(new Error('spawn failed'))
     })
     const spawnSubprocess = vi
-      .fn<() => Promise<SubprocessHandle>>()
-      .mockImplementationOnce(async () => {
-        await spawnGate
+      .fn<TerminalHostOptions['spawnSubprocess']>()
+      .mockImplementationOnce(async (opts) => {
+        try {
+          await spawnGate
+        } catch (error) {
+          opts.onCreationDisposition?.({ kind: 'no-fork' })
+          throw error
+        }
         return mockSubprocess()
       })
       .mockImplementation(async () => mockSubprocess())
diff --git a/src/main/daemon/terminal-host-cwd-readability.test.ts b/src/main/daemon/terminal-host-cwd-readability.test.ts
index 771e37e229ec..2bb707641c9e 100644
--- a/src/main/daemon/terminal-host-cwd-readability.test.ts
+++ b/src/main/daemon/terminal-host-cwd-readability.test.ts
@@ -188,7 +188,12 @@ describe('TerminalHost cwd readability verdict', () => {
     host = new TerminalHost({
       spawnSubprocess: async (opts) => {
         if (opts.cwd) {
-          await validateWorkingDirectoryAsync(opts.cwd, { signal: opts.cancelSignal })
+          try {
+            await validateWorkingDirectoryAsync(opts.cwd, { signal: opts.cancelSignal })
+          } catch (error) {
+            opts.onCreationDisposition?.({ kind: 'no-fork' })
+            throw error
+          }
         }
         return createMockSubprocess()
       }
diff --git a/src/main/ipc/pty/spawn-commit-binding.ts b/src/main/ipc/pty/spawn-commit-binding.ts
index 171386ea7b29..794eafabf8da 100644
--- a/src/main/ipc/pty/spawn-commit-binding.ts
+++ b/src/main/ipc/pty/spawn-commit-binding.ts
@@ -105,6 +105,25 @@ export async function savePtySpawnPaneBinding(
   }
 }
 
+/** Optional runtime stores delegate the same binding write without introducing an await when absent. */
+export function persistFreshPaneBindingIfSupported(
+  store: Partial<Pick<Store, 'persistPtyBinding' | 'getWorkspaceSession'>> | null | undefined,
+  input: PersistPtyBindingArgs | (() => PersistPtyBindingArgs),
+  connectionId?: string | null
+): Promise<boolean> | undefined {
+  if (!store?.persistPtyBinding || !store.getWorkspaceSession) {
+    return undefined
+  }
+  return persistFreshPaneBinding(
+    {
+      persistPtyBinding: store.persistPtyBinding.bind(store),
+      getWorkspaceSession: store.getWorkspaceSession.bind(store)
+    },
+    input,
+    connectionId
+  )
+}
+
 /** Runs inside the existing durable mutation, after source/topology checks and before any bind. */
 export async function persistFreshPaneBinding(
   store: Pick<Store, 'persistPtyBinding' | 'getWorkspaceSession'>,
diff --git a/src/main/runtime/bind-first-pane.test-fixture.ts b/src/main/runtime/bind-first-pane.test-fixture.ts
index 3ae7ed5e415a..1a0977b465b1 100644
--- a/src/main/runtime/bind-first-pane.test-fixture.ts
+++ b/src/main/runtime/bind-first-pane.test-fixture.ts
@@ -2,7 +2,7 @@
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../shared/layout-owner-switch'
 import type { RuntimePtyController } from './runtime-pty-controller-contract'
 import type { WorkspaceSessionState } from '../../shared/workspace-session-state-types'
-import { getConnectionExecutionHostId } from '../../shared/execution-host'
+import { captureFakeSpawnBinding } from './runtime-fake-spawn-binding.test-fixture'
 import { getPtyExecutionHost } from '../../shared/terminal-execution-host'
 import { asProfileSessionStore, storeOf } from './profile-session-store.test-fixture'
 import { reusedTerminalIdUnbinding } from '../persistence/loading-store/reused-terminal-id-unbind'
@@ -172,58 +172,13 @@ export function committingSpawn<
   hostId = 'local'
 ): (args: Args) => Promise<Result> {
   return async (args) => {
+    const commit = captureFakeSpawnBinding(runtime, args, hostId)
     const result = await spawn(args)
-    if (args.worktreeId && args.tabId && args.leafId && typeof result?.id === 'string') {
-      bindPaneFirst(
-        runtime,
-        {
-          worktreeId: args.worktreeId,
-          tabId: args.tabId,
-          leafId: args.leafId,
-          ptyId: result.id
-        },
-        hostId
-      )
-    }
+    commit(result)
     return result
   }
 }
 
-/** Bind the pre-spawn pane, refusing one closed since; emulate it for stores without pane writes. */
-function commitIntoWrittenPane(
-  runtime: OrcaRuntimeService,
-  args: SpawnArgs,
-  result: unknown
-): void {
-  const ptyId = result && typeof result === 'object' && 'id' in result ? result.id : null
-  const store = storeOf(runtime)
-  if (
-    !store?.getWorkspaceSession ||
-    !args.worktreeId ||
-    !args.tabId ||
-    !args.leafId ||
-    typeof ptyId !== 'string'
-  ) {
-    return
-  }
-  const { worktreeId, tabId, leafId } = args
-  const holdsPane = (hostId: string): boolean => {
-    const session = store.getWorkspaceSession?.(hostId)
-    return (
-      (session?.tabsByWorktree?.[worktreeId]?.some((tab) => tab.id === tabId) ?? false) &&
-      layoutContainsLeafId(session?.terminalLayoutsByTabId?.[tabId]?.root ?? null, leafId)
-    )
-  }
-  const hostId = !Reflect.has(store, 'admitTerminalPane')
-    ? 'local'
-    : [getConnectionExecutionHostId(args.connectionId), 'local'].find(holdsPane)
-  if (hostId) {
-    bindPaneFirst(runtime, { worktreeId, tabId, leafId, ptyId }, hostId)
-  }
-}
-
-type SpawnArgs = Parameters<NonNullable<RuntimePtyController['spawn']>>[0]
-
 type PtyControllerRuntimePrototype = {
   setPtyController: (this: OrcaRuntimeService, controller: RuntimePtyController | null) => void
 }
@@ -244,8 +199,6 @@ export function commitFakeSpawnsInRuntimeTests(prototype: PtyControllerRuntimePr
       setPtyController.call(this, controller)
       return
     }
-    const commit = (args: SpawnArgs, result: unknown): void =>
-      commitIntoWrittenPane(this, args, result)
     // Wrap via accessor so later spy/reassignment spawns also commit.
     type Spawn = NonNullable<RuntimePtyController['spawn']>
     const committed = new WeakMap<Spawn, Spawn>()
@@ -258,8 +211,9 @@ export function commitFakeSpawnsInRuntimeTests(prototype: PtyControllerRuntimePr
         let wrapped = committed.get(own)
         if (!wrapped) {
           wrapped = async (args) => {
+            const commit = captureFakeSpawnBinding(this, args)
             const result = await own.call(controller, args)
-            commit(args, result)
+            commit(result)
             return result
           }
           committed.set(own, wrapped)
diff --git a/src/main/runtime/orca-runtime-test-fixtures.spec.ts b/src/main/runtime/orca-runtime-test-fixtures.spec.ts
index c2538525f32f..624440c92075 100644
--- a/src/main/runtime/orca-runtime-test-fixtures.spec.ts
+++ b/src/main/runtime/orca-runtime-test-fixtures.spec.ts
@@ -14,6 +14,8 @@ import { getDefaultWorkspaceSession } from '../../shared/constants'
 import { makePaneKey } from '../../shared/stable-pane-id'
 import type { LayoutCommand } from '../../shared/workspace-layout/workspace-layout-command-types'
 import { applyCommandToSession } from '../persistence/terminal-topology/terminal-pane-admission'
+import { applyPtyBinding } from '../persistence/loading-store/pty-binding-session-update'
+import { ptyBindingIsRefused } from '../persistence/loading-store/pty-binding-refusals'
 import { resolveHostId } from '../persistence/loading-store/session-host-partitions'
 import { toComparableRelaySshPtyId } from '../../shared/ssh-pty-id'
 import { spawnedPtyEnv } from './spawned-pty-env-fixtures'
@@ -626,30 +628,16 @@ function makeRuntimeStoreWithWorkspaceSession(
         if (!args) {
           return false
         }
-        const tabs = session.tabsByWorktree[args.worktreeId] ?? []
-        session = {
-          ...session,
-          tabsByWorktree: {
-            ...session.tabsByWorktree,
-            [args.worktreeId]: tabs.map((tab) =>
-              tab.id === args.tabId ? { ...tab, ptyId: args.ptyId } : tab
-            )
-          },
-          terminalLayoutsByTabId: {
-            ...session.terminalLayoutsByTabId,
-            [args.tabId]: {
-              ...(session.terminalLayoutsByTabId[args.tabId] ?? {
-                root: { type: 'leaf', leafId: args.leafId },
-                activeLeafId: args.leafId,
-                expandedLeafId: null
-              }),
-              ptyIdsByLeafId: {
-                ...session.terminalLayoutsByTabId[args.tabId]?.ptyIdsByLeafId,
-                [args.leafId]: args.ptyId
-              }
-            }
-          }
+        const worktreeId = args.expectedSourceBinding?.worktreeId ?? args.worktreeId
+        const paneKey = makePaneKey(args.tabId, args.leafId)
+        if (
+          ptyBindingIsRefused(args, session, worktreeId, paneKey, [
+            { hostId: ownerHostId, session }
+          ])
+        ) {
+          return false
         }
+        applyPtyBinding(args, session, worktreeId, paneKey)
         return true
       })
     })
diff --git a/src/main/runtime/orca-runtime-tests/mobile-session-tabs-targeted-agent-resume-claim-lifetime.spec.ts b/src/main/runtime/orca-runtime-tests/mobile-session-tabs-targeted-agent-resume-claim-lifetime.spec.ts
new file mode 100644
index 000000000000..bc45cf8a9780
--- /dev/null
+++ b/src/main/runtime/orca-runtime-tests/mobile-session-tabs-targeted-agent-resume-claim-lifetime.spec.ts
@@ -0,0 +1,206 @@
+import { describe, expect, it } from 'vitest'
+import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../shared/layout-owner-switch'
+import type { AgentStatusIpcPayload } from '../../../shared/agent-status-types'
+import { TEST_WORKTREE_ID } from '../orca-runtime-test-fixtures.spec'
+import { deterministicAgentSessionUuid } from '../runtime-agent-launch-resolution'
+import { deriveRemoteRuntimeTerminalCreateHandle } from '../remote-runtime-terminal-create-identity'
+import {
+  PANE_KEY,
+  MUTATION_ID,
+  makeSleptWorkspace,
+  makeRuntime,
+  sessionRow,
+  resumeSpawns,
+  storedRecord
+} from './targeted-agent-resume.test-fixture'
+
+describe('resumeAgentSessionInWorkspace retries, cancellation and a failed publication', () => {
+  it('reconciles the same request after its own hook arrives', async () => {
+    let rows: AgentStatusIpcPayload[] = []
+    const terminalHandle = deriveRemoteRuntimeTerminalCreateHandle(
+      'agent-session-resume',
+      TEST_WORKTREE_ID,
+      MUTATION_ID
+    )
+    const { resume, spawn } = makeRuntime(makeSleptWorkspace(), {
+      rows: () => rows,
+      checkHookAgentPresence: async () => 'live',
+      listProcesses: async () =>
+        spawn.mock.calls.length > 0
+          ? [
+              {
+                id: 'resumed-pty',
+                cwd: '',
+                title: 'claude',
+                terminalHandle,
+                worktreeId: TEST_WORKTREE_ID
+              }
+            ]
+          : []
+    })
+    const first = await resume()
+    if (!first.ok) {
+      throw new Error(first.reason)
+    }
+    rows = [sessionRow(first.paneKey, Date.now() + 1)]
+    await expect(resume()).resolves.toEqual(first)
+    expect(spawn).toHaveBeenCalledOnce()
+  })
+
+  it('honors cancellation during create inventory lookup before dispatch', async () => {
+    const controller = new AbortController()
+    const { resume, spawn } = makeRuntime(makeSleptWorkspace(), {
+      listProcesses: async () => {
+        controller.abort()
+        return []
+      }
+    })
+    await expect(resume({ signal: controller.signal })).resolves.toMatchObject({ ok: false })
+    expect(spawn).not.toHaveBeenCalled()
+  })
+
+  it('settles a failed post-spawn publication when that PTY exits', async () => {
+    const { runtime, resume } = makeRuntime(makeSleptWorkspace())
+    const unsubscribe = runtime.onMobileSessionTabsChanged(() => {
+      throw new Error('publication failed')
+    })
+    await expect(resume()).resolves.toEqual({ ok: false, reason: 'create_failed' })
+    unsubscribe()
+    runtime.onPtyExit('resumed-pty', 0)
+    await expect(resume({ mutationId: 'next-delivery' })).resolves.toMatchObject({ ok: true })
+  })
+})
+
+describe('resumeAgentSessionInWorkspace claim lifetime', () => {
+  it('releases the hold after a proven exit before registration', async () => {
+    let first = true
+    const { runtime, resume } = makeRuntime(makeSleptWorkspace(), {
+      spawn: async () => {
+        if (first) {
+          first = false
+          runtime.beginPtyRegistration('resumed-pty')
+          runtime.onPtyExit('resumed-pty', 0)
+        }
+        return { id: 'resumed-pty' }
+      }
+    })
+    await expect(resume()).resolves.toEqual({ ok: false, reason: 'create_failed' })
+    await expect(resume({ mutationId: 'after-proven-exit' })).resolves.toMatchObject({ ok: true })
+  })
+
+  it('does not settle a lost reply using another caller terminal in the same pane', async () => {
+    let rejectFirst!: (error: Error) => void
+    let started!: () => void
+    const start = new Promise<void>((resolve) => {
+      started = resolve
+    })
+    let calls = 0
+    const { runtime, resume, spawn } = makeRuntime(makeSleptWorkspace(), {
+      spawn: async () => {
+        calls += 1
+        if (calls === 1) {
+          started()
+          return new Promise<{ id: string }>((_resolve, reject) => {
+            rejectFirst = reject
+          })
+        }
+        return { id: `other-pty-${calls}` }
+      }
+    })
+    const first = resume()
+    await start
+    const args = spawn.mock.calls[0]?.[0]
+    if (
+      !args ||
+      typeof args !== 'object' ||
+      !('tabId' in args) ||
+      !('leafId' in args) ||
+      typeof args.tabId !== 'string' ||
+      typeof args.leafId !== 'string'
+    ) {
+      throw new Error('missing pane identity')
+    }
+    const other = await runtime.createTerminal(`id:${TEST_WORKTREE_ID}`, {
+      tabId: args.tabId,
+      leafId: args.leafId,
+      command: 'echo another caller',
+      focus: false
+    })
+    rejectFirst(new Error('lost spawn reply'))
+    await expect(first).resolves.toEqual({ ok: false, reason: 'create_failed' })
+    if (!other.ptyId) {
+      throw new Error('missing other PTY')
+    }
+    runtime.onPtyExit(other.ptyId, 0)
+    await expect(resume({ mutationId: 'other-delivery' })).resolves.toEqual({
+      ok: false,
+      reason: 'held_elsewhere'
+    })
+  })
+
+  it('does not settle an ambiguous resume using an earlier exited shell in its pane', async () => {
+    const seed = `${TEST_WORKTREE_ID}\0${MUTATION_ID}`
+    const tabId = deterministicAgentSessionUuid(`agent-session-resume-tab\0${seed}`)
+    const leafId = deterministicAgentSessionUuid(`agent-session-resume-leaf\0${seed}`)
+    let firstInventory = true
+    let spawns = 0
+    const { runtime, resume } = makeRuntime(makeSleptWorkspace(), {
+      listProcesses: async () => {
+        if (firstInventory) {
+          firstInventory = false
+          const other = await runtime.createTerminal(`id:${TEST_WORKTREE_ID}`, {
+            tabId,
+            leafId,
+            command: 'echo another caller',
+            focus: false
+          })
+          if (!other.ptyId) {
+            throw new Error('missing shell PTY')
+          }
+          runtime.onPtyExit(other.ptyId, 0)
+        }
+        return []
+      },
+      spawn: async () => {
+        spawns += 1
+        if (spawns === 2) {
+          throw new Error('resume started but reply lost')
+        }
+        return { id: `sequential-pty-${spawns}` }
+      }
+    })
+    await expect(resume()).resolves.toEqual({ ok: false, reason: 'create_failed' })
+    await expect(resume({ mutationId: 'next-delivery' })).resolves.toEqual({
+      ok: false,
+      reason: 'held_elsewhere'
+    })
+  })
+})
+
+it.runIf(ORCA_LAYOUT_OWNER_IS_MAIN)(
+  'hands a numbered-record resume claim to the stable pane hook',
+  async () => {
+    const fixture = makeSleptWorkspace()
+    const record = storedRecord(fixture)
+    if (!record) {
+      throw new Error('missing sleep record')
+    }
+    fixture.setSession({
+      ...fixture.getSession(),
+      sleepingAgentSessionsByPaneKey: {
+        'host-tab:1': { ...record, paneKey: 'host-tab:1', state: 'done' }
+      }
+    })
+    let rows: AgentStatusIpcPayload[] = []
+    let spawned = 0
+    const { resume, openOldPane, spawn } = makeRuntime(fixture, {
+      rows: () => rows,
+      checkHookAgentPresence: async () => 'exited',
+      spawn: async () => ({ id: `numbered-resume-${++spawned}` })
+    })
+    await openOldPane()
+    expect(resumeSpawns(spawn)).toBe(1)
+    rows = [sessionRow(PANE_KEY, Date.now() + 1)]
+    await expect(resume()).resolves.toMatchObject({ ok: true })
+  }
+)
diff --git a/src/main/runtime/orca-runtime-tests/mobile-session-tabs-targeted-agent-resume.spec.ts b/src/main/runtime/orca-runtime-tests/mobile-session-tabs-targeted-agent-resume.spec.ts
index 04b7d9c2f157..975f2ba600ee 100644
--- a/src/main/runtime/orca-runtime-tests/mobile-session-tabs-targeted-agent-resume.spec.ts
+++ b/src/main/runtime/orca-runtime-tests/mobile-session-tabs-targeted-agent-resume.spec.ts
@@ -1,21 +1,9 @@
 import { describe, expect, it, vi } from 'vitest'
-import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../shared/layout-owner-switch'
-import { OrcaRuntimeService, electronMocks } from '../orca-runtime-test-mocks.spec'
-import type { SleepingAgentSessionRecord } from '../orca-runtime-test-mocks.spec'
-import {
-  HEADLESS_LEAF_ID,
-  HEADLESS_SECOND_LEAF_ID,
-  TEST_WINDOW_ID,
-  TEST_WORKTREE_ID,
-  makeRuntimeStoreWithWorkspaceSession,
-  makeWorkspaceSessionWithHeadlessTerminal
-} from '../orca-runtime-test-fixtures.spec'
+import type { OrcaRuntimeService } from '../orca-runtime-test-mocks.spec'
+import { HEADLESS_SECOND_LEAF_ID, TEST_WORKTREE_ID } from '../orca-runtime-test-fixtures.spec'
 import type { AgentStatusIpcPayload } from '../../../shared/agent-status-types'
 import type { TerminalLaunchResult } from '../../../shared/agent-session-resume'
-import type { PtyProcessInfo } from '../../providers/pty-provider-contract'
-import { deterministicAgentSessionUuid } from '../runtime-agent-launch-resolution'
 import { deriveRemoteRuntimeTerminalCreateHandle } from '../remote-runtime-terminal-create-identity'
-import type { RuntimePtyController } from '../runtime-pty-controller-contract'
 import { agentSessionConversationView } from '../../../shared/agent-session-conversation-view'
 import { AgentSessionRecordStore } from '../agent-session-record-store'
 import {
@@ -26,35 +14,21 @@ import {
   chooseSavedResumeFreshLaunch,
   savedResumeResult
 } from '../../ipc/pty/host-env/saved-resume-admission'
+import {
+  PANE_KEY,
+  SESSION,
+  MUTATION_ID,
+  makeSleptWorkspace,
+  makeRuntime,
+  sessionRow,
+  spawnedCommands,
+  resumeSpawns,
+  storedRecord,
+  type Fixture
+} from './targeted-agent-resume.test-fixture'
 
-const PANE_KEY = `host-tab:${HEADLESS_LEAF_ID}`
-const SESSION = { key: 'session_id', id: 'provider-session-1' } as const
-const MUTATION_ID = '["dev","thread-1","delivery-1"]'
 const PANE_OWNED = { origin: 'worktree-sleep', state: 'done', restoreOnTabOpenOnly: true }
 
-function makeSleptWorkspace() {
-  const record: SleepingAgentSessionRecord = {
-    paneKey: PANE_KEY,
-    tabId: 'host-tab',
-    worktreeId: TEST_WORKTREE_ID,
-    agent: 'claude',
-    providerSession: SESSION,
-    prompt: 'do the thing',
-    state: 'working',
-    capturedAt: 1,
-    updatedAt: 1,
-    origin: 'worktree-sleep',
-    launchConfig: { agentArgs: '--permission-mode plan', agentEnv: {} }
-  }
-  return makeRuntimeStoreWithWorkspaceSession(
-    makeWorkspaceSessionWithHeadlessTerminal({
-      sleepingAgentSessionsByPaneKey: { [PANE_KEY]: record }
-    })
-  )
-}
-
-type Fixture = ReturnType<typeof makeSleptWorkspace>
-
 type DurableMutationStore = { runDurableMutation: (mutate: unknown) => Promise<unknown> }
 
 function isDurableMutationStore(
@@ -76,88 +50,6 @@ function hasWorkspaceScopeResolver(
   )
 }
 
-function sessionRow(paneKey: string, receivedAt = 0): AgentStatusIpcPayload {
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the resume guards read only paneKey, providerSession and the observation clocks.
-  return { paneKey, providerSession: SESSION, receivedAt } as never
-}
-
-function makeRuntime(
-  fixture: Fixture,
-  opts: {
-    spawn?: NonNullable<RuntimePtyController['spawn']>
-    rows?: () => AgentStatusIpcPayload[]
-    checkHookAgentPresence?: () => Promise<'live' | 'unverifiable' | 'exited' | null>
-    listProcesses?: () => Promise<PtyProcessInfo[]>
-    subscribeAgentProviderSessionChanges?: (
-      listener: (sessions: readonly { paneKey: string; sessionId: string }[]) => void
-    ) => () => void
-  } = {}
-) {
-  const spawn = vi.fn<NonNullable<RuntimePtyController['spawn']>>(
-    opts.spawn ?? (() => Promise.resolve({ id: 'resumed-pty' }))
-  )
-  const runtime = new OrcaRuntimeService(fixture.runtimeStore, undefined, {
-    getDesktopWindowStatus: () => 'openable',
-    ...(opts.rows ? { getAgentProviderSessionSnapshot: opts.rows } : {}),
-    ...(opts.checkHookAgentPresence ? { checkHookAgentPresence: opts.checkHookAgentPresence } : {}),
-    ...(opts.subscribeAgentProviderSessionChanges
-      ? { subscribeAgentProviderSessionChanges: opts.subscribeAgentProviderSessionChanges }
-      : {})
-  })
-  runtime.setPtyController({
-    spawn,
-    write: () => true,
-    kill: () => true,
-    getForegroundProcess: async () => null,
-    listProcesses: opts.listProcesses ?? (async () => [])
-  })
-  runtime.syncWindowGraph(0, { tabs: [], leaves: [] })
-  electronMocks.BrowserWindow.fromId.mockReturnValue(null)
-  const attachWindow = (webContents?: { send: (...args: unknown[]) => void }): void => {
-    runtime.attachWindow(TEST_WINDOW_ID)
-    runtime.markGraphReady(TEST_WINDOW_ID)
-    electronMocks.BrowserWindow.fromId.mockReturnValue({
-      isDestroyed: () => false,
-      ...(webContents ? { webContents } : {})
-    })
-  }
-  const resume = (
-    overrides: {
-      captureHostId?: 'local' | `ssh:${string}`
-      mutationId?: string
-      signal?: AbortSignal
-    } = {}
-  ) =>
-    runtime.resumeAgentSessionInWorkspace(TEST_WORKTREE_ID, {
-      agent: 'claude',
-      providerSession: SESSION,
-      captureHostId: overrides.captureHostId ?? 'local',
-      mutationId: overrides.mutationId ?? MUTATION_ID,
-      signal: overrides.signal
-    })
-  const openOldPane = () =>
-    runtime.activateMobileSessionTab(`id:${TEST_WORKTREE_ID}`, 'host-tab', HEADLESS_LEAF_ID, {
-      notifyClients: false,
-      navigation: 'caller',
-      intent: 'user'
-    })
-  return { runtime, spawn, attachWindow, resume, openOldPane }
-}
-
-function spawnedCommands(spawn: ReturnType<typeof vi.fn>): string[] {
-  return spawn.mock.calls.map(([args]: unknown[]) =>
-    typeof args === 'object' && args !== null && 'command' in args ? String(args.command ?? '') : ''
-  )
-}
-
-function resumeSpawns(spawn: ReturnType<typeof vi.fn>): number {
-  return spawnedCommands(spawn).filter((command) => command.includes('provider-session-1')).length
-}
-
-function storedRecord(fixture: Fixture) {
-  return fixture.getSession().sleepingAgentSessionsByPaneKey?.[PANE_KEY]
-}
-
 describe('resumeAgentSessionInWorkspace', () => {
   it.each(['live', 'worktree-sleep'] as const)(
     'releases a %s saved resume claim when actual admission creates a plain shell',
@@ -179,6 +71,7 @@ describe('resumeAgentSessionInWorkspace', () => {
       chat.providerHandleChain[0]!.handle.nativeId = SESSION.id
       let nativeOpen = true
       const store: AgentSessionRecordStore = Object.create(AgentSessionRecordStore.prototype)
+      store.getRecord = (sessionId) => (sessionId === chat.sessionId ? chat : null)
       store.listConversations = () => [agentSessionConversationView(chat)]
       store.getVisibleSessionTabIndex = () => ({
         present: true,
@@ -682,194 +575,3 @@ describe('resumeAgentSessionInWorkspace', () => {
     await expect(resume()).resolves.toMatchObject({ ok: true })
   })
 })
-
-describe('resumeAgentSessionInWorkspace retries, cancellation and a failed publication', () => {
-  it('reconciles the same request after its own hook arrives', async () => {
-    let rows: AgentStatusIpcPayload[] = []
-    const terminalHandle = deriveRemoteRuntimeTerminalCreateHandle(
-      'agent-session-resume',
-      TEST_WORKTREE_ID,
-      MUTATION_ID
-    )
-    const { resume, spawn } = makeRuntime(makeSleptWorkspace(), {
-      rows: () => rows,
-      checkHookAgentPresence: async () => 'live',
-      listProcesses: async () =>
-        spawn.mock.calls.length > 0
-          ? [
-              {
-                id: 'resumed-pty',
-                cwd: '',
-                title: 'claude',
-                terminalHandle,
-                worktreeId: TEST_WORKTREE_ID
-              }
-            ]
-          : []
-    })
-    const first = await resume()
-    if (!first.ok) {
-      throw new Error(first.reason)
-    }
-    rows = [sessionRow(first.paneKey, Date.now() + 1)]
-    await expect(resume()).resolves.toEqual(first)
-    expect(spawn).toHaveBeenCalledOnce()
-  })
-
-  it('honors cancellation during create inventory lookup before dispatch', async () => {
-    const controller = new AbortController()
-    const { resume, spawn } = makeRuntime(makeSleptWorkspace(), {
-      listProcesses: async () => {
-        controller.abort()
-        return []
-      }
-    })
-    await expect(resume({ signal: controller.signal })).resolves.toMatchObject({ ok: false })
-    expect(spawn).not.toHaveBeenCalled()
-  })
-
-  it('settles a failed post-spawn publication when that PTY exits', async () => {
-    const { runtime, resume } = makeRuntime(makeSleptWorkspace())
-    const unsubscribe = runtime.onMobileSessionTabsChanged(() => {
-      throw new Error('publication failed')
-    })
-    await expect(resume()).resolves.toEqual({ ok: false, reason: 'create_failed' })
-    unsubscribe()
-    runtime.onPtyExit('resumed-pty', 0)
-    await expect(resume({ mutationId: 'next-delivery' })).resolves.toMatchObject({ ok: true })
-  })
-})
-
-describe('resumeAgentSessionInWorkspace claim lifetime', () => {
-  it('releases the hold after a proven exit before registration', async () => {
-    let first = true
-    const { runtime, resume } = makeRuntime(makeSleptWorkspace(), {
-      spawn: async () => {
-        if (first) {
-          first = false
-          runtime.beginPtyRegistration('resumed-pty')
-          runtime.onPtyExit('resumed-pty', 0)
-        }
-        return { id: 'resumed-pty' }
-      }
-    })
-    await expect(resume()).resolves.toEqual({ ok: false, reason: 'create_failed' })
-    await expect(resume({ mutationId: 'after-proven-exit' })).resolves.toMatchObject({ ok: true })
-  })
-
-  it('does not settle a lost reply using another caller terminal in the same pane', async () => {
-    let rejectFirst!: (error: Error) => void
-    let started!: () => void
-    const start = new Promise<void>((resolve) => {
-      started = resolve
-    })
-    let calls = 0
-    const { runtime, resume, spawn } = makeRuntime(makeSleptWorkspace(), {
-      spawn: async () => {
-        calls += 1
-        if (calls === 1) {
-          started()
-          return new Promise<{ id: string }>((_resolve, reject) => {
-            rejectFirst = reject
-          })
-        }
-        return { id: `other-pty-${calls}` }
-      }
-    })
-    const first = resume()
-    await start
-    const args = spawn.mock.calls[0]?.[0]
-    if (
-      !args ||
-      typeof args !== 'object' ||
-      !('tabId' in args) ||
-      !('leafId' in args) ||
-      typeof args.tabId !== 'string' ||
-      typeof args.leafId !== 'string'
-    ) {
-      throw new Error('missing pane identity')
-    }
-    const other = await runtime.createTerminal(`id:${TEST_WORKTREE_ID}`, {
-      tabId: args.tabId,
-      leafId: args.leafId,
-      command: 'echo another caller',
-      focus: false
-    })
-    rejectFirst(new Error('lost spawn reply'))
-    await expect(first).resolves.toEqual({ ok: false, reason: 'create_failed' })
-    if (!other.ptyId) {
-      throw new Error('missing other PTY')
-    }
-    runtime.onPtyExit(other.ptyId, 0)
-    await expect(resume({ mutationId: 'other-delivery' })).resolves.toEqual({
-      ok: false,
-      reason: 'held_elsewhere'
-    })
-  })
-
-  it('does not settle an ambiguous resume using an earlier exited shell in its pane', async () => {
-    const seed = `${TEST_WORKTREE_ID}\0${MUTATION_ID}`
-    const tabId = deterministicAgentSessionUuid(`agent-session-resume-tab\0${seed}`)
-    const leafId = deterministicAgentSessionUuid(`agent-session-resume-leaf\0${seed}`)
-    let firstInventory = true
-    let spawns = 0
-    const { runtime, resume } = makeRuntime(makeSleptWorkspace(), {
-      listProcesses: async () => {
-        if (firstInventory) {
-          firstInventory = false
-          const other = await runtime.createTerminal(`id:${TEST_WORKTREE_ID}`, {
-            tabId,
-            leafId,
-            command: 'echo another caller',
-            focus: false
-          })
-          if (!other.ptyId) {
-            throw new Error('missing shell PTY')
-          }
-          runtime.onPtyExit(other.ptyId, 0)
-        }
-        return []
-      },
-      spawn: async () => {
-        spawns += 1
-        if (spawns === 2) {
-          throw new Error('resume started but reply lost')
-        }
-        return { id: `sequential-pty-${spawns}` }
-      }
-    })
-    await expect(resume()).resolves.toEqual({ ok: false, reason: 'create_failed' })
-    await expect(resume({ mutationId: 'next-delivery' })).resolves.toEqual({
-      ok: false,
-      reason: 'held_elsewhere'
-    })
-  })
-})
-
-it.runIf(ORCA_LAYOUT_OWNER_IS_MAIN)(
-  'hands a numbered-record resume claim to the stable pane hook',
-  async () => {
-    const fixture = makeSleptWorkspace()
-    const record = storedRecord(fixture)
-    if (!record) {
-      throw new Error('missing sleep record')
-    }
-    fixture.setSession({
-      ...fixture.getSession(),
-      sleepingAgentSessionsByPaneKey: {
-        'host-tab:1': { ...record, paneKey: 'host-tab:1', state: 'done' }
-      }
-    })
-    let rows: AgentStatusIpcPayload[] = []
-    let spawned = 0
-    const { resume, openOldPane, spawn } = makeRuntime(fixture, {
-      rows: () => rows,
-      checkHookAgentPresence: async () => 'exited',
-      spawn: async () => ({ id: `numbered-resume-${++spawned}` })
-    })
-    await openOldPane()
-    expect(resumeSpawns(spawn)).toBe(1)
-    rows = [sessionRow(PANE_KEY, Date.now() + 1)]
-    await expect(resume()).resolves.toMatchObject({ ok: true })
-  }
-)
diff --git a/src/main/runtime/orca-runtime-tests/targeted-agent-resume.test-fixture.ts b/src/main/runtime/orca-runtime-tests/targeted-agent-resume.test-fixture.ts
new file mode 100644
index 000000000000..5587adc7a716
--- /dev/null
+++ b/src/main/runtime/orca-runtime-tests/targeted-agent-resume.test-fixture.ts
@@ -0,0 +1,121 @@
+import { vi } from 'vitest'
+import { OrcaRuntimeService, electronMocks } from '../orca-runtime-test-mocks.spec'
+import type { SleepingAgentSessionRecord } from '../orca-runtime-test-mocks.spec'
+import {
+  HEADLESS_LEAF_ID,
+  TEST_WINDOW_ID,
+  TEST_WORKTREE_ID,
+  makeRuntimeStoreWithWorkspaceSession,
+  makeWorkspaceSessionWithHeadlessTerminal
+} from '../orca-runtime-test-fixtures.spec'
+import type { AgentStatusIpcPayload } from '../../../shared/agent-status-types'
+import type { PtyProcessInfo } from '../../providers/pty-provider-contract'
+import type { RuntimePtyController } from '../runtime-pty-controller-contract'
+
+export const PANE_KEY = `host-tab:${HEADLESS_LEAF_ID}`
+export const SESSION = { key: 'session_id', id: 'provider-session-1' } as const
+export const MUTATION_ID = '["dev","thread-1","delivery-1"]'
+export function makeSleptWorkspace() {
+  const record: SleepingAgentSessionRecord = {
+    paneKey: PANE_KEY,
+    tabId: 'host-tab',
+    worktreeId: TEST_WORKTREE_ID,
+    agent: 'claude',
+    providerSession: SESSION,
+    prompt: 'do the thing',
+    state: 'working',
+    capturedAt: 1,
+    updatedAt: 1,
+    origin: 'worktree-sleep',
+    launchConfig: { agentArgs: '--permission-mode plan', agentEnv: {} }
+  }
+  return makeRuntimeStoreWithWorkspaceSession(
+    makeWorkspaceSessionWithHeadlessTerminal({
+      sleepingAgentSessionsByPaneKey: { [PANE_KEY]: record }
+    })
+  )
+}
+
+export type Fixture = ReturnType<typeof makeSleptWorkspace>
+
+export function sessionRow(paneKey: string, receivedAt = 0): AgentStatusIpcPayload {
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the resume guards read only paneKey, providerSession and the observation clocks.
+  return { paneKey, providerSession: SESSION, receivedAt } as never
+}
+
+export function makeRuntime(
+  fixture: Fixture,
+  opts: {
+    spawn?: NonNullable<RuntimePtyController['spawn']>
+    rows?: () => AgentStatusIpcPayload[]
+    checkHookAgentPresence?: () => Promise<'live' | 'unverifiable' | 'exited' | null>
+    listProcesses?: () => Promise<PtyProcessInfo[]>
+    subscribeAgentProviderSessionChanges?: (
+      listener: (sessions: readonly { paneKey: string; sessionId: string }[]) => void
+    ) => () => void
+  } = {}
+) {
+  const spawn = vi.fn<NonNullable<RuntimePtyController['spawn']>>(
+    opts.spawn ?? (() => Promise.resolve({ id: 'resumed-pty' }))
+  )
+  const runtime = new OrcaRuntimeService(fixture.runtimeStore, undefined, {
+    getDesktopWindowStatus: () => 'openable',
+    ...(opts.rows ? { getAgentProviderSessionSnapshot: opts.rows } : {}),
+    ...(opts.checkHookAgentPresence ? { checkHookAgentPresence: opts.checkHookAgentPresence } : {}),
+    ...(opts.subscribeAgentProviderSessionChanges
+      ? { subscribeAgentProviderSessionChanges: opts.subscribeAgentProviderSessionChanges }
+      : {})
+  })
+  runtime.setPtyController({
+    spawn,
+    write: () => true,
+    kill: () => true,
+    getForegroundProcess: async () => null,
+    listProcesses: opts.listProcesses ?? (async () => [])
+  })
+  runtime.syncWindowGraph(0, { tabs: [], leaves: [] })
+  electronMocks.BrowserWindow.fromId.mockReturnValue(null)
+  const attachWindow = (webContents?: { send: (...args: unknown[]) => void }): void => {
+    runtime.attachWindow(TEST_WINDOW_ID)
+    runtime.markGraphReady(TEST_WINDOW_ID)
+    electronMocks.BrowserWindow.fromId.mockReturnValue({
+      isDestroyed: () => false,
+      ...(webContents ? { webContents } : {})
+    })
+  }
+  const resume = (
+    overrides: {
+      captureHostId?: 'local' | `ssh:${string}`
+      mutationId?: string
+      signal?: AbortSignal
+    } = {}
+  ) =>
+    runtime.resumeAgentSessionInWorkspace(TEST_WORKTREE_ID, {
+      agent: 'claude',
+      providerSession: SESSION,
+      captureHostId: overrides.captureHostId ?? 'local',
+      mutationId: overrides.mutationId ?? MUTATION_ID,
+      signal: overrides.signal
+    })
+  const openOldPane = () =>
+    runtime.activateMobileSessionTab(`id:${TEST_WORKTREE_ID}`, 'host-tab', HEADLESS_LEAF_ID, {
+      notifyClients: false,
+      navigation: 'caller',
+      intent: 'user'
+    })
+  return { runtime, spawn, attachWindow, resume, openOldPane }
+}
+
+export function spawnedCommands(spawn: ReturnType<typeof vi.fn>): string[] {
+  return spawn.mock.calls.map(([args]: unknown[]) =>
+    typeof args === 'object' && args !== null && 'command' in args ? String(args.command ?? '') : ''
+  )
+}
+
+export function resumeSpawns(spawn: ReturnType<typeof vi.fn>): number {
+  return spawnedCommands(spawn).filter((command) => command.includes('provider-session-1')).length
+}
+
+export function storedRecord(fixture: Fixture) {
+  return fixture.getSession().sleepingAgentSessionsByPaneKey?.[PANE_KEY]
+}
diff --git a/src/main/runtime/orca-runtime.test.ts b/src/main/runtime/orca-runtime.test.ts
index 6cec562476a8..aa3e3c752c55 100644
--- a/src/main/runtime/orca-runtime.test.ts
+++ b/src/main/runtime/orca-runtime.test.ts
@@ -97,6 +97,7 @@ await import('./orca-runtime-tests/mobile-session-tabs-shell-selection.spec')
 await import('./orca-runtime-tests/mobile-session-tabs-split-agent-tab.spec')
 await import('./orca-runtime-tests/mobile-session-tabs-windowless-sleep-resume.spec')
 await import('./orca-runtime-tests/mobile-session-tabs-targeted-agent-resume.spec')
+await import('./orca-runtime-tests/mobile-session-tabs-targeted-agent-resume-claim-lifetime.spec')
 await import('./orca-runtime-tests/mobile-session-tabs-headless-wake-report.spec')
 await import('./orca-runtime-tests/exit-retirement-activation.spec')
 await import('./orca-runtime-tests/mobile-creation-and-orchestration.spec')
diff --git a/src/main/runtime/profile-session-store.test-fixture.ts b/src/main/runtime/profile-session-store.test-fixture.ts
index c04ec50b265a..19aeedf8e4c6 100644
--- a/src/main/runtime/profile-session-store.test-fixture.ts
+++ b/src/main/runtime/profile-session-store.test-fixture.ts
@@ -105,19 +105,19 @@ export function asProfileSessionStore(
       const host = resolveHostId(hostIds[0])
       const change = applyCommandToSession(
         host,
-        getWorkspaceSession(host) ?? getDefaultWorkspaceSession(),
+        getWorkspaceSession.call(store, host) ?? getDefaultWorkspaceSession(),
         command
       )
       if (change.session) {
-        setWorkspaceSession(change.session, host)
+        setWorkspaceSession.call(store, change.session, host)
       }
       return change.value
     }
   }
   boundHostIdsByStore.get(store)?.add(hostId)
   return {
-    get: (host) => getWorkspaceSession(host) ?? getDefaultWorkspaceSession(),
-    set: (session, host) => setWorkspaceSession(session, host)
+    get: (host) => getWorkspaceSession.call(store, host) ?? getDefaultWorkspaceSession(),
+    set: (session, host) => setWorkspaceSession.call(store, session, host)
   }
 }
 
diff --git a/src/main/runtime/runtime-fake-spawn-binding.test-fixture.ts b/src/main/runtime/runtime-fake-spawn-binding.test-fixture.ts
new file mode 100644
index 000000000000..534ba0599eb5
--- /dev/null
+++ b/src/main/runtime/runtime-fake-spawn-binding.test-fixture.ts
@@ -0,0 +1,94 @@
+import { getConnectionExecutionHostId } from '../../shared/execution-host'
+import { layoutContainsLeafId } from '../persistence/restoring-sessions/terminal-layout-normalization'
+import { ptyBindingIsRefused } from '../persistence/loading-store/pty-binding-refusals'
+import { applyPtyBinding } from '../persistence/loading-store/pty-binding-session-update'
+import { PaneOwnerContentionError } from '../ipc/pty/pane/pane-spawn-operation'
+import { asProfileSessionStore, storeOf } from './profile-session-store.test-fixture'
+import type { OrcaRuntimeService } from './orca-runtime'
+import type { RuntimePtyController } from './runtime-pty-controller-contract'
+
+type SpawnArgs = Parameters<NonNullable<RuntimePtyController['spawn']>>[0]
+
+/** A fake controller replaces only the pane admitted for this spawn, like the lower owner. */
+export function captureFakeSpawnBinding(
+  runtime: OrcaRuntimeService,
+  args: Pick<SpawnArgs, 'worktreeId' | 'tabId' | 'leafId' | 'connectionId'>,
+  explicitHostId?: string
+): (result: unknown) => void {
+  const store = storeOf(runtime)
+  if (!store || !args.worktreeId || !args.tabId || !args.leafId) {
+    return () => {}
+  }
+  const { worktreeId, tabId, leafId } = args
+  const holdsPane = (hostId: string): boolean => {
+    const session = store.getWorkspaceSession?.(hostId)
+    return (
+      (session?.tabsByWorktree[worktreeId]?.some((tab) => tab.id === tabId) ?? false) &&
+      layoutContainsLeafId(session?.terminalLayoutsByTabId[tabId]?.root ?? null, leafId)
+    )
+  }
+  const admitted = Reflect.has(store, 'admitTerminalPane')
+  const hostId =
+    explicitHostId ??
+    (admitted
+      ? [getConnectionExecutionHostId(args.connectionId), 'local'].find(holdsPane)
+      : 'local')
+  if (!hostId) {
+    return () => {}
+  }
+  const sessions = asProfileSessionStore(store, hostId)
+  const before = sessions.get(hostId)
+  const paneKey = `${tabId}:${leafId}`
+  const predecessor = before.terminalLayoutsByTabId[tabId]?.ptyIdsByLeafId?.[leafId]
+  const predecessorStamp = before.terminalPtyIncarnationsByPaneKey?.[paneKey]
+  return (result) => {
+    if (
+      !result ||
+      typeof result !== 'object' ||
+      !('id' in result) ||
+      typeof result.id !== 'string'
+    ) {
+      return
+    }
+    const incarnationId =
+      'incarnationId' in result && typeof result.incarnationId === 'string'
+        ? result.incarnationId
+        : undefined
+    const current = sessions.get(hostId)
+    const bound = current.terminalLayoutsByTabId[tabId]?.ptyIdsByLeafId?.[leafId]
+    const stamp = current.terminalPtyIncarnationsByPaneKey?.[paneKey]
+    // Explicit committingSpawn and the common controller wrapper may observe the same commit.
+    if (bound === result.id && stamp === incarnationId) {
+      return
+    }
+    const binding = {
+      worktreeId,
+      tabId,
+      leafId,
+      ptyId: result.id,
+      ...(incarnationId ? { incarnationId } : { dropsIncarnation: true as const }),
+      ...(predecessor
+        ? { expectedBinding: { ptyId: predecessor, incarnationId: predecessorStamp } }
+        : {}),
+      mayCreate: !admitted,
+      mayReviveRetiredSurface: false
+    }
+    if (
+      (!predecessor && bound !== undefined) ||
+      ptyBindingIsRefused(
+        binding,
+        current,
+        worktreeId,
+        paneKey,
+        (store.getWorkspaceSessionHostIds?.() ?? [hostId]).map((hostId) => ({
+          hostId,
+          session: sessions.get(hostId)
+        }))
+      )
+    ) {
+      throw new PaneOwnerContentionError()
+    }
+    applyPtyBinding(binding, current, worktreeId, paneKey)
+    sessions.set(current, hostId)
+  }
+}
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-create-reconciliation.ts b/src/main/runtime/terminal/launch/mobile-terminal-create-reconciliation.ts
index a09310dea554..d00b99a4da24 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-create-reconciliation.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-create-reconciliation.ts
@@ -12,7 +12,7 @@ import {
   type PtySurfaceTopology
 } from '../../pty-recorded-surface-topology'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
-import { persistFreshPaneBinding } from '../../../ipc/pty/spawn-commit-binding'
+import { persistFreshPaneBindingIfSupported } from '../../../ipc/pty/spawn-commit-binding'
 
 export abstract class OrcaRuntimeWithReconcileOwnedMobileTerminal extends OrcaRuntimeWithResolveMobileSessionTerminalCommand {
   protected abstract ptySurfaceTopology(): PtySurfaceTopology
@@ -127,26 +127,19 @@ export abstract class OrcaRuntimeWithReconcileOwnedMobileTerminal extends OrcaRu
       }
       return { tabId: candidate.tabId, leafId: candidate.leafId }
     }
-    const store = this.store
-    if (store?.persistPtyBinding && store.getWorkspaceSession) {
-      const { persistPtyBinding, getWorkspaceSession } = store
-      const persisted = await persistFreshPaneBinding(
-        {
-          persistPtyBinding: persistPtyBinding.bind(store),
-          getWorkspaceSession: getWorkspaceSession.bind(store)
-        },
-        () => ({
-          ...resolve(),
-          worktreeId,
-          ptyId: pty.ptyId,
-          ...(incarnationId ? { incarnationId } : {}),
-          mayReviveRetiredSurface: false
-        }),
-        connectionId
-      )
-      if (!persisted) {
-        throw new Error('terminal_handle_stale')
-      }
+    const pendingBinding = persistFreshPaneBindingIfSupported(
+      this.store,
+      () => ({
+        ...resolve(),
+        worktreeId,
+        ptyId: pty.ptyId,
+        ...(incarnationId ? { incarnationId } : {}),
+        mayReviveRetiredSurface: false
+      }),
+      connectionId
+    )
+    if (pendingBinding && !(await pendingBinding)) {
+      throw new Error('terminal_handle_stale')
     }
     const surface = resolve()
     if (
diff --git a/src/main/runtime/terminal/lifecycle/bind-first-registration-census.test.ts b/src/main/runtime/terminal/lifecycle/bind-first-registration-census.test.ts
index bc72aff65b93..84b743008857 100644
--- a/src/main/runtime/terminal/lifecycle/bind-first-registration-census.test.ts
+++ b/src/main/runtime/terminal/lifecycle/bind-first-registration-census.test.ts
@@ -32,8 +32,8 @@ const CREATE_PATHS = [
   },
   {
     path: 'runtime-owned mobile create and restored-pane start',
-    file: 'src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts',
-    bindsWith: 'createTerminal('
+    file: 'src/main/runtime/terminal/launch/mobile-terminal-create-reconciliation.ts',
+    bindsWith: 'persistFreshPaneBindingIfSupported('
   },
   {
     path: 'CLI split of a terminal',
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.availability-notice.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.availability-notice.test.tsx
index 85adcf18098f..e00fceac2809 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.availability-notice.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.availability-notice.test.tsx
@@ -38,6 +38,7 @@ vi.mock('./NativeChatApprovalCard', () => moduleFactories.nativeChatApprovalCard
 vi.mock('./NativeChatQuestionCard', () => moduleFactories.nativeChatQuestionCard())
 
 import { NativeChatStructuredSession } from './NativeChatStructuredSession'
+import { ConfirmationDialogProvider } from '@/components/confirmation-dialog'
 import { TooltipProvider } from '@/components/ui/tooltip'
 
 // The host's verdict is a notice that never holds Send: it can be wrong while a send would work.
@@ -57,14 +58,16 @@ afterEach(() => {
 function pane(agent: 'claude' | 'codex' = 'codex'): React.JSX.Element {
   return (
     <TooltipProvider>
-      <NativeChatStructuredSession
-        isVisible
-        isFocusedGroup
-        tabId="availability-tab"
-        sessionId="availability-session"
-        target={{ kind: 'local' }}
-        agent={agent}
-      />
+      <ConfirmationDialogProvider>
+        <NativeChatStructuredSession
+          isVisible
+          isFocusedGroup
+          tabId="availability-tab"
+          sessionId="availability-session"
+          target={{ kind: 'local' }}
+          agent={agent}
+        />
+      </ConfirmationDialogProvider>
     </TooltipProvider>
   )
 }
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx
index 9780baf7be3a..e915b9ee4133 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx
@@ -368,7 +368,7 @@ it('gates eligible native header hover and menu switches through capability hydr
   const row = within(actions)
   expect(row.getByRole('button', { name: 'Close tab', hidden: true })).toBeTruthy()
   const transcript = screen.getByTestId('message-list')
-  const legacyName = 'Show as terminal'
+  const legacyName = 'Continue with Terminal Agent'
   const expectHidden = () => {
     expect(screen.queryAllByRole('button', { name: 'Switch to CLI', hidden: true })).toHaveLength(0)
     expect(screen.queryByRole('menuitem', { name: 'Switch to CLI' })).toBeNull()
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.launch-lifecycle.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.launch-lifecycle.test.tsx
index ae5ee6178f91..317d11c7c824 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.launch-lifecycle.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.launch-lifecycle.test.tsx
@@ -37,6 +37,7 @@ vi.mock('@/runtime/use-managed-runtime-install', () => ({
 }))
 
 import { NativeChatStructuredSession } from './NativeChatStructuredSession'
+import { ConfirmationDialogProvider } from '@/components/confirmation-dialog'
 import { agentSessionRefusalFailure } from '../../../../shared/agent-session-write-failure'
 import { structuredLaunchFailure } from '@/lib/structured-agent-session-launch-failure'
 import { StructuredAgentSessionCreateRefusalError } from '@/lib/structured-agent-session-launch-errors'
@@ -56,14 +57,16 @@ const NOT_SIGNED_IN_TEXT = "Codex isn't signed in. Run `codex login`."
 
 function sessionView(agent: 'codex' | 'grok' = 'codex'): React.JSX.Element {
   return (
-    <NativeChatStructuredSession
-      isVisible
-      isFocusedGroup
-      tabId="structured-tab-1"
-      sessionId="session-1"
-      target={{ kind: 'local' }}
-      agent={agent}
-    />
+    <ConfirmationDialogProvider>
+      <NativeChatStructuredSession
+        isVisible
+        isFocusedGroup
+        tabId="structured-tab-1"
+        sessionId="session-1"
+        target={{ kind: 'local' }}
+        agent={agent}
+      />
+    </ConfirmationDialogProvider>
   )
 }
 
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.stopping.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.stopping.test.tsx
index 1299f43f2950..1f31adac624e 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.stopping.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.stopping.test.tsx
@@ -33,18 +33,21 @@ vi.mock('./NativeChatQuestionCard', () => moduleFactories.nativeChatQuestionCard
 
 import { TooltipProvider } from '@/components/ui/tooltip'
 import { NativeChatStructuredSession } from './NativeChatStructuredSession'
+import { ConfirmationDialogProvider } from '@/components/confirmation-dialog'
 
 function renderPane(): void {
   render(
     <TooltipProvider>
-      <NativeChatStructuredSession
-        isVisible
-        isFocusedGroup
-        tabId="structured-tab-1"
-        sessionId="session-1"
-        target={{ kind: 'local' }}
-        agent="codex"
-      />
+      <ConfirmationDialogProvider>
+        <NativeChatStructuredSession
+          isVisible
+          isFocusedGroup
+          tabId="structured-tab-1"
+          sessionId="session-1"
+          target={{ kind: 'local' }}
+          agent="codex"
+        />
+      </ConfirmationDialogProvider>
     </TooltipProvider>
   )
 }
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.test.tsx
index ba5358c1f175..d2292b1496b3 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.test.tsx
@@ -2,11 +2,19 @@ import * as terminalThemeSelection from '../../../../shared/terminal-theme-selec
 import { getDefaultSettings } from '../../../../shared/constants'
 // @vitest-environment happy-dom
 
-import { act, cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react'
+import {
+  act,
+  cleanup,
+  fireEvent,
+  render as renderWithConfirmation,
+  screen,
+  waitFor
+} from '@testing-library/react'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types'
 import { useAppStore } from '@/store'
 import { TooltipProvider } from '@/components/ui/tooltip'
+import { ConfirmationDialogProvider } from '@/components/confirmation-dialog'
 import {
   claudeGroupedQuestionPromptItems,
   legacySingleQuestionPromptItems
@@ -34,6 +42,10 @@ import { NativeChatStructuredSession } from './NativeChatStructuredSession'
 import { structuredAgentSessionPaneKey } from '../../../../shared/structured-agent-session-projection'
 import { structuredAgentSessionDraftScopeKey } from './native-chat-composer-draft-store'
 
+function render(ui: React.ReactNode) {
+  return renderWithConfirmation(ui, { wrapper: ConfirmationDialogProvider })
+}
+
 describe('NativeChatStructuredSession', () => {
   it('applies persisted appearance at the chat root and updates it live', () => {
     const original = useAppStore.getState().settings
diff --git a/src/renderer/src/components/native-chat/native-chat-header-ownership.test.tsx b/src/renderer/src/components/native-chat/native-chat-header-ownership.test.tsx
index 0f7fc2182318..a22c5f8d57f6 100644
--- a/src/renderer/src/components/native-chat/native-chat-header-ownership.test.tsx
+++ b/src/renderer/src/components/native-chat/native-chat-header-ownership.test.tsx
@@ -356,7 +356,7 @@ it('keeps the real Continue pending operation disabled across header hide/reveal
   mocks.launch.mockResolvedValue(undefined)
   const view = render(overlay(true))
   const source = chat(view.container, 'chat-0')
-  const button = () => within(source).getByRole('button', { name: 'Show as terminal' })
+  const button = () => within(source).getByRole('button', { name: 'Continue with Terminal Agent' })
   expect(fullRequest).not.toHaveBeenCalled()
   fireEvent.click(button())
   expect(button().hasAttribute('disabled')).toBe(true)
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-foreground-agent-routing.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection-foreground-agent-routing.spec.ts
index e68028b8ec02..2885685336f6 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-foreground-agent-routing.spec.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-foreground-agent-routing.spec.ts
@@ -109,7 +109,10 @@ export function registerPtyConnectionForegroundAgentRoutingTests(): void {
     it('clears pre-hook launch config when an Orca-started command exits', async () => {
       vi.useFakeTimers({ toFake: ['setTimeout'] })
       const { connectPanePty } = await import('./pty-connection')
-      vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue('zsh')
+      vi.mocked(window.api.pty.inspectProcess).mockResolvedValue({
+        foregroundProcess: 'zsh',
+        hasChildProcesses: false
+      })
 
       const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null }
       const transport = createMockTransport()
@@ -173,9 +176,10 @@ export function registerPtyConnectionForegroundAgentRoutingTests(): void {
       const ptyId = 'pty-manually-typed-droid'
       const tabId = 'tab-manually-typed-droid'
       const foregroundResults = ['powershell.exe', 'droid']
-      vi.mocked(window.api.pty.confirmForegroundProcess).mockImplementation(async (id: string) =>
-        id === ptyId ? (foregroundResults.shift() ?? 'droid') : null
-      )
+      vi.mocked(window.api.pty.inspectProcess).mockImplementation(async (id: string) => ({
+        foregroundProcess: id === ptyId ? (foregroundResults.shift() ?? 'droid') : null,
+        hasChildProcesses: false
+      }))
       const transport = createMockTransport(ptyId)
       transport.connect.mockImplementation(
         async ({ callbacks }: { callbacks: ConnectCallbacks }) => {
@@ -215,7 +219,10 @@ export function registerPtyConnectionForegroundAgentRoutingTests(): void {
     it('confirms a manually typed Droid without OSC command boundaries', async () => {
       vi.useFakeTimers()
       const { connectPanePty } = await import('./pty-connection')
-      vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue('droid')
+      vi.mocked(window.api.pty.inspectProcess).mockResolvedValue({
+        foregroundProcess: 'droid',
+        hasChildProcesses: false
+      })
       const pane = createPane(1)
       const ptyId = 'pty-manual-droid-no-osc'
       const tabId = 'tab-manual-droid-no-osc'
@@ -237,7 +244,9 @@ export function registerPtyConnectionForegroundAgentRoutingTests(): void {
 
       await vi.advanceTimersByTimeAsync(350)
 
-      expect(window.api.pty.confirmForegroundProcess).toHaveBeenCalledWith(ptyId)
+      expect(window.api.pty.inspectProcess).toHaveBeenCalledWith(ptyId, {
+        scanChildProcesses: true
+      })
       expect(mockStoreState.paneForegroundAgentByPaneKey[paneKey]).toEqual({
         agent: 'droid',
         agentEvidence: 'process-read',
@@ -252,7 +261,10 @@ export function registerPtyConnectionForegroundAgentRoutingTests(): void {
       vi.useFakeTimers()
       const { connectPanePty } = await import('./pty-connection')
       vi.mocked(window.api.pty.getForegroundProcess).mockResolvedValue('droid')
-      vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue('droid')
+      vi.mocked(window.api.pty.inspectProcess).mockResolvedValue({
+        foregroundProcess: 'droid',
+        hasChildProcesses: false
+      })
       const pane = createPane(1)
       const ptyId = 'pty-launched-droid-no-osc'
       const tabId = 'tab-launched-droid-no-osc'
@@ -283,7 +295,9 @@ export function registerPtyConnectionForegroundAgentRoutingTests(): void {
       )
       await flushAsyncTicks()
 
-      expect(window.api.pty.confirmForegroundProcess).toHaveBeenCalledWith(ptyId)
+      expect(window.api.pty.inspectProcess).toHaveBeenCalledWith(ptyId, {
+        scanChildProcesses: true
+      })
       expect(mockStoreState.paneForegroundAgentByPaneKey[paneKey]).toEqual({
         agent: 'droid',
         agentEvidence: 'process-read',
@@ -298,9 +312,10 @@ export function registerPtyConnectionForegroundAgentRoutingTests(): void {
       vi.useFakeTimers()
       const { connectPanePty } = await import('./pty-connection')
       const foregroundResults = ['bash.exe', 'bash.exe', 'droid']
-      vi.mocked(window.api.pty.confirmForegroundProcess).mockImplementation(
-        async () => foregroundResults.shift() ?? 'droid'
-      )
+      vi.mocked(window.api.pty.inspectProcess).mockImplementation(async () => ({
+        foregroundProcess: foregroundResults.shift() ?? 'droid',
+        hasChildProcesses: false
+      }))
       const pane = createPane(1)
       const ptyId = 'pty-launched-droid-slow-boot'
       const tabId = 'tab-launched-droid-slow-boot'
@@ -342,7 +357,10 @@ export function registerPtyConnectionForegroundAgentRoutingTests(): void {
       let foreground = 'bash.exe'
       // Why both: the pane's process monitor reads the same foreground the confirm read sees.
       vi.mocked(window.api.pty.getForegroundProcess).mockImplementation(async () => foreground)
-      vi.mocked(window.api.pty.confirmForegroundProcess).mockImplementation(async () => foreground)
+      vi.mocked(window.api.pty.inspectProcess).mockImplementation(async () => ({
+        foregroundProcess: foreground,
+        hasChildProcesses: false
+      }))
       const pane = createPane(1)
       const ptyId = 'pty-launched-droid-slow'
       const tabId = 'tab-launched-droid-slow'
@@ -394,7 +412,10 @@ export function registerPtyConnectionForegroundAgentRoutingTests(): void {
       const { connectPanePty } = await import('./pty-connection')
       let foreground = 'sleep'
       vi.mocked(window.api.pty.getForegroundProcess).mockImplementation(async () => foreground)
-      vi.mocked(window.api.pty.confirmForegroundProcess).mockImplementation(async () => foreground)
+      vi.mocked(window.api.pty.inspectProcess).mockImplementation(async () => ({
+        foregroundProcess: foreground,
+        hasChildProcesses: false
+      }))
       const tabId = 'tab-delayed-claude'
       const ptyId = 'pty-delayed-claude'
       const paneKey = makePaneKey(tabId, LEAF_1)
@@ -428,7 +449,10 @@ export function registerPtyConnectionForegroundAgentRoutingTests(): void {
     it('revokes trusted Droid after accepted no-OSC exit input until shell confirmation', async () => {
       vi.useFakeTimers()
       const { connectPanePty } = await import('./pty-connection')
-      vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue('cmd.exe')
+      vi.mocked(window.api.pty.inspectProcess).mockResolvedValue({
+        foregroundProcess: 'cmd.exe',
+        hasChildProcesses: false
+      })
       const pane = createPane(1)
       const ptyId = 'pty-droid-exit-no-osc'
       const tabId = 'tab-droid-exit-no-osc'
@@ -470,7 +494,10 @@ export function registerPtyConnectionForegroundAgentRoutingTests(): void {
       const { connectPanePty } = await import('./pty-connection')
       let foreground = 'pi'
       vi.mocked(window.api.pty.getForegroundProcess).mockResolvedValue('pi')
-      vi.mocked(window.api.pty.confirmForegroundProcess).mockImplementation(async () => foreground)
+      vi.mocked(window.api.pty.inspectProcess).mockImplementation(async () => ({
+        foregroundProcess: foreground,
+        hasChildProcesses: false
+      }))
       const pane = createPane(1)
       const ptyId = 'pty-pi-no-osc-lifecycle'
       const tabId = 'tab-pi-no-osc-lifecycle'
@@ -524,10 +551,10 @@ export function registerPtyConnectionForegroundAgentRoutingTests(): void {
     it('never promotes typed Droid text when foreground enrichment is unavailable', async () => {
       vi.useFakeTimers()
       const { connectPanePty } = await import('./pty-connection')
-      vi.mocked(window.api.pty.confirmForegroundProcess)
-        .mockResolvedValueOnce(null)
+      vi.mocked(window.api.pty.inspectProcess)
+        .mockResolvedValueOnce({ foregroundProcess: null, hasChildProcesses: false })
         .mockRejectedValueOnce(new Error('inspection unavailable'))
-        .mockResolvedValueOnce(null)
+        .mockResolvedValueOnce({ foregroundProcess: null, hasChildProcesses: false })
       const dataCallbackRef: { current: ((data: string) => void) | null } = { current: null }
       const pane = createPane(1)
       const ptyId = 'pty-typed-droid-unavailable-start'
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-foreground-agent-sampling.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection-foreground-agent-sampling.spec.ts
index ba0961f43e2a..65061ce51994 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-foreground-agent-sampling.spec.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-foreground-agent-sampling.spec.ts
@@ -229,7 +229,9 @@ export function registerPtyConnectionForegroundAgentSamplingTests(): void {
           await vi.advanceTimersByTimeAsync(10_000)
 
           // Scope to this pane's pty id: a delayed confirm for another test's pane can fire during this advance.
-          expect(window.api.pty.confirmForegroundProcess).not.toHaveBeenCalledWith(ptyId)
+          expect(window.api.pty.inspectProcess).not.toHaveBeenCalledWith(ptyId, {
+            scanChildProcesses: true
+          })
           expect(mockStoreState.paneForegroundAgentByPaneKey[cacheKey]).toEqual({
             agent: 'droid',
             routingRevoked: true,
@@ -272,7 +274,9 @@ export function registerPtyConnectionForegroundAgentSamplingTests(): void {
           binding.sampleForegroundAgentOnFocus()
           await vi.advanceTimersByTimeAsync(10_000)
 
-          expect(window.api.pty.confirmForegroundProcess).not.toHaveBeenCalledWith(ptyId)
+          expect(window.api.pty.inspectProcess).not.toHaveBeenCalledWith(ptyId, {
+            scanChildProcesses: true
+          })
           expect(mockStoreState.paneForegroundAgentByPaneKey[cacheKey]).toEqual({
             agent: 'droid',
             routingRevoked: true,
@@ -303,7 +307,10 @@ export function registerPtyConnectionForegroundAgentSamplingTests(): void {
           state: 'working',
           agentType: 'droid'
         }
-        vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue('droid')
+        vi.mocked(window.api.pty.inspectProcess).mockResolvedValue({
+          foregroundProcess: 'droid',
+          hasChildProcesses: false
+        })
 
         binding.requestWindowsShiftEnterReconfirmation()
         await vi.advanceTimersByTimeAsync(200)
@@ -327,7 +334,9 @@ export function registerPtyConnectionForegroundAgentSamplingTests(): void {
 
         await vi.advanceTimersByTimeAsync(350)
         await flushAsyncTicks()
-        expect(window.api.pty.confirmForegroundProcess).toHaveBeenCalledWith(ptyId)
+        expect(window.api.pty.inspectProcess).toHaveBeenCalledWith(ptyId, {
+          scanChildProcesses: true
+        })
         expect(mockStoreState.paneForegroundAgentByPaneKey[cacheKey]).toEqual({
           agent: 'droid',
           agentEvidence: 'process-read',
@@ -363,7 +372,10 @@ export function registerPtyConnectionForegroundAgentSamplingTests(): void {
           state: 'working',
           agentType: 'pi'
         }
-        vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue('cmd.exe')
+        vi.mocked(window.api.pty.inspectProcess).mockResolvedValue({
+          foregroundProcess: 'cmd.exe',
+          hasChildProcesses: false
+        })
 
         binding.sampleForegroundAgentOnFocus()
 
@@ -404,7 +416,10 @@ export function registerPtyConnectionForegroundAgentSamplingTests(): void {
 
       it('confirms daemon launch identity before restoring warm-reattach routing', async () => {
         vi.useFakeTimers()
-        vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue('droid')
+        vi.mocked(window.api.pty.inspectProcess).mockResolvedValue({
+          foregroundProcess: 'droid',
+          hasChildProcesses: false
+        })
         const ptyId = 'pty-launch-identity-no-sample'
         const tabId = `tab-${ptyId}`
         mockStoreState.tabsByWorktree = { 'wt-1': [{ id: tabId, ptyId }] }
@@ -496,7 +511,10 @@ export function registerPtyConnectionForegroundAgentSamplingTests(): void {
 
       it('retires stale daemon launch identity when warm reattach finds the shell', async () => {
         vi.useFakeTimers()
-        vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue('powershell.exe')
+        vi.mocked(window.api.pty.inspectProcess).mockResolvedValue({
+          foregroundProcess: 'powershell.exe',
+          hasChildProcesses: false
+        })
         const ptyId = 'pty-stale-daemon-launch-identity'
         const tabId = `tab-${ptyId}`
         mockStoreState.tabsByWorktree = { 'wt-1': [{ id: tabId, ptyId }] }
@@ -514,9 +532,7 @@ export function registerPtyConnectionForegroundAgentSamplingTests(): void {
         await flushAsyncTicks()
 
         // Assert the floor (initial read + two retries), not an exact count: an incidental droid reconfirm can add one more.
-        expect(
-          vi.mocked(window.api.pty.confirmForegroundProcess).mock.calls.length
-        ).toBeGreaterThanOrEqual(3)
+        expect(vi.mocked(window.api.pty.inspectProcess).mock.calls.length).toBeGreaterThanOrEqual(3)
         expect(mockStoreState.paneForegroundAgentByPaneKey[cacheKey]).toEqual({
           agent: null,
           shellForeground: true
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-foreground-routing-confirmation.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection-foreground-routing-confirmation.spec.ts
index 330dd9deb652..a320255240b8 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-foreground-routing-confirmation.spec.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-foreground-routing-confirmation.spec.ts
@@ -160,7 +160,7 @@ export function registerPtyConnectionForegroundRoutingConfirmationTests(): void
       it('does not let a pending confirmation re-arm itself', async () => {
         vi.useFakeTimers()
         // Never resolves: the confirmation stays in flight for the whole test.
-        vi.mocked(window.api.pty.confirmForegroundProcess).mockReturnValue(new Promise(() => {}))
+        vi.mocked(window.api.pty.inspectProcess).mockReturnValue(new Promise(() => {}))
         const ptyId = 'pty-pi-no-remint'
         const tabId = `tab-${ptyId}`
         const { binding, cacheKey } = await connectRestoredPaneForForegroundSampling({
@@ -219,11 +219,14 @@ export function registerPtyConnectionForegroundRoutingConfirmationTests(): void
         async (outcome) => {
           vi.useFakeTimers()
           if (outcome === 'provider rejection') {
-            vi.mocked(window.api.pty.confirmForegroundProcess).mockRejectedValue(
+            vi.mocked(window.api.pty.inspectProcess).mockRejectedValue(
               new Error('inspection unavailable')
             )
           } else {
-            vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue(null)
+            vi.mocked(window.api.pty.inspectProcess).mockResolvedValue({
+              foregroundProcess: null,
+              hasChildProcesses: false
+            })
           }
           const ptyId = `pty-pi-reconfirm-${outcome.replace(' ', '-')}`
           const tabId = `tab-${ptyId}`
@@ -258,7 +261,10 @@ export function registerPtyConnectionForegroundRoutingConfirmationTests(): void
 
       it('replaces pending Pi routing when confirmation finds another agent', async () => {
         vi.useFakeTimers()
-        vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue('codex')
+        vi.mocked(window.api.pty.inspectProcess).mockResolvedValue({
+          foregroundProcess: 'codex',
+          hasChildProcesses: false
+        })
         const ptyId = 'pty-pi-reconfirm-codex'
         const tabId = `tab-${ptyId}`
         const { binding, cacheKey } = await connectRestoredPaneForForegroundSampling({
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-hibernation-kill-shell-foreground.test.ts b/src/renderer/src/components/terminal-pane/pty-connection-hibernation-kill-shell-foreground.test.ts
index 6b59c0d3cb6b..61583e97b488 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-hibernation-kill-shell-foreground.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-hibernation-kill-shell-foreground.test.ts
@@ -156,7 +156,10 @@ describe('shell showing through a hibernation kill', () => {
   }> {
     vi.useFakeTimers()
     const { connectPanePty } = await import('./pty-connection')
-    vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue('zsh')
+    vi.mocked(window.api.pty.inspectProcess).mockResolvedValue({
+      foregroundProcess: 'zsh',
+      hasChildProcesses: false
+    })
     const dataCallbackRef: { current: ((data: string) => void) | null } = { current: null }
     const ptyId = 'pty-hibernating'
     const transport = createMockTransport(ptyId)
@@ -236,19 +239,19 @@ describe('shell showing through a hibernation kill', () => {
     'preserves the wake record when a pending confirmation settles with PTY %s',
     async (boundPtyId) => {
       const pane = await connectHibernatingPane(true)
-      const foreground = createDeferred<string | null>()
-      vi.mocked(window.api.pty.confirmForegroundProcess).mockReturnValue(foreground.promise)
+      const foreground = createDeferred<Awaited<ReturnType<typeof window.api.pty.inspectProcess>>>()
+      vi.mocked(window.api.pty.inspectProcess).mockReturnValue(foreground.promise)
 
       pane.finishCommand()
       await vi.advanceTimersByTimeAsync(350)
-      expect(window.api.pty.confirmForegroundProcess).toHaveBeenCalledExactlyOnceWith(
-        'pty-hibernating'
-      )
+      expect(window.api.pty.inspectProcess).toHaveBeenCalledExactlyOnceWith('pty-hibernating', {
+        scanChildProcesses: true
+      })
       pane.exitPty()
       pane.rebindPty(boundPtyId)
       await flushAsyncTicks()
       expect(mockStoreState.suppressedPtyExitIds).toEqual({})
-      foreground.resolve('zsh')
+      foreground.resolve({ foregroundProcess: 'zsh', hasChildProcesses: false })
       await flushAsyncTicks()
 
       // A detached transport rejects the stale read; a retained binding reaches shell cleanup.
diff --git a/src/renderer/src/lib/agent-launch-through-host.test.ts b/src/renderer/src/lib/agent-launch-through-host.test.ts
index 0b2d6222fde3..dc43b6bb1ebe 100644
--- a/src/renderer/src/lib/agent-launch-through-host.test.ts
+++ b/src/renderer/src/lib/agent-launch-through-host.test.ts
@@ -18,6 +18,12 @@ const testStore = vi.hoisted(() => {
 })
 vi.mock('@/store', () => ({
   useAppStore: {
+    setState: (patch: Parameters<ReturnType<typeof createTestStore>['setState']>[0]) => {
+      if (!testStore.current) {
+        throw new Error('no test store')
+      }
+      testStore.current.setState(patch)
+    },
     getState: () => {
       if (!testStore.current) {
         throw new Error('no test store')
diff --git a/src/renderer/src/store/github/check-details-failure-mapping.test.ts b/src/renderer/src/store/github/check-details-failure-mapping.test.ts
index 20fa95587a2c..183f918811fe 100644
--- a/src/renderer/src/store/github/check-details-failure-mapping.test.ts
+++ b/src/renderer/src/store/github/check-details-failure-mapping.test.ts
@@ -152,7 +152,9 @@ for (const surface of surfaces) {
               },
               timeoutMs: 30_000,
               expectedEnvironmentPairingRevision: undefined,
-              expectedEnvironmentRuntimeId: undefined
+              expectedEnvironmentRuntimeId: undefined,
+              dispatchObservation: undefined,
+              observeDispatch: false
             },
             expect.any(Object)
           )

From 8d1a2e52aef1f3e9899f1bcd72928b6a5fe0fd71 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Thu, 29 Oct 2026 13:30:39 -0700
Subject: [PATCH 103/207] Fix lifecycle handling for existing Continue actions

---
 ...on-server-async-spawn-cancellation.test.ts |  24 ++
 ...on-server-creation-failure.test-fixture.ts |  92 +++++++
 src/main/daemon/daemon-server-options.ts      |  13 +-
 src/main/daemon/pty-subprocess.ts             | 109 ++++----
 .../conpty-startup-input-reader.ts            |  82 ++++--
 .../daemon-pty-physical-owner.ts              | 179 +++++++++++++
 .../native-pty-spawn-windows.test.ts          | 100 ++++++-
 .../daemon/pty-subprocess/native-pty-spawn.ts |  77 +++++-
 .../pty-subprocess/subprocess-handle.ts       | 104 ++------
 src/main/daemon/session-output-pipeline.ts    |  17 +-
 .../daemon/session-termination-controller.ts  |   6 +-
 src/main/daemon/session.ts                    |  36 +--
 src/main/daemon/terminal-creation-work.ts     | 229 ++++++++++++++++
 .../terminal-host-agent-session-claim.ts      |  13 +
 .../terminal-host-concurrent-create.test.ts   |  19 +-
 .../terminal-host-cwd-readability.test.ts     |   7 +-
 src/main/daemon/terminal-host-disposal.ts     |  10 +-
 src/main/daemon/terminal-host-options.ts      |   3 +
 .../daemon/terminal-host-returned-process.ts  | 100 +++++++
 .../daemon/terminal-host-session-create.ts    | 251 +++---------------
 .../daemon/terminal-host-session-process.ts   |  60 +++++
 .../daemon/terminal-host-session-publish.ts   | 212 +++++++++++++++
 .../daemon/terminal-host-session-shutdown.ts  |  22 +-
 src/main/daemon/terminal-host.ts              | 103 ++++---
 src/main/daemon/terminal-spawn-gate.test.ts   |   6 +-
 .../adopted-transcript-source.ts              |   7 +-
 .../codex-history-test-fixture.ts             |  88 ++++++
 .../journal-codex-history.test.ts             |  72 +++++
 .../journal-legacy-identity.ts                |  12 +-
 ...journal-legacy-import-record-bound.test.ts |   4 +-
 ...journal-legacy-import-tool-pairing.test.ts |   1 +
 .../journal-legacy-import.ts                  |  34 ++-
 .../journal-legacy-transcript-stream.ts       |  25 ++
 ...tured-agent-session-adopted-import.test.ts |  30 ++-
 ...ured-agent-session-create-adoption.test.ts | 113 +++++++-
 src/main/native-chat/codex-local-history.ts   | 154 +++++++++++
 .../codex-rollout-history-source.ts           |  82 ++++++
 .../codex-rollout-history-stream.ts           |  34 +++
 .../transcript-line-decoders-codex.ts         |  61 ++++-
 ...anscript-reader-codex-history-mode.test.ts |  29 ++
 .../structured-session-create-support.ts      |   9 +
 ...tructured-agent-session-create-adoption.ts |   9 +-
 .../tab-bar/cli-chat-resume-source.ts         |   8 +-
 .../tab-session-history-switch.parity.test.ts |  27 +-
 .../tab-session-history-switch.test.ts        | 104 ++++++--
 .../tab-bar/tab-session-history-switch.ts     |   5 +-
 .../tab-session-history-test-fixture.ts       |  27 ++
 .../agent-status-partial-updates.ts           |   6 +-
 .../src/lib/ai-vault-tab-title-requests.ts    | 143 +++++++---
 .../src/store/agent-conversation-retention.ts |  76 ++++++
 src/renderer/src/store/index.ts               |   6 +-
 .../store/slices/agent-pane-conversation.ts   |  67 +++++
 .../agent-status-authority-actions.ts         |  10 +
 .../agent-status/agent-status-batch-update.ts |  32 +++
 .../agent-status/agent-status-drop-actions.ts |   8 +
 .../agent-status/agent-status-drop-reducer.ts |  13 +
 .../agent-status/agent-status-live-actions.ts |   3 +-
 .../agent-status/agent-status-live-reducer.ts |   8 +-
 .../agent-status-provider-session-actions.ts  |   6 +-
 .../agent-status-provider-session.test.ts     |  39 +++
 .../agent-status/agent-status-runtime.ts      |  43 ++-
 .../agent-status-slice-contract.ts            |   3 +
 .../store/slices/agent-status/agent-status.ts |   1 +
 .../src/store/slices/store-test-helpers.ts    |   8 +-
 src/shared/claimed-agent-pty-owner.ts         |  37 ++-
 src/shared/pty-creation-disposition.ts        |  11 +
 66 files changed, 2669 insertions(+), 660 deletions(-)
 create mode 100644 src/main/daemon/daemon-server-creation-failure.test-fixture.ts
 create mode 100644 src/main/daemon/pty-subprocess/daemon-pty-physical-owner.ts
 create mode 100644 src/main/daemon/terminal-creation-work.ts
 create mode 100644 src/main/daemon/terminal-host-returned-process.ts
 create mode 100644 src/main/daemon/terminal-host-session-process.ts
 create mode 100644 src/main/daemon/terminal-host-session-publish.ts
 create mode 100644 src/main/native-chat/agent-session-journal/codex-history-test-fixture.ts
 create mode 100644 src/main/native-chat/agent-session-journal/journal-codex-history.test.ts
 create mode 100644 src/main/native-chat/agent-session-journal/journal-legacy-transcript-stream.ts
 create mode 100644 src/main/native-chat/codex-local-history.ts
 create mode 100644 src/main/native-chat/codex-rollout-history-source.ts
 create mode 100644 src/main/native-chat/codex-rollout-history-stream.ts
 create mode 100644 src/renderer/src/components/tab-bar/tab-session-history-test-fixture.ts
 create mode 100644 src/renderer/src/store/agent-conversation-retention.ts
 create mode 100644 src/renderer/src/store/slices/agent-pane-conversation.ts
 create mode 100644 src/renderer/src/store/slices/agent-status/agent-status-batch-update.ts
 create mode 100644 src/shared/pty-creation-disposition.ts

diff --git a/src/main/daemon/daemon-server-async-spawn-cancellation.test.ts b/src/main/daemon/daemon-server-async-spawn-cancellation.test.ts
index 3ea304bc1b9d..3a5a1377ddd4 100644
--- a/src/main/daemon/daemon-server-async-spawn-cancellation.test.ts
+++ b/src/main/daemon/daemon-server-async-spawn-cancellation.test.ts
@@ -1,3 +1,4 @@
+import { registerDaemonCreationFailureTests } from './daemon-server-creation-failure.test-fixture'
 import './mock-descendant-sweep'
 import { mkdtempSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
@@ -15,6 +16,7 @@ type DaemonServerInternals = {
 }
 
 describe('daemon async spawn cancellation', () => {
+  let spawned = 0
   let directory: string
   let server: DaemonServer
   let client: DaemonClient
@@ -23,6 +25,7 @@ describe('daemon async spawn cancellation', () => {
   let subprocess: ReturnType<typeof createMockSubprocess>
 
   beforeEach(async () => {
+    spawned = 0
     directory = mkdtempSync(join(tmpdir(), 'daemon-async-spawn-cancel-'))
     let markSpawnStarted: () => void = () => {}
     spawnStarted = new Promise<void>((resolve) => {
@@ -35,6 +38,7 @@ describe('daemon async spawn cancellation', () => {
       socketPath: getDaemonSocketPath(directory),
       tokenPath: join(directory, 'daemon.token'),
       spawnSubprocess: async () => {
+        spawned++
         subprocess = createMockSubprocess()
         markSpawnStarted()
         await spawnGate
@@ -53,9 +57,29 @@ describe('daemon async spawn cancellation', () => {
     releaseSpawn?.()
     client?.disconnect()
     await server?.shutdown()
+    vi.restoreAllMocks()
     rmSync(directory, { recursive: true, force: true })
   })
 
+  registerDaemonCreationFailureTests({
+    get server() {
+      return server
+    },
+    get client() {
+      return client
+    },
+    get subprocess() {
+      return subprocess
+    },
+    get spawnStarted() {
+      return spawnStarted
+    },
+    get spawned() {
+      return spawned
+    },
+    releaseSpawn: () => releaseSpawn()
+  })
+
   it.each(['cancelCreateOrAttach', 'kill'] as const)(
     'reaps a subprocess canceled by %s during async spawn',
     async (requestType) => {
diff --git a/src/main/daemon/daemon-server-creation-failure.test-fixture.ts b/src/main/daemon/daemon-server-creation-failure.test-fixture.ts
new file mode 100644
index 000000000000..6433a5564a44
--- /dev/null
+++ b/src/main/daemon/daemon-server-creation-failure.test-fixture.ts
@@ -0,0 +1,92 @@
+import './mock-descendant-sweep'
+import { expect, it, vi } from 'vitest'
+import type { DaemonClient } from './client'
+import type { createMockSubprocess } from './daemon-pty-adapter-test-harness'
+import type { DaemonServer } from './daemon-server'
+export type DaemonCreationFailureFixture = {
+  server: DaemonServer
+  client: DaemonClient
+  subprocess: ReturnType<typeof createMockSubprocess>
+  releaseSpawn: () => void
+  spawnStarted: Promise<void>
+  spawned: number
+}
+export function registerDaemonCreationFailureTests(fixture: DaemonCreationFailureFixture) {
+  it.each([
+    ['observer', 'retry'],
+    ['constructor', 'retry'],
+    ['publication', 'disposal']
+  ] as const)(
+    'ordinary authenticated create drives failed unpublished cleanup: %s/%s',
+    async (failure, wake) => {
+      const options = {
+        sessionId: 'ordinary-failed',
+        cols: 80,
+        rows: 24,
+        agentSessionEnsure: {
+          claim: {
+            digestVersion: 1 as const,
+            keyId: 'key',
+            identityDigest: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+            worktreeScopeDigest: 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+            agent: 'codex' as const
+          },
+          surface: {
+            worktreeId: 'worktree',
+            tabId: 'ordinary-tab',
+            leafId: '11111111-1111-4111-8111-111111111111',
+            terminalHandle: 'term_ordinary'
+          }
+        }
+      }
+      const creating = fixture.client.request('createOrAttach', options)
+      const observed = expect(creating).rejects.toThrow('fixture subscription failed')
+      await fixture.spawnStarted
+      const failed = fixture.subprocess
+      if (failure === 'observer') {
+        failed.onExit = vi.fn(failed.onExit).mockImplementationOnce(() => {
+          throw new Error('fixture subscription failed')
+        })
+      } else if (failure === 'constructor') {
+        failed.onData = () => {
+          throw new Error('fixture subscription failed')
+        }
+      } else {
+        Object.assign(failed, {
+          onInputClosed: () => {
+            throw new Error('fixture subscription failed')
+          }
+        })
+      }
+      vi.mocked(failed.forceKill).mockImplementation(() => {
+        throw new Error('fixture close unavailable')
+      })
+      fixture.releaseSpawn()
+      await observed
+      await vi.waitFor(() => expect(failed.forceKill).toHaveBeenCalled())
+      expect(fixture.server.host.listSessions()).toEqual([])
+      expect(fixture.server.automaticWork.gate.snapshot().terminals).toBe(1)
+      const attempts = vi.mocked(failed.forceKill).mock.calls.length
+      // The ordinary next authenticated request drives the retained resource, not a test callback.
+      vi.mocked(failed.forceKill).mockImplementation(() => {
+        setTimeout(() => failed._simulateExit(137), 5)
+      })
+      if (wake === 'disposal') {
+        await fixture.server.host.dispose()
+        expect(failed.dispose).toHaveBeenCalledOnce()
+        expect(fixture.spawned).toBe(1)
+        expect(fixture.server.automaticWork.gate.snapshot().terminals).toBe(0)
+        return
+      }
+      expect(await fixture.client.request('createOrAttach', options)).toMatchObject({ isNew: true })
+      expect(vi.mocked(failed.forceKill).mock.calls.length).toBeGreaterThan(attempts)
+      expect(failed.dispose).toHaveBeenCalledOnce()
+      expect(fixture.spawned).toBe(2)
+      expect(fixture.server.automaticWork.gate.snapshot().terminals).toBe(1)
+      await fixture.client.request('write', { sessionId: options.sessionId, data: 'new input' })
+      expect(fixture.subprocess.write).toHaveBeenCalledWith('new input')
+      await fixture.server.host.dispose()
+      expect(fixture.server.automaticWork.gate.snapshot().terminals).toBe(0)
+    }
+  )
+}
diff --git a/src/main/daemon/daemon-server-options.ts b/src/main/daemon/daemon-server-options.ts
index a634a5572355..d9df6d37b762 100644
--- a/src/main/daemon/daemon-server-options.ts
+++ b/src/main/daemon/daemon-server-options.ts
@@ -1,5 +1,5 @@
 import type { DaemonFileLog } from './daemon-file-log'
-import type { SubprocessHandle } from './session-subprocess-handle'
+import type { TerminalHostOptions } from './terminal-host-options'
 import type { TerminalSpawnAdmissionMode } from './terminal-spawn-gate'
 
 export type DaemonServerOptions = {
@@ -35,14 +35,5 @@ export type DaemonServerOptions = {
   automaticWorkMarkerPath?: string
   /** Shared terminal counts for the host-wide cap. */
   hostTerminalLedgerDir?: string
-  spawnSubprocess: (opts: {
-    sessionId: string
-    cols: number
-    rows: number
-    cwd?: string
-    env?: Record<string, string>
-    command?: string
-    shellOverride?: string
-    isCanceled?: () => boolean
-  }) => SubprocessHandle | Promise<SubprocessHandle>
+  spawnSubprocess: TerminalHostOptions['spawnSubprocess']
 }
diff --git a/src/main/daemon/pty-subprocess.ts b/src/main/daemon/pty-subprocess.ts
index 1594fda4713d..41f944b53cd7 100644
--- a/src/main/daemon/pty-subprocess.ts
+++ b/src/main/daemon/pty-subprocess.ts
@@ -1,3 +1,5 @@
+import type { PtyCreationDisposition } from '../../shared/claimed-agent-pty-owner'
+import { TerminalCreationWork } from './terminal-creation-work'
 import type { SubprocessHandle } from './session-subprocess-handle'
 import { normalizePtySize } from './daemon-pty-size'
 import { TerminalAttachCanceledError } from './daemon-errors'
@@ -31,6 +33,8 @@ export type PtySubprocessOptions = {
   terminalShellArgs?: string[]
   terminalWindowsWslDistro?: string | null
   terminalWindowsPowerShellImplementation?: 'auto' | 'powershell.exe' | 'pwsh.exe'
+  onCreationDisposition?: (disposition: PtyCreationDisposition) => void
+  assertCreateAllowed?: () => void
   isCanceled?: () => boolean
   /** Aborts in-progress cwd validation; `isCanceled` is only polled between steps. */
   cancelSignal?: AbortSignal
@@ -61,59 +65,68 @@ export async function checkPtySpawnHealth(): Promise<void> {
 
 /** Plan first so validation uses the host or WSL cwd that spawn will actually use. */
 export async function createPtySubprocess(opts: PtySubprocessOptions): Promise<SubprocessHandle> {
-  const size = normalizePtySize(opts.cols, opts.rows)
-  const env = createDaemonPtyEnvironment(opts)
-  const launch = createPtyShellLaunchPlan(opts, env)
-
-  await preflightPtySpawn({
-    validationCwd: launch.validationCwd,
-    cwdWasExplicit: opts.cwd !== undefined,
-    sessionId: opts.sessionId,
-    ...(opts.cancelSignal ? { signal: opts.cancelSignal } : {})
-  })
-  if (opts.isCanceled?.()) {
-    throw new TerminalAttachCanceledError(opts.sessionId)
-  }
-
-  let spawned: SpawnedDaemonPty
+  const work = new TerminalCreationWork()
   try {
-    spawned = await spawnNativeDaemonPty({
-      shellPath: launch.shellPath,
-      shellArgs: launch.shellArgs,
-      spawnCwd: launch.spawnCwd,
-      env,
-      cols: size.cols,
-      rows: size.rows,
-      windowsFallbackAttempts: launch.windowsFallbackAttempts,
-      // User-configured shell args can carry a command (`pwsh -Command ...`); never respawn those.
-      primaryArgsRespawnSafe:
-        !launch.startupCommandDeliveredInShellArgs && !opts.terminalShellArgs?.length,
-      onMacosTccSpawnStrategy: opts.onMacosTccSpawnStrategy,
+    const size = normalizePtySize(opts.cols, opts.rows)
+    const env = createDaemonPtyEnvironment(opts)
+    const launch = createPtyShellLaunchPlan(opts, env)
+
+    await preflightPtySpawn({
+      validationCwd: launch.validationCwd,
+      cwdWasExplicit: opts.cwd !== undefined,
+      sessionId: opts.sessionId,
       ...(opts.cancelSignal ? { signal: opts.cancelSignal } : {})
     })
-  } catch (error) {
-    // A cancel that lands while ConPTY's startup is awaited is a cancel, not a spawn failure.
-    if (opts.cancelSignal?.aborted) {
+    if (opts.isCanceled?.()) {
       throw new TerminalAttachCanceledError(opts.sessionId)
     }
-    if (process.platform === 'win32') {
-      throw formatPtySpawnError(error, launch.shellPath, launch.spawnCwd)
+
+    let spawned: SpawnedDaemonPty
+    try {
+      spawned = await spawnNativeDaemonPty({
+        creationWork: work,
+        assertCreateAllowed: opts.assertCreateAllowed,
+        shellPath: launch.shellPath,
+        shellArgs: launch.shellArgs,
+        spawnCwd: launch.spawnCwd,
+        env,
+        cols: size.cols,
+        rows: size.rows,
+        windowsFallbackAttempts: launch.windowsFallbackAttempts,
+        // User-configured shell args can carry a command (`pwsh -Command ...`); never respawn those.
+        primaryArgsRespawnSafe:
+          !launch.startupCommandDeliveredInShellArgs && !opts.terminalShellArgs?.length,
+        onMacosTccSpawnStrategy: opts.onMacosTccSpawnStrategy,
+        ...(opts.cancelSignal ? { signal: opts.cancelSignal } : {})
+      })
+    } catch (error) {
+      // A cancel that lands while ConPTY's startup is awaited is a cancel, not a spawn failure.
+      if (opts.cancelSignal?.aborted) {
+        throw new TerminalAttachCanceledError(opts.sessionId)
+      }
+      if (process.platform === 'win32') {
+        throw formatPtySpawnError(error, launch.shellPath, launch.spawnCwd)
+      }
+      throw error
     }
-    throw error
-  }
 
-  return createDaemonPtySubprocessHandle({
-    process: spawned.process,
-    shellPath: spawned.shellPath,
-    spawnCwd: spawned.spawnCwd,
-    env,
-    startupCommandDeliveredInShellArgs:
-      spawned.startupCommandDeliveredInShellArgs ?? launch.startupCommandDeliveredInShellArgs,
-    reportsChildExitStatus: spawned.reportsChildExitStatus,
-    requestedCwd: opts.cwd,
-    sessionId: opts.sessionId,
-    startupAgentRecognition: launch.startupAgentRecognition,
-    // Claimed here, synchronously with the handle's own subscription, so no event falls between.
-    ...(spawned.claimStartupEvents ? { startupEvents: spawned.claimStartupEvents() } : {})
-  })
+    return createDaemonPtySubprocessHandle({
+      process: spawned.process,
+      physicalOwner: spawned.physicalOwner,
+      shellPath: spawned.shellPath,
+      spawnCwd: spawned.spawnCwd,
+      env,
+      startupCommandDeliveredInShellArgs:
+        spawned.startupCommandDeliveredInShellArgs ?? launch.startupCommandDeliveredInShellArgs,
+      reportsChildExitStatus: spawned.reportsChildExitStatus,
+      requestedCwd: opts.cwd,
+      sessionId: opts.sessionId,
+      startupAgentRecognition: launch.startupAgentRecognition,
+      // Claimed here, synchronously with the handle's own subscription, so no event falls between.
+      ...(spawned.claimStartupEvents ? { startupEvents: spawned.claimStartupEvents() } : {})
+    })
+  } finally {
+    await work.finish()
+    opts.onCreationDisposition?.(await work.completion)
+  }
 }
diff --git a/src/main/daemon/pty-subprocess/conpty-startup-input-reader.ts b/src/main/daemon/pty-subprocess/conpty-startup-input-reader.ts
index 862e03458949..cc9d4819a678 100644
--- a/src/main/daemon/pty-subprocess/conpty-startup-input-reader.ts
+++ b/src/main/daemon/pty-subprocess/conpty-startup-input-reader.ts
@@ -1,3 +1,4 @@
+import type { DaemonPtyPhysicalOwner } from './subprocess-handle'
 import type * as pty from 'node-pty'
 import { killConptyNow, terminatePtyJob } from '../../windows/windows-pty-job'
 import { CONPTY_DA1_RESPONSE } from '../../../shared/conpty-device-attributes'
@@ -50,13 +51,21 @@ export type ConptyStartupEvents = {
 export type ConptyStartupWatch = {
   /** Settles on the first output that decides, or on exit before any did. */
   verdict: Promise<ConptyStartupOutcome>
-  /** Hands buffered output and exit to the caller and stops buffering. */
+  /** Hands buffered output to the caller and stops buffering. */
   claim(): ConptyStartupEvents
+  exited: Promise<void>
 }
 
 /** Buffers a fresh ConPTY's output until its owner claims it, so no startup byte is lost. */
-export function watchConptyStartup(proc: pty.IPty): ConptyStartupWatch {
+export function watchConptyStartup(
+  proc: pty.IPty,
+  exitSource: Pick<pty.IPty, 'onExit'> = proc
+): ConptyStartupWatch {
   const events: ConptyStartupEvents = { data: [], exit: null }
+  let ended!: () => void
+  const exited = new Promise<void>((resolve) => {
+    ended = resolve
+  })
   let output = ''
   let settle: (outcome: ConptyStartupOutcome) => void = () => {}
   const verdict = new Promise<ConptyStartupOutcome>((resolve) => {
@@ -84,13 +93,15 @@ export function watchConptyStartup(proc: pty.IPty): ConptyStartupWatch {
       settle(classified)
     }
   })
-  const exitSubscription = proc.onExit(({ exitCode, signal }) => {
+  const exitSubscription = exitSource.onExit(({ exitCode, signal }) => {
     events.exit = { exitCode, ...(signal !== undefined ? { signal } : {}) }
+    ended()
     decided = true
     settle('exited')
   })
   return {
     verdict,
+    exited,
     claim: () => {
       dataSubscription.dispose()
       exitSubscription.dispose()
@@ -101,9 +112,14 @@ export function watchConptyStartup(proc: pty.IPty): ConptyStartupWatch {
 
 async function decideConptyStartup(
   proc: pty.IPty,
-  signal: AbortSignal | undefined
-): Promise<{ outcome: ConptyStartupOutcome; claim: () => ConptyStartupEvents }> {
-  const watch = watchConptyStartup(proc)
+  signal: AbortSignal | undefined,
+  exitSource: Pick<pty.IPty, 'onExit'> = proc
+): Promise<{
+  outcome: ConptyStartupOutcome
+  claim: () => ConptyStartupEvents
+  exited: Promise<void>
+}> {
+  const watch = watchConptyStartup(proc, exitSource)
   let limit: ReturnType<typeof setTimeout> | undefined
   let onAbort = (): void => {}
   try {
@@ -115,7 +131,7 @@ async function decideConptyStartup(
       limit.unref?.()
       void watch.verdict.then(resolve)
     })
-    return { outcome, claim: watch.claim }
+    return { outcome, claim: watch.claim, exited: watch.exited }
   } catch (error) {
     // A canceled spawn must not leave the half-started shell running.
     discardConpty(proc, watch)
@@ -157,50 +173,76 @@ function withNotice(claim: () => ConptyStartupEvents): () => ConptyStartupEvents
 
 // Verify ConPTY input before exposing the pane, so respawning cannot repeat user input.
 export async function spawnConptyWithInputReader(
-  spawn: () => Promise<pty.IPty>,
+  spawn: () => Promise<{ proc: pty.IPty; physicalOwner: DaemonPtyPhysicalOwner }>,
   opts: {
     label: string
     signal?: AbortSignal
     // Only Orca's default interactive argv is safe to respawn; custom argv may repeat a command.
     respawnSafe: boolean
   }
-): Promise<{ proc: pty.IPty; claimStartupEvents: () => ConptyStartupEvents }> {
-  const first = await spawn()
+): Promise<{
+  proc: pty.IPty
+  physicalOwner: DaemonPtyPhysicalOwner
+  claimStartupEvents: () => ConptyStartupEvents
+}> {
+  const firstSpawn = await spawn()
+  const { proc: first, physicalOwner: firstOwner } = firstSpawn
   if (announcementUntrusted) {
-    return { proc: first, claimStartupEvents: () => ({ data: [], exit: null }) }
+    return { ...firstSpawn, claimStartupEvents: () => ({ data: [], exit: null }) }
   }
-  const firstStartup = await decideConptyStartup(first, opts.signal)
+  const firstStartup = await decideConptyStartup(first, opts.signal, firstOwner)
   if (firstStartup.outcome === 'input-reader') {
     announcementObserved = true
   }
   if (firstStartup.outcome !== 'no-input-reader') {
-    return { proc: first, claimStartupEvents: firstStartup.claim }
+    return { ...firstSpawn, claimStartupEvents: firstStartup.claim }
   }
   if (!opts.respawnSafe) {
     console.warn(`[daemon/pty] ConPTY for "${opts.label}" started without an input reader`)
     const claim = firstStartup.claim
-    return { proc: first, claimStartupEvents: announcementObserved ? withNotice(claim) : claim }
+    return { ...firstSpawn, claimStartupEvents: announcementObserved ? withNotice(claim) : claim }
   }
   respawnCount += 1
   console.warn(
     `[daemon/pty] ConPTY for "${opts.label}" started without an input reader; respawning (${respawnCount})`
   )
-  discardConpty(first, firstStartup)
-  const retry = await spawn()
-  const retryStartup = await decideConptyStartup(retry, opts.signal)
+  let limit: ReturnType<typeof setTimeout> | undefined
+  try {
+    terminatePtyJob(first)
+    killConptyNow(first)
+    first.kill()
+    const exited = await Promise.race([
+      firstOwner.completion.then(() => true),
+      new Promise<false>((resolve) => {
+        limit = setTimeout(() => resolve(false), CONPTY_STARTUP_DECISION_LIMIT_MS)
+        limit.unref?.()
+      })
+    ])
+    if (!exited) {
+      return { ...firstSpawn, claimStartupEvents: withNotice(firstStartup.claim) }
+    }
+    firstStartup.claim()
+  } catch {
+    return { ...firstSpawn, claimStartupEvents: withNotice(firstStartup.claim) }
+  } finally {
+    clearTimeout(limit)
+  }
+  const retrySpawn = await spawn()
+  const { proc: retry, physicalOwner: retryOwner } = retrySpawn
+  const retryStartup = await decideConptyStartup(retry, opts.signal, retryOwner)
   if (retryStartup.outcome === 'input-reader') {
     announcementObserved = true
   }
   if (retryStartup.outcome !== 'no-input-reader') {
-    return { proc: retry, claimStartupEvents: retryStartup.claim }
+    return { ...retrySpawn, claimStartupEvents: retryStartup.claim }
   }
   if (!announcementObserved) {
     // Two misses and no pane ever announced: distrust the check rather than respawn every pane.
     announcementUntrusted = true
     console.warn('[daemon/pty] ConPTY never announced an input reader; disabling the startup check')
-    return { proc: retry, claimStartupEvents: retryStartup.claim }
+    return { ...retrySpawn, claimStartupEvents: retryStartup.claim }
   }
   console.warn(`[daemon/pty] ConPTY for "${opts.label}" again started without an input reader`)
   // After one respawn, show the failure on screen instead of silently ignoring keystrokes.
-  return { proc: retry, claimStartupEvents: withNotice(retryStartup.claim) }
+  return { ...retrySpawn, claimStartupEvents: withNotice(retryStartup.claim) }
 }
diff --git a/src/main/daemon/pty-subprocess/daemon-pty-physical-owner.ts b/src/main/daemon/pty-subprocess/daemon-pty-physical-owner.ts
new file mode 100644
index 000000000000..4363b7a2d372
--- /dev/null
+++ b/src/main/daemon/pty-subprocess/daemon-pty-physical-owner.ts
@@ -0,0 +1,179 @@
+import type { DisposableNativePty } from './native-pty-spawn'
+import type * as pty from 'node-pty'
+import { forceKillPosixPtyProcessGroups } from '../../pty/posix-pty-process-groups'
+import { PendingPtyGroupSweep } from '../../pty/pending-pty-group-sweep'
+import { terminatePtyJob } from '../../windows/windows-pty-job'
+import { SessionTerminationController } from '../session-termination-controller'
+import { shutdownOwnedTerminalProcess } from '../terminal-host-session-shutdown'
+export function createDaemonPtyPhysicalOwner(proc: pty.IPty) {
+  const nativeProc: DisposableNativePty = proc
+  let exit: { exitCode: number; signal?: number } | null = null
+  const exitListeners = new Set<Parameters<pty.IPty['onExit']>[0]>()
+  let disposed = false
+  let nodePtyKillIssued = false
+  const groupSweep = new PendingPtyGroupSweep()
+  const killRoot = (): void => {
+    process.kill(proc.pid, 'SIGKILL')
+  }
+  const fallBackToNodePtyKill = (signalError: unknown): void => {
+    try {
+      proc.kill()
+      nodePtyKillIssued = true
+    } catch {
+      nodePtyKillIssued = false
+      throw signalError
+    }
+  }
+  const forceKillPosix = async (): Promise<void> => {
+    if (exit) {
+      return
+    }
+    // A reaped root frees its pid and TTY for reuse, so a table read that outlives it signals nothing.
+    await groupSweep.track(
+      forceKillPosixPtyProcessGroups(proc.pid, killRoot, { ownsRoot: () => exit === null }).catch(
+        fallBackToNodePtyKill
+      )
+    )
+  }
+  // Stays synchronous: dispose() reads nodePtyKillIssued right after to avoid double-closing ConPTY.
+  const forceKillConpty = (): void => {
+    if (exit) {
+      return
+    }
+    // Escalate a ConPTY kill through the job without double-closing node-pty's shell handle.
+    if (nodePtyKillIssued) {
+      terminatePtyJob(proc)
+      return
+    }
+    try {
+      killRoot()
+    } catch (signalError) {
+      fallBackToNodePtyKill(signalError)
+    }
+  }
+
+  const kill = (): void => {
+    if (exit) {
+      return
+    }
+    nodePtyKillIssued = true
+    try {
+      proc.kill()
+    } catch (error) {
+      nodePtyKillIssued = false
+      throw error
+    }
+  }
+  const forceKill = () => (process.platform === 'win32' ? forceKillConpty() : forceKillPosix())
+  const dispose = (): void => {
+    if (disposed) {
+      return
+    }
+    disposed = true
+    const destroy = (): void => {
+      try {
+        nativeProc.destroy?.()
+      } catch {}
+    }
+    if (process.platform !== 'win32') {
+      nativeProc.kill = () => {}
+    } else if (nodePtyKillIssued) {
+      return
+    }
+    groupSweep.afterSettled(destroy)
+  }
+  const termination = new SessionTerminationController({
+    sessionId: String(proc.pid),
+    subprocess: { kill, forceKill, signal: (signal) => proc.kill(signal), dispose },
+    isExited: () => exit !== null,
+    releaseProducerPause: ({ resume }) => {
+      if (resume) {
+        proc.resume()
+      }
+    }
+  })
+  let nativeExitSubscription: pty.IDisposable | undefined
+  const retireNativeExitSubscription = (): void => {
+    const subscription = nativeExitSubscription
+    nativeExitSubscription = undefined
+    subscription?.dispose()
+  }
+  const observeExit = (): void => {
+    if (exit || nativeExitSubscription) {
+      return
+    }
+    nativeExitSubscription = proc.onExit((event) => {
+      if (exit) {
+        return
+      }
+      exit = {
+        exitCode: event.exitCode,
+        ...(event.signal !== undefined ? { signal: event.signal } : {})
+      }
+      termination.markPhysicalExit()
+      const errors: unknown[] = []
+      try {
+        retireNativeExitSubscription()
+      } catch (error) {
+        errors.push(error)
+      }
+      try {
+        const listeners = [...exitListeners]
+        for (const listener of listeners) {
+          if (exitListeners.delete(listener)) {
+            try {
+              listener(exit)
+            } catch (error) {
+              errors.push(error)
+            }
+          }
+        }
+      } finally {
+        exitListeners.clear()
+      }
+      if (errors.length > 0) {
+        throw errors[0]
+      }
+    })
+    if (exit) {
+      retireNativeExitSubscription()
+    }
+  }
+  return {
+    observeExit,
+    completion: termination.physicalCompletion,
+    exitCode: () => exit?.exitCode ?? null,
+    onExit: (listener: Parameters<pty.IPty['onExit']>[0]): pty.IDisposable => {
+      if (exit) {
+        listener(exit)
+      } else {
+        exitListeners.add(listener)
+      }
+      return {
+        dispose: () => {
+          exitListeners.delete(listener)
+        }
+      }
+    },
+    hasExited: () => exit !== null,
+    kill,
+    forceKill,
+    dispose,
+    recover: () => {
+      try {
+        observeExit()
+      } catch {
+        // Observation failure must not revoke the returned process's cleanup authority.
+      }
+      return shutdownOwnedTerminalProcess({
+        pid: proc.pid,
+        isAlive: () => exit === null,
+        terminateOwnedTree: () => terminatePtyJob(proc),
+        close: async () => {
+          await termination.forceKillAndWaitForExit()
+          dispose()
+        }
+      })
+    }
+  }
+}
diff --git a/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts b/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts
index fd539e043800..45f14db4248f 100644
--- a/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts
+++ b/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts
@@ -9,6 +9,11 @@ const ptyJob = vi.hoisted(() => ({
 }))
 vi.mock('../../windows/windows-pty-job', () => ptyJob)
 
+import '../mock-descendant-sweep'
+import { TerminalHost } from '../terminal-host'
+import { TerminalSpawnGate } from '../terminal-spawn-gate'
+import { TerminalCreationWork } from '../terminal-creation-work'
+import { createDaemonPtySubprocessHandle } from './subprocess-handle'
 import { spawnNativeDaemonPty } from './native-pty-spawn'
 import {
   _resetConptyStartupTrustForTest,
@@ -42,8 +47,25 @@ function fakePane(pid: number, chunks: string[], exitCode?: number) {
   const exitListeners = new Set<(event: { exitCode: number }) => void>()
   const pane = {
     pid,
-    kill: vi.fn(),
+    kill: vi.fn(() => {
+      for (const listener of exitListeners) {
+        listener({ exitCode: 137 })
+      }
+    }),
     write: vi.fn(),
+    resize: vi.fn(),
+    pause: vi.fn(),
+    resume: vi.fn(),
+    emitData: (data: string) => {
+      for (const listener of dataListeners) {
+        listener(data)
+      }
+    },
+    emitExit: (exitCode: number) => {
+      for (const listener of exitListeners) {
+        listener({ exitCode })
+      }
+    },
     onData: (listener: (data: string) => void) => {
       dataListeners.add(listener)
       return { dispose: () => dataListeners.delete(listener) }
@@ -84,6 +106,7 @@ describe('Windows shell fallback over node-pty ConPTY', () => {
   })
   afterEach(() => {
     Object.defineProperty(process, 'platform', platform)
+    vi.useRealTimers()
     vi.restoreAllMocks()
   })
 
@@ -160,6 +183,81 @@ describe('Windows shell fallback over node-pty ConPTY', () => {
     expect(result.claimStartupEvents?.().data).toEqual(['\x1b[1t\x1b[?1004h'])
   })
 
+  it.each(['physical-exit', 'deadline'] as const)(
+    'ordinary create keeps the startup predecessor owned through %s and host disposal',
+    async (outcome) => {
+      vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] })
+      const broken = deadPane(990010)
+      broken.kill.mockImplementation(() => {})
+      const replacement = fakePane(990011, [])
+      nodePty.spawn.mockReturnValueOnce(broken).mockReturnValueOnce(replacement)
+      vi.spyOn(process, 'kill').mockImplementation((pid) => {
+        expect([broken.pid, replacement.pid]).toContain(pid)
+        if (pid === replacement.pid) {
+          queueMicrotask(() => replacement.emitExit(137))
+        }
+        return true
+      })
+      const gate = new TerminalSpawnGate({ log: () => {} })
+      const host = new TerminalHost({
+        spawnGate: gate,
+        spawnSubprocess: async (options) => {
+          const work = new TerminalCreationWork()
+          try {
+            const spawned = await spawnNativeDaemonPty({ ...args, creationWork: work })
+            return createDaemonPtySubprocessHandle({
+              ...spawned,
+              env: {},
+              sessionId: options.sessionId,
+              startupCommandDeliveredInShellArgs: false,
+              startupAgentRecognition: null,
+              startupEvents: spawned.claimStartupEvents?.()
+            })
+          } finally {
+            await work.finish()
+            options.onCreationDisposition?.(await work.completion)
+          }
+        }
+      })
+      const creating = host.createOrAttach({
+        sessionId: 'ordinary-conpty',
+        cols: 80,
+        rows: 24,
+        streamClient: { onData() {}, onExit() {} }
+      })
+      try {
+        await vi.waitFor(() => expect(broken.kill).toHaveBeenCalledOnce())
+        expect(nodePty.spawn).toHaveBeenCalledOnce()
+        expect(host.listSessions()).toEqual([])
+        if (outcome === 'physical-exit') {
+          broken.emitExit(137)
+          await vi.waitFor(() => expect(nodePty.spawn).toHaveBeenCalledTimes(2))
+          replacement.emitData(CONPTY_PRELUDE)
+        } else {
+          await vi.advanceTimersByTimeAsync(CONPTY_STARTUP_DECISION_LIMIT_MS)
+        }
+        const created = await creating
+        expect(created.isNew).toBe(true)
+        expect(created.pid).toBe(outcome === 'physical-exit' ? replacement.pid : broken.pid)
+        expect(nodePty.spawn).toHaveBeenCalledTimes(outcome === 'physical-exit' ? 2 : 1)
+        expect(gate.snapshot().terminals).toBe(1)
+        const disposing = host.dispose()
+        if (outcome === 'deadline') {
+          await vi.waitFor(() => expect(process.kill).toHaveBeenCalled())
+          expect(gate.snapshot().terminals).toBe(1)
+          broken.emitExit(137)
+        }
+        await disposing
+        expect(gate.snapshot().terminals).toBe(0)
+        expect(host.listSessions()).toEqual([])
+      } finally {
+        broken.emitExit(137)
+        replacement.emitExit(137)
+        await host.dispose()
+      }
+    }
+  )
+
   it('respawns only once, then says so in the pane', async () => {
     nodePty.spawn.mockReturnValueOnce(healthyPane(990001))
     await spawnNativeDaemonPty(args)
diff --git a/src/main/daemon/pty-subprocess/native-pty-spawn.ts b/src/main/daemon/pty-subprocess/native-pty-spawn.ts
index 8dd1a6ecfc63..ea368ba67c4f 100644
--- a/src/main/daemon/pty-subprocess/native-pty-spawn.ts
+++ b/src/main/daemon/pty-subprocess/native-pty-spawn.ts
@@ -1,3 +1,6 @@
+import type { PtyCreationDisposition } from '../../../shared/claimed-agent-pty-owner'
+import type { TerminalCreationWork } from '../terminal-creation-work'
+import { createDaemonPtyPhysicalOwner, type DaemonPtyPhysicalOwner } from './subprocess-handle'
 import { assertWslDistroAllowed } from '@orca/process-host/wsl-distro-allowlist'
 import type * as pty from 'node-pty'
 import {
@@ -12,20 +15,36 @@ import { spawnConptyWithInputReader, type ConptyStartupEvents } from './conpty-s
 async function loadNodePty(): Promise<typeof pty> {
   return import('node-pty')
 }
+
+export type DisposableNativePty = pty.IPty & {
+  destroy?: () => void
+  signalProcess?: (signal: string) => void
+  // node-pty emits these when its master stream retires; writes then become silent no-ops.
+  on?: (event: 'close' | 'error', listener: (error?: unknown) => void) => void
+  // False once node-pty's _close() retired the master; Windows never emits 'close' for that.
+  _writable?: boolean
+}
+
 export type SpawnedDaemonPty = {
   process: pty.IPty
+  physicalOwner?: DaemonPtyPhysicalOwner
   shellPath: string
   spawnCwd: string
   startupCommandDeliveredInShellArgs?: boolean
   /** False when a wrapper owns the reported status, so no exit code may be read from it. */
   reportsChildExitStatus: boolean
-  /** Windows: output and exit seen while confirming ConPTY reads input; claim before subscribing. */
+  /** Windows: output seen while confirming ConPTY reads input; claim before subscribing. */
   claimStartupEvents?: () => ConptyStartupEvents
 }
 
-type SpawnedNativePty = { proc: pty.IPty; claimStartupEvents?: () => ConptyStartupEvents }
+type SpawnedNativePty = {
+  proc: pty.IPty
+  physicalOwner: DaemonPtyPhysicalOwner
+  claimStartupEvents?: () => ConptyStartupEvents
+}
 
 export async function spawnNativeDaemonPty(args: {
+  creationWork?: TerminalCreationWork
   shellPath: string
   shellArgs: string[]
   spawnCwd: string
@@ -36,14 +55,16 @@ export async function spawnNativeDaemonPty(args: {
   /** The primary shell's argv is Orca's interactive default, so a respawn cannot repeat a command. */
   primaryArgsRespawnSafe?: boolean
   signal?: AbortSignal
+  assertCreateAllowed?: () => void
   onMacosTccSpawnStrategy?: (strategy: 'wrapped' | 'direct') => void
 }): Promise<SpawnedDaemonPty> {
   let reportsChildExitStatus = true
+  let unpublishedOwner: DaemonPtyPhysicalOwner | undefined
   const spawnOnce = async (
     shellPath: string,
     shellArgs: string[],
     cwd: string
-  ): Promise<pty.IPty> => {
+  ): Promise<{ proc: pty.IPty; physicalOwner: DaemonPtyPhysicalOwner }> => {
     args.signal?.throwIfAborted()
     assertWslDistroAllowed(shellPath, shellArgs)
     const tcc = wrapShellSpawnForMacosTccAttribution(shellPath, shellArgs, args.env)
@@ -53,18 +74,41 @@ export async function spawnNativeDaemonPty(args: {
     if (process.platform === 'win32') {
       assignHostProcessToKillOnCloseJob()
     }
-    const proc = nodePty.spawn(wrapped.file, wrapped.args, {
-      name: args.env.TERM ?? 'xterm-256color',
-      cols: args.cols,
-      rows: args.rows,
-      cwd,
-      env: wrapped.env,
-      // Bundled ConPTY provides the wrap-marker behavior xterm expects.
-      ...(process.platform === 'win32' ? { useConptyDll: true } : {})
+    args.signal?.throwIfAborted()
+    args.assertCreateAllowed?.()
+    const attempt = Promise.withResolvers<PtyCreationDisposition>()
+    args.creationWork?.join(attempt.promise)
+    let proc: pty.IPty
+    try {
+      proc = nodePty.spawn(wrapped.file, wrapped.args, {
+        name: args.env.TERM ?? 'xterm-256color',
+        cols: args.cols,
+        rows: args.rows,
+        cwd,
+        env: wrapped.env,
+        // Bundled ConPTY provides the wrap-marker behavior xterm expects.
+        ...(process.platform === 'win32' ? { useConptyDll: true } : {})
+      })
+    } catch (error) {
+      attempt.resolve({ kind: 'failed', completion: Promise.resolve() })
+      throw error
+    }
+    const physical = createDaemonPtyPhysicalOwner(proc)
+    unpublishedOwner = physical
+    attempt.resolve({
+      kind: 'physical',
+      completion: physical.completion,
+      exitCode: physical.exitCode,
+      recover: physical.recover
     })
+    physical.observeExit()
     reportsChildExitStatus = hostReportsChildExitStatus(tcc.file)
-    args.onMacosTccSpawnStrategy?.(tcc.file === shellPath ? 'direct' : 'wrapped')
-    return proc
+    try {
+      args.onMacosTccSpawnStrategy?.(tcc.file === shellPath ? 'direct' : 'wrapped')
+    } catch {
+      /* Diagnostics cannot revoke an owned child. */
+    }
+    return { proc, physicalOwner: physical }
   }
   const spawnAt = async (
     shellPath: string,
@@ -73,7 +117,7 @@ export async function spawnNativeDaemonPty(args: {
     respawnSafe: boolean
   ): Promise<SpawnedNativePty> => {
     if (process.platform !== 'win32') {
-      return { proc: await spawnOnce(shellPath, shellArgs, cwd) }
+      return await spawnOnce(shellPath, shellArgs, cwd)
     }
     return spawnConptyWithInputReader(() => spawnOnce(shellPath, shellArgs, cwd), {
       label: shellPath,
@@ -91,12 +135,15 @@ export async function spawnNativeDaemonPty(args: {
     )
     return {
       process: spawned.proc,
+      physicalOwner: spawned.physicalOwner,
       shellPath: args.shellPath,
       spawnCwd: args.spawnCwd,
       reportsChildExitStatus,
       ...(spawned.claimStartupEvents ? { claimStartupEvents: spawned.claimStartupEvents } : {})
     }
   } catch (primaryErr) {
+    // A returned predecessor stays owned until exit, including failed observer/startup setup.
+    await unpublishedOwner?.recover()
     args.signal?.throwIfAborted()
     if (process.platform !== 'win32') {
       throw primaryErr
@@ -115,6 +162,7 @@ export async function spawnNativeDaemonPty(args: {
         )
         return {
           process: spawned.proc,
+          physicalOwner: spawned.physicalOwner,
           shellPath: attempt.shellPath,
           spawnCwd: attempt.effectiveCwd,
           startupCommandDeliveredInShellArgs: attempt.startupCommandDeliveredInShellArgs,
@@ -122,6 +170,7 @@ export async function spawnNativeDaemonPty(args: {
           ...(spawned.claimStartupEvents ? { claimStartupEvents: spawned.claimStartupEvents } : {})
         }
       } catch {
+        await unpublishedOwner?.recover()
         args.signal?.throwIfAborted()
       }
     }
diff --git a/src/main/daemon/pty-subprocess/subprocess-handle.ts b/src/main/daemon/pty-subprocess/subprocess-handle.ts
index 1ce9cbfbc5cd..a1505b435f26 100644
--- a/src/main/daemon/pty-subprocess/subprocess-handle.ts
+++ b/src/main/daemon/pty-subprocess/subprocess-handle.ts
@@ -1,9 +1,9 @@
+import { createDaemonPtyPhysicalOwner } from './daemon-pty-physical-owner'
+import type { DisposableNativePty } from './native-pty-spawn'
 import type * as pty from 'node-pty'
 import type { RecognizedAgentProcess } from '../../../shared/agent-process-recognition'
 import { readPtySlavePath } from '../../../shared/pty-slave-line-discipline-echo'
-import { forceKillPosixPtyProcessGroups } from '../../pty/posix-pty-process-groups'
 import { signalPosixPtyForegroundGroup } from '../../pty/posix-pty-foreground-group'
-import { PendingPtyGroupSweep } from '../../pty/pending-pty-group-sweep'
 import { readPtsName } from '../../pty/node-pty-pts-name'
 import { terminatePtyJob } from '../../windows/windows-pty-job'
 import { isValidPtySize } from '../daemon-pty-size'
@@ -14,20 +14,15 @@ import { ptyProcessNameIsSpawnFile } from './spawn-file-foreground-process'
 import { inspectSpawnFileWindowsChildProcesses } from './spawn-file-child-processes'
 import type { ConptyStartupEvents } from './conpty-startup-input-reader'
 
-type DisposableNativePty = pty.IPty & {
-  destroy?: () => void
-  signalProcess?: (signal: string) => void
-  // node-pty emits these when its master stream retires; writes then become silent no-ops.
-  on?: (event: 'close' | 'error', listener: (error?: unknown) => void) => void
-  // False once node-pty's _close() retired the master; Windows never emits 'close' for that.
-  _writable?: boolean
-}
+export { createDaemonPtyPhysicalOwner } from './daemon-pty-physical-owner'
+export type DaemonPtyPhysicalOwner = ReturnType<typeof createDaemonPtyPhysicalOwner>
 
 // Normal exit also retires the master first; let the exit report win before calling input closed.
 export const MASTER_CLOSE_EXIT_GRACE_MS = 1_000
 
 export function createDaemonPtySubprocessHandle(args: {
   process: pty.IPty
+  physicalOwner?: DaemonPtyPhysicalOwner
   shellPath: string
   spawnCwd: string
   env: Record<string, string>
@@ -36,7 +31,7 @@ export function createDaemonPtySubprocessHandle(args: {
   requestedCwd?: string
   sessionId: string
   startupAgentRecognition: RecognizedAgentProcess | null
-  /** Output and exit buffered before this handle subscribed; replayed ahead of live events. */
+  /** Output buffered before this handle subscribed; replayed ahead of live events. */
   startupEvents?: ConptyStartupEvents
 }): SubprocessHandle {
   const reportsChildExitStatus = args.reportsChildExitStatus
@@ -44,15 +39,13 @@ export function createDaemonPtySubprocessHandle(args: {
   const proc = args.process
   // node-pty exposes destroy at runtime but omits it from IPty.
   const nativeProc: DisposableNativePty = proc
+  const physical = args.physicalOwner ?? createDaemonPtyPhysicalOwner(proc)
+  physical.observeExit()
   const events = new PtyPreListenerEvents()
   let dead = false
-  // Unlike dead, disposal keeps this false so an in-flight force-kill still lands.
-  let exited = false
-  const groupSweep = new PendingPtyGroupSweep()
   // I/O failure is not exit evidence; keep termination and producer flow control available.
   let ioFailed = false
   let disposed = false
-  let nodePtyKillIssued = false
   let masterRetired = false
   let masterError: string | null = null
   let masterRetiredTimer: ReturnType<typeof setTimeout> | null = null
@@ -116,7 +109,6 @@ export function createDaemonPtySubprocessHandle(args: {
   const acceptExit = ({ exitCode, signal }: { exitCode: number; signal?: number }): void => {
     // Exit listeners may re-enter cleanup; retire signal authority before notifying them.
     dead = true
-    exited = true
     clearMasterRetiredTimer()
     foreground.markDead()
     // Neutralize kill before an async socket-close SIGHUP can target a recycled PID.
@@ -129,51 +121,7 @@ export function createDaemonPtySubprocessHandle(args: {
       hostReportsChildExitStatus: reportsChildExitStatus
     })
   }
-  if (args.startupEvents?.exit) {
-    acceptExit(args.startupEvents.exit)
-  } else {
-    proc.onExit(acceptExit)
-  }
-
-  const killRoot = (): void => {
-    process.kill(proc.pid, 'SIGKILL')
-  }
-  const fallBackToNodePtyKill = (signalError: unknown): void => {
-    try {
-      proc.kill()
-      nodePtyKillIssued = true
-    } catch {
-      nodePtyKillIssued = false
-      throw signalError
-    }
-  }
-  const forceKillPosix = async (): Promise<void> => {
-    if (dead) {
-      return
-    }
-    // A reaped root frees its pid and TTY for reuse, so a table read that outlives it signals nothing.
-    await groupSweep.track(
-      forceKillPosixPtyProcessGroups(proc.pid, killRoot, { ownsRoot: () => !exited }).catch(
-        fallBackToNodePtyKill
-      )
-    )
-  }
-  // Stays synchronous: dispose() reads nodePtyKillIssued right after to avoid double-closing ConPTY.
-  const forceKillConpty = (): void => {
-    if (dead) {
-      return
-    }
-    // Escalate a ConPTY kill through the job without double-closing node-pty's shell handle.
-    if (nodePtyKillIssued) {
-      terminatePtyJob(proc)
-      return
-    }
-    try {
-      killRoot()
-    } catch (signalError) {
-      fallBackToNodePtyKill(signalError)
-    }
-  }
+  const exitSubscription = physical.onExit(acceptExit)
 
   const slavePath = readPtySlavePath(proc)
   return {
@@ -247,20 +195,16 @@ export function createDaemonPtySubprocessHandle(args: {
       } catch {}
     },
     kill: () => {
-      if (dead) {
-        return
-      }
-      nodePtyKillIssued = true
-      try {
-        proc.kill()
-      } catch (error) {
-        // A rejected native kill is not proof of exit; keep the wrapper live for a retry.
-        nodePtyKillIssued = false
-        throw error
+      if (!dead) {
+        physical.kill()
       }
     },
     terminateOwnedTree: () => terminatePtyJob(proc),
-    forceKill: () => (process.platform === 'win32' ? forceKillConpty() : forceKillPosix()),
+    forceKill: () => {
+      if (!dead) {
+        return physical.forceKill()
+      }
+    },
     signal: (sig) => {
       if (dead) {
         return
@@ -279,7 +223,7 @@ export function createDaemonPtySubprocessHandle(args: {
       // SIGWINCH belongs to the tty foreground group; destructive signals keep the root-pid target.
       if (sig === 'SIGWINCH') {
         void signalPosixPtyForegroundGroup(proc.pid, readPtsName(proc), sig, signalRootPid, {
-          ownsRoot: () => !exited
+          ownsRoot: () => !physical.hasExited()
         })
         return
       }
@@ -295,19 +239,9 @@ export function createDaemonPtySubprocessHandle(args: {
       dead = true
       clearMasterRetiredTimer()
       inputClosedListener = null
+      exitSubscription.dispose()
       events.clear()
-      const destroy = (): void => {
-        try {
-          nativeProc.destroy?.()
-        } catch {}
-      }
-      // POSIX destroy() can asynchronously signal a recycled pid; Windows needs kill() to close ConPTY.
-      if (process.platform !== 'win32') {
-        nativeProc.kill = () => {}
-      } else if (nodePtyKillIssued) {
-        return
-      }
-      groupSweep.afterSettled(destroy)
+      physical.dispose()
     }
   }
 }
diff --git a/src/main/daemon/session-output-pipeline.ts b/src/main/daemon/session-output-pipeline.ts
index fd4291b4df74..c1bb107b20cc 100644
--- a/src/main/daemon/session-output-pipeline.ts
+++ b/src/main/daemon/session-output-pipeline.ts
@@ -1,22 +1,15 @@
 import { SessionOutputPlane } from './session-output-plane'
 import { TerminalShellRecoveryBarrier } from './terminal-shell-recovery-barrier'
-import type { SubprocessHandle } from './session-subprocess-handle'
 import { release } from 'node:os'
-import type { PtyOwnerBackend } from '../../shared/pty-owner-backend'
+import type { SessionOptions } from './session-options'
 import { windowsPtyForOwnerBackend } from '../../shared/xterm-conpty-options'
 
 /** Couple barrier emissions and snapshot ownership so neither can lag the output plane. */
-export function createSessionOutputPipeline(opts: {
-  cols: number
-  rows: number
-  scrollback?: number | undefined
-  wslDistro?: string | undefined
-  historySeedChunks?: readonly string[] | undefined
-  ownerBackend?: PtyOwnerBackend | undefined
-  subprocess: SubprocessHandle
+export function createSessionOutputPipeline(
+  opts: SessionOptions,
   isAlive: () => boolean
-}): { output: SessionOutputPlane; recoveryBarrier: TerminalShellRecoveryBarrier } {
-  const { subprocess, isAlive } = opts
+): { output: SessionOutputPlane; recoveryBarrier: TerminalShellRecoveryBarrier } {
+  const { subprocess } = opts
   let barrier: TerminalShellRecoveryBarrier | null = null
   const output = new SessionOutputPlane({
     cols: opts.cols,
diff --git a/src/main/daemon/session-termination-controller.ts b/src/main/daemon/session-termination-controller.ts
index e13778a75871..99ae90a2c9b2 100644
--- a/src/main/daemon/session-termination-controller.ts
+++ b/src/main/daemon/session-termination-controller.ts
@@ -11,7 +11,7 @@ const SESSION_FORCE_KILL_MAX_ATTEMPTS = 2
 
 export type SessionTerminationControllerDeps = {
   sessionId: string
-  subprocess: SubprocessHandle
+  subprocess: Pick<SubprocessHandle, 'kill' | 'forceKill' | 'signal' | 'dispose'>
   isExited(): boolean
   releaseProducerPause(opts: { resume: boolean }): void
 }
@@ -25,6 +25,10 @@ export class SessionTerminationController {
 
   constructor(private readonly deps: SessionTerminationControllerDeps) {}
 
+  get physicalCompletion(): Promise<void> {
+    return this.physicalExit.exitedPromise
+  }
+
   get isTerminating(): boolean {
     return this._isTerminating
   }
diff --git a/src/main/daemon/session.ts b/src/main/daemon/session.ts
index 187df3b54cb0..fbd8e46e3596 100644
--- a/src/main/daemon/session.ts
+++ b/src/main/daemon/session.ts
@@ -49,16 +49,8 @@ export class Session {
     this.processNameIsSpawnFile = opts.subprocess.processNameIsSpawnFile === true
     this.shellIsRootChild = opts.subprocess.shellIsRootChild === true
     this.onSessionExit = opts.onExit
-    const pipeline = createSessionOutputPipeline({
-      cols: opts.cols,
-      rows: opts.rows,
-      scrollback: opts.scrollback,
-      wslDistro: opts.wslDistro,
-      historySeedChunks: opts.historySeedChunks,
-      ownerBackend: opts.ownerBackend,
-      subprocess: this.subprocess,
-      isAlive: () => !this._disposed && this._state !== 'exited'
-    })
+    const isAlive = () => !this._disposed && this._state !== 'exited'
+    const pipeline = createSessionOutputPipeline(opts, isAlive)
     this.output = pipeline.output
     this.recoveryBarrier = pipeline.recoveryBarrier
     this.producerPause = new SessionProducerPause(this.subprocess)
@@ -87,12 +79,20 @@ export class Session {
       write: (data) => this.subprocess.write(data),
       onEmission: (emission) => this.recoveryBarrier.accept(emission)
     })
-    this.subprocess.onData((data) => {
-      if (!this._disposed) {
-        this.shellReady.ingestSubprocessData(data)
-      }
-    })
-    this.subprocess.onExit((code, cause) => this.handleSubprocessExit(code, cause))
+    try {
+      this.subprocess.onData((data) => {
+        if (!this._disposed) {
+          this.shellReady.ingestSubprocessData(data)
+        }
+      })
+      this.subprocess.onExit((code, cause) => this.handleSubprocessExit(code, cause))
+    } catch (error) {
+      this._disposed = true
+      this.shellReady.dispose()
+      this.recoveryBarrier.dispose()
+      this.output.disposeEmulator()
+      throw error
+    }
   }
 
   get state(): SessionState {
@@ -119,6 +119,10 @@ export class Session {
     return this.output.hasAttachedClients
   }
 
+  get physicalCompletion(): Promise<void> {
+    return this.termination.physicalCompletion
+  }
+
   get isTerminating(): boolean {
     return this.termination.isTerminating
   }
diff --git a/src/main/daemon/terminal-creation-work.ts b/src/main/daemon/terminal-creation-work.ts
new file mode 100644
index 000000000000..8129e8ca1e74
--- /dev/null
+++ b/src/main/daemon/terminal-creation-work.ts
@@ -0,0 +1,229 @@
+import type { InternalCreateOrAttachOptions } from './terminal-host-agent-session-claim'
+import { waitForTerminalAttachOperation } from './terminal-attach-cancellation'
+import type { PtyCreationDisposition } from '../../shared/claimed-agent-pty-owner'
+import type { TerminalSpawnGate, TerminalSpawnLease } from './terminal-spawn-gate'
+
+export type PendingTerminalCreation = {
+  completion: Promise<void>
+  recover: () => Promise<void>
+}
+
+/** The complete ordinary call owns every lower attempt and acquired dependency. */
+export class TerminalCreationWork {
+  private readonly result = Promise.withResolvers<PtyCreationDisposition>()
+  readonly completion = this.result.promise
+  private readonly dependencies: Promise<PtyCreationDisposition>[] = []
+  private readonly owners: {
+    completion: Promise<void>
+    exitCode: () => number | null
+    recover?: () => Promise<void>
+  }[] = []
+  private uncertain = false
+
+  physicalObserver(
+    report: ((completion: Promise<void>, exitCode: () => number | null) => void) | undefined
+  ): (completion: Promise<void>, exitCode: () => number | null) => void {
+    return (completion, exitCode) => {
+      this.owner(completion, exitCode)
+      report?.(completion, exitCode)
+    }
+  }
+
+  join(disposition: Promise<PtyCreationDisposition>): void {
+    this.dependencies.push(disposition)
+  }
+
+  dispatched(): void {
+    this.uncertain = true
+  }
+
+  owner(
+    completion: Promise<void>,
+    exitCode: () => number | null,
+    recover?: () => Promise<void>
+  ): void {
+    this.owners.push({ completion, exitCode, recover })
+  }
+
+  async finish(reconcile?: (release: () => Promise<void>) => Promise<void>): Promise<void> {
+    const joined = await Promise.all(this.dependencies)
+    const physical = [
+      ...this.owners,
+      ...joined.flatMap((entry) => (entry.kind === 'physical' ? [entry] : []))
+    ]
+    const release = async () => {
+      await Promise.all(
+        [...this.owners, ...joined.filter((entry) => entry.kind !== 'no-fork')].map(async (entry) =>
+          entry.recover?.()
+        )
+      )
+    }
+    let recovery: Promise<void> | undefined
+    const recover = () => {
+      recovery ??= (reconcile ? reconcile(release) : release()).finally(() => {
+        recovery = undefined
+      })
+      return recovery
+    }
+    if (this.uncertain || joined.some((entry) => entry.kind === 'unknown')) {
+      this.result.resolve({ kind: 'unknown', recover })
+    } else if (joined.some((entry) => entry.kind === 'failed')) {
+      this.result.resolve({
+        kind: 'failed',
+        completion: Promise.all([
+          ...physical.map((entry) => entry.completion),
+          ...joined.flatMap((entry) => (entry.kind === 'failed' ? [entry.completion] : []))
+        ]).then(() => {}),
+        recover
+      })
+    } else if (physical.length) {
+      this.result.resolve({
+        kind: 'physical',
+        completion: Promise.all(physical.map((entry) => entry.completion)).then(() => {}),
+        exitCode: () => physical.at(-1)?.exitCode() ?? null,
+        recover
+      })
+    } else {
+      this.result.resolve({ kind: 'no-fork' })
+    }
+  }
+}
+
+export function reconcileUnpublishedTerminalCreation(
+  sessions: ReadonlyMap<string, unknown>,
+  sessionId: string
+): (release: () => Promise<void>) => Promise<void> {
+  return async (release) => {
+    // Registered Sessions retain their ordinary current/use-fenced close authority.
+    if (!sessions.has(sessionId)) {
+      await release()
+    }
+  }
+}
+
+/** Keep pending recovery and exact-entry retirement outside the completed request's scope. */
+export function registerPendingTerminalCreation(
+  pendingCreations: Map<string, PendingTerminalCreation>,
+  sessionId: string,
+  creation: TerminalCreationWork
+): (published: boolean) => void {
+  const settled = Promise.withResolvers<void>()
+  const pending: PendingTerminalCreation = {
+    completion: settled.promise,
+    recover: async () => {
+      const disposition = await creation.completion
+      if (disposition.kind !== 'no-fork') {
+        await disposition.recover?.()
+      }
+    }
+  }
+  pendingCreations.set(sessionId, pending)
+  const finish = () => {
+    if (pendingCreations.get(sessionId) === pending) {
+      pendingCreations.delete(sessionId)
+    }
+    settled.resolve()
+  }
+  return (published) => {
+    if (published) {
+      finish()
+    } else {
+      void creation.completion.then(async (disposition) => {
+        if (disposition.kind === 'unknown') {
+          return
+        }
+        if (disposition.kind === 'physical' || disposition.kind === 'failed') {
+          await disposition.completion
+        }
+        finish()
+      })
+    }
+  }
+}
+
+/** An unpublished attempt keeps its existing lease until its actual disposition permits release. */
+export function settleUnpublishedTerminalSpawnLease(
+  completion: Promise<PtyCreationDisposition>,
+  admitted: TerminalSpawnLease | undefined,
+  sessionId: string,
+  spawnGate: TerminalSpawnGate | undefined
+): void {
+  void completion.then(async (disposition) => {
+    if (disposition.kind === 'no-fork') {
+      admitted?.abandon()
+    } else if (disposition.kind === 'failed') {
+      await disposition.completion
+      admitted?.abandon()
+    } else if (disposition.kind === 'physical') {
+      admitted?.commit(sessionId, true)
+      await disposition.completion
+      spawnGate?.onSessionExit(sessionId)
+    }
+  })
+}
+
+/** Recovery may outlive the observer; its rejection observer needs only the actual outcome. */
+export function recoverUnpublishedTerminalCreation(disposition: PtyCreationDisposition): void {
+  if (disposition.kind !== 'no-fork') {
+    void disposition.recover?.().catch(() => {})
+  }
+}
+
+export async function runTerminalCreation<Result>(
+  opts: InternalCreateOrAttachOptions,
+  sessions: ReadonlyMap<string, unknown>,
+  pendingCreations: Map<string, PendingTerminalCreation>,
+  assertCreateAllowed: (options: InternalCreateOrAttachOptions) => void,
+  operation: (
+    options: InternalCreateOrAttachOptions,
+    creation: TerminalCreationWork
+  ) => Promise<Result>
+): Promise<Result> {
+  const creation = new TerminalCreationWork()
+  const requestedOptions = opts
+  opts = {
+    ...opts,
+    creationWork: creation,
+    onPhysicalOwner: creation.physicalObserver(opts.onPhysicalOwner)
+  }
+  try {
+    assertCreateAllowed(opts)
+    for (
+      let inFlight = pendingCreations.get(opts.sessionId);
+      inFlight !== undefined;
+      inFlight = pendingCreations.get(opts.sessionId)
+    ) {
+      // Let canceled callers leave rather than wait behind a cwd probe stuck on an unreachable share.
+      const pending = inFlight
+      await waitForTerminalAttachOperation(
+        pending.recover().then(() => pending.completion),
+        opts.cancelSignal,
+        opts.sessionId
+      )
+      assertCreateAllowed(opts)
+    }
+    assertCreateAllowed(opts)
+
+    const finishPending = registerPendingTerminalCreation(
+      pendingCreations,
+      opts.sessionId,
+      creation
+    )
+    let published = false
+    try {
+      const result = await operation(opts, creation)
+      published = true
+      return result
+    } finally {
+      finishPending(published || sessions.has(opts.sessionId))
+    }
+  } finally {
+    await creation.finish(reconcileUnpublishedTerminalCreation(sessions, opts.sessionId))
+    const disposition = await creation.completion
+    requestedOptions.onCreationDisposition?.(disposition)
+    if (!sessions.has(opts.sessionId) && disposition.kind !== 'no-fork') {
+      // Failed unpublished resources keep the same ordinary cleanup owner across Retry/disposal.
+      recoverUnpublishedTerminalCreation(disposition)
+    }
+  }
+}
diff --git a/src/main/daemon/terminal-host-agent-session-claim.ts b/src/main/daemon/terminal-host-agent-session-claim.ts
index 84ee3830d9bb..d535510f3e2c 100644
--- a/src/main/daemon/terminal-host-agent-session-claim.ts
+++ b/src/main/daemon/terminal-host-agent-session-claim.ts
@@ -1,3 +1,5 @@
+import type { TerminalCreationWork } from './terminal-creation-work'
+import type { PtyCreationDisposition } from '../../shared/claimed-agent-pty-owner'
 import type { ClaimedAgentPtyOwnerRegistry } from '../../shared/claimed-agent-pty-owner'
 import type { AgentSessionOwnerBinding } from '../../shared/agent-session-host-authority'
 import type { SpawnIntent } from '../../shared/host-spawn-admission'
@@ -7,6 +9,9 @@ export type InternalCreateOrAttachOptions = CreateOrAttachOptions & {
   agentSessionGeneration?: string
   /** Request identity for the fork gate; absent for in-process callers. */
   spawnAdmission?: { clientId: string; declaredIntent: SpawnIntent | null; deadlineAt: number }
+  creationWork?: TerminalCreationWork
+  onCreationDisposition?: (disposition: PtyCreationDisposition) => void
+  onPhysicalOwner?: (completion: Promise<void>, exitCode: () => number | null) => void
   isCanceled?: () => boolean
   cancelSignal?: AbortSignal
 }
@@ -23,6 +28,14 @@ export async function createOrAttachClaimedAgentSession(args: {
   }
   let created: CreateOrAttachResult | null = null
   const ensured = await args.owners.ensure({
+    creation: args.options.creationWork?.completion,
+    onJoin: (creation) => {
+      if (creation) {
+        args.options.creationWork?.join(creation)
+      } else {
+        args.options.creationWork?.dispatched()
+      }
+    },
     claim: ensureRequest.claim,
     surface: ensureRequest.surface,
     spawn: async ({ generation }) => {
diff --git a/src/main/daemon/terminal-host-concurrent-create.test.ts b/src/main/daemon/terminal-host-concurrent-create.test.ts
index 85dd89799295..1cf8ca1537cc 100644
--- a/src/main/daemon/terminal-host-concurrent-create.test.ts
+++ b/src/main/daemon/terminal-host-concurrent-create.test.ts
@@ -1,5 +1,6 @@
 import { describe, expect, it, vi } from 'vitest'
 import type { SubprocessHandle } from './session-subprocess-handle'
+import type { TerminalHostOptions } from './terminal-host-options'
 import { TerminalHost } from './terminal-host'
 
 vi.mock('../pty-descendant-termination', () => ({ killWithDescendantSweep: vi.fn() }))
@@ -95,8 +96,11 @@ describe('concurrent createOrAttach across the async spawn', () => {
 
   it('lets the next caller spawn after a failed spawn releases the gate', async () => {
     const spawnSubprocess = vi
-      .fn<() => Promise<SubprocessHandle>>()
-      .mockRejectedValueOnce(new Error('Working directory "X" does not exist.'))
+      .fn<TerminalHostOptions['spawnSubprocess']>()
+      .mockImplementationOnce((opts) => {
+        opts.onCreationDisposition?.({ kind: 'no-fork' })
+        throw new Error('Working directory "X" does not exist.')
+      })
       .mockImplementation(async () => mockSubprocess())
     const host = new TerminalHost({ spawnSubprocess })
 
@@ -197,9 +201,14 @@ describe('concurrent createOrAttach across the async spawn', () => {
       rejectSpawn = () => reject(new Error('spawn failed'))
     })
     const spawnSubprocess = vi
-      .fn<() => Promise<SubprocessHandle>>()
-      .mockImplementationOnce(async () => {
-        await spawnGate
+      .fn<TerminalHostOptions['spawnSubprocess']>()
+      .mockImplementationOnce(async (opts) => {
+        try {
+          await spawnGate
+        } catch (error) {
+          opts.onCreationDisposition?.({ kind: 'no-fork' })
+          throw error
+        }
         return mockSubprocess()
       })
       .mockImplementation(async () => mockSubprocess())
diff --git a/src/main/daemon/terminal-host-cwd-readability.test.ts b/src/main/daemon/terminal-host-cwd-readability.test.ts
index 771e37e229ec..2bb707641c9e 100644
--- a/src/main/daemon/terminal-host-cwd-readability.test.ts
+++ b/src/main/daemon/terminal-host-cwd-readability.test.ts
@@ -188,7 +188,12 @@ describe('TerminalHost cwd readability verdict', () => {
     host = new TerminalHost({
       spawnSubprocess: async (opts) => {
         if (opts.cwd) {
-          await validateWorkingDirectoryAsync(opts.cwd, { signal: opts.cancelSignal })
+          try {
+            await validateWorkingDirectoryAsync(opts.cwd, { signal: opts.cancelSignal })
+          } catch (error) {
+            opts.onCreationDisposition?.({ kind: 'no-fork' })
+            throw error
+          }
         }
         return createMockSubprocess()
       }
diff --git a/src/main/daemon/terminal-host-disposal.ts b/src/main/daemon/terminal-host-disposal.ts
index 0a733db4e343..741b4fc43bfa 100644
--- a/src/main/daemon/terminal-host-disposal.ts
+++ b/src/main/daemon/terminal-host-disposal.ts
@@ -1,3 +1,4 @@
+import type { PendingTerminalCreation } from './terminal-creation-work'
 import { shutdownTerminalHostSessions } from './terminal-host-session-shutdown'
 import type { TerminalSessionTeardown } from './terminal-session-teardown'
 import type { Session } from './session'
@@ -10,7 +11,7 @@ type FinalCheckpoint = (
 ) => void
 
 type TerminalHostDisposalOptions = {
-  pendingCreations: ReadonlyMap<string, Promise<void>>
+  pendingCreations: ReadonlyMap<string, PendingTerminalCreation>
   sessionTeardown: TerminalSessionTeardown
   sessions: Map<string, Session>
   onFinalCheckpoint?: FinalCheckpoint
@@ -26,7 +27,12 @@ export async function disposeTerminalHostSessions({
 }: TerminalHostDisposalOptions): Promise<void> {
   if (pendingCreations.size > 0) {
     // No spawn may publish a session after teardown completes.
-    await Promise.all(pendingCreations.values())
+    await Promise.all(
+      [...pendingCreations.values()].map(async (creation) => {
+        await creation.recover()
+        await creation.completion
+      })
+    )
   }
   const existingTeardowns = sessionTeardown.requestImmediateAll()
   await Promise.all([
diff --git a/src/main/daemon/terminal-host-options.ts b/src/main/daemon/terminal-host-options.ts
index 0b21fbc8b3fc..8c70339eec0a 100644
--- a/src/main/daemon/terminal-host-options.ts
+++ b/src/main/daemon/terminal-host-options.ts
@@ -1,3 +1,4 @@
+import type { PtyCreationDisposition } from '../../shared/claimed-agent-pty-owner'
 import type { StartupCommandDelivery } from '../../shared/codex-startup-delivery'
 import type { TuiAgent } from '../../shared/tui-agent'
 import type { SubprocessHandle } from './session-subprocess-handle'
@@ -19,6 +20,8 @@ export type TerminalHostOptions = {
     terminalShellArgs?: string[]
     terminalWindowsWslDistro?: string | null
     terminalWindowsPowerShellImplementation?: 'auto' | 'powershell.exe' | 'pwsh.exe'
+    onCreationDisposition?: (disposition: PtyCreationDisposition) => void
+    assertCreateAllowed?: () => void
     isCanceled?: () => boolean
     cancelSignal?: AbortSignal
   }) => SubprocessHandle | Promise<SubprocessHandle>
diff --git a/src/main/daemon/terminal-host-returned-process.ts b/src/main/daemon/terminal-host-returned-process.ts
new file mode 100644
index 000000000000..d2c246b2ee3c
--- /dev/null
+++ b/src/main/daemon/terminal-host-returned-process.ts
@@ -0,0 +1,100 @@
+import type { Session } from './session'
+import type { SubprocessHandle } from './session-subprocess-handle'
+import type { TerminalExitCause } from '../../shared/terminal-exit-cause'
+import type { TerminalSpawnGate } from './terminal-spawn-gate'
+import { SessionTerminationController } from './session-termination-controller'
+import { shutdownOwnedTerminalProcess } from './terminal-host-session-shutdown'
+
+/** Retain the returned resource, not the completed create request or publication dependencies. */
+export function observeReturnedTerminalProcess(
+  subprocess: SubprocessHandle,
+  sessionId: string,
+  spawnGate: TerminalSpawnGate | undefined
+) {
+  const exited = Promise.withResolvers<void>()
+  let code: number | null = null
+  let exitCause: TerminalExitCause | undefined
+  let sessionExit: Parameters<SubprocessHandle['onExit']>[0] | undefined
+  const rawTermination = new SessionTerminationController({
+    sessionId,
+    subprocess,
+    isExited: () => code !== null,
+    releaseProducerPause: ({ resume }) => {
+      if (resume) {
+        subprocess.resume?.()
+      }
+    }
+  })
+  let recoverCreated = () =>
+    shutdownOwnedTerminalProcess({
+      pid: subprocess.pid,
+      isAlive: () => code === null,
+      terminateOwnedTree: () => subprocess.terminateOwnedTree(),
+      close: async () => {
+        await rawTermination.forceKillAndWaitForExit()
+        rawTermination.disposeSubprocessHandle()
+      }
+    })
+  let observing = false
+  const observeExit = (): void => {
+    if (observing || code !== null) {
+      return
+    }
+    subprocess.onExit((value, cause) => {
+      if (code !== null) {
+        return
+      }
+      code = value
+      exitCause = cause
+      rawTermination.markPhysicalExit()
+      spawnGate?.onSessionExit(sessionId)
+      exited.resolve()
+      sessionExit?.(value, cause)
+    })
+    observing = true
+    subprocess.onExit = (callback) => {
+      sessionExit = callback
+      if (code !== null) {
+        callback(code, exitCause)
+      }
+    }
+  }
+  return {
+    observeExit,
+    completion: exited.promise,
+    exitCode: () => code,
+    recover: async () => {
+      try {
+        observeExit()
+      } catch {
+        // Recovery still owns signaling when the adapter cannot yet observe exit.
+      }
+      await recoverCreated()
+    },
+    useRecovery: (recover: () => Promise<void>) => {
+      recoverCreated = recover
+    }
+  }
+}
+
+export function recoverUnpublishedTerminalSession(
+  session: Pick<
+    Session,
+    'pid' | 'isAlive' | 'terminateOwnedTree' | 'forceKillAndWaitForExit' | 'dispose'
+  >
+): () => Promise<void> {
+  return () =>
+    shutdownOwnedTerminalProcess({
+      pid: session.pid,
+      isAlive: () => session.isAlive,
+      terminateOwnedTree: () => session.terminateOwnedTree(),
+      close: async () => {
+        await session.forceKillAndWaitForExit()
+        session.dispose()
+      }
+    })
+}
+
+export function terminalSessionExitCode(session: Pick<Session, 'exitCode'>): () => number | null {
+  return () => session.exitCode
+}
diff --git a/src/main/daemon/terminal-host-session-create.ts b/src/main/daemon/terminal-host-session-create.ts
index 5a2852d0d3bb..600ad2e78fc0 100644
--- a/src/main/daemon/terminal-host-session-create.ts
+++ b/src/main/daemon/terminal-host-session-create.ts
@@ -1,37 +1,22 @@
-import { buildStartupCommandSubmission } from '../../shared/startup-command-submission'
-import {
-  discardStagedStartupCommand,
-  stageStartupCommand,
-  startupStagingFailureNotice,
-  type StartupCommandStaging
-} from '../../shared/startup-command-staging'
-import { resolvePtyOwnerBackend } from '../../shared/pty-owner-backend'
+import { terminalSessionExitCode } from './terminal-host-returned-process'
+import { settleUnpublishedTerminalSpawnLease } from './terminal-creation-work'
+import { spawnAndPublishSession } from './terminal-host-session-publish'
 import { getDaemonSessionResultMetadata } from './daemon-create-or-attach-result'
-import { enumerateDirectoryOnce } from './directory-enumeration-probe'
 import { normalizePtySize } from './daemon-pty-size'
-import { Session } from './session'
-import { shellPathSupportsPtyStartupBarrier } from './shell-ready'
+import type { Session } from './session'
 import type { InternalCreateOrAttachOptions } from './terminal-host-agent-session-claim'
 import type { CreateOrAttachResult } from './terminal-host-create-contract'
 import type { TerminalHostOptions } from './terminal-host-options'
 import type { TerminalHostTombstones } from './terminal-host-tombstones'
 import type { TerminalSessionTeardown } from './terminal-session-teardown'
 import type { TerminalSpawnGate } from './terminal-spawn-gate'
-import type { LegacyRestoreDetails } from './legacy-restore-records'
-import { resolveDaemonSessionScrollbackRows } from './daemon-session-scrollback-window'
 import { TerminalAttachCanceledError } from './daemon-errors'
 import { waitForTerminalAttachOperation } from './terminal-attach-cancellation'
-import { sharedPromiseSettlementWaiters } from '../../shared/promise-settlement-waiters'
 import { SessionNotFoundError } from './types'
 import { resolveWslSessionContext } from './wsl-session-context'
-import { recordSessionSpawnPaneKey } from './terminal-host-session-listing'
-import {
-  attachSessionInputViewer,
-  isSessionInputClosed,
-  trackSessionInput
-} from './session-input-path'
-
-type TerminalHostSessionCreateDependencies = {
+import { attachSessionInputViewer, isSessionInputClosed } from './session-input-path'
+import { describeAgentRestore } from './terminal-host-session-process'
+export type TerminalHostSessionCreateDependencies = {
   sessions: Map<string, Session>
   /** Re-checks the host's shutdown fence and this request's cancellation after any await. */
   assertCreateAllowed: () => void
@@ -74,6 +59,12 @@ export async function createOrAttachTerminalSession(
   // Attach synchronously: in-flight recovery resets arrive after the snapshot in stream order.
   // Checkpoint readers that require settled ownership use getSettledSnapshot.
   if (existing && existing.isAlive && !existing.isTerminating) {
+    deps.assertCreateAllowed()
+    const attachedSession = existing
+    opts.onPhysicalOwner?.(
+      attachedSession.physicalCompletion,
+      terminalSessionExitCode(attachedSession)
+    )
     const snapshot = existing.getSnapshot()
     existing.detachAllClients()
     const token = existing.attachClient(opts.streamClient)
@@ -109,6 +100,7 @@ export async function createOrAttachTerminalSession(
   const size = normalizePtySize(opts.cols, opts.rows)
   const wslDistro = resolveWslSessionContext(opts)?.distro
   const sessionId = opts.sessionId
+  const spawnGate = deps.spawnGate
   let lease = deps.spawnGate?.admit(
     {
       clientId: opts.spawnAdmission?.clientId ?? 'in-process',
@@ -126,210 +118,31 @@ export async function createOrAttachTerminalSession(
   if (lease instanceof Promise) {
     lease = await lease
   }
+  let published = false
   try {
     if (paced) {
       // Pacing can outlast shutdown or cancellation; recheck before spawning.
       deps.assertCreateAllowed()
     }
-    return await spawnAndPublishSession(opts, deps, { size, wslDistro }, (publishedId, isAlive) =>
-      lease?.commit(publishedId, isAlive)
+    const result = await spawnAndPublishSession(
+      opts,
+      deps,
+      { size, wslDistro },
+      (publishedId, isAlive) => lease?.commit(publishedId, isAlive)
     )
+    published = true
+    return result
   } finally {
-    lease?.abandon()
-  }
-}
-
-async function spawnAndPublishSession(
-  opts: InternalCreateOrAttachOptions,
-  deps: TerminalHostSessionCreateDependencies,
-  ctx: { size: { cols: number; rows: number }; wslDistro: string | undefined },
-  onPublished: (sessionId: string, isAlive: boolean) => void
-): Promise<CreateOrAttachResult> {
-  const { size, wslDistro } = ctx
-  // Only macOS needs the TCC probe; other hosts must not pin extra filesystem workers.
-  const cwdReadableByDaemon =
-    process.platform === 'darwin' && opts.cwd && !wslDistro
-      ? await isCwdReadableByThisProcess(opts.cwd, opts)
-      : null
-  deps.assertCreateAllowed()
-  const subprocess = await deps.spawnSubprocess({
-    sessionId: opts.sessionId,
-    cols: size.cols,
-    rows: size.rows,
-    cwd: opts.cwd,
-    env: opts.env,
-    envToDelete: opts.envToDelete,
-    command: opts.command,
-    startupCommandDelivery: opts.startupCommandDelivery,
-    ...(opts.launchAgent ? { launchAgent: opts.launchAgent } : {}),
-    shellOverride: opts.shellOverride,
-    terminalShellArgs: opts.terminalShellArgs,
-    terminalWindowsWslDistro: opts.terminalWindowsWslDistro,
-    terminalWindowsPowerShellImplementation: opts.terminalWindowsPowerShellImplementation,
-    isCanceled: opts.isCanceled,
-    ...(opts.cancelSignal ? { cancelSignal: opts.cancelSignal } : {})
-  })
-
-  let staging: StartupCommandStaging | undefined
-  // Reconcile fallback-shell capability or its first command could remain queued until timeout.
-  const shellReadySupported =
-    (opts.shellReadySupported ?? false) &&
-    (subprocess.shellPath === undefined || shellPathSupportsPtyStartupBarrier(subprocess.shellPath))
-  const session = new Session({
-    sessionId: opts.sessionId,
-    cols: size.cols,
-    rows: size.rows,
-    terminalHandle: opts.env?.ORCA_TERMINAL_HANDLE,
-    launchAgent: opts.launchAgent,
-    subprocess,
-    ownerBackend: resolvePtyOwnerBackend({
-      platform: process.platform,
-      shellPath: subprocess.shellPath,
-      wslDistro
-    }),
-    shellReadySupported,
-    scrollback: resolveDaemonSessionScrollbackRows(),
-    historySeedChunks: opts.historySeedChunks,
-    ...(opts.startupIngress ? { startupIngress: opts.startupIngress } : {}),
-    wslDistro,
-    onExit: createSessionExitHandler(
-      deps.onSessionExit,
-      opts.sessionId,
-      opts.agentSessionGeneration,
-      () => discardStagedStartupCommand(staging),
-      deps.spawnGate
-    ),
-    ...(deps.reportReadinessEvent ? { reportReadinessEvent: deps.reportReadinessEvent } : {}),
-    ...(opts.shellReadyTimeoutMs !== undefined
-      ? { shellReadyTimeoutMs: opts.shellReadyTimeoutMs }
-      : {})
-  })
-  recordSessionSpawnPaneKey(session, opts.env?.ORCA_PANE_KEY)
-
-  trackSessionInput(session, subprocess, deps.reportReadinessEvent)
-
-  if (opts.isCanceled?.()) {
-    // Retain cleanup ownership if the native child refuses to exit.
-    deps.sessions.set(opts.sessionId, session)
-    // Retain the live-cap charge until physical exit.
-    onPublished(opts.sessionId, session.isAlive)
-    await session.forceKillAndDisposeSubprocess()
-    if (deps.sessions.get(opts.sessionId) === session) {
-      session.dispose()
-      deps.sessions.delete(opts.sessionId)
-      deps.onDeadSessionRemoved(opts.sessionId)
-      deps.spawnGate?.onSessionExit(opts.sessionId)
-    }
-    throw new TerminalAttachCanceledError(opts.sessionId)
-  }
-
-  deps.sessions.set(opts.sessionId, session)
-  deps.onSessionCreated(opts.sessionId, opts.agentSessionGeneration, session.isAlive)
-  onPublished(opts.sessionId, session.isAlive)
-  const token = session.attachClient(opts.streamClient)
-  attachSessionInputViewer(session, opts.streamClient)
-
-  const startupCommandWritten =
-    Boolean(opts.command) && !subprocess.startupCommandDeliveredInShellArgs
-  // Distinguish absent from undelivered commands; log only length because command text may contain credentials.
-  try {
-    deps.reportReadinessEvent?.('startup-command-delivery', {
-      sessionId: opts.sessionId,
-      written: startupCommandWritten,
-      hasCommand: Boolean(opts.command),
-      commandLength: opts.command?.length ?? 0,
-      viaShellArgs: subprocess.startupCommandDeliveredInShellArgs === true,
-      queuedByShellReadyBarrier: shellReadySupported
-    })
-  } catch {
-    // Diagnostics must never turn a live PTY into a failed create.
-  }
-  if (startupCommandWritten && opts.command) {
-    staging = stageStartupCommand({
-      command: opts.command,
-      shellPath: subprocess.shellPath,
-      orcaBuiltLine: opts.launchAgent !== undefined
-    })
-    const notice = startupStagingFailureNotice(staging)
-    if (notice) {
-      session.startupIngress.accept(notice)
-      try {
-        deps.reportReadinessEvent?.('startup-command-stage-failed', {
-          sessionId: opts.sessionId,
-          reason: staging.failure
-        })
-      } catch {
-        // Diagnostics must never turn a live PTY into a failed create.
-      }
+    const admitted = lease
+    if (published || !opts.creationWork) {
+      admitted?.abandon()
+    } else {
+      settleUnpublishedTerminalSpawnLease(
+        opts.creationWork.completion,
+        admitted,
+        sessionId,
+        spawnGate
+      )
     }
-    // Why: only Orca-wrapped shells advertise the paste-safe startup barrier.
-    session.writeStartupCommand(
-      buildStartupCommandSubmission(staging.command, {
-        bracketedPasteSafe: shellReadySupported
-      })
-    )
-  }
-
-  return {
-    isNew: true,
-    snapshot: null,
-    pid: subprocess.pid,
-    shellState: session.shellState,
-    incarnationId: session.incarnationId,
-    ...getDaemonSessionResultMetadata(session),
-    ...(isSessionInputClosed(session) ? { inputClosed: true as const } : {}),
-    ...(cwdReadableByDaemon !== null ? { cwdReadableByDaemon } : {}),
-    attachToken: token
   }
 }
-
-function createSessionExitHandler(
-  onSessionExit: TerminalHostSessionCreateDependencies['onSessionExit'],
-  sessionId: string,
-  generation: string | undefined,
-  discardStagedCommand: () => void,
-  spawnGate: TerminalSpawnGate | undefined
-): () => void {
-  return () => {
-    discardStagedCommand()
-    spawnGate?.onSessionExit(sessionId)
-    onSessionExit(sessionId, generation)
-  }
-}
-
-/** Describe restore identity without including environment values that may contain credentials. */
-function describeAgentRestore(
-  opts: InternalCreateOrAttachOptions
-): LegacyRestoreDetails | undefined {
-  if (!opts.command || (!opts.launchAgent && !opts.agentSessionEnsure)) {
-    return undefined
-  }
-  return {
-    sessionId: opts.sessionId,
-    agent: opts.launchAgent ?? opts.agentSessionEnsure?.claim.agent ?? null,
-    cwd: opts.cwd ?? null,
-    worktreeId: opts.agentSessionEnsure?.surface.worktreeId ?? null,
-    command: opts.command,
-    identityDigest: opts.agentSessionEnsure?.claim.identityDigest ?? null
-  }
-}
-
-// TCC may reject directory enumeration despite successful access(); only explicit permission denial counts.
-async function isCwdReadableByThisProcess(
-  cwd: string,
-  opts: Pick<InternalCreateOrAttachOptions, 'sessionId' | 'cancelSignal'>
-): Promise<boolean | null> {
-  const outcome = await sharedPromiseSettlementWaiters(enumerateDirectoryOnce(cwd))
-    .wait({
-      timeoutMs: 1_000,
-      signal: opts.cancelSignal,
-      createAbortError: () => new TerminalAttachCanceledError(opts.sessionId)
-    })
-    .catch((error: unknown) => {
-      if (error instanceof TerminalAttachCanceledError) {
-        throw error
-      }
-      return null
-    })
-  return outcome === null ? null : outcome !== 'denied'
-}
diff --git a/src/main/daemon/terminal-host-session-process.ts b/src/main/daemon/terminal-host-session-process.ts
new file mode 100644
index 000000000000..1a0357eb34e3
--- /dev/null
+++ b/src/main/daemon/terminal-host-session-process.ts
@@ -0,0 +1,60 @@
+import {
+  discardStagedStartupCommand,
+  type StartupCommandStaging
+} from '../../shared/startup-command-staging'
+import type { TerminalHostSessionCreateDependencies } from './terminal-host-session-create'
+import { enumerateDirectoryOnce } from './directory-enumeration-probe'
+import type { InternalCreateOrAttachOptions } from './terminal-host-agent-session-claim'
+import type { TerminalSpawnGate } from './terminal-spawn-gate'
+import type { LegacyRestoreDetails } from './legacy-restore-records'
+import { TerminalAttachCanceledError } from './daemon-errors'
+import { sharedPromiseSettlementWaiters } from '../../shared/promise-settlement-waiters'
+
+export function createSessionExitHandler(
+  onSessionExit: TerminalHostSessionCreateDependencies['onSessionExit'],
+  sessionId: string,
+  generation: string | undefined,
+  staging: { current?: StartupCommandStaging },
+  spawnGate: TerminalSpawnGate | undefined
+): () => void {
+  return () => {
+    discardStagedStartupCommand(staging.current)
+    spawnGate?.onSessionExit(sessionId)
+    onSessionExit(sessionId, generation)
+  }
+}
+
+export function describeAgentRestore(
+  opts: InternalCreateOrAttachOptions
+): LegacyRestoreDetails | undefined {
+  if (!opts.command || (!opts.launchAgent && !opts.agentSessionEnsure)) {
+    return undefined
+  }
+  return {
+    sessionId: opts.sessionId,
+    agent: opts.launchAgent ?? opts.agentSessionEnsure?.claim.agent ?? null,
+    cwd: opts.cwd ?? null,
+    worktreeId: opts.agentSessionEnsure?.surface.worktreeId ?? null,
+    command: opts.command,
+    identityDigest: opts.agentSessionEnsure?.claim.identityDigest ?? null
+  }
+}
+
+export async function isCwdReadableByThisProcess(
+  cwd: string,
+  opts: Pick<InternalCreateOrAttachOptions, 'sessionId' | 'cancelSignal'>
+): Promise<boolean | null> {
+  const outcome = await sharedPromiseSettlementWaiters(enumerateDirectoryOnce(cwd))
+    .wait({
+      timeoutMs: 1_000,
+      signal: opts.cancelSignal,
+      createAbortError: () => new TerminalAttachCanceledError(opts.sessionId)
+    })
+    .catch((error: unknown) => {
+      if (error instanceof TerminalAttachCanceledError) {
+        throw error
+      }
+      return null
+    })
+  return outcome === null ? null : outcome !== 'denied'
+}
diff --git a/src/main/daemon/terminal-host-session-publish.ts b/src/main/daemon/terminal-host-session-publish.ts
new file mode 100644
index 000000000000..0ad776c08a4c
--- /dev/null
+++ b/src/main/daemon/terminal-host-session-publish.ts
@@ -0,0 +1,212 @@
+import type { PtyCreationDisposition } from '../../shared/claimed-agent-pty-owner'
+import type { SubprocessHandle } from './session-subprocess-handle'
+import { buildStartupCommandSubmission } from '../../shared/startup-command-submission'
+import {
+  stageStartupCommand,
+  startupStagingFailureNotice,
+  type StartupCommandStaging
+} from '../../shared/startup-command-staging'
+import { resolvePtyOwnerBackend } from '../../shared/pty-owner-backend'
+import { getDaemonSessionResultMetadata } from './daemon-create-or-attach-result'
+import { Session } from './session'
+import {
+  observeReturnedTerminalProcess,
+  recoverUnpublishedTerminalSession,
+  terminalSessionExitCode
+} from './terminal-host-returned-process'
+import { shellPathSupportsPtyStartupBarrier } from './shell-ready'
+import type { InternalCreateOrAttachOptions } from './terminal-host-agent-session-claim'
+import type { CreateOrAttachResult } from './terminal-host-create-contract'
+import { resolveDaemonSessionScrollbackRows } from './daemon-session-scrollback-window'
+import { TerminalAttachCanceledError } from './daemon-errors'
+import { recordSessionSpawnPaneKey } from './terminal-host-session-listing'
+import {
+  attachSessionInputViewer,
+  isSessionInputClosed,
+  trackSessionInput
+} from './session-input-path'
+import {
+  createSessionExitHandler,
+  isCwdReadableByThisProcess
+} from './terminal-host-session-process'
+import type { TerminalHostSessionCreateDependencies } from './terminal-host-session-create'
+export async function spawnAndPublishSession(
+  opts: InternalCreateOrAttachOptions,
+  deps: TerminalHostSessionCreateDependencies,
+  ctx: { size: { cols: number; rows: number }; wslDistro: string | undefined },
+  onPublished: (sessionId: string, isAlive: boolean) => void
+): Promise<CreateOrAttachResult> {
+  const { size, wslDistro } = ctx
+  // Only macOS needs the TCC probe; other hosts must not pin extra filesystem workers.
+  const cwdReadableByDaemon =
+    process.platform === 'darwin' && opts.cwd && !wslDistro
+      ? await isCwdReadableByThisProcess(opts.cwd, opts)
+      : null
+  deps.assertCreateAllowed()
+  const lower = Promise.withResolvers<PtyCreationDisposition>()
+  opts.creationWork?.join(lower.promise)
+  let lowerReported = false
+  let physical: ReturnType<typeof observeReturnedTerminalProcess>
+  let subprocess: SubprocessHandle
+  try {
+    subprocess = await deps.spawnSubprocess({
+      onCreationDisposition: (disposition) => {
+        lowerReported = true
+        lower.resolve(disposition)
+      },
+      sessionId: opts.sessionId,
+      cols: size.cols,
+      rows: size.rows,
+      cwd: opts.cwd,
+      env: opts.env,
+      envToDelete: opts.envToDelete,
+      command: opts.command,
+      startupCommandDelivery: opts.startupCommandDelivery,
+      ...(opts.launchAgent ? { launchAgent: opts.launchAgent } : {}),
+      shellOverride: opts.shellOverride,
+      terminalShellArgs: opts.terminalShellArgs,
+      terminalWindowsWslDistro: opts.terminalWindowsWslDistro,
+      terminalWindowsPowerShellImplementation: opts.terminalWindowsPowerShellImplementation,
+      isCanceled: opts.isCanceled,
+      assertCreateAllowed: deps.assertCreateAllowed,
+      ...(opts.cancelSignal ? { cancelSignal: opts.cancelSignal } : {})
+    })
+    // External implementations returning a handle have transferred an actual resource.
+    physical = observeReturnedTerminalProcess(subprocess, opts.sessionId, deps.spawnGate)
+    if (!lowerReported) {
+      lower.resolve({
+        kind: 'physical',
+        completion: physical.completion,
+        exitCode: physical.exitCode,
+        recover: physical.recover
+      })
+    }
+    physical.observeExit()
+    opts.onPhysicalOwner?.(physical.completion, physical.exitCode)
+    onPublished(opts.sessionId, physical.exitCode() === null)
+  } catch (error) {
+    if (!lowerReported) {
+      lower.resolve({ kind: 'unknown' })
+    }
+    throw error
+  }
+
+  const staging: { current?: StartupCommandStaging } = {}
+  // Reconcile fallback-shell capability or its first command could remain queued until timeout.
+  const shellReadySupported =
+    (opts.shellReadySupported ?? false) &&
+    (subprocess.shellPath === undefined || shellPathSupportsPtyStartupBarrier(subprocess.shellPath))
+  const session = new Session({
+    sessionId: opts.sessionId,
+    cols: size.cols,
+    rows: size.rows,
+    terminalHandle: opts.env?.ORCA_TERMINAL_HANDLE,
+    launchAgent: opts.launchAgent,
+    subprocess,
+    ownerBackend: resolvePtyOwnerBackend({
+      platform: process.platform,
+      shellPath: subprocess.shellPath,
+      wslDistro
+    }),
+    shellReadySupported,
+    scrollback: resolveDaemonSessionScrollbackRows(),
+    historySeedChunks: opts.historySeedChunks,
+    ...(opts.startupIngress ? { startupIngress: opts.startupIngress } : {}),
+    wslDistro,
+    onExit: createSessionExitHandler(
+      deps.onSessionExit,
+      opts.sessionId,
+      opts.agentSessionGeneration,
+      staging,
+      deps.spawnGate
+    ),
+    ...(deps.reportReadinessEvent ? { reportReadinessEvent: deps.reportReadinessEvent } : {}),
+    ...(opts.shellReadyTimeoutMs !== undefined
+      ? { shellReadyTimeoutMs: opts.shellReadyTimeoutMs }
+      : {})
+  })
+  physical.useRecovery(recoverUnpublishedTerminalSession(session))
+  opts.onPhysicalOwner?.(session.physicalCompletion, terminalSessionExitCode(session))
+  recordSessionSpawnPaneKey(session, opts.env?.ORCA_PANE_KEY)
+
+  try {
+    trackSessionInput(session, subprocess, deps.reportReadinessEvent)
+  } catch (error) {
+    void session.physicalCompletion.then(session.dispose.bind(session))
+    throw error
+  }
+
+  if (opts.isCanceled?.()) {
+    // Retain cleanup ownership if the native child refuses to exit.
+    deps.sessions.set(opts.sessionId, session)
+    // Retain the live-cap charge until physical exit.
+    onPublished(opts.sessionId, session.isAlive)
+    await session.forceKillAndWaitForExit().catch(() => {})
+    if (!session.isAlive && deps.sessions.get(opts.sessionId) === session) {
+      session.dispose()
+      deps.sessions.delete(opts.sessionId)
+      deps.onDeadSessionRemoved(opts.sessionId)
+      deps.spawnGate?.onSessionExit(opts.sessionId)
+    }
+    throw new TerminalAttachCanceledError(opts.sessionId)
+  }
+
+  deps.sessions.set(opts.sessionId, session)
+  deps.onSessionCreated(opts.sessionId, opts.agentSessionGeneration, session.isAlive)
+  onPublished(opts.sessionId, session.isAlive)
+  const token = session.attachClient(opts.streamClient)
+  attachSessionInputViewer(session, opts.streamClient)
+
+  const startupCommandWritten =
+    Boolean(opts.command) && !subprocess.startupCommandDeliveredInShellArgs
+  // Distinguish absent from undelivered commands; log only length because command text may contain credentials.
+  try {
+    deps.reportReadinessEvent?.('startup-command-delivery', {
+      sessionId: opts.sessionId,
+      written: startupCommandWritten,
+      hasCommand: Boolean(opts.command),
+      commandLength: opts.command?.length ?? 0,
+      viaShellArgs: subprocess.startupCommandDeliveredInShellArgs === true,
+      queuedByShellReadyBarrier: shellReadySupported
+    })
+  } catch {
+    // Diagnostics must never turn a live PTY into a failed create.
+  }
+  if (startupCommandWritten && opts.command) {
+    staging.current = stageStartupCommand({
+      command: opts.command,
+      shellPath: subprocess.shellPath,
+      orcaBuiltLine: opts.launchAgent !== undefined
+    })
+    const notice = startupStagingFailureNotice(staging.current)
+    if (notice) {
+      session.startupIngress.accept(notice)
+      try {
+        deps.reportReadinessEvent?.('startup-command-stage-failed', {
+          sessionId: opts.sessionId,
+          reason: staging.current.failure
+        })
+      } catch {
+        // Diagnostics must never turn a live PTY into a failed create.
+      }
+    }
+    // Why: only Orca-wrapped shells advertise the paste-safe startup barrier.
+    session.writeStartupCommand(
+      buildStartupCommandSubmission(staging.current.command, {
+        bracketedPasteSafe: shellReadySupported
+      })
+    )
+  }
+
+  return {
+    isNew: true,
+    snapshot: null,
+    pid: subprocess.pid,
+    shellState: session.shellState,
+    incarnationId: session.incarnationId,
+    ...getDaemonSessionResultMetadata(session),
+    ...(isSessionInputClosed(session) ? { inputClosed: true as const } : {}),
+    ...(cwdReadableByDaemon !== null ? { cwdReadableByDaemon } : {}),
+    attachToken: token
+  }
+}
diff --git a/src/main/daemon/terminal-host-session-shutdown.ts b/src/main/daemon/terminal-host-session-shutdown.ts
index d043ea1d7c5f..384739ee48e8 100644
--- a/src/main/daemon/terminal-host-session-shutdown.ts
+++ b/src/main/daemon/terminal-host-session-shutdown.ts
@@ -8,15 +8,29 @@ async function disposeLiveSession(session: Session): Promise<void> {
     await session.forceKillAndDisposeSubprocess()
     return
   }
+  await shutdownOwnedTerminalProcess({
+    pid: session.pid,
+    isAlive: () => session.isAlive,
+    terminateOwnedTree: () => session.terminateOwnedTree(),
+    close: () => session.forceKillAndDisposeSubprocess()
+  })
+}
+
+export async function shutdownOwnedTerminalProcess(owner: {
+  pid: number
+  isAlive: () => boolean
+  terminateOwnedTree: Session['terminateOwnedTree']
+  close: () => Promise<void>
+}): Promise<void> {
   try {
-    await killWithDescendantSweep(session.pid, () => {}, {
-      ownsRoot: () => session.isAlive,
-      terminateOwnedTree: () => session.terminateOwnedTree(),
+    await killWithDescendantSweep(owner.pid, () => {}, {
+      ownsRoot: owner.isAlive,
+      terminateOwnedTree: owner.terminateOwnedTree,
       terminateDescendants: terminateShutdownDescendants,
       awaitEscalation: true
     })
   } finally {
-    await session.forceKillAndDisposeSubprocess()
+    await owner.close()
   }
 }
 
diff --git a/src/main/daemon/terminal-host.ts b/src/main/daemon/terminal-host.ts
index c5fbe6db155a..1243ff32de96 100644
--- a/src/main/daemon/terminal-host.ts
+++ b/src/main/daemon/terminal-host.ts
@@ -1,3 +1,5 @@
+import { terminalSessionExitCode } from './terminal-host-returned-process'
+import { runTerminalCreation, type PendingTerminalCreation } from './terminal-creation-work'
 import { beginTerminalHostFencedTermination } from './terminal-host-fenced-termination'
 import type { PtyFencedTerminationRequest } from '../../shared/pty-fenced-termination'
 import type { Session } from './session'
@@ -22,7 +24,6 @@ import {
 } from './terminal-host-session-listing'
 import { createOrAttachTerminalSession } from './terminal-host-session-create'
 import { TerminalAttachCanceledError } from './daemon-errors'
-import { waitForTerminalAttachOperation } from './terminal-attach-cancellation'
 import { randomUUID } from 'node:crypto'
 import { inspectTerminalHostSession } from './terminal-host-process-inspection'
 import type { TerminalHostProcessInspection } from './terminal-host-process-inspection'
@@ -45,7 +46,7 @@ const DEFAULT_MAX_TOMBSTONES = 1000
 export class TerminalHost {
   private sessions = new Map<string, Session>()
   // Serializes creates for one id across async spawn validation.
-  private pendingCreations = new Map<string, Promise<void>>()
+  private pendingCreations = new Map<string, PendingTerminalCreation>()
   private sessionTeardown = new TerminalSessionTeardown(this.sessions)
   private killedTombstones: TerminalHostTombstones
   private readonly spawnOptions: Pick<TerminalHostOptions, 'spawnSubprocess' | 'spawnGate'>
@@ -71,64 +72,50 @@ export class TerminalHost {
     this.killedTombstones = new TerminalHostTombstones(opts.maxTombstones ?? DEFAULT_MAX_TOMBSTONES)
   }
 
-  async createOrAttach(opts: InternalCreateOrAttachOptions): Promise<CreateOrAttachResult> {
-    this.assertCreateOrAttachAllowed(opts)
-    for (
-      let inFlight = this.pendingCreations.get(opts.sessionId);
-      inFlight !== undefined;
-      inFlight = this.pendingCreations.get(opts.sessionId)
-    ) {
-      // Let canceled callers leave rather than wait behind a cwd probe stuck on an unreachable share.
-      await waitForTerminalAttachOperation(inFlight, opts.cancelSignal, opts.sessionId)
-      this.assertCreateOrAttachAllowed(opts)
-    }
-    this.assertCreateOrAttachAllowed(opts)
-
-    let settleCreation: () => void = () => {}
-    this.pendingCreations.set(
-      opts.sessionId,
-      new Promise<void>((resolve) => {
-        settleCreation = resolve
-      })
-    )
-    try {
-      return await createOrAttachClaimedAgentSession({
-        options: opts,
-        owners: this.agentSessionOwners,
-        isLive: (owner) =>
-          this.agentSessionGenerations.isCurrent(
-            owner,
-            Boolean(
-              this.sessions.get(owner.ptyId)?.isAlive &&
-              !this.sessions.get(owner.ptyId)?.isTerminating
+  createOrAttach(opts: InternalCreateOrAttachOptions): Promise<CreateOrAttachResult> {
+    return runTerminalCreation(
+      opts,
+      this.sessions,
+      this.pendingCreations,
+      (options) => this.assertCreateOrAttachAllowed(options),
+      (opts, creation) =>
+        createOrAttachClaimedAgentSession({
+          options: opts,
+          owners: this.agentSessionOwners,
+          isLive: (owner) => {
+            const session = this.sessions.get(owner.ptyId)
+            const live = this.agentSessionGenerations.isCurrent(
+              owner,
+              Boolean(session?.isAlive && !session.isTerminating)
             )
-          ),
-        createOrAttach: async (options) => {
-          this.assertCreateOrAttachAllowed(options)
-          if (options.agentSessionGeneration && this.sessions.get(options.sessionId)?.isAlive) {
-            throw new Error('agent_session_claim_unavailable')
+            if (live && session) {
+              creation.owner(session.physicalCompletion, terminalSessionExitCode(session))
+            }
+            return live
+          },
+          createOrAttach: async (options) => {
+            this.assertCreateOrAttachAllowed(options)
+            if (options.agentSessionGeneration && this.sessions.get(options.sessionId)?.isAlive) {
+              throw new Error('agent_session_claim_unavailable')
+            }
+            return await createOrAttachTerminalSession(options, {
+              sessions: this.sessions,
+              assertCreateAllowed: () => this.assertCreateOrAttachAllowed(options),
+              sessionTeardown: this.sessionTeardown,
+              killedTombstones: this.killedTombstones,
+              spawnSubprocess: this.spawnOptions.spawnSubprocess,
+              spawnGate: this.spawnOptions.spawnGate,
+              onDeadSessionRemoved: (sessionId) => this.agentSessionGenerations.forget(sessionId),
+              onSessionCreated: (sessionId, generation, isAlive) =>
+                this.agentSessionGenerations.remember(sessionId, generation, isAlive),
+              ...(this.reportReadinessEvent
+                ? { reportReadinessEvent: this.reportReadinessEvent }
+                : {}),
+              onSessionExit: this.handleSessionExit.bind(this)
+            })
           }
-          return await createOrAttachTerminalSession(options, {
-            sessions: this.sessions,
-            assertCreateAllowed: () => this.assertCreateOrAttachAllowed(options),
-            sessionTeardown: this.sessionTeardown,
-            killedTombstones: this.killedTombstones,
-            spawnSubprocess: this.spawnOptions.spawnSubprocess,
-            spawnGate: this.spawnOptions.spawnGate,
-            onDeadSessionRemoved: (sessionId) => this.agentSessionGenerations.forget(sessionId),
-            onSessionCreated: (sessionId, generation, isAlive) =>
-              this.agentSessionGenerations.remember(sessionId, generation, isAlive),
-            ...(this.reportReadinessEvent
-              ? { reportReadinessEvent: this.reportReadinessEvent }
-              : {}),
-            onSessionExit: this.handleSessionExit.bind(this)
-          })
-        }
-      })
-    } finally {
-      this.pendingCreations.delete(opts.sessionId)
-      settleCreation()
-    }
+        })
+    )
   }
 
   private handleSessionExit(sessionId: string, generation: string | undefined): void {
diff --git a/src/main/daemon/terminal-spawn-gate.test.ts b/src/main/daemon/terminal-spawn-gate.test.ts
index 3da9de6af159..f77c331746b2 100644
--- a/src/main/daemon/terminal-spawn-gate.test.ts
+++ b/src/main/daemon/terminal-spawn-gate.test.ts
@@ -153,7 +153,8 @@ describe('TerminalSpawnGate', () => {
     expect(gate.snapshot()).toMatchObject({ liveAutomatic: 0, inFlight: { interactive: 0 } })
     expect(log).not.toHaveBeenCalled()
 
-    spawnSubprocess.mockImplementationOnce(() => {
+    spawnSubprocess.mockImplementationOnce((options) => {
+      options.onCreationDisposition?.({ kind: 'no-fork' })
       throw new Error('spawn failed')
     })
     await expect(restore('restore-fails')).rejects.toThrow('spawn failed')
@@ -269,7 +270,8 @@ describe('TerminalSpawnGate', () => {
 
     it('frees the slot of a fork that failed', async () => {
       capAt(1)
-      spawnSubprocess.mockImplementationOnce(() => {
+      spawnSubprocess.mockImplementationOnce((options) => {
+        options.onCreationDisposition?.({ kind: 'no-fork' })
         throw new Error('spawn failed')
       })
       await expect(shell('a')).rejects.toThrow('spawn failed')
diff --git a/src/main/native-chat/agent-session-journal/adopted-transcript-source.ts b/src/main/native-chat/agent-session-journal/adopted-transcript-source.ts
index 433a9b564311..1905a5db1488 100644
--- a/src/main/native-chat/agent-session-journal/adopted-transcript-source.ts
+++ b/src/main/native-chat/agent-session-journal/adopted-transcript-source.ts
@@ -8,7 +8,12 @@ import { readOpenCodeTranscriptSignalViaWorker } from '../../ai-vault/session-sc
 import { samePiDirectory } from '../../pi/rpc-launch-resolution'
 import { admitTranscriptPath } from '../transcript-path-admission'
 
-export type AdoptedTranscriptSource = { providerSessionId: string; workspaceCwd: string }
+export type AdoptedTranscriptSource = {
+  providerSessionId: string
+  workspaceCwd: string
+  /** Host-selected account store, never supplied by a wire caller or persisted. */
+  conversationStore?: string
+}
 
 export function assertAdoptedSourceIdentity(
   source: AdoptedTranscriptSource,
diff --git a/src/main/native-chat/agent-session-journal/codex-history-test-fixture.ts b/src/main/native-chat/agent-session-journal/codex-history-test-fixture.ts
new file mode 100644
index 000000000000..f59843ee23a4
--- /dev/null
+++ b/src/main/native-chat/agent-session-journal/codex-history-test-fixture.ts
@@ -0,0 +1,88 @@
+import { writeFile } from 'node:fs/promises'
+import { join } from 'node:path'
+
+export type CodexHistoryPositionFixture = {
+  thread_id: string
+  end_ordinal_exclusive: number
+  end_byte_offset: number
+}
+
+export async function writeCodexHistoryFixture(
+  root: string,
+  id: string,
+  prompts: string[],
+  base?: CodexHistoryPositionFixture,
+  metadataId = id
+) {
+  const records = [
+    {
+      type: 'session_meta',
+      payload: {
+        id: metadataId,
+        history_mode: 'paginated',
+        ...(base ? { history_base: base } : {})
+      }
+    },
+    ...prompts.flatMap((text, turn) => [
+      {
+        type: 'response_item',
+        payload: {
+          type: 'message',
+          role: 'user',
+          id: `response-user-${turn}`,
+          content: [{ type: 'input_text', text }]
+        }
+      },
+      {
+        type: 'event_msg',
+        payload: {
+          type: 'item_completed',
+          thread_id: id,
+          turn_id: `turn-${turn}`,
+          completed_at_ms: 1,
+          item: { type: 'UserMessage', id: `user-${turn}`, content: [{ type: 'text', text }] }
+        }
+      },
+      {
+        type: 'response_item',
+        payload: {
+          type: 'message',
+          role: 'assistant',
+          id: `answer-${turn}`,
+          content: [{ type: 'output_text', text: `${text} answer` }]
+        }
+      },
+      {
+        type: 'event_msg',
+        payload: {
+          type: 'item_completed',
+          thread_id: id,
+          turn_id: `turn-${turn}`,
+          completed_at_ms: 1,
+          item: {
+            type: 'AgentMessage',
+            id: `answer-${turn}`,
+            content: [{ type: 'Text', text: `${text} answer` }]
+          }
+        }
+      }
+    ])
+  ].map((record, index) => ({
+    ...record,
+    timestamp: '2026-10-27T00:00:00.000Z',
+    ordinal: (base?.end_ordinal_exclusive ?? 0) + index
+  }))
+  const serialized = `${records.map((record) => JSON.stringify(record)).join('\n')}\n`
+  const ids = metadataId === id ? id : `${metadataId}_${id}`
+  const filePath = join(root, `rollout-2026-10-27T00-00-00-${ids}.jsonl`)
+  await writeFile(filePath, serialized)
+  return {
+    filePath,
+    records,
+    position: {
+      thread_id: id,
+      end_ordinal_exclusive: (base?.end_ordinal_exclusive ?? 0) + records.length,
+      end_byte_offset: Buffer.byteLength(serialized)
+    }
+  }
+}
diff --git a/src/main/native-chat/agent-session-journal/journal-codex-history.test.ts b/src/main/native-chat/agent-session-journal/journal-codex-history.test.ts
new file mode 100644
index 000000000000..fac0bc529b64
--- /dev/null
+++ b/src/main/native-chat/agent-session-journal/journal-codex-history.test.ts
@@ -0,0 +1,72 @@
+import { appendFile, mkdir, mkdtemp, readFile, rename, rm, writeFile } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { basename, dirname, join } from 'node:path'
+import { zstdCompressSync } from 'node:zlib'
+import { afterEach, beforeEach, expect, it } from 'vitest'
+import { writeCodexHistoryFixture } from './codex-history-test-fixture'
+import { prepareLegacyTranscriptImport } from './journal-legacy-import'
+
+const PARENT = '01a17c7f-6f58-7a73-b87a-a8702ff2da17'
+const CHILD = '01a17c81-30d1-72f0-b84e-002ddfe6fd47'
+const MIDDLE = '01a17c80-30d1-72f0-b84e-002ddfe6fd47'
+let root: string
+beforeEach(async () => {
+  const account = await mkdtemp(join(tmpdir(), 'orca-codex-lineage-'))
+  root = join(account, 'sessions')
+  await mkdir(root)
+  await mkdir(join(account, 'archived_sessions'))
+})
+afterEach(async () => {
+  await rm(dirname(root), { recursive: true, force: true })
+})
+
+function request(filePath: string) {
+  return {
+    agent: 'codex' as const,
+    sessionId: CHILD,
+    options: {
+      filePath,
+      codexSessionsDirs: [root],
+      source: { providerSessionId: CHILD, workspaceCwd: '/workspace' }
+    }
+  }
+}
+
+it.each(['active', 'archive', 'compressed'] as const)(
+  'imports %s ancestor prefixes oldest first and excludes later turns',
+  async (location) => {
+    const parent = await writeCodexHistoryFixture(root, PARENT, ['sky'], undefined, MIDDLE)
+    const middle = await writeCodexHistoryFixture(root, MIDDLE, ['leaves'], parent.position)
+    const child = await writeCodexHistoryFixture(root, CHILD, ['ice'], middle.position)
+    const later = await writeCodexHistoryFixture(root, '01a17c82-30d1-72f0-b84e-002ddfe6fd47', [
+      'S1'
+    ])
+    await appendFile(
+      parent.filePath,
+      `${later.records
+        .slice(1)
+        .map((record, index) =>
+          JSON.stringify({ ...record, ordinal: parent.position.end_ordinal_exclusive + index })
+        )
+        .join('\n')}\n`
+    )
+    if (location !== 'active') {
+      const archived = join(dirname(root), 'archived_sessions', basename(parent.filePath))
+      if (location === 'compressed') {
+        await writeFile(`${archived}.zst`, zstdCompressSync(await readFile(parent.filePath)))
+        await rm(parent.filePath)
+      } else {
+        await rename(parent.filePath, archived)
+      }
+    }
+    const result = await prepareLegacyTranscriptImport(request(child.filePath))
+    expect(result.ok && result.items.map((item) => item.body)).toMatchObject([
+      { blocks: [{ text: 'sky' }] },
+      { blocks: [{ text: 'sky answer' }] },
+      { blocks: [{ text: 'leaves' }] },
+      { blocks: [{ text: 'leaves answer' }] },
+      { blocks: [{ text: 'ice' }] },
+      { blocks: [{ text: 'ice answer' }] }
+    ])
+  }
+)
diff --git a/src/main/native-chat/agent-session-journal/journal-legacy-identity.ts b/src/main/native-chat/agent-session-journal/journal-legacy-identity.ts
index 92b9aba86a80..dde940448701 100644
--- a/src/main/native-chat/agent-session-journal/journal-legacy-identity.ts
+++ b/src/main/native-chat/agent-session-journal/journal-legacy-identity.ts
@@ -23,7 +23,7 @@ export function createLegacyIdentityTracker(input: {
       provider: 'legacy',
       agent: input.agent,
       sessionId: input.sessionId,
-      recordId: legacyRecordId(line, index)
+      recordId: legacyRecordId(line, index, input.transcriptAgent === 'codex')
     })
   }
 }
@@ -44,10 +44,16 @@ function claudeIdentity(
 }
 
 /** Line position is stable only within a given import; prefer stored IDs when available. */
-function legacyRecordId(line: string, lineIndex: number): string {
+function legacyRecordId(line: string, lineIndex: number, nestedItem: boolean): string {
   const record = parseRecord(line)
   const payload = record?.payload
-  const id = stringField(payload, 'id') ?? stringField(record, 'id') ?? stringField(record, 'uuid')
+  const item =
+    nestedItem && payload && typeof payload === 'object' && 'item' in payload ? payload.item : null
+  const id =
+    stringField(item, 'id') ??
+    stringField(payload, 'id') ??
+    stringField(record, 'id') ??
+    stringField(record, 'uuid')
   return id ?? `#${lineIndex}`
 }
 
diff --git a/src/main/native-chat/agent-session-journal/journal-legacy-import-record-bound.test.ts b/src/main/native-chat/agent-session-journal/journal-legacy-import-record-bound.test.ts
index 515429eea1e6..6142c8f41c3a 100644
--- a/src/main/native-chat/agent-session-journal/journal-legacy-import-record-bound.test.ts
+++ b/src/main/native-chat/agent-session-journal/journal-legacy-import-record-bound.test.ts
@@ -18,7 +18,7 @@ afterEach(async () => {
   await Promise.all(roots.splice(0).map((root) => rm(root, { recursive: true, force: true })))
 })
 
-describe('legacy import record byte bound', () => {
+describe.each(['claude', 'codex'] as const)('record byte bound: %s', (agent) => {
   it('refuses a single line past the limit and closes the stream', async () => {
     const root = await mkdtemp(join(tmpdir(), 'orca-legacy-import-bound-'))
     roots.push(root)
@@ -26,7 +26,7 @@ describe('legacy import record byte bound', () => {
     await writeFile(filePath, ' '.repeat(RECORD_LIMIT_BYTES + 1))
 
     const result = await prepareLegacyTranscriptImport({
-      agent: 'claude',
+      agent,
       sessionId: 'record-bound',
       options: { filePath }
     })
diff --git a/src/main/native-chat/agent-session-journal/journal-legacy-import-tool-pairing.test.ts b/src/main/native-chat/agent-session-journal/journal-legacy-import-tool-pairing.test.ts
index ac5eb4363fba..7bc0662e6039 100644
--- a/src/main/native-chat/agent-session-journal/journal-legacy-import-tool-pairing.test.ts
+++ b/src/main/native-chat/agent-session-journal/journal-legacy-import-tool-pairing.test.ts
@@ -286,6 +286,7 @@ describe('legacy import tool identity', () => {
   ])('pairs Codex singleton %s and %s import records', async (callType, outputType) => {
     const { pairs } = await importRows(
       [
+        { type: 'session_meta', payload: { history_mode: 'paginated' } },
         {
           type: 'response_item',
           payload: {
diff --git a/src/main/native-chat/agent-session-journal/journal-legacy-import.ts b/src/main/native-chat/agent-session-journal/journal-legacy-import.ts
index de21b7689843..930615fbc8f5 100644
--- a/src/main/native-chat/agent-session-journal/journal-legacy-import.ts
+++ b/src/main/native-chat/agent-session-journal/journal-legacy-import.ts
@@ -5,7 +5,6 @@ import {
   validateAdoptedOpenCodeSource,
   type AdoptedTranscriptSource
 } from './adopted-transcript-source'
-import { createReadStream } from 'node:fs'
 import type { AgentType } from '../../../shared/agent-status-types'
 import type {
   AgentJournalCursor,
@@ -21,7 +20,7 @@ import {
   decodeGrokTranscriptLine,
   decodeOmpTranscriptLine
 } from '../transcript-line-decoders'
-import { decodeTranscriptStream } from '../transcript-stream-lines'
+import { readLegacyImportTranscript } from './journal-legacy-transcript-stream'
 import { readOpenCodeNativeChatTranscriptFull } from '../transcript-opencode'
 import { boundSubagentEntryId } from '../subagent-entry-id-bounds'
 import { createLegacyIdentityTracker } from './journal-legacy-identity'
@@ -111,6 +110,9 @@ export async function prepareLegacyTranscriptImport(input: {
       agent: input.agent,
       sessionId: input.sessionId,
       source: options.source,
+      codexSessionsDirs: options.source?.conversationStore
+        ? [options.source.conversationStore]
+        : options.codexSessionsDirs,
       decodedMessageIdentities: options.decodedMessageIdentities,
       limits
     })
@@ -186,7 +188,8 @@ function replacementItem(
 
 const TRANSCRIPT_DECODERS = {
   claude: decodeClaudeTranscriptLine,
-  codex: decodeCodexTranscriptLine,
+  codex: (line: string, fallbackId: string) =>
+    decodeCodexTranscriptLine(line, fallbackId, { historyImport: true }),
   grok: decodeGrokTranscriptLine,
   omp: decodeOmpTranscriptLine
 } as const
@@ -199,6 +202,7 @@ async function decodeReplacementItems(input: {
   sessionId: string
   decodedMessageIdentities?: true
   source?: AdoptedTranscriptSource
+  codexSessionsDirs?: string[]
   limits: JournalPayloadLimits
 }): Promise<{ items: JournalReplacementItem[]; consumedBytes: number }> {
   const source = input.source
@@ -224,12 +228,16 @@ async function decodeReplacementItems(input: {
       : null
   let lineIndex = 0
   try {
-    const { consumedBytes } = await decodeTranscriptStream(
-      createReadStream(input.filePath),
-      input.filePath,
-      0,
-      (line, fallbackId) => {
-        source?.observe(line)
+    const { consumedBytes } = await readLegacyImportTranscript(
+      {
+        filePath: input.filePath,
+        codex: input.transcriptAgent === 'codex',
+        roots: input.codexSessionsDirs
+      },
+      (line, fallbackId, recordId, selected = true) => {
+        if (selected) {
+          source?.observe(line)
+        }
         const currentLineIndex = lineIndex
         lineIndex += 1
         if (pi) {
@@ -241,21 +249,19 @@ async function decodeReplacementItems(input: {
           retained.push(
             toItem(
               message,
-              input.decodedMessageIdentities
+              recordId || input.decodedMessageIdentities
                 ? {
                     provider: 'legacy',
                     agent: input.agent,
                     sessionId: input.sessionId,
-                    recordId: message.id
+                    recordId: recordId ?? message.id
                   }
                 : tracker.identify(line, currentLineIndex)
             )
           )
         }
         return null
-      },
-      true,
-      MAX_LEGACY_IMPORT_RECORD_BYTES
+      }
     )
     if (consumedBytes > 0) {
       await source?.validate()
diff --git a/src/main/native-chat/agent-session-journal/journal-legacy-transcript-stream.ts b/src/main/native-chat/agent-session-journal/journal-legacy-transcript-stream.ts
new file mode 100644
index 000000000000..760a75df2383
--- /dev/null
+++ b/src/main/native-chat/agent-session-journal/journal-legacy-transcript-stream.ts
@@ -0,0 +1,25 @@
+import { createReadStream } from 'node:fs'
+import { decodeTranscriptStream } from '../transcript-stream-lines'
+import { readCodexLocalHistory } from '../codex-local-history'
+
+export async function readLegacyImportTranscript(
+  input: { filePath: string; codex: boolean; roots?: readonly string[] },
+  visit: (line: string, fallbackId: string, recordId?: string, selected?: boolean) => null
+): Promise<{ consumedBytes: number }> {
+  return input.codex
+    ? {
+        consumedBytes: await readCodexLocalHistory({
+          ...input,
+          visit: (line, fallbackId, selected, recordId) =>
+            visit(line, fallbackId, recordId, selected)
+        })
+      }
+    : decodeTranscriptStream(
+        createReadStream(input.filePath),
+        input.filePath,
+        0,
+        visit,
+        true,
+        16 * 1024 * 1024
+      )
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-adopted-import.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-adopted-import.test.ts
index 57a7f56ba97b..6eca137c164d 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-adopted-import.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-adopted-import.test.ts
@@ -1,5 +1,4 @@
 import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types'
-
 import { appendFile, mkdtemp, rm, writeFile } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
@@ -16,6 +15,7 @@ import { openTestAttachConversation } from './structured-agent-session-attach-te
 import { performAttach, type AttachFlowInput } from './structured-agent-session-attach-flow'
 import { AgentSessionJournal } from '../agent-session-journal/journal-store'
 import * as legacyImport from '../agent-session-journal/journal-legacy-import'
+import { writeCodexHistoryFixture } from '../agent-session-journal/codex-history-test-fixture'
 import { StructuredAgentSessionHost } from './structured-agent-session-host'
 import { openTestJournalHostDatabase } from '../agent-session-journal/journal-host-database-test-support'
 import { createStructuredAgentSessionLogger } from './structured-agent-session-logger'
@@ -97,6 +97,11 @@ function attachParams(
     runtimeKind: 'native',
     adopt: {
       providerHandle: codexProviderHandle(THREAD),
+      source: {
+        providerSessionId: THREAD,
+        workspaceCwd: '/workspace',
+        conversationStore: root ?? undefined
+      },
       ...(transcriptPath ? { transcriptPath } : {})
     },
     ...overrides
@@ -296,7 +301,7 @@ describe('adopting a provider conversation on create', () => {
     expect(sessionAdapter.acquire).toHaveBeenCalledTimes(1)
   })
 
-  it.each(['missing', 'oversized', 'empty', 'invalid', 'source-less'] as const)(
+  it.each(['missing', 'oversized', 'empty', 'metadata-only', 'invalid', 'source-less'] as const)(
     'refuses %s source before claiming a conversation',
     async (kind) => {
       root = await mkdtemp(join(tmpdir(), 'orca-adopt-preflight-'))
@@ -304,6 +309,11 @@ describe('adopting a provider conversation on create', () => {
       if (kind === 'oversized') {
         await writeCodexRollout(transcriptPath, 'original turn')
         await appendFile(transcriptPath, 'x'.repeat(16 * 1024 * 1024 + 1))
+      } else if (kind === 'metadata-only') {
+        await writeFile(
+          transcriptPath,
+          `${JSON.stringify({ type: 'session_meta', payload: { id: THREAD, cwd: '/workspace' } })}\n`
+        )
       } else if (kind === 'empty' || kind === 'invalid') {
         await writeFile(transcriptPath, kind === 'empty' ? '' : 'not json\n')
       }
@@ -388,14 +398,23 @@ describe('adopting a provider conversation on create', () => {
 
   it('prepares a valid source once before acquisition and imports those exact items', async () => {
     root = await mkdtemp(join(tmpdir(), 'orca-adopt-once-'))
-    const transcriptPath = join(root, 'rollout.jsonl')
-    await writeCodexRollout(transcriptPath, 'prepared before acquiring')
+    const parent = await writeCodexHistoryFixture(root, '01a17c7f-6f58-7a73-b87a-a8702ff2da17', [
+      'sky'
+    ])
+    const { filePath: transcriptPath } = await writeCodexHistoryFixture(
+      root,
+      THREAD,
+      ['prepared before acquiring'],
+      parent.position
+    )
+    await appendFile(transcriptPath, '{"ordinal":')
     const prepare = vi.spyOn(legacyImport, 'prepareLegacyTranscriptImport')
     const sessionAdapter = adapter()
     const acquire = sessionAdapter.acquire
     sessionAdapter.acquire = vi.fn(async (input) => {
       expect(prepare).toHaveBeenCalledTimes(1)
       await rm(transcriptPath)
+      await rm(parent.filePath)
       return acquire(input)
     })
     const result = await attach(transcriptPath, sessionAdapter, async ({ journal }) =>
@@ -406,6 +425,9 @@ describe('adopting a provider conversation on create', () => {
       throw new Error('attach failed')
     }
     expect(JSON.stringify(result.value.page.items)).toContain('prepared before acquiring')
+    expect(JSON.stringify(result.value.page.items)).toContain('sky answer')
+    expect(result.value.page.items).toHaveLength(4)
+    expect(sessionAdapter.dispatch).not.toHaveBeenCalled()
     expect(prepare).toHaveBeenCalledTimes(1)
   })
 })
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-create-adoption.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-create-adoption.test.ts
index 6958d2070f6f..00e09d3270e4 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-create-adoption.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-create-adoption.test.ts
@@ -1,4 +1,4 @@
-import { writeFile, rm } from 'node:fs/promises'
+import { mkdir, realpath, rename, writeFile, rm } from 'node:fs/promises'
 import { join } from 'node:path'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import {
@@ -22,6 +22,14 @@ import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../shared/constants'
 import { openTestJournalHostDatabase } from '../agent-session-journal/journal-host-database-test-support'
 import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding'
 
+import { writeCodexHistoryFixture } from '../agent-session-journal/codex-history-test-fixture'
+import { structuredAgentRuntimeMetadata } from '../../runtime/structured-agent-runtime-metadata'
+import {
+  resolveStructuredAgentSessionAdoptionForCreate,
+  structuredAgentSessionAdoptAttach
+} from '../../runtime/structured-agent-session-create-adoption'
+import { prepareCodexAiVaultSessionResume } from '../../codex/codex-ai-vault-session-resume'
+
 let rig: RestTestRig
 beforeEach(async () => {
   rig = await createRestTestRig({ idleSweep: { intervalMs: 60_000 } })
@@ -29,6 +37,7 @@ beforeEach(async () => {
 afterEach(async () => {
   await rig.dispose()
   vi.restoreAllMocks()
+  vi.unstubAllEnvs()
 })
 
 async function adoptedParams(history = 'adopted history', threadId = THREAD) {
@@ -63,6 +72,108 @@ function anotherSession(params: AgentSessionAttachParams): AgentSessionAttachPar
   })
 }
 
+it.each([
+  ['matching', THREAD],
+  ['mismatched', '019fd532-7c11-7a90-b6de-4e1a2c3d5f61']
+] as const)(
+  'resolves a selected-account rollout with %s metadata before at-rest publication',
+  async (_kind, metadataId) => {
+    vi.stubEnv('ORCA_USER_DATA_PATH', join(rig.root, 'host-data'))
+    const accountHome = { variable: 'CODEX_HOME', path: join(rig.root, 'selected-account') }
+    const sessions = join(accountHome.path, 'sessions')
+    await mkdir(sessions, { recursive: true })
+    const rollout = await writeCodexHistoryFixture(
+      sessions,
+      THREAD,
+      ['saved CLI turn'],
+      undefined,
+      metadataId
+    )
+    if (metadataId !== THREAD) {
+      // Keep filename lookup valid so the imported metadata is what refuses the mismatched source.
+      await rename(rollout.filePath, join(sessions, `rollout-2026-10-27T00-00-00-${THREAD}.jsonl`))
+    }
+    const metadata = structuredAgentRuntimeMetadata('codex')
+    if (!metadata?.transcriptImport) {
+      throw new Error('Codex transcript importer is not registered')
+    }
+    const adoption = await resolveStructuredAgentSessionAdoptionForCreate({
+      settings: {},
+      agent: 'codex',
+      transcriptImport: metadata.transcriptImport,
+      providerSessionId: THREAD,
+      selectedAccountHome: accountHome,
+      launchEnv: {},
+      workspaceCwd: rig.root,
+      prepareCodexResume: (args) =>
+        prepareCodexAiVaultSessionResume(args, {
+          runtimeHome: null,
+          systemCodexHomePath: join(rig.root, 'system-account'),
+          preparePinnedLaunchHome: async () => {
+            throw new Error('At-rest adoption must not ready a fork launch')
+          }
+        })
+    })
+    expect(adoption.accountHome).toEqual(accountHome)
+    expect(adoption.transcriptPath).toBe(
+      await realpath(join(sessions, `rollout-2026-10-27T00-00-00-${THREAD}.jsonl`))
+    )
+    const result = await rig.host.create(
+      CALLER,
+      createTestParams(undefined, {
+        accountHome: adoption.accountHome,
+        adopt: structuredAgentSessionAdoptAttach({
+          definition: metadata.definition,
+          handleNamesTranscript: metadata.transcriptImport.handleNamesTranscript,
+          conversationStore:
+            metadata.transcriptImport.conversationStore({
+              accountHome: adoption.accountHome,
+              launchEnv: {}
+            }) ?? undefined,
+          transcriptPath: adoption.transcriptPath,
+          providerSessionId: THREAD,
+          workspaceCwd: rig.root
+        })
+      })
+    )
+    expect(rig.adapter.acquire).not.toHaveBeenCalled()
+    expect(rig.adapter.dispatch).not.toHaveBeenCalled()
+    if (metadataId !== THREAD) {
+      expect(result).toMatchObject({
+        ok: false,
+        refusal: {
+          code: 'agent_session_identity_required',
+          details: { reason: 'transcriptUnreadable' },
+          createAttemptRefusedBeforeCommit: true
+        }
+      })
+      expect(rig.store.listRecords()).toEqual([])
+      expect(rig.store.listOperationRows()).toEqual([])
+      expect(rig.store.listVisibleSessionIds()).toEqual([])
+      return
+    }
+    expect(result.ok).toBe(true)
+    if (!result.ok) {
+      throw new Error('Real selected-account adoption failed')
+    }
+    const snapshot = await rig.host.journalSnapshot(SESSION)
+    expect(snapshot.items.map(({ body }) => body)).toEqual([
+      { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'saved CLI turn' }] },
+      {
+        kind: 'message',
+        role: 'assistant',
+        blocks: [{ type: 'text', text: 'saved CLI turn answer' }]
+      }
+    ])
+    expect(result.value.page.items).toEqual(snapshot.items)
+    expect(rig.store.getRecord(SESSION)?.accountHome).toEqual(accountHome)
+    expect(rig.store.getRecord(SESSION)?.providerHandleChain).toMatchObject([
+      { origin: 'adopted', mintedAtFence: 1, handle: { nativeId: THREAD } }
+    ])
+    expect(rig.store.listVisibleSessionIds()).toEqual([SESSION])
+  }
+)
+
 it('imports adoption at rest and resumes its original provider identity after its source disappears', async () => {
   const params = await adoptedParams()
   expect(await rig.host.create(CALLER, params)).toMatchObject({
diff --git a/src/main/native-chat/codex-local-history.ts b/src/main/native-chat/codex-local-history.ts
new file mode 100644
index 000000000000..567d56af7ba0
--- /dev/null
+++ b/src/main/native-chat/codex-local-history.ts
@@ -0,0 +1,154 @@
+import { createHash } from 'node:crypto'
+import { asRecord, extractString, parseJsonObject } from '../ai-vault/session-scanner-values'
+import { sessionIdFromFileName } from '../ai-vault/session-scanner-accumulator'
+import { codexHistorySources, codexPhysicalRolloutId } from './codex-rollout-history-source'
+import { readCodexRolloutBytes } from './codex-rollout-history-stream'
+import { splitTranscriptStreamLines } from './transcript-stream-lines'
+import { isCodexVisibleHistoryRecord } from './transcript-line-decoders-codex'
+import { transcriptFallbackId } from './transcript-fallback-id'
+
+type HistoryPosition = {
+  thread_id: string
+  end_ordinal_exclusive: number
+  end_byte_offset: number
+}
+
+type HistorySegment = {
+  path: string
+  rolloutId: string
+  headerDigest: string | null
+  paginated: boolean
+  start: number
+  end?: HistoryPosition
+}
+
+/** Resolve physical prefixes only; logical fork parents can describe standalone copied files. */
+export async function readCodexLocalHistory(input: {
+  filePath: string
+  roots?: readonly string[]
+  visit: (line: string, fallbackId: string, selected: boolean, recordId?: string) => void
+}): Promise<number> {
+  const sources = await codexHistorySources(input.filePath, input.roots)
+  const seen = new Set<string>()
+  const segments: HistorySegment[] = []
+  let path = sources.path
+  let end: HistoryPosition | undefined
+  for (;;) {
+    const rolloutId = codexPhysicalRolloutId(path) ?? sessionIdFromFileName(path)
+    if (seen.has(path) || seen.has(rolloutId)) {
+      throw new Error('The conversation history lineage is invalid.')
+    }
+    seen.add(path)
+    seen.add(rolloutId)
+    if (end && rolloutId !== end.thread_id.toLowerCase()) {
+      throw new Error('The conversation history source identity is invalid.')
+    }
+    let header: string | null = null
+    for await (const raw of lines(path, end)) {
+      if (raw.line.trim()) {
+        header = raw.line
+        break
+      }
+    }
+    const record = header ? parseJsonObject(header) : null
+    const metadata = record?.type === 'session_meta' ? asRecord(record.payload) : null
+    const paginated = metadata?.history_mode === 'paginated'
+    const base = metadata?.history_base == null ? undefined : historyPosition(metadata.history_base)
+    if ((end || base) && !paginated) {
+      throw new Error('The conversation history source is not paginated.')
+    }
+    segments.push({
+      path,
+      rolloutId,
+      headerDigest: header === null ? null : digestHeader(header),
+      paginated,
+      start: base?.end_ordinal_exclusive ?? 0,
+      end
+    })
+    if (!base) {
+      break
+    }
+    path = await sources.resolve(base.thread_id)
+    end = base
+  }
+  let bytes = 0
+  for (const segment of segments.toReversed()) {
+    let offset = 0
+    let ordinal = segment.start
+    let first = true
+    const strictOrdinals = segment.end !== undefined
+    for await (const raw of lines(segment.path, segment.end)) {
+      offset += raw.byteLength
+      bytes += raw.byteLength
+      if (!raw.line.trim()) {
+        continue
+      }
+      if (first) {
+        first = false
+        if (digestHeader(raw.line) !== segment.headerDigest) {
+          throw new Error('The conversation history source changed during import.')
+        }
+      }
+      const record = parseJsonObject(raw.line)
+      if (
+        strictOrdinals &&
+        (record?.ordinal !== ordinal ||
+          (segment.end && (!raw.terminated || ordinal >= segment.end.end_ordinal_exclusive)))
+      ) {
+        throw new Error('The conversation history ordinal or byte boundary is invalid.')
+      }
+      ordinal += 1
+      if (isCodexVisibleHistoryRecord(record, segment.paginated)) {
+        const payload = asRecord(record?.payload)
+        const item = asRecord(payload?.item)
+        const id =
+          extractString(item?.id) ?? extractString(payload?.id) ?? extractString(record?.id)
+        input.visit(
+          raw.line,
+          transcriptFallbackId(segment.path, offset - raw.byteLength),
+          segment.end === undefined,
+          segment.paginated ? `${segment.rolloutId}:${id ?? `#${ordinal - 1}`}` : undefined
+        )
+      }
+    }
+    if (
+      (first && segment.headerDigest !== null) ||
+      (segment.end &&
+        (offset !== segment.end.end_byte_offset || ordinal !== segment.end.end_ordinal_exclusive))
+    ) {
+      throw new Error('The conversation history prefix is truncated or mismatched.')
+    }
+  }
+  return bytes
+}
+
+function lines(path: string, end?: HistoryPosition) {
+  return splitTranscriptStreamLines(
+    readCodexRolloutBytes(path, end?.end_byte_offset),
+    16 * 1024 * 1024
+  )
+}
+
+function digestHeader(line: string): string {
+  return createHash('sha256').update(line).digest('hex')
+}
+
+function historyPosition(value: unknown): HistoryPosition {
+  const record = asRecord(value)
+  const thread_id = extractString(record?.thread_id)
+  const end_ordinal_exclusive = record?.end_ordinal_exclusive
+  const end_byte_offset = record?.end_byte_offset
+  if (
+    !thread_id ||
+    !/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(thread_id) ||
+    typeof end_ordinal_exclusive !== 'number' ||
+    !Number.isSafeInteger(end_ordinal_exclusive) ||
+    end_ordinal_exclusive < 1 ||
+    typeof end_byte_offset !== 'number' ||
+    !Number.isSafeInteger(end_byte_offset) ||
+    end_byte_offset < 1
+  ) {
+    throw new Error('The conversation history position is invalid.')
+  }
+  return { thread_id, end_ordinal_exclusive, end_byte_offset }
+}
diff --git a/src/main/native-chat/codex-rollout-history-source.ts b/src/main/native-chat/codex-rollout-history-source.ts
new file mode 100644
index 000000000000..3932efc5c6b2
--- /dev/null
+++ b/src/main/native-chat/codex-rollout-history-source.ts
@@ -0,0 +1,82 @@
+import { basename, dirname, join } from 'node:path'
+import { forEachSessionFile } from '../ai-vault/session-scanner-discovery'
+import { admitTranscriptPath } from './transcript-path-admission'
+
+export function codexPhysicalRolloutId(path: string): string | null {
+  const match = basename(path).match(
+    /^rollout-\d{4}-\d{2}-\d{2}T\d{2}-\d{2}-\d{2}-([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})(?:_([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}))?\.jsonl(?:\.zst)?$/i
+  )
+  return (match?.[2] ?? match?.[1])?.toLowerCase() ?? null
+}
+
+export async function codexHistorySources(filePath: string, roots?: readonly string[]) {
+  let stores: string[] | undefined
+  let selected = filePath
+  for (const root of roots ?? []) {
+    const name = basename(root)
+    const candidates =
+      name === 'sessions' || name === 'archived_sessions'
+        ? [join(dirname(root), 'sessions'), join(dirname(root), 'archived_sessions')]
+        : [root]
+    for (const store of candidates) {
+      const admitted = await admitTranscriptPath(store, filePath)
+      if (admitted) {
+        stores = candidates
+        selected = admitted.path
+        break
+      }
+    }
+    if (stores) {
+      break
+    }
+  }
+  if (roots?.length && !stores) {
+    throw new Error('The conversation is outside its account storage.')
+  }
+  const paths = new Map<string, string>()
+  let indexedStores = 0
+  return { path: selected, resolve }
+
+  async function resolve(id: string): Promise<string> {
+    if (!stores) {
+      throw new Error('The conversation history account is unavailable.')
+    }
+    const key = id.toLowerCase()
+    while (!paths.has(key) && indexedStores < stores.length) {
+      const indexed = new Map<string, string>()
+      await forEachSessionFile(
+        stores[indexedStores],
+        'codex',
+        [],
+        { extensions: new Set(['.jsonl', '.zst']), strictErrors: true },
+        (path) => {
+          const physicalId = codexPhysicalRolloutId(path)
+          if (!physicalId) {
+            return
+          }
+          const previous = indexed.get(physicalId)
+          // Prefer a plain file over its compressed sibling within this store.
+          if (!previous || `${path}.zst` === previous) {
+            indexed.set(physicalId, path)
+          }
+        }
+      )
+      for (const [physicalId, path] of indexed) {
+        if (!paths.has(physicalId)) {
+          paths.set(physicalId, path)
+        }
+      }
+      indexedStores += 1
+    }
+    const found = paths.get(key)
+    if (found) {
+      for (const store of stores) {
+        const admitted = await admitTranscriptPath(store, found)
+        if (admitted) {
+          return admitted.path
+        }
+      }
+    }
+    throw new Error('The conversation history source is unavailable.')
+  }
+}
diff --git a/src/main/native-chat/codex-rollout-history-stream.ts b/src/main/native-chat/codex-rollout-history-stream.ts
new file mode 100644
index 000000000000..adaf53b409fe
--- /dev/null
+++ b/src/main/native-chat/codex-rollout-history-stream.ts
@@ -0,0 +1,34 @@
+import { createReadStream } from 'node:fs'
+import { finished } from 'node:stream/promises'
+import { createZstdDecompress } from 'node:zlib'
+
+/** Bookmarks count decoded JSONL bytes, including newlines, never compressed file bytes. */
+export async function* readCodexRolloutBytes(path: string, end?: number): AsyncGenerator<Buffer> {
+  const decoder = path.endsWith('.zst') ? createZstdDecompress() : undefined
+  const file = createReadStream(path)
+  try {
+    if (decoder) {
+      file.on('error', (error) => decoder.destroy(error))
+      file.pipe(decoder)
+    }
+    let remaining = end ?? Infinity
+    for await (const chunk of decoder ?? file) {
+      const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk)
+      const prefix = buffer.subarray(0, Math.min(buffer.length, remaining))
+      if (prefix.length) {
+        yield prefix
+      }
+      remaining -= prefix.length
+      if (remaining === 0) {
+        break
+      }
+    }
+  } finally {
+    decoder?.destroy()
+    file.destroy()
+    await Promise.allSettled([
+      finished(file, { cleanup: true }),
+      ...(decoder ? [finished(decoder, { cleanup: true })] : [])
+    ])
+  }
+}
diff --git a/src/main/native-chat/transcript-line-decoders-codex.ts b/src/main/native-chat/transcript-line-decoders-codex.ts
index b856377f74d0..96c21824277b 100644
--- a/src/main/native-chat/transcript-line-decoders-codex.ts
+++ b/src/main/native-chat/transcript-line-decoders-codex.ts
@@ -13,9 +13,27 @@ import {
 import { claudeContentBlocks, toolResultOutput } from './transcript-record-blocks'
 import { CODEX_EVENT_TURN_ABORTED } from './transcript-turn-markers'
 
+/** Paginated completed items own visible messages; response tools retain their legacy format. */
+export function isCodexVisibleHistoryRecord(
+  record: Record<string, unknown> | null,
+  paginated: boolean
+): boolean {
+  const payload = asRecord(record?.payload)
+  return (
+    !paginated ||
+    !(
+      (record?.type === 'response_item' &&
+        (payload?.type === 'message' || payload?.type === 'reasoning')) ||
+      (record?.type === 'event_msg' &&
+        (payload?.type === 'user_message' || payload?.type === 'agent_message'))
+    )
+  )
+}
+
 export function decodeCodexTranscriptLine(
   line: string,
-  fallbackId: string
+  fallbackId: string,
+  options?: { historyImport: true }
 ): NativeChatMessage | null {
   const record = parseJsonObject(line)
   if (!record) {
@@ -30,10 +48,15 @@ export function decodeCodexTranscriptLine(
   const baseId = extractString(payload.id) ?? fallbackId
 
   if (record.type === 'response_item') {
-    return codexResponseItem(payload, baseId, timestamp)
+    return codexResponseItem(
+      payload,
+      baseId,
+      timestamp,
+      options?.historyImport ? codexTurnItemBlocks : claudeContentBlocks
+    )
   }
   if (record.type === 'event_msg') {
-    return codexEventMessage(payload, baseId, timestamp)
+    return codexEventMessage(payload, baseId, timestamp, options?.historyImport === true)
   }
   return null
 }
@@ -56,7 +79,8 @@ function codexUnwrappedResponseItem(
 function codexResponseItem(
   payload: Record<string, unknown>,
   id: string,
-  timestamp: number | null
+  timestamp: number | null,
+  decodeMessageBlocks = claudeContentBlocks
 ): NativeChatMessage | null {
   if (payload.type === 'message') {
     const role =
@@ -64,7 +88,7 @@ function codexResponseItem(
     if (!role) {
       return null
     }
-    const decodedBlocks = claudeContentBlocks(payload.content)
+    const decodedBlocks = decodeMessageBlocks(payload.content)
     const blocks =
       role === 'user' ? decodedBlocks.filter((block) => !isSkillContext(block)) : decodedBlocks
     if (blocks.length === 0) {
@@ -122,7 +146,8 @@ function isSkillContext(block: NativeChatBlock): boolean {
 function codexEventMessage(
   payload: Record<string, unknown>,
   id: string,
-  timestamp: number | null
+  timestamp: number | null,
+  historyImport: boolean
 ): NativeChatMessage | null {
   if (payload.type === CODEX_EVENT_TURN_ABORTED) {
     return {
@@ -138,7 +163,7 @@ function codexEventMessage(
     return codexCompactionMarker(id, timestamp)
   }
   if (payload.type === 'item_completed') {
-    return codexCompletedTurnItem(payload, id, timestamp)
+    return codexCompletedTurnItem(payload, id, timestamp, historyImport)
   }
   if (payload.type === 'user_message') {
     const text = extractString(payload.message)
@@ -158,13 +183,24 @@ function codexEventMessage(
 function codexCompletedTurnItem(
   payload: Record<string, unknown>,
   fallbackId: string,
-  timestamp: number | null
+  timestamp: number | null,
+  historyImport: boolean
 ): NativeChatMessage | null {
   const item = asRecord(payload.item)
   if (!item) {
     return null
   }
   const id = extractString(item.id) ?? fallbackId
+  if (historyImport && item.type === 'Reasoning') {
+    return codexResponseItem(
+      {
+        type: 'reasoning',
+        text: codexSummaryText(item.summary_text) ?? codexSummaryText(item.raw_content)
+      },
+      id,
+      timestamp
+    )
+  }
   if (item.type === 'ContextCompaction') {
     return codexCompactionMarker(id, timestamp)
   }
@@ -194,11 +230,20 @@ function codexCompactionMarker(id: string, timestamp: number | null): NativeChat
 }
 
 function codexTurnItemBlocks(content: unknown): NativeChatBlock[] {
+  if (typeof content === 'string') {
+    return content.trim() ? [{ type: 'text', text: content }] : []
+  }
   if (!Array.isArray(content)) {
     return []
   }
   const blocks: NativeChatBlock[] = []
   for (const value of content) {
+    if (typeof value === 'string') {
+      if (value.trim()) {
+        blocks.push({ type: 'text', text: value })
+      }
+      continue
+    }
     const item = asRecord(value)
     if (!item) {
       continue
diff --git a/src/main/native-chat/transcript-reader-codex-history-mode.test.ts b/src/main/native-chat/transcript-reader-codex-history-mode.test.ts
index 36e5748d6e77..eddab9d62ac5 100644
--- a/src/main/native-chat/transcript-reader-codex-history-mode.test.ts
+++ b/src/main/native-chat/transcript-reader-codex-history-mode.test.ts
@@ -1,3 +1,5 @@
+import { prepareLegacyTranscriptImport } from './agent-session-journal/journal-legacy-import'
+import { createNativeChatMerger, replaceList } from '../../shared/native-chat/native-chat-merge'
 import { mkdtemp, rm, writeFile } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
@@ -135,6 +137,18 @@ describe('Codex transcript history modes', () => {
         '2026-08-09T10:00:01.000Z'
       ),
       completedItem({ type: 'ContextCompaction', id: 'compaction-1' }, '2026-08-09T10:00:01.500Z'),
+      {
+        type: 'response_item',
+        payload: {
+          type: 'reasoning',
+          id: 'reason',
+          summary: [{ type: 'summary_text', text: 'why' }]
+        }
+      },
+      completedItem(
+        { type: 'Reasoning', id: 'reason', summary_text: ['why'], raw_content: [] },
+        '2026-08-09T10:00:01.750Z'
+      ),
       {
         type: 'response_item',
         payload: {
@@ -179,6 +193,7 @@ describe('Codex transcript history modes', () => {
           timestamp: Date.parse('2026-08-09T10:00:01.500Z'),
           blocks: [{ type: 'text', text: 'Context compacted', presentation: 'compaction' }]
         },
+        { id: 'reason', role: 'reasoning', blocks: [{ type: 'text', text: 'why' }] },
         {
           id: 'assistant-1',
           role: 'assistant',
@@ -187,6 +202,20 @@ describe('Codex transcript history modes', () => {
       ]
     })
     expect(tail).toMatchObject({ messages: 'messages' in result ? result.messages : [] })
+    const snapshot = createNativeChatMerger()
+    replaceList(snapshot, 'messages' in result ? result.messages : [])
+    expect(snapshot.list.filter(({ role }) => role === 'reasoning')).toHaveLength(1)
+    const imported = await prepareLegacyTranscriptImport({
+      agent: 'codex',
+      sessionId: 'session-1',
+      options: { filePath }
+    })
+    expect(
+      imported.ok &&
+        imported.items
+          .filter(({ body }) => body.kind === 'message' && body.role === 'reasoning')
+          .map(({ body }) => body)
+    ).toEqual([{ kind: 'message', role: 'reasoning', blocks: [{ type: 'text', text: 'why' }] }])
   })
 
   it('keeps legacy event messages without duplicating response copies', async () => {
diff --git a/src/main/runtime/session-tabs/structured-session-create-support.ts b/src/main/runtime/session-tabs/structured-session-create-support.ts
index 9d8b667b0f01..89ff851da06c 100644
--- a/src/main/runtime/session-tabs/structured-session-create-support.ts
+++ b/src/main/runtime/session-tabs/structured-session-create-support.ts
@@ -228,6 +228,15 @@ export abstract class OrcaRuntimeWithGetStructuredAgentSessionCreateSupport exte
             adopt: structuredAgentSessionAdoptAttach({
               definition,
               handleNamesTranscript: transcriptImport!.handleNamesTranscript,
+              ...(input.agent === 'codex'
+                ? {
+                    conversationStore:
+                      transcriptImport!.conversationStore({
+                        accountHome: adoption.accountHome,
+                        launchEnv
+                      }) ?? undefined
+                  }
+                : {}),
               transcriptPath: adoption.transcriptPath,
               providerSessionId: input.resumeFrom.providerSessionId,
               workspaceCwd
diff --git a/src/main/runtime/structured-agent-session-create-adoption.ts b/src/main/runtime/structured-agent-session-create-adoption.ts
index c0f6bb4d3970..d269eae52104 100644
--- a/src/main/runtime/structured-agent-session-create-adoption.ts
+++ b/src/main/runtime/structured-agent-session-create-adoption.ts
@@ -218,6 +218,7 @@ export function structuredAgentSessionAdoptAttach(input: {
     agent: AgentSessionProviderHandle['agent']
   }
   handleNamesTranscript: boolean | undefined
+  conversationStore?: string
   transcriptPath: string
   providerSessionId: string
   workspaceCwd: string
@@ -229,6 +230,12 @@ export function structuredAgentSessionAdoptAttach(input: {
       nativeId: input.handleNamesTranscript ? input.transcriptPath : input.providerSessionId
     },
     transcriptPath: input.transcriptPath,
-    source: { providerSessionId: input.providerSessionId, workspaceCwd: input.workspaceCwd }
+    source: {
+      providerSessionId: input.providerSessionId,
+      workspaceCwd: input.workspaceCwd,
+      ...(input.conversationStore !== undefined
+        ? { conversationStore: input.conversationStore }
+        : {})
+    }
   }
 }
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts
index c435d6d5c26c..42e407e92b16 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts
@@ -1,7 +1,7 @@
 import type { AppState } from '@/store/types'
 import {
   collectAgentPaneConversations,
-  resolvePaneAgentConversation
+  resolvePaneLastAgentConversation
 } from '@/lib/ai-vault-tab-title-requests'
 import type { ExecutionHostId } from '../../../../shared/execution-host'
 import {
@@ -26,13 +26,15 @@ export function resolveCliChatResumeSource(
   args: { tab: { id: string; worktreeId: string }; paneKey?: string }
 ): CliChatResumeSource | null {
   const conversation = args.paneKey
-    ? resolvePaneAgentConversation(
+    ? resolvePaneLastAgentConversation(
         state,
         { worktreeId: args.tab.worktreeId, paneKey: args.paneKey },
         adoptsCliConversations
       )
     : collectAgentPaneConversations(state, adoptsCliConversations, {
-        runningAgentsOnly: true
+        runningAgentsOnly: true,
+        includeLastReported: true,
+        tab: { worktreeId: args.tab.worktreeId, tabId: args.tab.id }
       }).find((candidate) => candidate.tabId === args.tab.id)
   const offer = conversation
     ? resolvePaneResumeInNewChatOffer(state, {
diff --git a/src/renderer/src/components/tab-bar/tab-session-history-switch.parity.test.ts b/src/renderer/src/components/tab-bar/tab-session-history-switch.parity.test.ts
index a5f0c35f00cc..787830acd143 100644
--- a/src/renderer/src/components/tab-bar/tab-session-history-switch.parity.test.ts
+++ b/src/renderer/src/components/tab-bar/tab-session-history-switch.parity.test.ts
@@ -1,4 +1,5 @@
 // @vitest-environment happy-dom
+import { makeTabSessionHistoryRow as row } from './tab-session-history-test-fixture'
 import { renderHook } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { useAppStore } from '@/store'
@@ -31,32 +32,6 @@ vi.mock('@/lib/agent-session-launch-plan', async (importOriginal) => ({
 const WORKTREE_ID = 'repo-1::/repo/wt'
 const SIBLING_ID = 'repo-1::/repo/sibling'
 
-function row(overrides: Partial<AiVaultSession> = {}): AiVaultSession {
-  return {
-    id: 'row-1',
-    executionHostId: 'local',
-    agent: 'claude',
-    sessionId: 'claude-session-1',
-    title: 'Fix the build',
-    cwd: '/repo/wt',
-    branch: 'main',
-    model: null,
-    filePath: '/home/.claude/projects/repo/claude-session-1.jsonl',
-    codexHome: null,
-    createdAt: null,
-    updatedAt: null,
-    modifiedAt: '2026-10-08T00:00:00.000Z',
-    messageCount: 2,
-    totalTokens: 10,
-    previewMessages: [{ role: 'user', text: 'Fix the build', timestamp: null }],
-    queuedMessageCount: 0,
-    subagentTranscriptCount: 0,
-    resumeCommand: 'claude --resume claude-session-1',
-    subagent: null,
-    ...overrides
-  }
-}
-
 function makeState(): AppState {
   useAppStore.setState(useAppStore.getInitialState(), true)
   useAppStore.setState({
diff --git a/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts b/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts
index 0dfd6677eed0..85423ccb7699 100644
--- a/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts
+++ b/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts
@@ -1,3 +1,5 @@
+import { makeTabSessionHistoryRow as row } from './tab-session-history-test-fixture'
+import { applyProviderSessionOnlyUpdate } from '@/hooks/ipc-events/agent-status-partial-updates'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { useAppStore } from '@/store'
 import type { AppState } from '@/store/types'
@@ -69,32 +71,6 @@ vi.mock('../right-sidebar/ai-vault-session-resume-in-chat-workspace', () => ({
 
 const WORKTREE_ID = 'repo-1::/repo/wt'
 
-function row(overrides: Partial<AiVaultSession> = {}): AiVaultSession {
-  return {
-    id: 'row-1',
-    executionHostId: 'local',
-    agent: 'claude',
-    sessionId: 'claude-session-1',
-    title: 'Fix the build',
-    cwd: '/repo/wt',
-    branch: 'main',
-    model: null,
-    filePath: '/home/.claude/projects/repo/claude-session-1.jsonl',
-    codexHome: null,
-    createdAt: null,
-    updatedAt: null,
-    modifiedAt: '2026-10-08T00:00:00.000Z',
-    messageCount: 2,
-    totalTokens: 10,
-    previewMessages: [{ role: 'user', text: 'Fix the build', timestamp: null }],
-    queuedMessageCount: 0,
-    subagentTranscriptCount: 0,
-    resumeCommand: 'claude --resume claude-session-1',
-    subagent: null,
-    ...overrides
-  }
-}
-
 const SIBLING_ID = 'repo-1::/repo/sibling'
 
 function makeState(
@@ -572,6 +548,82 @@ describe('one pane of a terminal tab', () => {
       false
     )
   })
+  it('identifies a provider-only Continue source without a live turn or selecting its sibling', () => {
+    makeState()
+    const [L1, L2] = [
+      '11111111-1111-4111-8111-111111111111',
+      '22222222-2222-4222-8222-222222222222'
+    ]
+    const pane = `term-1:${L1}`
+    const layout = (ptyIdsByLeafId: Record<string, string>) =>
+      useAppStore.setState({
+        terminalLayoutsByTabId: {
+          'term-1': { root: null, activeLeafId: L1, expandedLeafId: null, ptyIdsByLeafId }
+        }
+      })
+    layout({ [L1]: 'pty-1', [L2]: 'pty-2' })
+    applyProviderSessionOnlyUpdate({
+      store: useAppStore.getState(),
+      batch: undefined,
+      paneKey: pane,
+      routing: { tabId: 'term-1', worktreeId: WORKTREE_ID },
+      data: {
+        paneKey: pane,
+        connectionId: null,
+        receivedAt: 1,
+        stateStartedAt: 1,
+        state: 'done',
+        prompt: '',
+        agentType: 'codex',
+        providerSession: { key: 'session_id', id: 'thread-c' },
+        providerSessionOnly: true
+      }
+    })
+    const state = useAppStore.getState()
+    expect(state.agentStatusByPaneKey).toEqual({})
+    expect(
+      resolveCliChatResumeSource(state, {
+        tab: { id: 'term-1', worktreeId: WORKTREE_ID },
+        paneKey: pane
+      })
+    ).toMatchObject({ agent: 'codex', providerSessionId: 'thread-c' })
+    expect(paneGate(state, `term-1:${L2}`)).toBe(false)
+    useAppStore
+      .getState()
+      .setAgentStatus(
+        pane,
+        { state: 'done', prompt: 'first', agentType: 'codex' },
+        undefined,
+        undefined,
+        { tabId: 'term-1', worktreeId: WORKTREE_ID },
+        { providerSession: { key: 'session_id', id: 'thread-c' } }
+      )
+    useAppStore
+      .getState()
+      .setAgentStatus(pane, { state: 'working', prompt: 'second', agentType: 'codex' })
+    expect(
+      resolveCliChatResumeSource(useAppStore.getState(), {
+        tab: { id: 'term-1', worktreeId: WORKTREE_ID },
+        paneKey: pane
+      })
+    ).toBeNull()
+    expect(paneGate(useAppStore.getState(), pane)).toBe(false)
+    useAppStore
+      .getState()
+      .recordAgentProviderSession(
+        pane,
+        'codex',
+        { key: 'session_id', id: 'thread-next' },
+        undefined,
+        { tabId: 'term-1', worktreeId: WORKTREE_ID }
+      )
+    expect(
+      resolveCliChatResumeSource(useAppStore.getState(), {
+        tab: { id: 'term-1', worktreeId: WORKTREE_ID },
+        paneKey: pane
+      })
+    ).toMatchObject({ providerSessionId: 'thread-next' })
+  })
 })
 
 describe('findTabSessionHistoryRow', () => {
diff --git a/src/renderer/src/components/tab-bar/tab-session-history-switch.ts b/src/renderer/src/components/tab-bar/tab-session-history-switch.ts
index c6af6894b09a..4c6a79d55e46 100644
--- a/src/renderer/src/components/tab-bar/tab-session-history-switch.ts
+++ b/src/renderer/src/components/tab-bar/tab-session-history-switch.ts
@@ -4,7 +4,8 @@ import type { AppState } from '@/store/types'
 import { getIndexedAllWorktrees } from '@/store/worktree-repo-index'
 import {
   collectAgentPaneConversations,
-  resolvePaneAgentConversation
+  resolvePaneAgentConversation,
+  resolvePaneLastAgentConversation
 } from '@/lib/ai-vault-tab-title-requests'
 import {
   isAiVaultSessionResumableContent,
@@ -82,7 +83,7 @@ export function resolvePaneResumeInNewChatOffer(
   state: AppState,
   pane: { worktreeId: string; paneKey: string }
 ): PaneResumeInNewChatOffer {
-  const conversation = resolvePaneAgentConversation(state, pane, adoptsCliConversations)
+  const conversation = resolvePaneLastAgentConversation(state, pane, adoptsCliConversations)
   if (!conversation) {
     return null
   }
diff --git a/src/renderer/src/components/tab-bar/tab-session-history-test-fixture.ts b/src/renderer/src/components/tab-bar/tab-session-history-test-fixture.ts
new file mode 100644
index 000000000000..13c5f985a685
--- /dev/null
+++ b/src/renderer/src/components/tab-bar/tab-session-history-test-fixture.ts
@@ -0,0 +1,27 @@
+import type { AiVaultSession } from '../../../../shared/ai-vault-types'
+
+export function makeTabSessionHistoryRow(overrides: Partial<AiVaultSession> = {}): AiVaultSession {
+  return {
+    id: 'row-1',
+    executionHostId: 'local',
+    agent: 'claude',
+    sessionId: 'claude-session-1',
+    title: 'Fix the build',
+    cwd: '/repo/wt',
+    branch: 'main',
+    model: null,
+    filePath: '/home/.claude/projects/repo/claude-session-1.jsonl',
+    codexHome: null,
+    createdAt: null,
+    updatedAt: null,
+    modifiedAt: '2026-10-08T00:00:00.000Z',
+    messageCount: 2,
+    totalTokens: 10,
+    previewMessages: [{ role: 'user', text: 'Fix the build', timestamp: null }],
+    queuedMessageCount: 0,
+    subagentTranscriptCount: 0,
+    resumeCommand: 'claude --resume claude-session-1',
+    subagent: null,
+    ...overrides
+  }
+}
diff --git a/src/renderer/src/hooks/ipc-events/agent-status-partial-updates.ts b/src/renderer/src/hooks/ipc-events/agent-status-partial-updates.ts
index 7c265e49db22..14b108c7a413 100644
--- a/src/renderer/src/hooks/ipc-events/agent-status-partial-updates.ts
+++ b/src/renderer/src/hooks/ipc-events/agent-status-partial-updates.ts
@@ -1,3 +1,4 @@
+import { RESUMABLE_TUI_AGENTS } from '../../../../shared/agent-session-resume'
 import type { AgentStatusIpcPayload } from '../../../../shared/agent-status-types'
 import type { ProgramStatusFacet } from '../../../../shared/program-status/facet'
 import type { AppState } from '@/store/types'
@@ -48,13 +49,14 @@ export function applyProviderSessionOnlyUpdate(args: {
   routing: NonNullable<AgentProviderSessionUpdate['routing']>
 }): AgentStatusApplyResult {
   const { store, batch, data, paneKey, routing } = args
-  if (!data.providerSession || data.agentType !== 'pi') {
+  const agent = RESUMABLE_TUI_AGENTS.find((candidate) => candidate === data.agentType)
+  if (!data.providerSession || !agent) {
     return 'dropped'
   }
   const update: AgentProviderSessionUpdate = {
     kind: 'providerSession',
     paneKey,
-    agent: 'pi',
+    agent,
     providerSession: data.providerSession,
     timing: { updatedAt: data.receivedAt },
     routing,
diff --git a/src/renderer/src/lib/ai-vault-tab-title-requests.ts b/src/renderer/src/lib/ai-vault-tab-title-requests.ts
index 24722f26b90d..e2ed995b2d98 100644
--- a/src/renderer/src/lib/ai-vault-tab-title-requests.ts
+++ b/src/renderer/src/lib/ai-vault-tab-title-requests.ts
@@ -7,6 +7,10 @@ import { parsePaneKey } from '../../../shared/stable-pane-id'
 import type { TerminalTab } from '../../../shared/terminal-tab-types'
 import { getExecutionHostIdForWorktree } from '@/lib/worktree-runtime-owner'
 import type { AppState } from '@/store/types'
+import type { AgentPaneConversationIdentity } from '@/store/slices/agent-pane-conversation'
+import { collectLeafIdsInOrder } from '@/components/terminal-pane/terminal-layout-leaf-ids'
+import { getIndexedRepoMap, getIndexedWorktreeMap } from '@/store/worktree-repo-index'
+import { selectWorktreesByRepo } from '@/store/workspace-record-selectors'
 
 export type AgentPaneConversation<Agent extends AgentType> = {
   agent: Agent
@@ -23,6 +27,8 @@ export type AiVaultTitleRequest = Omit<
   'paneKey'
 >
 
+type ConversationTab = TerminalTab & { worktreeId: string; leafIds?: ReadonlySet<string> }
+
 type RequestCandidate<Agent extends AgentType> = AgentPaneConversation<Agent> & {
   priority: number
 }
@@ -38,7 +44,7 @@ function activePaneKey(state: AppState, tabId: string): string | null {
 
 function registerCandidate<Agent extends AgentType>(
   state: AppState,
-  tabsById: ReadonlyMap<string, TerminalTab>,
+  tabsById: ReadonlyMap<string, ConversationTab>,
   candidates: Map<string, RequestCandidate<Agent>>,
   isAgent: (agent: AgentType | null | undefined) => agent is Agent,
   args: {
@@ -56,16 +62,24 @@ function registerCandidate<Agent extends AgentType>(
   }
   const tabId = tabIdFromPaneKey(args.paneKey, args.tabId)
   const tab = tabId ? tabsById.get(tabId) : undefined
-  const worktreeId = args.worktreeId ?? tab?.worktreeId
-  if (!tabId || !tab || !worktreeId) {
+  const worktreeId = tab?.worktreeId
+  const pane = parsePaneKey(args.paneKey)
+  if (
+    !tabId ||
+    !tab ||
+    !worktreeId ||
+    (pane && (pane.tabId !== tabId || (tab.leafIds && !tab.leafIds.has(pane.leafId)))) ||
+    (args.worktreeId !== undefined && args.worktreeId !== worktreeId)
+  ) {
     return
   }
   const priority = args.priority + (activePaneKey(state, tabId) === args.paneKey ? 100 : 0)
-  if ((candidates.get(tabId)?.priority ?? -1) >= priority) {
+  const key = tabId
+  if ((candidates.get(key)?.priority ?? -1) >= priority) {
     return
   }
   const executionHostId = getExecutionHostIdForWorktree(state, worktreeId)
-  candidates.set(tabId, {
+  candidates.set(key, {
     agent: args.agent,
     executionHostId,
     providerSession: args.providerSession,
@@ -89,30 +103,96 @@ function liveCandidate(entry: AgentStatusEntry): Parameters<typeof registerCandi
   }
 }
 
+function lastReportedCandidate(
+  state: AppState,
+  identity: AgentPaneConversationIdentity,
+  tabsById: ReadonlyMap<string, ConversationTab>
+): Parameters<typeof registerCandidate>[4] | null {
+  const pane = parsePaneKey(identity.paneKey)
+  const tab = pane ? tabsById.get(pane.tabId) : undefined
+  const worktree = getIndexedWorktreeMap(selectWorktreesByRepo(state)).get(identity.worktreeId)
+  const repo = worktree ? getIndexedRepoMap(state.repos).get(worktree.repoId) : undefined
+  if (
+    !pane ||
+    tab?.worktreeId !== identity.worktreeId ||
+    (tab.leafIds && !tab.leafIds.has(pane.leafId)) ||
+    identity.executionHostId !== getExecutionHostIdForWorktree(state, identity.worktreeId) ||
+    (repo !== undefined && identity.connectionId !== (repo.connectionId ?? null))
+  ) {
+    return null
+  }
+  return { ...identity, priority: 0, refresh: false }
+}
+
+function conversationRecords<T>(records: Record<string, T> | undefined, paneKey?: string): T[] {
+  const addressed = paneKey ? records?.[paneKey] : undefined
+  return paneKey ? (addressed ? [addressed] : []) : Object.values(records ?? {})
+}
+
 export function collectAiVaultTitleRequests(state: AppState): AiVaultTitleRequest[] {
   return collectAgentPaneConversations(state, isAiVaultTitleAgent).map(
     ({ paneKey: _paneKey, ...request }) => request
   )
 }
 
+/** Each tab's conversation: live, sleeping, retained, then its last reported identity. */
 export function collectAgentPaneConversations<Agent extends AgentType>(
   state: AppState,
   isAgent: (agent: AgentType | null | undefined) => agent is Agent,
   options: {
     /** Skip retained and sleeping records: those remember a conversation after its agent exited. */
     runningAgentsOnly?: boolean
+    includeLastReported?: boolean
+    pane?: { worktreeId: string; paneKey: string }
+    tab?: { worktreeId: string; tabId: string }
   } = {}
 ): AgentPaneConversation<Agent>[] {
-  const tabsById = new Map(
-    Object.values(state.tabsByWorktree)
-      .flat()
-      .map((tab) => [tab.id, tab] as const)
-  )
+  const addressed = options.pane
+    ? {
+        worktreeId: options.pane.worktreeId,
+        tabId: tabIdFromPaneKey(
+          options.pane.paneKey,
+          state.agentStatusByPaneKey[options.pane.paneKey]?.tabId ??
+            state.sleepingAgentSessionsByPaneKey[options.pane.paneKey]?.tabId ??
+            state.retainedAgentsByPaneKey[options.pane.paneKey]?.entry.tabId
+        )
+      }
+    : options.tab
+  const partitions = addressed
+    ? [
+        [
+          addressed.worktreeId,
+          (state.tabsByWorktree[addressed.worktreeId] ?? []).filter(
+            (tab) => tab.id === addressed.tabId
+          )
+        ] as const
+      ]
+    : Object.entries(state.tabsByWorktree)
+  const tabsById = new Map<string, ConversationTab>()
+  for (const [worktreeId, tabs] of partitions) {
+    for (const tab of tabs) {
+      const root = state.terminalLayoutsByTabId[tab.id]?.root
+      tabsById.set(tab.id, {
+        ...tab,
+        worktreeId,
+        ...(root ? { leafIds: new Set(collectLeafIdsInOrder(root)) } : {})
+      })
+    }
+  }
+  const records = <T>(record: Record<string, T> | undefined) =>
+    conversationRecords(record, options.pane?.paneKey)
   const candidates = new Map<string, RequestCandidate<Agent>>()
-  const retained = options.runningAgentsOnly ? [] : Object.values(state.retainedAgentsByPaneKey)
-  const sleeping = options.runningAgentsOnly
-    ? []
-    : Object.values(state.sleepingAgentSessionsByPaneKey)
+  const retained = options.runningAgentsOnly ? [] : records(state.retainedAgentsByPaneKey)
+  const sleeping = options.runningAgentsOnly ? [] : records(state.sleepingAgentSessionsByPaneKey)
+
+  if (!options.runningAgentsOnly || options.includeLastReported) {
+    for (const identity of records(state.agentConversationsByPaneKey)) {
+      const candidate = lastReportedCandidate(state, identity, tabsById)
+      if (candidate) {
+        registerCandidate(state, tabsById, candidates, isAgent, candidate)
+      }
+    }
+  }
 
   for (const entry of retained) {
     registerCandidate(state, tabsById, candidates, isAgent, {
@@ -136,11 +216,13 @@ export function collectAgentPaneConversations<Agent extends AgentType>(
       worktreeId: record.worktreeId
     })
   }
-  for (const entry of Object.values(state.agentStatusByPaneKey)) {
+  for (const entry of records(state.agentStatusByPaneKey)) {
     registerCandidate(state, tabsById, candidates, isAgent, liveCandidate(entry))
   }
 
-  return [...candidates.values()].map(({ priority: _priority, ...request }) => request)
+  return [...candidates.values()]
+    .filter((candidate) => !options.pane || candidate.paneKey === options.pane.paneKey)
+    .map(({ priority: _priority, ...request }) => request)
 }
 
 export function resolvePaneAgentConversation<Agent extends AgentType>(
@@ -148,19 +230,20 @@ export function resolvePaneAgentConversation<Agent extends AgentType>(
   pane: { worktreeId: string; paneKey: string },
   isAgent: (agent: AgentType | null | undefined) => agent is Agent
 ): AgentPaneConversation<Agent> | null {
-  const live = state.agentStatusByPaneKey[pane.paneKey]
-  if (live?.paneKey !== pane.paneKey) {
-    return null
-  }
-  const tabsById = new Map(
-    (state.tabsByWorktree[pane.worktreeId] ?? []).map((tab) => [tab.id, tab] as const)
+  return collectAgentPaneConversations(state, isAgent, { pane, runningAgentsOnly: true })[0] ?? null
+}
+
+/** One pane's conversation survives occupancy cleanup after its agent exits. */
+export function resolvePaneLastAgentConversation<Agent extends AgentType>(
+  state: AppState,
+  pane: { worktreeId: string; paneKey: string },
+  isAgent: (agent: AgentType | null | undefined) => agent is Agent
+): AgentPaneConversation<Agent> | null {
+  return (
+    collectAgentPaneConversations(state, isAgent, {
+      pane,
+      runningAgentsOnly: true,
+      includeLastReported: true
+    })[0] ?? null
   )
-  const candidates = new Map<string, RequestCandidate<Agent>>()
-  registerCandidate(state, tabsById, candidates, isAgent, liveCandidate(live))
-  const [candidate] = candidates.values()
-  if (!candidate) {
-    return null
-  }
-  const { priority: _priority, ...request } = candidate
-  return request
 }
diff --git a/src/renderer/src/store/agent-conversation-retention.ts b/src/renderer/src/store/agent-conversation-retention.ts
new file mode 100644
index 000000000000..e132b536f325
--- /dev/null
+++ b/src/renderer/src/store/agent-conversation-retention.ts
@@ -0,0 +1,76 @@
+import type { StateCreator } from 'zustand'
+import type { AppState } from './types'
+import type { StoreSetArgs } from './react-commit-cascade-write-probe'
+import {
+  classifyPaneKeyLiveness,
+  MAX_LIVE_AGENT_STATUSES
+} from './slices/agent-status/agent-status-capacity-eviction'
+
+type Conversations = AppState['agentConversationsByPaneKey']
+
+function cappedConversations(state: AppState, previous: Conversations): Conversations {
+  const entries = state.agentConversationsByPaneKey
+  const incoming = Object.keys(entries)
+  const keys = [
+    ...Object.keys(previous).filter((key) => Object.hasOwn(entries, key)),
+    ...incoming.filter((key) => !Object.hasOwn(previous, key))
+  ]
+  let evicted: string[] = []
+  if (keys.length > MAX_LIVE_AGENT_STATUSES) {
+    const classify = classifyPaneKeyLiveness(state)
+    const eligible = keys.filter((key) => classify(key) !== 'live')
+    evicted = eligible.slice(0, Math.max(0, eligible.length - MAX_LIVE_AGENT_STATUSES))
+  }
+  if (evicted.length === 0 && keys.every((key, index) => key === incoming[index])) {
+    return entries
+  }
+  const removed = new Set(evicted)
+  return Object.fromEntries(
+    keys.filter((key) => !removed.has(key)).map((key) => [key, entries[key]])
+  )
+}
+
+export function withAgentConversationRetention(
+  createState: StateCreator<AppState, [], []>
+): StateCreator<AppState, [], []> {
+  return (set, get, api) => {
+    const wrap =
+      (write: typeof set): typeof set =>
+      (...args: StoreSetArgs<AppState>): void => {
+        if (args[1] === true) {
+          const [partial] = args
+          write((state) => {
+            const requested = typeof partial === 'function' ? partial(state) : partial
+            const entries = cappedConversations(requested, get().agentConversationsByPaneKey)
+            return entries === requested.agentConversationsByPaneKey
+              ? requested
+              : { ...requested, agentConversationsByPaneKey: entries }
+          }, true)
+        } else {
+          const [partial] = args
+          write((state) => {
+            const requested = typeof partial === 'function' ? partial(state) : partial
+            if (
+              requested === state ||
+              (!Object.hasOwn(requested, 'agentConversationsByPaneKey') &&
+                !Object.hasOwn(requested, 'terminalLayoutsByTabId'))
+            ) {
+              return requested
+            }
+            const current = get()
+            const candidate = { ...current, ...requested }
+            const entries = cappedConversations(candidate, current.agentConversationsByPaneKey)
+            return entries === candidate.agentConversationsByPaneKey
+              ? requested
+              : { ...requested, agentConversationsByPaneKey: entries }
+          })
+        }
+      }
+    api.setState = wrap(api.setState)
+    const initial = createState(wrap(set), get, api)
+    const entries = cappedConversations(initial, {})
+    return entries === initial.agentConversationsByPaneKey
+      ? initial
+      : { ...initial, agentConversationsByPaneKey: entries }
+  }
+}
diff --git a/src/renderer/src/store/index.ts b/src/renderer/src/store/index.ts
index 0f7c537b340a..341b339c13d2 100644
--- a/src/renderer/src/store/index.ts
+++ b/src/renderer/src/store/index.ts
@@ -65,6 +65,7 @@ import { ORCA_SIDEBAR_INPUTS_IS_MAIN } from '../../../shared/sidebar-inputs-swit
 import { withReactCommitCascadeWriteProbe } from './react-commit-cascade-write-probe'
 import { withStoreIdentityChurnProbe } from './store-identity-churn-probe'
 import { withEditorBufferRecords } from './editor-buffer-record-lifecycle'
+import { withAgentConversationRetention } from './agent-conversation-retention'
 import { attachEditorBufferIdentityEvents } from './editor-buffer-identity-events'
 import {
   registerRendererMemoryProfileContributor,
@@ -79,11 +80,14 @@ const withDevelopmentStoreProbes = (createState: StateCreator<AppState, [], []>)
     ? withStoreIdentityChurnProbe(createState)
     : createState
 
+const withAppStoreWritePolicies = (createState: StateCreator<AppState, [], []>) =>
+  withAgentConversationRetention(withDevelopmentStoreProbes(createState))
+
 // Why buffer records outermost: the probes must see each caller's own partial and frame.
 // Why e2e checks the buffer invariant too: a writer that skips the record must fail there, not drift.
 export const useAppStore = create<AppState>()(
   withEditorBufferRecords(
-    withDevelopmentStoreProbes(
+    withAppStoreWritePolicies(
       withReactCommitCascadeWriteProbe((...a) => {
         // Why first: settling inside the bump's own notify means hook subscribers never see it unsettled.
         // Switch point: the stamp-sorted list reads no settled epoch.
diff --git a/src/renderer/src/store/slices/agent-pane-conversation.ts b/src/renderer/src/store/slices/agent-pane-conversation.ts
new file mode 100644
index 000000000000..de1c17921427
--- /dev/null
+++ b/src/renderer/src/store/slices/agent-pane-conversation.ts
@@ -0,0 +1,67 @@
+import type { AgentProviderSessionMetadata } from '../../../../shared/agent-session-resume'
+import { agentProviderSessionsEqual } from '../../../../shared/agent-session-resume'
+import type { AgentStatusEntry, AgentType } from '../../../../shared/agent-status-types'
+import type { ExecutionHostId } from '../../../../shared/execution-host'
+import { getExecutionHostIdForWorktree } from '@/lib/worktree-runtime-owner'
+import type { AppState } from '../types'
+import { findAgentPaneWorktreeId } from './agent-status/agent-status-pane-key-tab-binding'
+
+export type AgentPaneConversationIdentity = {
+  paneKey: string
+  worktreeId: string
+  executionHostId: ExecutionHostId
+  connectionId: string | null
+  agent: AgentType
+  providerSession: AgentProviderSessionMetadata
+}
+
+/** Conversation identity outlives turn occupancy; it never requests an automatic resume. */
+export function projectAgentPaneConversation(
+  state: AppState,
+  entry: Pick<
+    AgentStatusEntry,
+    'paneKey' | 'agentType' | 'providerSession' | 'worktreeId' | 'connectionId'
+  >,
+  copy: (
+    entries: AppState['agentConversationsByPaneKey']
+  ) => AppState['agentConversationsByPaneKey'] = (entries) => ({ ...entries })
+): AppState['agentConversationsByPaneKey'] {
+  const current = state.agentConversationsByPaneKey
+  const previous = current[entry.paneKey]
+  const agent = entry.agentType
+  const worktreeId = entry.worktreeId ?? findAgentPaneWorktreeId(state, entry.paneKey)
+  if (!agent || agent === 'unknown' || !entry.providerSession?.id || !worktreeId) {
+    if (!previous) {
+      return current
+    }
+    const next = copy(current)
+    delete next[entry.paneKey]
+    return next
+  }
+  const executionHostId = getExecutionHostIdForWorktree(state, worktreeId)
+  const connectionId = entry.connectionId ?? null
+  if (
+    previous?.agent === agent &&
+    previous.worktreeId === worktreeId &&
+    previous.executionHostId === executionHostId &&
+    previous.connectionId === connectionId &&
+    agentProviderSessionsEqual(agent, previous.providerSession, entry.providerSession)
+  ) {
+    return current
+  }
+  const next = copy(current)
+  Object.defineProperty(next, entry.paneKey, {
+    value: {
+      paneKey: entry.paneKey,
+      worktreeId,
+      executionHostId,
+      connectionId,
+      agent,
+      providerSession: entry.providerSession
+    },
+    writable: true,
+    enumerable: true,
+    configurable: true
+  })
+  return next
+}
diff --git a/src/renderer/src/store/slices/agent-status/agent-status-authority-actions.ts b/src/renderer/src/store/slices/agent-status/agent-status-authority-actions.ts
index 41643ce2a95f..72dfc14f948e 100644
--- a/src/renderer/src/store/slices/agent-status/agent-status-authority-actions.ts
+++ b/src/renderer/src/store/slices/agent-status/agent-status-authority-actions.ts
@@ -77,6 +77,10 @@ export function createAgentStatusAuthorityActions(
           }
           return {
             agentStatusByPaneKey: removePaneKeys(s.agentStatusByPaneKey, retiredPaneKeySet),
+            agentConversationsByPaneKey: removePaneKeys(
+              s.agentConversationsByPaneKey,
+              retiredPaneKeySet
+            ),
             runtimeAgentOrchestrationByPaneKey: removePaneKeys(
               s.runtimeAgentOrchestrationByPaneKey,
               retiredPaneKeySet
@@ -192,6 +196,12 @@ export function createAgentStatusAuthorityActions(
             paneKey: to,
             tabId: targetTabId
           })),
+          agentConversationsByPaneKey: movePaneKeyedRecord(
+            s.agentConversationsByPaneKey,
+            from,
+            to,
+            (identity) => ({ ...identity, paneKey: to })
+          ),
           // Bump epoch on live pane-key moves so retention/sidebar consumers observe the remap.
           ...(from in s.agentStatusByPaneKey
             ? { agentStatusEpoch: s.agentStatusEpoch + 1, sortEpoch: s.sortEpoch + 1 }
diff --git a/src/renderer/src/store/slices/agent-status/agent-status-batch-update.ts b/src/renderer/src/store/slices/agent-status/agent-status-batch-update.ts
new file mode 100644
index 000000000000..69db959e7010
--- /dev/null
+++ b/src/renderer/src/store/slices/agent-status/agent-status-batch-update.ts
@@ -0,0 +1,32 @@
+import type { AgentStatusBatchUpdate } from './agent-status-contract'
+import type { AgentStatusSlice } from './agent-status-slice-contract'
+
+export function applyAgentStatusBatchUpdate(
+  actions: Pick<
+    AgentStatusSlice,
+    'setAgentStatus' | 'recordAgentProviderSession' | 'setAgentProgramStatus'
+  >,
+  update: AgentStatusBatchUpdate
+): void {
+  if (update.kind === 'providerSession') {
+    actions.recordAgentProviderSession(
+      update.paneKey,
+      update.agent,
+      update.providerSession,
+      update.timing,
+      update.routing,
+      update.metadata
+    )
+  } else if (update.kind === 'programStatus') {
+    actions.setAgentProgramStatus(update.paneKey, update.programStatus)
+  } else {
+    actions.setAgentStatus(
+      update.paneKey,
+      update.payload,
+      update.terminalTitle,
+      update.timing,
+      update.routing,
+      update.metadata
+    )
+  }
+}
diff --git a/src/renderer/src/store/slices/agent-status/agent-status-drop-actions.ts b/src/renderer/src/store/slices/agent-status/agent-status-drop-actions.ts
index 87957222f6a0..5913c0821c5f 100644
--- a/src/renderer/src/store/slices/agent-status/agent-status-drop-actions.ts
+++ b/src/renderer/src/store/slices/agent-status/agent-status-drop-actions.ts
@@ -14,6 +14,7 @@ import {
 } from './agent-status-pane-key-tab-binding'
 import { retireAgentPaneAuthorityAliasesByOwnerTab } from '../agent-pane-authority'
 import { agentTurnEndedOnPurpose } from '../../../../../shared/agent-main-agent-verdict'
+import { removePaneKeys } from './agent-status-pane-keyed-records'
 
 function removeAcknowledgement(
   acknowledgements: Record<string, number>,
@@ -53,6 +54,9 @@ export function createAgentStatusDropActions(
         const nextManualUnread = opts?.paneRemoved
           ? removeAcknowledgement(s.manuallyUnreadTurnsByPaneKey, paneKey)
           : s.manuallyUnreadTurnsByPaneKey
+        const nextConversations = opts?.paneRemoved
+          ? removePaneKeys(s.agentConversationsByPaneKey, new Set([paneKey]))
+          : s.agentConversationsByPaneKey
         const hasLaunchConfig = paneKey in s.agentLaunchConfigByPaneKey
         const nextLaunchConfigs = hasLaunchConfig
           ? { ...s.agentLaunchConfigByPaneKey }
@@ -62,6 +66,9 @@ export function createAgentStatusDropActions(
         }
         if (!hasLive && !hasRetained && !migrationUnsupported.changed) {
           const cleanupPatch = {
+            ...(nextConversations !== s.agentConversationsByPaneKey
+              ? { agentConversationsByPaneKey: nextConversations }
+              : {}),
             ...(hasLaunchConfig ? { agentLaunchConfigByPaneKey: nextLaunchConfigs } : {}),
             ...(nextAck !== s.acknowledgedAgentsByPaneKey
               ? { acknowledgedAgentsByPaneKey: nextAck }
@@ -89,6 +96,7 @@ export function createAgentStatusDropActions(
         const needsSuppressor = hasLive && !(paneKey in s.retentionSuppressedPaneKeys)
         return {
           agentStatusByPaneKey: nextLive,
+          agentConversationsByPaneKey: nextConversations,
           agentLaunchConfigByPaneKey: nextLaunchConfigs,
           retainedAgentsByPaneKey: nextRetained,
           migrationUnsupportedByPtyId: migrationUnsupported.next,
diff --git a/src/renderer/src/store/slices/agent-status/agent-status-drop-reducer.ts b/src/renderer/src/store/slices/agent-status/agent-status-drop-reducer.ts
index 96eda5a96f06..73a89376b97d 100644
--- a/src/renderer/src/store/slices/agent-status/agent-status-drop-reducer.ts
+++ b/src/renderer/src/store/slices/agent-status/agent-status-drop-reducer.ts
@@ -17,6 +17,7 @@ export type AgentStatusTabPrefixDropState = Pick<
   | 'acknowledgedAgentsByPaneKey'
   | 'activityClearedAtByPaneKey'
   | 'agentLaunchConfigByPaneKey'
+  | 'agentConversationsByPaneKey'
   | 'agentStatusByPaneKey'
   | 'agentStatusEpoch'
   | 'migrationUnsupportedByPtyId'
@@ -75,6 +76,15 @@ export function buildAgentStatusTabPrefixDropPatch(
     const nextClosedTabs = opts?.paneKeys
       ? s.recentlyClosedAgentStatusTabIds
       : boundRecentlyClosedAgentStatusTabIds(s.recentlyClosedAgentStatusTabIds, tabIdPrefix)
+    const nextConversations = opts?.preserveActivityClearedState
+      ? s.agentConversationsByPaneKey
+      : opts?.paneKeys
+        ? removePaneKeys(s.agentConversationsByPaneKey, opts.paneKeys)
+        : removePaneKeysByTabPrefix(
+            s.agentConversationsByPaneKey,
+            tabIdPrefix,
+            new Set([...completedOrphanKeys, ...retiredAliasPaneKeys])
+          )
     const nextRetiredPaneKeys = boundRecentlyRetiredAgentStatusPaneKeys(
       s.recentlyRetiredAgentStatusPaneKeys,
       closedAgentStatusRetirementKeys(
@@ -117,11 +127,13 @@ export function buildAgentStatusTabPrefixDropPatch(
           ...(nextManualUnread !== s.manuallyUnreadTurnsByPaneKey
             ? { manuallyUnreadTurnsByPaneKey: nextManualUnread }
             : {}),
+          agentConversationsByPaneKey: nextConversations,
           recentlyClosedAgentStatusTabIds: nextClosedTabs,
           recentlyRetiredAgentStatusPaneKeys: nextRetiredPaneKeys
         }
       }
       return {
+        agentConversationsByPaneKey: nextConversations,
         recentlyClosedAgentStatusTabIds: nextClosedTabs,
         recentlyRetiredAgentStatusPaneKeys: nextRetiredPaneKeys,
         ...(nextClearedAt !== s.activityClearedAtByPaneKey
@@ -167,6 +179,7 @@ export function buildAgentStatusTabPrefixDropPatch(
 
     return {
       agentStatusByPaneKey: nextLive,
+      agentConversationsByPaneKey: nextConversations,
       agentLaunchConfigByPaneKey: nextLaunchConfigs,
       retainedAgentsByPaneKey: nextRetained,
       migrationUnsupportedByPtyId: migrationUnsupported.next,
diff --git a/src/renderer/src/store/slices/agent-status/agent-status-live-actions.ts b/src/renderer/src/store/slices/agent-status/agent-status-live-actions.ts
index 0ce74ccc64de..fc46e318e17c 100644
--- a/src/renderer/src/store/slices/agent-status/agent-status-live-actions.ts
+++ b/src/renderer/src/store/slices/agent-status/agent-status-live-actions.ts
@@ -32,6 +32,7 @@ export function createAgentStatusLiveActions(
   runtime: AgentStatusRuntime
 ): Pick<AgentStatusSlice, 'setAgentStatus' | 'setAgentStatuses' | 'transactAgentStatuses'> {
   const {
+    projectConversation,
     get,
     set,
     applyGeneratedTabTitleUpdate,
@@ -105,7 +106,7 @@ export function createAgentStatusLiveActions(
         return state
       }
       const previousEntries = state.agentStatusByPaneKey
-      const reduction = reduceAgentStatusLiveUpdate(state, built, updatedAt)
+      const reduction = reduceAgentStatusLiveUpdate(state, built, updatedAt, projectConversation)
       changedPaneKeys.add(built.entry.paneKey)
       for (const evicted of reduction.evictedEntries) {
         changedPaneKeys.add(evicted.paneKey)
diff --git a/src/renderer/src/store/slices/agent-status/agent-status-live-reducer.ts b/src/renderer/src/store/slices/agent-status/agent-status-live-reducer.ts
index d7f7a26c5b80..7c0d99279718 100644
--- a/src/renderer/src/store/slices/agent-status/agent-status-live-reducer.ts
+++ b/src/renderer/src/store/slices/agent-status/agent-status-live-reducer.ts
@@ -1,3 +1,4 @@
+import { projectAgentPaneConversation } from '../agent-pane-conversation'
 import type { AppState } from '../../types'
 import type { AgentStatusEntry } from '../../../../../shared/agent-status-types'
 import {
@@ -20,7 +21,8 @@ export type AgentStatusLiveUpdateReduction = {
 export function reduceAgentStatusLiveUpdate(
   state: AppState,
   build: AgentStatusLiveEntryBuild,
-  updatedAt: number
+  updatedAt: number,
+  projectConversation = projectAgentPaneConversation
 ): AgentStatusLiveUpdateReduction {
   const {
     entry,
@@ -107,8 +109,12 @@ export function reduceAgentStatusLiveUpdate(
     nextSleepingAgentSessions = removePaneKeys(nextSleepingAgentSessions, evicted)
     nextLaunchConfigs = removePaneKeys(nextLaunchConfigs, evicted)
   }
+  const nextConversations = projectConversation(state, entry)
   const patch: Partial<AppState> = {
     agentStatusByPaneKey: nextLive,
+    ...(nextConversations !== state.agentConversationsByPaneKey
+      ? { agentConversationsByPaneKey: nextConversations }
+      : {}),
     retainedAgentsByPaneKey: nextRetainedAgents,
     sleepingAgentSessionsByPaneKey: nextSleepingAgentSessions,
     agentLaunchConfigByPaneKey: nextLaunchConfigs,
diff --git a/src/renderer/src/store/slices/agent-status/agent-status-provider-session-actions.ts b/src/renderer/src/store/slices/agent-status/agent-status-provider-session-actions.ts
index 2a56eee351b0..6ef89e795a1a 100644
--- a/src/renderer/src/store/slices/agent-status/agent-status-provider-session-actions.ts
+++ b/src/renderer/src/store/slices/agent-status/agent-status-provider-session-actions.ts
@@ -27,7 +27,7 @@ import { settleAttentionRemovedBy } from '../workspace-attention/attention-remov
 export function createAgentStatusProviderSessionActions(
   runtime: AgentStatusRuntime
 ): Pick<AgentStatusSlice, 'recordAgentProviderSession'> {
-  const { get, set, requestFreshness } = runtime
+  const { get, set, requestFreshness, projectConversation } = runtime
   return {
     recordAgentProviderSession: (
       paneKey: string,
@@ -148,8 +148,12 @@ export function createAgentStatusProviderSessionActions(
             nextLaunchConfigs = { ...nextLaunchConfigs }
             delete nextLaunchConfigs[paneKey]
           }
+          const nextConversations = projectConversation(s, { ...record, agentType: agent })
           return {
             agentStatusByPaneKey: nextLive,
+            ...(nextConversations !== s.agentConversationsByPaneKey
+              ? { agentConversationsByPaneKey: nextConversations }
+              : {}),
             retainedAgentsByPaneKey: nextRetained,
             sleepingAgentSessionsByPaneKey: {
               ...s.sleepingAgentSessionsByPaneKey,
diff --git a/src/renderer/src/store/slices/agent-status/agent-status-provider-session.test.ts b/src/renderer/src/store/slices/agent-status/agent-status-provider-session.test.ts
index e68a56ccff76..c32d82651d81 100644
--- a/src/renderer/src/store/slices/agent-status/agent-status-provider-session.test.ts
+++ b/src/renderer/src/store/slices/agent-status/agent-status-provider-session.test.ts
@@ -1,3 +1,6 @@
+import { normalizeHookPayload } from '../../../../../shared/agent-hook-listener'
+import { createHookListenerState } from '../../../../../shared/agent-hook-listener/listener-state'
+import { applyProviderSessionOnlyUpdate } from '../../../hooks/ipc-events/agent-status-partial-updates'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import type { SleepingAgentSessionRecord } from '../../../../../shared/agent-session-resume'
 import type { AppState } from '../../types'
@@ -833,3 +836,39 @@ describe('sleepingAgentSessionsByPaneKey after reminted-hook settlement', () =>
     )
   })
 })
+
+it('retains recorded Jcode session-start identity without a status row', () => {
+  const store = createTestStore()
+  seedStore(store, { tabsByWorktree: { 'wt-1': [makeTab({ id: 'tab-1', worktreeId: 'wt-1' })] } })
+  const paneKey = 'tab-1:11111111-1111-4111-8111-111111111111'
+  // Jcode 0.87.1 captured input; agent-hook-listener-jcode.test.ts pins provenance.
+  const payload = {
+    hook_event_name: 'session_start',
+    event: 'session_start',
+    session_id: 'session_jc_5',
+    model: 'claude-haiku-4-5',
+    source: 'create'
+  }
+  const event = normalizeHookPayload(
+    createHookListenerState(),
+    'jcode',
+    { paneKey, payload },
+    'production'
+  )
+  if (!event) {
+    throw new Error('Recorded session_start was rejected')
+  }
+  expect(event.providerSessionOnly).toBe(true)
+  applyProviderSessionOnlyUpdate({
+    store: store.getState(),
+    batch: undefined,
+    paneKey,
+    routing: { tabId: 'tab-1', worktreeId: 'wt-1' },
+    data: { ...event, ...event.payload, receivedAt: 1, stateStartedAt: 1 }
+  })
+  expect(store.getState().agentStatusByPaneKey).toEqual({})
+  expect(store.getState().agentConversationsByPaneKey[paneKey]).toMatchObject({
+    agent: 'jcode',
+    providerSession: { key: 'session_id', id: 'session_jc_5' }
+  })
+})
diff --git a/src/renderer/src/store/slices/agent-status/agent-status-runtime.ts b/src/renderer/src/store/slices/agent-status/agent-status-runtime.ts
index 43646194b00e..08dbdb0f6da5 100644
--- a/src/renderer/src/store/slices/agent-status/agent-status-runtime.ts
+++ b/src/renderer/src/store/slices/agent-status/agent-status-runtime.ts
@@ -1,3 +1,5 @@
+import { applyAgentStatusBatchUpdate } from './agent-status-batch-update'
+import { projectAgentPaneConversation } from '../agent-pane-conversation'
 import { structuralValuesEqualIgnoringUndefined } from '../../../../../shared/structural-value-equality'
 import type { StateCreator } from 'zustand'
 import type { AppState } from '../../types'
@@ -17,6 +19,7 @@ export type AgentStatusStateUpdate =
   | ((state: AppState, changedPaneKeys: Set<string>) => AppState | Partial<AppState>)
 
 export type AgentStatusRuntime = {
+  projectConversation: typeof projectAgentPaneConversation
   get: () => AppState
   subscribeAgentStatusChanges: (listener: AgentStatusChangeListener) => () => void
   set: (update: AgentStatusStateUpdate) => void
@@ -114,6 +117,20 @@ export function createAgentStatusRuntime(
   let batchedAgentStatusFreshnessRequested = false
   const get = (): AppState => batchedAgentStatusState ?? storeGet()
 
+  let conversationDraft: AppState['agentConversationsByPaneKey'] | null = null
+  const projectConversation: typeof projectAgentPaneConversation = (state, entry) =>
+    projectAgentPaneConversation(state, entry, (entries) => {
+      if (!batchedAgentStatusState) {
+        return { ...entries }
+      }
+      const next =
+        entries === conversationDraft
+          ? entries
+          : Object.setPrototypeOf(Object.assign(Object.create(null), entries), Object.prototype)
+      conversationDraft = next
+      return next
+    })
+
   // Omit replace from this write type so no slice call can request replacement the batch cannot express.
   const set = (update: AgentStatusStateUpdate): void => {
     const staged = batchedAgentStatusState
@@ -171,28 +188,7 @@ export function createAgentStatusRuntime(
       return false
     }
     const revisionBeforeUpdate = batchedAgentStatusRevision
-    const actions = getActions()
-    if (update.kind === 'providerSession') {
-      actions.recordAgentProviderSession(
-        update.paneKey,
-        update.agent,
-        update.providerSession,
-        update.timing,
-        update.routing,
-        update.metadata
-      )
-    } else if (update.kind === 'programStatus') {
-      actions.setAgentProgramStatus(update.paneKey, update.programStatus)
-    } else {
-      actions.setAgentStatus(
-        update.paneKey,
-        update.payload,
-        update.terminalTitle,
-        update.timing,
-        update.routing,
-        update.metadata
-      )
-    }
+    applyAgentStatusBatchUpdate(getActions(), update)
     return batchedAgentStatusRevision !== revisionBeforeUpdate
   }
 
@@ -224,6 +220,7 @@ export function createAgentStatusRuntime(
       const generatedTabTitleUpdates = batchedGeneratedTabTitleUpdates
       const freshnessRequested = batchedAgentStatusFreshnessRequested
       const hasStagedWrites = batchedAgentStatusRevision !== revisionAtStart
+      conversationDraft = null
       batchedPaneKeys = null
       batchedAgentStatusState = null
       batchedAgentStatusTouchedKeys = null
@@ -248,6 +245,7 @@ export function createAgentStatusRuntime(
       }
       return result
     } finally {
+      conversationDraft = null
       batchedPaneKeys = null
       batchedAgentStatusState = null
       batchedAgentStatusTouchedKeys = null
@@ -292,6 +290,7 @@ export function createAgentStatusRuntime(
   }
 
   return {
+    projectConversation,
     subscribeAgentStatusChanges,
     get,
     set,
diff --git a/src/renderer/src/store/slices/agent-status/agent-status-slice-contract.ts b/src/renderer/src/store/slices/agent-status/agent-status-slice-contract.ts
index 13c1787564df..eb75b409b592 100644
--- a/src/renderer/src/store/slices/agent-status/agent-status-slice-contract.ts
+++ b/src/renderer/src/store/slices/agent-status/agent-status-slice-contract.ts
@@ -29,12 +29,15 @@ import type {
   SleepingAgentLaunchConfig,
   SleepingAgentSessionRecord
 } from '../../../../../shared/agent-session-resume'
+import type { AgentPaneConversationIdentity } from '../agent-pane-conversation'
 import type { AgentStatusStateUpdate } from './agent-status-runtime'
 import type { ProgramStatusFacet } from '../../../../../shared/program-status/facet'
 
 export type AgentStatusSlice = {
   /** Explicit agent status entries keyed by `${tabId}:${leafId}`; real-time only, not persisted. */
   agentStatusByPaneKey: Record<string, AgentStatusEntry>
+  /** Host-reported conversation identity only; transient and independent of agent occupancy. */
+  agentConversationsByPaneKey: Record<string, AgentPaneConversationIdentity>
   /** Store-local committed row changes, using writer-known keys rather than map discovery. */
   subscribeAgentStatusChanges: (listener: AgentStatusChangeListener) => () => void
   /** Route external atomic status patches through the same commit boundary. */
diff --git a/src/renderer/src/store/slices/agent-status/agent-status.ts b/src/renderer/src/store/slices/agent-status/agent-status.ts
index b52cc7b05a78..71ebea692c50 100644
--- a/src/renderer/src/store/slices/agent-status/agent-status.ts
+++ b/src/renderer/src/store/slices/agent-status/agent-status.ts
@@ -61,6 +61,7 @@ export const createAgentStatusSlice: StateCreator<AppState, [], [], AgentStatusS
     subscribeAgentStatusChanges: runtime.subscribeAgentStatusChanges,
     updateAgentStatusState: runtime.set,
     agentStatusByPaneKey: {},
+    agentConversationsByPaneKey: {},
     runtimeAgentOrchestrationByPaneKey: {},
     migrationUnsupportedByPtyId: {},
     agentStatusEpoch: 0,
diff --git a/src/renderer/src/store/slices/store-test-helpers.ts b/src/renderer/src/store/slices/store-test-helpers.ts
index 559e6186218b..4bc34505c1af 100644
--- a/src/renderer/src/store/slices/store-test-helpers.ts
+++ b/src/renderer/src/store/slices/store-test-helpers.ts
@@ -1,4 +1,4 @@
-import { create } from 'zustand'
+import { create, type StateCreator } from 'zustand'
 import type { AppState } from '../types'
 import type { Worktree } from '../../../../shared/worktree/types'
 import { createRepoSlice } from './repos'
@@ -54,6 +54,7 @@ import { createStructuredChatSleptAtSlice } from './structured-chat-slept-at'
 import { createWorkspaceAttentionSlice } from './workspace-attention/workspace-attention-slice'
 import '@/i18n/i18n'
 import { withEditorBufferRecords } from '../editor-buffer-record-lifecycle'
+import { withAgentConversationRetention } from '../agent-conversation-retention'
 import { makeWorktree, TEST_REPO } from './worktrees-slice-test-fixtures'
 export { makeWorktree, TEST_REPO } from './worktrees-slice-test-fixtures'
 export {
@@ -64,10 +65,13 @@ export {
   makeTabGroup
 } from './store-session-test-harness'
 
+const withTestStorePolicies = (creator: StateCreator<AppState, [], []>, check: boolean) =>
+  withEditorBufferRecords(withAgentConversationRetention(creator), check)
+
 export function createTestStore() {
   // Why the record middleware: views of one file share a record only through it, as in the app.
   return create<AppState>()(
-    withEditorBufferRecords<AppState>(
+    withTestStorePolicies(
       (...a) => ({
         ...createRepoSlice(...a),
         ...createSparsePresetsSlice(...a),
diff --git a/src/shared/claimed-agent-pty-owner.ts b/src/shared/claimed-agent-pty-owner.ts
index 93a9c63ea0af..dd5f233b5e09 100644
--- a/src/shared/claimed-agent-pty-owner.ts
+++ b/src/shared/claimed-agent-pty-owner.ts
@@ -1,3 +1,5 @@
+import type { PtyCreationDisposition } from './pty-creation-disposition'
+export type { PtyCreationDisposition } from './pty-creation-disposition'
 import { randomUUID } from 'node:crypto'
 import type {
   AgentSessionClaimedSpawnResult,
@@ -29,6 +31,7 @@ type ReservedOwner = {
   generation: string
   phase: 'reserved'
   promise: Promise<AgentSessionClaimedSpawnResult>
+  creation?: Promise<PtyCreationDisposition>
 }
 
 type LiveOwner = LiveAgentSessionOwner
@@ -61,7 +64,8 @@ export class ClaimedAgentPtyOwnerRegistry {
     }>
     isLive?: (owner: LiveAgentSessionOwner) => boolean | Promise<boolean>
     /** Called when this request waits on another request's start instead of starting its own. */
-    onJoin?: () => void
+    onJoin?: (creation?: Promise<PtyCreationDisposition>) => void
+    creation?: Promise<PtyCreationDisposition>
   }): Promise<AgentSessionClaimedSpawnResult> {
     // Snapshot reused retry arguments before awaits so caller mutations cannot change registry keys.
     const requestedClaim = cloneClaim(args.claim)
@@ -93,7 +97,7 @@ export class ClaimedAgentPtyOwnerRegistry {
       if (reserved.worktreeScopeDigest !== requestedClaim.worktreeScopeDigest) {
         throw new Error('agent_session_conflict')
       }
-      args.onJoin?.()
+      args.onJoin?.(reserved.creation)
       const result = await reserved.promise
       return { disposition: 'adopted', owner: cloneOwner(result.owner as LiveOwner) }
     }
@@ -113,10 +117,11 @@ export class ClaimedAgentPtyOwnerRegistry {
       worktreeScopeDigest: requestedClaim.worktreeScopeDigest,
       generation,
       phase: 'reserved',
+      creation: args.creation,
       promise
     })
 
-    let promotedOwner: LiveOwner | null = null
+    let published = false
     try {
       const spawned = await args.spawn({ generation })
       const owner: LiveOwner = spawned.owner
@@ -155,9 +160,9 @@ export class ClaimedAgentPtyOwnerRegistry {
       const keys = this.keysByPtyId.get(owner.ptyId) ?? new Set<string>()
       keys.add(key)
       this.keysByPtyId.set(owner.ptyId, keys)
-      promotedOwner = owner
       // Index before awaited proof so an exit beating spawn completion can remove the matching generation.
       if (args.isLive && !(await args.isLive(cloneOwner(owner)))) {
+        this.release(owner.ptyId, owner.generation)
         throw new Error('agent_session_exited_during_start')
       }
       const current = this.live.get(key)
@@ -169,17 +174,29 @@ export class ClaimedAgentPtyOwnerRegistry {
         owner: cloneOwner(owner)
       }
       resolveReservation(result)
+      published = true
       return result
     } catch (error) {
-      if (promotedOwner) {
-        this.release(promotedOwner.ptyId, promotedOwner.generation)
-      }
       rejectReservation(error)
       throw error
     } finally {
-      const current = this.reserved.get(key)
-      if (current?.generation === generation) {
-        this.reserved.delete(key)
+      const finish = () => {
+        if (this.reserved.get(key)?.generation === generation) {
+          this.reserved.delete(key)
+        }
+      }
+      if (published || !args.creation) {
+        finish()
+      } else {
+        void args.creation.then(async (disposition) => {
+          if (disposition.kind === 'unknown') {
+            return
+          }
+          if (disposition.kind === 'physical' || disposition.kind === 'failed') {
+            await disposition.completion
+          }
+          finish()
+        })
       }
     }
   }
diff --git a/src/shared/pty-creation-disposition.ts b/src/shared/pty-creation-disposition.ts
new file mode 100644
index 000000000000..d1adbc8ae52e
--- /dev/null
+++ b/src/shared/pty-creation-disposition.ts
@@ -0,0 +1,11 @@
+export type PtyCreationDisposition =
+  | { kind: 'no-fork' }
+  | { kind: 'unknown'; recover?: () => Promise<void> }
+  // Exact native call threw without exporting a handle; physical outcome is unknown.
+  | { kind: 'failed'; completion: Promise<void>; recover?: () => Promise<void> }
+  | {
+      kind: 'physical'
+      completion: Promise<void>
+      exitCode: () => number | null
+      recover?: () => Promise<void>
+    }

From 82beabc125bb5419ca88151e507e97df5e4ecee2 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Thu, 29 Oct 2026 15:34:50 -0700
Subject: [PATCH 104/207] Preserve legacy import and owned Windows cleanup

---
 .../pty-subprocess-handle-lifecycle.test.ts   |   7 +-
 .../pty-subprocess-io-failure-cleanup.test.ts |  34 +++++-
 .../conpty-startup-input-reader.ts            |  21 ++--
 .../daemon-pty-physical-owner.ts              |  32 +++---
 .../native-pty-spawn-windows.test.ts          | 105 ++++++++++++++++--
 .../daemon/session-termination-controller.ts  |   8 +-
 .../codex-history-test-fixture.ts             |  25 +++++
 ...ured-agent-session-create-adoption.test.ts |  45 ++++++--
 .../transcript-line-decoders-codex.ts         |  21 +---
 ...anscript-reader-codex-history-mode.test.ts |  24 +---
 src/main/windows/windows-pty-job.ts           |  10 +-
 11 files changed, 231 insertions(+), 101 deletions(-)

diff --git a/src/main/daemon/pty-subprocess-handle-lifecycle.test.ts b/src/main/daemon/pty-subprocess-handle-lifecycle.test.ts
index 2a1ca54781b9..cdf42214b874 100644
--- a/src/main/daemon/pty-subprocess-handle-lifecycle.test.ts
+++ b/src/main/daemon/pty-subprocess-handle-lifecycle.test.ts
@@ -80,6 +80,7 @@ vi.mock('../providers/windows-pty-job-membership', () => ({
 import { createPtySubprocess } from './pty-subprocess'
 import { mockPtyProcess, useDaemonPtySubprocessEnv } from './pty-subprocess-test-harness'
 import { __setConptyJobNativeForTests } from '../windows/windows-pty-job'
+import * as ptyJob from '../windows/windows-pty-job'
 
 describe('createPtySubprocess', () => {
   beforeEach(() => {
@@ -453,16 +454,20 @@ describe('createPtySubprocess', () => {
       const killSpy = vi.spyOn(process, 'kill').mockImplementation(() => {
         throw new Error('already gone')
       })
+      const terminateJob = vi.spyOn(ptyJob, 'terminatePtyJob').mockReturnValue('unavailable')
       const origPlatform = Object.getOwnPropertyDescriptor(process, 'platform')
       Object.defineProperty(process, 'platform', { value: 'win32' })
       try {
         const handle = await createPtySubprocess({ sessionId: 'test', cols: 80, rows: 24 })
         handle.forceKill()
         handle.dispose()
-        expect(killSpy).toHaveBeenCalledWith(123456, 'SIGKILL')
+        // An unverified PID can be reused; the per-PTY job/native handle owns this process tree.
+        expect(killSpy).not.toHaveBeenCalled()
+        expect(terminateJob).toHaveBeenCalledExactlyOnceWith(proc)
         expect(proc.kill).toHaveBeenCalledOnce()
         expect(proc.destroy).not.toHaveBeenCalled()
       } finally {
+        terminateJob.mockRestore()
         killSpy.mockRestore()
         restorePlatform(origPlatform)
       }
diff --git a/src/main/daemon/pty-subprocess-io-failure-cleanup.test.ts b/src/main/daemon/pty-subprocess-io-failure-cleanup.test.ts
index ec96ec8f50f7..bcd672ad0d72 100644
--- a/src/main/daemon/pty-subprocess-io-failure-cleanup.test.ts
+++ b/src/main/daemon/pty-subprocess-io-failure-cleanup.test.ts
@@ -145,6 +145,7 @@ describe.each(['darwin', 'linux', 'win32'] as const)('%s native-handle contract'
     it('keeps graceful and forced termination available until physical exit', () => {
       const fixture = createFixture()
       const originalKill = fixture.proc.kill
+      const terminateJob = vi.spyOn(ptyJob, 'terminatePtyJob').mockReturnValue('unavailable')
       const signal = vi.spyOn(process, 'kill').mockReturnValue(true)
       failIo(fixture, operation)
 
@@ -154,7 +155,14 @@ describe.each(['darwin', 'linux', 'win32'] as const)('%s native-handle contract'
       const forced = createFixture()
       failIo(forced, operation)
       forced.handle.forceKill()
-      expect(signal).toHaveBeenCalledWith(4242, 'SIGKILL')
+      if (platform === 'win32') {
+        // An unverified PID can be reused; the per-PTY job/native handle owns this process tree.
+        expect(signal).not.toHaveBeenCalled()
+        expect(terminateJob).toHaveBeenCalledExactlyOnceWith(forced.proc)
+        expect(forced.proc.kill).toHaveBeenCalledOnce()
+      } else {
+        expect(signal).toHaveBeenCalledWith(4242, 'SIGKILL')
+      }
 
       forced.proc._simulateExit(137)
       signal.mockClear()
@@ -168,6 +176,7 @@ describe.each(['darwin', 'linux', 'win32'] as const)('%s native-handle contract'
 
     it('reaps every session and native handle across 32 failed-I/O create/close cycles', async () => {
       const emulatorDispose = vi.spyOn(HeadlessEmulator.prototype, 'dispose')
+      const terminateJob = vi.spyOn(ptyJob, 'terminatePtyJob').mockReturnValue('unavailable')
       const signal = vi.spyOn(process, 'kill').mockReturnValue(true)
       let fixture = createFixture()
       const host = new TerminalHost({ spawnSubprocess: () => fixture.handle })
@@ -195,9 +204,18 @@ describe.each(['darwin', 'linux', 'win32'] as const)('%s native-handle contract'
             expect(host.listSessions()).toHaveLength(1)
             expect(fixture.proc.destroy).not.toHaveBeenCalled()
             expect(onExit).not.toHaveBeenCalled()
-            await vi.waitFor(() => expect(signal).toHaveBeenCalledWith(4242, 'SIGKILL'), {
-              interval: 1
-            })
+            if (platform === 'win32') {
+              await vi.waitFor(() => expect(fixture.proc.kill).toHaveBeenCalledOnce(), {
+                interval: 1
+              })
+              expect(terminateJob).toHaveBeenCalledWith(fixture.proc)
+              // An unverified PID can be reused; the per-PTY job/native handle owns this process tree.
+              expect(signal).not.toHaveBeenCalled()
+            } else {
+              await vi.waitFor(() => expect(signal).toHaveBeenCalledWith(4242, 'SIGKILL'), {
+                interval: 1
+              })
+            }
           } finally {
             fixture.proc._simulateExit(137)
             killFailure = await settled
@@ -205,7 +223,13 @@ describe.each(['darwin', 'linux', 'win32'] as const)('%s native-handle contract'
           expect(killFailure).toBeNull()
           expect(host.listSessions()).toHaveLength(0)
           expect(onExit).toHaveBeenCalledOnce()
-          expect(fixture.proc.destroy).toHaveBeenCalledOnce()
+          if (platform === 'win32') {
+            // An unverified PID can be reused; job/native close owns the tree and must not be repeated by destroy.
+            expect(fixture.proc.destroy).not.toHaveBeenCalled()
+            expect(fixture.proc.kill).toHaveBeenCalledOnce()
+          } else {
+            expect(fixture.proc.destroy).toHaveBeenCalledOnce()
+          }
           expect(emulatorDispose).toHaveBeenCalledTimes(index + 1)
         }
       } finally {
diff --git a/src/main/daemon/pty-subprocess/conpty-startup-input-reader.ts b/src/main/daemon/pty-subprocess/conpty-startup-input-reader.ts
index cc9d4819a678..a9b4092cc1cb 100644
--- a/src/main/daemon/pty-subprocess/conpty-startup-input-reader.ts
+++ b/src/main/daemon/pty-subprocess/conpty-startup-input-reader.ts
@@ -1,6 +1,5 @@
 import type { DaemonPtyPhysicalOwner } from './subprocess-handle'
 import type * as pty from 'node-pty'
-import { killConptyNow, terminatePtyJob } from '../../windows/windows-pty-job'
 import { CONPTY_DA1_RESPONSE } from '../../../shared/conpty-device-attributes'
 
 // Bundled ConPTY queries DA1 (or CPR when inheriting the cursor) right after it starts reading
@@ -113,13 +112,13 @@ export function watchConptyStartup(
 async function decideConptyStartup(
   proc: pty.IPty,
   signal: AbortSignal | undefined,
-  exitSource: Pick<pty.IPty, 'onExit'> = proc
+  physicalOwner: DaemonPtyPhysicalOwner
 ): Promise<{
   outcome: ConptyStartupOutcome
   claim: () => ConptyStartupEvents
   exited: Promise<void>
 }> {
-  const watch = watchConptyStartup(proc, exitSource)
+  const watch = watchConptyStartup(proc, physicalOwner)
   let limit: ReturnType<typeof setTimeout> | undefined
   let onAbort = (): void => {}
   try {
@@ -134,7 +133,7 @@ async function decideConptyStartup(
     return { outcome, claim: watch.claim, exited: watch.exited }
   } catch (error) {
     // A canceled spawn must not leave the half-started shell running.
-    discardConpty(proc, watch)
+    discardConpty(physicalOwner, watch)
     throw error
   } finally {
     clearTimeout(limit)
@@ -142,12 +141,12 @@ async function decideConptyStartup(
   }
 }
 
-function discardConpty(proc: pty.IPty, watch: Pick<ConptyStartupWatch, 'claim'>): void {
+function discardConpty(
+  physicalOwner: DaemonPtyPhysicalOwner,
+  watch: Pick<ConptyStartupWatch, 'claim'>
+): void {
   watch.claim()
-  // Handle-based only: a pid may already be recycled if the shell exited during startup.
-  terminatePtyJob(proc)
-  killConptyNow(proc)
-  proc.kill()
+  physicalOwner.forceKill()
 }
 
 // Why process-wide: the announcement is a fact of the bundled ConPTY build. Until one pane shows
@@ -208,9 +207,7 @@ export async function spawnConptyWithInputReader(
   )
   let limit: ReturnType<typeof setTimeout> | undefined
   try {
-    terminatePtyJob(first)
-    killConptyNow(first)
-    first.kill()
+    firstOwner.forceKill()
     const exited = await Promise.race([
       firstOwner.completion.then(() => true),
       new Promise<false>((resolve) => {
diff --git a/src/main/daemon/pty-subprocess/daemon-pty-physical-owner.ts b/src/main/daemon/pty-subprocess/daemon-pty-physical-owner.ts
index 4363b7a2d372..01c3390cf61e 100644
--- a/src/main/daemon/pty-subprocess/daemon-pty-physical-owner.ts
+++ b/src/main/daemon/pty-subprocess/daemon-pty-physical-owner.ts
@@ -2,7 +2,7 @@ import type { DisposableNativePty } from './native-pty-spawn'
 import type * as pty from 'node-pty'
 import { forceKillPosixPtyProcessGroups } from '../../pty/posix-pty-process-groups'
 import { PendingPtyGroupSweep } from '../../pty/pending-pty-group-sweep'
-import { terminatePtyJob } from '../../windows/windows-pty-job'
+import { killConptyNow, terminatePtyJob } from '../../windows/windows-pty-job'
 import { SessionTerminationController } from '../session-termination-controller'
 import { shutdownOwnedTerminalProcess } from '../terminal-host-session-shutdown'
 export function createDaemonPtyPhysicalOwner(proc: pty.IPty) {
@@ -35,25 +35,12 @@ export function createDaemonPtyPhysicalOwner(proc: pty.IPty) {
       )
     )
   }
-  // Stays synchronous: dispose() reads nodePtyKillIssued right after to avoid double-closing ConPTY.
-  const forceKillConpty = (): void => {
-    if (exit) {
-      return
-    }
-    // Escalate a ConPTY kill through the job without double-closing node-pty's shell handle.
-    if (nodePtyKillIssued) {
-      terminatePtyJob(proc)
+  const kill = (): void => {
+    if (exit || (process.platform === 'win32' && nodePtyKillIssued)) {
       return
     }
-    try {
-      killRoot()
-    } catch (signalError) {
-      fallBackToNodePtyKill(signalError)
-    }
-  }
-
-  const kill = (): void => {
-    if (exit) {
+    if (process.platform === 'win32' && killConptyNow(proc)) {
+      nodePtyKillIssued = true
       return
     }
     nodePtyKillIssued = true
@@ -64,6 +51,15 @@ export function createDaemonPtyPhysicalOwner(proc: pty.IPty) {
       throw error
     }
   }
+  const forceKillConpty = (): void => {
+    if (exit) {
+      return
+    }
+    // Re-request the owned job even after a native close; neither request proves exit.
+    terminatePtyJob(proc)
+    kill()
+  }
+
   const forceKill = () => (process.platform === 'win32' ? forceKillConpty() : forceKillPosix())
   const dispose = (): void => {
     if (disposed) {
diff --git a/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts b/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts
index 45f14db4248f..b5574e20dd37 100644
--- a/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts
+++ b/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts
@@ -13,6 +13,7 @@ import '../mock-descendant-sweep'
 import { TerminalHost } from '../terminal-host'
 import { TerminalSpawnGate } from '../terminal-spawn-gate'
 import { TerminalCreationWork } from '../terminal-creation-work'
+import { IMMEDIATE_KILL_PHYSICAL_EXIT_TIMEOUT_MS } from '../immediate-kill-reply-budget'
 import { createDaemonPtySubprocessHandle } from './subprocess-handle'
 import { spawnNativeDaemonPty } from './native-pty-spawn'
 import {
@@ -52,6 +53,7 @@ function fakePane(pid: number, chunks: string[], exitCode?: number) {
         listener({ exitCode: 137 })
       }
     }),
+    destroy: vi.fn(),
     write: vi.fn(),
     resize: vi.fn(),
     pause: vi.fn(),
@@ -101,7 +103,8 @@ describe('Windows shell fallback over node-pty ConPTY', () => {
     Object.defineProperty(process, 'platform', { configurable: true, value: 'win32' })
     vi.spyOn(console, 'warn').mockImplementation(() => {})
     nodePty.spawn.mockReset()
-    ptyJob.terminatePtyJob.mockReset()
+    ptyJob.terminatePtyJob.mockReset().mockReturnValue('unavailable')
+    ptyJob.killConptyNow.mockReset().mockReturnValue(false)
     _resetConptyStartupTrustForTest()
   })
   afterEach(() => {
@@ -183,20 +186,29 @@ describe('Windows shell fallback over node-pty ConPTY', () => {
     expect(result.claimStartupEvents?.().data).toEqual(['\x1b[1t\x1b[?1004h'])
   })
 
-  it.each(['physical-exit', 'deadline'] as const)(
+  it.each(['physical-exit', 'deadline', 'observation-retry'] as const)(
     'ordinary create keeps the startup predecessor owned through %s and host disposal',
     async (outcome) => {
       vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] })
       const broken = deadPane(990010)
       broken.kill.mockImplementation(() => {})
+      if (outcome === 'observation-retry') {
+        vi.spyOn(broken, 'onExit').mockImplementationOnce(() => {
+          throw new Error('initial exit subscription failed')
+        })
+        // The native close request returns but cannot establish exit; the job is unavailable.
+        ptyJob.killConptyNow.mockReturnValue(true)
+      }
       const replacement = fakePane(990011, [])
       nodePty.spawn.mockReturnValueOnce(broken).mockReturnValueOnce(replacement)
-      vi.spyOn(process, 'kill').mockImplementation((pid) => {
-        expect([broken.pid, replacement.pid]).toContain(pid)
-        if (pid === replacement.pid) {
+      vi.spyOn(process, 'kill').mockImplementation(() => {
+        throw new Error('Windows cleanup must not signal an unchecked PID')
+      })
+      ptyJob.terminatePtyJob.mockImplementation((proc) => {
+        if (proc === replacement) {
           queueMicrotask(() => replacement.emitExit(137))
         }
-        return true
+        return outcome === 'observation-retry' ? 'unavailable' : 'terminated'
       })
       const gate = new TerminalSpawnGate({ log: () => {} })
       const host = new TerminalHost({
@@ -225,7 +237,35 @@ describe('Windows shell fallback over node-pty ConPTY', () => {
         rows: 24,
         streamClient: { onData() {}, onExit() {} }
       })
+      const creationSettled = creating.then(
+        () => null,
+        (error: unknown) => error
+      )
       try {
+        if (outcome === 'observation-retry') {
+          await vi.waitFor(() => expect(ptyJob.killConptyNow).toHaveBeenCalledOnce())
+          await vi.advanceTimersByTimeAsync(IMMEDIATE_KILL_PHYSICAL_EXIT_TIMEOUT_MS)
+          expect(await creationSettled).toBeInstanceOf(Error)
+          expect(host.listSessions()).toEqual([])
+          expect(gate.snapshot().terminals).toBe(1)
+          // Let the automatic failed-create recovery also exhaust its bounded exit wait.
+          await vi.advanceTimersByTimeAsync(IMMEDIATE_KILL_PHYSICAL_EXIT_TIMEOUT_MS)
+          const requests = ptyJob.terminatePtyJob.mock.calls.length
+          ptyJob.terminatePtyJob.mockImplementation(() => {
+            queueMicrotask(() => broken.emitExit(137))
+            return 'terminated'
+          })
+          await host.dispose()
+          expect(ptyJob.terminatePtyJob.mock.calls.length).toBeGreaterThan(requests)
+          expect(ptyJob.killConptyNow).toHaveBeenCalledOnce()
+          expect(broken.kill).not.toHaveBeenCalled()
+          expect(broken.destroy).not.toHaveBeenCalled()
+          expect(process.kill).not.toHaveBeenCalled()
+          expect(nodePty.spawn).toHaveBeenCalledOnce()
+          expect(gate.snapshot().terminals).toBe(0)
+          expect(host.listSessions()).toEqual([])
+          return
+        }
         await vi.waitFor(() => expect(broken.kill).toHaveBeenCalledOnce())
         expect(nodePty.spawn).toHaveBeenCalledOnce()
         expect(host.listSessions()).toEqual([])
@@ -241,15 +281,42 @@ describe('Windows shell fallback over node-pty ConPTY', () => {
         expect(created.pid).toBe(outcome === 'physical-exit' ? replacement.pid : broken.pid)
         expect(nodePty.spawn).toHaveBeenCalledTimes(outcome === 'physical-exit' ? 2 : 1)
         expect(gate.snapshot().terminals).toBe(1)
-        const disposing = host.dispose()
         if (outcome === 'deadline') {
-          await vi.waitFor(() => expect(process.kill).toHaveBeenCalled())
+          ptyJob.terminatePtyJob.mockReturnValue('unavailable')
+          const disposing = host.dispose().then(
+            () => null,
+            (error: unknown) => error
+          )
+          await vi.waitFor(() =>
+            expect(
+              ptyJob.terminatePtyJob.mock.calls.filter(([proc]) => proc === broken).length
+            ).toBeGreaterThan(1)
+          )
           expect(gate.snapshot().terminals).toBe(1)
-          broken.emitExit(137)
+          expect(host.listSessions()).toHaveLength(1)
+          await vi.advanceTimersByTimeAsync(IMMEDIATE_KILL_PHYSICAL_EXIT_TIMEOUT_MS)
+          expect(await disposing).toBeInstanceOf(Error)
+          expect(gate.snapshot().terminals).toBe(1)
+          expect(host.listSessions()).toHaveLength(1)
+          // The same owner's force request must reach the now-available job after the timeout.
+          const requests = ptyJob.terminatePtyJob.mock.calls.length
+          ptyJob.terminatePtyJob.mockImplementation(() => {
+            queueMicrotask(() => broken.emitExit(137))
+            return 'terminated'
+          })
+          const retrying = host.dispose()
+          await vi.waitFor(() =>
+            expect(ptyJob.terminatePtyJob.mock.calls.length).toBeGreaterThan(requests)
+          )
+          await retrying
+          expect(broken.kill).toHaveBeenCalledOnce()
+          expect(broken.destroy).not.toHaveBeenCalled()
+        } else {
+          await host.dispose()
         }
-        await disposing
         expect(gate.snapshot().terminals).toBe(0)
         expect(host.listSessions()).toEqual([])
+        expect(process.kill).not.toHaveBeenCalled()
       } finally {
         broken.emitExit(137)
         replacement.emitExit(137)
@@ -313,12 +380,26 @@ describe('Windows shell fallback over node-pty ConPTY', () => {
   it('kills the pane tree when the spawn is canceled while startup is awaited', async () => {
     const controller = new AbortController()
     const silent = fakePane(990001, [])
+    silent.kill.mockImplementation(() => {})
+    vi.spyOn(process, 'kill').mockImplementation(() => {
+      throw new Error('unchecked Windows PID')
+    })
     nodePty.spawn.mockReturnValueOnce(silent)
     const spawned = spawnNativeDaemonPty({ ...args, signal: controller.signal })
     await new Promise((resolve) => setImmediate(resolve))
+    let settled = false
+    const rejected = expect(spawned)
+      .rejects.toThrow('spawn canceled')
+      .then(() => {
+        settled = true
+      })
     controller.abort(new Error('spawn canceled'))
-
-    await expect(spawned).rejects.toThrow('spawn canceled')
+    await vi.waitFor(() => expect(silent.kill).toHaveBeenCalledOnce())
+    expect(settled).toBe(false)
+    expect(nodePty.spawn).toHaveBeenCalledOnce()
+    silent.emitExit(137)
+    await rejected
+    expect(process.kill).not.toHaveBeenCalled()
     expect(ptyJob.terminatePtyJob).toHaveBeenCalledWith(silent)
     // node-pty defers kill() until first output, which a silent pane never produces.
     expect(ptyJob.killConptyNow).toHaveBeenCalledWith(silent)
diff --git a/src/main/daemon/session-termination-controller.ts b/src/main/daemon/session-termination-controller.ts
index 99ae90a2c9b2..30a17c4291a2 100644
--- a/src/main/daemon/session-termination-controller.ts
+++ b/src/main/daemon/session-termination-controller.ts
@@ -92,7 +92,13 @@ export class SessionTerminationController {
     }
     // Escalate now rather than spend the physical-exit budget waiting for graceful shutdown.
     await this.requestForceKillWithRetry()
-    await this.waitForPhysicalExit(timeoutMs)
+    try {
+      await this.waitForPhysicalExit(timeoutMs)
+    } catch (error) {
+      // A fulfilled request without exit cannot suppress the next explicit cleanup attempt.
+      this.forceKillRequest = null
+      throw error
+    }
   }
 
   signal(sig: string): void {
diff --git a/src/main/native-chat/agent-session-journal/codex-history-test-fixture.ts b/src/main/native-chat/agent-session-journal/codex-history-test-fixture.ts
index f59843ee23a4..783daff93704 100644
--- a/src/main/native-chat/agent-session-journal/codex-history-test-fixture.ts
+++ b/src/main/native-chat/agent-session-journal/codex-history-test-fixture.ts
@@ -86,3 +86,28 @@ export async function writeCodexHistoryFixture(
     }
   }
 }
+
+export function codexLegacyMirrorRecords() {
+  return [
+    {
+      type: 'response_item',
+      payload: {
+        type: 'message',
+        role: 'user',
+        content: [{ type: 'input_text', text: 'Prompt' }]
+      }
+    },
+    { type: 'event_msg', payload: { type: 'user_message', message: 'Prompt' } },
+    { type: 'compacted', payload: { message: 'summary', replacement_history: [] } },
+    { type: 'event_msg', payload: { type: 'context_compacted' } },
+    { type: 'event_msg', payload: { type: 'agent_message', message: 'Response' } },
+    {
+      type: 'response_item',
+      payload: {
+        type: 'message',
+        role: 'assistant',
+        content: [{ type: 'output_text', text: 'Response' }]
+      }
+    }
+  ]
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-create-adoption.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-create-adoption.test.ts
index 00e09d3270e4..885a00210b01 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-create-adoption.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-create-adoption.test.ts
@@ -22,7 +22,10 @@ import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../shared/constants'
 import { openTestJournalHostDatabase } from '../agent-session-journal/journal-host-database-test-support'
 import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding'
 
-import { writeCodexHistoryFixture } from '../agent-session-journal/codex-history-test-fixture'
+import {
+  codexLegacyMirrorRecords,
+  writeCodexHistoryFixture
+} from '../agent-session-journal/codex-history-test-fixture'
 import { structuredAgentRuntimeMetadata } from '../../runtime/structured-agent-runtime-metadata'
 import {
   resolveStructuredAgentSessionAdoptionForCreate,
@@ -74,6 +77,7 @@ function anotherSession(params: AgentSessionAttachParams): AgentSessionAttachPar
 
 it.each([
   ['matching', THREAD],
+  ['legacy', THREAD],
   ['mismatched', '019fd532-7c11-7a90-b6de-4e1a2c3d5f61']
 ] as const)(
   'resolves a selected-account rollout with %s metadata before at-rest publication',
@@ -89,6 +93,17 @@ it.each([
       undefined,
       metadataId
     )
+    if (_kind === 'legacy') {
+      await writeFile(
+        rollout.filePath,
+        [
+          { type: 'session_meta', payload: { id: THREAD, cwd: rig.root } },
+          ...codexLegacyMirrorRecords()
+        ]
+          .map((record) => JSON.stringify(record))
+          .join('\n')
+      )
+    }
     if (metadataId !== THREAD) {
       // Keep filename lookup valid so the imported metadata is what refuses the mismatched source.
       await rename(rollout.filePath, join(sessions, `rollout-2026-10-27T00-00-00-${THREAD}.jsonl`))
@@ -157,14 +172,26 @@ it.each([
       throw new Error('Real selected-account adoption failed')
     }
     const snapshot = await rig.host.journalSnapshot(SESSION)
-    expect(snapshot.items.map(({ body }) => body)).toEqual([
-      { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'saved CLI turn' }] },
-      {
-        kind: 'message',
-        role: 'assistant',
-        blocks: [{ type: 'text', text: 'saved CLI turn answer' }]
-      }
-    ])
+    expect(snapshot.items.map(({ body }) => body)).toEqual(
+      _kind === 'legacy'
+        ? [
+            { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'Prompt' }] },
+            {
+              kind: 'message',
+              role: 'system',
+              blocks: [{ type: 'text', text: 'Context compacted', presentation: 'compaction' }]
+            },
+            { kind: 'message', role: 'assistant', blocks: [{ type: 'text', text: 'Response' }] }
+          ]
+        : [
+            { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'saved CLI turn' }] },
+            {
+              kind: 'message',
+              role: 'assistant',
+              blocks: [{ type: 'text', text: 'saved CLI turn answer' }]
+            }
+          ]
+    )
     expect(result.value.page.items).toEqual(snapshot.items)
     expect(rig.store.getRecord(SESSION)?.accountHome).toEqual(accountHome)
     expect(rig.store.getRecord(SESSION)?.providerHandleChain).toMatchObject([
diff --git a/src/main/native-chat/transcript-line-decoders-codex.ts b/src/main/native-chat/transcript-line-decoders-codex.ts
index 96c21824277b..ec388e48df23 100644
--- a/src/main/native-chat/transcript-line-decoders-codex.ts
+++ b/src/main/native-chat/transcript-line-decoders-codex.ts
@@ -48,12 +48,7 @@ export function decodeCodexTranscriptLine(
   const baseId = extractString(payload.id) ?? fallbackId
 
   if (record.type === 'response_item') {
-    return codexResponseItem(
-      payload,
-      baseId,
-      timestamp,
-      options?.historyImport ? codexTurnItemBlocks : claudeContentBlocks
-    )
+    return codexResponseItem(payload, baseId, timestamp)
   }
   if (record.type === 'event_msg') {
     return codexEventMessage(payload, baseId, timestamp, options?.historyImport === true)
@@ -79,8 +74,7 @@ function codexUnwrappedResponseItem(
 function codexResponseItem(
   payload: Record<string, unknown>,
   id: string,
-  timestamp: number | null,
-  decodeMessageBlocks = claudeContentBlocks
+  timestamp: number | null
 ): NativeChatMessage | null {
   if (payload.type === 'message') {
     const role =
@@ -88,7 +82,7 @@ function codexResponseItem(
     if (!role) {
       return null
     }
-    const decodedBlocks = decodeMessageBlocks(payload.content)
+    const decodedBlocks = claudeContentBlocks(payload.content)
     const blocks =
       role === 'user' ? decodedBlocks.filter((block) => !isSkillContext(block)) : decodedBlocks
     if (blocks.length === 0) {
@@ -230,20 +224,11 @@ function codexCompactionMarker(id: string, timestamp: number | null): NativeChat
 }
 
 function codexTurnItemBlocks(content: unknown): NativeChatBlock[] {
-  if (typeof content === 'string') {
-    return content.trim() ? [{ type: 'text', text: content }] : []
-  }
   if (!Array.isArray(content)) {
     return []
   }
   const blocks: NativeChatBlock[] = []
   for (const value of content) {
-    if (typeof value === 'string') {
-      if (value.trim()) {
-        blocks.push({ type: 'text', text: value })
-      }
-      continue
-    }
     const item = asRecord(value)
     if (!item) {
       continue
diff --git a/src/main/native-chat/transcript-reader-codex-history-mode.test.ts b/src/main/native-chat/transcript-reader-codex-history-mode.test.ts
index eddab9d62ac5..6013dd838d0b 100644
--- a/src/main/native-chat/transcript-reader-codex-history-mode.test.ts
+++ b/src/main/native-chat/transcript-reader-codex-history-mode.test.ts
@@ -1,3 +1,4 @@
+import { codexLegacyMirrorRecords } from './agent-session-journal/codex-history-test-fixture'
 import { prepareLegacyTranscriptImport } from './agent-session-journal/journal-legacy-import'
 import { createNativeChatMerger, replaceList } from '../../shared/native-chat/native-chat-merge'
 import { mkdtemp, rm, writeFile } from 'node:fs/promises'
@@ -219,28 +220,7 @@ describe('Codex transcript history modes', () => {
   })
 
   it('keeps legacy event messages without duplicating response copies', async () => {
-    const filePath = await writeCodexFixture([
-      {
-        type: 'response_item',
-        payload: {
-          type: 'message',
-          role: 'user',
-          content: [{ type: 'input_text', text: 'Prompt' }]
-        }
-      },
-      { type: 'event_msg', payload: { type: 'user_message', message: 'Prompt' } },
-      { type: 'compacted', payload: { message: 'summary', replacement_history: [] } },
-      { type: 'event_msg', payload: { type: 'context_compacted' } },
-      { type: 'event_msg', payload: { type: 'agent_message', message: 'Response' } },
-      {
-        type: 'response_item',
-        payload: {
-          type: 'message',
-          role: 'assistant',
-          content: [{ type: 'output_text', text: 'Response' }]
-        }
-      }
-    ])
+    const filePath = await writeCodexFixture(codexLegacyMirrorRecords())
 
     const result = await readNativeChatTranscript('codex', 'session-1', { filePath })
 
diff --git a/src/main/windows/windows-pty-job.ts b/src/main/windows/windows-pty-job.ts
index bc5bb536d806..ae1e382e9fdf 100644
--- a/src/main/windows/windows-pty-job.ts
+++ b/src/main/windows/windows-pty-job.ts
@@ -195,11 +195,15 @@ export function __setConptyJobNativeForTests(loader?: () => ConptyNative | null)
 type UnreadyWindowsPty = IPty & { _agent?: { kill?: () => void } }
 
 // Bypass node-pty's output-deferred kill to release silent ConPTY hosts, input pipes and output workers immediately.
-export function killConptyNow(proc: IPty): void {
+export function killConptyNow(proc: IPty): boolean {
   const pane: UnreadyWindowsPty = proc
   try {
-    pane._agent?.kill?.()
+    if (!pane._agent?.kill) {
+      return false
+    }
+    pane._agent.kill()
+    return true
   } catch {
-    // Best effort; the host job still reaps the console host with the daemon.
+    return false
   }
 }

From 0a8a32409009d0bd1d6a7e20d27d1e2e159a4be4 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Thu, 29 Oct 2026 15:57:08 -0700
Subject: [PATCH 105/207] Match pending creation membership contract

---
 src/main/daemon/terminal-host-fenced-termination.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/daemon/terminal-host-fenced-termination.ts b/src/main/daemon/terminal-host-fenced-termination.ts
index 45869c858ea6..97f93c7ee257 100644
--- a/src/main/daemon/terminal-host-fenced-termination.ts
+++ b/src/main/daemon/terminal-host-fenced-termination.ts
@@ -13,7 +13,7 @@ export function beginTerminalHostFencedTermination(
   request: PtyFencedTerminationRequest,
   deps: {
     sessions: ReadonlyMap<string, Session>
-    pendingCreations: ReadonlyMap<string, Promise<void>>
+    pendingCreations: ReadonlyMap<string, unknown>
     owners: ClaimedAgentPtyOwnerRegistry
     kill: (id: string, options: { immediate: true }) => Promise<void>
   }

From ad564bf4ac6690f0a10659b7c680dcaf8e02964d Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Thu, 29 Oct 2026 16:48:40 -0700
Subject: [PATCH 106/207] fix(continue): align sweep and imported source
 contracts

---
 .../structured-agent-session-attach.ts            |  3 ++-
 .../agent-status-primitives.ts                    |  1 +
 .../retraction-pane-ownership.test.ts             | 15 ++++++++++++++-
 .../src/runtime/web-session-tabs-sync/state.ts    | 12 ++----------
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-attach.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-attach.ts
index 79cb8c859c5c..8c868adf3119 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-attach.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-attach.ts
@@ -36,6 +36,7 @@ import {
 } from '../../../shared/agent-session-mutation-envelope'
 import type { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
 import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
+import type { AdoptedTranscriptSource } from '../agent-session-journal/adopted-transcript-source'
 import { structuredAgentSessionRefusalMessage } from './structured-agent-session-refusal-message'
 
 /** Clients cannot assert spawn tokens, claim keys or owner death; only host observations grant authority. */
@@ -59,7 +60,7 @@ export type AgentSessionAttachParams = {
     providerHandle: AgentSessionProviderHandle
     /** Omit only for exact replay of an already-imported journal. */
     transcriptPath?: string
-    source?: { providerSessionId: string; workspaceCwd: string }
+    source?: AdoptedTranscriptSource
   }
 }
 
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/agent-status-primitives.ts b/src/renderer/src/runtime/web-session-tabs-sync/agent-status-primitives.ts
index e72b33217b23..261c036aec83 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/agent-status-primitives.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/agent-status-primitives.ts
@@ -188,6 +188,7 @@ export function buildRetractedMirroredTabSweepPatch(
   let sweepState: RetiredTerminalTabSweepState = {
     acknowledgedAgentsByPaneKey: state.acknowledgedAgentsByPaneKey ?? {},
     activityClearedAtByPaneKey: state.activityClearedAtByPaneKey ?? {},
+    agentConversationsByPaneKey: state.agentConversationsByPaneKey ?? {},
     agentLaunchConfigByPaneKey: state.agentLaunchConfigByPaneKey ?? {},
     agentStatusByPaneKey: agentStatusPatch?.agentStatusByPaneKey ?? state.agentStatusByPaneKey,
     agentStatusEpoch: agentStatusPatch?.agentStatusEpoch ?? state.agentStatusEpoch,
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/retraction-pane-ownership.test.ts b/src/renderer/src/runtime/web-session-tabs-sync/retraction-pane-ownership.test.ts
index 6c1d7aa9e8e6..5ba8ad659015 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/retraction-pane-ownership.test.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/retraction-pane-ownership.test.ts
@@ -10,7 +10,7 @@ import {
 } from '../web-session-tabs-sync-test-harness'
 import { collectCollidingRetractionPaneKeys } from './retraction-pane-ownership'
 import { buildRetractedMirroredTabSweepPatch } from './agent-status-primitives'
-import type { WebSessionTabsBatchContext } from './state'
+import type { WebSessionTabsBatchContext, WebSessionTabsSyncState } from './state'
 import {
   getForegroundTerminalTabLastSeenAtById,
   resetForegroundTerminalTabIdsForTests,
@@ -28,7 +28,18 @@ it.each([true, false])('cleans unrelated tabs when a collision is mirrored=%s',
   const owned = makePaneKey(collision, LEAF_ID)
   const foreign = makePaneKey(collision, SECOND_LEAF_ID)
   const normal = makePaneKey(ordinary, LEAF_ID)
+  const conversations: WebSessionTabsSyncState['agentConversationsByPaneKey'] = {
+    [owned]: {
+      paneKey: owned,
+      worktreeId: 'folder:own',
+      executionHostId: 'local',
+      connectionId: 'host-a',
+      agent: 'codex',
+      providerSession: { key: 'session_id', id: '019fd532-7c11-7a90-b6de-4e1a2c3d5f60' }
+    }
+  }
   const state = makeState({
+    agentConversationsByPaneKey: conversations,
     acknowledgedAgentsByPaneKey: { [foreign]: 2 },
     agentStatusByPaneKey: Object.fromEntries(
       [owned, normal].map((paneKey) => [
@@ -57,6 +68,8 @@ it.each([true, false])('cleans unrelated tabs when a collision is mirrored=%s',
     )
     const patch = buildRetractedMirroredTabSweepPatch(state, {}, null, [collision, ordinary], scope)
     const after = { ...state, ...patch }
+    expect(after.agentConversationsByPaneKey).toBe(conversations)
+    expect(patch).not.toHaveProperty('agentConversationsByPaneKey')
     expect(after.acknowledgedAgentsByPaneKey?.[foreign]).toBe(2)
     expect(after.agentStatusByPaneKey[normal]).toBeUndefined()
     expect(after.recentlyClosedAgentStatusTabIds?.[ordinary]).toBeDefined()
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/state.ts b/src/renderer/src/runtime/web-session-tabs-sync/state.ts
index fc5ea00dfbc8..c9ff465fb67f 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/state.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/state.ts
@@ -1,4 +1,5 @@
 import type { AppState } from '../../store'
+import type { RetiredTerminalTabSweepState } from '../../store/slices/retired-terminal-tab-state-sweep'
 import type {
   RuntimeMobileSessionAgentTab,
   RuntimeMobileSessionBrowserTab,
@@ -225,26 +226,17 @@ export type WebSessionTabsSyncState = Pick<
   | 'unreadTerminalTabs'
   | 'sortEpoch'
 > &
+  Partial<RetiredTerminalTabSweepState> &
   Partial<
     Pick<
       AppState,
-      | 'acknowledgedAgentsByPaneKey'
-      | 'activityClearedAtByPaneKey'
-      | 'agentLaunchConfigByPaneKey'
       | 'automaticAgentResumeClaimsByTabId'
       // Client draft proves dirty-flag ownership (#21392); without one, follow host save state.
       | 'editorDrafts'
       // Why: the live index carries sticky detachments; absent here, views resolve by identity.
       | 'editorBufferIdOf'
       | 'localOnlyScrollbackByTabId'
-      | 'migrationUnsupportedByPtyId'
-      | 'manuallyUnreadTurnsByPaneKey'
-      | 'paneForegroundAgentByPaneKey'
       | 'pendingStartupByTabId'
-      | 'recentlyClosedAgentStatusTabIds'
-      | 'recentlyRetiredAgentStatusPaneKeys'
-      | 'retainedAgentsByPaneKey'
-      | 'retentionSuppressedPaneKeys'
       | 'runtimePaneTitlesByTabId'
     >
   >

From 48daedcdee48026a784a7f236c1cb14926ebeac1 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Thu, 29 Oct 2026 17:12:31 -0700
Subject: [PATCH 107/207] Combine terminal claim type imports

---
 src/main/daemon/terminal-host-agent-session-claim.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/daemon/terminal-host-agent-session-claim.ts b/src/main/daemon/terminal-host-agent-session-claim.ts
index d535510f3e2c..b514418cda33 100644
--- a/src/main/daemon/terminal-host-agent-session-claim.ts
+++ b/src/main/daemon/terminal-host-agent-session-claim.ts
@@ -1,6 +1,8 @@
 import type { TerminalCreationWork } from './terminal-creation-work'
-import type { PtyCreationDisposition } from '../../shared/claimed-agent-pty-owner'
-import type { ClaimedAgentPtyOwnerRegistry } from '../../shared/claimed-agent-pty-owner'
+import type {
+  ClaimedAgentPtyOwnerRegistry,
+  PtyCreationDisposition
+} from '../../shared/claimed-agent-pty-owner'
 import type { AgentSessionOwnerBinding } from '../../shared/agent-session-host-authority'
 import type { SpawnIntent } from '../../shared/host-spawn-admission'
 import type { CreateOrAttachOptions, CreateOrAttachResult } from './terminal-host-create-contract'

From 2f5d17e8acd72a2b2730daf8fa0a58726ad37090 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Thu, 29 Oct 2026 17:24:03 -0700
Subject: [PATCH 108/207] Classify own-property checks as layout reads

---
 config/scripts/check-layout-writer-ratchets.mjs      | 11 +++++++++++
 config/scripts/check-layout-writer-ratchets.test.mjs |  1 +
 2 files changed, 12 insertions(+)

diff --git a/config/scripts/check-layout-writer-ratchets.mjs b/config/scripts/check-layout-writer-ratchets.mjs
index c2b611cbead3..b47bc51145ce 100644
--- a/config/scripts/check-layout-writer-ratchets.mjs
+++ b/config/scripts/check-layout-writer-ratchets.mjs
@@ -381,6 +381,17 @@ export function countLayoutWrites(sourceText, ratchet, fileName = 'file.tsx') {
       !(ts.isPropertyAssignment(node.parent) && node.parent.name === node) &&
       !ts.isComputedPropertyName(node.parent) &&
       !(ts.isElementAccessExpression(node.parent) && node.parent.argumentExpression === node) &&
+      !(
+        ts.isCallExpression(node.parent) &&
+        !node.parent.questionDotToken &&
+        node.parent.arguments.length === 2 &&
+        node.parent.arguments[1] === node &&
+        ts.isPropertyAccessExpression(node.parent.expression) &&
+        !node.parent.expression.questionDotToken &&
+        ts.isIdentifier(node.parent.expression.expression) &&
+        node.parent.expression.expression.text === 'Object' &&
+        node.parent.expression.name.text === 'hasOwn'
+      ) &&
       !ts.isLiteralTypeNode(node.parent)
     ) {
       count += 1
diff --git a/config/scripts/check-layout-writer-ratchets.test.mjs b/config/scripts/check-layout-writer-ratchets.test.mjs
index 126e33260120..e697e8409834 100644
--- a/config/scripts/check-layout-writer-ratchets.test.mjs
+++ b/config/scripts/check-layout-writer-ratchets.test.mjs
@@ -36,6 +36,7 @@ describe('renderer layout writes', () => {
       'const useTabs = () => ({ activeTabId, tabsByWorktree })',
       "type Field = Pick<AppState, 'tabsByWorktree'>",
       "const read = state['unifiedTabsByWorktree']",
+      "Object.hasOwn(requested, 'terminalLayoutsByTabId')",
       'const { tabsByWorktree } = state'
     ].join('\n')
     expect(countLayoutWrites(src, rendererRatchet, 'a.tsx')).toBe(5)

From cd8e4c99025ab90522fee24b11d2f1f330d68de3 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Thu, 29 Oct 2026 17:30:52 -0700
Subject: [PATCH 109/207] Report pre-spawn failure in WSL cwd fixture

---
 src/main/daemon/daemon-pty-adapter-wsl-sleep-cwd.test.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/daemon/daemon-pty-adapter-wsl-sleep-cwd.test.ts b/src/main/daemon/daemon-pty-adapter-wsl-sleep-cwd.test.ts
index e61437041432..54172da8af14 100644
--- a/src/main/daemon/daemon-pty-adapter-wsl-sleep-cwd.test.ts
+++ b/src/main/daemon/daemon-pty-adapter-wsl-sleep-cwd.test.ts
@@ -56,6 +56,7 @@ describe('a sleeping bridge WSL pane keeps its shell folder', () => {
     const harness = await startDaemonAdapterHarness((opts) => {
       spawnCwds.push(opts.cwd)
       if (opts.cwd && deletedCwds.has(opts.cwd)) {
+        opts.onCreationDisposition?.({ kind: 'no-fork' })
         throw new Error(`Working directory "${opts.cwd}" does not exist. It may have been deleted.`)
       }
       lastSubprocess = createMockSubprocess()

From cd7964cec41721b2705d4ef05094171af2d26cd0 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Thu, 29 Oct 2026 20:13:35 -0700
Subject: [PATCH 110/207] Load saved CLI history without a retained source row

---
 .../structured-agent-cli-source.ts            |  76 +++++-
 ...ructured-agent-session-history-adoption.ts |   3 +-
 ...red-agent-session-source-admission.test.ts | 226 +++++++++++++++++-
 .../runtime/rpc/dispatcher-stream-options.ts  |  28 ++-
 src/main/runtime/rpc/dispatcher.ts            |   4 +-
 ...ured-agent-session-adoption-replay.test.ts |  69 +++++-
 .../structured-agent-session-create.ts        |   6 +-
 .../structured-session-cli-writer-host.ts     |  21 ++
 .../structured-session-create-support.ts      |  12 +-
 ...tructured-agent-session-create-adoption.ts |  11 +-
 10 files changed, 424 insertions(+), 32 deletions(-)

diff --git a/src/main/native-chat/structured-agent-cli-source.ts b/src/main/native-chat/structured-agent-cli-source.ts
index aab056651481..900fdc214a6a 100644
--- a/src/main/native-chat/structured-agent-cli-source.ts
+++ b/src/main/native-chat/structured-agent-cli-source.ts
@@ -11,15 +11,29 @@ import { isWslUncPath } from '../../shared/wsl-paths'
 import { needsWslHostResolution } from './host-readable-transcript-path'
 import { parseSshTranscriptPath } from './ssh-transcript-path'
 
-export type StructuredAgentCliSourceEvidence =
+type CliSource = NonNullable<StructuredAgentSessionResumeSource['cliSource']>
+export type StructuredAgentCliSourceRoute = 'native-local' | 'unsupported' | 'unknown'
+export type StructuredAgentCliSourceLocator =
+  | { kind: 'none' }
+  | { kind: 'matched'; transcriptPath?: string }
+  | { kind: 'absent' }
+
+export type StructuredAgentCliSourceEvidence = (
   | { readonly rows: readonly Readonly<AgentStatusIpcPayload>[] }
   | { readonly error: unknown }
+) & {
+  readonly sourceRoute?: Readonly<CliSource & { route: StructuredAgentCliSourceRoute }>
+  readonly routeError?: unknown
+}
 
 export function captureStructuredAgentCliSource(
-  readRows: () => readonly AgentStatusIpcPayload[]
+  readRows: () => readonly AgentStatusIpcPayload[],
+  source?: CliSource,
+  readRoute?: (source: CliSource) => StructuredAgentCliSourceRoute
 ): StructuredAgentCliSourceEvidence {
+  let rows: StructuredAgentCliSourceEvidence
   try {
-    return Object.freeze({
+    rows = {
       rows: Object.freeze(
         readRows().map((row) =>
           Object.freeze({
@@ -30,23 +44,34 @@ export function captureStructuredAgentCliSource(
           })
         )
       )
-    })
+    }
   } catch (error) {
-    return Object.freeze({ error })
+    rows = { error }
+  }
+  if (!source || !readRoute) {
+    return Object.freeze(rows)
+  }
+  try {
+    return Object.freeze({
+      ...rows,
+      sourceRoute: Object.freeze({ ...source, route: readRoute(source) })
+    })
+  } catch (routeError) {
+    return Object.freeze({ ...rows, routeError })
   }
 }
 
-export function structuredAgentCliSourcePathFromEvidence(input: {
+export function structuredAgentCliSourceFromEvidence(input: {
   agent: StructuredAgentId
   resumeFrom: StructuredAgentSessionResumeSource
   workspaceId: string
   evidence?: StructuredAgentCliSourceEvidence
-}): string | undefined {
+}): StructuredAgentCliSourceLocator {
   const evidence = input.evidence
   if (input.resumeFrom.cliSource && evidence && 'error' in evidence) {
     throw evidence.error
   }
-  return structuredAgentCliSourcePath({
+  return resolveSource({
     ...input,
     rows: evidence && 'rows' in evidence ? evidence.rows : []
   })
@@ -59,9 +84,20 @@ export function structuredAgentCliSourcePath(input: {
   workspaceId: string
   rows: readonly AgentStatusIpcPayload[]
 }): string | undefined {
+  const source = resolveSource(input)
+  return source.kind === 'matched' ? source.transcriptPath : undefined
+}
+
+function resolveSource(input: {
+  agent: StructuredAgentId
+  resumeFrom: StructuredAgentSessionResumeSource
+  workspaceId: string
+  rows: readonly AgentStatusIpcPayload[]
+  evidence?: StructuredAgentCliSourceEvidence
+}): StructuredAgentCliSourceLocator {
   const source = input.resumeFrom.cliSource
   if (!source) {
-    return undefined
+    return { kind: 'none' }
   }
   const row = input.rows.find(
     (candidate) =>
@@ -78,6 +114,26 @@ export function structuredAgentCliSourcePath(input: {
       candidate.providerSession?.id === input.resumeFrom.providerSessionId
   )
   if (!row) {
+    if (
+      source.workspaceId === input.workspaceId &&
+      !input.rows.some((candidate) => candidate.paneKey === source.paneKey)
+    ) {
+      const evidence = input.evidence
+      if (evidence && 'routeError' in evidence) {
+        throw evidence.routeError
+      }
+      const route = evidence?.sourceRoute
+      if (route?.workspaceId === source.workspaceId && route.paneKey === source.paneKey) {
+        if (route.route === 'native-local') {
+          return { kind: 'absent' }
+        }
+        if (route.route === 'unsupported') {
+          throw agentSessionRefusalError('structured_agent_session_unsupported', {
+            reason: 'hostUnsupported'
+          })
+        }
+      }
+    }
     throw agentSessionRefusalError(
       'agent_session_identity_required',
       { reason: 'transcriptUnreadable' },
@@ -93,5 +149,5 @@ export function structuredAgentCliSourcePath(input: {
       reason: 'hostUnsupported'
     })
   }
-  return path || undefined
+  return { kind: 'matched', ...(path ? { transcriptPath: path } : {}) }
 }
diff --git a/src/main/native-chat/structured-agent-session-history-adoption.ts b/src/main/native-chat/structured-agent-session-history-adoption.ts
index f5764dc9e7fa..8b1c66c0c882 100644
--- a/src/main/native-chat/structured-agent-session-history-adoption.ts
+++ b/src/main/native-chat/structured-agent-session-history-adoption.ts
@@ -112,6 +112,7 @@ export function structuredAdoptionConflictError(
 export async function resolveStructuredAgentSessionAdoption(input: {
   providerSessionId: string
   candidateAccountHomes: readonly AgentSessionAccountHome[]
+  exhaustionReason?: 'transcriptNotFound' | 'transcriptUnreadable'
   resolveTranscript: (args: {
     providerSessionId: string
     accountHome: AgentSessionAccountHome
@@ -139,6 +140,6 @@ export async function resolveStructuredAgentSessionAdoption(input: {
   }
   // Wrong-home fallback silently turns resume into a blank chat under the old name.
   throw agentSessionRefusalError('agent_session_identity_required', {
-    reason: 'transcriptNotFound'
+    reason: input.exhaustionReason ?? 'transcriptNotFound'
   })
 }
diff --git a/src/main/native-chat/structured-agent-session-source-admission.test.ts b/src/main/native-chat/structured-agent-session-source-admission.test.ts
index 0f041b570138..ace61d29ec28 100644
--- a/src/main/native-chat/structured-agent-session-source-admission.test.ts
+++ b/src/main/native-chat/structured-agent-session-source-admission.test.ts
@@ -4,7 +4,12 @@ import { dirname, join } from 'node:path'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import { CLAUDE_CLI_CONVERSATIONS } from '../claude/claude-cli-conversations'
 import { resolveStructuredAgentSessionAdoptionForCreate } from '../runtime/structured-agent-session-create-adoption'
-import { structuredAgentCliSourcePath } from './structured-agent-cli-source'
+import {
+  captureStructuredAgentCliSource,
+  structuredAgentCliSourcePath,
+  structuredAgentCliSourceFromEvidence,
+  type StructuredAgentCliSourceEvidence
+} from './structured-agent-cli-source'
 import { prepareAdoptedTranscript } from './agent-session-wire/structured-agent-session-adopted-import'
 import type { AgentSessionAttachParams } from './agent-session-wire/structured-agent-session-attach'
 import type { StructuredAgentId } from '../../shared/agent-session-provider-handle'
@@ -13,6 +18,7 @@ import { prepareCodexAdoption } from './codex-adoption-preparation'
 import { codexAiVaultSessionResumePreparation } from '../codex/codex-ai-vault-session-resume'
 import * as codexHomes from '../codex/codex-home-paths'
 import { adoptedDirectoryProbes } from './agent-session-journal/adopted-directory-probe'
+import type { AgentStatusIpcPayload } from '../../shared/agent-status-types'
 
 let root: string
 beforeEach(async () => {
@@ -169,11 +175,38 @@ it('creates from the host hook path when Claude filename differs, then checks ac
     selectedAccountHome: { variable: 'CLAUDE_CONFIG_DIR', path: root },
     launchEnv: {},
     workspaceCwd: root,
-    resolveTranscriptPath: sourcePath
+    resolveTranscriptSource: () => ({ kind: 'matched', transcriptPath: sourcePath() })
   })
   expect(adoption.transcriptPath).toBe(transcriptPath)
   expect(admission).toHaveBeenCalledOnce()
   expect(find).not.toHaveBeenCalled()
+  await expect(
+    resolveStructuredAgentSessionAdoptionForCreate({
+      settings: {},
+      agent: 'claude',
+      transcriptImport: importer,
+      providerSessionId: id,
+      selectedAccountHome,
+      launchEnv: {},
+      workspaceCwd: root,
+      resolveTranscriptSource: () =>
+        structuredAgentCliSourceFromEvidence({
+          agent: 'claude',
+          workspaceId: 'folder',
+          resumeFrom: {
+            providerSessionId: id,
+            cliSource: { workspaceId: 'folder', paneKey: 'tab:leaf' }
+          },
+          evidence: captureStructuredAgentCliSource(
+            () => [],
+            { workspaceId: 'folder', paneKey: 'tab:leaf' },
+            () => 'native-local'
+          )
+        })
+    })
+  ).rejects.toMatchObject({ refusal: { details: { reason: 'transcriptUnreadable' } } })
+  expect(find).toHaveBeenCalled()
+  find.mockClear()
   expect(await prepareAdoptedTranscript(params('claude', adoption.transcriptPath))).toMatchObject({
     ok: true
   })
@@ -200,7 +233,7 @@ it('creates from the host hook path when Claude filename differs, then checks ac
       selectedAccountHome: { variable: 'CLAUDE_CONFIG_DIR', path: root },
       launchEnv: {},
       workspaceCwd: root,
-      resolveTranscriptPath: () => escaped
+      resolveTranscriptSource: () => ({ kind: 'matched', transcriptPath: escaped })
     })
   ).rejects.toMatchObject({ refusal: { details: { reason: 'transcriptUnreadable' } } })
   admission.mockRejectedValueOnce(
@@ -215,12 +248,192 @@ it('creates from the host hook path when Claude filename differs, then checks ac
       selectedAccountHome,
       launchEnv: {},
       workspaceCwd: root,
-      resolveTranscriptPath: sourcePath
+      resolveTranscriptSource: () => ({ kind: 'matched', transcriptPath: sourcePath() })
     })
   ).rejects.toMatchObject({ refusal: { details: { reason: 'transcriptUnreadable' } } })
   expect(find).not.toHaveBeenCalled()
 })
 
+it('imports early and late Claude history with an absent locator and captured native source', async () => {
+  const transcriptPath = await file(join(root, 'projects', 'folder', `${id}.jsonl`), [
+    {
+      type: 'user',
+      uuid: 'early',
+      parentUuid: null,
+      isSidechain: false,
+      timestamp: '2026-10-29T18:00:00.000Z',
+      sessionId: id,
+      cwd: root,
+      message: { role: 'user', content: 'early Claude request' }
+    },
+    {
+      type: 'assistant',
+      uuid: 'late',
+      parentUuid: 'early',
+      isSidechain: false,
+      timestamp: '2026-10-29T18:10:00.000Z',
+      sessionId: id,
+      cwd: root,
+      message: { role: 'assistant', content: [{ type: 'text', text: 'late Claude reply' }] }
+    }
+  ])
+  const resumeFrom = {
+    providerSessionId: id,
+    cliSource: { workspaceId: 'folder', paneKey: 'tab:leaf' }
+  }
+  const evidence = captureStructuredAgentCliSource(
+    () => [],
+    resumeFrom.cliSource,
+    () => 'native-local'
+  )
+  const selectedAccountHome = { variable: 'CLAUDE_CONFIG_DIR', path: root }
+  const importer = CLAUDE_CLI_CONVERSATIONS.transcriptImport!
+  vi.spyOn(importer, 'accountHomeCandidates').mockReturnValue([selectedAccountHome])
+  const store = vi.spyOn(importer, 'conversationStore')
+  const find = vi.spyOn(importer, 'findTranscript')
+  const lookup = (captured: StructuredAgentCliSourceEvidence | undefined = evidence) =>
+    resolveStructuredAgentSessionAdoptionForCreate({
+      settings: {},
+      agent: 'claude',
+      transcriptImport: importer,
+      providerSessionId: id,
+      selectedAccountHome,
+      launchEnv: {},
+      workspaceCwd: root,
+      resolveTranscriptSource: () =>
+        structuredAgentCliSourceFromEvidence({
+          agent: 'claude',
+          workspaceId: 'folder',
+          resumeFrom,
+          evidence: captured
+        })
+    })
+  for (const captured of [
+    captureStructuredAgentCliSource(() => []),
+    captureStructuredAgentCliSource(
+      () => [],
+      resumeFrom.cliSource,
+      () => 'unknown'
+    ),
+    captureStructuredAgentCliSource(
+      () => [],
+      resumeFrom.cliSource,
+      () => {
+        throw new Error('route unreadable')
+      }
+    ),
+    captureStructuredAgentCliSource(
+      () => {
+        throw new Error('rows unreadable')
+      },
+      resumeFrom.cliSource,
+      () => 'native-local'
+    ),
+    captureStructuredAgentCliSource(
+      () => [],
+      { ...resumeFrom.cliSource, workspaceId: 'other' },
+      () => 'native-local'
+    )
+  ]) {
+    await expect(lookup(captured)).rejects.toMatchObject({
+      refusal: { details: { reason: 'transcriptUnreadable' } }
+    })
+  }
+  await expect(
+    lookup(
+      captureStructuredAgentCliSource(
+        () => [],
+        resumeFrom.cliSource,
+        () => 'unsupported'
+      )
+    )
+  ).rejects.toMatchObject({ refusal: { details: { reason: 'hostUnsupported' } } })
+  const row: AgentStatusIpcPayload = {
+    paneKey: 'tab:leaf',
+    worktreeId: 'folder',
+    agentType: 'claude',
+    state: 'waiting',
+    prompt: '',
+    connectionId: null,
+    receivedAt: 1,
+    stateStartedAt: 1,
+    providerSession: { key: 'session_id', id, transcriptPath }
+  }
+  for (const change of [
+    { providerSession: undefined },
+    { providerSession: { ...row.providerSession!, id: 'new-run' } },
+    { worktreeId: 'other' },
+    { agentType: 'codex' },
+    { connectionId: 'ssh' },
+    { structuredHost: 'owned' as const }
+  ]) {
+    await expect(
+      lookup(
+        captureStructuredAgentCliSource(
+          () => [{ ...row, ...change }],
+          resumeFrom.cliSource,
+          () => 'native-local'
+        )
+      )
+    ).rejects.toMatchObject({ refusal: { details: { reason: 'transcriptUnreadable' } } })
+  }
+  const resolve = (captured: StructuredAgentCliSourceEvidence, workspaceId = 'folder') =>
+    structuredAgentCliSourceFromEvidence({
+      agent: 'claude',
+      workspaceId,
+      resumeFrom,
+      evidence: captured
+    })
+  expect(() => resolve(evidence, 'other')).toThrow('agent_session_identity_required')
+  const routeFault = () => {
+    throw new Error('unused route failure')
+  }
+  expect(
+    resolve(
+      captureStructuredAgentCliSource(
+        () => [row, { ...row, worktreeId: 'other' }],
+        resumeFrom.cliSource,
+        routeFault
+      )
+    )
+  ).toEqual({ kind: 'matched', transcriptPath })
+  expect(
+    resolve(
+      captureStructuredAgentCliSource(
+        () => [{ ...row, providerSession: { key: 'session_id', id } }],
+        resumeFrom.cliSource,
+        routeFault
+      )
+    )
+  ).toEqual({ kind: 'matched' })
+  expect(find).not.toHaveBeenCalled()
+  const adoption = await lookup()
+  expect(resumeFrom.cliSource).toEqual({ workspaceId: 'folder', paneKey: 'tab:leaf' })
+  expect(adoption).toEqual({ accountHome: selectedAccountHome, transcriptPath })
+  expect(store).toHaveBeenCalledOnce()
+  const prepared = await prepareAdoptedTranscript(params('claude', adoption.transcriptPath))
+  expect(prepared).toMatchObject({ ok: true })
+  if (!prepared.ok) {
+    throw new Error('Claude history was not imported')
+  }
+  expect(prepared.items).toEqual(
+    expect.arrayContaining([
+      expect.objectContaining({
+        body: expect.objectContaining({
+          blocks: expect.arrayContaining([
+            expect.objectContaining({ text: 'early Claude request' })
+          ])
+        })
+      }),
+      expect.objectContaining({
+        body: expect.objectContaining({
+          blocks: expect.arrayContaining([expect.objectContaining({ text: 'late Claude reply' })])
+        })
+      })
+    ])
+  )
+})
+
 it('judges the lookup and its re-admission against one store resolved once per account', async () => {
   const transcriptPath = await file(join(root, 'projects', 'folder', `${id}.jsonl`), [])
   const importer = CLAUDE_CLI_CONVERSATIONS.transcriptImport!
@@ -259,7 +472,10 @@ it.skipIf(process.platform === 'win32')(
         selectedAccountHome: { variable: 'CLAUDE_CONFIG_DIR', path: linked },
         launchEnv: {},
         workspaceCwd: root,
-        resolveTranscriptPath: () => join(linked, 'projects', 'folder', `${id}.jsonl`)
+        resolveTranscriptSource: () => ({
+          kind: 'matched',
+          transcriptPath: join(linked, 'projects', 'folder', `${id}.jsonl`)
+        })
       })
     ).rejects.toMatchObject({ refusal: { details: { reason: 'transcriptNotFound' } } })
   }
diff --git a/src/main/runtime/rpc/dispatcher-stream-options.ts b/src/main/runtime/rpc/dispatcher-stream-options.ts
index 349c589acc01..f73bd6326623 100644
--- a/src/main/runtime/rpc/dispatcher-stream-options.ts
+++ b/src/main/runtime/rpc/dispatcher-stream-options.ts
@@ -36,7 +36,8 @@ export function rpcContextFromTransport(
   runtime: OrcaRuntimeService,
   request: RpcRequest,
   options: RpcDispatchStreamingOptions | undefined,
-  orchestrationCaller: OrchestrationSessionCaller | undefined
+  orchestrationCaller: OrchestrationSessionCaller | undefined,
+  params?: unknown
 ): RpcContext {
   return {
     runtime,
@@ -50,7 +51,11 @@ export function rpcContextFromTransport(
       : undefined,
     structuredAgentCliSourceEvidence:
       request.method === 'agentSession.create'
-        ? captureStructuredAgentCliSource(() => runtime.getAgentProviderSessionRows())
+        ? captureStructuredAgentCliSource(
+            () => runtime.getAgentProviderSessionRows(),
+            cliSourceCoordinates(params),
+            (source) => runtime.getStructuredAgentCliSourceRoute(source)
+          )
         : undefined,
     clientId: options?.clientId,
     pairedDeviceId: options?.pairedDeviceId,
@@ -71,3 +76,22 @@ export function rpcContextFromTransport(
     orchestrationCaller
   }
 }
+
+function cliSourceCoordinates(params: unknown) {
+  if (!params || typeof params !== 'object' || !('resumeFrom' in params)) {
+    return undefined
+  }
+  const resume = params.resumeFrom
+  if (!resume || typeof resume !== 'object' || !('cliSource' in resume)) {
+    return undefined
+  }
+  const source = resume.cliSource
+  return source &&
+    typeof source === 'object' &&
+    'workspaceId' in source &&
+    typeof source.workspaceId === 'string' &&
+    'paneKey' in source &&
+    typeof source.paneKey === 'string'
+    ? { workspaceId: source.workspaceId, paneKey: source.paneKey }
+    : undefined
+}
diff --git a/src/main/runtime/rpc/dispatcher.ts b/src/main/runtime/rpc/dispatcher.ts
index d6c08bacfde8..8bb2cacdc529 100644
--- a/src/main/runtime/rpc/dispatcher.ts
+++ b/src/main/runtime/rpc/dispatcher.ts
@@ -153,7 +153,7 @@ export class RpcDispatcher {
     try {
       const result = await method.handler(
         params,
-        rpcContextFromTransport(this.runtime, request, options, caller),
+        rpcContextFromTransport(this.runtime, request, options, caller, params),
         emit
       )
       recordRuntimeFeatureInteraction(
@@ -192,7 +192,7 @@ export class RpcDispatcher {
     options: RpcDispatchStreamingOptions | undefined
   ): Promise<unknown> {
     const { runtime, orchestrationMutations, legacyOrchestration } = this
-    const context = rpcContextFromTransport(runtime, request, options, caller)
+    const context = rpcContextFromTransport(runtime, request, options, caller, params)
     // Runtime test fakes may omit client-hosted browser routing.
     const clientHostedBrowser = await (runtime.routeClientHostedBrowserRpc?.(
       request.method,
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-adoption-replay.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-adoption-replay.test.ts
index ec0b159e9c83..cf557117e784 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-adoption-replay.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-adoption-replay.test.ts
@@ -1,7 +1,7 @@
 import type { AgentProcessVerdict } from '../../../../shared/agent-process-presence'
 import { AGENT_SESSION_CREATE_MESSAGE_RUNTIME_CAPABILITY } from '../../../../shared/agent-session-create-capabilities'
 import '../unused-default-rpc-methods.test-fixture'
-import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises'
+import { appendFile, mkdir, mkdtemp, realpath, rm, writeFile } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { dirname, join } from 'node:path'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
@@ -22,6 +22,7 @@ import { openTestJournalHostDatabase } from '../../../native-chat/agent-session-
 import { createStructuredAgentSessionLogger } from '../../../native-chat/agent-session-wire/structured-agent-session-logger'
 import { codexProviderHandle } from '../../../../shared/agent-session-provider-handle-encoding'
 import { claudeAndCodexAgents } from '../../../native-chat/agent-session-wire/structured-agent-session-adapter-router-test-support'
+import { prepareStructuredAgentSessionCreateForWorktree } from './structured-agent-session-create'
 
 const SESSION = 'session-adoption-replay'
 const THREAD = 'thread-adoption-replay'
@@ -144,7 +145,11 @@ afterEach(async () => {
 })
 
 describe('committed adopting create RPC replay', () => {
-  it.each([true, false])('captures source before routing (unary=%s)', async (unary) => {
+  it.each([
+    [true, false],
+    [false, false],
+    [true, true]
+  ] as const)('captures source before routing (unary=%s, absent=%s)', async (unary, absent) => {
     const originalHome = join(root, 'account-original')
     const driftedHome = join(root, 'account-drifted')
     const transcriptPath = join(
@@ -168,6 +173,16 @@ describe('committed adopting create RPC replay', () => {
       })}\n`,
       'utf8'
     )
+    if (absent) {
+      await appendFile(
+        transcriptPath,
+        `${JSON.stringify({
+          type: 'response_item',
+          timestamp: '2026-09-06T18:10:01.000Z',
+          payload: { type: 'message', role: 'assistant', content: 'late adopted history' }
+        })}\n`
+      )
+    }
 
     let selectedHome = originalHome
     const selectAccountHome = vi.fn(() => selectedHome)
@@ -212,6 +227,7 @@ describe('committed adopting create RPC replay', () => {
     const sourceRows = vi
       .spyOn(runtime, 'getAgentProviderSessionRows')
       .mockImplementation(() => rows)
+    const sourceRoute = vi.spyOn(runtime, 'getStructuredAgentCliSourceRoute')
     // The structured surface is settings-gated for every caller, not just mobile; this test
     // probes durable-identity replay, which only runs once the gate admits the call.
     // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: The RPC gate reads only this setting from the test double.
@@ -306,8 +322,9 @@ describe('committed adopting create RPC replay', () => {
     writerVerdict = 'exited'
     const params = createParams()
 
+    // absent row with proven local history now imports (Continue after exit); invalid source still refuses
     rows = unary
-      ? []
+      ? [{ ...sourceRow, providerSession: undefined }]
       : [{ ...sourceRow, providerSession: { ...sourceRow.providerSession, id: 'replaced' } }]
     const route = vi
       .spyOn(runtime, 'routeClientHostedBrowserRpc')
@@ -321,7 +338,42 @@ describe('committed adopting create RPC replay', () => {
     })
     expect(sessionAdapter.acquire).not.toHaveBeenCalled()
     expect(internal.publishStructuredAgentSessionTab).not.toHaveBeenCalled()
+    if (absent) {
+      rows = []
+      const source = params.resumeFrom.cliSource
+      const binding = { tabId: 'tab-source', leafId: SOURCE_LEAF, incarnationId: 'i1' }
+      expect(runtime.getStructuredAgentCliSourceRoute(source)).toBe('native-local')
+      runtime.registerPty('source-pty', WORKSPACE, null, binding, true)
+      expect(runtime.getStructuredAgentCliSourceRoute(source)).toBe('unsupported')
+      runtime.registerPty('source-pty', WORKSPACE, 'ssh', binding, false)
+      expect(runtime.getStructuredAgentCliSourceRoute(source)).toBe('unsupported')
+      runtime.registerPty('source-pty', WORKSPACE, null, binding, false)
+      expect(runtime.getStructuredAgentCliSourceRoute({ ...source, paneKey: 'missing' })).toBe(
+        'unknown'
+      )
+      expect(() =>
+        runtime.getStructuredAgentCliSourceRoute({ ...source, workspaceId: 'other' })
+      ).toThrow('terminal_not_found')
+      const direct = {
+        runtime,
+        ensureHost: async () => host,
+        envelope: params.envelope,
+        worktree: params.worktree,
+        agent: params.agent,
+        caller: { callerKey: CLIENT.clientId },
+        resumeFrom: params.resumeFrom
+      }
+      sourceRoute.mockClear()
+      const prepared = await prepareStructuredAgentSessionCreateForWorktree(direct)
+      expect(prepared.attachParams.adopt?.transcriptPath).toBe(await realpath(transcriptPath))
+      expect(sourceRoute).toHaveBeenCalledOnce()
+      sourceRoute.mockClear()
+      const intent = await runtime.resolveStructuredAgentSessionCreateIntent(direct)
+      expect(intent.adopt?.transcriptPath).toBe(await realpath(transcriptPath))
+      expect(sourceRoute).toHaveBeenCalledOnce()
+    }
     selectAccountHome.mockClear()
+    sourceRoute.mockClear()
     const entered = Promise.withResolvers<void>()
     const release = Promise.withResolvers<void>()
     route.mockImplementationOnce(async () => {
@@ -331,6 +383,10 @@ describe('committed adopting create RPC replay', () => {
     })
     const pending = call(dispatcher, params, CLIENT, unary)
     await entered.promise
+    expect(sourceRoute).toHaveBeenCalledOnce()
+    if (absent) {
+      runtime.onPtyExit('source-pty', 0)
+    }
     if (unary) {
       rows = []
     } else {
@@ -343,6 +399,7 @@ describe('committed adopting create RPC replay', () => {
       ok: true,
       result: { ok: false, refusal: { code: 'agent_session_operation_unknown' } }
     })
+    expect(sourceRoute).toHaveBeenCalledOnce()
     expect(store.getRecord(SESSION)?.accountHome).toMatchObject({ path: originalHome })
     await rm(transcriptPath)
     selectedHome = driftedHome
@@ -357,7 +414,8 @@ describe('committed adopting create RPC replay', () => {
       return []
     })
 
-    expect(await call(dispatcher, params)).toMatchObject({
+    const replay = await call(dispatcher, params)
+    expect(replay).toMatchObject({
       ok: true,
       result: {
         ok: true,
@@ -377,6 +435,9 @@ describe('committed adopting create RPC replay', () => {
         }
       }
     })
+    if (absent) {
+      expect(JSON.stringify(replay)).toContain('late adopted history')
+    }
     expect(sessionAdapter.acquire).toHaveBeenCalledTimes(1)
     expect(internal.publishStructuredAgentSessionTab).toHaveBeenCalledTimes(2)
     expect(selectAccountHome).toHaveBeenCalledTimes(1)
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-create.ts b/src/main/runtime/rpc/methods/structured-agent-session-create.ts
index 69394a2d4295..21dd8680ce76 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-create.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-create.ts
@@ -92,7 +92,11 @@ export async function prepareStructuredAgentSessionCreateForWorktree(args: {
   const structuredAgentCliSourceEvidence =
     args.structuredAgentCliSourceEvidence ??
     (args.resumeFrom?.cliSource
-      ? captureStructuredAgentCliSource(() => args.runtime.getAgentProviderSessionRows())
+      ? captureStructuredAgentCliSource(
+          () => args.runtime.getAgentProviderSessionRows(),
+          args.resumeFrom.cliSource,
+          (source) => args.runtime.getStructuredAgentCliSourceRoute(source)
+        )
       : undefined)
   // Adoption replay may need the record loaded from disk before source discovery can be skipped.
   let host = args.resumeFrom ? await args.ensureHost() : null
diff --git a/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts b/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts
index 5fe9dd7b78df..9692e8912c7a 100644
--- a/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts
+++ b/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts
@@ -24,8 +24,29 @@ import {
 import type { AgentSessionRecord } from '../../../shared/agent-session-record'
 import { CLI_CONVERSATION_ADOPTING_AGENTS } from '../../../shared/structured-agent-cli-conversation-adoption'
 import { recordConversationKey } from '../../native-chat/structured-conversation-key'
+import type { StructuredAgentCliSourceRoute } from '../../native-chat/structured-agent-cli-source'
 
 export abstract class OrcaRuntimeWithStructuredSessionCliWriterHost extends OrcaRuntimeWithGetWorktreePs {
+  getStructuredAgentCliSourceRoute(source: {
+    workspaceId: string
+    paneKey: string
+  }): StructuredAgentCliSourceRoute {
+    const pty = this.getPtyRecordForPaneKey(source.paneKey)
+    if (!pty) {
+      return 'unknown'
+    }
+    const pane = this.resolveTerminalPane(source.paneKey, source.workspaceId)
+    if (pane.ptyId !== pty.ptyId || pty.worktreeId !== source.workspaceId) {
+      return 'unknown'
+    }
+    return pty.connectionId ||
+      pty.isWsl ||
+      pty.wslDistro ||
+      pane.executionHostId !== LOCAL_EXECUTION_HOST_ID
+      ? 'unsupported'
+      : 'native-local'
+  }
+
   rememberSavedTerminalLaunchResult(ptyId: string, result: TerminalLaunchResult): void {
     const pty = this.ptysById.get(ptyId)
     if (pty && result.savedResumeDecision) {
diff --git a/src/main/runtime/session-tabs/structured-session-create-support.ts b/src/main/runtime/session-tabs/structured-session-create-support.ts
index 89ff851da06c..d7ebdc6a274c 100644
--- a/src/main/runtime/session-tabs/structured-session-create-support.ts
+++ b/src/main/runtime/session-tabs/structured-session-create-support.ts
@@ -1,6 +1,6 @@
 import {
   captureStructuredAgentCliSource,
-  structuredAgentCliSourcePathFromEvidence
+  structuredAgentCliSourceFromEvidence
 } from '../../native-chat/structured-agent-cli-source'
 import type { OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce as RestoreStructuredAgentSessionTabsOnceMethods } from './structured-session-tab-restoration'
 import { agentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
@@ -102,7 +102,11 @@ export abstract class OrcaRuntimeWithGetStructuredAgentSessionCreateSupport exte
     const structuredAgentCliSourceEvidence =
       input.structuredAgentCliSourceEvidence ??
       (input.resumeFrom?.cliSource
-        ? captureStructuredAgentCliSource(() => this.getAgentProviderSessionRows())
+        ? captureStructuredAgentCliSource(
+            () => this.getAgentProviderSessionRows(),
+            input.resumeFrom.cliSource,
+            (source) => this.getStructuredAgentCliSourceRoute(source)
+          )
         : undefined)
     const hostLaunchDirectory = isFloatingWorkspaceSelector(input.worktree)
       ? (await this.resolveRuntimeFileTarget(input.worktree)).worktree.path
@@ -198,8 +202,8 @@ export abstract class OrcaRuntimeWithGetStructuredAgentSessionCreateSupport exte
             agent: input.agent,
             transcriptImport,
             providerSessionId: resumeFrom.providerSessionId,
-            resolveTranscriptPath: () =>
-              structuredAgentCliSourcePathFromEvidence({
+            resolveTranscriptSource: () =>
+              structuredAgentCliSourceFromEvidence({
                 agent: input.agent,
                 resumeFrom,
                 workspaceId: location.workspaceId,
diff --git a/src/main/runtime/structured-agent-session-create-adoption.ts b/src/main/runtime/structured-agent-session-create-adoption.ts
index d269eae52104..bf7b01c101d4 100644
--- a/src/main/runtime/structured-agent-session-create-adoption.ts
+++ b/src/main/runtime/structured-agent-session-create-adoption.ts
@@ -6,7 +6,10 @@ import {
 import { prepareCodexAdoption } from '../native-chat/codex-adoption-preparation'
 import type { NativeCodexResumePreparation } from '../codex/codex-ai-vault-session-resume'
 import type { StructuredAgentSessionResumeSource } from '../../shared/structured-agent-session-create'
-import type { StructuredAgentCliSourceEvidence } from '../native-chat/structured-agent-cli-source'
+import type {
+  StructuredAgentCliSourceEvidence,
+  StructuredAgentCliSourceLocator
+} from '../native-chat/structured-agent-cli-source'
 import type { AgentSessionAccountHome } from '../../shared/agent-session-account-home'
 import type { AgentSessionExecutionLocation } from '../../shared/agent-session-record'
 import type {
@@ -107,11 +110,12 @@ export async function resolveStructuredAgentSessionAdoptionForCreate(input: {
   selectedAccountHome: AgentSessionAccountHome
   launchEnv: NodeJS.ProcessEnv
   workspaceCwd: string
-  resolveTranscriptPath?: () => string | undefined
+  resolveTranscriptSource?: () => StructuredAgentCliSourceLocator
   prepareCodexResume?: NativeCodexResumePreparation
 }) {
   try {
-    const transcriptPath = input.resolveTranscriptPath?.()
+    const source = input.resolveTranscriptSource?.()
+    const transcriptPath = source?.kind === 'matched' ? source.transcriptPath : undefined
     const candidates = input.transcriptImport.accountHomeCandidates(input)
     // Resolve each account store once so lookup, hook path and re-admission agree despite environment changes.
     const stores = new Map<AgentSessionAccountHome, string | null>()
@@ -145,6 +149,7 @@ export async function resolveStructuredAgentSessionAdoptionForCreate(input: {
     }
     const adoption = await resolveStructuredAgentSessionAdoption({
       providerSessionId: input.providerSessionId,
+      ...(source?.kind === 'absent' ? { exhaustionReason: 'transcriptUnreadable' as const } : {}),
       candidateAccountHomes: admitted ? [admitted.accountHome] : candidates,
       resolveTranscript: async (args) => {
         const exact = admitted?.path

From 3e641706ed281670655a552af1180b78d2982395 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Thu, 29 Oct 2026 21:24:18 -0700
Subject: [PATCH 111/207] Unify same-conversation switching and preserve user
 selection

---
 .../check-e2e-typecheck-ratchet.test.mjs      |   1 -
 .../check-layout-writer-ratchets.test.mjs     |  11 -
 ...ile-session-tab-application-launch.test.ts |  35 +-
 package.json                                  |   2 +-
 pnpm-lock.yaml                                |  25 -
 .../managed-hook-stdin-lifecycle.test.ts      |  37 +-
 .../structured-session-ownership.test.ts      |  42 +-
 .../ai-vault/structured-session-ownership.ts  |   5 +-
 .../daemon/daemon-client-rpc-request.test.ts  |  23 -
 ...apter-switch-compatibility.test-fixture.ts | 129 ---
 .../daemon-pty-spawn-preparations.test.ts     |  18 -
 ...on-server-async-spawn-cancellation.test.ts | 541 +-----------
 ...emon-server-native-failure.test-fixture.ts | 200 ++---
 ...n-final-checkpoint-caller-deadline.test.ts |  17 -
 .../native-pty-spawn-windows.test.ts          |  51 --
 src/main/daemon/session.test.ts               |  78 --
 .../pty/runtime/kill-same-id-respawn.test.ts  |  17 -
 src/main/ipc/pty/spawn-commit-binding.test.ts |  75 --
 src/main/ipc/pty/spawn-commit-binding.ts      |  57 +-
 ...red-agent-session-at-rest-catch-up.test.ts | 186 ----
 ...red-agent-session-conversation-lifetime.ts |   7 +-
 ...ured-agent-session-create-adoption.test.ts | 283 +++----
 ...uctured-agent-session-current-work.test.ts |   1 -
 ...on-switch-command-ordinary.test-fixture.ts | 143 ----
 ...ent-session-switch-command.test-fixture.ts | 169 ----
 ...tured-agent-session-switch-command.test.ts | 798 ------------------
 ...tructured-agent-session-switch-commands.ts |  10 +-
 ...ctured-agent-session-switch-import.test.ts | 676 +--------------
 ...session-switch-reservation.test-fixture.ts |  60 --
 ...gent-session-switch-socket.test-fixture.ts | 133 ---
 ...ructured-agent-session-switch-stop.test.ts |  68 --
 ...nt-session-terminal-writer-acquire.test.ts | 258 +-----
 .../structured-provider-session-ownership.ts  |   5 +-
 .../original-terminal-close-store.test.ts     |  46 -
 ...agent-foreground-process-real-rows.test.ts |  18 -
 .../local-pty-provider-shutdown.test.ts       |  11 -
 .../local-pty-switch-cleanup.test.ts          | 156 ----
 .../agent-session-inventory-scale.test.ts     |   4 +-
 .../agent-session-tab-layout-queue.test.ts    |  29 -
 ...gent-session-reservation-admission.test.ts |  19 +-
 .../agent-session-reservation-admission.ts    |  20 +-
 .../runtime/bind-first-pane.test-fixture.ts   |   7 +-
 ...rminal-create-host-session-binding.test.ts |  21 -
 .../runtime/client-session-tab-selection.ts   |  22 +
 .../mobile-session-switch-placement.test.ts   | 147 ----
 ...ca-runtime-original-terminal-close.test.ts | 194 -----
 ...ctured-agent-session-create-intent.test.ts |  69 ++
 ...-runtime-terminal-close-continuity.test.ts |  32 -
 ...-runtime-terminal-rename-retention.test.ts |   5 +-
 ...a-runtime-terminal-split-authority.test.ts |  23 +-
 .../orca-runtime-test-fixtures.spec.ts        |   3 +-
 .../mobile-session-tabs-part-09.spec.ts       |   3 +-
 .../orchestration/chat-assignee.test.ts       |  43 +-
 .../structured-worker-switch-stop.test.ts     |   2 -
 .../profile-session-store.test-fixture.ts     |   9 +-
 ...der-mobile-resume-adoption-scaling.test.ts | 158 ----
 .../qoder-mobile-resume-adoption.test.ts      | 238 ------
 .../cli-runtime-boundary.test.ts              | 328 +------
 ...ured-agent-session-adoption-replay.test.ts |  11 +-
 ...red-agent-session-switch-execution.test.ts | 284 ++-----
 ...ructured-agent-session-switch-execution.ts |  31 +-
 ...red-agent-session-switch-generated.test.ts | 476 -----------
 .../structured-agent-session-switch-source.ts |  28 +-
 ...agent-session-switch-terminal-execution.ts |   2 +-
 ...structured-agent-session-switch-to-chat.ts |   5 +-
 ...runtime-fake-spawn-binding.test-fixture.ts |  25 +-
 src/main/runtime/runtime-layout-apply.test.ts |  40 +-
 .../runtime/runtime-pane-admission.test.ts    |  14 +-
 .../runtime/runtime-worktree-ps-activity.ts   |   2 +-
 ...form-mobile-session-pty-records-refresh.ts |   3 +
 .../headless-pane-move-to-new-tab.ts          |   1 +
 .../session-tabs/headless-tab-properties.ts   |   3 +
 .../headless-terminal-tab-close.ts            |   3 +
 .../main-layout-agent-launch-tabs.test.ts     | 152 +---
 .../main-layout-agent-launch-tabs.ts          |  16 +-
 ...session-tab-open-placement-scaling.test.ts | 204 -----
 .../structured-session-create-support.ts      |  34 +-
 ...uctured-session-switch-publication.test.ts | 522 ------------
 .../structured-session-tab-restoration.ts     |  79 +-
 .../structured-agent-cli-writers.test.ts      |  26 -
 ...tructured-agent-session-create-adoption.ts |  34 +-
 ...ent-session-windowless-layout-host.test.ts | 162 +---
 ...red-chat-dispatch-worker-lifecycle.test.ts |  57 --
 .../runtime/terminal/focus/focus-terminal.ts  |   3 +
 .../mobile-terminal-create-reconciliation.ts  |   4 +-
 .../terminal/launch/mobile-terminal-create.ts |  29 +
 .../launch/mobile-terminal-owned-create.ts    |  51 +-
 .../mobile-terminal-switch-publication.ts     |   2 +
 .../bind-first-registration-census.test.ts    |   2 +-
 .../startup/workspace-agent-startup.ts        |  82 ++
 .../workspaces/workspace-activation.ts        |  88 +-
 .../BrowserPaneOverlayLayer.tsx               |   6 +-
 .../dashboard/reveal-dashboard-agent.ts       |   2 +
 .../editor/check-annotation-open.ts           |   2 +
 .../EmulatorPaneOverlayLayer.tsx              |   6 +-
 .../use-floating-terminal-create-actions.ts   |   5 +
 .../native-chat/NativeChatPaneHeader.test.tsx |  43 +-
 .../NativeChatResumeInCliButton.tsx           |  62 +-
 ...ucturedSession.history-read-state.test.tsx | 133 +--
 ...StructuredAgentSessionPaneOverlayLayer.tsx |   6 +-
 .../native-chat-header-ownership.test.tsx     |  45 +-
 .../native-chat-session-transport.test.ts     |  22 -
 .../use-native-chat-toggle-shortcut.ts        |   2 +
 .../components/quick-open-file-navigation.ts  |   2 +
 .../right-sidebar/AiVaultVirtualRow.test.tsx  | 201 +----
 .../ai-vault-history-native-return.test.tsx   | 153 +---
 .../ai-vault-original-pane-actions.ts         |   3 +
 .../ai-vault-session-in-place-switch.ts       |  15 +-
 .../ai-vault-session-launch-actions.test.ts   |  29 -
 .../ai-vault-session-launch-actions.ts        |   4 +
 .../ai-vault-session-launch-feedback.ts       |  13 +-
 .../ai-vault-session-resume-in-chat-launch.ts |  16 +-
 ...-vault-session-resume-in-chat-workspace.ts |   3 +-
 .../use-right-sidebar-tab-routing.ts          |   2 +
 .../right-sidebar/useFileExplorerHandlers.ts  |   2 +
 .../sidebar/WorkspaceAttachmentOrigins.tsx    |   2 +
 .../components/sidebar/WorktreeCardAgents.tsx |   2 +
 .../sidebar/activate-retained-agent-row.ts    |   2 +
 .../status-bar/resource-session-navigation.ts |   2 +
 .../status-bar/use-resource-usage-actions.ts  |   3 +
 .../tab-bar/cli-chat-resume-feedback.ts       |  18 +-
 .../cli-chat-resume-ordinary-feedback.ts      |  88 ++
 .../tab-bar/cli-chat-resume-ordinary-run.ts   | 192 +++++
 .../tab-bar/cli-chat-resume-run.test.ts       | 761 ++++++++++++++---
 .../components/tab-bar/cli-chat-resume-run.ts |  77 +-
 .../tab-bar/cli-chat-resume-source.ts         |   4 +-
 .../cli-chat-resume-transport.test-fixture.ts |  23 -
 .../tab-bar/native-chat-cli-fork-run.test.ts  |  32 +-
 .../tab-bar/native-chat-cli-fork-run.ts       |  15 +-
 .../native-chat-cli-switch-run.test.ts        |  82 +-
 .../tab-bar/native-chat-cli-switch-run.ts     |  84 +-
 .../tab-session-history-switch.parity.test.ts |  72 +-
 .../tab-session-history-switch.test.ts        |  81 +-
 .../tab-bar/tab-session-history-switch.ts     |  21 +-
 .../tab-bar/use-tab-bar-item-actions.ts       |  23 +-
 .../tab-group/tab-drag-drop-commit.ts         |   4 +
 .../tab-group-layout-owner-commands.ts        |   4 +
 .../useTabGroupActivationCommands.ts          |   5 +
 .../tab-group/useTabGroupCreationCommands.ts  |   8 +
 .../tab-group/useTabGroupWorkspaceModel.ts    |   2 +
 .../TerminalPaneOverlayLayer.tsx              |   6 +-
 ...alPaneResumeInChatButton.held-job.test.tsx |  71 +-
 .../TerminalPaneResumeInChatButton.test.tsx   |  48 +-
 .../pane-foreground-agent-tracker.test.ts     |  42 -
 .../terminal-file-open-routing.ts             |   2 +
 .../terminal-pane/terminal-handle-links.ts    |   2 +
 ...al-presentation-retirement.test-fixture.ts |  29 +-
 .../terminal-presentation-retirement.test.ts  | 339 --------
 .../use-terminal-pane-chat-state.ts           |   3 +
 .../use-terminal-activation-actions.ts        |   4 +
 .../components/use-terminal-create-actions.ts |   4 +
 .../floating-workspace-reveal-routing.test.ts |  74 --
 .../ipc-events/session-tab-ipc-bridge.ts      |   3 +-
 ...minal-request-ipc-bridge-placement.test.ts |  44 -
 .../terminal-ui-routing-ipc-bridge.ts         |  17 +-
 src/renderer/src/hooks/ipc-tab-switch.ts      |   3 +
 ...seIpcEvents-agent-conversation-cap.test.ts | 436 ----------
 ...ents-agent-status-batch-projection.test.ts | 112 ---
 ...Events-agent-status-owner-ordering.test.ts | 288 -------
 .../activate-ai-vault-structured-session.ts   |  44 +-
 .../lib/agent-launch-pane-ordinary-verdict.ts |  75 ++
 ...nt-launch-pane-verdict-application.test.ts |  56 +-
 .../agent-launch-pane-verdict-application.ts  |  10 +
 .../lib/agent-launch-tab-main-written.test.ts |  77 +-
 .../src/lib/agent-launch-tab-main-written.ts  |  28 +-
 .../src/lib/agent-launch-tab-presentation.ts  |  14 +
 .../lib/agent-launch-tab-publication.test.ts  | 255 +-----
 .../src/lib/agent-launch-tab-publication.ts   |  16 +
 ...ured-agent-session-provisional-tab.test.ts |  35 +-
 ...tructured-agent-session-provisional-tab.ts |  29 +-
 ...structured-agent-session-tab-activation.ts |  26 +-
 .../lib/conversation-surface-switch.test.tsx  | 478 ++---------
 .../src/lib/conversation-surface-switch.ts    |  42 +-
 .../src/lib/conversation-switch-legacy.ts     |  14 +-
 .../conversation-switch-presentation.test.tsx | 149 +---
 .../conversation-switch-result-selection.ts   |   3 +-
 .../src/lib/conversation-switch-selection.ts  |   9 +-
 .../src/lib/conversation-switch-state.ts      |  14 +
 .../src/lib/in-place-switch-support.test.tsx  | 191 -----
 .../lib/launch-ai-vault-session-and-reveal.ts |  14 +-
 .../launch-ai-vault-session-placement.test.ts |  45 +
 .../src/lib/launch-ai-vault-session.test.ts   |  23 -
 .../src/lib/launch-ai-vault-session.ts        |  22 +-
 .../launch-structured-agent-session.test.ts   |  47 --
 .../client-hosted-browser-row-state.ts        |   2 +
 .../lib/simulator-tab-palette-activation.ts   |   2 +
 ...structured-agent-session-launch-surface.ts |  19 +-
 ...t-session-tab-open-through-layout-owner.ts |   6 +
 src/renderer/src/lib/tab-number-shortcuts.ts  |   2 +
 .../src/lib/viewer-selection-request.ts       | 154 ++++
 .../src/lib/workspace-switch-user-act.ts      |   2 +
 .../lib/workspace-tab-palette-activation.ts   |   2 +
 .../lib/worktree-activation-pty-inventory.ts  |   8 +
 src/renderer/src/lib/worktree-activation.ts   |  12 +-
 .../snapshot-apply.ts                         |  12 +-
 .../src/runtime/runtime-rpc-client.test.ts    |  58 --
 .../session-tab-open-placement.test.ts        | 523 ------------
 .../structured-agent-session-client.test.ts   |  16 -
 .../runtime/web-runtime-session-snapshot.ts   |   4 +-
 ...session-terminal-workspace-routing.test.ts | 136 ---
 .../web-runtime-terminal-create-operation.ts  |  23 +-
 .../runtime/web-runtime-terminal-creation.ts  |  13 +-
 ...-runtime-terminal-switch-placement.test.ts | 298 ++++++-
 .../web-session-tabs-sync/apply-snapshot.ts   |  14 +-
 .../global-session-inventory-event.ts         |   5 +-
 .../web-session-tabs-sync/load-initial.ts     |   5 +-
 .../open-placement-read.ts                    |  12 +-
 .../open-placement-selection.ts               |  54 +-
 .../web-session-tabs-sync/snapshot-api.ts     |  21 +-
 .../runtime/web-session-tabs-sync/state.ts    |   6 +
 .../web-session-tabs-sync/store-patch.ts      |  48 +-
 .../visibility-resume-repair.ts               |   6 +-
 .../workspace-layout-frame-open-selection.ts  |   8 +-
 .../runtime/workspace-layout-frame-pending.ts |  29 +-
 .../runtime/workspace-layout-frame-startup.ts |  18 +
 .../workspace-layout-frame-sync.test.ts       | 265 +++---
 .../runtime/workspace-layout-frame-sync.ts    |  59 +-
 .../slices/browser/browser-tab-actions.ts     |   2 +
 .../actions/markdown-preview-actions.ts       |   2 +
 src/renderer/src/store/slices/settings.ts     |   2 +
 .../store/slices/tabs/moved-tab-selection.ts  |   6 +-
 .../store/slices/tabs/tabs-close-actions.ts   |   2 +
 .../slices/ui/ui-slice-settings-actions.ts    |  11 +-
 .../store/slices/ui/ui-slice-task-actions.ts  |   2 +
 .../store/slices/ui/ui-slice-view-actions.ts  |  64 +-
 .../src/store/slices/worktree-nav-history.ts  |   2 +
 .../terminal-active-workspace-creation.ts     |   2 +
 .../src/store/terminals/terminal-tab-close.ts |   2 +
 ...workspace-layout-frame-store-patch.test.ts | 112 +--
 src/shared/agent-session-switch-execution.ts  |   2 +-
 src/shared/claimed-agent-pty-owner.test.ts    |  70 --
 ...session-tab-placement-work.test-fixture.ts |  54 --
 src/shared/session-tab-placement.ts           |   5 +
 ...-chat-resume-terminal-capture.unit.test.ts | 168 +---
 .../structured-agent-session-host-fixture.ts  |  14 +
 ...obile-terminal-session-switch.unit.test.ts | 226 ++---
 .../native-chat-switch-readable.unit.test.tsx |  59 +-
 ...ronment-switch-dispatch-clock.unit.test.ts |  30 +-
 ...minal-presentation-retirement.unit.test.ts |  49 +-
 239 files changed, 3626 insertions(+), 12972 deletions(-)
 delete mode 100644 src/main/ipc/pty/spawn-commit-binding.test.ts
 delete mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.test.ts
 delete mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-switch-command-ordinary.test-fixture.ts
 delete mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test-fixture.ts
 delete mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test.ts
 delete mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-switch-reservation.test-fixture.ts
 delete mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-switch-socket.test-fixture.ts
 delete mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-switch-stop.test.ts
 delete mode 100644 src/main/providers/local-pty-switch-cleanup.test.ts
 delete mode 100644 src/main/runtime/mobile-session-switch-placement.test.ts
 delete mode 100644 src/main/runtime/orca-runtime-original-terminal-close.test.ts
 delete mode 100644 src/main/runtime/qoder-mobile-resume-adoption-scaling.test.ts
 delete mode 100644 src/main/runtime/rpc/methods/structured-agent-session-switch-generated.test.ts
 delete mode 100644 src/main/runtime/session-tabs/session-tab-open-placement-scaling.test.ts
 delete mode 100644 src/main/runtime/session-tabs/structured-session-switch-publication.test.ts
 create mode 100644 src/main/runtime/workspaces/startup/workspace-agent-startup.ts
 create mode 100644 src/renderer/src/components/tab-bar/cli-chat-resume-ordinary-feedback.ts
 create mode 100644 src/renderer/src/components/tab-bar/cli-chat-resume-ordinary-run.ts
 delete mode 100644 src/renderer/src/components/tab-bar/cli-chat-resume-transport.test-fixture.ts
 delete mode 100644 src/renderer/src/components/terminal-pane/terminal-presentation-retirement.test.ts
 delete mode 100644 src/renderer/src/hooks/useIpcEvents-agent-conversation-cap.test.ts
 delete mode 100644 src/renderer/src/hooks/useIpcEvents-agent-status-owner-ordering.test.ts
 create mode 100644 src/renderer/src/lib/agent-launch-pane-ordinary-verdict.ts
 delete mode 100644 src/renderer/src/lib/in-place-switch-support.test.tsx
 create mode 100644 src/renderer/src/lib/viewer-selection-request.ts
 delete mode 100644 src/renderer/src/runtime/session-tab-open-placement.test.ts
 create mode 100644 src/renderer/src/runtime/workspace-layout-frame-startup.ts
 delete mode 100644 src/shared/session-tab-placement-work.test-fixture.ts

diff --git a/config/scripts/check-e2e-typecheck-ratchet.test.mjs b/config/scripts/check-e2e-typecheck-ratchet.test.mjs
index 1e593022ed16..f61be826e5c1 100644
--- a/config/scripts/check-e2e-typecheck-ratchet.test.mjs
+++ b/config/scripts/check-e2e-typecheck-ratchet.test.mjs
@@ -46,7 +46,6 @@ describe('main', () => {
   it('fails when a file gains an error, as a missing helper import does', () => {
     withBaseline('1 tests/e2e/a.spec.ts\n1 tests/e2e/helpers/b.ts\n')
     expect(main(root, undefined, OUTPUT)).toBe(1)
-    expect(console.error).toHaveBeenCalledWith(OUTPUT)
   })
 
   it('passes at the baseline and fails until a fixed file is pruned', () => {
diff --git a/config/scripts/check-layout-writer-ratchets.test.mjs b/config/scripts/check-layout-writer-ratchets.test.mjs
index 9c5be29cfbbd..126e33260120 100644
--- a/config/scripts/check-layout-writer-ratchets.test.mjs
+++ b/config/scripts/check-layout-writer-ratchets.test.mjs
@@ -52,17 +52,6 @@ describe('renderer layout writes', () => {
     expect(countLayoutWrites(src, rendererRatchet, 'a.tsx')).toBe(3)
   })
 
-  it('reads Object.hasOwn property names while retaining computed and direct writes', () => {
-    expect(
-      countLayoutWrites("Object.hasOwn(requested, 'terminalLayoutsByTabId')", rendererRatchet)
-    ).toBe(0)
-    const writes = "patch.terminalLayoutsByTabId = next; patch['terminalLayoutsByTabId'] = next"
-    expect(countLayoutWrites(writes, rendererRatchet)).toBe(2)
-    const other =
-      "Object.hasOwn('terminalLayoutsByTabId', key); other.hasOwn(state, 'terminalLayoutsByTabId'); Object.other(state, 'terminalLayoutsByTabId')"
-    expect(countLayoutWrites(other, rendererRatchet)).toBe(3)
-  })
-
   it('allows only the frozen mirror writers', () => {
     expect(rendererRatchet.allowed('src/renderer/src/store/workspace-layout-cache.ts')).toBe(true)
     expect(
diff --git a/mobile/src/session/use-mobile-session-tab-application-launch.test.ts b/mobile/src/session/use-mobile-session-tab-application-launch.test.ts
index b78060567a8b..4dff20805b0c 100644
--- a/mobile/src/session/use-mobile-session-tab-application-launch.test.ts
+++ b/mobile/src/session/use-mobile-session-tab-application-launch.test.ts
@@ -1,4 +1,4 @@
-import { createElement, type SetStateAction } from 'react'
+import { createElement } from 'react'
 import { act, create, type ReactTestRenderer } from 'react-test-renderer'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import type { RpcClient } from '../transport/rpc-client'
@@ -373,36 +373,3 @@ describe('landing on a launched tab', () => {
     expect(state.creatingTerminalRef.current).toBeNull()
   })
 })
-
-it('applies desktop retirement and replacement in host order without a phone activation', () => {
-  const { state, sendRequest } = scope(null)
-  let published: MobileSessionTab[] = []
-  state.setSessionTabs.mockImplementation((next: SetStateAction<MobileSessionTab[]>) => {
-    published = typeof next === 'function' ? next(published) : next
-  })
-  state.selectedSessionTabIdRef.current = 'C'
-  state.activeSessionTabIdRef.current = 'C'
-  state.activeHandleRef.current = null
-  const apply = mount(state)
-  const a = terminalTab('A', 'term_A')
-  const b = terminalTab('B', 'term_B')
-  const c = { ...chatTab('C', 'conversation'), agent: 'codex' as const, isActive: true }
-  const t = terminalTab('T', 'term_T', true)
-  apply(snapshot([a, c, b]))
-  expect(published.map((tab) => tab.id)).toEqual(['A', 'C', 'B'])
-  expect(state.activeSessionTabIdRef.current).toBe('C')
-  apply(snapshot([{ ...a, isActive: true }, b]))
-  expect(published.map((tab) => tab.id)).toEqual(['A', 'B'])
-  expect(state.activeSessionTabIdRef.current).toBe('A')
-  apply(snapshot([a, t, b]))
-  expect(published.map((tab) => tab.id)).toEqual(['A', 'T', 'B'])
-  expect(published.find((tab) => tab.id === state.activeSessionTabIdRef.current)).toEqual(t)
-  expect(state.setActiveSessionTabId).toHaveBeenLastCalledWith('T')
-  expect(state.activeSessionTabTypeRef.current).toBe('terminal')
-  expect(state.setActiveHandle).toHaveBeenLastCalledWith('term_T')
-  expect(state.activeHandleRef.current).toBe('term_T')
-  expect(state.subscribeToTerminal).toHaveBeenLastCalledWith('term_T')
-  expect(state.unsubscribeTerminal).toHaveBeenCalledWith('term_A')
-  expect(state.selectedSessionTabIdRef.current).toBe('C')
-  expect(activations(sendRequest)).toEqual([])
-})
diff --git a/package.json b/package.json
index a034af5b11f4..4a6f074d5b19 100644
--- a/package.json
+++ b/package.json
@@ -384,7 +384,7 @@
   },
   "lint-staged": {
     "{*.{ts,tsx,js,jsx,mjs,mts,cts},!(cloud)/**/*.{ts,tsx,js,jsx,mjs,mts,cts}}": [
-      "oxlint --no-error-on-unmatched-pattern",
+      "oxlint",
       "oxlint --config config/oxlint-js-plugins.json",
       "ast-grep scan --config config/sgconfig.yml --min-severity warning",
       "oxlint --config config/oxlint-react-doctor.json",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index cb4d59bacdb7..8e6047af5701 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -6,9 +6,6 @@ importers:
   .:
     configDependencies: {}
     packageManagerDependencies:
-      '@pnpm/exe':
-        specifier: 12.14.0
-        version: 12.14.0
       pnpm:
         specifier: 12.14.0
         version: 12.14.0
@@ -92,11 +89,6 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@pnpm/exe@12.14.0':
-    resolution: {integrity: sha512-iZCbiKegYUapNVkZY4O8vjXt9EF/j34LbDvew6qUM5g/HrxMY38cFJaoE8+5ZWQfbt2YCsLfufI5TTh+GxUbWw==}
-    engines: {node: '>=18.*'}
-    hasBin: true
-
   pnpm@12.14.0:
     resolution: {integrity: sha512-wYum2HmT09Fky16JSPMrLAbuhUSH4GzY2GeBNC+z5btGNDZwNHEehoArqpw3vqkGzhkprQjXCITJfYAd8TOJpg==}
     engines: {node: '>=18.*'}
@@ -146,23 +138,6 @@ snapshots:
   '@pnpm/exe.win32-x64@12.14.0':
     optional: true
 
-  '@pnpm/exe@12.14.0':
-    optionalDependencies:
-      '@pnpm/exe.android-arm64': 12.14.0
-      '@pnpm/exe.android-x64': 12.14.0
-      '@pnpm/exe.darwin-arm64': 12.14.0
-      '@pnpm/exe.darwin-x64': 12.14.0
-      '@pnpm/exe.freebsd-x64': 12.14.0
-      '@pnpm/exe.linux-arm64': 12.14.0
-      '@pnpm/exe.linux-arm64-musl': 12.14.0
-      '@pnpm/exe.linux-ppc64': 12.14.0
-      '@pnpm/exe.linux-riscv64': 12.14.0
-      '@pnpm/exe.linux-s390x': 12.14.0
-      '@pnpm/exe.linux-x64': 12.14.0
-      '@pnpm/exe.linux-x64-musl': 12.14.0
-      '@pnpm/exe.win32-arm64': 12.14.0
-      '@pnpm/exe.win32-x64': 12.14.0
-
   pnpm@12.14.0:
     optionalDependencies:
       '@pnpm/exe.android-arm64': 12.14.0
diff --git a/src/main/agent-hooks/managed-hook-stdin-lifecycle.test.ts b/src/main/agent-hooks/managed-hook-stdin-lifecycle.test.ts
index 702e76715be1..35336fe612f6 100644
--- a/src/main/agent-hooks/managed-hook-stdin-lifecycle.test.ts
+++ b/src/main/agent-hooks/managed-hook-stdin-lifecycle.test.ts
@@ -201,40 +201,13 @@ function runHookProcess(
     let stderr = ''
     let stdout = ''
     const timeout = setTimeout(() => {
-      const diagnostic = JSON.stringify({
-        executable,
-        args,
-        spawnfile: child.spawnfile,
-        spawnargs: child.spawnargs,
-        inPane: Boolean(env.ORCA_PANE_KEY),
-        pid: child.pid ?? null,
-        exitCode: child.exitCode,
-        signalCode: child.signalCode,
-        killed: child.killed,
-        stdout,
-        stderr,
-        stdinErrors: stdinErrors.map(({ code, message }) => ({ code, message })),
-        stdin: {
-          destroyed: child.stdin.destroyed,
-          writableEnded: child.stdin.writableEnded,
-          writableFinished: child.stdin.writableFinished,
-          writableLength: child.stdin.writableLength,
-          writableNeedDrain: child.stdin.writableNeedDrain
-        },
-        stdoutPipe: {
-          destroyed: child.stdout.destroyed,
-          readableEnded: child.stdout.readableEnded,
-          readableLength: child.stdout.readableLength
-        },
-        stderrPipe: {
-          destroyed: child.stderr.destroyed,
-          readableEnded: child.stderr.readableEnded,
-          readableLength: child.stderr.readableLength
-        }
-      })
       child.stdin.destroy()
       child.kill('SIGKILL')
-      reject(new Error(`hook did not finish with stdin ${stdin}d\n${diagnostic}`))
+      reject(
+        new Error(
+          `hook did not finish with stdin ${stdin}d: ${executable} ${args.join(' ').slice(0, 200)}`
+        )
+      )
     }, 10_000)
     child.on('error', (error) => {
       clearTimeout(timeout)
diff --git a/src/main/ai-vault/structured-session-ownership.test.ts b/src/main/ai-vault/structured-session-ownership.test.ts
index 7c3e82d8c802..2d4c206398d8 100644
--- a/src/main/ai-vault/structured-session-ownership.test.ts
+++ b/src/main/ai-vault/structured-session-ownership.test.ts
@@ -8,12 +8,12 @@ import { setStructuredAgentSessionHost } from '../native-chat/agent-session-wire
 import {
   assertLegacyAiVaultResumeAllowed,
   assertLegacyAiVaultResumeCommandAllowed,
+  findResumeOwnership,
   OPENS_EVERY_STRUCTURED_CHAT,
   projectStructuredAiVaultSearchResponse,
   projectStructuredAiVaultSessions
 } from './structured-session-ownership'
 import type { AiVaultSearchHit, AiVaultSearchResponse } from '../../shared/ai-vault-search-types'
-import type { AiVaultPrepareSessionResumeArgs } from '../../shared/ai-vault-resume-preparation'
 import {
   codexChatHolding,
   installChats,
@@ -114,43 +114,37 @@ describe('structured AI Vault ownership', () => {
     }
   )
 
-  it('lets a terminal resume a Codex conversation once no chat may be writing it', async () => {
+  it('names the chat continuing a conversation first, while every link still refuses a terminal', async () => {
     const movedOn = codexChatHolding('session-moved', [PROVIDER_SESSION, OTHER_SESSION])
     const owned = (records: ReturnType<typeof codexChatHolding>[]) => {
       installChats(records)
       return projectStructuredAiVaultSessions(listResult(), OPENS_EVERY_STRUCTURED_CHAT).sessions[0]
         ?.structuredSession?.sessionId
     }
-    const resume: AiVaultPrepareSessionResumeArgs = {
-      agent: 'codex',
-      filePath: `/sessions/rollout-${PROVIDER_SESSION}.jsonl`,
-      codexHome: null,
-      executionHostId: 'local'
-    }
     expect(owned([movedOn, codexChatHolding('session-now', [PROVIDER_SESSION])])).toBe(
       'session-now'
     )
-    // A link the chat moved on from is the terminal's: no owner row, and the resume is admitted.
-    expect(owned([movedOn])).toBeUndefined()
-    expect(() => assertLegacyAiVaultResumeAllowed(resume)).not.toThrow()
-    // The head refuses while its lease may admit a writer, and admits once its agent provably exited.
-    installChats([codexChatHolding('session-now', [PROVIDER_SESSION])])
-    expect(() => assertLegacyAiVaultResumeAllowed(resume)).toThrow('agent_session_conflict')
-    const exited = codexChatHolding('session-now', [PROVIDER_SESSION])
-    exited.lease = {
-      ...exited.lease,
-      claimStatus: 'released',
-      ownerProcess: null,
-      reservedSpawnToken: null,
-      deathEvidence: { kind: 'exit-observed', detail: 'switched to a terminal', observedAt: 1 }
-    }
-    installChats([exited])
+    expect(owned([movedOn])).toBe('session-moved')
+    expect(
+      findResumeOwnership({ agent: 'codex', sessionId: PROVIDER_SESSION, filePath: '' })
+    ).toMatchObject({
+      sessionId: 'session-moved',
+      role: 'earlier'
+    })
+    expect(() =>
+      assertLegacyAiVaultResumeAllowed({
+        agent: 'codex',
+        filePath: `/sessions/rollout-${PROVIDER_SESSION}.jsonl`,
+        codexHome: null,
+        executionHostId: 'local'
+      })
+    ).toThrow('agent_session_conflict')
     await expect(
       assertLegacyAiVaultResumeCommandAllowed(
         `codex resume ${PROVIDER_SESSION}`,
         async () => undefined
       )
-    ).resolves.toBeUndefined()
+    ).rejects.toThrow('agent_session_conflict')
   })
 
   it('derives typed refusals from the single writer predicate for live and proving leases', async () => {
diff --git a/src/main/ai-vault/structured-session-ownership.ts b/src/main/ai-vault/structured-session-ownership.ts
index f215260e5e04..c81e38824bc0 100644
--- a/src/main/ai-vault/structured-session-ownership.ts
+++ b/src/main/ai-vault/structured-session-ownership.ts
@@ -9,7 +9,6 @@ import { getStructuredAgentSessionHost } from '../native-chat/agent-session-wire
 import { ensureStructuredAgentSessionHostUnlessRefused } from '../runtime/structured-agent-session-host-refusal'
 import {
   listStructuredProviderSessionOwnership,
-  sameIdTerminalResumeEnabled,
   terminalResumeBlocked,
   type StructuredProviderSessionOwnership
 } from '../native-chat/agent-session-wire/structured-provider-session-ownership'
@@ -131,9 +130,7 @@ function ownershipLookup():
     const found = historyRowOwners(row.agent).flatMap(
       (owner) => byProviderSession.get(`${owner}\0${row.sessionId}`) ?? []
     )
-    // An agent that switches in place lists a conversation a chat held earlier as the terminal's.
-    const earlier = found.find((ownership) => !sameIdTerminalResumeEnabled(ownership.provider))
-    return found.find((ownership) => ownership.role === 'head') ?? earlier ?? null
+    return found.find((ownership) => ownership.role === 'head') ?? found[0] ?? null
   }
 }
 
diff --git a/src/main/daemon/daemon-client-rpc-request.test.ts b/src/main/daemon/daemon-client-rpc-request.test.ts
index 146c736101cd..569b59776d5b 100644
--- a/src/main/daemon/daemon-client-rpc-request.test.ts
+++ b/src/main/daemon/daemon-client-rpc-request.test.ts
@@ -152,29 +152,6 @@ describe('requestDaemonRpc', () => {
     expect(pendingRequests.size).toBe(0)
   })
 
-  it('keeps the actual negotiated switch child result after a matched cancellation acknowledgement', async () => {
-    vi.useFakeTimers()
-    const pendingRequests = new DaemonPendingRequests()
-    const request = requestDaemonRpc({
-      // SAFETY: only the write boundary is exercised; no socket is created.
-      socket: { write: vi.fn() } as unknown as Socket,
-      pendingRequests,
-      id: 'switch-commit',
-      type: 'createOrAttach',
-      payload: { sessionId: 'actual-child', switchExecution: { phase: 'commit' } },
-      timeoutMs: 10,
-      unmatchedCancelGraceMs: 5_000,
-      onCreateCancellationFailure: vi.fn(),
-      settleCreateCancellation: vi.fn(async () => ({ canceled: true }))
-    })
-    await vi.advanceTimersByTimeAsync(10)
-    expect(pendingRequests.size).toBe(1)
-    const actual = { isNew: true, switchOutcomeUnknown: true, incarnationId: 'actual-incarnation' }
-    pendingRequests.settle({ id: 'switch-commit', ok: true, payload: actual })
-    await expect(request).resolves.toEqual(actual)
-    expect(pendingRequests.size).toBe(0)
-  })
-
   it('rejects an unmatched cancellation once the grace window elapses', async () => {
     vi.useFakeTimers()
     const pendingRequests = new DaemonPendingRequests()
diff --git a/src/main/daemon/daemon-pty-adapter-switch-compatibility.test-fixture.ts b/src/main/daemon/daemon-pty-adapter-switch-compatibility.test-fixture.ts
index f5d8dce6abb3..42872ff7e1e6 100644
--- a/src/main/daemon/daemon-pty-adapter-switch-compatibility.test-fixture.ts
+++ b/src/main/daemon/daemon-pty-adapter-switch-compatibility.test-fixture.ts
@@ -1,6 +1,4 @@
 import './mock-descendant-sweep'
-import * as transport from './daemon-client-socket-connect'
-import type { DaemonClientConnections } from './daemon-client-connections'
 import { expect, it, vi } from 'vitest'
 import { DaemonClient } from './client'
 import { DaemonPtyAdapter } from './daemon-pty-adapter'
@@ -55,131 +53,4 @@ export function registerDaemonSwitchCompatibilityTests(fixture: {
       request.mockRestore()
     }
   })
-
-  it.each(['confirmation', 'anchor', 'stale-token', 'stale-token-cleanup-loss'] as const)(
-    'chooses ordinary creation before dispatch when v54 lacks complete %s',
-    async (missing) => {
-      const connect = transport.connectDaemonSocket
-      const stale = missing.startsWith('stale-token')
-      let cleanupReplyLost = false
-      const cleanupRequests = new Set<string>()
-      let tracked: Promise<unknown> | undefined
-      const writes: {
-        type: string
-        payload?: { switchExecution?: { phase: string }; settlement?: unknown; release?: unknown }
-      }[] = []
-      vi.spyOn(transport, 'connectDaemonSocket').mockImplementation(async (...args) => {
-        const socket = await connect(...args)
-        let receiverObserved = false
-        const write = socket.write.bind(socket)
-        vi.spyOn(socket, 'write').mockImplementation(
-          (...bytes: Parameters<typeof socket.write>) => {
-            const frame = JSON.parse(String(bytes[0]))
-            writes.push(frame)
-            if (frame.type === 'cancelCreateOrAttach' && !frame.payload?.release) {
-              cleanupRequests.add(frame.id)
-            }
-            if (
-              !receiverObserved &&
-              (frame.payload?.switchExecution?.phase === 'prepare' ||
-                (stale && frame.type === 'cancelCreateOrAttach'))
-            ) {
-              receiverObserved = true
-              // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: modify only this fixture's actual authenticated response bytes.
-              const peers = (fixture.server as unknown as { connections: DaemonClientConnections })
-                .connections
-              const peer = [...peers.values()].at(-1)?.controlSocket
-              if (!peer) {
-                throw new Error('fixture peer missing')
-              }
-              const respond = peer.write.bind(peer)
-              vi.spyOn(peer, 'write').mockImplementation(
-                (...reply: Parameters<typeof peer.write>) => {
-                  const result = JSON.parse(String(reply[0]))
-                  if (stale && result.payload?.retention) {
-                    result.payload.retention = 'consumer-release-v1'
-                  }
-                  if (
-                    missing === 'stale-token-cleanup-loss' &&
-                    cleanupRequests.has(result.id) &&
-                    !cleanupReplyLost
-                  ) {
-                    cleanupReplyLost = true
-                    peer.destroy()
-                    return true
-                  }
-                  if (
-                    result.id === frame.id &&
-                    frame.payload?.switchExecution?.phase === 'prepare'
-                  ) {
-                    if (missing === 'confirmation') {
-                      delete result.payload.retention
-                    } else if (missing === 'anchor') {
-                      delete result.payload.anchor
-                    } else {
-                      result.payload.retention = 'consumer-release-v1'
-                    }
-                    return respond(`${JSON.stringify(result)}\n`)
-                  }
-                  return stale && result.payload?.retention
-                    ? respond(`${JSON.stringify(result)}\n`)
-                    : respond(...reply)
-                }
-              )
-            }
-            return write(...bytes)
-          }
-        )
-        return socket
-      })
-      const deadline = agentSessionSwitchDeadline()
-      try {
-        const spawning = fixture.adapter.spawn({
-          sessionId: 'bare-v54',
-          cols: 80,
-          rows: 24,
-          switchExecution: {
-            invocationId: 'bare-click',
-            ...deadline,
-            trackPhysical: (work) => {
-              tracked = work
-              return work
-            }
-          }
-        })
-        if (missing === 'stale-token-cleanup-loss') {
-          await expect(spawning).rejects.toThrow('Connection lost')
-          expect(cleanupReplyLost).toBe(true)
-          if (!tracked) {
-            throw new Error('known old anchor lost its ordinary settlement owner')
-          }
-          await tracked
-          // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: inspect only the owned fixture receiver's retained handoff state.
-          const receiver = fixture.server as unknown as {
-            preparations: { hasOwedOutcomes(): boolean }
-          }
-          await vi.waitFor(() => expect(receiver.preparations.hasOwedOutcomes()).toBe(false))
-          expect(writes.filter((frame) => frame.type === 'createOrAttach')).toHaveLength(1)
-          expect(fixture.server.host.listSessions()).toEqual([])
-          await expect(
-            fixture.adapter.spawn({ sessionId: 'bare-v54', cols: 80, rows: 24 })
-          ).resolves.toMatchObject({ id: 'bare-v54' })
-        } else {
-          await expect(spawning).resolves.toMatchObject({ id: 'bare-v54' })
-        }
-        expect(writes.filter((frame) => frame.type === 'createOrAttach')).toHaveLength(2)
-        expect(writes.some((frame) => frame.payload?.switchExecution?.phase === 'commit')).toBe(
-          false
-        )
-        const ordinary = writes.findLast((frame) => frame.type === 'createOrAttach')
-        expect(ordinary?.payload).not.toHaveProperty('switchExecution')
-        expect(fixture.server.host.listSessions()).toMatchObject([
-          { sessionId: 'bare-v54', isAlive: true }
-        ])
-      } finally {
-        deadline.dispose()
-        vi.restoreAllMocks()
-      }
-    }
-  )
 }
diff --git a/src/main/daemon/daemon-pty-spawn-preparations.test.ts b/src/main/daemon/daemon-pty-spawn-preparations.test.ts
index 4bbd246fc97c..b8e118e0aee0 100644
--- a/src/main/daemon/daemon-pty-spawn-preparations.test.ts
+++ b/src/main/daemon/daemon-pty-spawn-preparations.test.ts
@@ -35,21 +35,3 @@ it('rejects another connection and a reused anchor while the actual selected pre
   expect(preparations.isCanceled(selected)).toBe(false)
   preparations.finish('pane', selected)
 })
-
-it('proves no fork by fencing its exact uncommitted anchor, never from a missing preparation', async () => {
-  const preparations = new DaemonPtySpawnPreparations(async () => {})
-  const identity = { invocationId: 'click', anchor: 'prepare' }
-  expect(await preparations.settle('pane', 'connection', 'commit', identity)).toEqual({
-    outcome: 'unknown'
-  })
-  preparations.prepareSwitch('pane', 'connection', 'prepare', 'click')
-  expect(await preparations.settle('pane', 'connection', 'commit', identity)).toEqual({
-    outcome: 'exited'
-  })
-  expect(() =>
-    preparations.commitSwitch('pane', 'connection', 'late-commit', {
-      ...identity,
-      remainingMs: 1000
-    })
-  ).toThrow()
-})
diff --git a/src/main/daemon/daemon-server-async-spawn-cancellation.test.ts b/src/main/daemon/daemon-server-async-spawn-cancellation.test.ts
index 1223bd8d39af..5817e40cb4c0 100644
--- a/src/main/daemon/daemon-server-async-spawn-cancellation.test.ts
+++ b/src/main/daemon/daemon-server-async-spawn-cancellation.test.ts
@@ -10,10 +10,8 @@ import { createMockSubprocess } from './daemon-pty-adapter-test-harness'
 import { DaemonServer } from './daemon-server'
 import { DaemonPtyAdapter } from './daemon-pty-adapter'
 import * as transport from './daemon-client-socket-connect'
-import { HistoryManager } from './history-manager'
 import type { DaemonClientConnections } from './daemon-client-connections'
 import { getDaemonSocketPath } from './daemon-spawner'
-import type { CancelCreateOrAttachResult, CreateOrAttachResult } from './types'
 const nativePty = vi.hoisted(() => ({ spawn: vi.fn() }))
 vi.mock('node-pty', () => nativePty)
 
@@ -78,47 +76,20 @@ describe('daemon async spawn cancellation', () => {
     rmSync(directory, { recursive: true, force: true })
   })
 
-  it.each([
-    'healthy',
-    'release-request-lost',
-    'release-reply-lost',
-    'late-recovery',
-    'adoption-failed',
-    'construction-failed',
-    'continuing-adapter',
-    'surviving-adapter',
-    'replacement-endpoint'
-  ] as const)(
+  it.each(['healthy', 'release-reply-lost'] as const)(
     'consumes only after actual adoption and reclaims without a physical hold: %s',
     async (loss) => {
       const adapter = new DaemonPtyAdapter({
         socketPath: getDaemonSocketPath(directory),
-        tokenPath: join(directory, 'daemon.token'),
-        ...(loss === 'adoption-failed' ? { historyPath: join(directory, 'history') } : {})
+        tokenPath: join(directory, 'daemon.token')
       })
-      if (loss === 'adoption-failed') {
-        vi.spyOn(HistoryManager.prototype, 'openSession').mockRejectedValue(
-          new Error('fixture disk unavailable')
-        )
-      }
-      let successor: DaemonPtyAdapter | undefined
       let owner: { work: Promise<unknown>; recover: () => Promise<void> } | undefined
       let blocked = false
-      let releaseSent = 0
       let releaseReplyDropped = false
-      let originalReply: (() => void) | undefined
-      let lateReply: (() => void) | undefined
-      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: inspect only this fixture's receiver and adapter ownership maps.
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: inspect only this fixture's receiver connections.
       const receiver = server as unknown as {
-        preparations: { retained: Map<string, unknown> }
         connections: DaemonClientConnections
       }
-      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: read-only assertions on the actual local owners, never resolve/remove them from a test.
-      const local = adapter as unknown as {
-        switchReleaseCleanup: Map<string, unknown>
-        switchReleaseDrain?: Promise<void>
-        switchSpawnSettlements: Map<unknown, unknown>
-      }
       const connect = transport.connectDaemonSocket
       vi.spyOn(transport, 'connectDaemonSocket').mockImplementation(async (...args) => {
         if (blocked) {
@@ -138,18 +109,6 @@ describe('daemon async spawn cancellation', () => {
               vi.spyOn(peer, 'write').mockImplementation(
                 (...bytes: Parameters<typeof peer.write>) => {
                   const result = JSON.parse(String(bytes[0]))
-                  if (loss === 'late-recovery' && result.id === frame.id) {
-                    originalReply = () => {
-                      respond(...bytes)
-                    }
-                    return true
-                  }
-                  if (loss === 'late-recovery' && result.payload?.settlement) {
-                    lateReply = () => {
-                      respond(...bytes)
-                    }
-                    return true
-                  }
                   if (
                     loss === 'release-reply-lost' &&
                     !releaseReplyDropped &&
@@ -164,23 +123,6 @@ describe('daemon async spawn cancellation', () => {
                 }
               )
             }
-            if (frame.payload?.release) {
-              releaseSent++
-              if (releaseSent === 1 && frame.payload.release.outcome === 'adopted') {
-                expect(adapter.getActiveSessionIds()).toContain('receipt-pane')
-              }
-              if (
-                (loss === 'release-request-lost' ||
-                  loss === 'continuing-adapter' ||
-                  loss === 'surviving-adapter' ||
-                  loss === 'replacement-endpoint') &&
-                releaseSent === 1
-              ) {
-                blocked = true
-                socket.destroy()
-                return true
-              }
-            }
             return write(...values)
           }
         )
@@ -209,481 +151,42 @@ describe('daemon async spawn cancellation', () => {
       )
       try {
         await spawnStarted
-        if (loss === 'construction-failed') {
-          subprocess.onData = () => {
-            throw new Error('fixture subscription failed')
-          }
-          vi.mocked(subprocess.forceKill).mockImplementation(() => {
-            throw new Error('fixture close unavailable')
-          })
-        }
         releaseSpawn()
-        if (loss === 'late-recovery') {
-          await vi.waitFor(() => expect(originalReply).toBeTypeOf('function'))
-          if (!owner) {
-            throw new Error('receiver completion was not tracked')
-          }
-          const recovering = owner.recover()
-          await vi.waitFor(() => expect(lateReply).toBeTypeOf('function'))
-          originalReply!()
-          expect(await observed).toMatchObject({ result: { id: 'receipt-pane' } })
-          await owner.work
-          await vi.waitFor(() => expect(receiver.preparations.retained.size).toBe(0))
-          // The real older owned response arrives after the exact receipt has been released.
-          lateReply!()
-          await expect(recovering).resolves.toBeUndefined()
-        } else if (loss === 'adoption-failed' || loss === 'construction-failed') {
-          expect(await observed).toMatchObject({
-            error: {
-              message:
-                loss === 'adoption-failed'
-                  ? 'fixture disk unavailable'
-                  : 'fixture subscription failed'
-            }
-          })
-          expect(releaseSent).toBe(0)
-          expect(local.switchSpawnSettlements.size).toBe(1)
-          expect(receiver.preparations.retained.size).toBe(1)
-          await expect(adapter.settleSwitchWorkForReplacement()).rejects.toThrow(
-            loss === 'adoption-failed'
-              ? 'not confirmed physical completion'
-              : 'fixture close unavailable'
-          )
-          expect(local.switchSpawnSettlements.size).toBe(1)
-          if (loss === 'construction-failed') {
-            vi.mocked(subprocess.forceKill).mockImplementation(() => {
-              setTimeout(() => subprocess._simulateExit(137), 5)
-            })
-          } else {
-            subprocess._simulateExit(0)
-          }
-          if (!owner) {
-            throw new Error('receiver completion was not tracked')
-          }
-          await owner.recover()
-          await owner.work
-        } else {
-          expect(await observed).toMatchObject({ result: { id: 'receipt-pane' } })
-          if (!owner) {
-            throw new Error('receiver completion was not tracked')
-          }
-          await owner.work
-          expect(local.switchSpawnSettlements.size).toBe(0)
-          if (loss !== 'healthy') {
-            await vi.waitFor(() => expect(blocked).toBe(true))
-            await vi.waitFor(() => expect(local.switchReleaseDrain).toBeUndefined())
-            expect(local.switchReleaseCleanup.size).toBe(1)
-            expect(receiver.preparations.retained.size).toBe(
-              loss === 'release-request-lost' ||
-                loss === 'continuing-adapter' ||
-                loss === 'surviving-adapter' ||
-                loss === 'replacement-endpoint'
-                ? 1
-                : 0
-            )
-            // Physical ownership is consumed even while exact GC delivery is unavailable.
-            await expect(owner.recover()).resolves.toBeUndefined()
-            if (
-              loss === 'continuing-adapter' ||
-              loss === 'surviving-adapter' ||
-              loss === 'replacement-endpoint'
-            ) {
-              await adapter.settleSwitchWorkForReplacement()
-              successor = new DaemonPtyAdapter({
-                socketPath: getDaemonSocketPath(directory),
-                tokenPath: join(directory, 'daemon.token')
-              })
-              if (loss === 'replacement-endpoint') {
-                await server.shutdown()
-                server = new DaemonServer({
-                  socketPath: getDaemonSocketPath(directory),
-                  tokenPath: join(directory, 'daemon.token'),
-                  spawnSubprocess: () => {
-                    throw new Error('GC must never create a process')
-                  }
-                })
-                await server.start()
-              }
-              successor.inheritSwitchReleaseCleanup(adapter)
-              if (loss !== 'surviving-adapter') {
-                adapter.dispose()
-              }
-            }
-            blocked = false
-            await (successor ?? adapter).listProcesses()
-          }
-        }
-        if (loss === 'replacement-endpoint') {
-          if (!successor) {
-            throw new Error('successor missing')
-          }
-          // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: actual successor transport/outcome maps, never mutate them.
-          const replacement = server as unknown as {
-            preparations: { retained: Map<string, unknown> }
-            connections: DaemonClientConnections
-          }
-          // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: read only the successor adapter cleanup maps; tests never settle or delete physical ownership.
-          const cleanup = successor as unknown as {
-            switchReleaseCleanup: Map<string, unknown>
-            switchReleaseDrain?: Promise<void>
-          }
-          await vi.waitFor(() => expect(cleanup.switchReleaseCleanup.size).toBe(0))
-          await vi.waitFor(() => expect(cleanup.switchReleaseDrain).toBeUndefined())
-          expect(replacement.preparations.retained.size).toBe(0)
-          await vi.waitFor(() => expect(replacement.connections.size).toBe(1))
-          await successor.listProcesses()
-          await vi.waitFor(() => expect(replacement.connections.size).toBe(1))
-          expect(await successor.requestIdleRetirement()).toMatchObject({ state: 'retiring' })
-          return
+        expect(await observed).toMatchObject({ result: { id: 'receipt-pane' } })
+        if (!owner) {
+          throw new Error('receiver completion was not tracked')
         }
-        await vi.waitFor(() => expect(receiver.preparations.retained.size).toBe(0))
-        await vi.waitFor(() => expect(local.switchReleaseCleanup.size).toBe(0))
-        if (loss !== 'adoption-failed' && loss !== 'construction-failed') {
-          expect(server.host.listSessions()).toMatchObject([
-            { sessionId: 'receipt-pane', isAlive: true }
-          ])
-          expect(subprocess.forceKill).not.toHaveBeenCalled()
+        await owner.work
+        if (loss !== 'healthy') {
+          await vi.waitFor(() => expect(blocked).toBe(true))
+          blocked = false
+          await adapter.listProcesses()
+          await expect(
+            adapter.spawn({ sessionId: 'receipt-pane', cols: 80, rows: 24 })
+          ).resolves.toMatchObject({ id: 'receipt-pane', isReattach: true })
         }
+        expect(server.host.listSessions()).toMatchObject([
+          { sessionId: 'receipt-pane', isAlive: true }
+        ])
+        expect(subprocess.forceKill).not.toHaveBeenCalled()
         expect(spawned).toBe(1)
-        if (loss === 'surviving-adapter') {
-          await vi.waitFor(() => expect(receiver.connections.size).toBe(3))
-        }
-        if (
-          loss === 'release-request-lost' ||
-          loss === 'release-reply-lost' ||
-          loss === 'surviving-adapter' ||
-          loss === 'continuing-adapter'
-        ) {
-          await (successor ?? adapter).spawn({
-            sessionId: 'receipt-pane',
-            cols: 80,
-            rows: 24,
-            attachOnly: true
-          })
-        }
         const exit = vi.fn()
-        ;(successor ?? adapter).onExit(exit)
+        adapter.onExit(exit)
         subprocess._simulateExit(0)
-        if (loss !== 'adoption-failed' && loss !== 'construction-failed') {
-          await vi.waitFor(() => expect(exit).toHaveBeenCalledOnce())
-        }
-        expect(receiver.preparations.retained.size).toBe(0)
-        if (loss === 'continuing-adapter' || loss === 'surviving-adapter') {
-          if (!successor) {
-            throw new Error('successor missing')
-          }
-          client.disconnect()
-          if (loss === 'surviving-adapter') {
-            await vi.waitFor(() => expect(receiver.connections.size).toBe(2))
-            expect(await successor.requestIdleRetirement()).toMatchObject({ state: 'busy' })
-            adapter.dispose()
-          }
-          await vi.waitFor(() => expect(receiver.connections.size).toBe(1))
-          expect(await successor.requestIdleRetirement()).toMatchObject({ state: 'retiring' })
-        }
+        await vi.waitFor(() => expect(exit).toHaveBeenCalledOnce())
       } finally {
         blocked = false
         releaseSpawn()
-        originalReply?.()
-        lateReply?.()
         await observed
         subprocess?._simulateExit(0)
         await owner?.recover().catch(() => {})
         await owner?.work
-        successor?.dispose()
         adapter.dispose()
       }
     },
     15_000
   )
 
-  it('keeps owed terminal proof through ordinary graceful retirement and releases only an exact completed disposition', async () => {
-    const prepared = await client.request<{ anchor: string }>('createOrAttach', {
-      sessionId: 'owed-pane',
-      cols: 80,
-      rows: 24,
-      switchExecution: { phase: 'prepare', invocationId: 'owed-click' }
-    })
-    const release = {
-      sessionId: 'owed-pane',
-      requestId: 'not-committed',
-      release: {
-        invocationId: 'owed-click',
-        anchor: prepared.anchor,
-        endpoint: client.getDaemonIdentity()!,
-        outcome: 'exited' as const
-      }
-    }
-    expect(await client.request('cancelCreateOrAttach', release)).toMatchObject({
-      released: false,
-      canceled: false
-    })
-    expect(await client.request('shutdownIfIdle', undefined)).toMatchObject({ retiring: false })
-    const settled = await client.request('cancelCreateOrAttach', {
-      sessionId: 'owed-pane',
-      requestId: 'not-committed',
-      settlement: release.release
-    })
-    expect(settled).toMatchObject({ settlement: { outcome: 'exited' } })
-    expect(await client.request('shutdownIfIdle', undefined)).toMatchObject({ retiring: false })
-    expect(await client.request('cancelCreateOrAttach', release)).toMatchObject({
-      released: true,
-      canceled: false
-    })
-    expect(await client.request('cancelCreateOrAttach', release)).toMatchObject({ released: true })
-    expect(
-      await client.request('cancelCreateOrAttach', {
-        sessionId: 'owed-pane',
-        requestId: 'not-committed',
-        settlement: release.release
-      })
-    ).toMatchObject({ settlement: { outcome: 'unknown' } })
-    expect(await client.request('shutdownIfIdle', undefined)).toMatchObject({ retiring: true })
-  })
-
-  it.each([
-    'canceled',
-    'missing-budget',
-    'zero-budget',
-    'oversized-budget',
-    'unsupported-contract'
-  ] as const)('settles an exact refused commit with no admitted work: %s', async (refusal) => {
-    const sessionId = 'refused-switch'
-    const prepared = await client.request<{ anchor: string }>('createOrAttach', {
-      sessionId,
-      cols: 80,
-      rows: 24,
-      switchExecution: { phase: 'prepare', invocationId: 'original-click' }
-    })
-    if (refusal === 'canceled') {
-      await client.request('cancelCreateOrAttach', { sessionId, requestId: prepared.anchor })
-    }
-    let requestId = ''
-    await expect(
-      client.request(
-        'createOrAttach',
-        {
-          sessionId,
-          cols: 80,
-          rows: 24,
-          switchExecution: {
-            phase: 'commit',
-            contract: refusal === 'unsupported-contract' ? undefined : 'creation-settlement-v1',
-            invocationId: 'original-click',
-            anchor: prepared.anchor,
-            ...(refusal === 'missing-budget'
-              ? {}
-              : {
-                  remainingMs:
-                    refusal === 'zero-budget'
-                      ? 0
-                      : refusal === 'oversized-budget'
-                        ? 720_001
-                        : 60_000
-                })
-          }
-        },
-        30_000,
-        undefined,
-        (sent) => {
-          requestId = sent
-        }
-      )
-    ).rejects.toThrow('Attach canceled')
-    const settlement = {
-      sessionId,
-      requestId,
-      settlement: {
-        invocationId: 'original-click',
-        anchor: prepared.anchor,
-        endpoint: client.getDaemonIdentity()!
-      }
-    }
-    for (let repeat = 0; repeat < 2; repeat++) {
-      await expect(client.request('cancelCreateOrAttach', settlement)).resolves.toMatchObject({
-        settlement: { outcome: 'exited' }
-      })
-    }
-    expect(spawned).toBe(0)
-    expect(server.host.listSessions()).toEqual([])
-    await expect(
-      client.request('createOrAttach', {
-        sessionId,
-        cols: 80,
-        rows: 24,
-        switchExecution: {
-          phase: 'commit',
-          contract: 'creation-settlement-v1',
-          invocationId: 'original-click',
-          anchor: prepared.anchor,
-          remainingMs: 60_000
-        }
-      })
-    ).rejects.toThrow('Attach canceled')
-  })
-
-  it.each(['pre-host', 'exited', 'live-unknown', 'used', 'replaced'] as const)(
-    'rejoins the exact admitted owner and preserves physical truth: %s',
-    async (outcome) => {
-      const preHost = Promise.withResolvers<void>()
-      if (outcome === 'pre-host') {
-        preparation = preHost.promise
-      }
-      const sessionId = 'retained-switch'
-      const prepared = await client.request<{ anchor: string }>('createOrAttach', {
-        sessionId,
-        cols: 80,
-        rows: 24,
-        switchExecution: { phase: 'prepare', invocationId: 'original-click' }
-      })
-      const endpoint = client.getDaemonIdentity()!
-      let requestId = ''
-      const create = client
-        .request<CreateOrAttachResult>(
-          'createOrAttach',
-          {
-            sessionId,
-            cols: 80,
-            rows: 24,
-            switchExecution: {
-              phase: 'commit',
-              contract: 'creation-settlement-v1',
-              invocationId: 'original-click',
-              anchor: prepared.anchor,
-              remainingMs: 60_000
-            }
-          },
-          30_000,
-          undefined,
-          (sent) => {
-            requestId = sent
-          }
-        )
-        .catch(() => undefined)
-      const payload = {
-        sessionId,
-        get requestId() {
-          return requestId
-        },
-        settlement: { invocationId: 'original-click', anchor: prepared.anchor, endpoint }
-      }
-      if (outcome !== 'pre-host') {
-        await spawnStarted
-      }
-      await expect(
-        client.request('cancelCreateOrAttach', {
-          ...payload,
-          settlement: {
-            ...payload.settlement,
-            endpoint: { ...endpoint, launchNonce: 'different-endpoint' }
-          }
-        })
-      ).resolves.toMatchObject({ settlement: { outcome: 'unknown' } })
-      await expect(
-        client.request('cancelCreateOrAttach', {
-          ...payload,
-          settlement: { ...payload.settlement, invocationId: 'other-click' }
-        })
-      ).resolves.toMatchObject({ settlement: { outcome: 'unknown' } })
-
-      try {
-        if (outcome === 'used' || outcome === 'replaced') {
-          releaseSpawn()
-          const original = await create
-          expect(original?.incarnationId).toBeDefined()
-          if (outcome === 'replaced') {
-            subprocess._simulateExit(0)
-          }
-          const other = new DaemonClient({
-            socketPath: getDaemonSocketPath(directory),
-            tokenPath: join(directory, 'daemon.token')
-          })
-          try {
-            await other.ensureConnected()
-            await expect(other.request('cancelCreateOrAttach', payload)).resolves.toMatchObject({
-              settlement: { outcome: 'unknown' }
-            })
-            const current = await other.request<CreateOrAttachResult>('createOrAttach', {
-              sessionId,
-              cols: 80,
-              rows: 24
-            })
-            const protectedChild = subprocess
-            expect(await client.request('cancelCreateOrAttach', payload)).toMatchObject({
-              settlement:
-                outcome === 'used'
-                  ? { outcome: 'owned', result: { incarnationId: original?.incarnationId } }
-                  : { outcome: 'exited' }
-            })
-            expect(protectedChild.forceKill).not.toHaveBeenCalled()
-            expect(server.host.listSessions()).toMatchObject([
-              { incarnationId: current.incarnationId, isAlive: true }
-            ])
-          } finally {
-            other.disconnect()
-          }
-        } else {
-          if (outcome === 'live-unknown') {
-            subprocess.forceKill.mockImplementation(() => {
-              throw new Error('physical close unavailable')
-            })
-          }
-          let settled = false
-          const joined = client
-            .request<CancelCreateOrAttachResult>('cancelCreateOrAttach', payload)
-            .then((value) => {
-              settled = true
-              return value
-            })
-          void joined.catch(() => {})
-          await (outcome === 'pre-host'
-            ? create
-            : vi.waitFor(() => {
-                const daemon = server as unknown as DaemonServerInternals
-                expect([...(daemon.preparations.pending.get(sessionId) ?? [])][0]?.canceled).toBe(
-                  true
-                )
-              }))
-          expect(settled).toBe(false)
-          if (outcome === 'pre-host') {
-            await create
-            expect(settled).toBe(false)
-            expect(server.host.listSessions()).toEqual([])
-            preHost.resolve()
-          } else {
-            releaseSpawn()
-          }
-          expect(await joined).toMatchObject({
-            settlement: { outcome: outcome === 'live-unknown' ? 'owned' : 'exited' }
-          })
-          if (outcome === 'live-unknown') {
-            expect(server.host.listSessions()).toMatchObject([{ isAlive: true }])
-            const observedExit = vi.fn()
-            const unsubscribe = client.onEvent(observedExit)
-            subprocess._simulateExit(137)
-            await vi.waitFor(() =>
-              expect(observedExit).toHaveBeenCalledWith(
-                expect.objectContaining({ event: 'exit', sessionId })
-              )
-            )
-            unsubscribe()
-            await expect(client.request('cancelCreateOrAttach', payload)).resolves.toMatchObject({
-              settlement: { outcome: 'exited' }
-            })
-          } else {
-            expect(server.host.listSessions()).toEqual([])
-          }
-        }
-      } finally {
-        preHost.resolve()
-        releaseSpawn()
-        subprocess?._simulateExit(137)
-        await create
-      }
-    },
-    20_000
-  )
-
   it.each(['cancelCreateOrAttach', 'kill'] as const)(
     'reaps a subprocess canceled by %s during async spawn',
     async (requestType) => {
@@ -781,6 +284,7 @@ describe('daemon async spawn cancellation', () => {
     expect(subprocess.dispose).toHaveBeenCalledOnce()
   })
   registerDaemonCreationFailureTests({
+    nativePty,
     get directory() {
       return directory
     },
@@ -804,9 +308,6 @@ describe('daemon async spawn cancellation', () => {
     },
     get spawned() {
       return spawned
-    },
-    get nativePty() {
-      return nativePty
     }
   })
 })
diff --git a/src/main/daemon/daemon-server-native-failure.test-fixture.ts b/src/main/daemon/daemon-server-native-failure.test-fixture.ts
index 46e9f8c21c41..6d39e8ecd91b 100644
--- a/src/main/daemon/daemon-server-native-failure.test-fixture.ts
+++ b/src/main/daemon/daemon-server-native-failure.test-fixture.ts
@@ -7,149 +7,67 @@ import { DaemonServer } from './daemon-server'
 import { getDaemonSocketPath } from './daemon-spawner'
 import type { DaemonCreationFailureFixture } from './daemon-server-creation-failure.test-fixture'
 export function registerDaemonNativeFailureTests(fixture: DaemonCreationFailureFixture) {
-  it.each(['ordinary', 'retained'] as const)(
-    '%s authenticated native throw releases its exact logical claim/cap before same-ID retry and delivery',
-    async (mode) => {
-      fixture.client.disconnect()
-      await fixture.server.shutdown()
-      fixture.server = new DaemonServer({
-        socketPath: getDaemonSocketPath(fixture.directory),
-        tokenPath: join(fixture.directory, 'daemon.token'),
-        spawnSubprocess: createPtySubprocess,
-        preparePtySpawn: async () => {},
-        ptySpawnHealthCheck: async () => {}
+  it('ordinary authenticated native throw releases its exact logical claim/cap before same-ID retry and delivery', async () => {
+    fixture.client.disconnect()
+    await fixture.server.shutdown()
+    fixture.server = new DaemonServer({
+      socketPath: getDaemonSocketPath(fixture.directory),
+      tokenPath: join(fixture.directory, 'daemon.token'),
+      spawnSubprocess: createPtySubprocess,
+      preparePtySpawn: async () => {},
+      ptySpawnHealthCheck: async () => {}
+    })
+    await fixture.server.start()
+    await fixture.client.ensureConnected()
+    const native = mockPtyProcess(999_999_999)
+    fixture.nativePty.spawn
+      .mockReset()
+      .mockImplementationOnce(() => {
+        throw new Error('exact native no-export failure')
       })
-      await fixture.server.start()
-      await fixture.client.ensureConnected()
-      const native = mockPtyProcess(999_999_999)
-      fixture.nativePty.spawn
-        .mockReset()
-        .mockImplementationOnce(() => {
-          throw new Error('exact native no-export failure')
-        })
-        .mockReturnValue(native)
-      const payload = {
-        sessionId: 'failed-native-ordinary',
-        cols: 80,
-        rows: 24,
-        cwd: fixture.directory,
-        agentSessionEnsure: {
-          claim: {
-            digestVersion: 1 as const,
-            keyId: 'key',
-            identityDigest: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
-            worktreeScopeDigest: 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
-            agent: 'codex' as const
-          },
-          surface: {
-            worktreeId: 'worktree',
-            tabId: 'tab',
-            leafId: '11111111-1111-4111-8111-111111111111',
-            terminalHandle: 'term_native'
-          }
+      .mockReturnValue(native)
+    const payload = {
+      sessionId: 'failed-native-ordinary',
+      cols: 80,
+      rows: 24,
+      cwd: fixture.directory,
+      agentSessionEnsure: {
+        claim: {
+          digestVersion: 1 as const,
+          keyId: 'key',
+          identityDigest: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+          worktreeScopeDigest: 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+          agent: 'codex' as const
+        },
+        surface: {
+          worktreeId: 'worktree',
+          tabId: 'tab',
+          leafId: '11111111-1111-4111-8111-111111111111',
+          terminalHandle: 'term_native'
         }
       }
-      try {
-        const events: unknown[] = []
-        const remove = fixture.client.onEvent((event) => events.push(event))
-        let requestId = ''
-        const prepared =
-          mode === 'retained'
-            ? await fixture.client.request<{ anchor: string; retention: string }>(
-                'createOrAttach',
-                {
-                  ...payload,
-                  switchExecution: { phase: 'prepare', invocationId: 'native-click' }
-                }
-              )
-            : undefined
-        if (prepared) {
-          expect(prepared.retention).toBe('creation-settlement-v1')
-        }
-        await expect(
-          fixture.client.request(
-            'createOrAttach',
-            {
-              ...payload,
-              ...(prepared
-                ? {
-                    switchExecution: {
-                      phase: 'commit',
-                      contract: 'creation-settlement-v1',
-                      invocationId: 'native-click',
-                      anchor: prepared.anchor,
-                      remainingMs: 60_000
-                    }
-                  }
-                : {})
-            },
-            undefined,
-            undefined,
-            (id) => {
-              requestId = id
-            }
-          )
-        ).rejects.toThrow('exact native no-export failure')
-        if (prepared) {
-          const identity = {
-            anchor: prepared.anchor,
-            invocationId: 'native-click',
-            endpoint: fixture.client.getDaemonIdentity()!
-          }
-          expect(
-            await fixture.client.request('cancelCreateOrAttach', {
-              sessionId: payload.sessionId,
-              requestId,
-              settlement: identity
-            })
-          ).toMatchObject({
-            retention: 'creation-settlement-v1',
-            settlement: { outcome: 'failed' }
-          })
-          expect(events).toEqual([])
-          expect(
-            await fixture.client.request('cancelCreateOrAttach', {
-              sessionId: payload.sessionId,
-              requestId,
-              release: { ...identity, outcome: 'exited' }
-            })
-          ).toMatchObject({ released: false })
-          expect(
-            await fixture.client.request('cancelCreateOrAttach', {
-              sessionId: payload.sessionId,
-              requestId: 'wrong-request',
-              release: { ...identity, outcome: 'failed' }
-            })
-          ).toMatchObject({ released: false })
-          expect(
-            await fixture.client.request('cancelCreateOrAttach', {
-              sessionId: payload.sessionId,
-              requestId,
-              release: { ...identity, outcome: 'failed' }
-            })
-          ).toMatchObject({ released: true })
-        }
-        remove()
-        await vi.waitFor(() =>
-          expect(fixture.server.automaticWork.gate.snapshot().terminals).toBe(0)
-        )
-        expect(fixture.server.host.listSessions()).toEqual([])
-        expect(await fixture.client.request('createOrAttach', payload)).toMatchObject({
-          isNew: true
-        })
-        expect(fixture.nativePty.spawn).toHaveBeenCalledTimes(2)
-        expect(fixture.server.automaticWork.gate.snapshot().terminals).toBe(1)
-        await fixture.client.request('write', {
-          sessionId: payload.sessionId,
-          data: 'new ordinary input'
-        })
-        expect(native.write).toHaveBeenCalledWith('new ordinary input')
-      } finally {
-        // External native exit reaches the actual owner; never signal a fixture PID.
-        native._simulateExit(0)
-        await fixture.server.host.dispose()
-      }
-      expect(fixture.server.automaticWork.gate.snapshot().terminals).toBe(0)
     }
-  )
+    try {
+      await expect(fixture.client.request('createOrAttach', payload)).rejects.toThrow(
+        'exact native no-export failure'
+      )
+      await vi.waitFor(() => expect(fixture.server.automaticWork.gate.snapshot().terminals).toBe(0))
+      expect(fixture.server.host.listSessions()).toEqual([])
+      expect(await fixture.client.request('createOrAttach', payload)).toMatchObject({
+        isNew: true
+      })
+      expect(fixture.nativePty.spawn).toHaveBeenCalledTimes(2)
+      expect(fixture.server.automaticWork.gate.snapshot().terminals).toBe(1)
+      await fixture.client.request('write', {
+        sessionId: payload.sessionId,
+        data: 'new ordinary input'
+      })
+      expect(native.write).toHaveBeenCalledWith('new ordinary input')
+    } finally {
+      // External native exit reaches the actual owner; never signal a fixture PID.
+      native._simulateExit(0)
+      await fixture.server.host.dispose()
+    }
+    expect(fixture.server.automaticWork.gate.snapshot().terminals).toBe(0)
+  })
 }
diff --git a/src/main/daemon/daemon-shutdown-final-checkpoint-caller-deadline.test.ts b/src/main/daemon/daemon-shutdown-final-checkpoint-caller-deadline.test.ts
index 144823db18c6..110e6657858c 100644
--- a/src/main/daemon/daemon-shutdown-final-checkpoint-caller-deadline.test.ts
+++ b/src/main/daemon/daemon-shutdown-final-checkpoint-caller-deadline.test.ts
@@ -113,23 +113,6 @@ describe('STA-4228 keep-history stop bounds only the caller wait on the final ch
     rmSync(dir, { recursive: true, force: true })
   })
 
-  it('checks the execution-host inventory before an ordinary daemon kill', async () => {
-    const { id, incarnationId } = await adapter.spawn({
-      cols: 80,
-      rows: 24,
-      sessionId: 'fenced-shell',
-      cwd: '/tmp'
-    })
-    const child = subprocesses.at(-1)!
-    await expect(
-      adapter.shutdown(id, { immediate: true, expectedIncarnationId: 'earlier' })
-    ).rejects.toThrow('terminal_handle_stale')
-    expect(child.forceKill).not.toHaveBeenCalled()
-    expect(child.kill).not.toHaveBeenCalled()
-    await adapter.shutdown(id, { immediate: true, expectedIncarnationId: incarnationId })
-    expect((await adapter.listProcesses()).some((row) => row.id === id)).toBe(false)
-  })
-
   /** Wedges one session's checkpoint at the history-write layer until explicitly released. */
   function stallCheckpointFor(stalledSessionId: string): { release: () => void } {
     const manager = adapter.getHistoryManager()
diff --git a/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts b/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts
index 2c9403b536ba..bd3cb18f700f 100644
--- a/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts
+++ b/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts
@@ -95,57 +95,6 @@ describe('Windows shell fallback over node-pty ConPTY', () => {
     vi.restoreAllMocks()
   })
 
-  it('checks operation authority after loading the native module, before physical spawn', async () => {
-    let allowed = true
-    const creationWork = new TerminalCreationWork()
-    const starting = spawnNativeDaemonPty({
-      ...args,
-      creationWork,
-      assertCreateAllowed: () => {
-        if (!allowed) {
-          throw new Error('expired')
-        }
-      }
-    })
-    allowed = false
-    await expect(starting).rejects.toThrow('expired')
-    expect(nodePty.spawn).not.toHaveBeenCalled()
-    await creationWork.finish()
-    expect(await creationWork.completion).toEqual({ kind: 'no-fork' })
-  })
-
-  it('does not dispatch a fallback shell after the operation loses authority', async () => {
-    let allowed = true
-    nodePty.spawn.mockImplementation(() => {
-      allowed = false
-      throw new Error('primary refused')
-    })
-    await expect(
-      spawnNativeDaemonPty({
-        ...args,
-        assertCreateAllowed: () => {
-          if (!allowed) {
-            throw new Error('expired')
-          }
-        }
-      })
-    ).rejects.toThrow('primary refused')
-    expect(nodePty.spawn).toHaveBeenCalledOnce()
-  })
-
-  it('settles exact no-export native failure without trying another switch shell', async () => {
-    const creationWork = new TerminalCreationWork()
-    nodePty.spawn.mockImplementation(() => {
-      throw new Error('opaque native dispatch failure')
-    })
-    await expect(
-      spawnNativeDaemonPty({ ...args, creationWork, retainCanceledChild: true })
-    ).rejects.toThrow('opaque native dispatch failure')
-    await creationWork.finish()
-    expect(await creationWork.completion).toMatchObject({ kind: 'failed' })
-    expect(nodePty.spawn).toHaveBeenCalledOnce()
-  })
-
   it.each(['physical', 'exited', 'unknown'] as const)(
     'keeps every %s predecessor when a later native invocation fails',
     async (predecessor) => {
diff --git a/src/main/daemon/session.test.ts b/src/main/daemon/session.test.ts
index 407a40c39512..33fd5f6f2bc6 100644
--- a/src/main/daemon/session.test.ts
+++ b/src/main/daemon/session.test.ts
@@ -12,11 +12,6 @@ import {
   setPtyOwnerHostColors
 } from '../../shared/pty-owner-color-query-colors'
 import { createMockSubprocess } from './session-subprocess.test-fixture'
-import type * as PtyDescendantTerminationModule from '../pty-descendant-termination'
-
-const sweep = await vi.importActual<typeof PtyDescendantTerminationModule>(
-  '../pty-descendant-termination'
-)
 
 const killWithDescendantSweepMock = vi.hoisted(() => vi.fn())
 vi.mock('../pty-descendant-termination', () => ({
@@ -572,79 +567,6 @@ describe('Session', () => {
     })
   })
 
-  describe('unused owned-spawn conditional close', () => {
-    it.each(['input', 'attachment'] as const)(
-      'refuses without a signal when %s arrives during descendant capture',
-      async (change) => {
-        createSession()
-        const witness = session.captureSwitchWitness()
-        const check = session.switchCloseCondition({
-          token: witness,
-          remainingMs: 10_000,
-          ownedSpawn: true
-        })
-        const entered = Promise.withResolvers<void>()
-        const release = Promise.withResolvers<void>()
-        killWithDescendantSweepMock.mockImplementation((pid, killRoot, options) =>
-          sweep.killWithDescendantSweep(pid, killRoot, {
-            ...options,
-            platform: 'linux',
-            readTable: async () => {
-              entered.resolve()
-              await release.promise
-              return { rows: [], capturedAtMs: Date.now() }
-            }
-          })
-        )
-        const teardown = new TerminalSessionTeardown(new Map([['test-session', session]]))
-        const closing = teardown.killSession('test-session', session, true, check, true)
-        await entered.promise
-        if (change === 'input') {
-          session.write('codex\r')
-        }
-        if (change === 'attachment') {
-          session.attachClient({ onData: () => {}, onExit: () => {} })
-        }
-        release.resolve()
-        await closing
-        expect(session.isTerminating).toBe(false)
-        expect(subprocess.killed).toBe(false)
-        expect(subprocess.signals).toEqual([])
-        session.write('echo still usable\r')
-        expect(subprocess.written).toContain('echo still usable\r')
-      }
-    )
-    it('seals accepted input only after its actual close is admitted', async () => {
-      createSession()
-      const witness = session.captureSwitchWitness()
-      const check = session.switchCloseCondition({
-        token: witness,
-        remainingMs: 10_000,
-        ownedSpawn: true
-      })
-      killWithDescendantSweepMock.mockImplementation((pid, killRoot, options) =>
-        sweep.killWithDescendantSweep(pid, killRoot, {
-          ...options,
-          platform: 'linux',
-          readTable: async () => ({ rows: [], capturedAtMs: Date.now() })
-        })
-      )
-      vi.spyOn(subprocess, 'forceKill').mockImplementation(() => {
-        session.write('must not reach a closing shell\r')
-        subprocess.simulateExit(0)
-      })
-      await new TerminalSessionTeardown(new Map([['test-session', session]])).killSession(
-        'test-session',
-        session,
-        true,
-        check,
-        true
-      )
-      expect(subprocess.written).not.toContain('must not reach a closing shell\r')
-      expect(session.isAlive).toBe(false)
-    })
-  })
-
   describe('kill', () => {
     beforeEach(() => {
       killWithDescendantSweepMock.mockImplementation((_pid: number, killRoot: () => void) => {
diff --git a/src/main/ipc/pty/runtime/kill-same-id-respawn.test.ts b/src/main/ipc/pty/runtime/kill-same-id-respawn.test.ts
index 58544a8760f1..87017b1e572e 100644
--- a/src/main/ipc/pty/runtime/kill-same-id-respawn.test.ts
+++ b/src/main/ipc/pty/runtime/kill-same-id-respawn.test.ts
@@ -75,23 +75,6 @@ describe('a stop whose shutdown lands after a same-id respawn', () => {
     expect(ports.sendPtyExitToRenderer).not.toHaveBeenCalled()
   }
 
-  it('refuses a captured stop after provider startup replaced the same id', async () => {
-    const h = start()
-    const shutdown = vi.fn(async () => false)
-    const ports = {
-      ...h.ports,
-      shutdownProviderAndDetectExit: shutdown,
-      getLocalPtyProviderStartupPromise: () => Promise.resolve().then(respawn)
-    }
-    await expect(
-      stopAndWaitPtyFromRuntimeController(asControllerDeps(ports), PTY_ID, {
-        expectedIncarnationId: 'inc-stopped'
-      })
-    ).resolves.toBe(false)
-    expect(shutdown).not.toHaveBeenCalled()
-    expectRespawnUntouched(h)
-  })
-
   it('leaves the respawn alone after a runtime kill', async () => {
     const h = start()
     killPtyFromRuntimeController(asControllerDeps(h.ports), PTY_ID)
diff --git a/src/main/ipc/pty/spawn-commit-binding.test.ts b/src/main/ipc/pty/spawn-commit-binding.test.ts
deleted file mode 100644
index 7a695b60b358..000000000000
--- a/src/main/ipc/pty/spawn-commit-binding.test.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-import '../../runtime/orca-runtime-test-mocks.spec'
-import { expect, it, vi } from 'vitest'
-import {
-  fixture,
-  admitRuntimeSpawnPane
-} from '../../persistence/loading-store/profile-state-delayed-authority-fixture'
-import { LocalPtyProvider } from '../../providers/local-pty-provider'
-import type { IPtyProvider, PtySpawnResult } from '../../providers/pty-provider-contract'
-import { savePtySpawnPaneBinding } from './spawn-commit-binding'
-
-vi.mock('./provider/liveness', () => ({ finishPtyShutdown: vi.fn() }))
-const worktreeId = 'repo-local::/fixture/local'
-const tabId = '11111111-1111-4111-8111-111111111111'
-const leafId = '22222222-2222-4222-8222-222222222222'
-const incarnationId = '33333333-3333-4333-8333-333333333333'
-
-it('reconciles a dispatched child through real topology creation after a queued binding loses to newer work', async () => {
-  const { store, authority } = await fixture()
-  await admitRuntimeSpawnPane(store, { worktreeId, tabId, leafId })
-  const pause = authority.pause()
-  const newer = store.persistPtyBinding({ worktreeId, tabId, leafId, ptyId: 'B', incarnationId })
-  await pause.started.promise
-  const shutdown = vi.fn()
-  const killFenced = vi.fn(async () => ({
-    outcome: 'refused' as const,
-    reason: 'unverifiable' as const
-  }))
-  const provider: IPtyProvider = Object.assign(new LocalPtyProvider(), {
-    killFenced,
-    shutdown
-  })
-  const result: PtySpawnResult = {
-    id: 'A',
-    incarnationId,
-    switchCleanupWitness: 'captured-before-spawn-reply'
-  }
-  const saving = savePtySpawnPaneBinding(
-    {
-      result,
-      provider,
-      args: {
-        switchExecution: {
-          invocationId: 'click',
-          signal: new AbortController().signal,
-          remaining: () => 100,
-          check: () => {
-            throw new Error('revoked')
-          }
-        }
-      },
-      deps: {}
-    },
-    {
-      store,
-      binding: { worktreeId, tabId, leafId, ptyId: 'A', incarnationId },
-      refusal: 'terminal_pane_owner_changed',
-      failureLog: 'expected binding conflict'
-    },
-    null
-  )
-  pause.finish.resolve()
-  await newer
-  await saving
-  expect(shutdown).not.toHaveBeenCalled()
-  expect(killFenced).toHaveBeenCalledOnce()
-  expect(result.switchOutcomeUnknown).toBe(true)
-  const recovered = result.switchRecoveredSurface!
-  expect(recovered.tabId).not.toBe(tabId)
-  const session = store.getWorkspaceSession()
-  expect(session.terminalLayoutsByTabId?.[tabId]?.ptyIdsByLeafId?.[leafId]).toBe('B')
-  expect(
-    session.terminalLayoutsByTabId?.[recovered.tabId]?.ptyIdsByLeafId?.[recovered.leafId]
-  ).toBe('A')
-  expect(session.tabsByWorktree[worktreeId].some((row) => row.id === recovered.tabId)).toBe(true)
-})
diff --git a/src/main/ipc/pty/spawn-commit-binding.ts b/src/main/ipc/pty/spawn-commit-binding.ts
index 794eafabf8da..8b964d5e0608 100644
--- a/src/main/ipc/pty/spawn-commit-binding.ts
+++ b/src/main/ipc/pty/spawn-commit-binding.ts
@@ -105,39 +105,38 @@ export async function savePtySpawnPaneBinding(
   }
 }
 
-/** Optional runtime stores delegate the same binding write without introducing an await when absent. */
-export function persistFreshPaneBindingIfSupported(
-  store: Partial<Pick<Store, 'persistPtyBinding' | 'getWorkspaceSession'>> | null | undefined,
-  input: PersistPtyBindingArgs | (() => PersistPtyBindingArgs),
-  connectionId?: string | null
-): Promise<boolean> | undefined {
-  if (!store?.persistPtyBinding || !store.getWorkspaceSession) {
-    return undefined
-  }
-  return persistFreshPaneBinding(
-    {
-      persistPtyBinding: store.persistPtyBinding.bind(store),
-      getWorkspaceSession: store.getWorkspaceSession.bind(store)
-    },
-    input,
-    connectionId
-  )
-}
+type PaneBindingStore = Pick<Store, 'persistPtyBinding' | 'getWorkspaceSession'>
 
 /** Runs inside the existing durable mutation, after source/topology checks and before any bind. */
-export async function persistFreshPaneBinding(
-  store: Pick<Store, 'persistPtyBinding' | 'getWorkspaceSession'>,
+export function persistFreshPaneBinding(
+  store: PaneBindingStore,
   input: PersistPtyBindingArgs | (() => PersistPtyBindingArgs),
   connectionId?: string | null,
   absentOwner?: AbsentPaneBinding,
   observeAuthority?: () => void
-): Promise<boolean> {
+): Promise<boolean>
+export function persistFreshPaneBinding(
+  store: Partial<PaneBindingStore> | null | undefined,
+  input: PersistPtyBindingArgs | (() => PersistPtyBindingArgs),
+  connectionId?: string | null
+): Promise<boolean> | undefined
+export function persistFreshPaneBinding(
+  store: Partial<PaneBindingStore> | null | undefined,
+  input: PersistPtyBindingArgs | (() => PersistPtyBindingArgs),
+  connectionId?: string | null,
+  absentOwner?: AbsentPaneBinding,
+  observeAuthority?: () => void
+): Promise<boolean> | undefined {
+  if (!store?.getWorkspaceSession) {
+    return undefined
+  }
+  const getWorkspaceSession = store.getWorkspaceSession.bind(store)
   let targetChanged = false
   const hostId = connectionId ? toSshExecutionHostId(connectionId) : undefined
-  const persisted = await store.persistPtyBinding(() => {
+  const pending = store.persistPtyBinding?.(() => {
     observeAuthority?.()
     const binding = typeof input === 'function' ? input() : input
-    const session = store.getWorkspaceSession(hostId)
+    const session = getWorkspaceSession(hostId)
     const paneKey = makePaneKey(binding.tabId, binding.leafId)
     if (ptyBindingIsRefused(binding, session, binding.worktreeId, paneKey, [])) {
       return binding
@@ -154,10 +153,14 @@ export async function persistFreshPaneBinding(
     }
     return binding
   }, hostId)
-  if (targetChanged) {
-    throw new PaneOwnerContentionError()
-  }
-  return persisted
+  return pending === undefined
+    ? undefined
+    : Promise.resolve(pending).then((persisted) => {
+        if (targetChanged) {
+          throw new PaneOwnerContentionError()
+        }
+        return persisted
+      })
 }
 
 /** Only the original unused physical witness can authorize cleanup after a dispatched result. */
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.test.ts
deleted file mode 100644
index 71f5ca8ccb69..000000000000
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.test.ts
+++ /dev/null
@@ -1,186 +0,0 @@
-import { mkdtemp, rm, writeFile } from 'node:fs/promises'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import { agentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
-import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding'
-import { createTrackedJournalOpener } from '../agent-session-journal/journal-host-database-test-support'
-import { readCodexHistoryJournalView } from '../../codex/codex-history-journal-view'
-import {
-  captureSwitchStoppedCliTurn,
-  catchUpSwitchedCliTranscript
-} from './structured-agent-session-switch-import'
-import { catchUpStructuredSessionAtRest } from './structured-agent-session-at-rest-catch-up'
-
-const journals = createTrackedJournalOpener()
-let root: string
-const deadlines: ReturnType<typeof agentSessionSwitchDeadline>[] = []
-beforeEach(async () => {
-  root = await mkdtemp(join(tmpdir(), 'orca-switch-history-'))
-})
-afterEach(async () => {
-  deadlines.forEach((deadline) => deadline.dispose())
-  deadlines.length = 0
-  await journals.closeAll()
-  await rm(root, { recursive: true, force: true })
-})
-const options = () => ({
-  stateDirectory: root,
-  identity: {
-    sessionId: 'native',
-    workspaceId: 'folder',
-    hostId: 'local',
-    agent: 'codex' as const,
-    providerHandle: codexProviderHandle('019aef12-1234-7000-8000-123456789abc')
-  }
-})
-const threadId = '019aef12-1234-7000-8000-123456789abc'
-type CodexTranscriptFixturePayload =
-  | { id: string }
-  | { type: 'task_started' | 'task_complete'; turn_id: string }
-  | {
-      type: 'message'
-      role: 'user' | 'assistant'
-      content: { type: 'input_text' | 'output_text'; text: string }[]
-    }
-
-function transcript(complete: boolean) {
-  const row = (type: string, payload: CodexTranscriptFixturePayload) =>
-    JSON.stringify({
-      timestamp: '2026-10-26T12:00:00Z',
-      type,
-      payload
-    })
-  return `${[
-    row('session_meta', { id: threadId }),
-    row('event_msg', { type: 'task_started', turn_id: 'turn-cli-1' }),
-    row('response_item', {
-      type: 'message',
-      role: 'user',
-      content: [{ type: 'input_text', text: 'Continue the terminal change' }]
-    }),
-    row('response_item', {
-      type: 'message',
-      role: 'assistant',
-      content: [{ type: 'output_text', text: 'Implemented and verified.' }]
-    }),
-    ...(complete ? [row('event_msg', { type: 'task_complete', turn_id: 'turn-cli-1' })] : [])
-  ].join('\n')}\n`
-}
-async function refresh(journal: Awaited<ReturnType<typeof journals.open>>, complete: boolean) {
-  const filePath = join(root, 'rollout.jsonl')
-  await writeFile(filePath, transcript(complete))
-  const deadline = agentSessionSwitchDeadline()
-  deadlines.push(deadline)
-  return catchUpStructuredSessionAtRest({ journal, threadId, filePath, fence: 1, deadline })
-}
-it('opens native-founded CLI history without a provider, survives restart and does not duplicate a second return', async () => {
-  let journal = await journals.open(options())
-  expect(journal.historyOrigin()).toBeNull()
-  await refresh(journal, true)
-  const snapshot = journal.snapshot()
-  expect(snapshot.items.filter((item) => item.body.kind === 'message')).toHaveLength(2)
-  expect(readCodexHistoryJournalView(journal, threadId)).toMatchObject({
-    unresolvedOrigin: false,
-    importedAt: null
-  })
-  expect(readCodexHistoryJournalView(journal, threadId).known.has('turn-cli-1')).toBe(true)
-  await journal.close()
-  journal = await journals.open(options())
-  await refresh(journal, true)
-  expect(journal.snapshot()).toEqual(snapshot)
-})
-it('never turns a partially written CLI turn into covered history', async () => {
-  const journal = await journals.open(options())
-  const before = journal.snapshot()
-  await expect(refresh(journal, false)).rejects.toMatchObject({
-    refusal: { details: { reason: 'messagesUnsettled' } }
-  })
-  expect(journal.snapshot()).toEqual(before)
-  await refresh(journal, true)
-  expect(readCodexHistoryJournalView(journal, threadId).known.has('turn-cli-1')).toBe(true)
-})
-
-it.each([100, 1000])(
-  'imports a real %i-turn Codex corpus with bounded journal passes and idempotent repeat',
-  async (count) => {
-    const journal = await journals.open(options())
-    const filePath = join(root, 'scale-rollout.jsonl')
-    const turns = Array.from({ length: count }, (_, i) =>
-      transcript(true)
-        .split('\n')
-        .filter((row) => row && !row.includes('session_meta'))
-        .join('\n')
-        .replaceAll('turn-cli-1', `turn-cli-${i}`)
-    )
-    const source = `${transcript(true).split('\n')[0]}\n${turns.join('\n')}\n`
-    await writeFile(filePath, source)
-    const deadline = agentSessionSwitchDeadline()
-    deadlines.push(deadline)
-    let scanned = 0
-    const visit = journal.visitItemsWithLinkage.bind(journal)
-    const visits = vi.spyOn(journal, 'visitItemsWithLinkage').mockImplementation((callback) =>
-      visit((...args) => {
-        scanned++
-        callback(...args)
-      })
-    )
-    const started = performance.now()
-    await catchUpStructuredSessionAtRest({ journal, threadId, filePath, fence: 1, deadline })
-    const first = journal.snapshot()
-    expect(first.items.filter((item) => item.body.kind === 'message')).toHaveLength(2 * count)
-    await catchUpStructuredSessionAtRest({ journal, threadId, filePath, fence: 1, deadline })
-    expect(journal.snapshot()).toEqual(first)
-    expect(visits.mock.calls.length).toBeLessThanOrEqual(3)
-    expect(scanned).toBeLessThanOrEqual(12 * count)
-    console.info(
-      JSON.stringify({
-        scanned,
-        corpus: 'codex-at-rest',
-        turns: count,
-        bytes: Buffer.byteLength(source),
-        elapsedMs: performance.now() - started
-      })
-    )
-  }
-)
-
-it.each([false, true])(
-  'commits explicit stopped-turn evidence through import, preserving a terminal verdict=%s',
-  async (completedBeforeExit) => {
-    let journal = await journals.open(options())
-    const filePath = join(root, 'stopped.jsonl')
-    const source = { agent: 'codex' as const, sessionId: threadId, filePath }
-    const deadline = agentSessionSwitchDeadline()
-    deadlines.push(deadline)
-    await writeFile(filePath, transcript(false))
-    const stopped = await captureSwitchStoppedCliTurn(source, true, deadline)
-    expect(stopped?.turnId).toBe('turn-cli-1')
-    if (completedBeforeExit) {
-      await writeFile(filePath, transcript(true))
-    }
-    await catchUpStructuredSessionAtRest({
-      journal,
-      threadId,
-      filePath,
-      fence: 1,
-      deadline,
-      stoppedTurnId: stopped?.turnId
-    })
-    await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline, stopped })
-    const snapshot = journal.snapshot()
-    expect(
-      snapshot.items.filter((item) => item.body.kind === 'turn').map((item) => item.body)
-    ).toEqual([
-      expect.objectContaining({
-        turnId: 'turn-cli-1',
-        state: completedBeforeExit ? 'completed' : 'interrupted'
-      })
-    ])
-    expect(snapshot.items.filter((item) => item.body.kind === 'message')).toHaveLength(2)
-    await journal.close()
-    journal = await journals.open(options())
-    await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline, stopped })
-    expect(journal.snapshot()).toEqual(snapshot)
-  }
-)
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-conversation-lifetime.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-conversation-lifetime.ts
index 307b0177bb37..5ec42789dfa1 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-conversation-lifetime.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-conversation-lifetime.ts
@@ -106,10 +106,9 @@ export function createStructuredAgentSessionConversationLifetime(
     }
     const starts = sleep.workspaceSleepStartAborts(() => host.context().runtimeState, sessionId)
     // Pending creates have no record yet; their queued close waits for founding.
-    if (matches()) {
-      switchCommands.revoke(sessionId)
-    }
-    if (matches() && deps().store.getRecord(sessionId)) {
+    const matched = matches()
+    const revoked = matched && switchCommands.revoke(sessionId)
+    if ((revoked ? matches() : matched) && deps().store.getRecord(sessionId)) {
       const journal = sessions.get(sessionId)?.journal
       if (journal) {
         closeStructuredAgentSessionHandovers(journal)
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-create-adoption.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-create-adoption.test.ts
index bb4a9efa953f..e6a7c4d65e69 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-create-adoption.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-create-adoption.test.ts
@@ -1,4 +1,4 @@
-import { mkdir, realpath, rename, writeFile, rm } from 'node:fs/promises'
+import { writeFile, rm, mkdir, realpath, rename } from 'node:fs/promises'
 import { join } from 'node:path'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import {
@@ -20,9 +20,8 @@ import {
 import type { AgentSessionAttachParams } from './structured-agent-session-attach'
 import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../shared/constants'
 import { openTestJournalHostDatabase } from '../agent-session-journal/journal-host-database-test-support'
-import { adapterFor, fakeCodex } from '../../codex/codex-structured-session-adapter-fixture'
-import { createCodexStructuredLaunchResolver } from '../../runtime/structured-agent-launch-composition.test-support'
 import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding'
+
 import { writeCodexHistoryFixture } from '../agent-session-journal/codex-history-test-fixture'
 import { structuredAgentRuntimeMetadata } from '../../runtime/structured-agent-runtime-metadata'
 import {
@@ -73,144 +72,8 @@ function anotherSession(params: AgentSessionAttachParams): AgentSessionAttachPar
   })
 }
 
-it.each([
-  ['matching', THREAD],
-  ['mismatched', '019fd532-7c11-7a90-b6de-4e1a2c3d5f61']
-] as const)(
-  'resolves a selected-account rollout with %s metadata before at-rest publication',
-  async (_kind, metadataId) => {
-    vi.stubEnv('ORCA_USER_DATA_PATH', join(rig.root, 'host-data'))
-    const accountHome = { variable: 'CODEX_HOME', path: join(rig.root, 'selected-account') }
-    const sessions = join(accountHome.path, 'sessions')
-    await mkdir(sessions, { recursive: true })
-    const rollout = await writeCodexHistoryFixture(
-      sessions,
-      THREAD,
-      ['saved CLI turn'],
-      undefined,
-      metadataId
-    )
-    if (metadataId !== THREAD) {
-      // Keep filename lookup valid so the imported metadata is what refuses the mismatched source.
-      await rename(rollout.filePath, join(sessions, `rollout-2026-10-27T00-00-00-${THREAD}.jsonl`))
-    }
-    const metadata = structuredAgentRuntimeMetadata('codex')
-    if (!metadata?.transcriptImport) {
-      throw new Error('Codex transcript importer is not registered')
-    }
-    const adoption = await resolveStructuredAgentSessionAdoptionForCreate({
-      settings: {},
-      agent: 'codex',
-      transcriptImport: metadata.transcriptImport,
-      providerSessionId: THREAD,
-      selectedAccountHome: accountHome,
-      launchEnv: {},
-      workspaceCwd: rig.root,
-      prepareCodexResume: (args) =>
-        prepareCodexAiVaultSessionResume(args, {
-          runtimeHome: null,
-          systemCodexHomePath: join(rig.root, 'system-account'),
-          preparePinnedLaunchHome: async () => {
-            throw new Error('At-rest adoption must not ready a fork launch')
-          }
-        })
-    })
-    expect(adoption.accountHome).toEqual(accountHome)
-    expect(adoption.transcriptPath).toBe(
-      await realpath(join(sessions, `rollout-2026-10-27T00-00-00-${THREAD}.jsonl`))
-    )
-    const result = await rig.host.create(
-      CALLER,
-      createTestParams(undefined, {
-        accountHome: adoption.accountHome,
-        adopt: structuredAgentSessionAdoptAttach({
-          definition: metadata.definition,
-          handleNamesTranscript: metadata.transcriptImport.handleNamesTranscript,
-          conversationStore:
-            metadata.transcriptImport.conversationStore({
-              accountHome: adoption.accountHome,
-              launchEnv: {}
-            }) ?? undefined,
-          transcriptPath: adoption.transcriptPath,
-          providerSessionId: THREAD,
-          workspaceCwd: rig.root
-        })
-      })
-    )
-    expect(rig.adapter.acquire).not.toHaveBeenCalled()
-    expect(rig.adapter.dispatch).not.toHaveBeenCalled()
-    if (metadataId !== THREAD) {
-      expect(result).toMatchObject({
-        ok: false,
-        refusal: {
-          code: 'agent_session_identity_required',
-          details: { reason: 'transcriptUnreadable' },
-          createAttemptRefusedBeforeCommit: true
-        }
-      })
-      expect(rig.store.listRecords()).toEqual([])
-      expect(rig.store.listOperationRows()).toEqual([])
-      expect(rig.store.listVisibleSessionIds()).toEqual([])
-      return
-    }
-    expect(result.ok).toBe(true)
-    if (!result.ok) {
-      throw new Error('Real selected-account adoption failed')
-    }
-    const snapshot = await rig.host.journalSnapshot(SESSION)
-    expect(snapshot.items.map(({ body }) => body)).toEqual([
-      { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'saved CLI turn' }] },
-      {
-        kind: 'message',
-        role: 'assistant',
-        blocks: [{ type: 'text', text: 'saved CLI turn answer' }]
-      }
-    ])
-    expect(result.value.page.items).toEqual(snapshot.items)
-    expect(rig.store.getRecord(SESSION)?.accountHome).toEqual(accountHome)
-    expect(rig.store.getRecord(SESSION)?.providerHandleChain).toMatchObject([
-      { origin: 'adopted', mintedAtFence: 1, handle: { nativeId: THREAD } }
-    ])
-    expect(rig.store.listVisibleSessionIds()).toEqual([SESSION])
-  }
-)
-
 it('imports adoption at rest and resumes its original provider identity after its source disappears', async () => {
   const params = await adoptedParams()
-  const history = vi.fn(async () => ({ data: [], nextCursor: null }))
-  const codex = fakeCodex({
-    // Codex 0.162 answers excludeTurns resumes with metadata, not historical turns.
-    'thread/turns/list': history,
-    'thread/resume': () => ({
-      thread: { id: THREAD, turns: [] },
-      model: 'gpt-5.4',
-      reasoningEffort: 'medium'
-    }),
-    'turn/start': () => ({ turn: { id: 'new-turn' } }),
-    'model/list': () => ({
-      data: [
-        {
-          model: 'gpt-5.4',
-          supportedReasoningEfforts: [{ reasoningEffort: 'medium' }],
-          defaultReasoningEffort: 'medium',
-          isDefault: true
-        }
-      ],
-      nextCursor: null
-    })
-  })
-  const adapter = adapterFor(codex, {}, [], {
-    resolveLaunch: createCodexStructuredLaunchResolver({
-      store: {
-        getRecord: (id) => rig.store.getRecord(id),
-        pinLaunchDirectory: (...args) => rig.store.pinLaunchDirectory(...args)
-      },
-      resolveWorkspacePath: async () => rig.root,
-      resolveCommand: () => 'codex',
-      resolveLaunchArgs: () => []
-    })
-  })
-  await rig.restart({ adapter })
   expect(await rig.host.create(CALLER, params)).toMatchObject({
     ok: true,
     value: {
@@ -235,39 +98,15 @@ it('imports adoption at rest and resumes its original provider identity after it
       adopt: { providerHandle: codexProviderHandle(THREAD) }
     })
   ).toMatchObject({ ok: true, replayed: true })
-  expect(await rig.host.switchToChat(SESSION)).toEqual({ ok: true })
-  const caughtUp = await rig.host.journalSnapshot(SESSION)
-  expect(
-    caughtUp.items.filter((item) => item.body.kind === 'message' && item.body.role === 'user')
-  ).toHaveLength(1)
-  expect(codex.connections[0].calls.some((call) => call.method === 'turn/start')).toBe(false)
-  expect(await rig.host.switchToChat(SESSION)).toEqual({ ok: true })
-  expect(codex.connections).toHaveLength(1)
-  expect(codex.connections[0].calls.filter((call) => call.method === 'thread/resume')).toEqual([
-    {
-      method: 'thread/resume',
-      params: expect.objectContaining({ threadId: THREAD, excludeTurns: true })
-    }
-  ])
-  expect(
-    (await rig.host.journalSnapshot(SESSION)).items.filter(
-      (item) => item.body.kind === 'message' && item.body.role === 'user'
-    )
-  ).toHaveLength(1)
-  expect(history).toHaveBeenCalledOnce()
-  expect(
-    await rig.host.send(
-      CALLER,
-      restTestSend('new work', rig.store.getRecord(SESSION)?.lease.runtimeFence)
-    )
-  ).toMatchObject({ ok: true })
-  await vi.waitFor(() =>
-    expect(codex.connections[0].calls.filter((call) => call.method === 'turn/start')).toHaveLength(
-      1
-    )
+  expect(await rig.host.send(CALLER, restTestSend('new work'))).toMatchObject({ ok: true })
+  await vi.waitFor(() => expect(rig.adapter.dispatch).toHaveBeenCalledOnce())
+  expect(rig.adapter.acquire).toHaveBeenCalledWith(
+    expect.objectContaining({
+      identity: expect.objectContaining({
+        providerHandle: expect.objectContaining({ nativeId: THREAD })
+      })
+    })
   )
-  expect(history).toHaveBeenCalledOnce()
-  await adapter.closeAll()
   expect(rig.store.getRecord(SESSION)?.accountHome).toEqual(params.accountHome)
 })
 
@@ -428,3 +267,105 @@ it.each(['adopted', 'blank'] as const)(
     expect(rig.adapter.acquire).not.toHaveBeenCalled()
   }
 )
+
+it.each([
+  ['matching', THREAD],
+  ['mismatched', '019fd532-7c11-7a90-b6de-4e1a2c3d5f61']
+] as const)(
+  'resolves a selected-account rollout with %s metadata before at-rest publication',
+  async (_kind, metadataId) => {
+    vi.stubEnv('ORCA_USER_DATA_PATH', join(rig.root, 'host-data'))
+    const accountHome = { variable: 'CODEX_HOME', path: join(rig.root, 'selected-account') }
+    const sessions = join(accountHome.path, 'sessions')
+    await mkdir(sessions, { recursive: true })
+    const rollout = await writeCodexHistoryFixture(
+      sessions,
+      THREAD,
+      ['saved CLI turn'],
+      undefined,
+      metadataId
+    )
+    if (metadataId !== THREAD) {
+      // Keep filename lookup valid so the imported metadata is what refuses the mismatched source.
+      await rename(rollout.filePath, join(sessions, `rollout-2026-10-27T00-00-00-${THREAD}.jsonl`))
+    }
+    const metadata = structuredAgentRuntimeMetadata('codex')
+    if (!metadata?.transcriptImport) {
+      throw new Error('Codex transcript importer is not registered')
+    }
+    const adoption = await resolveStructuredAgentSessionAdoptionForCreate({
+      settings: {},
+      agent: 'codex',
+      transcriptImport: metadata.transcriptImport,
+      providerSessionId: THREAD,
+      selectedAccountHome: accountHome,
+      launchEnv: {},
+      workspaceCwd: rig.root,
+      prepareCodexResume: (args) =>
+        prepareCodexAiVaultSessionResume(args, {
+          runtimeHome: null,
+          systemCodexHomePath: join(rig.root, 'system-account'),
+          preparePinnedLaunchHome: async () => {
+            throw new Error('At-rest adoption must not ready a fork launch')
+          }
+        })
+    })
+    expect(adoption.accountHome).toEqual(accountHome)
+    expect(adoption.transcriptPath).toBe(
+      await realpath(join(sessions, `rollout-2026-10-27T00-00-00-${THREAD}.jsonl`))
+    )
+    const result = await rig.host.create(
+      CALLER,
+      createTestParams(undefined, {
+        accountHome: adoption.accountHome,
+        adopt: structuredAgentSessionAdoptAttach({
+          definition: metadata.definition,
+          handleNamesTranscript: metadata.transcriptImport.handleNamesTranscript,
+          conversationStore:
+            metadata.transcriptImport.conversationStore({
+              accountHome: adoption.accountHome,
+              launchEnv: {}
+            }) ?? undefined,
+          transcriptPath: adoption.transcriptPath,
+          providerSessionId: THREAD,
+          workspaceCwd: rig.root
+        })
+      })
+    )
+    expect(rig.adapter.acquire).not.toHaveBeenCalled()
+    expect(rig.adapter.dispatch).not.toHaveBeenCalled()
+    if (metadataId !== THREAD) {
+      expect(result).toMatchObject({
+        ok: false,
+        refusal: {
+          code: 'agent_session_identity_required',
+          details: { reason: 'transcriptUnreadable' },
+          createAttemptRefusedBeforeCommit: true
+        }
+      })
+      expect(rig.store.listRecords()).toEqual([])
+      expect(rig.store.listOperationRows()).toEqual([])
+      expect(rig.store.listVisibleSessionIds()).toEqual([])
+      return
+    }
+    expect(result.ok).toBe(true)
+    if (!result.ok) {
+      throw new Error('Real selected-account adoption failed')
+    }
+    const snapshot = await rig.host.journalSnapshot(SESSION)
+    expect(snapshot.items.map(({ body }) => body)).toEqual([
+      { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'saved CLI turn' }] },
+      {
+        kind: 'message',
+        role: 'assistant',
+        blocks: [{ type: 'text', text: 'saved CLI turn answer' }]
+      }
+    ])
+    expect(result.value.page.items).toEqual(snapshot.items)
+    expect(rig.store.getRecord(SESSION)?.accountHome).toEqual(accountHome)
+    expect(rig.store.getRecord(SESSION)?.providerHandleChain).toMatchObject([
+      { origin: 'adopted', mintedAtFence: 1, handle: { nativeId: THREAD } }
+    ])
+    expect(rig.store.listVisibleSessionIds()).toEqual([SESSION])
+  }
+)
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-current-work.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-current-work.test.ts
index 57d23f64ffda..bae602d898fa 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-current-work.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-current-work.test.ts
@@ -117,7 +117,6 @@ describe("a dead generation's leftovers, its settlement refused and its lease re
 
     expect(work.liveFence).toBeNull()
     expect(work.working()).toBe(false)
-    expect(work.holdsHandedOverSend()).toBe(false)
     expect(work.actionablePromptIds()).toEqual([])
     expect(view.listed()?.status).not.toBe('working')
     expect(current.host.readStatusSummary(SESSION)?.status).not.toBe('working')
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command-ordinary.test-fixture.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command-ordinary.test-fixture.ts
deleted file mode 100644
index 4eac06c74880..000000000000
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command-ordinary.test-fixture.ts
+++ /dev/null
@@ -1,143 +0,0 @@
-import '../../daemon/mock-descendant-sweep'
-import type { DaemonServer } from '../../daemon/daemon-server'
-import type { DaemonPtyAdapter } from '../../daemon/daemon-pty-adapter'
-import type { createMockSubprocess } from '../../daemon/daemon-pty-adapter-test-harness'
-import type { setupMainOwnedWorkspace } from '../../runtime/main-owned-workspace-runtime-fixture'
-import { expect, vi } from 'vitest'
-import type { agentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
-import { restTestSend, type RestTestRig } from './structured-agent-session-rest-test-rig'
-import { CREATE_TEST_CALLER as caller } from './structured-agent-session-create-test-fixture'
-import { HOST_TEST_SESSION as id } from './structured-agent-session-host-test-data'
-export async function verifyOrdinarySwitchLostOutcome(fixture: {
-  ordinaryRequestId: string
-  boundary: string
-  dispatched: ReturnType<typeof Promise.withResolvers<void>>
-  release: ReturnType<typeof Promise.withResolvers<void>>
-  lateOrdinaryReply: (() => void) | undefined
-  destination: string
-  destinationTab: string
-  destinationPane: string
-  server: DaemonServer
-  time: { deadline: ReturnType<typeof agentSessionSwitchDeadline> }
-  outcome: Promise<{ ok: true; value: { status: string } } | { ok: false; error: unknown }>
-  runtime: ReturnType<typeof setupMainOwnedWorkspace>['runtime']
-  rig: RestTestRig
-  tabIds: () => string[]
-  run: () => Promise<{ status: 'completed'; sessionId: string }>
-  clock: () => { deadline: ReturnType<typeof agentSessionSwitchDeadline> }
-  acquisitions: number
-  stop: ReturnType<typeof vi.spyOn>
-  spawn: ReturnType<typeof vi.fn>
-  sibling: ReturnType<typeof createMockSubprocess>
-  subprocess: ReturnType<typeof createMockSubprocess>
-  adapter: DaemonPtyAdapter
-}) {
-  const {
-    boundary,
-    dispatched,
-    release,
-    server,
-    time,
-    outcome,
-    runtime,
-    rig,
-    tabIds,
-    run,
-    clock,
-    acquisitions,
-    stop,
-    spawn,
-    sibling,
-    subprocess,
-    adapter
-  } = fixture
-
-  if (boundary !== 'legacy-never-created') {
-    await dispatched.promise
-    release.resolve()
-    await vi.waitFor(() => expect(fixture.lateOrdinaryReply).toBeTypeOf('function'))
-    expect(
-      server.host
-        .listSessions()
-        .some((entry) => entry.sessionId === fixture.destination && entry.isAlive)
-    ).toBe(true)
-  } else {
-    await vi.waitFor(() => expect(fixture.ordinaryRequestId).not.toBe(''))
-  }
-  time.deadline.revoke()
-  expect(await outcome).toMatchObject({ ok: false })
-  expect(rig.host.switchExecuting(id)).toBe(true)
-  expect(tabIds()).toContain(fixture.destinationTab)
-  if (boundary === 'legacy-late-reply') {
-    fixture.lateOrdinaryReply!()
-    await vi.waitFor(() =>
-      expect(runtime.hasLiveTerminalForPaneKey(fixture.destinationPane)).toBe(true)
-    )
-  } else {
-    const duplicate = await rig.host
-      .runSwitch(id, 'other-viewer', clock().deadline, run, { direction: 'terminal' })
-      .catch((error: unknown) => error)
-    const first = await outcome
-    if (first.ok) {
-      throw new Error('original observer unexpectedly completed')
-    }
-    expect(duplicate).toBe(first.error)
-    const unavailable = await rig.host.send(
-      caller,
-      restTestSend(
-        'Recover the original ordinary outcome',
-        rig.store.getRecord(id)!.lease.runtimeFence
-      )
-    )
-    if (!unavailable.ok) {
-      throw new Error('ordinary send refused')
-    }
-    await vi.waitFor(async () =>
-      expect(
-        (await rig.host.journalSnapshot(id)).submissions.find(
-          (entry) => entry.clientMessageId === unavailable.value.clientMessageId
-        )?.dispatchState
-      ).toBe('rejected')
-    )
-    expect(rig.adapter.acquire).toHaveBeenCalledTimes(acquisitions)
-    expect(rig.host.switchExecuting(id)).toBe(true)
-    expect(run).toHaveBeenCalledOnce()
-    expect(stop).toHaveBeenCalledOnce()
-    if (boundary === 'legacy-never-created') {
-      expect(spawn).not.toHaveBeenCalled()
-      expect(server.host.listSessions()).toMatchObject([
-        { sessionId: 'unrelated-sibling', isAlive: true }
-      ])
-      return
-    }
-    expect(adapter.getActiveSessionIds()).toContain(fixture.destination)
-  }
-  expect(spawn).toHaveBeenCalledOnce()
-  expect(sibling.forceKill).not.toHaveBeenCalled()
-  subprocess._simulateExit(0)
-  await vi.waitFor(() => expect(rig.host.switchExecuting(id)).toBe(false), { timeout: 10000 })
-  const accepted = await rig.host.send(
-    caller,
-    restTestSend(
-      'After the original ordinary child exited',
-      rig.store.getRecord(id)!.lease.runtimeFence
-    )
-  )
-  expect(accepted.ok).toBe(true)
-  await vi.waitFor(() => expect(rig.adapter.dispatch).toHaveBeenCalledOnce())
-  await vi.waitFor(async () =>
-    expect(
-      (await rig.host.journalSnapshot(id)).submissions.some(
-        (entry) =>
-          entry.clientMessageId === (accepted.ok ? accepted.value.clientMessageId : '') &&
-          entry.dispatchState === 'accepted'
-      )
-    ).toBe(true)
-  )
-  expect(stop).toHaveBeenCalledOnce()
-  expect(run).toHaveBeenCalledOnce()
-  expect(spawn).toHaveBeenCalledOnce()
-  expect(
-    server.host.listSessions().find((entry) => entry.sessionId === 'unrelated-sibling')?.isAlive
-  ).toBe(true)
-}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test-fixture.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test-fixture.ts
deleted file mode 100644
index 9f115e11a99a..000000000000
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test-fixture.ts
+++ /dev/null
@@ -1,169 +0,0 @@
-import type { DaemonClientConnections } from '../../daemon/daemon-client-connections'
-import type { DaemonServer } from '../../daemon/daemon-server'
-import { expect, vi } from 'vitest'
-import { restTestSend } from './structured-agent-session-rest-test-rig'
-import { CREATE_TEST_CALLER as caller } from './structured-agent-session-create-test-fixture'
-import { HOST_TEST_SESSION as id } from './structured-agent-session-host-test-data'
-import { TAB_ID } from '../../runtime/main-owned-workspace-runtime-fixture'
-import type { SwitchSocketFaultState } from './structured-agent-session-switch-socket.test-fixture'
-import type { verifyOrdinarySwitchLostOutcome } from './structured-agent-session-switch-command-ordinary.test-fixture'
-type OrdinaryFixture = Parameters<typeof verifyOrdinarySwitchLostOutcome>[0]
-type OutageFixture = Pick<
-  OrdinaryFixture,
-  | 'server'
-  | 'release'
-  | 'outcome'
-  | 'rig'
-  | 'sibling'
-  | 'acquisitions'
-  | 'spawn'
-  | 'stop'
-  | 'run'
-  | 'tabIds'
-> & {
-  noFork: boolean
-  nativeFailed: boolean
-  wire: SwitchSocketFaultState
-  stages: string[]
-  receiverCanceled: () => boolean
-  terminalOutcome: string
-  occupied: Awaited<ReturnType<DaemonServer['automaticWork']['gate']['admit']>>[]
-}
-export async function verifySwitchOutcomeOutage(fixture: OutageFixture) {
-  const {
-    noFork,
-    nativeFailed,
-    wire,
-    server,
-    stages,
-    receiverCanceled,
-    release,
-    outcome,
-    terminalOutcome,
-    rig,
-    sibling,
-    acquisitions,
-    occupied,
-    spawn,
-    stop,
-    run,
-    tabIds
-  } = fixture
-
-  if (!noFork && !nativeFailed) {
-    // Real loss before the held creation returns; no receiver outcome can reach this observer.
-    wire.connectionUnavailable = true
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: exact fixture connection only.
-    const peers = (server as unknown as { connections: DaemonClientConnections }).connections
-    // The adapter is the second authenticated pair; preserve the unrelated sibling.
-    const sockets = [...peers.values()]
-    sockets.at(-1)?.controlSocket.destroy()
-    stages.push('waiting-receiver-cancel')
-    await vi.waitFor(() => expect(receiverCanceled()).toBe(true))
-    release.resolve()
-  }
-  expect(await outcome).toMatchObject({ ok: false })
-  const retained =
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: inspect the exact receiver owner without changing disposition or resolving work.
-    (server as unknown as { preparations: { retained: Map<string, { outcome?: string }> } })
-      .preparations.retained
-  await vi.waitFor(() =>
-    expect([...retained.values()]).toMatchObject([{ outcome: terminalOutcome }])
-  )
-  expect(rig.host.switchExecuting(id)).toBe(true)
-  await vi.advanceTimersByTimeAsync(720_001)
-  expect([...retained.values()]).toMatchObject([{ outcome: terminalOutcome }])
-  expect(Object.keys([...retained.values()][0])).not.toContain('controller')
-  expect(sibling.forceKill).not.toHaveBeenCalled()
-  const unavailable = await rig.host.send(
-    caller,
-    restTestSend('While exact recovery is unavailable', rig.store.getRecord(id)!.lease.runtimeFence)
-  )
-  if (!unavailable.ok) {
-    throw new Error('ordinary send was refused')
-  }
-  await vi.waitFor(async () =>
-    expect(
-      (await rig.host.journalSnapshot(id)).submissions.find(
-        (entry) => entry.clientMessageId === unavailable.value.clientMessageId
-      )?.dispatchState
-    ).toBe('rejected')
-  )
-  expect(rig.adapter.acquire).toHaveBeenCalledTimes(acquisitions)
-  occupied.forEach((lease) => lease.abandon())
-  wire.connectionUnavailable = false
-  const accepted = await rig.host.send(
-    caller,
-    restTestSend('After the same receiver recovers', rig.store.getRecord(id)!.lease.runtimeFence)
-  )
-  expect(accepted.ok).toBe(true)
-  await vi.waitFor(() => expect(rig.adapter.dispatch).toHaveBeenCalledOnce())
-  await vi.waitFor(async () =>
-    expect(
-      (await rig.host.journalSnapshot(id)).submissions.some(
-        (entry) =>
-          entry.clientMessageId === (accepted.ok ? accepted.value.clientMessageId : '') &&
-          entry.dispatchState === 'accepted'
-      )
-    ).toBe(true)
-  )
-  await vi.waitFor(() => expect(rig.host.switchExecuting(id)).toBe(false))
-  await vi.waitFor(() => expect(retained.size).toBe(0))
-  expect(wire.settlementOutcomes).toContain(terminalOutcome)
-  expect(spawn).toHaveBeenCalledTimes(noFork ? 0 : 1)
-  expect(stop).toHaveBeenCalledOnce()
-  expect(run).toHaveBeenCalledOnce()
-  await vi.waitFor(() => expect(tabIds()).toEqual([TAB_ID]))
-  expect(server.host.listSessions()).toMatchObject([
-    { sessionId: 'unrelated-sibling', isAlive: true }
-  ])
-}
-
-type FinalDeliveryFixture = Pick<
-  OrdinaryFixture,
-  'rig' | 'spawn' | 'tabIds' | 'adapter' | 'server' | 'stop' | 'run'
-> & {
-  boundary: string
-  noFork: boolean
-  mobile: boolean
-  wire: SwitchSocketFaultState
-  stages: string[]
-}
-export async function verifySwitchFinalDelivery(fixture: FinalDeliveryFixture) {
-  const { rig, spawn, boundary, noFork, mobile, tabIds, adapter, server, wire, stop, run, stages } =
-    fixture
-  await vi.waitFor(() => expect(rig.adapter.dispatch).toHaveBeenCalledOnce())
-  await vi.waitFor(async () =>
-    expect(
-      (await rig.host.journalSnapshot(id)).submissions.filter(
-        (entry) => entry.dispatchState === 'accepted'
-      )
-    ).toHaveLength(1)
-  )
-  await vi.waitFor(() => expect(rig.host.switchExecuting(id)).toBe(false))
-  expect(spawn).toHaveBeenCalledTimes(boundary === 'queued' || noFork ? 0 : 1)
-  if (mobile) {
-    await vi.waitFor(() => expect(tabIds()).toEqual([TAB_ID]))
-  }
-  if (boundary === 'gc-outage' || boundary === 'native-gc-outage') {
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: only inspect the actual fixture owners; GC debt cannot hold the already delivered send.
-    const local = adapter as unknown as {
-      switchReleaseCleanup: Map<string, unknown>
-      switchReleaseDrain?: Promise<void>
-    }
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: inspect the actual fixture receiver retention map without mutating its ownership.
-    const receiver = server as unknown as { preparations: { retained: Map<string, unknown> } }
-    expect(local.switchReleaseCleanup.size).toBe(1)
-    expect(receiver.preparations.retained.size).toBe(1)
-    await vi.waitFor(() => expect(local.switchReleaseDrain).toBeUndefined())
-    wire.connectionUnavailable = false
-    // Do not lose the next release; one ordinary successful connection drains only exact GC debt.
-    wire.boundaryGcDrained = true
-    await adapter.listProcesses()
-    await vi.waitFor(() => expect(local.switchReleaseCleanup.size).toBe(0))
-    expect(receiver.preparations.retained.size).toBe(0)
-  }
-  expect(stop).toHaveBeenCalledOnce()
-  expect(run).toHaveBeenCalledOnce()
-  expect(stages.filter((stage) => stage === 'controller-spawn')).toHaveLength(1)
-}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test.ts
deleted file mode 100644
index 1cd75f34e0cc..000000000000
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command.test.ts
+++ /dev/null
@@ -1,798 +0,0 @@
-import { registerSwitchReservationTests } from './structured-agent-session-switch-reservation.test-fixture'
-import {
-  verifySwitchOutcomeOutage,
-  verifySwitchFinalDelivery
-} from './structured-agent-session-switch-command.test-fixture'
-import {
-  installSwitchSocketFaults,
-  type SwitchSocketFaultState
-} from './structured-agent-session-switch-socket.test-fixture'
-import '../../daemon/mock-descendant-sweep'
-import { mkdtemp, rm } from 'node:fs/promises'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { resolveAgentLaunchPaneVerdict } from '../../agent-launch/agent-launch-pane-attachment'
-import { createPtySubprocess } from '../../daemon/pty-subprocess'
-import { DaemonClient } from '../../daemon/client'
-import { DaemonServer } from '../../daemon/daemon-server'
-import type { DaemonClientConnections } from '../../daemon/daemon-client-connections'
-import { DaemonPtyAdapter } from '../../daemon/daemon-pty-adapter'
-import { getDaemonSocketPath } from '../../daemon/daemon-spawner'
-import { createMockSubprocess } from '../../daemon/daemon-pty-adapter-test-harness'
-import {
-  setupMainOwnedWorkspace,
-  WORKTREE_ID,
-  TAB_ID
-} from '../../runtime/main-owned-workspace-runtime-fixture'
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import { agentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
-import { DEFAULT_SPAWN_ADMISSION_LIMITS } from '../../../shared/host-spawn-admission'
-import {
-  createRestTestRig,
-  restTestSend,
-  type RestTestRig
-} from './structured-agent-session-rest-test-rig'
-import {
-  CREATE_TEST_CALLER as caller,
-  createTestParams
-} from './structured-agent-session-create-test-fixture'
-import { HOST_TEST_SESSION as id } from './structured-agent-session-host-test-data'
-import { verifyOrdinarySwitchLostOutcome } from './structured-agent-session-switch-command-ordinary.test-fixture'
-import type * as LocalPtyUtils from '../../providers/local-pty-utils'
-const nativePty = vi.hoisted(() => ({ spawn: vi.fn() }))
-vi.mock('node-pty', () => nativePty)
-vi.mock('../../providers/local-pty-utils', async (importOriginal) => ({
-  ...(await importOriginal<typeof LocalPtyUtils>()),
-  ensureNodePtySpawnHelperExecutable: () => {},
-  getNodePtySpawnHelperCandidates: () => [process.execPath]
-}))
-
-vi.mock('../../../shared/layout-owner-switch', () => ({ ORCA_LAYOUT_OWNER_IS_MAIN: true }))
-
-let initial: ReturnType<typeof createTestParams>
-let rig: RestTestRig
-const deadlines: ReturnType<typeof agentSessionSwitchDeadline>[] = []
-function clock() {
-  let now = 0
-  const deadline = agentSessionSwitchDeadline(() => now, 720_000)
-  deadlines.push(deadline)
-  return {
-    deadline,
-    expire: () => {
-      now = 720_001
-    }
-  }
-}
-beforeEach(async () => {
-  rig = await createRestTestRig({ idleSweep: { intervalMs: 60_000 } })
-  initial = createTestParams()
-  expect(await rig.host.create(caller, initial)).toMatchObject({ ok: true })
-})
-afterEach(async () => {
-  deadlines.forEach((deadline) => deadline.dispose())
-  deadlines.length = 0
-  await rig.dispose()
-  vi.restoreAllMocks()
-  vi.useRealTimers()
-  vi.unstubAllEnvs()
-})
-
-it('joins same-direction viewers while an ordinary Stop runs outside the command selection lane', async () => {
-  const time = clock()
-  expect(await rig.host.switchToChat(id)).toMatchObject({ ok: true })
-  const exit = Promise.withResolvers<boolean>()
-  const entered = Promise.withResolvers<void>()
-  rig.adapter.closeSession.mockImplementation(async () => {
-    entered.resolve()
-    return exit.promise
-  })
-  const run = vi.fn(async () => {
-    await rig.host.stopForSwitch(id, caller, time.deadline)
-    return { status: 'completed' as const, sessionId: id }
-  })
-  const first = rig.host.runSwitch(id, 'first-viewer', time.deadline, run, {
-    direction: 'terminal'
-  })
-  await Promise.race([entered.promise, first])
-  const second = rig.host.runSwitch(id, 'second-viewer', clock().deadline, run, {
-    direction: 'terminal'
-  })
-  exit.resolve(true)
-  expect(await first).toEqual(await second)
-  expect(run).toHaveBeenCalledOnce()
-})
-
-registerSwitchDaemonComposition(() => rig, clock, nativePty)
-
-registerSwitchReservationTests(() => rig, clock)
-
-function registerSwitchDaemonComposition(
-  getRig: () => RestTestRig,
-  clock: () => { deadline: ReturnType<typeof agentSessionSwitchDeadline>; expire: () => void },
-  nativePty: { spawn: ReturnType<typeof vi.fn> }
-) {
-  it.each([
-    'legacy-daemon',
-    'legacy-lost-reply',
-    'legacy-late-reply',
-    'legacy-never-created',
-    'stale-daemon-token',
-    'native-failed',
-    'native-outage',
-    'native-gc-outage',
-    'queued',
-    'commit-expired',
-    'host-cap',
-    'gc-outage',
-    'cap-outage',
-    'expired-outage',
-    'exit-outage',
-    'dispatched',
-    'disconnected',
-    'recovery-failed',
-    'recovery-used',
-    'lost-reply',
-    'missing-result',
-    'live-unknown'
-  ] as const)(
-    'composes Stop, ordinary runtime creation, daemon sockets and retained physical work: %s',
-    async (boundary) => {
-      const rig = getRig()
-      expect(await rig.host.switchToChat(id)).toMatchObject({ ok: true })
-      const acquisitions = rig.adapter.acquire.mock.calls.length
-      const stop = vi.spyOn(rig.host, 'stopForSwitch')
-      const directory = await mkdtemp(join(tmpdir(), 'switch-daemon-composition-'))
-      const time = clock()
-      const ordinaryLoss = [
-        'legacy-lost-reply',
-        'legacy-late-reply',
-        'legacy-never-created'
-      ].includes(boundary)
-      const compatible =
-        ordinaryLoss || boundary === 'legacy-daemon' || boundary === 'stale-daemon-token'
-      const nativeFailed = ['native-failed', 'native-outage', 'native-gc-outage'].includes(boundary)
-      const outage = ['cap-outage', 'expired-outage', 'exit-outage', 'native-outage'].includes(
-        boundary
-      )
-      const terminalOutcome = nativeFailed ? 'failed' : 'exited'
-      nativePty.spawn.mockReset()
-      nativePty.spawn.mockImplementation(() => {
-        throw new Error('opaque native fixture failure')
-      })
-      const cap = boundary === 'host-cap' || boundary === 'cap-outage' || boundary === 'gc-outage'
-      const expired = boundary === 'commit-expired' || boundary === 'expired-outage'
-      const noFork = cap || expired
-      const mobile =
-        ordinaryLoss ||
-        nativeFailed ||
-        noFork ||
-        outage ||
-        ['recovery-failed', 'recovery-used'].includes(boundary)
-      if (cap) {
-        vi.stubEnv('ORCA_DAEMON_MAX_HOST_TERMINALS', outage ? '2' : '1')
-      }
-      if (outage) {
-        vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] })
-      }
-      const stages: string[] = []
-      let destination = ''
-      let destinationTab = ''
-      let destinationPane = ''
-      const tabIds = () => session().tabsByWorktree[WORKTREE_ID]?.map((tab) => tab.id) ?? []
-      const monotonic = performance.now.bind(performance)
-      const wire: SwitchSocketFaultState = {
-        receiverDelay: 0,
-        connectionUnavailable: false,
-        boundaryGcDrained: false,
-        commitRequestId: '',
-        ordinaryRequestId: '',
-        lateOrdinaryReply: undefined,
-        settlementOutcomes: []
-      }
-      if (expired) {
-        vi.spyOn(performance, 'now').mockImplementation(() => monotonic() + wire.receiverDelay)
-      }
-      const dispatched = Promise.withResolvers<void>()
-      const release = Promise.withResolvers<void>()
-      const subprocess = createMockSubprocess()
-      let usedViewer: DaemonClient | undefined
-      let receiverCanceled = () => false
-      const sibling = createMockSubprocess()
-      const spawn = vi.fn(async (opts: { sessionId: string; isCanceled?: () => boolean }) => {
-        if (opts.sessionId === 'unrelated-sibling') {
-          return sibling
-        }
-        receiverCanceled = opts.isCanceled ?? (() => false)
-        dispatched.resolve()
-        if (nativeFailed) {
-          return createPtySubprocess({ ...opts, cols: 80, rows: 24, cwd: directory })
-        }
-        await release.promise
-        return subprocess
-      })
-      const server = new DaemonServer({
-        socketPath: getDaemonSocketPath(directory),
-        tokenPath: join(directory, 'test.token'),
-        ...(boundary.startsWith('legacy-') ? { protocolVersion: 53 } : {}),
-        spawnAdmission: 'enforce',
-        preparePtySpawn: async () => {},
-        ptySpawnHealthCheck: async () => {},
-        spawnSubprocess: spawn
-      })
-      await server.start()
-
-      let omitSettlement = boundary === 'missing-result'
-      const omittedSettlement = Promise.withResolvers<void>()
-
-      installSwitchSocketFaults(boundary, ordinaryLoss, expired, outage, server, wire)
-      const respawn = vi.fn(async () => {
-        if (wire.connectionUnavailable) {
-          throw new Error('Recovery temporarily unavailable')
-        }
-      })
-      const adapter = new DaemonPtyAdapter({
-        socketPath: getDaemonSocketPath(directory),
-        tokenPath: join(directory, 'test.token'),
-        ...(boundary.startsWith('legacy-') ? { protocolVersion: 53 } : {}),
-        ...(['recovery-failed', 'recovery-used'].includes(boundary) ? { respawn } : {})
-      })
-      const { runtime, bindPty, session } = setupMainOwnedWorkspace()
-      Object.assign(runtime, {
-        resolveTerminalWorkspaceLaunchScope: async () => ({
-          id: WORKTREE_ID,
-          path: directory,
-          connectionId: null,
-          repo: null,
-          folderWorkspace: null
-        })
-      })
-      // The controller's external provider boundary; admission, registration and publication stay real.
-      runtime.setPtyController({
-        write: () => true,
-        kill: () => false,
-        getForegroundProcess: async () => null,
-        listProcesses: () => adapter.listProcesses(),
-        spawn: async (opts) => {
-          stages.push('controller-spawn')
-          destination = opts.sessionId!
-          destinationTab = opts.tabId!
-          destinationPane = `${opts.tabId}:${opts.leafId}`
-          const result = await adapter.spawn(opts)
-          if (!opts.tabId || !opts.leafId) {
-            throw new Error('ordinary pane identity missing')
-          }
-          bindPty({
-            worktreeId: WORKTREE_ID,
-            tabId: opts.tabId,
-            leafId: opts.leafId,
-            ptyId: result.id
-          })
-          return result
-        }
-      })
-      const siblingViewer =
-        outage || ordinaryLoss
-          ? new DaemonClient({
-              ...(boundary.startsWith('legacy-') ? { protocolVersion: 53 } : {}),
-              socketPath: getDaemonSocketPath(directory),
-              tokenPath: join(directory, 'test.token')
-            })
-          : undefined
-      if (siblingViewer) {
-        await siblingViewer.ensureConnected()
-        await siblingViewer.request('createOrAttach', {
-          sessionId: 'unrelated-sibling',
-          cols: 80,
-          rows: 24
-        })
-        spawn.mockClear()
-      }
-      const occupied = await Promise.all(
-        Array.from(
-          {
-            length: cap
-              ? 1
-              : outage || nativeFailed || compatible
-                ? 0
-                : DEFAULT_SPAWN_ADMISSION_LIMITS.userResumeConcurrency
-          },
-          (_, index) =>
-            server.automaticWork.gate.admit({
-              clientId: `other-${index}`,
-              declaredIntent: 'user-resume',
-              hasAgentSessionClaim: false,
-              hasHistorySeed: false,
-              deadlineAt: Infinity
-            })
-        )
-      )
-      let physical: Promise<unknown> = Promise.resolve()
-      const run = vi.fn(async () => {
-        const current = await rig.host.stopForSwitch(id, caller, time.deadline)
-        rig.host.guardSwitchWork(id, current)
-        stages.push('stopped')
-        const switchExecution = {
-          invocationId: 'socket-switch',
-          viewer: 'none' as const,
-          signal: time.deadline.signal,
-          remaining: time.deadline.remaining,
-          check: () => {
-            time.deadline.check()
-            if (!current()) {
-              throw new Error('newer work owns the source')
-            }
-          },
-          trackPhysical: <T>(work: Promise<T>, recover?: () => Promise<void>) => {
-            physical = Promise.allSettled([physical, work])
-            return rig.host.trackSwitchPhysical(id, work, recover)
-          }
-        }
-        await time.deadline.wait<
-          | Awaited<ReturnType<typeof runtime.createMobileSessionTerminal>>
-          | Awaited<ReturnType<typeof runtime.createTerminal>>
-        >(
-          mobile
-            ? runtime.createMobileSessionTerminal(`id:${WORKTREE_ID}`, {
-                command: 'cx',
-                launchAgent: 'codex',
-                clientMutationId: 'socket-switch',
-                activate: false,
-                signal: time.deadline.signal,
-                switchExecution
-              })
-            : runtime.createTerminal(`id:${WORKTREE_ID}`, {
-                command: 'cx',
-                launchAgent: 'codex',
-                spawnIntent: 'user-resume',
-                sessionId: 'destination',
-                presentation: 'background',
-                signal: time.deadline.signal,
-                switchExecution
-              })
-        )
-        return { status: 'completed' as const, sessionId: id }
-      })
-      const operation = rig.host.runSwitch(id, 'socket-switch', time.deadline, run, {
-        direction: 'terminal'
-      })
-      const outcome = operation.then(
-        (value) => ({ ok: true as const, value }),
-        (error: unknown) => ({ ok: false as const, error })
-      )
-      try {
-        if (ordinaryLoss) {
-          await verifyOrdinarySwitchLostOutcome({
-            get ordinaryRequestId() {
-              return wire.ordinaryRequestId
-            },
-            boundary,
-            dispatched,
-            release,
-            get lateOrdinaryReply() {
-              return wire.lateOrdinaryReply
-            },
-            get destination() {
-              return destination
-            },
-            get destinationTab() {
-              return destinationTab
-            },
-            get destinationPane() {
-              return destinationPane
-            },
-            server,
-            time,
-            outcome,
-            rig,
-            tabIds,
-            runtime,
-            run,
-            clock,
-            acquisitions,
-            stop,
-            spawn,
-            sibling,
-            subprocess,
-            adapter
-          })
-          return
-        }
-        if (compatible) {
-          await dispatched.promise
-          expect(stop).toHaveBeenCalledOnce()
-          expect(rig.adapter.closeSession).toHaveBeenCalledOnce()
-          expect(rig.adapter.acquire).toHaveBeenCalledTimes(acquisitions)
-          release.resolve()
-          expect(await outcome).toMatchObject({ ok: true, value: { status: 'completed' } })
-          expect(spawn).toHaveBeenCalledOnce()
-          expect(wire.commitRequestId).toBe('')
-          expect(stages.filter((stage) => stage === 'controller-spawn')).toHaveLength(1)
-          expect(tabIds()).toHaveLength(2)
-          await adapter.write(destination, 'new terminal input')
-          await vi.waitFor(() =>
-            expect(subprocess.write).toHaveBeenCalledWith('new terminal input')
-          )
-          expect(nativePty.spawn).not.toHaveBeenCalled()
-          return
-        }
-        if (noFork || nativeFailed) {
-          await outcome
-        } else if (mobile) {
-          await dispatched.promise
-        } else {
-          await Promise.race([
-            vi.waitFor(
-              () => expect(server.automaticWork.gate.snapshot().waiting, stages.join(',')).toBe(1),
-              { timeout: 5000 }
-            ),
-            operation.then(() => {
-              throw new Error('completed before daemon gate')
-            })
-          ])
-        }
-        if (!mobile || noFork) {
-          expect(spawn).not.toHaveBeenCalled()
-        }
-        expect(rig.adapter.acquire).toHaveBeenCalledTimes(acquisitions)
-        expect(stop).toHaveBeenCalledOnce()
-        expect(rig.adapter.closeSession).toHaveBeenCalledOnce()
-        if (cap) {
-          expect(server.automaticWork.gate.snapshot()).toMatchObject({
-            hostCapRefused: 1,
-            waiting: 0
-          })
-        }
-        if (outage) {
-          await verifySwitchOutcomeOutage({
-            noFork,
-            nativeFailed,
-            wire,
-            server,
-            stages,
-            receiverCanceled,
-            release,
-            outcome,
-            terminalOutcome,
-            rig,
-            sibling,
-            acquisitions,
-            occupied,
-            spawn,
-            stop,
-            run,
-            tabIds
-          })
-          return
-        }
-        if (noFork || nativeFailed) {
-          occupied.forEach((lease) => lease.abandon())
-          expect(server.automaticWork.gate.snapshot()).toMatchObject({ terminals: 0, waiting: 0 })
-          expect(await outcome).toMatchObject({ ok: false })
-          if (nativeFailed) {
-            expect(spawn).toHaveBeenCalledOnce()
-            expect(nativePty.spawn).toHaveBeenCalledOnce()
-            const original = await outcome
-            await expect(
-              rig.host.runSwitch(id, 'socket-switch', clock().deadline, run, {
-                direction: 'terminal'
-              })
-            ).rejects.toBe(original.ok ? undefined : original.error)
-            expect(run).toHaveBeenCalledOnce()
-          } else {
-            expect(spawn).not.toHaveBeenCalled()
-          }
-          expect(
-            (
-              await rig.host.send(
-                caller,
-                restTestSend(
-                  'After receiver refused the expired commit',
-                  rig.store.getRecord(id)!.lease.runtimeFence
-                )
-              )
-            ).ok
-          ).toBe(true)
-        } else if (boundary === 'queued') {
-          expect(
-            (
-              await rig.host.send(
-                caller,
-                restTestSend('A new instruction', rig.store.getRecord(id)!.lease.runtimeFence)
-              )
-            ).ok
-          ).toBe(true)
-        } else {
-          occupied.forEach((lease) => lease.abandon())
-          await dispatched.promise
-          // Losing this observer does not settle the receiver's already-dispatched child.
-          if (
-            boundary === 'disconnected' ||
-            boundary === 'recovery-failed' ||
-            boundary === 'recovery-used'
-          ) {
-            // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: read this fixture server's connection registry only to break its exact external socket.
-            const connections = (server as unknown as { connections: DaemonClientConnections })
-              .connections
-            const client = connections.values().next().value
-            if (!client) {
-              throw new Error('authenticated fixture connection missing')
-            }
-            wire.connectionUnavailable = boundary === 'recovery-failed'
-            client.controlSocket.destroy()
-            if (boundary === 'recovery-used') {
-              subprocess.forceKill.mockImplementation(() => {
-                throw new Error('physical close unavailable')
-              })
-              release.resolve()
-            }
-          } else if (boundary === 'lost-reply' || boundary === 'missing-result') {
-            // Drop only this commit's external response bytes; the authenticated socket stays usable.
-            // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the fixture owns this server's exact response socket and retained commit lookup.
-            const daemon = server as unknown as {
-              connections: DaemonClientConnections
-              preparations: { pending: Map<string, Set<{ requestId: string }>> }
-            }
-            const requestId = [...(daemon.preparations.pending.get(destination) ?? [])][0]
-              ?.requestId
-            const socket = daemon.connections.values().next().value?.controlSocket
-            if (!requestId || !socket) {
-              throw new Error('fixture commit transport missing')
-            }
-            const write = socket.write.bind(socket)
-            vi.spyOn(socket, 'write').mockImplementation(
-              (...args: Parameters<typeof socket.write>) => {
-                const frame = JSON.parse(String(args[0]))
-                if (frame.id === requestId) {
-                  return true
-                }
-                if (omitSettlement && frame.payload?.settlement) {
-                  omittedSettlement.resolve()
-                  // A peer ignoring the optional field can acknowledge cancellation but cannot prove exit.
-                  return write(`${JSON.stringify({ ...frame, payload: { canceled: true } })}\n`)
-                }
-                return write(...args)
-              }
-            )
-            time.deadline.revoke()
-          } else {
-            time.deadline.revoke()
-          }
-        }
-        stages.push('waiting-observer')
-        expect(await outcome).toMatchObject({ ok: false })
-        stages.push('observer-failed')
-        if (boundary !== 'queued' && !noFork && !nativeFailed) {
-          expect(rig.host.switchExecuting(id)).toBe(true)
-          if (mobile) {
-            expect(tabIds()).toContain(destinationTab)
-            expect(runtime.hasLiveTerminalForPaneKey(destinationPane)).toBe(false)
-            expect(
-              await resolveAgentLaunchPaneVerdict(
-                { worktreeId: WORKTREE_ID, paneKey: destinationPane },
-                (paneKey) => runtime.hasLiveTerminalForPaneKey(paneKey)
-              )
-            ).toEqual({ kind: 'unconfirmed' })
-            const observed = await outcome
-            expect(observed).toMatchObject({
-              error: {
-                message: 'Connection lost'
-              }
-            })
-          }
-          stages.push('duplicate')
-          const duplicate = await rig.host
-            .runSwitch(id, 'other-viewer', clock().deadline, run, { direction: 'terminal' })
-            .catch((error: unknown) => error)
-          const observed = await outcome
-          if (observed.ok) {
-            throw new Error('revoked observer unexpectedly completed')
-          }
-          expect(duplicate).toBe(observed.error)
-          await expect(
-            rig.host.runSwitch(id, 'opposing-viewer', clock().deadline, run, { direction: 'chat' })
-          ).rejects.toMatchObject({ refusal: { details: { reason: 'handoffInFlight' } } })
-          expect(run).toHaveBeenCalledOnce()
-          if (boundary === 'recovery-failed') {
-            await vi.waitFor(() => expect(respawn).toHaveBeenCalled())
-            const accepted = await rig.host.send(
-              caller,
-              restTestSend(
-                'While recovery is unavailable',
-                rig.store.getRecord(id)!.lease.runtimeFence
-              )
-            )
-            expect(accepted.ok).toBe(true)
-            // Run the ordinary start/recovery iteration to its bounded failure, not a mocked join.
-            if (!accepted.ok) {
-              throw new Error('new send was refused')
-            }
-            await vi.waitFor(async () =>
-              expect(
-                (await rig.host.journalSnapshot(id)).submissions.find(
-                  (entry) => entry.clientMessageId === accepted.value.clientMessageId
-                )?.dispatchState
-              ).toBe('rejected')
-            )
-            expect(rig.adapter.acquire).toHaveBeenCalledTimes(acquisitions)
-            expect(rig.host.switchExecuting(id)).toBe(true)
-            wire.connectionUnavailable = false
-          }
-          stages.push('waiting-receiver-cancel')
-          await vi.waitFor(() => expect(receiverCanceled()).toBe(true))
-          if (boundary === 'recovery-failed') {
-            expect(
-              (
-                await rig.host.send(
-                  caller,
-                  restTestSend(
-                    'After recovery is restored',
-                    rig.store.getRecord(id)!.lease.runtimeFence
-                  )
-                )
-              ).ok
-            ).toBe(true)
-          }
-          if (boundary === 'live-unknown') {
-            subprocess.forceKill.mockImplementation(() => {
-              throw new Error('physical close unavailable')
-            })
-          }
-          release.resolve()
-          if (boundary === 'live-unknown' || boundary === 'recovery-used') {
-            await vi.waitFor(async () =>
-              expect(await adapter.listProcesses()).toMatchObject([{ id: destination }])
-            )
-            let killsBeforeUse = subprocess.forceKill.mock.calls.length
-            if (boundary === 'recovery-used') {
-              usedViewer = new DaemonClient({
-                socketPath: getDaemonSocketPath(directory),
-                tokenPath: join(directory, 'test.token')
-              })
-              await usedViewer.ensureConnected()
-              await usedViewer.request('createOrAttach', {
-                sessionId: destination,
-                cols: 80,
-                rows: 24,
-                attachOnly: true
-              })
-              killsBeforeUse = subprocess.forceKill.mock.calls.length
-            }
-            const accepted = await rig.host.send(
-              caller,
-              restTestSend(
-                'While the terminal is still alive',
-                rig.store.getRecord(id)!.lease.runtimeFence
-              )
-            )
-            if (!accepted.ok) {
-              throw new Error('new send was refused')
-            }
-            await vi.waitFor(async () =>
-              expect(
-                (await rig.host.journalSnapshot(id)).submissions.find(
-                  (entry) => entry.clientMessageId === accepted.value.clientMessageId
-                )?.dispatchState
-              ).toBe('rejected')
-            )
-            expect(rig.adapter.acquire).toHaveBeenCalledTimes(acquisitions)
-            expect(rig.host.switchExecuting(id)).toBe(true)
-            if (mobile) {
-              expect(tabIds()).toContain(destinationTab)
-            }
-            if (boundary === 'recovery-used') {
-              expect(subprocess.forceKill).toHaveBeenCalledTimes(killsBeforeUse)
-            }
-            expect(server.host.listSessions()).toMatchObject([{ isAlive: true }])
-            subprocess._simulateExit(137)
-          }
-          if (boundary === 'missing-result') {
-            await omittedSettlement.promise
-            expect(rig.host.switchExecuting(id)).toBe(true)
-            const accepted = await rig.host.send(
-              caller,
-              restTestSend('Missing settlement proof', rig.store.getRecord(id)!.lease.runtimeFence)
-            )
-            if (!accepted.ok) {
-              throw new Error('new send was refused')
-            }
-            await vi.waitFor(async () =>
-              expect(
-                (await rig.host.journalSnapshot(id)).submissions.find(
-                  (entry) => entry.clientMessageId === accepted.value.clientMessageId
-                )?.dispatchState
-              ).toBe('rejected')
-            )
-            expect(rig.adapter.acquire).toHaveBeenCalledTimes(acquisitions)
-            omitSettlement = false
-            expect(
-              (
-                await rig.host.send(
-                  caller,
-                  restTestSend(
-                    'After receiver proof is available',
-                    rig.store.getRecord(id)!.lease.runtimeFence
-                  )
-                )
-              ).ok
-            ).toBe(true)
-          }
-          stages.push('waiting-physical')
-          await physical.catch(() => {})
-          stages.push('physical-finished')
-          // The unused child is canceled through ordinary owned cleanup, with actual fake-I/O exit.
-          if (boundary !== 'recovery-used') {
-            expect(subprocess.forceKill).toHaveBeenCalled()
-          }
-          expect(server.host.listSessions().every((entry) => !entry.isAlive)).toBe(true)
-          if (boundary !== 'recovery-failed' && boundary !== 'missing-result') {
-            expect(
-              (
-                await rig.host.send(
-                  caller,
-                  restTestSend('After physical exit', rig.store.getRecord(id)!.lease.runtimeFence)
-                )
-              ).ok
-            ).toBe(true)
-          }
-        } else {
-          occupied.forEach((lease) => lease.abandon())
-          await physical.catch(() => {})
-          if (nativeFailed) {
-            expect(spawn).toHaveBeenCalledOnce()
-          } else {
-            expect(spawn).not.toHaveBeenCalled()
-          }
-          expect(server.host.listSessions()).toEqual([])
-          // Definitively unused publication is withdrawn by its ordinary owner.
-          await vi.waitFor(() => expect(tabIds()).toEqual([TAB_ID]))
-        }
-        await verifySwitchFinalDelivery({
-          rig,
-          spawn,
-          boundary,
-          noFork,
-          mobile,
-          tabIds,
-          adapter,
-          server,
-          wire,
-          stop,
-          run,
-          stages
-        })
-      } finally {
-        vi.useRealTimers()
-        time.deadline.revoke()
-        wire.connectionUnavailable = false
-        omitSettlement = false
-        occupied.forEach((lease) => lease.abandon())
-        release.resolve()
-        if (
-          compatible ||
-          boundary === 'live-unknown' ||
-          boundary === 'recovery-used' ||
-          boundary === 'exit-outage'
-        ) {
-          subprocess._simulateExit(137)
-        }
-        await outcome
-        // An ordinary retry wakes retained receiver completion after restoring external transport.
-        void rig.host
-          .runSwitch(id, 'cleanup-observer', clock().deadline, run, { direction: 'terminal' })
-          .catch(() => {})
-        if (!ordinaryLoss) {
-          await physical.catch(() => {})
-        }
-
-        usedViewer?.disconnect()
-        sibling._simulateExit(0)
-        siblingViewer?.disconnect()
-        vi.useRealTimers()
-        adapter.dispose()
-        await server.shutdown()
-        await rm(directory, { recursive: true, force: true })
-      }
-    },
-    25_000
-  )
-}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-commands.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-commands.ts
index 3c0837cc4e50..15337e2e5748 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-commands.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-commands.ts
@@ -108,12 +108,14 @@ export function createStructuredAgentSessionSwitchCommands(
         await command?.physical
       }
     },
-    revoke: (id: string) => {
+    revoke: (id: string): boolean => {
       const command = commands.get(id)
-      if (command) {
-        command.retentionAllowed = false
-        command.deadline.revoke()
+      if (!command) {
+        return false
       }
+      command.retentionAllowed = false
+      command.deadline.revoke()
+      return true
     },
     dispose: () => {
       unsubscribe()
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.test.ts
index be41e9a4c25b..bdaee7e548cc 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.test.ts
@@ -1,29 +1,15 @@
-import { mkdtemp, rm, writeFile, appendFile, readFile, copyFile } from 'node:fs/promises'
+import { mkdtemp, rm, writeFile, readFile, copyFile } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import type { AgentType } from '../../../shared/agent-status-types'
 import { agentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
 import {
   claudeProviderHandle,
   codexProviderHandle
 } from '../../../shared/agent-session-provider-handle-encoding'
-import { agentTurnVerdict } from '../../../shared/agent-turn-outcome'
-import {
-  agentJournalItemKey,
-  agentJournalSubmissionKey
-} from '../../../shared/agent-session-journal-item-key'
-import Database from '../../sqlite/sync-database'
-import { claudePromptUuidForSubmission } from '../../claude/structured/claude-structured-session-id'
-import { encodePiHistoryClaim } from '../../pi/rpc-history-journal-view'
-import { createLegacyProviderTimelineIdentityScheme } from '../agent-session-timeline/provider-timeline-identity'
-import { acpNamedTextKey } from '../../acp/acp-turn-messages'
 import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
-import { piHistoryEntryIdentity } from '../../pi/rpc-history-import'
 import { createTrackedJournalOpener } from '../agent-session-journal/journal-host-database-test-support'
 import { importLegacyTranscriptIntoJournal } from '../agent-session-journal/journal-legacy-import'
-import { createPiTranscriptCollector } from '../agent-session-journal/journal-pi-active-branch'
-import { decodePiTurnLifecycle } from '../transcript-turn-lifecycle'
 import {
   captureSwitchStoppedCliTurn,
   catchUpSwitchedCliTranscript
@@ -63,598 +49,13 @@ function options() {
     }
   }
 }
-const encode = (rows: unknown[]) => `${rows.map((row) => JSON.stringify(row)).join('\n')}\n`
-
-async function sourceFor(agent: AgentType) {
-  const filePath = join(
-    root,
-    agent === 'opencode' || agent === 'opencode2' ? 'opencode.db' : 'session.jsonl'
-  )
-  const sessionId = agent === 'pi' ? filePath : 'cli-session'
-  const source = { agent, sessionId, filePath }
-  if (agent === 'opencode' || agent === 'opencode2') {
-    const db = new Database(filePath)
-    if (agent === 'opencode') {
-      db.exec(`CREATE TABLE session (id TEXT PRIMARY KEY); INSERT INTO session VALUES ('cli-session');
-        CREATE TABLE message (id TEXT PRIMARY KEY, session_id TEXT, time_created INTEGER, time_updated INTEGER, data TEXT);
-        CREATE TABLE part (id TEXT PRIMARY KEY, session_id TEXT, message_id TEXT, time_created INTEGER, time_updated INTEGER, data TEXT);`)
-      db.prepare('INSERT INTO message VALUES (?, ?, 1, 1, ?)').run(
-        'user',
-        sessionId,
-        JSON.stringify({ role: 'user', time: { created: 1 } })
-      )
-      db.prepare('INSERT INTO message VALUES (?, ?, 2, 2, ?)').run(
-        'reply',
-        sessionId,
-        JSON.stringify({ role: 'assistant', parentID: 'user', time: { created: 2 } })
-      )
-      for (const [id, text] of [
-        ['user', 'Keep this prompt'],
-        ['reply', 'Partial response']
-      ]) {
-        db.prepare('INSERT INTO part VALUES (?, ?, ?, 1, 1, ?)').run(
-          id,
-          sessionId,
-          id,
-          JSON.stringify({ type: 'text', text })
-        )
-      }
-    } else {
-      db.exec(`CREATE TABLE session_v2 (id TEXT PRIMARY KEY); INSERT INTO session_v2 VALUES ('cli-session');
-        CREATE TABLE session_message (id TEXT PRIMARY KEY, session_id TEXT, type TEXT, seq INTEGER, data TEXT, time_created INTEGER, time_updated INTEGER);`)
-      const insert = db.prepare('INSERT INTO session_message VALUES (?, ?, ?, ?, ?, 1, 1)')
-      insert.run('user', sessionId, 'user', 1, JSON.stringify({ text: 'Keep this prompt' }))
-      insert.run(
-        'reply',
-        sessionId,
-        'assistant',
-        2,
-        JSON.stringify({ content: [{ type: 'text', text: 'Partial response' }] })
-      )
-    }
-    db.close()
-    return {
-      source,
-      finish: async () => {
-        const finished = new Database(filePath)
-        try {
-          if (agent === 'opencode') {
-            finished.prepare('UPDATE message SET data = ? WHERE id = ?').run(
-              JSON.stringify({
-                role: 'assistant',
-                parentID: 'user',
-                finish: 'stop',
-                time: { created: 2, completed: 3 }
-              }),
-              'reply'
-            )
-          } else {
-            finished
-              .prepare('INSERT INTO session_message VALUES (?, ?, ?, ?, ?, 3, 3)')
-              .run('end', sessionId, 'idle', 3, JSON.stringify({ outcome: 'succeeded' }))
-          }
-        } finally {
-          finished.close()
-        }
-      }
-    }
-  }
-  const rows =
-    agent === 'claude'
-      ? [
-          {
-            type: 'user',
-            uuid: 'user',
-            sessionId,
-            message: { role: 'user', content: 'Keep this prompt' }
-          },
-          {
-            type: 'assistant',
-            uuid: 'reply',
-            sessionId,
-            message: { role: 'assistant', content: [{ type: 'text', text: 'Partial response' }] }
-          }
-        ]
-      : agent === 'pi'
-        ? [
-            { type: 'session', version: 3, id: 'header-id' },
-            {
-              type: 'message',
-              id: 'user',
-              parentId: null,
-              message: { role: 'user', content: 'Keep this prompt' }
-            },
-            {
-              type: 'message',
-              id: 'abandoned',
-              parentId: 'user',
-              message: {
-                role: 'assistant',
-                content: [{ type: 'text', text: 'Abandoned answer' }],
-                stopReason: 'stop'
-              }
-            },
-            {
-              type: 'message',
-              id: 'reply',
-              parentId: 'user',
-              message: {
-                role: 'assistant',
-                content: [{ type: 'text', text: 'Partial response' }],
-                stopReason: 'toolUse'
-              }
-            }
-          ]
-        : [
-            {
-              type: 'user',
-              id: 'user',
-              timestamp: '2026-10-28T00:00:00Z',
-              content: 'Keep this prompt'
-            },
-            {
-              type: 'assistant',
-              id: 'reply',
-              timestamp: '2026-10-28T00:00:01Z',
-              content: 'Partial response'
-            }
-          ]
-  await writeFile(filePath, encode(rows))
-  const events = [
-    { type: 'turn_started', session_id: sessionId, turn_number: 1, ts: '2026-10-28T00:00:00Z' }
-  ]
-  if (agent === 'grok') {
-    await writeFile(join(root, 'events.jsonl'), encode(events))
-  }
-  return {
-    source,
-    finish: async () => {
-      if (agent === 'grok') {
-        await writeFile(
-          join(root, 'events.jsonl'),
-          encode([
-            ...events,
-            { type: 'turn_ended', outcome: 'completed', ts: '2026-10-28T00:00:02Z' }
-          ])
-        )
-      } else if (agent === 'claude') {
-        await writeFile(
-          filePath,
-          encode([
-            ...rows,
-            {
-              type: 'assistant',
-              uuid: 'end',
-              sessionId,
-              message: {
-                role: 'assistant',
-                content: [{ type: 'text', text: 'Final response' }],
-                stop_reason: 'end_turn'
-              }
-            }
-          ])
-        )
-      } else {
-        await writeFile(
-          filePath,
-          encode([
-            ...rows,
-            {
-              type: 'message',
-              id: 'end',
-              parentId: 'reply',
-              message: {
-                role: 'assistant',
-                content: [{ type: 'text', text: 'Final response' }],
-                stopReason: 'stop'
-              }
-            }
-          ])
-        )
-      }
-    }
-  }
-}
-
-it.each(['claude', 'pi', 'grok', 'opencode', 'opencode2'] as const)(
-  'imports stopped %s through the durable journal, preserves provider completion and deduplicates after reopen',
-  async (agent) => {
-    const { source, finish } = await sourceFor(agent)
-    let journal = await journals.open(options())
-    const stopped = await captureSwitchStoppedCliTurn(source, true, deadline)
-    expect(stopped).toBeDefined()
-    await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline, stopped })
-    expect(
-      journal
-        .snapshot()
-        .items.filter((item) => item.body.kind === 'turn')
-        .map((item) => item.body)
-    ).toEqual([expect.objectContaining({ state: 'interrupted' })])
-    if (agent === 'pi') {
-      expect(
-        journal.item(agentJournalItemKey(piHistoryEntryIdentity(source.filePath, 'user')))
-      ).not.toBeNull()
-      expect(
-        journal
-          .snapshot()
-          .items.some(
-            (item) =>
-              item.itemId ===
-              agentJournalItemKey(piHistoryEntryIdentity(source.filePath, 'abandoned'))
-          )
-      ).toBe(false)
-    }
-    const snapshot = journal.snapshot()
-    await journal.close()
-    journal = await journals.open(options())
-    await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline, stopped })
-    expect(journal.snapshot()).toEqual(snapshot)
-    // A different conversation journal sees a completion written before the exact source exited.
-    await finish()
-    const raced = await journals.open({
-      ...options(),
-      identity: { ...options().identity, sessionId: 'raced' }
-    })
-    await catchUpSwitchedCliTranscript({ journal: raced, source, fence: 1, deadline, stopped })
-    expect(
-      raced
-        .snapshot()
-        .items.filter((item) => item.body.kind === 'turn')
-        .map((item) => item.body)
-    ).toEqual([expect.objectContaining({ state: 'completed' })])
-  }
-)
-
-it('does not infer Interrupted from a historical truncated tail and checks newer work at the commit owner', async () => {
-  const { source } = await sourceFor('claude')
-  const journal = await journals.open(options())
-  await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline })
-  expect(journal.snapshot().items.some((item) => item.body.kind === 'turn')).toBe(false)
-  const stopped = await captureSwitchStoppedCliTurn(source, true, deadline)
-  const before = journal.snapshot()
-  await expect(
-    catchUpSwitchedCliTranscript({
-      journal,
-      source,
-      fence: 1,
-      deadline,
-      stopped,
-      check: () => {
-        throw new Error('newer accepted action')
-      }
-    })
-  ).rejects.toThrow('newer accepted action')
-  expect(journal.snapshot()).toEqual(before)
-})
-
-async function nativePrompt(journal: AgentSessionJournal) {
-  await journal.appendSubmission({
-    clientMessageId: 'native-prompt',
-    payloadFingerprint: 'native-fingerprint',
-    fence: 1,
-    body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'Keep this prompt' }] }
-  })
-  return agentJournalSubmissionKey('native-prompt')
-}
-
-it.each([false, true])(
-  'preserves a native Claude submission while importing a later CLI turn (acknowledged=%s)',
-  async (acknowledged) => {
-    const { source } = await sourceFor('claude')
-    const journal = await journals.open(options())
-    const native = await nativePrompt(journal)
-    const promptUuid = claudePromptUuidForSubmission('native', native)
-    if (acknowledged) {
-      await journal.resolveDispatch({
-        clientMessageId: 'native-prompt',
-        fence: 1,
-        state: 'accepted',
-        providerIdentity: { provider: 'claude', sessionId: source.sessionId, uuid: promptUuid }
-      })
-    }
-    const transcript = await readFile(source.filePath, 'utf8')
-    await writeFile(source.filePath, transcript.replace('"uuid":"user"', `"uuid":"${promptUuid}"`))
-    const before = journal.snapshot().items
-    await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline })
-    expect(journal.snapshot().items).toEqual(before)
-    await appendFile(
-      source.filePath,
-      encode([
-        {
-          type: 'user',
-          uuid: 'outside-user',
-          sessionId: source.sessionId,
-          message: { role: 'user', content: 'Outside prompt' }
-        },
-        {
-          type: 'assistant',
-          uuid: 'outside-answer',
-          sessionId: source.sessionId,
-          message: { role: 'assistant', content: [{ type: 'text', text: 'Outside partial' }] }
-        }
-      ])
-    )
-    const stopped = await captureSwitchStoppedCliTurn(source, true, deadline)
-    await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline, stopped })
-    expect(journal.item(native)).toEqual(before[0])
-    expect(
-      journal
-        .snapshot()
-        .items.filter((item) => item.body.kind === 'message' && item.body.role === 'user')
-    ).toHaveLength(2)
-  }
-)
-
-it.each([
-  { oldEntries: 600, payloadBytes: 32, stopReason: 'toolUse', state: 'working' },
-  { oldEntries: 6000, payloadBytes: 32, stopReason: 'stop', state: 'completed' },
-  { oldEntries: 80, payloadBytes: 16 * 1024, stopReason: 'toolUse', state: 'working' },
-  { oldEntries: 80, payloadBytes: 160 * 1024, stopReason: 'stop', state: 'completed' }
-])(
-  'yields during selected Pi lifecycle replay with $oldEntries old entries of $payloadBytes bytes and a fixed suffix',
-  async ({ oldEntries, payloadBytes, stopReason, state }) => {
-    const observed: string[] = []
-    const emitted: string[] = []
-    const slices: { rows: number; bytes: number; emitted: number }[] = []
-    const lifecycle: string[] = []
-    let rows = 0
-    let bytes = 0
-    let maxLineBytes = 0
-    let pending: ReturnType<typeof setImmediate> | undefined
-    const collector = createPiTranscriptCollector(
-      (message) => message.id,
-      (_line, lineIndex) => ({
-        provider: 'legacy',
-        agent: 'pi',
-        sessionId: 'synthetic-progress-control',
-        recordId: String(lineIndex)
-      }),
-      (line, fallbackId) => {
-        observed.push(fallbackId)
-        const next = decodePiTurnLifecycle(line, fallbackId)
-        if (next) {
-          lifecycle.push(next.state)
-        }
-        rows += 1
-        bytes += Buffer.byteLength(line, 'utf8')
-        if (!pending) {
-          pending = setImmediate(() => {
-            slices.push({ rows, bytes, emitted: emitted.length })
-            rows = 0
-            bytes = 0
-            pending = undefined
-          })
-        }
-      }
-    )
-    let lineIndex = 0
-    const record = (entry: Record<string, unknown>) => {
-      const line = JSON.stringify(entry)
-      maxLineBytes = Math.max(maxLineBytes, Buffer.byteLength(line, 'utf8'))
-      collector.record(line, typeof entry.id === 'string' ? entry.id : 'header', lineIndex++)
-    }
-    try {
-      record({ type: 'session', version: 3 })
-      record({ type: 'message', id: 'old-user', parentId: null, message: { role: 'user' } })
-      record({
-        type: 'message',
-        id: 'old-answer',
-        parentId: 'old-user',
-        message: { role: 'assistant', stopReason: 'stop' }
-      })
-      let parentId = 'old-answer'
-      const payload = 'x'.repeat(payloadBytes)
-      for (let i = 0; i < oldEntries; i += 1) {
-        const id = `old-${i}`
-        record({ type: 'custom', id, parentId, data: payload })
-        parentId = id
-      }
-      record({ type: 'custom', id: 'claim', parentId })
-      record({
-        type: 'compaction',
-        id: 'compaction',
-        parentId: 'claim',
-        firstKeptEntryId: 'old-user',
-        summary: 'Kept summary'
-      })
-      record({
-        type: 'message',
-        id: 'recent-user',
-        parentId: 'compaction',
-        message: { role: 'user', content: 'Current prompt' }
-      })
-      record({
-        type: 'message',
-        id: 'abandoned-answer',
-        parentId: 'recent-user',
-        message: { role: 'assistant', stopReason: 'error', content: 'Other branch' }
-      })
-      record({
-        type: 'message',
-        id: 'recent-answer',
-        parentId: 'recent-user',
-        message: { role: 'assistant', stopReason, content: 'Current answer' }
-      })
-      await collector.project((id) => emitted.push(id), 'claim')
-      await new Promise<void>((resolve) => setImmediate(resolve))
-      expect(observed).toHaveLength(oldEntries + 6)
-      expect(observed.slice(-4)).toEqual(['claim', 'compaction', 'recent-user', 'recent-answer'])
-      expect(observed).not.toContain('abandoned-answer')
-      expect(lifecycle).toEqual(
-        state === 'working'
-          ? ['working', 'completed', 'working']
-          : ['working', 'completed', 'working', 'completed']
-      )
-      expect(emitted).toEqual(['compaction', 'recent-user', 'recent-answer'])
-      expect(slices[0].emitted).toBe(0)
-      expect(slices.length).toBeGreaterThan(1)
-      expect(Math.max(...slices.map((slice) => slice.rows))).toBeLessThanOrEqual(256)
-      expect(Math.max(...slices.map((slice) => slice.bytes))).toBeLessThanOrEqual(
-        1024 * 1024 + maxLineBytes
-      )
-    } finally {
-      if (pending) {
-        clearImmediate(pending)
-      }
-      collector.close()
-    }
-  }
-)
-
-it('uses the existing Pi resume claim to import only the selected CLI suffix after native work', async () => {
-  const { source } = await sourceFor('pi')
-  const journal = await journals.open(options())
-  const native = await nativePrompt(journal)
-  const before = journal.item(native)
-  const cursor = journal.cursor()
-  const resumeCursor = encodePiHistoryClaim({
-    entry: 'reply',
-    epoch: cursor.epoch,
-    sequence: cursor.sequence
-  })
-  await appendFile(
-    source.filePath,
-    encode([
-      {
-        type: 'message',
-        id: 'outside-user',
-        parentId: 'reply',
-        message: { role: 'user', content: 'Outside prompt' }
-      },
-      {
-        type: 'message',
-        id: 'outside-answer',
-        parentId: 'outside-user',
-        message: { role: 'assistant', content: [{ type: 'text', text: 'Outside partial' }] }
-      }
-    ])
-  )
-  const stopped = await captureSwitchStoppedCliTurn(source, true, deadline)
-  await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline, stopped, resumeCursor })
-  expect(journal.item(native)).toEqual(before)
-  expect(
-    journal
-      .snapshot()
-      .items.filter((item) => item.body.kind === 'message' && item.body.role === 'user')
-  ).toHaveLength(2)
-  expect(
-    journal.item(agentJournalItemKey(piHistoryEntryIdentity(source.filePath, 'reply')))
-  ).toBeNull()
-  expect(
-    journal
-      .snapshot()
-      .items.filter((item) => item.body.kind === 'turn')
-      .map((item) => item.body)
-  ).toEqual([expect.objectContaining({ state: 'interrupted' })])
-})
-
-it.each(['grok', 'opencode', 'opencode2'] as const)(
-  'reuses native timeline coverage for %s instead of importing its native prompt and answer again',
-  async (agent) => {
-    const { source } = await sourceFor(agent)
-    const journal = await journals.open(options())
-    const native = await nativePrompt(journal)
-    const scheme = createLegacyProviderTimelineIdentityScheme({ agent, sessionId: 'native' })
-    const turn = {
-      namespace: source.sessionId,
-      key: { source: 'provider' as const, value: 'prompt:native-prompt' }
-    }
-    const turnIdentity = scheme.turn(turn)
-    await journal.appendLifecycleBatch({
-      settlementId: 'native-answer',
-      fence: 1,
-      mutations: [
-        {
-          kind: 'item',
-          identity: turnIdentity,
-          body: {
-            kind: 'turn',
-            turnId: scheme.turnId(turn),
-            state: 'completed',
-            userItemId: native
-          },
-          turnScope: { kind: 'thread' }
-        },
-        {
-          kind: 'item',
-          identity: scheme.item({
-            namespace: source.sessionId,
-            key: { source: 'provider', value: acpNamedTextKey('reply', 'assistant') },
-            family: 'item',
-            thread: source.sessionId
-          }),
-          body: {
-            kind: 'message',
-            role: 'assistant',
-            blocks: [{ type: 'text', text: 'Partial response' }]
-          },
-          turnScope: { kind: 'turn', turnItemId: agentJournalItemKey(turnIdentity) }
-        }
-      ]
-    })
-    const before = journal.snapshot().items
-    const stopped = await captureSwitchStoppedCliTurn(source, true, deadline)
-    await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline, stopped })
-    expect(journal.snapshot().items).toEqual(before)
-  }
+const claudeRecording = await readFile(
+  join(import.meta.dirname, '__fixtures__', 'claude-cli-switch-2.1.302.jsonl'),
+  'utf8'
 )
-
-it('imports a recorded Claude Code disk prefix through switch settlement and preserves completion on a racing final read', async () => {
-  const recording = await readFile(
-    join(import.meta.dirname, '__fixtures__', 'claude-cli-switch-2.1.302.jsonl'),
-    'utf8'
-  )
-  const rows = recording.trimEnd().split('\n')
-  expect(rows).toHaveLength(4)
-  const filePath = join(root, 'recorded-claude.jsonl')
-  const source = { agent: 'claude' as const, sessionId: JSON.parse(rows[0]!).sessionId, filePath }
-  const recordedOptions = {
-    ...options(),
-    identity: {
-      ...options().identity,
-      agent: 'claude' as const,
-      providerHandle: claudeProviderHandle(source.sessionId, null)
-    }
-  }
-  // A captured disk prefix at the tool-use frontier; this is not a recording of an actual Stop.
-  await writeFile(filePath, `${rows.slice(0, 2).join('\n')}\n`)
-  const historical = await journals.open({
-    ...recordedOptions,
-    identity: { ...recordedOptions.identity, sessionId: 'historical' }
-  })
-  await catchUpSwitchedCliTranscript({ journal: historical, source, fence: 1, deadline })
-  expect(historical.snapshot().items.some((item) => item.body.kind === 'turn')).toBe(false)
-  const stopped = await captureSwitchStoppedCliTurn(source, true, deadline)
-  expect(stopped).toBeDefined()
-  let journal = await journals.open(recordedOptions)
-  await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline, stopped })
-  const snapshot = journal.snapshot()
-  expect(
-    snapshot.items.filter((item) => item.body.kind === 'turn').map((item) => item.body)
-  ).toEqual([expect.objectContaining({ state: 'interrupted' })])
-  expect(snapshot.items.some((item) => item.body.kind === 'tool-call')).toBe(true)
-  await journal.close()
-  journal = await journals.open(recordedOptions)
-  await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline, stopped })
-  expect(journal.snapshot()).toEqual(snapshot)
-  await writeFile(filePath, recording)
-  const completed = await journals.open({
-    ...recordedOptions,
-    identity: { ...recordedOptions.identity, sessionId: 'completed' }
-  })
-  await catchUpSwitchedCliTranscript({ journal: completed, source, fence: 1, deadline, stopped })
-  expect(
-    completed
-      .snapshot()
-      .items.filter((item) => item.body.kind === 'turn')
-      .map((item) => item.body)
-  ).toEqual([expect.objectContaining({ state: 'completed' })])
-  const final = completed.snapshot()
-  await catchUpSwitchedCliTranscript({ journal: completed, source, fence: 1, deadline, stopped })
-  expect(completed.snapshot()).toEqual(final)
-})
-
+const claudeRecordingId: string = JSON.parse(claudeRecording.split('\n')[0]!).sessionId
 it.each([
+  ['claude', claudeRecordingId],
   ['codex', '01a183db-b8d6-7170-af39-e004651c1e1e'],
   ['pi', '01a1841b-2daa-7238-ade8-4b2474dcac14'],
   ['grok', '01a105db-937d-7ec0-b1d1-5396ae618abf'],
@@ -668,7 +69,12 @@ it.each([
     const filePath = join(root, sqlite ? 'native.db' : 'native.jsonl')
     const source = { agent, sessionId: agent === 'pi' ? filePath : recordedId, filePath }
     async function install(completed: boolean) {
-      if (agent === 'grok') {
+      if (agent === 'claude') {
+        const rows = claudeRecording.trimEnd().split('\n')
+        expect(rows).toHaveLength(4)
+        // Fixture truncation at genuine tool use, not a recording of Stop or exit.
+        await writeFile(filePath, completed ? claudeRecording : `${rows.slice(0, 2).join('\n')}\n`)
+      } else if (agent === 'grok') {
         const directory = join(fixtures, completed ? 'completed' : 'interrupted-prefix')
         await copyFile(join(directory, 'chat_history.jsonl'), filePath)
         await copyFile(join(directory, 'events.jsonl'), join(root, 'events.jsonl'))
@@ -694,7 +100,12 @@ it.each([
       identity: {
         ...options().identity,
         agent,
-        providerHandle: agent === 'codex' ? codexProviderHandle(recordedId) : null
+        providerHandle:
+          agent === 'codex'
+            ? codexProviderHandle(recordedId)
+            : agent === 'claude'
+              ? claudeProviderHandle(recordedId, null)
+              : null
       }
     }
     async function imported(sessionId: string) {
@@ -760,54 +171,3 @@ it.each([
     expect(completed.snapshot()).toEqual(final)
   }
 )
-
-it.each(['pi', 'grok', 'opencode', 'opencode2'] as const)(
-  'preserves %s provider failure through actual transcript import and durable turn outcome',
-  async (agent) => {
-    const { source, finish } = await sourceFor(agent)
-    const stopped = await captureSwitchStoppedCliTurn(source, true, deadline)
-    await finish()
-    // Synthetic controls of the existing fixture, separate from the recorded capture cases.
-    if (agent === 'grok') {
-      const eventsPath = join(root, 'events.jsonl')
-      await writeFile(
-        eventsPath,
-        (await readFile(eventsPath, 'utf8')).replace('"outcome":"completed"', '"outcome":"error"')
-      )
-    } else if (agent === 'pi') {
-      const rows = (await readFile(source.filePath, 'utf8')).trimEnd().split('\n')
-      const terminal = JSON.parse(rows.pop()!)
-      terminal.message.stopReason = 'error'
-      await writeFile(source.filePath, `${rows.join('\n')}\n${JSON.stringify(terminal)}\n`)
-    } else {
-      const db = new Database(source.filePath)
-      try {
-        if (agent === 'opencode') {
-          db.prepare(
-            "UPDATE message SET data = json_set(data, '$.finish', 'error') WHERE id = 'reply'"
-          ).run()
-        } else {
-          db.prepare('UPDATE session_message SET data = ? WHERE id = ?').run(
-            JSON.stringify({ outcome: 'failed' }),
-            'end'
-          )
-        }
-      } finally {
-        db.close()
-      }
-    }
-    let journal = await journals.open(options())
-    await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline, stopped })
-    const snapshot = journal.snapshot()
-    const turns = snapshot.items.flatMap(({ body }) => (body.kind === 'turn' ? [body] : []))
-    expect(turns).toHaveLength(1)
-    expect(turns[0]).toMatchObject({ state: 'completed', outcome: 'failure' })
-    expect(agentTurnVerdict({ state: turns[0]!.state, outcome: turns[0]!.outcome ?? null })).toBe(
-      'failure'
-    )
-    await journal.close()
-    journal = await journals.open(options())
-    await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline, stopped })
-    expect(journal.snapshot()).toEqual(snapshot)
-  }
-)
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-reservation.test-fixture.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-reservation.test-fixture.ts
deleted file mode 100644
index b196acea45f8..000000000000
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-reservation.test-fixture.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import '../../daemon/mock-descendant-sweep'
-import { expect, it, vi } from 'vitest'
-import type { agentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
-import type { RestTestRig } from './structured-agent-session-rest-test-rig'
-import { HOST_TEST_SESSION as id } from './structured-agent-session-host-test-data'
-import {
-  agentSessionLeaseNeverAcquired,
-  agentSessionLeasePossiblyWriting
-} from '../../../shared/agent-session-lease-adjudication'
-export function registerSwitchReservationTests(
-  getRig: () => RestTestRig,
-  clock: () => { deadline: ReturnType<typeof agentSessionSwitchDeadline>; expire: () => void }
-) {
-  it('drops an expired operation at its actual queued reservation without acquiring', async () => {
-    const rig = getRig()
-
-    const time = clock()
-    const reserve = rig.store.reserveOwner
-    vi.spyOn(rig.store, 'reserveOwner').mockImplementation((request, check) => {
-      time.expire()
-      return reserve(request, check)
-    })
-    expect(await rig.host.switchToChat(id, time.deadline)).toMatchObject({ ok: false })
-    expect(rig.adapter.acquire).not.toHaveBeenCalled()
-    expect(agentSessionLeaseNeverAcquired(rig.store.getRecord(id)!.lease)).toBe(true)
-  })
-
-  it('distinguishes never-acquired ownership from recovery without physical exit proof', async () => {
-    const rig = getRig()
-
-    expect(agentSessionLeaseNeverAcquired(rig.store.getRecord(id)!.lease)).toBe(true)
-    await rig.host.switchToTerminal(id, clock().deadline)
-    await rig.store.transitionHandoff(id, (record) => ({
-      ...record,
-      lease: { ...record.lease, minimumNextFence: 2 }
-    }))
-    expect(agentSessionLeasePossiblyWriting(rig.store.getRecord(id)!.lease)).toBe(true)
-    await rig.restart()
-    await expect(rig.host.switchToTerminal(id, clock().deadline)).rejects.toMatchObject({
-      refusal: { details: { reason: 'ownerUnproven' } }
-    })
-    expect(rig.adapter.closeSession).not.toHaveBeenCalled()
-  })
-
-  it('rechecks source work at the actual queued visibility transaction and never retires a different tab', async () => {
-    const rig = getRig()
-
-    await rig.store.setSessionTabVisibility(id, false)
-    await rig.store.setSessionTabVisibility(id, true, 'source-tab')
-    let current = true
-    const late = rig.store.setSwitchedSessionTabVisibility(id, 'source-tab', false, () => current)
-    current = false
-    expect(await late).toBe(false)
-    expect(rig.store.getSessionTabId(id)).toBe('source-tab')
-    expect(
-      await rig.store.setSwitchedSessionTabVisibility(id, 'another-tab', false, () => true)
-    ).toBe(false)
-    expect(rig.store.getSessionTabId(id)).toBe('source-tab')
-  })
-}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-socket.test-fixture.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-socket.test-fixture.ts
deleted file mode 100644
index 6827bb6af814..000000000000
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-socket.test-fixture.ts
+++ /dev/null
@@ -1,133 +0,0 @@
-import '../../daemon/mock-descendant-sweep'
-import type { DaemonServer } from '../../daemon/daemon-server'
-import type { DaemonClientConnections } from '../../daemon/daemon-client-connections'
-import * as transport from '../../daemon/daemon-client-socket-connect'
-import { vi } from 'vitest'
-export type SwitchSocketFaultState = {
-  receiverDelay: number
-  connectionUnavailable: boolean
-  boundaryGcDrained: boolean
-  commitRequestId: string
-  ordinaryRequestId: string
-  lateOrdinaryReply: (() => void) | undefined
-  settlementOutcomes: string[]
-}
-export function installSwitchSocketFaults(
-  boundary: string,
-  ordinaryLoss: boolean,
-  expired: boolean,
-  outage: boolean,
-  server: DaemonServer,
-  wire: SwitchSocketFaultState
-) {
-  const connect = transport.connectDaemonSocket
-  vi.spyOn(transport, 'connectDaemonSocket').mockImplementation(async (...args) => {
-    if (wire.connectionUnavailable) {
-      throw new Error('Connection lost')
-    }
-    const socket = await connect(...args)
-    let received = ''
-    socket.on('data', (chunk) => {
-      received += String(chunk)
-      const lines = received.split('\n')
-      received = lines.pop() ?? ''
-      for (const line of lines) {
-        const response = JSON.parse(line)
-        if (response.payload?.settlement) {
-          wire.settlementOutcomes.push(response.payload.settlement.outcome)
-        }
-      }
-    })
-    const write = socket.write.bind(socket)
-    vi.spyOn(socket, 'write').mockImplementation((...values: Parameters<typeof socket.write>) => {
-      const frame = JSON.parse(String(values[0]))
-      if (
-        ordinaryLoss &&
-        frame.type === 'createOrAttach' &&
-        frame.payload?.sessionId !== 'unrelated-sibling' &&
-        !frame.payload?.attachOnly
-      ) {
-        wire.ordinaryRequestId = frame.id
-        if (boundary === 'legacy-never-created') {
-          return true
-        }
-        // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: retain/drop only the owned original ordinary response bytes; sockets and sibling stay live.
-        const peers = (server as unknown as { connections: DaemonClientConnections }).connections
-        const peer = [...peers.values()].at(-1)?.controlSocket
-        if (!peer) {
-          throw new Error('ordinary fixture peer missing')
-        }
-        const respond = peer.write.bind(peer)
-        vi.spyOn(peer, 'write').mockImplementation((...args: Parameters<typeof peer.write>) => {
-          const response = JSON.parse(String(args[0]))
-          if (response.id === wire.ordinaryRequestId) {
-            wire.lateOrdinaryReply = () => {
-              respond(...args)
-            }
-            return true
-          }
-          return respond(...args)
-        })
-      }
-
-      if (
-        (boundary === 'gc-outage' || boundary === 'native-gc-outage') &&
-        frame.payload?.release &&
-        !wire.boundaryGcDrained &&
-        !wire.connectionUnavailable
-      ) {
-        wire.connectionUnavailable = true
-        socket.destroy()
-        return true
-      }
-      if (
-        boundary === 'stale-daemon-token' &&
-        frame.payload?.switchExecution?.phase === 'prepare'
-      ) {
-        // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the fixture owns both authenticated sockets; simulate old development response bytes only.
-        const peers = (server as unknown as { connections: DaemonClientConnections }).connections
-        const peer = [...peers.values()].at(-1)?.controlSocket
-        if (!peer) {
-          throw new Error('fixture peer missing')
-        }
-        const respond = peer.write.bind(peer)
-        vi.spyOn(peer, 'write').mockImplementation((...args: Parameters<typeof peer.write>) => {
-          const reply = JSON.parse(String(args[0]))
-          if (reply.payload?.retention) {
-            reply.payload.retention = 'consumer-release-v1'
-          }
-          return respond(`${JSON.stringify(reply)}\n`)
-        })
-      }
-      if (frame.payload?.switchExecution?.phase === 'commit') {
-        wire.commitRequestId = frame.id
-        if (expired) {
-          wire.receiverDelay = 720_001
-        }
-        if (outage) {
-          // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: this fixture owns both ends of this authenticated transport.
-          const peers = (server as unknown as { connections: DaemonClientConnections }).connections
-          const peer = [...peers.values()].at(-1)?.controlSocket
-          if (!peer) {
-            throw new Error('fixture control socket missing')
-          }
-          const respond = peer.write.bind(peer)
-          vi.spyOn(peer, 'write').mockImplementation((...args: Parameters<typeof peer.write>) => {
-            const response = JSON.parse(String(args[0]))
-            if (response.payload?.settlement) {
-              wire.settlementOutcomes.push(response.payload.settlement.outcome)
-            }
-            if (outage && response.id === wire.commitRequestId) {
-              wire.connectionUnavailable = true
-              peer.destroy()
-              return true
-            }
-            return respond(...args)
-          })
-        }
-      }
-      return write(...values)
-    })
-    return socket
-  })
-}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-stop.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-stop.test.ts
deleted file mode 100644
index de745e76ae04..000000000000
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-stop.test.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import { agentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
-import {
-  createRestTestRig,
-  foundRestTestChat,
-  REST_TEST_CALLER as caller,
-  REST_TEST_SESSION as id,
-  type RestTestRig
-} from './structured-agent-session-rest-test-rig'
-import { createTestParams } from './structured-agent-session-create-test-fixture'
-
-let rig: RestTestRig
-let deadline: ReturnType<typeof agentSessionSwitchDeadline>
-beforeEach(async () => {
-  rig = await createRestTestRig({ idleSweep: { intervalMs: 60_000 } })
-  deadline = agentSessionSwitchDeadline()
-})
-afterEach(async () => {
-  deadline.dispose()
-  await rig.dispose()
-})
-
-it.each(['idle', 'replying'] as const)(
-  'joins ordinary %s Stop and physical exit before reopening',
-  async (state) => {
-    if (state === 'replying') {
-      await foundRestTestChat(rig)
-    } else {
-      expect(await rig.host.create(caller, createTestParams())).toMatchObject({ ok: true })
-      expect(await rig.host.switchToChat(id)).toMatchObject({ ok: true })
-    }
-    const exit = Promise.withResolvers<boolean>()
-    const entered = Promise.withResolvers<void>()
-    rig.adapter.closeSession.mockImplementation(async () => {
-      entered.resolve()
-      return exit.promise
-    })
-    const acquired = rig.adapter.acquire.mock.calls.length
-    const dispatches = rig.adapter.dispatch.mock.calls.length
-    const destination = vi.fn(async () => rig.host.switchToChat(id))
-    const switched = rig.host.stopForSwitch(id, caller, deadline).then(destination)
-    await Promise.race([
-      entered.promise,
-      switched.then(() => {
-        throw new Error('destination opened without stopping the source')
-      })
-    ])
-    expect(destination).not.toHaveBeenCalled()
-    expect(rig.adapter.acquire).toHaveBeenCalledTimes(acquired)
-    exit.resolve(true)
-    expect(await switched).toMatchObject({ ok: true })
-    expect(destination).toHaveBeenCalledOnce()
-    expect(rig.adapter.acquire).toHaveBeenCalledTimes(acquired + 1)
-    expect(rig.adapter.dispatch).toHaveBeenCalledTimes(dispatches)
-  }
-)
-
-it('keeps an unproven source owned and never starts its destination', async () => {
-  expect(await rig.host.create(caller, createTestParams())).toMatchObject({ ok: true })
-  expect(await rig.host.switchToChat(id)).toMatchObject({ ok: true })
-  rig.adapter.closeSession.mockResolvedValue(false)
-  const destination = vi.fn()
-  await expect(rig.host.stopForSwitch(id, caller, deadline).then(destination)).rejects.toBeDefined()
-  expect(rig.adapter.closeSession).toHaveBeenCalled()
-  expect(destination).not.toHaveBeenCalled()
-  expect(rig.host.collaboratorsForTests().sessions.get(id)?.child).toBeTruthy()
-  expect((await rig.host.journalSnapshot(id)).items).toBeDefined()
-})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts
index 4bfc20f43b12..27e9930feefb 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-terminal-writer-acquire.test.ts
@@ -2,8 +2,6 @@ import {
   assertCliConversationWritersExited,
   posixCliWriterShellAlone
 } from '../../runtime/structured-agent-cli-writers'
-import { appendAgentSessionProviderHandleLink } from '../../../shared/agent-session-provider-handle'
-import { agentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
 import type { AgentSessionRecord } from '../../../shared/agent-session-record'
 import type { SleepingAgentSessionRecord } from '../../../shared/agent-session-resume'
 const physicalSnapshot = vi.hoisted(() => vi.fn())
@@ -11,7 +9,6 @@ vi.mock('../../../shared/process-table-snapshot-reader', async (importOriginal)
   ...(await importOriginal<object>()),
   getFreshShellForegroundSnapshot: physicalSnapshot
 }))
-import { retireChatForAdmittedTerminalLaunch } from '../../runtime/session-tabs/structured-session-terminal-launch-retirement'
 import { setStructuredAgentSessionHost } from './structured-agent-session-registry'
 import { mkdtemp, rm } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
@@ -19,21 +16,14 @@ import { join } from 'node:path'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope'
 import { agentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
-import { agentSessionLeaseOwnerVerdict } from '../../../shared/agent-session-lease-adjudication'
 import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding'
 import type { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
-import {
-  seedTestAgentSessionRecordStore,
-  openTestAgentSessionRecordStore
-} from '../../runtime/agent-session-record-store-test-harness'
+import { openTestAgentSessionRecordStore } from '../../runtime/agent-session-record-store-test-harness'
 import {
   closeTestJournalHostDatabase,
   openTestJournalHostDatabase
 } from '../agent-session-journal/journal-host-database-test-support'
-import {
-  AgentSessionAcquisitionRefusal,
-  type StructuredAgentSessionAdapter
-} from './structured-agent-session-adapter'
+import type { StructuredAgentSessionAdapter } from './structured-agent-session-adapter'
 import {
   NO_STRUCTURED_AGENTS,
   structuredAgentsDeclaringNothing
@@ -192,250 +182,6 @@ it('refuses the chat agent start while a terminal writes its conversation, once
 })
 
 // The switch is idle-only and proves the stop; subsequent sends use ordinary G-acquire.
-it('switches an idle chat to its terminal and a racing send starts no second writer', async () => {
-  const order: string[] = []
-  closeSession.mockImplementation(async () => {
-    order.push('stop')
-    return true
-  })
-  await host.switchToTerminal(SESSION)
-  expect(order).toEqual(['stop'])
-  terminalWriting = true
-  expect(agentSessionLeaseOwnerVerdict(store.getRecord(SESSION)!.lease)).toBe('exited')
-  const spawnsBefore = acquire.mock.calls.length
-  const raced = await rejection(await send('from another window'))
-  expect(raced?.rejection).toMatchObject({ kind: 'conversationOpenInTerminal' })
-  expect(acquire.mock.calls.length).toBe(spawnsBefore)
-})
-
-it('stops a starting chat without granting an unproven terminal handoff', async () => {
-  await host.close(SESSION, 'evict')
-  let release = (): void => undefined
-  const started = new Promise<void>((resolve) => {
-    release = resolve
-  })
-  let signal: AbortSignal | undefined
-  acquire.mockImplementationOnce(async (attempt) => {
-    signal = attempt.signal
-    await started
-    return acquire.getMockImplementation()!(attempt)
-  })
-  await send('starts the agent')
-  await vi.waitFor(() => expect(signal).toBeDefined())
-  try {
-    await expect(host.switchToTerminal(SESSION)).rejects.toMatchObject({
-      refusal: { details: { reason: 'ownerUnproven' } }
-    })
-    expect(signal?.aborted).toBe(true)
-  } finally {
-    release()
-  }
-})
-
-// Terminal to chat: the chat's agent starts with no send, and only its ready provider is success.
-it('starts the chat that holds the conversation for a switch from its terminal', async () => {
-  await host.close(SESSION, 'evict')
-  terminalWriting = true
-  const spawnsBefore = acquire.mock.calls.length
-  expect(await host.switchToChat(SESSION)).toMatchObject({
-    ok: false,
-    refusal: { details: { reason: 'conversationOpenInTerminal' } }
-  })
-  expect(acquire.mock.calls.length).toBe(spawnsBefore)
-
-  terminalWriting = false
-  open.mockRejectedValueOnce(
-    new AgentSessionAcquisitionRefusal('thread has an active writer', 'conversationOpenElsewhere')
-  )
-  expect(await host.switchToChat(SESSION)).toMatchObject({
-    ok: false,
-    refusal: {
-      code: 'agent_session_operation_invalid',
-      details: { reason: 'conversationOpenElsewhere' }
-    }
-  })
-
-  expect(await host.switchToChat(SESSION)).toEqual({ ok: true })
-  expect(host.collaboratorsForTests().sessions.get(SESSION)?.child?.phase).toBe('ready')
-  expect(vi.mocked(host.deps.adapter.dispatch)).not.toHaveBeenCalled()
-})
-
-// A delayed admitted launch retires presentation only, even if a later send already restarted the chat.
-it('retires only after an explicit admitted launch without stopping a later native child', async () => {
-  setStructuredAgentSessionHost(host)
-  await host.setSessionTabVisibility(SESSION, true)
-  await host.switchToTerminal(SESSION)
-  const runtime = { retireStructuredAgentSessionTabFromSnapshot: vi.fn(() => true) }
-  const args = {
-    resumeOrigin: 'switch',
-    worktreeId: store.getRecord(SESSION)?.location.workspaceId
-  }
-  const decision = {
-    agent: 'codex' as const,
-    providerSession: { key: 'session_id' as const, id: THREAD },
-    verdict: 'admitted' as const
-  }
-  for (const result of [
-    {},
-    { savedResumeDecision: { ...decision, verdict: 'unverifiable' as const } },
-    { savedResumeDecision: decision, isReattach: true }
-  ]) {
-    await retireChatForAdmittedTerminalLaunch(runtime, args, result)
-    expect(store.getVisibleSessionTabIndex()?.sessionIds).toContain(SESSION)
-  }
-  expect(await host.switchToChat(SESSION)).toEqual({ ok: true })
-  const laterChild = host.collaboratorsForTests().sessions.get(SESSION)?.child
-  const closes = closeSession.mock.calls.length
-  await retireChatForAdmittedTerminalLaunch(runtime, args, { savedResumeDecision: decision })
-  expect(store.getVisibleSessionTabIndex()?.sessionIds).not.toContain(SESSION)
-  expect(runtime.retireStructuredAgentSessionTabFromSnapshot).toHaveBeenCalledWith(SESSION)
-  expect(host.collaboratorsForTests().sessions.get(SESSION)?.child).toBe(laterChild)
-  expect(closeSession).toHaveBeenCalledTimes(closes)
-})
-
-it.each([10, 100])(
-  'retires distinct holders once despite %i matching resumed links',
-  async (count) => {
-    await host.switchToTerminal(SESSION)
-    await store.transitionHandoff(SESSION, (record) => {
-      let chain = record.providerHandleChain
-      for (let fence = 2; fence <= count; fence += 1) {
-        chain = appendAgentSessionProviderHandleLink(chain, {
-          ...chain.at(-1)!,
-          linkId: `retirement-link-${fence}`,
-          mintedAtFence: fence,
-          origin: 'resumed'
-        })
-      }
-      return {
-        ...record,
-        providerHandleChain: chain,
-        lease: { ...record.lease, runtimeFence: count }
-      }
-    })
-    const record = store.getRecord(SESSION)!
-    await seedTestAgentSessionRecordStore(root, {
-      records: [
-        record,
-        {
-          ...record,
-          sessionId: 'distinct-holder',
-          lease: { ...record.lease, sessionId: 'distinct-holder' }
-        },
-        {
-          ...record,
-          sessionId: 'wrong-workspace',
-          lease: { ...record.lease, sessionId: 'wrong-workspace' },
-          location: { ...record.location, workspaceId: 'another-workspace' }
-        },
-        {
-          ...record,
-          sessionId: 'wrong-host',
-          lease: { ...record.lease, sessionId: 'wrong-host' },
-          location: { ...record.location, executionHostId: 'ssh:another-host' }
-        },
-        {
-          ...record,
-          sessionId: 'strong-holder',
-          lease: { ...record.lease, sessionId: 'strong-holder' }
-        }
-      ]
-    })
-    store = await openTestAgentSessionRecordStore(root)
-    Object.assign(host.deps, { store })
-    setStructuredAgentSessionHost(host)
-    const held = Promise.withResolvers<void>()
-    const started = Promise.withResolvers<void>()
-    const deadline = agentSessionSwitchDeadline()
-    const strong = host.runSwitch(
-      'strong-holder',
-      'retirement-command',
-      deadline,
-      async () => {
-        started.resolve()
-        await held.promise
-        return { status: 'completed', sessionId: 'strong-holder' }
-      },
-      { direction: 'terminal' }
-    )
-    const visibility = vi.spyOn(host, 'setSessionTabVisibility')
-    const dismiss = vi.spyOn(host.restartResume, 'dismiss')
-    const runtime = { retireStructuredAgentSessionTabFromSnapshot: vi.fn(() => true) }
-    try {
-      await Promise.race([started.promise, strong])
-      await retireChatForAdmittedTerminalLaunch(
-        runtime,
-        {
-          resumeOrigin: 'switch',
-          worktreeId: record.location.workspaceId
-        },
-        {
-          savedResumeDecision: {
-            agent: 'codex',
-            providerSession: { key: 'session_id', id: THREAD },
-            verdict: 'admitted'
-          }
-        }
-      )
-      expect(visibility.mock.calls.map(([id]) => id)).toEqual([SESSION, 'distinct-holder'])
-      expect(dismiss.mock.calls).toEqual([[[SESSION]], [['distinct-holder']]])
-      expect(runtime.retireStructuredAgentSessionTabFromSnapshot.mock.calls).toEqual([
-        [SESSION],
-        ['distinct-holder']
-      ])
-      expect(closeSession).toHaveBeenCalledOnce()
-    } finally {
-      held.resolve()
-      await strong
-      deadline.dispose()
-    }
-  }
-)
-
-it.each(['ready', 'failed', 'closed', 'replaced'] as const)(
-  'awaits provider open for the selected child, whose result is %s',
-  async (ending) => {
-    await host.close(SESSION, 'evict')
-    const held = Promise.withResolvers<void>()
-    open.mockImplementationOnce(async () => {
-      await held.promise
-      if (ending === 'failed') {
-        throw new AgentSessionAcquisitionRefusal('provider failed')
-      }
-      return { reportedOptions: { model: '' } }
-    })
-    let settled = false
-    const switching = host.switchToChat(SESSION).then((result) => {
-      settled = true
-      return result
-    })
-    await vi.waitFor(() => expect(open).toHaveBeenCalledTimes(2))
-    const child = host.collaboratorsForTests().sessions.get(SESSION)?.child
-    expect(child?.phase).toBe('starting')
-    expect(settled).toBe(false)
-    let replacement = child
-    if (ending === 'closed' || ending === 'replaced') {
-      await host.close(SESSION, 'evict')
-    }
-    if (ending === 'replaced') {
-      expect(await host.switchToChat(SESSION)).toEqual({ ok: true })
-      replacement = host.collaboratorsForTests().sessions.get(SESSION)?.child
-      expect(replacement?.generation).not.toBe(child?.generation)
-    }
-    held.resolve()
-    expect(await switching).toMatchObject({ ok: ending === 'ready' })
-    expect(vi.mocked(host.deps.adapter.dispatch)).not.toHaveBeenCalled()
-    if (ending === 'replaced') {
-      expect(host.collaboratorsForTests().sessions.get(SESSION)?.child).toBe(replacement)
-    }
-    if (ending === 'closed') {
-      expect(await host.switchToChat(SESSION)).toEqual({ ok: true })
-      expect(host.collaboratorsForTests().sessions.get(SESSION)?.child?.generation).not.toBe(
-        child?.generation
-      )
-    }
-  }
-)
 
 it('acquires when only a saved Sleep note remains, but refuses an existing unknown terminal', async () => {
   const saved: SleepingAgentSessionRecord = {
diff --git a/src/main/native-chat/agent-session-wire/structured-provider-session-ownership.ts b/src/main/native-chat/agent-session-wire/structured-provider-session-ownership.ts
index 2e592e00768a..a6f3e6c0656e 100644
--- a/src/main/native-chat/agent-session-wire/structured-provider-session-ownership.ts
+++ b/src/main/native-chat/agent-session-wire/structured-provider-session-ownership.ts
@@ -6,7 +6,6 @@ import type { StructuredAgentId } from '../../../shared/agent-session-provider-h
 import { agentSessionLeasePossiblyWriting } from '../../../shared/agent-session-lease-adjudication'
 export { agentSessionLeasePossiblyWriting } from '../../../shared/agent-session-lease-adjudication'
 import { structuredAgentRuntimeMetadata } from '../../runtime/structured-agent-runtime-metadata'
-import { inPlaceSwitchEnabled } from '../../../shared/structured-agent-cli-conversation-adoption'
 import {
   keysMayMatch,
   recordConversationKey,
@@ -57,8 +56,8 @@ export function listStructuredProviderSessionOwnership(
 }
 
 /** Agents whose chats let a terminal resume the same conversation once the chat stopped writing. */
-export function sameIdTerminalResumeEnabled(provider: StructuredAgentId): boolean {
-  return inPlaceSwitchEnabled(provider)
+export function sameIdTerminalResumeEnabled(_provider: StructuredAgentId): boolean {
+  return false
 }
 
 /** Whether a terminal resume of this link's conversation is refused. */
diff --git a/src/main/persistence/terminal-topology/original-terminal-close-store.test.ts b/src/main/persistence/terminal-topology/original-terminal-close-store.test.ts
index eb1fd35edd2d..4885e78e881b 100644
--- a/src/main/persistence/terminal-topology/original-terminal-close-store.test.ts
+++ b/src/main/persistence/terminal-topology/original-terminal-close-store.test.ts
@@ -48,52 +48,6 @@ async function opened() {
   return { ...opened, originalPresentation }
 }
 
-it.each(['successor', 'new holder'] as const)(
-  'checks %s at queued admission, preserving membership and future commands',
-  async (change) => {
-    const { store, authority, originalPresentation } = await opened()
-    const pause = authority.pause()
-    const preceding = store.runDurableMutation(() => ({ value: undefined }))
-    await pause.started.promise
-    const closing = applyWindowLayoutCommand(store, () => ['local'], command, undefined, {
-      originalPresentation,
-      admit: () => true
-    })
-    // A replacement commits before the close is admitted, after its caller already dispatched it.
-    const state = store.getWorkspaceSession()
-    if (change === 'new holder') {
-      store.setWorkspaceSession(state, 'ssh:new-holder')
-    } else {
-      store.setWorkspaceSession({
-        ...state,
-        tabsByWorktree: {
-          ...state.tabsByWorktree,
-          [pane.worktreeId]: state.tabsByWorktree[pane.worktreeId].map((row) => ({
-            ...row,
-            generation: (row.generation ?? 0) + 1
-          }))
-        }
-      })
-    }
-    const refused = expect(closing).rejects.toThrow('terminal_pane_owner_changed')
-    pause.finish.resolve()
-    await preceding
-    await refused
-    expect(
-      store.getWorkspaceSession().tabsByWorktree[pane.worktreeId].map((row) => row.id)
-    ).toContain(pane.tabId)
-    await expect(
-      store.applyLayoutCommand({
-        type: 'renameTab',
-        workspace: pane.worktreeId,
-        tabId: pane.tabId,
-        kind: 'custom',
-        title: 'Still usable'
-      })
-    ).resolves.toMatchObject({ ok: true })
-  }
-)
-
 it('requires the captured close write, retains the applied removal on failure and reloads its later durable intent', async () => {
   const { store, authority, originalPresentation, readState, directory, path } = await opened()
   authority.failNextWrite()
diff --git a/src/main/providers/agent-foreground-process-real-rows.test.ts b/src/main/providers/agent-foreground-process-real-rows.test.ts
index db4adfeddaf0..fd86e2073987 100644
--- a/src/main/providers/agent-foreground-process-real-rows.test.ts
+++ b/src/main/providers/agent-foreground-process-real-rows.test.ts
@@ -1,4 +1,3 @@
-import { resolveSuspendedAgentProcessFromPs } from './suspended-agent-process'
 import { readFileSync } from 'node:fs'
 import { join } from 'node:path'
 import { gunzipSync } from 'node:zlib'
@@ -36,20 +35,3 @@ describe('real foreground process captures', () => {
     ])
   })
 })
-
-it('keeps a stopped real Codex subtree distinct from foreground routing after Ctrl-Z', () => {
-  const captures: CapturedRun[] = JSON.parse(
-    gunzipSync(readFileSync(join(__dirname, '__fixtures__', 'real-agent-rows.json.gz'))).toString(
-      'utf8'
-    )
-  )
-  const capture = captures.find((run) => run.agent === 'codex')!
-  const stopped = capture.rows.map((row) =>
-    row.pid === capture.shellPid
-      ? { ...row, stat: 'Ss+' }
-      : { ...row, stat: row.stat.replace('+', '').replace(/^[A-Za-z]/, 'T') }
-  )
-  expect(resolveAgentForegroundProcessFromPs(stopped, capture.shellPid)).toBeNull()
-  expect(resolveSuspendedAgentProcessFromPs(stopped, capture.shellPid)).toBe('codex')
-  expect(resolveSuspendedAgentProcessFromPs(capture.rows, capture.shellPid)).toBeNull()
-})
diff --git a/src/main/providers/local-pty-provider-shutdown.test.ts b/src/main/providers/local-pty-provider-shutdown.test.ts
index 902b531be6db..70c037319ec9 100644
--- a/src/main/providers/local-pty-provider-shutdown.test.ts
+++ b/src/main/providers/local-pty-provider-shutdown.test.ts
@@ -171,17 +171,6 @@ describe('LocalPtyProvider', () => {
   })
 
   describe('shutdown', () => {
-    it('fences the actual local shutdown before cancelling or signalling a replacement', async () => {
-      const kill = mockProc.kill
-      const { id, incarnationId } = await provider.spawn({ cols: 80, rows: 24 })
-      await expect(
-        provider.shutdown(id, { immediate: true, expectedIncarnationId: 'earlier' })
-      ).rejects.toThrow('terminal_handle_stale')
-      expect(kill).not.toHaveBeenCalled()
-      await provider.shutdown(id, { immediate: true, expectedIncarnationId: incarnationId })
-      expect(kill).toHaveBeenCalled()
-    })
-
     it('kills the PTY process', async () => {
       // Cleanup replaces kill to prevent recycled-PID SIGHUP; capture the spy before shutdown (docs/fix-pty-fd-leak.md).
       const killSpy = mockProc.kill
diff --git a/src/main/providers/local-pty-switch-cleanup.test.ts b/src/main/providers/local-pty-switch-cleanup.test.ts
deleted file mode 100644
index 89f0a959ccf3..000000000000
--- a/src/main/providers/local-pty-switch-cleanup.test.ts
+++ /dev/null
@@ -1,156 +0,0 @@
-import { afterEach, expect, it, vi } from 'vitest'
-import type { IPty } from 'node-pty'
-import type { ProcessTableRow } from '../../shared/process-table-snapshot'
-import { LocalPtyProvider } from './local-pty-provider'
-import {
-  ptyProcesses,
-  ptyIncarnations,
-  ptyShellPath,
-  ptyPhysicalExits,
-  LocalPtyPhysicalExit,
-  clearPtyState
-} from './local-pty-provider-state'
-import type * as PtyDescendantTerminationModule from '../pty-descendant-termination'
-import type * as ProcessTableSnapshotReaderModule from '../../shared/process-table-snapshot-reader'
-
-const table = vi.hoisted(() => vi.fn())
-vi.mock('../../shared/process-table-snapshot-reader', async (importOriginal) => ({
-  ...(await importOriginal<typeof ProcessTableSnapshotReaderModule>()),
-  getProcessTableSnapshot: async () => (await table()).rows,
-  getStrictProcessTableSnapshotWithAge: () => table()
-}))
-vi.mock('../pty/posix-pty-process-groups', () => ({
-  forceKillPosixPtyProcessGroups: (_pid: number, killRoot: () => void) => killRoot(),
-  forceKillPosixPtyProcessGroupsSync: (_pid: number, killRoot: () => void) => killRoot()
-}))
-vi.mock('../pty-descendant-termination', async (importOriginal) => {
-  const sweep = await importOriginal<typeof PtyDescendantTerminationModule>()
-  return {
-    ...sweep,
-    killWithDescendantSweep: (
-      pid: number,
-      killRoot: () => void,
-      options: Parameters<typeof sweep.killWithDescendantSweep>[2]
-    ) =>
-      sweep.killWithDescendantSweep(pid, killRoot, {
-        ...options,
-        platform: 'linux',
-        readTable: async () => {
-          await table()
-          return { rows: [], capturedAtMs: 0 }
-        }
-      })
-  }
-})
-const id = 'switch-cleanup-fixture'
-const incarnation = '45454545-4545-4545-8545-454545454545'
-const shell: ProcessTableRow = {
-  pid: 12000,
-  ppid: 1,
-  pgid: 12000,
-  tpgid: 12000,
-  tty: 'pts/7',
-  stat: 'Ss+',
-  command: '/bin/zsh'
-}
-const snapshot = (rows: ProcessTableRow[]) => ({ rows, capturedAgeMs: 0 })
-afterEach(() => {
-  clearPtyState(id)
-  vi.restoreAllMocks()
-  table.mockReset()
-})
-function setup() {
-  const owner = new LocalPtyPhysicalExit()
-  const kill = vi.fn(() => {
-    owner.markExited()
-    clearPtyState(id)
-  })
-  const proc: IPty = {
-    pid: shell.pid,
-    cols: 80,
-    rows: 24,
-    process: 'zsh',
-    handleFlowControl: false,
-    onData: () => ({ dispose: () => {} }),
-    onExit: () => ({ dispose: () => {} }),
-    write: vi.fn(),
-    resize: () => {},
-    clear: () => {},
-    pause: () => {},
-    resume: () => {},
-    kill
-  }
-  ptyProcesses.set(id, proc)
-  ptyIncarnations.set(id, incarnation)
-  ptyShellPath.set(id, '/bin/zsh')
-  ptyPhysicalExits.set(id, owner)
-  owner.witness = {
-    token: 'captured-before-probe',
-    at: performance.now(),
-    revision: owner.useRevision
-  }
-  table.mockResolvedValue(snapshot([shell]))
-  return { provider: new LocalPtyProvider(), proc, owner, kill }
-}
-const request = () => ({
-  id,
-  expectedIncarnationId: incarnation,
-  requireNoAgentOwner: true,
-  requireUnattached: false,
-  switchCondition: {
-    token: 'captured-before-probe',
-    remainingMs: 10_000,
-    ownedSpawn: true as const
-  }
-})
-
-it.each(['input', 'attachment', 'preparing launch'] as const)(
-  'keeps the real local owner usable when %s races the final probe',
-  async (change) => {
-    const { provider, proc, kill } = setup()
-    const entered = Promise.withResolvers<void>()
-    const release = Promise.withResolvers<void>()
-    table.mockImplementation(async () => {
-      entered.resolve()
-      await release.promise
-      return snapshot([shell])
-    })
-    const closing = provider.killFenced(request())
-    await entered.promise
-    if (change === 'input') {
-      expect(provider.write(id, 'codex\r')).toBe(true)
-    }
-    if (change === 'attachment') {
-      await provider.attach(id)
-    }
-    let releaseLaunch: (() => void) | undefined
-    let launching: Promise<unknown> | undefined
-    if (change === 'preparing launch') {
-      const { runCancelableLocalPtySpawn } = await import('./local-pty-spawn-state')
-      const wait = Promise.withResolvers<void>()
-      releaseLaunch = wait.resolve
-      launching = runCancelableLocalPtySpawn(id, () => wait.promise)
-    }
-    release.resolve()
-    expect(await closing).toMatchObject({ outcome: 'refused' })
-    expect(kill).not.toHaveBeenCalled()
-    expect(ptyProcesses.get(id)).toBe(proc)
-    expect(provider.write(id, 'echo still here\r')).toBe(true)
-    releaseLaunch?.()
-    await launching
-  }
-)
-it('cleans up only a captured unused new spawn; obsolete source-shell witnesses never authorize it', async () => {
-  const { provider, kill } = setup()
-  const sourceRequest = {
-    ...request(),
-    switchCondition: { token: 'captured-before-probe', remainingMs: 10_000 }
-  }
-  expect(await provider.killFenced(sourceRequest)).toEqual({
-    outcome: 'refused',
-    reason: 'unsupported'
-  })
-  expect(kill).not.toHaveBeenCalled()
-  expect(await provider.killFenced(request())).toEqual({ outcome: 'ended' })
-  expect(kill).toHaveBeenCalledOnce()
-})
diff --git a/src/main/runtime/agent-session-inventory-scale.test.ts b/src/main/runtime/agent-session-inventory-scale.test.ts
index cb343c68b311..2a4b6d6dad8f 100644
--- a/src/main/runtime/agent-session-inventory-scale.test.ts
+++ b/src/main/runtime/agent-session-inventory-scale.test.ts
@@ -524,8 +524,8 @@ describe('real conversation inventory work', () => {
       expect(slept.stoppedSessionIds).not.toContain('damaged-chat')
       expect(slept.failures?.some((row) => row.sessionId === 'damaged-chat')).toBe(true)
       expect(work.counts.inventories).toBe(1)
-      // One inventory and seven checked observations, including post-revocation membership, per selected healthy member.
-      expect(work.counts.views).toBe(n + 1 + 7 * (n / 2 + 1))
+      // One inventory and six checked observations per selected healthy member.
+      expect(work.counts.views).toBe(n + 1 + 6 * (n / 2 + 1))
       expect(rig.store.getConversation(rig.rows[1]!.sessionId)?.location.workspaceId).toBe('other')
       work.reset()
       expect(rig.host.knownAgentIds()).toContain('claude')
diff --git a/src/main/runtime/agent-session-tab-layout-queue.test.ts b/src/main/runtime/agent-session-tab-layout-queue.test.ts
index 464f1a028f1e..3edbf568755d 100644
--- a/src/main/runtime/agent-session-tab-layout-queue.test.ts
+++ b/src/main/runtime/agent-session-tab-layout-queue.test.ts
@@ -55,32 +55,3 @@ it('goes on past a batch whose changes cannot be read', async () => {
   expect(warn).toHaveBeenCalledOnce()
   warn.mockRestore()
 })
-
-it('awaits the actual layout apply and refuses a revoked invocation after queueing', async () => {
-  const entered = Promise.withResolvers<void>()
-  const release = Promise.withResolvers<void>()
-  let authority = true
-  let changed = false
-  const queue = createChatTabLayoutQueue({
-    sessionOf: () => null,
-    hostIdOf: () => 'local',
-    apply: async (_command, run) => {
-      entered.resolve()
-      await release.promise
-      if (run?.admit && !run.admit()) {
-        return { ok: false, code: 'tab_not_found' }
-      }
-      changed = true
-      return { ok: true, result: {} }
-    }
-  })
-  const result = queue(
-    () => [open('source')],
-    () => authority
-  )
-  await entered.promise
-  authority = false
-  release.resolve()
-  expect(await result).toBe(false)
-  expect(changed).toBe(false)
-})
diff --git a/src/main/runtime/agent-session/ownership/agent-session-reservation-admission.test.ts b/src/main/runtime/agent-session/ownership/agent-session-reservation-admission.test.ts
index 6d3c00e3dad3..c2644c8287bb 100644
--- a/src/main/runtime/agent-session/ownership/agent-session-reservation-admission.test.ts
+++ b/src/main/runtime/agent-session/ownership/agent-session-reservation-admission.test.ts
@@ -110,8 +110,8 @@ describe('floating launch directory reservation', () => {
 
 describe('adopted conversation ownership', () => {
   it('refuses when another record already holds the same conversation root', () => {
-    // Compare conversation roots, not exact leaves, within the same account.
-    const holder = { ...agentSessionRecordFixture(), accountHome: reserveRequest().accountHome }
+    // Compare conversation roots, not exact leaves, or branches could admit two writers onto one conversation.
+    const holder = agentSessionRecordFixture()
 
     expect(() =>
       applyAgentSessionReservation(
@@ -122,20 +122,8 @@ describe('adopted conversation ownership', () => {
     ).toThrow('agent_session_conflict')
   })
 
-  it('admits the same conversation root in a distinct account', () => {
-    const holder = agentSessionRecordFixture()
-    expect(holder.accountHome).not.toEqual(reserveRequest().accountHome)
-    expect(() =>
-      applyAgentSessionReservation(
-        storeState([holder]),
-        reserveRequest({ adoptedHandleLink: adoptedLink() }),
-        LEASE_TTL_MS
-      )
-    ).not.toThrow()
-  })
-
   it('admits an adoption of a conversation no record holds', () => {
-    const holder = { ...agentSessionRecordFixture(), accountHome: reserveRequest().accountHome }
+    const holder = agentSessionRecordFixture()
 
     expect(() =>
       applyAgentSessionReservation(
@@ -154,7 +142,6 @@ describe('adopted conversation ownership', () => {
     const fixture = agentSessionRecordFixture()
     const holder: AgentSessionRecord = {
       ...fixture,
-      accountHome: reserveRequest().accountHome,
       providerHandleChain: [
         ...fixture.providerHandleChain,
         adoptedLink({
diff --git a/src/main/runtime/agent-session/ownership/agent-session-reservation-admission.ts b/src/main/runtime/agent-session/ownership/agent-session-reservation-admission.ts
index bf642a84a39b..fc4f322f0856 100644
--- a/src/main/runtime/agent-session/ownership/agent-session-reservation-admission.ts
+++ b/src/main/runtime/agent-session/ownership/agent-session-reservation-admission.ts
@@ -3,10 +3,6 @@
 import { agentSessionRefusalError } from '../../../../shared/agent-session-wire-refusals'
 import type { AgentSessionAdmissionModels } from '../../agent-session-record-options'
 import { chatAgentsShareConversations } from '../../../../shared/structured-agent-cli-conversation-adoption'
-import {
-  keysMayMatch,
-  recordConversationKey
-} from '../../../native-chat/structured-conversation-key'
 import {
   agentSessionOperationKey,
   evaluateAgentSessionOperation,
@@ -231,25 +227,19 @@ export function assertAdoptedConversationUnowned(
     return
   }
   const root = agentSessionProviderHandleRoot(adopted.handle)
-  const key = recordConversationKey(request, adopted)
   for (const record of listAgentSessionConversations(state)) {
     if (record.sessionId === request.sessionId) {
       continue
     }
     // Only the conversation a chat continues now: an earlier link no longer holds anything.
     const head = record.providerHandleChain.at(-1)
-    const headKey = head ? recordConversationKey(record, head) : null
     const holdsSameConversation =
       !!head &&
-      record.location.executionHostId === request.location.executionHostId &&
-      record.location.wslDistro === request.location.wslDistro &&
-      agentSessionAccountHomesEqual(record.accountHome, request.accountHome) &&
-      (key && headKey
-        ? keysMayMatch(headKey, key)
-        : agentSessionProviderHandleRoot(head.handle) === root ||
-          (head.handle.transport === adopted.handle.transport &&
-            head.handle.nativeId === adopted.handle.nativeId &&
-            chatAgentsShareConversations(head.handle.agent, adopted.handle.agent)))
+      (agentSessionProviderHandleRoot(head.handle) === root ||
+        // One id from two chat agents that open the same conversations (`opencode`, `opencode2`).
+        (head.handle.transport === adopted.handle.transport &&
+          head.handle.nativeId === adopted.handle.nativeId &&
+          chatAgentsShareConversations(head.handle.agent, adopted.handle.agent)))
     if (holdsSameConversation) {
       throw agentSessionRefusalError('agent_session_conflict', {
         reason: 'conversationHeldElsewhere',
diff --git a/src/main/runtime/bind-first-pane.test-fixture.ts b/src/main/runtime/bind-first-pane.test-fixture.ts
index 1a0977b465b1..c636c5c34870 100644
--- a/src/main/runtime/bind-first-pane.test-fixture.ts
+++ b/src/main/runtime/bind-first-pane.test-fixture.ts
@@ -1,4 +1,5 @@
 // L80: emulate the PTY host's binding commit before registration in layout-owner builds; switch-off writes nothing.
+import type { ExecutionHostId } from '../../shared/execution-host'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../shared/layout-owner-switch'
 import type { RuntimePtyController } from './runtime-pty-controller-contract'
 import type { WorkspaceSessionState } from '../../shared/workspace-session-state-types'
@@ -87,7 +88,7 @@ export function withBoundPane(
 export function bindPaneFirst(
   runtime: OrcaRuntimeService,
   pane: BoundPane,
-  hostId = 'local'
+  hostId: ExecutionHostId = 'local'
 ): void {
   if (!ORCA_LAYOUT_OWNER_IS_MAIN) {
     return
@@ -105,7 +106,7 @@ export function movePaneFirst(
   runtime: OrcaRuntimeService,
   fromTabId: string,
   pane: BoundPane,
-  hostId = 'local'
+  hostId: ExecutionHostId = 'local'
 ): void {
   if (!ORCA_LAYOUT_OWNER_IS_MAIN) {
     return
@@ -169,7 +170,7 @@ export function committingSpawn<
 >(
   runtime: OrcaRuntimeService,
   spawn: (args: Args) => Promise<Result>,
-  hostId = 'local'
+  hostId: ExecutionHostId = 'local'
 ): (args: Args) => Promise<Result> {
   return async (args) => {
     const commit = captureFakeSpawnBinding(runtime, args, hostId)
diff --git a/src/main/runtime/cli-terminal-create-host-session-binding.test.ts b/src/main/runtime/cli-terminal-create-host-session-binding.test.ts
index 6531bd5aa47f..daf302469b1b 100644
--- a/src/main/runtime/cli-terminal-create-host-session-binding.test.ts
+++ b/src/main/runtime/cli-terminal-create-host-session-binding.test.ts
@@ -355,27 +355,6 @@ it.each(['refused', 'adopted', 'stable-adopted', 'ensure-adopted', 'fresh-unavai
   }
 )
 
-it('does not fill missing unavailable launch facts from the rejected request', async () => {
-  const { runtime, spawn } = createRuntimeWithAttachedWindow()
-  spawn.mockResolvedValue({ id: 'effective-pty', agentResumeUnavailable: true })
-  const result = await runtime.createTerminal('id:repo-1::/tmp/wt-cli', {
-    launchAgent: 'claude',
-    title: 'Rejected C',
-    resumeOrigin: 'saved',
-    resumeProviderSession: { key: 'session_id', id: 'C' },
-    launchConfig: { agentCommand: 'claude', agentArgs: '', agentEnv: {} }
-  })
-  expect(result).toMatchObject({
-    ptyId: 'effective-pty',
-    title: 'Rejected C',
-    agentResumeUnavailable: true
-  })
-  expect(result.launchAgent).toBeUndefined()
-  expect(result.launchConfig).toBeUndefined()
-  expect(result.launchToken).toBeUndefined()
-  expect(spawn).toHaveBeenCalledOnce()
-})
-
 it.each(['unchanged', 'hook', 'config', 'incarnation', 'handle'] as const)(
   'samples the actual created PTY after snapshot awaits and revalidates %s on reconnect',
   async (change) => {
diff --git a/src/main/runtime/client-session-tab-selection.ts b/src/main/runtime/client-session-tab-selection.ts
index d6ecdc9975bd..a2cf137c4f19 100644
--- a/src/main/runtime/client-session-tab-selection.ts
+++ b/src/main/runtime/client-session-tab-selection.ts
@@ -22,6 +22,28 @@ export class ClientSessionTabSelectionStore {
   private statesByClient = new Map<string, Map<string, StoredClientSessionTabSelection>>()
   private persistListener: ((state: PersistedMobileClientTabSelections) => void) | null = null
 
+  private hostNavigationRevision = 0
+  private hostSelectionRequest = 0
+
+  /** Only explicit host-target navigation supersedes the host's delayed selection. */
+  noteHostNavigation(): void {
+    this.hostNavigationRevision++
+  }
+
+  captureHostSelection(): (consume?: boolean) => boolean {
+    const revision = this.hostNavigationRevision
+    const request = ++this.hostSelectionRequest
+    let pending = true
+    return (consume = false) => {
+      const current =
+        pending && revision === this.hostNavigationRevision && request === this.hostSelectionRequest
+      if (current && consume) {
+        pending = false
+      }
+      return current
+    }
+  }
+
   // Persist across host restart so phones do not snap back to the first tab.
   hydrate(persisted: PersistedMobileClientTabSelections): void {
     for (const [clientNavigationId, selectionsByWorktree] of Object.entries(
diff --git a/src/main/runtime/mobile-session-switch-placement.test.ts b/src/main/runtime/mobile-session-switch-placement.test.ts
deleted file mode 100644
index cccfca0a84a0..000000000000
--- a/src/main/runtime/mobile-session-switch-placement.test.ts
+++ /dev/null
@@ -1,147 +0,0 @@
-import { withRuntimePaneAdmission } from './runtime-durable-store-fixture'
-import { addWorkspace } from '../../shared/workspace-layout/workspace-layout-session.test-fixture'
-import { withChatTabChanges } from './agent-session/agent-session-tab-layout'
-import { observeSessionTabPlacementWork } from '../../shared/session-tab-placement-work.test-fixture'
-import * as profile from './profile-session-store.test-fixture'
-import { afterEach, expect, it, vi } from 'vitest'
-import type { RuntimeMobileSessionTabsSnapshot } from '../../shared/runtime-types'
-const { OrcaRuntimeService } = await import('./orca-runtime-test-mocks.spec')
-await import('./orca-runtime-test-lifecycle.spec')
-const { store, TEST_WORKTREE_ID: WT } = await import('./orca-runtime-test-fixtures.spec')
-
-afterEach(() => vi.restoreAllMocks())
-
-it.each([
-  { only: false, pinned: false, retire: true, n: 0 },
-  { only: true, pinned: false, retire: true, n: 0 },
-  { only: false, pinned: true, retire: true, n: 0 },
-  { only: false, pinned: true, retire: false, n: 0 },
-  ...[32, 320].map((n) => ({ only: false, pinned: false, retire: true, n }))
-])(
-  'preserves current headless placement and pin partitions ($only/$pinned/$retire/$n)',
-  async ({ only, pinned, retire, n }) => {
-    const runtimeStore: typeof store & Parameters<typeof withRuntimePaneAdmission>[0] = { ...store }
-    profile.announceSessionWrites(runtimeStore)
-    const session = profile.asProfileSessionStore(runtimeStore, 'local')
-    withRuntimePaneAdmission(runtimeStore)
-    const runtime = new OrcaRuntimeService(runtimeStore)
-    const [A, C, B, U, D] = ['A', 'C', 'B', 'U', 'D'].map((id) => `agent-session:${id}`)
-    const chat = (id: string) => ({
-      type: 'agent-session' as const,
-      id,
-      sessionId: id.slice(14),
-      agent: 'codex' as const,
-      title: id,
-      isActive: false,
-      isPinned: pinned && [A, C, B].includes(id)
-    })
-    const source = n
-      ? Array.from({ length: n }, (_, i) => (i === n / 2 ? C : `agent-session:old-${i}`))
-      : only
-        ? [C]
-        : pinned
-          ? [A, C, B, U]
-          : [A, C, B]
-    const current = Array.from({ length: n }, (_, i) => `agent-session:current-${i}`)
-    const work = observeSessionTabPlacementWork()
-    const snapshot = (left = source, snapshotVersion = 1): RuntimeMobileSessionTabsSnapshot => ({
-      worktree: WT,
-      publicationEpoch: 'headless:test',
-      snapshotVersion,
-      activeGroupId: 'R',
-      activeTabId: D,
-      activeTabType: 'agent-session',
-      tabs: [...left, D].map(chat),
-      tabGroups: [
-        { id: 'L', activeTabId: left.includes(C) ? C : left[0], tabOrder: left },
-        { id: 'R', activeTabId: D, tabOrder: [D] }
-      ]
-    })
-    const savedChat = (id: string) => ({
-      id,
-      entityId: chat(id).sessionId,
-      kind: 'agent-session' as const,
-      entry: { agentSessionAgent: 'codex' as const, isPinned: chat(id).isPinned }
-    })
-    const saved = addWorkspace(session.get('local'), WT, [
-      { id: 'L', tabs: source.map(savedChat), activeTabId: C },
-      { id: 'R', tabs: [savedChat(D)] }
-    ])
-    saved.activeGroupIdByWorktree![WT] = 'R'
-    session.set(saved, 'local')
-    runtime.syncWindowGraph(0, { tabs: [], leaves: [], mobileSessionTabs: [snapshot()] })
-    runtime.setPtyController({
-      spawn: vi.fn(async () => {
-        const closed = (n ? source : retire ? [C] : []).map(chat)
-        const changed = withChatTabChanges('local', session.get('local'), WT, [
-          ...current.map((id, i) => ({
-            open: {
-              sessionId: chat(id).sessionId,
-              agent: 'codex' as const,
-              tabId: id,
-              placement: { groupId: 'L', afterTabId: source[i] }
-            }
-          })),
-          ...closed.map(({ sessionId: close }) => ({ close }))
-        ])
-        if (changed) {
-          session.set(changed, 'local')
-        }
-        for (const { sessionId } of closed) {
-          expect(runtime.retireStructuredAgentSessionTabFromSnapshot(sessionId)).toBe(true)
-        }
-        if (n) {
-          runtime.syncWindowGraph(0, {
-            tabs: [],
-            leaves: [],
-            mobileSessionTabs: [snapshot(current, n + 2)]
-          })
-        }
-        await runtime.publishStructuredAgentSessionTab({
-          workspaceId: WT,
-          sessionId: 'concurrent',
-          agent: 'codex',
-          activate: false
-        })
-        return { id: 'pty-placement', incarnationId: '45454545-4545-4545-8545-454545454545' }
-      }),
-      write: () => true,
-      kill: () => true,
-      getForegroundProcess: async () => null
-    })
-    const created = await runtime.createMobileSessionTerminal(`id:${WT}`, {
-      afterTabId: C,
-      targetGroupId: 'L',
-      command: 'codex resume conversation',
-      activate: false
-    })
-    const result = await runtime.listMobileSessionTabs(`id:${WT}`)
-    expect(result.tabs.some((tab) => tab.id === C)).toBe(!retire)
-    expect(
-      result.tabs.some((tab) => tab.type === 'agent-session' && tab.sessionId === 'concurrent')
-    ).toBe(true)
-    if (!only) {
-      expect(result.tabGroups?.find((group) => group.id === 'L')?.tabOrder).toEqual(
-        n
-          ? [...current.slice(0, n / 2 + 1), created.tab.parentTabId, ...current.slice(n / 2 + 1)]
-          : pinned
-            ? [A, ...(!retire ? [C] : []), B, created.tab.parentTabId, U]
-            : [A, created.tab.parentTabId, B]
-      )
-      expect(result.tabGroups?.find((group) => group.id === 'R')?.tabOrder).toContain(D)
-    } else {
-      expect(
-        result.tabGroups?.some((group) => group.tabOrder.includes(created.tab.parentTabId))
-      ).toBe(true)
-    }
-    const refreshed = await runtime.listMobileSessionTabs(`id:${WT}`)
-    expect(refreshed.tabGroups).toEqual(result.tabGroups)
-    if (n) {
-      console.info('HOST_PLACEMENT_WORK', JSON.stringify({ n, samples: work.samples }))
-      expect(work.samples.length).toBeGreaterThan(0)
-      for (const sample of work.samples) {
-        expect(sample.reads + sample.adds + sample.has).toBeLessThanOrEqual(12 * n + 32)
-      }
-    }
-  }
-)
diff --git a/src/main/runtime/orca-runtime-original-terminal-close.test.ts b/src/main/runtime/orca-runtime-original-terminal-close.test.ts
deleted file mode 100644
index 0c2cea203d9e..000000000000
--- a/src/main/runtime/orca-runtime-original-terminal-close.test.ts
+++ /dev/null
@@ -1,194 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { terminalTreeHasLeaf } from '../../shared/terminal-tab-close'
-import {
-  createHarness,
-  INCARNATION_ID,
-  LEAF_ID,
-  PTY_ID,
-  SIBLING_LEAF_ID,
-  SIBLING_PTY_ID,
-  TAB_ID,
-  WORKTREE_ID
-} from './__fixtures__/orca-runtime-terminal-close-continuity-fixtures'
-
-function captured(harness: ReturnType<typeof createHarness>) {
-  const source = harness.runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_ID}`, WORKTREE_ID)
-  if (!source.presentation || !source.incarnationId) {
-    throw new Error('Missing original source')
-  }
-  const { incarnationId, presentation } = source
-  return {
-    source,
-    close: () => harness.runtime.closeTerminal(source.handle, incarnationId, presentation)
-  }
-}
-
-function addSibling(harness: ReturnType<typeof createHarness>) {
-  harness.editSession((state) => ({
-    ...state,
-    terminalLayoutsByTabId: {
-      ...state.terminalLayoutsByTabId,
-      [TAB_ID]: {
-        ...state.terminalLayoutsByTabId[TAB_ID],
-        root: {
-          type: 'split',
-          direction: 'horizontal',
-          ratio: 0.7,
-          first: { type: 'leaf', leafId: LEAF_ID },
-          second: { type: 'leaf', leafId: SIBLING_LEAF_ID }
-        },
-        ptyIdsByLeafId: { [LEAF_ID]: PTY_ID, [SIBLING_LEAF_ID]: SIBLING_PTY_ID },
-        activeLeafId: SIBLING_LEAF_ID,
-        expandedLeafId: SIBLING_LEAF_ID
-      }
-    }
-  }))
-}
-
-describe('original-aware terminal close owner transaction', () => {
-  it('stops only the source and keeps membership until explicit owner retirement', async () => {
-    const harness = createHarness({ registerPtyBacked: true, publishMobileSurface: true })
-    const { close } = captured(harness)
-    harness.setStopAndWaitAction(async () => {
-      await harness.runtime.onPtyExit(PTY_ID, 0, INCARNATION_ID, { hostExitConfirmed: true })
-      expect(
-        terminalTreeHasLeaf(harness.getSession().terminalLayoutsByTabId[TAB_ID]?.root, LEAF_ID)
-      ).toBe(true)
-    })
-    harness.setVerifiedStopResult(true)
-    harness.setCloseTerminalTabAction(() => {})
-    await expect(close()).resolves.toMatchObject({ ptyKilled: true })
-    expect(harness.stopAndWait).toHaveBeenCalledExactlyOnceWith(
-      PTY_ID,
-      expect.objectContaining({ expectedIncarnationId: INCARNATION_ID })
-    )
-    expect(harness.kill).not.toHaveBeenCalled()
-    expect(harness.getSession().tabsByWorktree[WORKTREE_ID]).toEqual([])
-    expect(harness.getSession().closedTerminalTabTombstonesByTabId?.[TAB_ID]).toBeDefined()
-  })
-
-  it.each([false, true])(
-    'accepts earned exit without another stop (readable=%s)',
-    async (readable) => {
-      const harness = createHarness({ registerPtyBacked: true, publishMobileSurface: true })
-      const { close, source } = captured(harness)
-      const settleSleep = readable
-        ? harness.runtime.intentionalPtyStops.mark(PTY_ID, 'reversible', INCARNATION_ID)
-        : null
-      await harness.runtime.onPtyExit(PTY_ID, 0, INCARNATION_ID, { hostExitConfirmed: true })
-      settleSleep?.(true)
-      expect(harness.runtime.getTerminalHandleForPaneKey(`${TAB_ID}:${LEAF_ID}`)).toBe(
-        source.handle
-      )
-      if (readable) {
-        harness.runtime.syncWindowGraph(1, {
-          tabs: [
-            {
-              tabId: TAB_ID,
-              worktreeId: WORKTREE_ID,
-              title: 'Ended source',
-              activeLeafId: LEAF_ID,
-              layout: { type: 'leaf', leafId: LEAF_ID }
-            }
-          ],
-          leaves: [
-            {
-              tabId: TAB_ID,
-              worktreeId: WORKTREE_ID,
-              leafId: LEAF_ID,
-              paneRuntimeId: 7,
-              ptyId: null
-            }
-          ]
-        })
-        expect(harness.runtime.getTerminalHandleForPaneKey(`${TAB_ID}:${LEAF_ID}`)).toBe(
-          source.handle
-        )
-        harness.editSession((state) => ({
-          ...state,
-          terminalLayoutsByTabId: {
-            ...state.terminalLayoutsByTabId,
-            [TAB_ID]: { ...state.terminalLayoutsByTabId[TAB_ID], ptyIdsByLeafId: {} }
-          }
-        }))
-      }
-      harness.runtime.dropArchivedPtyRecord(PTY_ID)
-      if (readable) {
-        expect(
-          harness.runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_ID}`, WORKTREE_ID).handle
-        ).toBe(source.handle)
-      }
-      harness.setCloseTerminalTabAction(() => {})
-      await expect(close()).resolves.toMatchObject({ ptyKilled: true })
-      expect(harness.stopAndWait).not.toHaveBeenCalled()
-      expect(harness.kill).not.toHaveBeenCalled()
-    }
-  )
-
-  it('does not retire a successor published during the required durable write', async () => {
-    const harness = createHarness({ registerPtyBacked: true, publishMobileSurface: true })
-    const { close } = captured(harness)
-    harness.setVerifiedStopResult(true)
-    harness.setCloseTerminalTabAction(() => {})
-    harness.flushOrThrow.mockImplementationOnce(() => {
-      harness.runtime.registerPty(PTY_ID, WORKTREE_ID, null, {
-        tabId: TAB_ID,
-        leafId: LEAF_ID,
-        incarnationId: 'successor-after-admission'
-      })
-    })
-    await expect(close()).rejects.toThrow('terminal_pane_owner_changed')
-    expect(harness.kill).not.toHaveBeenCalled()
-    expect(harness.stopAndWait).toHaveBeenCalledTimes(1)
-  })
-
-  it('retains an unknown source and refuses a pinned final tab before stopping', async () => {
-    const harness = createHarness({ registerPtyBacked: true })
-    const { close } = captured(harness)
-    await expect(close()).rejects.toThrow('terminal_close_unverifiable')
-    expect(harness.closeTerminalTab).not.toHaveBeenCalled()
-    expect(harness.kill).not.toHaveBeenCalled()
-    expect(harness.getSession().tabsByWorktree[WORKTREE_ID]).toHaveLength(1)
-    harness.editSession((state) => ({
-      ...state,
-      tabsByWorktree: {
-        ...state.tabsByWorktree,
-        [WORKTREE_ID]: state.tabsByWorktree[WORKTREE_ID].map((row) => ({ ...row, isPinned: true }))
-      }
-    }))
-    await expect(close()).rejects.toThrow('terminal_tab_pinned')
-    expect(harness.stopAndWait).toHaveBeenCalledTimes(1)
-  })
-
-  it.each(['sibling', 'successor', 'write failure'] as const)(
-    'revalidates %s after the acknowledged owner await',
-    async (change) => {
-      const harness = createHarness({ registerPtyBacked: true, publishMobileSurface: true })
-      const { close } = captured(harness)
-      harness.setVerifiedStopResult(true)
-      harness.setCloseTerminalTabAction(() => {
-        addSibling(harness)
-        if (change === 'successor') {
-          harness.replacePersistedIncarnation('incarnation-successor')
-        }
-        if (change === 'write failure') {
-          harness.rejectPersistenceFlush(new Error('required write failed'))
-        }
-      })
-      const result = close()
-      if (change === 'successor') {
-        await expect(result).rejects.toThrow('terminal_pane_owner_changed')
-      } else if (change === 'write failure') {
-        await expect(result).rejects.toThrow('required write failed')
-      } else {
-        await expect(result).resolves.toMatchObject({ ptyKilled: true })
-      }
-      const layout = harness.getSession().terminalLayoutsByTabId[TAB_ID]
-      expect(terminalTreeHasLeaf(layout?.root, SIBLING_LEAF_ID)).toBe(true)
-      expect(layout?.ptyIdsByLeafId?.[SIBLING_LEAF_ID]).toBe(SIBLING_PTY_ID)
-      expect(terminalTreeHasLeaf(layout?.root, LEAF_ID)).toBe(change === 'successor')
-      expect(harness.kill).not.toHaveBeenCalled()
-      expect(harness.stopAndWait).toHaveBeenCalledTimes(1)
-    }
-  )
-})
diff --git a/src/main/runtime/orca-runtime-structured-agent-session-create-intent.test.ts b/src/main/runtime/orca-runtime-structured-agent-session-create-intent.test.ts
index 89afa5e29a05..cdd63546c65d 100644
--- a/src/main/runtime/orca-runtime-structured-agent-session-create-intent.test.ts
+++ b/src/main/runtime/orca-runtime-structured-agent-session-create-intent.test.ts
@@ -1,3 +1,6 @@
+import { agentSessionRecordFixture } from '../../shared/agent-session-record.test-fixture'
+import type { StructuredAgentSessionHost } from '../native-chat/agent-session-wire/structured-agent-session-host'
+import { agentSessionConversationView } from '../../shared/agent-session-conversation-view'
 import { prepareAdoptedTranscript } from '../native-chat/agent-session-wire/structured-agent-session-adopted-import'
 import { mkdir, mkdtemp, realpath, rm, writeFile } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
@@ -100,6 +103,72 @@ describe('structured Codex folder trust', () => {
 })
 
 describe('structured agent-session create intent', () => {
+  it('returns the recorded owner, once no terminal still runs it, before launch support or account preparation', async () => {
+    const record = agentSessionRecordFixture()
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: early ownership admission only reads the host's record list.
+    setStructuredAgentSessionHost({
+      deps: { store: { listConversations: () => [agentSessionConversationView(record)] } }
+    } as unknown as StructuredAgentSessionHost)
+    const runtime = new OrcaRuntimeService()
+    const support = vi
+      .spyOn(runtime, 'getStructuredAgentSessionCreateSupport')
+      .mockRejectedValue(new Error('fresh launch is unavailable'))
+    const writers = vi
+      .spyOn(runtime, 'assertStructuredAdoptionTerminalWritersExited')
+      .mockResolvedValue()
+    await expect(
+      runtime.resolveStructuredAgentSessionCreateIntent({
+        envelope: { sessionId: 'new-chat', clientOperationId: 'operation-1' },
+        worktree: 'id:another-workspace',
+        agent: 'claude',
+        resumeFrom: { providerSessionId: 'provider-session-alpha-1' }
+      })
+    ).rejects.toMatchObject({
+      refusal: {
+        code: 'agent_session_conflict',
+        details: {
+          reason: 'conversationHeldElsewhere',
+          owner: { sessionId: record.sessionId, workspaceId: record.location.workspaceId }
+        }
+      }
+    })
+    expect(support).not.toHaveBeenCalled()
+    expect(writers).toHaveBeenCalledWith('claude', 'provider-session-alpha-1', undefined)
+  })
+
+  it('refuses a switch out of a live terminal before naming the chat that owns the conversation', async () => {
+    const record = agentSessionRecordFixture()
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: early ownership admission only reads the host's record list.
+    setStructuredAgentSessionHost({
+      deps: { store: { listConversations: () => [agentSessionConversationView(record)] } }
+    } as unknown as StructuredAgentSessionHost)
+    const runtime = new OrcaRuntimeService()
+    const writers = vi.spyOn(runtime, 'assertStructuredAdoptionTerminalWritersExited')
+    const intent = () =>
+      runtime.resolveStructuredAgentSessionCreateIntent({
+        envelope: { sessionId: 'new-chat', clientOperationId: 'operation-1' },
+        worktree: 'id:another-workspace',
+        agent: 'claude',
+        resumeFrom: {
+          providerSessionId: 'provider-session-alpha-1',
+          cliSource: { workspaceId: 'another-workspace', paneKey: 'pane-1' }
+        }
+      })
+    const liveWriter = Object.assign(new Error('live'), {
+      refusal: { code: 'agent_session_conflict', details: { reason: 'conversationHeldElsewhere' } }
+    })
+    writers.mockRejectedValueOnce(liveWriter)
+    await expect(intent()).rejects.toBe(liveWriter)
+    writers.mockResolvedValueOnce()
+    await expect(intent()).rejects.toMatchObject({
+      refusal: { details: { owner: { sessionId: record.sessionId } } }
+    })
+    expect(writers).toHaveBeenCalledWith('claude', 'provider-session-alpha-1', {
+      workspaceId: 'another-workspace',
+      paneKey: 'pane-1'
+    })
+  })
+
   it('pins the selected Codex launch home after normal launch preparation', async () => {
     const prepareCodexStructuredLaunch = vi.fn(() => '/accounts/selected/home')
     const runtime = new OrcaRuntimeService(
diff --git a/src/main/runtime/orca-runtime-terminal-close-continuity.test.ts b/src/main/runtime/orca-runtime-terminal-close-continuity.test.ts
index 1e8f8affea40..b1922c98ec3f 100644
--- a/src/main/runtime/orca-runtime-terminal-close-continuity.test.ts
+++ b/src/main/runtime/orca-runtime-terminal-close-continuity.test.ts
@@ -393,38 +393,6 @@ describe('terminal close and handle incarnation continuity', () => {
     expect(canary.ptyId).toBe(survivor.ptyId)
   })
 
-  it('forwards the captured incarnation to the stop and never falls back after a refused stop', async () => {
-    const harness = createHarness({ registerPtyBacked: true })
-    const terminal = harness.runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_ID}`, WORKTREE_ID)
-    const presentation = terminal.presentation
-    if (!presentation) {
-      throw new Error('Missing original source')
-    }
-    const close = () => harness.runtime.closeTerminal(terminal.handle, INCARNATION_ID, presentation)
-    harness.setVerifiedStopResult(false)
-    await expect(close()).rejects.toThrow('terminal_close_unverifiable')
-    expect(harness.stopAndWait).toHaveBeenCalledWith(
-      PTY_ID,
-      expect.objectContaining({ expectedIncarnationId: INCARNATION_ID })
-    )
-    expect(harness.kill).not.toHaveBeenCalled()
-    expect(harness.closeTerminalTab).not.toHaveBeenCalled()
-    expect(harness.closeTerminalPane).not.toHaveBeenCalled()
-    harness.setVerifiedStopResult(true)
-    harness.acknowledged.resolve()
-    await expect(close()).resolves.toMatchObject({ ptyKilled: true })
-  })
-
-  it('closes nothing when its handle now runs a later incarnation than the caller expected', async () => {
-    const harness = createHarness()
-    const [{ handle }] = (await harness.runtime.listTerminals(`id:${WORKTREE_ID}`)).terminals
-    await expect(harness.runtime.closeTerminal(handle, 'earlier-incarnation')).rejects.toThrow(
-      'terminal_handle_stale'
-    )
-    expect(harness.kill).not.toHaveBeenCalled()
-    expect(harness.getSession().tabsByWorktree[WORKTREE_ID]).toHaveLength(1)
-  })
-
   it('does not kill the final PTY when durable tab retirement is rejected', async () => {
     const harness = createHarness()
     const [{ handle }] = (await harness.runtime.listTerminals(`id:${WORKTREE_ID}`)).terminals
diff --git a/src/main/runtime/orca-runtime-terminal-rename-retention.test.ts b/src/main/runtime/orca-runtime-terminal-rename-retention.test.ts
index c9c2b190343d..92a84ef726f6 100644
--- a/src/main/runtime/orca-runtime-terminal-rename-retention.test.ts
+++ b/src/main/runtime/orca-runtime-terminal-rename-retention.test.ts
@@ -54,10 +54,7 @@ describe('terminal rename before renderer graph hydration', () => {
 
       expect(getSession().tabsByWorktree[TEST_WORKTREE_ID][0].customTitle).toBe(title)
       expect(renameTerminal).toHaveBeenCalledWith('host-tab', title)
-      // Main-owned last-pane exit closes its tab; model restart with a fresh runtime over the saved session instead.
-      if (!ORCA_LAYOUT_OWNER_IS_MAIN) {
-        runtime.onPtyExit('omp-initial-pty', 0)
-      }
+      // A permanent last-pane exit closes its tab; restart reuses the retained saved session.
       const restored = new OrcaRuntimeService(checkedStore)
       restored.setPtyController({
         spawn: vi.fn(committingSpawn(restored, async () => ({ id: 'omp-replacement-pty' }))),
diff --git a/src/main/runtime/orca-runtime-terminal-split-authority.test.ts b/src/main/runtime/orca-runtime-terminal-split-authority.test.ts
index 1c406e77d481..e7e3c42b60cc 100644
--- a/src/main/runtime/orca-runtime-terminal-split-authority.test.ts
+++ b/src/main/runtime/orca-runtime-terminal-split-authority.test.ts
@@ -1,6 +1,7 @@
 import { withRuntimePaneAdmission } from './runtime-durable-store-fixture'
 import { describe, expect, it, vi } from 'vitest'
 import { getDefaultWorkspaceSession } from '../../shared/constants'
+import type { ExecutionHostId } from '../../shared/execution-host'
 import type { RuntimeMobileSessionTabsSnapshot } from '../../shared/runtime-types'
 import type { TerminalLayoutSnapshot } from '../../shared/terminal-tab-types'
 import type { WorkspaceSessionState } from '../../shared/workspace-session-state-types'
@@ -98,7 +99,7 @@ function createHarness(
 ) {
   let session = persistedSession(includeSource)
   const connectionId = options.connectionId ?? null
-  const ownerHostId = connectionId ? `ssh:${connectionId}` : 'local'
+  const ownerHostId: ExecutionHostId = connectionId ? `ssh:${connectionId}` : 'local'
   const requestedSessionHostIds: (string | undefined)[] = []
   // Exclude fixture spawn-commit reads from split-read assertions.
   let committingPane = false
@@ -146,7 +147,8 @@ function createHarness(
           (_args: { worktreeId?: string; tabId?: string; leafId?: string }) =>
             new Promise<{ id: string; incarnationId?: string }>((resolve) => {
               resolveSpawn = resolve
-            })
+            }),
+          ownerHostId
         )
       )
     : vi.fn(
@@ -154,9 +156,17 @@ function createHarness(
           runtime,
           async (_args: { worktreeId?: string; tabId?: string; leafId?: string }) => ({
             id: SPLIT_PTY_ID
-          })
+          }),
+          ownerHostId
         )
       )
+  let afterSpawnCommit: (() => void) | undefined
+  const committedSpawn = spawn.getMockImplementation()!
+  spawn.mockImplementation(async (args) => {
+    const result = await committedSpawn(args)
+    afterSpawnCommit?.()
+    return result
+  })
   Object.assign(runtime, {
     resolveTerminalWorkspaceLaunchScope: vi.fn(async () => ({
       id: WORKTREE_ID,
@@ -248,6 +258,9 @@ function createHarness(
     getSession: () => session,
     getSnapshot: () => internals.mobileSessionTabsByWorktree.get(WORKTREE_ID),
     requestedSessionHostIds,
+    afterSpawnCommit: (run: () => void) => {
+      afterSpawnCommit = run
+    },
     replaceSourceIncarnation: (incarnationId: string) => registerSource(incarnationId),
     replacePersistedSourceIncarnation: (incarnationId: string) => {
       session = {
@@ -510,7 +523,7 @@ describe('remote runtime terminal split authority', () => {
 
     const split = harness.runtime.splitTerminal(harness.handle, { direction: 'horizontal' })
     await vi.waitFor(() => expect(harness.spawn).toHaveBeenCalledOnce())
-    harness.replacePersistedSourceIncarnation('persisted-after')
+    harness.afterSpawnCommit(() => harness.replacePersistedSourceIncarnation('persisted-after'))
     harness.resolveSpawn()
 
     await expect(split).rejects.toThrow('terminal_split_source_not_found')
@@ -549,7 +562,7 @@ describe('remote runtime terminal split authority', () => {
 
     const split = harness.runtime.splitTerminal(harness.handle, { direction: 'horizontal' })
     await vi.waitFor(() => expect(harness.spawn).toHaveBeenCalledOnce())
-    harness.replacePersistedSourceIncarnation('persisted-after')
+    harness.afterSpawnCommit(() => harness.replacePersistedSourceIncarnation('persisted-after'))
     harness.resolveSpawn()
 
     await expect(split).rejects.toThrow('terminal_split_source_not_found')
diff --git a/src/main/runtime/orca-runtime-test-fixtures.spec.ts b/src/main/runtime/orca-runtime-test-fixtures.spec.ts
index 624440c92075..faf463b0ce17 100644
--- a/src/main/runtime/orca-runtime-test-fixtures.spec.ts
+++ b/src/main/runtime/orca-runtime-test-fixtures.spec.ts
@@ -11,6 +11,7 @@ import {
   getTerminalPasteIngestMs
 } from '../../shared/agent-prompt-injection'
 import { getDefaultWorkspaceSession } from '../../shared/constants'
+import type { ExecutionHostId } from '../../shared/execution-host'
 import { makePaneKey } from '../../shared/stable-pane-id'
 import type { LayoutCommand } from '../../shared/workspace-layout/workspace-layout-command-types'
 import { applyCommandToSession } from '../persistence/terminal-topology/terminal-pane-admission'
@@ -571,7 +572,7 @@ function makeHeadlessTerminalLayout(
 function makeRuntimeStoreWithWorkspaceSession(
   initialSession: WorkspaceSessionState,
   // Session fixtures must answer only their host partition so hardcoded host ids fail.
-  ownerHostId = 'local'
+  ownerHostId: ExecutionHostId = 'local'
 ): {
   runtimeStore: typeof store & {
     admitTerminalPane: ReturnType<typeof withRuntimePaneAdmission>['admitTerminalPane']
diff --git a/src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-09.spec.ts b/src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-09.spec.ts
index ea50773d0a66..46a0146c322e 100644
--- a/src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-09.spec.ts
+++ b/src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-09.spec.ts
@@ -1,4 +1,5 @@
 import { describe, expect, it, vi } from 'vitest'
+import type { ExecutionHostId } from '../../../shared/execution-host'
 import { bindPaneFirst, committingSpawn, registerBoundPty } from '../bind-first-pane.test-fixture'
 import {
   OrcaRuntimeService,
@@ -28,7 +29,7 @@ describe('OrcaRuntimeService', () => {
     function makeParkedSessionStore(
       origin: SleepingAgentSessionRecord['origin'] | undefined,
       overrides: Partial<SleepingAgentSessionRecord> = {},
-      ownerHostId = 'local'
+      ownerHostId: ExecutionHostId = 'local'
     ) {
       return makeRuntimeStoreWithWorkspaceSession(
         makeWorkspaceSessionWithHeadlessTerminal({
diff --git a/src/main/runtime/orchestration/chat-assignee.test.ts b/src/main/runtime/orchestration/chat-assignee.test.ts
index 6c81c99ab1a1..bf374c9eeee0 100644
--- a/src/main/runtime/orchestration/chat-assignee.test.ts
+++ b/src/main/runtime/orchestration/chat-assignee.test.ts
@@ -3,9 +3,7 @@ import { describe, expect, it } from 'vitest'
 import type { AgentSessionRecord } from '../../../shared/agent-session-record'
 import { testOrcaSessionId } from '../../../shared/orca-session-address-test-fixture'
 import { sessionRecord } from '../rpc/orchestration-session-caller-test-fixture'
-import { chatAssigneeSessionId, observeChatAssignee, chatAssigneeOwesWork } from './chat-assignee'
-import { OrchestrationDb } from './db'
-import { createRootDispatch } from './db/root-dispatch-test-fixture'
+import { chatAssigneeSessionId, observeChatAssignee } from './chat-assignee'
 import type { AgentSessionRecordReader } from './structured-session-lineage'
 
 const CHAT = testOrcaSessionId('7e3b9d15-2c4a-4f86-a0b1-5c9e2d7f3b64')
@@ -68,42 +66,3 @@ describe('a chat assignee', () => {
     })
   })
 })
-
-it('derives direct debt through legacy clear lineage and stops pinning once that assignment settles', () => {
-  const db = new OrchestrationDb(':memory:')
-  try {
-    const successor = testOrcaSessionId('3f9a1c7e-6b2d-4e85-a0c4-9d1e7b3f5a26')
-    const root: AgentSessionRecord = {
-      ...sessionRecord(CHAT),
-      conversationCommand: {
-        command: 'clear',
-        state: 'completed',
-        replacementSessionId: successor,
-        operationId: 'clear',
-        callerKey: 'caller',
-        phase: 'committed'
-      }
-    }
-    const records = [root, sessionRecord(successor, { lease: { claimStatus: 'released' } })]
-    const conversations = records.map(agentSessionConversationView)
-    const reader = {
-      getRecord: (id: string) => conversations.find((record) => record.sessionId === id) ?? null,
-      listRecords: () => conversations
-    }
-    const task = db.createTask({ runId: 'run_legacy_local', spec: 'original work' })
-    const dispatch = createRootDispatch(db, task.id, `orca_session_id:${CHAT}`)
-    for (const status of ['pending', 'dispatched']) {
-      db.db.prepare('UPDATE dispatch_contexts SET status = ? WHERE id = ?').run(status, dispatch.id)
-      expect(chatAssigneeOwesWork(db, successor, reader)).toBe(true)
-      expect(chatAssigneeOwesWork(db, CHAT, reader)).toBe(false)
-      expect(chatAssigneeOwesWork(db, 'unrelated', reader)).toBe(false)
-    }
-    db.db
-      .prepare('UPDATE dispatch_contexts SET status = ? WHERE id = ?')
-      .run('completed', dispatch.id)
-    expect(chatAssigneeOwesWork(db, successor, reader)).toBe(false)
-    expect(chatAssigneeOwesWork(null, successor, reader)).toBe(false)
-  } finally {
-    db.close()
-  }
-})
diff --git a/src/main/runtime/orchestration/structured-worker-switch-stop.test.ts b/src/main/runtime/orchestration/structured-worker-switch-stop.test.ts
index 47cb2d96594b..f6d9bab3902a 100644
--- a/src/main/runtime/orchestration/structured-worker-switch-stop.test.ts
+++ b/src/main/runtime/orchestration/structured-worker-switch-stop.test.ts
@@ -85,8 +85,6 @@ it.each([false, true])(
       () => false
     )
     await entered.promise
-    expect(db.getWorkerDispatch(dispatch.id)?.state).toBe('stopping')
-    expect(forgetStructuredSessionMail).not.toHaveBeenCalled()
     exit.resolve(proven)
     expect(await observed).toBe(proven)
     expect(db.getWorkerDispatch(dispatch.id)?.state).toBe(proven ? 'stopped' : 'stop_unknown')
diff --git a/src/main/runtime/profile-session-store.test-fixture.ts b/src/main/runtime/profile-session-store.test-fixture.ts
index 19aeedf8e4c6..30997c205eb3 100644
--- a/src/main/runtime/profile-session-store.test-fixture.ts
+++ b/src/main/runtime/profile-session-store.test-fixture.ts
@@ -1,4 +1,5 @@
 // Model profile sessions by host, including routed layout commands and write notifications.
+import type { ExecutionHostId } from '../../shared/execution-host'
 import type { WorkspaceSessionState } from '../../shared/workspace-session-state-types'
 import { getDefaultWorkspaceSession } from '../../shared/constants'
 import type { LayoutCommand } from '../../shared/workspace-layout/workspace-layout-command-types'
@@ -10,14 +11,14 @@ import type { RuntimeStore } from './runtime-store-contract'
 export type SessionStore = {
   getWorkspaceSession?: (hostId?: string) => WorkspaceSessionState | null | undefined
   setWorkspaceSession?: (session: WorkspaceSessionState, hostId?: string) => void
-  getWorkspaceSessionHostIds?: () => readonly string[]
+  getWorkspaceSessionHostIds?: () => readonly ExecutionHostId[]
   applyLayoutCommand?: (command: LayoutCommand, hostIds?: readonly string[]) => Promise<unknown>
 } & Pick<RuntimeStore, 'onWorkspaceSessionWritten'>
 
 type WriteListener = Parameters<NonNullable<RuntimeStore['onWorkspaceSessionWritten']>>[0]
 
 // The partitions a store without its own host list has had panes bound in.
-const boundHostIdsByStore = new WeakMap<SessionStore, Set<string>>()
+const boundHostIdsByStore = new WeakMap<SessionStore, Set<ExecutionHostId>>()
 
 const installedSessionStores = new WeakSet<SessionStore>()
 const installedLayoutApplies = new WeakSet<SessionStore>()
@@ -78,7 +79,7 @@ export function storeOf(runtime: OrcaRuntimeService): SessionStore | null {
 /** Supply missing profile session APIs, track host partitions, and retain state for fixture cleanup. */
 export function asProfileSessionStore(
   store: SessionStore,
-  hostId: string
+  hostId: ExecutionHostId
 ): {
   get: (host: string) => WorkspaceSessionState
   set: (session: WorkspaceSessionState, host: string) => void
@@ -94,7 +95,7 @@ export function asProfileSessionStore(
     }
   }
   if (!store.getWorkspaceSessionHostIds) {
-    const hostIds = new Set<string>()
+    const hostIds = new Set<ExecutionHostId>()
     boundHostIdsByStore.set(store, hostIds)
     store.getWorkspaceSessionHostIds = () => [...hostIds]
   }
diff --git a/src/main/runtime/qoder-mobile-resume-adoption-scaling.test.ts b/src/main/runtime/qoder-mobile-resume-adoption-scaling.test.ts
deleted file mode 100644
index a5e9edc9b0c0..000000000000
--- a/src/main/runtime/qoder-mobile-resume-adoption-scaling.test.ts
+++ /dev/null
@@ -1,158 +0,0 @@
-import './rpc/unused-default-rpc-methods.test-fixture'
-import { expect, it, vi } from 'vitest'
-import type { OwnedMobileTerminalCreateOptions } from './terminal/launch/mobile-terminal-create'
-
-await import('./orca-runtime-test-mocks.spec')
-await import('./orca-runtime-test-lifecycle.spec')
-const { OrcaRuntimeService } = await import('./orca-runtime-test-mocks.spec')
-
-type SpawnPane = { worktreeId?: string; tabId?: string; leafId?: string }
-
-class QoderScaleRuntime extends OrcaRuntimeService {
-  createOwned(worktreeId: string, opts: OwnedMobileTerminalCreateOptions) {
-    return this.createRuntimeOwnedMobileSessionTerminal(worktreeId, false, undefined, opts)
-  }
-}
-
-it('bounds lost-reply persisted-surface reconciliation at N/10N without replaying the create', async () => {
-  const { fixture } =
-    await import('../persistence/loading-store/profile-state-delayed-authority-fixture')
-  const samples: { n: number; tabReads: number; bindingReads: number }[] = []
-  for (const n of [10, 100]) {
-    const { store: durable } = await fixture()
-    const worktreeId = 'repo-local::/fixture/local'
-    const runtime = new QoderScaleRuntime(durable)
-    Object.assign(runtime, {
-      resolveTerminalWorkspaceLaunchScope: async () => ({
-        id: worktreeId,
-        path: '/fixture/local',
-        connectionId: null,
-        repo: null,
-        folderWorkspace: null
-      })
-    })
-    runtime.syncWindowGraph(0, { tabs: [], leaves: [] })
-    const request = {
-      command: 'qodercli --resume original',
-      launchAgent: 'qoder' as const,
-      launchConfig: { agentCommand: 'qodercli', agentArgs: '--original', agentEnv: {} },
-      createMutation: { clientIdentity: 'scale-phone', id: 'scale-operation' }
-    }
-    const inventory: {
-      id: string
-      worktreeId: string
-      terminalHandle: string
-      cwd: string
-      title: string
-    }[] = []
-    const spawn = vi.fn(async (args: SpawnPane & { preAllocatedHandle?: string }) => {
-      if (!args.preAllocatedHandle) {
-        throw new Error('missing actual handle')
-      }
-      inventory.push({
-        id: 'scale-live',
-        worktreeId,
-        terminalHandle: args.preAllocatedHandle,
-        cwd: '/fixture/local',
-        title: 'Qoder'
-      })
-      throw new Error('lost-spawn-reply')
-    })
-    const kill = vi.fn()
-    runtime.setPtyController({
-      spawn,
-      kill,
-      write: () => true,
-      getForegroundProcess: async () => null,
-      listProcesses: async () => inventory
-    })
-    await expect(runtime.createOwned(worktreeId, request)).rejects.toThrow('lost-spawn-reply')
-    let current = { tabId: '', leafId: '' }
-    for (let index = 0; index < n; index++) {
-      current = {
-        tabId: `11111111-1111-4111-8111-${String(index).padStart(12, '0')}`,
-        leafId: `22222222-2222-4222-8222-${String(index).padStart(12, '0')}`
-      }
-      await durable.admitTerminalPane({
-        type: 'createTerminalTab',
-        workspace: worktreeId,
-        ...current
-      })
-      await durable.persistPtyBinding({
-        worktreeId,
-        ...current,
-        ptyId: index === n - 1 ? 'scale-live' : `unrelated-${index}`
-      })
-    }
-    let measuring = true
-    let tabReads = 0
-    let bindingReads = 0
-    const observedTabs = new WeakSet<object>()
-    const observedBindings = new WeakSet<object>()
-    const read = runtime.getWorkspaceSessionForWorktree.bind(runtime)
-    const observer = vi
-      .spyOn(runtime, 'getWorkspaceSessionForWorktree')
-      .mockImplementation((id) => {
-        const session = read(id)
-        measuring = false
-        for (const tab of session?.tabsByWorktree[worktreeId] ?? []) {
-          if (!observedTabs.has(tab)) {
-            observedTabs.add(tab)
-            const value = tab.id
-            Object.defineProperty(tab, 'id', {
-              configurable: true,
-              enumerable: true,
-              get: () => {
-                if (measuring) {
-                  tabReads++
-                }
-                return value
-              }
-            })
-          }
-          const bindings = session?.terminalLayoutsByTabId[tab.id]?.ptyIdsByLeafId
-          if (bindings && !observedBindings.has(bindings)) {
-            observedBindings.add(bindings)
-            for (const [leafId, value] of Object.entries(bindings)) {
-              Object.defineProperty(bindings, leafId, {
-                configurable: true,
-                enumerable: true,
-                get: () => {
-                  if (measuring) {
-                    bindingReads++
-                  }
-                  return value
-                }
-              })
-            }
-          }
-        }
-        measuring = true
-        return session
-      })
-    try {
-      const result = await runtime.createOwned(worktreeId, {
-        ...request,
-        identity: { tabId: 'unrelated-retry', leafId: '99999999-9999-4999-8999-999999999999' }
-      })
-      expect(result.tab).toMatchObject({
-        parentTabId: current.tabId,
-        leafId: current.leafId,
-        ptyId: 'scale-live'
-      })
-      expect(result.tab.parentTabId).not.toBe(spawn.mock.calls[0][0].tabId)
-      expect(spawn).toHaveBeenCalledOnce()
-      expect(kill).not.toHaveBeenCalled()
-      samples.push({ n, tabReads, bindingReads })
-    } finally {
-      observer.mockRestore()
-    }
-  }
-  for (const sample of samples) {
-    expect(sample.bindingReads).toBeGreaterThanOrEqual(2 * sample.n)
-    expect(sample.bindingReads).toBeLessThanOrEqual(2 * sample.n + 5)
-    expect(sample.tabReads).toBeLessThanOrEqual(7 * sample.n + 9)
-  }
-  expect(samples[1].bindingReads).toBeLessThanOrEqual(10 * samples[0].bindingReads)
-  expect(samples[1].tabReads).toBeLessThanOrEqual(10 * samples[0].tabReads)
-})
diff --git a/src/main/runtime/qoder-mobile-resume-adoption.test.ts b/src/main/runtime/qoder-mobile-resume-adoption.test.ts
index bd1b336bb49d..bc5f0d37913a 100644
--- a/src/main/runtime/qoder-mobile-resume-adoption.test.ts
+++ b/src/main/runtime/qoder-mobile-resume-adoption.test.ts
@@ -480,241 +480,3 @@ it('releases abandoned dispatch capacity without guessing an expired live recipe
     vi.useRealTimers()
   }
 }, 30_000)
-
-it('recovers an unhinted allocated pane across a lost reply and a publication error, ignoring the retry pair', async () => {
-  const { TEST_WORKTREE_ID } = await import('./orca-runtime-test-fixtures.spec')
-  const runtime = new QoderAdoptionRuntime({ ...store })
-  runtime.syncWindowGraph(0, { tabs: [], leaves: [] })
-  const request = {
-    command: 'qodercli --resume original',
-    launchAgent: 'qoder' as const,
-    launchConfig: { agentCommand: 'qodercli', agentArgs: '--original', agentEnv: {} },
-    createMutation: { clientIdentity: 'unhinted-phone', id: 'unhinted-operation' }
-  }
-  const inventory: {
-    id: string
-    worktreeId: string
-    terminalHandle: string
-    cwd: string
-    title: string
-  }[] = []
-  let allocated: { tabId: string; leafId: string } | undefined
-  const spawn = vi.fn(async (args: SpawnPane & { preAllocatedHandle?: string }) => {
-    if (!args.tabId || !args.leafId || !args.preAllocatedHandle) {
-      throw new Error('missing actual allocation')
-    }
-    allocated = { tabId: args.tabId, leafId: args.leafId }
-    inventory.push({
-      id: 'unhinted-live',
-      worktreeId: TEST_WORKTREE_ID,
-      terminalHandle: args.preAllocatedHandle,
-      cwd: TEST_WORKTREE_PATH,
-      title: 'Qoder'
-    })
-    throw new Error('lost-spawn-reply')
-  })
-  const kill = vi.fn()
-  runtime.setPtyController({
-    spawn,
-    kill,
-    write: () => true,
-    getForegroundProcess: async () => null,
-    listProcesses: async () => inventory
-  })
-  await expect(runtime.createOwned(TEST_WORKTREE_ID, request)).rejects.toThrow('lost-spawn-reply')
-  expect(allocated).toBeDefined()
-  await expect(
-    runtime.createOwned(TEST_WORKTREE_ID, { ...request, launchAgent: 'codex' })
-  ).rejects.toThrow('terminal_create_identity_conflict')
-  expect(runtime.retainedRecipe('unhinted-live', TEST_WORKTREE_ID).runtimeSessionOwned).toBe(false)
-  const retry = {
-    ...request,
-    identity: { tabId: 'retry-tab', leafId: '99999999-9999-4999-8999-999999999999' }
-  }
-  const unsubscribe = runtime.onMobileSessionTabsChanged(() => {
-    throw new Error('publication-observer-failed')
-  })
-  try {
-    await expect(runtime.createOwned(TEST_WORKTREE_ID, retry)).rejects.toThrow(
-      'publication-observer-failed'
-    )
-    expect(runtime['ownedMobileDispatchRecipes'].size).toBe(1)
-  } finally {
-    unsubscribe()
-  }
-  const result = await runtime.createOwned(TEST_WORKTREE_ID, retry)
-  expect(result.tab).toMatchObject({
-    parentTabId: allocated?.tabId,
-    leafId: allocated?.leafId,
-    ptyId: 'unhinted-live',
-    launchAgent: 'qoder',
-    status: 'ready'
-  })
-  expect(result.tab.parentTabId).not.toBe(retry.identity.tabId)
-  expect(runtime.resolveTerminalPane(`${result.tab.parentTabId}:${result.tab.leafId}`).ptyId).toBe(
-    'unhinted-live'
-  )
-  expect(runtime['ownedMobileDispatchRecipes'].size).toBe(0)
-  expect(spawn).toHaveBeenCalledOnce()
-  expect(kill).not.toHaveBeenCalled()
-})
-
-it.each(['moved', 'closed', 'replaced'] as const)(
-  'retains ordinary %s authority while inventory reconciliation waits',
-  async (change) => {
-    const { fixture } =
-      await import('../persistence/loading-store/profile-state-delayed-authority-fixture')
-    const { store: durable } = await fixture()
-    const worktreeId = 'repo-local::/fixture/local'
-    const runtime = new QoderAdoptionRuntime(durable)
-    Object.assign(runtime, {
-      resolveTerminalWorkspaceLaunchScope: async () => ({
-        id: worktreeId,
-        path: '/fixture/local',
-        connectionId: null,
-        repo: null,
-        folderWorkspace: null
-      })
-    })
-    runtime.syncWindowGraph(0, { tabs: [], leaves: [] })
-    const request = {
-      command: 'qodercli --resume original',
-      launchAgent: 'qoder' as const,
-      launchConfig: { agentCommand: 'qodercli', agentArgs: '--original', agentEnv: {} },
-      keepPaneOnStartFailure: true as const,
-      createMutation: { clientIdentity: 'authority-phone', id: 'authority-operation' },
-      identity: {
-        tabId: '11111111-1111-4111-8111-111111111111',
-        leafId: '22222222-2222-4222-8222-222222222222'
-      }
-    }
-    const incarnationId = '33333333-3333-4333-8333-333333333333'
-    const inventory: {
-      id: string
-      worktreeId: string
-      terminalHandle: string
-      cwd: string
-      title: string
-      incarnationId: string
-    }[] = []
-    const spawn = vi.fn(async (args: SpawnPane & { preAllocatedHandle?: string }) => {
-      if (!args.preAllocatedHandle) {
-        throw new Error('missing actual handle')
-      }
-      inventory.push({
-        id: 'original-live',
-        worktreeId,
-        terminalHandle: args.preAllocatedHandle,
-        cwd: '/fixture/local',
-        title: 'Qoder',
-        incarnationId
-      })
-      throw new Error('lost-spawn-reply')
-    })
-    const entered = Promise.withResolvers<void>()
-    const release = Promise.withResolvers<void>()
-    let hold = false
-    const kill = vi.fn()
-    runtime.setPtyController({
-      spawn,
-      kill,
-      write: () => true,
-      getForegroundProcess: async () => null,
-      listProcesses: async () => {
-        if (hold) {
-          entered.resolve()
-          await release.promise
-        }
-        return inventory
-      }
-    })
-    await expect(runtime.createOwned(worktreeId, request)).rejects.toThrow('lost-spawn-reply')
-    await durable.persistPtyBinding({
-      worktreeId,
-      ...request.identity,
-      ptyId: 'original-live',
-      incarnationId
-    })
-    runtime.registerPty('original-live', worktreeId, null, {
-      ...request.identity,
-      terminalHandle: inventory[0].terminalHandle,
-      incarnationId
-    })
-    hold = true
-    const retry = runtime.createOwned(worktreeId, {
-      ...request,
-      identity: {
-        tabId: 'unrelated-retry',
-        leafId: '99999999-9999-4999-8999-999999999999'
-      }
-    })
-    const observed = retry.then(
-      (value) => ({ value, error: null }),
-      (error: unknown) => ({ value: null, error })
-    )
-    await entered.promise
-    let movedTabId: string | undefined
-    try {
-      if (change === 'closed') {
-        await runtime.closeTerminalSurfaceFromRenderer({
-          worktreeId,
-          target: { kind: 'tab', tabId: request.identity.tabId },
-          reason: 'user'
-        })
-      } else {
-        expect(
-          await durable.persistPtyBinding({
-            worktreeId,
-            ...request.identity,
-            ptyId: change === 'replaced' ? 'successor-live' : 'original-live',
-            incarnationId
-          })
-        ).toBe(true)
-        if (change === 'moved') {
-          const moved = await durable.moveTerminalLeafToNewTab({
-            worktreeId,
-            sourceTabId: request.identity.tabId,
-            targetTabId: '44444444-4444-4444-8444-444444444444',
-            leafId: request.identity.leafId,
-            ptyId: 'original-live'
-          })
-          expect(moved.status).toBe('moved')
-          movedTabId =
-            moved.status === 'moved'
-              ? (moved.tabId ?? '44444444-4444-4444-8444-444444444444')
-              : undefined
-        }
-      }
-    } finally {
-      release.resolve()
-    }
-    const outcome = await observed
-    const session = durable.getWorkspaceSession()
-    if (change === 'moved') {
-      expect(outcome.error).toBeNull()
-      expect(outcome.value?.tab).toMatchObject({
-        parentTabId: movedTabId,
-        leafId: request.identity.leafId,
-        ptyId: 'original-live'
-      })
-      expect(
-        session.terminalLayoutsByTabId[request.identity.tabId]?.ptyIdsByLeafId?.[
-          request.identity.leafId
-        ]
-      ).not.toBe('original-live')
-    } else {
-      expect(outcome.error).toBeInstanceOf(Error)
-      expect(outcome.value).toBeNull()
-      expect(
-        session.terminalLayoutsByTabId[request.identity.tabId]?.ptyIdsByLeafId?.[
-          request.identity.leafId
-        ]
-      ).toBe(change === 'replaced' ? 'successor-live' : undefined)
-    }
-    expect(session.tabsByWorktree[worktreeId].some((tab) => tab.id === 'unrelated-retry')).toBe(
-      false
-    )
-    expect(spawn).toHaveBeenCalledOnce()
-    expect(kill).not.toHaveBeenCalled()
-  }
-)
diff --git a/src/main/runtime/rpc/methods/orchestration/cli-runtime-boundary.test.ts b/src/main/runtime/rpc/methods/orchestration/cli-runtime-boundary.test.ts
index 0bb015023e87..89927a88313c 100644
--- a/src/main/runtime/rpc/methods/orchestration/cli-runtime-boundary.test.ts
+++ b/src/main/runtime/rpc/methods/orchestration/cli-runtime-boundary.test.ts
@@ -1,28 +1,8 @@
-import {
-  createRestTestRig,
-  type RestTestRig
-} from '../../../../native-chat/agent-session-wire/structured-agent-session-rest-test-rig'
-import { openTestJournalHostDatabase } from '../../../../native-chat/agent-session-journal/journal-host-database-test-support'
-import { setStructuredAgentSessionHost } from '../../../../native-chat/agent-session-wire/structured-agent-session-registry'
-import {
-  HOST_TEST_NOW,
-  hostTestAttachParams,
-  hostTestMessage,
-  hostTestOperationId
-} from '../../../../native-chat/agent-session-wire/structured-agent-session-host-test-data'
-import {
-  createStructuredWorkerSession,
-  releaseStructuredWorkerSession
-} from '../orchestration-structured-worker-session'
-import { structuredWorkerIdentities } from '../../../structured-worker-identity'
-import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../../../shared/agent-session-journal-types'
-import { computeAgentSessionPayloadFingerprint } from '../../../../../shared/agent-session-mutation-envelope'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { partialRuntimeStore } from '../../../runtime-store-partial-fixture'
 import type { RpcContext } from '../../core'
 import { createOrchestrationRpcHarness } from './rpc-test-harness'
 import type { OrchestrationDb } from '../../../orchestration/db'
-import { OrchestrationError } from '../../../orchestration/orchestration-error'
 
 type CliRuntimeClient = {
   isRemote?: boolean
@@ -43,26 +23,8 @@ describe('orchestration CLI/runtime boundary', () => {
   const { findMethod } = h
   let db: OrchestrationDb
   let ctx: RpcContext
-  let rig: RestTestRig | undefined
-  const structuredDispatches: string[] = []
-  const originalExitCode = process.exitCode
 
   afterEach(async () => {
-    for (const dispatchId of structuredDispatches.splice(0)) {
-      releaseStructuredWorkerSession(dispatchId, ctx.runtime)
-    }
-    if (rig) {
-      rig.adapter.closeSession.mockResolvedValue(true)
-      openTestJournalHostDatabase(rig.root).db.exec(
-        'DROP TRIGGER IF EXISTS cli_refuse_lease_release'
-      )
-      await rig.dispose()
-      rig = undefined
-    }
-    setStructuredAgentSessionHost(null)
-    structuredWorkerIdentities.clear()
-    vi.useRealTimers()
-    process.exitCode = originalExitCode
     h.cleanup()
     restoreTerminalHandle()
     vi.doUnmock('../../../../../cli/format')
@@ -89,20 +51,7 @@ describe('orchestration CLI/runtime boundary', () => {
             result: { identity: { handle: objectParams(params).terminal, live: true } } as T
           }
         }
-        try {
-          return { result: (await callRpc(method, objectParams(params))) as T }
-        } catch (error) {
-          if (!(error instanceof OrchestrationError)) {
-            throw error
-          }
-          const cliClientPath = '../../../../../cli/runtime-client'
-          const {
-            RuntimeClientError
-          }: {
-            RuntimeClientError: new (code: string, message: string, data?: unknown) => Error
-          } = await import(cliClientPath)
-          throw new RuntimeClientError(error.code, error.message, error.data)
-        }
+        return { result: (await callRpc(method, objectParams(params))) as T }
       }
     }
   }
@@ -222,281 +171,6 @@ describe('orchestration CLI/runtime boundary', () => {
     }
   })
 
-  it.each(['proven', 'lease-release-failed', 'failed-close'] as const)(
-    'CLI Stop/read/release preserves the actual structured close outcome: %s',
-    async (closeKind) => {
-      ;({ db, ctx } = h.setup(true, partialRuntimeStore()))
-      const { runtime } = ctx
-      vi.useFakeTimers({ toFake: ['Date', 'setTimeout', 'clearTimeout'] })
-      vi.setSystemTime(HOST_TEST_NOW)
-      rig = await createRestTestRig()
-      const { host, store, adapter } = rig
-      setStructuredAgentSessionHost(host)
-      // External installation and workspace/account lookup; creation, binding and lifecycle stay real.
-      vi.spyOn(runtime, 'ensureStructuredAgentSessionHost').mockResolvedValue(undefined)
-      vi.spyOn(runtime, 'resolveStructuredAgentSessionCreateIntent').mockImplementation(
-        async (input) =>
-          hostTestAttachParams(null, {
-            providerHandle: undefined,
-            envelope: {
-              ...input.envelope,
-              expectedRuntimeFence: null,
-              payloadFingerprint: ''
-            }
-          })
-      )
-      const notify = vi.spyOn(runtime, 'notifyStructuredSessionJournalActivity')
-      const forget = vi.spyOn(runtime, 'forgetStructuredSessionMail')
-      const subscriptions = new Map<string, ReturnType<typeof vi.fn<() => void>>>()
-      const observe = host.observeJournalPublications.bind(host)
-      vi.spyOn(host, 'observeJournalPublications').mockImplementation((sessionId, listener) => {
-        const dispose = vi.fn(observe(sessionId, listener))
-        subscriptions.set(sessionId, dispose)
-        return dispose
-      })
-      const start = async (spec: string) => {
-        const task = db.createTask({ spec })
-        const { dispatch } = db.createStartingWorkerDispatch({
-          taskId: task.id,
-          startOptions: {},
-          creator: { kind: 'system' },
-          maxDepth: 9,
-          runtimeEpoch: runtime.getRuntimeId()
-        })
-        structuredDispatches.push(dispatch.id)
-        const { identity } = await createStructuredWorkerSession({
-          runtime,
-          worktreeId: 'workspace-1',
-          agent: 'codex',
-          dispatchId: dispatch.id,
-          onJournalActivity: (id) => runtime.notifyStructuredSessionJournalActivity(id)
-        })
-        db.prepareStartingWorkerAuthority({
-          dispatchId: dispatch.id,
-          handle: identity.handle,
-          paneKey: identity.paneKey,
-          processIncarnation: identity.processIncarnation,
-          worktreeId: identity.worktreeId,
-          effects: [],
-          setupState: 'not_configured',
-          terminalOwnership: 'created',
-          hostScope: JSON.stringify(identity.hostScope)
-        })
-        db.markWorkerDispatchReady(dispatch.id)
-        const session = host.collaboratorsForTests().sessions.get(identity.sessionId)
-        if (!session) {
-          throw new Error('The actual worker create did not open its journal')
-        }
-        const append = (text: string) =>
-          session.journal.appendItem(
-            { provider: 'orca', clientMessageId: text },
-            { kind: 'status', text },
-            {
-              fence: store.requireWritableRecord(identity.sessionId).lease.runtimeFence,
-              turnScope: AGENT_JOURNAL_THREAD_SCOPE
-            }
-          )
-        return { identity, dispatch, task, journal: session.journal, append }
-      }
-      const worker = await start('worker with retained output')
-      const sibling = await start('sibling must stay bound')
-      const sessionId = worker.identity.sessionId
-      const body = hostTestMessage('Retain this worker output')
-      const sent = await host.send(
-        { callerKey: 'cli-lifecycle-fixture' },
-        {
-          envelope: {
-            sessionId,
-            clientOperationId: hostTestOperationId(),
-            expectedRuntimeFence: store.requireWritableRecord(sessionId).lease.runtimeFence,
-            payloadFingerprint: computeAgentSessionPayloadFingerprint({
-              method: 'agentSession.send',
-              sessionId,
-              fields: { body }
-            })
-          },
-          body
-        }
-      )
-      expect(sent.ok).toBe(true)
-      await vi.waitFor(() => expect(adapter.dispatch).toHaveBeenCalledOnce())
-      const mailbox = `dispatch:${worker.dispatch.id}`
-      const held = db.insertMessage({
-        from: 'term_coord',
-        to: mailbox,
-        subject: 'Held by the current turn',
-        deliveryContract: 'current_delivery'
-      })
-      expect(
-        db
-          .getOrCreateMailboxDelivery({
-            runId: db.getDispatchContextById(worker.dispatch.id)!.run_id,
-            mailboxHandle: mailbox,
-            consumerGeneration: db.getDispatchContextById(worker.dispatch.id)!.consumer_generation
-          })
-          ?.messages.map((message) => message.id)
-      ).toEqual([held.id])
-      const pending = db.insertMessage({
-        from: 'term_coord',
-        to: mailbox,
-        subject: 'Never redrive after a completed close'
-      })
-      await worker.journal.appendItem(
-        { provider: 'orca', clientMessageId: 'busy-turn' },
-        { kind: 'turn', turnId: 'busy-turn', state: 'running' },
-        {
-          fence: store.requireWritableRecord(sessionId).lease.runtimeFence,
-          turnScope: AGENT_JOURNAL_THREAD_SCOPE
-        }
-      )
-      expect(host.currentWork(sessionId)?.working()).toBe(true)
-      runtime.deliverPendingMessagesForHandle(mailbox)
-      await vi.advanceTimersByTimeAsync(300)
-      expect(db.getMessageById(pending.id)?.delivered_at).toBeNull()
-      adapter.dispatch.mockClear()
-      notify.mockClear()
-      await worker.append('publication queued before close')
-      const childBeforeClose = host.collaboratorsForTests().sessions.get(sessionId)?.child
-      const leaseBeforeClose = store.getRecord(sessionId)?.lease
-      expect(childBeforeClose).toBeTruthy()
-      if (closeKind === 'lease-release-failed') {
-        // Fail the actual durable release write, preserving the real transition/rollback owners.
-        openTestJournalHostDatabase(rig.root).db.exec(`
-          CREATE TEMP TRIGGER cli_refuse_lease_release BEFORE UPDATE ON agent_session_records
-          WHEN json_extract(NEW.record_json, '$.lease.claimStatus') = 'released'
-          BEGIN SELECT RAISE(ABORT, 'fixture disk full'); END
-        `)
-      }
-      const close = vi.spyOn(host, 'close')
-      adapter.closeSession.mockResolvedValue(closeKind !== 'failed-close')
-      for (const name of ['ORCA_PAIRING_CODE', 'ORCA_ENVIRONMENT', 'ORCA_AGENT_SESSION_ID']) {
-        vi.stubEnv(name, '')
-      }
-      process.env.ORCA_TERMINAL_HANDLE = 'term_coord'
-      vi.doMock('../../../../../cli/runtime-client', async (importOriginal) => ({
-        ...(await importOriginal<Record<string, unknown>>()),
-        RuntimeClient: client
-      }))
-      const output = vi.fn()
-      const printed = vi.spyOn(console, 'log').mockImplementation(() => {})
-      vi.doMock('../../../../../cli/format', () => ({ printResult: output }))
-      const cliPath = '../../../../../cli/index'
-      const { main }: { main(argv: string[]): Promise<void> } = await import(cliPath)
-      const command = async (name: string, extra: string[] = []) => {
-        output.mockClear()
-        process.exitCode = undefined
-        await main(['orchestration', name, '--dispatch', worker.dispatch.id, ...extra, '--json'])
-        expect(output).toHaveBeenCalledOnce()
-        return output.mock.calls[0][0].result
-      }
-      const refusedCommand = async (
-        name: string,
-        code: string,
-        message: string,
-        extra: string[] = []
-      ) => {
-        output.mockClear()
-        printed.mockClear()
-        process.exitCode = undefined
-        await main(['orchestration', name, '--dispatch', worker.dispatch.id, ...extra, '--json'])
-        expect(process.exitCode).toBe(1)
-        expect(output).not.toHaveBeenCalled()
-        expect(printed).toHaveBeenCalledOnce()
-        const error: unknown = JSON.parse(String(printed.mock.calls[0][0]))
-        expect(error).toMatchObject({
-          ok: false,
-          error: { code, message: expect.stringContaining(message) }
-        })
-      }
-      const stopped = await command('worker-stop')
-      expect(stopped).toMatchObject({
-        state: closeKind === 'proven' ? 'stopped' : 'stop_unknown',
-        processAction: 'closed_agent_terminal'
-      })
-      expect(process.exitCode).toBe(closeKind === 'proven' ? undefined : 1)
-      expect(db.getWorkerDispatch(worker.dispatch.id)?.state).toBe(stopped.state)
-      expect(db.getDispatchContextById(worker.dispatch.id)?.status).toBe(
-        closeKind === 'proven' ? 'failed' : 'dispatched'
-      )
-      expect(close).toHaveBeenCalledExactlyOnceWith(sessionId, 'evict')
-      expect(adapter.closeSession).toHaveBeenCalledExactlyOnceWith(sessionId, undefined)
-      if (closeKind === 'lease-release-failed') {
-        expect(store.getRecord(sessionId)?.lease.claimStatus).toBe('live')
-        expect(host.collaboratorsForTests().sessions.get(sessionId)?.lastEndedChild).toMatchObject({
-          rootGone: true
-        })
-      }
-      await vi.advanceTimersByTimeAsync(300)
-      if (closeKind !== 'failed-close') {
-        expect(subscriptions.get(sessionId)).toHaveBeenCalledOnce()
-        expect(forget).toHaveBeenCalledWith(sessionId)
-        expect(notify).not.toHaveBeenCalledWith(sessionId)
-        const snapshot = vi.spyOn(host, 'journalSnapshot')
-        runtime.notifyStructuredSessionJournalActivity(sessionId)
-        expect(snapshot).not.toHaveBeenCalled()
-      } else {
-        expect(subscriptions.get(sessionId)).not.toHaveBeenCalled()
-        expect(forget).not.toHaveBeenCalledWith(sessionId)
-        expect(host.collaboratorsForTests().sessions.get(sessionId)?.child).toBe(childBeforeClose)
-        expect(store.getRecord(sessionId)?.lease).toEqual(leaseBeforeClose)
-        expect(structuredWorkerIdentities.get(worker.identity.handle)).toEqual(worker.identity)
-      }
-      const current = await command('worker-read', ['--source', 'transcript'])
-      expect(current.source).toBe('transcript')
-      expect(JSON.stringify(current.transcript.messages)).toContain('Retain this worker output')
-      expect(current.status.liveness).toBe(closeKind === 'proven' ? 'exited' : 'live')
-      const newer = await start('newer worker must stay bound')
-      const siblingResource = db.getWorkerTerminalResourceByOwner(sibling.dispatch.id)
-      const newerResource = db.getWorkerTerminalResourceByOwner(newer.dispatch.id)
-      if (closeKind === 'proven') {
-        const release = await command('worker-release')
-        const repeated = await command('worker-release')
-        expect(release).toMatchObject({ state: 'released', archive: { status: 'unavailable' } })
-        expect(repeated).toMatchObject({ state: 'already_released', processAction: 'none' })
-        await refusedCommand(
-          'worker-read',
-          'archive_unavailable',
-          'without a preserved output archive',
-          ['--source', 'transcript']
-        )
-        const history = await host.history({ sessionId, direction: 'tail' })
-        expect(history.ok).toBe(true)
-        if (!history.ok) {
-          throw new Error('The retained conversation history could not be read')
-        }
-        expect(JSON.stringify(history.page.items)).toContain('Retain this worker output')
-      } else {
-        const resourceBeforeRelease = db.getWorkerTerminalResourceByOwner(worker.dispatch.id)
-        for (let attempt = 0; attempt < 2; attempt += 1) {
-          await refusedCommand(
-            'worker-release',
-            'dispatch_inactive',
-            'stop_unknown; only a settled worker can release'
-          )
-        }
-        expect(db.getWorkerDispatch(worker.dispatch.id)?.state).toBe('stop_unknown')
-        expect(db.getWorkerTerminalResourceByOwner(worker.dispatch.id)).toEqual(
-          resourceBeforeRelease
-        )
-      }
-      expect(adapter.closeSession).toHaveBeenCalledExactlyOnceWith(sessionId, undefined)
-      notify.mockClear()
-      await sibling.append('sibling still has a retry edge')
-      await newer.append('newer still has a retry edge')
-      await vi.advanceTimersByTimeAsync(300)
-      expect(db.getWorkerTerminalResourceByOwner(sibling.dispatch.id)).toEqual(siblingResource)
-      expect(db.getWorkerTerminalResourceByOwner(newer.dispatch.id)).toEqual(newerResource)
-      expect(structuredWorkerIdentities.get(sibling.identity.handle)).toEqual(sibling.identity)
-      expect(structuredWorkerIdentities.get(newer.identity.handle)).toEqual(newer.identity)
-      expect(subscriptions.get(sibling.identity.sessionId)).not.toHaveBeenCalled()
-      expect(subscriptions.get(newer.identity.sessionId)).not.toHaveBeenCalled()
-      expect(notify).toHaveBeenCalledWith(sibling.identity.sessionId)
-      expect(notify).toHaveBeenCalledWith(newer.identity.sessionId)
-      expect(adapter.dispatch).not.toHaveBeenCalled()
-      expect(db.getMessageById(pending.id)?.delivered_at).toBeNull()
-    }
-  )
-
   function taskBySpec(spec: string) {
     const task = db.listTasks().find((candidate) => candidate.spec === spec)
     if (!task) {
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-adoption-replay.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-adoption-replay.test.ts
index 59308095dda6..ec0b159e9c83 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-adoption-replay.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-adoption-replay.test.ts
@@ -380,18 +380,13 @@ describe('committed adopting create RPC replay', () => {
     expect(sessionAdapter.acquire).toHaveBeenCalledTimes(1)
     expect(internal.publishStructuredAgentSessionTab).toHaveBeenCalledTimes(2)
     expect(selectAccountHome).toHaveBeenCalledTimes(1)
-    // A new adopter needs readable account-qualified identity; an unavailable writer scan still refuses first.
+    // The switched-out terminal is checked before the owner is named; an unavailable scan refuses.
     const another = await call(dispatcher, createParams(OPERATION, 'another-chat'))
     expect(another).toMatchObject({
       ok: true,
-      result: {
-        ok: false,
-        refusal: unary
-          ? { code: 'agent_session_identity_required' }
-          : { code: 'agent_session_conflict', details: { reason: 'conversationHeldElsewhere' } }
-      }
+      result: { ok: false, refusal: { details: { reason: 'conversationHeldElsewhere' } } }
     })
-    expect(JSON.stringify(another).includes(`"owner"`)).toBe(false)
+    expect(JSON.stringify(another).includes(`"owner"`)).toBe(unary)
 
     // Only an exact committed replay bypasses an unavailable writer scan.
     const freshRefusal = unary
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
index 985693f6c80b..f6a4fd6f06f0 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
@@ -6,7 +6,6 @@ import { agentSessionProviderHandleChainHead } from '../../../../shared/agent-se
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import {
   createRestTestRig,
-  restTestSend,
   type RestTestRig
 } from '../../../native-chat/agent-session-wire/structured-agent-session-rest-test-rig'
 import {
@@ -25,9 +24,6 @@ import {
   LEAF_B
 } from '../../main-owned-workspace-runtime-fixture'
 import { executeStructuredSessionSwitch } from './structured-agent-session-switch-execution'
-import { SwitchToChatParams, SwitchToTerminalParams } from './structured-agent-session-schemas'
-import { STRUCTURED_AGENT_SESSION_SWITCH_TO_CHAT_METHODS } from './structured-agent-session-switch-to-chat'
-import type { RuntimeMobileSessionCreateTerminalResult } from '../../../../shared/runtime-types'
 import { DaemonRequestTimeoutError } from '../../../daemon/daemon-errors'
 
 let rig: RestTestRig
@@ -49,83 +45,6 @@ afterEach(async () => {
   await rig.dispose()
   vi.restoreAllMocks()
 })
-const terminal: RuntimeMobileSessionCreateTerminalResult = {
-  tab: {
-    type: 'terminal',
-    id: 'new:leaf',
-    parentTabId: 'new',
-    leafId: 'leaf',
-    title: 'Codex',
-    terminal: 'handle',
-    status: 'ready',
-    isActive: true
-  },
-  publicationEpoch: 'host',
-  snapshotVersion: 1
-}
-
-it('executes empty/fresh through the ordinary terminal owner without requesting a saved resume or native identity', async () => {
-  const { runtime } = setupMainOwnedWorkspace()
-  const create = vi
-    .spyOn(runtime, 'createSessionSwitchTerminal')
-    .mockImplementation(async (_workspace, args) => {
-      args.execution.check()
-      expect(rig.adapter.closeSession).not.toHaveBeenCalled()
-      return terminal
-    })
-  const result = await executeStructuredSessionSwitch(
-    { sessionId: id, execution: { invocationId: 'fresh', commandOverride: 'cx' } },
-    { runtime },
-    'terminal'
-  )
-  expect(result).toMatchObject({ status: 'completed', terminal: terminal.tab.id })
-  expect(create).toHaveBeenCalledWith(
-    expect.any(String),
-    expect.objectContaining({ sessionId: id, source: undefined, commandOverride: 'cx' })
-  )
-  expect(rig.adapter.acquire).not.toHaveBeenCalled()
-})
-
-it.each([false, true])(
-  'publishes before slow startup and preserves a first send accepted during publication=%s',
-  async (sendDuringPublication) => {
-    const { runtime } = setupMainOwnedWorkspace()
-    const acquired = Promise.withResolvers<void>()
-    const original = rig.adapter.acquire.getMockImplementation()!
-    rig.adapter.acquire.mockImplementation(async (...args) => {
-      await acquired.promise
-      return original(...args)
-    })
-    const publish = vi
-      .spyOn(runtime, 'publishStructuredAgentSessionTab')
-      .mockImplementation(async (input) => {
-        input.check?.()
-        await rig.store.setSessionTabVisibility(id, true)
-        if (sendDuringPublication) {
-          const sent = await rig.host.send(
-            caller,
-            restTestSend('A new explicit instruction', rig.store.getRecord(id)!.lease.runtimeFence)
-          )
-          expect(sent.ok).toBe(true)
-        }
-      })
-    const result = await executeStructuredSessionSwitch(
-      { sessionId: id, execution: { invocationId: 'slow-open' } },
-      { runtime },
-      'chat'
-    )
-    expect(result).toEqual({ status: 'completed', sessionId: id })
-    expect(publish).toHaveBeenCalledOnce()
-    expect(rig.store.getSessionTabId(id)).not.toBeNull()
-    acquired.resolve()
-    await vi.waitFor(() => expect(rig.adapter.acquire).toHaveBeenCalledOnce())
-    await vi.waitFor(() => expect(rig.host.switchExecuting(id)).toBe(false))
-    await vi.waitFor(() =>
-      expect(rig.adapter.dispatch).toHaveBeenCalledTimes(sendDuringPublication ? 1 : 0)
-    )
-  }
-)
-
 async function savedTranscript() {
   await rig.host.switchToChat(id)
   await rig.host.switchToTerminal(id)
@@ -183,12 +102,12 @@ async function savedTranscript() {
   })
 }
 
-it.each(['single', 'split', 'split-during-stop'] as const)(
+it.each(['single', 'split'] as const)(
   'uses ordinary exact physical exit and source placement, retaining siblings: %s',
   async (shape) => {
     const split = shape !== 'single'
     await savedTranscript()
-    const { runtime, session, bindPty } = setupMainOwnedWorkspace({ split: shape === 'split' })
+    const { runtime, session } = setupMainOwnedWorkspace({ split: shape === 'split' })
     const incarnationId = '11111111-1111-4111-8111-111111111111'
     runtime.registerPty(PTY_A, WORKTREE_ID, null, { tabId: TAB_ID, leafId: LEAF_A, incarnationId })
     const source = runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_A}`, WORKTREE_ID)
@@ -225,7 +144,6 @@ it.each(['single', 'split', 'split-during-stop'] as const)(
         sessionId: id,
         execution: {
           invocationId: 'from-pane',
-          viewerSelection: 'source-viewer',
           source: {
             terminal: source.handle,
             expectedIncarnationId: incarnationId,
@@ -243,20 +161,6 @@ it.each(['single', 'split', 'split-during-stop'] as const)(
       })
     ])
     expect(rig.adapter.acquire).toHaveBeenCalledTimes(acquisitions)
-    if (shape === 'split-during-stop') {
-      expect(
-        await runtime.applyLayoutCommand({
-          type: 'splitPane',
-          workspace: WORKTREE_ID,
-          tabId: TAB_ID,
-          leafId: LEAF_A,
-          direction: 'vertical',
-          newLeafId: LEAF_B
-        })
-      ).toMatchObject({ ok: true })
-      bindPty({ worktreeId: WORKTREE_ID, tabId: TAB_ID, leafId: LEAF_B, ptyId: PTY_B })
-      runtime.registerPty(PTY_B, WORKTREE_ID, null, { tabId: TAB_ID, leafId: LEAF_B })
-    }
     exit.resolve()
     expect(await operation).toEqual({ status: 'completed', sessionId: id })
     await vi.waitFor(() => expect(rig.adapter.acquire).toHaveBeenCalledTimes(acquisitions + 1))
@@ -277,7 +181,6 @@ it.each(['single', 'split', 'split-during-stop'] as const)(
       openPlacement: {
         invocationId: 'from-pane',
         generation: expect.any(String),
-        viewerSelection: 'source-viewer',
         placement: { afterTabId: TAB_ID, index: 0 },
         source: source.presentation.identity
       }
@@ -350,123 +253,13 @@ it('reports a dispatched terminal with a lost answer as uncertain, preserving it
   expect(rig.store.getSessionTabId(id)).toBe('source-chat')
 })
 
-it('retires the captured custom source and its ordinary projected row after fresh startup', async () => {
-  const { runtime } = setupMainOwnedWorkspace()
-  await rig.store.setSessionTabVisibility(id, false)
-  await rig.store.setSessionTabVisibility(id, true, 'source-chat')
-  await runtime.applyLayoutCommand({
-    type: 'openAgentSessionTab',
-    workspace: WORKTREE_ID,
-    sessionId: id,
-    agent: 'codex',
-    tabId: 'source-chat'
-  })
-  runtime.projectStructuredAgentSessionTab({
-    workspaceId: WORKTREE_ID,
-    sessionId: id,
-    agent: 'codex',
-    activate: true
-  })
-  vi.spyOn(runtime, 'createSessionSwitchTerminal').mockResolvedValue(terminal)
-  const result = await executeStructuredSessionSwitch(
-    { sessionId: id, execution: { invocationId: 'retire', sourceTabId: 'source-chat' } },
-    { runtime },
-    'terminal'
-  )
-  expect(result).toMatchObject({ status: 'completed', sourceRetained: false })
-  expect(rig.store.getSessionTabId(id)).toBeNull()
-  expect(
-    (await runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)).tabs.some(
-      (tab) => tab.type === 'agent-session' && tab.sessionId === id
-    )
-  ).toBe(false)
-})
-
-it('preserves the v1 request/result and start-only side effects when execution is absent', async () => {
-  const { runtime } = setupMainOwnedWorkspace()
-  expect(SwitchToChatParams.parse({ sessionId: id })).toEqual({ sessionId: id })
-  expect(SwitchToTerminalParams.parse({ sessionId: id })).toEqual({ sessionId: id })
-  expect(SwitchToChatParams.safeParse({ sessionId: id, other: true }).success).toBe(false)
-  const publish = vi.spyOn(runtime, 'publishStructuredAgentSessionTab')
-  const create = vi.spyOn(runtime, 'createSessionSwitchTerminal')
-  const result = await STRUCTURED_AGENT_SESSION_SWITCH_TO_CHAT_METHODS[0].handler(
-    { sessionId: id },
-    { runtime }
-  )
-  expect(result).toEqual({ ok: true, sessionId: id })
-  expect(publish).not.toHaveBeenCalled()
-  expect(create).not.toHaveBeenCalled()
-})
-
-it('keeps strict v1 envelopes and journal effects for both a selected and already-starting failed child', async () => {
-  const { runtime } = setupMainOwnedWorkspace()
-  const opening = Promise.withResolvers<void>()
-  const entered = Promise.withResolvers<void>()
-  vi.spyOn(rig.host.deps.adapter, 'open').mockImplementation(async () => {
-    entered.resolve()
-    await opening.promise
-    throw new Error('provider launch failed')
-  })
-  const method = STRUCTURED_AGENT_SESSION_SWITCH_TO_CHAT_METHODS[0]!
-  const first = method.handler({ sessionId: id }, { runtime })
-  await entered.promise
-  const joined = method.handler({ sessionId: id }, { runtime })
-  opening.resolve()
-  const answer = await first
-  expect(await joined).toEqual(answer)
-  expect(Object.keys(answer).sort()).toEqual(['ok', 'refusal'])
-  expect(answer).toEqual({
-    ok: false,
-    refusal: {
-      code: 'agent_session_owner_restart_failed',
-      message: "Codex couldn't start. Send your message to try again."
-    }
-  })
-  const failures = (await rig.host.journalSnapshot(id)).items.filter(
-    (item) => item.body.kind === 'status' && item.body.failure
-  )
-  expect(failures).toHaveLength(1)
-})
-
-it('publishes ordinary late startup failure once after the destination transcript is already visible', async () => {
-  const { runtime } = setupMainOwnedWorkspace()
-  const release = Promise.withResolvers<void>()
-  const entered = Promise.withResolvers<void>()
-  rig.adapter.acquire.mockImplementation(async () => {
-    entered.resolve()
-    await release.promise
-    throw new Error('raw provider startup detail')
-  })
-  const result = await executeStructuredSessionSwitch(
-    { sessionId: id, execution: { invocationId: 'late-failure' } },
-    { runtime },
-    'chat'
-  )
-  expect(result).toEqual({ status: 'completed', sessionId: id })
-  await entered.promise
-  expect(rig.store.getSessionTabId(id)).not.toBeNull()
-  release.resolve()
-  await vi.waitFor(async () => {
-    const failures = (await rig.host.journalSnapshot(id)).items.filter(
-      (item) => item.body.kind === 'status' && item.body.failure
-    )
-    expect(failures).toHaveLength(1)
-    expect(JSON.stringify(failures)).not.toContain('raw provider startup detail')
-  })
-  expect(
-    await executeStructuredSessionSwitch(
-      { sessionId: id, execution: { invocationId: 'other-viewer' } },
-      { runtime },
-      'chat'
-    )
-  ).toEqual(result)
-  expect(rig.adapter.acquire).toHaveBeenCalledOnce()
-  expect(rig.adapter.dispatch).not.toHaveBeenCalled()
-})
-
-it.each([false, true])(
-  'captures selection before native Stop and consumes it at the ordinary terminal snapshot: newer navigation=%s',
-  async (navigate) => {
+it.each([
+  { navigate: false, viewerSelection: undefined },
+  { navigate: true, viewerSelection: undefined },
+  { navigate: false, viewerSelection: 'selection-v1:initiating-viewer' }
+])(
+  'captures selection before native Stop and consumes it at the ordinary terminal snapshot: $navigate/$viewerSelection',
+  async ({ navigate, viewerSelection }) => {
     const { runtime, bindPty, handleOf } = setupMainOwnedWorkspace()
     Object.assign(runtime, {
       resolveTerminalWorkspaceLaunchScope: async () => ({
@@ -484,6 +277,20 @@ it.each([false, true])(
       activate: true,
       check: () => {}
     })
+    const other = createTestParams()
+    expect(
+      await rig.host.create(caller, {
+        ...other,
+        envelope: { ...other.envelope, sessionId: 'newer-navigation' },
+        location: { ...other.location, workspaceId: WORKTREE_ID }
+      })
+    ).toMatchObject({ ok: true })
+    await runtime.publishStructuredAgentSessionTab({
+      workspaceId: WORKTREE_ID,
+      sessionId: 'newer-navigation',
+      agent: 'codex',
+      activate: false
+    })
     await rig.host.switchToChat(id)
     const stopping = Promise.withResolvers<void>()
     const stopped = Promise.withResolvers<void>()
@@ -529,7 +336,11 @@ it.each([false, true])(
     const operation = executeStructuredSessionSwitch(
       {
         sessionId: id,
-        execution: { invocationId: 'ordinary-native-stop', sourceTabId: `agent-session:${id}` }
+        execution: {
+          invocationId: 'ordinary-native-stop',
+          sourceTabId: `agent-session:${id}`,
+          ...(viewerSelection ? { viewerSelection } : {})
+        }
       },
       { runtime },
       'terminal'
@@ -541,23 +352,46 @@ it.each([false, true])(
       })
     ])
     expect(spawn).not.toHaveBeenCalled()
+    runtime.projectStructuredAgentSessionTab({
+      workspaceId: 'another-workspace',
+      sessionId: 'automatic-publication',
+      agent: 'codex',
+      activate: true
+    })
     if (navigate) {
-      runtime.projectStructuredAgentSessionTab({
-        workspaceId: WORKTREE_ID,
-        sessionId: 'newer-navigation',
-        agent: 'codex',
-        activate: true
-      })
+      const picked = await runtime.activateMobileSessionTab(
+        `id:${WORKTREE_ID}`,
+        'agent-session:newer-navigation',
+        undefined,
+        { navigation: 'all', intent: 'user', clientNavigationId: 'host-follow-viewer' }
+      )
+      expect(picked.activeTabId).toBe('agent-session:newer-navigation')
     }
     stopped.resolve()
     const answer = await operation
     expect(answer).toMatchObject({ status: 'completed' })
     expect(spawn).toHaveBeenCalledOnce()
-    const snapshot = await runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)
+    expect(spawn.mock.calls[0]![1]!.presentation).toBe('background')
+    expect(spawn.mock.calls[0]![1]!.agentLaunchViewer?.()).toBe('none')
+    const snapshot = await runtime.listMobileSessionTabs(
+      `id:${WORKTREE_ID}`,
+      navigate ? 'host-follow-viewer' : undefined
+    )
+    if (viewerSelection) {
+      expect(
+        snapshot.tabs.find((tab) => tab.type === 'terminal' && tab.ptyId === 'switch-destination')
+          ?.openPlacement
+      ).toMatchObject({
+        activate: true,
+        viewerSelection
+      })
+    }
     expect(snapshot.activeTabId).toBe(
       navigate
         ? 'agent-session:newer-navigation'
-        : `${spawn.mock.calls[0]![1]!.tabId}::${spawn.mock.calls[0]![1]!.leafId}`
+        : viewerSelection
+          ? `agent-session:${id}`
+          : `${spawn.mock.calls[0]![1]!.tabId}::${spawn.mock.calls[0]![1]!.leafId}`
     )
   }
 )
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
index 579921cd555d..bc5503fce445 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
@@ -13,8 +13,7 @@ import {
 } from '../../../../shared/agent-session-switch-execution'
 import {
   AgentSessionRefusalError,
-  agentSessionRefusalError,
-  isAgentSessionRefusalError
+  agentSessionRefusalError
 } from '../../../../shared/agent-session-wire-refusals'
 import {
   nativeConversationContent,
@@ -29,7 +28,7 @@ import {
 import {
   captureStructuredSwitchTerminalSource,
   recordWorkspace,
-  switchRetainedOwner
+  resolveStructuredSwitchRetainedOwner
 } from './structured-agent-session-switch-source'
 import { executeStructuredSessionTerminalSwitch } from './structured-agent-session-switch-terminal-execution'
 import { agentLaunchMovesHostWindow } from './agent-launch-tab-publication'
@@ -43,7 +42,10 @@ export async function executeStructuredSessionSwitch(
 ): Promise<AgentSessionSwitchResult> {
   const deadline = agentSessionSwitchDeadline()
   let sessionId = params.sessionId
-  const selectionCurrent = ctx.runtime.captureSessionSwitchSelection()
+  const selectionCurrent = ctx.runtime.captureSessionSwitchSelection(
+    undefined,
+    params.execution?.viewerSelection
+  )
   let commandOwned = false
   const operation = (async (): Promise<AgentSessionSwitchResult> => {
     const prepared = await prepareStructuredSessionSwitch(params, ctx, sessionId, deadline)
@@ -172,21 +174,12 @@ export async function executeStructuredSessionSwitch(
             }
             sessionId = created.value.sessionId
           } catch (error) {
-            const owner =
-              isAgentSessionRefusalError(error) &&
-              (error.refusal.code === 'agent_session_conflict' ||
-                error.refusal.code === 'agent_session_ownership_unknown') &&
-              createIdentity &&
-              providerSessionId &&
-              switchRetainedOwner(host, createIdentity, providerSessionId)
-            if (
-              !owner ||
-              !isAgentSessionRefusalError(error) ||
-              error.refusal.details?.owner?.sessionId !== owner
-            ) {
-              throw error
-            }
-            sessionId = owner
+            sessionId = resolveStructuredSwitchRetainedOwner(
+              error,
+              host,
+              createIdentity,
+              providerSessionId
+            )
           }
           await host.adoptSwitch(conversation?.commandKey ?? params.sessionId, sessionId)
         }
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-generated.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-generated.test.ts
deleted file mode 100644
index 71cddf224b71..000000000000
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-generated.test.ts
+++ /dev/null
@@ -1,476 +0,0 @@
-import { randomUUID } from 'node:crypto'
-import type * as ProcessHost from '@orca/process-host'
-import { mkdir, writeFile } from 'node:fs/promises'
-import { basename, join } from 'node:path'
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import {
-  createStructuredAgentSessionId,
-  structuredAgentSessionCreateParams
-} from '../../../../shared/structured-agent-session-create'
-import { toRuntimeExecutionHostId } from '../../../../shared/execution-host'
-import {
-  createRestTestRig,
-  type RestTestRig
-} from '../../../native-chat/agent-session-wire/structured-agent-session-rest-test-rig'
-import { setStructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-registry'
-import { HOST_TEST_THREAD } from '../../../native-chat/agent-session-wire/structured-agent-session-host-test-data'
-import {
-  setupMainOwnedWorkspace,
-  WORKTREE_ID,
-  TAB_ID,
-  LEAF_A,
-  PTY_A
-} from '../../main-owned-workspace-runtime-fixture'
-import type { AgentStatusIpcPayload } from '../../../../shared/agent-status-types'
-import * as writerProcess from '../../structured-agent-cli-writers'
-import { executeStructuredSessionSwitch } from './structured-agent-session-switch-execution'
-import { SwitchToChatParams } from './structured-agent-session-schemas'
-import {
-  switchConversationIdentity,
-  switchRetainedOwner
-} from './structured-agent-session-switch-source'
-import { createTestParams } from '../../../native-chat/agent-session-wire/structured-agent-session-create-test-fixture'
-import { PI_RPC_AGENT } from '../../../pi/rpc-agent-definition'
-import { StructuredAgentRegistry } from '../../../native-chat/agent-session-wire/structured-agent-registry'
-
-vi.mock('../../structured-agent-shell-environment', () => ({
-  resolveHostAgentBaseEnvironment: async () => ({}),
-  refreshHostAgentBaseEnvironmentAfterMiss: async () => {}
-}))
-vi.mock('../../../agent-workspace-trust', () => ({ applyAgentWorkspaceTrust: async () => ({}) }))
-vi.mock('@orca/process-host', async (importOriginal) => ({
-  ...(await importOriginal<typeof ProcessHost>()),
-  runProcess: async () => ({
-    stdout: 'codex 0.200.0',
-    stderr: '',
-    code: 0,
-    timedOut: false,
-    outputTruncated: false
-  })
-}))
-
-let rig: RestTestRig
-beforeEach(async () => {
-  rig = await createRestTestRig({
-    idleSweep: { intervalMs: 60_000 },
-    resolveWorkspacePath: async () => rig.root,
-    resolveLaunchEnv: async () => ({ CODEX_HOME: rig.root })
-  })
-  vi.stubEnv('HOME', join(rig.root, 'home'))
-  vi.stubEnv('USERPROFILE', join(rig.root, 'home'))
-  vi.stubEnv('ORCA_USER_DATA_PATH', join(rig.root, 'user-data'))
-  vi.stubEnv('CODEX_HOME', rig.root)
-  vi.spyOn(Date, 'now').mockImplementation(() => rig.clock.now)
-  const acquire = rig.adapter.acquire.getMockImplementation()!
-  rig.adapter.acquire.mockImplementation(async (input) => {
-    const acquired = await acquire(input)
-    return {
-      ...acquired,
-      ...(acquired.link ? { link: { ...acquired.link, origin: 'resumed' as const } } : {})
-    }
-  })
-  setStructuredAgentSessionHost(rig.host)
-})
-afterEach(async () => {
-  setStructuredAgentSessionHost(null)
-  await rig.dispose()
-  vi.unstubAllEnvs()
-  vi.restoreAllMocks()
-})
-
-it.each([
-  { retained: false, working: false, navigation: 'none', otherAccount: false },
-  { retained: false, working: true, navigation: 'preparation', otherAccount: false },
-  { retained: true, working: false, navigation: 'stop', otherAccount: false },
-  { retained: false, working: false, navigation: 'none', otherAccount: true }
-] as const)(
-  'composes generated viewer envelopes through actual create admission and exact Stop: %j',
-  async ({ retained, working, navigation, otherAccount }) => {
-    const filePath = join(
-      rig.root,
-      'sessions',
-      `rollout-2026-10-28T00-00-00-${HOST_TEST_THREAD}.jsonl`
-    )
-    await mkdir(join(rig.root, 'sessions'), { recursive: true })
-    const transcript = `${[
-      { type: 'session_meta', payload: { id: HOST_TEST_THREAD, cwd: rig.root } },
-      {
-        timestamp: '2026-10-28T00:00:00Z',
-        type: 'event_msg',
-        payload: { type: 'task_started', turn_id: 'cli-turn' }
-      },
-      {
-        type: 'response_item',
-        payload: {
-          type: 'message',
-          role: 'user',
-          content: [{ type: 'input_text', text: 'A saved prompt' }]
-        }
-      },
-      ...(working
-        ? []
-        : [
-            {
-              timestamp: '2026-10-28T00:00:01Z',
-              type: 'event_msg',
-              payload: { type: 'task_complete', turn_id: 'cli-turn' }
-            }
-          ])
-    ]
-      .map((row) => JSON.stringify(row))
-      .join('\n')}\n`
-    await writeFile(filePath, transcript)
-    const preparing = Promise.withResolvers<void>()
-    const prepared = Promise.withResolvers<void>()
-    let holdPreparation = false
-    let selectedHome = rig.root
-    const prepareHome = vi.fn(async () => {
-      if (holdPreparation && navigation === 'preparation') {
-        preparing.resolve()
-        await prepared.promise
-      }
-      return selectedHome
-    })
-    let exited = false
-    const launchHome = vi.fn(async () => rig.root)
-    const { runtime, session, handleOf } = setupMainOwnedWorkspace({
-      runtimeDeps: {
-        resolveCodexStructuredLaunchHome: prepareHome,
-        prepareCodexStructuredLaunch: launchHome,
-        readHookCliWriterObservation: () => ({
-          current: () => true,
-          topology: 'pane-owned',
-          presence: async () => (exited ? 'exited' : 'live')
-        })
-      }
-    })
-    // Only workspace filesystem lookup and external process/account I/O are supplied by the fixture.
-    vi.spyOn(runtime, 'resolveRuntimeFileTarget').mockResolvedValue({
-      executionHostId: 'local',
-      worktree: {
-        id: WORKTREE_ID,
-        repoId: 'repo-1',
-        parentWorktreeId: null,
-        childWorktreeIds: [],
-        lineage: null,
-        path: rig.root,
-        displayName: 'workspace',
-        comment: '',
-        linkedIssue: null,
-        linkedPR: null,
-        linkedLinearIssue: null,
-        isArchived: false,
-        isUnread: false,
-        isPinned: false,
-        sortOrder: 0,
-        lastActivityAt: 0,
-        branch: 'main',
-        head: 'head',
-        isBare: false,
-        isMainWorktree: true,
-        git: { path: rig.root, head: 'head', branch: 'main', isBare: false, isMainWorktree: true }
-      }
-    })
-    vi.spyOn(runtime, 'prepareAiVaultSessionResume').mockResolvedValue({ useRealCodexHome: false })
-    vi.spyOn(writerProcess, 'posixCliWriterShellAlone').mockResolvedValue(false)
-    const incarnationId = '11111111-1111-4111-8111-111111111111'
-    runtime.registerPty(PTY_A, WORKTREE_ID, null, { tabId: TAB_ID, leafId: LEAF_A, incarnationId })
-    const row: AgentStatusIpcPayload = {
-      paneKey: `${TAB_ID}:${LEAF_A}`,
-      worktreeId: WORKTREE_ID,
-      connectionId: null,
-      agentType: 'codex',
-      state: working ? 'working' : 'waiting',
-      prompt: '',
-      receivedAt: 1,
-      stateStartedAt: 1,
-      providerSession: { key: 'session_id', id: HOST_TEST_THREAD, transcriptPath: filePath }
-    }
-    vi.spyOn(runtime, 'getAgentProviderSessionRows').mockImplementation(() => (exited ? [] : [row]))
-    vi.spyOn(runtime.agentTransitions, 'latestRow').mockImplementation(() => (exited ? null : row))
-    const stopEntered = Promise.withResolvers<void>()
-    const exit = Promise.withResolvers<void>()
-    const stop = vi.fn(async () => {
-      stopEntered.resolve()
-      await exit.promise
-      exited = true
-      await runtime.onPtyExit(PTY_A, 0, incarnationId, { hostExitConfirmed: true })
-      return true
-    })
-    runtime.setPtyController({
-      write: () => true,
-      kill: () => false,
-      stopAndWait: stop,
-      getForegroundProcess: async () => 'codex',
-      listProcesses: async () =>
-        exited
-          ? []
-          : [
-              {
-                id: PTY_A,
-                cwd: rig.root,
-                title: 'Codex',
-                worktreeId: WORKTREE_ID,
-                terminalHandle: handleOf(PTY_A),
-                rootProcessId: 10,
-                incarnationId
-              }
-            ]
-    })
-    const source = runtime.resolveTerminalPane(row.paneKey, WORKTREE_ID)
-    if (!source.presentation) {
-      throw new Error('missing source presentation')
-    }
-    const resumeFrom = {
-      providerSessionId: HOST_TEST_THREAD,
-      cliSource: { workspaceId: WORKTREE_ID, paneKey: row.paneKey }
-    }
-    const createIntent = () => {
-      const sessionId = createStructuredAgentSessionId('codex', randomUUID)
-      return {
-        sessionId,
-        params: structuredAgentSessionCreateParams({
-          sessionId,
-          worktree: `id:${WORKTREE_ID}`,
-          agent: 'codex',
-          resumeFrom,
-          randomUuid: randomUUID
-        })
-      }
-    }
-    const first = createIntent()
-    const second = createIntent()
-    expect(first.sessionId).not.toBe(second.sessionId)
-    let canonical = first.sessionId
-    if (otherAccount) {
-      const otherHome = join(rig.root, 'other-account')
-      await mkdir(join(otherHome, 'sessions'), { recursive: true })
-      await writeFile(join(otherHome, 'sessions', basename(filePath)), transcript)
-      selectedHome = otherHome
-      const attach = await runtime.resolveStructuredAgentSessionCreateIdentity({
-        ...first.params,
-        resumeFrom: { providerSessionId: HOST_TEST_THREAD }
-      })
-      selectedHome = rig.root
-      expect(attach.accountHome).toEqual({ variable: 'CODEX_HOME', path: otherHome })
-      expect(
-        await rig.host.create(
-          { callerKey: 'setup' },
-          createTestParams(undefined, {
-            ...attach,
-            envelope: { ...attach.envelope, sessionId: 'other-account-native' }
-          })
-        )
-      ).toMatchObject({ ok: true })
-    }
-    if (retained) {
-      const attach = await runtime.resolveStructuredAgentSessionCreateIdentity(first.params)
-      const created = await rig.host.create(
-        { callerKey: 'setup' },
-        createTestParams(undefined, {
-          ...attach,
-          envelope: { ...attach.envelope, sessionId: first.sessionId }
-        })
-      )
-      expect(created).toMatchObject({ ok: true })
-      await rig.host.switchToChat(first.sessionId)
-      await rig.host.switchToTerminal(first.sessionId)
-      canonical = first.sessionId
-    }
-    const generated = (intent: typeof first, invocationId: string) =>
-      SwitchToChatParams.parse({
-        sessionId: intent.sessionId,
-        execution: {
-          invocationId,
-          create: intent.params,
-          source: {
-            terminal: source.handle,
-            expectedIncarnationId: incarnationId,
-            originalPresentation: source.presentation
-          }
-        }
-      })
-    // Retained return still carries a fresh generated ID, never the known native owner.
-    const a = retained ? second : first
-    const b = createIntent()
-    await expect(runtime.resolveStructuredAgentSessionCreateIntent(a.params)).rejects.toMatchObject(
-      {
-        refusal: {
-          code: 'agent_session_conflict',
-          details: { reason: 'conversationHeldElsewhere' }
-        }
-      }
-    )
-    const commands = vi.spyOn(rig.host, 'runSwitch')
-    const acquisitions = rig.adapter.acquire.mock.calls.length
-    const launchPreparations = launchHome.mock.calls.length
-    holdPreparation = true
-    const operation = executeStructuredSessionSwitch(generated(a, 'viewer-a'), { runtime }, 'chat')
-    const navigate = () =>
-      runtime.projectStructuredAgentSessionTab({
-        workspaceId: WORKTREE_ID,
-        sessionId: 'newer-navigation',
-        agent: 'codex',
-        activate: true
-      })
-    if (navigation === 'preparation') {
-      await preparing.promise
-      navigate()
-      prepared.resolve()
-    }
-    await Promise.race([
-      stopEntered.promise,
-      operation.then((answer) => {
-        throw new Error(JSON.stringify(answer))
-      })
-    ])
-    const duplicate = executeStructuredSessionSwitch(generated(b, 'viewer-b'), { runtime }, 'chat')
-    expect(rig.adapter.acquire).toHaveBeenCalledTimes(acquisitions)
-    expect(rig.store.getRecord(a.sessionId)).toBeNull()
-    expect(launchHome).toHaveBeenCalledTimes(launchPreparations)
-    await vi.waitFor(() => expect(commands).toHaveBeenCalledTimes(2))
-    if (navigation === 'stop') {
-      navigate()
-    }
-    exit.resolve()
-    const answer = await operation
-    expect(answer).toEqual({ status: 'completed', sessionId: canonical })
-    expect(await duplicate).toEqual(answer)
-    if (working) {
-      expect(
-        (await rig.host.journalSnapshot(canonical)).items
-          .filter((item) => item.body.kind === 'turn')
-          .map((item) => item.body)
-      ).toContainEqual(expect.objectContaining({ state: 'interrupted' }))
-    }
-    expect(stop).toHaveBeenCalledOnce()
-    await vi.waitFor(() => expect(rig.adapter.acquire).toHaveBeenCalledTimes(acquisitions + 1))
-    await vi.waitFor(() => expect(rig.store.getRecord(canonical)?.lease.claimStatus).toBe('live'))
-    expect(rig.adapter.dispatch).not.toHaveBeenCalled()
-    const snapshot = await runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)
-    expect(snapshot.activeTabId).toBe(
-      `agent-session:${navigation === 'none' ? canonical : 'newer-navigation'}`
-    )
-    expect(session().unifiedTabs?.[WORKTREE_ID]?.some((tab) => tab.entityId === canonical)).toBe(
-      true
-    )
-  }
-)
-
-it('uses registered Pi History IDs and isolates account and owning host for prefounding/native command identity', async () => {
-  const filePath = join(rig.root, `2026-10-28T00-00-00_${HOST_TEST_THREAD}.jsonl`)
-  const transcript = `${[
-    { type: 'session', version: 3, id: HOST_TEST_THREAD },
-    {
-      type: 'message',
-      id: 'pi-user',
-      parentId: null,
-      message: { role: 'user', content: 'Saved Pi prompt' }
-    },
-    {
-      type: 'message',
-      id: 'pi-reply',
-      parentId: 'pi-user',
-      message: {
-        role: 'assistant',
-        content: [{ type: 'text', text: 'Saved reply' }],
-        stopReason: 'stop'
-      }
-    }
-  ]
-    .map((row) => JSON.stringify(row))
-    .join('\n')}\n`
-  await writeFile(filePath, transcript)
-  const identity = {
-    provider: 'pi' as const,
-    accountHome: { variable: 'PI_CODING_AGENT_DIR', path: rig.root },
-    location: {
-      executionHostId: 'local' as const,
-      wslDistro: null,
-      workspaceId: WORKTREE_ID,
-      workspaceKind: 'git-worktree' as const
-    }
-  }
-  const piRig = await createRestTestRig({
-    agents: new StructuredAgentRegistry([
-      {
-        definition: PI_RPC_AGENT,
-        adapter: {
-          ...rig.host.deps.adapter,
-          compact: async () => {
-            throw new Error('identity-only fixture never contacts the provider')
-          }
-        }
-      }
-    ])
-  })
-  try {
-    const created = await piRig.host.create(
-      { callerKey: 'setup' },
-      createTestParams(undefined, {
-        ...identity,
-        agent: 'pi',
-        adopt: {
-          providerHandle: { transport: 'jsonl-rpc', agent: 'pi', nativeId: filePath },
-          transcriptPath: filePath
-        }
-      })
-    )
-    // Use the actual ordinary import/founding owner, with a valid registered transcript.
-    expect(created).toMatchObject({ ok: true })
-    expect(switchRetainedOwner(piRig.host, identity, HOST_TEST_THREAD)).toBe(
-      created.ok ? created.value.sessionId : null
-    )
-    const key = switchConversationIdentity(identity, HOST_TEST_THREAD).commandKey
-    expect(switchConversationIdentity(identity, filePath).commandKey).toBe(key)
-    for (const [index, scoped] of [
-      {
-        ...identity,
-        accountHome: { ...identity.accountHome, path: join(rig.root, 'other-account') }
-      },
-      {
-        ...identity,
-        location: { ...identity.location, executionHostId: toRuntimeExecutionHostId('other') }
-      },
-      { ...identity, location: { ...identity.location, wslDistro: 'Ubuntu' } }
-    ].entries()) {
-      expect(switchRetainedOwner(piRig.host, scoped, HOST_TEST_THREAD)).toBeNull()
-      await mkdir(scoped.accountHome.path, { recursive: true })
-      const scopedPath = join(scoped.accountHome.path, basename(filePath))
-      await writeFile(scopedPath, transcript)
-      const params = createTestParams(undefined, {
-        ...scoped,
-        agent: 'pi',
-        envelope: { ...createTestParams().envelope, sessionId: `pi-scoped-${index}` },
-        adopt: {
-          providerHandle: { transport: 'jsonl-rpc', agent: 'pi', nativeId: scopedPath },
-          transcriptPath: scopedPath
-        }
-      })
-      expect(await piRig.host.create({ callerKey: 'setup' }, params)).toMatchObject({ ok: true })
-      expect(switchRetainedOwner(piRig.host, scoped, HOST_TEST_THREAD)).toBe(
-        params.envelope.sessionId
-      )
-      expect(switchConversationIdentity(scoped, HOST_TEST_THREAD).commandKey).not.toBe(key)
-    }
-    const aliasPath = join(rig.root, 'same-account-copy', `copy_${HOST_TEST_THREAD}.jsonl`)
-    await mkdir(join(rig.root, 'same-account-copy'))
-    await writeFile(aliasPath, transcript)
-    const duplicate = createTestParams(undefined, {
-      ...identity,
-      agent: 'pi',
-      envelope: { ...createTestParams().envelope, sessionId: 'pi-duplicate' },
-      adopt: {
-        providerHandle: { transport: 'jsonl-rpc', agent: 'pi', nativeId: aliasPath },
-        transcriptPath: aliasPath
-      }
-    })
-    expect(await piRig.host.create({ callerKey: 'setup' }, duplicate)).toMatchObject({
-      ok: false,
-      refusal: { code: 'agent_session_conflict', details: { reason: 'conversationHeldElsewhere' } }
-    })
-    expect(piRig.store.listRecords()).toHaveLength(4)
-  } finally {
-    await piRig.dispose()
-  }
-})
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-source.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-source.ts
index 5b638b983c93..f1991e84419b 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-source.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-source.ts
@@ -1,7 +1,10 @@
 import type { RpcContext } from '../core'
 import type { StructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-host'
 
-import { agentSessionRefusalError } from '../../../../shared/agent-session-wire-refusals'
+import {
+  agentSessionRefusalError,
+  isAgentSessionRefusalError
+} from '../../../../shared/agent-session-wire-refusals'
 
 import type { AgentSessionAttachParams } from '../../../native-chat/agent-session-wire/structured-agent-session-attach'
 import { listStructuredProviderSessionOwnership } from '../../../native-chat/agent-session-wire/structured-provider-session-ownership'
@@ -59,6 +62,29 @@ export function switchRetainedOwner(
   )
 }
 
+export function resolveStructuredSwitchRetainedOwner(
+  error: unknown,
+  host: StructuredAgentSessionHost,
+  identity: Parameters<typeof switchRetainedOwner>[1] | undefined,
+  providerSessionId: string | null | undefined
+): string {
+  const owner =
+    isAgentSessionRefusalError(error) &&
+    (error.refusal.code === 'agent_session_conflict' ||
+      error.refusal.code === 'agent_session_ownership_unknown') &&
+    identity &&
+    providerSessionId &&
+    switchRetainedOwner(host, identity, providerSessionId)
+  if (
+    !owner ||
+    !isAgentSessionRefusalError(error) ||
+    error.refusal.details?.owner?.sessionId !== owner
+  ) {
+    throw error
+  }
+  return owner
+}
+
 /** Translate only an unconfirmed exact terminal capture into the existing ownership refusal. */
 export function captureStructuredSwitchTerminalSource(
   runtime: RpcContext['runtime'],
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts
index 43fbfbdc22ad..70a3bf534d17 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts
@@ -24,7 +24,7 @@ export async function executeStructuredSessionTerminalSwitch(
   sessionId: string,
   deadline: ReturnType<typeof agentSessionSwitchDeadline>,
   execution: NonNullable<z.infer<typeof SwitchToTerminalParams>['execution']>,
-  selectionCurrent: () => boolean
+  selectionCurrent: (consume?: boolean) => boolean
 ): Promise<AgentSessionSwitchResult> {
   const agent = record.provider
   if (!isTuiAgent(agent)) {
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-to-chat.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-to-chat.ts
index e8d9c05124d2..327f2c23e725 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-to-chat.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-to-chat.ts
@@ -11,10 +11,7 @@ import {
 } from './structured-agent-session-gate'
 import { SwitchToChatParams } from './structured-agent-session-schemas'
 
-// `agentSession.switchToChat` — a terminal's conversation moving into the chat that already holds
-// it. The host resolves the record and starts its agent through the ordinary operation start, so the
-// provider open imports the terminal's turns; success is that agent ready. A refusal leaves the
-// terminal to the client. Gated per agent by `agent-session.structured.switch.v1:<agent>`.
+// Optional execution uses the complete switch contract; strict legacy calls keep their envelope.
 
 export const STRUCTURED_AGENT_SESSION_SWITCH_TO_CHAT_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/runtime-fake-spawn-binding.test-fixture.ts b/src/main/runtime/runtime-fake-spawn-binding.test-fixture.ts
index 534ba0599eb5..fe9a554e002c 100644
--- a/src/main/runtime/runtime-fake-spawn-binding.test-fixture.ts
+++ b/src/main/runtime/runtime-fake-spawn-binding.test-fixture.ts
@@ -1,4 +1,4 @@
-import { getConnectionExecutionHostId } from '../../shared/execution-host'
+import { getConnectionExecutionHostId, type ExecutionHostId } from '../../shared/execution-host'
 import { layoutContainsLeafId } from '../persistence/restoring-sessions/terminal-layout-normalization'
 import { ptyBindingIsRefused } from '../persistence/loading-store/pty-binding-refusals'
 import { applyPtyBinding } from '../persistence/loading-store/pty-binding-session-update'
@@ -12,15 +12,18 @@ type SpawnArgs = Parameters<NonNullable<RuntimePtyController['spawn']>>[0]
 /** A fake controller replaces only the pane admitted for this spawn, like the lower owner. */
 export function captureFakeSpawnBinding(
   runtime: OrcaRuntimeService,
-  args: Pick<SpawnArgs, 'worktreeId' | 'tabId' | 'leafId' | 'connectionId'>,
-  explicitHostId?: string
+  args: Pick<
+    SpawnArgs,
+    'worktreeId' | 'tabId' | 'leafId' | 'connectionId' | 'expectedSourceBinding'
+  >,
+  explicitHostId?: ExecutionHostId
 ): (result: unknown) => void {
   const store = storeOf(runtime)
   if (!store || !args.worktreeId || !args.tabId || !args.leafId) {
     return () => {}
   }
   const { worktreeId, tabId, leafId } = args
-  const holdsPane = (hostId: string): boolean => {
+  const holdsPane = (hostId: ExecutionHostId): boolean => {
     const session = store.getWorkspaceSession?.(hostId)
     return (
       (session?.tabsByWorktree[worktreeId]?.some((tab) => tab.id === tabId) ?? false) &&
@@ -31,7 +34,7 @@ export function captureFakeSpawnBinding(
   const hostId =
     explicitHostId ??
     (admitted
-      ? [getConnectionExecutionHostId(args.connectionId), 'local'].find(holdsPane)
+      ? [getConnectionExecutionHostId(args.connectionId), 'local' as const].find(holdsPane)
       : 'local')
   if (!hostId) {
     return () => {}
@@ -54,6 +57,7 @@ export function captureFakeSpawnBinding(
       'incarnationId' in result && typeof result.incarnationId === 'string'
         ? result.incarnationId
         : undefined
+    runtime.assertPtyRegistrationAllowed(result.id, incarnationId)
     const current = sessions.get(hostId)
     const bound = current.terminalLayoutsByTabId[tabId]?.ptyIdsByLeafId?.[leafId]
     const stamp = current.terminalPtyIncarnationsByPaneKey?.[paneKey]
@@ -70,6 +74,7 @@ export function captureFakeSpawnBinding(
       ...(predecessor
         ? { expectedBinding: { ptyId: predecessor, incarnationId: predecessorStamp } }
         : {}),
+      ...(args.expectedSourceBinding ? { expectedSourceBinding: args.expectedSourceBinding } : {}),
       mayCreate: !admitted,
       mayReviveRetiredSurface: false
     }
@@ -86,7 +91,15 @@ export function captureFakeSpawnBinding(
         }))
       )
     ) {
-      throw new PaneOwnerContentionError()
+      // The fake lower owner discards its refused child before returning, as the real provider does.
+      try {
+        runtime['ptyController']?.kill(result.id)
+      } catch {
+        // Cleanup cannot replace the original binding refusal.
+      }
+      throw args.expectedSourceBinding
+        ? new Error('terminal_split_source_not_found')
+        : new PaneOwnerContentionError()
     }
     applyPtyBinding(binding, current, worktreeId, paneKey)
     sessions.set(current, hostId)
diff --git a/src/main/runtime/runtime-layout-apply.test.ts b/src/main/runtime/runtime-layout-apply.test.ts
index 300844f64a05..2c601490a9d3 100644
--- a/src/main/runtime/runtime-layout-apply.test.ts
+++ b/src/main/runtime/runtime-layout-apply.test.ts
@@ -1,9 +1,5 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import {
-  applyWindowLayoutCommand,
-  type WindowLayoutCommand,
-  type LayoutCommandRunOptions
-} from './runtime-layout-apply'
+import { applyWindowLayoutCommand, type WindowLayoutCommand } from './runtime-layout-apply'
 import type { RuntimeStore } from './runtime-store-contract'
 import type { ExecutionHostId } from '../../shared/execution-host'
 import type { LayoutApplyOutcome } from '../../shared/workspace-layout/workspace-layout-command-types'
@@ -56,40 +52,6 @@ describe('applyWindowLayoutCommand', () => {
     })
   })
 
-  it('forwards present close options intact to the owning Store', async () => {
-    const { store, applyLayoutCommand } = storeWith()
-    const run: LayoutCommandRunOptions = {
-      originalPresentation: {
-        identity: {
-          ...CLOSE,
-          worktreeId: CLOSE.workspace,
-          createdAt: 1,
-          generation: 0,
-          hasLeaf: true,
-          ptyId: 'pty-1',
-          incarnationId: 'i1'
-        },
-        holders: []
-      },
-      admit: () => true,
-      live: { isBindingLive: () => true },
-      stopBeforeWrite: () => true,
-      onEffects: vi.fn()
-    }
-    const tabClose: WindowLayoutCommand = {
-      type: 'closeTabs',
-      workspace: CLOSE.workspace,
-      tabIds: [CLOSE.tabId]
-    }
-    await applyWindowLayoutCommand(store, () => ['local'], CLOSE, undefined, run)
-    await applyWindowLayoutCommand(store, () => ['local'], tabClose, undefined, run)
-    expect(applyLayoutCommand.mock.calls).toEqual([
-      [{ ...CLOSE, userPaneClose: true }, ['local'], run],
-      [{ ...tabClose, force: true }, ['local'], run]
-    ])
-    expect(mocks.markAgentLaunchesClosedByUser).not.toHaveBeenCalled()
-  })
-
   it('applies other commands to the routed partition only', async () => {
     const { store, applyLayoutCommand } = storeWith()
     const rename = { ...CLOSE, type: 'renamePane', title: 'Pane' } as const
diff --git a/src/main/runtime/runtime-pane-admission.test.ts b/src/main/runtime/runtime-pane-admission.test.ts
index 060e793722c6..0bdae8114d76 100644
--- a/src/main/runtime/runtime-pane-admission.test.ts
+++ b/src/main/runtime/runtime-pane-admission.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it, vi } from 'vitest'
 import type { TerminalPaneAdmissionOutcome } from '../persistence/terminal-topology/terminal-pane-admission'
-import { admitRuntimePane, startInAdmittedPane } from './runtime-pane-admission'
+import { startInAdmittedPane } from './runtime-pane-admission'
 import type { RuntimeStore } from './runtime-store-contract'
 
 const SPLIT = {
@@ -40,18 +40,6 @@ describe('startInAdmittedPane', () => {
     expect(start).toHaveBeenCalledWith('admitted')
   })
 
-  it('forwards the authority check to the store without running it early', async () => {
-    const { store, runtimeStore } = storeAnswering('admitted')
-    const check = vi.fn()
-
-    await expect(admitRuntimePane(runtimeStore, SPLIT, 'ssh:target-1', check)).resolves.toBe(
-      'admitted'
-    )
-    expect(store.admitTerminalPane).toHaveBeenCalledWith(SPLIT, 'ssh:target-1', check)
-    expect(store.admitTerminalPane.mock.contexts).toEqual([runtimeStore])
-    expect(check).not.toHaveBeenCalled()
-  })
-
   it('takes back the pane it wrote when the start fails', async () => {
     const { store, runtimeStore } = storeAnswering('admitted')
 
diff --git a/src/main/runtime/runtime-worktree-ps-activity.ts b/src/main/runtime/runtime-worktree-ps-activity.ts
index 3c5cc848d63c..67b6e23fde5d 100644
--- a/src/main/runtime/runtime-worktree-ps-activity.ts
+++ b/src/main/runtime/runtime-worktree-ps-activity.ts
@@ -149,7 +149,7 @@ export function applyRuntimeWorktreePsTerminalActivity(args: {
     summary.hasAttachedPty = true
     summary.hasHostSidebarActivity = true
     summary.lastOutputAt = maxTimestamp(summary.lastOutputAt, pty.lastOutputAt)
-    const ptyStatus = getSavedTabWorktreeStatus(owner.title, true)
+    const ptyStatus = getSavedTabWorktreeStatus(displayTitle ?? owner.title, true)
     if (ptyStatus === 'working' || ptyStatus === 'permission') {
       addTerminalTitleEvidence(titleEvidence, summary.worktreeId, {
         status: ptyStatus,
diff --git a/src/main/runtime/session-lifecycle/projection/perform-mobile-session-pty-records-refresh.ts b/src/main/runtime/session-lifecycle/projection/perform-mobile-session-pty-records-refresh.ts
index 59c6f03f1c64..b27d01e53911 100644
--- a/src/main/runtime/session-lifecycle/projection/perform-mobile-session-pty-records-refresh.ts
+++ b/src/main/runtime/session-lifecycle/projection/perform-mobile-session-pty-records-refresh.ts
@@ -129,6 +129,9 @@ export abstract class OrcaRuntimeWithPerformMobileSessionPtyRecordsRefresh exten
   ): Promise<RuntimeMobileSessionTabActivationResult> {
     const navigation = opts.navigation ?? (opts.notifyClients === false ? 'caller' : 'all')
     const targetsHost = navigationTargetsHost(navigation)
+    if (targetsHost && !isAutomaticTabActivation(opts.intent)) {
+      this.clientSessionTabSelections.noteHostNavigation()
+    }
     const explicitWorktreeId = this.getExplicitSessionWorktreeIdSelector(worktreeSelector)
     let worktreeId =
       explicitWorktreeId ?? (await this.resolveWorkspaceSelector(worktreeSelector)).id
diff --git a/src/main/runtime/session-tabs/headless-pane-move-to-new-tab.ts b/src/main/runtime/session-tabs/headless-pane-move-to-new-tab.ts
index 10076d2a96fc..8fd75883cb9a 100644
--- a/src/main/runtime/session-tabs/headless-pane-move-to-new-tab.ts
+++ b/src/main/runtime/session-tabs/headless-pane-move-to-new-tab.ts
@@ -27,6 +27,7 @@ export abstract class OrcaRuntimeWithHeadlessPaneMoveToNewTab extends OrcaRuntim
     commit: (move: TerminalLeafMoveRequest) => Promise<TerminalLeafMoveResult>,
     placement?: MovedPanePlacement
   ): Promise<TerminalLeafMoveResult> {
+    this.clientSessionTabSelections.noteHostNavigation()
     const explicitWorktreeId = this.getExplicitSessionWorktreeIdSelector(worktreeSelector)
     const worktreeId =
       explicitWorktreeId ?? (await this.resolveWorkspaceSelector(worktreeSelector)).id
diff --git a/src/main/runtime/session-tabs/headless-tab-properties.ts b/src/main/runtime/session-tabs/headless-tab-properties.ts
index e3e58dfccbda..676591fbb3f4 100644
--- a/src/main/runtime/session-tabs/headless-tab-properties.ts
+++ b/src/main/runtime/session-tabs/headless-tab-properties.ts
@@ -38,6 +38,9 @@ export abstract class RuntimeHeadlessTabProperties extends OrcaRuntimeWithHeadle
     worktreeSelector: string,
     args: SessionTabProps
   ): Promise<{ updated: true }> {
+    if (args.viewMode !== undefined) {
+      this.clientSessionTabSelections.noteHostNavigation()
+    }
     const explicitWorktreeId = this.getExplicitSessionWorktreeIdSelector(worktreeSelector)
     const worktreeId =
       explicitWorktreeId ?? (await this.resolveWorkspaceSelector(worktreeSelector)).id
diff --git a/src/main/runtime/session-tabs/headless-terminal-tab-close.ts b/src/main/runtime/session-tabs/headless-terminal-tab-close.ts
index 8446eff1c669..fb16b69f2a09 100644
--- a/src/main/runtime/session-tabs/headless-terminal-tab-close.ts
+++ b/src/main/runtime/session-tabs/headless-terminal-tab-close.ts
@@ -150,6 +150,9 @@ export abstract class OrcaRuntimeWithCloseHeadlessMobileTerminalTab extends Orca
     worktreeSelector: string,
     move: RuntimeMobileSessionTabMove
   ): Promise<RuntimeMobileSessionTabMoveResult> {
+    if (move.kind !== 'reorder') {
+      this.clientSessionTabSelections.noteHostNavigation()
+    }
     const explicitWorktreeId = this.getExplicitSessionWorktreeIdSelector(worktreeSelector)
     const worktreeId =
       explicitWorktreeId ?? (await this.resolveWorkspaceSelector(worktreeSelector)).id
diff --git a/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.test.ts b/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.test.ts
index 79d5dba00933..f6e83e9ff206 100644
--- a/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.test.ts
+++ b/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.test.ts
@@ -1,14 +1,7 @@
-import { fixture as durableFixture } from '../../persistence/loading-store/profile-state-delayed-authority-fixture'
-import { OrcaRuntimeService } from '../orca-runtime'
-import { HEADLESS_RUNTIME_WINDOW_ID } from '../../../shared/runtime-session-contracts'
-import {
-  trackRunningAgentLaunchPane,
-  resetAgentLaunchPanesForTests
-} from '../../agent-launch/agent-launch-pane-attachment'
+import { resetAgentLaunchPanesForTests } from '../../agent-launch/agent-launch-pane-attachment'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { WORKTREE_ID, setupMainOwnedWorkspace } from '../main-owned-workspace-runtime-fixture'
 import { publishAgentLaunchTabEarly } from '../rpc/methods/agent-launch-tab-publication'
-import type { PublishedTab } from '../../../shared/workspace-layout/workspace-layout-published'
 
 // Layout-owner build, no window: an agent launch's early tab in a workspace main owns is written by
 // main, a retry finds it, and a withdrawn launch pane is taken back by main.
@@ -114,146 +107,3 @@ describe("an agent launch's early tab in a workspace main owns, with a window at
     )
   })
 })
-
-// These schedules go through Store -> LayoutCommandPersistence's actual durable queue.
-describe('conditional launch withdrawal at the durable writer', () => {
-  const worktreeId = 'repo-local::/fixture/local'
-  const pane = { worktreeId, tabId: NEW_TAB, leafId: NEW_LEAF, operationId: 'old-launch' }
-  async function opened() {
-    const state = await durableFixture()
-    const runtime = new OrcaRuntimeService(state.store)
-    runtime.syncWindowGraph(HEADLESS_RUNTIME_WINDOW_ID, { tabs: [], leaves: [] })
-    const running = trackRunningAgentLaunchPane({ worktreeId, paneKey: `${NEW_TAB}:${NEW_LEAF}` })
-    const shown = await runtime.publishAgentLaunchTabInMainLayout({
-      ...pane,
-      launchAgent: 'codex',
-      viewMode: 'terminal',
-      viewer: 'none'
-    })
-    if (!shown?.withdrawalRoot) {
-      throw new Error('actual create did not capture placement')
-    }
-    return { ...state, runtime, running, shown }
-  }
-  it('keeps a destination after a new launch is accepted before its options resolve', async () => {
-    const { store, authority, runtime, running, shown } = await opened()
-    const pause = authority.pause()
-    const preceding = store.runDurableMutation(() => ({ value: undefined }))
-    await pause.started.promise
-    const removing = runtime.withdrawAgentLaunchPaneInMainLayout(
-      pane,
-      running.current,
-      shown.withdrawalRoot
-    )
-    runtime.noteAcceptedAgentLaunchPane(`${NEW_TAB}:${NEW_LEAF}`, 'new-preparing-launch')
-    pause.finish.resolve()
-    await preceding
-    expect(await removing).toBe(false)
-    expect(store.getWorkspaceSession().terminalLayoutsByTabId[NEW_TAB]?.root).toMatchObject({
-      leafId: NEW_LEAF
-    })
-  })
-  it('rechecks acceptance after last_pane before its queued closeTabs', async () => {
-    const { store, runtime, running, shown } = await opened()
-    const apply = runtime.applyLayoutCommand.bind(runtime)
-    const spy = vi.spyOn(runtime, 'applyLayoutCommand').mockImplementation(async (...args) => {
-      const reply = await apply(...args)
-      if (!reply.ok && reply.code === 'last_pane') {
-        runtime.noteAcceptedAgentLaunchPane(`${NEW_TAB}:${NEW_LEAF}`, 'later-launch')
-      }
-      return reply
-    })
-    expect(
-      await runtime.withdrawAgentLaunchPaneInMainLayout(pane, running.current, shown.withdrawalRoot)
-    ).toBe(false)
-    expect(spy).toHaveBeenCalledTimes(2)
-    expect(
-      store.getWorkspaceSession().tabsByWorktree[worktreeId].some((row) => row.id === NEW_TAB)
-    ).toBe(true)
-  })
-  it('refuses a queued create after expiry at the actual layout apply', async () => {
-    const { store, authority } = await durableFixture()
-    const runtime = new OrcaRuntimeService(store)
-    runtime.syncWindowGraph(HEADLESS_RUNTIME_WINDOW_ID, { tabs: [], leaves: [] })
-    const pause = authority.pause()
-    const preceding = store.runDurableMutation(() => ({ value: undefined }))
-    await pause.started.promise
-    let expired = false
-    const creating = runtime.publishAgentLaunchTabInMainLayout(
-      {
-        ...pane,
-        launchAgent: 'codex',
-        viewMode: 'terminal',
-        viewer: 'none'
-      },
-      () => {
-        if (expired) {
-          throw new Error('expired')
-        }
-      }
-    )!
-    const refused = expect(creating).rejects.toThrow('expired')
-    expired = true
-    pause.finish.resolve()
-    await preceding
-    await refused
-    expect(
-      store.getWorkspaceSession().tabsByWorktree[worktreeId].some((row) => row.id === NEW_TAB)
-    ).toBe(false)
-  })
-})
-
-it('uses a captured index through ordinary launch publication when its source already retired', async () => {
-  const { fixture } = launchHost()
-  const published: Pick<PublishedTab, 'id' | 'openPlacement'>[] = []
-  const subscription = fixture.runtime.subscribeWorkspaceLayouts((event) => {
-    if (event.type === 'workspace') {
-      published.push(...event.layout.tabs)
-    }
-    if (event.type === 'records') {
-      for (const change of event.workspaces) {
-        if (change.change === 'layout') {
-          published.push(...change.layout.tabs)
-        }
-        if (change.change === 'records') {
-          published.push(...(change.tabs?.set ?? []))
-        }
-      }
-    }
-  })
-  const request = {
-    worktreeId: WORKTREE_ID,
-    tabId: NEW_TAB,
-    leafId: NEW_LEAF,
-    launchAgent: 'codex' as const,
-    viewMode: 'terminal' as const,
-    viewer: 'none' as const,
-    placement: { afterTabId: 'naturally-retired-source', index: 0 },
-    openPlacement: {
-      invocationId: 'captured-open',
-      generation: 'captured-generation',
-      placement: { afterTabId: 'naturally-retired-source', index: 0 },
-      activate: false,
-      viewerSelection: 'original-viewer'
-    }
-  }
-  await fixture.runtime.publishAgentLaunchTabInMainLayout(request)
-  const result = await fixture.runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)
-  const group = fixture
-    .session()
-    .tabGroups?.[WORKTREE_ID]?.find((row) => row.tabOrder.includes(NEW_TAB))
-  expect(group?.tabOrder[0]).toBe(NEW_TAB)
-  const row = result.tabs.find((tab) => tab.type === 'terminal' && tab.parentTabId === NEW_TAB)
-  expect(row).toMatchObject({ openPlacement: request.openPlacement })
-  expect(published.find((tab) => tab.id === NEW_TAB)).toMatchObject({
-    openPlacement: request.openPlacement
-  })
-  expect(JSON.stringify(fixture.session())).not.toContain('openPlacement')
-  fixture.runtime.hydrateHeadlessMobileSessionTabsFromWorkspaceSession(WORKTREE_ID, { force: true })
-  expect(
-    (await fixture.runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)).tabs.find(
-      (tab) => tab.id === row?.id
-    )
-  ).toMatchObject({ openPlacement: request.openPlacement })
-  subscription.unsubscribe()
-})
diff --git a/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.ts b/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.ts
index 01a629b750f1..578cb9236723 100644
--- a/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.ts
+++ b/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.ts
@@ -1,3 +1,4 @@
+import { isSessionTabSelectionRequest } from '../../../shared/session-tab-placement'
 import { launchTabWithdrawalIdentity } from '../../../shared/agent-launch-tab-publication'
 import { OrcaRuntimeWithCloseStructuredAgentSessionTab } from './structured-session-tab-close'
 import type {
@@ -64,7 +65,7 @@ export abstract class OrcaRuntimeWithMainLayoutAgentLaunchTabs extends OrcaRunti
   publishAgentLaunchTabInMainLayout(
     request: Omit<AgentLaunchTabPublishRequest, 'requestId'>,
     check?: () => void,
-    selectionCurrent?: () => boolean
+    selectionCurrent?: (consume?: boolean) => boolean
   ): Promise<AgentLaunchTabPublished> | null {
     const { worktreeId, tabId, leafId, placement } = request
     if (!this.ownsLaunchTab(worktreeId, tabId)) {
@@ -111,7 +112,10 @@ export abstract class OrcaRuntimeWithMainLayoutAgentLaunchTabs extends OrcaRunti
                         ...tab,
                         openPlacement: {
                           ...openPlacement,
-                          activate: openPlacement.activate && (selectionCurrent?.() ?? true)
+                          activate:
+                            openPlacement.activate &&
+                            (isSessionTabSelectionRequest(openPlacement.viewerSelection) ||
+                              (selectionCurrent?.() ?? true))
                         }
                       }
                     : tab
@@ -131,7 +135,13 @@ export abstract class OrcaRuntimeWithMainLayoutAgentLaunchTabs extends OrcaRunti
         throw new Error('agent_launch_tab_unplaced')
       }
       this.showLaunchTabInWindow(
-        { ...request, viewer: (selectionCurrent?.() ?? true) ? request.viewer : 'none' },
+        {
+          ...request,
+          viewer:
+            isSessionTabSelectionRequest(request.viewerSelection) || (selectionCurrent?.() ?? true)
+              ? request.viewer
+              : 'none'
+        },
         { frameSeq: reply.frameSeq, created: !existed }
       )
       // A retry naming the same tab finds it: the launch made no tab, so it takes none back.
diff --git a/src/main/runtime/session-tabs/session-tab-open-placement-scaling.test.ts b/src/main/runtime/session-tabs/session-tab-open-placement-scaling.test.ts
deleted file mode 100644
index f6a9aed873f0..000000000000
--- a/src/main/runtime/session-tabs/session-tab-open-placement-scaling.test.ts
+++ /dev/null
@@ -1,204 +0,0 @@
-// Production snapshot storage and frame overlays execute; only external workspace/process I/O uses the existing fixture.
-import { expect, it, vi } from 'vitest'
-import * as placementProjection from './session-tab-open-placement'
-import type { PublishedWorkspaceLayout } from '../../../shared/workspace-layout/workspace-layout-published'
-import { applyWorkspaceLayoutRecordChange } from '../../../shared/workspace-layout/workspace-layout-records'
-import {
-  setupMainOwnedWorkspace,
-  WORKTREE_ID,
-  TAB_ID,
-  LEAF_A,
-  PTY_A
-} from '../main-owned-workspace-runtime-fixture'
-
-vi.mock('../../../shared/layout-owner-switch', () => ({ ORCA_LAYOUT_OWNER_IS_MAIN: true }))
-
-/** Count reads without replacing the production owner, lookup, equality or overlay. */
-function observeFieldReads<K extends PropertyKey, T extends Partial<Record<K, unknown>>>(
-  rows: readonly T[],
-  keys: readonly K[],
-  count: () => void
-): void {
-  for (const row of rows) {
-    for (const key of keys) {
-      if (!Object.hasOwn(row, key)) {
-        continue
-      }
-      const value = row[key]
-      Object.defineProperty(row, key, {
-        configurable: true,
-        enumerable: true,
-        get: () => {
-          count()
-          return value
-        }
-      })
-    }
-  }
-}
-
-it('bounds retained placement work linearly on ordinary snapshot and unchanged frame replay at N/10N', async () => {
-  const samples: { n: number; snapshotReads: number; frameReads: number }[] = []
-  for (const n of [32, 320]) {
-    const { runtime, bindPty } = setupMainOwnedWorkspace()
-    for (let index = 0; index < n; index++) {
-      const openPlacement = {
-        invocationId: `switched-${index}`,
-        generation: `generation-${index}`,
-        placement: { afterTabId: `retired-source-${index}`, index },
-        activate: false,
-        viewerSelection: 'original-viewer'
-      }
-      await (index % 2 === 0
-        ? runtime.publishStructuredAgentSessionTab({
-            workspaceId: WORKTREE_ID,
-            sessionId: `retained-${index}`,
-            agent: 'codex',
-            activate: false,
-            check: () => {},
-            openPlacement
-          })
-        : runtime.publishAgentLaunchTabInMainLayout({
-            worktreeId: WORKTREE_ID,
-            tabId: `retained-terminal-${index}`,
-            leafId: `11111111-1111-4111-8111-${String(index).padStart(12, '0')}`,
-            launchAgent: 'codex',
-            viewMode: 'terminal',
-            viewer: 'none',
-            placement: openPlacement.placement,
-            openPlacement
-          }))
-    }
-    let measuring: 'snapshot' | 'frame' | undefined
-    const rowKeys = ['id', 'sessionId', 'parentTabId', 'leafId', 'openPlacement'] as const
-    let snapshotReads = 0
-    let frameReads = 0
-    const countRead = () => {
-      if (measuring === 'snapshot') {
-        snapshotReads++
-      } else if (measuring === 'frame') {
-        frameReads++
-      }
-    }
-    const preserve = placementProjection.preserveSessionTabOpenPlacements
-    const overlay = placementProjection.withPublishedSessionTabOpenPlacements
-    // Observe the added owners while running their real bodies; unrelated title/status readers are outside this contract.
-    const preserveObservation = vi
-      .spyOn(placementProjection, 'preserveSessionTabOpenPlacements')
-      .mockImplementation((...args) => {
-        measuring = 'snapshot'
-        try {
-          return preserve(...args)
-        } finally {
-          measuring = undefined
-        }
-      })
-    const overlayObservation = vi
-      .spyOn(placementProjection, 'withPublishedSessionTabOpenPlacements')
-      .mockImplementation((...args) => {
-        observeFieldReads(args[0].tabs, ['id', 'entityId', 'terminal'] as const, countRead)
-        observeFieldReads(
-          args[0].tabs.flatMap((tab) => tab.terminal?.panes ?? []),
-          ['leafId', 'ptyId'] as const,
-          countRead
-        )
-        measuring = 'frame'
-        try {
-          return overlay(...args)
-        } finally {
-          measuring = undefined
-        }
-      })
-    let frames = 0
-    const layouts = new Map<string, PublishedWorkspaceLayout>()
-    const subscription = runtime.subscribeWorkspaceLayouts((event) => {
-      frames++
-      if (event.type === 'records') {
-        for (const change of event.workspaces) {
-          const next = applyWorkspaceLayoutRecordChange(layouts.get(change.key), change)
-          if (next) {
-            layouts.set(change.key, next)
-          } else {
-            layouts.delete(change.key)
-          }
-        }
-      }
-    })
-    for (const entry of subscription.snapshot) {
-      layouts.set(entry.key, entry.layout)
-    }
-    try {
-      const existing = runtime.mobileSessionTabsByWorktree.get(WORKTREE_ID)
-      if (!existing) {
-        throw new Error('missing actual publication rows')
-      }
-      expect(existing.tabs.filter((row) => 'openPlacement' in row)).toHaveLength(n)
-      // An ordinary graph replay omits optional metadata; the same destination retains it.
-      const replay = {
-        ...existing,
-        tabs: existing.tabs.map((row) => {
-          if (row.type !== 'agent-session' && row.type !== 'terminal') {
-            return { ...row }
-          }
-          const { openPlacement: _placement, ...rest } = row
-          return rest
-        })
-      }
-      observeFieldReads(existing.tabs, rowKeys, countRead)
-      observeFieldReads(replay.tabs, rowKeys, countRead)
-      runtime.storeMobileSessionSnapshot(WORKTREE_ID, replay)
-      const retained = runtime.mobileSessionTabsByWorktree.get(WORKTREE_ID)
-      if (!retained) {
-        throw new Error('ordinary replay lost rows')
-      }
-      expect(retained.tabs.filter((row) => 'openPlacement' in row)).toHaveLength(n)
-      const replayReads = snapshotReads
-      observeFieldReads(retained.tabs, rowKeys, countRead)
-      const before = frames
-      // An unchanged ordinary Store write still runs projection/overlay, but emits no duplicate frame.
-      bindPty({ worktreeId: WORKTREE_ID, tabId: TAB_ID, leafId: LEAF_A, ptyId: PTY_A })
-      await Promise.resolve()
-      await Promise.resolve()
-      expect(frames).toBe(before)
-      expect(frameReads).toBeGreaterThanOrEqual(n)
-      expect(snapshotReads).toBeGreaterThanOrEqual(n)
-      const shown = [...layouts.values()].find((layout) => layout.worktreeId === WORKTREE_ID)
-      expect(shown?.tabs.filter((tab) => tab.openPlacement)).toHaveLength(n)
-      const unchangedFrameReads = frameReads
-      // A real metadata change still publishes through the same ordinary live overlay.
-      runtime.projectStructuredAgentSessionTab({
-        workspaceId: WORKTREE_ID,
-        sessionId: 'retained-0',
-        agent: 'codex',
-        activate: false,
-        openPlacement: {
-          invocationId: 'reopened-0',
-          generation: 'reopened-generation',
-          placement: { index: 0 },
-          activate: false,
-          viewerSelection: 'current-viewer'
-        }
-      })
-      await Promise.resolve()
-      await Promise.resolve()
-      expect(frames).toBe(before + 1)
-      expect(
-        [...layouts.values()]
-          .flatMap((layout) => layout.tabs)
-          .find((tab) => tab.entityId === 'retained-0')?.openPlacement
-      ).toMatchObject({ generation: 'reopened-generation', viewerSelection: 'current-viewer' })
-      samples.push({ n, snapshotReads: replayReads, frameReads: unchangedFrameReads })
-    } finally {
-      subscription.unsubscribe()
-      preserveObservation.mockRestore()
-      overlayObservation.mockRestore()
-    }
-  }
-  console.info('MAIN_OPEN_PLACEMENT_WORK', JSON.stringify(samples))
-  for (const sample of samples) {
-    expect(sample.snapshotReads).toBeLessThanOrEqual(32 * (sample.n + 1))
-    expect(sample.frameReads).toBeLessThanOrEqual(32 * (sample.n + 1))
-  }
-  expect(samples[1].snapshotReads).toBeLessThanOrEqual(samples[0].snapshotReads * 11)
-  expect(samples[1].frameReads).toBeLessThanOrEqual(samples[0].frameReads * 11)
-})
diff --git a/src/main/runtime/session-tabs/structured-session-create-support.ts b/src/main/runtime/session-tabs/structured-session-create-support.ts
index 33d86633af5b..a88fc65e1c4b 100644
--- a/src/main/runtime/session-tabs/structured-session-create-support.ts
+++ b/src/main/runtime/session-tabs/structured-session-create-support.ts
@@ -60,22 +60,26 @@ export abstract class OrcaRuntimeWithGetStructuredAgentSessionCreateSupport exte
   async resolveStructuredAgentSessionCreateIntent(
     input: StructuredAgentSessionCreateIntentInput
   ): Promise<AgentSessionAttachParams & { hostLaunchDirectory?: string }> {
-    const resolved = await this.resolveStructuredAgentSessionCreateIdentity(input, 'launch')
-    const replay = resolveCommittedStructuredAgentSessionAdoptionIntent({
-      host: getStructuredAgentSessionHost(),
-      ...input,
-      location: resolved.location
-    })
-    if (input.resumeFrom && !replay) {
-      requireUnownedStructuredAgentSessionAdoption({
-        host: getStructuredAgentSessionHost(),
-        agent: input.agent,
-        providerSessionId: input.resumeFrom.providerSessionId,
-        selfSessionId: input.envelope.sessionId,
-        identity: resolved
-      })
+    if (input.resumeFrom) {
+      const { providerSessionId, cliSource } = input.resumeFrom
+      try {
+        requireUnownedStructuredAgentSessionAdoption({
+          host: getStructuredAgentSessionHost(),
+          agent: input.agent,
+          providerSessionId,
+          selfSessionId: input.envelope.sessionId
+        })
+      } catch (ownerConflict) {
+        // Refuse transfer from a live terminal or the chat's first send starts a second writer.
+        await this.assertStructuredAdoptionTerminalWritersExited(
+          input.agent,
+          providerSessionId,
+          cliSource
+        )
+        throw ownerConflict
+      }
     }
-    return resolved
+    return this.resolveStructuredAgentSessionCreateIdentity(input, 'launch')
   }
 
   /** Resolve registered account/transcript identity without acquiring or admitting a writer. */
diff --git a/src/main/runtime/session-tabs/structured-session-switch-publication.test.ts b/src/main/runtime/session-tabs/structured-session-switch-publication.test.ts
deleted file mode 100644
index 5e228573e3da..000000000000
--- a/src/main/runtime/session-tabs/structured-session-switch-publication.test.ts
+++ /dev/null
@@ -1,522 +0,0 @@
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import {
-  setupMainOwnedWorkspace,
-  WORKTREE_ID,
-  TAB_ID,
-  LEAF_A,
-  PTY_A
-} from '../main-owned-workspace-runtime-fixture'
-import { chatTabCommandsSettled } from '../session-layout-apply.test-fixture'
-import { applyWorkspaceLayoutRecordChange } from '../../../shared/workspace-layout/workspace-layout-records'
-import type { PublishedWorkspaceLayout } from '../../../shared/workspace-layout/workspace-layout-published'
-import { workspaceLayoutFromPublished } from '../../../shared/workspace-layout/workspace-layout-from-published'
-
-const owner = vi.hoisted(() => ({ main: true }))
-vi.mock('../../../shared/layout-owner-switch', () => ({
-  get ORCA_LAYOUT_OWNER_IS_MAIN() {
-    return owner.main
-  }
-}))
-beforeEach(() => {
-  owner.main = true
-})
-afterEach(() => vi.restoreAllMocks())
-
-it('selects a newly published or already listed chat through the real main layout and headless view', async () => {
-  const { runtime, session } = setupMainOwnedWorkspace()
-  const frames: PublishedWorkspaceLayout[] = []
-  const layouts = new Map<string, PublishedWorkspaceLayout>()
-  const subscription = runtime.subscribeWorkspaceLayouts((event) => {
-    if (event.type !== 'records') {
-      return
-    }
-    for (const change of event.workspaces) {
-      const next = applyWorkspaceLayoutRecordChange(layouts.get(change.key), change)
-      if (next) {
-        layouts.set(change.key, next)
-        frames.push(next)
-      } else {
-        layouts.delete(change.key)
-      }
-    }
-  })
-  for (const entry of subscription.snapshot) {
-    layouts.set(entry.key, entry.layout)
-  }
-  const input = {
-    workspaceId: WORKTREE_ID,
-    sessionId: 'destination',
-    agent: 'codex' as const,
-    activate: true,
-    check: () => {},
-    placement: { afterTabId: TAB_ID },
-    openPlacement: {
-      invocationId: 'chat-frame-open',
-      generation: 'chat-frame-generation',
-      placement: { afterTabId: TAB_ID },
-      activate: true,
-      viewerSelection: 'original-viewer'
-    }
-  }
-  for (let repeat = 0; repeat < 2; repeat++) {
-    await runtime.publishStructuredAgentSessionTab(input)
-    await chatTabCommandsSettled()
-    const snapshot = await runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)
-    expect(snapshot.activeTabId).toBe('agent-session:destination')
-    const group = session().tabGroups?.[WORKTREE_ID]?.find((row) =>
-      row.tabOrder.includes('agent-session:destination')
-    )
-    expect(group?.activeTabId).toBe('agent-session:destination')
-    expect(group?.tabOrder).toEqual([TAB_ID, 'agent-session:destination'])
-  }
-  const first = frames.find((layout) => layout.tabs.some((tab) => tab.entityId === 'destination'))
-  expect(first?.tabs.find((tab) => tab.entityId === 'destination')).toMatchObject({
-    openPlacement: input.openPlacement
-  })
-  if (!first) {
-    throw new Error('missing actual destination frame')
-  }
-  expect(JSON.stringify(workspaceLayoutFromPublished(first))).not.toContain('openPlacement')
-  expect(JSON.stringify(session())).not.toContain('openPlacement')
-  const late = runtime.subscribeWorkspaceLayouts(() => {})
-  expect(
-    late.snapshot
-      .flatMap((entry) => entry.layout.tabs)
-      .find((tab) => tab.entityId === 'destination')
-  ).toMatchObject({ openPlacement: input.openPlacement })
-  late.unsubscribe()
-  subscription.unsubscribe()
-})
-
-it('publishes readable history while a queued main write preserves newer navigation', async () => {
-  const { runtime } = setupMainOwnedWorkspace()
-  await runtime.publishStructuredAgentSessionTab({
-    workspaceId: WORKTREE_ID,
-    sessionId: 'current-chat',
-    agent: 'codex',
-    activate: true,
-    check: () => {}
-  })
-  const selectionCurrent = runtime.captureSessionSwitchSelection(WORKTREE_ID)
-  const entered = Promise.withResolvers<void>()
-  const release = Promise.withResolvers<void>()
-  const original = runtime.applyLayoutCommand.bind(runtime)
-  vi.spyOn(runtime, 'applyLayoutCommand').mockImplementation(async (...args) => {
-    entered.resolve()
-    await release.promise
-    return original(...args)
-  })
-  const publishing = runtime.publishStructuredAgentSessionTab({
-    workspaceId: WORKTREE_ID,
-    sessionId: 'destination',
-    agent: 'codex',
-    activate: true,
-    check: () => {},
-    selectionCurrent,
-    openPlacement: {
-      invocationId: 'held-publication',
-      generation: 'held-generation',
-      placement: { afterTabId: TAB_ID, index: 0 },
-      activate: true,
-      viewerSelection: 'original-viewer'
-    }
-  })
-  await entered.promise
-  expect(
-    runtime.mobileSessionTabsByWorktree
-      .get(WORKTREE_ID)
-      ?.tabs.find((tab) => tab.type === 'agent-session' && tab.sessionId === 'destination')
-  ).toMatchObject({
-    openPlacement: { invocationId: 'held-publication', viewerSelection: 'original-viewer' }
-  })
-  runtime.projectStructuredAgentSessionTab({
-    workspaceId: WORKTREE_ID,
-    sessionId: 'newer-chat',
-    agent: 'codex',
-    activate: true
-  })
-  release.resolve()
-  await publishing
-  const snapshot = await runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)
-  expect(
-    snapshot.tabs.some((tab) => tab.type === 'agent-session' && tab.sessionId === 'destination')
-  ).toBe(true)
-  expect(snapshot.activeTabId).toBe('agent-session:newer-chat')
-})
-
-it('keeps the captured source slot when natural-exit retirement reaches layout before publication', async () => {
-  const { runtime, session } = setupMainOwnedWorkspace()
-  const incarnationId = '11111111-1111-4111-8111-111111111111'
-  runtime.registerPty(PTY_A, WORKTREE_ID, null, { tabId: TAB_ID, leafId: LEAF_A, incarnationId })
-  expect(
-    await runtime.applyLayoutCommand({
-      type: 'openAgentSessionTab',
-      workspace: WORKTREE_ID,
-      sessionId: 'before-tab',
-      agent: 'codex',
-      tabId: 'agent-session:before-tab',
-      index: 0
-    })
-  ).toMatchObject({ ok: true })
-  await runtime.publishStructuredAgentSessionTab({
-    workspaceId: WORKTREE_ID,
-    sessionId: 'later-tab',
-    agent: 'codex',
-    activate: false,
-    check: () => {}
-  })
-  const source = runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_A}`, WORKTREE_ID)
-  if (!source.presentation) {
-    throw new Error('missing source')
-  }
-  const close = runtime.captureTerminalSwitchClose(
-    source.handle,
-    incarnationId,
-    source.presentation
-  )
-  await runtime.onPtyExit(PTY_A, 0, incarnationId, { hostExitConfirmed: true })
-  expect(
-    await runtime.applyLayoutCommand({
-      type: 'closeTabs',
-      workspace: WORKTREE_ID,
-      tabIds: [TAB_ID],
-      force: true
-    })
-  ).toMatchObject({ ok: true })
-  await close.stop()
-  await runtime.publishStructuredAgentSessionTab({
-    workspaceId: WORKTREE_ID,
-    sessionId: 'destination',
-    agent: 'codex',
-    activate: true,
-    check: () => {},
-    placement: close.placement(),
-    openPlacement: {
-      invocationId: 'natural-exit',
-      generation: 'natural-generation',
-      placement: close.placement()!,
-      activate: true,
-      source: close.source
-    }
-  })
-  const group = session().tabGroups?.[WORKTREE_ID]?.find((row) =>
-    row.tabOrder.includes('agent-session:destination')
-  )
-  expect(group?.tabOrder).toEqual([
-    'agent-session:before-tab',
-    'agent-session:destination',
-    'agent-session:later-tab'
-  ])
-  expect(group?.activeTabId).toBe('agent-session:destination')
-  expect(
-    await runtime.applyLayoutCommand({
-      type: 'createTerminalTab',
-      workspace: WORKTREE_ID,
-      tabId: TAB_ID,
-      leafId: LEAF_A
-    })
-  ).toMatchObject({ ok: true })
-  expect(close.placement()).toBeUndefined()
-})
-
-it.each(['none', 'publication', 'spawn'] as const)(
-  'keeps original selection through ordinary terminal publication and owned snapshot: navigation during %s',
-  async (navigation) => {
-    const { runtime, session, handleOf, bindPty } = setupMainOwnedWorkspace()
-    Object.assign(runtime, {
-      resolveTerminalWorkspaceLaunchScope: async () => ({
-        id: WORKTREE_ID,
-        path: '/workspace',
-        connectionId: null,
-        repo: null,
-        folderWorkspace: null
-      })
-    })
-    const selectionCurrent = runtime.captureSessionSwitchSelection(WORKTREE_ID)
-    const entered = Promise.withResolvers<void>()
-    const release = Promise.withResolvers<void>()
-    const apply = runtime.applyLayoutCommand.bind(runtime)
-    if (navigation === 'publication') {
-      vi.spyOn(runtime, 'applyLayoutCommand').mockImplementation(async (...args) => {
-        if (args[0].type === 'createTerminalTab') {
-          entered.resolve()
-          await release.promise
-        }
-        return apply(...args)
-      })
-    }
-    vi.spyOn(runtime, 'createTerminal').mockImplementation(async (_selector, opts = {}) => {
-      if (!opts.tabId || !opts.leafId) {
-        throw new Error('missing ordinary published identity')
-      }
-      opts.beforePtySpawn?.()
-      opts.onPtySpawnDispatched?.({
-        tabId: opts.tabId,
-        leafId: opts.leafId,
-        launchAgent: 'codex',
-        ...(opts.launchConfig ? { launchConfig: opts.launchConfig } : {})
-      })
-      const published = runtime.mobileSessionTabsByWorktree
-        .get(WORKTREE_ID)
-        ?.tabs.find(
-          (tab) =>
-            tab.type === 'terminal' && tab.parentTabId === opts.tabId && tab.leafId === opts.leafId
-        )
-      expect(published).toMatchObject({
-        openPlacement: { generation: 'terminal-generation', viewerSelection: 'original-viewer' }
-      })
-      if (navigation === 'spawn') {
-        entered.resolve()
-        await release.promise
-      }
-      bindPty({
-        worktreeId: WORKTREE_ID,
-        tabId: opts.tabId,
-        leafId: opts.leafId,
-        ptyId: 'destination-pty'
-      })
-      runtime.registerPty('destination-pty', WORKTREE_ID, null, {
-        tabId: opts.tabId,
-        leafId: opts.leafId,
-        terminalHandle: opts.preAllocatedHandle
-      })
-      return {
-        handle: handleOf('destination-pty'),
-        ptyId: 'destination-pty',
-        tabId: opts.tabId,
-        paneKey: `${opts.tabId}:${opts.leafId}`,
-        worktreeId: WORKTREE_ID,
-        title: null,
-        surface: 'background'
-      }
-    })
-    const operation = runtime.createMobileSessionTerminal(`id:${WORKTREE_ID}`, {
-      command: 'cx',
-      launchAgent: 'codex',
-      clientMutationId: `ordinary-${navigation}`,
-      switchExecution: {
-        invocationId: `ordinary-${navigation}`,
-        openPlacement: {
-          invocationId: `ordinary-${navigation}`,
-          generation: 'terminal-generation',
-          placement: { afterTabId: TAB_ID, index: 0 },
-          activate: true,
-          viewerSelection: 'original-viewer'
-        },
-        check: () => {},
-        signal: new AbortController().signal,
-        remaining: () => 60_000,
-        viewer: 'focus-in-workspace',
-        viewerSelection: 'original-viewer',
-        selectionCurrent
-      }
-    })
-    const settled = operation.then(
-      () => {},
-      () => {}
-    )
-    try {
-      if (navigation !== 'none') {
-        await Promise.race([
-          entered.promise,
-          operation.then(() => {
-            throw new Error('ordinary create settled before the held stage')
-          })
-        ])
-        runtime.projectStructuredAgentSessionTab({
-          workspaceId: WORKTREE_ID,
-          sessionId: 'later-navigation',
-          agent: 'codex',
-          activate: true
-        })
-      }
-    } finally {
-      release.resolve()
-      await settled
-    }
-    const result = await operation
-    const snapshot = await runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)
-    expect(snapshot.activeTabId).toBe(
-      navigation === 'none' ? result.tab.id : 'agent-session:later-navigation'
-    )
-    expect(snapshot.tabs.find((tab) => tab.id === result.tab.id)).toMatchObject({
-      openPlacement: { generation: 'terminal-generation', activate: navigation === 'none' }
-    })
-    expect(
-      session().terminalLayoutsByTabId[result.tab.parentTabId!]?.ptyIdsByLeafId?.[
-        result.tab.leafId!
-      ]
-    ).toBe('destination-pty')
-  }
-)
-
-it.each(['window', 'main', 'headless'] as const)(
-  'carries addressed membership through %s publication and ordinary row rebuilds',
-  async (mode) => {
-    owner.main = mode === 'main'
-    const { runtime, session } = setupMainOwnedWorkspace()
-    await runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)
-    if (mode !== 'headless') {
-      Object.assign(runtime, { getAvailableAuthoritativeWindow: () => ({}) })
-    }
-    for (const agent of ['claude', 'codex'] as const) {
-      const input = {
-        workspaceId: WORKTREE_ID,
-        sessionId: `placed-${agent}`,
-        agent,
-        activate: true,
-        check: () => {},
-        placement: { afterTabId: TAB_ID, index: 0 },
-        openPlacement: {
-          invocationId: `switch-${agent}`,
-          generation: `generation-${agent}`,
-          placement: { afterTabId: TAB_ID, index: 0 },
-          activate: true,
-          viewerSelection: 'original-history-viewer'
-        }
-      }
-      await runtime.publishStructuredAgentSessionTab(input)
-      const id = `agent-session:placed-${agent}`
-      const snapshot = await runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)
-      expect(snapshot.tabs.find((tab) => tab.id === id)).toMatchObject({
-        openPlacement: input.openPlacement
-      })
-      expect(
-        snapshot.tabGroups?.find((group) => group.tabOrder.includes(id))?.tabOrder.slice(0, 2)
-      ).toEqual([TAB_ID, id])
-      // The ordinary graph can omit optional metadata; the same destination retains its intent.
-      runtime.storeMobileSessionSnapshot(WORKTREE_ID, {
-        ...snapshot,
-        tabs: snapshot.tabs.map((tab) => {
-          if (tab.type !== 'agent-session') {
-            return tab
-          }
-          const { openPlacement: _placement, ...row } = tab
-          return row
-        })
-      })
-      expect(
-        (await runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)).tabs.find((tab) => tab.id === id)
-      ).toMatchObject({ openPlacement: input.openPlacement })
-      if (mode === 'window') {
-        expect(
-          session().unifiedTabs?.[WORKTREE_ID]?.some((tab) => tab.entityId === input.sessionId)
-        ).not.toBe(true)
-      }
-    }
-  }
-)
-
-it('settles a random retry placeholder around the original live switch destination without another dispatch', async () => {
-  const { fixture, admitRuntimeSpawnPane } =
-    await import('../../persistence/loading-store/profile-state-delayed-authority-fixture')
-  const { OrcaRuntimeService } = await import('../orca-runtime')
-  const { store } = await fixture()
-  const worktreeId = 'repo-local::/fixture/local'
-  const runtime = new OrcaRuntimeService(store)
-  runtime.syncWindowGraph(0, { tabs: [], leaves: [] })
-  await admitRuntimeSpawnPane(store, { worktreeId, tabId: TAB_ID, leafId: LEAF_A })
-  await store.persistPtyBinding({ worktreeId, tabId: TAB_ID, leafId: LEAF_A, ptyId: PTY_A })
-  runtime.registerPty(PTY_A, worktreeId, null, { tabId: TAB_ID, leafId: LEAF_A })
-  const session = () => store.getWorkspaceSession()
-  Object.assign(runtime, {
-    resolveTerminalWorkspaceLaunchScope: async () => ({
-      id: worktreeId,
-      path: '/fixture/local',
-      connectionId: null,
-      repo: null,
-      folderWorkspace: null
-    })
-  })
-  const inventory: {
-    id: string
-    worktreeId: string
-    terminalHandle: string
-    cwd: string
-    title: string
-  }[] = []
-  let original: { tabId: string; leafId: string } | undefined
-  const spawn = vi.fn(
-    async (args: { tabId?: string; leafId?: string; preAllocatedHandle?: string }) => {
-      if (!args.tabId || !args.leafId || !args.preAllocatedHandle) {
-        throw new Error('missing actual dispatch identity')
-      }
-      original = { tabId: args.tabId, leafId: args.leafId }
-      await store.persistPtyBinding({ worktreeId, ...original, ptyId: 'original-switch-live' })
-      // The lower spawn publication arrives; only its observer reply is lost.
-      runtime.registerPty('original-switch-live', worktreeId, null, {
-        ...original,
-        terminalHandle: args.preAllocatedHandle
-      })
-      inventory.push({
-        id: 'original-switch-live',
-        worktreeId,
-        terminalHandle: args.preAllocatedHandle,
-        cwd: '/fixture/local',
-        title: 'Codex'
-      })
-      throw new Error('lost-successful-reply')
-    }
-  )
-  const kill = vi.fn()
-  runtime.setPtyController({
-    spawn,
-    kill,
-    write: () => true,
-    getForegroundProcess: async () => null,
-    listProcesses: async () => inventory
-  })
-  const publish = vi.spyOn(runtime, 'publishAgentLaunchTabInMainLayout')
-  const verdict = vi.spyOn(runtime, 'reportAgentLaunchPaneVerdict')
-  const request = {
-    command: 'cx',
-    launchAgent: 'codex' as const,
-    clientMutationId: 'same-switch-operation',
-    switchExecution: {
-      invocationId: 'same-switch-invocation',
-      check: () => {},
-      signal: new AbortController().signal,
-      remaining: () => 60_000,
-      viewer: 'none' as const,
-      selectionCurrent: () => true
-    }
-  }
-  await expect(runtime.createMobileSessionTerminal(`id:${worktreeId}`, request)).rejects.toThrow(
-    'lost-successful-reply'
-  )
-  if (!original) {
-    throw new Error('missing accepted original dispatch')
-  }
-  expect(session().terminalLayoutsByTabId[original.tabId]?.ptyIdsByLeafId?.[original.leafId]).toBe(
-    'original-switch-live'
-  )
-  const result = await runtime.createMobileSessionTerminal(`id:${worktreeId}`, request)
-  expect(result.tab).toMatchObject({
-    parentTabId: original?.tabId,
-    leafId: original?.leafId,
-    ptyId: 'original-switch-live',
-    status: 'ready'
-  })
-  expect(publish).toHaveBeenCalledTimes(2)
-  const retryPane = publish.mock.calls[1][0]
-  expect(retryPane.tabId).not.toBe(original?.tabId)
-  await chatTabCommandsSettled()
-  expect(session().tabsByWorktree[worktreeId].some((tab) => tab.id === retryPane.tabId)).toBe(false)
-  expect(session().terminalLayoutsByTabId[original.tabId]?.ptyIdsByLeafId?.[original.leafId]).toBe(
-    'original-switch-live'
-  )
-  expect(session().terminalLayoutsByTabId[TAB_ID]?.ptyIdsByLeafId?.[LEAF_A]).toBe(PTY_A)
-  expect(
-    verdict.mock.calls.some(
-      ([pane, outcome]) => pane.tabId === retryPane.tabId && outcome.kind === 'proceed'
-    )
-  ).toBe(false)
-  expect(verdict).toHaveBeenCalledWith(expect.objectContaining({ tabId: retryPane.tabId }), {
-    kind: 'withdrawn'
-  })
-  expect(runtime.resolveTerminalPane(`${result.tab.parentTabId}:${result.tab.leafId}`).ptyId).toBe(
-    'original-switch-live'
-  )
-  expect(spawn).toHaveBeenCalledOnce()
-  expect(kill).not.toHaveBeenCalled()
-})
diff --git a/src/main/runtime/session-tabs/structured-session-tab-restoration.ts b/src/main/runtime/session-tabs/structured-session-tab-restoration.ts
index 223140c02615..60fe756115ea 100644
--- a/src/main/runtime/session-tabs/structured-session-tab-restoration.ts
+++ b/src/main/runtime/session-tabs/structured-session-tab-restoration.ts
@@ -7,7 +7,10 @@ import { seedStructuredAgentSessionTabIndex } from '../agent-session/structured-
 import { restoredChatTabChanges } from './restored-chat-tab-changes'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../shared/layout-owner-switch'
 import type { StructuredAgentId } from '../../../shared/agent-session-provider-handle'
-import type { SessionTabOpenPlacement } from '../../../shared/session-tab-placement'
+import {
+  isSessionTabSelectionRequest,
+  type SessionTabOpenPlacement
+} from '../../../shared/session-tab-placement'
 import { projectStructuredSessionTab } from './structured-session-tab-projection'
 import { OrcaRuntimeWithStructuredSessionLaunchRuntime } from './structured-session-launch-runtime'
 
@@ -73,37 +76,14 @@ export abstract class OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce exten
     }
   }
 
-  captureSessionSwitchSelection(worktreeId?: string): () => boolean {
-    const worktrees = worktreeId
-      ? [worktreeId]
-      : [
-          ...new Set([
-            ...this.getKnownWorkspaceSessionWorktreeIds(),
-            ...this.mobileSessionTabsByWorktree.keys()
-          ])
-        ].sort()
-    for (const id of worktrees) {
-      this.hydrateHeadlessMobileSessionTabsFromWorkspaceSession(id)
-    }
-    const read = () => {
-      return JSON.stringify(
-        worktrees.map((id) => {
-          const snapshot = this.mobileSessionTabsByWorktree.get(id)
-          const session = this.getWorkspaceSessionForWorktree(id)
-          return [
-            snapshot?.activeTabId,
-            snapshot?.activeGroupId,
-            session?.activeTabIdByWorktree?.[id],
-            session?.activeGroupIdByWorktree?.[id],
-            session?.tabGroups?.[id]
-              ?.filter((group) => group.activeTabId != null)
-              .map((group) => [group.id, group.activeTabId]) ?? []
-          ]
-        })
-      )
-    }
-    const captured = read()
-    return () => captured === read()
+  captureSessionSwitchSelection(
+    _worktreeId?: string,
+    viewerSelection?: string
+  ): (consume?: boolean) => boolean {
+    // A window request is transported to its viewer; it grants no host-view authority.
+    return viewerSelection !== undefined
+      ? () => false
+      : this.clientSessionTabSelections.captureHostSelection()
   }
 
   async publishStructuredAgentSessionTab(input: {
@@ -112,7 +92,7 @@ export abstract class OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce exten
     agent: StructuredAgentId
     activate: boolean
     check?: () => void
-    selectionCurrent?: () => boolean
+    selectionCurrent?: (consume?: boolean) => boolean
     viewerSelection?: string
     focusWindow?: boolean
     notify?: boolean
@@ -168,11 +148,23 @@ export abstract class OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce exten
       this.saveWindowlessAgentSessionTab(input.workspaceId, input)
     }
     input.check?.()
-    const activate = input.activate && (input.selectionCurrent?.() ?? true)
+    const viewerRequest = isSessionTabSelectionRequest(input.viewerSelection)
+    const activate = input.activate && !viewerRequest && (input.selectionCurrent?.() ?? true)
+    if (activate) {
+      input.check?.()
+      input.selectionCurrent?.(true)
+    }
     this.projectStructuredAgentSessionTab({
       ...input,
       activate,
-      ...(input.openPlacement ? { openPlacement: { ...input.openPlacement, activate } } : {})
+      ...(input.openPlacement
+        ? {
+            openPlacement: {
+              ...input.openPlacement,
+              activate: viewerRequest ? input.openPlacement.activate : activate
+            }
+          }
+        : {})
     })
     if (activate) {
       input.check?.()
@@ -184,15 +176,14 @@ export abstract class OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce exten
           input.sessionId
         )
       )
-      if (input.focusWindow !== false) {
-        this.notifier?.focusEditorTab?.(
-          input.tabId ??
-            host?.getSessionTabId(input.sessionId) ??
-            `agent-session:${input.sessionId}`,
-          input.workspaceId,
-          input.viewerSelection
-        )
-      }
+    }
+    if ((activate || (viewerRequest && input.activate)) && input.focusWindow !== false) {
+      input.check?.()
+      this.notifier?.focusEditorTab?.(
+        input.tabId ?? host?.getSessionTabId(input.sessionId) ?? `agent-session:${input.sessionId}`,
+        input.workspaceId,
+        input.viewerSelection
+      )
     }
   }
 
diff --git a/src/main/runtime/structured-agent-cli-writers.test.ts b/src/main/runtime/structured-agent-cli-writers.test.ts
index bcb015ceb80c..61ab4182680f 100644
--- a/src/main/runtime/structured-agent-cli-writers.test.ts
+++ b/src/main/runtime/structured-agent-cli-writers.test.ts
@@ -686,29 +686,3 @@ describe('execution-host conversation writer inspection', () => {
     await expect(check('opencode')).resolves.toBeUndefined()
   })
 })
-
-it.each(['claude', 'codex'] as const)(
-  'distinguishes an addressed %s source with an opaque inspection from another writer without claiming a live job',
-  async (agent) => {
-    const check = inspection('unverifiable')
-    check.host.shellAlone = vi.fn(async () => false)
-    await expect(
-      assertCliConversationWritersExited(check.host, agent, 'conversation', {
-        paneKey: 'source',
-        worktreeId: 'workspace'
-      })
-    ).rejects.toMatchObject({
-      refusal: {
-        code: 'agent_session_conflict',
-        details: { reason: 'conversationHeldElsewhere', source: true }
-      }
-    })
-    const other = inspection('unverifiable')
-    await expect(other.run()).rejects.toMatchObject(refusal)
-    try {
-      await other.run()
-    } catch (error) {
-      expect(error).not.toMatchObject({ refusal: { details: { source: true } } })
-    }
-  }
-)
diff --git a/src/main/runtime/structured-agent-session-create-adoption.ts b/src/main/runtime/structured-agent-session-create-adoption.ts
index 92859d91a705..b7b6e7231581 100644
--- a/src/main/runtime/structured-agent-session-create-adoption.ts
+++ b/src/main/runtime/structured-agent-session-create-adoption.ts
@@ -19,10 +19,10 @@ import type { StructuredAgentSessionHost } from '../native-chat/agent-session-wi
 import { listStructuredProviderSessionOwnership } from '../native-chat/agent-session-wire/structured-provider-session-ownership'
 import {
   findCommittedStructuredAgentSessionAdoptionReplay,
+  findConflictingStructuredAdoption,
   resolveStructuredAgentSessionAdoption,
   structuredAdoptionConflictError
 } from '../native-chat/structured-agent-session-history-adoption'
-import { keysMayMatch, terminalConversationKey } from '../native-chat/structured-conversation-key'
 import { structuredAgentRuntimeMetadata } from './structured-agent-runtime-metadata'
 import type {
   StructuredAgentTranscriptImport,
@@ -86,33 +86,13 @@ export function requireUnownedStructuredAgentSessionAdoption(input: {
   agent: StructuredAgentId
   providerSessionId: string
   selfSessionId: string
-  identity?: AgentSessionAttachParams
 }): void {
-  const key = input.identity && {
-    ...terminalConversationKey(input.agent, input.providerSessionId),
-    home: input.identity.accountHome
-  }
-  const conflict =
-    input.host &&
-    listStructuredProviderSessionOwnership(input.host.deps.store.listConversations()).find(
-      (owner) => {
-        if (owner.sessionId === input.selfSessionId || owner.role !== 'head') {
-          return false
-        }
-        if (key && input.identity) {
-          const record = input.host?.deps.store.getRecord(owner.sessionId)
-          return (
-            keysMayMatch(owner.key, key) &&
-            record?.location.executionHostId === input.identity.location.executionHostId &&
-            record?.location.wslDistro === input.identity.location.wslDistro
-          )
-        }
-        return keysMayMatch(
-          owner.key,
-          terminalConversationKey(input.agent, input.providerSessionId)
-        )
-      }
-    )
+  const conflict = input.host
+    ? findConflictingStructuredAdoption({
+        ...input,
+        ownership: listStructuredProviderSessionOwnership(input.host.deps.store.listConversations())
+      })
+    : null
   if (conflict) {
     throw structuredAdoptionConflictError(conflict)
   }
diff --git a/src/main/runtime/structured-agent-session-windowless-layout-host.test.ts b/src/main/runtime/structured-agent-session-windowless-layout-host.test.ts
index fa197cb1a81f..1fbedbe6aff4 100644
--- a/src/main/runtime/structured-agent-session-windowless-layout-host.test.ts
+++ b/src/main/runtime/structured-agent-session-windowless-layout-host.test.ts
@@ -1,19 +1,9 @@
-import { isAgentSessionProviderHandleChain } from '../../shared/agent-session-provider-handle'
-import { codexProviderHandle } from '../../shared/agent-session-provider-handle-encoding'
-import { publishCommittedPtySpawn } from '../ipc/pty/spawn-commit-publication'
-import type { PtySpawnCommitInput } from '../ipc/pty/spawn-commit-assembly'
-import { createRuntimePtySpawnState } from '../ipc/pty/runtime/spawn-state'
-import { createPtySpawnCommitDependencies } from '../persistence/loading-store/pty-spawn-commit-dependencies-fixture'
-import { unregisterPty } from '../memory/pty-registry'
-import { AgentSessionStoreTransactions } from './agent-session-store-transactions'
-import * as storeDraft from './agent-session-store-draft'
-import * as storeRows from './agent-session-record-rows'
 // A windowless host's saved chat tab against a real chat host: the index hiding a chat reaches the
 // runtime and takes the tab out of the layout, and a chat whose record is gone loses its tab.
 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 { afterEach, beforeEach, describe, expect, it } from 'vitest'
 import {
   agentSessionLeaseFixture,
   agentSessionRecordFixture
@@ -24,10 +14,7 @@ import { getDefaultWorkspaceSession } from '../../shared/constants'
 import { normalizeExecutionHostId } from '../../shared/execution-host'
 import { closeTestJournalHostDatabases } from '../native-chat/agent-session-journal/journal-host-database-test-support'
 import { recordingStructuredAgentSessionLogger } from '../native-chat/agent-session-wire/structured-agent-session-logger-test-support'
-import {
-  readPersistedTestAgentSessionStore,
-  seedTestAgentSessionRecordStore
-} from './agent-session-record-store-test-harness'
+import { seedTestAgentSessionRecordStore } from './agent-session-record-store-test-harness'
 import { OrcaRuntimeService } from './orca-runtime'
 import { withChatTabChanges } from './agent-session/agent-session-tab-layout'
 import {
@@ -123,7 +110,7 @@ async function runtimeWithSavedChats(
     })
   }
   await settled()
-  return { runtime, state, store }
+  return { runtime, state }
 }
 
 function installHost(runtime: OrcaRuntimeService) {
@@ -301,146 +288,3 @@ describe('a windowless chat tab against the chat host', () => {
     expect(savedChatIds(state)).toEqual([CHAT_GONE, CHAT_B])
   })
 })
-
-it.each([
-  [8, 1],
-  [80, 1],
-  [256, 1],
-  [8, 10]
-])('measures retirement at %i links/%i sessions', async (k, sessions) => {
-  const record = released(CHAT_A)
-  record.provider = 'codex'
-  const handle = codexProviderHandle('88888888-8888-4888-8888-888888888888')
-  record.providerHandleChain = Array.from({ length: k }, (_, index) => ({
-    linkId: `link-${index}`,
-    origin: index === 0 ? 'created' : 'resumed',
-    mintedAtFence: index + 1,
-    observedAt: index + 1,
-    handle
-  }))
-  record.lease = { ...record.lease, runtimeFence: k, provenHandleLinkId: `link-${k - 1}` }
-  expect(isAgentSessionProviderHandleChain(record.providerHandleChain)).toBe(true)
-  const ids = Array.from({ length: sessions }, (_, i) => (i ? `chat-matching-${i}` : CHAT_A))
-  const records = ids.map((sessionId) => ({
-    ...record,
-    sessionId,
-    lease: { ...record.lease, sessionId }
-  }))
-  await seedTestAgentSessionRecordStore(root, {
-    records: [...records, released(CHAT_B)],
-    sessionTabs: shown(...ids, CHAT_B)
-  })
-  const { runtime, state, store } = await runtimeWithSavedChats([...ids, CHAT_B])
-  for (let index = 0; index < 3; index += 1) {
-    await runtime.publishStructuredAgentSessionTab({
-      workspaceId: `other-${index}`,
-      sessionId: CHAT_B,
-      agent: 'codex',
-      activate: false
-    })
-  }
-  const host = await installHost(runtime)
-  const probes = {
-    visibility: vi.spyOn(host, 'setSessionTabVisibility'),
-    transactions: vi.spyOn(AgentSessionStoreTransactions.prototype, 'transact'),
-    drafts: vi.spyOn(storeDraft, 'draftAgentSessionStoreState'),
-    differences: vi.spyOn(storeDraft, 'agentSessionStoreDraftRowWrites'),
-    changedRowCommits: vi.spyOn(storeRows, 'writeAgentSessionStoreRows'),
-    hidden: vi.spyOn(runtime, 'onStructuredSessionTabHidden'),
-    savedWrites: vi.spyOn(store, 'setWorkspaceSession'),
-    layoutCommands: vi.spyOn(store, 'applyLayoutCommand'),
-    retirement: vi.spyOn(runtime, 'retireStructuredAgentSessionTabFromSnapshot')
-  }
-  const publications = vi.fn()
-  const unsubscribe = runtime.onMobileSessionTabsChanged(publications)
-  const dismissals = vi.spyOn(host.restartResume, 'dismiss')
-  const visits = { recordVisits: 0, snapshotVisits: 0, findVisits: 0 }
-  for (const method of [Symbol.iterator, 'values'] as const) {
-    const original = Map.prototype[method]
-    vi.spyOn(Map.prototype, method).mockImplementation(function* (this: Map<unknown, unknown>) {
-      for (const item of original.call(this)) {
-        const value = method === 'values' ? item : item[1]
-        if (typeof value === 'object' && value !== null) {
-          if ('providerHandleChain' in value) {
-            visits.recordVisits += 1
-          }
-          if ('snapshotVersion' in value && 'tabs' in value) {
-            visits.snapshotVisits += 1
-          }
-        }
-        yield item
-      }
-      return undefined
-    })
-  }
-  const find = Array.prototype.find
-  vi.spyOn(Array.prototype, 'find').mockImplementation(function (
-    this: ArrayLike<unknown>,
-    predicate,
-    thisArg
-  ) {
-    return find.call(this, (value, index, array) => {
-      visits.findVisits += 1
-      return predicate.call(thisArg, value, index, array)
-    })
-  })
-  const reply = {
-    id: `perf-retirement-${k}`,
-    savedResumeDecision: {
-      agent: 'codex' as const,
-      providerSession: { key: 'session_id' as const, id: handle.nativeId },
-      verdict: 'admitted' as const
-    }
-  }
-  const ports = createPtySpawnCommitDependencies(runtime)
-  const spawnState = createRuntimePtySpawnState(ports, {
-    cols: 80,
-    rows: 24,
-    resumeOrigin: 'switch',
-    worktreeId: WT
-  })
-  spawnState.result = reply
-  const commit: PtySpawnCommitInput = {
-    state: spawnState,
-    nativeWindowsConptySpawn: false,
-    seedPaneKey: null,
-    registration: {
-      store: undefined,
-      worktreeId: WT,
-      shellOverride: undefined,
-      rendererLaunchAuthority: null
-    },
-    preAllocatedHandle: null,
-    paneKey: null,
-    resumeArgvDropped: false,
-    codexLaunchEnv: undefined,
-    initiallyHidden: false,
-    hiddenDelivery: 'runtime-owned',
-    response: reply
-  }
-  const counts = () => ({
-    ...Object.fromEntries(Object.entries(probes).map(([key, spy]) => [key, spy.mock.calls.length])),
-    dismissals: dismissals.mock.calls.length,
-    publications: publications.mock.calls.length,
-    ...visits
-  })
-  try {
-    expect((await publishCommittedPtySpawn(commit)).result).toBe(reply)
-    const beforeDrain = counts()
-    await Promise.all(dismissals.mock.results.map(({ value }) => value))
-    await settled()
-    const afterDrain = counts()
-    console.info('RETIREMENT_WORK', JSON.stringify({ k, sessions, beforeDrain, afterDrain }))
-    expect(
-      afterDrain.recordVisits + afterDrain.snapshotVisits + afterDrain.findVisits
-    ).toBeLessThanOrEqual(128 * k * sessions * sessions)
-    expect(host.deps.store.getVisibleSessionTabIndex().sessionIds).toEqual([CHAT_B])
-    expect(savedChatIds(state)).toEqual([CHAT_B])
-    expect((await readPersistedTestAgentSessionStore(root)).sessionTabs).toEqual(shown(CHAT_B))
-    expect(host.collaboratorsForTests().sessions.size).toBe(0)
-  } finally {
-    unsubscribe()
-    unregisterPty(reply.id)
-    vi.restoreAllMocks()
-  }
-})
diff --git a/src/main/runtime/structured-chat-dispatch-worker-lifecycle.test.ts b/src/main/runtime/structured-chat-dispatch-worker-lifecycle.test.ts
index 92bf9e147176..36728b04c26a 100644
--- a/src/main/runtime/structured-chat-dispatch-worker-lifecycle.test.ts
+++ b/src/main/runtime/structured-chat-dispatch-worker-lifecycle.test.ts
@@ -12,7 +12,6 @@ import {
   WAIT,
   call,
   clearChat,
-  connectionFor,
   coordinatorRunAndTask,
   db,
   dispatcher,
@@ -235,59 +234,3 @@ describe("a chat assignee's liveness, stop and close", () => {
 })
 
 // Stop ends the provider turn; the same chat/caller still owns its direct assignment.
-it.each(['pending', 'dispatched'] as const)(
-  'Stops %s direct work for a switch and resumes the same assignment on the next send',
-  async (status) => {
-    const { taskId, dispatchId } = await dispatchToChat()
-    await clearChat(PEER_CHAT)
-    await host.close(PEER_CHAT, 'evict')
-    db.db.prepare('UPDATE dispatch_contexts SET status = ? WHERE id = ?').run(status, dispatchId)
-    await startClearedContext(PEER_CHAT)
-    const worker = connectionFor(PEER_CHAT)
-    expect(await sendUserMessage(PEER_CHAT, 'continue original work')).toMatchObject({ ok: true })
-    await vi.waitFor(() => expect(worker.turns).toHaveLength(2), WAIT)
-    worker.handlers.onNotification?.('turn/started', { turn: { id: 'turn-2' } })
-    await host.flushStreamedEvents(PEER_CHAT)
-    const before = db.getDispatchContextById(dispatchId)
-    const close = vi.spyOn(host.deps.adapter, 'disposeSession')
-    const acquire = vi.spyOn(host.deps.adapter, 'acquire')
-    await host.switchToTerminal(PEER_CHAT)
-    expect(worker.methods).toContain('turn/interrupt')
-    expect(close).toHaveBeenCalled()
-    expect(worker.closed).toBe(true)
-    expect(acquire).not.toHaveBeenCalled()
-    expect(host.deps.store.getRecord(PEER_CHAT)?.lease.claimStatus).toBe('released')
-    expect((await host.journalSnapshot(PEER_CHAT)).items).toEqual(
-      expect.arrayContaining([
-        expect.objectContaining({
-          body: expect.objectContaining({ kind: 'turn', turnId: 'turn-2', state: 'interrupted' })
-        })
-      ])
-    )
-    expect(db.getDispatchContextById(dispatchId)).toEqual(before)
-    expect(host.deps.store.getVisibleSessionTabIndex().sessionIds).toContain(PEER_CHAT)
-    db.db
-      .prepare('UPDATE dispatch_contexts SET status = ? WHERE id = ?')
-      .run('dispatched', dispatchId)
-    await startClearedContext(PEER_CHAT)
-    expect(connectionFor(PEER_CHAT)).not.toBe(worker)
-    expect(acquire).toHaveBeenCalledTimes(1)
-    expect(host.deps.store.getRecord(PEER_CHAT)?.lease.claimStatus).toBe('live')
-    await call(
-      'orchestration.send',
-      { to: WORKER, subject: 'follow up', body: 'finish original work' },
-      { sessionId: COORDINATOR }
-    )
-    const mail = await call('orchestration.check', {}, { sessionId: PEER_CHAT })
-    expect(JSON.stringify(mail)).toContain('follow up')
-    await vi.waitFor(() => expect(connectionFor(PEER_CHAT).turns).toHaveLength(2), WAIT)
-    await settleTurn(PEER_CHAT, 1)
-    await call('orchestration.send', workerDone(taskId, dispatchId), { sessionId: PEER_CHAT })
-    expect(db.getTask(taskId)?.status).toBe('completed')
-    expect(db.getDispatchContextById(dispatchId)?.status).toBe('completed')
-    await vi.waitFor(async () => {
-      await host.switchToTerminal(PEER_CHAT)
-    }, WAIT)
-    expect(host.deps.store.getRecord(PEER_CHAT)?.lease.claimStatus).toBe('released')
-  }
-)
diff --git a/src/main/runtime/terminal/focus/focus-terminal.ts b/src/main/runtime/terminal/focus/focus-terminal.ts
index 189db51faffd..20987f3ecb0a 100644
--- a/src/main/runtime/terminal/focus/focus-terminal.ts
+++ b/src/main/runtime/terminal/focus/focus-terminal.ts
@@ -19,6 +19,9 @@ export abstract class OrcaRuntimeWithFocusTerminal extends OrcaRuntimeWithWaitFo
     options: { navigateHost?: boolean } = {}
   ): Promise<RuntimeTerminalFocus> {
     const navigateHost = options.navigateHost !== false
+    if (navigateHost) {
+      this.clientSessionTabSelections.noteHostNavigation()
+    }
     const livePtyIdentity = (): RuntimeTerminalFocus => {
       const live = this.getLivePtyForHandle(handle)
       if (!live?.pty.connected) {
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-create-reconciliation.ts b/src/main/runtime/terminal/launch/mobile-terminal-create-reconciliation.ts
index d00b99a4da24..320d266d4be3 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-create-reconciliation.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-create-reconciliation.ts
@@ -12,7 +12,7 @@ import {
   type PtySurfaceTopology
 } from '../../pty-recorded-surface-topology'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
-import { persistFreshPaneBindingIfSupported } from '../../../ipc/pty/spawn-commit-binding'
+import { persistFreshPaneBinding } from '../../../ipc/pty/spawn-commit-binding'
 
 export abstract class OrcaRuntimeWithReconcileOwnedMobileTerminal extends OrcaRuntimeWithResolveMobileSessionTerminalCommand {
   protected abstract ptySurfaceTopology(): PtySurfaceTopology
@@ -127,7 +127,7 @@ export abstract class OrcaRuntimeWithReconcileOwnedMobileTerminal extends OrcaRu
       }
       return { tabId: candidate.tabId, leafId: candidate.leafId }
     }
-    const pendingBinding = persistFreshPaneBindingIfSupported(
+    const pendingBinding = persistFreshPaneBinding(
       this.store,
       () => ({
         ...resolve(),
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-create.ts b/src/main/runtime/terminal/launch/mobile-terminal-create.ts
index 7c1e260d52d5..3861ad7b96e6 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-create.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-create.ts
@@ -1,3 +1,4 @@
+import { copySleepingAgentLaunchConfig } from '../../runtime-agent-launch-resolution'
 import type { MobileTerminalCreateOptions } from './mobile-terminal-create-options'
 import type { RuntimeMobileSessionTabsResult } from '../../../../shared/runtime-session-contracts'
 import { OrcaRuntimeWithFailedStartPanes } from './failed-start-pane'
@@ -42,6 +43,31 @@ export function pruneOwnedMobileTerminalDispatchRecipes(
   }
 }
 
+export function recordOwnedMobileTerminalDispatchRecipe(
+  recipes: Map<string, OwnedMobileTerminalDispatchRecipe>,
+  handle: string,
+  launch: Pick<
+    OwnedMobileTerminalDispatchRecipe,
+    'tabId' | 'leafId' | 'launchConfig' | 'launchAgent'
+  >,
+  workspace: { connectionId?: string | null }
+): void {
+  if (!recipes.has(handle) && recipes.size >= 4096) {
+    throw new Error('runtime_unavailable')
+  }
+  // Retain original dispatch evidence across an ambiguous response; retry payloads cannot replace it.
+  recipes.set(handle, {
+    tabId: launch.tabId,
+    leafId: launch.leafId,
+    connectionId: workspace.connectionId ?? null,
+    recordedAt: Date.now(),
+    ...(launch.launchConfig
+      ? { launchConfig: copySleepingAgentLaunchConfig(launch.launchConfig) }
+      : {}),
+    ...(launch.launchAgent ? { launchAgent: launch.launchAgent } : {})
+  })
+}
+
 export type { MobileTerminalCreateOptions } from './mobile-terminal-create-options'
 
 export type OwnedMobileTerminalCreateOptions = {
@@ -132,6 +158,9 @@ export abstract class OrcaRuntimeWithCreateMobileSessionTerminal extends OrcaRun
   ): Promise<RuntimeMobileSessionCreateTerminalResult> {
     const navigation = opts.navigation ?? 'all'
     const select = opts.select ?? opts.activate !== false
+    if (select && navigationTargetsHost(navigation) && !opts.switchExecution) {
+      this.clientSessionTabSelections.noteHostNavigation()
+    }
     const runOpts = {
       ...opts,
       activate: select && navigationTargetsHost(navigation)
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts b/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
index 194853995dd2..ba3423b1f55c 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
@@ -1,3 +1,4 @@
+import { isSessionTabSelectionRequest } from '../../../../shared/session-tab-placement'
 import { OrcaRuntimeWithReconcileOwnedMobileTerminal } from './mobile-terminal-create-reconciliation'
 import type {
   RuntimeMobileSessionCreateTerminalResult,
@@ -6,11 +7,11 @@ import type {
 } from '../../../../shared/runtime-types'
 import {
   pruneOwnedMobileTerminalDispatchRecipes,
+  recordOwnedMobileTerminalDispatchRecipe,
   type OwnedMobileTerminalCreateOptions,
   type OwnedMobileTerminalDispatchRecipe
 } from './mobile-terminal-create'
 import { randomUUID } from 'node:crypto'
-import { copySleepingAgentLaunchConfig } from '../../runtime-agent-launch-resolution'
 import { deriveRemoteRuntimeTerminalCreateHandle } from '../../remote-runtime-terminal-create-identity'
 import {
   placeCreatedSessionTab,
@@ -56,30 +57,23 @@ export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal ext
     const create = (preAllocatedHandle?: string) =>
       this.createTerminal(`id:${worktreeId}`, {
         focus: false,
-        ...(opts.presentation ? { presentation: opts.presentation } : {}),
+        ...(opts.switchExecution
+          ? { presentation: 'background' as const, agentLaunchViewer: () => 'none' as const }
+          : opts.presentation
+            ? { presentation: opts.presentation }
+            : {}),
         ...(opts.afterDesktopTabId ? { afterTabId: opts.afterDesktopTabId } : {}),
         beforePtySpawn: opts.beforePtySpawn,
         switchExecution: opts.switchExecution,
         ...(opts.keepPaneOnStartFailure ? { keepPaneOnStartFailure: true as const } : {}),
         onPtySpawnDispatched: (launch) => {
           if (mutationHandle && launch) {
-            if (
-              !this.ownedMobileDispatchRecipes.has(mutationHandle) &&
-              this.ownedMobileDispatchRecipes.size >= 4096
-            ) {
-              throw new Error('runtime_unavailable')
-            }
-            // Retain original dispatch evidence across an ambiguous response; retry payloads cannot replace it.
-            this.ownedMobileDispatchRecipes.set(mutationHandle, {
-              tabId: launch.tabId,
-              leafId: launch.leafId,
-              connectionId: workspace.connectionId ?? null,
-              recordedAt: Date.now(),
-              ...(launch.launchConfig
-                ? { launchConfig: copySleepingAgentLaunchConfig(launch.launchConfig) }
-                : {}),
-              ...(launch.launchAgent ? { launchAgent: launch.launchAgent } : {})
-            })
+            recordOwnedMobileTerminalDispatchRecipe(
+              this.ownedMobileDispatchRecipes,
+              mutationHandle,
+              launch,
+              workspace
+            )
           }
           // Why after the recipe: its refusal above is still before dispatch.
           opts.onPtySpawnDispatched?.()
@@ -192,18 +186,27 @@ export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal ext
       existingSurface?.customTitle !== undefined
         ? existingSurface.customTitle
         : this.getPtyManualTitle(livePty.pty, false) || undefined
-    activate = activate && (opts.switchExecution?.selectionCurrent?.() ?? true)
+    const viewerRequest = isSessionTabSelectionRequest(opts.switchExecution?.viewerSelection)
+    const publishActivate = opts.switchExecution?.openPlacement?.activate ?? activate
+    activate = activate && !viewerRequest && (opts.switchExecution?.selectionCurrent?.() ?? true)
     const tab: RuntimeMobileSessionTerminalTab = {
       type: 'terminal',
       ...(existingSurface?.openPlacement
         ? {
             openPlacement: {
               ...existingSurface.openPlacement,
-              activate: existingSurface.openPlacement.activate && activate
+              activate:
+                existingSurface.openPlacement.activate &&
+                (viewerRequest ? publishActivate : activate)
             }
           }
         : opts.switchExecution?.openPlacement
-          ? { openPlacement: { ...opts.switchExecution.openPlacement, activate } }
+          ? {
+              openPlacement: {
+                ...opts.switchExecution.openPlacement,
+                activate: viewerRequest ? publishActivate : activate
+              }
+            }
           : {}),
       id: `${parentTabId}::${leafId}`,
       parentTabId,
@@ -268,6 +271,10 @@ export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal ext
       tabs
     }
     // Store adds retirement proofs; emit that snapshot because version-deduping subscribers would miss proofs from a pre-store frame.
+    if (activate) {
+      opts.switchExecution?.check()
+      opts.switchExecution?.selectionCurrent?.(true)
+    }
     const stored = this.storeMobileSessionSnapshot(worktreeId, next)
     if (opts.switchExecution?.openPlacement) {
       this.markPaneLiveTitlesDirty()
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-switch-publication.ts b/src/main/runtime/terminal/launch/mobile-terminal-switch-publication.ts
index 05a9fee9f65a..0848b1aebc86 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-switch-publication.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-switch-publication.ts
@@ -1,3 +1,4 @@
+import { isSessionTabSelectionRequest } from '../../../../shared/session-tab-placement'
 import type { OrcaRuntimeWithMobileTerminalCreateOwner } from './mobile-terminal-create-owner'
 import type { MobileTerminalCreateOptions } from './mobile-terminal-create-options'
 import { trackRunningAgentLaunchPane } from '../../../agent-launch/agent-launch-pane-attachment'
@@ -88,6 +89,7 @@ export async function createPublishedSwitchTerminal(args: {
       launchAgent: startupCommand.launchAgent ?? 'codex',
       viewMode: 'terminal' as const,
       viewer:
+        isSessionTabSelectionRequest(opts.switchExecution!.viewerSelection) ||
         (opts.switchExecution!.selectionCurrent?.() ?? true)
           ? opts.switchExecution!.viewer
           : ('none' as const),
diff --git a/src/main/runtime/terminal/lifecycle/bind-first-registration-census.test.ts b/src/main/runtime/terminal/lifecycle/bind-first-registration-census.test.ts
index 84b743008857..831da7cbb110 100644
--- a/src/main/runtime/terminal/lifecycle/bind-first-registration-census.test.ts
+++ b/src/main/runtime/terminal/lifecycle/bind-first-registration-census.test.ts
@@ -33,7 +33,7 @@ const CREATE_PATHS = [
   {
     path: 'runtime-owned mobile create and restored-pane start',
     file: 'src/main/runtime/terminal/launch/mobile-terminal-create-reconciliation.ts',
-    bindsWith: 'persistFreshPaneBindingIfSupported('
+    bindsWith: 'persistFreshPaneBinding('
   },
   {
     path: 'CLI split of a terminal',
diff --git a/src/main/runtime/workspaces/startup/workspace-agent-startup.ts b/src/main/runtime/workspaces/startup/workspace-agent-startup.ts
new file mode 100644
index 000000000000..e01e3463d090
--- /dev/null
+++ b/src/main/runtime/workspaces/startup/workspace-agent-startup.ts
@@ -0,0 +1,82 @@
+import { OrcaRuntimeWithListManagedWorktrees } from '../managed-workspace-operations'
+import type { Repo } from '../../../../shared/repo-types'
+import type { TuiAgent } from '../../../../shared/tui-agent'
+import type { AgentLaunchPreferences } from '../../../../shared/agent-session-host-authority'
+import type { TerminalWorkspaceLaunchScope } from '../../runtime-legacy-worker-terminal-recovery-types'
+import {
+  buildWorktreeStartupForAgent,
+  buildWorktreeStartupForDraft,
+  resolveWorktreeStartupDraftAgent
+} from '../../runtime-worktree-agent-startup'
+
+export abstract class OrcaRuntimeWithBuildWorktreeStartup extends OrcaRuntimeWithListManagedWorktrees {
+  protected abstract toAgentSessionOptions(
+    preferences: AgentLaunchPreferences | undefined
+  ): Record<string, string> | undefined
+
+  /** Use buildStartupForDraft's selection so launches can name the agent before creation. */
+  async resolveStartupDraftAgent(repo: Repo, requestedAgent?: TuiAgent): Promise<TuiAgent | null> {
+    if (!this.store) {
+      return null
+    }
+    return resolveWorktreeStartupDraftAgent({
+      repo,
+      settings: this.store.getSettings(),
+      ...(requestedAgent ? { requestedAgent } : {})
+    })
+  }
+
+  protected async buildStartupForDraft(
+    repo: Repo,
+    draft: string,
+    requestedAgent?: TuiAgent,
+    launchSource?: string
+  ): ReturnType<typeof buildWorktreeStartupForDraft> {
+    if (!this.store) {
+      return null
+    }
+    return buildWorktreeStartupForDraft({
+      repo,
+      draft,
+      ...(requestedAgent ? { requestedAgent } : {}),
+      ...(launchSource ? { launchSource } : {}),
+      settings: this.store.getSettings(),
+      getLaunchRuntime: (agent) => this.resolveStartupAgentLaunchRuntime(repo, agent)
+    })
+  }
+
+  protected buildStartupForAgent(
+    repo: Repo,
+    agent: TuiAgent,
+    prompt: string | undefined,
+    launchPreferences?: AgentLaunchPreferences,
+    launchInputs?: {
+      agentArgs?: string | null
+      extraAgentArgs?: string
+      suppressStartupUpdatePrompt?: boolean
+      launchSource?: string
+      onPromptCarry?: (carried: boolean) => void
+      /** The existing workspace it starts in; absent is a new workspace of `repo`. */
+      launchScope?: TerminalWorkspaceLaunchScope
+    }
+  ): ReturnType<typeof buildWorktreeStartupForAgent> {
+    if (!this.store) {
+      throw new Error('runtime_unavailable')
+    }
+    return buildWorktreeStartupForAgent({
+      repo,
+      agent,
+      ...(prompt !== undefined ? { prompt } : {}),
+      ...(launchPreferences ? { launchPreferences } : {}),
+      ...(launchInputs?.agentArgs !== undefined ? { agentArgs: launchInputs.agentArgs } : {}),
+      ...(launchInputs?.extraAgentArgs ? { extraAgentArgs: launchInputs.extraAgentArgs } : {}),
+      ...(launchInputs?.suppressStartupUpdatePrompt ? { suppressStartupUpdatePrompt: true } : {}),
+      ...(launchInputs?.launchSource ? { launchSource: launchInputs.launchSource } : {}),
+      ...(launchInputs?.onPromptCarry ? { onPromptCarry: launchInputs.onPromptCarry } : {}),
+      settings: this.store.getSettings(),
+      getLaunchRuntime: (agent) =>
+        this.resolveStartupAgentLaunchRuntime(repo, agent, launchInputs?.launchScope),
+      toSessionOptions: (preferences) => this.toAgentSessionOptions(preferences)
+    })
+  }
+}
diff --git a/src/main/runtime/workspaces/workspace-activation.ts b/src/main/runtime/workspaces/workspace-activation.ts
index 98214c6be840..1ea9dabc91f8 100644
--- a/src/main/runtime/workspaces/workspace-activation.ts
+++ b/src/main/runtime/workspaces/workspace-activation.ts
@@ -1,4 +1,4 @@
-import { OrcaRuntimeWithListManagedWorktrees } from './managed-workspace-operations'
+import { OrcaRuntimeWithBuildWorktreeStartup } from './startup/workspace-agent-startup'
 import type { RuntimeNavigationTarget } from '../../../shared/runtime-navigation'
 import {
   navigationTargetsClients,
@@ -7,20 +7,12 @@ import {
 } from '../../../shared/runtime-navigation'
 import { getRepoExecutionHostId } from '../../../shared/execution-host'
 import { phoneWakeReport } from '../../../shared/workspace-sleep'
-import type { Repo } from '../../../shared/repo-types'
-import type { TerminalWorkspaceLaunchScope } from '../runtime-legacy-worker-terminal-recovery-types'
 import type { TuiAgent } from '../../../shared/tui-agent'
 import type { RuntimeTerminalWait } from '../../../shared/runtime-terminal-contracts'
 import type {
   WorktreeStartupDraftPaste,
   WorktreeStartupFollowup
 } from '../runtime-worktree-agent-startup'
-import {
-  buildWorktreeStartupForAgent,
-  buildWorktreeStartupForDraft,
-  resolveWorktreeStartupDraftAgent
-} from '../runtime-worktree-agent-startup'
-import type { AgentLaunchPreferences } from '../../../shared/agent-session-host-authority'
 import type { Worktree } from '../../../shared/worktree/types'
 import type { WorktreeLineageResolution } from '../runtime-worktree-lineage-resolution'
 import type {
@@ -50,10 +42,7 @@ import {
 } from '../launched-agent-foreground'
 import { worktreeRowTarget } from '../../persistence/host-qualified-worktree-meta'
 
-export abstract class OrcaRuntimeWithActivateManagedWorktree extends OrcaRuntimeWithListManagedWorktrees {
-  protected abstract toAgentSessionOptions(
-    preferences: AgentLaunchPreferences | undefined
-  ): Record<string, string> | undefined
+export abstract class OrcaRuntimeWithActivateManagedWorktree extends OrcaRuntimeWithBuildWorktreeStartup {
   protected abstract getWorktreeStartupReadinessHost(): WorktreeStartupReadinessHost
   protected abstract getWorktreeTerminalProvisioningHost(
     createdWorktree?: Worktree
@@ -73,14 +62,17 @@ export abstract class OrcaRuntimeWithActivateManagedWorktree extends OrcaRuntime
     /** unsupported-headless means no renderer holds wake records; clients must not claim agents resumed. */
     sleepingAgentWake: 'requested' | 'unsupported-headless' | 'not-applicable'
   }> {
+    const navigation = resolveRuntimeNavigationTarget({ ...opts, defaultTarget: 'host' })
+    const targetsHost = navigationTargetsHost(navigation)
+    if (targetsHost) {
+      this.clientSessionTabSelections.noteHostNavigation()
+    }
     this.assertGraphReady()
     const worktree = await this.resolveGitWorktreeSelector(worktreeSelector)
     const repo = this.store?.getRepo(worktree.repoId)
     if (!repo) {
       throw new Error('repo_not_found')
     }
-    const navigation = resolveRuntimeNavigationTarget({ ...opts, defaultTarget: 'host' })
-    const targetsHost = navigationTargetsHost(navigation)
     const targetsClients = navigationTargetsClients(navigation)
 
     const target = this.store ? worktreeRowTarget(this.store, worktree) : undefined
@@ -129,72 +121,6 @@ export abstract class OrcaRuntimeWithActivateManagedWorktree extends OrcaRuntime
     return { repoId: repo.id, worktreeId: worktree.id, activated: true, sleepingAgentWake }
   }
 
-  /** Use buildStartupForDraft's selection so launches can name the agent before creation. */
-  async resolveStartupDraftAgent(repo: Repo, requestedAgent?: TuiAgent): Promise<TuiAgent | null> {
-    if (!this.store) {
-      return null
-    }
-    return resolveWorktreeStartupDraftAgent({
-      repo,
-      settings: this.store.getSettings(),
-      ...(requestedAgent ? { requestedAgent } : {})
-    })
-  }
-
-  protected async buildStartupForDraft(
-    repo: Repo,
-    draft: string,
-    requestedAgent?: TuiAgent,
-    launchSource?: string
-  ): ReturnType<typeof buildWorktreeStartupForDraft> {
-    if (!this.store) {
-      return null
-    }
-    return buildWorktreeStartupForDraft({
-      repo,
-      draft,
-      ...(requestedAgent ? { requestedAgent } : {}),
-      ...(launchSource ? { launchSource } : {}),
-      settings: this.store.getSettings(),
-      getLaunchRuntime: (agent) => this.resolveStartupAgentLaunchRuntime(repo, agent)
-    })
-  }
-
-  protected buildStartupForAgent(
-    repo: Repo,
-    agent: TuiAgent,
-    prompt: string | undefined,
-    launchPreferences?: AgentLaunchPreferences,
-    launchInputs?: {
-      agentArgs?: string | null
-      extraAgentArgs?: string
-      suppressStartupUpdatePrompt?: boolean
-      launchSource?: string
-      onPromptCarry?: (carried: boolean) => void
-      /** The existing workspace it starts in; absent is a new workspace of `repo`. */
-      launchScope?: TerminalWorkspaceLaunchScope
-    }
-  ): ReturnType<typeof buildWorktreeStartupForAgent> {
-    if (!this.store) {
-      throw new Error('runtime_unavailable')
-    }
-    return buildWorktreeStartupForAgent({
-      repo,
-      agent,
-      ...(prompt !== undefined ? { prompt } : {}),
-      ...(launchPreferences ? { launchPreferences } : {}),
-      ...(launchInputs?.agentArgs !== undefined ? { agentArgs: launchInputs.agentArgs } : {}),
-      ...(launchInputs?.extraAgentArgs ? { extraAgentArgs: launchInputs.extraAgentArgs } : {}),
-      ...(launchInputs?.suppressStartupUpdatePrompt ? { suppressStartupUpdatePrompt: true } : {}),
-      ...(launchInputs?.launchSource ? { launchSource: launchInputs.launchSource } : {}),
-      ...(launchInputs?.onPromptCarry ? { onPromptCarry: launchInputs.onPromptCarry } : {}),
-      settings: this.store.getSettings(),
-      getLaunchRuntime: (agent) =>
-        this.resolveStartupAgentLaunchRuntime(repo, agent, launchInputs?.launchScope),
-      toSessionOptions: (preferences) => this.toAgentSessionOptions(preferences)
-    })
-  }
-
   protected recordCreatedWorktreeLineage(
     worktree: Pick<Worktree, 'id' | 'instanceId'>,
     lineageResolution: WorktreeLineageResolution
diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/BrowserPaneOverlayLayer.tsx b/src/renderer/src/components/browser-pane/assemble-chrome/BrowserPaneOverlayLayer.tsx
index 136c0b379756..df734927e906 100644
--- a/src/renderer/src/components/browser-pane/assemble-chrome/BrowserPaneOverlayLayer.tsx
+++ b/src/renderer/src/components/browser-pane/assemble-chrome/BrowserPaneOverlayLayer.tsx
@@ -1,3 +1,4 @@
+import { noteViewerGroupNavigation } from '@/lib/viewer-selection-request'
 import { memo, useCallback, useEffect, useMemo } from 'react'
 import { registerBrowserOverlaySlotViewport } from '../host-guest/browser-page-viewport'
 import { useShallow } from 'zustand/react/shallow'
@@ -147,7 +148,10 @@ const BrowserPaneOverlayLayer = memo(function BrowserPaneOverlayLayer({
 
   // Why: stable identity so BrowserOverlaySlot's memo holds; groupId is passed at call time so one callback serves every slot.
   const focusOwningGroup = useCallback(
-    (groupId: string) => focusGroup(worktreeId, groupId),
+    (groupId: string) => {
+      noteViewerGroupNavigation(useAppStore.getState(), worktreeId, groupId)
+      focusGroup(worktreeId, groupId)
+    },
     [focusGroup, worktreeId]
   )
 
diff --git a/src/renderer/src/components/dashboard/reveal-dashboard-agent.ts b/src/renderer/src/components/dashboard/reveal-dashboard-agent.ts
index 5bd062be10c0..9c553da565e4 100644
--- a/src/renderer/src/components/dashboard/reveal-dashboard-agent.ts
+++ b/src/renderer/src/components/dashboard/reveal-dashboard-agent.ts
@@ -1,3 +1,4 @@
+import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { revealTerminalPane } from '@/lib/reveal-terminal-pane'
 import { activateAndRevealWorkspace } from '@/lib/worktree-activation'
 import { activateStructuredAgentSessionTab } from '@/lib/agent-session/structured-agent-session-tab-activation'
@@ -9,6 +10,7 @@ import { useAppStore } from '@/store'
 import type { DashboardRevealAgentArgs } from '../../../../shared/dashboard-snapshot'
 
 export function revealDashboardAgent(args: DashboardRevealAgentArgs): boolean {
+  noteViewerNavigation()
   const state = useAppStore.getState()
   const tab = state.unifiedTabsByWorktree[args.worktreeId]?.find(
     (candidate) =>
diff --git a/src/renderer/src/components/editor/check-annotation-open.ts b/src/renderer/src/components/editor/check-annotation-open.ts
index d099f521b1cd..602dc974bd9a 100644
--- a/src/renderer/src/components/editor/check-annotation-open.ts
+++ b/src/renderer/src/components/editor/check-annotation-open.ts
@@ -1,3 +1,4 @@
+import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { detectLanguage } from '@/lib/language-detect'
 import { activateAndRevealWorktree } from '@/lib/worktree-activation'
 import { useAppStore } from '@/store'
@@ -29,6 +30,7 @@ export function openAnnotationLocation(params: {
   const { absolutePath, relativePath } = resolvedPath
   const language = detectLanguage(relativePath)
 
+  noteViewerNavigation()
   // Use shared activation so annotation jumps join sidebar, palette and terminal-link navigation history.
   activateAndRevealWorktree(worktreeId, { providesInitialSurface: true, executionHostId })
 
diff --git a/src/renderer/src/components/emulator-pane/EmulatorPaneOverlayLayer.tsx b/src/renderer/src/components/emulator-pane/EmulatorPaneOverlayLayer.tsx
index 410d9d3ac665..fd8e7bb9822a 100644
--- a/src/renderer/src/components/emulator-pane/EmulatorPaneOverlayLayer.tsx
+++ b/src/renderer/src/components/emulator-pane/EmulatorPaneOverlayLayer.tsx
@@ -1,3 +1,4 @@
+import { noteViewerGroupNavigation } from '@/lib/viewer-selection-request'
 import { memo, useCallback, useMemo } from 'react'
 import { useShallow } from 'zustand/react/shallow'
 import { useAppStore } from '@/store'
@@ -70,7 +71,10 @@ const EmulatorPaneOverlayLayer = memo(function EmulatorPaneOverlayLayer({
   )
   const focusGroup = useAppStore((state) => state.focusGroup)
   const focusOwningGroup = useCallback(
-    (groupId: string) => focusGroup(worktreeId, groupId),
+    (groupId: string) => {
+      noteViewerGroupNavigation(useAppStore.getState(), worktreeId, groupId)
+      focusGroup(worktreeId, groupId)
+    },
     [focusGroup, worktreeId]
   )
 
diff --git a/src/renderer/src/components/floating-terminal/use-floating-terminal-create-actions.ts b/src/renderer/src/components/floating-terminal/use-floating-terminal-create-actions.ts
index 448390791129..6c92f28dfe4c 100644
--- a/src/renderer/src/components/floating-terminal/use-floating-terminal-create-actions.ts
+++ b/src/renderer/src/components/floating-terminal/use-floating-terminal-create-actions.ts
@@ -1,3 +1,4 @@
+import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { useCallback } from 'react'
 import { toast } from 'sonner'
 import { resolveGroupTabFromVisibleId } from '@/components/tab-group/tab-group-visible-id'
@@ -43,6 +44,7 @@ export function useFloatingTerminalCreateActions({
 }: FloatingTerminalCreateActionsInput) {
   const activateFloatingItem = useCallback(
     (visibleId: string) => {
+      noteViewerNavigation()
       const item = resolveGroupTabFromVisibleId(groupTabs, visibleId)
       if (!item) {
         return
@@ -67,6 +69,7 @@ export function useFloatingTerminalCreateActions({
 
   const createFloatingTerminalTab = useCallback(
     (shellOverride?: string) => {
+      noteViewerNavigation()
       const tabId = createBrowserUuid()
       createTab(FLOATING_TERMINAL_WORKTREE_ID, activeGroup?.id, shellOverride, { id: tabId })
       focusTerminalTabSurface(tabId)
@@ -75,6 +78,7 @@ export function useFloatingTerminalCreateActions({
   )
 
   const createFloatingBrowserTab = useCallback(() => {
+    noteViewerNavigation()
     if (!ensureClientCreationActionAllowed(FLOATING_TERMINAL_WORKTREE_ID, 'managed-browser')) {
       return
     }
@@ -91,6 +95,7 @@ export function useFloatingTerminalCreateActions({
   }, [activeGroup, browserDefaultUrl, createBrowserTab])
 
   const createFloatingMarkdownTab = useCallback(() => {
+    noteViewerNavigation()
     if (!markdownCwd) {
       return
     }
diff --git a/src/renderer/src/components/native-chat/NativeChatPaneHeader.test.tsx b/src/renderer/src/components/native-chat/NativeChatPaneHeader.test.tsx
index 2087eaf617fa..2f8bd2abd3f3 100644
--- a/src/renderer/src/components/native-chat/NativeChatPaneHeader.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatPaneHeader.test.tsx
@@ -1,5 +1,13 @@
+import { ConfirmationDialogProvider } from '@/components/confirmation-dialog'
 // @vitest-environment happy-dom
-import { act, cleanup, fireEvent, render, screen } from '@testing-library/react'
+import {
+  act,
+  cleanup,
+  fireEvent,
+  render as renderWithConfirmation,
+  screen,
+  waitFor
+} from '@testing-library/react'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import { TooltipProvider } from '@/components/ui/tooltip'
 import { useAppStore } from '@/store'
@@ -7,6 +15,15 @@ import { createTabsSliceMockApi } from '@/store/slices/tabs-slice-test-harness'
 import { makeFolderWorkspace } from '@/store/slices/worktrees-slice-test-fixtures'
 import * as historyRequest from '../right-sidebar/ai-vault-panel-session-list-request'
 
+function render(ui: React.ReactNode) {
+  return renderWithConfirmation(ui, { wrapper: ConfirmationDialogProvider })
+}
+
+vi.mock('@/runtime/structured-agent-session-client', async (original) => ({
+  ...(await original<object>()),
+  supportsInPlaceSwitch: async () => false
+}))
+
 const mocks = vi.hoisted(() => ({ launch: vi.fn(), resume: vi.fn(), close: vi.fn() }))
 vi.mock('@/store', async () => {
   const { createTestStore } = await import('@/store/slices/store-test-helpers')
@@ -74,7 +91,7 @@ it('puts Hand Off first like the terminal header, only on the focused pane, and
   expect(screen.queryByRole('button', { name: 'Hand Off to Another Agent' })).toBeNull()
 })
 
-it('offers the terminal header action order and targets Resume and Close at the displayed chat', () => {
+it('offers the terminal header action order and targets Resume and Close at the displayed chat', async () => {
   const source = renderHeader()
   expect(screen.getAllByRole('button').map((button) => button.getAttribute('aria-label'))).toEqual([
     'Continue with Terminal Agent',
@@ -88,15 +105,19 @@ it('offers the terminal header action order and targets Resume and Close at the
   expect(fullRequest).not.toHaveBeenCalled()
   fireEvent.click(screen.getByRole('button', { name: 'Continue with Terminal Agent' }))
   expect(fullRequest).toHaveBeenCalledTimes(1)
-  expect(mocks.resume).toHaveBeenCalledExactlyOnceWith(
-    expect.objectContaining({
-      subject: expect.objectContaining({
-        sessionId: source.entityId,
-        request: { scopePaths: ['/repo'], executionHostScope: 'local', sessionLimit: 250 }
-      }),
-      tab: { id: source.id, worktreeId: source.worktreeId },
-      agent: 'codex'
-    })
+  await waitFor(() =>
+    expect(mocks.resume).toHaveBeenCalledExactlyOnceWith(
+      expect.objectContaining({
+        subject: expect.objectContaining({
+          sessionId: source.entityId,
+          request: { scopePaths: ['/repo'], executionHostScope: 'local', sessionLimit: 250 }
+        }),
+        tab: { id: source.id, worktreeId: source.worktreeId },
+        agent: 'codex',
+        queuedMessage:
+          'A copy of this Codex conversation opens in a new terminal. The original chat stays open.'
+      })
+    )
   )
   fireEvent.click(screen.getByRole('button', { name: 'Close tab' }))
   expect(mocks.close).toHaveBeenCalledExactlyOnceWith({
diff --git a/src/renderer/src/components/native-chat/NativeChatResumeInCliButton.tsx b/src/renderer/src/components/native-chat/NativeChatResumeInCliButton.tsx
index 2a835e8b8070..1a1f7bd38edb 100644
--- a/src/renderer/src/components/native-chat/NativeChatResumeInCliButton.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatResumeInCliButton.tsx
@@ -1,3 +1,10 @@
+import { inPlaceSwitchEnabled } from '../../../../shared/structured-agent-cli-conversation-adoption'
+import { useConfirmationDialog } from '@/components/confirmation-dialog-context'
+import {
+  conversationSwitchFailureText,
+  runNativeChatCliSwitch,
+  useConversationSwitchPending
+} from '@/lib/conversation-surface-switch'
 import { useMemo } from 'react'
 import { SquareTerminal } from 'lucide-react'
 import { Button } from '@/components/ui/button'
@@ -7,6 +14,7 @@ import { isNativeChatEnabled } from '../../../../shared/structured-native-chat-l
 import type { AppState } from '@/store/types'
 import { selectFolderWorkspaces, selectWorktreesByRepo } from '@/store/workspace-record-selectors'
 import { translate } from '@/i18n/i18n'
+import { agentLabel } from '../../../../shared/ai-vault-session-filters'
 import { AI_VAULT_AGENTS } from '../../../../shared/ai-vault-types'
 import {
   runNativeChatCliFork,
@@ -72,6 +80,20 @@ export function NativeChatResumeInCliButton({
   const pending = useNativeChatCliForkPending(
     executionHostScope ? { executionHostScope, sessionId: nativeChat.sessionId } : null
   )
+  const switchAgent = AI_VAULT_AGENTS.find((candidate) => candidate === nativeAgent)
+  const switchPending = useConversationSwitchPending(
+    executionHostScope && switchAgent
+      ? {
+          direction: 'terminal',
+          sessionId,
+          workspaceId: worktreeId,
+          executionHostId: executionHostScope,
+          agent: switchAgent,
+          chatTabId: tabId
+        }
+      : null
+  )
+  const confirm = useConfirmationDialog()
   const commandOverrides = useAppStore((state) => state.settings?.agentCmdOverrides)
   const agent = AI_VAULT_AGENTS.find((candidate) => candidate === nativeChat.agent)
   const enabled = useAppStore((state) => isNativeChatEnabled(state.settings))
@@ -90,8 +112,8 @@ export function NativeChatResumeInCliButton({
           variant="pane-title"
           size="icon-xs"
           aria-label={label}
-          disabled={pending}
-          aria-busy={pending || undefined}
+          disabled={pending || switchPending}
+          aria-busy={pending || switchPending || undefined}
           onClick={(event) => {
             event.stopPropagation()
             const subject = resolveTabSessionHistorySubject(useAppStore.getState(), {
@@ -99,7 +121,41 @@ export function NativeChatResumeInCliButton({
               nativeChat
             })
             if (subject?.kind === 'chat') {
-              void runNativeChatCliFork({ subject, tab, agent, commandOverrides })
+              const legacyContinue = (viewerSelection?: string) =>
+                runNativeChatCliFork({
+                  subject,
+                  tab,
+                  agent,
+                  commandOverrides,
+                  ...(viewerSelection
+                    ? {
+                        viewerSelection,
+                        describeFailure: (message: string) =>
+                          conversationSwitchFailureText(new Error(message), {
+                            agent,
+                            direction: 'terminal'
+                          })
+                      }
+                    : {}),
+                  queuedMessage: translate(
+                    'components.tab.bar.switch.legacyCopy',
+                    'A copy of this {{agent}} conversation opens in a new terminal. The original chat stays open.',
+                    { agent: agentLabel(agent) }
+                  )
+                })
+              if (!inPlaceSwitchEnabled(agent)) {
+                void legacyContinue()
+                return
+              }
+              void runNativeChatCliSwitch({
+                confirm,
+                sessionId,
+                workspaceId: worktreeId,
+                executionHostId: executionHostScope,
+                agent,
+                chatTabId: tabId,
+                legacyContinue
+              })
             }
           }}
         >
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx
index e915b9ee4133..72176c574e07 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx
@@ -1,31 +1,16 @@
-import recordedOmpReply from '../../../../main/acp/fixtures/omp-v17-reply-without-thought.jsonl?raw'
-import { z } from 'zod'
 import { createGlobalSettingsFixture } from '../../../../shared/global-settings-test-fixture'
 import { makeRepo, makeWorktree } from '../worktree-jump-palette-test-fixtures'
 import { agentSessionTabFixture } from './native-chat-workspace-test-fixtures'
-import * as cliSwitch from '@/lib/conversation-surface-switch'
 import { useAppStore } from '@/store'
 import { makeTabGroup } from '@/store/slices/store-test-helpers'
-import * as cliFork from '../tab-bar/native-chat-cli-fork-run'
 // @vitest-environment happy-dom
 
-import { act, cleanup, render, screen, within } from '@testing-library/react'
+import { act, cleanup, render, screen } from '@testing-library/react'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { TooltipProvider } from '@/components/ui/tooltip'
 import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types'
 import { NativeChatStructuredSession } from './NativeChatStructuredSession'
-import { TabSessionSwitchHoverAction } from '../tab-bar/TabSessionSwitchHoverAction'
-import { TabSessionSurfaceSwitchMenuItems } from '../tab-bar/TabSessionSurfaceSwitchMenuItems'
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuTrigger
-} from '@/components/ui/dropdown-menu'
-import {
-  readLocalRuntimeCapabilitiesOrUnknown,
-  refreshLocalRuntimeCapabilities,
-  setLocalRuntimeCapabilitiesForTests
-} from '@/runtime/local-runtime-capabilities'
+import { setLocalRuntimeCapabilitiesForTests } from '@/runtime/local-runtime-capabilities'
 import { createCompatibleRuntimeStatusResponse } from '@/runtime/runtime-compatibility-test-fixture'
 import type { RuntimeStatus } from '../../../../shared/runtime-types'
 
@@ -260,55 +245,10 @@ afterEach(() => {
   })
 }
 
-it('keeps the recorded OMP reply readable with its CLI switch unavailable', () => {
-  const chunk = z.object({
-    sessionId: z.string(),
-    update: z.object({
-      sessionUpdate: z.literal('agent_message_chunk'),
-      content: z.object({ type: z.literal('text'), text: z.string() })
-    })
-  })
-  const frames = recordedOmpReply
-    .trim()
-    .split('\n')
-    .map((line) => chunk.safeParse(JSON.parse(line).message.params))
-    .flatMap((result) => (result.success ? [result.data] : []))
-  const text = frames.map(({ update }) => update.content.text).join('')
-  expect(text).toContain('marker recorded')
-  const { sessionId } = frames[0]
-  const tab = agentSessionTabFixture('omp-capture', 'wt-1', {
-    agentSessionAgent: 'omp',
-    entityId: sessionId
-  })
-  mocks.messages = [{ id: 'recorded-omp', role: 'assistant', blocks: [{ type: 'text', text }] }]
-  useAppStore.setState({
-    settings: createGlobalSettingsFixture({ experimentalNativeChat: true }),
-    repos: [makeRepo()],
-    worktreesByRepo: { 'repo-1': [makeWorktree('wt-1', 'recorded', { path: '/repo' })] },
-    unifiedTabsByWorktree: { 'wt-1': [tab] }
-  })
-  const invoke = vi.spyOn(cliSwitch, 'runNativeChatCliSwitch')
-  render(
-    <NativeChatStructuredSession
-      isVisible
-      isFocusedGroup
-      tabId={tab.id}
-      sessionId={tab.entityId}
-      target={{ kind: 'local' }}
-      agent="omp"
-    />,
-    { wrapper: TooltipProvider }
-  )
-  expect(screen.queryByRole('button', { name: 'Switch to CLI' })).toBeNull()
-  expect(invoke).not.toHaveBeenCalled()
-  expect(mocks.messageListProps?.session).toMatchObject({ sessionId, messages: mocks.messages })
-})
-
-it('gates eligible native header hover and menu switches through capability hydration and live Chat UI updates', async () => {
+it('gates the native header switch through capability hydration and live Chat UI updates', async () => {
   const tab = agentSessionTabFixture('native-controls', 'wt-1', {
     entityId: '019fd532-7c11-7a90-b6de-4e1a2c3d5f60'
   })
-  const nativeChat = { sessionId: tab.entityId, agent: 'codex' as const }
   useAppStore.setState(useAppStore.getInitialState(), true)
   useAppStore.setState({
     settings: createGlobalSettingsFixture({ experimentalNativeChat: false }),
@@ -337,8 +277,6 @@ it('gates eligible native header hover and menu switches through capability hydr
   })
   const getStatus = vi.fn(() => status)
   Object.assign(window, { api: { ...window.api, runtime: { getStatus } } })
-  const switchToCli = vi.spyOn(cliSwitch, 'runNativeChatCliSwitch')
-  const forkToCli = vi.spyOn(cliFork, 'runNativeChatCliFork')
   render(
     <TooltipProvider>
       <NativeChatStructuredSession
@@ -350,34 +288,15 @@ it('gates eligible native header hover and menu switches through capability hydr
         target={{ kind: 'local' }}
         agent="codex"
       />
-      <TabSessionSwitchHoverAction tab={tab} nativeChat={nativeChat} />
-      <DropdownMenu open modal={false}>
-        <DropdownMenuTrigger>Open native tab menu</DropdownMenuTrigger>
-        <DropdownMenuContent>
-          <TabSessionSurfaceSwitchMenuItems tab={tab} nativeChat={nativeChat} leadingSeparator />
-        </DropdownMenuContent>
-      </DropdownMenu>
     </TooltipProvider>
   )
-  const actions = screen
-    .getByRole('button', { name: 'Split Chat Right', hidden: true })
-    .closest('.pane-title-actions')
-  if (!(actions instanceof HTMLElement)) {
-    throw new Error('Expected the grouped pane actions row')
-  }
-  const row = within(actions)
-  expect(row.getByRole('button', { name: 'Close tab', hidden: true })).toBeTruthy()
   const transcript = screen.getByTestId('message-list')
   const legacyName = 'Continue with Terminal Agent'
   const expectHidden = () => {
     expect(screen.queryAllByRole('button', { name: 'Switch to CLI', hidden: true })).toHaveLength(0)
-    expect(screen.queryByRole('menuitem', { name: 'Switch to CLI' })).toBeNull()
-    expect(screen.queryByRole('separator')).toBeNull()
-    expect(screen.queryByText('Resume in New Terminal')).toBeNull()
     expect(screen.getByTestId('message-list')).toBe(transcript)
     expect(screen.getAllByRole('button', { name: legacyName, hidden: true })).toHaveLength(1)
   }
-  expect(readLocalRuntimeCapabilitiesOrUnknown()).toBeNull()
   expectHidden()
   act(() => {
     useAppStore.setState({
@@ -385,15 +304,9 @@ it('gates eligible native header hover and menu switches through capability hydr
     })
   })
   const loadingButtons = screen.getAllByRole('button', { name: 'Switch to CLI', hidden: true })
-  expect(loadingButtons).toHaveLength(2)
-  expect(row.getAllByRole('button', { name: 'Switch to CLI', hidden: true })).toHaveLength(1)
   for (const button of loadingButtons) {
     expect(button.hasAttribute('disabled')).toBe(true)
   }
-  expect(screen.queryByRole('button', { name: legacyName, hidden: true })).toBeNull()
-  expect(
-    screen.getByRole('menuitem', { name: 'Switch to CLI' }).hasAttribute('data-disabled')
-  ).toBe(true)
   const response = createCompatibleRuntimeStatusResponse('local')
   if (!response.ok) {
     throw new Error('Expected status fixture')
@@ -405,50 +318,10 @@ it('gates eligible native header hover and menu switches through capability hydr
     })
     await status
   })
-  expect(readLocalRuntimeCapabilitiesOrUnknown()).toContain(
-    'agent-session.structured.switch.creation-settlement-v1:codex'
-  )
   const buttons = screen.getAllByRole('button', { name: 'Switch to CLI', hidden: true })
-  expect(buttons).toHaveLength(2)
-  expect(row.getAllByRole('button', { name: 'Switch to CLI', hidden: true })).toHaveLength(1)
-  expect(screen.queryByRole('button', { name: legacyName, hidden: true })).toBeNull()
   for (const button of buttons) {
     expect(button.hasAttribute('disabled')).toBe(false)
   }
-  expect(
-    screen.getByRole('menuitem', { name: 'Switch to CLI' }).getAttribute('data-disabled')
-  ).toBeNull()
-  act(() => {
-    useAppStore.setState({
-      settings: createGlobalSettingsFixture({ experimentalNativeChat: false })
-    })
-  })
-  expectHidden()
-  act(() => {
-    useAppStore.setState({
-      settings: createGlobalSettingsFixture({ experimentalNativeChat: true })
-    })
-  })
-  getStatus.mockResolvedValue({ ...response.result, capabilities: [] })
-  await act(async () => {
-    await refreshLocalRuntimeCapabilities()
-  })
-  const oldPeerButtons = screen.getAllByRole('button', { name: 'Switch to CLI', hidden: true })
-  expect(oldPeerButtons).toHaveLength(2)
-  for (const button of oldPeerButtons) {
-    expect(button.hasAttribute('disabled')).toBe(false)
-  }
-  expect(
-    screen.getByRole('menuitem', { name: 'Switch to CLI' }).getAttribute('data-disabled')
-  ).toBeNull()
-  expect(screen.queryByRole('button', { name: legacyName, hidden: true })).toBeNull()
-  expect(screen.queryByRole('menuitem', { name: 'Resume in New Terminal' })).toBeNull()
-  expect(screen.getByRole('separator')).toBeTruthy()
-  expect(screen.getByTestId('message-list')).toBe(transcript)
-  expect(readLocalRuntimeCapabilitiesOrUnknown()).toEqual([])
-  expect(getStatus).toHaveBeenCalledTimes(2)
-  expect(forkToCli).not.toHaveBeenCalled()
-  expect(switchToCli).not.toHaveBeenCalled()
   act(() => {
     useAppStore.setState({
       settings: createGlobalSettingsFixture({ experimentalNativeChat: false })
diff --git a/src/renderer/src/components/native-chat/StructuredAgentSessionPaneOverlayLayer.tsx b/src/renderer/src/components/native-chat/StructuredAgentSessionPaneOverlayLayer.tsx
index a2a527240564..bfcdb8fc8412 100644
--- a/src/renderer/src/components/native-chat/StructuredAgentSessionPaneOverlayLayer.tsx
+++ b/src/renderer/src/components/native-chat/StructuredAgentSessionPaneOverlayLayer.tsx
@@ -1,3 +1,4 @@
+import { noteViewerGroupNavigation } from '@/lib/viewer-selection-request'
 import { memo, useCallback, useMemo } from 'react'
 import { useShallow } from 'zustand/react/shallow'
 import type { Tab, TabGroup } from '../../../../shared/tab-types'
@@ -78,7 +79,10 @@ const StructuredAgentSessionPaneOverlayLayer = memo(
     )
     const focusGroup = useAppStore((state) => state.focusGroup)
     const focusOwningGroup = useCallback(
-      (groupId: string) => focusGroup(worktreeId, groupId),
+      (groupId: string) => {
+        noteViewerGroupNavigation(useAppStore.getState(), worktreeId, groupId)
+        focusGroup(worktreeId, groupId)
+      },
       [focusGroup, worktreeId]
     )
     const groupActiveTabById = useMemo(
diff --git a/src/renderer/src/components/native-chat/native-chat-header-ownership.test.tsx b/src/renderer/src/components/native-chat/native-chat-header-ownership.test.tsx
index a22c5f8d57f6..46388fb222c0 100644
--- a/src/renderer/src/components/native-chat/native-chat-header-ownership.test.tsx
+++ b/src/renderer/src/components/native-chat/native-chat-header-ownership.test.tsx
@@ -1,6 +1,7 @@
+import { ConfirmationDialogProvider } from '@/components/confirmation-dialog'
 // @vitest-environment happy-dom
 import { Profiler } from 'react'
-import { act, cleanup, fireEvent, render, screen, within } from '@testing-library/react'
+import { act, cleanup, fireEvent, render, screen, waitFor, within } from '@testing-library/react'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import { TooltipProvider } from '@/components/ui/tooltip'
 import { useAppStore } from '@/store'
@@ -129,9 +130,11 @@ function seedChats(size: number) {
 }
 function overlay(active: boolean) {
   return (
-    <TooltipProvider>
-      <StructuredAgentSessionPaneOverlayLayer worktreeId={workspace} isWorktreeActive={active} />
-    </TooltipProvider>
+    <ConfirmationDialogProvider>
+      <TooltipProvider>
+        <StructuredAgentSessionPaneOverlayLayer worktreeId={workspace} isWorktreeActive={active} />
+      </TooltipProvider>
+    </ConfirmationDialogProvider>
   )
 }
 function chat(container: HTMLElement, id: string) {
@@ -202,21 +205,23 @@ function eligibility(
   tabId = 'tab'
 ) {
   return (
-    <TooltipProvider>
-      <Profiler id="eligibility" onRender={() => work.commits++}>
-        {[
-          { key: 'folder', id: folder },
-          { key: 'git', id: git }
-        ].map(({ key, id }) => (
-          <NativeChatResumeInCliButton
-            key={key}
-            tabId={tabId}
-            worktreeId={id}
-            nativeChat={{ sessionId, agent }}
-          />
-        ))}
-      </Profiler>
-    </TooltipProvider>
+    <ConfirmationDialogProvider>
+      <TooltipProvider>
+        <Profiler id="eligibility" onRender={() => work.commits++}>
+          {[
+            { key: 'folder', id: folder },
+            { key: 'git', id: git }
+          ].map(({ key, id }) => (
+            <NativeChatResumeInCliButton
+              key={key}
+              tabId={tabId}
+              worktreeId={id}
+              nativeChat={{ sessionId, agent }}
+            />
+          ))}
+        </Profiler>
+      </TooltipProvider>
+    </ConfirmationDialogProvider>
   )
 }
 
@@ -368,7 +373,7 @@ it('keeps the real Continue pending operation disabled across header hide/reveal
   expect(button().hasAttribute('disabled')).toBe(true)
   expect(button().getAttribute('aria-busy')).toBe('true')
   fireEvent.click(button())
-  expect(mocks.prepare).toHaveBeenCalledTimes(1)
+  await waitFor(() => expect(mocks.prepare).toHaveBeenCalledTimes(1))
   await act(async () =>
     preparation.resolve({
       copied: false,
diff --git a/src/renderer/src/components/native-chat/native-chat-session-transport.test.ts b/src/renderer/src/components/native-chat/native-chat-session-transport.test.ts
index 5bb6094e6407..3fd4c66567c9 100644
--- a/src/renderer/src/components/native-chat/native-chat-session-transport.test.ts
+++ b/src/renderer/src/components/native-chat/native-chat-session-transport.test.ts
@@ -114,28 +114,6 @@ describe('getNativeChatSessionTransport — selection', () => {
     })
   })
 
-  it('carries known optional outcomes and omits unrecognized ones without dropping lifecycle', async () => {
-    markRuntimeEnvironmentCompatible(ENV)
-    const transport = getNativeChatSessionTransport(ENV)
-    const lifecycle = { state: 'completed', turnId: 'outcome-turn', timestamp: 42 }
-    for (const [received, expected] of [
-      ['success', 'success'],
-      ['cancellation', 'cancellation'],
-      ['superseded', 'superseded'],
-      ['future-verdict', undefined],
-      [null, undefined],
-      [7, undefined]
-    ] as const) {
-      runtimeEnvironmentsCall.mockResolvedValueOnce(
-        okEnvelope({ messages: [], lifecycle: { ...lifecycle, outcome: received } })
-      )
-      await expect(transport.readSession('codex', 'sess-1')).resolves.toEqual({
-        messages: [],
-        lifecycle: { ...lifecycle, ...(expected ? { outcome: expected } : {}) }
-      })
-    }
-  })
-
   it('accepts interrupted lifecycle metadata from a remote runtime', async () => {
     markRuntimeEnvironmentCompatible(ENV)
     const lifecycle = { state: 'interrupted', turnId: 'turn-2', timestamp: 43 } as const
diff --git a/src/renderer/src/components/native-chat/use-native-chat-toggle-shortcut.ts b/src/renderer/src/components/native-chat/use-native-chat-toggle-shortcut.ts
index 106c3bcd8f54..79ac9c3a98e7 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-toggle-shortcut.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-toggle-shortcut.ts
@@ -1,3 +1,4 @@
+import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { usePluginCommands } from '@/store/plugin-panels'
 import { useEffect, useLayoutEffect, useRef } from 'react'
 import { matchesRecentTabSwitcherChord } from '../../../../shared/window-shortcut-policy'
@@ -132,6 +133,7 @@ export function useNativeChatToggleShortcut(worktreeId: string, isWorktreeActive
       ) {
         return
       }
+      noteViewerNavigation()
       state.toggleTabViewMode(tab.id)
       e.preventDefault()
       e.stopImmediatePropagation()
diff --git a/src/renderer/src/components/quick-open-file-navigation.ts b/src/renderer/src/components/quick-open-file-navigation.ts
index 87ab1782bf45..84436cc7a119 100644
--- a/src/renderer/src/components/quick-open-file-navigation.ts
+++ b/src/renderer/src/components/quick-open-file-navigation.ts
@@ -1,3 +1,4 @@
+import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { prepareQuickOpenFiles, rankQuickOpenFiles } from '../../../shared/quick-open-path-search'
 import { statUserOpenedPath } from '@/lib/user-opened-local-path'
 import { detectLanguage } from '@/lib/language-detect'
@@ -29,6 +30,7 @@ export async function openQuickOpenFile(
   rawQuery?: string,
   assertInteractionCurrent: () => void = () => {}
 ): Promise<void> {
+  noteViewerNavigation()
   const guard = captureFileExplorerOperationGuard(
     worktreeId,
     getFileExplorerOperationOwner(worktreeId)
diff --git a/src/renderer/src/components/right-sidebar/AiVaultVirtualRow.test.tsx b/src/renderer/src/components/right-sidebar/AiVaultVirtualRow.test.tsx
index 96a3259eb8a9..338f8f8d9c38 100644
--- a/src/renderer/src/components/right-sidebar/AiVaultVirtualRow.test.tsx
+++ b/src/renderer/src/components/right-sidebar/AiVaultVirtualRow.test.tsx
@@ -1,8 +1,7 @@
 // @vitest-environment happy-dom
 import { getDefaultSettings } from '../../../../shared/constants'
 
-import { act, cleanup, fireEvent, render, screen } from '@testing-library/react'
-import { Profiler } from 'react'
+import { cleanup, fireEvent, render, screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { TooltipProvider } from '@/components/ui/tooltip'
@@ -12,11 +11,6 @@ import type { AgentDotState } from '@/components/AgentStateDot'
 import { AiVaultVirtualRow } from './AiVaultVirtualRow'
 import { setLocalRuntimeCapabilitiesForTests } from '@/runtime/local-runtime-capabilities'
 import { useAppStore } from '@/store'
-import { createCompatibleRuntimeStatusResponse } from '@/runtime/runtime-compatibility-test-fixture'
-import {
-  lastVerifiedRuntimeStatus,
-  type RuntimeHostStatusSnapshot
-} from '../../../../shared/runtime-host-status'
 
 const cliSession: AiVaultSession = {
   id: 'local:codex:session-1:/tmp/session-1.jsonl',
@@ -286,196 +280,3 @@ describe('AiVaultVirtualRow CLI surface actions', () => {
     expect(screen.queryByRole('menuitem', { name: 'Resume in New Terminal' })).toBeNull()
   })
 })
-
-it.each([
-  { rows: 10, hosts: 3 },
-  { rows: 100, hosts: 3 },
-  { rows: 10, hosts: 30 }
-])(
-  'isolates $rows mounted History rows across $hosts registered hosts',
-  async ({ rows, hosts }) => {
-    useAppStore.setState(useAppStore.getInitialState(), true)
-    useAppStore.setState((state) => ({
-      settings: {
-        ...getDefaultSettings('/home/test'),
-        ...state.settings,
-        experimentalNativeChat: true
-      }
-    }))
-    setLocalRuntimeCapabilitiesForTests([])
-    const getStatus = vi.fn()
-    const previousApi = window.api
-    Object.assign(window, {
-      api: { ...previousApi, runtime: { ...previousApi?.runtime, getStatus } }
-    })
-    const environments = Array.from({ length: hosts }, (_, index) => ({
-      id: `history-host-${index}`,
-      name: `Host ${index}`,
-      createdAt: 1,
-      updatedAt: 1,
-      pairingRevision: 1,
-      lastUsedAt: null,
-      runtimeId: `history-host-${index}`,
-      preferredEndpointId: 'endpoint',
-      endpoints: [
-        { id: 'endpoint', kind: 'websocket' as const, label: 'Host', endpoint: 'ws://host' }
-      ]
-    }))
-    useAppStore.getState().setRuntimeEnvironments(environments)
-    const addressed = environments.at(-1)!.id
-    const snapshot = (id: string, sequence: number, blocked = false): RuntimeHostStatusSnapshot => {
-      const response = createCompatibleRuntimeStatusResponse(id)
-      if (!response.ok) {
-        throw new Error('Expected compatible status')
-      }
-      return {
-        environmentId: id,
-        pairingRevision: 1,
-        sequence,
-        checkedAt: sequence,
-        transport: 'ready',
-        verification: blocked ? 'blocked' : 'verified',
-        status: {
-          ...response.result,
-          capabilities: ['agent-session.structured.switch.creation-settlement-v1:codex']
-        }
-      }
-    }
-    for (const environment of environments) {
-      useAppStore.getState().applyRuntimeHostStatusSnapshot(snapshot(environment.id, 1))
-    }
-    const fixtures = Array.from({ length: rows }, (_, index) =>
-      sessionRowFixture(
-        {
-          ...cliSession,
-          id: `history-${index}`,
-          sessionId: `conversation-${index}`,
-          title: `History ${index}`,
-          executionHostId: `runtime:${index === 0 ? addressed : environments[0].id}`
-        },
-        false,
-        undefined,
-        undefined,
-        index,
-        true
-      )
-    )
-    const commits = new Map<string, number>()
-    const rendered = render(
-      <TooltipProvider>
-        {fixtures.map((fixture, index) => (
-          <Profiler
-            key={index}
-            id={String(index)}
-            onRender={(id) => {
-              commits.set(id, (commits.get(id) ?? 0) + 1)
-            }}
-          >
-            {fixture.element}
-          </Profiler>
-        ))}
-      </TooltipProvider>
-    )
-    try {
-      await act(async () => {})
-      const user = userEvent.setup()
-      await user.click(screen.getAllByTestId('ai-vault-session-more-actions')[0])
-      const control = await screen.findByRole('menuitem', { name: 'Switch to native chat' })
-      expect(control.getAttribute('data-disabled')).toBeNull()
-      await act(async () => {})
-      const clearCounts = () => {
-        commits.clear()
-        fixtures.forEach((fixture) => fixture.getOriginalPaneTarget.mockClear())
-      }
-      clearCounts()
-      const registered = useAppStore.getState().runtimeEnvironments
-      let membershipEntries = 0
-      const originalSome = registered.some.bind(registered)
-      const membership = vi.spyOn(registered, 'some').mockImplementation((predicate, thisArg) =>
-        originalSome((value, index, array) => {
-          membershipEntries += 1
-          return predicate.call(thisArg, value, index, array)
-        })
-      )
-      const status = useAppStore.getState().runtimeStatusByEnvironmentId.get(addressed)
-      const learned = lastVerifiedRuntimeStatus(status)
-      if (!learned?.capabilities) {
-        throw new Error('Expected learned capabilities')
-      }
-      const capabilities = vi.spyOn(learned.capabilities, 'includes')
-      await act(async () => {
-        useAppStore.getState().applyRuntimeHostStatusSnapshot(snapshot(environments[1].id, 2))
-      })
-      expect([...commits.values()]).toEqual([])
-      expect(
-        fixtures.every((fixture) => fixture.getOriginalPaneTarget.mock.calls.length === 0)
-      ).toBe(true)
-      const membershipLookups = membership.mock.calls.length
-      const capabilityLookups = capabilities.mock.calls.length
-      expect(membershipLookups).toBeGreaterThanOrEqual(rows)
-      expect(membershipLookups).toBeLessThanOrEqual(16 * rows)
-      expect(capabilityLookups).toBeGreaterThan(0)
-      expect(capabilityLookups).toBeLessThanOrEqual(16)
-      expect(membershipEntries).toBeGreaterThanOrEqual(membershipLookups)
-      expect(membershipEntries).toBeLessThanOrEqual(membershipLookups * hosts)
-      membership.mockClear()
-      capabilities.mockClear()
-      await act(async () => {
-        useAppStore.setState({ activeWorktreeId: 'unused-workspace' })
-      })
-      expect([...commits.values()]).toEqual([])
-      expect(
-        fixtures.every((fixture) => fixture.getOriginalPaneTarget.mock.calls.length === 0)
-      ).toBe(true)
-      expect(membership).not.toHaveBeenCalled()
-      const unusedSwitchLookups = capabilities.mock.calls.filter(
-        ([capability]) =>
-          capability === 'agent-session.structured.switch.creation-settlement-v1:codex'
-      ).length
-      expect(unusedSwitchLookups).toBe(0)
-      const unusedDeleteLookups = capabilities.mock.calls.filter(
-        ([capability]) => capability === 'aiVault.delete-session.v1'
-      ).length
-      expect(unusedDeleteLookups).toBe(1)
-      await act(async () => {
-        useAppStore.getState().applyRuntimeHostStatusSnapshot(snapshot(addressed, 2, true))
-      })
-      expect(commits.get('0')).toBeGreaterThan(0)
-      expect([...commits.keys()]).toEqual(['0'])
-      expect(fixtures[0].getOriginalPaneTarget).toHaveBeenCalledTimes(1)
-      expect(
-        fixtures.slice(1).every((fixture) => fixture.getOriginalPaneTarget.mock.calls.length === 0)
-      ).toBe(true)
-      expect(
-        screen
-          .getByRole('menuitem', { name: 'Switch to native chat' })
-          .getAttribute('data-disabled')
-      ).not.toBeNull()
-      clearCounts()
-      await act(async () => {
-        useAppStore.getState().applyRuntimeHostStatusSnapshot(snapshot(addressed, 3))
-      })
-      expect([...commits.keys()]).toEqual(['0'])
-      expect(
-        screen
-          .getByRole('menuitem', { name: 'Switch to native chat' })
-          .getAttribute('data-disabled')
-      ).toBeNull()
-      expect(getStatus).not.toHaveBeenCalled()
-      console.info('HISTORY_ROW_COUNTS', {
-        rows,
-        hosts,
-        unrelatedRowCommits: 0,
-        unrelatedWrapperRenders: 0,
-        membershipLookups,
-        membershipEntries,
-        capabilityLookups,
-        unusedSwitchLookups,
-        unusedDeleteLookups
-      })
-    } finally {
-      rendered.unmount()
-      Object.assign(window, { api: previousApi })
-    }
-  }
-)
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx b/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx
index 82bb067cd407..c5a1d5a0f08f 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx
+++ b/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx
@@ -1,5 +1,5 @@
 // @vitest-environment happy-dom
-import { act, cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react'
+import { cleanup, render, screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import { TooltipProvider } from '@/components/ui/tooltip'
@@ -25,16 +25,7 @@ const mocks = vi.hoisted(() => ({
   startOwner: vi.fn(async () => false),
   run: vi.fn(),
   source: vi.fn(),
-  panes: vi.fn<
-    () => {
-      providerSession: { id: string }
-      agent: 'codex'
-      executionHostId: 'runtime:paired'
-      tabId: string
-      worktreeId: string
-      paneKey: string
-    }[]
-  >(() => [])
+  panes: vi.fn(() => [])
 }))
 vi.mock('@/runtime/structured-agent-session-client', () => ({
   supportsInPlaceSwitch: mocks.probe,
@@ -99,13 +90,7 @@ const row: AiVaultSession = {
   resumeCommand: '',
   subagent: null
 }
-function History({
-  session,
-  originalPaneTarget = null
-}: {
-  session: AiVaultSession
-  originalPaneTarget?: { worktreeId: string; tabId: string; paneKey: string; leafId: string } | null
-}) {
+function History({ session }: { session: AiVaultSession }) {
   const state = useAppStore.getState()
   const targetState = {
     ...state,
@@ -141,7 +126,7 @@ function History({
         expandedSessionIds={new Set([session.id])}
         vaultScope="all"
         buildResumeStartup={actions.buildResumeStartup}
-        getOriginalPaneTarget={() => originalPaneTarget}
+        getOriginalPaneTarget={() => null}
         isStructuredSessionOpen={() => false}
         getSessionLiveState={() => null}
         getWorktreeInfo={resume.getSessionWorktreeInfo}
@@ -196,35 +181,14 @@ function pairedHistoryStatus() {
 }
 
 it.each(['local', 'runtime:paired'] as const)(
-  'composes the owned %s row/details/menu and refreshes unknown capability',
+  'routes the owned %s History action to the common switcher',
   async (host) => {
     mocks.owner.mockReturnValue(host)
     useAppStore.setState({
       runtimeEnvironments: [paired],
       runtimeStatusByEnvironmentId: new Map([['paired', pairedHistoryStatus()]])
     })
-    setLocalRuntimeCapabilitiesForTests(null)
-    useAppStore.setState({ runtimeStatusByEnvironmentId: new Map() })
-    let answer = (_value: { capabilities: string[] }) => {}
-    Object.assign(window.api.runtime, {
-      getStatus: () =>
-        new Promise((resolve) => {
-          answer = resolve
-        })
-    })
-    const session = { ...row, executionHostId: host }
-    render(<History session={session} />)
-    expect(
-      screen.getByRole('button', { name: 'Switch to native chat' }).hasAttribute('disabled')
-    ).toBe(true)
-    await act(async () => {
-      answer({ capabilities: [HISTORY, SWITCH] })
-      if (host !== 'local') {
-        useAppStore.setState({
-          runtimeStatusByEnvironmentId: new Map([['paired', pairedHistoryStatus()]])
-        })
-      }
-    })
+    render(<History session={{ ...row, executionHostId: host }} />)
     const button = await screen.findByRole('button', { name: 'Switch to native chat' })
     expect(button.hasAttribute('disabled')).toBe(false)
     await userEvent.setup().click(button)
@@ -236,111 +200,6 @@ it.each(['local', 'runtime:paired'] as const)(
         executionHostId: host
       })
     )
-    await userEvent.setup().click(screen.getByTestId('ai-vault-session-more-actions'))
-    await userEvent
-      .setup()
-      .click(await screen.findByRole('menuitem', { name: 'Switch to native chat' }))
-    expect(mocks.startOwner).toHaveBeenCalledTimes(2)
-    fireEvent.contextMenu(screen.getByText('Conversation'))
-    await userEvent
-      .setup()
-      .click(await screen.findByRole('menuitem', { name: 'Switch to native chat' }))
-    expect(mocks.startOwner).toHaveBeenCalledTimes(3)
-  }
-)
-
-it('routes a capable paired unowned row with a matching terminal through the same return', async () => {
-  mocks.owner.mockReturnValue('runtime:paired')
-  useAppStore.setState({
-    runtimeEnvironments: [paired],
-    runtimeStatusByEnvironmentId: new Map([['paired', pairedHistoryStatus()]])
-  })
-  const session = {
-    ...row,
-    structuredSession: undefined,
-    executionHostId: 'runtime:paired' as const
-  }
-  const source = {
-    agent: 'codex',
-    tabId: 'terminal',
-    workspaceId: 'workspace',
-    paneKey: 'terminal:leaf',
-    executionHostId: 'runtime:paired',
-    providerSessionId: 'conversation'
-  }
-  mocks.panes.mockReturnValue([
-    {
-      providerSession: { id: 'conversation' },
-      agent: 'codex',
-      executionHostId: 'runtime:paired',
-      tabId: 'terminal',
-      worktreeId: 'workspace',
-      paneKey: 'terminal:leaf'
-    }
-  ])
-  mocks.source.mockReturnValue(source)
-  render(
-    <History
-      session={session}
-      originalPaneTarget={{
-        worktreeId: 'workspace',
-        tabId: 'terminal',
-        paneKey: 'terminal:leaf',
-        leafId: 'leaf'
-      }}
-    />
-  )
-  await waitFor(() =>
-    expect(
-      screen.getByRole('button', { name: 'Switch to native chat' }).hasAttribute('disabled')
-    ).toBe(false)
-  )
-  await userEvent.setup().click(screen.getByRole('button', { name: 'Switch to native chat' }))
-  expect(mocks.startOwner).toHaveBeenCalledExactlyOnceWith(
-    expect.objectContaining({ direction: 'chat', source, history: session })
-  )
-})
-
-it.each([
-  { executionHostId: 'ssh:box' as const, agent: 'codex' as const, filePath: '/rollout.jsonl' },
-  {
-    executionHostId: 'local' as const,
-    agent: 'codex' as const,
-    filePath: '//wsl.localhost/Ubuntu/rollout.jsonl'
-  },
-  { executionHostId: 'local' as const, agent: 'omp' as const, filePath: '/session.jsonl' }
-])('keeps ordinary restrictions for an unsupported owned row: %s', async (overrides) => {
-  setLocalRuntimeCapabilitiesForTests([HISTORY])
-  mocks.probe.mockResolvedValue(false)
-  mocks.owner.mockReturnValue(
-    overrides.executionHostId.startsWith('ssh:') ? null : overrides.executionHostId
-  )
-  render(<History session={{ ...row, ...overrides }} />)
-  await waitFor(() =>
-    expect(screen.queryByRole('button', { name: 'Switch to native chat' })).toBeNull()
-  )
-  expect(mocks.run).not.toHaveBeenCalled()
-  expect(mocks.startOwner).not.toHaveBeenCalled()
-})
-
-it.each(['codex', 'claude', 'grok', 'opencode', 'opencode2', 'pi'] as const)(
-  'routes the %s History action through the common switch on supported older hosts',
-  async (agent) => {
-    setLocalRuntimeCapabilitiesForTests([HISTORY])
-    mocks.probe.mockResolvedValue(false)
-    const session = { ...row, agent, structuredSession: undefined }
-    render(<History session={session} />)
-    await userEvent
-      .setup()
-      .click(await screen.findByRole('button', { name: 'Switch to native chat' }))
-    expect(mocks.startOwner).toHaveBeenCalledExactlyOnceWith(
-      expect.objectContaining({
-        direction: 'chat',
-        agent,
-        history: session
-      })
-    )
-    expect(mocks.newChat).not.toHaveBeenCalled()
   }
 )
 
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-original-pane-actions.ts b/src/renderer/src/components/right-sidebar/ai-vault-original-pane-actions.ts
index 746e47c784fb..fb81b57309c8 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-original-pane-actions.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault-original-pane-actions.ts
@@ -1,3 +1,4 @@
+import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { useCallback, useMemo } from 'react'
 import { useShallow } from 'zustand/react/shallow'
 import { toast } from 'sonner'
@@ -73,6 +74,7 @@ export function useAiVaultOriginalPaneActions(): {
 
   const jumpToOriginalPane = useCallback(
     async (session: AiVaultSession): Promise<boolean> => {
+      noteViewerNavigation()
       if (session.structuredSession && isStructuredSessionOpen(session)) {
         return activateAiVaultStructuredSession(session)
       }
@@ -102,6 +104,7 @@ export function useAiVaultOriginalPaneActions(): {
   )
 
   const jumpToWorktree = useCallback((worktreeId: string): void => {
+    noteViewerNavigation()
     revealSessionWorkspace(worktreeId)
   }, [])
 
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts b/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts
index 5a6c41130103..4ac3126a790d 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts
@@ -1,3 +1,4 @@
+import { collectAgentPaneConversations } from '@/lib/ai-vault-tab-title-requests'
 import type { ConfirmationDialogContextValue } from '@/components/confirmation-dialog-context'
 import type { AiVaultOriginalPaneTarget } from './ai-vault-original-pane'
 import {
@@ -91,12 +92,20 @@ export function historyConversationSwitch(
 }
 
 function historyPaneSource(session: AiVaultSession, pane?: AiVaultOriginalPaneTarget | null) {
-  if (!pane) {
+  const location =
+    pane ??
+    collectAgentPaneConversations(useAppStore.getState(), adoptsCliConversations).find(
+      (candidate) =>
+        candidate.executionHostId === session.executionHostId &&
+        candidate.providerSession.id === session.sessionId &&
+        cliConversationRowsShareAgent(candidate.agent, session.agent)
+    )
+  if (!location) {
     return null
   }
   const source = resolveCliChatResumeSource(useAppStore.getState(), {
-    tab: { id: pane.tabId, worktreeId: pane.worktreeId },
-    paneKey: pane.paneKey
+    tab: { id: location.tabId, worktreeId: location.worktreeId },
+    paneKey: location.paneKey
   })
   return source &&
     adoptsCliConversations(session.agent) &&
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-session-launch-actions.test.ts b/src/renderer/src/components/right-sidebar/ai-vault-session-launch-actions.test.ts
index 041b36625e96..de780c3ce7e9 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-session-launch-actions.test.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault-session-launch-actions.test.ts
@@ -243,35 +243,6 @@ describe('ordinary CLI copy launch when the switch action does not apply', () =>
   })
 })
 
-it.each(['claude', 'codex', 'grok', 'opencode', 'opencode2', 'pi'] as const)(
-  'routes supported %s History chats through the common same-conversation switch',
-  (agent) => {
-    vi.clearAllMocks()
-    const chat = { ...owned, agent }
-    mocks.getState.mockReturnValue({
-      activeWorktreeId: 'worktree-1',
-      settings: {},
-      unifiedTabsByWorktree: {
-        'worktree-1': [{ id: 'chat-tab', contentType: 'agent-session', entityId: 'chat-1' }]
-      }
-    })
-    renderActions().handleResumeInNewCli(chat, 'worktree-2')
-    expect(mocks.switchToCli).toHaveBeenCalledExactlyOnceWith({
-      confirm: mocks.confirm,
-      sessionId: 'chat-1',
-      workspaceId: 'worktree-1',
-      executionHostId: 'local',
-      agent,
-      chatTabId: 'chat-tab',
-      history: chat
-    })
-    expect(mocks.prepareAiVaultSessionForFork).not.toHaveBeenCalled()
-    expect(mocks.buildAiVaultForkStartupForWorktree).not.toHaveBeenCalled()
-    expect(mocks.launchAiVaultSessionInNewTab).not.toHaveBeenCalled()
-    expect(mocks.toastError).not.toHaveBeenCalled()
-  }
-)
-
 it('refuses the stale OMP row before creating a second terminal writer', async () => {
   vi.clearAllMocks()
   mocks.prepareAiVaultSessionForTerminalResume.mockRejectedValue(
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 25a85b8a87a5..018be48a8df5 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
@@ -1,3 +1,4 @@
+import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { useConfirmationDialog } from '@/components/confirmation-dialog-context'
 import type { AiVaultOriginalPaneTarget } from './ai-vault-original-pane'
 import {
@@ -134,6 +135,7 @@ export function useAiVaultSessionLaunchActions({
 
   const handleResume = useCallback(
     (session: AiVaultSession, targetWorktreeId?: string): void => {
+      noteViewerNavigation()
       if (session.structuredSession) {
         void activateAiVaultStructuredSession(session)
         return
@@ -154,6 +156,7 @@ export function useAiVaultSessionLaunchActions({
   // Supported chats transfer the same conversation; other history rows keep their ordinary resume.
   const handleResumeInNewCli = useCallback(
     (session: AiVaultSession, targetWorktreeId: string): void => {
+      noteViewerNavigation()
       if (switchAiVaultSessionToCli(session, confirm)) {
         return
       }
@@ -204,6 +207,7 @@ export function useAiVaultSessionLaunchActions({
       targetWorktreeId?: string,
       pane?: AiVaultOriginalPaneTarget | null
     ): void => {
+      noteViewerNavigation()
       if (
         !adoptsCliConversations(session.agent) ||
         switchAiVaultSessionToNativeChat(
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-session-launch-feedback.ts b/src/renderer/src/components/right-sidebar/ai-vault-session-launch-feedback.ts
index 832cec2a84b8..7c1a0c68f38e 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-session-launch-feedback.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault-session-launch-feedback.ts
@@ -8,13 +8,14 @@ import { translate } from '@/i18n/i18n'
 import { agentLabel } from './ai-vault-session-filters'
 import type { AiVaultAgent } from '../../../../shared/ai-vault-types'
 
-export function notifyAiVaultSessionQueued(agent: AiVaultAgent): void {
+export function notifyAiVaultSessionQueued(agent: AiVaultAgent, message?: string): void {
   toast.success(
-    translate(
-      'auto.components.right.sidebar.AiVaultPanel.agentSessionQueued',
-      '{{value0}} session queued',
-      { value0: agentLabel(agent) }
-    )
+    message ??
+      translate(
+        'auto.components.right.sidebar.AiVaultPanel.agentSessionQueued',
+        '{{value0}} session queued',
+        { value0: agentLabel(agent) }
+      )
   )
 }
 
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.ts b/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.ts
index 2b70b934e8c6..07f29a2cc1d1 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.ts
@@ -1,3 +1,4 @@
+import { isSessionTabSelectionRequest } from '../../../../shared/session-tab-placement'
 import { conversationSwitchViewerSelectionCurrent } from '@/lib/conversation-switch-selection'
 import { toast } from 'sonner'
 import {
@@ -57,7 +58,9 @@ export async function resumeAiVaultSessionInNewChat(
   worktreeId: string,
   requestId: AgentLaunchRequestId,
   replacing?: AiVaultChatReplacement,
-  viewerSelection?: string
+  viewerSelection?: string,
+  reportFailure: (error: unknown) => void = (error) =>
+    notifyAiVaultSessionResumeInChatFailure(error, rowAgent)
 ): Promise<void> {
   try {
     const recordingHost = parseRoutableExecutionHostId(session.executionHostId)
@@ -88,6 +91,7 @@ export async function resumeAiVaultSessionInNewChat(
     const launch = beginStructuredAgentSessionProvisionalLaunch({
       plan,
       hooks: {},
+      viewerSelection,
       ...(viewerSelection !== undefined
         ? { canActivate: () => conversationSwitchViewerSelectionCurrent(viewerSelection) }
         : {}),
@@ -97,7 +101,10 @@ export async function resumeAiVaultSessionInNewChat(
       beforeOpen: waitForCreate
         ? undefined
         : () => {
-            if (!conversationSwitchViewerSelectionCurrent(viewerSelection)) {
+            if (
+              isSessionTabSelectionRequest(viewerSelection) ||
+              !conversationSwitchViewerSelectionCurrent(viewerSelection)
+            ) {
               return true
             }
             if (
@@ -118,6 +125,7 @@ export async function resumeAiVaultSessionInNewChat(
       const state = useAppStore.getState()
       if (
         conversationSwitchViewerSelectionCurrent(viewerSelection) &&
+        !isSessionTabSelectionRequest(viewerSelection) &&
         waitForCreate &&
         settlement.kind === 'structured' &&
         state.activeWorktreeId !== worktreeId &&
@@ -133,11 +141,11 @@ export async function resumeAiVaultSessionInNewChat(
       }
       const handled = replacing?.onSettled(settlement) === true
       if (settlement.kind === 'failed' && !settlement.notified && !handled) {
-        notifyAiVaultSessionResumeInChatFailure(settlement.error, rowAgent)
+        reportFailure(settlement.error)
       }
     })
   } catch (error) {
-    notifyAiVaultSessionResumeInChatFailure(error, rowAgent)
+    reportFailure(error)
     replacing?.onSettled(null)
   }
 }
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-workspace.ts b/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-workspace.ts
index 77feb5e3897e..7a6bdddd27c8 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-workspace.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-workspace.ts
@@ -1,3 +1,4 @@
+import { inPlaceSwitchSupportedNow } from '@/lib/in-place-switch-support'
 import { resolveHostCapabilities, workspaceKindForWorktreeId } from '@/lib/agent-launch-route-input'
 import {
   structuredAgentSessionLaunchFeasible,
@@ -51,7 +52,7 @@ export function resolveAiVaultSessionResumeInChatForWorkspace(args: {
     inPlaceSwitchAvailable:
       targetOwner !== null &&
       targetOwner === normalizeExecutionHostId(args.session.executionHostId) &&
-      inPlaceSwitchEnabled(args.session.agent),
+      inPlaceSwitchSupportedNow(targetOwner, args.session.agent),
     structuredRouteAvailable:
       Boolean(args.session.structuredSession && inPlaceSwitchEnabled(args.session.agent)) ||
       (adoptsCliConversations(args.session.agent) &&
diff --git a/src/renderer/src/components/right-sidebar/use-right-sidebar-tab-routing.ts b/src/renderer/src/components/right-sidebar/use-right-sidebar-tab-routing.ts
index cab92c7de0f7..a52a61169f75 100644
--- a/src/renderer/src/components/right-sidebar/use-right-sidebar-tab-routing.ts
+++ b/src/renderer/src/components/right-sidebar/use-right-sidebar-tab-routing.ts
@@ -1,3 +1,4 @@
+import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { useEffect, useRef } from 'react'
 import { useAppStore } from '@/store'
 import type { ActiveRightSidebarTab } from '@/store/slices/editor'
@@ -79,6 +80,7 @@ export function useRightSidebarTabRouting({
     rememberedFolderTabByWorkspaceKeyRef.current[activeFolderWorkspaceKey] = effectiveTab
   }, [activeFolderWorkspaceKey, effectiveTab, visibleItems])
   const selectActivityTab = (tab: ActiveRightSidebarTab): void => {
+    noteViewerNavigation()
     if (activeFolderWorkspaceKey) {
       rememberedFolderTabByWorkspaceKeyRef.current[activeFolderWorkspaceKey] = tab
     }
diff --git a/src/renderer/src/components/right-sidebar/useFileExplorerHandlers.ts b/src/renderer/src/components/right-sidebar/useFileExplorerHandlers.ts
index 08ef2ef1072b..369f0898f303 100644
--- a/src/renderer/src/components/right-sidebar/useFileExplorerHandlers.ts
+++ b/src/renderer/src/components/right-sidebar/useFileExplorerHandlers.ts
@@ -1,3 +1,4 @@
+import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { useCallback } from 'react'
 import type React from 'react'
 import type { RefObject } from 'react'
@@ -88,6 +89,7 @@ export async function activateFileExplorerNode(args: {
     toggleDir(activeWorktreeId, node.path)
     return
   }
+  noteViewerNavigation()
   let escapesWorktree = false
   if (node.isSymlink) {
     // Resolve symlinks only on explicit activation because targets may be protected by macOS TCC.
diff --git a/src/renderer/src/components/sidebar/WorkspaceAttachmentOrigins.tsx b/src/renderer/src/components/sidebar/WorkspaceAttachmentOrigins.tsx
index 61b8267a50a4..638216044f73 100644
--- a/src/renderer/src/components/sidebar/WorkspaceAttachmentOrigins.tsx
+++ b/src/renderer/src/components/sidebar/WorkspaceAttachmentOrigins.tsx
@@ -1,3 +1,4 @@
+import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import React from 'react'
 import { Terminal } from 'lucide-react'
 import { useAppStore } from '@/store'
@@ -29,6 +30,7 @@ function useReferenceTabs(workspace: Worktree): Tab[] {
 }
 
 function focusOrigin(workspace: Worktree, tab: Tab, paneKey: string | undefined): void {
+  noteViewerNavigation()
   const state = useAppStore.getState()
   if (!state.setActiveWorktree(workspace.id, workspace.hostId)) {
     return
diff --git a/src/renderer/src/components/sidebar/WorktreeCardAgents.tsx b/src/renderer/src/components/sidebar/WorktreeCardAgents.tsx
index 5ff16ef8a1b3..127ce07682f2 100644
--- a/src/renderer/src/components/sidebar/WorktreeCardAgents.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCardAgents.tsx
@@ -1,3 +1,4 @@
+import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import React, { useCallback, useLayoutEffect, useMemo, useRef } from 'react'
 import { useShallow } from 'zustand/react/shallow'
 import { useAppStore } from '@/store'
@@ -179,6 +180,7 @@ const WorktreeCardAgentsBody = React.memo(function WorktreeCardAgentsBody({
         dismissStaleAgentRowByKey(paneKey)
         return
       }
+      noteViewerNavigation()
       // Use shared activation for cross-repo reveal and navigation history.
       activateAndRevealWorktree(worktreeId)
       const tabs = useAppStore.getState().tabsByWorktree[worktreeId] ?? []
diff --git a/src/renderer/src/components/sidebar/activate-retained-agent-row.ts b/src/renderer/src/components/sidebar/activate-retained-agent-row.ts
index 9b335088379f..f57f92d250dc 100644
--- a/src/renderer/src/components/sidebar/activate-retained-agent-row.ts
+++ b/src/renderer/src/components/sidebar/activate-retained-agent-row.ts
@@ -1,3 +1,4 @@
+import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { useAppStore } from '@/store'
 import { activateAndRevealWorkspace } from '@/lib/worktree-activation'
 import { activateTabAndFocusPane } from '@/lib/activate-tab-and-focus-pane'
@@ -34,6 +35,7 @@ export function activateRetainedAgentRow(worktreeId: string, tabId: string, pane
   if ((nativeTab ? !target : !hasLiveTerminal) || owner === 'foreign') {
     return
   }
+  noteViewerNavigation()
   // Verify an existing destination before workspace activation can resume sleeping panes.
   if (
     activateAndRevealWorkspace(worktreeId, owner ? { executionHostId: owner } : undefined) === false
diff --git a/src/renderer/src/components/status-bar/resource-session-navigation.ts b/src/renderer/src/components/status-bar/resource-session-navigation.ts
index 94f11f862c8e..1a1ff7f7a8d5 100644
--- a/src/renderer/src/components/status-bar/resource-session-navigation.ts
+++ b/src/renderer/src/components/status-bar/resource-session-navigation.ts
@@ -1,3 +1,4 @@
+import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { parsePaneKey } from '../../../../shared/stable-pane-id'
 
 type TabLookup = Record<string, { id: string }[]>
@@ -22,6 +23,7 @@ export function navigateResourceSessionToTab(
   paneKey: string | null,
   deps: ResourceSessionNavigationDeps
 ): void {
+  noteViewerNavigation()
   for (const [worktreeId, tabs] of Object.entries(deps.tabsByWorktree)) {
     if (tabs.some((tab) => tab.id === tabId)) {
       deps.activateAndRevealWorktree(worktreeId)
diff --git a/src/renderer/src/components/status-bar/use-resource-usage-actions.ts b/src/renderer/src/components/status-bar/use-resource-usage-actions.ts
index 502995f714de..dbd260e66846 100644
--- a/src/renderer/src/components/status-bar/use-resource-usage-actions.ts
+++ b/src/renderer/src/components/status-bar/use-resource-usage-actions.ts
@@ -1,3 +1,4 @@
+import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import {
   useCallback,
   useState,
@@ -103,6 +104,7 @@ export function useResourceUsageActions({
     }
     // Folder activation owns host/path gating; git-worktree target resolution cannot handle folder keys.
     if (parseWorkspaceKey(worktreeId)?.type === 'folder') {
+      noteViewerNavigation()
       activateAndRevealWorkspace(worktreeId)
       return
     }
@@ -113,6 +115,7 @@ export function useResourceUsageActions({
     if (!target) {
       return
     }
+    noteViewerNavigation()
     activateAndRevealWorktree(worktreeId, { executionHostId: target.hostId })
   }, [])
 
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
index f50d8e51a0b1..43ac60bdcc7c 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
@@ -41,7 +41,8 @@ export async function switchIntoOwnerLegacy(
   source: Pick<AiVaultSession, 'agent'> & Pick<CliChatResumeSource, 'tabId' | 'workspaceId'>,
   structuredSession: NonNullable<AiVaultSession['structuredSession']>,
   target: RuntimeClientTarget,
-  viewerSelection?: string
+  viewerSelection?: string,
+  reportFailure?: (error: unknown) => void
 ): Promise<boolean> {
   // A host without the switch keeps the earlier behaviour: the chat is shown, the terminal stays.
   if (!(await supportsInPlaceSwitch(target, source.agent))) {
@@ -49,18 +50,20 @@ export async function switchIntoOwnerLegacy(
       { structuredSession },
       undefined,
       target,
-      viewerSelection
+      viewerSelection,
+      ...(reportFailure ? ([() => reportFailure(undefined)] as const) : ([] as const))
     )
     return false
   }
-  if (!(await startCliChatReturn(source, structuredSession.sessionId, target))) {
+  if (!(await startCliChatReturn(source, structuredSession.sessionId, target, reportFailure))) {
     return false
   }
   const shown = await activateAiVaultStructuredSessionVerified(
     { structuredSession },
     undefined,
     target,
-    viewerSelection
+    viewerSelection,
+    ...(reportFailure ? ([() => reportFailure(undefined)] as const) : ([] as const))
   )
   if (shown !== 'activated') {
     return false
@@ -118,12 +121,17 @@ export async function switchIntoOwnerLegacy(
 export async function startCliChatReturn(
   source: Pick<AiVaultSession, 'agent'>,
   sessionId: string,
-  target: RuntimeClientTarget
+  target: RuntimeClientTarget,
+  reportFailure?: (error: unknown) => void
 ): Promise<boolean> {
   const switched = await callStructuredAgentSession<
     { ok: true } | { ok: false; refusal: AgentSessionWireRefusal }
   >(target, 'agentSession.switchToChat', { sessionId }).catch(() => null)
   if (!switched?.ok) {
+    if (reportFailure) {
+      reportFailure(switched ? Object.assign(new Error('Chat switch refused'), switched) : null)
+      return false
+    }
     toast.error(
       conversationSwitchFailureText(
         switched ? Object.assign(new Error('Chat switch refused'), switched) : null,
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-ordinary-feedback.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-ordinary-feedback.ts
new file mode 100644
index 000000000000..6286f37ebbbd
--- /dev/null
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-ordinary-feedback.ts
@@ -0,0 +1,88 @@
+import { toast } from 'sonner'
+import { translate } from '@/i18n/i18n'
+import { structuredLaunchFailure } from '@/lib/structured-agent-session-launch-failure'
+import { activateAiVaultStructuredSession } from '@/lib/activate-ai-vault-structured-session'
+import { agentSessionWriteFailureText } from '../native-chat/agent-session-write-notice-text'
+import { agentLabel } from '../../../../shared/ai-vault-session-filters'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
+import { cliConversationExitGuidance } from '@/lib/cli-conversation-exit-guidance'
+import type { CliChatResumeSource } from './cli-chat-resume-source'
+
+export async function reportCliChatResumeFailure(
+  source: CliChatResumeSource,
+  error: unknown,
+  openOwner: boolean,
+  target: RuntimeClientTarget,
+  viewerSelection?: string,
+  reportFailure?: (error: unknown) => void
+): Promise<void> {
+  const refusal = structuredLaunchFailure(error)
+  if (
+    refusal?.code === 'agent_session_conflict' ||
+    refusal?.code === 'agent_session_ownership_unknown'
+  ) {
+    const owner = refusal.owner
+    if (openOwner && owner) {
+      await (viewerSelection === undefined
+        ? activateAiVaultStructuredSession({ structuredSession: owner }, undefined, target)
+        : activateAiVaultStructuredSession(
+            { structuredSession: owner },
+            undefined,
+            target,
+            viewerSelection,
+            ...(reportFailure ? ([() => reportFailure(error)] as const) : ([] as const))
+          ))
+      return
+    }
+    if (reportFailure) {
+      reportFailure(error)
+      return
+    }
+    toast.error(
+      refusal.code === 'agent_session_conflict' &&
+        refusal.details?.reason === 'conversationHeldElsewhere' &&
+        !owner
+        ? cliConversationExitGuidance(source.agent, true)
+        : translate(
+            'auto.components.right.sidebar.AiVaultPanel.resumeInChatConflict',
+            'Another chat is already holding this conversation.'
+          )
+    )
+    return
+  }
+  if (reportFailure) {
+    reportFailure(error)
+    return
+  }
+  // The chat's agent refused to start while the terminal may still write the conversation.
+  if (
+    refusal?.code === 'agent_session_operation_invalid' &&
+    refusal.details?.reason === 'conversationOpenInTerminal'
+  ) {
+    toast.error(cliConversationExitGuidance(source.agent, true))
+    return
+  }
+  if (refusal?.code === 'agent_session_identity_required') {
+    if (refusal.details?.reason === 'transcriptNotFound') {
+      toast.error(
+        translate(
+          'components.native-chat.resumeInNewChat.notSavedYet',
+          "{{agent}} hasn't saved this conversation yet. Try again after it replies.",
+          { agent: agentLabel(source.agent) }
+        )
+      )
+      return
+    }
+    const failure = structuredLaunchFailure(error)
+    if (failure) {
+      toast.error(agentSessionWriteFailureText(failure, 'read-history'))
+      return
+    }
+  }
+  toast.error(
+    translate(
+      'auto.components.right.sidebar.AiVaultPanel.resumeInChatFailed',
+      'Could not resume this session in a new chat.'
+    )
+  )
+}
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-ordinary-run.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-ordinary-run.ts
new file mode 100644
index 000000000000..82227b7a604b
--- /dev/null
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-ordinary-run.ts
@@ -0,0 +1,192 @@
+import { useSyncExternalStore } from 'react'
+import { toast } from 'sonner'
+import { conversationSwitchSourceKept } from '@/lib/conversation-switch-feedback'
+import { useAppStore } from '@/store'
+import { newAgentLaunchRequestId } from '@/lib/agent-launch-request-id'
+import { adoptAgentSessionLaunchVerdict } from '@/lib/agent-session-launch-plan'
+import { beginStructuredAgentSessionProvisionalLaunch } from '@/lib/agent-session/structured-agent-session-provisional-tab'
+import { supportsStructuredAgentSessionCliSource } from '@/runtime/structured-agent-session-client'
+import { structuredAgentSessionTargetForHost } from '@/runtime/structured-agent-session-owner'
+import { waitForPromiseWithSignal } from '../../../../shared/abort-signal-reason'
+import { CLI_CONVERSATION_ADOPTING_AGENTS } from '../../../../shared/structured-agent-cli-conversation-adoption'
+import { toHostSessionPaneKey } from '../../../../shared/terminal-surface-id'
+import { resolveCliChatResumeSource, type CliChatResumeSource } from './cli-chat-resume-source'
+import { reportCliChatResumeFailure } from './cli-chat-resume-ordinary-feedback'
+import { adoptingAgentOnHost } from '../right-sidebar/ai-vault-session-resume-in-chat-launch'
+
+const pending = new Map<string, AbortController>()
+const listeners = new Set<() => void>()
+const changed = () => listeners.forEach((listener) => listener())
+const keyFor = (source: CliChatResumeSource) =>
+  [
+    source.executionHostId,
+    CLI_CONVERSATION_ADOPTING_AGENTS[source.agent],
+    source.providerSessionId
+  ].join('\0')
+const subscribe = (listener: () => void) => {
+  listeners.add(listener)
+  return () => listeners.delete(listener)
+}
+
+export function useCliChatResumePending(source: CliChatResumeSource | null): boolean {
+  return useSyncExternalStore(
+    subscribe,
+    () => !!source && pending.has(keyFor(source)),
+    () => false
+  )
+}
+
+export async function runOrdinaryCliChatResume(
+  source: CliChatResumeSource,
+  openOwner = false,
+  selection?: {
+    token?: string
+    reportFailure?: (error: unknown) => void
+    current: () => boolean
+    sourceCurrent: () => boolean
+    afterTabId: string
+  }
+): Promise<void> {
+  const key = keyFor(source)
+  if (pending.has(key) || source.hostUpdateRequired) {
+    return
+  }
+  const target = structuredAgentSessionTargetForHost(source.executionHostId)
+  if (!target) {
+    return
+  }
+  const controller = new AbortController()
+  const isCurrent = () => {
+    if (controller.signal.aborted || (selection && !selection.sourceCurrent())) {
+      return false
+    }
+    // The strict route already proved the captured process exited; idle is not loss of identity.
+    if (selection) {
+      return true
+    }
+    const current = resolveCliChatResumeSource(useAppStore.getState(), {
+      tab: { id: source.tabId, worktreeId: source.workspaceId },
+      paneKey: source.paneKey
+    })
+    return (
+      !!current &&
+      current.executionHostId === source.executionHostId &&
+      current.providerSessionId === source.providerSessionId &&
+      CLI_CONVERSATION_ADOPTING_AGENTS[current.agent] ===
+        CLI_CONVERSATION_ADOPTING_AGENTS[source.agent]
+    )
+  }
+  if (!isCurrent()) {
+    return
+  }
+  const release = () => {
+    if (pending.get(key) === controller) {
+      pending.delete(key)
+      changed()
+    }
+  }
+  pending.set(key, controller)
+  changed()
+  const stopSource = useAppStore.subscribe(() => {
+    if (!isCurrent()) {
+      controller.abort()
+      release()
+    }
+  })
+  const timer = setTimeout(
+    () => controller.abort(new Error('Conversation preparation timed out.')),
+    30_000
+  )
+  let dispatched = false
+  const handoff = () => {
+    if (dispatched) {
+      return true
+    }
+    if (!isCurrent()) {
+      return false
+    }
+    dispatched = true
+    stopSource()
+    clearTimeout(timer)
+    return true
+  }
+  try {
+    const cliSourceSupported = await waitForPromiseWithSignal(
+      supportsStructuredAgentSessionCliSource(target),
+      controller.signal
+    )
+    if (!isCurrent()) {
+      return
+    }
+    const agent = await waitForPromiseWithSignal(
+      adoptingAgentOnHost(source.agent, source.workspaceId, source.executionHostId),
+      controller.signal
+    )
+    if (!isCurrent()) {
+      return
+    }
+    const plan = adoptAgentSessionLaunchVerdict({
+      route: 'structured-native-chat',
+      requestId: newAgentLaunchRequestId(),
+      agent,
+      worktreeId: source.workspaceId,
+      executionHostId: source.executionHostId,
+      resumeFrom: {
+        providerSessionId: source.providerSessionId,
+        // The host matches its own pane keys, not this client's mirrored ones.
+        ...(cliSourceSupported
+          ? {
+              cliSource: {
+                workspaceId: source.workspaceId,
+                paneKey: toHostSessionPaneKey(source.paneKey)
+              }
+            }
+          : {})
+      }
+    })
+    const launch = beginStructuredAgentSessionProvisionalLaunch({
+      plan,
+      hooks: { beforeCreate: handoff },
+      deferPublication: true,
+      ...(selection
+        ? {
+            viewerSelection: selection.token,
+            canActivate: selection.current,
+            afterTabId: selection.afterTabId
+          }
+        : {})
+    })
+    if (!launch) {
+      return
+    }
+    const result = await waitForPromiseWithSignal(launch.settlement, controller.signal)
+    if (selection && result.kind === 'structured') {
+      toast.info(conversationSwitchSourceKept(source.agent))
+    }
+    if (result.kind === 'failed' && !result.notified && pending.get(key) === controller) {
+      await reportCliChatResumeFailure(
+        source,
+        result.error,
+        openOwner,
+        target,
+        selection?.token,
+        selection?.reportFailure
+      )
+    }
+  } catch (error) {
+    if (pending.get(key) === controller) {
+      await reportCliChatResumeFailure(
+        source,
+        error,
+        false,
+        target,
+        selection?.token,
+        selection?.reportFailure
+      )
+    }
+  } finally {
+    clearTimeout(timer)
+    stopSource()
+    release()
+  }
+}
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
index d1ee070f6b86..fb211690d5dc 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
@@ -1,151 +1,676 @@
+import { conversationSwitchFailureText } from '@/lib/conversation-switch-feedback'
 // @vitest-environment happy-dom
-import { beforeEach, expect, it, vi } from 'vitest'
-import { runLegacyCliChatResume } from './cli-chat-resume-run'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type { CliChatResumeSource } from './cli-chat-resume-source'
+import type { AgentSessionWireRefusal } from '../../../../shared/agent-session-wire'
+import type { StructuredAgentSessionCreateParams } from '../../../../shared/structured-agent-session-create'
+import type * as FrameDrawnChatTabPlacementModule from '@/lib/frame-drawn-chat-tab-placement'
 
 const mocks = vi.hoisted(() => {
-  const live: { source: CliChatResumeSource | null } = { source: null }
+  const state: { source: CliChatResumeSource | null } = { source: null }
   return {
-    rpc: vi.fn(),
-    launch: vi.fn(),
-    report: vi.fn(),
-    info: vi.fn(),
-    error: vi.fn(),
-    live,
-    state: {
-      activeView: 'worktrees',
-      groupsByWorktree: {},
-      tabsByWorktree: { workspace: [{ id: 'tab', createdAt: 1 }] },
-      terminalLayoutsByTabId: {
-        tab: {
-          root: { type: 'leaf', leafId: 'leaf' },
-          ptyIdsByLeafId: { leaf: 'pty' }
-        }
-      }
-    }
+    ...state,
+    sourceCapability: vi.fn(),
+    createCapability: vi.fn(),
+    call: vi.fn(),
+    toast: vi.fn(),
+    activate: vi.fn(async () => true),
+    frameDrawn: false
   }
 })
-vi.mock('sonner', () => ({ toast: { info: mocks.info, error: mocks.error } }))
-vi.mock('@/runtime/runtime-rpc-client', () => ({ callRuntimeRpc: mocks.rpc }))
-vi.mock('@/runtime/structured-agent-session-owner', () => ({
-  structuredAgentSessionTargetForHost: () => ({ kind: 'local' })
+vi.mock('./cli-chat-resume-source', () => ({ resolveCliChatResumeSource: () => mocks.source }))
+vi.mock('@/runtime/structured-agent-session-client', () => ({
+  supportsStructuredAgentSessionCliSource: mocks.sourceCapability,
+  supportsStructuredAgentSessionCreateMessage: mocks.createCapability,
+  callStructuredAgentSession: (...args: unknown[]) =>
+    args[1] === 'agentSession.createSupport'
+      ? Promise.resolve({ supported: true })
+      : mocks.call(...args)
 }))
-vi.mock('./cli-chat-resume-terminal-capture', () => ({
-  captureSourceTerminal: async () => ({
-    target: { kind: 'local' },
-    handle: 'exact',
-    incarnationId: 'incarnation',
-    presentation: { identity: { ptyId: 'pty' } }
-  })
+vi.mock('@/runtime/structured-session-tab-inventory', () => ({
+  readStructuredSessionTabInventory: async () => {
+    throw new Error('Reply unavailable')
+  }
 }))
-vi.mock('./cli-chat-resume-source', () => ({ resolveCliChatResumeSource: () => mocks.live.source }))
-vi.mock('../right-sidebar/ai-vault-session-resume-in-chat-launch', () => ({
-  adoptingAgentOnHost: async (agent: string) => agent
+vi.mock('@/lib/structured-agent-session-create-hydration', () => ({
+  publishStructuredAgentSessionCreateHydration: vi.fn()
 }))
-vi.mock('./cli-chat-resume-feedback', () => ({ reportCliChatResumeFailure: mocks.report }))
-vi.mock('@/lib/agent-session/structured-agent-session-provisional-tab', () => ({
-  beginStructuredAgentSessionProvisionalLaunch: mocks.launch
+vi.mock('sonner', () => ({ toast: { error: mocks.toast } }))
+// A frame-drawn server workspace's create carries the tab's place, read as it is sent.
+vi.mock('@/lib/frame-drawn-chat-tab-placement', async (importOriginal) => {
+  const actual = await importOriginal<typeof FrameDrawnChatTabPlacementModule>()
+  return {
+    ...actual,
+    withFrameDrawnChatTabPlacement: (
+      intent: Parameters<typeof actual.withFrameDrawnChatTabPlacement>[0]
+    ) =>
+      mocks.frameDrawn
+        ? { ...intent.params, tabPlacement: { groupId: 'g-1' } }
+        : actual.withFrameDrawnChatTabPlacement(intent)
+  }
+})
+vi.mock('@/lib/activate-ai-vault-structured-session', () => ({
+  activateAiVaultStructuredSession: mocks.activate
 }))
-vi.mock('@/lib/agent-session-launch-plan', () => ({
-  adoptAgentSessionLaunchVerdict: (args: unknown) => args
+// Switch-on, main opens the chat's tab and its frame draws it.
+vi.mock('@/runtime/runtime-rpc-client', async (importOriginal) => ({
+  ...(
+    await import('@/runtime/layout-apply-test-transport.test-fixture')
+  ).runtimeRpcClientWithLayoutApply(await importOriginal()),
+  runtimeEnvironmentSupportsCapability: async () => true
 }))
-vi.mock('@/store', () => ({ useAppStore: { getState: () => mocks.state } }))
+vi.mock('@/runtime/runtime-layout-client', async (importOriginal) =>
+  (
+    await import('@/runtime/layout-apply-test-transport.test-fixture')
+  ).runtimeLayoutClientWithTestFrames(await importOriginal())
+)
 
-const source: CliChatResumeSource = {
-  agent: 'codex',
+import { adoptAgentSessionLaunchVerdict } from '@/lib/agent-session-launch-plan'
+import { newAgentLaunchRequestId } from '@/lib/agent-launch-request-id'
+import { beginStructuredAgentSessionProvisionalLaunch } from '@/lib/agent-session/structured-agent-session-provisional-tab'
+import {
+  getStructuredAgentSessionLaunchLifecycle,
+  retryStructuredAgentSessionLaunch
+} from '@/lib/structured-agent-session-launch'
+import {
+  readStructuredAgentLaunchRecord,
+  writeStructuredAgentLaunchRecord,
+  resetStructuredAgentLaunchPersistenceForTests
+} from '@/lib/agent-session/launch/structured-agent-session-launch-persistence'
+import {
+  reserveStructuredLaunchSlot,
+  restoreStructuredLaunchSurfaces,
+  stopStructuredLaunchSlotTracking
+} from '@/lib/structured-agent-session-launch-surface'
+import { applyStructuredSessionTabSnapshots } from '@/runtime/local-structured-session-tabs-sync/snapshot-apply'
+import { resetLocalStructuredSessionVersionForTests } from '@/runtime/local-structured-session-tabs-sync/inventory-generation-fence'
+import { resetWebSessionTabsSnapshotFreshnessForTests } from '@/runtime/web-session-tabs-sync/tracking-lifecycle'
+import { buildWorkspaceSessionPayload } from '@/lib/workspace-session'
+import { buildHydratedTabState } from '@/store/slices/tabs-hydration'
+import { makeWorktree } from '@/store/slices/worktrees-slice-test-fixtures'
+import type { RuntimeMobileSessionTabsResult } from '../../../../shared/runtime-types'
+import { useAppStore } from '@/store'
+import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
+import { layoutApplyTestTransport } from '@/runtime/layout-apply-test-transport.test-fixture'
+import { runOrdinaryCliChatResume as runCliChatResume } from './cli-chat-resume-ordinary-run'
+import { toWebTerminalSurfaceTabId } from '../../../../shared/terminal-surface-id'
+import {
+  resetStructuredAgentLaunchRegistryForTests,
+  structuredLaunchStates
+} from '@/lib/agent-session/launch/structured-agent-session-launch-registry'
+import { isEmptyWorkspaceDefaultSurfacePending } from '@/lib/empty-workspace-default-surface-claims'
+import {
+  clearWebSessionFocusIntent,
+  peekWebSessionFocusIntent,
+  resetWebSessionFocusIntentForTests
+} from '@/runtime/web-session-focus-intent'
+import { structuredAgentSessionFocusOwner } from '@/runtime/structured-agent-session-owner'
+import { registerSessionTabIpcBridge } from '@/hooks/ipc-events/session-tab-ipc-bridge'
+import {
+  drawTabsFromMain,
+  type TabsDrawnFromMain
+} from '@/store/slices/tabs-drawn-from-main.test-fixture'
+
+const SOURCE: CliChatResumeSource = {
+  tabId: 'tab-1',
+  workspaceId: 'wt-1',
+  paneKey: 'tab-1:leaf',
+  agent: 'claude',
+  providerSessionId: 'provider-1',
   executionHostId: 'local',
-  workspaceId: 'workspace',
-  tabId: 'tab',
-  paneKey: 'tab:leaf',
-  ptyId: 'pty',
-  providerSessionId: 'conversation'
+  ptyId: undefined
 }
-beforeEach(() => {
+const tabs = () => useAppStore.getState().unifiedTabsByWorktree['wt-1'] ?? []
+let main: TabsDrawnFromMain | undefined
+afterEach(() => {
+  vi.unstubAllGlobals()
+  main?.close()
+  main = undefined
+})
+function deferred<T>() {
+  let resolve: (value: T) => void = () => {}
+  const promise = new Promise<T>((done) => {
+    resolve = done
+  })
+  return { promise, resolve }
+}
+function refuse(reason: 'transcriptNotFound' | 'transcriptUnreadable'): AgentSessionWireRefusal {
+  return {
+    code: 'agent_session_identity_required',
+    message: 'private host error',
+    details: { reason },
+    createAttemptRefusedBeforeCommit: true
+  }
+}
+
+beforeEach(async () => {
   vi.clearAllMocks()
-  mocks.live.source = source
-  mocks.state = {
-    ...mocks.state,
-    activeView: 'worktrees',
-    tabsByWorktree: { workspace: [{ id: 'tab', createdAt: 1 }] }
+  resetLocalStructuredSessionVersionForTests()
+  resetWebSessionTabsSnapshotFreshnessForTests()
+  stopStructuredLaunchSlotTracking()
+  localStorage.clear()
+  resetStructuredAgentLaunchPersistenceForTests()
+  resetStructuredAgentLaunchRegistryForTests()
+  resetWebSessionFocusIntentForTests()
+  useAppStore.setState(useAppStore.getInitialState(), true)
+  useAppStore.setState({ activeWorktreeId: 'wt-1' })
+  mocks.source = SOURCE
+  mocks.frameDrawn = false
+  mocks.sourceCapability.mockResolvedValue(true)
+  mocks.createCapability.mockResolvedValue(true)
+  mocks.call.mockImplementation(
+    async (_target, method, params: StructuredAgentSessionCreateParams) => {
+      expect(method).toBe('agentSession.create')
+      return { ok: true, value: { sessionId: params.envelope.sessionId, fence: 1 } }
+    }
+  )
+  main = await drawTabsFromMain(useAppStore)
+})
+
+function snapshot(sessionId?: string): RuntimeMobileSessionTabsResult {
+  return {
+    worktree: 'wt-1',
+    publicationEpoch: 'publication-test',
+    snapshotVersion: Date.now(),
+    activeGroupId: null,
+    activeTabId: null,
+    activeTabType: null,
+    tabs: sessionId
+      ? [
+          {
+            type: 'agent-session',
+            id: `agent-session:${sessionId}`,
+            sessionId,
+            agent: 'claude',
+            title: 'Chat',
+            isActive: false
+          }
+        ]
+      : []
   }
-  mocks.rpc.mockResolvedValue({ stoppedPtyIds: ['pty'], postStopVerified: true })
-  mocks.launch.mockReturnValue({
-    settlement: Promise.resolve({ kind: 'structured', sessionId: 'same' })
+}
+
+/** Main takes the store's current layout, as after a restart; seeding after it is invisible to main. */
+async function redrawFromMain(): Promise<void> {
+  main?.close()
+  main = await drawTabsFromMain(useAppStore)
+}
+
+async function seedTabs() {
+  const seeded = ['E', 'S', 'B'].map((id) =>
+    useAppStore.getState().createUnifiedTab('wt-1', 'editor', { id, entityId: id })
+  )
+  await redrawFromMain()
+  return seeded
+}
+
+const HOST_LEAF = '11111111-1111-4111-8111-111111111111'
+
+describe('CLI identity resume through the existing launch owner', () => {
+  it.each([true, false])(
+    'resumes on the owning server with optional CLI-source capability: %s',
+    async (supported) => {
+      // A desktop sees the host's pane through its mirrored surface key.
+      const source: CliChatResumeSource = {
+        ...SOURCE,
+        executionHostId: 'runtime:server-1',
+        paneKey: `${toWebTerminalSurfaceTabId('host-tab-1')}:${HOST_LEAF}`
+      }
+      mocks.source = source
+      mocks.sourceCapability.mockResolvedValue(supported)
+      useAppStore.setState({
+        worktreesByRepo: {
+          repo: [
+            makeWorktree({
+              id: 'wt-1',
+              repoId: 'repo',
+              hostId: 'runtime:server-1',
+              runtimeOwnerEnvironmentId: 'server-1'
+            })
+          ]
+        }
+      })
+      mocks.call.mockImplementation(
+        async (_target, _method, params: StructuredAgentSessionCreateParams) => ({
+          ok: true,
+          value: { sessionId: params.envelope.sessionId, fence: 1 }
+        })
+      )
+      await runCliChatResume(source)
+      expect(mocks.sourceCapability).toHaveBeenCalledWith({
+        kind: 'environment',
+        environmentId: 'server-1'
+      })
+      expect(mocks.call).toHaveBeenCalledOnce()
+      expect(mocks.call).toHaveBeenCalledWith(
+        { kind: 'environment', environmentId: 'server-1' },
+        'agentSession.create',
+        expect.objectContaining({
+          resumeFrom: {
+            providerSessionId: 'provider-1',
+            ...(supported
+              ? { cliSource: { workspaceId: 'wt-1', paneKey: `host-tab-1:${HOST_LEAF}` } }
+              : {})
+          }
+        })
+      )
+      expect(mocks.toast).not.toHaveBeenCalled()
+    }
+  )
+
+  it('opens an existing conversation owner on the source server after a conflict', async () => {
+    const source: CliChatResumeSource = { ...SOURCE, executionHostId: 'runtime:server-1' }
+    mocks.source = source
+    useAppStore.setState({
+      worktreesByRepo: {
+        repo: [
+          makeWorktree({
+            id: 'wt-1',
+            repoId: 'repo',
+            hostId: 'runtime:server-1',
+            runtimeOwnerEnvironmentId: 'server-1'
+          })
+        ]
+      }
+    })
+    const owner = { sessionId: 'owner-chat', workspaceId: 'owner-workspace' }
+    mocks.call.mockResolvedValue({
+      ok: false,
+      refusal: {
+        code: 'agent_session_conflict',
+        message: 'owner',
+        details: { reason: 'conversationHeldElsewhere', owner },
+        createAttemptRefusedBeforeCommit: true
+      }
+    })
+    await runCliChatResume(source, true)
+    expect(mocks.activate).toHaveBeenCalledWith({ structuredSession: owner }, undefined, {
+      kind: 'environment',
+      environmentId: 'server-1'
+    })
+    expect(tabs()).toEqual([])
   })
-})
 
-it('uses only the old ordinary exact-stop envelope and starts adoption after proven exit', async () => {
-  const stopped = Promise.withResolvers<unknown>()
-  mocks.rpc.mockReturnValue(stopped.promise)
-  const running = runLegacyCliChatResume(source)
-  await vi.waitFor(() => expect(mocks.rpc).toHaveBeenCalledOnce())
-  expect(mocks.launch).not.toHaveBeenCalled()
-  expect(mocks.rpc).toHaveBeenCalledWith({ kind: 'local' }, 'terminal.stopExact', {
-    worktree: 'id:workspace',
-    expectedPtyIds: ['pty'],
-    targetOnly: true,
-    keepHistory: true
+  it('shares pending, sends only an advertised source, and survives source closure after dispatch', async () => {
+    const reply = deferred<unknown>()
+    mocks.call.mockReturnValue(reply.promise)
+    const running = runCliChatResume(SOURCE)
+    await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
+    await runCliChatResume({ ...SOURCE, paneKey: 'another-pane' })
+    expect(mocks.call).toHaveBeenCalledOnce()
+    expect(tabs()).toEqual([])
+    expect(isEmptyWorkspaceDefaultSurfacePending('wt-1')).toBe(true)
+    const params: StructuredAgentSessionCreateParams = mocks.call.mock.calls[0][2]
+    expect(params.resumeFrom).toEqual({
+      providerSessionId: 'provider-1',
+      cliSource: { workspaceId: 'wt-1', paneKey: 'tab-1:leaf' }
+    })
+    mocks.source = null
+    useAppStore.setState({})
+    reply.resolve({ ok: true, value: { sessionId: params.envelope.sessionId, fence: 1 } })
+    await running
+    expect(tabs()).toHaveLength(1)
+    expect(isEmptyWorkspaceDefaultSurfacePending('wt-1')).toBe(false)
+  })
+
+  it('retires an unsent click during create capability waiting, even if the same source returns', async () => {
+    const capability = deferred<boolean>()
+    mocks.createCapability.mockReturnValue(capability.promise)
+    const running = runCliChatResume(SOURCE)
+    await vi.waitFor(() => expect(mocks.createCapability).toHaveBeenCalledOnce())
+    mocks.source = null
+    useAppStore.setState({})
+    await running
+    mocks.source = SOURCE
+    capability.resolve(true)
+    await vi.waitFor(() => expect([...structuredLaunchStates()]).toHaveLength(0))
+    expect(mocks.call).not.toHaveBeenCalled()
+    expect(tabs()).toEqual([])
+    expect(mocks.toast).not.toHaveBeenCalled()
+  })
+
+  it('uses ID-only create for an older host and retains uncertainty without pre-commit proof', async () => {
+    mocks.sourceCapability.mockResolvedValue(false)
+    mocks.call.mockResolvedValue({
+      ok: false,
+      refusal: { code: 'agent_session_conflict', message: 'old host' }
+    })
+    await runCliChatResume(SOURCE, true)
+    expect(mocks.call.mock.calls[0][2].resumeFrom).toEqual({ providerSessionId: 'provider-1' })
+    expect(tabs()).toHaveLength(1)
+    expect(mocks.activate).not.toHaveBeenCalled()
+    expect(mocks.toast).not.toHaveBeenCalled()
+  })
+
+  it('keeps ordinary refusals hidden and distinguishes unsaved from unreadable content', async () => {
+    for (const reason of ['transcriptNotFound', 'transcriptUnreadable'] as const) {
+      mocks.call.mockResolvedValue({ ok: false, refusal: refuse(reason) })
+      await runCliChatResume(SOURCE)
+      expect(tabs()).toEqual([])
+      expect([...structuredLaunchStates()]).toEqual([])
+      expect(mocks.toast.mock.calls.at(-1)?.[0]).toMatch(
+        reason === 'transcriptUnreadable' ? /couldn't open.*history/i : /hasn't saved/
+      )
+    }
+  })
+
+  it('keeps the terminal and directs a refused terminal writer to quit in this terminal', async () => {
+    mocks.call.mockResolvedValue({
+      ok: false,
+      refusal: {
+        code: 'agent_session_conflict',
+        message: 'private host evidence',
+        details: { reason: 'conversationHeldElsewhere' },
+        createAttemptRefusedBeforeCommit: true
+      }
+    })
+    await runCliChatResume(SOURCE, true)
+    expect(mocks.toast).toHaveBeenCalledTimes(1)
+    expect(mocks.toast.mock.calls[0]?.[0]).toBe(
+      'Orca could not confirm Claude stopped in this terminal. Quit Claude here, then try this action again.'
+    )
+    expect(mocks.activate).not.toHaveBeenCalled()
+    expect(tabs()).toEqual([])
+    expect([...structuredLaunchStates()]).toEqual([])
+  })
+
+  it('opens a proved owner only for the header, on the initiating host, without importing', async () => {
+    const owner = { sessionId: 'owner-chat', workspaceId: 'owner-workspace' }
+    mocks.call.mockResolvedValue({
+      ok: false,
+      refusal: {
+        code: 'agent_session_conflict',
+        message: 'owner',
+        details: { reason: 'conversationHeldElsewhere', owner },
+        createAttemptRefusedBeforeCommit: true
+      }
+    })
+    await runCliChatResume(SOURCE)
+    expect(mocks.toast).toHaveBeenCalledWith('Another chat is already holding this conversation.')
+    expect(mocks.activate).not.toHaveBeenCalled()
+    await runCliChatResume(SOURCE, true)
+    expect(mocks.activate).toHaveBeenCalledWith({ structuredSession: owner }, undefined, {
+      kind: 'local'
+    })
+    expect(tabs()).toEqual([])
   })
-  // Ordinary stop may remove the source from the live map; that is no failure or busy refusal.
-  mocks.live.source = null
-  stopped.resolve({ stoppedPtyIds: ['pty'], postStopVerified: true })
-  await running
-  expect(mocks.launch).toHaveBeenCalledExactlyOnceWith(
-    expect.objectContaining({
-      plan: expect.objectContaining({ resumeFrom: { providerSessionId: 'conversation' } })
+
+  it('keeps the eager History joiner failed and retryable after the hidden starter is refused', async () => {
+    const reply = deferred<unknown>()
+    mocks.call.mockReturnValue(reply.promise)
+    const running = runCliChatResume(SOURCE)
+    await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
+    const sessionId: string = mocks.call.mock.calls[0][2].envelope.sessionId
+    const eager = beginStructuredAgentSessionProvisionalLaunch({
+      hooks: {},
+      plan: adoptAgentSessionLaunchVerdict({
+        route: 'structured-native-chat',
+        requestId: newAgentLaunchRequestId(),
+        agent: 'claude',
+        worktreeId: 'wt-1',
+        executionHostId: 'local',
+        resumeFrom: { providerSessionId: 'provider-1' }
+      })
     })
+    await vi.waitFor(() => expect(tabs()).toHaveLength(1))
+    reply.resolve({ ok: false, refusal: refuse('transcriptUnreadable') })
+    await Promise.all([running, eager?.settlement])
+    expect(mocks.call).toHaveBeenCalledOnce()
+    expect(getStructuredAgentSessionLaunchLifecycle('wt-1', sessionId)).toBe('failed')
+    expect(readStructuredAgentLaunchRecord(sessionId)?.lifecycle).toBe('failed')
+    mocks.call.mockResolvedValue({ ok: true, value: { sessionId, fence: 1 } })
+    expect(retryStructuredAgentSessionLaunch('wt-1', sessionId)).toBe(true)
+    await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(2))
+    expect(mocks.call.mock.calls[1][2].envelope.sessionId).toBe(sessionId)
+    await vi.waitFor(() =>
+      expect(getStructuredAgentSessionLaunchLifecycle('wt-1', sessionId)).toBeNull()
+    )
+    expect(tabs()).toHaveLength(1)
+  })
+
+  it.each([false, true])(
+    'still opens an eager History joiner after the terminal closes before create (frame-drawn: %s)',
+    async (frameDrawn) => {
+      mocks.frameDrawn = frameDrawn
+      const capability = deferred<boolean>()
+      mocks.createCapability.mockReturnValue(capability.promise)
+      const running = runCliChatResume(SOURCE)
+      await vi.waitFor(() => expect(mocks.createCapability).toHaveBeenCalledOnce())
+      const eager = beginStructuredAgentSessionProvisionalLaunch({
+        hooks: {},
+        plan: adoptAgentSessionLaunchVerdict({
+          route: 'structured-native-chat',
+          requestId: newAgentLaunchRequestId(),
+          agent: 'claude',
+          worktreeId: 'wt-1',
+          executionHostId: 'local',
+          resumeFrom: { providerSessionId: 'provider-1' }
+        })
+      })
+      mocks.source = null
+      useAppStore.setState({})
+      capability.resolve(true)
+      await Promise.all([running, eager?.settlement])
+      expect(mocks.call).toHaveBeenCalledOnce()
+      expect(mocks.call.mock.calls[0][2].resumeFrom).toEqual({ providerSessionId: 'provider-1' })
+      expect(mocks.call.mock.calls[0][2].tabPlacement).toEqual(
+        frameDrawn ? { groupId: 'g-1' } : undefined
+      )
+      expect(tabs()).toHaveLength(1)
+      expect(mocks.toast).not.toHaveBeenCalled()
+    }
   )
-  expect(mocks.error).not.toHaveBeenCalled()
-  expect(mocks.info).toHaveBeenCalledOnce()
-})
 
-it.each([
-  null,
-  {},
-  { ptyKilled: true },
-  { stoppedPtyIds: ['other'], postStopVerified: true },
-  { stoppedPtyIds: ['pty'], postStopVerified: false },
-  { stoppedPtyIds: ['pty'], postStopVerified: true, remainingLivePtyIds: ['pty'] }
-])('does not create on an insufficient old receipt %j', async (receipt) => {
-  mocks.rpc.mockResolvedValue(receipt)
-  await runLegacyCliChatResume(source)
-  expect(mocks.launch).not.toHaveBeenCalled()
-  expect(mocks.error).toHaveBeenCalledExactlyOnceWith(
-    expect.stringContaining('could not confirm Codex stopped')
+  it.each([
+    ['reply', 'B', 'B E S R', 'B E S D R'],
+    ['inventory', 'E', 'S B R E', 'S B D R E'],
+    ['reply', 'E', 'S B E R', 'S B D E R'],
+    ['inventory', 'B', 'R S E B', 'R S E D B']
+  ])(
+    'keeps canonical membership through registered IPC (%s first, move %s to %s)',
+    async (first, mover, requested, expected) => {
+      const [e, source, browser] = await seedTabs()
+      let move: Parameters<typeof window.api.ui.onMoveSessionTab>[0] = () => {}
+      vi.stubGlobal('api', {
+        ...window.api,
+        ui: {
+          ...window.api?.ui,
+          onCloseSessionTab: () => () => {},
+          onSessionTabCloseRequest: () => () => {},
+          onMoveSessionTab: (callback: typeof move) => {
+            move = callback
+            return () => {}
+          }
+        }
+      })
+      registerSessionTabIpcBridge([])
+      const reply = deferred<unknown>()
+      mocks.call.mockReturnValue(reply.promise)
+      const running = runCliChatResume(SOURCE)
+      await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
+      const sessionId: string = mocks.call.mock.calls[0][2].envelope.sessionId
+      const slotId = `structured-agent-session-${sessionId}`
+      const store = useAppStore.getState()
+      const order = store.groupsByWorktree['wt-1'][0].tabOrder
+      expect(order).toEqual([e.id, source.id, browser.id, slotId])
+      const later = useAppStore
+        .getState()
+        .createUnifiedTab('wt-1', 'editor', { id: 'R', entityId: 'R' })
+      await redrawFromMain()
+      const beforeNoop = useAppStore.getState()
+      move({
+        kind: 'reorder',
+        worktreeId: 'wt-1',
+        targetGroupId: e.groupId,
+        tabId: browser.id,
+        tabOrder: [e.id, source.id, browser.id, later.id]
+      })
+      expect(useAppStore.getState()).toBe(beforeNoop)
+      move({
+        kind: 'reorder',
+        worktreeId: 'wt-1',
+        targetGroupId: e.groupId,
+        tabId: mover,
+        tabOrder: requested.split(' ')
+      })
+      const expectedOrder = expected.split(' ').map((id) => (id === 'D' ? slotId : id))
+      expect(useAppStore.getState().groupsByWorktree['wt-1'][0].tabOrder).toEqual(expectedOrder)
+      expect(readStructuredAgentLaunchRecord(sessionId)?.surfaceAddress).toEqual({
+        worktreeId: 'wt-1',
+        targetGroupId: e.groupId,
+        precedingTabIds: expectedOrder.slice(0, expectedOrder.indexOf(slotId))
+      })
+      const other = useAppStore.getState().createUnifiedTab('wt-1', 'editor', {
+        entityId: 'other',
+        split: { splitDirection: 'right', sourceGroupId: e.groupId }
+      })
+      await redrawFromMain()
+      clearWebSessionFocusIntent(structuredAgentSessionFocusOwner({ kind: 'local' }), 'wt-1')
+      if (first === 'inventory') {
+        applyStructuredSessionTabSnapshots([snapshot(sessionId)])
+      }
+      reply.resolve({ ok: true, value: { sessionId, fence: 1 } })
+      await running
+      expect(
+        useAppStore.getState().groupsByWorktree['wt-1'].find((group) => group.id === e.groupId)
+          ?.tabOrder
+      ).toEqual(expectedOrder)
+      expect(useAppStore.getState().activeGroupIdByWorktree['wt-1']).toBe(other.groupId)
+      useAppStore.getState().moveUnifiedTabToGroup(slotId, other.groupId)
+      applyStructuredSessionTabSnapshots([
+        { ...snapshot(sessionId), snapshotVersion: Date.now() + 1 }
+      ])
+      expect(tabs().find((tab) => tab.entityId === sessionId)?.groupId).toBe(other.groupId)
+    }
   )
-})
 
-it('reports an unconfirmed old Stop once and never launches after a lost Stop result', async () => {
-  mocks.rpc.mockRejectedValue(new Error('raw stop transport failure'))
-  await runLegacyCliChatResume(source)
-  expect(mocks.launch).not.toHaveBeenCalled()
-  expect(mocks.error).toHaveBeenCalledExactlyOnceWith(
-    'Orca could not confirm Codex stopped. Check Codex in the original terminal, then try switching again.'
+  // Main's publish of a window's create places nothing switch-on, so the resume's own open must.
+  it('opens a resumed chat once, through main, after the tab before its hidden slot', async () => {
+    const [, , browser] = await seedTabs()
+    await runCliChatResume(SOURCE)
+    await main?.settle()
+    const sessionId: string = mocks.call.mock.calls[0][2].envelope.sessionId
+    const slotId = `structured-agent-session-${sessionId}`
+    expect(tabs().find((tab) => tab.entityId === sessionId)?.id).toBe(slotId)
+    expect(useAppStore.getState().groupsByWorktree['wt-1'][0].tabOrder.at(-1)).toBe(slotId)
+    if (ORCA_LAYOUT_OWNER_IS_MAIN) {
+      expect(layoutApplyTestTransport.sentOfType('openAgentSessionTab')).toEqual([
+        expect.objectContaining({ tabId: slotId, sessionId, afterTabId: browser.id })
+      ])
+    }
+  })
+
+  it.each([false, true])(
+    'keeps overlapping requests in their canonical order (second finishes first: %s)',
+    async (reverse) => {
+      const initial = await seedTabs()
+      const replies = [deferred<unknown>(), deferred<unknown>()]
+      mocks.call
+        .mockImplementationOnce(() => replies[0].promise)
+        .mockImplementationOnce(() => replies[1].promise)
+      const first = runCliChatResume(SOURCE)
+      await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(1))
+      const secondSource = { ...SOURCE, providerSessionId: 'provider-2' }
+      mocks.source = secondSource
+      const second = runCliChatResume(secondSource)
+      await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(2))
+      const ids: string[] = mocks.call.mock.calls.map((call) => call[2].envelope.sessionId)
+      for (const index of reverse ? [1, 0] : [0, 1]) {
+        replies[index].resolve({ ok: true, value: { sessionId: ids[index], fence: 1 } })
+        await (index === 0 ? first : second)
+      }
+      expect(useAppStore.getState().groupsByWorktree['wt-1'][0].tabOrder).toEqual([
+        ...initial.map((tab) => tab.id),
+        ...ids.map((id) => `structured-agent-session-${id}`)
+      ])
+    }
   )
-})
 
-it('lets a replacement source win while exact Stop is pending', async () => {
-  mocks.rpc.mockImplementation(async () => {
-    mocks.live.source = { ...source, ptyId: 'replacement' }
-    return { stoppedPtyIds: ['pty'], postStopVerified: true }
+  it('restores a pending-only group as unknown without sending create or restoring focus', async () => {
+    const record = {
+      sessionId: 'reload-pending',
+      executionHostId: 'local' as const,
+      agent: 'claude' as const,
+      lifecycle: 'pending' as const,
+      clientOperationId: 'original-operation',
+      payloadFingerprint: 'fingerprint',
+      expectedRuntimeFence: null,
+      surfaceAddress: { worktreeId: 'wt-1', precedingTabIds: [] }
+    }
+    writeStructuredAgentLaunchRecord(record)
+    const firstGroup = vi.fn()
+    const unsubscribe = useAppStore.subscribe((state) => {
+      const group = state.groupsByWorktree['wt-1']?.[0]
+      if (group) {
+        firstGroup(group)
+      }
+    })
+    reserveStructuredLaunchSlot(record)
+    unsubscribe()
+    expect(firstGroup).toHaveBeenCalledTimes(1)
+    expect(firstGroup.mock.calls[0][0]).toMatchObject({
+      tabOrder: ['structured-agent-session-reload-pending'],
+      activeTabId: null
+    })
+    expect(firstGroup.mock.calls[0][0].recentTabIds ?? []).toEqual([])
+    expect(tabs()).toHaveLength(0)
+    const session = buildWorkspaceSessionPayload(useAppStore.getState())
+    stopStructuredLaunchSlotTracking()
+    resetStructuredAgentLaunchPersistenceForTests()
+    resetStructuredAgentLaunchRegistryForTests()
+    useAppStore.setState(useAppStore.getInitialState(), true)
+    useAppStore.setState({
+      ...buildHydratedTabState(session, new Set(['wt-1'])),
+      worktreesByRepo: { repo: [makeWorktree({ id: 'wt-1', repoId: 'repo', hostId: 'local' })] }
+    })
+    await redrawFromMain()
+    restoreStructuredLaunchSurfaces()
+    restoreStructuredLaunchSurfaces()
+    applyStructuredSessionTabSnapshots([snapshot()])
+    await main?.settle()
+    expect(mocks.call).not.toHaveBeenCalled()
+    expect(
+      peekWebSessionFocusIntent(structuredAgentSessionFocusOwner({ kind: 'local' }), 'wt-1')
+    ).toBeNull()
+    expect(tabs()).toHaveLength(1)
+    expect(getStructuredAgentSessionLaunchLifecycle('wt-1', 'reload-pending')).toBe(
+      'visibility-unknown'
+    )
+    expect(readStructuredAgentLaunchRecord('reload-pending')?.clientOperationId).toBe(
+      'original-operation'
+    )
+    expect(useAppStore.getState().groupsByWorktree['wt-1'][0].recentTabIds ?? []).toEqual([])
   })
-  await runLegacyCliChatResume(source)
-  expect(mocks.launch).not.toHaveBeenCalled()
-  expect(mocks.error).not.toHaveBeenCalled()
 })
 
-it.each(['navigate', 'close'] as const)(
-  'lets a later %s win while exact Stop is pending',
-  async (action) => {
-    mocks.rpc.mockImplementation(async () => {
-      mocks.state =
-        action === 'navigate'
-          ? { ...mocks.state, activeView: 'settings' }
-          : { ...mocks.state, tabsByWorktree: { workspace: [] } }
-      return { stoppedPtyIds: ['pty'], postStopVerified: true }
+it.each(['preparation', 'refusal'])(
+  'unified strict legacy admission reports %s through the common formatter once',
+  async (stage) => {
+    if (stage === 'preparation') {
+      mocks.sourceCapability.mockRejectedValue(new Error('raw provider transport text'))
+    } else {
+      mocks.call.mockResolvedValue({ ok: false, refusal: refuse('transcriptUnreadable') })
+    }
+    await runCliChatResume(SOURCE, true, {
+      current: () => true,
+      sourceCurrent: () => true,
+      afterTabId: SOURCE.tabId,
+      reportFailure: (error) => {
+        mocks.toast(
+          conversationSwitchFailureText(error, {
+            agent: SOURCE.agent,
+            direction: 'chat',
+            source: SOURCE
+          })
+        )
+      }
     })
-    await runLegacyCliChatResume(source)
-    expect(mocks.launch).not.toHaveBeenCalled()
-    expect(mocks.error).not.toHaveBeenCalled()
+    expect(mocks.toast).toHaveBeenCalledExactlyOnceWith(
+      stage === 'refusal'
+        ? "Claude couldn't open this conversation's history. Check that its saved conversation is available, then try again."
+        : 'Claude could not start in chat. Check its setup and try again.'
+    )
+    expect(tabs()).toEqual([])
+    expect(mocks.activate).not.toHaveBeenCalled()
   }
 )
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
index 2f419c4e5a8d..06081cea36c3 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
@@ -1,24 +1,18 @@
+import { runOrdinaryCliChatResume } from './cli-chat-resume-ordinary-run'
 import {
   captureTerminalSurfaceIdentity,
   isRetainedTerminalSurfaceIdentity
 } from '../../../../shared/terminal-tab-close'
 import { toast } from 'sonner'
-import {
-  conversationSwitchFailureText,
-  conversationSwitchSourceKept
-} from '@/lib/conversation-switch-feedback'
+import { conversationSwitchFailureText } from '@/lib/conversation-switch-feedback'
 import {
   conversationSwitchChanged,
   isCliChatResumePending,
   pendingCliChatResumes as pending
 } from '@/lib/pending-conversation-surface-switches'
 import { useAppStore } from '@/store'
-import { newAgentLaunchRequestId } from '@/lib/agent-launch-request-id'
-import { adoptAgentSessionLaunchVerdict } from '@/lib/agent-session-launch-plan'
-import { beginStructuredAgentSessionProvisionalLaunch } from '@/lib/agent-session/structured-agent-session-provisional-tab'
 import { structuredAgentSessionTargetForHost } from '@/runtime/structured-agent-session-owner'
 import { resolveCliChatResumeSource, type CliChatResumeSource } from './cli-chat-resume-source'
-import { reportCliChatResumeFailure } from './cli-chat-resume-feedback'
 import { adoptingAgentOnHost } from '../right-sidebar/ai-vault-session-resume-in-chat-launch'
 import { callRuntimeRpc } from '@/runtime/runtime-rpc-client'
 import { captureSourceTerminal } from './cli-chat-resume-terminal-capture'
@@ -28,7 +22,8 @@ import { captureConversationSwitchSelection } from '@/lib/conversation-switch-st
 /** Old peers stop the addressed PTY before ordinary adoption; a kill acknowledgement is never exit proof. */
 export async function runLegacyCliChatResume(
   source: CliChatResumeSource,
-  viewerSelection?: string
+  viewerSelection?: string,
+  reportFailure?: (error: unknown) => void
 ): Promise<void> {
   const key = `${source.executionHostId}\0${source.agent}\0${source.providerSessionId}`
   const target = structuredAgentSessionTargetForHost(source.executionHostId)
@@ -77,15 +72,11 @@ export async function runLegacyCliChatResume(
     if (!captured || !ptyId || !isCurrent()) {
       throw stopUnknown()
     }
-    if (!stillCaptured() || !stillSelected()) {
+    if (!stillCaptured()) {
       return
     }
-    const agent = await adoptingAgentOnHost(
-      source.agent,
-      source.workspaceId,
-      source.executionHostId
-    )
-    if (!isCurrent() || !stillCaptured() || !stillSelected()) {
+    await adoptingAgentOnHost(source.agent, source.workspaceId, source.executionHostId)
+    if (!isCurrent() || !stillCaptured()) {
       return
     }
     const stopped = await callRuntimeRpc<{
@@ -119,51 +110,25 @@ export async function runLegacyCliChatResume(
     if (current && !isCurrent()) {
       return
     }
-    const state = useAppStore.getState()
-    if (!stillCaptured() || !stillSelected()) {
+    if (!stillCaptured()) {
       return
     }
-    const group = state.groupsByWorktree[source.workspaceId]?.find((row) =>
-      row.tabOrder.includes(source.tabId)
-    )
-    const plan = adoptAgentSessionLaunchVerdict({
-      route: 'structured-native-chat',
-      requestId: newAgentLaunchRequestId(),
-      agent,
-      worktreeId: source.workspaceId,
-      executionHostId: source.executionHostId,
-      resumeFrom: { providerSessionId: source.providerSessionId }
-    })
-    const launch = beginStructuredAgentSessionProvisionalLaunch({
-      plan,
-      hooks: { beforeCreate: stillCaptured },
-      canActivate: stillSelected,
-      afterTabId: source.tabId,
-      target: group
-        ? {
-            surfaceAddress: {
-              worktreeId: source.workspaceId,
-              targetGroupId: group.id,
-              precedingTabIds: group.tabOrder.slice(0, group.tabOrder.indexOf(source.tabId) + 1)
-            }
-          }
-        : undefined
+    await runOrdinaryCliChatResume(source, true, {
+      token: viewerSelection,
+      reportFailure,
+      current: stillSelected,
+      sourceCurrent: stillCaptured,
+      afterTabId: source.tabId
     })
-    if (!launch) {
-      return
-    }
-    const result = await launch.settlement
-    if (result.kind === 'structured') {
-      // Old close envelopes cannot condition retirement on this captured incarnation after adoption.
-      toast.info(conversationSwitchSourceKept(source.agent))
-    } else if (result.kind === 'failed' && !result.notified) {
-      await reportCliChatResumeFailure(source, result.error, target, viewerSelection)
-    }
   } catch (error) {
     // A stopped shell can cease being busy or disappear; that never turns proven Stop into a failure.
-    toast.error(
-      conversationSwitchFailureText(error, { agent: source.agent, direction: 'chat', source })
-    )
+    if (reportFailure) {
+      reportFailure(error)
+    } else {
+      toast.error(
+        conversationSwitchFailureText(error, { agent: source.agent, direction: 'chat', source })
+      )
+    }
   } finally {
     pending.delete(controller)
     conversationSwitchChanged()
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts
index 2ced2e62fb07..0b3ff5861226 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts
@@ -12,7 +12,7 @@ import {
   adoptsCliConversations,
   type CliConversationRowAgent
 } from '../../../../shared/structured-agent-cli-conversation-adoption'
-import { resolvePaneResumeInNewChatOffer } from './tab-session-history-switch'
+import { resolvePaneSwitchToChatOffer } from './tab-session-history-switch'
 
 export type CliChatResumeSource = {
   tabId: string
@@ -44,7 +44,7 @@ export function resolveCliChatResumeSource(
         tab: { worktreeId: args.tab.worktreeId, tabId: args.tab.id }
       }).find((candidate) => candidate.tabId === args.tab.id)
   const offer = conversation
-    ? resolvePaneResumeInNewChatOffer(state, {
+    ? resolvePaneSwitchToChatOffer(state, {
         worktreeId: conversation.worktreeId,
         paneKey: conversation.paneKey
       })
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-transport.test-fixture.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-transport.test-fixture.ts
deleted file mode 100644
index a8d06fbe46d2..000000000000
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-transport.test-fixture.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { vi } from 'vitest'
-import type { PtyTransport } from '../terminal-pane/pty-transport-types'
-
-export function createExitReturnTransport(initialPtyId: string): PtyTransport {
-  let ptyId: string | null = initialPtyId
-  return {
-    attach: vi.fn(({ existingPtyId }: { existingPtyId: string }) => {
-      ptyId = existingPtyId
-    }),
-    connect: vi.fn(async () => {}),
-    disconnect: vi.fn(() => {
-      ptyId = null
-    }),
-    sendInput: vi.fn(() => true),
-    sendInputImmediate: vi.fn(() => true),
-    sendInputAccepted: vi.fn(async () => true),
-    claimViewport: vi.fn(() => true),
-    resize: vi.fn(() => true),
-    isConnected: vi.fn(() => true),
-    getPtyId: vi.fn(() => ptyId),
-    getConnectionId: vi.fn(() => null)
-  }
-}
diff --git a/src/renderer/src/components/tab-bar/native-chat-cli-fork-run.test.ts b/src/renderer/src/components/tab-bar/native-chat-cli-fork-run.test.ts
index aa84f9e13ad9..e03f6de0683d 100644
--- a/src/renderer/src/components/tab-bar/native-chat-cli-fork-run.test.ts
+++ b/src/renderer/src/components/tab-bar/native-chat-cli-fork-run.test.ts
@@ -1,3 +1,4 @@
+import { conversationSwitchFailureText } from '@/lib/conversation-switch-feedback'
 import { beforeEach, expect, it, vi } from 'vitest'
 import { runNativeChatCliFork } from './native-chat-cli-fork-run'
 import type * as LaunchFeedback from '../right-sidebar/ai-vault-session-launch-feedback'
@@ -124,13 +125,13 @@ it('lets the destination finish after dispatch and passes no source resume ident
     closeSource()
     return { tabId: null, runtimeLaunch: Promise.resolve({ status: 'created' }) }
   })
-  await runNativeChatCliFork(args)
+  await runNativeChatCliFork({ ...args, queuedMessage: 'Claude copy opens in a new terminal.' })
   expect(mocks.launch).toHaveBeenCalledWith({
     agent: 'claude',
     worktreeId: 'workspace-1',
     command: 'claude --resume source --fork-session'
   })
-  expect(mocks.notify).toHaveBeenCalledWith('claude')
+  expect(mocks.notify).toHaveBeenCalledWith('claude', 'Claude copy opens in a new terminal.')
   expect(mocks.error).not.toHaveBeenCalled()
 })
 
@@ -202,3 +203,30 @@ it.each([
     expect(mocks.listeners.size).toBe(0)
   }
 )
+
+it.each(['prepare', 'launch'])(
+  'unified old Continue sanitizes its %s failure once',
+  async (stage) => {
+    mocks.prepare.mockResolvedValue(prepared)
+    if (stage === 'prepare') {
+      mocks.prepare.mockRejectedValue(new Error('raw provider secret'))
+    } else {
+      mocks.launch.mockReturnValue({
+        tabId: null,
+        runtimeLaunch: Promise.resolve({ status: 'failed', message: 'raw provider secret' })
+      })
+    }
+    await runNativeChatCliFork({
+      ...args,
+      describeFailure: (message) =>
+        conversationSwitchFailureText(new Error(message), {
+          agent: args.agent,
+          direction: 'terminal'
+        })
+    })
+    expect(mocks.error).toHaveBeenCalledExactlyOnceWith(
+      'Claude could not start in a terminal. Check its setup and try again.'
+    )
+    expect(mocks.notify).not.toHaveBeenCalled()
+  }
+)
diff --git a/src/renderer/src/components/tab-bar/native-chat-cli-fork-run.ts b/src/renderer/src/components/tab-bar/native-chat-cli-fork-run.ts
index 921c0223e3ef..25c906b0ba76 100644
--- a/src/renderer/src/components/tab-bar/native-chat-cli-fork-run.ts
+++ b/src/renderer/src/components/tab-bar/native-chat-cli-fork-run.ts
@@ -51,6 +51,9 @@ export async function runNativeChatCliFork(args: {
   subject: NativeChatCliForkSubject
   tab: { id: string; worktreeId: string }
   agent: AiVaultAgent
+  viewerSelection?: string
+  queuedMessage?: string
+  describeFailure?: (message: string) => string
   onComplete?: () => void
   commandOverrides?: Partial<Record<AiVaultAgent, string | null>>
 }): Promise<void> {
@@ -143,15 +146,21 @@ export async function runNativeChatCliFork(args: {
     }
     stop()
     await launchAiVaultSessionAndReveal(
-      { agent: target.agent, worktreeId: subject.workspaceId, ...startup },
-      describeAiVaultCliForkFailure
+      {
+        agent: target.agent,
+        worktreeId: subject.workspaceId,
+        ...startup,
+        ...(args.viewerSelection ? { viewerSelection: args.viewerSelection } : {})
+      },
+      args.describeFailure ?? describeAiVaultCliForkFailure,
+      args.queuedMessage
     )
   } catch (error) {
     if (pending.get(key) === controller) {
       notifyAiVaultSessionPreparationFailure(
         new Error(readIpcErrorMessage(error)),
         args.agent,
-        describeAiVaultCliForkFailure
+        args.describeFailure ?? describeAiVaultCliForkFailure
       )
     }
   } finally {
diff --git a/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.test.ts b/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.test.ts
index a3e446e68adb..7c7b09740b21 100644
--- a/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.test.ts
+++ b/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.test.ts
@@ -1,5 +1,4 @@
-import { EMPTY_STRUCTURED_AGENT_SESSION } from '../../../../shared/structured-agent-session-reducer'
-import type { StructuredAgentSessionReadSnapshot } from '@/components/native-chat/structured-agent-session-read-owner-contract'
+import type { StructuredAgentSessionReadSnapshot } from '@/components/native-chat/structured-agent-session-read-owner'
 import { beforeEach, expect, it, vi } from 'vitest'
 
 const mocks = vi.hoisted(() => {
@@ -82,26 +81,6 @@ beforeEach(() => {
   mocks.call.mockResolvedValue({ source: SOURCE })
 })
 
-it('stops the chat on its host, opens the same-id resume in its slot, leaves retirement to the admitted host launch', async () => {
-  await runNativeChatCliSwitch(SWITCH)
-  expect(mocks.call).toHaveBeenCalledWith({ kind: 'local' }, 'agentSession.switchToTerminal', {
-    sessionId: 'chat-1'
-  })
-  expect(mocks.launch).toHaveBeenCalledWith(
-    expect.objectContaining({
-      agent: 'codex',
-      worktreeId: 'wt-1',
-      command: 'codex resume thread-c',
-      env: { CODEX_HOME: '/accounts/a/home' },
-      providerSession: { key: 'session_id', id: 'thread-c' },
-      afterTabId: 'chat-tab',
-      resumeOrigin: 'switch'
-    })
-  )
-  // The committed host launch hides the source; a client receipt never stops today's native child.
-  expect(mocks.closeUnifiedTab).not.toHaveBeenCalled()
-})
-
 it('preserves readable recovery and never launches from an old Close acknowledgement', async () => {
   mocks.supported = false
   await runNativeChatCliSwitch(SWITCH)
@@ -113,62 +92,3 @@ it('preserves readable recovery and never launches from an old Close acknowledge
   expect(mocks.closeUnifiedTab).not.toHaveBeenCalled()
   expect(mocks.toast).toHaveBeenCalledOnce()
 })
-
-it('keeps the chat when old owner cannot complete Stop, with factual guidance', async () => {
-  mocks.call.mockRejectedValue({
-    data: {
-      refusal: { code: 'agent_session_ownership_unknown', details: { reason: 'ownerUnproven' } }
-    }
-  })
-  await runNativeChatCliSwitch(SWITCH)
-  expect(mocks.launch).not.toHaveBeenCalled()
-  expect(mocks.closeUnifiedTab).not.toHaveBeenCalled()
-  expect(mocks.toast).toHaveBeenCalledWith(
-    expect.stringContaining('could not confirm Codex stopped')
-  )
-})
-
-it('composes ordinary Stop before the old strict proven-close switch envelope', async () => {
-  mocks.live.held = {
-    current: true,
-    loadingOlder: false,
-    olderHistoryGeneration: 0,
-    state: {
-      ...EMPTY_STRUCTURED_AGENT_SESSION,
-      fence: 8,
-      working: true,
-      latestTurn: { itemId: 'turn', observedAt: 1, turn: { turnId: 'turn', state: 'running' } }
-    }
-  }
-  const stop = Promise.withResolvers<{ ok: boolean }>()
-  mocks.call.mockImplementation((_target, method) =>
-    method === 'agentSession.cancel' ? stop.promise : Promise.resolve({ source: SOURCE })
-  )
-  const switching = runNativeChatCliSwitch(SWITCH)
-  await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-  expect(mocks.launch).not.toHaveBeenCalled()
-  expect(mocks.call.mock.calls[0][2]).toEqual({
-    envelope: expect.objectContaining({
-      sessionId: SWITCH.sessionId,
-      expectedRuntimeFence: 8
-    })
-  })
-  stop.resolve({ ok: true })
-  await switching
-  expect(mocks.call.mock.calls.map((call) => call[1])).toEqual([
-    'agentSession.cancel',
-    'agentSession.switchToTerminal'
-  ])
-  expect(mocks.call.mock.calls[1][2]).toEqual({ sessionId: SWITCH.sessionId })
-  expect(mocks.launch).toHaveBeenCalledOnce()
-})
-
-it('does not override navigation while the old proven-close owner is pending', async () => {
-  mocks.call.mockImplementation(async () => {
-    mocks.live.view = 'settings'
-    return { source: SOURCE }
-  })
-  await runNativeChatCliSwitch(SWITCH)
-  expect(mocks.launch).not.toHaveBeenCalled()
-  expect(mocks.toast).not.toHaveBeenCalled()
-})
diff --git a/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts b/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts
index a52a663e7ec7..55b906f2adfa 100644
--- a/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts
+++ b/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts
@@ -13,15 +13,11 @@ import {
 import { conversationSwitchFailureText } from '@/lib/conversation-switch-feedback'
 import { toast } from 'sonner'
 import { useAppStore } from '@/store'
-import { buildAiVaultResumeStartupForWorktree } from '@/lib/ai-vault-resume-command'
-import { launchAiVaultSessionInNewTab } from '@/lib/launch-ai-vault-session'
 import { callStructuredAgentSession } from '@/runtime/structured-agent-session-client'
 import { structuredAgentSessionTargetForHost } from '@/runtime/structured-agent-session-owner'
-import { AiVaultChatForkSourceSchema } from '../../../../shared/ai-vault-chat-fork-contract'
 import type { AiVaultAgent } from '../../../../shared/ai-vault-types'
 import { getExecutionHostIdForWorktree } from '@/lib/worktree-runtime-owner'
 import { parseExecutionHostId } from '../../../../shared/execution-host'
-import { captureConversationSwitchSelection } from '@/lib/conversation-switch-state'
 
 const changed = conversationSwitchChanged
 /** Moves a chat's conversation into a terminal on the same id: the host proves the chat stopped, the
@@ -34,6 +30,7 @@ export async function runLegacyNativeChatCliSwitch(args: {
   chatTabId: string | null
   onComplete?: () => void
   viewerSelection?: string
+  reportFailure?: (error: unknown) => void
 }): Promise<void> {
   const key = `${args.executionHostId}\0${args.sessionId}\0legacy`
   const target = structuredAgentSessionTargetForHost(args.executionHostId)
@@ -41,25 +38,6 @@ export async function runLegacyNativeChatCliSwitch(args: {
   if (pending.has(key) || !target || !hostId) {
     return
   }
-  const stillSelected = captureConversationSwitchSelection(args.viewerSelection)
-  const sourceTab = useAppStore
-    .getState()
-    .unifiedTabsByWorktree?.[args.workspaceId]?.find((tab) => tab.id === args.chatTabId)
-  const stillCaptured = () => {
-    const state = useAppStore.getState()
-    const current = state.unifiedTabsByWorktree?.[args.workspaceId]?.find(
-      (tab) => tab.id === args.chatTabId
-    )
-    return (
-      getExecutionHostIdForWorktree(state, args.workspaceId) === args.executionHostId &&
-      (!sourceTab ||
-        Boolean(
-          current &&
-          current.entityId === sourceTab.entityId &&
-          current.groupId === sourceTab.groupId
-        ))
-    )
-  }
   pending.set(key, args)
   try {
     changed()
@@ -103,53 +81,23 @@ export async function runLegacyNativeChatCliSwitch(args: {
         }
       }
     }
-    if (!(await supports(`agent-session.structured.switch.v1:${args.agent}`))) {
-      // Ordinary old Close can hide before proving exit; reveal readable recovery and never infer proof from its ACK.
-      try {
-        await callStructuredAgentSession(target, 'agentSession.close', {
-          sessionId: args.sessionId
-        })
-      } catch {
-        // The original Close has no positive exit receipt on this peer.
-      } finally {
-        await callStructuredAgentSession(target, 'agentSession.reveal', {
-          sessionId: args.sessionId
-        }).catch(() => {})
-      }
-      throw agentSessionRefusalError('agent_session_ownership_unknown', { reason: 'ownerUnproven' })
-    }
-    const answered = await callStructuredAgentSession<{ source: unknown }>(
-      target,
-      'agentSession.switchToTerminal',
-      { sessionId: args.sessionId }
-    )
-    const source = AiVaultChatForkSourceSchema.parse(answered.source)
-    if (!stillSelected() || !stillCaptured()) {
-      return
-    }
-    const state = useAppStore.getState()
-    const startup = buildAiVaultResumeStartupForWorktree({
-      state,
-      worktreeId: args.workspaceId,
-      session: { ...source, executionHostId: hostId },
-      commandOverride: state.settings?.agentCmdOverrides?.[source.agent]
-    })
-    const launch = launchAiVaultSessionInNewTab({
-      agent: source.agent,
-      worktreeId: args.workspaceId,
-      ...startup,
-      ...(args.chatTabId ? { afterTabId: args.chatTabId } : {}),
-      resumeOrigin: 'switch',
-      canActivate: stillSelected
-    })
-    const outcome = launch.tabId === null ? await launch.runtimeLaunch : null
-    if (outcome && outcome.status !== 'created') {
-      throw new Error(outcome.status === 'failed' ? outcome.message : undefined)
+    // Ordinary old Close has no positive exit receipt; keep readable recovery without launching.
+    try {
+      await callStructuredAgentSession(target, 'agentSession.close', { sessionId: args.sessionId })
+    } finally {
+      await callStructuredAgentSession(target, 'agentSession.reveal', {
+        sessionId: args.sessionId
+      }).catch(() => {})
     }
-    // The execution host retires only the source presentation after its explicit admitted result.
-    // A tab allocation or generic create receipt says nothing about admission.
+    throw agentSessionRefusalError('agent_session_ownership_unknown', { reason: 'ownerUnproven' })
   } catch (error) {
-    toast.error(conversationSwitchFailureText(error, { agent: args.agent, direction: 'terminal' }))
+    if (args.reportFailure) {
+      args.reportFailure(error)
+    } else {
+      toast.error(
+        conversationSwitchFailureText(error, { agent: args.agent, direction: 'terminal' })
+      )
+    }
   } finally {
     pending.delete(key)
     try {
diff --git a/src/renderer/src/components/tab-bar/tab-session-history-switch.parity.test.ts b/src/renderer/src/components/tab-bar/tab-session-history-switch.parity.test.ts
index 022d5763cada..196a9e30075f 100644
--- a/src/renderer/src/components/tab-bar/tab-session-history-switch.parity.test.ts
+++ b/src/renderer/src/components/tab-bar/tab-session-history-switch.parity.test.ts
@@ -16,12 +16,12 @@ import {
   type TabSessionHistorySubject
 } from './tab-session-history-switch'
 
+const { readLocalCapabilities } = vi.hoisted(() => ({ readLocalCapabilities: vi.fn() }))
+
 // Stage host IPC capabilities only; run the shared panel/tab composition for real.
 vi.mock('@/runtime/local-runtime-capabilities', async (importOriginal) => ({
   ...(await importOriginal<Record<string, unknown>>()),
-  readLocalRuntimeCapabilitiesOrUnknown: () => [
-    STRUCTURED_AGENT_SESSION_RESUME_HISTORY_RUNTIME_CAPABILITY
-  ]
+  readLocalRuntimeCapabilitiesOrUnknown: readLocalCapabilities
 }))
 vi.mock('@/lib/agent-session-launch-plan', async (importOriginal) => ({
   ...(await importOriginal<Record<string, unknown>>()),
@@ -86,19 +86,25 @@ function panelTargets(state: AppState, session: AiVaultSession) {
       settings: state.settings
     })
   )
-  return resolveAiVaultSessionRowChatActions({
-    session,
-    originalPaneTarget: null,
-    structuredSessionOpen: false,
-    resumeState: result.current.getSessionResumeState(session),
-    resumeInChat: result.current.getSessionResumeInChat(session),
-    searchHit: undefined
-  })
+  return {
+    worktreeInfo: result.current.getSessionWorktreeInfo(session),
+    ...resolveAiVaultSessionRowChatActions({
+      session,
+      originalPaneTarget: null,
+      structuredSessionOpen: false,
+      resumeState: result.current.getSessionResumeState(session),
+      resumeInChat: result.current.getSessionResumeInChat(session),
+      searchHit: undefined
+    })
+  }
 }
 
 const request = { scopePaths: [], executionHostScope: 'local', sessionLimit: 250 } as const
 
 beforeEach(() => {
+  readLocalCapabilities.mockReturnValue([
+    STRUCTURED_AGENT_SESSION_RESUME_HISTORY_RUNTIME_CAPABILITY
+  ])
   makeState()
 })
 
@@ -122,36 +128,22 @@ describe('the tab menu offers exactly what the Session History row offers', () =
     })
   })
 
-  it.each(['local', 'ssh:unavailable'] as const)(
-    'keeps an owned conversation eligible only on its supported switch route (%s)',
-    (executionHostId) => {
-      useAppStore.setState((state) => ({
-        repos: state.repos.map((repo) => ({ ...repo, executionHostId }))
-      }))
-      const state = useAppStore.getState()
-      const owned = row({
-        executionHostId,
-        structuredSession: { sessionId: 'orca-chat-1', workspaceId: WORKTREE_ID }
+  it('nothing for a CLI conversation a native chat already holds', () => {
+    const state = useAppStore.getState()
+    const owned = row({
+      structuredSession: { sessionId: 'orca-chat-1', workspaceId: WORKTREE_ID }
+    })
+    expect(panelTargets(state, owned).resumeInNewChatWorkspaceId).toBeNull()
+    expect(
+      resolveTabSessionSwitch(state, owned, {
+        kind: 'cli',
+        agent: 'claude',
+        providerSessionId: owned.sessionId,
+        workspaceId: WORKTREE_ID,
+        request
       })
-      const panel = panelTargets(state, owned)
-      expect(panel.resumeInNewChatWorkspaceId).toBe(
-        executionHostId === 'local' ? WORKTREE_ID : null
-      )
-      expect(
-        resolveTabSessionSwitch(state, owned, {
-          kind: 'cli',
-          agent: 'claude',
-          providerSessionId: owned.sessionId,
-          workspaceId: WORKTREE_ID,
-          request: { ...request, executionHostScope: executionHostId }
-        })
-      ).toEqual(
-        executionHostId === 'local'
-          ? { action: 'resume-in-new-chat', worktreeId: WORKTREE_ID }
-          : null
-      )
-    }
-  )
+    ).toBeNull()
+  })
 
   it("Switch to Chat in the conversation's own worktree when that differs", () => {
     const state = useAppStore.getState()
diff --git a/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts b/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts
index 7a0e594a43c9..b13c00fe890c 100644
--- a/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts
+++ b/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts
@@ -7,17 +7,12 @@ import {
   chatSubject,
   cliSubject
 } from './tab-session-history-fixtures.test-fixture'
-import { switchAiVaultSessionToNativeChat } from '../right-sidebar/ai-vault-session-in-place-switch'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { useAppStore } from '@/store'
 import type { AppState } from '@/store/types'
 import { makeTerminalTab } from '../worktree-jump-palette-test-fixtures'
 import { makeAgentStatusEntry } from '@/runtime/sync-runtime-graph-test-harness'
-import {
-  collectAgentPaneConversations,
-  resolvePaneLastAgentConversation,
-  collectAiVaultTitleRequests
-} from '@/lib/ai-vault-tab-title-requests'
+import { collectAiVaultTitleRequests } from '@/lib/ai-vault-tab-title-requests'
 import { resolveCliChatResumeSource } from './cli-chat-resume-source'
 import { applyProviderSessionOnlyUpdate } from '@/hooks/ipc-events/agent-status-partial-updates'
 import type { AiVaultListArgs, AiVaultSession } from '../../../../shared/ai-vault-types'
@@ -483,14 +478,13 @@ describe('one pane of a terminal tab', () => {
   })
 
   it.each(Object.keys(exitedAgentRecords))(
-    'keeps the History move off once the agent exited and only a %s record remains',
+    'offers nothing once the agent exited and only a %s record remains, as the tab menu does',
     (kind) => {
       makeState()
       useAppStore.setState(exitedAgentRecords[kind])
       const exited = useAppStore.getState()
       expect(paneSubject(exited, claudePane)).toBeNull()
-      // The pane's switch to native chat stays offered after the agent exits: that is when it works.
-      expect(paneGate(exited, claudePane)).toBe(true)
+      expect(paneGate(exited, claudePane)).toBe(false)
       expect(
         resolveTabSessionHistorySubject(exited, { tab: { id: 'term-1', worktreeId: WORKTREE_ID } })
       ).toBeNull()
@@ -782,72 +776,3 @@ describe('lookupTabSessionHistoryRow', () => {
     expect(listCache.readCachedAiVaultSessionList(PANEL_REQUEST)).toBeNull()
   })
 })
-
-it.each(['local', 'runtime:paired-host'] as const)(
-  'History returns an owned same-id conversation on %s even with no local source pane',
-  (executionHostId) => {
-    makeState()
-    mocks.inPlaceSwitch = true
-    mocks.switchOwner.mockClear()
-    const structuredSession = { sessionId: 'owned-codex', workspaceId: WORKTREE_ID }
-    expect(
-      switchAiVaultSessionToNativeChat(row({ agent: 'codex', executionHostId, structuredSession }))
-    ).toBe(true)
-    expect(mocks.switchOwner).toHaveBeenCalledWith(
-      expect.objectContaining({
-        agent: 'codex',
-        direction: 'chat',
-        workspaceId: WORKTREE_ID,
-        sessionId: structuredSession.sessionId,
-        executionHostId
-      })
-    )
-    mocks.inPlaceSwitch = false
-  }
-)
-
-it('uses one same-pane evidence order in History, the pane action and its feasibility gate', () => {
-  makeState()
-  const paneKey = 'term-1:11111111-1111-4111-8111-111111111111'
-  const sleeping = exitedAgentRecords.sleeping.sleepingAgentSessionsByPaneKey!['term-1:leaf-1']
-  const retained = exitedAgentRecords.retained.retainedAgentsByPaneKey!['term-1:leaf-1']
-  useAppStore.setState({
-    sleepingAgentSessionsByPaneKey: {
-      [paneKey]: { ...sleeping, paneKey, providerSession: { key: 'session_id', id: 'C' } }
-    },
-    retainedAgentsByPaneKey: {
-      [paneKey]: {
-        ...retained,
-        entry: { ...retained.entry, paneKey, providerSession: { key: 'session_id', id: 'X' } }
-      }
-    }
-  })
-  const isClaude = (agent: unknown): agent is 'claude' => agent === 'claude'
-  const state = useAppStore.getState()
-  const pane = { worktreeId: WORKTREE_ID, paneKey }
-  const collected = collectAgentPaneConversations(state, isClaude, {
-    allPanes: true
-  })
-  expect(collected).toHaveLength(1)
-  expect(collected[0].providerSession.id).toBe('C')
-  const layouts = { ...state.terminalLayoutsByTabId }
-  Object.defineProperty(layouts, 'unrelated-tab', {
-    get: () => {
-      throw new Error('Exact-pane lookup scanned an unrelated layout')
-    }
-  })
-  const addressedState = {
-    ...state,
-    terminalLayoutsByTabId: layouts,
-    tabsByWorktree: {
-      ...state.tabsByWorktree,
-      [WORKTREE_ID]: [
-        ...state.tabsByWorktree[WORKTREE_ID],
-        { ...state.tabsByWorktree[WORKTREE_ID][0], id: 'unrelated-tab' }
-      ]
-    }
-  }
-  expect(resolvePaneLastAgentConversation(addressedState, pane, isClaude)).toEqual(collected[0])
-  expect(canPaneOfferResumeInNewChat(state, pane)).toBe(true)
-  expect(collectAgentPaneConversations(state, isClaude, { runningAgentsOnly: true })).toEqual([])
-})
diff --git a/src/renderer/src/components/tab-bar/tab-session-history-switch.ts b/src/renderer/src/components/tab-bar/tab-session-history-switch.ts
index 4c6a79d55e46..55698d4ff0c4 100644
--- a/src/renderer/src/components/tab-bar/tab-session-history-switch.ts
+++ b/src/renderer/src/components/tab-bar/tab-session-history-switch.ts
@@ -83,7 +83,26 @@ export function resolvePaneResumeInNewChatOffer(
   state: AppState,
   pane: { worktreeId: string; paneKey: string }
 ): PaneResumeInNewChatOffer {
-  const conversation = resolvePaneLastAgentConversation(state, pane, adoptsCliConversations)
+  return conversationResumeOffer(
+    state,
+    resolvePaneAgentConversation(state, pane, adoptsCliConversations)
+  )
+}
+
+export function resolvePaneSwitchToChatOffer(
+  state: AppState,
+  pane: { worktreeId: string; paneKey: string }
+): PaneResumeInNewChatOffer {
+  return conversationResumeOffer(
+    state,
+    resolvePaneLastAgentConversation(state, pane, adoptsCliConversations)
+  )
+}
+
+function conversationResumeOffer(
+  state: AppState,
+  conversation: ReturnType<typeof resolvePaneLastAgentConversation>
+): PaneResumeInNewChatOffer {
   if (!conversation) {
     return null
   }
diff --git a/src/renderer/src/components/tab-bar/use-tab-bar-item-actions.ts b/src/renderer/src/components/tab-bar/use-tab-bar-item-actions.ts
index 1a78071df886..20d410d9b453 100644
--- a/src/renderer/src/components/tab-bar/use-tab-bar-item-actions.ts
+++ b/src/renderer/src/components/tab-bar/use-tab-bar-item-actions.ts
@@ -1,3 +1,4 @@
+import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { useLayoutEffect, useMemo, useRef } from 'react'
 import { clearClientHostedBrowserRowSelection } from '@/lib/pane-manager/client-hosted-browser-row-state'
 import { noteUserWorkspaceSwitch } from '@/lib/workspace-switch-user-act'
@@ -70,6 +71,10 @@ export function useTabBarItemActions(source: TabBarItemActionSource): TabBarItem
       noteUserWorkspaceSwitch(useAppStore.getState().activeWorktreeId)
       activate()
     }
+    const navigate = (action: () => void): void => {
+      noteViewerNavigation()
+      action()
+    }
     const actions: TabBarItemActions = {
       activateTerminal: (tabId) => activateRealTab(() => latest.current.props.onActivate(tabId)),
       activateFile: (fileId) =>
@@ -78,14 +83,14 @@ export function useTabBarItemActions(source: TabBarItemActionSource): TabBarItem
         activateRealTab(() => latest.current.props.onActivateBrowserTab?.(tabId)),
       activateAgentSession: (tabId) =>
         activateRealTab(() => latest.current.props.onActivateAgentSession?.(tabId)),
-      close: (tabId) => latest.current.props.onClose(tabId),
-      closeFile: (fileId) => latest.current.props.onCloseFile?.(fileId),
-      closeBrowserTab: (tabId) => latest.current.props.onCloseBrowserTab?.(tabId),
-      closeOthers: (tabId) => latest.current.props.onCloseOthers(tabId),
-      closeToRight: (tabId) => latest.current.props.onCloseToRight(tabId),
-      closeToLeft: (tabId) => latest.current.props.onCloseToLeft(tabId),
-      closeSplitPane: () => latest.current.props.onCloseSplitPane?.(),
-      closeAllFiles: () => latest.current.props.onCloseAllFiles?.(),
+      close: (tabId) => navigate(() => latest.current.props.onClose(tabId)),
+      closeFile: (fileId) => navigate(() => latest.current.props.onCloseFile?.(fileId)),
+      closeBrowserTab: (tabId) => navigate(() => latest.current.props.onCloseBrowserTab?.(tabId)),
+      closeOthers: (tabId) => navigate(() => latest.current.props.onCloseOthers(tabId)),
+      closeToRight: (tabId) => navigate(() => latest.current.props.onCloseToRight(tabId)),
+      closeToLeft: (tabId) => navigate(() => latest.current.props.onCloseToLeft(tabId)),
+      closeSplitPane: () => navigate(() => latest.current.props.onCloseSplitPane?.()),
+      closeAllFiles: () => navigate(() => latest.current.props.onCloseAllFiles?.()),
       setCustomTitle: (tabId, title) => latest.current.props.onSetCustomTitle(tabId, title),
       setTabColor: (tabId, color) => latest.current.props.onSetTabColor(tabId, color),
       togglePaneExpand: (tabId) => latest.current.props.onTogglePaneExpand(tabId),
@@ -94,7 +99,7 @@ export function useTabBarItemActions(source: TabBarItemActionSource): TabBarItem
       makePreviewFilePermanent: (fileId, tabId) =>
         latest.current.props.onMakePreviewFilePermanent?.(fileId, tabId),
       togglePinned: (item) => latest.current.togglePinned(item),
-      toggleViewMode: (tabId) => latest.current.toggleTabViewMode(tabId)
+      toggleViewMode: (tabId) => navigate(() => latest.current.toggleTabViewMode(tabId))
     }
     return ORCA_LAYOUT_OWNER_IS_MAIN
       ? { ...actions, ...withLayoutOwnerTabProps(actions, () => latest.current.props.worktreeId) }
diff --git a/src/renderer/src/components/tab-group/tab-drag-drop-commit.ts b/src/renderer/src/components/tab-group/tab-drag-drop-commit.ts
index ca7f1e27c8e3..ca1ff0baddf6 100644
--- a/src/renderer/src/components/tab-group/tab-drag-drop-commit.ts
+++ b/src/renderer/src/components/tab-group/tab-drag-drop-commit.ts
@@ -1,3 +1,4 @@
+import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import type { RefObject } from 'react'
 import type { DragEndEvent } from '@dnd-kit/core'
 import { useAppStore } from '../../store'
@@ -63,6 +64,7 @@ export function commitTabDragDrop({
       finishDrag(true)
       return
     }
+    noteViewerNavigation()
     const moved = dropUnifiedTab(activeData.unifiedTabId, {
       groupId: paneColumnSplit.groupId,
       splitDirection: paneColumnSplit.zone
@@ -158,6 +160,7 @@ export function commitTabDragDrop({
         finishDrag(true)
         return
       }
+      noteViewerNavigation()
       const moved = dropUnifiedTab(activeData.unifiedTabId, {
         groupId: overData.groupId,
         index
@@ -194,6 +197,7 @@ export function commitTabDragDrop({
         finishDrag(true)
         return
       }
+      noteViewerNavigation()
       const moved = dropUnifiedTab(activeData.unifiedTabId, {
         groupId: overData.groupId
       })
diff --git a/src/renderer/src/components/tab-group/tab-group-layout-owner-commands.ts b/src/renderer/src/components/tab-group/tab-group-layout-owner-commands.ts
index ae33f4c836c2..fbdd21271667 100644
--- a/src/renderer/src/components/tab-group/tab-group-layout-owner-commands.ts
+++ b/src/renderer/src/components/tab-group/tab-group-layout-owner-commands.ts
@@ -1,3 +1,4 @@
+import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 // Main frames/reconnect snapshots draw moves and select them unless selection changed; divider ratios persist on release.
 
 import { useAppStore } from '@/store'
@@ -27,6 +28,9 @@ export function dropTabThroughLayoutOwner(worktreeId: string, drop: TabDrop): bo
   if (!command) {
     return false
   }
+  if (drop.kind !== 'reorder') {
+    noteViewerNavigation()
+  }
   const forget = expectSelectionAfterMove(worktreeId, drop)
   const sent = sendLayoutCommandToOwner(worktreeId, command, {
     // Forget after the answering frame; without a stream, retain selection intent for the reconnect snapshot.
diff --git a/src/renderer/src/components/tab-group/useTabGroupActivationCommands.ts b/src/renderer/src/components/tab-group/useTabGroupActivationCommands.ts
index 517d2d8860ba..ec3cda39716c 100644
--- a/src/renderer/src/components/tab-group/useTabGroupActivationCommands.ts
+++ b/src/renderer/src/components/tab-group/useTabGroupActivationCommands.ts
@@ -1,3 +1,4 @@
+import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { useCallback } from 'react'
 import type { Tab } from '../../../../shared/tab-types'
 import { useAppStore } from '../../store'
@@ -36,6 +37,7 @@ export function useTabGroupActivationCommands({
       if (!item) {
         return
       }
+      noteViewerNavigation()
       focusGroup(worktreeId, groupId)
       activateTab(item.id)
       const runtimeEnvironmentId = runtimeEnvironmentIdOrLocalUnlessTwin(
@@ -94,6 +96,7 @@ export function useTabGroupActivationCommands({
       if (!item) {
         return
       }
+      noteViewerNavigation()
       focusGroup(worktreeId, groupId)
       activateTab(item.id)
       if (item.contentType === 'simulator') {
@@ -115,6 +118,7 @@ export function useTabGroupActivationCommands({
       if (!item) {
         return
       }
+      noteViewerNavigation()
       focusGroup(worktreeId, groupId)
       activateTab(item.id)
       const runtimeEnvironmentId = runtimeEnvironmentIdOrLocalUnlessTwin(
@@ -139,6 +143,7 @@ export function useTabGroupActivationCommands({
 
   const activateAgentSession = useCallback(
     (tabId: string) => {
+      noteViewerNavigation()
       activateStructuredAgentSessionTab({ worktreeId, tabId })
     },
     [worktreeId]
diff --git a/src/renderer/src/components/tab-group/useTabGroupCreationCommands.ts b/src/renderer/src/components/tab-group/useTabGroupCreationCommands.ts
index 95c674cf9e8c..71d4cec4853d 100644
--- a/src/renderer/src/components/tab-group/useTabGroupCreationCommands.ts
+++ b/src/renderer/src/components/tab-group/useTabGroupCreationCommands.ts
@@ -1,3 +1,4 @@
+import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { toast } from 'sonner'
 import { useAppStore } from '../../store'
 import { focusTerminalTabSurface } from '../../lib/focus-terminal-tab-surface'
@@ -40,12 +41,14 @@ export function useTabGroupCreationCommands({
 
   return {
     newBrowserTab: () => {
+      noteViewerNavigation()
       void openNewBrowserTabInActiveWorkspace(groupId).catch((error) => {
         toast.error(error instanceof Error ? error.message : String(error))
       })
     },
     newSimulatorTab: worktreeState.mobileEmulatorEnabled
       ? () => {
+          noteViewerNavigation()
           if (getSimulatorTabForWorktree(worktreeId)) {
             void ensureSimulatorTab(worktreeId, { surfacePane: true })
             return
@@ -59,9 +62,11 @@ export function useTabGroupCreationCommands({
         }
       : undefined,
     openEntry: async (args: TabCreateEntryArgs) => {
+      noteViewerNavigation()
       await openTabBarEntry(args)
     },
     duplicateBrowserTab: (browserTabId: string, sourceUnifiedTabId: string) => {
+      noteViewerNavigation()
       void (async () => {
         const state = useAppStore.getState()
         const tabs = state.browserTabsByWorktree[worktreeId] ?? []
@@ -110,12 +115,15 @@ export function useTabGroupCreationCommands({
     },
     // Why: target the owning group explicitly; the "+" menu can fire from an unfocused panel without updating global group focus.
     newFileTab: async () => {
+      noteViewerNavigation()
       await openNewMarkdownInActiveWorkspace(groupId)
     },
     newTerminalTab: () => {
+      noteViewerNavigation()
       void openNewTerminalTabInActiveWorkspace(groupId)
     },
     newTerminalWithShell: (shellOverride: string) => {
+      noteViewerNavigation()
       void (async () => {
         const environmentId = runtimeEnvironmentIdOrLocalUnlessTwin(
           useAppStore.getState(),
diff --git a/src/renderer/src/components/tab-group/useTabGroupWorkspaceModel.ts b/src/renderer/src/components/tab-group/useTabGroupWorkspaceModel.ts
index 662721214e45..b54233cb01bf 100644
--- a/src/renderer/src/components/tab-group/useTabGroupWorkspaceModel.ts
+++ b/src/renderer/src/components/tab-group/useTabGroupWorkspaceModel.ts
@@ -1,3 +1,4 @@
+import { noteViewerGroupNavigation } from '@/lib/viewer-selection-request'
 import { useShallow } from 'zustand/react/shallow'
 import type { BrowserTab as BrowserTabState } from '../../../../shared/browser-workspace-types'
 import type { Tab, TabGroup } from '../../../../shared/tab-types'
@@ -88,6 +89,7 @@ export function useTabGroupWorkspaceModel({
     expandedPaneByTabId: worktreeState.expandedPaneByTabId,
     commands: {
       focusGroup: () => {
+        noteViewerGroupNavigation(useAppStore.getState(), worktreeId, groupId)
         focusGroup(worktreeId, groupId)
       },
       activateAgentSession,
diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneOverlayLayer.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneOverlayLayer.tsx
index 0db5597d9b2c..8596c09f973d 100644
--- a/src/renderer/src/components/terminal-pane/TerminalPaneOverlayLayer.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalPaneOverlayLayer.tsx
@@ -1,3 +1,4 @@
+import { noteViewerGroupNavigation } from '@/lib/viewer-selection-request'
 import { memo, useCallback, useMemo } from 'react'
 import { useShallow } from 'zustand/react/shallow'
 import type { Tab, TabGroup } from '../../../../shared/tab-types'
@@ -76,7 +77,10 @@ const TerminalPaneOverlayLayer = memo(function TerminalPaneOverlayLayer({
   )
 
   const focusOwningGroup = useCallback(
-    (groupId: string) => focusGroup(worktreeId, groupId),
+    (groupId: string) => {
+      noteViewerGroupNavigation(useAppStore.getState(), worktreeId, groupId)
+      focusGroup(worktreeId, groupId)
+    },
     [focusGroup, worktreeId]
   )
 
diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.held-job.test.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.held-job.test.tsx
index fe1e386a5635..0b938f0753e1 100644
--- a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.held-job.test.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.held-job.test.tsx
@@ -9,26 +9,17 @@ import {
   makeTerminalTab
 } from '@/store/slices/worktrees-slice-test-fixtures'
 import { TooltipProvider } from '@/components/ui/tooltip'
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuTrigger
-} from '@/components/ui/dropdown-menu'
-import { CliChatResumeMenuItems } from '../tab-bar/CliChatResumeMenuItems'
 import { TerminalPaneResumeInChatButton } from './TerminalPaneResumeInChatButton'
-import { resolveCliChatResumeSource } from '../tab-bar/cli-chat-resume-source'
-import { conversationSwitchFailureText } from '@/lib/conversation-switch-feedback'
 import { STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY } from '../../../../shared/protocol-version'
-import { agentSessionRefusalError } from '../../../../shared/agent-session-wire-refusals'
 vi.mock('@/runtime/local-runtime-capabilities', () => ({
   ensureLocalRuntimeCapabilities: async () => [STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY],
   readLocalRuntimeCapabilitiesOrUnknown: () => [STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY],
   subscribeLocalRuntimeCapabilityObservation: () => () => {}
 }))
 afterEach(cleanup)
-it.each(['foreground', 'suspended'] as const)(
+it.each(['suspended'] as const)(
   'keeps the real Claude header/menu switchable during held %s work and after exit',
-  (job) => {
+  () => {
     useAppStore.setState(useAppStore.getInitialState(), true)
     const paneKey = 'shell:3f2504e0-4f89-41d3-9a0c-0305e82c3301'
     useAppStore.setState({
@@ -56,74 +47,20 @@ it.each(['foreground', 'suspended'] as const)(
       )
     useAppStore.getState().setPaneForegroundAgent(paneKey, {
       agent: 'claude',
-      shellForeground: job === 'suspended',
-      ...(job === 'suspended' ? { suspendedAgent: 'claude' as const } : {})
-    })
-    const source = resolveCliChatResumeSource(useAppStore.getState(), {
-      tab: { id: 'shell', worktreeId: 'wt-1' },
-      paneKey
+      shellForeground: true,
+      suspendedAgent: 'claude'
     })
-    expect(source).toMatchObject({ agent: 'claude', providerSessionId: 'real-claude' })
     render(
       <TooltipProvider>
         <TerminalPaneResumeInChatButton tabId="shell" worktreeId="wt-1" paneKey={paneKey} />
-        <DropdownMenu open>
-          <DropdownMenuTrigger>Menu</DropdownMenuTrigger>
-          <DropdownMenuContent>
-            <CliChatResumeMenuItems
-              tab={{ id: 'shell', worktreeId: 'wt-1' }}
-              leadingSeparator={false}
-            />
-          </DropdownMenuContent>
-        </DropdownMenu>
       </TooltipProvider>
     )
     const header = screen.getByRole('button', { name: 'Switch to native chat', hidden: true })
     expect(header.hasAttribute('disabled')).toBe(false)
-    expect(
-      screen.getByRole('menuitem', { name: 'Switch to native chat' }).getAttribute('aria-disabled')
-    ).not.toBe('true')
     act(() =>
       useAppStore.getState().setPaneForegroundAgent(paneKey, { agent: null, shellForeground: true })
     )
     expect(header.hasAttribute('disabled')).toBe(false)
-    expect(
-      screen.getByRole('menuitem', { name: 'Switch to native chat' }).getAttribute('aria-disabled')
-    ).not.toBe('true')
-    expect(
-      resolveCliChatResumeSource(useAppStore.getState(), {
-        tab: { id: 'shell', worktreeId: 'wt-1' },
-        paneKey
-      })
-    ).toEqual(source)
-    const refusal = agentSessionRefusalError('agent_session_conflict', {
-      reason: 'conversationHeldElsewhere',
-      source: true
-    })
-    expect(
-      conversationSwitchFailureText(refusal, { agent: 'claude', direction: 'chat', source })
-    ).toBe(
-      'Orca could not confirm Claude stopped in this terminal. Quit Claude here, then try this action again.'
-    )
-    expect(
-      conversationSwitchFailureText(
-        agentSessionRefusalError('agent_session_conflict', {
-          reason: 'conversationHeldElsewhere'
-        }),
-        { agent: 'claude', direction: 'chat', source, history: {} }
-      )
-    ).toBe(
-      'Orca could not confirm Claude stopped. Check its open chats and terminals, then try this action again.'
-    )
-    expect(
-      conversationSwitchFailureText(
-        agentSessionRefusalError('agent_session_conflict', {
-          reason: 'conversationHeldElsewhere',
-          owner: { sessionId: 'other', workspaceId: 'wt-1' }
-        }),
-        { agent: 'claude', direction: 'chat', source }
-      )
-    ).toBe('Claude is open in another chat or terminal. Continue there, then try switching again.')
   }
 )
 
diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.test.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.test.tsx
index eee6ccd38e73..2ca6285a97dc 100644
--- a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.test.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.test.tsx
@@ -1,15 +1,9 @@
 // @vitest-environment happy-dom
-import { act, cleanup, fireEvent, render, screen } from '@testing-library/react'
+import { cleanup, fireEvent, render, screen } from '@testing-library/react'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import { TooltipProvider } from '@/components/ui/tooltip'
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuTrigger
-} from '@/components/ui/dropdown-menu'
 import { useAppStore } from '@/store'
 import { createGlobalSettingsFixture } from '../../../../shared/global-settings-test-fixture'
-import { CliChatResumeMenuItems } from '../tab-bar/CliChatResumeMenuItems'
 import { TerminalPaneResumeInChatButton } from './TerminalPaneResumeInChatButton'
 import type { CliChatResumeSource } from '../tab-bar/cli-chat-resume-source'
 
@@ -78,46 +72,6 @@ it.each([
   expect(screen.getByRole('button').hasAttribute('disabled')).toBe(true)
 })
 
-it('hides header and menu switches while Chat UI is off and follows live setting changes', () => {
-  mocks.source.agent = 'codex'
-  useAppStore.setState({ settings: createGlobalSettingsFixture({ experimentalNativeChat: false }) })
-  render(
-    <TooltipProvider>
-      <TerminalPaneResumeInChatButton tabId="tab-1" worktreeId="wt-1" paneKey="tab-1:leaf" />
-      <DropdownMenu open>
-        <DropdownMenuTrigger>Open</DropdownMenuTrigger>
-        <DropdownMenuContent>
-          <CliChatResumeMenuItems tab={{ id: 'tab-1', worktreeId: 'wt-1' }} leadingSeparator />
-        </DropdownMenuContent>
-      </DropdownMenu>
-    </TooltipProvider>
-  )
-  expect(screen.queryByRole('button', { name: 'Switch to native chat' })).toBeNull()
-  expect(screen.queryByRole('menuitem')).toBeNull()
-  act(() => {
-    useAppStore.getState().setPaneForegroundAgent('tab-1:leaf', {
-      agent: 'codex',
-      shellForeground: false
-    })
-  })
-  expect(screen.queryByRole('button', { name: 'Switch to native chat', hidden: true })).toBeNull()
-  expect(screen.queryByRole('menuitem')).toBeNull()
-  act(() => {
-    useAppStore.setState({
-      settings: createGlobalSettingsFixture({ experimentalNativeChat: true })
-    })
-  })
-  expect(screen.getByRole('button', { name: 'Switch to native chat', hidden: true })).toBeTruthy()
-  expect(screen.getByRole('menuitem', { name: 'Switch to native chat' })).toBeTruthy()
-  act(() => {
-    useAppStore.setState({
-      settings: createGlobalSettingsFixture({ experimentalNativeChat: false })
-    })
-  })
-  expect(screen.queryByRole('button', { name: 'Switch to native chat', hidden: true })).toBeNull()
-  expect(screen.queryByRole('menuitem')).toBeNull()
-})
-
 it('keeps an older host visible but disabled, telling the user to update it', async () => {
   mocks.pending = false
   mocks.run.mockClear()
diff --git a/src/renderer/src/components/terminal-pane/pane-foreground-agent-tracker.test.ts b/src/renderer/src/components/terminal-pane/pane-foreground-agent-tracker.test.ts
index a3ffc77b46df..4d13455aa3ae 100644
--- a/src/renderer/src/components/terminal-pane/pane-foreground-agent-tracker.test.ts
+++ b/src/renderer/src/components/terminal-pane/pane-foreground-agent-tracker.test.ts
@@ -806,45 +806,3 @@ describe('createPaneForegroundAgentTracker', () => {
     expect(publish).not.toHaveBeenCalled()
   })
 })
-
-it('retains a suspended agent at a shell return without granting foreground routing or clearing its header', async () => {
-  vi.useFakeTimers()
-  const publish = vi.fn()
-  const shell = vi.fn()
-  const read = vi.fn().mockResolvedValue({
-    foregroundProcess: 'zsh',
-    hasChildProcesses: true,
-    suspendedAgentProcess: 'codex'
-  })
-  const tracker = createPaneForegroundAgentTracker({
-    getPtyId: () => 'pty-stopped',
-    isTrackablePtyId: () => true,
-    readForegroundProcess: read,
-    confirmForegroundProcess: read,
-    publish,
-    hasKnownAgentIdentity: () => true,
-    onConfirmedShellForeground: shell
-  })
-  try {
-    tracker.onCommandFinished()
-    await vi.advanceTimersByTimeAsync(350)
-    expect(publish).toHaveBeenLastCalledWith(
-      expect.objectContaining({
-        agent: null,
-        suspendedAgent: 'codex',
-        shellForeground: true,
-        routingTrusted: false,
-        routingRevoked: true
-      })
-    )
-    expect(shell).not.toHaveBeenCalled()
-    read.mockResolvedValue({ foregroundProcess: 'zsh', hasChildProcesses: false })
-    tracker.onCommandFinished()
-    await vi.advanceTimersByTimeAsync(350)
-    expect(publish).toHaveBeenLastCalledWith({ agent: null, shellForeground: true })
-    expect(shell).toHaveBeenCalledOnce()
-  } finally {
-    tracker.dispose()
-    vi.useRealTimers()
-  }
-})
diff --git a/src/renderer/src/components/terminal-pane/terminal-file-open-routing.ts b/src/renderer/src/components/terminal-pane/terminal-file-open-routing.ts
index 31056fadf744..99b7b2c6bd47 100644
--- a/src/renderer/src/components/terminal-pane/terminal-file-open-routing.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-file-open-routing.ts
@@ -1,3 +1,4 @@
+import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { downloadAndOpenRemoteTerminalFile } from './terminal-remote-file-download-open'
 import { findWorkspaceFileRoute } from '@/lib/runtime-workspace-file-route'
 import { isPathInsideWorktree, toWorktreeRelativePath } from '../../../../shared/terminal-links'
@@ -83,6 +84,7 @@ export function openDetectedFilePath(
   column: number | null,
   deps: TerminalFileOpenDeps
 ): void {
+  noteViewerNavigation()
   const { openWithSystemDefault = false, runtimeEnvironmentId } = deps
   let { worktreeId, worktreePath } = deps
   let mappedFilePath = mapTerminalFilePath(
diff --git a/src/renderer/src/components/terminal-pane/terminal-handle-links.ts b/src/renderer/src/components/terminal-pane/terminal-handle-links.ts
index dbdb387e5bd5..3a416a2de0dd 100644
--- a/src/renderer/src/components/terminal-pane/terminal-handle-links.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-handle-links.ts
@@ -1,3 +1,4 @@
+import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import type { ILink, ILinkProvider, Terminal } from '@xterm/xterm'
 import type { AppState } from '@/store'
 import { useAppStore } from '@/store'
@@ -145,6 +146,7 @@ export function focusRendererTerminalHandle(
     return false
   }
 
+  noteViewerNavigation()
   revealWorkspaceSurface(store, target.worktreeId)
   store.setActiveTabType('terminal', target.worktreeId)
   if (target.leafId) {
diff --git a/src/renderer/src/components/terminal-pane/terminal-presentation-retirement.test-fixture.ts b/src/renderer/src/components/terminal-pane/terminal-presentation-retirement.test-fixture.ts
index 39d6c771b9d3..a64213671c02 100644
--- a/src/renderer/src/components/terminal-pane/terminal-presentation-retirement.test-fixture.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-presentation-retirement.test-fixture.ts
@@ -1,4 +1,4 @@
-import { vi, type Mock } from 'vitest'
+import { vi } from 'vitest'
 import { renderHook } from '@testing-library/react'
 import { Terminal } from '@xterm/xterm'
 import { SearchAddon } from '@xterm/addon-search'
@@ -23,7 +23,6 @@ import type { PtyTransport } from './pty-transport-types'
 import { useAppStore } from '@/store'
 
 export const LEAF = '11111111-1111-4111-8111-111111111111'
-export const SIBLING = '22222222-2222-4222-8222-222222222222'
 
 function disposable<T extends { dispose(): void }>(value: T): T {
   return Object.assign(value, { dispose: vi.fn<() => void>() })
@@ -72,25 +71,14 @@ function pane(id: number, leafId: string): ManagedPaneInternal {
 
 type MountedOwner = {
   source: ManagedPaneInternal
-  other: ManagedPaneInternal
-  panes: Map<number, ManagedPaneInternal>
   sourceTransport: PtyTransport
   transports: Map<number, PtyTransport>
-  binding: { dispose: Mock }
-  bindings: Map<number, { dispose: Mock }>
-  link: { dispose: Mock }
-  onLayoutChanged: Mock
   manager: PaneManager
-  empty: Mock<() => void>
-  cancelResize: Mock
-  expandedElement: HTMLDivElement
-  setPaneCount: UseTerminalPaneLifecycleDeps['setPaneCount']
   unregister: () => void
 }
 
 /** Uses the production tree teardown, real pane disposer and real mount closure callback. */
 export function mountedOwner(
-  split: boolean,
   address = {
     tabId: 'terminal',
     worktreeId: 'wt-1',
@@ -99,8 +87,7 @@ export function mountedOwner(
   }
 ): MountedOwner {
   const source = pane(1, address.leafId)
-  const other = pane(2, SIBLING)
-  const panes = new Map([[1, source], ...(split ? [[2, other] as const] : [])])
+  const panes = new Map([[1, source]])
   const sourceTransport: PtyTransport = {
     getPtyId: () => address.ptyId,
     detach: vi.fn(),
@@ -197,7 +184,7 @@ export function mountedOwner(
   const onLayoutChanged = vi.fn()
   manager = new PaneManager(document.createElement('div'), { linkOpenHint: () => '' })
   vi.spyOn(manager, 'getPanes').mockImplementation(() => [...panes.values()])
-  vi.spyOn(manager, 'getActivePane').mockImplementation(() => panes.get(2) ?? panes.get(1) ?? null)
+  vi.spyOn(manager, 'getActivePane').mockImplementation(() => panes.get(1) ?? null)
   vi.spyOn(manager, 'retirePanePreservingPty').mockImplementation((id, permanent, failures) =>
     retireManagedPanePreservingPty(
       {
@@ -260,19 +247,9 @@ export function mountedOwner(
   managerRef.current = null
   return {
     source,
-    other,
-    panes,
     sourceTransport,
     transports,
-    binding,
-    bindings,
-    link,
-    onLayoutChanged,
     manager,
-    empty,
-    cancelResize,
-    expandedElement,
-    setPaneCount: deps.setPaneCount,
     unregister: () => {
       removeMountEvents()
       registration.unregisterRuntimeTab()
diff --git a/src/renderer/src/components/terminal-pane/terminal-presentation-retirement.test.ts b/src/renderer/src/components/terminal-pane/terminal-presentation-retirement.test.ts
deleted file mode 100644
index 2559a7ceef3d..000000000000
--- a/src/renderer/src/components/terminal-pane/terminal-presentation-retirement.test.ts
+++ /dev/null
@@ -1,339 +0,0 @@
-// @vitest-environment happy-dom
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { useAppStore } from '@/store'
-import { makeTerminalTab } from '@/store/slices/worktrees-slice-test-fixtures'
-import { captureTerminalSurfaceIdentity } from '../../../../shared/terminal-tab-close'
-import {
-  removeTerminalPresentation,
-  retireTerminalPresentation
-} from './terminal-presentation-retirement'
-import { capturedPanesByTabId, parkedWatchersByTabId } from './terminal-parked-watcher-registry'
-import { LEAF, SIBLING, mountedOwner } from './terminal-presentation-retirement.test-fixture'
-import { hasRegisteredRuntimeTerminalTab } from '@/runtime/mounted-terminal-tab-registry'
-
-vi.mock('@/runtime/sync-runtime-graph', () => ({ scheduleRuntimeGraphSync: vi.fn() }))
-
-function prepare(split: boolean) {
-  useAppStore.setState({
-    tabsByWorktree: { 'wt-1': [makeTerminalTab({ id: 'terminal', worktreeId: 'wt-1' })] },
-    terminalLayoutsByTabId: {
-      terminal: {
-        root: split
-          ? {
-              type: 'split',
-              direction: 'horizontal',
-              ratio: 0.7,
-              first: { type: 'leaf', leafId: LEAF },
-              second: { type: 'leaf', leafId: SIBLING }
-            }
-          : { type: 'leaf', leafId: LEAF },
-        activeLeafId: split ? SIBLING : LEAF,
-        expandedLeafId: split ? SIBLING : null,
-        chatLeafId: LEAF,
-        ptyIdsByLeafId: { [LEAF]: 'pty-1', ...(split ? { [SIBLING]: 'pty-2' } : {}) }
-      }
-    }
-  })
-  useAppStore
-    .getState()
-    .createUnifiedTab('wt-1', 'terminal', { id: 'terminal', entityId: 'terminal' })
-  const identity = captureTerminalSurfaceIdentity(useAppStore.getState(), 'wt-1', 'terminal', LEAF)
-  if (!identity) {
-    throw new Error('Expected source identity')
-  }
-  return identity
-}
-
-beforeEach(() => {
-  localStorage.clear()
-  useAppStore.setState(useAppStore.getInitialState(), true)
-  capturedPanesByTabId.clear()
-  parkedWatchersByTabId.clear()
-})
-
-describe('direct permanent presentation owner', () => {
-  it.each([true, false])(
-    'disposes mounted resources and canonical membership (split=%s)',
-    (split) => {
-      const identity = prepare(split)
-      const owner = mountedOwner(split)
-      capturedPanesByTabId.set('terminal', {
-        worktreeId: 'wt-1',
-        panes: [{ paneId: 1, leafId: LEAF, ptyId: 'pty-1', drivesTabTitle: true }]
-      })
-      try {
-        retireTerminalPresentation(identity)
-        expect(owner.source.terminal.dispose).toHaveBeenCalledOnce()
-        expect(owner.source.searchAddon.dispose).toHaveBeenCalledOnce()
-        expect(owner.sourceTransport.detach).toHaveBeenCalledExactlyOnceWith({
-          preserveExitObserver: false
-        })
-        expect(owner.sourceTransport.destroy).not.toHaveBeenCalled()
-        expect(owner.transports.has(1)).toBe(false)
-        expect(owner.bindings.has(1)).toBe(false)
-        expect(capturedPanesByTabId.has('terminal')).toBe(false)
-        expect(owner.binding.dispose).toHaveBeenCalledOnce()
-        expect(owner.link.dispose).toHaveBeenCalledOnce()
-        expect(owner.panes.has(1)).toBe(false)
-        expect(owner.setPaneCount).toHaveBeenLastCalledWith(split ? 1 : 0)
-        const state = useAppStore.getState()
-        if (split) {
-          expect(owner.other.terminal.dispose).not.toHaveBeenCalled()
-          expect(state.terminalLayoutsByTabId.terminal).toMatchObject({
-            root: { type: 'leaf', leafId: SIBLING },
-            activeLeafId: SIBLING,
-            expandedLeafId: SIBLING,
-            ptyIdsByLeafId: { [SIBLING]: 'pty-2' }
-          })
-          expect(state.terminalLayoutsByTabId.terminal.chatLeafId).toBeUndefined()
-        } else {
-          expect(owner.manager.destroy).toHaveBeenCalledOnce()
-          expect(owner.cancelResize).toHaveBeenCalledOnce()
-          expect(owner.expandedElement.style.display).toBe('flex')
-          expect(capturedPanesByTabId.has('terminal')).toBe(false)
-          expect(owner.onLayoutChanged).not.toHaveBeenCalled()
-          expect(hasRegisteredRuntimeTerminalTab('terminal', 'wt-1')).toBe(false)
-          expect(state.tabsByWorktree['wt-1']).toEqual([])
-          expect(state.terminalLayoutsByTabId.terminal).toBeUndefined()
-        }
-      } finally {
-        owner.unregister()
-      }
-    }
-  )
-
-  it.each([true, false])(
-    'disposes exact parked captures, including empty watcher entries (split=%s)',
-    (split) => {
-      const identity = prepare(split)
-      const dispose = vi.fn()
-      const siblingDispose = vi.fn()
-      capturedPanesByTabId.set('terminal', {
-        worktreeId: 'wt-1',
-        panes: [
-          { paneId: 1, leafId: LEAF, ptyId: 'pty-1', drivesTabTitle: true },
-          ...(split ? [{ paneId: 2, leafId: SIBLING, ptyId: 'pty-2', drivesTabTitle: false }] : [])
-        ]
-      })
-      parkedWatchersByTabId.set('terminal', {
-        worktreeId: 'wt-1',
-        tabPtyId: 'pty-1',
-        paneIdByPtyId: new Map([['pty-1', 1], ...(split ? [['pty-2', 2] as const] : [])]),
-        disposersByPtyId: new Map(
-          split
-            ? [
-                ['pty-1', dispose],
-                ['pty-2', siblingDispose]
-              ]
-            : []
-        )
-      })
-      retireTerminalPresentation(identity)
-      expect(siblingDispose).not.toHaveBeenCalled()
-      if (split) {
-        expect(dispose).toHaveBeenCalledOnce()
-        expect(capturedPanesByTabId.get('terminal')?.panes.map((pane) => pane.leafId)).toEqual([
-          SIBLING
-        ])
-        expect([...parkedWatchersByTabId.get('terminal')!.paneIdByPtyId.keys()]).toEqual(['pty-2'])
-      } else {
-        expect(capturedPanesByTabId.has('terminal')).toBe(false)
-        expect(parkedWatchersByTabId.has('terminal')).toBe(false)
-      }
-    }
-  )
-
-  it('refuses a replacement or a newly pinned final tab before disposal', () => {
-    const identity = prepare(false)
-    const owner = mountedOwner(false)
-    try {
-      useAppStore.setState({
-        terminalLayoutsByTabId: {
-          terminal: {
-            ...useAppStore.getState().terminalLayoutsByTabId.terminal,
-            ptyIdsByLeafId: { [LEAF]: 'replacement' }
-          }
-        }
-      })
-      expect(() => retireTerminalPresentation(identity)).toThrow('terminal_pane_owner_changed')
-      expect(owner.source.terminal.dispose).not.toHaveBeenCalled()
-      useAppStore.setState({
-        terminalLayoutsByTabId: {
-          terminal: {
-            ...useAppStore.getState().terminalLayoutsByTabId.terminal,
-            ptyIdsByLeafId: { [LEAF]: 'pty-1' }
-          }
-        },
-        tabsByWorktree: {
-          'wt-1': [{ ...useAppStore.getState().tabsByWorktree['wt-1'][0], isPinned: true }]
-        }
-      })
-      expect(() => retireTerminalPresentation(identity)).toThrow('terminal_tab_pinned')
-      expect(owner.source.terminal.dispose).not.toHaveBeenCalled()
-    } finally {
-      owner.unregister()
-    }
-  })
-
-  it('reports a real disposer failure and retains source membership', () => {
-    const identity = prepare(false)
-    const owner = mountedOwner(false)
-    owner.source.paneDragCleanup = () => {
-      throw new Error('disposal failed')
-    }
-    try {
-      expect(() => retireTerminalPresentation(identity)).toThrow('disposal failed')
-      expect(useAppStore.getState().tabsByWorktree['wt-1']).toHaveLength(1)
-      expect(owner.sourceTransport.destroy).not.toHaveBeenCalled()
-    } finally {
-      owner.unregister()
-    }
-  })
-  it('reports nested actual addon/terminal failures after closure and layout, while ordinary callers remain best effort', () => {
-    const identity = prepare(false)
-    const owner = mountedOwner(false)
-    const image = owner.source.imageAddon
-    const webgl = owner.source.webglAddon
-    if (!image || !webgl) {
-      throw new Error('Expected actual addon owners')
-    }
-    vi.spyOn(image, 'dispose').mockImplementation(() => {
-      throw undefined
-    })
-    vi.spyOn(webgl, 'dispose').mockImplementation(() => {
-      throw false
-    })
-    vi.spyOn(owner.source.terminal, 'dispose').mockImplementation(() => {
-      throw new Error('terminal failed')
-    })
-    try {
-      let failure: unknown
-      try {
-        retireTerminalPresentation(identity)
-      } catch (error) {
-        failure = error
-      }
-      expect(failure).toBeInstanceOf(AggregateError)
-      if (!(failure instanceof AggregateError)) {
-        throw new Error('Expected failure')
-      }
-      expect(failure.errors).toEqual([undefined, false, new Error('terminal failed')])
-      expect(owner.source.searchAddon.dispose).toHaveBeenCalledOnce()
-      expect(owner.binding.dispose).toHaveBeenCalledOnce()
-      expect(owner.sourceTransport.detach).toHaveBeenCalledOnce()
-      expect(owner.manager.destroy).toHaveBeenCalledOnce()
-      expect(useAppStore.getState().terminalLayoutsByTabId.terminal).toBeUndefined()
-      expect(hasRegisteredRuntimeTerminalTab('terminal', 'wt-1')).toBe(false)
-    } finally {
-      owner.unregister()
-    }
-
-    prepare(false)
-    const ordinary = mountedOwner(false)
-    vi.spyOn(ordinary.source.searchAddon, 'dispose').mockImplementation(() => {
-      throw new Error('advisory')
-    })
-    try {
-      expect(() => ordinary.manager.retirePanePreservingPty(1, true)).not.toThrow()
-      expect(ordinary.source.terminal.dispose).toHaveBeenCalledOnce()
-    } finally {
-      ordinary.unregister()
-    }
-  })
-
-  it.each(['DOM', 'onPaneClosed'] as const)(
-    'retains caught and genuine %s and final-owner failures without claiming structural completion',
-    (stage) => {
-      const identity = prepare(false)
-      const owner = mountedOwner(false)
-      const caught = new Error('addon failed')
-      const structural = new Error(stage)
-      const final = new Error('onEmpty failed')
-      vi.spyOn(owner.source.searchAddon, 'dispose').mockImplementation(() => {
-        throw caught
-      })
-      if (stage === 'DOM') {
-        document.body.append(owner.source.container)
-        vi.spyOn(owner.source.container, 'remove').mockImplementation(() => {
-          throw structural
-        })
-      } else {
-        owner.link.dispose.mockImplementation(() => {
-          throw structural
-        })
-      }
-      owner.empty.mockImplementation(() => {
-        throw final
-      })
-      try {
-        let failure: unknown
-        try {
-          retireTerminalPresentation(identity)
-        } catch (error) {
-          failure = error
-        }
-        if (!(failure instanceof AggregateError)) {
-          throw new Error('Expected aggregate')
-        }
-        expect(failure.errors[0]).toBe(caught)
-        expect(failure.errors[1]).toBeInstanceOf(AggregateError)
-        expect(failure.errors[1].errors).toEqual([structural, final])
-        expect(owner.empty).toHaveBeenCalledOnce()
-        expect(owner.panes.size).toBe(0)
-        expect(useAppStore.getState().tabsByWorktree['wt-1']).toHaveLength(1)
-        expect(hasRegisteredRuntimeTerminalTab('terminal', 'wt-1')).toBe(false)
-      } finally {
-        owner.unregister()
-        document.body.replaceChildren()
-      }
-    }
-  )
-
-  it('preserves an ordinary previously unswallowed owner throw', () => {
-    prepare(false)
-    const owner = mountedOwner(false)
-    owner.source.paneDragCleanup = () => {
-      throw new Error('ordinary owner failed')
-    }
-    try {
-      expect(() => owner.manager.retirePanePreservingPty(1, true)).toThrow('ordinary owner failed')
-      expect(owner.panes.size).toBe(1)
-    } finally {
-      owner.unregister()
-    }
-  })
-
-  it('retains caught failures when layout throws, and rejects them even after an already-absent leaf', () => {
-    const identity = prepare(true)
-    const caught = new Error('caught disposal')
-    const layoutFailure = new Error('layout failed')
-    const originalSet = useAppStore.getState().setTabLayout
-    useAppStore.setState({
-      setTabLayout: () => {
-        throw layoutFailure
-      }
-    })
-    try {
-      let failure: unknown
-      try {
-        removeTerminalPresentation(identity, (failures) => {
-          failures.push(caught)
-        })
-      } catch (error) {
-        failure = error
-      }
-      if (!(failure instanceof AggregateError)) {
-        throw new Error('Expected aggregate')
-      }
-      expect(failure.errors).toEqual([caught, layoutFailure])
-    } finally {
-      useAppStore.setState({ setTabLayout: originalSet })
-    }
-    useAppStore.setState({ tabsByWorktree: {}, terminalLayoutsByTabId: {} })
-    expect(() =>
-      removeTerminalPresentation(identity, (failures) => {
-        failures.push(caught)
-      })
-    ).toThrow(AggregateError)
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/use-terminal-pane-chat-state.ts b/src/renderer/src/components/terminal-pane/use-terminal-pane-chat-state.ts
index 3692d9f3db8c..d08fdd2a3ecd 100644
--- a/src/renderer/src/components/terminal-pane/use-terminal-pane-chat-state.ts
+++ b/src/renderer/src/components/terminal-pane/use-terminal-pane-chat-state.ts
@@ -1,3 +1,4 @@
+import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { useCallback, useEffect, useMemo, useRef } from 'react'
 import { useShallow } from 'zustand/react/shallow'
 import { useAppStore } from '../../store'
@@ -216,6 +217,7 @@ export function useTerminalPaneChatState(controller: TerminalPaneTitleController
       if (!unifiedTabId) {
         return
       }
+      noteViewerNavigation()
       if (effectiveChatViewMode && chatLeafId === leafId) {
         setChatLeafId(null)
         toggleTabViewMode(unifiedTabId)
@@ -238,6 +240,7 @@ export function useTerminalPaneChatState(controller: TerminalPaneTitleController
   const switchNativeChatToTerminal = useCallback(() => {
     if (chatLeafId && unifiedTabId) {
       setChatLeafId(null)
+      noteViewerNavigation()
       setTabViewMode(unifiedTabId, 'terminal')
     }
   }, [chatLeafId, setChatLeafId, setTabViewMode, unifiedTabId])
diff --git a/src/renderer/src/components/use-terminal-activation-actions.ts b/src/renderer/src/components/use-terminal-activation-actions.ts
index cfa5190a1057..0d4936b536b3 100644
--- a/src/renderer/src/components/use-terminal-activation-actions.ts
+++ b/src/renderer/src/components/use-terminal-activation-actions.ts
@@ -1,3 +1,4 @@
+import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { useCallback } from 'react'
 import { useAppStore } from '../store'
 import { TOGGLE_TERMINAL_PANE_EXPAND_EVENT } from '@/constants/terminal'
@@ -11,6 +12,7 @@ export function useTerminalActivationActions(controller: TerminalBulkCloseContro
   const { activeWorktreeId, setActiveBrowserTab, setActiveTab, setActiveTabType } = controller
   const handleActivateTab = useCallback(
     (tabId: string) => {
+      noteViewerNavigation()
       const runtimeEnvironmentId = getActiveWorktreeRuntimeEnvironmentId(activeWorktreeId)
       if (activeWorktreeId && isWebRuntimeSessionActive(runtimeEnvironmentId)) {
         void activateWebRuntimeSessionTab({
@@ -27,6 +29,7 @@ export function useTerminalActivationActions(controller: TerminalBulkCloseContro
 
   const handleTogglePaneExpand = useCallback(
     (tabId: string) => {
+      noteViewerNavigation()
       setActiveTab(tabId)
       requestAnimationFrame(() => {
         window.dispatchEvent(
@@ -39,6 +42,7 @@ export function useTerminalActivationActions(controller: TerminalBulkCloseContro
 
   const handleActivateBrowserTab = useCallback(
     (tabId: string) => {
+      noteViewerNavigation()
       const state = useAppStore.getState()
       const runtimeEnvironmentId = getActiveWorktreeRuntimeEnvironmentId(activeWorktreeId)
       if (
diff --git a/src/renderer/src/components/use-terminal-create-actions.ts b/src/renderer/src/components/use-terminal-create-actions.ts
index d37e36389d7c..a80b7ea0cf92 100644
--- a/src/renderer/src/components/use-terminal-create-actions.ts
+++ b/src/renderer/src/components/use-terminal-create-actions.ts
@@ -1,3 +1,4 @@
+import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { useCallback } from 'react'
 import { toast } from 'sonner'
 import { useAppStore } from '../store'
@@ -29,6 +30,7 @@ export function useTerminalCreateActions(controller: TerminalColdActivationContr
   } = controller
   const handleNewTab = useCallback(
     (shellOverride?: string) => {
+      noteViewerNavigation()
       if (!activeWorktreeId) {
         return
       }
@@ -63,6 +65,7 @@ export function useTerminalCreateActions(controller: TerminalColdActivationContr
   )
 
   const handleNewSimulatorTab = useCallback(() => {
+    noteViewerNavigation()
     if (!activeWorktreeId) {
       return
     }
@@ -76,6 +79,7 @@ export function useTerminalCreateActions(controller: TerminalColdActivationContr
   }, [activeWorktreeId])
 
   const handleNewBrowserTab = useCallback(() => {
+    noteViewerNavigation()
     if (!activeWorktreeId) {
       return
     }
diff --git a/src/renderer/src/hooks/ipc-events/floating-workspace-reveal-routing.test.ts b/src/renderer/src/hooks/ipc-events/floating-workspace-reveal-routing.test.ts
index e2dda585175e..30ce3d0f47eb 100644
--- a/src/renderer/src/hooks/ipc-events/floating-workspace-reveal-routing.test.ts
+++ b/src/renderer/src/hooks/ipc-events/floating-workspace-reveal-routing.test.ts
@@ -1,4 +1,3 @@
-import { captureConversationSwitchViewerSelection } from '@/lib/conversation-switch-selection'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { FLOATING_TERMINAL_WORKTREE_ID, getDefaultSettings } from '../../../../shared/constants'
 import { TOGGLE_FLOATING_TERMINAL_EVENT } from '@/lib/floating-terminal'
@@ -283,76 +282,3 @@ describe('taking the user to a folder workspace terminal', () => {
     expect(panelToggles(dispatchEvent)).toBe(0)
   })
 })
-
-it.each(['unchanged', 'navigate'] as const)(
-  'checks original viewer at the editor focus event writer: %s',
-  async (action) => {
-    const { emit } = setup()
-    const state = testStore().getState()
-    const source = state.createUnifiedTab(MAIN, 'agent-session', {
-      entityId: 'source',
-      agentSessionAgent: 'codex'
-    })
-    const destination = state.createUnifiedTab(MAIN, 'agent-session', {
-      entityId: 'canonical-C',
-      agentSessionAgent: 'codex',
-      activate: false
-    })
-    const other = state.createUnifiedTab(MAIN, 'agent-session', {
-      entityId: 'other',
-      activate: false
-    })
-    state.activateTab(source.id)
-    const viewerSelection = captureConversationSwitchViewerSelection()
-    if (action === 'navigate') {
-      state.activateTab(other.id)
-    }
-    emit('onFocusEditorTab', { tabId: destination.id, worktreeId: MAIN, viewerSelection })
-    expect(testStore().getState().getActiveTab(MAIN)?.id).toBe(
-      action === 'unchanged' ? destination.id : other.id
-    )
-    expect(testStore().getState().getTab(destination.id)?.entityId).toBe('canonical-C')
-  }
-)
-
-it.each(['unchanged', 'navigate', 'courtesy'] as const)(
-  'uses original viewer authority for cross-workspace native focus: %s',
-  (action) => {
-    const { emit } = setup()
-    const state = testStore().getState()
-    const source = state.createUnifiedTab(MAIN, 'agent-session', { entityId: 'visible-source' })
-    state.activateTab(source.id)
-    const destinationWorktree = 'repo1::/repo1/other'
-    const viewerSelection = captureConversationSwitchViewerSelection()
-    // The advisory focus can precede adoption; ordinary membership must still be usable later.
-    emit('onFocusEditorTab', {
-      tabId: 'future-chat',
-      worktreeId: destinationWorktree,
-      viewerSelection
-    })
-    expect(testStore().getState().activeWorktreeId).toBe(MAIN)
-    const destination = state.createUnifiedTab(destinationWorktree, 'agent-session', {
-      id: 'future-chat',
-      entityId: 'canonical-cross-workspace',
-      activate: false
-    })
-    if (action === 'navigate') {
-      state.createUnifiedTab(MAIN, 'agent-session', { entityId: 'newer-view' })
-    }
-    emit('onFocusEditorTab', {
-      tabId: destination.id,
-      worktreeId: destinationWorktree,
-      ...(action === 'courtesy' ? {} : { viewerSelection })
-    })
-    expect(testStore().getState().activeWorktreeId).toBe(
-      action === 'unchanged' ? destinationWorktree : MAIN
-    )
-    expect(testStore().getState().getTab(destination.id)?.entityId).toBe(
-      'canonical-cross-workspace'
-    )
-    if (action === 'unchanged') {
-      expect(testStore().getState().getActiveTab(destinationWorktree)?.id).toBe(destination.id)
-      expect(testStore().getState().activeTabType).toBe('agent-session')
-    }
-  }
-)
diff --git a/src/renderer/src/hooks/ipc-events/session-tab-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/session-tab-ipc-bridge.ts
index 3da47a74cd7c..d5851fd49086 100644
--- a/src/renderer/src/hooks/ipc-events/session-tab-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/session-tab-ipc-bridge.ts
@@ -1,3 +1,4 @@
+import { disposeViewerSelection } from '@/lib/viewer-selection-request'
 import {
   disposeSwitchProjections,
   captureSwitchProjection,
@@ -27,7 +28,7 @@ import { resolveBrowserSessionTabTarget } from './browser-session-tab-target'
 import { resolveWindowTabIdForHostTab } from './host-session-tab-target'
 
 export function registerSessionTabIpcBridge(unsubs: (() => void)[]): void {
-  unsubs.push(disposeSwitchProjections)
+  unsubs.push(disposeSwitchProjections, disposeViewerSelection)
   unsubs.push(
     window.api.ui.onCloseSessionTab(({ tabId, worktreeId }) => {
       if (isLocalSessionTabCloseOwned(worktreeId, tabId)) {
diff --git a/src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge-placement.test.ts b/src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge-placement.test.ts
index f67d05bdbff1..8907b8a0b0b0 100644
--- a/src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge-placement.test.ts
+++ b/src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge-placement.test.ts
@@ -3,7 +3,6 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 import type * as AgentStatusModule from '@/lib/agent-status'
 import { createTabsSliceMockApi } from '../../store/slices/tabs-slice-test-harness'
 import { createTestStore } from '../../store/slices/store-test-helpers'
-import { applyLocalStructuredSessionTabSnapshots } from '../../runtime/local-structured-session-tabs-sync/snapshot-apply'
 
 vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } }))
 vi.mock('@/lib/agent-status', async (importOriginal) => ({
@@ -111,46 +110,3 @@ describe("a host's focused terminal create into a requested group", () => {
     expect(store.getState().sortEpoch).toBe(epoch + 1)
   })
 })
-
-it('uses the source group while another group is active and keeps the slot after early retirement', () => {
-  const a = store.getState().createTab(WT)
-  const c = store.getState().createUnifiedTab(WT, 'agent-session', { entityId: 'C' })
-  const b = store.getState().createTab(WT)
-  const left = c.groupId
-  const right = store.getState().createEmptySplitGroup(WT, left, 'right')!
-  store.getState().createTab(WT, right)
-  store.getState().focusGroup(WT, right)
-  replyTerminalCreate.mockImplementationOnce(() => {
-    // The admitted host removes presentation through its publication, never a generic close.
-    store.setState((state) =>
-      applyLocalStructuredSessionTabSnapshots(state, [
-        {
-          worktree: WT,
-          publicationEpoch: 'headless:bridge-test',
-          snapshotVersion: 1,
-          activeGroupId: right,
-          activeTabId: null,
-          activeTabType: null,
-          tabs: []
-        }
-      ])
-    )
-  })
-  request({
-    requestId: 'early-retire',
-    worktreeId: WT,
-    source: 'runtime-session',
-    targetGroupId: left,
-    afterTabId: c.id,
-    presentation: 'background'
-  })
-  const createdId = replyTerminalCreate.mock.calls[0][0].tabId
-  expect(replyTerminalCreate.mock.calls[0][0]).toMatchObject({ tabId: expect.any(String) })
-  expect(store.getState().unifiedTabsByWorktree[WT]?.some((tab) => tab.id === c.id)).toBe(false)
-  expect(
-    store.getState().groupsByWorktree[WT]?.find((group) => group.id === left)?.tabOrder
-  ).toEqual([a.id, createdId, b.id])
-  expect(
-    store.getState().groupsByWorktree[WT]?.find((group) => group.id === right)?.tabOrder
-  ).toHaveLength(1)
-})
diff --git a/src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge.ts
index ac86024e9376..579fac02b9d6 100644
--- a/src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge.ts
@@ -1,3 +1,6 @@
+import { noteViewerNavigation } from '@/lib/viewer-selection-request'
+import { isSessionTabSelectionRequest } from '../../../../shared/session-tab-placement'
+import { selectSessionTabForViewer } from '@/runtime/web-session-tabs-sync/store-patch'
 import { conversationSwitchViewerSelectionCurrent } from '@/lib/conversation-switch-selection'
 import type { SplitTerminalPaneDetail } from '@/constants/terminal'
 import { requestBackgroundTerminalWorktreeMount } from '@/components/terminal/background-terminal-worktree-mount'
@@ -132,10 +135,15 @@ export function registerTerminalUiRoutingIpcBridge(unsubs: (() => void)[]): void
         flashFocusedPane,
         scrollToBottomIfOutputSinceLastView
       }) => {
+        const notificationFocus =
+          ackPaneKeyOnSuccess || flashFocusedPane || scrollToBottomIfOutputSinceLastView
+        if (notificationFocus) {
+          noteViewerNavigation()
+        }
         const store = useAppStore.getState()
         revealWorkspaceSurface(store, worktreeId)
         store.setActiveTab(tabId)
-        if (ackPaneKeyOnSuccess || flashFocusedPane || scrollToBottomIfOutputSinceLastView) {
+        if (notificationFocus) {
           activateTabAndFocusPane(tabId, leafId ?? null, {
             ...(ackPaneKeyOnSuccess ? { ackPaneKeyOnSuccess } : {}),
             ...(flashFocusedPane ? { flashFocusedPane: true } : {}),
@@ -152,6 +160,9 @@ export function registerTerminalUiRoutingIpcBridge(unsubs: (() => void)[]): void
 
   unsubs.push(
     window.api.ui.onFocusEditorTab(({ tabId, worktreeId, userInitiated, viewerSelection }) => {
+      if (userInitiated && viewerSelection === undefined) {
+        noteViewerNavigation()
+      }
       if (!conversationSwitchViewerSelectionCurrent(viewerSelection)) {
         return
       }
@@ -179,6 +190,10 @@ export function registerTerminalUiRoutingIpcBridge(unsubs: (() => void)[]): void
         }
         return
       }
+      if (viewerSelection && isSessionTabSelectionRequest(viewerSelection)) {
+        selectSessionTabForViewer(worktreeId, tab.id, viewerSelection)
+        return
+      }
       revealWorkspaceSurface(store, worktreeId)
       store.focusGroup(worktreeId, tab.groupId)
       store.activateTab(tab.id)
diff --git a/src/renderer/src/hooks/ipc-tab-switch.ts b/src/renderer/src/hooks/ipc-tab-switch.ts
index c2543fd24233..f070cbf9d630 100644
--- a/src/renderer/src/hooks/ipc-tab-switch.ts
+++ b/src/renderer/src/hooks/ipc-tab-switch.ts
@@ -1,3 +1,4 @@
+import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { useAppStore } from '../store'
 import { getActiveTabNavOrder } from '@/components/tab-bar/group-tab-order'
 import {
@@ -44,6 +45,7 @@ function resolveCycleContext(): CycleContext | null {
 
 /** Activate by unified tab ID after file/browser updates so duplicate entities focus the correct split instance. */
 export function activateCyclableTab(store: AppStoreState, next: TypeCyclableTab): void {
+  noteViewerNavigation()
   const worktreeId = store.activeWorktreeId
   if (next.type === 'terminal') {
     store.setActiveTab(next.id)
@@ -309,6 +311,7 @@ export function handleSwitchTerminalTab(direction: number): boolean {
   if (next.id === store.activeTabId && store.activeTabType === 'terminal') {
     return false
   }
+  noteViewerNavigation()
   store.setActiveTab(next.id)
   store.setActiveTabType('terminal', worktreeId)
   activateCycledTabOnOwner(worktreeId, next)
diff --git a/src/renderer/src/hooks/useIpcEvents-agent-conversation-cap.test.ts b/src/renderer/src/hooks/useIpcEvents-agent-conversation-cap.test.ts
deleted file mode 100644
index e0037d996938..000000000000
--- a/src/renderer/src/hooks/useIpcEvents-agent-conversation-cap.test.ts
+++ /dev/null
@@ -1,436 +0,0 @@
-import { afterEach, expect, it, vi } from 'vitest'
-import type { UseBoundStore, StoreApi } from 'zustand'
-import type { AppState } from '../store/types'
-import type { AgentStatusIpcPayload } from '../../../shared/agent-status-types'
-import type { AgentStatusSetData } from './ipc-events-agent-status-store-test-fixtures'
-import {
-  createTestStore,
-  makeTab,
-  makeWorktree,
-  TEST_REPO
-} from '../store/slices/store-test-helpers'
-import { buildWindowApi } from './ipc-events-agent-status-window-test-fixtures'
-import { collectLeafIds } from '../../../shared/terminal-pane-layout-tree'
-import { adoptsCliConversations } from '../../../shared/structured-agent-cli-conversation-adoption'
-import {
-  collectAgentPaneConversations,
-  resolvePaneLastAgentConversation
-} from '@/lib/ai-vault-tab-title-requests'
-import {
-  transferAgentPaneAuthorityAlias,
-  resetAgentPaneAuthorityAliasesForTests
-} from '../store/slices/agent-pane-authority'
-import * as capacity from '../store/slices/agent-status/agent-status-capacity-eviction'
-import * as switches from '../lib/pending-conversation-surface-switches'
-
-const mocks = vi.hoisted(() => {
-  const store: { current?: UseBoundStore<StoreApi<AppState>> } = {}
-  return {
-    store,
-    support: vi.fn(async () => true),
-    call: vi.fn(),
-    rpc: vi.fn(),
-    launch: vi.fn(),
-    toast: vi.fn()
-  }
-})
-vi.mock('@/store', () => ({
-  get useAppStore() {
-    return mocks.store.current
-  }
-}))
-vi.mock('@/runtime/structured-agent-session-client', () => ({
-  supportsInPlaceSwitch: mocks.support,
-  supportsStructuredAgentSessionCliSource: async () => true,
-  callStructuredAgentSession: mocks.call
-}))
-vi.mock('@/runtime/runtime-rpc-client', () => ({ callRuntimeRpc: mocks.rpc }))
-vi.mock('@/lib/launch-ai-vault-session', () => ({ launchAiVaultSessionInNewTab: mocks.launch }))
-vi.mock('@/runtime/local-runtime-capabilities', async (original) => ({
-  ...(await original<Record<string, unknown>>()),
-  readLocalRuntimeCapabilitiesOrUnknown: () => [
-    'agent-session.structured.v1',
-    'agent-session.structured.agents.v1',
-    'agent-session.structured.switch.v1:codex'
-  ]
-}))
-vi.mock('@/runtime/host-structured-agents', async (original) => ({
-  ...(await original<Record<string, unknown>>()),
-  readHostStructuredAgents: () => [{ agent: 'codex', capabilities: {} }]
-}))
-vi.mock('./agent-hook-completion-notifications', () => ({
-  observeAgentHookCompletionForNotification: vi.fn(),
-  syncAgentHookCompletionNotificationsForStoreUpdate: vi.fn()
-}))
-vi.mock('sonner', () => ({ toast: { error: mocks.toast } }))
-const cleanup: (() => void)[] = []
-afterEach(async () => {
-  cleanup
-    .splice(0)
-    .toReversed()
-    .forEach((close) => close())
-  resetAgentPaneAuthorityAliasesForTests()
-  vi.restoreAllMocks()
-  vi.useRealTimers()
-  vi.unstubAllGlobals()
-})
-const leaf = (n: number) => `00000000-0000-4000-8000-${String(n).padStart(12, '0')}`
-const pane = (tab: string, n = 1) => `${tab}:${leaf(n)}`
-const layout = (n: number) => ({
-  root: { type: 'leaf' as const, leafId: leaf(n) },
-  activeLeafId: leaf(n),
-  expandedLeafId: null
-})
-it.each([600, 6000])(
-  'bounds real publications across held switches and retries at %i callbacks',
-  async (n) => {
-    vi.useFakeTimers()
-    vi.setSystemTime(1_800_000_000_000)
-    vi.clearAllMocks()
-    const store = createTestStore()
-    mocks.store.current = store
-    const tabs = ['cli', 'retry', 'root-b', 'root-c', 'rootless'].map((id) =>
-      makeTab({ id, worktreeId: 'wt', createdAt: 1 })
-    )
-    const roots = [pane('retry'), pane('root-b'), pane('root-c')]
-    store.setState({
-      workspaceSessionReady: true,
-      repos: [TEST_REPO],
-      worktreesByRepo: { [TEST_REPO.id]: [makeWorktree({ id: 'wt', repoId: TEST_REPO.id })] },
-      tabsByWorktree: { wt: tabs },
-      terminalLayoutsByTabId: {
-        ...Object.fromEntries(
-          tabs.filter((tab) => tab.id !== 'rootless').map((tab) => [tab.id, layout(1)])
-        ),
-        rootless: { root: null, activeLeafId: null, expandedLeafId: null }
-      }
-    })
-    let onSet: ((data: AgentStatusSetData) => void) | undefined
-    vi.stubGlobal(
-      'window',
-      buildWindowApi({
-        onSet: (callback) => {
-          onSet = callback
-          return () => {}
-        }
-      })
-    )
-    const { registerAgentStatusIpcBridge } = await import('./ipc-events/agent-status-ipc-bridge')
-    const { resolveCliChatResumeSource } =
-      await import('../components/tab-bar/cli-chat-resume-source')
-    const unsubs: (() => void)[] = []
-    const bridge = registerAgentStatusIpcBridge(unsubs)
-    cleanup.push(bridge.disposeAsyncState, bridge.unsubscribeStore, ...unsubs)
-    await Promise.resolve()
-    let callbacks = 0
-    const emit = async (key: string, id = key) => {
-      const data: AgentStatusIpcPayload & AgentStatusSetData = {
-        paneKey: key,
-        state: 'done',
-        prompt: '',
-        agentType: 'codex',
-        providerSessionOnly: true,
-        worktreeId: 'wt',
-        terminalHandle: `term-${key}`,
-        providerSession: { key: 'session_id', id },
-        connectionId: null,
-        receivedAt: Date.now(),
-        stateStartedAt: Date.now()
-      }
-      if (!onSet) {
-        throw new Error('Missing bridge callback')
-      }
-      onSet(data)
-      callbacks += 1
-      await vi.advanceTimersByTimeAsync(34)
-      expect(store.getState().agentConversationsByPaneKey[key]?.providerSession.id).toBe(id)
-      store.getState().clearSleepingAgentSession(key)
-    }
-    for (const key of [
-      pane('cli'),
-      ...roots,
-      pane('cli', 2),
-      pane('retry', 2),
-      pane('native'),
-      pane('alias-old'),
-      pane('alias-new')
-    ]) {
-      await emit(key, key === pane('cli') || key === pane('retry') ? 'conversation' : key)
-    }
-    const first = resolveCliChatResumeSource(store.getState(), {
-      tab: { id: 'cli', worktreeId: 'wt' },
-      paneKey: pane('cli')
-    })!
-    const retry = resolveCliChatResumeSource(store.getState(), {
-      tab: { id: 'retry', worktreeId: 'wt' },
-      paneKey: pane('retry')
-    })!
-    expect(first.providerSessionId).toBe('conversation')
-    expect(retry.providerSessionId).toBe('conversation')
-    const firstController = new AbortController()
-    const retryController = new AbortController()
-    switches.pendingCliChatResumes.set(firstController, { key: null, source: first })
-    switches.pendingNativeChatCliSwitches.set('native', {
-      chatTabId: 'native',
-      workspaceId: 'wt',
-      executionHostId: 'local'
-    })
-    cleanup.push(() => {
-      switches.pendingCliChatResumes.delete(firstController)
-      switches.pendingCliChatResumes.delete(retryController)
-      switches.pendingNativeChatCliSwitches.delete('native')
-    })
-    transferAgentPaneAuthorityAlias({ fromPaneKey: first.paneKey, toPaneKey: pane('alias-old') })
-    const { cli: _removed, ...withoutCli } = store.getState().terminalLayoutsByTabId
-    store.setState({
-      terminalLayoutsByTabId: withoutCli,
-      tabsByWorktree: { wt: tabs.filter((tab) => tab.id !== 'cli') }
-    })
-    switches.pendingCliChatResumes.set(retryController, { key: 'retry', source: retry })
-    transferAgentPaneAuthorityAlias({ fromPaneKey: retry.paneKey, toPaneKey: pane('alias-new') })
-    let protectedKeys = [
-      first.paneKey,
-      pane('cli', 2),
-      retry.paneKey,
-      pane('retry', 2),
-      pane('alias-old'),
-      pane('alias-new'),
-      pane('native')
-    ]
-    let publications = 0
-    const assertBound = () => {
-      const state = store.getState()
-      const rooted = new Set(
-        Object.entries(state.terminalLayoutsByTabId).flatMap(([tab, tree]) =>
-          collectLeafIds(tree.root).map((id) => `${tab}:${id}`)
-        )
-      )
-      const keys = Object.keys(state.agentConversationsByPaneKey)
-      expect(
-        keys.filter((key) => !rooted.has(key) && !protectedKeys.includes(key)).length
-      ).toBeLessThanOrEqual(500)
-      expect(keys.length).toBeLessThanOrEqual(
-        rooted.size + 500 + protectedKeys.filter((key) => !rooted.has(key)).length
-      )
-      for (const key of [...roots, ...protectedKeys]) {
-        expect(state.agentConversationsByPaneKey[key]).toBeDefined()
-      }
-      publications += 1
-    }
-    cleanup.push(store.subscribe(assertBound))
-    const batches = vi.spyOn(store.getState(), 'transactAgentStatuses')
-    const records = vi.spyOn(store.getState(), 'recordAgentProviderSession')
-    let classifiedKeys = 0
-    let protectionEntries = 0
-    const classify = capacity.classifyPaneKeyLiveness
-    const protect = switches.protectedConversationPaneKeys
-    const classifier = vi.spyOn(capacity, 'classifyPaneKeyLiveness').mockImplementation((state) => {
-      const lookup = classify(state)
-      return (key) => {
-        classifiedKeys += 1
-        return lookup(key)
-      }
-    })
-    vi.spyOn(switches, 'protectedConversationPaneKeys').mockImplementation((entries) => {
-      protectionEntries += Object.keys(entries).length
-      return protect(entries)
-    })
-    const deliveredBefore = callbacks
-    for (let index = 0; index < n; index += 1) {
-      await emit(pane(index % 2 ? 'unknown' : 'rootless', index + 10))
-    }
-    expect(callbacks - deliveredBefore).toBe(n)
-    expect(records).toHaveBeenCalledTimes(n)
-    expect(batches).toHaveBeenCalledTimes(0)
-    expect(publications).toBeGreaterThanOrEqual(n)
-    expect(publications).toBeLessThanOrEqual(3 * n)
-    expect(classifier.mock.calls.length).toBeLessThanOrEqual(publications)
-    expect(classifiedKeys).toBeLessThanOrEqual(510 * publications)
-    expect(Object.keys(store.getState().agentConversationsByPaneKey)).toHaveLength(509)
-    const oldest = pane(n % 2 ? 'unknown' : 'rootless', n - 500 + 10)
-    await emit(oldest, 'replacement-does-not-refresh-residency')
-    store.setState(
-      {
-        ...store.getState(),
-        agentConversationsByPaneKey: Object.fromEntries(
-          Object.entries(store.getState().agentConversationsByPaneKey).toReversed()
-        )
-      },
-      true
-    )
-    await emit(pane('unknown', n + 10))
-    expect(store.getState().agentConversationsByPaneKey[oldest]).toBeUndefined()
-    let nestedWrites = 0
-    const stopNested = store.subscribe(() => {
-      if (nestedWrites++ === 0) {
-        store.setState((state) => ({
-          agentConversationsByPaneKey: state.agentConversationsByPaneKey
-        }))
-      }
-    })
-    store.setState({ activeWorktreeId: 'wt' })
-    stopNested()
-    expect(nestedWrites).toBe(2)
-    protectedKeys = [retry.paneKey, pane('retry', 2), pane('alias-new'), pane('native')]
-    switches.pendingCliChatResumes.delete(firstController)
-    store.setState((state) => ({ agentConversationsByPaneKey: state.agentConversationsByPaneKey }))
-    expect(Object.keys(store.getState().agentConversationsByPaneKey)).toHaveLength(506)
-    expect(store.getState().agentConversationsByPaneKey[pane('alias-new')]).toBeDefined()
-    protectedKeys = [pane('native')]
-    switches.pendingCliChatResumes.delete(retryController)
-    store.setState((state) => ({ agentConversationsByPaneKey: state.agentConversationsByPaneKey }))
-    expect(Object.keys(store.getState().agentConversationsByPaneKey)).toHaveLength(504)
-    await emit(pane('pressure-after-native-receipt', n + 11))
-    protectedKeys = []
-    switches.pendingNativeChatCliSwitches.delete('native')
-    store.setState((state) => ({ agentConversationsByPaneKey: state.agentConversationsByPaneKey }))
-    expect(Object.keys(store.getState().agentConversationsByPaneKey)).toHaveLength(503)
-    for (const key of roots) {
-      expect(
-        resolvePaneLastAgentConversation(
-          store.getState(),
-          { worktreeId: 'wt', paneKey: key },
-          adoptsCliConversations
-        )?.providerSession.id
-      ).toBe(key === pane('retry') ? 'conversation' : key)
-    }
-    expect(
-      collectAgentPaneConversations(store.getState(), adoptsCliConversations, { allPanes: true })
-    ).toEqual(expect.arrayContaining(roots.map((paneKey) => expect.objectContaining({ paneKey }))))
-    expect(mocks.rpc.mock.calls.every(([, method]) => method !== 'terminal.close')).toBe(true)
-    expect(classifier.mock.calls.length).toBeLessThanOrEqual(publications)
-    expect(classifiedKeys).toBeLessThanOrEqual(510 * publications)
-    expect(publications).toBeLessThanOrEqual(3 * n + 64)
-    console.info('CAP_COUNTS', {
-      n,
-      callbacks,
-      batches: batches.mock.calls.length,
-      records: records.mock.calls.length,
-      publications,
-      classifierBuilds: classifier.mock.calls.length,
-      classifiedKeys,
-      protectionEntries,
-      retained: Object.keys(store.getState().agentConversationsByPaneKey).length
-    })
-  },
-  120_000
-)
-
-it.each([600, 6000])(
-  'skips retention reconstruction for unchanged identities among %i rooted conversations',
-  async (n) => {
-    vi.useFakeTimers()
-    vi.setSystemTime(1_800_000_000_000)
-    const store = createTestStore()
-    mocks.store.current = store
-    vi.stubGlobal('window', { api: { gh: { enqueuePRRefresh: vi.fn(async () => true) } } })
-    const identities = Object.fromEntries(
-      Array.from({ length: n }, (_, index) => {
-        const paneKey = pane(`root-${index}`)
-        return [
-          paneKey,
-          {
-            paneKey,
-            worktreeId: 'wt',
-            executionHostId: 'local' as const,
-            connectionId: null,
-            agent: 'codex' as const,
-            providerSession: { key: 'session_id' as const, id: `conversation-${index}` }
-          }
-        ]
-      })
-    )
-    store.setState({
-      repos: [TEST_REPO],
-      worktreesByRepo: { [TEST_REPO.id]: [makeWorktree({ id: 'wt', repoId: TEST_REPO.id })] },
-      tabsByWorktree: { wt: [makeTab({ id: 'root-0', worktreeId: 'wt' })] },
-      terminalLayoutsByTabId: Object.fromEntries(
-        Array.from({ length: n }, (_, index) => [`root-${index}`, layout(1)])
-      ),
-      agentConversationsByPaneKey: identities
-    })
-    const key = pane('root-0')
-    let updatedAt = Date.now()
-    const status = (state: 'working' | 'done') =>
-      store
-        .getState()
-        .setAgentStatus(
-          key,
-          { state, agentType: 'codex', prompt: 'Existing conversation' },
-          undefined,
-          { updatedAt: ++updatedAt },
-          { worktreeId: 'wt', connectionId: null },
-          { providerSession: identities[key].providerSession }
-        )
-    status('working')
-    const keys = vi.spyOn(Object, 'keys')
-    const classifier = vi.spyOn(capacity, 'classifyPaneKeyLiveness')
-    const protection = vi.spyOn(switches, 'protectedConversationPaneKeys')
-    status('done')
-    expect(store.getState().agentStatusByPaneKey[key].state).toBe('done')
-    store
-      .getState()
-      .recordAgentProviderSession(
-        key,
-        'codex',
-        identities[key].providerSession,
-        { updatedAt: ++updatedAt },
-        { worktreeId: 'wt', connectionId: null }
-      )
-    expect(store.getState().agentStatusByPaneKey[key]).toBeUndefined()
-    store.getState().setAgentStatuses([
-      {
-        paneKey: key,
-        payload: { state: 'working', agentType: 'codex', prompt: 'Next turn' },
-        timing: { updatedAt: ++updatedAt },
-        routing: { worktreeId: 'wt', connectionId: null },
-        metadata: { providerSession: identities[key].providerSession }
-      }
-    ])
-    expect(store.getState().agentStatusByPaneKey[key].state).toBe('working')
-    expect(store.getState().agentConversationsByPaneKey).toBe(identities)
-    const unchangedEnumerations = keys.mock.calls.filter(([map]) => map === identities).length
-    expect(unchangedEnumerations).toBe(0)
-    expect(classifier).not.toHaveBeenCalled()
-    expect(protection).not.toHaveBeenCalled()
-    store
-      .getState()
-      .recordAgentProviderSession(
-        key,
-        'codex',
-        { key: 'session_id', id: 'replacement' },
-        { updatedAt: ++updatedAt },
-        { worktreeId: 'wt', connectionId: null }
-      )
-    expect(store.getState().agentConversationsByPaneKey[key].providerSession.id).toBe('replacement')
-    expect(classifier).toHaveBeenCalledTimes(1)
-    expect(protection).toHaveBeenCalledTimes(1)
-    switches.pendingNativeChatCliSwitches.set('retention-test', {
-      chatTabId: 'root-0',
-      workspaceId: 'wt',
-      executionHostId: 'local'
-    })
-    cleanup.push(() => switches.pendingNativeChatCliSwitches.delete('retention-test'))
-    store.setState({
-      terminalLayoutsByTabId: Object.fromEntries(
-        Object.entries(store.getState().terminalLayoutsByTabId).slice(501)
-      )
-    })
-    expect(classifier).toHaveBeenCalledTimes(2)
-    expect(store.getState().agentConversationsByPaneKey[key]).toBeDefined()
-    expect(Object.keys(store.getState().agentConversationsByPaneKey)).toHaveLength(n)
-    switches.pendingNativeChatCliSwitches.delete('retention-test')
-    store.setState((state) => ({ agentConversationsByPaneKey: state.agentConversationsByPaneKey }))
-    expect(classifier).toHaveBeenCalledTimes(3)
-    expect(store.getState().agentConversationsByPaneKey[key]).toBeUndefined()
-    expect(Object.keys(store.getState().agentConversationsByPaneKey)).toHaveLength(n - 1)
-    expect(store.getState().agentConversationsByPaneKey[pane('root-501')]).toBeDefined()
-    console.info('UNCHANGED_RETENTION_COUNTS', {
-      n,
-      acceptedUpdates: 3,
-      unchangedEnumerations,
-      changedInputRebuilds: classifier.mock.calls.length
-    })
-    await Promise.resolve()
-  }
-)
diff --git a/src/renderer/src/hooks/useIpcEvents-agent-status-batch-projection.test.ts b/src/renderer/src/hooks/useIpcEvents-agent-status-batch-projection.test.ts
index d422137721eb..b015f0be5111 100644
--- a/src/renderer/src/hooks/useIpcEvents-agent-status-batch-projection.test.ts
+++ b/src/renderer/src/hooks/useIpcEvents-agent-status-batch-projection.test.ts
@@ -619,118 +619,6 @@ describe('useIpcEvents agent status snapshot integration', () => {
       vi.useRealTimers()
     }
   })
-
-  it.each([16, 160])(
-    'copies startup association entries linearly at %i events with immutable reentry',
-    async (n) => {
-      vi.useFakeTimers()
-      const store = createTestStore()
-      const pane = (i: number) => `rootless:00000000-0000-4000-8000-${String(i).padStart(12, '0')}`
-      store.setState({
-        workspaceSessionReady: true,
-        repos: [TEST_REPO],
-        worktreesByRepo: { [TEST_REPO.id]: [makeWorktree({ id: 'wt', repoId: TEST_REPO.id })] },
-        tabsByWorktree: { wt: [makeTab({ id: 'rootless', worktreeId: 'wt' })] },
-        terminalLayoutsByTabId: {
-          rootless: { root: null, activeLeafId: null, expandedLeafId: null }
-        }
-      })
-      const record = store.getState().recordAgentProviderSession
-      for (let i = 0; i < n; i++) {
-        record(pane(i), 'codex', { key: 'session_id', id: `seed-${i}` }, undefined, {
-          worktreeId: 'wt'
-        })
-      }
-      const initial = Object.freeze(store.getState().agentConversationsByPaneKey)
-      const entries: AgentStatusSetData[] = Array.from({ length: n }, (_, i) => ({
-        paneKey: pane(n + i),
-        state: 'working',
-        prompt: '',
-        agentType: 'codex',
-        providerSessionOnly: i % 2 === 0,
-        worktreeId: 'wt',
-        terminalHandle: `term-${i}`,
-        providerSession: { key: 'session_id', id: `startup-${i}` },
-        receivedAt: 1000,
-        stateStartedAt: 1000
-      }))
-      let copied = 0,
-        enumerated = 0
-      const assign = Object.assign
-      const association = (source: unknown): source is Record<PropertyKey, unknown> =>
-        typeof source === 'object' && source !== null && Object.hasOwn(source, pane(0))
-      vi.spyOn(Object, 'assign').mockImplementation((target, ...sources) =>
-        assign(
-          target,
-          ...sources.map((source) =>
-            association(source)
-              ? new Proxy(source, {
-                  ownKeys(value) {
-                    const found = Reflect.ownKeys(value)
-                    enumerated += found.length
-                    return found
-                  },
-                  get(value, key) {
-                    copied += 1
-                    return value[key]
-                  }
-                })
-              : source
-          )
-        )
-      )
-      const snapshots: (typeof initial)[] = [],
-        order: string[] = []
-      cleanup.push(
-        store.subscribe((state, previous) => {
-          if (state.agentConversationsByPaneKey === previous.agentConversationsByPaneKey) {
-            return
-          }
-          snapshots.push(Object.freeze(state.agentConversationsByPaneKey))
-          order.push('published')
-          if (snapshots.length === 1) {
-            store.getState().transactAgentStatuses((outer) => {
-              store.getState().transactAgentStatuses((inner) => {
-                inner.apply({
-                  kind: 'providerSession',
-                  paneKey: pane(2 * n - 1),
-                  agent: 'codex',
-                  providerSession: { key: 'session_id', id: 'reentered' },
-                  timing: { updatedAt: 2000 },
-                  routing: { worktreeId: 'wt' }
-                })
-                inner.afterCommit(() => order.push('inner'))
-              })
-              outer.afterCommit(() => order.push('outer'))
-            })
-          }
-        })
-      )
-      const snapshot = vi.fn(async () => entries)
-      vi.doMock('../store', () => ({
-        useAppStore: { getState: store.getState, subscribe: store.subscribe }
-      }))
-      stubAuxiliaryModules()
-      vi.stubGlobal('window', buildWindowApi({ onSet: () => () => {}, getSnapshot: snapshot }))
-      const { registerAgentStatusIpcBridge } = await import('./ipc-events/agent-status-ipc-bridge')
-      const unsubs: (() => void)[] = []
-      const bridge = registerAgentStatusIpcBridge(unsubs)
-      cleanup.push(bridge.disposeAsyncState, bridge.unsubscribeStore, ...unsubs)
-      await vi.advanceTimersByTimeAsync(0)
-      console.info('STARTUP_ASSOCIATION_WORK', { n, copied, enumerated })
-      expect(snapshot).toHaveBeenCalledOnce()
-      expect(snapshots).toHaveLength(2)
-      expect(order).toEqual(['published', 'published', 'inner', 'outer'])
-      expect(Object.keys(initial)).toEqual(Array.from({ length: n }, (_, i) => pane(i)))
-      expect(Object.keys(snapshots[0])).toEqual(Array.from({ length: 2 * n }, (_, i) => pane(i)))
-      expect(snapshots[0][pane(2 * n - 1)].providerSession.id).toBe(`startup-${n - 1}`)
-      expect(snapshots[1][pane(2 * n - 1)].providerSession.id).toBe('reentered')
-      expect(snapshots[0]).not.toBe(snapshots[1])
-      expect(Object.keys(snapshots[1])).toEqual(Object.keys(snapshots[0]))
-      expect(copied).toBe(3 * n)
-      expect(enumerated).toBe(3 * n)
-    }
-  )
 })
 
 const cleanup: (() => void)[] = []
diff --git a/src/renderer/src/hooks/useIpcEvents-agent-status-owner-ordering.test.ts b/src/renderer/src/hooks/useIpcEvents-agent-status-owner-ordering.test.ts
deleted file mode 100644
index 6da7c48824cc..000000000000
--- a/src/renderer/src/hooks/useIpcEvents-agent-status-owner-ordering.test.ts
+++ /dev/null
@@ -1,288 +0,0 @@
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import type { AgentStatusIpcPayload } from '../../../shared/agent-status-types'
-import type {
-  TerminalLayoutSnapshot,
-  TerminalPaneLayoutNode
-} from '../../../shared/terminal-tab-types'
-import { getDefaultWorkspaceSession } from '../../../shared/constants'
-import { makePaneKey } from '../../../shared/stable-pane-id'
-import { collectLeafIds } from '../../../shared/terminal-pane-layout-tree'
-import {
-  createTestStore,
-  makeTab,
-  makeWorktree,
-  TEST_REPO
-} from '../store/slices/store-test-helpers'
-import { classifyPaneKeyLiveness } from '../store/slices/agent-status/agent-status-capacity-eviction'
-import {
-  resetAgentPaneAuthorityAliasesForTests,
-  resolveAgentPaneAuthorityKey
-} from '../store/slices/agent-pane-authority'
-import { buildWindowApi } from './ipc-events-agent-status-window-test-fixtures'
-import type { AgentStatusSetData } from './ipc-events-agent-status-store-test-fixtures'
-
-const holder = vi.hoisted(() => ({
-  getStore: (): ReturnType<typeof createTestStore> => {
-    throw new Error('Witness store not initialized')
-  }
-}))
-vi.mock('../store', () => ({
-  useAppStore: {
-    getState: () => holder.getStore().getState(),
-    subscribe: (...args: Parameters<ReturnType<typeof createTestStore>['subscribe']>) =>
-      holder.getStore().subscribe(...args)
-  }
-}))
-vi.mock('./agent-hook-completion-notifications', () => ({
-  observeAgentHookCompletionForNotification: vi.fn(),
-  syncAgentHookCompletionNotificationsForStoreUpdate: vi.fn()
-}))
-vi.mock('@/lib/telemetry', () => ({ track: vi.fn() }))
-
-const A = '11111111-1111-4111-8111-111111111111'
-const B = '22222222-2222-4222-8222-222222222222'
-const R = '33333333-3333-4333-8333-333333333333'
-const TAB = 'tab-ordering'
-const WT = 'wt-ordering'
-const key = (leaf: string): string => makePaneKey(TAB, leaf)
-const layout = (...leaves: string[]): TerminalLayoutSnapshot => ({
-  root: leaves.slice(1).reduce<TerminalPaneLayoutNode>(
-    (first, leafId) => ({
-      type: 'split',
-      direction: 'vertical',
-      first,
-      second: { type: 'leaf', leafId }
-    }),
-    { type: 'leaf', leafId: leaves[0]! }
-  ),
-  activeLeafId: leaves[0]!,
-  expandedLeafId: null
-})
-const cleanups: (() => void)[] = []
-beforeEach(() => {
-  vi.useFakeTimers()
-  vi.setSystemTime(1_800_000_000_000)
-  resetAgentPaneAuthorityAliasesForTests()
-})
-afterEach(() => {
-  cleanups
-    .splice(0)
-    .toReversed()
-    .forEach((cleanup) => cleanup())
-  vi.restoreAllMocks()
-  vi.useRealTimers()
-  vi.unstubAllGlobals()
-})
-
-async function witness() {
-  const store = createTestStore()
-  holder.getStore = () => store
-  const tab = makeTab({ id: TAB, worktreeId: WT, ptyId: 'pty-A', title: 'Shell' })
-  store.setState({
-    workspaceSessionReady: true,
-    repos: [TEST_REPO],
-    worktreesByRepo: { [TEST_REPO.id]: [makeWorktree({ id: WT, repoId: TEST_REPO.id })] },
-    tabsByWorktree: { [WT]: [tab] },
-    terminalLayoutsByTabId: { [TAB]: layout(R) }
-  })
-  let phase = 'mount'
-  const publications: unknown[] = []
-  const removals: { phase: string; incoming: string; keys: string[]; owner: string }[] = []
-  const capture = (): void => {
-    const state = store.getState()
-    publications.push({
-      phase,
-      layouts: state.terminalLayoutsByTabId,
-      aliases: [A, B, R].map((leaf) => [key(leaf), resolveAgentPaneAuthorityKey(key(leaf))]),
-      projection: state.agentConversationsByPaneKey,
-      live: Object.keys(state.agentStatusByPaneKey),
-      sleeping: Object.keys(state.sleepingAgentSessionsByPaneKey)
-    })
-  }
-  cleanups.push(
-    store.subscribe((state, previous) => {
-      capture()
-      for (const incoming of [key(A), key(B)]) {
-        if (
-          state.agentConversationsByPaneKey[incoming] &&
-          !previous.agentConversationsByPaneKey[incoming]
-        ) {
-          // Observational only: exercise the candidate's classifier, never remove a production key.
-          const classify = classifyPaneKeyLiveness(state)
-          removals.push({
-            phase,
-            incoming,
-            owner: resolveAgentPaneAuthorityKey(key(A)),
-            keys: Object.keys(state.agentConversationsByPaneKey).filter(
-              (candidate) => candidate !== incoming && classify(candidate) === 'dead'
-            )
-          })
-        }
-      }
-    })
-  )
-  let onSet: ((data: AgentStatusSetData) => void) | undefined
-  vi.stubGlobal(
-    'window',
-    buildWindowApi({
-      onSet: (callback) => {
-        onSet = callback
-        return () => {}
-      }
-    })
-  )
-  const { registerAgentStatusIpcBridge } = await import('./ipc-events/agent-status-ipc-bridge')
-  const unsubs: (() => void)[] = []
-  const bridge = registerAgentStatusIpcBridge(unsubs)
-  cleanups.push(bridge.disposeAsyncState, bridge.unsubscribeStore, ...unsubs)
-  await Promise.resolve()
-  const transaction = vi.spyOn(store.getState(), 'transactAgentStatuses')
-  const timer = vi.spyOn(globalThis, 'setTimeout')
-  const event = (
-    leaf: string,
-    providerSessionOnly = false,
-    runtimeBacked = true
-  ): AgentStatusIpcPayload & AgentStatusSetData => ({
-    paneKey: key(leaf),
-    connectionId: null,
-    state: 'working',
-    prompt: '',
-    agentType: 'claude',
-    receivedAt: Date.now(),
-    stateStartedAt: Date.now(),
-    providerSession: { key: 'session_id', id: `conversation-${leaf}` },
-    ...(providerSessionOnly ? { providerSessionOnly: true } : {}),
-    ...(runtimeBacked ? { worktreeId: WT, terminalHandle: `term-${leaf}` } : {})
-  })
-  return {
-    store,
-    tab,
-    publications,
-    removals,
-    transaction,
-    timer,
-    event,
-    stage: (name: string) => {
-      phase = name
-      capture()
-    },
-    emit: (data: ReturnType<typeof event>) => {
-      if (!onSet) {
-        throw new Error('Missing production onSet')
-      }
-      onSet(data)
-    },
-    settle: async () => {
-      await vi.advanceTimersByTimeAsync(150)
-      phase = 'settled'
-      capture()
-    }
-  }
-}
-
-it.each([
-  ['live', A, B],
-  ['live', B, A],
-  ['provider-only', A, B],
-  ['provider-only', B, A]
-])(
-  'preserves two %s source-before-layout identities in order %s then %s',
-  async (route, first, second) => {
-    const w = await witness()
-    for (const leaf of [first, second]) {
-      w.stage(`source-${leaf}`)
-      w.emit(w.event(leaf, route === 'provider-only'))
-      await vi.advanceTimersByTimeAsync(34)
-    }
-    expect(w.removals.at(-1)?.keys).toEqual([key(first)])
-    for (const leaf of [A, B]) {
-      w.stage(`ordinary-cleanup-${leaf}`)
-      w.store.getState().removeAgentStatus(key(leaf))
-      w.store.getState().clearSleepingAgentSession(key(leaf))
-    }
-    expect(w.store.getState().agentStatusByPaneKey).toEqual({})
-    expect(w.store.getState().sleepingAgentSessionsByPaneKey).toEqual({})
-    w.stage('later-layout')
-    w.store.getState().setTabLayout(TAB, layout(A, B))
-    await w.settle()
-    expect(Object.keys(w.store.getState().agentConversationsByPaneKey).sort()).toEqual(
-      [key(A), key(B)].sort()
-    )
-    console.info(
-      'OWNER_ORDERING_TRACE',
-      JSON.stringify({
-        route,
-        first,
-        second,
-        publications: w.publications,
-        wouldRemove: w.removals
-      })
-    )
-  }
-)
-
-it.each(['normalization', 'scoped-hydration'])(
-  'replays pending B before projection-only A transfers during %s',
-  async (operation) => {
-    const w = await witness()
-    w.store.getState().setTabLayout(TAB, layout(A))
-    w.stage('source-A')
-    w.emit(w.event(A, true))
-    w.store.getState().clearSleepingAgentSession(key(A))
-    expect(w.store.getState().agentStatusByPaneKey).toEqual({})
-    expect(w.store.getState().sleepingAgentSessionsByPaneKey).toEqual({})
-    await vi.advanceTimersByTimeAsync(34)
-    w.stage('pending-B')
-    w.emit(w.event(B, false, false))
-    expect(w.store.getState().agentConversationsByPaneKey[key(B)]).toBeUndefined()
-    expect(w.timer.mock.calls.filter((call) => call[1] === 100)).toHaveLength(1)
-    const batchesBefore = w.transaction.mock.calls.length
-    const duplicate = {
-      ...layout(A, R, B),
-      activeLeafId: R,
-      ptyIdsByLeafId: { [A]: 'pty-A', [R]: 'pty-A', [B]: 'pty-B' }
-    }
-    w.stage(operation)
-    if (operation === 'normalization') {
-      w.store.getState().setTabLayout(TAB, duplicate)
-    } else {
-      w.store.getState().hydrateWorkspaceSession(
-        {
-          ...getDefaultWorkspaceSession(),
-          activeRepoId: TEST_REPO.id,
-          activeWorktreeId: WT,
-          activeTabId: TAB,
-          tabsByWorktree: { [WT]: [w.tab] },
-          terminalLayoutsByTabId: { [TAB]: duplicate }
-        },
-        { replaceWorkspaceKeys: [WT] }
-      )
-    }
-    expect(w.transaction.mock.calls.length - batchesBefore).toBe(1)
-    expect(w.removals.find((row) => row.incoming === key(B))).toEqual({
-      phase: operation,
-      incoming: key(B),
-      owner: key(A),
-      keys: [key(A)]
-    })
-    expect(collectLeafIds(w.store.getState().terminalLayoutsByTabId[TAB].root)).toEqual([R, B])
-    expect(resolveAgentPaneAuthorityKey(key(A))).toBe(key(R))
-    expect(w.store.getState().agentConversationsByPaneKey[key(R)]?.providerSession.id).toBe(
-      `conversation-${A}`
-    )
-    expect(w.store.getState().agentConversationsByPaneKey[key(A)]).toBeUndefined()
-    await w.settle()
-    expect(w.store.getState().agentConversationsByPaneKey[key(B)]).toBeDefined()
-    expect(w.store.getState().agentConversationsByPaneKey[key(R)]).toBeDefined()
-    console.info(
-      'OWNER_ORDERING_TRACE',
-      JSON.stringify({
-        operation,
-        synchronousPendingBatches: w.transaction.mock.calls.length - batchesBefore,
-        pendingRetryTimers: w.timer.mock.calls.filter((call) => call[1] === 100).length,
-        publications: w.publications,
-        wouldRemove: w.removals
-      })
-    )
-  }
-)
diff --git a/src/renderer/src/lib/activate-ai-vault-structured-session.ts b/src/renderer/src/lib/activate-ai-vault-structured-session.ts
index 7b5f2d079a86..701db0a379b4 100644
--- a/src/renderer/src/lib/activate-ai-vault-structured-session.ts
+++ b/src/renderer/src/lib/activate-ai-vault-structured-session.ts
@@ -1,3 +1,5 @@
+import { isSessionTabSelectionRequest } from '../../../shared/session-tab-placement'
+import { viewerSelectionOutcome } from './viewer-selection-request'
 import { conversationSwitchViewerSelectionCurrent } from './conversation-switch-selection'
 import { toast } from 'sonner'
 import type { AiVaultSession } from '../../../shared/ai-vault-types'
@@ -82,11 +84,17 @@ export async function activateAiVaultStructuredSession(
   session: Pick<AiVaultSession, 'structuredSession'>,
   deps: StructuredSessionActivationDeps = defaultDeps,
   target?: RuntimeClientTarget,
-  viewerSelection?: string
+  viewerSelection?: string,
+  onFailure?: () => void
 ): Promise<boolean> {
   return (
-    (await activateAiVaultStructuredSessionVerified(session, deps, target, viewerSelection)) !==
-    'none'
+    (await activateAiVaultStructuredSessionVerified(
+      session,
+      deps,
+      target,
+      viewerSelection,
+      onFailure
+    )) !== 'none'
   )
 }
 
@@ -96,7 +104,8 @@ export async function activateAiVaultStructuredSessionVerified(
   session: Pick<AiVaultSession, 'structuredSession'>,
   deps: StructuredSessionActivationDeps = defaultDeps,
   target?: RuntimeClientTarget,
-  viewerSelection?: string
+  viewerSelection?: string,
+  onFailure?: () => void
 ): Promise<'activated' | 'reported' | 'none'> {
   const structured = session.structuredSession
   if (!structured) {
@@ -114,7 +123,14 @@ export async function activateAiVaultStructuredSessionVerified(
   if (inFlight) {
     return inFlight
   }
-  const activation = activateStructuredSession(structured, deps, target, viewerSelection)
+  const activation = activateStructuredSession(
+    structured,
+    onFailure
+      ? { ...deps, unavailable: onFailure, gone: onFailure, hostCannotOpen: onFailure }
+      : deps,
+    target,
+    viewerSelection
+  )
   activationsInFlight.set(key, activation)
   try {
     return await activation
@@ -136,8 +152,19 @@ async function activateStructuredSession(
     sessionId: structured.sessionId,
     ...(host ? { target: host } : {})
   }
-  const activate = () =>
-    conversationSwitchViewerSelectionCurrent(viewerSelection) && deps.activate(target)
+  const modern = viewerSelection !== undefined && isSessionTabSelectionRequest(viewerSelection)
+  const activate = () => {
+    if (modern && viewerSelectionOutcome(viewerSelection) === 'fulfilled') {
+      return true
+    }
+    return (
+      conversationSwitchViewerSelectionCurrent(viewerSelection) &&
+      deps.activate({
+        ...target,
+        ...(modern ? { viewerSelection, callerOnly: true } : {})
+      })
+    )
+  }
   if (!activate()) {
     // Refresh can avoid reveal, but failure must fall through: host republication is the actual repair.
     const refreshed = await refreshedWithoutThrowing(deps, structured.workspaceId, host)
@@ -167,6 +194,9 @@ async function activateStructuredSession(
       }
     }
   }
+  if (modern) {
+    return viewerSelectionOutcome(viewerSelection) === 'fulfilled' ? 'activated' : 'none'
+  }
   // A moved project's chat opens under its retained entry; the catalog does not list it.
   if (
     useAppStore.getState().activeWorktreeId !== structured.workspaceId &&
diff --git a/src/renderer/src/lib/agent-launch-pane-ordinary-verdict.ts b/src/renderer/src/lib/agent-launch-pane-ordinary-verdict.ts
new file mode 100644
index 000000000000..6ab4340ebcf0
--- /dev/null
+++ b/src/renderer/src/lib/agent-launch-pane-ordinary-verdict.ts
@@ -0,0 +1,75 @@
+/** Apply main’s typed spawn/takeback verdicts, retaining final pane outcomes until session cleanup. */
+
+import type { AgentLaunchPaneVerdictEvent } from '../../../shared/agent-launch-pane-verdict'
+import { applyClosedTerminalLeafNotice } from '@/components/terminal-pane/closed-terminal-leaf-notice'
+import { collectLeafIdsInOrder } from '@/components/terminal-pane/terminal-layout-leaf-ids'
+import { useAppStore } from '@/store'
+import { forgetAgentLaunchPanePrompt } from './agent-launch-pane-prompt'
+import {
+  agentLaunchPaneAttemptCurrent,
+  settleAgentLaunchPaneStart
+} from './agent-launch-pane-start'
+import {
+  applyVerdictToUndrawnLaunchTab,
+  releaseMainWrittenLaunchTab
+} from './agent-launch-tab-main-written'
+
+export function applyOrdinaryAgentLaunchPaneVerdict(event: AgentLaunchPaneVerdictEvent): boolean {
+  if (!agentLaunchPaneAttemptCurrent(event.tabId, event.leafId, event.operationId)) {
+    return false
+  }
+  const { worktreeId, tabId, leafId, verdict } = event
+  const state = useAppStore.getState()
+  const tab = state.tabsByWorktree[worktreeId]?.find((candidate) => candidate.id === tabId)
+  // A main-written tab this window does not draw yet keeps the verdict until it draws.
+  if (!tab && applyVerdictToUndrawnLaunchTab(event)) {
+    return true
+  }
+  // Only a pane its tab says a launch laid out: a verdict never touches anything else.
+  if (
+    tab?.agentLaunchPane?.leafId !== leafId ||
+    tab.agentLaunchPane.operationId !== event.operationId
+  ) {
+    return false
+  }
+  if (verdict.kind !== 'proceed') {
+    settleAgentLaunchPaneStart(tabId, leafId, null)
+  }
+  switch (verdict.kind) {
+    case 'proceed':
+      releaseMainWrittenLaunchTab(tabId)
+      forgetAgentLaunchPanePrompt(tabId)
+      state.setTabAgentLaunchPane(tabId, undefined)
+      return true
+    case 'not-started':
+    case 'unconfirmed': {
+      const root = state.terminalLayoutsByTabId[tabId]?.root
+      if (root && !collectLeafIdsInOrder(root).includes(leafId)) {
+        forgetAgentLaunchPanePrompt(tabId)
+        state.setTabAgentLaunchPane(tabId, undefined)
+        return true
+      }
+      state.setTabAgentLaunchPane(tabId, { ...tab.agentLaunchPane, outcome: verdict })
+      return true
+    }
+    case 'withdrawn': {
+      forgetAgentLaunchPanePrompt(tabId)
+      if (releaseMainWrittenLaunchTab(tabId)) {
+        state.setTabAgentLaunchPane(tabId, undefined)
+        return true
+      }
+      // The pane alone when the user split the tab while it waited; their split stays.
+      if (state.terminalLayoutsByTabId[tabId]?.root?.type === 'leaf') {
+        state.closeTab(tabId, {
+          reason: 'cleanup',
+          recordInteraction: false,
+          captureRecentlyClosed: false
+        })
+      } else {
+        state.setTabAgentLaunchPane(tabId, undefined)
+        applyClosedTerminalLeafNotice(tabId, leafId)
+      }
+    }
+  }
+  return true
+}
diff --git a/src/renderer/src/lib/agent-launch-pane-verdict-application.test.ts b/src/renderer/src/lib/agent-launch-pane-verdict-application.test.ts
index f497ca3b9483..d14bd2351ee2 100644
--- a/src/renderer/src/lib/agent-launch-pane-verdict-application.test.ts
+++ b/src/renderer/src/lib/agent-launch-pane-verdict-application.test.ts
@@ -22,12 +22,6 @@ const testStore = vi.hoisted(() => {
 })
 vi.mock('@/store', () => ({
   useAppStore: {
-    setState: (patch: Parameters<ReturnType<typeof createTestStore>['setState']>[0]) => {
-      if (!testStore.current) {
-        throw new Error('no test store')
-      }
-      testStore.current.setState(patch)
-    },
     getState: () => {
       if (!testStore.current) {
         throw new Error('no test store')
@@ -46,11 +40,7 @@ createTabsSliceMockApi()
 const { applyAgentLaunchPaneVerdict } = await import('./agent-launch-pane-verdict-application')
 const { agentLaunchPanePrompt, rememberAgentLaunchPanePrompt } =
   await import('./agent-launch-pane-prompt')
-const { noteAgentLaunchPaneClosedByUser, wasAgentLaunchPaneClosedByUser } =
-  await import('./agent-launch-pane-closes')
-const { awaitAgentLaunchPaneStart } = await import('./agent-launch-pane-start')
-const { agentLaunchPaneOutcomeForLeaf } =
-  await import('../components/terminal-pane/agent-launch-pane-notice-text')
+const { wasAgentLaunchPaneClosedByUser } = await import('./agent-launch-pane-closes')
 
 const WT = 'repo1::/tmp/feature'
 const LEAF = '3f2504e0-4f89-41d3-9a0c-0305e82c3301'
@@ -74,14 +64,6 @@ beforeEach(() => {
     initialLeafId: LEAF,
     agentLaunchPane: { leafId: LEAF, operationId: 'op-1' }
   }).id
-  applyAgentLaunchPaneVerdict({
-    worktreeId: WT,
-    tabId,
-    leafId: LEAF,
-    operationId: 'op-1',
-    accepted: true,
-    verdict: { kind: 'proceed' }
-  })
   rememberAgentLaunchPanePrompt(tabId, 'fix the build')
 })
 
@@ -109,31 +91,15 @@ describe("a launch pane's verdict in the window", () => {
     expect(launchTab()?.agentLaunchPane).toBeUndefined()
   })
 
-  it('final after a user closes the launch leaf does not affect its surviving sibling', async () => {
-    const sibling = '9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d'
-    const started = awaitAgentLaunchPaneStart(tabId, LEAF)
-    // The ordinary split-close owner records the user close before persisting the surviving tree.
-    noteAgentLaunchPaneClosedByUser(tabId, LEAF)
+  it('final, for a launch pane the user already closed out of a split: nothing is kept', () => {
     store.getState().setTabLayout(tabId, {
-      root: { type: 'leaf', leafId: sibling },
-      activeLeafId: sibling,
+      root: { type: 'leaf', leafId: '9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d' },
+      activeLeafId: '9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d',
       expandedLeafId: null
     })
-    const layout = store.getState().terminalLayoutsByTabId[tabId]
-    await expect(started).resolves.toBeNull()
-    expect(wasAgentLaunchPaneClosedByUser(tabId, LEAF)).toBe(true)
-
     apply({ kind: 'not-started', code: 'agent_launch_tab_closed' })
-
-    expect(store.getState().terminalLayoutsByTabId[tabId]).toBe(layout)
-    expect(launchTab()?.agentLaunchPane).toEqual({
-      leafId: LEAF,
-      operationId: 'op-1',
-      outcome: { kind: 'not-started', code: 'agent_launch_tab_closed' }
-    })
-    expect(agentLaunchPanePrompt(tabId)).toBe('fix the build')
-    expect(agentLaunchPaneOutcomeForLeaf(launchTab(), sibling)).toBeNull()
-    expect(applyClosedTerminalLeafNotice).not.toHaveBeenCalled()
+    expect(launchTab()?.agentLaunchPane).toBeUndefined()
+    expect(agentLaunchPanePrompt(tabId)).toBeNull()
   })
 
   it('withdrawn: a tab with only the launch pane goes', () => {
@@ -141,7 +107,7 @@ describe("a launch pane's verdict in the window", () => {
     expect(launchTab()).toBeUndefined()
   })
 
-  it('withdrawn: a split the user added keeps both panes without closing either', () => {
+  it('withdrawn: a split the user added stays; only the launch pane closes', () => {
     store.getState().setTabLayout(tabId, {
       root: {
         type: 'split',
@@ -152,13 +118,9 @@ describe("a launch pane's verdict in the window", () => {
       activeLeafId: LEAF,
       expandedLeafId: null
     })
-    const layout = store.getState().terminalLayoutsByTabId[tabId]
-    const tab = launchTab()
     apply({ kind: 'withdrawn' })
-    expect(launchTab()).toBe(tab)
-    expect(store.getState().terminalLayoutsByTabId[tabId]).toBe(layout)
-    expect(agentLaunchPanePrompt(tabId)).toBe('fix the build')
-    expect(applyClosedTerminalLeafNotice).not.toHaveBeenCalled()
+    expect(launchTab()).toBeDefined()
+    expect(applyClosedTerminalLeafNotice).toHaveBeenCalledWith(tabId, LEAF)
   })
 
   it('never touches a pane no launch laid out', () => {
diff --git a/src/renderer/src/lib/agent-launch-pane-verdict-application.ts b/src/renderer/src/lib/agent-launch-pane-verdict-application.ts
index 92be4dac7883..4a4642eb5662 100644
--- a/src/renderer/src/lib/agent-launch-pane-verdict-application.ts
+++ b/src/renderer/src/lib/agent-launch-pane-verdict-application.ts
@@ -1,3 +1,5 @@
+import { endViewerSelectionForDestination } from './viewer-selection-request'
+import { applyOrdinaryAgentLaunchPaneVerdict } from './agent-launch-pane-ordinary-verdict'
 import { launchTabWithdrawalIdentity } from '../../../shared/agent-launch-tab-publication'
 import type { AgentLaunchPaneVerdictEvent } from '../../../shared/agent-launch-pane-verdict'
 import { createKeptWorktreeSurfacePruners } from '@/store/slices/tabs/kept-worktree-surface-pruning'
@@ -20,6 +22,13 @@ export function applyAgentLaunchPaneVerdict(event: AgentLaunchPaneVerdictEvent):
     confirmAgentLaunchPaneAttempt(event.tabId, event.leafId, event.operationId)
     return true
   }
+  if (event.withdrawalRoot === undefined) {
+    const applied = applyOrdinaryAgentLaunchPaneVerdict(event)
+    if (applied && (event.verdict.kind === 'withdrawn' || event.verdict.kind === 'not-started')) {
+      endViewerSelectionForDestination(event.worktreeId, event.tabId)
+    }
+    return applied
+  }
   const { worktreeId, tabId, leafId, verdict } = event
   // Commit the state verdict first; never call ordinary Close on a launch's provisional pane.
   let accepted = false
@@ -65,6 +74,7 @@ export function applyAgentLaunchPaneVerdict(event: AgentLaunchPaneVerdictEvent):
         browserTabIds: new Set()
       })
       accepted = withdrawn = true
+      endViewerSelectionForDestination(worktreeId, tabId)
       const layouts = { ...state.terminalLayoutsByTabId }
       delete layouts[tabId]
       return {
diff --git a/src/renderer/src/lib/agent-launch-tab-main-written.test.ts b/src/renderer/src/lib/agent-launch-tab-main-written.test.ts
index 5f8db8a5cbbb..949e11d02fb9 100644
--- a/src/renderer/src/lib/agent-launch-tab-main-written.test.ts
+++ b/src/renderer/src/lib/agent-launch-tab-main-written.test.ts
@@ -1,5 +1,11 @@
+import {
+  beginViewerSelectionRequest,
+  disposeViewerSelection,
+  viewerSelectionOutcome
+} from './viewer-selection-request'
+import { agentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
+import { noteUserWorkspaceSwitch } from './workspace-switch-user-act'
 import { _resetLayoutFramePositionForTests } from '@/runtime/layout-frame-position'
-import { captureConversationSwitchViewerSelection } from './conversation-switch-selection'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type * as AgentStatusModule from '@/lib/agent-status'
 import type { AgentLaunchTabPublishRequest } from '../../../shared/agent-launch-tab-publication'
@@ -98,6 +104,7 @@ beforeEach(() => {
   store.getState().setActiveWorktree(WT)
 })
 afterEach(() => {
+  disposeViewerSelection()
   _resetUndrawnLaunchTabsForTests()
   frames.flowing = false
   frames.holdsTab = true
@@ -182,7 +189,7 @@ describe("a launch tab main wrote, in a layout-owner build's window", () => {
     expect(agentLaunchPanePrompt(TAB_ID)).toBeNull()
   })
 
-  it('withdraws an unused main-written projection and drops what it kept', () => {
+  it('leaves the close of a withdrawn tab to main, and drops what it kept', () => {
     drawMainTab()
     keepAgentLaunchTabMainWrote(request({ prompt: 'fix the build' }))
 
@@ -194,7 +201,7 @@ describe("a launch tab main wrote, in a layout-owner build's window", () => {
       verdict: { kind: 'withdrawn' }
     })
 
-    expect(store.getState().tabsByWorktree[WT]?.map((tab) => tab.id)).toEqual([])
+    expect(store.getState().tabsByWorktree[WT]?.map((tab) => tab.id)).toEqual([TAB_ID])
     expect(launchPane()).toBeUndefined()
     expect(agentLaunchPanePrompt(TAB_ID)).toBeNull()
   })
@@ -222,20 +229,58 @@ describe("a launch tab main wrote, in a layout-owner build's window", () => {
   })
 })
 
-it.each(['unchanged', 'navigate'] as const)(
-  'checks original viewer when main-written publication finally draws: %s',
-  (action) => {
-    const source = store.getState().createTab(WT)
+it.each([false, true])(
+  'the actual undrawn callback fulfils once, preserving a newer user choice=%s',
+  (navigate) => {
     const other = store.getState().createTab(WT)
-    store.getState().setActiveTab(source.id)
-    const viewerSelection = captureConversationSwitchViewerSelection()
-    keepAgentLaunchTabMainWrote(request({ viewer: 'focus-in-workspace', viewerSelection }))
-    if (action === 'navigate') {
-      store.getState().setActiveTab(other.id)
+    const deadline = agentSessionSwitchDeadline(Date.now)
+    try {
+      const older = beginViewerSelectionRequest('older-dialog', deadline)
+      const selection = beginViewerSelectionRequest('accepted-action', deadline)
+      selection.accept()
+      older.accept()
+      expect(viewerSelectionOutcome(selection.token)).toBe('pending')
+      keepAgentLaunchTabMainWrote(
+        request({
+          viewer: 'focus-window',
+          openPlacement: {
+            invocationId: 'accepted-action',
+            generation: 'op-1',
+            placement: {},
+            activate: true,
+            viewerSelection: selection.token
+          }
+        })
+      )
+      expect(viewerSelectionOutcome(selection.token)).toBe('pending')
+      expect(revealWorkspaceSurface).not.toHaveBeenCalled()
+      if (navigate) {
+        noteUserWorkspaceSwitch(WT)
+        store
+          .getState()
+          .activateTab(
+            store.getState().unifiedTabsByWorktree[WT].find((tab) => tab.entityId === other.id)!.id
+          )
+      }
+      drawMainTab()
+      expect(viewerSelectionOutcome(selection.token)).toBe(navigate ? 'superseded' : 'fulfilled')
+      expect(store.getState().getActiveTab(WT)?.entityId).toBe(navigate ? other.id : TAB_ID)
+      const focusCount = focusTerminalInitiatedTab.mock.calls.length
+      keepAgentLaunchTabMainWrote(
+        request({
+          viewer: 'focus-window',
+          openPlacement: {
+            invocationId: 'accepted-action',
+            generation: 'op-1',
+            placement: {},
+            activate: true,
+            viewerSelection: selection.token
+          }
+        })
+      )
+      expect(focusTerminalInitiatedTab).toHaveBeenCalledTimes(focusCount)
+    } finally {
+      deadline.dispose()
     }
-    drawMainTab()
-    expect(launchPane()).toEqual({ leafId: LEAF_ID, operationId: 'op-1' })
-    expect(store.getState().getActiveTab(WT)?.id).toBe(action === 'unchanged' ? TAB_ID : other.id)
-    expect(focusTerminalInitiatedTab).toHaveBeenCalledTimes(action === 'unchanged' ? 1 : 0)
   }
 )
diff --git a/src/renderer/src/lib/agent-launch-tab-main-written.ts b/src/renderer/src/lib/agent-launch-tab-main-written.ts
index 3cd87d7a942b..1fc811c52462 100644
--- a/src/renderer/src/lib/agent-launch-tab-main-written.ts
+++ b/src/renderer/src/lib/agent-launch-tab-main-written.ts
@@ -1,3 +1,9 @@
+import { isSessionTabSelectionRequest } from '../../../shared/session-tab-placement'
+import { openPlacementSourceCurrent } from '@/runtime/web-session-tabs-sync/open-placement'
+import {
+  bindViewerSelectionDestination,
+  endViewerSelectionForDestination
+} from './viewer-selection-request'
 import { conversationSwitchViewerSelectionCurrent } from '@/lib/conversation-switch-selection'
 import { agentLaunchPaneAttemptCurrent } from './agent-launch-pane-start'
 import { afterLayoutFrame, layoutFramesFlowing } from '@/runtime/layout-frame-position'
@@ -84,6 +90,7 @@ function keepWhenDrawn(request: AgentLaunchTabPublishRequest, present: () => voi
       undrawn.get(tabId)?.pane.operationId === request.operationId &&
       goneFromFrames(worktreeId, tabId)
     ) {
+      endViewerSelectionForDestination(worktreeId, tabId)
       dropUndrawn(tabId)
     }
   }
@@ -116,14 +123,21 @@ export function keepAgentLaunchTabMainWrote(
     throw new Error('agent_launch_superseded')
   }
   const created = request.shownByMain?.created === true
+  const viewerSelection = request.openPlacement?.viewerSelection ?? request.viewerSelection
+  bindViewerSelectionDestination(viewerSelection, { worktreeId, tabId })
   noteMainWritten(tabId)
   if (request.prompt) {
     rememberAgentLaunchPanePrompt(tabId, request.prompt)
   }
-  // Only the launch that made the tab moves anyone, as the window's own publication.
+  // Ordinary retries retain focus; explicit viewer requests use their one-shot owner.
   const present = (): void => {
-    if (created) {
-      presentAgentLaunchTab(viewer, worktreeId, tabId, leafId, request.viewerSelection)
+    if (
+      (created || isSessionTabSelectionRequest(viewerSelection)) &&
+      (!request.openPlacement ||
+        (request.openPlacement.activate &&
+          openPlacementSourceCurrent(useAppStore.getState(), worktreeId, request.openPlacement)))
+    ) {
+      presentAgentLaunchTab(viewer, worktreeId, tabId, leafId, viewerSelection)
     }
   }
   const tab = drawnTab(worktreeId, tabId)
@@ -133,11 +147,11 @@ export function keepAgentLaunchTabMainWrote(
   } else if (
     created &&
     viewer === 'focus-window' &&
-    conversationSwitchViewerSelectionCurrent(request.viewerSelection)
+    conversationSwitchViewerSelectionCurrent(viewerSelection)
   ) {
     // Reveal the workspace while awaiting its tab frame, unless main already closed the tab.
     if (keepWhenDrawn(request, present)) {
-      if (request.viewerSelection === undefined) {
+      if (viewerSelection === undefined) {
         revealWorkspaceSurface(useAppStore.getState(), worktreeId, [tabId])
       }
     }
@@ -162,10 +176,14 @@ export function applyVerdictToUndrawnLaunchTab(event: AgentLaunchPaneVerdictEven
     return false
   }
   const { verdict } = event
+  if (verdict.kind === 'not-started') {
+    endViewerSelectionForDestination(event.worktreeId, event.tabId)
+  }
   if (verdict.kind === 'not-started' || verdict.kind === 'unconfirmed') {
     entry.pane = { ...entry.pane, outcome: verdict }
     return true
   }
+  endViewerSelectionForDestination(event.worktreeId, event.tabId)
   dropUndrawn(event.tabId)
   return true
 }
diff --git a/src/renderer/src/lib/agent-launch-tab-presentation.ts b/src/renderer/src/lib/agent-launch-tab-presentation.ts
index c49f9cb8a4e0..e4b33b0f6290 100644
--- a/src/renderer/src/lib/agent-launch-tab-presentation.ts
+++ b/src/renderer/src/lib/agent-launch-tab-presentation.ts
@@ -1,3 +1,5 @@
+import { isSessionTabSelectionRequest } from '../../../shared/session-tab-placement'
+import { selectSessionTabForViewer } from '@/runtime/web-session-tabs-sync/store-patch'
 import { conversationSwitchViewerSelectionCurrent } from '@/lib/conversation-switch-selection'
 import type { AgentLaunchTabViewerRule } from '../../../shared/agent-launch-tab-publication'
 import { focusTerminalInitiatedTab } from '../hooks/ipc-events/terminal-command-state'
@@ -15,6 +17,18 @@ export function presentAgentLaunchTab(
   if (!conversationSwitchViewerSelectionCurrent(viewerSelection)) {
     return
   }
+  if (viewerSelection && isSessionTabSelectionRequest(viewerSelection)) {
+    const state = useAppStore.getState()
+    if (
+      viewer === 'focus-window' ||
+      (viewer === 'focus-in-workspace' && state.activeWorktreeId === worktreeId)
+    ) {
+      if (selectSessionTabForViewer(worktreeId, tabId, viewerSelection)) {
+        focusTerminalInitiatedTab(tabId, leafId, worktreeId)
+      }
+    }
+    return
+  }
   if (viewer === 'focus-window') {
     revealWorkspaceSurface(useAppStore.getState(), worktreeId, [tabId])
   }
diff --git a/src/renderer/src/lib/agent-launch-tab-publication.test.ts b/src/renderer/src/lib/agent-launch-tab-publication.test.ts
index fb0be10690de..90bf6c5e389f 100644
--- a/src/renderer/src/lib/agent-launch-tab-publication.test.ts
+++ b/src/renderer/src/lib/agent-launch-tab-publication.test.ts
@@ -1,27 +1,7 @@
-import { registerSessionTabIpcBridge } from '@/hooks/ipc-events/session-tab-ipc-bridge'
-import * as structuredSessionClient from '@/runtime/structured-agent-session-client'
-import { captureConversationSwitchViewerSelection } from './conversation-switch-selection'
 import type { AppState } from '@/store/types'
-import {
-  acceptAgentLaunchPaneAttempt,
-  awaitAgentLaunchPaneStart,
-  settleAgentLaunchPaneStart,
-  forgetAgentLaunchPaneAttempts
-} from './agent-launch-pane-start'
-import { applyAgentLaunchPaneVerdict } from './agent-launch-pane-verdict-application'
+import { forgetAgentLaunchPaneAttempts } from './agent-launch-pane-start'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import {
-  captureSwitchProjection,
-  disposeSwitchProjections,
-  observeSwitchProjections,
-  retireSwitchProjection
-} from './conversation-switch-projection'
-import {
-  isWebSessionCloseIntentPending,
-  recordWebSessionCloseIntent
-} from '@/runtime/web-session-close-intent'
-import { LOCAL_STRUCTURED_SESSION_OWNER } from '@/runtime/local-structured-session-owner'
-import { AGENT_SESSION_SWITCH_CLIENT_MS } from '../../../shared/agent-session-switch-execution'
+import { disposeSwitchProjections } from './conversation-switch-projection'
 import type * as AgentStatusModule from '@/lib/agent-status'
 import type { AgentLaunchTabPublishRequest } from '../../../shared/agent-launch-tab-publication'
 import { createTabsSliceMockApi } from '../store/slices/tabs-slice-test-harness'
@@ -189,168 +169,6 @@ describe('publishing a launch tab before its agent exists', () => {
 })
 
 describe('placement', () => {
-  it('places the destination after a guarded source without retaining it until a user reorders', async () => {
-    const source = store.getState().createUnifiedTab(WT, 'agent-session', {
-      id: 'source-chat',
-      entityId: 'saved-source',
-      agentSessionAgent: 'codex'
-    })
-    const following = store.getState().createTab(WT)
-    store.getState().activateTab(source.id)
-    const order = () =>
-      store.getState().groupsByWorktree[WT]!.find((group) => group.id === source.groupId)!.tabOrder
-    expect(order()).toEqual([source.id, following.id])
-    const retain = vi.fn()
-    captureSwitchProjection(
-      store.getState(),
-      WT,
-      {
-        invocationId: 'switch-placement',
-        generation: 'switch-generation',
-        sessionId: source.entityId,
-        tabId: source.id,
-        phase: 'prepare'
-      },
-      retain
-    )
-
-    const published = publishAgentLaunchTab(
-      request({
-        operationId: 'switch-placement',
-        launchAgent: 'codex',
-        placement: { groupId: source.groupId, afterTabId: source.id }
-      })
-    )
-    expect(published).toMatchObject({ tabId: TAB_ID, created: true })
-    expect(launchTab()).toMatchObject({ id: TAB_ID, entityId: TAB_ID, groupId: source.groupId })
-    expect(order()).toEqual([source.id, TAB_ID, following.id])
-    await Promise.resolve()
-    expect(retain).not.toHaveBeenCalled()
-
-    store.getState().reorderUnifiedTabs(source.groupId!, [following.id, source.id, TAB_ID])
-    expect(order()).toEqual([following.id, source.id, TAB_ID])
-    await Promise.resolve()
-    expect(retain).toHaveBeenCalledOnce()
-  })
-
-  it('keeps actual IPC-captured source use protected without sending obsolete execution receipts', async () => {
-    const source = store.getState().createUnifiedTab(WT, 'agent-session', {
-      id: 'ipc-source',
-      entityId: 'ipc-conversation',
-      agentSessionAgent: 'codex'
-    })
-    const originalUi = window.api.ui
-    let receive: Parameters<typeof originalUi.onSessionTabCloseRequest>[0] | undefined
-    const respond = vi.fn<typeof originalUi.respondSessionTabClose>()
-    const rpc = vi
-      .spyOn(structuredSessionClient, 'callStructuredAgentSession')
-      .mockRejectedValue(new Error('obsolete receipt must not dispatch'))
-    const unsubs: (() => void)[] = []
-    window.api.ui = {
-      ...originalUi,
-      onCloseSessionTab: () => () => {},
-      onMoveSessionTab: () => () => {},
-      onSessionTabCloseRequest: (callback) => {
-        receive = callback
-        return () => {}
-      },
-      respondSessionTabClose: respond
-    }
-    try {
-      registerSessionTabIpcBridge(unsubs)
-      const projection = {
-        invocationId: 'ipc-switch',
-        generation: 'ipc-generation',
-        sessionId: source.entityId,
-        tabId: source.id,
-        phase: 'prepare' as const
-      }
-      receive!({
-        requestId: 'prepare',
-        tabId: source.id,
-        worktreeId: WT,
-        switchProjection: projection
-      })
-      expect(respond).toHaveBeenCalledWith({ requestId: 'prepare', switchApplied: true })
-      store.getState().activateTab(source.id)
-      await Promise.resolve()
-      const usedSource = store.getState().getActiveTab(WT)
-      receive!({
-        requestId: 'retire',
-        tabId: source.id,
-        worktreeId: WT,
-        switchProjection: { ...projection, phase: 'retire' }
-      })
-      expect(respond).toHaveBeenLastCalledWith({ requestId: 'retire', switchApplied: false })
-      expect(store.getState().getActiveTab(WT)?.id).toBe(source.id)
-      expect(store.getState().unifiedTabsByWorktree[WT]).toContainEqual(usedSource)
-      for (const unsubscribe of unsubs) {
-        unsubscribe()
-      }
-      await Promise.resolve()
-      expect(rpc).not.toHaveBeenCalled()
-    } finally {
-      disposeSwitchProjections()
-      window.api.ui = originalUi
-      rpc.mockRestore()
-    }
-  })
-
-  it('releases retirement on actual use or rollback without clearing a newer close', () => {
-    const fixedNow = 1_000_000
-    const clock = vi.spyOn(Date, 'now').mockReturnValue(fixedNow)
-    try {
-      const source = store
-        .getState()
-        .createUnifiedTab(WT, 'agent-session', { entityId: 'saved-source' })
-      const owner = { environmentId: LOCAL_STRUCTURED_SESSION_OWNER }
-      const hostTabId = `agent-session:${source.entityId}`
-      const pending = (now = fixedNow) => isWebSessionCloseIntentPending(owner, WT, hostTabId, now)
-      const proposal = {
-        invocationId: 'retirement',
-        generation: 'retirement',
-        sessionId: source.entityId,
-        tabId: source.id,
-        phase: 'prepare' as const
-      }
-      const retiredAt = fixedNow
-      captureSwitchProjection(store.getState(), WT, proposal, vi.fn())
-      store.setState(retireSwitchProjection(store.getState(), proposal) ?? {})
-      expect(store.getState().unifiedTabsByWorktree[WT]).not.toContainEqual(source)
-      expect(pending(retiredAt + AGENT_SESSION_SWITCH_CLIENT_MS - 1)).toBe(true)
-      store
-        .getState()
-        .createUnifiedTab(WT, 'agent-session', { id: source.id, entityId: source.entityId })
-      store.getState().activateTab(source.id)
-      expect(pending()).toBe(false)
-
-      const rollback = { ...proposal, invocationId: 'rollback', generation: 'rollback' }
-      captureSwitchProjection(store.getState(), WT, rollback, vi.fn())
-      store.setState(retireSwitchProjection(store.getState(), rollback) ?? {})
-      expect(pending()).toBe(true)
-      observeSwitchProjections(
-        store.getState(),
-        {
-          worktree: WT,
-          publicationEpoch: 'rollback',
-          snapshotVersion: 1,
-          activeGroupId: null,
-          activeTabId: null,
-          activeTabType: null,
-          tabs: [],
-          switchProjections: [{ ...rollback, phase: 'retain' }]
-        },
-        vi.fn()
-      )
-      expect(pending()).toBe(false)
-      recordWebSessionCloseIntent(owner, WT, hostTabId, fixedNow)
-      disposeSwitchProjections()
-      expect(pending()).toBe(true)
-    } finally {
-      clock.mockRestore()
-    }
-  })
-
   function twoGroups() {
     const anchor = store.getState().createUnifiedTab(WT, 'terminal')
     const sourceGroupId = store.getState().groupsByWorktree[WT]![0]!.id
@@ -473,72 +291,3 @@ describe('whose view moves', () => {
     expect(focusTerminalInitiatedTab).toHaveBeenCalledWith(TAB_ID, LEAF_ID, WT)
   })
 })
-
-describe('the ordinary window actual verdict producer', () => {
-  it('takes back an exact unused failed tab without ordinary Close', () => {
-    const shown = publishAgentLaunchTab(request({ operationId: 'A' }))
-    expect(
-      publishAgentLaunchTab(
-        request({ operationId: 'A', withdraw: { root: shown.withdrawalRoot! } })
-      ).withdrawn
-    ).toBe(true)
-    expect(store.getState().tabsByWorktree[WT]?.some((row) => row.id === TAB_ID)).toBe(false)
-    expect(store.getState().terminalLayoutsByTabId[TAB_ID]).toBeUndefined()
-  })
-  it('does not clear a newer accepted/preparing launch prompt or waiter', async () => {
-    const shown = publishAgentLaunchTab(request({ operationId: 'A', prompt: 'original' }))
-    acceptAgentLaunchPaneAttempt(`${TAB_ID}:${LEAF_ID}`, 'B')
-    publishAgentLaunchTab(request({ operationId: 'B', prompt: 'new work' }))
-    const started = awaitAgentLaunchPaneStart(TAB_ID, LEAF_ID)
-    const answer = vi.fn()
-    void started.then(answer)
-    expect(
-      applyAgentLaunchPaneVerdict({
-        worktreeId: WT,
-        tabId: TAB_ID,
-        leafId: LEAF_ID,
-        operationId: 'A',
-        withdrawalRoot: shown.withdrawalRoot,
-        verdict: { kind: 'withdrawn' }
-      })
-    ).toBe(false)
-    expect(agentLaunchPanePrompt(TAB_ID)).toBe('new work')
-    await Promise.resolve()
-    expect(answer).not.toHaveBeenCalled()
-    settleAgentLaunchPaneStart(TAB_ID, LEAF_ID, 'pty-B')
-    expect(await started).toBe('pty-B')
-  })
-  it('retains a used destination even when the failed start was definitive', () => {
-    const shown = publishAgentLaunchTab(request({ operationId: 'A' }))
-    store.setState({ lastTerminalInputAtByPaneKey: { [`${TAB_ID}:${LEAF_ID}`]: 1 } })
-    const receipt = publishAgentLaunchTab(
-      request({ operationId: 'A', withdraw: { root: shown.withdrawalRoot! } })
-    )
-    expect(receipt.withdrawn).toBe(false)
-    expect(store.getState().tabsByWorktree[WT]?.some((row) => row.id === TAB_ID)).toBe(true)
-  })
-})
-
-it.each(['unchanged', 'navigate', 'close'] as const)(
-  'conditions ordinary terminal creation and presentation on the original viewer: %s',
-  (action) => {
-    const source = store.getState().createTab(WT)
-    const other = store.getState().createTab(WT)
-    store.getState().setActiveTab(source.id)
-    const viewerSelection = captureConversationSwitchViewerSelection()
-    if (action === 'navigate') {
-      store.getState().setActiveTab(other.id)
-    }
-    if (action === 'close') {
-      store.getState().closeTab(source.id)
-    }
-    const selected = store.getState().getActiveTab(WT)?.id
-    const published = publishAgentLaunchTab(
-      request({ viewer: 'focus-in-workspace', viewerSelection })
-    )
-    expect(published.created).toBe(true)
-    expect(launchTab()?.entityId).toBe(TAB_ID)
-    expect(store.getState().getActiveTab(WT)?.id).toBe(action === 'unchanged' ? TAB_ID : selected)
-    expect(focusTerminalInitiatedTab).toHaveBeenCalledTimes(action === 'unchanged' ? 1 : 0)
-  }
-)
diff --git a/src/renderer/src/lib/agent-launch-tab-publication.ts b/src/renderer/src/lib/agent-launch-tab-publication.ts
index cf3d3bffd992..214b1a448d11 100644
--- a/src/renderer/src/lib/agent-launch-tab-publication.ts
+++ b/src/renderer/src/lib/agent-launch-tab-publication.ts
@@ -1,3 +1,4 @@
+import { isSessionTabSelectionRequest } from '../../../shared/session-tab-placement'
 import { conversationSwitchViewerSelectionCurrent } from '@/lib/conversation-switch-selection'
 import { applyAgentLaunchPaneVerdict } from './agent-launch-pane-verdict-application'
 import { launchTabWithdrawalIdentity } from '../../../shared/agent-launch-tab-publication'
@@ -92,6 +93,21 @@ export function publishAgentLaunchTab(
         remount: kept?.leafId === leafId && kept.outcome !== undefined
       })
     }
+    const retrySelection = request.openPlacement?.viewerSelection ?? request.viewerSelection
+    if (
+      isSessionTabSelectionRequest(retrySelection) &&
+      (!request.openPlacement ||
+        (request.openPlacement.activate &&
+          openPlacementSourceCurrent(store, worktreeId, request.openPlacement)))
+    ) {
+      presentAgentLaunchTab(
+        request.viewer,
+        worktreeId,
+        tabId,
+        leafId,
+        request.openPlacement?.viewerSelection ?? request.viewerSelection
+      )
+    }
     return { tabId, created: false, placement: { groupId } }
   }
 
diff --git a/src/renderer/src/lib/agent-session/structured-agent-session-provisional-tab.test.ts b/src/renderer/src/lib/agent-session/structured-agent-session-provisional-tab.test.ts
index 64efeb8f24ca..7a478a9f9cc0 100644
--- a/src/renderer/src/lib/agent-session/structured-agent-session-provisional-tab.test.ts
+++ b/src/renderer/src/lib/agent-session/structured-agent-session-provisional-tab.test.ts
@@ -1,10 +1,9 @@
 // @vitest-environment happy-dom
+import { noteUserWorkspaceSwitch } from '@/lib/workspace-switch-user-act'
 import { getDefaultSettings } from '../../../../shared/constants'
 import type * as CliChatResumeSourceModule from '@/components/tab-bar/cli-chat-resume-source'
 import type * as CliChatResumeTerminalCapture from '@/components/tab-bar/cli-chat-resume-terminal-capture'
 import type { CliChatResumeSource } from '@/components/tab-bar/cli-chat-resume-source'
-import { runLegacyCliChatResume } from '@/components/tab-bar/cli-chat-resume-run'
-import { captureConversationSwitchViewerSelection } from '../conversation-switch-selection'
 import { runConversationSwitch } from '../conversation-surface-switch'
 import { setLocalRuntimeCapabilitiesForTests } from '@/runtime/local-runtime-capabilities'
 import type * as SessionClient from '@/runtime/structured-agent-session-client'
@@ -537,9 +536,9 @@ it.each(['expiry', 'purge'])('created pane publication: %s', async (order) => {
   }
 })
 
-it.each(['unchanged', 'navigate', 'strict-old-runtime', 'stale-v2-runtime'] as const)(
-  'strict legacy Stop through real host admission and provisional/layout writers: %s',
-  async (action) => {
+it.each([false, true])(
+  'strict legacy Stop through real host admission and provisional/layout writers, newer navigation=%s',
+  async (navigate) => {
     const source = useAppStore
       .getState()
       .createUnifiedTab('wt-1', 'terminal', { id: 'source-terminal', entityId: 'source-terminal' })
@@ -601,10 +600,7 @@ it.each(['unchanged', 'navigate', 'strict-old-runtime', 'stale-v2-runtime'] as c
         }
       }
     )
-    const fromCommon = action === 'strict-old-runtime' || action === 'stale-v2-runtime'
-    setLocalRuntimeCapabilitiesForTests(
-      action === 'stale-v2-runtime' ? ['agent-session.structured.switch.v2:codex'] : []
-    )
+    setLocalRuntimeCapabilitiesForTests([])
     useAppStore.setState((state) => ({
       settings: {
         ...getDefaultSettings('/home/test'),
@@ -612,13 +608,11 @@ it.each(['unchanged', 'navigate', 'strict-old-runtime', 'stale-v2-runtime'] as c
         experimentalNativeChat: true
       }
     }))
-    const running = fromCommon
-      ? runConversationSwitch({
-          direction: 'chat',
-          ...mocks.source.current,
-          source: mocks.source.current
-        })
-      : runLegacyCliChatResume(mocks.source.current, captureConversationSwitchViewerSelection())
+    const running = runConversationSwitch({
+      direction: 'chat',
+      ...mocks.source.current,
+      source: mocks.source.current
+    })
     await vi.waitFor(() => expect(mocks.support).toHaveBeenCalledOnce())
     expect(mocks.stopped).toHaveBeenCalledExactlyOnceWith({
       worktree: 'id:wt-1',
@@ -627,10 +621,11 @@ it.each(['unchanged', 'navigate', 'strict-old-runtime', 'stale-v2-runtime'] as c
       keepHistory: true
     })
     expect(mocks.create).not.toHaveBeenCalled()
-    if (action === 'navigate') {
+    await main.settle()
+    if (navigate) {
+      noteUserWorkspaceSwitch('wt-1')
       useAppStore.getState().activateTab(other.id)
     }
-    await main.settle()
     admission.resolve({ supported: true })
     await running
     await main.settle()
@@ -641,9 +636,7 @@ it.each(['unchanged', 'navigate', 'strict-old-runtime', 'stale-v2-runtime'] as c
       )
     expect(mocks.create).toHaveBeenCalledOnce()
     expect(chats).toHaveLength(1)
-    expect(useAppStore.getState().getActiveTab('wt-1')?.id).toBe(
-      action === 'navigate' ? other.id : chats[0].id
-    )
+    expect(useAppStore.getState().getActiveTab('wt-1')?.id).toBe(navigate ? other.id : chats[0].id)
     expect(mocks.create.mock.calls[0][0].resumeFrom.providerSessionId).toBe('saved-provider')
     expect(mocks.create.mock.calls[0][0].envelope.sessionId).toBe(chats[0].entityId)
   }
diff --git a/src/renderer/src/lib/agent-session/structured-agent-session-provisional-tab.ts b/src/renderer/src/lib/agent-session/structured-agent-session-provisional-tab.ts
index 74d1d69dd520..7539d4ff0cad 100644
--- a/src/renderer/src/lib/agent-session/structured-agent-session-provisional-tab.ts
+++ b/src/renderer/src/lib/agent-session/structured-agent-session-provisional-tab.ts
@@ -70,6 +70,7 @@ export type ProvisionalLaunchArgs = {
   targetGroupId?: string
   afterTabId?: string
   activate?: boolean
+  viewerSelection?: string
   canActivate?: () => boolean
   /** Identity-only resumes publish on commit; unknown outcomes keep their recovery tab. */
   deferPublication?: true
@@ -208,6 +209,7 @@ function beginLocalProvisionalLaunch(
       ...(args.targetGroupId ? { targetGroupId: args.targetGroupId } : {}),
       ...(args.afterTabId ? { afterTabId: args.afterTabId } : {}),
       ...(args.activate !== undefined ? { activate: args.activate } : {}),
+      viewerSelection: args.viewerSelection,
       canActivate: args.canActivate
     })
     return { ...handle, tab }
@@ -228,7 +230,32 @@ function beginDeferredPublication(
   const releaseHold = holdEmptyWorkspaceDefaultSurfaceForLaunch(worktreeId)
   let handle: StructuredAgentLaunchHandle | null
   try {
-    handle = args.plan.begin(launchHooks(args), args.target)
+    const hooks = launchHooks(args)
+    handle = args.plan.begin(
+      args.viewerSelection
+        ? {
+            ...hooks,
+            onStructuredReady: (sessionId) => {
+              hooks.onStructuredReady?.(sessionId)
+              if (!handle) {
+                return
+              }
+              openStructuredAgentSessionProvisionalTab({
+                worktreeId,
+                executionHostId: handle.executionHostId,
+                sessionId,
+                agent: args.plan.agent,
+                targetGroupId: args.targetGroupId,
+                afterTabId: args.afterTabId,
+                activate: args.activate,
+                viewerSelection: args.viewerSelection,
+                canActivate: args.canActivate
+              })
+            }
+          }
+        : hooks,
+      args.target
+    )
   } catch (error) {
     releaseHold()
     throw error
diff --git a/src/renderer/src/lib/agent-session/structured-agent-session-tab-activation.ts b/src/renderer/src/lib/agent-session/structured-agent-session-tab-activation.ts
index 01af74c8598c..8c39f4e5fc53 100644
--- a/src/renderer/src/lib/agent-session/structured-agent-session-tab-activation.ts
+++ b/src/renderer/src/lib/agent-session/structured-agent-session-tab-activation.ts
@@ -1,3 +1,5 @@
+import { isSessionTabSelectionRequest } from '../../../../shared/session-tab-placement'
+import { selectSessionTabForViewer } from '@/runtime/web-session-tabs-sync/store-patch'
 import { runtimeEnvironmentIdOrLocalUnlessTwin } from '../worktree-runtime-owner'
 import { requestNativeChatComposerFocus } from '@/components/native-chat/use-native-chat-composer-reveal-focus'
 import { useAppStore } from '@/store/index'
@@ -33,6 +35,7 @@ export function activateStructuredAgentSessionTab(args: {
   tabId: string
   target?: RuntimeClientTarget
   callerOnly?: boolean
+  viewerSelection?: string
 }): boolean {
   const state = useAppStore.getState()
   const tab = (state.unifiedTabsByWorktree[args.worktreeId] ?? []).find(
@@ -46,9 +49,22 @@ export function activateStructuredAgentSessionTab(args: {
   if (!tab) {
     return false
   }
-  state.focusGroup(args.worktreeId, tab.groupId)
-  state.activateTab(tab.id, { worktreeId: args.worktreeId })
-  state.setActiveTabType('agent-session', args.worktreeId)
+  if (args.viewerSelection && isSessionTabSelectionRequest(args.viewerSelection)) {
+    if (
+      !selectSessionTabForViewer(
+        args.worktreeId,
+        tab.id,
+        args.viewerSelection,
+        args.target?.kind === 'environment' ? args.target.environmentId : undefined
+      )
+    ) {
+      return false
+    }
+  } else {
+    state.focusGroup(args.worktreeId, tab.groupId)
+    state.activateTab(tab.id, { worktreeId: args.worktreeId })
+    state.setActiveTabType('agent-session', args.worktreeId)
+  }
   requestNativeChatComposerFocus(tab.id)
   activateStructuredAgentSessionTabOnOwner(args.worktreeId, tab.entityId, args.target, {
     callerOnly: args.callerOnly
@@ -81,6 +97,7 @@ export function activateStructuredAgentSessionById(args: {
   sessionId: string
   target?: RuntimeClientTarget
   callerOnly?: boolean
+  viewerSelection?: string
 }): boolean {
   const tab = findStructuredAgentSessionTab(useAppStore.getState().unifiedTabsByWorktree, {
     workspaceId: args.worktreeId,
@@ -92,7 +109,8 @@ export function activateStructuredAgentSessionById(args: {
         worktreeId: args.worktreeId,
         tabId: tab.id,
         target: args.target,
-        callerOnly: args.callerOnly
+        callerOnly: args.callerOnly,
+        viewerSelection: args.viewerSelection
       })
     : false
 }
diff --git a/src/renderer/src/lib/conversation-surface-switch.test.tsx b/src/renderer/src/lib/conversation-surface-switch.test.tsx
index 73975344ba7c..d8e8857afc6c 100644
--- a/src/renderer/src/lib/conversation-surface-switch.test.tsx
+++ b/src/renderer/src/lib/conversation-surface-switch.test.tsx
@@ -1,29 +1,13 @@
-import { structuredAgentSessionTabId } from '../../../shared/structured-agent-session-projection'
 // @vitest-environment happy-dom
-import { act, cleanup, renderHook } from '@testing-library/react'
+import { cleanup } from '@testing-library/react'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import { applyWebSessionTabsSnapshot } from '@/runtime/web-session-tabs-sync/snapshot-api'
-import {
-  makeSnapshot,
-  resetWebSessionTabsSyncTestState
-} from '@/runtime/web-session-tabs-sync-test-harness'
-import { toWebTerminalSurfaceTabId } from '../../../shared/terminal-surface-id'
 import { createTabsSliceMockApi } from '../store/slices/tabs-slice-test-harness'
-import { captureConversationSwitchViewerSelection } from './conversation-switch-selection'
-import { publishAgentLaunchTab } from './agent-launch-tab-publication'
 import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
-import type { CliChatResumeSource } from '@/components/tab-bar/cli-chat-resume-source'
 import type * as SessionOwner from '@/runtime/structured-agent-session-owner'
 import { useAppStore } from '@/store'
 import { EMPTY_STRUCTURED_AGENT_SESSION } from '../../../shared/structured-agent-session-reducer'
-import type { StructuredAgentSessionReadSnapshot } from '@/components/native-chat/structured-agent-session-read-owner-contract'
-import {
-  runConversationSwitch,
-  useConversationSwitchReadiness,
-  conversationSwitchFailureText
-} from './conversation-surface-switch'
+import { runConversationSwitch, runNativeChatCliSwitch } from './conversation-surface-switch'
 import { pendingNativeChatCliSwitches } from './pending-conversation-surface-switches'
-
 const mocks = vi.hoisted(() => {
   function makeTarget(): { current: RuntimeClientTarget } {
     return { current: { kind: 'local' } }
@@ -110,7 +94,6 @@ const subject = {
 beforeEach(() => {
   vi.clearAllMocks()
   createTabsSliceMockApi()
-  resetWebSessionTabsSyncTestState()
   mocks.target.current = { kind: 'local' }
   mocks.rpc.mockResolvedValue({})
   mocks.pairedRefresh.mockResolvedValue(undefined)
@@ -132,12 +115,10 @@ afterEach(() => {
   vi.useRealTimers()
   pendingNativeChatCliSwitches.clear()
 })
-
 it('reserves pending before negotiation, sends one execution request and leaves all launching to the host', async () => {
   const negotiation = Promise.withResolvers<boolean>()
   mocks.support.mockReturnValue(negotiation.promise)
   const first = runConversationSwitch(subject)
-  expect(pendingNativeChatCliSwitches.size).toBe(1)
   expect(await runConversationSwitch(subject)).toBe(false)
   negotiation.resolve(true)
   expect(await first).toBe(true)
@@ -154,135 +135,7 @@ it('reserves pending before negotiation, sends one execution request and leaves
   expect(mocks.legacy).not.toHaveBeenCalled()
   expect(pendingNativeChatCliSwitches.size).toBe(0)
 })
-
-it('keeps an old peer on the explicit v1 adapter without sending execution fields', async () => {
-  mocks.support.mockResolvedValue(false)
-  await runConversationSwitch(subject)
-  expect(mocks.legacy).toHaveBeenCalledOnce()
-  expect(mocks.call).not.toHaveBeenCalled()
-})
-
-it('starts the full observer at actual first send, without refilling on later observation', async () => {
-  vi.useFakeTimers()
-  const answer = Promise.withResolvers<unknown>()
-  let send: (() => void) | undefined
-  mocks.call.mockImplementation((_target, _method, _params, options) => {
-    send = options.beforeSend
-    return answer.promise
-  })
-  const running = runConversationSwitch(subject)
-  await act(async () => {
-    await vi.advanceTimersByTimeAsync(700_000)
-  })
-  expect(send).toBeDefined()
-  send!()
-  await act(async () => {
-    await vi.advanceTimersByTimeAsync(40_000)
-  })
-  expect(pendingNativeChatCliSwitches.size).toBe(1)
-  send!()
-  await act(async () => {
-    await vi.advanceTimersByTimeAsync(695_001)
-  })
-  expect(await running).toBe(false)
-  expect(pendingNativeChatCliSwitches.size).toBe(0)
-  answer.resolve({ status: 'completed', sessionId: subject.sessionId })
-})
-
-it('clears invocation pending and rereads real state after a lost answer, without hiding a late destination', async () => {
-  vi.useFakeTimers()
-  const answer = Promise.withResolvers<unknown>()
-  mocks.call.mockReturnValue(answer.promise)
-  const running = runConversationSwitch(subject)
-  await act(async () => {
-    await vi.advanceTimersByTimeAsync(735_001)
-  })
-  expect(await running).toBe(false)
-  expect(pendingNativeChatCliSwitches.size).toBe(0)
-  expect(mocks.refresh).toHaveBeenCalledWith('workspace', { reacceptCurrentVersion: true })
-  expect(mocks.error).toHaveBeenCalledExactlyOnceWith(
-    expect.stringContaining('could not confirm the Codex switch')
-  )
-  answer.resolve({ status: 'completed', sessionId: subject.sessionId })
-  await Promise.resolve()
-  expect(mocks.error).toHaveBeenCalledOnce()
-  expect(mocks.legacy).not.toHaveBeenCalled()
-})
-
-it.each(['chat', 'terminal'] as const)(
-  'uses held live turn facts for %s, without opening a History reader',
-  (direction) => {
-    let held: StructuredAgentSessionReadSnapshot = {
-      current: true,
-      loadingOlder: false,
-      olderHistoryGeneration: 0,
-      state: { ...EMPTY_STRUCTURED_AGENT_SESSION, working: true }
-    }
-    mocks.reader.mockReturnValue({ subscribe: mocks.subscribe, getSnapshot: () => held })
-    const { result } = renderHook(() => useConversationSwitchReadiness({ ...subject, direction }))
-    // Owed/unanswered work is decided by the host at click, not by this broad working flag.
-    expect(result.current.ready).toBe(true)
-    act(() => {
-      held = {
-        ...held,
-        state: {
-          ...held.state,
-          latestTurn: {
-            itemId: 'codex:turn:turn_123',
-            observedAt: 1,
-            turn: { turnId: 'turn_123', state: 'running' }
-          }
-        }
-      }
-      mocks.listeners.forEach((listener) => listener())
-    })
-    expect(result.current.ready).toBe(true)
-    expect(result.current.explanation).toBeUndefined()
-    act(() => {
-      held = { ...held, current: false }
-      mocks.listeners.forEach((listener) => listener())
-    })
-    expect(result.current.ready).toBe(true)
-    expect(mocks.call).not.toHaveBeenCalled()
-  }
-)
-
-it('keeps suspended and live jobs available for Stop and switch', () => {
-  const paneKey = 'terminal:leaf'
-  const source = {
-    tabId: 'terminal',
-    workspaceId: subject.workspaceId,
-    paneKey,
-    agent: subject.agent,
-    providerSessionId: 'provider-session',
-    executionHostId: 'local' as const,
-    ptyId: 'pty'
-  }
-  useAppStore.getState().setPaneForegroundAgent(paneKey, {
-    agent: null,
-    suspendedAgent: 'codex',
-    shellForeground: true
-  })
-  const { result } = renderHook(() =>
-    useConversationSwitchReadiness({ ...subject, direction: 'chat', source })
-  )
-  expect(result.current.ready).toBe(true)
-  expect(result.current.explanation).toBeUndefined()
-  act(() => {
-    useAppStore.getState().setPaneForegroundAgent(paneKey, {
-      agent: 'codex',
-      shellForeground: false
-    })
-  })
-  expect(result.current.ready).toBe(true)
-  expect(result.current.explanation).toBeUndefined()
-})
-
 it('formats real refusal categories once, with agent and next step, never raw errors or platform-wrong job control', async () => {
-  const text = (reason: string, platform = 'darwin') =>
-    conversationSwitchFailureText(null, { ...subject, platform }, reason)
-  expect(text('ownerUnproven')).toContain('Check its open chats and terminals')
-  expect(text('previousExitUnverifiable')).not.toContain('Restart')
   mocks.call.mockRejectedValue(new Error('secret raw transport/provider failure'))
   await runConversationSwitch({ ...subject, direction: 'chat' })
   expect(mocks.error).toHaveBeenCalledExactlyOnceWith(
@@ -307,13 +160,14 @@ it.each([false, true])(
     const confirm = vi.fn(() => answer.promise)
     const first = runConversationSwitch({ ...subject, confirm })
     expect(await runConversationSwitch({ ...subject, confirm })).toBe(false)
+    await vi.waitFor(() => expect(confirm).toHaveBeenCalledOnce())
     expect(confirm).toHaveBeenCalledExactlyOnceWith(
       expect.objectContaining({
         title: 'Codex is replying. Stop it and switch?',
         compact: true
       })
     )
-    expect(mocks.support).not.toHaveBeenCalled()
+    expect(mocks.support).toHaveBeenCalledOnce()
     expect(mocks.call).not.toHaveBeenCalled()
     answer.resolve(yes)
     expect(await first).toBe(yes)
@@ -322,17 +176,7 @@ it.each([false, true])(
   }
 )
 
-it('does nothing with Chat UI off, including History and direct action dispatch', async () => {
-  useAppStore.setState({
-    settings: { ...useAppStore.getState().settings!, experimentalNativeChat: false }
-  })
-  expect(await runConversationSwitch(subject)).toBe(false)
-  expect(mocks.support).not.toHaveBeenCalled()
-  expect(mocks.call).not.toHaveBeenCalled()
-  expect(mocks.refresh).not.toHaveBeenCalled()
-})
-
-it.each(['claude', 'codex', 'grok', 'opencode', 'opencode2', 'pi'] as const)(
+it.each(['codex'] as const)(
   'dispatches idle %s once through the common host command, preserving configured commands',
   async (agent) => {
     const confirm = vi.fn()
@@ -355,275 +199,55 @@ it.each(['claude', 'codex', 'grok', 'opencode', 'opencode2', 'pi'] as const)(
     )
   }
 )
-it('keeps the disabled agent out of the switch contract', async () => {
-  expect(await runConversationSwitch({ ...subject, agent: 'omp' })).toBe(false)
+
+it('does not offer chat switching while Chat UI is off', async () => {
+  useAppStore.setState({
+    settings: { ...useAppStore.getState().settings!, experimentalNativeChat: false }
+  })
+  expect(await runConversationSwitch({ ...subject, direction: 'chat' })).toBe(false)
+  expect(mocks.support).not.toHaveBeenCalled()
   expect(mocks.call).not.toHaveBeenCalled()
 })
 
-it.each(['support', 'Stop'] as const)(
-  'uses the original viewer through native %s and real terminal publication',
-  async (heldAt) => {
-    const source = useAppStore.getState().createUnifiedTab('workspace', 'agent-session', {
-      id: 'source',
-      entityId: subject.sessionId,
-      agentSessionAgent: 'codex'
-    })
-    const other = useAppStore.getState().createTab('workspace')
-    useAppStore.setState({ activeWorktreeId: 'workspace' })
-    useAppStore.getState().activateTab(source.id)
-    const original = captureConversationSwitchViewerSelection()
-    const held = Promise.withResolvers<void>()
-    if (heldAt === 'support') {
-      mocks.support.mockImplementation(async () => {
-        await held.promise
-        return true
-      })
-    }
-    mocks.call.mockImplementation(async (_target, _method, request) => {
-      if (heldAt === 'Stop') {
-        await held.promise
-      }
-      publishAgentLaunchTab({
-        requestId: 'publication',
-        tabId: 'destination-terminal',
-        leafId: 'destination-leaf',
-        worktreeId: 'workspace',
-        launchAgent: 'codex',
-        viewer: 'focus-in-workspace',
-        viewMode: 'terminal',
-        viewerSelection: request.execution.viewerSelection
-      })
-      return { status: 'completed', sessionId: subject.sessionId, terminal: 'destination-terminal' }
-    })
-    const running = runConversationSwitch(subject)
-    if (heldAt === 'Stop') {
-      await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-    }
-    useAppStore.getState().setActiveTab(other.id)
-    held.resolve()
-    expect(await running).toBe(true)
-    expect(mocks.call.mock.calls[0][2].execution.viewerSelection).toBe(original)
-    expect(useAppStore.getState().getActiveTab('workspace')?.id).toBe(other.id)
-    expect(
-      useAppStore
-        .getState()
-        .tabsByWorktree.workspace.some((tab) => tab.id === 'destination-terminal')
-    ).toBe(true)
-  }
-)
-
-it.each(['unchanged', 'unchanged-retained', 'prepare-navigation', 'result-navigation'] as const)(
-  'paired generated chat request consumes canonical C at the real selection writer: %s',
-  async (action) => {
-    mocks.target.current = { kind: 'environment', environmentId: 'paired' }
-    const host = 'runtime:paired' as const
-    const leaf = '11111111-1111-4111-8111-111111111111'
-    const source = { id: toWebTerminalSurfaceTabId('host-source') }
-    const canonical = {
-      id: structuredAgentSessionTabId('codex_canonical-C'),
-      entityId: 'codex_canonical-C'
-    }
-    const other = { id: structuredAgentSessionTabId('codex_D') }
-    const canonicalRow = {
-      type: 'agent-session' as const,
-      id: `agent-session:${canonical.entityId}`,
-      sessionId: canonical.entityId,
-      agent: 'codex' as const,
-      title: 'Canonical',
-      isActive: false
-    }
-    const otherRow = {
-      type: 'agent-session' as const,
-      id: 'agent-session:codex_D',
-      sessionId: 'codex_D',
-      agent: 'codex' as const,
-      title: 'D',
-      isActive: false
-    }
-    const sourceRow = {
-      type: 'terminal' as const,
-      id: `host-source::${leaf}`,
-      parentTabId: 'host-source',
-      leafId: leaf,
-      terminal: 'source-process',
-      title: 'Source',
-      status: 'ready' as const,
-      isActive: true
-    }
-    const snapshot = (retired: boolean) =>
-      makeSnapshot(retired ? [canonicalRow, otherRow] : [sourceRow, canonicalRow, otherRow], {
-        worktree: 'workspace',
-        snapshotVersion: retired ? 2 : 1,
-        activeTabId: retired ? canonicalRow.id : sourceRow.id,
-        activeTabType: retired ? 'agent-session' : 'terminal',
-        tabGroups: [
-          {
-            id: 'host-group-1',
-            activeTabId: retired ? canonicalRow.id : 'host-source',
-            tabOrder: retired
-              ? [canonicalRow.id, otherRow.id]
-              : ['host-source', canonicalRow.id, otherRow.id]
-          }
-        ]
-      })
-    useAppStore.setState({ activeWorktreeId: 'workspace', activeWorkspaceExecutionHostId: host })
-    useAppStore.setState((state) => applyWebSessionTabsSnapshot(state, snapshot(false), 'paired'))
-    useAppStore.getState().activateTab(source.id)
-    const original = captureConversationSwitchViewerSelection()
-    const preparing = Promise.withResolvers<{
-      handle: string
-      incarnationId: string
-      presentation: object
-    }>()
-    mocks.capture.mockReturnValue(preparing.promise)
-    const listing = Promise.withResolvers<void>()
-    mocks.pairedRefresh.mockImplementation(async () => {
-      await listing.promise
-      useAppStore.setState((state) =>
-        applyWebSessionTabsSnapshot(state, snapshot(action !== 'unchanged-retained'), 'paired')
-      )
-    })
-    mocks.call.mockResolvedValue({ status: 'completed', sessionId: canonical.entityId })
-    const cli: CliChatResumeSource = {
-      agent: 'codex',
-      executionHostId: host,
-      workspaceId: 'workspace',
-      tabId: source.id,
-      paneKey: `${source.id}:leaf`,
-      ptyId: 'pty',
-      providerSessionId: 'saved-conversation'
-    }
-    const running = runConversationSwitch({
-      direction: 'chat',
-      executionHostId: host,
-      workspaceId: 'workspace',
-      agent: 'codex',
-      source: cli
-    })
-    await vi.waitFor(() => expect(mocks.capture).toHaveBeenCalledOnce())
-    if (action === 'prepare-navigation') {
-      useAppStore.getState().activateTab(other.id)
-    }
-    preparing.resolve({
-      handle: 'original-source',
-      incarnationId: 'original-incarnation',
-      presentation: {}
-    })
-    await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-    const request = mocks.call.mock.calls[0][2]
-    expect(request.sessionId).not.toBe(canonical.entityId)
-    expect(request.execution.create.envelope.sessionId).toBe(request.sessionId)
-    expect(request.execution.create.resumeFrom.providerSessionId).toBe(cli.providerSessionId)
-    expect(request.execution.viewerSelection).toBe(original)
-    await vi.waitFor(() => expect(mocks.pairedRefresh).toHaveBeenCalledOnce())
-    if (action === 'result-navigation') {
-      useAppStore.getState().activateTab(other.id)
-    }
-    listing.resolve()
-    expect(await running).toBe(true)
-    expect(useAppStore.getState().getActiveTab('workspace')?.id).toBe(
-      action.startsWith('unchanged') ? canonical.id : other.id
-    )
-    expect(useAppStore.getState().getTab(canonical.id)?.entityId).toBe(canonical.entityId)
-    expect(mocks.rpc).toHaveBeenCalledTimes(action === 'unchanged-retained' ? 1 : 0)
-    if (action === 'unchanged-retained') {
-      expect(mocks.rpc).toHaveBeenCalledWith(
-        mocks.target.current,
-        'session.tabs.activate',
-        expect.objectContaining({
-          tabId: `agent-session:${canonical.entityId}`,
-          navigation: 'caller',
-          notifyClients: false
-        })
-      )
-    }
-  }
-)
-
-it.each(['unchanged', 'result-navigation'] as const)(
-  'paired terminal result preserves caller selection and readable membership: %s',
-  async (action) => {
-    mocks.target.current = { kind: 'environment', environmentId: 'paired' }
-    const leaf = '11111111-1111-4111-8111-111111111111'
-    const sourceId = structuredAgentSessionTabId(subject.sessionId)
-    const destination = toWebTerminalSurfaceTabId('host-terminal')
-    const other = structuredAgentSessionTabId('codex_D')
-    const sourceRow = {
-      type: 'agent-session' as const,
-      id: `agent-session:${subject.sessionId}`,
+it('Continue with Chat UI off uses the same host switch identity, never copied/fork startup', async () => {
+  useAppStore.setState({
+    settings: { ...useAppStore.getState().settings!, experimentalNativeChat: false }
+  })
+  const legacyContinue = vi.fn(async () => {})
+  await runNativeChatCliSwitch({ ...subject, legacyContinue })
+  expect(mocks.call).toHaveBeenCalledExactlyOnceWith(
+    { kind: 'local' },
+    'agentSession.switchToTerminal',
+    expect.objectContaining({
       sessionId: subject.sessionId,
-      agent: 'codex' as const,
-      title: 'Source',
-      isActive: true
-    }
-    const otherRow = {
-      type: 'agent-session' as const,
-      id: 'agent-session:codex_D',
-      sessionId: 'codex_D',
-      agent: 'codex' as const,
-      title: 'D',
-      isActive: false
-    }
-    const terminalRow = {
-      type: 'terminal' as const,
-      id: `host-terminal::${leaf}`,
-      parentTabId: 'host-terminal',
-      leafId: leaf,
-      terminal: 'new-process',
-      title: 'Destination',
-      status: 'ready' as const,
-      isActive: false
-    }
-    const snapshot = (published: boolean) =>
-      makeSnapshot(published ? [sourceRow, terminalRow, otherRow] : [sourceRow, otherRow], {
-        worktree: 'workspace',
-        snapshotVersion: published ? 2 : 1,
-        activeTabId: sourceRow.id,
-        activeTabType: 'agent-session',
-        tabGroups: [
-          {
-            id: 'host-group-1',
-            activeTabId: sourceRow.id,
-            tabOrder: published
-              ? [sourceRow.id, 'host-terminal', otherRow.id]
-              : [sourceRow.id, otherRow.id]
-          }
-        ]
+      execution: expect.objectContaining({
+        sourceTabId: subject.chatTabId,
+        viewerSelection: expect.stringMatching(/^selection-v1:/)
       })
-    useAppStore.setState({
-      activeWorktreeId: 'workspace',
-      activeWorkspaceExecutionHostId: 'runtime:paired'
-    })
-    useAppStore.setState((state) => applyWebSessionTabsSnapshot(state, snapshot(false), 'paired'))
-    useAppStore.getState().activateTab(sourceId)
-    const listed = Promise.withResolvers<void>()
-    mocks.pairedRefresh.mockImplementation(async () => {
-      await listed.promise
-      useAppStore.setState((state) => applyWebSessionTabsSnapshot(state, snapshot(true), 'paired'))
-    })
-    mocks.call.mockResolvedValue({
-      status: 'completed',
-      sessionId: subject.sessionId,
-      terminal: 'host-terminal',
-      sourceRetained: true
-    })
-    const running = runConversationSwitch({
-      ...subject,
-      executionHostId: 'runtime:paired',
-      chatTabId: sourceId
+    }),
+    expect.any(Object)
+  )
+  expect(legacyContinue).not.toHaveBeenCalled()
+  expect(mocks.legacy).not.toHaveBeenCalled()
+})
+
+it('old-host Continue while replying reports its copy outcome without promising Stop', async () => {
+  mocks.support.mockResolvedValue(false)
+  mocks.reader.mockReturnValue({
+    getSnapshot: () => ({
+      current: true,
+      state: {
+        ...EMPTY_STRUCTURED_AGENT_SESSION,
+        working: true,
+        latestTurn: { itemId: 'turn', observedAt: 1, turn: { turnId: 'turn', state: 'running' } }
+      }
     })
-    await vi.waitFor(() => expect(mocks.pairedRefresh).toHaveBeenCalledOnce())
-    if (action === 'result-navigation') {
-      useAppStore.getState().activateTab(other)
-    }
-    listed.resolve()
-    expect(await running).toBe(true)
-    expect(useAppStore.getState().getActiveTab('workspace')?.id).toBe(
-      action === 'unchanged' ? destination : other
-    )
-    expect(
-      useAppStore.getState().tabsByWorktree.workspace.some((tab) => tab.id === destination)
-    ).toBe(true)
-    expect(mocks.error).not.toHaveBeenCalled()
-  }
-)
+  })
+  const confirm = vi.fn()
+  const legacyContinue = vi.fn(async () => {})
+  await runNativeChatCliSwitch({ ...subject, confirm, legacyContinue })
+  expect(mocks.support).toHaveBeenCalledOnce()
+  expect(confirm).not.toHaveBeenCalled()
+  expect(mocks.call).not.toHaveBeenCalled()
+  expect(legacyContinue).toHaveBeenCalledExactlyOnceWith(expect.stringMatching(/^selection-v1:/))
+})
diff --git a/src/renderer/src/lib/conversation-surface-switch.ts b/src/renderer/src/lib/conversation-surface-switch.ts
index d1b33dcdbe8b..a8ce45df2bd5 100644
--- a/src/renderer/src/lib/conversation-surface-switch.ts
+++ b/src/renderer/src/lib/conversation-surface-switch.ts
@@ -25,7 +25,6 @@ import {
   conversationSwitchFailureText,
   conversationSwitchSourceKept
 } from './conversation-switch-feedback'
-import { resolveWorktreeExecutionHostPlatform } from './execution-host-facts'
 import { structuredAgentSessionTargetForHost } from '@/runtime/structured-agent-session-owner'
 import {
   callStructuredAgentSession,
@@ -46,7 +45,7 @@ import {
 import { AgentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
 import { prepareAiVaultSessionForResume } from './ai-vault-session-resume-preparation'
 import type { CliChatResumeSource } from '@/components/tab-bar/cli-chat-resume-source'
-import { captureConversationSwitchViewerSelection } from './conversation-switch-selection'
+import { beginViewerSelectionRequest } from './viewer-selection-request'
 import { presentConversationSwitchResult } from './conversation-switch-result-selection'
 import { runLegacyConversationSwitch } from './conversation-switch-legacy'
 import {
@@ -54,7 +53,8 @@ import {
   keyFor,
   pendingNow,
   rederiveConversationSwitch,
-  conversationSwitchReplying
+  conversationSwitchReplying,
+  withConversationSwitchPlatform
 } from './conversation-switch-state'
 
 export { conversationSwitchFailureText } from './conversation-switch-feedback'
@@ -77,28 +77,22 @@ export function runNativeChatCliSwitch(
 
 export async function runConversationSwitch(args: ConversationSwitch): Promise<boolean> {
   if (
-    !isNativeChatEnabled(useAppStore.getState().settings) ||
+    (args.direction === 'chat' && !isNativeChatEnabled(useAppStore.getState().settings)) ||
     !inPlaceSwitchEnabled(args.agent) ||
     pendingNow(args)
   ) {
     return false
   }
-  const viewerSelection = captureConversationSwitchViewerSelection()
-  const platform = resolveWorktreeExecutionHostPlatform(
-    useAppStore.getState(),
-    args.workspaceId,
-    undefined
-  )
-  args = {
-    ...args,
-    platform: args.platform ?? (platform.kind === 'known' ? platform.platform : undefined)
-  }
+  args = withConversationSwitchPlatform(args)
   const target = structuredAgentSessionTargetForHost(args.executionHostId)
   const hostId = parseExecutionHostId(args.executionHostId)?.id
   if (!target || !hostId) {
     return false
   }
   const deadline = agentSessionSwitchDeadline(Date.now, AGENT_SESSION_SWITCH_CLIENT_MS)
+  const invocationId = createBrowserUuid()
+  const selection = beginViewerSelectionRequest(invocationId, deadline)
+  const viewerSelection = selection.token
   const key = keyFor(args)
   const feedback =
     args.feedback ?? ((message: string, kind: 'error' | 'info') => toast[kind](message))
@@ -108,11 +102,17 @@ export async function runConversationSwitch(args: ConversationSwitch): Promise<b
     executionHostId: args.executionHostId
   })
   conversationSwitchChanged()
-  const invocationId = createBrowserUuid()
   let consented = false
   let sent = false
   let presentation: SwitchPresentationVisit | undefined
   try {
+    const supported = await deadline.wait(supportsInPlaceSwitch(target, args.agent, true))
+    if (!supported && args.legacyContinue) {
+      selection.accept()
+      consented = true
+      await args.legacyContinue(viewerSelection)
+      return false
+    }
     if (conversationSwitchReplying(args)) {
       const confirmed = await args.confirm?.({
         title: translate(
@@ -129,6 +129,7 @@ export async function runConversationSwitch(args: ConversationSwitch): Promise<b
         return false
       }
     }
+    selection.accept()
     consented = true
     if (args.direction === 'terminal' && args.sessionId && args.chatTabId) {
       captureSwitchProjection(
@@ -144,7 +145,7 @@ export async function runConversationSwitch(args: ConversationSwitch): Promise<b
         () => {}
       )
     }
-    if (!(await deadline.wait(supportsInPlaceSwitch(target, args.agent, true)))) {
+    if (!supported) {
       await runLegacyConversationSwitch(args, target, viewerSelection)
       return false
     }
@@ -246,6 +247,9 @@ export async function runConversationSwitch(args: ConversationSwitch): Promise<b
       presentation = beginSwitchPresentation(target, answer.sessionId)
     }
     if (answer.status !== 'completed') {
+      if (answer.status === 'refused') {
+        selection.discard()
+      }
       if (!presentation || reportSwitchPresentationFailure(presentation, answer.failureItemId)) {
         feedback(
           conversationSwitchFailureText(new AgentSessionRefusalError(answer.refusal), args),
@@ -262,11 +266,17 @@ export async function runConversationSwitch(args: ConversationSwitch): Promise<b
     }
     return true
   } catch (error) {
+    if (!sent) {
+      selection.discard()
+    }
     if (!presentation || reportSwitchPresentationFailure(presentation)) {
       feedback(conversationSwitchFailureText(error, args), 'error')
     }
     return false
   } finally {
+    if (!consented) {
+      selection.discard()
+    }
     if (!sent) {
       releaseUnsentSwitchProjection(invocationId)
     }
diff --git a/src/renderer/src/lib/conversation-switch-legacy.ts b/src/renderer/src/lib/conversation-switch-legacy.ts
index ab3636a2aceb..7d80e8939097 100644
--- a/src/renderer/src/lib/conversation-switch-legacy.ts
+++ b/src/renderer/src/lib/conversation-switch-legacy.ts
@@ -1,3 +1,5 @@
+import { toast } from 'sonner'
+import { conversationSwitchFailureText } from './conversation-switch-feedback'
 import { adoptsCliConversations } from '../../../shared/structured-agent-cli-conversation-adoption'
 import { runLegacyCliChatResume } from '@/components/tab-bar/cli-chat-resume-run'
 import { runLegacyNativeChatCliSwitch } from '@/components/tab-bar/native-chat-cli-switch-run'
@@ -13,21 +15,24 @@ export function runLegacyConversationSwitch(
   target: RuntimeClientTarget,
   viewerSelection: string
 ) {
+  const reportFailure = (error: unknown) => toast.error(conversationSwitchFailureText(error, args))
   if (args.direction === 'terminal' && args.sessionId) {
     return runLegacyNativeChatCliSwitch({
       ...args,
       sessionId: args.sessionId,
       chatTabId: args.chatTabId ?? null,
-      viewerSelection
+      viewerSelection,
+      reportFailure
     })
   } else if (args.source) {
-    return runLegacyCliChatResume(args.source, viewerSelection)
+    return runLegacyCliChatResume(args.source, viewerSelection, reportFailure)
   } else if (args.sessionId) {
     return switchIntoOwnerLegacy(
       { agent: args.agent, tabId: args.chatTabId ?? '', workspaceId: args.workspaceId },
       { sessionId: args.sessionId, workspaceId: args.workspaceId },
       target,
-      viewerSelection
+      viewerSelection,
+      reportFailure
     )
   } else if (args.history && adoptsCliConversations(args.agent)) {
     return resumeAiVaultSessionInNewChat(
@@ -36,7 +41,8 @@ export function runLegacyConversationSwitch(
       args.workspaceId,
       newAgentLaunchRequestId(),
       undefined,
-      viewerSelection
+      viewerSelection,
+      reportFailure
     )
   }
   return undefined
diff --git a/src/renderer/src/lib/conversation-switch-presentation.test.tsx b/src/renderer/src/lib/conversation-switch-presentation.test.tsx
index 14704d6f0ac3..e889bfcc5b15 100644
--- a/src/renderer/src/lib/conversation-switch-presentation.test.tsx
+++ b/src/renderer/src/lib/conversation-switch-presentation.test.tsx
@@ -55,157 +55,28 @@ function bounds(top: number): DOMRect {
     toJSON: () => ({})
   }
 }
-it.each(['before row', 'offscreen', 'absent root'] as const)(
-  'selects one clicked-context report for the exact failure %s, without hiding future manual history',
-  (timing) => {
+it.each([true, false])(
+  'reports the exact failure once in the clicked context (visible: %s)',
+  (visible) => {
     vi.spyOn(HTMLElement.prototype, 'getBoundingClientRect').mockImplementation(function (
       this: HTMLElement
     ) {
-      return bounds(timing === 'offscreen' && this.dataset.switchItemId ? 5_000 : 0)
+      return bounds(!visible && this.dataset.switchItemId ? 5_000 : 0)
     })
     const visit = beginSwitchPresentation(target, 'conversation')
-    const view =
-      timing === 'absent root'
-        ? undefined
-        : render(<Visit item={timing === 'before row' ? undefined : 'failed-new'} />)
+    const view = render(<Visit item="failed-new" />)
     act(() => {
-      expect(reportSwitchPresentationFailure(visit, 'failed-new')).toBe(true)
+      expect(reportSwitchPresentationFailure(visit, 'failed-new')).toBe(!visible)
     })
     expect(reportSwitchPresentationFailure(visit, 'failed-new')).toBe(false)
-    view?.rerender(<Visit item="failed-new" />)
-    if (view) {
+    if (visible) {
+      expect(screen.getByText('Codex could not start. Try again.')).toBeTruthy()
+    } else {
       expect(screen.queryByText('Codex could not start. Try again.')).toBeNull()
     }
-    view?.unmount()
+    view.unmount()
     visit.release()
     render(<Visit item="failed-new" />)
     expect(screen.getByText('Codex could not start. Try again.')).toBeTruthy()
   }
 )
-it('uses the currently visible exact row, never an older equal failure', async () => {
-  vi.spyOn(HTMLElement.prototype, 'getBoundingClientRect').mockImplementation(() => bounds(0))
-  const visit = beginSwitchPresentation(target, 'conversation')
-  const view = render(<Visit item="old-failure" />)
-  view.rerender(<Visit item="selected-failure" />)
-  act(() => {
-    expect(reportSwitchPresentationFailure(visit, 'selected-failure')).toBe(false)
-  })
-  expect(screen.getByText('Codex could not start. Try again.')).toBeTruthy()
-  expect(reportSwitchPresentationFailure(visit, 'selected-failure')).toBe(false)
-})
-
-it('does not toast again when the exact failure was shown before its result but has since left the viewport', () => {
-  vi.spyOn(HTMLElement.prototype, 'getBoundingClientRect').mockImplementation(() => bounds(0))
-  const visit = beginSwitchPresentation(target, 'conversation')
-  const view = render(<Visit item="selected-failure" />)
-  expect(visit.presentedItems.has('selected-failure')).toBe(true)
-  view.rerender(<Visit />)
-  expect(reportSwitchPresentationFailure(visit, 'selected-failure')).toBe(false)
-  view.unmount()
-  visit.release()
-})
-it('inspects only mounted virtual rows once per current-visit render, without consulting history', () => {
-  const geometry = vi
-    .spyOn(HTMLElement.prototype, 'getBoundingClientRect')
-    .mockImplementation(() => bounds(0))
-  const visit = beginSwitchPresentation(target, 'conversation')
-  const view = render(<Visit item="mounted-only" />)
-  geometry.mockClear()
-  view.rerender(<Visit item="next-mounted" />)
-  expect(visit.presentedItems.has('next-mounted')).toBe(true)
-  expect(geometry.mock.calls.length).toBeLessThanOrEqual(4)
-  view.unmount()
-  visit.release()
-})
-
-it.each([100, 1000])(
-  'bounds viewport work by %i mounted rows and tears it down at selected settlement',
-  (count) => {
-    const geometry = vi
-      .spyOn(HTMLElement.prototype, 'getBoundingClientRect')
-      .mockImplementation(() => bounds(0))
-    function Rows() {
-      const root = useRef<HTMLDivElement>(null)
-      useSwitchPresentationRows(root)
-      return (
-        <div ref={root} data-testid="viewport">
-          {Array.from({ length: count }, (_, i) => (
-            <div key={i} data-switch-item-id={`item-${i}`} />
-          ))}
-        </div>
-      )
-    }
-    function ScaleVisit() {
-      const visit = useSwitchPresentation(target, 'scale', true)
-      return (
-        <SwitchPresentationContext.Provider value={visit}>
-          <Rows />
-        </SwitchPresentationContext.Provider>
-      )
-    }
-    const visit = beginSwitchPresentation(target, 'scale')
-    const view = render(<ScaleVisit />)
-    geometry.mockClear()
-    act(() => screen.getByTestId('viewport').dispatchEvent(new Event('scroll')))
-    expect(geometry.mock.calls.length).toBe(2 * count)
-    expect(visit.presentedItems.size).toBe(count)
-    act(() => {
-      expect(reportSwitchPresentationFailure(visit, 'item-1')).toBe(false)
-    })
-    expect(visit.presentedItems.size).toBe(0)
-    geometry.mockClear()
-    act(() => screen.getByTestId('viewport').dispatchEvent(new Event('scroll')))
-    view.rerender(<ScaleVisit />)
-    expect(geometry).not.toHaveBeenCalled()
-    view.unmount()
-    visit.release()
-  }
-)
-
-it.each([10, 100])(
-  'isolates actual visit and notice subscriptions across %i mounted consumers',
-  (count) => {
-    let renders = 0
-    const visits: ReturnType<typeof beginSwitchPresentation>[] = []
-    function Reader({
-      id,
-      host = target
-    }: {
-      id: string
-      host?: typeof target | { kind: 'environment'; environmentId: string }
-    }) {
-      renders++
-      const visit = useSwitchPresentation(host, id, true)
-      return (
-        <SwitchPresentationContext.Provider value={visit}>
-          <List item="failure" />
-        </SwitchPresentationContext.Provider>
-      )
-    }
-    render(
-      <>
-        {Array.from({ length: count }, (_, i) => (
-          <Reader key={i} id={`unrelated-${i}`} />
-        ))}
-        <Reader id="addressed" />
-        <Reader id="addressed" host={{ kind: 'environment', environmentId: 'other' }} />
-      </>
-    )
-    renders = 0
-    act(() => {
-      visits.push(beginSwitchPresentation(target, 'foreign'))
-    })
-    expect(renders).toBe(0)
-    act(() => {
-      visits.push(beginSwitchPresentation(target, 'addressed'))
-    })
-    expect(renders).toBe(1)
-    renders = 0
-    act(() => {
-      reportSwitchPresentationFailure(visits[1], 'failure')
-    })
-    expect(renders).toBe(0)
-    cleanup()
-    visits.forEach((visit) => visit.release())
-  }
-)
diff --git a/src/renderer/src/lib/conversation-switch-result-selection.ts b/src/renderer/src/lib/conversation-switch-result-selection.ts
index 733c5724f179..b5def7ef9d1e 100644
--- a/src/renderer/src/lib/conversation-switch-result-selection.ts
+++ b/src/renderer/src/lib/conversation-switch-result-selection.ts
@@ -26,7 +26,8 @@ export async function presentConversationSwitchResult(
       worktreeId: args.workspaceId,
       sessionId: result.sessionId,
       target,
-      callerOnly: true
+      callerOnly: true,
+      viewerSelection
     })
   } else if (result.terminal) {
     presentAgentLaunchTab(
diff --git a/src/renderer/src/lib/conversation-switch-selection.ts b/src/renderer/src/lib/conversation-switch-selection.ts
index 5d93c40d891f..14b04076fcae 100644
--- a/src/renderer/src/lib/conversation-switch-selection.ts
+++ b/src/renderer/src/lib/conversation-switch-selection.ts
@@ -1,3 +1,5 @@
+import { isSessionTabSelectionRequest } from '../../../shared/session-tab-placement'
+import { viewerSelectionOutcome } from './viewer-selection-request'
 import { structuredAgentSessionDomainFingerprint } from '../../../shared/structured-agent-session-mutation'
 import { useAppStore } from '@/store'
 import { resolveWebSessionVisibleTabId } from '@/runtime/web-session-focus-intent'
@@ -37,5 +39,10 @@ export function conversationSwitchViewerSelectionCurrent(
   selection?: string,
   state?: ViewerState
 ): boolean {
-  return selection === undefined || selection === captureConversationSwitchViewerSelection(state)
+  return (
+    selection === undefined ||
+    (isSessionTabSelectionRequest(selection)
+      ? viewerSelectionOutcome(selection) === 'pending'
+      : selection === captureConversationSwitchViewerSelection(state))
+  )
 }
diff --git a/src/renderer/src/lib/conversation-switch-state.ts b/src/renderer/src/lib/conversation-switch-state.ts
index 9fbdd2462144..8c2fe57e2cb5 100644
--- a/src/renderer/src/lib/conversation-switch-state.ts
+++ b/src/renderer/src/lib/conversation-switch-state.ts
@@ -1,3 +1,4 @@
+import { resolveWorktreeExecutionHostPlatform } from './execution-host-facts'
 import { translate } from '@/i18n/i18n'
 import { useSyncExternalStore } from 'react'
 import { useAppStore } from '@/store'
@@ -21,6 +22,7 @@ import type { AiVaultSession, AiVaultAgent } from '../../../shared/ai-vault-type
 import type { CliChatResumeSource } from '@/components/tab-bar/cli-chat-resume-source'
 
 export type ConversationSwitch = {
+  legacyContinue?: (viewerSelection: string) => Promise<void>
   confirm?: ConfirmationDialogContextValue
   direction: 'chat' | 'terminal'
   executionHostId: string
@@ -34,6 +36,18 @@ export type ConversationSwitch = {
   feedback?: (message: string, kind: 'error' | 'info') => void
 }
 
+export function withConversationSwitchPlatform(args: ConversationSwitch): ConversationSwitch {
+  const platform = resolveWorktreeExecutionHostPlatform(
+    useAppStore.getState(),
+    args.workspaceId,
+    undefined
+  )
+  return {
+    ...args,
+    platform: args.platform ?? (platform.kind === 'known' ? platform.platform : undefined)
+  }
+}
+
 export const keyFor = (args: ConversationSwitch) =>
   `${args.executionHostId}\0${args.sessionId ?? args.source?.providerSessionId ?? args.history?.sessionId}`
 
diff --git a/src/renderer/src/lib/in-place-switch-support.test.tsx b/src/renderer/src/lib/in-place-switch-support.test.tsx
deleted file mode 100644
index c51e33ec7d60..000000000000
--- a/src/renderer/src/lib/in-place-switch-support.test.tsx
+++ /dev/null
@@ -1,191 +0,0 @@
-// @vitest-environment happy-dom
-import { useConversationSwitchReadiness } from './conversation-surface-switch'
-import { supportsInPlaceSwitch } from '@/runtime/structured-agent-session-client'
-import { act, cleanup, render, screen } from '@testing-library/react'
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import { useAppStore } from '@/store'
-import {
-  refreshLocalRuntimeCapabilities,
-  setLocalRuntimeCapabilitiesForTests
-} from '@/runtime/local-runtime-capabilities'
-import { createCompatibleRuntimeStatusResponse } from '@/runtime/runtime-compatibility-test-fixture'
-import type { RuntimeHostStatusSnapshot } from '../../../shared/runtime-host-status'
-import { inPlaceSwitchCapabilityNow, useInPlaceSwitchCapability } from './in-place-switch-support'
-
-const SWITCH = 'agent-session.structured.switch.creation-settlement-v1:codex'
-const environment = {
-  id: 'paired',
-  name: 'Host',
-  createdAt: 1,
-  updatedAt: 1,
-  pairingRevision: 1,
-  lastUsedAt: null,
-  runtimeId: 'paired',
-  preferredEndpointId: 'endpoint',
-  endpoints: [{ id: 'endpoint', kind: 'websocket' as const, label: 'Host', endpoint: 'ws://host' }]
-}
-const getStatus = vi.fn()
-function Switch({ host = 'local' }: { host?: string }) {
-  const supported = useInPlaceSwitchCapability(host, 'codex')
-  return <button disabled={supported !== true}>{String(supported)}</button>
-}
-function snapshot(
-  sequence: number,
-  patch: Partial<RuntimeHostStatusSnapshot> = {}
-): RuntimeHostStatusSnapshot {
-  const response = createCompatibleRuntimeStatusResponse('paired')
-  if (!response.ok) {
-    throw new Error('Expected status')
-  }
-  return {
-    environmentId: 'paired',
-    pairingRevision: 1,
-    sequence,
-    checkedAt: sequence,
-    transport: 'ready',
-    verification: 'verified',
-    status: { ...response.result, capabilities: [SWITCH] },
-    ...patch
-  }
-}
-beforeEach(() => {
-  useAppStore.setState(useAppStore.getInitialState(), true)
-  setLocalRuntimeCapabilitiesForTests(null)
-  getStatus.mockReset()
-  Object.assign(window, { api: { ...window.api, runtime: { getStatus } } })
-})
-afterEach(cleanup)
-
-it('activates once after failed boot, observes local publication, and never probes from reads or notifications', async () => {
-  getStatus.mockRejectedValueOnce(new Error('boot unavailable'))
-  await refreshLocalRuntimeCapabilities()
-  expect(inPlaceSwitchCapabilityNow('local', 'codex')).toBeUndefined()
-  let answer = (_value: { capabilities: string[] }) => {}
-  getStatus.mockImplementationOnce(
-    () =>
-      new Promise((resolve) => {
-        answer = resolve
-      })
-  )
-  render(<Switch />)
-  expect(screen.getByRole('button').hasAttribute('disabled')).toBe(true)
-  expect(getStatus).toHaveBeenCalledTimes(2)
-  await act(async () => {
-    answer({ capabilities: [SWITCH] })
-  })
-  expect(screen.getByRole('button').hasAttribute('disabled')).toBe(false)
-  for (let index = 0; index < 4; index++) {
-    expect(inPlaceSwitchCapabilityNow('local', 'codex')).toBe(true)
-    act(() => useAppStore.setState({ runtimeStatusByEnvironmentId: new Map() }))
-  }
-  expect(getStatus).toHaveBeenCalledTimes(2)
-  getStatus.mockResolvedValueOnce({ capabilities: [] })
-  await act(async () => {
-    await refreshLocalRuntimeCapabilities()
-  })
-  expect(screen.getByRole('button').textContent).toBe('false')
-})
-
-it('derives only the addressed catalog owner across publication, lost contact, revocation, replacement and legacy verification', async () => {
-  setLocalRuntimeCapabilitiesForTests([])
-  useAppStore.getState().setRuntimeEnvironments([environment])
-  render(<Switch host="runtime:paired" />)
-  expect(screen.getByRole('button').textContent).toBe('undefined')
-  act(() => useAppStore.getState().applyRuntimeHostStatusSnapshot(snapshot(1)))
-  expect(screen.getByRole('button').hasAttribute('disabled')).toBe(false)
-  const learned = snapshot(2, { verification: 'unavailable', transport: 'disconnected' })
-  act(() => useAppStore.getState().applyRuntimeHostStatusSnapshot(learned))
-  expect(inPlaceSwitchCapabilityNow('runtime:paired', 'codex')).toBe(true)
-  expect(inPlaceSwitchCapabilityNow('runtime:other', 'codex')).toBeUndefined()
-  act(() =>
-    useAppStore.getState().applyRuntimeHostStatusSnapshot(snapshot(3, { verification: 'blocked' }))
-  )
-  expect(screen.getByRole('button').textContent).toBe('undefined')
-  act(() => useAppStore.getState().setRuntimeEnvironments([{ ...environment, pairingRevision: 2 }]))
-  act(() => useAppStore.getState().applyRuntimeHostStatusSnapshot(snapshot(10)))
-  expect(inPlaceSwitchCapabilityNow('runtime:paired', 'codex')).toBeUndefined()
-  const legacy = snapshot(11, { pairingRevision: 2 })
-  if (!legacy.status) {
-    throw new Error('Expected status')
-  }
-  delete legacy.status.capabilities
-  act(() => useAppStore.getState().applyRuntimeHostStatusSnapshot(legacy))
-  expect(screen.getByRole('button').textContent).toBe('false')
-  act(() =>
-    useAppStore.getState().applyRuntimeHostStatusSnapshot(snapshot(12, { pairingRevision: 2 }))
-  )
-  expect(screen.getByRole('button').textContent).toBe('true')
-  act(() =>
-    useAppStore
-      .getState()
-      .applyRuntimeHostStatusSnapshot(snapshot(13, { pairingRevision: 2, retired: true }))
-  )
-  expect(screen.getByRole('button').textContent).toBe('undefined')
-  expect(getStatus).not.toHaveBeenCalled()
-})
-
-it.each([10, 100])(
-  'keeps %i production switch controls idle for unrelated host updates',
-  async (count) => {
-    setLocalRuntimeCapabilitiesForTests([SWITCH])
-    useAppStore.getState().setRuntimeEnvironments([environment])
-    useAppStore.getState().applyRuntimeHostStatusSnapshot(snapshot(1))
-    const renders = new Map<string, number>()
-    function Control({ host }: { host: string }) {
-      renders.set(host, (renders.get(host) ?? 0) + 1)
-      const state = useConversationSwitchReadiness({
-        executionHostId: host,
-        workspaceId: 'workspace',
-        direction: 'terminal',
-        agent: 'codex',
-        sessionId: host
-      })
-      return <button>{String(state.ready)}</button>
-    }
-    render(
-      <>
-        {Array.from({ length: count }, (_, i) => (
-          <Control key={i} host="local" />
-        ))}
-        <Control host="runtime:paired" />
-      </>
-    )
-    await act(async () => {})
-    renders.clear()
-    act(() => useAppStore.getState().applyRuntimeHostStatusSnapshot(snapshot(2)))
-    expect([...renders.values()]).toEqual([])
-    act(() =>
-      useAppStore
-        .getState()
-        .applyRuntimeHostStatusSnapshot(snapshot(3, { verification: 'blocked' }))
-    )
-    expect(renders.get('local')).toBeUndefined()
-    expect(renders.get('runtime:paired')).toBe(1)
-    renders.clear()
-    act(() => useAppStore.setState({ activeWorktreeId: 'unrelated' }))
-    expect([...renders.values()]).toEqual([])
-    expect(getStatus).not.toHaveBeenCalled()
-  }
-)
-
-it('uses the same complete capability for learned readiness and strong dispatch, rejecting stale development support', async () => {
-  useAppStore.getState().setRuntimeEnvironments([environment])
-  const stale = 'agent-session.structured.switch.v2:codex'
-  setLocalRuntimeCapabilitiesForTests([stale])
-  expect(inPlaceSwitchCapabilityNow('local', 'codex')).toBe(false)
-  expect(inPlaceSwitchCapabilityNow('local', 'codex', true)).toBe(false)
-  expect(await supportsInPlaceSwitch({ kind: 'local' }, 'codex', true)).toBe(false)
-  setLocalRuntimeCapabilitiesForTests([SWITCH])
-  expect(inPlaceSwitchCapabilityNow('local', 'codex')).toBe(true)
-  expect(await supportsInPlaceSwitch({ kind: 'local' }, 'codex', true)).toBe(true)
-  const old = snapshot(1)
-  if (!old.status) {
-    throw new Error('Expected status')
-  }
-  old.status.capabilities = [stale]
-  useAppStore.getState().applyRuntimeHostStatusSnapshot(old)
-  expect(inPlaceSwitchCapabilityNow('runtime:paired', 'codex', true)).toBe(false)
-  useAppStore.getState().applyRuntimeHostStatusSnapshot(snapshot(2))
-  expect(inPlaceSwitchCapabilityNow('runtime:paired', 'codex', true)).toBe(true)
-  expect(getStatus).not.toHaveBeenCalled()
-})
diff --git a/src/renderer/src/lib/launch-ai-vault-session-and-reveal.ts b/src/renderer/src/lib/launch-ai-vault-session-and-reveal.ts
index 306487c4842f..24ea69d5137a 100644
--- a/src/renderer/src/lib/launch-ai-vault-session-and-reveal.ts
+++ b/src/renderer/src/lib/launch-ai-vault-session-and-reveal.ts
@@ -8,7 +8,8 @@ import { agentLabel } from '@/components/right-sidebar/ai-vault-session-filters'
 
 export async function launchAiVaultSessionAndReveal(
   args: Parameters<typeof launchAiVaultSessionInNewTab>[0],
-  describeFailure: (message: string) => string = (message) => message
+  describeFailure: (message: string) => string = (message) => message,
+  queuedMessage?: string
 ): Promise<void> {
   const launch = launchAiVaultSessionInNewTab(args)
   if (launch.tabId === null) {
@@ -25,8 +26,15 @@ export async function launchAiVaultSessionAndReveal(
       return
     }
   }
-  if (useAppStore.getState().activeWorktreeId !== args.worktreeId) {
+  if (
+    args.viewerSelection === undefined &&
+    useAppStore.getState().activeWorktreeId !== args.worktreeId
+  ) {
     activateAiVaultResumeWorkspace(args.worktreeId)
   }
-  notifyAiVaultSessionQueued(args.agent)
+  if (queuedMessage === undefined) {
+    notifyAiVaultSessionQueued(args.agent)
+  } else {
+    notifyAiVaultSessionQueued(args.agent, queuedMessage)
+  }
 }
diff --git a/src/renderer/src/lib/launch-ai-vault-session-placement.test.ts b/src/renderer/src/lib/launch-ai-vault-session-placement.test.ts
index 2972fbc73348..c9dbd82dd152 100644
--- a/src/renderer/src/lib/launch-ai-vault-session-placement.test.ts
+++ b/src/renderer/src/lib/launch-ai-vault-session-placement.test.ts
@@ -1,3 +1,11 @@
+// @vitest-environment happy-dom
+import { agentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
+import {
+  beginViewerSelectionRequest,
+  disposeViewerSelection,
+  viewerSelectionOutcome
+} from './viewer-selection-request'
+import { activateTabNumberShortcut } from './tab-number-shortcuts'
 import { expect, it, vi } from 'vitest'
 import type { Tab } from '../../../shared/tab-types'
 import { createTestStore } from '@/store/slices/store-test-helpers'
@@ -85,3 +93,40 @@ it('keeps the pinned partition and neighbor order after a local switch retires i
     false
   )
 })
+
+it.each([false, true])(
+  'old Continue ordinary create consumes the original selection, newer reclick=%s',
+  (navigate) => {
+    const store = createTestStore()
+    mocks.store = store
+    const worktreeId = 'repo1::/work/app'
+    store.setState({ activeWorktreeId: worktreeId, activeView: 'terminal' })
+    const source = store.getState().createTab(worktreeId)
+    const deadline = agentSessionSwitchDeadline(Date.now)
+    try {
+      const selection = beginViewerSelectionRequest('old-continue', deadline)
+      selection.accept()
+      if (navigate) {
+        expect(activateTabNumberShortcut(0)).toBe(true)
+      }
+      const result = launchAiVaultSessionInNewTab({
+        agent: 'codex',
+        worktreeId,
+        command: 'codex resume copied-conversation',
+        viewerSelection: selection.token
+      })
+      expect(result.tabId).not.toBeNull()
+      expect(store.getState().tabsByWorktree[worktreeId]).toHaveLength(2)
+      expect(store.getState().getActiveTab(worktreeId)?.entityId).toBe(
+        navigate ? source.id : result.tabId
+      )
+      expect(viewerSelectionOutcome(selection.token)).toBe(navigate ? 'superseded' : 'fulfilled')
+      expect(store.getState().pendingStartupByTabId[result.tabId ?? '']?.command).toBe(
+        'codex resume copied-conversation'
+      )
+    } finally {
+      deadline.dispose()
+      disposeViewerSelection()
+    }
+  }
+)
diff --git a/src/renderer/src/lib/launch-ai-vault-session.test.ts b/src/renderer/src/lib/launch-ai-vault-session.test.ts
index ad74d3d07463..18b354afc088 100644
--- a/src/renderer/src/lib/launch-ai-vault-session.test.ts
+++ b/src/renderer/src/lib/launch-ai-vault-session.test.ts
@@ -153,29 +153,6 @@ describe('launchAiVaultSessionInNewTab', () => {
     expect(mockCloseEmptyGroup).not.toHaveBeenCalled()
   })
 
-  it.each([undefined, 'explicit-group'])(
-    'derives the source group before the paired launch and preserves explicit target %s',
-    (targetGroupId) => {
-      runtimeMocks.runtimeEnvironmentIdOrLocalUnlessTwin.mockReturnValue('env-1')
-      runtimeMocks.isWebRuntimeSessionActive.mockReturnValue(true)
-      mockState.unifiedTabsByWorktree['wt-1'] = [{ id: 'chat-C', groupId: 'source-group' }]
-      launchAiVaultSessionInNewTab({
-        agent: 'codex',
-        worktreeId: 'wt-1',
-        afterTabId: 'chat-C',
-        targetGroupId,
-        command: 'codex resume session-2'
-      })
-      expect(runtimeMocks.createWebRuntimeSessionTerminal).toHaveBeenCalledWith(
-        expect.objectContaining({
-          afterTabId: 'chat-C',
-          targetGroupId: targetGroupId ?? 'source-group'
-        }),
-        { notifyFailure: false }
-      )
-    }
-  )
-
   it('removes the still-empty split group when the runtime create does not succeed', async () => {
     runtimeMocks.runtimeEnvironmentIdOrLocalUnlessTwin.mockReturnValue('env-1')
     runtimeMocks.isWebRuntimeSessionActive.mockReturnValue(true)
diff --git a/src/renderer/src/lib/launch-ai-vault-session.ts b/src/renderer/src/lib/launch-ai-vault-session.ts
index baf2e7843f41..31d68483d207 100644
--- a/src/renderer/src/lib/launch-ai-vault-session.ts
+++ b/src/renderer/src/lib/launch-ai-vault-session.ts
@@ -1,3 +1,5 @@
+import { conversationSwitchViewerSelectionCurrent } from './conversation-switch-selection'
+import { presentAgentLaunchTab } from './agent-launch-tab-presentation'
 import { useAppStore } from '@/store'
 import { persistAgentLaunchTabOrder } from '@/lib/launch-agent-tab-order'
 import { insertUnifiedTabAfterAnchor } from '@/lib/unified-tab-anchor-insertion'
@@ -32,9 +34,16 @@ export function launchAiVaultSessionInNewTab(args: {
   afterTabId?: string
   /** A chat's switch, whose ordinary spawn admits the resume; set only for a capable host. */
   resumeOrigin?: 'switch'
+  viewerSelection?: string
   canActivate?: () => boolean
 }): LaunchAiVaultSessionInNewTabResult {
   const store = useAppStore.getState()
+  const canActivate =
+    args.viewerSelection === undefined
+      ? args.canActivate
+      : () =>
+          conversationSwitchViewerSelectionCurrent(args.viewerSelection) &&
+          args.canActivate?.() !== false
   const slot = args.afterTabId
     ? store.unifiedTabsByWorktree[args.worktreeId]?.find((tab) => tab.id === args.afterTabId)
     : undefined
@@ -70,11 +79,15 @@ export function launchAiVaultSessionInNewTab(args: {
         ...(args.launchConfig ? { agentArgs: args.launchConfig.agentArgs } : {}),
         activate: true
       },
-      { notifyFailure: false, canActivate: args.canActivate }
+      {
+        notifyFailure: false,
+        ...(canActivate ? { canActivate } : {}),
+        ...(args.viewerSelection ? { viewerSelection: args.viewerSelection } : {})
+      }
     )
     const observedRuntimeLaunch = runtimeLaunch.then((outcome) => {
       if (outcome.status === 'created') {
-        if (args.canActivate?.() !== false) {
+        if (canActivate?.() !== false && args.viewerSelection === undefined) {
           useAppStore.getState().setActiveTabType('terminal', args.worktreeId)
         }
       } else if (splitGroupId) {
@@ -86,7 +99,7 @@ export function launchAiVaultSessionInNewTab(args: {
     return { tabId: null, runtimeLaunch: observedRuntimeLaunch }
   }
 
-  const activate = args.canActivate?.() !== false
+  const activate = canActivate?.() !== false && args.viewerSelection === undefined
   const tab = store.createTab(args.worktreeId, sourceGroupId, undefined, {
     ...(split ? { split } : {}),
     ...(activate ? {} : { activate: false, recordInteraction: false }),
@@ -114,5 +127,8 @@ export function launchAiVaultSessionInNewTab(args: {
     insertUnifiedTabAfterAnchor(args.worktreeId, tab.id, slot.id)
   }
 
+  if (args.viewerSelection) {
+    presentAgentLaunchTab('focus-window', args.worktreeId, tab.id, undefined, args.viewerSelection)
+  }
   return { tabId: tab.id }
 }
diff --git a/src/renderer/src/lib/launch-structured-agent-session.test.ts b/src/renderer/src/lib/launch-structured-agent-session.test.ts
index 931886c97c3b..df609da79925 100644
--- a/src/renderer/src/lib/launch-structured-agent-session.test.ts
+++ b/src/renderer/src/lib/launch-structured-agent-session.test.ts
@@ -1,5 +1,3 @@
-import { structuredAgentSessionFocusOwner } from '@/runtime/structured-agent-session-owner'
-import { CreateIntentParams } from '../../../shared/rpc-contract/structured-agent-session-params'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { structuredAgentSessionPayloadFingerprint } from '../../../shared/structured-agent-session-mutation'
 import { callStructuredAgentSession } from '@/runtime/structured-agent-session-client'
@@ -60,51 +58,6 @@ describe('structured agent session launch', () => {
     expect(peekWebSessionFocusIntent(owner, worktreeId)).toBeNull()
   })
 
-  it('generates fresh CLI-switch intents accepted by the shared create contract', () => {
-    const worktreeId = 'switch-generated-workspace'
-    const resumeFrom = {
-      providerSessionId: 'saved-provider',
-      cliSource: { workspaceId: worktreeId, paneKey: 'source-tab:source-leaf' }
-    }
-    const create = () =>
-      createStructuredAgentSessionLaunchIntent(
-        worktreeId,
-        'codex',
-        'local',
-        resumeFrom,
-        undefined,
-        false
-      )
-    const first = create()
-    const second = create()
-    expect(first.sessionId).not.toBe(second.sessionId)
-    expect(first.params.envelope.clientOperationId).not.toBe(
-      second.params.envelope.clientOperationId
-    )
-    for (const intent of [first, second]) {
-      expect(intent.target).toEqual({ kind: 'local' })
-      expect(CreateIntentParams.parse(intent.params)).toEqual(intent.params)
-      expect(intent.params).toEqual({
-        worktree: `id:${worktreeId}`,
-        agent: 'codex',
-        resumeFrom,
-        envelope: {
-          sessionId: intent.sessionId,
-          clientOperationId: expect.stringMatching(/^\d{13}-[0-9a-f]{32}$/),
-          expectedRuntimeFence: null,
-          payloadFingerprint: structuredAgentSessionPayloadFingerprint({
-            method: 'agentSession.create',
-            sessionId: intent.sessionId,
-            fields: { worktree: `id:${worktreeId}`, agent: 'codex', resumeFrom }
-          })
-        }
-      })
-    }
-    expect(
-      peekWebSessionFocusIntent(structuredAgentSessionFocusOwner(first.target), worktreeId)
-    ).toBeNull()
-  })
-
   // The chat opens before its host answers, so the create is the last thing that can say no.
   it('issues no create to a host held for its access, or after its chat closed', async () => {
     vi.mocked(callStructuredAgentSession).mockResolvedValue({ supported: true })
diff --git a/src/renderer/src/lib/pane-manager/client-hosted-browser-row-state.ts b/src/renderer/src/lib/pane-manager/client-hosted-browser-row-state.ts
index 4dfbf14f8a5b..49366e479ea9 100644
--- a/src/renderer/src/lib/pane-manager/client-hosted-browser-row-state.ts
+++ b/src/renderer/src/lib/pane-manager/client-hosted-browser-row-state.ts
@@ -1,3 +1,4 @@
+import { noteViewerNavigation } from '../viewer-selection-request'
 import { useCallback, useSyncExternalStore } from 'react'
 import type {
   ClientHostedBrowserRow,
@@ -91,6 +92,7 @@ export function useClientHostedBrowserRows(worktreeId: string): readonly ClientH
 }
 
 export function selectClientHostedBrowserRow(next: ClientHostedBrowserRowSelection): void {
+  noteViewerNavigation()
   selection = next
   notifyChange()
 }
diff --git a/src/renderer/src/lib/simulator-tab-palette-activation.ts b/src/renderer/src/lib/simulator-tab-palette-activation.ts
index 84e1294c4fc9..fc3c0161dbb7 100644
--- a/src/renderer/src/lib/simulator-tab-palette-activation.ts
+++ b/src/renderer/src/lib/simulator-tab-palette-activation.ts
@@ -1,3 +1,4 @@
+import { noteViewerNavigation } from './viewer-selection-request'
 import { useAppStore } from '@/store'
 import type { ExecutionHostId } from '../../../shared/execution-host'
 import { activateAndRevealWorkspace } from './worktree-activation'
@@ -58,6 +59,7 @@ export function activateSimulatorTabPaletteResult({
   }
 
   const state = useAppStore.getState()
+  noteViewerNavigation()
   state.focusGroup(worktreeId, tab.groupId)
   state.activateTab(tab.id, { worktreeId })
   state.setActiveTab(tab.id)
diff --git a/src/renderer/src/lib/structured-agent-session-launch-surface.ts b/src/renderer/src/lib/structured-agent-session-launch-surface.ts
index 447802971e5e..7687f1f88287 100644
--- a/src/renderer/src/lib/structured-agent-session-launch-surface.ts
+++ b/src/renderer/src/lib/structured-agent-session-launch-surface.ts
@@ -1,3 +1,4 @@
+import { selectSessionTabForViewer } from '@/runtime/web-session-tabs-sync/store-patch'
 import {
   findIndexedProjectGroupOwner,
   findIndexedRepoOwner,
@@ -154,15 +155,20 @@ export function openStructuredAgentSessionProvisionalTab(args: {
   /** The tab the chat opens right after, in that tab's group. */
   afterTabId?: string
   activate?: boolean
+  viewerSelection?: string
   canActivate?: () => boolean
 }): OpenedAgentSessionTab {
   const state = useAppStore.getState()
   const existing = findStructuredLaunchTab(args)
   if (existing) {
     if (args.activate !== false && args.canActivate?.() !== false) {
-      state.focusGroup(args.worktreeId, existing.groupId)
-      state.activateTab(existing.id, { worktreeId: args.worktreeId })
-      state.setActiveTabType('agent-session', args.worktreeId)
+      if (args.viewerSelection) {
+        selectSessionTabForViewer(args.worktreeId, existing.id, args.viewerSelection)
+      } else {
+        state.focusGroup(args.worktreeId, existing.groupId)
+        state.activateTab(existing.id, { worktreeId: args.worktreeId })
+        state.setActiveTabType('agent-session', args.worktreeId)
+      }
     }
     return existing
   }
@@ -186,11 +192,13 @@ export function openStructuredAgentSessionProvisionalTab(args: {
       label: defaultAgentChatLabel(args.agent),
       targetGroupId,
       ...(args.afterTabId ? { afterTabId: args.afterTabId } : {}),
-      activate
+      activate: activate && args.viewerSelection === undefined
     })
     const target = structuredAgentSessionTargetForHost(args.executionHostId)
     holdFrameDrawnProvisionalChatTab(target, args.worktreeId, tab.id)
-    if (activate) {
+    if (activate && args.viewerSelection) {
+      selectSessionTabForViewer(args.worktreeId, tab.id, args.viewerSelection)
+    } else if (activate) {
       state.setActiveTabType('agent-session', args.worktreeId)
     }
     return tab
@@ -208,6 +216,7 @@ export function openStructuredAgentSessionProvisionalTab(args: {
           ? { afterTabId: args.afterTabId }
           : slotAnchor(address, args.worktreeId)),
         activate: args.activate !== false,
+        viewerSelection: args.viewerSelection,
         canActivate: args.canActivate,
         drawHere
       })
diff --git a/src/renderer/src/lib/structured-agent-session-tab-open-through-layout-owner.ts b/src/renderer/src/lib/structured-agent-session-tab-open-through-layout-owner.ts
index 774c372b0961..4d0a7ef4cfb7 100644
--- a/src/renderer/src/lib/structured-agent-session-tab-open-through-layout-owner.ts
+++ b/src/renderer/src/lib/structured-agent-session-tab-open-through-layout-owner.ts
@@ -1,3 +1,4 @@
+import { selectSessionTabForViewer } from '@/runtime/web-session-tabs-sync/store-patch'
 // Send open with the chat’s own tab ID, select only after main draws it, and use afterPendingTab before reading the returned tab from store.
 
 import type { ExecutionHostId } from '../../../shared/execution-host'
@@ -18,6 +19,7 @@ export type AgentSessionTabOpen = {
   targetGroupId?: string
   afterTabId?: string
   activate: boolean
+  viewerSelection?: string
   canActivate?: () => boolean
   /** Today's draw, for a twin main may route to a paired server. */
   drawHere: () => Tab
@@ -56,6 +58,10 @@ export function openAgentSessionTabThroughLayoutOwner(
       if (!open.activate || open.canActivate?.() === false) {
         return
       }
+      if (open.viewerSelection) {
+        selectSessionTabForViewer(worktreeId, shownId, open.viewerSelection)
+        return
+      }
       // As the window's own open: the chat is selected in its group; the focused group stays.
       const current = useAppStore.getState()
       current.activateTab(shownId, { worktreeId })
diff --git a/src/renderer/src/lib/tab-number-shortcuts.ts b/src/renderer/src/lib/tab-number-shortcuts.ts
index d28334741fb5..b9ba6c783ac5 100644
--- a/src/renderer/src/lib/tab-number-shortcuts.ts
+++ b/src/renderer/src/lib/tab-number-shortcuts.ts
@@ -1,3 +1,4 @@
+import { noteViewerNavigation } from './viewer-selection-request'
 import { focusTerminalTabSurface } from '@/lib/focus-terminal-tab-surface'
 import { useAppStore } from '@/store'
 import type { AppState } from '@/store/types'
@@ -57,6 +58,7 @@ export function activateTabNumberShortcut(index: number): boolean {
     return false
   }
 
+  noteViewerNavigation()
   const worktreeId = target.worktreeId
   const runtimeEnvironmentId = runtimeEnvironmentIdOrLocalUnlessTwin(store, worktreeId)
   store.focusGroup(worktreeId, target.groupId)
diff --git a/src/renderer/src/lib/viewer-selection-request.ts b/src/renderer/src/lib/viewer-selection-request.ts
new file mode 100644
index 000000000000..43cc15d9f991
--- /dev/null
+++ b/src/renderer/src/lib/viewer-selection-request.ts
@@ -0,0 +1,154 @@
+import { isSessionTabSelectionRequest } from '../../../shared/session-tab-placement'
+import type { AgentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
+import { createBrowserUuid } from './browser-uuid'
+
+type Destination = { worktreeId: string; tabId: string }
+type Request = {
+  token: string
+  order: number
+  revision: number
+  deadline: Pick<AgentSessionSwitchDeadline, 'check'>
+  outcome: 'pending' | 'fulfilled' | 'superseded'
+  destination?: Destination
+}
+
+let lifetime = createBrowserUuid()
+let navigationRevision = 0
+let actionOrder = 0
+let acceptedOrder = 0
+let current: Request | undefined
+
+/** Explicit navigation only; automatic layout repair/publication never calls this ingress. */
+export function noteViewerNavigation(): void {
+  navigationRevision += 1
+  if (current) {
+    current.outcome = 'superseded'
+  }
+}
+
+/** Capture before preparation/consent; accepting an older dialog cannot replace a newer action. */
+export function beginViewerSelectionRequest(
+  invocationId: string,
+  deadline: Pick<AgentSessionSwitchDeadline, 'check'>
+) {
+  const candidate: Request = {
+    token: `selection-v1:${lifetime}:${invocationId}:${++actionOrder}`,
+    order: actionOrder,
+    revision: navigationRevision,
+    deadline,
+    outcome: 'pending'
+  }
+  return {
+    token: candidate.token,
+    accept: () => {
+      if (candidate.order <= acceptedOrder) {
+        candidate.outcome = 'superseded'
+        return
+      }
+      acceptedOrder = candidate.order
+      if (current) {
+        current.outcome = 'superseded'
+      }
+      current = candidate
+      if (candidate.revision !== navigationRevision) {
+        candidate.outcome = 'superseded'
+      }
+    },
+    discard: () => {
+      candidate.outcome = 'superseded'
+    }
+  }
+}
+
+export function viewerSelectionOutcome(token: string): 'pending' | 'fulfilled' | 'superseded' {
+  if (!isSessionTabSelectionRequest(token) || current?.token !== token) {
+    return 'superseded'
+  }
+  if (current.outcome === 'pending') {
+    try {
+      current.deadline.check()
+    } catch {
+      current.outcome = 'superseded'
+    }
+    if (current.revision !== navigationRevision) {
+      current.outcome = 'superseded'
+    }
+  }
+  return current.outcome
+}
+
+/** Called inside the accepted ordinary writer after resolving membership, before its subscribers. */
+export function commitViewerSelection(
+  token: string,
+  destination: Destination,
+  apply: () => boolean
+): boolean {
+  if (viewerSelectionOutcome(token) !== 'pending' || !current) {
+    return false
+  }
+  const request = current
+  if (
+    request.destination &&
+    (request.destination.worktreeId !== destination.worktreeId ||
+      request.destination.tabId !== destination.tabId)
+  ) {
+    return false
+  }
+  request.destination = destination
+  request.outcome = 'fulfilled'
+  try {
+    if (apply()) {
+      return true
+    }
+  } catch (error) {
+    if (current === request) {
+      request.outcome = 'pending'
+    }
+    throw error
+  }
+  // Missing membership is not success; no state was applied.
+  if (current === request && request.outcome === 'fulfilled') {
+    request.outcome = 'pending'
+  }
+  return false
+}
+
+/** The ordinary publication owner knows the destination before it can be drawn. */
+export function bindViewerSelectionDestination(
+  token: string | undefined,
+  destination: Destination
+): void {
+  if (token && viewerSelectionOutcome(token) === 'pending' && current) {
+    current.destination ??= destination
+  }
+}
+
+/** A definite close/withdrawal cannot leave an undrawn destination's selection armed. */
+export function endViewerSelectionForDestination(worktreeId: string, tabId: string): void {
+  if (current?.destination?.worktreeId === worktreeId && current.destination.tabId === tabId) {
+    current.outcome = 'superseded'
+  }
+}
+
+/** Pointer focus on another pane is navigation; typing/copying in the current pane is not. */
+export function noteViewerGroupNavigation(
+  state: {
+    activeWorktreeId: string | null
+    activeGroupIdByWorktree: Record<string, string | undefined>
+  },
+  worktreeId: string,
+  groupId: string
+): void {
+  if (
+    state.activeWorktreeId !== worktreeId ||
+    state.activeGroupIdByWorktree[worktreeId] !== groupId
+  ) {
+    noteViewerNavigation()
+  }
+}
+
+export function disposeViewerSelection(): void {
+  current = undefined
+  lifetime = createBrowserUuid()
+  navigationRevision = actionOrder = acceptedOrder = 0
+}
diff --git a/src/renderer/src/lib/workspace-switch-user-act.ts b/src/renderer/src/lib/workspace-switch-user-act.ts
index cf832e29033c..bc8f3f237803 100644
--- a/src/renderer/src/lib/workspace-switch-user-act.ts
+++ b/src/renderer/src/lib/workspace-switch-user-act.ts
@@ -1,3 +1,4 @@
+import { noteViewerNavigation } from './viewer-selection-request'
 /**
  * The user's own switches to a workspace (opening it, picking one of its tabs) in this window. Only
  * these may wake or start a stopped WSL distro (E9); launch restore, a reload, remounts and Orca's own
@@ -21,6 +22,7 @@ export function noteUserWorkspaceSwitch(workspaceKey: string | null | undefined)
   if (!workspaceKey) {
     return
   }
+  noteViewerNavigation()
   lastSwitchAt.set(workspaceKey, Date.now())
   switchCounts.set(workspaceKey, (switchCounts.get(workspaceKey) ?? 0) + 1)
 }
diff --git a/src/renderer/src/lib/workspace-tab-palette-activation.ts b/src/renderer/src/lib/workspace-tab-palette-activation.ts
index 43ca1bccb5ac..387e0c2dae3d 100644
--- a/src/renderer/src/lib/workspace-tab-palette-activation.ts
+++ b/src/renderer/src/lib/workspace-tab-palette-activation.ts
@@ -1,3 +1,4 @@
+import { noteViewerNavigation } from './viewer-selection-request'
 import { focusTerminalTabSurface } from '@/lib/focus-terminal-tab-surface'
 import { runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/worktree-runtime-owner'
 import { activateWebRuntimeSessionTab } from '@/runtime/web-runtime-session-tab-lifecycle'
@@ -104,6 +105,7 @@ export function activateWorkspaceTabPaletteResult(
     return { status: 'failed', reason: initialFailure }
   }
 
+  noteViewerNavigation()
   const executionHostId =
     result.executionHostId ?? initialState.getKnownWorktreeById(result.worktreeId)?.hostId
   const activated = executionHostId
diff --git a/src/renderer/src/lib/worktree-activation-pty-inventory.ts b/src/renderer/src/lib/worktree-activation-pty-inventory.ts
index 2018f8578a16..5fa974dc9340 100644
--- a/src/renderer/src/lib/worktree-activation-pty-inventory.ts
+++ b/src/renderer/src/lib/worktree-activation-pty-inventory.ts
@@ -12,6 +12,14 @@ import {
   type WorktreeOperationRouteState
 } from './worktree-operation-route'
 
+export function canInspectAgentActivationInventory(): boolean {
+  return (
+    typeof window !== 'undefined' &&
+    typeof window.api?.runtime?.call === 'function' &&
+    typeof window.api?.pty?.listSessions === 'function'
+  )
+}
+
 /** Only a reachable execution-owner route can authorize activation from its inventory. */
 export function resolveActivationPtyListScope(
   state: WorktreeOperationRouteState,
diff --git a/src/renderer/src/lib/worktree-activation.ts b/src/renderer/src/lib/worktree-activation.ts
index 9b2f969c5630..390694f87bc2 100644
--- a/src/renderer/src/lib/worktree-activation.ts
+++ b/src/renderer/src/lib/worktree-activation.ts
@@ -1,3 +1,4 @@
+import { canInspectAgentActivationInventory } from './worktree-activation-pty-inventory'
 import { noteUserWorkspaceOpen } from './workspace-switch-user-act'
 import { translate } from '@/i18n/i18n'
 import { useAppStore } from '@/store'
@@ -54,14 +55,6 @@ export type ActivateAndRevealResult = {
   primaryTabId: string | null
 }
 
-function canInspectAgentActivationInventory(): boolean {
-  return (
-    typeof window !== 'undefined' &&
-    typeof window.api?.runtime?.call === 'function' &&
-    typeof window.api?.pty?.listSessions === 'function'
-  )
-}
-
 export function activateAndRevealFolderWorkspace(
   folderWorkspaceId: string,
   opts?: WorktreeActivationSurfaceSelection & {
@@ -73,6 +66,7 @@ export function activateAndRevealFolderWorkspace(
     executionHostId?: ExecutionHostId
   }
 ): ActivateAndRevealResult | false {
+  noteUserWorkspaceOpen(folderWorkspaceKey(folderWorkspaceId), opts?.navigationIntent)
   const state = useAppStore.getState()
   const folderWorkspaceOwner = findFolderWorkspaceOwner(
     state,
@@ -176,6 +170,7 @@ export function activateAndRevealWorktree(
   worktreeId: string,
   opts?: WorktreeActivationOptions
 ): ActivateAndRevealResult | false {
+  noteUserWorkspaceOpen(worktreeId, opts?.navigationIntent)
   const state = useAppStore.getState()
   // The floating workspace owns a separate panel, never the main window's selection.
   if (isFloatingWorkspaceId(worktreeId)) {
@@ -210,7 +205,6 @@ export function activateAndRevealWorktree(
   if (state.activeView !== 'terminal') {
     state.setActiveView('terminal')
   }
-  noteUserWorkspaceOpen(worktreeId, opts?.navigationIntent)
 
   state.setActiveWorktree(
     worktreeId,
diff --git a/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts b/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts
index d2db51c67a36..92e7e4f51198 100644
--- a/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts
+++ b/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts
@@ -7,7 +7,10 @@ import type { WorktreeRuntimeOwnerState } from '../../lib/worktree-runtime-owner
 import { getExecutionHostIdForWorktree } from '../../lib/worktree-runtime-owner'
 import { applyWebSessionTabsSnapshot } from '../web-session-tabs-sync/snapshot-api'
 import { applyWebSessionTabsStorePatch } from '../web-session-tabs-sync/store-patch'
-import type { WebSessionTabsSyncState } from '../web-session-tabs-sync/state'
+import type {
+  SnapshotOpenSelectionOffer,
+  WebSessionTabsSyncState
+} from '../web-session-tabs-sync/state'
 import {
   admitRetiredValueUnderAuthority,
   noteRetiredValue,
@@ -46,6 +49,7 @@ function isWorktreeRetraction(
 }
 
 export type StructuredSessionSnapshotApplyOptions = {
+  offerOpenSelection?: (offer: SnapshotOpenSelectionOffer) => void
   /** Authority census replies answer a just-issued listAll, so exempt them from retired-epoch fencing of delayed dead-generation stream frames. */
   authoritative?: boolean
   /** Re-applies a publication at the version already applied: the window removed a chat early. */
@@ -70,7 +74,7 @@ export function applyStructuredSessionTabSnapshots(
   const acceptedAgentSessions: { worktreeId: string; sessionId: string }[] = []
   const drawnChatLabels: DrawnChatLabel[] = []
   const settleStructuredSessionMirror = applyWebSessionTabsStorePatch(
-    (state, changedAgentPaneKeys) =>
+    (state, changedAgentPaneKeys, offerOpenSelection) =>
       applyLocalStructuredSessionTabSnapshots(
         state,
         snapshots,
@@ -78,6 +82,7 @@ export function applyStructuredSessionTabSnapshots(
         undefined,
         {
           ...options,
+          offerOpenSelection,
           onAcceptedAgentSession: (worktreeId, sessionId) => {
             acceptedAgentSessions.push({ worktreeId, sessionId })
             options.onAcceptedAgentSession?.(worktreeId, sessionId)
@@ -175,6 +180,9 @@ export function applyLocalStructuredSessionTabSnapshots<
       owner,
       now,
       {
+        offerOpenSelection: options.framesDraw?.(snapshot.worktree)
+          ? undefined
+          : options.offerOpenSelection,
         contentScope: 'agent-session',
         preserveLocalLayout: true,
         terminalPtyMode: 'local'
diff --git a/src/renderer/src/runtime/runtime-rpc-client.test.ts b/src/renderer/src/runtime/runtime-rpc-client.test.ts
index 026686104593..72afe7578b4a 100644
--- a/src/renderer/src/runtime/runtime-rpc-client.test.ts
+++ b/src/renderer/src/runtime/runtime-rpc-client.test.ts
@@ -20,64 +20,6 @@ import {
 installRuntimeRpcClientTestBridge()
 
 describe('runtime RPC client routing', () => {
-  it.each(['local', 'environment'] as const)(
-    'runs the %s dispatch veto once and does not send when it throws',
-    async (kind) => {
-      const target = kind === 'local' ? { kind } : { kind, environmentId: 'env-1' }
-      const dispatch = kind === 'local' ? runtimeCall : runtimeEnvironmentCall
-      const beforeSend = vi.fn((): void => {
-        expect(dispatch).not.toHaveBeenCalled()
-        throw new Error('operation retired')
-      })
-      await expect(callRuntimeRpc(target, 'status.get', undefined, { beforeSend })).rejects.toThrow(
-        'operation retired'
-      )
-      expect(beforeSend).toHaveBeenCalledOnce()
-      expect(dispatch).not.toHaveBeenCalled()
-
-      beforeSend.mockImplementation(() => {
-        expect(dispatch).not.toHaveBeenCalled()
-      })
-      dispatch.mockRejectedValue(new Error('reply lost'))
-      await expect(callRuntimeRpc(target, 'status.get', undefined, { beforeSend })).rejects.toThrow(
-        'reply lost'
-      )
-      expect(beforeSend).toHaveBeenCalledTimes(2)
-      expect(dispatch).toHaveBeenCalledOnce()
-    }
-  )
-
-  it('observes an abortable host dispatch once, without marking subscription setup sent', async () => {
-    let callbacks: Parameters<typeof window.api.runtimeEnvironments.subscribe>[1] | undefined
-    const unsubscribe = vi.fn()
-    runtimeEnvironmentSubscribe.mockImplementation((_args, incoming) => {
-      callbacks = incoming
-      return Promise.resolve({ unsubscribe })
-    })
-    const beforeSend = vi.fn()
-    const request = callRuntimeRpc(
-      { kind: 'environment', environmentId: 'env-1' },
-      'status.get',
-      undefined,
-      { signal: new AbortController().signal, beforeSend }
-    )
-    expect(runtimeEnvironmentSubscribe).toHaveBeenCalledOnce()
-    expect(beforeSend).not.toHaveBeenCalled()
-    callbacks?.onSent?.(123)
-    callbacks?.onSent?.(456)
-    callbacks?.onResponse({
-      id: 'response',
-      ok: true,
-      result: 'done',
-      _meta: { runtimeId: 'remote-runtime' }
-    })
-    await expect(request).resolves.toBe('done')
-    expect(beforeSend).toHaveBeenCalledExactlyOnceWith(123)
-    callbacks?.onSent?.(789)
-    expect(beforeSend).toHaveBeenCalledOnce()
-    expect(runtimeEnvironmentCall).not.toHaveBeenCalled()
-  })
-
   it('routes local runtime calls through window.api.runtime.call', async () => {
     runtimeCall.mockResolvedValue({
       id: 'local',
diff --git a/src/renderer/src/runtime/session-tab-open-placement.test.ts b/src/renderer/src/runtime/session-tab-open-placement.test.ts
deleted file mode 100644
index 63e91d38e9f5..000000000000
--- a/src/renderer/src/runtime/session-tab-open-placement.test.ts
+++ /dev/null
@@ -1,523 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { AppState } from '@/store/types'
-import type { RuntimeMobileSessionTabsResult } from '../../../shared/runtime-types'
-import type { SessionTabOpenPlacement } from '../../../shared/session-tab-placement'
-import { captureTerminalSurfaceIdentity } from '../../../shared/terminal-tab-close'
-import { structuredAgentSessionTabId } from '../../../shared/structured-agent-session-projection'
-import { toWebTerminalSurfaceTabId } from '../../../shared/terminal-surface-id'
-import { createTestStore } from '../store/slices/store-test-helpers'
-import { createTabsSliceMockApi } from '../store/slices/tabs-slice-test-harness'
-import { captureConversationSwitchViewerSelection } from '../lib/conversation-switch-selection'
-import { publishAgentLaunchTab } from '../lib/agent-launch-tab-publication'
-import { retireTerminalPresentation } from '../components/terminal-pane/terminal-presentation-retirement'
-import { applyLocalStructuredSessionTabSnapshots } from './local-structured-session-tabs-sync/snapshot-apply'
-import { resetLocalStructuredSessionVersionForTests } from './local-structured-session-tabs-sync/inventory-generation-fence'
-import { applyWebSessionTabsSnapshot } from './web-session-tabs-sync/snapshot-api'
-import { hostSessionTabIdByLocalKey } from './web-session-tabs-sync/state'
-import { resetWebSessionTabsSyncTestState } from './web-session-tabs-sync-test-harness'
-
-const ref = vi.hoisted(() => {
-  const current: { store: ReturnType<typeof createTestStore> | null } = { store: null }
-  return current
-})
-vi.mock('@/store', () => ({
-  useAppStore: {
-    getState: () => ref.store!.getState(),
-    setState: (patch: Partial<AppState>) => ref.store!.setState(patch)
-  }
-}))
-// DOM focus is external I/O; publication, adoption and selection remain production owners.
-vi.mock('@/lib/focus-terminal-tab-surface', () => ({ focusTerminalTabSurface: vi.fn() }))
-vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } }))
-
-const api = createTabsSliceMockApi()
-const WT = 'placement::workspace'
-const OTHER = 'placement::other'
-const A = 'source-terminal'
-const C = 'neighbour-terminal'
-const LEAF = '11111111-1111-4111-8111-111111111111'
-const SIBLING = '22222222-2222-4222-8222-222222222222'
-const DESTINATION = '33333333-3333-4333-8333-333333333333'
-const ENV = 'placement-server'
-let store: ReturnType<typeof createTestStore>
-let version = 0
-
-function frame(tabs: RuntimeMobileSessionTabsResult['tabs']): RuntimeMobileSessionTabsResult {
-  return {
-    worktree: WT,
-    publicationEpoch: 'placement-host',
-    snapshotVersion: ++version,
-    activeGroupId: 'host-group',
-    activeTabId: null,
-    activeTabType: 'terminal',
-    tabGroups: [{ id: 'host-group', activeTabId: null, tabOrder: tabs.map((tab) => tab.id) }],
-    tabs
-  }
-}
-function terminal(
-  id: string
-): Extract<RuntimeMobileSessionTabsResult['tabs'][number], { type: 'terminal' }> {
-  return {
-    type: 'terminal',
-    id: `${id}::${LEAF}`,
-    parentTabId: id,
-    leafId: LEAF,
-    title: id,
-    isActive: false,
-    status: 'ready',
-    terminal: `handle-${id}`
-  }
-}
-function apply(snapshot: RuntimeMobileSessionTabsResult, paired: boolean): void {
-  store.setState((state) =>
-    paired
-      ? applyWebSessionTabsSnapshot(state, snapshot, ENV)
-      : applyLocalStructuredSessionTabSnapshots(state, [snapshot])
-  )
-}
-function order(): string[] {
-  return store.getState().groupsByWorktree[WT]!.flatMap((group) => group.tabOrder)
-}
-function seed(paired: boolean, extra = false) {
-  store.setState({
-    activeWorktreeId: WT,
-    activeWorkspaceExecutionHostId: paired ? `runtime:${ENV}` : 'local'
-  })
-  let original: NonNullable<ReturnType<typeof captureTerminalSurfaceIdentity>>
-  if (paired) {
-    // External host facts; presentation membership is created only by the ordinary mirror writer.
-    original = {
-      worktreeId: WT,
-      tabId: A,
-      leafId: LEAF,
-      createdAt: 123,
-      generation: 0,
-      hasLeaf: true,
-      ptyId: 'source-host-pty',
-      incarnationId: 'source-host-incarnation'
-    }
-    apply(
-      frame([
-        { ...terminal(A), ptyId: original.ptyId, incarnationId: original.incarnationId },
-        terminal(C)
-      ]),
-      true
-    )
-  } else {
-    store.getState().createTab(WT, undefined, undefined, { id: A, initialLeafId: LEAF })
-    original = captureTerminalSurfaceIdentity(store.getState(), WT, A, LEAF)!
-  }
-  const a = paired ? toWebTerminalSurfaceTabId(A) : A
-  const c = paired ? toWebTerminalSurfaceTabId(C) : C
-  const group = store.getState().unifiedTabsByWorktree[WT]!.find((tab) => tab.id === a)!.groupId
-  if (!paired) {
-    store.getState().createTab(WT, group, undefined, { id: C, initialLeafId: LEAF })
-  }
-  const editor = (name: string): string => {
-    const fileId = store.getState().openFile(
-      {
-        filePath: `/tmp/placement-${name}.ts`,
-        relativePath: `${name}.ts`,
-        worktreeId: WT,
-        language: 'typescript',
-        runtimeEnvironmentId: null,
-        mode: 'edit'
-      },
-      { targetGroupId: group, selection: 'none', suppressActiveRuntimeFallback: true }
-    )
-    return store.getState().unifiedTabsByWorktree[WT]!.find((tab) => tab.entityId === fileId)!.id
-  }
-  const b = editor('B')
-  const x = extra ? editor('X') : null
-  store.getState().reorderUnifiedTabs(group, x ? [a, x, b, c] : [a, b, c])
-  store.getState().setActiveTab(a)
-  return { group, original, b, x, a, c }
-}
-function intent(groupId: string, afterTabId?: string): SessionTabOpenPlacement {
-  return {
-    invocationId: 'switch-invocation',
-    generation: 'switch-generation',
-    placement: { groupId, afterTabId, index: 0 },
-    activate: true,
-    viewerSelection: captureConversationSwitchViewerSelection(store.getState())
-  }
-}
-function chat(
-  agent: 'claude' | 'codex',
-  openPlacement?: SessionTabOpenPlacement
-): Extract<RuntimeMobileSessionTabsResult['tabs'][number], { type: 'agent-session' }> {
-  return {
-    type: 'agent-session',
-    id: `agent-session:${agent}-conversation`,
-    sessionId: `${agent}-conversation`,
-    agent,
-    title: agent,
-    isActive: false,
-    ...(openPlacement ? { openPlacement } : {})
-  }
-}
-
-beforeEach(() => {
-  store = createTestStore()
-  ref.store = store
-  version = 0
-  resetLocalStructuredSessionVersionForTests()
-  resetWebSessionTabsSyncTestState()
-})
-afterEach(() => {
-  resetLocalStructuredSessionVersionForTests()
-  resetWebSessionTabsSyncTestState()
-})
-
-describe('explicit open placement at the actual ordinary store owner', () => {
-  it.each([
-    ['claude', false],
-    ['codex', false],
-    ['claude', true],
-    ['codex', true]
-  ] as const)(
-    'keeps the source slot and canonical one-click selection in both directions: %s paired=%s',
-    (agent, paired) => {
-      const seeded = seed(paired)
-      const open = { ...intent(seeded.group, A), source: seeded.original }
-      apply(frame([terminal(A), chat(agent, open), terminal(C)]), paired)
-      const canonical = structuredAgentSessionTabId(`${agent}-conversation`)
-      expect(order()).toEqual([seeded.a, canonical, seeded.b, seeded.c])
-      expect(store.getState().getActiveTab(WT)?.entityId).toBe(`${agent}-conversation`)
-      if (paired) {
-        apply(frame([chat(agent, open), terminal(C)]), true)
-      } else {
-        retireTerminalPresentation(seeded.original)
-      }
-      expect(order()).toEqual([canonical, seeded.b, seeded.c])
-      const reverse = intent(seeded.group, `agent-session:${agent}-conversation`)
-      if (paired) {
-        apply(frame([{ ...terminal(DESTINATION), openPlacement: reverse }, terminal(C)]), true)
-      } else {
-        publishAgentLaunchTab({
-          requestId: 'reverse',
-          worktreeId: WT,
-          tabId: DESTINATION,
-          leafId: LEAF,
-          launchAgent: agent,
-          viewMode: 'terminal',
-          viewer: 'focus-in-workspace',
-          openPlacement: { ...reverse, placement: { ...reverse.placement, afterTabId: canonical } }
-        })
-        apply(frame([]), false)
-      }
-      const destination = paired ? toWebTerminalSurfaceTabId(DESTINATION) : DESTINATION
-      expect(order()).toEqual([destination, seeded.b, seeded.c])
-      expect(store.getState().getActiveTab(WT)?.id).toBe(destination)
-    }
-  )
-
-  it('uses the explicit index for a coalesced retired source without moving client-only X or a later used destination', () => {
-    const seeded = seed(true, true)
-    const open = { ...intent(seeded.group, A), source: seeded.original }
-    const snapshot = frame([chat('codex', open), terminal(C)])
-    apply(snapshot, true)
-    const canonical = structuredAgentSessionTabId('codex-conversation')
-    expect(order()).toEqual([canonical, seeded.x, seeded.b, seeded.c])
-    store.getState().reorderUnifiedTabs(seeded.group, [seeded.x!, seeded.b, seeded.c, canonical])
-    store.getState().activateTab(seeded.b)
-    apply({ ...snapshot, snapshotVersion: ++version }, true)
-    expect(order()).toEqual([seeded.x!, seeded.b, seeded.c, canonical])
-    expect(store.getState().getActiveTab(WT)?.id).toBe(seeded.b)
-  })
-
-  it.each([false, true])(
-    'selects a source-free History conversation across workspaces and preserves newer navigation: paired=%s',
-    (paired) => {
-      const seeded = seed(paired)
-      store.setState({ activeWorktreeId: OTHER, activeTabId: null, activeTabType: 'terminal' })
-      const open = intent(seeded.group)
-      apply(frame([terminal(A), terminal(C), chat('codex', open)]), paired)
-      expect(store.getState().activeWorktreeId).toBe(WT)
-      expect(store.getState().activeTabType).toBe('agent-session')
-      expect(store.getState().getActiveTab(WT)?.entityId).toBe('codex-conversation')
-      const stale = intent(seeded.group)
-      store.setState({ activeWorktreeId: OTHER })
-      apply(frame([terminal(A), terminal(C), chat('claude', stale), chat('codex', open)]), paired)
-      expect(store.getState().activeWorktreeId).toBe(OTHER)
-      expect(store.getState().getActiveTab(WT)?.entityId).toBe('codex-conversation')
-    }
-  )
-
-  it.each(['publication-first', 'inventory-first'] as const)(
-    'keeps first terminal materialization placed across both ordinary arrival orders: %s',
-    (arrival) => {
-      const seeded = seed(false)
-      const open = intent(seeded.group, A)
-      const publish = () =>
-        publishAgentLaunchTab({
-          requestId: 'terminal-open',
-          worktreeId: WT,
-          tabId: DESTINATION,
-          leafId: LEAF,
-          launchAgent: 'codex',
-          viewMode: 'terminal',
-          viewer: 'focus-in-workspace',
-          openPlacement: open
-        })
-      const snapshot = frame([
-        { ...terminal(DESTINATION), openPlacement: open },
-        terminal(A),
-        terminal(C)
-      ])
-      const observed: string[][] = []
-      const stop = store.subscribe(() => {
-        const ids = order()
-        if (ids.includes(DESTINATION) || ids.includes(toWebTerminalSurfaceTabId(DESTINATION))) {
-          observed.push(ids)
-        }
-      })
-      if (arrival === 'publication-first') {
-        publish()
-        apply(snapshot, false)
-      } else {
-        apply(snapshot, false)
-        publish()
-      }
-      stop()
-      expect(observed.length).toBeGreaterThan(0)
-      for (const ids of observed) {
-        expect(
-          ids.findIndex((id) => id === DESTINATION || id === toWebTerminalSurfaceTabId(DESTINATION))
-        ).toBe(1)
-      }
-      expect(order()).toHaveLength(4)
-    }
-  )
-
-  it.each(['reused', 'closed', 'split'] as const)(
-    'retains exact source/sibling authority during placement: %s',
-    (change) => {
-      const seeded = seed(false)
-      const open = { ...intent(seeded.group, A), source: seeded.original }
-      if (change === 'reused') {
-        store.setState((state) => ({
-          tabsByWorktree: {
-            ...state.tabsByWorktree,
-            [WT]: state.tabsByWorktree[WT]!.map((row) =>
-              row.id === A ? { ...row, generation: 1 } : row
-            )
-          }
-        }))
-      } else if (change === 'closed') {
-        store.getState().closeTab(A)
-      } else {
-        store.getState().setTabLayout(A, {
-          root: {
-            type: 'split',
-            direction: 'horizontal',
-            first: { type: 'leaf', leafId: LEAF },
-            second: { type: 'leaf', leafId: SIBLING }
-          },
-          activeLeafId: SIBLING,
-          expandedLeafId: null,
-          ptyIdsByLeafId: { [SIBLING]: 'sibling-pty' }
-        })
-      }
-      api.pty.kill.mockClear()
-      apply(frame([chat('claude', open)]), false)
-      const canonical = structuredAgentSessionTabId('claude-conversation')
-      if (change === 'split') {
-        expect(order()).toEqual([A, canonical, seeded.b, C])
-        retireTerminalPresentation(seeded.original)
-        expect(store.getState().terminalLayoutsByTabId[A]?.root).toEqual({
-          type: 'leaf',
-          leafId: SIBLING
-        })
-        expect(store.getState().terminalLayoutsByTabId[A]?.ptyIdsByLeafId).toEqual({
-          [SIBLING]: 'sibling-pty'
-        })
-        expect(order()).toEqual([A, canonical, seeded.b, C])
-      } else {
-        expect(order().at(-1)).toBe(canonical)
-      }
-      expect(api.pty.kill).not.toHaveBeenCalled()
-    }
-  )
-
-  it('preserves first canonical identity and ordered duplicate replacement candidates in ordinary adoption', () => {
-    store.setState({ activeWorktreeId: WT })
-    const first = store.getState().createUnifiedTab(WT, 'agent-session', {
-      id: 'old-first',
-      entityId: 'old-conversation',
-      agentSessionAgent: 'codex'
-    })
-    const second = store.getState().createUnifiedTab(WT, 'agent-session', {
-      id: 'old-second',
-      entityId: 'old-conversation',
-      agentSessionAgent: 'codex'
-    })
-    const canonical = store.getState().createUnifiedTab(WT, 'agent-session', {
-      id: 'canonical-first',
-      entityId: 'canonical-conversation',
-      agentSessionAgent: 'codex'
-    })
-    store.getState().createUnifiedTab(WT, 'agent-session', {
-      id: 'canonical-duplicate',
-      entityId: 'canonical-conversation',
-      agentSessionAgent: 'codex'
-    })
-    apply(
-      frame([
-        {
-          ...chat('codex'),
-          id: 'host-canonical',
-          sessionId: 'canonical-conversation',
-          replacesSessionId: 'old-conversation'
-        },
-        {
-          ...chat('claude'),
-          id: 'host-new-first',
-          sessionId: 'new-first',
-          replacesSessionId: 'old-conversation'
-        },
-        {
-          ...chat('codex'),
-          id: 'host-new-second',
-          sessionId: 'new-second',
-          replacesSessionId: 'old-conversation'
-        }
-      ]),
-      true
-    )
-    const rows = store.getState().unifiedTabsByWorktree[WT]!
-    expect(
-      rows.filter((row) => row.entityId === 'canonical-conversation').map((row) => row.id)
-    ).toEqual([canonical.id])
-    expect(rows.find((row) => row.entityId === 'new-first')).toMatchObject({
-      id: first.id,
-      groupId: first.groupId
-    })
-    expect(rows.find((row) => row.entityId === 'new-second')).toMatchObject({
-      id: second.id,
-      groupId: second.groupId
-    })
-    expect(new Set(rows.map((row) => row.id)).size).toBe(rows.length)
-  })
-
-  it.each([false, true])(
-    'bounds retained source-absent snapshot replay work at N/10N: paired=%s',
-    (paired) => {
-      const measure = (count: number) => {
-        store = createTestStore()
-        ref.store = store
-        resetLocalStructuredSessionVersionForTests()
-        resetWebSessionTabsSyncTestState()
-        store.setState({
-          activeWorktreeId: WT,
-          activeWorkspaceExecutionHostId: paired ? `runtime:${ENV}` : 'local',
-          worktreeNavHistory: Array.from({ length: 50 }, (_, i) => `history-${i}`),
-          worktreeNavHistoryIndex: 49
-        })
-        const sourceIds = Array.from({ length: count }, (_, i) => `retired-source-${i}`)
-        if (paired) {
-          apply(frame(sourceIds.map(terminal)), true)
-        } else {
-          for (const id of sourceIds) {
-            store.getState().createTab(WT, undefined, undefined, { id, initialLeafId: LEAF })
-          }
-        }
-        const group = store.getState().groupsByWorktree[WT]![0]!.id
-        const captured = sourceIds.map((id) =>
-          captureTerminalSurfaceIdentity(
-            store.getState(),
-            WT,
-            paired ? toWebTerminalSurfaceTabId(id) : id,
-            LEAF
-          )!
-        )
-        const viewerSelection = captureConversationSwitchViewerSelection(store.getState())
-        const destinations = sourceIds.map((sourceId, i) => ({
-          ...chat(i % 2 ? 'claude' : 'codex'),
-          id: `agent-session:retained-${i}`,
-          sessionId: `retained-${i}`,
-          openPlacement: {
-            ...intent(group, sourceId),
-            viewerSelection,
-            invocationId: `retained-${i}`,
-            generation: `generation-${i}`,
-            source: { ...captured[i]!, tabId: sourceId }
-          }
-        }))
-        apply(frame([...sourceIds.map(terminal), ...destinations]), paired)
-        if (paired) {
-          apply(frame(destinations), true)
-        } else {
-          for (const original of captured) {
-            retireTerminalPresentation(original)
-          }
-        }
-        expect(store.getState().tabsByWorktree[WT]).toHaveLength(0)
-        const before = store.getState()
-        const beforeOrder = order()
-        const beforeActiveId = before.getActiveTab(WT)?.id
-        let tabReads = 0
-        let historyReads = 0
-        store.setState({
-          unifiedTabsByWorktree: {
-            ...before.unifiedTabsByWorktree,
-            [WT]: before.unifiedTabsByWorktree[WT]!.map(
-              (row) =>
-                new Proxy(row, {
-                  get: (target, key, receiver) => {
-                    if (key === 'id' || key === 'entityId' || key === 'contentType') {
-                      tabReads++
-                    }
-                    // oxlint-disable-next-line anti-slop/no-reflect-get -- Proxy `get` trap: only Reflect.get forwards a raw string|symbol key with the proxy receiver.
-                    return Reflect.get(target, key, receiver)
-                  }
-                })
-            )
-          },
-          worktreeNavHistory: new Proxy(before.worktreeNavHistory, {
-            get: (target, key, receiver) => {
-              if (typeof key === 'string' && /^\d+$/.test(key)) {
-                historyReads++
-              }
-              // oxlint-disable-next-line anti-slop/no-reflect-get -- Proxy `get` trap: only Reflect.get forwards a raw string|symbol key with the proxy receiver.
-              return Reflect.get(target, key, receiver)
-            }
-          })
-        })
-        const mappings = vi.spyOn(hostSessionTabIdByLocalKey, 'get')
-        try {
-          apply(frame(destinations), paired)
-          const mappingReads = mappings.mock.calls.length
-          const membershipReads = tabReads
-          expect(order()).toEqual(beforeOrder)
-          expect(store.getState().getActiveTab(WT)?.id).toBe(beforeActiveId)
-          expect(store.getState().activeWorktreeId).toBe(before.activeWorktreeId)
-          expect(order()).toHaveLength(count)
-          expect(historyReads).toBeGreaterThan(0)
-          expect(historyReads).toBeLessThanOrEqual(100)
-          expect(mappingReads).toBeLessThanOrEqual(30 * count + 300)
-          expect(membershipReads).toBeGreaterThan(0)
-          expect(membershipReads).toBeLessThanOrEqual(50 * count + 500)
-          return { count, mappingReads, membershipReads, historyReads }
-        } finally {
-          mappings.mockRestore()
-        }
-      }
-      const small = measure(10)
-      const large = measure(100)
-      expect(large.mappingReads).toBeLessThanOrEqual(12 * Math.max(1, small.mappingReads))
-      expect(large.membershipReads).toBeLessThanOrEqual(12 * small.membershipReads)
-      expect(large.historyReads).toBeLessThanOrEqual(2 * small.historyReads)
-      process.stdout.write(
-        `retained snapshot operation counts ${JSON.stringify({ paired, small, large })}\n`
-      )
-    }
-  )
-
-  it('retains the ordinary append and unsolicited-selection policy without placement metadata', () => {
-    const seeded = seed(false)
-    apply(frame([chat('claude')]), false)
-    expect(order()).toEqual([A, seeded.b, C, structuredAgentSessionTabId('claude-conversation')])
-    expect(store.getState().getActiveTab(WT)?.id).toBe(A)
-  })
-})
diff --git a/src/renderer/src/runtime/structured-agent-session-client.test.ts b/src/renderer/src/runtime/structured-agent-session-client.test.ts
index 57ecbd371141..adcde73f93f4 100644
--- a/src/renderer/src/runtime/structured-agent-session-client.test.ts
+++ b/src/renderer/src/runtime/structured-agent-session-client.test.ts
@@ -136,22 +136,6 @@ describe('callStructuredAgentSession timeouts', () => {
     mocks.call.mockResolvedValue({ origin: 'unknown' })
   })
 
-  it.each(['agentSession.switchToChat', 'agentSession.switchToTerminal'])(
-    'allows the complete host-owned %s while retaining the legacy transport call',
-    async (method) => {
-      for (const switchTarget of [{ kind: 'local' } as const, target]) {
-        const params = { sessionId: 'session-1', execution: { invocationId: 'switch-1' } }
-        await callStructuredAgentSession(switchTarget, method, params)
-        expect(mocks.call).toHaveBeenLastCalledWith(switchTarget, method, params, {
-          timeoutMs: 735_000
-        })
-        const legacyParams = { sessionId: 'session-1' }
-        await callStructuredAgentSession(switchTarget, method, legacyParams)
-        expect(mocks.call).toHaveBeenLastCalledWith(switchTarget, method, legacyParams)
-      }
-    }
-  )
-
   // A waiting read lasts as long as the host's listing, which outlasts the default 15 s.
   it('gives a model catalog read longer than the slowest host listing', async () => {
     const params = { agent: 'claude', sessionId: 'session-1', waitForListing: true }
diff --git a/src/renderer/src/runtime/web-runtime-session-snapshot.ts b/src/renderer/src/runtime/web-runtime-session-snapshot.ts
index cae80cb6df86..c0684f70cc98 100644
--- a/src/renderer/src/runtime/web-runtime-session-snapshot.ts
+++ b/src/renderer/src/runtime/web-runtime-session-snapshot.ts
@@ -157,7 +157,7 @@ export async function refreshWebRuntimeSessionTabsSnapshot(
       ? decideWebSessionTabsSnapshot(recovered, environmentId)
       : WEB_SESSION_TABS_FRAME_OUTRANKED
     const settleMirror = applyWebSessionTabsStorePatch(
-      (state, changedAgentPaneKeys) => {
+      (state, changedAgentPaneKeys, offerOpenSelection) => {
         // Eager refresh can outlive workspace switches; update tabs without taking focus.
         const patch = decision.apply
           ? applyWebSessionTabsSnapshot(
@@ -165,7 +165,7 @@ export async function refreshWebRuntimeSessionTabsSnapshot(
               recovered,
               environmentId,
               undefined,
-              undefined,
+              { offerOpenSelection },
               changedAgentPaneKeys
             )
           : state
diff --git a/src/renderer/src/runtime/web-runtime-session-terminal-workspace-routing.test.ts b/src/renderer/src/runtime/web-runtime-session-terminal-workspace-routing.test.ts
index bb117d54b4e8..b3033b1e56f3 100644
--- a/src/renderer/src/runtime/web-runtime-session-terminal-workspace-routing.test.ts
+++ b/src/renderer/src/runtime/web-runtime-session-terminal-workspace-routing.test.ts
@@ -1,12 +1,4 @@
-import { applyWebSessionTabsSnapshot } from './web-session-tabs-sync/snapshot-api'
 import { resetWebSessionTabsSnapshotFreshnessForTests } from './web-session-tabs-sync/tracking-lifecycle'
-import { createTestStore } from '../store/slices/store-test-helpers'
-import {
-  captureConversationSwitchViewerSelection,
-  conversationSwitchViewerSelectionCurrent
-} from '../lib/conversation-switch-selection'
-import { structuredAgentSessionTabId } from '../../../shared/structured-agent-session-projection'
-import { toWebTerminalSurfaceTabId } from '../../../shared/terminal-surface-id'
 import type * as SnapshotApi from './web-session-tabs-sync/snapshot-api'
 import type * as StorePatch from './web-session-tabs-sync/store-patch'
 import type * as TrackingMappings from './web-session-tabs-sync/tracking-mappings'
@@ -340,132 +332,4 @@ describe('web-runtime-session terminal workspace routing', () => {
     expect(selection.activeWorktreeId).toBe('repo::/other')
     expect(selection.activeWorkspaceExecutionHostId).toBe('local')
   })
-  it.each(['unchanged', 'create-navigation', 'list-navigation'] as const)(
-    'strict paired ordinary create/list/placement respects original caller selection: %s',
-    async (action) => {
-      mocks.realStore = true
-      const store = createTestStore()
-      mocks.getState.mockImplementation(store.getState)
-      mocks.setState.mockImplementation(store.setState)
-      mocks.subscribe.mockImplementation(store.subscribe)
-      store.setState({
-        activeWorktreeId: WORKTREE_ID,
-        activeWorkspaceExecutionHostId: RUNTIME_EXECUTION_HOST_ID
-      })
-      const sourceId = structuredAgentSessionTabId('codex_source')
-      const otherId = structuredAgentSessionTabId('codex_D')
-      const destId = toWebTerminalSurfaceTabId('host-destination')
-      const leaf = '11111111-1111-4111-8111-111111111111'
-      const source = {
-        type: 'agent-session' as const,
-        id: 'agent-session:codex_source',
-        sessionId: 'codex_source',
-        agent: 'codex' as const,
-        title: 'Source',
-        isActive: true
-      }
-      const other = {
-        type: 'agent-session' as const,
-        id: 'agent-session:codex_D',
-        sessionId: 'codex_D',
-        agent: 'codex' as const,
-        title: 'D',
-        isActive: false
-      }
-      const destination = {
-        type: 'terminal' as const,
-        id: `host-destination::${leaf}`,
-        parentTabId: 'host-destination',
-        leafId: leaf,
-        terminal: 'destination-process',
-        title: 'Destination',
-        status: 'ready' as const,
-        isActive: false
-      }
-      const snapshot = (created: boolean) => ({
-        ...makeSnapshot(),
-        snapshotVersion: created ? 2 : 1,
-        activeTabId: source.id,
-        activeTabType: 'agent-session' as const,
-        tabs: created ? [source, destination, other] : [source, other],
-        tabGroups: [
-          {
-            id: 'group-1',
-            activeTabId: source.id,
-            tabOrder: created ? [source.id, 'host-destination', other.id] : [source.id, other.id]
-          }
-        ]
-      })
-      store.setState((state) => applyWebSessionTabsSnapshot(state, snapshot(false), ENVIRONMENT_ID))
-      store.getState().activateTab(sourceId)
-      const original = captureConversationSwitchViewerSelection()
-      const created = Promise.withResolvers<void>()
-      const listed = Promise.withResolvers<void>()
-      const runtimeCall = vi.fn(async (request: { method: string }) => {
-        if (request.method === 'session.tabs.createTerminal') {
-          await created.promise
-          return {
-            id: 'create',
-            ok: true,
-            result: { tab: { id: 'host-destination', leafId: leaf } }
-          }
-        }
-        if (request.method === 'session.tabs.list') {
-          await listed.promise
-          return { id: 'list', ok: true, result: snapshot(true) }
-        }
-        throw new Error(`Unexpected external method ${request.method}`)
-      })
-      stubRuntimeEnvironmentBridge({ call: runtimeCall })
-      const running = createWebRuntimeSessionTerminal(
-        {
-          worktreeId: WORKTREE_ID,
-          environmentId: ENVIRONMENT_ID,
-          agentSessionKind: 'resume',
-          launchAgent: 'codex',
-          resumeOrigin: 'switch',
-          command: 'codex resume saved',
-          providerSession: { key: 'session_id', id: 'saved' },
-          afterTabId: sourceId,
-          targetGroupId: 'group-1',
-          activate: true
-        },
-        {
-          notifyFailure: false,
-          canActivate: () => conversationSwitchViewerSelectionCurrent(original)
-        }
-      )
-      await vi.waitFor(() =>
-        expect(runtimeCall).toHaveBeenCalledWith(
-          expect.objectContaining({
-            method: 'session.tabs.createTerminal',
-            params: expect.objectContaining({
-              activate: false,
-              select: false,
-              navigation: 'caller'
-            })
-          })
-        )
-      )
-      if (action === 'create-navigation') {
-        store.getState().activateTab(otherId)
-      }
-      created.resolve()
-      await vi.waitFor(() =>
-        expect(runtimeCall).toHaveBeenCalledWith(
-          expect.objectContaining({ method: 'session.tabs.list' })
-        )
-      )
-      if (action === 'list-navigation') {
-        store.getState().activateTab(otherId)
-      }
-      listed.resolve()
-      expect(await running).toEqual({ status: 'created' })
-      expect(store.getState().getActiveTab(WORKTREE_ID)?.id).toBe(
-        action === 'unchanged' ? destId : otherId
-      )
-      expect(store.getState().getTab(destId)?.contentType).toBe('terminal')
-      expect(store.getState().getTab(sourceId)?.entityId).toBe('codex_source')
-    }
-  )
 })
diff --git a/src/renderer/src/runtime/web-runtime-terminal-create-operation.ts b/src/renderer/src/runtime/web-runtime-terminal-create-operation.ts
index 40fdda9de7f5..044cb3494c75 100644
--- a/src/renderer/src/runtime/web-runtime-terminal-create-operation.ts
+++ b/src/renderer/src/runtime/web-runtime-terminal-create-operation.ts
@@ -1,3 +1,4 @@
+import { presentAgentLaunchTab } from '@/lib/agent-launch-tab-presentation'
 import { createWebRuntimeAgentTerminalHostAuthority } from './web-runtime-agent-terminal-host-authority'
 import type { RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope'
 import type { RuntimeMobileSessionCreateTerminalResult } from '../../../shared/runtime-types'
@@ -18,7 +19,7 @@ import {
   recordWebSessionTerminalPlacement,
   webTerminalPlacementParentTabId
 } from './web-session-terminal-placement'
-import { toHostSessionTabId } from '../../../shared/terminal-surface-id'
+import { toHostSessionTabId, toWebTerminalSurfaceTabId } from '../../../shared/terminal-surface-id'
 import {
   captureRuntimeEnvironmentCall,
   captureWebSessionIntentOwner,
@@ -46,7 +47,8 @@ import { buildPlainCreateTerminalParams } from './web-runtime-plain-terminal-cre
 
 export async function createWebRuntimeSessionTerminalResult(
   args: CreateWebRuntimeSessionTerminalArgs,
-  canActivate?: () => boolean
+  canActivate?: () => boolean,
+  viewerSelection?: string
 ): Promise<CreatedWebRuntimeSessionTerminal> {
   const environmentId = resolveWebRuntimeSessionEnvironmentId(
     args.environmentId,
@@ -185,6 +187,7 @@ export async function createWebRuntimeSessionTerminalResult(
       })
     }
     if (
+      viewerSelection === undefined &&
       args.activate !== false &&
       canActivate?.() !== false &&
       createdTabId &&
@@ -220,11 +223,25 @@ export async function createWebRuntimeSessionTerminalResult(
           groupId: placementGroupId,
           afterTabId: args.afterTabId,
           captured,
-          activate: args.activate !== false,
+          activate: args.activate !== false && viewerSelection === undefined,
           canActivate
         }
       )
     }
+    if (
+      viewerSelection &&
+      createdTabId &&
+      args.activate !== false &&
+      matchesWebSessionIntentOwner(intentOwner)
+    ) {
+      presentAgentLaunchTab(
+        'focus-window',
+        args.worktreeId,
+        toWebTerminalSurfaceTabId(webTerminalPlacementParentTabId(createdTabId)),
+        createdLeafId,
+        viewerSelection
+      )
+    }
     return {
       outcome: { status: 'created' },
       ...(createdTabId ? { hostTabId: createdTabId } : {})
diff --git a/src/renderer/src/runtime/web-runtime-terminal-creation.ts b/src/renderer/src/runtime/web-runtime-terminal-creation.ts
index 2846e6fbe5f3..4c6d8afdd899 100644
--- a/src/renderer/src/runtime/web-runtime-terminal-creation.ts
+++ b/src/renderer/src/runtime/web-runtime-terminal-creation.ts
@@ -19,13 +19,22 @@ import type {
  */
 export async function createWebRuntimeSessionTerminal(
   args: CreateWebRuntimeSessionTerminalArgs,
-  options: { notifyFailure?: boolean; userAct?: boolean; canActivate?: () => boolean } = {}
+  options: {
+    notifyFailure?: boolean
+    userAct?: boolean
+    canActivate?: () => boolean
+    viewerSelection?: string
+  } = {}
 ): Promise<WebRuntimeTerminalCreateOutcome> {
   if (options.userAct && !(await startStoppedWslHostForUserAct(args.environmentId))) {
     // The start already told the user why; the host is still stopped.
     return { status: 'failed', message: stoppedWslHostMessage(args.environmentId) }
   }
-  const created = await createWebRuntimeSessionTerminalResult(args, options.canActivate)
+  const created = await createWebRuntimeSessionTerminalResult(
+    args,
+    options.canActivate,
+    options.viewerSelection
+  )
   if (
     created.hostFailed &&
     created.outcome.status === 'failed' &&
diff --git a/src/renderer/src/runtime/web-runtime-terminal-switch-placement.test.ts b/src/renderer/src/runtime/web-runtime-terminal-switch-placement.test.ts
index f6d2300c6e1d..d7b4ac678f43 100644
--- a/src/renderer/src/runtime/web-runtime-terminal-switch-placement.test.ts
+++ b/src/renderer/src/runtime/web-runtime-terminal-switch-placement.test.ts
@@ -1,13 +1,26 @@
-import { observeSessionTabPlacementWork } from '../../../shared/session-tab-placement-work.test-fixture'
 // @vitest-environment happy-dom
+import { agentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
+import {
+  beginViewerSelectionRequest,
+  disposeViewerSelection,
+  viewerSelectionOutcome
+} from '@/lib/viewer-selection-request'
+import { activateTabNumberShortcut } from '@/lib/tab-number-shortcuts'
+import { registerTerminalUiRoutingIpcBridge } from '@/hooks/ipc-events/terminal-ui-routing-ipc-bridge'
+import { applyWebSessionTabsStorePatch } from './web-session-tabs-sync/store-patch'
+import {
+  createWebSessionTabsSnapshotPatch,
+  applyWebSessionTabsSnapshot
+} from './web-session-tabs-sync/snapshot-api'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import { useAppStore } from '@/store'
+import { makeOpenFile } from '@/store/slices/store-session-test-harness'
 import type { RuntimeMobileSessionTabsResult } from '../../../shared/runtime-types'
 import { createGlobalSettingsFixture } from '../../../shared/global-settings-test-fixture'
 import { createWebRuntimeSessionTerminalResult } from './web-runtime-terminal-create-operation'
 import { refreshWebRuntimeSessionTabsSnapshot } from './web-runtime-session-snapshot'
-import { applyWebSessionTabsSnapshot } from './web-session-tabs-sync/snapshot-api'
 import { toWebTerminalSurfaceTabId } from '../../../shared/terminal-surface-id'
+import { makePaneKey } from '../../../shared/stable-pane-id'
 import { resetWebSessionTabsSnapshotFreshnessForTests } from './web-session-tabs-sync/tracking-lifecycle'
 
 const ENV = 'paired-placement',
@@ -20,8 +33,40 @@ const chat = (id: string) => ({
   title: id,
   isActive: false
 })
+type TerminalFocusCallback = Parameters<typeof window.api.ui.onFocusTerminal>[0]
+function routeTerminalFocus(data: Parameters<TerminalFocusCallback>[0]): void {
+  let focusTerminal: TerminalFocusCallback = () => {
+    throw new Error('Terminal focus listener was not registered')
+  }
+  const originalApi = window.api
+  Object.assign(window, {
+    api: {
+      ...originalApi,
+      ui: {
+        ...originalApi?.ui,
+        onSplitTerminal: () => () => {},
+        onRenameTerminal: () => () => {},
+        onSetPaneTitle: () => () => {},
+        onFocusEditorTab: () => () => {},
+        onFocusTerminal: (callback: TerminalFocusCallback) => {
+          focusTerminal = callback
+          return () => {}
+        }
+      }
+    }
+  })
+  const unsubs: (() => void)[] = []
+  try {
+    registerTerminalUiRoutingIpcBridge(unsubs)
+    focusTerminal(data)
+  } finally {
+    unsubs.forEach((unsubscribe) => unsubscribe())
+    Object.assign(window, { api: originalApi })
+  }
+}
+
 let frame: RuntimeMobileSessionTabsResult
-function resetFrame(n = 0) {
+function resetFrame() {
   resetWebSessionTabsSnapshotFreshnessForTests()
   useAppStore.setState(useAppStore.getInitialState(), true)
   useAppStore.setState({
@@ -32,9 +77,7 @@ function resetFrame(n = 0) {
       activeRuntimeEnvironmentId: ENV
     })
   })
-  const source = n
-    ? Array.from({ length: n }, (_, i) => (i === n / 2 ? 'C' : `old-${i}`))
-    : ['A', 'C', 'B']
+  const source = ['A', 'C', 'B']
   frame = {
     worktree: WT,
     publicationEpoch: 'host-placement',
@@ -56,19 +99,9 @@ function resetFrame(n = 0) {
 }
 beforeEach(() => resetFrame())
 afterEach(() => vi.restoreAllMocks())
-it.each([
-  { pinned: false, n: 0 },
-  { pinned: true, n: 0 },
-  { pinned: false, n: 32 },
-  { pinned: false, n: 320 }
-])(
-  'keeps client neighbors and pin partitions through early retirement and refresh (pinned: $pinned/$n)',
-  async ({ pinned, n }) => {
-    const current = Array.from({ length: n }, (_, i) => `current-${i}`)
-    if (n) {
-      resetFrame(n)
-    }
-    const work = observeSessionTabPlacementWork()
+it.each([{ pinned: false }, { pinned: true }])(
+  'keeps client neighbors and pin partitions through early retirement and refresh (pinned: $pinned)',
+  async ({ pinned }) => {
     if (pinned) {
       frame = {
         ...frame,
@@ -95,9 +128,7 @@ it.each([
           ...frame,
           snapshotVersion: frame.snapshotVersion + 1,
           tabs: [
-            ...(n
-              ? [...current, 'D'].map(chat)
-              : frame.tabs.filter((tab) => tab.id !== 'agent-session:C')),
+            ...frame.tabs.filter((tab) => tab.id !== 'agent-session:C'),
             {
               type: 'terminal',
               id: 'T::leaf',
@@ -114,9 +145,8 @@ it.each([
               id: 'L',
               activeTabId: 'T',
               tabOrder: [
-                ...(n
-                  ? current.map((id) => `agent-session:${id}`)
-                  : ['agent-session:A', 'agent-session:B']),
+                'agent-session:A',
+                'agent-session:B',
                 'T',
                 ...(pinned ? ['agent-session:U'] : [])
               ]
@@ -163,30 +193,206 @@ it.each([
     const order = () =>
       useAppStore.getState().groupsByWorktree[WT].find((group) => group.id === sourceGroup)!
         .tabOrder
-    const expected = n
-      ? [
-          ...current.slice(0, n / 2 + 1).map((id) => `structured-agent-session-${id}`),
-          toWebTerminalSurfaceTabId('T'),
-          ...current.slice(n / 2 + 1).map((id) => `structured-agent-session-${id}`),
-          'concurrent'
-        ]
-      : [
-          'structured-agent-session-A',
-          ...(pinned ? ['structured-agent-session-B'] : []),
-          toWebTerminalSurfaceTabId('T'),
-          ...(pinned ? ['structured-agent-session-U'] : ['structured-agent-session-B']),
-          'concurrent'
-        ]
+    const expected = [
+      'structured-agent-session-A',
+      ...(pinned ? ['structured-agent-session-B'] : []),
+      toWebTerminalSurfaceTabId('T'),
+      ...(pinned ? ['structured-agent-session-U'] : ['structured-agent-session-B']),
+      'concurrent'
+    ]
     expect(order()).toEqual(expected)
     expect(useAppStore.getState().activeGroupIdByWorktree[WT]).toBe(sourceGroup)
-    if (n) {
-      console.info('PAIRED_PLACEMENT_WORK', JSON.stringify({ n, samples: work.samples }))
-      expect(work.samples.length).toBeGreaterThan(0)
-      for (const sample of work.samples) {
-        expect(sample.reads + sample.adds + sample.has).toBeLessThanOrEqual(12 * n + 32)
-      }
-    }
     await refreshWebRuntimeSessionTabsSnapshot(ENV, WT, { acceptCurrentSnapshot: true })
     expect(order()).toEqual(expected)
   }
 )
+
+it.each([
+  {
+    owner: 'local-structured-session',
+    direction: 'chat',
+    inventoryFirst: false,
+    navigation: 'notification'
+  },
+  {
+    owner: 'local-structured-session',
+    direction: 'terminal',
+    inventoryFirst: true,
+    navigation: 'shortcut'
+  },
+  { owner: ENV, direction: 'chat', inventoryFirst: true, navigation: 'shortcut' },
+  { owner: ENV, direction: 'terminal', inventoryFirst: false, navigation: 'shortcut' }
+] as const)(
+  'consumes the original viewer choice once at the real $owner $direction snapshot writer ($navigation)',
+  async ({ owner, direction, inventoryFirst, navigation }) => {
+    const worktreeId = navigation === 'notification' ? 'folder:folder-1' : WT
+    for (const navigate of [false, true]) {
+      disposeViewerSelection()
+      useAppStore.setState(useAppStore.getInitialState(), true)
+      useAppStore.setState({ activeWorktreeId: worktreeId, activeView: 'terminal' })
+      const leafId = '10000000-0000-4000-8000-000000000001'
+      const terminal = (id: string) => ({
+        type: 'terminal' as const,
+        id: `${id}::${leafId}`,
+        parentTabId: id,
+        leafId,
+        title: id,
+        terminal: `term_${id}`,
+        isActive: false,
+        status: 'ready' as const
+      })
+      const source = direction === 'chat' ? terminal('A') : chat('A')
+      let snapshot: RuntimeMobileSessionTabsResult = {
+        worktree: worktreeId,
+        publicationEpoch: 'selection',
+        snapshotVersion: 1,
+        activeGroupId: 'G',
+        activeTabId: source.id,
+        tabs: [source, terminal('B'), terminal('C')],
+        tabGroups: [
+          {
+            id: 'G',
+            activeTabId: source.id,
+            tabOrder: [source.type === 'terminal' ? 'A' : source.id, 'B', 'C']
+          }
+        ]
+      }
+      const apply = () =>
+        applyWebSessionTabsStorePatch(createWebSessionTabsSnapshotPatch(snapshot, owner), {
+          frames: []
+        })()
+      apply()
+      const initial = useAppStore.getState()
+      const sourceTab = initial.unifiedTabsByWorktree[worktreeId].find(
+        (tab) => tab.entityId === (direction === 'chat' ? toWebTerminalSurfaceTabId('A') : 'A')
+      )!
+      const siblings = ['B', 'C'].map((id) =>
+        initial.unifiedTabsByWorktree[worktreeId].find(
+          (tab) => tab.entityId === toWebTerminalSurfaceTabId(id)
+        )!
+      )
+      const groupId = sourceTab.groupId
+      useAppStore.setState({
+        openFiles: [makeOpenFile({ id: '/repo/client-only', worktreeId })]
+      })
+      initial.createUnifiedTab(worktreeId, 'editor', {
+        id: 'X',
+        entityId: '/repo/client-only',
+        targetGroupId: groupId,
+        afterTabId: sourceTab.id,
+        activate: false
+      })
+      const deadline = agentSessionSwitchDeadline(Date.now)
+      try {
+        const selection = beginViewerSelectionRequest('snapshot-choice', deadline)
+        selection.accept()
+        const openPlacement = {
+          invocationId: 'snapshot-choice',
+          generation: 'snapshot-generation',
+          placement: { groupId, afterTabId: sourceTab.id, index: 0 },
+          activate: true,
+          viewerSelection: selection.token
+        }
+        // Natural disappearance and ordinary fallback are not navigation.
+        snapshot = {
+          ...snapshot,
+          snapshotVersion: 2,
+          tabs: snapshot.tabs.slice(1),
+          tabGroups: [{ id: 'G', activeTabId: 'C', tabOrder: ['B', 'C'] }]
+        }
+        apply()
+        if (navigation === 'notification') {
+          routeTerminalFocus({
+            tabId: toWebTerminalSurfaceTabId('C'),
+            worktreeId,
+            leafId,
+            ...(navigate
+              ? {
+                  ackPaneKeyOnSuccess: makePaneKey(toWebTerminalSurfaceTabId('C'), leafId),
+                  flashFocusedPane: true,
+                  scrollToBottomIfOutputSinceLastView: true
+                }
+              : {})
+          })
+          await new Promise<void>((resolve) =>
+            requestAnimationFrame(() => requestAnimationFrame(() => resolve()))
+          )
+          expect(useAppStore.getState().activeWorktreeId).toBe(worktreeId)
+          expect(useAppStore.getState().activeTabIdByWorktree[worktreeId]).toBe(
+            toWebTerminalSurfaceTabId('C')
+          )
+        } else if (navigate) {
+          // A real shortcut/re-click, including ABA, must supersede the captured gesture.
+          expect(activateTabNumberShortcut(2)).toBe(true)
+          expect(activateTabNumberShortcut(1)).toBe(true)
+          expect(activateTabNumberShortcut(2)).toBe(true)
+        }
+        const userChoice = useAppStore.getState().activeTabIdByWorktree[worktreeId]
+        const destination = direction === 'chat' ? chat('canonical-D') : terminal('D')
+        snapshot = {
+          ...snapshot,
+          snapshotVersion: 3,
+          tabs: [destination, ...snapshot.tabs],
+          tabGroups: [
+            {
+              id: 'G',
+              activeTabId: 'C',
+              tabOrder: [destination.type === 'terminal' ? 'D' : destination.id, 'B', 'C']
+            }
+          ]
+        }
+        if (inventoryFirst) {
+          snapshot = {
+            ...snapshot,
+            tabs: snapshot.tabs.map((row) =>
+              row.id === destination.id
+                ? { ...row, openPlacement: { ...openPlacement, activate: false } }
+                : row
+            )
+          }
+          apply()
+        }
+        if (navigation !== 'notification' || !navigate) {
+          expect(viewerSelectionOutcome(selection.token)).toBe(navigate ? 'superseded' : 'pending')
+        }
+        snapshot = {
+          ...snapshot,
+          snapshotVersion: 4,
+          tabs: snapshot.tabs.map((row) =>
+            row.id === destination.id ? { ...row, openPlacement } : row
+          )
+        }
+        apply()
+        const after = useAppStore.getState()
+        const landed = after.unifiedTabsByWorktree[worktreeId].find(
+          (row) =>
+            row.entityId === (direction === 'chat' ? 'canonical-D' : toWebTerminalSurfaceTabId('D'))
+        )!
+        expect(landed).toBeDefined()
+        const group = after.groupsByWorktree[worktreeId].find((row) => row.id === groupId)!
+        expect(group.tabOrder).toEqual([landed.id, 'X', ...siblings.map((row) => row.id)])
+        expect(group.activeTabId).toBe(navigate ? userChoice : landed.id)
+        expect(viewerSelectionOutcome(selection.token)).toBe(navigate ? 'superseded' : 'fulfilled')
+        expect(
+          after.unifiedTabsByWorktree[worktreeId].filter((row) => row.id === landed.id)
+        ).toHaveLength(1)
+        apply()
+        expect(
+          useAppStore.getState().groupsByWorktree[worktreeId].find((row) => row.id === groupId)!
+            .activeTabId
+        ).toBe(group.activeTabId)
+        // The same retained metadata is inventory after fulfilment, even after an ordinary repair.
+        expect(activateTabNumberShortcut(3)).toBe(true)
+        const later = useAppStore.getState().activeTabIdByWorktree[worktreeId]
+        apply()
+        expect(useAppStore.getState().activeTabIdByWorktree[worktreeId]).toBe(later)
+        expect(
+          useAppStore.getState().groupsByWorktree[worktreeId].find((row) => row.id === groupId)!
+            .tabOrder
+        ).toEqual(group.tabOrder)
+      } finally {
+        deadline.dispose()
+      }
+    }
+  }
+)
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/apply-snapshot.ts b/src/renderer/src/runtime/web-session-tabs-sync/apply-snapshot.ts
index 27d124635e6d..f3acaabf4f33 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/apply-snapshot.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/apply-snapshot.ts
@@ -79,9 +79,21 @@ export function applyWebSessionTabsSnapshotWithContext(
   const browserRecords = applyBrowserRecordUpdates(terminalRecords)
   const worktreeRecords = applyWorktreeRecordUpdates(browserRecords)
   const activeState = applyActiveStateUpdates(worktreeRecords)
+  const patch = buildWebSessionTabsFinalPatch(activeState)
+  options?.offerOpenSelection?.((current, membership) =>
+    applySnapshotOpenSelection(
+      current,
+      membership,
+      worktreeId,
+      environmentId,
+      base.openPlacements,
+      unified.hostToLocalTabId,
+      true
+    )
+  )
   return applySnapshotOpenSelection(
     state,
-    buildWebSessionTabsFinalPatch(activeState),
+    patch,
     worktreeId,
     environmentId,
     base.openPlacements,
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/global-session-inventory-event.ts b/src/renderer/src/runtime/web-session-tabs-sync/global-session-inventory-event.ts
index ad7eca835864..3ccc2cd55f1b 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/global-session-inventory-event.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/global-session-inventory-event.ts
@@ -131,13 +131,14 @@ export function handleGlobalSessionInventoryEvent({
         decisions[index]!.apply ? [snapshot] : []
       )
       settleHydration = applyWebSessionTabsStorePatch(
-        (state, changedAgentPaneKeys) =>
+        (state, changedAgentPaneKeys, offerOpenSelection) =>
           applyWebSessionTabsSnapshots(
             state,
             freshSnapshots,
             environmentId,
             undefined,
-            changedAgentPaneKeys
+            changedAgentPaneKeys,
+            { offerOpenSelection }
           ),
         {
           frames: applicable.map(({ snapshot }, index) => ({
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/load-initial.ts b/src/renderer/src/runtime/web-session-tabs-sync/load-initial.ts
index 1bbcd81f03bc..8c5cec1ccf44 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/load-initial.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/load-initial.ts
@@ -128,13 +128,14 @@ export function loadInitialWebSessionTabs({
         (latestReceivedSessionTabsInventoryFrameByEnvironment.get(environmentId) ?? 0) <=
           requestReceivedFrame
       settleHydration = applyWebSessionTabsStorePatch(
-        (state, changedAgentPaneKeys) =>
+        (state, changedAgentPaneKeys, offerOpenSelection) =>
           applyWebSessionTabsSnapshots(
             state,
             freshSnapshots,
             environmentId,
             undefined,
-            changedAgentPaneKeys
+            changedAgentPaneKeys,
+            { offerOpenSelection }
           ),
         {
           frames: applicable.map((snapshot, index) => ({
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/open-placement-read.ts b/src/renderer/src/runtime/web-session-tabs-sync/open-placement-read.ts
index 8e6ea631bd9b..126ec13de170 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/open-placement-read.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/open-placement-read.ts
@@ -5,7 +5,7 @@ import {
   isRetainedTerminalSurfaceIdentity
 } from '../../../../shared/terminal-tab-close'
 import { toWebTerminalSurfaceTabId } from '../../../../shared/terminal-surface-id'
-import { captureConversationSwitchViewerSelection } from '../../lib/conversation-switch-selection'
+import { conversationSwitchViewerSelectionCurrent } from '../../lib/conversation-switch-selection'
 import { isWebSessionCloseIntentPending } from '../web-session-close-intent'
 import { LOCAL_STRUCTURED_SESSION_OWNER } from '../local-structured-session-owner'
 import { getRemoteRuntimePtyOwner } from '../runtime-terminal-stream'
@@ -69,18 +69,12 @@ export function createOpenPlacementRead(
       (tabIds.has(hostId) ? hostId : tabIds.has(mirroredId) ? mirroredId : hostId)
     )
   }
-  let viewerSelection: string | undefined
   return {
     localTabId,
     hasTab: (id: string) => tabIds.has(id),
     hasEntity: (kind: string, id: string) => entityIds.get(kind)?.has(id) === true,
-    viewerSelectionCurrent: (original?: string): boolean => {
-      if (original === undefined) {
-        return true
-      }
-      viewerSelection ??= captureConversationSwitchViewerSelection(state)
-      return original === viewerSelection
-    },
+    viewerSelectionCurrent: (original?: string): boolean =>
+      conversationSwitchViewerSelectionCurrent(original, state),
     sourceCurrent: (intent: SessionTabOpenPlacement): boolean => {
       const source = intent.source
       if (!source) {
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/open-placement-selection.ts b/src/renderer/src/runtime/web-session-tabs-sync/open-placement-selection.ts
index ccb6a65c995d..6abc6e1ee6eb 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/open-placement-selection.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/open-placement-selection.ts
@@ -1,3 +1,5 @@
+import { isSessionTabSelectionRequest } from '../../../../shared/session-tab-placement'
+import { commitViewerSelection } from '@/lib/viewer-selection-request'
 import { isFloatingWorkspaceId } from '../../../../shared/floating-workspace-worktree'
 import { isWorkspaceKey, worktreeWorkspaceKey } from '../../../../shared/workspace-scope'
 import { appendHistoryEntry } from '../../store/slices/worktree-nav-history'
@@ -15,15 +17,49 @@ export function applySnapshotOpenSelection(
   worktreeId: string,
   environmentId: string,
   placements: readonly SnapshotOpenPlacement[],
-  hostToLocalTabId: ReadonlyMap<string, string>
+  hostToLocalTabId: ReadonlyMap<string, string>,
+  consume = false,
+  onSelection?: (patch: Partial<WebSessionTabsSyncState>) => void
 ): WebSessionTabsSyncState | Partial<WebSessionTabsSyncState> {
-  const requested = placements.find((entry) => entry.activate)
+  const requested =
+    placements.find(
+      (entry) => entry.activate && isSessionTabSelectionRequest(entry.intent.viewerSelection)
+    ) ?? placements.find((entry) => entry.activate)
   if (!requested) {
     return patch
   }
+  const localId = hostToLocalTabId.get(requested.hostTabId)
+  return localId
+    ? applyOpenDestinationSelection(
+        state,
+        patch,
+        worktreeId,
+        environmentId,
+        localId,
+        requested.intent.viewerSelection,
+        consume,
+        onSelection
+      )
+    : patch
+}
+
+export function applyOpenDestinationSelection(
+  state: WebSessionTabsSyncState,
+  patch: Partial<WebSessionTabsSyncState>,
+  worktreeId: string,
+  environmentId: string,
+  tabId: string,
+  token: string | undefined,
+  consume: boolean,
+  onSelection?: (patch: Partial<WebSessionTabsSyncState>) => void
+): Partial<WebSessionTabsSyncState> {
+  if (token && isSessionTabSelectionRequest(token) && !consume) {
+    return patch
+  }
   const next = { ...state, ...patch }
-  const localId = requested && hostToLocalTabId.get(requested.hostTabId)
-  const tab = localId && next.unifiedTabsByWorktree[worktreeId]?.find((row) => row.id === localId)
+  const tab = next.unifiedTabsByWorktree[worktreeId]?.find(
+    (row) => row.id === tabId || row.entityId === tabId
+  )
   if (
     !tab ||
     !next.groupsByWorktree[worktreeId]?.some((group) => group.tabOrder.includes(tab.id))
@@ -35,8 +71,7 @@ export function applySnapshotOpenSelection(
   const surface = deriveActiveSurfaceForWorktree(activated, worktreeId, tab.groupId, {
     preferredTabId: tab.id
   })
-  return {
-    ...patch,
+  const selectionPatch = {
     ...activation,
     ...snapshotOpenSelectionRecords(next, worktreeId, surface),
     ...(isFloatingWorkspaceId(worktreeId)
@@ -63,4 +98,11 @@ export function applySnapshotOpenSelection(
           activeView: 'terminal' as const
         })
   }
+  if (token && isSessionTabSelectionRequest(token)) {
+    return consume && commitViewerSelection(token, { worktreeId, tabId: tab.id }, () => true)
+      ? (onSelection?.(selectionPatch), { ...patch, ...selectionPatch })
+      : patch
+  }
+  onSelection?.(selectionPatch)
+  return { ...patch, ...selectionPatch }
 }
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/snapshot-api.ts b/src/renderer/src/runtime/web-session-tabs-sync/snapshot-api.ts
index 7e549997c665..5477d915d281 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/snapshot-api.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/snapshot-api.ts
@@ -1,5 +1,6 @@
 import type { RuntimeMobileSessionTabsResult } from '../../../../shared/runtime-types'
 import type {
+  SnapshotOpenSelectionOffer,
   WebSessionTabsBatchContext,
   WebSessionTabsSnapshotApplyOptions,
   WebSessionTabsSyncState
@@ -43,8 +44,19 @@ export function createWebSessionTabsSnapshotPatch(
   snapshot: RuntimeMobileSessionTabsResult,
   environmentId: string
 ) {
-  return (state: WebSessionTabsSyncState, keys: Set<string>) =>
-    applyWebSessionTabsSnapshot(state, snapshot, environmentId, undefined, undefined, keys)
+  return (
+    state: WebSessionTabsSyncState,
+    keys: Set<string>,
+    offerOpenSelection?: (offer: SnapshotOpenSelectionOffer) => void
+  ) =>
+    applyWebSessionTabsSnapshot(
+      state,
+      snapshot,
+      environmentId,
+      undefined,
+      { offerOpenSelection },
+      keys
+    )
 }
 
 export function applyWebSessionTabsSnapshots(
@@ -135,7 +147,8 @@ export function decideWebSessionTabsSnapshotOperations(
 export function applyWebSessionTabsSnapshotOperations(
   state: WebSessionTabsSyncState,
   operations: readonly DecidedWebSessionTabsSnapshotOperation[],
-  changedAgentPaneKeys?: Set<string>
+  changedAgentPaneKeys?: Set<string>,
+  options?: WebSessionTabsSnapshotApplyOptions
 ): WebSessionTabsSyncState | Partial<WebSessionTabsSyncState> {
   let nextState = state
   let mergedPatch: Partial<WebSessionTabsSyncState> = {}
@@ -148,7 +161,7 @@ export function applyWebSessionTabsSnapshotOperations(
       snapshot,
       environmentId,
       undefined,
-      undefined,
+      options,
       changedAgentPaneKeys
     )
     if (patch === nextState) {
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/state.ts b/src/renderer/src/runtime/web-session-tabs-sync/state.ts
index 569283a910a9..f5f35e2c3845 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/state.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/state.ts
@@ -60,7 +60,13 @@ export type SessionTabsRuntimeHistory = RetiredValueHistory
 /** Bounded retired-epoch history prevents sibling streams’ delayed frames rolling back accepted replacements after restart. */
 export type SessionTabsPublicationEpochHistory = RetiredValueHistory
 
+export type SnapshotOpenSelectionOffer = (
+  state: WebSessionTabsSyncState,
+  patch: Partial<WebSessionTabsSyncState>
+) => Partial<WebSessionTabsSyncState>
+
 export type WebSessionTabsSnapshotApplyOptions = {
+  offerOpenSelection?: (offer: SnapshotOpenSelectionOffer) => void
   contentScope?: 'all' | 'agent-session'
   preserveLocalLayout?: boolean
   terminalPtyMode?: 'local' | 'remote'
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/store-patch.ts b/src/renderer/src/runtime/web-session-tabs-sync/store-patch.ts
index 520ec3657b59..ff9840710026 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/store-patch.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/store-patch.ts
@@ -1,3 +1,6 @@
+import { applyOpenDestinationSelection } from './open-placement-selection'
+import { runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/worktree-runtime-owner'
+import { LOCAL_STRUCTURED_SESSION_OWNER } from '../local-structured-session-owner'
 import {
   observeSwitchProjections,
   protectSwitchProjections
@@ -24,6 +27,7 @@ import { agentStatusEntryEqual } from './state-equality-core'
 import {
   HOST_WORKING_CLIENT_BOUNDARY_LIMIT,
   hostWorkingClientBoundaryByPaneKey,
+  type SnapshotOpenSelectionOffer,
   type WebSessionTabsSyncState
 } from './state'
 import { reportVisibleTabPickToHost } from '../web-session-visible-tab-pick-report'
@@ -47,11 +51,44 @@ export function snapshotOpenSelectionRecords(
   }
 }
 
+/** The ordinary snapshot selection writer also handles an addressed publication/focus offer. */
+export function selectSessionTabForViewer(
+  worktreeId: string,
+  tabId: string,
+  viewerSelection: string,
+  environmentId = runtimeEnvironmentIdOrLocalUnlessTwin(useAppStore.getState(), worktreeId) ??
+    LOCAL_STRUCTURED_SESSION_OWNER
+): boolean {
+  let selected = false
+  applyWebSessionTabsStorePatch(
+    (_state, _keys, offer) => {
+      offer((state, patch) =>
+        applyOpenDestinationSelection(
+          state,
+          patch,
+          worktreeId,
+          environmentId,
+          tabId,
+          viewerSelection,
+          true,
+          () => {
+            selected = true
+          }
+        )
+      )
+      return {}
+    },
+    { frames: [] }
+  )()
+  return selected
+}
+
 /** Commit a reconciliation patch and return a receipt for its host evidence. */
 export function applyWebSessionTabsStorePatch(
   buildPatch: (
     state: AppState,
-    changedAgentPaneKeys: Set<string>
+    changedAgentPaneKeys: Set<string>,
+    offerOpenSelection: (offer: SnapshotOpenSelectionOffer) => void
   ) => WebSessionTabsSyncState | Partial<WebSessionTabsSyncState>,
   hostMirrorVerdict: HostSessionMirrorPatchVerdict,
   agentStatusSnapshots?: RuntimeMobileSessionTabsResult | readonly RuntimeMobileSessionTabsResult[],
@@ -83,7 +120,11 @@ export function applyWebSessionTabsStorePatch(
       : []) {
       observeSwitchProjections(state, snapshot, () => {})
     }
-    const patch = protectSwitchProjections(state, buildPatch(state, changedAgentPaneKeys))
+    const offers: SnapshotOpenSelectionOffer[] = []
+    let patch = protectSwitchProjections(
+      state,
+      buildPatch(state, changedAgentPaneKeys, (offer) => offers.push(offer))
+    )
     mirroredAgentStatusChanged = patch !== state && Object.hasOwn(patch, 'agentStatusByPaneKey')
     if (agentStatusSnapshots) {
       const nextAgentStatuses = patch.agentStatusByPaneKey ?? state.agentStatusByPaneKey
@@ -206,6 +247,9 @@ export function applyWebSessionTabsStorePatch(
         }
       }
     }
+    for (const offer of offers) {
+      patch = offer(state, patch)
+    }
     patchCommitted = true
     return patch
   }
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/visibility-resume-repair.ts b/src/renderer/src/runtime/web-session-tabs-sync/visibility-resume-repair.ts
index 7bb5eafb9baa..b95128cb92d5 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/visibility-resume-repair.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/visibility-resume-repair.ts
@@ -15,8 +15,10 @@ export function applyVisibilityResumeRepairs(
   }
   const decided = decideWebSessionTabsSnapshotOperations(operations)
   const settle = applyWebSessionTabsStorePatch(
-    (state, changedAgentPaneKeys) =>
-      applyWebSessionTabsSnapshotOperations(state, decided, changedAgentPaneKeys),
+    (state, changedAgentPaneKeys, offerOpenSelection) =>
+      applyWebSessionTabsSnapshotOperations(state, decided, changedAgentPaneKeys, {
+        offerOpenSelection
+      }),
     {
       frames: decided.map(({ environmentId, snapshot, decision }) => ({
         environmentId,
diff --git a/src/renderer/src/runtime/workspace-layout-frame-open-selection.ts b/src/renderer/src/runtime/workspace-layout-frame-open-selection.ts
index 21dcac8729ee..7207861bbdb9 100644
--- a/src/renderer/src/runtime/workspace-layout-frame-open-selection.ts
+++ b/src/renderer/src/runtime/workspace-layout-frame-open-selection.ts
@@ -13,7 +13,9 @@ export function frameOpenSelectionPatch(
   patch: Partial<AppState>,
   cache: WorkspaceLayoutCache,
   keys: readonly string[],
-  target: RuntimeClientTarget
+  target: RuntimeClientTarget,
+  consume = false,
+  onSelection?: (patch: Partial<AppState>) => void
 ): Partial<AppState> {
   const owner =
     target.kind === 'environment' ? target.environmentId : LOCAL_STRUCTURED_SESSION_OWNER
@@ -30,7 +32,9 @@ export function frameOpenSelectionPatch(
       key,
       owner,
       placements,
-      new Map(layout.tabs.map((tab) => [tab.id, tab.id]))
+      new Map(layout.tabs.map((tab) => [tab.id, tab.id])),
+      consume,
+      onSelection
     )
   }
   return next
diff --git a/src/renderer/src/runtime/workspace-layout-frame-pending.ts b/src/renderer/src/runtime/workspace-layout-frame-pending.ts
index 2d706b24a7f9..b6b8f93a78ee 100644
--- a/src/renderer/src/runtime/workspace-layout-frame-pending.ts
+++ b/src/renderer/src/runtime/workspace-layout-frame-pending.ts
@@ -2,7 +2,10 @@
 
 import type { WorkspaceLayoutCache } from '@/store/workspace-layout-cache'
 import { stableJson } from '../../../shared/workspace-layout/workspace-layout-load-report'
-import type { WorkspaceLayoutRecordsFrame } from '../../../shared/workspace-layout/workspace-layout-stream-frames'
+import type {
+  WorkspaceLayoutChangeFrame,
+  WorkspaceLayoutRecordsFrame
+} from '../../../shared/workspace-layout/workspace-layout-stream-frames'
 import type {
   PublishedPane,
   PublishedTab,
@@ -123,3 +126,27 @@ export function notePendingRecordsFrame(
     }
   }
 }
+
+/** A stream snapshot/whole workspace redraws; records accumulate against their prior cache. */
+export function noteReceivedLayoutFrame(
+  pending: Map<string, PendingWorkspaceChanges>,
+  shown: Set<string>,
+  before: WorkspaceLayoutCache,
+  after: WorkspaceLayoutCache,
+  frame: WorkspaceLayoutChangeFrame,
+  snapshotReceived: boolean
+): void {
+  switch (frame.type) {
+    case 'snapshot':
+      if (snapshotReceived) {
+        shown.clear()
+      }
+      return
+    case 'workspace':
+    case 'removed':
+      shown.delete(frame.key)
+      return
+    case 'records':
+      notePendingRecordsFrame(pending, shown, before, after, frame)
+  }
+}
diff --git a/src/renderer/src/runtime/workspace-layout-frame-startup.ts b/src/renderer/src/runtime/workspace-layout-frame-startup.ts
new file mode 100644
index 000000000000..1658e6edf7e4
--- /dev/null
+++ b/src/renderer/src/runtime/workspace-layout-frame-startup.ts
@@ -0,0 +1,18 @@
+import { useAppStore } from '@/store'
+import {
+  openWorkspaceLayoutFrameSync,
+  type WorkspaceLayoutFrameSync
+} from './workspace-layout-frame-sync'
+import { provideLayoutFrameTerminalPanes } from './layout-frame-terminal-panes'
+
+let startupFrames: WorkspaceLayoutFrameSync | null = null
+
+/** After restore: the window's one layout stream shows the frames' workspaces from now on. */
+export function showStartupLayoutFrames(): void {
+  // Kept for the document's life: a local stream ends only with main, and a re-run boot reuses it.
+  if (!startupFrames) {
+    startupFrames = openWorkspaceLayoutFrameSync(useAppStore)
+    provideLayoutFrameTerminalPanes(startupFrames)
+  }
+  startupFrames.start()
+}
diff --git a/src/renderer/src/runtime/workspace-layout-frame-sync.test.ts b/src/renderer/src/runtime/workspace-layout-frame-sync.test.ts
index b56c53c4bbdd..99af4fadcfd8 100644
--- a/src/renderer/src/runtime/workspace-layout-frame-sync.test.ts
+++ b/src/renderer/src/runtime/workspace-layout-frame-sync.test.ts
@@ -1,4 +1,15 @@
-import { captureConversationSwitchViewerSelection } from '@/lib/conversation-switch-selection'
+import {
+  beginViewerSelectionRequest,
+  disposeViewerSelection,
+  viewerSelectionOutcome
+} from '@/lib/viewer-selection-request'
+import { agentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
+import {
+  captureSwitchProjection,
+  retireSwitchProjection,
+  disposeSwitchProjections
+} from '@/lib/conversation-switch-projection'
+import { noteUserWorkspaceSwitch } from '@/lib/workspace-switch-user-act'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type * as AgentStatusModule from '@/lib/agent-status'
 import type { ExecutionHostId } from '../../../shared/execution-host'
@@ -11,6 +22,8 @@ import {
 } from '../../../shared/workspace-layout/workspace-layout-profile.test-fixture'
 import type { WorkspaceLayoutChangeFrame } from '../../../shared/workspace-layout/workspace-layout-stream-frames'
 import {
+  addWorkspace,
+  leaf,
   emptySession,
   GIT_KEY
 } from '../../../shared/workspace-layout/workspace-layout-session.test-fixture'
@@ -120,6 +133,8 @@ beforeEach(() => {
   check = installLayoutFrameApplyCheck()
 })
 afterEach(() => {
+  disposeViewerSelection()
+  disposeSwitchProjections()
   endLayoutFramePositions()
   check.uninstall()
   expect(check.failures).toEqual([])
@@ -142,168 +157,6 @@ describe('the window drawn from layout frames', () => {
     sync.close()
   })
 
-  it.each(['unchanged', 'navigate', 'unheld'] as const)(
-    'selects explicit native opens only after ordinary frame membership: %s',
-    async (action) => {
-      const { store, sync, layouts, frames } = await bootWithFrames('local', localDesktopSession())
-      sync.start()
-      await flushMicrotasks()
-      const before = store.getState()
-      const viewerSelection = captureConversationSwitchViewerSelection(before)
-      const destination = structuredClone(layouts[GIT_KEY]!)
-      const destinationKey = action === 'unheld' ? 'repo::history-other-workspace' : GIT_KEY
-      destination.worktreeId = destinationKey
-      if (action === 'unheld') {
-        destination.tabs = []
-        destination.groups = [{ id: 'history-destination-root', tabIds: [] }]
-        destination.groupLayout = { type: 'leaf', groupId: 'history-destination-root' }
-        destination.editorFiles = []
-        destination.browserTabs = []
-      }
-      const group = destination.groups[0]!
-      const tabId = 'native-frame-destination'
-      destination.tabs.push({
-        id: tabId,
-        kind: 'agent-session',
-        entityId: 'canonical-native-frame',
-        executionHostId: 'local',
-        createdAt: 123,
-        customTitle: null,
-        color: null,
-        agentSessionAgent: 'codex',
-        openPlacement: {
-          invocationId: 'frame-open',
-          generation: 'frame-generation',
-          placement: { groupId: group.id, index: 0 },
-          activate: true,
-          viewerSelection
-        }
-      })
-      group.tabIds.unshift(tabId)
-      // Main already placed it; the frame consumer must draw that order without inserting again.
-      if (action === 'navigate') {
-        store.setState({ activeWorktreeId: 'repo::newer-selection' })
-      }
-      stream.onFrame!(frames.records(destinationKey, destination))
-      await flushMicrotasks()
-      expect(
-        store.getState().unifiedTabsByWorktree[destinationKey]?.filter((tab) => tab.id === tabId)
-      ).toHaveLength(1)
-      expect(
-        store.getState().groupsByWorktree[destinationKey]?.find((entry) => entry.id === group.id)
-          ?.tabOrder
-      ).toEqual(group.tabIds)
-      if (action !== 'navigate') {
-        expect(store.getState().activeWorktreeId).toBe(destinationKey)
-        expect(store.getState().getActiveTab(destinationKey)?.id).toBe(tabId)
-        expect(store.getState().activeTabType).toBe('agent-session')
-      } else {
-        expect(store.getState().activeWorktreeId).toBe('repo::newer-selection')
-      }
-      sync.close()
-    }
-  )
-
-  it('bounds retained unheld metadata work during another workspace frame at N/10N', async () => {
-    const measure = async (count: number) => {
-      const { store, sync, layouts, frames } = await bootWithFrames('local', localDesktopSession())
-      sync.start()
-      await flushMicrotasks()
-      store.setState({
-        worktreeNavHistory: Array.from({ length: 50 }, (_, i) => `history-${i}`),
-        worktreeNavHistoryIndex: 49
-      })
-      const viewerSelection = captureConversationSwitchViewerSelection(store.getState())
-      const key = 'retained::unheld-workspace'
-      let carriers = 0
-      let historyReads = 0
-      const tabs: PublishedTab[] = Array.from({ length: count }, (_, i) => {
-        const openPlacement = {
-          invocationId: `retained-${i}`,
-          generation: `generation-${i}`,
-          placement: { groupId: 'retained-group', index: i },
-          activate: true,
-          viewerSelection,
-          source: {
-            worktreeId: key,
-            tabId: `naturally-retired-${i}`,
-            leafId: 'source-leaf',
-            createdAt: 123,
-            generation: 0,
-            hasLeaf: true,
-            ptyId: null,
-            incarnationId: null
-          }
-        }
-        return {
-          id: `retained-${i}`,
-          kind: 'agent-session',
-          entityId: `retained-${i}`,
-          executionHostId: 'local',
-          createdAt: 123,
-          customTitle: null,
-          color: null,
-          agentSessionAgent: i % 2 ? 'claude' : 'codex',
-          get openPlacement() {
-            carriers++
-            return openPlacement
-          }
-        }
-      })
-      // A different viewer already navigated: these host destinations remain readable inventory only.
-      store.setState({ activeWorktreeId: GIT_KEY, activeView: 'tasks' })
-      stream.onFrame!(
-        frames.records(key, {
-          worktreeId: key,
-          tabs,
-          groups: [{ id: 'retained-group', tabIds: tabs.map((tab) => tab.id) }],
-          groupLayout: { type: 'leaf', groupId: 'retained-group' },
-          editorFiles: [],
-          browserTabs: []
-        })
-      )
-      await flushMicrotasks()
-      const before = store.getState()
-      store.setState({
-        worktreeNavHistory: new Proxy(before.worktreeNavHistory, {
-          get: (target, property, receiver) => {
-            if (typeof property === 'string' && /^\d+$/.test(property)) {
-              historyReads++
-            }
-            // oxlint-disable-next-line anti-slop/no-reflect-get -- Proxy `get` trap: only Reflect.get forwards a raw string|symbol key with the proxy receiver.
-            return Reflect.get(target, property, receiver)
-          }
-        })
-      })
-      carriers = 0
-      try {
-        const renamed = structuredClone(layouts[GIT_KEY]!)
-        renamed.tabs.find((tab) => tab.id === 'tab-shell')!.customTitle = 'another-workspace-update'
-        stream.onFrame!(frames.records(GIT_KEY, renamed))
-        await flushMicrotasks()
-        expect(store.getState().unifiedTabsByWorktree[key]).toBeUndefined()
-        expect(store.getState().activeWorktreeId).toBe(GIT_KEY)
-        expect(store.getState().activeView).toBe('tasks')
-        expect(
-          store.getState().tabsByWorktree[GIT_KEY]!.find((tab) => tab.id === 'tab-shell')
-            ?.customTitle
-        ).toBe('another-workspace-update')
-        expect(carriers).toBeGreaterThanOrEqual(count)
-        expect(carriers).toBeLessThanOrEqual(4 * count)
-        expect(historyReads).toBeGreaterThan(0)
-        expect(historyReads).toBeLessThanOrEqual(100)
-        return { count, carriers, historyReads }
-      } finally {
-        sync.close()
-      }
-    }
-    const small = await measure(10)
-    const large = await measure(100)
-    expect(large.carriers).toBeLessThanOrEqual(12 * small.carriers)
-    expect(large.historyReads).toBeLessThanOrEqual(2 * small.historyReads)
-    process.stdout.write(`unrelated frame operation counts ${JSON.stringify({ small, large })}\n`)
-  })
-
   it('shows a structure change main publishes, keeping what only the window knows', async () => {
     const session = localDesktopSession()
     const { store, sync, layouts, frames } = await bootWithFrames('local', session)
@@ -596,3 +449,89 @@ describe('the window drawn from layout frames', () => {
     sync.close()
   })
 })
+
+it.each([false, true])(
+  'selects once after natural retirement and a real coalesced frame; later re-click=%s',
+  async (navigate) => {
+    const session = addWorkspace(emptySession(), GIT_KEY, [
+      {
+        id: 'G',
+        activeTabId: 'A',
+        recent: ['C'],
+        tabs: [
+          {
+            id: 'A',
+            entityId: 'canonical-A',
+            kind: 'agent-session',
+            entry: { agentSessionAgent: 'codex' }
+          },
+          { id: 'B', leaves: [[leaf(1), 'pty-B']] },
+          { id: 'C', leaves: [[leaf(2), 'pty-C']] }
+        ]
+      }
+    ])
+    const { store, sync, layouts, frames } = await bootWithFrames('local', session)
+    const deadline = agentSessionSwitchDeadline(Date.now)
+    sync.start()
+    await flushMicrotasks()
+    try {
+      const request = beginViewerSelectionRequest('frame-switch', deadline)
+      request.accept()
+      const proposal = {
+        invocationId: 'frame-switch',
+        generation: 'generation',
+        sessionId: 'canonical-A',
+        tabId: 'A',
+        phase: 'prepare' as const
+      }
+      captureSwitchProjection(store.getState(), GIT_KEY, proposal, () => {})
+      const retired = retireSwitchProjection(store.getState(), { ...proposal, phase: 'retire' })
+      expect(retired).not.toBeNull()
+      store.setState(retired!)
+      const siblingTree = store.getState().terminalLayoutsByTabId.B
+      const fallback = store.getState().groupsByWorktree[GIT_KEY][0].activeTabId
+      expect(fallback).toBe('C')
+      if (navigate) {
+        // The ordinary explicit tab ingress counts even a re-click at the automatic fallback.
+        noteUserWorkspaceSwitch(GIT_KEY)
+        store.getState().activateTab('C', { worktreeId: GIT_KEY })
+      }
+      const destination = structuredClone(layouts[GIT_KEY]!)
+      destination.tabs = destination.tabs.filter((tab) => tab.id !== 'A')
+      const published: PublishedTab = {
+        id: 'D',
+        entityId: 'D',
+        kind: 'terminal',
+        createdAt: 123,
+        customTitle: null,
+        color: null,
+        executionHostId: 'local',
+        terminal: {
+          root: { type: 'leaf', leafId: leaf(3) },
+          panes: [{ leafId: leaf(3), ptyId: 'pty-D' }]
+        },
+        openPlacement: {
+          invocationId: 'frame-switch',
+          generation: 'generation',
+          placement: { groupId: 'G', index: 0 },
+          activate: true,
+          viewerSelection: request.token
+        }
+      }
+      destination.tabs.unshift(published)
+      destination.groups[0].tabIds = ['D', 'B', 'C']
+      stream.onFrame!(frames.records(GIT_KEY, destination))
+      await flushMicrotasks()
+      expect(store.getState().groupsByWorktree[GIT_KEY][0].tabOrder).toEqual(['D', 'B', 'C'])
+      expect(store.getState().groupsByWorktree[GIT_KEY][0].activeTabId).toBe(navigate ? 'C' : 'D')
+      expect(store.getState().terminalLayoutsByTabId.B).toEqual(siblingTree)
+      expect(viewerSelectionOutcome(request.token)).toBe(navigate ? 'superseded' : 'fulfilled')
+      stream.onFrame!(frames.snapshot({ [GIT_KEY]: destination }))
+      await flushMicrotasks()
+      expect(store.getState().groupsByWorktree[GIT_KEY][0].activeTabId).toBe(navigate ? 'C' : 'D')
+    } finally {
+      deadline.dispose()
+      sync.close()
+    }
+  }
+)
diff --git a/src/renderer/src/runtime/workspace-layout-frame-sync.ts b/src/renderer/src/runtime/workspace-layout-frame-sync.ts
index 5a5112f92a02..0270a02518c0 100644
--- a/src/renderer/src/runtime/workspace-layout-frame-sync.ts
+++ b/src/renderer/src/runtime/workspace-layout-frame-sync.ts
@@ -2,7 +2,6 @@
 
 import { frameOpenSelectionPatch } from './workspace-layout-frame-open-selection'
 import { showFramePatch, withMovedTabsSelected } from '@/store/slices/tabs/moved-tab-selection'
-import { useAppStore } from '@/store'
 import type { AppState } from '@/store/types'
 import type { TerminalTab } from '../../../shared/terminal-tab-types'
 import { applyLayoutFrame, EMPTY_WORKSPACE_LAYOUT_CACHE } from '@/store/workspace-layout-cache'
@@ -26,15 +25,12 @@ import { heldTabGroupFocus } from './held-tab-group-follow'
 import { shownContentRekeyPatch } from './layout-owner-content-rekeys'
 import { provideLayoutFrameWorkspaces } from './layout-frame-workspaces'
 import {
-  notePendingRecordsFrame,
+  noteReceivedLayoutFrame,
   pendingWorkspaceChanges,
   type PendingWorkspaceChanges
 } from './workspace-layout-frame-pending'
 import { layoutFrameApplyObserver } from './workspace-layout-frame-apply-observer'
-import {
-  provideLayoutFrameTerminalPanes,
-  type LayoutFrameTerminalQueries
-} from './layout-frame-terminal-panes'
+import type { LayoutFrameTerminalQueries } from './layout-frame-terminal-panes'
 import {
   isTabPaneTreeHeld,
   onTabPaneTreeRedraw,
@@ -89,28 +85,10 @@ export function openWorkspaceLayoutFrameSync(
   /** The moved tabs' selections this flush's writes took. */
   let selectionsTaken: MovedTabSelection[] = []
   const show = (
-    patch: LayoutFrameBuildPatch | ((current: AppState) => LayoutFrameBuildPatch)
+    patch: LayoutFrameBuildPatch | ((current: AppState) => LayoutFrameBuildPatch),
+    select?: (current: AppState, accepted: Partial<AppState>) => Partial<AppState>
   ): void => {
-    selectionsTaken.push(...showFramePatch(store, patch))
-  }
-
-  // Each change against the cache's copy it applies to, before the frame replaces it.
-  const noteFrame = (before: WorkspaceLayoutCache, frame: WorkspaceLayoutChangeFrame): void => {
-    switch (frame.type) {
-      case 'snapshot':
-        // A reopened stream's snapshot redraws every workspace: the window drew alone meanwhile.
-        if (snapshotReceived) {
-          shown.clear()
-        }
-        return
-      case 'workspace':
-      case 'removed':
-        // An older host's whole workspace: only a full build shows it.
-        shown.delete(frame.key)
-        return
-      case 'records':
-        notePendingRecordsFrame(pending, shown, before, cache, frame)
-    }
+    selectionsTaken.push(...showFramePatch(store, patch, select))
   }
 
   // Pane trees show at once; only a tab the window's own pane command holds waits.
@@ -159,13 +137,18 @@ export function openWorkspaceLayoutFrameSync(
       ...rekeyed,
       ...layoutFrameFlushPatch(base, cache, { fullBuilt, workspaceBuilt, rebound }, holds)
     }
-    show((current) =>
+    let openSelectionTaken: Partial<AppState> = {}
+    show(membership, (current, accepted) =>
       frameOpenSelectionPatch(
         current,
-        membership,
+        accepted,
         cache,
         [...fullBuilt, ...workspaceBuilt],
-        source.target
+        source.target,
+        true,
+        (selection) => {
+          openSelectionTaken = { ...openSelectionTaken, ...selection }
+        }
       )
     )
     if (titleUpdates.length > 0) {
@@ -201,7 +184,7 @@ export function openWorkspaceLayoutFrameSync(
         const moved = withMovedTabsSelected(built, selectionsTaken)
         return {
           ...moved,
-          ...frameOpenSelectionPatch(state, moved, cache, builtKeys, source.target)
+          ...openSelectionTaken
         }
       }
     })
@@ -229,7 +212,7 @@ export function openWorkspaceLayoutFrameSync(
   const receive = (frame: WorkspaceLayoutChangeFrame): void => {
     const before = cache
     cache = applyLayoutFrame(cache, frame)
-    noteFrame(before, frame)
+    noteReceivedLayoutFrame(pending, shown, before, cache, frame, snapshotReceived)
     if (frame.type === 'snapshot') {
       snapshotReceived = true
       live = started
@@ -313,14 +296,4 @@ const FRAME_BUILD_HOLDS: Omit<LayoutFrameBuildHolds, 'newRowFields'> = {
   held: { isTabHeld: isDrawnTabHeld, isGroupLayoutHeld: isDrawnGroupLayoutHeld }
 }
 
-let startupFrames: WorkspaceLayoutFrameSync | null = null
-
-/** After restore: the window's one layout stream shows the frames' workspaces from now on. */
-export function showStartupLayoutFrames(): void {
-  // Kept for the document's life: a local stream ends only with main, and a re-run boot reuses it.
-  if (!startupFrames) {
-    startupFrames = openWorkspaceLayoutFrameSync(useAppStore)
-    provideLayoutFrameTerminalPanes(startupFrames)
-  }
-  startupFrames.start()
-}
+export { showStartupLayoutFrames } from './workspace-layout-frame-startup'
diff --git a/src/renderer/src/store/slices/browser/browser-tab-actions.ts b/src/renderer/src/store/slices/browser/browser-tab-actions.ts
index cd18f753229b..09a9f052997e 100644
--- a/src/renderer/src/store/slices/browser/browser-tab-actions.ts
+++ b/src/renderer/src/store/slices/browser/browser-tab-actions.ts
@@ -1,3 +1,4 @@
+import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { createBrowserUuid } from '@/lib/browser-uuid'
 import { translate } from '@/i18n/i18n'
 import type { BrowserSlice, BrowserSliceGet, BrowserSliceSet } from './browser-slice-contract'
@@ -176,6 +177,7 @@ export function createBrowserTabActions(
     },
 
     openNewBrowserTabInActiveWorkspace: async (groupId) => {
+      noteViewerNavigation()
       const state = get()
       // Why: the invoking group owns its workspace; global selection may already point elsewhere.
       const worktreeId =
diff --git a/src/renderer/src/store/slices/editor/actions/markdown-preview-actions.ts b/src/renderer/src/store/slices/editor/actions/markdown-preview-actions.ts
index 2b576c451ba8..18214fb916df 100644
--- a/src/renderer/src/store/slices/editor/actions/markdown-preview-actions.ts
+++ b/src/renderer/src/store/slices/editor/actions/markdown-preview-actions.ts
@@ -1,3 +1,4 @@
+import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import type { EditorGet, EditorSet } from '../types/editor-set-get'
 import type { EditorSlice } from '../types/editor-slice'
 import { createUntitledMarkdownFileWithTemplateSelection } from '@/lib/create-untitled-markdown'
@@ -45,6 +46,7 @@ export function createMarkdownPreviewActions(
 > {
   return {
     openNewMarkdownInActiveWorkspace: async (groupId) => {
+      noteViewerNavigation()
       const created = await createUntitledFileInActiveWorkspace(
         get,
         groupId,
diff --git a/src/renderer/src/store/slices/settings.ts b/src/renderer/src/store/slices/settings.ts
index 70e33babea43..55979754568f 100644
--- a/src/renderer/src/store/slices/settings.ts
+++ b/src/renderer/src/store/slices/settings.ts
@@ -1,3 +1,4 @@
+import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { normalizeNativeChatAppearanceSettings } from '../../../../shared/native-chat/native-chat-appearance-settings'
 import type { StateCreator } from 'zustand'
 import type { AppState } from '../types'
@@ -241,6 +242,7 @@ export const createSettingsSlice: StateCreator<AppState, [], [], SettingsSlice>
   },
 
   setActiveRuntimeEnvironmentPreference: async (environmentId) => {
+    noteViewerNavigation()
     const nextId = normalizeRuntimeEnvironmentId(environmentId)
     const previousId = normalizeRuntimeEnvironmentId(get().settings?.activeRuntimeEnvironmentId)
     if (previousId === nextId) {
diff --git a/src/renderer/src/store/slices/tabs/moved-tab-selection.ts b/src/renderer/src/store/slices/tabs/moved-tab-selection.ts
index 92a5bb1c1d8c..2714dd6d9b59 100644
--- a/src/renderer/src/store/slices/tabs/moved-tab-selection.ts
+++ b/src/renderer/src/store/slices/tabs/moved-tab-selection.ts
@@ -89,7 +89,8 @@ export function showFramePatch(
     getState: () => AppState
     setState: (patch: Partial<AppState> | ((state: AppState) => Partial<AppState>)) => void
   },
-  patch: Partial<AppState> | ((current: AppState) => Partial<AppState>)
+  patch: Partial<AppState> | ((current: AppState) => Partial<AppState>),
+  select?: (current: AppState, accepted: Partial<AppState>) => Partial<AppState>
 ): MovedTabSelection[] {
   if (typeof patch !== 'function' && Object.keys(patch).length === 0) {
     return []
@@ -101,7 +102,8 @@ export function showFramePatch(
       typeof patch === 'function' ? patch(current) : patch
     )
     taken = shown.taken
-    const next = protectSwitchProjections(current, shown.patch)
+    const protectedPatch = protectSwitchProjections(current, shown.patch)
+    const next = select ? select(current, protectedPatch) : protectedPatch
     return Object.keys(next).length === 0 ? current : next
   })
   return taken
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 57611166d12c..b07fbe64aa26 100644
--- a/src/renderer/src/store/slices/tabs/tabs-close-actions.ts
+++ b/src/renderer/src/store/slices/tabs/tabs-close-actions.ts
@@ -1,3 +1,4 @@
+import { endViewerSelectionForDestination } from '@/lib/viewer-selection-request'
 import { retireStructuredAgentSessionReadOwner } from '@/components/native-chat/structured-agent-session-read-owner-registry'
 import type { TabsSlice, TabsSliceGet, TabsSliceSet } from './tabs-slice-contract'
 import { collapseGroupLayout } from '../../../../../shared/workspace-layout/tab-group-layout-tree'
@@ -45,6 +46,7 @@ export function createTabsCloseActions(
         return null
       }
       const { tab, worktreeId } = found
+      endViewerSelectionForDestination(worktreeId, tab.id)
       forgetDesktopCreatedServerTab(tab.id)
       forgetDesktopCreatedServerTab(tab.entityId)
       const group = findGroupForTab(state.groupsByWorktree, worktreeId, tab.groupId)
diff --git a/src/renderer/src/store/slices/ui/ui-slice-settings-actions.ts b/src/renderer/src/store/slices/ui/ui-slice-settings-actions.ts
index 81de3888e343..a868c057d6e4 100644
--- a/src/renderer/src/store/slices/ui/ui-slice-settings-actions.ts
+++ b/src/renderer/src/store/slices/ui/ui-slice-settings-actions.ts
@@ -1,9 +1,11 @@
+import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import type { UISlice, UISliceGet, UISliceSet } from './ui-slice-contract'
 import { isSettingsNavigationTarget } from '../../../lib/settings-navigation-types'
 
 export function createUiSettingsActions(set: UISliceSet, get: UISliceGet): Partial<UISlice> {
   return {
     openSettingsPage: () => {
+      noteViewerNavigation()
       // Why: settings search is a transient filter; opening Settings shouldn't inherit hidden sections from last visit.
       get().setSettingsSearchQuery('')
       set((state) => ({
@@ -13,12 +15,13 @@ export function createUiSettingsActions(set: UISliceSet, get: UISliceGet): Parti
           state.activeView === 'settings' ? state.previousViewBeforeSettings : state.activeView
       }))
     },
-    closeSettingsPage: () =>
-      set((state) => {
-        return { activeView: state.previousViewBeforeSettings }
-      }),
+    closeSettingsPage: () => {
+      noteViewerNavigation()
+      set((state) => ({ activeView: state.previousViewBeforeSettings }))
+    },
     settingsNavigationTarget: null,
     openSettingsTarget: (target) => {
+      noteViewerNavigation()
       if (!isSettingsNavigationTarget(target)) {
         if (import.meta.env.DEV) {
           throw new TypeError('openSettingsTarget received an invalid navigation target')
diff --git a/src/renderer/src/store/slices/ui/ui-slice-task-actions.ts b/src/renderer/src/store/slices/ui/ui-slice-task-actions.ts
index 6faa5283c335..c527bbd104b6 100644
--- a/src/renderer/src/store/slices/ui/ui-slice-task-actions.ts
+++ b/src/renderer/src/store/slices/ui/ui-slice-task-actions.ts
@@ -1,3 +1,4 @@
+import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import type { UISlice, UISliceGet, UISliceSet } from './ui-slice-contract'
 import { findPrevLiveNonTaskStackHistoryIndex } from '../worktree-nav-history'
 import { hasFeatureInteraction } from '../../../../../shared/feature-interactions'
@@ -32,6 +33,7 @@ export function createUiTaskActions(set: UISliceSet, get: UISliceGet): Partial<U
     githubTaskDrawerWorkItem: null,
     newWorkspaceDraft: null,
     openTaskPage: (data = {}, options = {}) => {
+      noteViewerNavigation()
       if (options.recordTasksInteraction !== false) {
         const wasTasksPreviouslyInteracted = hasFeatureInteraction(
           get().featureInteractions,
diff --git a/src/renderer/src/store/slices/ui/ui-slice-view-actions.ts b/src/renderer/src/store/slices/ui/ui-slice-view-actions.ts
index ccece2d27c83..897f4969333b 100644
--- a/src/renderer/src/store/slices/ui/ui-slice-view-actions.ts
+++ b/src/renderer/src/store/slices/ui/ui-slice-view-actions.ts
@@ -1,25 +1,30 @@
+import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import type { UISlice, UISliceGet, UISliceSet } from './ui-slice-contract'
 import { rewindHistoryIndexPastView } from '../worktree-nav-history'
 
 export function createUiViewActions(set: UISliceSet, get: UISliceGet): Partial<UISlice> {
   return {
     openActivityPage: () => {
+      noteViewerNavigation()
       set((state) => ({
         activeView: 'activity',
         previousViewBeforeActivity:
           state.activeView === 'activity' ? state.previousViewBeforeActivity : state.activeView
       }))
     },
-    closeActivityPage: () =>
-      set((state) => ({
+    closeActivityPage: () => {
+      noteViewerNavigation()
+      return set((state) => ({
         activeView: state.previousViewBeforeActivity
-      })),
+      }))
+    },
     selectedAutomationId: null,
     setSelectedAutomationId: (id) => set({ selectedAutomationId: id }),
     pendingAutomationRunNavigation: null,
     setPendingAutomationRunNavigation: (navigation) =>
       set({ pendingAutomationRunNavigation: navigation }),
     openAutomationsPage: () => {
+      noteViewerNavigation()
       get().recordViewVisit('automations')
       set((state) => ({
         activeView: 'automations',
@@ -29,12 +34,15 @@ export function createUiViewActions(set: UISliceSet, get: UISliceGet): Partial<U
             : state.activeView
       }))
     },
-    closeAutomationsPage: () =>
-      set((state) => ({
+    closeAutomationsPage: () => {
+      noteViewerNavigation()
+      return set((state) => ({
         activeView: state.previousViewBeforeAutomations,
         worktreeNavHistoryIndex: rewindHistoryIndexPastView(state, 'automations')
-      })),
+      }))
+    },
     openSpacePage: () => {
+      noteViewerNavigation()
       get().recordFeatureInteraction?.('workspace-cleanup')
       if (typeof window !== 'undefined' && window.api?.workspaceSpace?.openWindow) {
         void window.api.workspaceSpace.openWindow()
@@ -46,11 +54,14 @@ export function createUiViewActions(set: UISliceSet, get: UISliceGet): Partial<U
           state.activeView === 'space' ? state.previousViewBeforeSpace : state.activeView
       }))
     },
-    closeSpacePage: () =>
-      set((state) => ({
+    closeSpacePage: () => {
+      noteViewerNavigation()
+      return set((state) => ({
         activeView: state.previousViewBeforeSpace
-      })),
+      }))
+    },
     openSkillsPage: () => {
+      noteViewerNavigation()
       get().recordViewVisit('skills')
       set((state) => ({
         activeView: 'skills',
@@ -58,12 +69,15 @@ export function createUiViewActions(set: UISliceSet, get: UISliceGet): Partial<U
           state.activeView === 'skills' ? state.previousViewBeforeSkills : state.activeView
       }))
     },
-    closeSkillsPage: () =>
-      set((state) => ({
+    closeSkillsPage: () => {
+      noteViewerNavigation()
+      return set((state) => ({
         activeView: state.previousViewBeforeSkills,
         worktreeNavHistoryIndex: rewindHistoryIndexPastView(state, 'skills')
-      })),
+      }))
+    },
     openSkillShare: (shareId) => {
+      noteViewerNavigation()
       get().recordViewVisit('skills')
       set((state) => ({
         activeView: 'skills',
@@ -74,6 +88,7 @@ export function createUiViewActions(set: UISliceSet, get: UISliceGet): Partial<U
     },
     clearPendingSkillShare: () => set({ pendingSkillShareId: null }),
     openSkillsSharedLinks: () => {
+      noteViewerNavigation()
       get().recordViewVisit('skills')
       set((state) => ({
         activeView: 'skills',
@@ -84,6 +99,7 @@ export function createUiViewActions(set: UISliceSet, get: UISliceGet): Partial<U
     },
     clearPendingSkillsSharedView: () => set({ pendingSkillsSharedView: false }),
     openArtifactsPage: () => {
+      noteViewerNavigation()
       get().recordViewVisit('artifacts')
       set((state) => ({
         activeView: 'artifacts',
@@ -91,21 +107,27 @@ export function createUiViewActions(set: UISliceSet, get: UISliceGet): Partial<U
           state.activeView === 'artifacts' ? state.previousViewBeforeArtifacts : state.activeView
       }))
     },
-    closeArtifactsPage: () =>
-      set((state) => ({
+    closeArtifactsPage: () => {
+      noteViewerNavigation()
+      return set((state) => ({
         activeView: state.previousViewBeforeArtifacts,
         worktreeNavHistoryIndex: rewindHistoryIndexPastView(state, 'artifacts')
-      })),
-    openMobilePage: () =>
-      set((state) => ({
+      }))
+    },
+    openMobilePage: () => {
+      noteViewerNavigation()
+      return set((state) => ({
         activeView: 'mobile',
         previousViewBeforeMobile:
           state.activeView === 'mobile' ? state.previousViewBeforeMobile : state.activeView
-      })),
-    closeMobilePage: () =>
-      set((state) => ({
+      }))
+    },
+    closeMobilePage: () => {
+      noteViewerNavigation()
+      return set((state) => ({
         activeView: state.previousViewBeforeMobile
-      })),
+      }))
+    },
     setNewWorkspaceDraft: (draft) => set({ newWorkspaceDraft: draft }),
     clearNewWorkspaceDraft: () => set({ newWorkspaceDraft: null })
   }
diff --git a/src/renderer/src/store/slices/worktree-nav-history.ts b/src/renderer/src/store/slices/worktree-nav-history.ts
index bd6fa428ad3f..118f55de0b6e 100644
--- a/src/renderer/src/store/slices/worktree-nav-history.ts
+++ b/src/renderer/src/store/slices/worktree-nav-history.ts
@@ -1,3 +1,4 @@
+import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import type { StateCreator } from 'zustand'
 import type { AppState } from '../types'
 import { findWorktreeById } from './worktree-helpers'
@@ -271,6 +272,7 @@ function navigateToIndex(
   if (targetIndex === null) {
     return
   }
+  noteViewerNavigation()
   const targetEntry = state.worktreeNavHistory[targetIndex]
 
   // Why: capture-and-restore (not force false) so re-entrant navigation doesn't clobber the flag.
diff --git a/src/renderer/src/store/terminals/terminal-active-workspace-creation.ts b/src/renderer/src/store/terminals/terminal-active-workspace-creation.ts
index a3ce2cab5578..ba85d9daab54 100644
--- a/src/renderer/src/store/terminals/terminal-active-workspace-creation.ts
+++ b/src/renderer/src/store/terminals/terminal-active-workspace-creation.ts
@@ -1,3 +1,4 @@
+import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../shared/constants'
 import { parseWorkspaceKey } from '../../../../shared/workspace-scope'
 import { focusTerminalTabSurface } from '@/lib/focus-terminal-tab-surface'
@@ -12,6 +13,7 @@ export function createActiveWorkspaceTerminalActions(
 ): Pick<TerminalSlice, 'openNewTerminalTabInActiveWorkspace'> {
   return {
     openNewTerminalTabInActiveWorkspace: async (groupId) => {
+      noteViewerNavigation()
       const state = get()
       const worktreeId = state.activeWorktreeId
       if (!worktreeId) {
diff --git a/src/renderer/src/store/terminals/terminal-tab-close.ts b/src/renderer/src/store/terminals/terminal-tab-close.ts
index 6fd6977f8a6c..f5806c026d01 100644
--- a/src/renderer/src/store/terminals/terminal-tab-close.ts
+++ b/src/renderer/src/store/terminals/terminal-tab-close.ts
@@ -1,3 +1,4 @@
+import { endViewerSelectionForDestination } from '@/lib/viewer-selection-request'
 import type { TerminalTab } from '../../../../shared/terminal-tab-types'
 import { sweepRetiredTerminalTabState } from '../slices/retired-terminal-tab-state-sweep'
 import {
@@ -72,6 +73,7 @@ export function createTerminalTabCloseActions(
             const closing = before.find((t) => t.id === tabId)
             if (closing) {
               closingWorktreeId = wId
+              endViewerSelectionForDestination(wId, tabId)
               // User close cancels pending agent launch; every close settles its startup wait to prevent delivery into a vanished tab.
               if (closing.agentLaunchPane && !closing.agentLaunchPane.outcome) {
                 if (closeReason === 'user') {
diff --git a/src/renderer/src/store/workspace-layout-frame-store-patch.test.ts b/src/renderer/src/store/workspace-layout-frame-store-patch.test.ts
index dc6b2bbb7786..30481d9596eb 100644
--- a/src/renderer/src/store/workspace-layout-frame-store-patch.test.ts
+++ b/src/renderer/src/store/workspace-layout-frame-store-patch.test.ts
@@ -1,9 +1,4 @@
-import {
-  captureSwitchProjection,
-  disposeSwitchProjections
-} from '@/lib/conversation-switch-projection'
-import { showFramePatch } from './slices/tabs/moved-tab-selection'
-import { afterEach, describe, expect, it, vi } from 'vitest'
+import { describe, expect, it, vi } from 'vitest'
 import type * as AgentStatusModule from '@/lib/agent-status'
 import type { WorkspaceSessionState } from '../../../shared/workspace-session-state-types'
 import { loadWorkspaceLayoutWithoutReport } from '../../../shared/workspace-layout/workspace-layout-load'
@@ -213,108 +208,3 @@ describe('laying frame slices over the store', () => {
     expect(dropped.remoteBrowserPageHandlesByPageId).not.toHaveProperty(page.id)
   })
 })
-
-afterEach(() => disposeSwitchProjections())
-it('the real frame producer preserves a chat activated after an omission patch was prepared, including later frames', async () => {
-  const { state } = await restored()
-  const store = createTestStore()
-  const basis = state.unifiedTabsByWorktree[GIT_KEY]![0]!
-  const source = {
-    ...basis,
-    id: 'source-chat',
-    contentType: 'agent-session' as const,
-    entityId: 'conversation',
-    agent: 'codex' as const
-  }
-  const rows = [...state.unifiedTabsByWorktree[GIT_KEY]!, source]
-  const groups = state.groupsByWorktree[GIT_KEY]!.map((group) =>
-    group.id === source.groupId ? { ...group, tabOrder: [...group.tabOrder, source.id] } : group
-  )
-  store.setState({
-    ...state,
-    unifiedTabsByWorktree: { ...state.unifiedTabsByWorktree, [GIT_KEY]: rows },
-    groupsByWorktree: { ...state.groupsByWorktree, [GIT_KEY]: groups }
-  })
-  const retain = vi.fn()
-  captureSwitchProjection(
-    store.getState(),
-    GIT_KEY,
-    {
-      invocationId: 'A',
-      generation: 'generation-A',
-      sessionId: 'conversation',
-      tabId: source.id,
-      phase: 'retire'
-    },
-    retain
-  )
-  const prepared = {
-    unifiedTabsByWorktree: state.unifiedTabsByWorktree,
-    groupsByWorktree: state.groupsByWorktree
-  }
-  // Actual ordinary activation, even already-active, invalidates the handoff before its frame lands.
-  store.getState().activateTab(source.id)
-  showFramePatch(store, prepared)
-  showFramePatch(store, prepared)
-  expect(store.getState().unifiedTabsByWorktree[GIT_KEY]?.some((row) => row.id === source.id)).toBe(
-    true
-  )
-  expect(
-    store.getState().groupsByWorktree[GIT_KEY]?.find((group) => group.id === source.groupId)
-      ?.tabOrder
-  ).toContain(source.id)
-  await Promise.resolve()
-  expect(retain).toHaveBeenCalledOnce()
-})
-
-it.each([100, 1000])(
-  'indexes a frame once for %i tabs with equally many unresolved guards',
-  async (count) => {
-    const { state } = await restored()
-    const store = createTestStore()
-    const basis = state.unifiedTabsByWorktree[GIT_KEY]![0]!
-    let reads = 0
-    const rows = Array.from({ length: count }, (_, i) => ({
-      ...basis,
-      get id() {
-        reads++
-        return `chat-${i}`
-      },
-      contentType: 'agent-session' as const,
-      entityId: `session-${i}`,
-      agent: 'codex' as const
-    }))
-    const group = {
-      ...state.groupsByWorktree[GIT_KEY]![0]!,
-      id: basis.groupId!,
-      tabOrder: rows.map((row) => row.id)
-    }
-    store.setState({
-      ...state,
-      unifiedTabsByWorktree: { [GIT_KEY]: rows },
-      groupsByWorktree: { [GIT_KEY]: [group] }
-    })
-    for (let i = 0; i < count; i++) {
-      captureSwitchProjection(
-        store.getState(),
-        GIT_KEY,
-        {
-          invocationId: `op-${i}`,
-          generation: `gen-${i}`,
-          sessionId: `session-${i}`,
-          tabId: `chat-${i}`,
-          phase: 'prepare'
-        },
-        () => {}
-      )
-      store.getState().activateTab(`chat-${i}`)
-    }
-    reads = 0
-    showFramePatch(store, {
-      unifiedTabsByWorktree: { [GIT_KEY]: [] },
-      groupsByWorktree: { [GIT_KEY]: [] }
-    })
-    expect(store.getState().unifiedTabsByWorktree[GIT_KEY]).toHaveLength(count)
-    expect(reads).toBeLessThan(30 * count)
-  }
-)
diff --git a/src/shared/agent-session-switch-execution.ts b/src/shared/agent-session-switch-execution.ts
index e533b4b7d3d3..3b7027021505 100644
--- a/src/shared/agent-session-switch-execution.ts
+++ b/src/shared/agent-session-switch-execution.ts
@@ -94,7 +94,7 @@ export type AgentSessionSwitchAuthority = {
   invocationId: string
   openPlacement?: SessionTabOpenPlacement
   /** View freshness is independent of process authority. */
-  selectionCurrent?: () => boolean
+  selectionCurrent?: (consume?: boolean) => boolean
   check: () => void
   remaining: () => number
   signal: AbortSignal
diff --git a/src/shared/claimed-agent-pty-owner.test.ts b/src/shared/claimed-agent-pty-owner.test.ts
index 06a3f67a9a5a..af7e2480439d 100644
--- a/src/shared/claimed-agent-pty-owner.test.ts
+++ b/src/shared/claimed-agent-pty-owner.test.ts
@@ -313,73 +313,3 @@ describe('ClaimedAgentPtyOwnerRegistry', () => {
     expect(spawn).toHaveBeenCalledOnce()
   })
 })
-
-it('expires a waiting claim observer after liveness without releasing the actual creator', async () => {
-  const registry = new ClaimedAgentPtyOwnerRegistry()
-  const gate = Promise.withResolvers<boolean>()
-  const probing = Promise.withResolvers<void>()
-  let expired = false
-  const check = () => {
-    if (expired) {
-      throw new Error('expired')
-    }
-  }
-  const created = await registry.ensure({
-    claim: claim(),
-    surface,
-    spawn: async () => ({ ptyId: 'real' })
-  })
-  const adopting = registry.ensure({
-    claim: claim(),
-    surface,
-    check,
-    spawn: async () => {
-      throw new Error('must not duplicate')
-    },
-    isLive: () => {
-      probing.resolve()
-      return gate.promise
-    }
-  })
-  const rejected = expect(adopting).rejects.toThrow('expired')
-  await probing.promise
-  expired = true
-  gate.resolve(true)
-  await rejected
-  expect(
-    await registry.ensure({
-      claim: claim(),
-      surface,
-      spawn: async () => {
-        throw new Error('must not duplicate')
-      }
-    })
-  ).toMatchObject({
-    disposition: 'adopted',
-    owner: { generation: created.owner.generation, ptyId: 'real' }
-  })
-})
-it('settles the dispatched creator while an expired joiner cannot cancel its claim', async () => {
-  const registry = new ClaimedAgentPtyOwnerRegistry()
-  const gate = Promise.withResolvers<{ ptyId: string }>()
-  let expired = false
-  const first = registry.ensure({ claim: claim(), surface, spawn: () => gate.promise })
-  const second = registry.ensure({
-    claim: claim(),
-    surface,
-    check: () => {
-      if (expired) {
-        throw new Error('expired')
-      }
-    },
-    spawn: async () => {
-      throw new Error('must not duplicate')
-    }
-  })
-  const rejected = expect(second).rejects.toThrow('expired')
-  expired = true
-  gate.resolve({ ptyId: 'real' })
-  const owner = await first
-  await rejected
-  expect(registry.listForPty('real')).toEqual([owner.owner])
-})
diff --git a/src/shared/session-tab-placement-work.test-fixture.ts b/src/shared/session-tab-placement-work.test-fixture.ts
deleted file mode 100644
index 7f769ca80cdb..000000000000
--- a/src/shared/session-tab-placement-work.test-fixture.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { vi } from 'vitest'
-import * as placement from './session-tab-placement'
-
-export function observeSessionTabPlacementWork() {
-  const samples: { reads: number; adds: number; has: number }[] = []
-  function measure<T>(work: () => T): T {
-    const count = { reads: 0, adds: 0, has: 0 }
-    const { includes, indexOf } = Array.prototype
-    const { add, has } = Set.prototype
-    const receiver = (array: unknown[]) =>
-      new Proxy(array, {
-        get(target, key) {
-          if (key === 'length') {
-            return target.length
-          }
-          if (typeof key !== 'string' || !/^\d+$/.test(key)) {
-            return undefined
-          }
-          count.reads += 1
-          return target[Number(key)]
-        }
-      })
-    Array.prototype.includes = function (value, from) {
-      return includes.call(receiver(this), value, from)
-    }
-    Array.prototype.indexOf = function (value, from) {
-      return indexOf.call(receiver(this), value, from)
-    }
-    Set.prototype.add = function (value) {
-      count.adds += 1
-      return add.call(this, value)
-    }
-    Set.prototype.has = function (value) {
-      count.has += 1
-      return has.call(this, value)
-    }
-    try {
-      return work()
-    } finally {
-      Object.assign(Array.prototype, { includes, indexOf })
-      Object.assign(Set.prototype, { add, has })
-      samples.push(count)
-    }
-  }
-  const created = placement.placeCreatedSessionTab
-  const unpinned = placement.placeUnpinnedSessionTabAtCapture
-  vi.spyOn(placement, 'placeCreatedSessionTab').mockImplementation((...args) =>
-    measure(() => created(...args))
-  )
-  vi.spyOn(placement, 'placeUnpinnedSessionTabAtCapture').mockImplementation((...args) =>
-    measure(() => unpinned(...args))
-  )
-  return { samples }
-}
diff --git a/src/shared/session-tab-placement.ts b/src/shared/session-tab-placement.ts
index 1ef2d30cc733..3e75fd0e089e 100644
--- a/src/shared/session-tab-placement.ts
+++ b/src/shared/session-tab-placement.ts
@@ -12,6 +12,11 @@ export type SessionTabOpenPlacement = {
   source?: TerminalSurfaceCloseIdentity
 }
 
+/** Recognizes viewer-owned requests; only the initiating viewer can admit or consume one. */
+export function isSessionTabSelectionRequest(token: string | undefined): boolean {
+  return token?.startsWith('selection-v1:') === true && token.length > 'selection-v1:'.length
+}
+
 /** Call-local neighbors survive an anchor retiring while creation is awaited. */
 export type CapturedSessionTabPlacement = { preceding: string[]; following: string[] }
 
diff --git a/tests/e2e/cli-chat-resume-terminal-capture.unit.test.ts b/tests/e2e/cli-chat-resume-terminal-capture.unit.test.ts
index 6a1f607f5ef7..32cb82043168 100644
--- a/tests/e2e/cli-chat-resume-terminal-capture.unit.test.ts
+++ b/tests/e2e/cli-chat-resume-terminal-capture.unit.test.ts
@@ -3,15 +3,12 @@ import { beforeEach, expect, it, vi } from 'vitest'
 import { useAppStore } from '@/store'
 import { captureSourceTerminal } from '@/components/tab-bar/cli-chat-resume-terminal-capture'
 import { buildMirroredTerminalTabs } from '@/runtime/web-session-tabs-sync/terminal-build'
-import { toRemoteRuntimePtyId } from '../../src/shared/remote-runtime/remote-runtime-pty-id'
 import type { captureTerminalSurfaceIdentity } from '../../src/shared/terminal-tab-close'
 import {
   createHarness,
   WORKTREE_ID,
   TAB_ID,
-  LEAF_ID,
-  PTY_ID,
-  INCARNATION_ID
+  LEAF_ID
 } from '../../src/main/runtime/__fixtures__/orca-runtime-terminal-close-continuity-fixtures'
 
 const { rpc } = vi.hoisted(() => ({ rpc: vi.fn() }))
@@ -32,106 +29,6 @@ function source(ptyId: string | undefined, executionHostId: 'local' | 'runtime:p
     ptyId
   }
 }
-function seed(harness: ReturnType<typeof createHarness>) {
-  const session = harness.getSession()
-  useAppStore.setState({
-    tabsByWorktree: session.tabsByWorktree,
-    terminalLayoutsByTabId: session.terminalLayoutsByTabId
-  })
-}
-
-it('captures the authenticated original after earned shell exit and cleared renderer binding, then closes without another stop', async () => {
-  const harness = createHarness({ registerPtyBacked: true, publishMobileSurface: true })
-  const retained = harness.runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_ID}`, WORKTREE_ID)
-  const settle = harness.runtime.intentionalPtyStops.mark(PTY_ID, 'reversible', INCARNATION_ID)
-  await harness.runtime.onPtyExit(PTY_ID, 0, INCARNATION_ID, { hostExitConfirmed: true })
-  settle(true)
-  harness.runtime.syncWindowGraph(1, {
-    tabs: [
-      {
-        tabId: TAB_ID,
-        worktreeId: WORKTREE_ID,
-        title: 'Ended',
-        activeLeafId: LEAF_ID,
-        layout: { type: 'leaf', leafId: LEAF_ID }
-      }
-    ],
-    leaves: [
-      { tabId: TAB_ID, worktreeId: WORKTREE_ID, leafId: LEAF_ID, paneRuntimeId: 7, ptyId: null }
-    ]
-  })
-  harness.editSession((state) => ({
-    ...state,
-    terminalLayoutsByTabId: {
-      ...state.terminalLayoutsByTabId,
-      [TAB_ID]: { ...state.terminalLayoutsByTabId[TAB_ID], ptyIdsByLeafId: {} }
-    }
-  }))
-  harness.runtime.dropArchivedPtyRecord(PTY_ID)
-  seed(harness)
-  rpc.mockImplementation(async () => ({
-    terminal: harness.runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_ID}`, WORKTREE_ID)
-  }))
-  const captured = await captureSourceTerminal(source(undefined))
-  expect(captured?.handle).toBe(retained.handle)
-  if (!captured?.presentation) {
-    throw new Error('Expected authenticated original')
-  }
-  harness.setCloseTerminalTabAction(() => {})
-  await expect(
-    harness.runtime.closeTerminal(captured.handle, captured.incarnationId, captured.presentation)
-  ).resolves.toMatchObject({ ptyKilled: true })
-  expect(harness.stopAndWait).not.toHaveBeenCalled()
-  expect(harness.getSession().tabsByWorktree[WORKTREE_ID]).toEqual([])
-})
-
-it.each(['row', 'incarnation', 'pty', 'workspace', 'leaf', 'host'] as const)(
-  'refuses changed %s facts across resolve without recapturing',
-  async (change) => {
-    const harness = createHarness({ registerPtyBacked: true, publishMobileSurface: true })
-    seed(harness)
-    let resolvedTerminal: ReturnType<typeof harness.runtime.resolveTerminalPane> | undefined
-    rpc.mockImplementation(async () => {
-      if (change === 'row') {
-        harness.editSession((state) => ({
-          ...state,
-          tabsByWorktree: {
-            ...state.tabsByWorktree,
-            [WORKTREE_ID]: state.tabsByWorktree[WORKTREE_ID].map((row) => ({
-              ...row,
-              generation: (row.generation ?? 0) + 1
-            }))
-          }
-        }))
-      }
-      if (change === 'incarnation') {
-        harness.replacePersistedIncarnation('successor')
-      }
-      const terminal = harness.runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_ID}`, WORKTREE_ID)
-      resolvedTerminal = terminal
-      if (change === 'host') {
-        terminal.executionHostId = 'ssh:successor'
-      }
-      if (change === 'pty') {
-        terminal.ptyId = 'successor'
-      }
-      if (change === 'workspace' && terminal.presentation) {
-        terminal.presentation.identity.worktreeId = 'other'
-      }
-      if (change === 'leaf' && terminal.presentation) {
-        terminal.presentation.identity.leafId = 'other'
-      }
-      return { terminal }
-    })
-    expect(await captureSourceTerminal(source(PTY_ID))).toBeNull()
-    if (change === 'incarnation') {
-      expect(rpc).toHaveResolvedWith({ terminal: resolvedTerminal })
-      expect(resolvedTerminal).toMatchObject({ ptyId: PTY_ID, incarnationId: INCARNATION_ID })
-      expect(resolvedTerminal).not.toHaveProperty('presentation')
-    }
-  }
-)
-
 it('captures a real mirrored source on host coordinates and keeps client continuity independent of host clocks', async () => {
   const harness = createHarness({ registerPtyBacked: true, publishMobileSurface: true })
   harness.editSession((session) => ({
@@ -165,12 +62,10 @@ it('captures a real mirrored source on host coordinates and keeps client continu
     })
   }
   seedMirror()
-  let duringResolve = () => {}
   rpc.mockImplementation(
     async (_target, method, params: { paneKey: string; worktreeId: string }) => {
       expect(method).toBe('terminal.resolvePane')
       expect(params).toEqual({ paneKey: `${TAB_ID}:${LEAF_ID}`, worktreeId: WORKTREE_ID })
-      duringResolve()
       return { terminal: harness.runtime.resolveTerminalPane(params.paneKey, params.worktreeId) }
     }
   )
@@ -183,65 +78,4 @@ it('captures a real mirrored source on host coordinates and keeps client continu
     incarnationId: terminal.incarnationId,
     presentation: terminal.presentation
   })
-  for (const change of ['generation', 'adoption', 'binding', 'owner', 'incarnation'] as const) {
-    seedMirror()
-    duringResolve = () =>
-      useAppStore.setState({
-        ...(change === 'generation' || change === 'adoption'
-          ? {
-              tabsByWorktree: {
-                [WORKTREE_ID]: [
-                  {
-                    ...mirror.tab,
-                    ...(change === 'generation' ? { generation: 1 } : { createdAt: 9001 })
-                  }
-                ]
-              }
-            }
-          : {}),
-        ...(change === 'binding'
-          ? {
-              terminalLayoutsByTabId: {
-                [mirror.tab.id]: {
-                  ...mirror.layout,
-                  ptyIdsByLeafId: { [LEAF_ID]: toRemoteRuntimePtyId('successor', 'paired') }
-                }
-              }
-            }
-          : {}),
-        ...(change === 'owner' ? { activeWorkspaceExecutionHostId: 'runtime:successor' } : {}),
-        ...(change === 'incarnation'
-          ? {
-              terminalPtyIncarnationsByPaneKey: { [mirrored.paneKey]: 'successor' }
-            }
-          : {})
-      })
-    expect(await captureSourceTerminal(mirrored), change).toBeNull()
-  }
-  seedMirror()
-  duringResolve = () => {}
-  expect(
-    await captureSourceTerminal({ ...mirrored, ptyId: toRemoteRuntimePtyId(terminal.handle) })
-  ).toBeNull()
-  expect(await captureSourceTerminal({ ...mirrored, ptyId: undefined })).toBeNull()
-  expect(await captureSourceTerminal({ ...mirrored, executionHostId: 'local' })).toBeNull()
-  rpc.mockImplementation(async (_target, _method, params) => ({
-    terminal: {
-      ...harness.runtime.resolveTerminalPane(params.paneKey, params.worktreeId),
-      handle: 'different'
-    }
-  }))
-  expect(await captureSourceTerminal(mirrored)).toBeNull()
-})
-
-it('requires a real row/leaf for the new missing-binding exception while retaining existing nonnull-source admission', async () => {
-  const harness = createHarness({ registerPtyBacked: true, publishMobileSurface: true })
-  const terminal = harness.runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_ID}`, WORKTREE_ID)
-  rpc.mockResolvedValue({ terminal })
-  expect(await captureSourceTerminal(source(undefined))).toBeNull()
-  expect(await captureSourceTerminal(source(PTY_ID))).toMatchObject({ handle: terminal.handle })
-  const proxy = toRemoteRuntimePtyId(terminal.handle, 'paired')
-  expect(await captureSourceTerminal(source(proxy, 'runtime:paired'))).toMatchObject({
-    handle: terminal.handle
-  })
 })
diff --git a/tests/e2e/cross-version-wire/structured-agent-session-host-fixture.ts b/tests/e2e/cross-version-wire/structured-agent-session-host-fixture.ts
index b8ed1e948c32..6194a43e06f6 100644
--- a/tests/e2e/cross-version-wire/structured-agent-session-host-fixture.ts
+++ b/tests/e2e/cross-version-wire/structured-agent-session-host-fixture.ts
@@ -7,6 +7,7 @@ import {
   agentSessionLeaseFixture
 } from '../../../src/shared/agent-session-record.test-fixture'
 import type { AgentSessionRecord } from '../../../src/shared/agent-session-record'
+import { agentSessionRefusalError } from '../../../src/shared/agent-session-wire-refusals'
 import type { AiVaultChatForkSource } from '../../../src/shared/ai-vault-resume-preparation'
 import type { StructuredAgentSessionAdapter } from '../../../src/main/native-chat/agent-session-wire/structured-agent-session-adapter'
 import { startsWhenPublished } from '../../../src/main/native-chat/agent-session-wire/structured-agent-session-instant-start.test-support'
@@ -144,6 +145,19 @@ export function installableHost(
       modelCatalog: { read: hostCalls.modelCatalog, demand: vi.fn(async () => {}) },
       store: {
         getRecord: hostCalls.getRecord,
+        selectWritableRecord: (sessionId: string) => {
+          const record: AgentSessionRecord | null = hostCalls.getRecord(sessionId)
+          return record ? { kind: 'writable' as const, record } : { kind: 'missing' as const }
+        },
+        requireWritableRecord: (sessionId: string) => {
+          const record: AgentSessionRecord | null = hostCalls.getRecord(sessionId)
+          if (!record) {
+            throw agentSessionRefusalError('agent_session_identity_required', {
+              reason: 'recordMissing'
+            })
+          }
+          return record
+        },
         getConversation: () => null,
         getOperationRow: () => null
       }
diff --git a/tests/e2e/mobile-terminal-session-switch.unit.test.ts b/tests/e2e/mobile-terminal-session-switch.unit.test.ts
index 61272c19fd74..987001526c3a 100644
--- a/tests/e2e/mobile-terminal-session-switch.unit.test.ts
+++ b/tests/e2e/mobile-terminal-session-switch.unit.test.ts
@@ -4,7 +4,6 @@ import { createTestStore } from '@/store/slices/store-test-helpers'
 import { createTabsSliceMockApi } from '@/store/slices/tabs-slice-test-harness'
 import { publishAgentLaunchTab as windowPublish } from '@/lib/agent-launch-tab-publication'
 import { applyAgentLaunchPaneVerdict } from '@/lib/agent-launch-pane-verdict-application'
-import { acceptAgentLaunchPaneAttempt } from '@/lib/agent-launch-pane-start'
 import { agentSessionSwitchDeadline } from '../../src/shared/agent-session-switch-execution'
 import { afterEach, expect, it, vi } from 'vitest'
 import '../../src/main/runtime/orca-runtime-test-lifecycle.spec'
@@ -21,14 +20,6 @@ import { withChatTabChanges } from '../../src/main/runtime/agent-session/agent-s
 import { committingSpawn } from '../../src/main/runtime/bind-first-pane.test-fixture'
 import type { RuntimeNotifier } from '../../src/main/runtime/runtime-notifier-contract'
 import '../../src/main/daemon/mock-descendant-sweep'
-import { mkdtempSync, rmSync } from 'node:fs'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { DaemonPtyAdapter } from '../../src/main/daemon/daemon-pty-adapter'
-import { DaemonServer } from '../../src/main/daemon/daemon-server'
-import { getDaemonSocketPath } from '../../src/main/daemon/daemon-spawner'
-import { createMockSubprocess } from '../../src/main/daemon/daemon-pty-adapter-test-harness'
-import type { DaemonClientConnections } from '../../src/main/daemon/daemon-client-connections'
 import type { RuntimePtyController } from '../../src/main/runtime/runtime-pty-controller-contract'
 
 const renderer = vi.hoisted(() => {
@@ -151,184 +142,79 @@ const args = () => ({
   execution: execution()
 })
 
-it('publishes before ordinary fresh startup, forwards caller choices and never seeds a fabricated Codex ID', async () => {
-  const { service, events, spawn, publish } = await setup()
-  const created = await service.createSessionSwitchTerminal(wt, args())
-  expect(events.slice(0, 2)).toEqual(['published', 'spawn'])
-  expect(publish).toHaveBeenCalledOnce()
-  expect(spawn).toHaveBeenCalledWith(
-    expect.objectContaining({ command: expect.stringContaining('my-codex'), launchAgent: 'codex' })
-  )
-  expect(spawn.mock.calls[0]?.[0]).not.toHaveProperty('resumeProviderSession')
-  expect(created.tab.terminal).toBeDefined()
-})
-
-it('withdraws a definitely unused destination after failed spawn', async () => {
-  const { service, report, publish } = await setup('failed')
-  await expect(service.createSessionSwitchTerminal(wt, args())).rejects.toThrow()
-  expect(report).toHaveBeenCalledWith(expect.objectContaining({ worktreeId: wt }), {
-    kind: 'withdrawn'
-  })
-  const published = await publish.mock.results[0]!.value
-  expect(renderer.store!.getState().terminalLayoutsByTabId[published.tabId]).toBeUndefined()
-})
-
-it('retains an unresolved receiver destination until real no-fork settlement permits unused cleanup', async () => {
-  const directory = mkdtempSync(join(tmpdir(), 'mobile-switch-receiver-'))
-  const socketPath = getDaemonSocketPath(directory)
-  const tokenPath = join(directory, 'test.token')
-  const entered = Promise.withResolvers<void>()
-  const releasePreparation = Promise.withResolvers<void>()
-  const nativeSpawn = vi.fn(() => createMockSubprocess())
-  const preparation = vi.fn(async () => {
-    entered.resolve()
-    await releasePreparation.promise
-    throw new Error('workspace preparation failed')
-  })
-  const server = new DaemonServer({
-    socketPath,
-    tokenPath,
-    spawnSubprocess: nativeSpawn,
-    preparePtySpawn: preparation
-  })
-  const adapter = new DaemonPtyAdapter({ socketPath, tokenPath })
-  let operation: Promise<unknown> | undefined
-  try {
-    await server.start()
-    const { service, report, publish, spawn } = await setup('ready', (options) =>
-      adapter.spawn(options)
-    )
-    operation = service.createSessionSwitchTerminal(wt, args()).catch((error: unknown) => error)
-    await entered.promise
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: access only this fixture's authenticated server sockets to inject transport loss.
-    const connections = (server as unknown as { connections: DaemonClientConnections }).connections
-    const peer = [...connections.values()].find((connection) => connection.controlSocket)
-    if (!peer) {
-      throw new Error('authenticated receiver connection missing')
-    }
-    peer.controlSocket.destroy()
-    expect(await operation).toBeInstanceOf(Error)
-    const published = await publish.mock.results[0]!.value
-    expect(report).toHaveBeenCalledWith(expect.objectContaining({ worktreeId: wt }), {
-      kind: 'unconfirmed'
-    })
-    expect(renderer.store!.getState().terminalLayoutsByTabId[published.tabId]?.root).toBeDefined()
-    expect(report.mock.calls.some(([, verdict]) => verdict.kind === 'withdrawn')).toBe(false)
-    expect(nativeSpawn).not.toHaveBeenCalled()
-    releasePreparation.resolve()
-    await adapter.settleSwitchWorkForReplacement()
-    await vi.waitFor(() => {
-      expect(renderer.store!.getState().terminalLayoutsByTabId[published.tabId]).toBeUndefined()
-      expect(report).toHaveBeenLastCalledWith(expect.objectContaining({ worktreeId: wt }), {
-        kind: 'withdrawn'
-      })
-    })
-    expect(preparation).toHaveBeenCalledOnce()
-    expect(spawn).toHaveBeenCalledOnce()
-    expect(nativeSpawn).not.toHaveBeenCalled()
-    expect(server.host.listSessions()).toEqual([])
-  } finally {
-    releasePreparation.resolve()
-    await operation
-    await adapter.settleSwitchWorkForReplacement()
-    adapter.dispose()
-    await server.shutdown()
-    rmSync(directory, { recursive: true, force: true })
-  }
-})
-
-it('expires after preparation/publication without dispatching spawn, keeping the source', async () => {
-  const { service, spawn, publish, report } = await setup()
-  let expired = false
-  const original = publish.getMockImplementation()!
-  publish.mockImplementation(async (request) => {
-    const answer = await original(request)
-    if (!answer) {
-      throw new Error('missing window publication')
-    }
-    expired = true
-    return answer
-  })
-  await expect(
-    service.createSessionSwitchTerminal(wt, {
+const nativeId = '019aef12-1234-7000-8000-123456789abc'
+it.each([false, true])(
+  'publishes before ordinary startup and preserves fresh/saved caller choices: saved=%s',
+  async (saved) => {
+    const { service, events, spawn, publish } = await setup()
+    const created = await service.createSessionSwitchTerminal(wt, {
       ...args(),
-      execution: {
-        ...execution(),
-        check: () => {
-          if (expired) {
-            throw new Error('expired')
+      ...(saved
+        ? {
+            source: {
+              agent: 'codex' as const,
+              sourceAgent: 'codex' as const,
+              sessionId: nativeId,
+              filePath: '/tmp/rollout.jsonl',
+              cwd: '/repo',
+              codexHome: null,
+              executionHostPlatform: process.platform
+            }
           }
-        }
-      }
+        : {})
     })
-  ).rejects.toThrow('expired')
-  expect(spawn).not.toHaveBeenCalled()
-  expect(report).toHaveBeenCalledWith(expect.anything(), { kind: 'withdrawn' })
-})
-
-it('uses the saved native ID with ordinary resume environment/runtime instead of forking', async () => {
-  const { service, spawn } = await setup()
-  const nativeId = '019aef12-1234-7000-8000-123456789abc'
-  await service.createSessionSwitchTerminal(wt, {
-    ...args(),
-    source: {
-      agent: 'codex',
-      sourceAgent: 'codex',
-      sessionId: nativeId,
-      filePath: '/tmp/rollout.jsonl',
-      cwd: '/repo',
-      codexHome: null,
-      executionHostPlatform: process.platform
+    expect(events.slice(0, 2)).toEqual(['published', 'spawn'])
+    expect(publish).toHaveBeenCalledOnce()
+    expect(spawn).toHaveBeenCalledWith(
+      expect.objectContaining({
+        command: expect.stringContaining('my-codex'),
+        launchAgent: 'codex'
+      })
+    )
+    if (saved) {
+      expect(spawn).toHaveBeenCalledWith(
+        expect.objectContaining({
+          command: expect.stringContaining(nativeId),
+          resumeProviderSession: expect.objectContaining({ id: nativeId }),
+          launchRuntime: expect.any(Object)
+        })
+      )
+      expect(spawn.mock.calls[0]?.[0].command).not.toContain('fork')
+    } else {
+      expect(spawn.mock.calls[0]?.[0]).not.toHaveProperty('resumeProviderSession')
     }
-  })
-  expect(spawn).toHaveBeenCalledWith(
-    expect.objectContaining({
-      command: expect.stringContaining(nativeId),
-      resumeProviderSession: expect.objectContaining({ id: nativeId }),
-      launchRuntime: expect.any(Object)
-    })
-  )
-  expect(spawn.mock.calls[0]?.[0].command).not.toContain('fork')
-})
+    expect(created.tab.terminal).toBeDefined()
+  }
+)
 
-it.each(['input', 'replacement', 'preparing', 'layout'] as const)(
-  'retains a window-published failed destination after newer %s before persistence',
-  async (use) => {
-    const { service, publish, spawn } = await setup('failed')
+it.each([false, true])(
+  'withdraws a failed unused destination and retains one the user typed into: used=%s',
+  async (used) => {
+    const { service, publish, spawn, report } = await setup('failed')
     const original = publish.getMockImplementation()!
     publish.mockImplementation(async (request) => {
       const receipt = await original(request)
       if (!receipt) {
         throw new Error('missing window publication')
       }
-      const key = `${request.tabId}:${request.leafId}`
-      if (use === 'input') {
+      if (used) {
+        const key = `${request.tabId}:${request.leafId}`
         renderer.store!.setState({ lastTerminalInputAtByPaneKey: { [key]: 1 } })
       }
-      if (use === 'preparing' || use === 'replacement') {
-        acceptAgentLaunchPaneAttempt(key, 'new-launch')
-      }
-      if (use === 'replacement') {
-        windowPublish({ ...request, operationId: 'new-launch', requestId: 'replacement' })
-      }
-      if (use === 'layout') {
-        renderer.store!.setState((state) => ({
-          terminalLayoutsByTabId: {
-            ...state.terminalLayoutsByTabId,
-            [request.tabId]: {
-              ...state.terminalLayoutsByTabId[request.tabId]!,
-              root: { type: 'leaf', leafId: 'changed' }
-            }
-          }
-        }))
-      }
       return receipt
     })
     await expect(service.createSessionSwitchTerminal(wt, args())).rejects.toThrow()
     const published = await publish.mock.results[0]!.value
-    expect(
-      renderer.store!.getState().tabsByWorktree[wt]?.some((row) => row.id === published.tabId)
-    ).toBe(true)
+    if (used) {
+      expect(
+        renderer.store!.getState().tabsByWorktree[wt]?.some((row) => row.id === published.tabId)
+      ).toBe(true)
+    } else {
+      expect(report).toHaveBeenCalledWith(expect.objectContaining({ worktreeId: wt }), {
+        kind: 'withdrawn'
+      })
+      expect(renderer.store!.getState().terminalLayoutsByTabId[published.tabId]).toBeUndefined()
+    }
     expect(spawn).toHaveBeenCalledOnce()
   }
 )
diff --git a/tests/e2e/native-chat-switch-readable.unit.test.tsx b/tests/e2e/native-chat-switch-readable.unit.test.tsx
index 9f03eddc4477..adc0559004bf 100644
--- a/tests/e2e/native-chat-switch-readable.unit.test.tsx
+++ b/tests/e2e/native-chat-switch-readable.unit.test.tsx
@@ -12,9 +12,6 @@ import {
 import { executeStructuredSessionSwitch } from '../../src/main/runtime/rpc/methods/structured-agent-session-switch-execution'
 import { act, cleanup, render, screen, waitFor } from '@testing-library/react'
 import { afterEach, expect, it, vi } from 'vitest'
-import { agentSessionRefusalError } from '../../src/shared/agent-session-wire-refusals'
-import { RuntimeRpcCallError } from '@/runtime/runtime-rpc-result'
-import { beginSwitchPresentation } from '@/lib/conversation-switch-presentation'
 import { NativeChatStructuredSession } from '../../src/renderer/src/components/native-chat/NativeChatStructuredSession'
 import { ConfirmationDialogProvider } from '@/components/confirmation-dialog'
 import { TooltipProvider } from '@/components/ui/tooltip'
@@ -97,9 +94,9 @@ afterEach(async () => {
   }
   vi.restoreAllMocks()
 })
-it.each(['readable', 'refused', 'unmounted'] as const)(
+it.each(['readable'] as const)(
   'completes one physical switch independently of slow provider readiness and renderer history: %s',
-  async (outcome) => {
+  async () => {
     const restoreLayout = stubLayout()
     const restoreResize = stubResizeObserver()
     restores.push(restoreLayout, restoreResize)
@@ -200,8 +197,7 @@ it.each(['readable', 'refused', 'unmounted'] as const)(
       }
       return { ok: true, models: [], current: { model: '' } }
     })
-    const visit = beginSwitchPresentation({ kind: 'local' }, HOST_TEST_SESSION)
-    const view = render(
+    render(
       <ConfirmationDialogProvider>
         <TooltipProvider>
           <NativeChatStructuredSession
@@ -222,46 +218,14 @@ it.each(['readable', 'refused', 'unmounted'] as const)(
         expect.anything()
       )
     )
-    expect(visit.mounted).toBe(true)
-    expect(visit.visible).toBe(true)
-    expect(providerReady).not.toHaveBeenCalled()
     expect(screen.getByRole('status', { name: 'Loading chat' })).toBeTruthy()
-    if (outcome === 'unmounted') {
-      view.unmount()
-    }
-    await act(async () =>
-      outcome === 'refused'
-        ? read.reject(
-            new RuntimeRpcCallError({
-              id: 'history-read',
-              ok: false,
-              error: {
-                code: 'runtime_error',
-                message: 'agent_session_journal_unreadable',
-                data: {
-                  refusal: agentSessionRefusalError('agent_session_journal_unreadable', {
-                    reason: 'journalCorrupt'
-                  }).refusal
-                }
-              }
-            })
-          )
-        : read.resolve(page)
-    )
-    if (outcome === 'readable') {
-      await waitFor(() => {
-        act(() => deliverResizes())
-        expect(screen.getByText('Readable before Codex is ready')).toBeTruthy()
-        expect(visit.presentedItems.size).toBeGreaterThan(0)
-      })
-    } else if (outcome === 'refused') {
-      await waitFor(() => expect(screen.getByText('Unable to load this chat.')).toBeTruthy())
-      expect(screen.queryByText('Readable before Codex is ready')).toBeNull()
-    } else {
-      expect(visit.mounted).toBe(true)
-      expect(visit.visible).toBe(false)
-      expect(screen.queryByText('Readable before Codex is ready')).toBeNull()
-    }
+    await act(async () => {
+      read.resolve(page)
+    })
+    await waitFor(() => {
+      act(() => deliverResizes())
+      expect(screen.getByText('Readable before Codex is ready')).toBeTruthy()
+    })
     expect(providerReady).not.toHaveBeenCalled()
     expect(stopped).toHaveBeenCalledOnce()
     expect(publish).toHaveBeenCalledOnce()
@@ -272,8 +236,5 @@ it.each(['readable', 'refused', 'unmounted'] as const)(
     })
     provider.resolve()
     await vi.waitFor(() => expect(providerReady).toHaveBeenCalledOnce())
-    await vi.waitFor(() => expect(rig.host.switchExecuting(HOST_TEST_SESSION)).toBe(false))
-    expect(rig.adapter.acquire).toHaveBeenCalledOnce()
-    visit.release()
   }
 )
diff --git a/tests/e2e/runtime-environment-switch-dispatch-clock.unit.test.ts b/tests/e2e/runtime-environment-switch-dispatch-clock.unit.test.ts
index 4bd3cd7aecee..36e2422310cf 100644
--- a/tests/e2e/runtime-environment-switch-dispatch-clock.unit.test.ts
+++ b/tests/e2e/runtime-environment-switch-dispatch-clock.unit.test.ts
@@ -35,7 +35,7 @@ afterEach(() => {
 })
 it.each(['ready after expiry', 'delayed sent receipt'] as const)(
   'uses actual main/shared-control dispatch authority with %s across preload',
-  async (schedule) => {
+  async () => {
     vi.useFakeTimers()
     vi.setSystemTime(0)
     const deadline = agentSessionSwitchDeadline(Date.now, 735_000)
@@ -127,29 +127,11 @@ it.each(['ready after expiry', 'delayed sent receipt'] as const)(
     )
     void call.catch(() => undefined)
     expect(mocks.subscribe).toHaveBeenCalledOnce()
-    if (schedule === 'ready after expiry') {
-      await vi.advanceTimersByTimeAsync(36_000)
-      ready.resolve()
-      await Promise.resolve()
-      await Promise.resolve()
-      expect(wire).not.toHaveBeenCalled()
-    } else {
-      await vi.advanceTimersByTimeAsync(20_000)
-      ready.resolve()
-      await Promise.resolve()
-      await Promise.resolve()
-      expect(wire).toHaveBeenCalledOnce()
-      await vi.advanceTimersByTimeAsync(30_000)
-      for (const send of queuedEvents.splice(0)) {
-        send()
-      }
-      expect(sent).toHaveBeenCalledExactlyOnceWith(720_000)
-      expect(deadline.remaining()).toBe(705_000)
-      // A delayed duplicate receipt must not refill observation.
-      deadline.beforeSend(750_000)
-      expect(deadline.remaining()).toBe(705_000)
-      await vi.advanceTimersByTimeAsync(705_000)
-    }
+    await vi.advanceTimersByTimeAsync(36_000)
+    ready.resolve()
+    await Promise.resolve()
+    await Promise.resolve()
+    expect(wire).not.toHaveBeenCalled()
     for (const send of queuedEvents.splice(0)) {
       send()
     }
diff --git a/tests/e2e/terminal-presentation-retirement.unit.test.ts b/tests/e2e/terminal-presentation-retirement.unit.test.ts
index 85f16ba3f4cc..91c8e4f1353c 100644
--- a/tests/e2e/terminal-presentation-retirement.unit.test.ts
+++ b/tests/e2e/terminal-presentation-retirement.unit.test.ts
@@ -1,7 +1,6 @@
 // @vitest-environment happy-dom
 import { beforeEach, expect, it, vi } from 'vitest'
 import { useAppStore } from '@/store'
-import { retireTerminalPresentation } from '@/components/terminal-pane/terminal-presentation-retirement'
 import type {
   TerminalTabCloseRequest,
   TerminalTabCloseResponse
@@ -14,8 +13,7 @@ import {
   WORKTREE_ID,
   TAB_ID,
   LEAF_ID,
-  PTY_ID,
-  INCARNATION_ID
+  PTY_ID
 } from '../../src/main/runtime/__fixtures__/orca-runtime-terminal-close-continuity-fixtures'
 
 vi.mock('@/runtime/sync-runtime-graph', () => ({ scheduleRuntimeGraphSync: vi.fn() }))
@@ -24,49 +22,6 @@ beforeEach(() => {
   useAppStore.setState(useAppStore.getInitialState(), true)
 })
 
-it('completes host stop, direct mounted disposal and explicit durable intent together', async () => {
-  const harness = createHarness({ registerPtyBacked: true, publishMobileSurface: true })
-  const session = harness.getSession()
-  useAppStore.setState({
-    tabsByWorktree: session.tabsByWorktree,
-    terminalLayoutsByTabId: session.terminalLayoutsByTabId
-  })
-  useAppStore.getState().createUnifiedTab(WORKTREE_ID, 'terminal', { id: TAB_ID, entityId: TAB_ID })
-  const source = harness.runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_ID}`, WORKTREE_ID)
-  if (!source.presentation || !source.incarnationId) {
-    throw new Error('Expected original presentation')
-  }
-  const { presentation, incarnationId } = source
-  const owner = mountedOwner(false, {
-    tabId: TAB_ID,
-    worktreeId: WORKTREE_ID,
-    leafId: LEAF_ID,
-    ptyId: PTY_ID
-  })
-  harness.setVerifiedStopResult(true)
-  harness.setStopAndWaitAction(async () => {
-    await harness.runtime.onPtyExit(PTY_ID, 0, INCARNATION_ID, { hostExitConfirmed: true })
-    expect(owner.source.terminal.dispose).not.toHaveBeenCalled()
-    expect(useAppStore.getState().tabsByWorktree[WORKTREE_ID]).toHaveLength(1)
-  })
-  harness.setCloseTerminalTabAction(() => retireTerminalPresentation(presentation.identity))
-  try {
-    await expect(
-      harness.runtime.closeTerminal(source.handle, incarnationId, presentation)
-    ).resolves.toMatchObject({ ptyKilled: true })
-    expect(owner.source.terminal.dispose).toHaveBeenCalledOnce()
-    expect(owner.transports.size).toBe(0)
-    expect(owner.bindings.size).toBe(0)
-    expect(owner.sourceTransport.destroy).not.toHaveBeenCalled()
-    expect(harness.getSession().tabsByWorktree[WORKTREE_ID]).toEqual([])
-    expect(harness.getSession().closedTerminalTabTombstonesByTabId?.[TAB_ID]).toBeDefined()
-    expect(harness.flushOrThrow).toHaveBeenCalled()
-    expect(harness.kill).not.toHaveBeenCalled()
-  } finally {
-    owner.unregister()
-  }
-})
-
 it.each([false, true])(
   'persists the actual renderer effects after caught disposal failure before one failed IPC receipt (write fails=%s)',
   async (writeFails) => {
@@ -81,7 +36,7 @@ it.each([false, true])(
       throw new Error('Expected original')
     }
     const { presentation, incarnationId } = source
-    const owner = mountedOwner(false, {
+    const owner = mountedOwner({
       tabId: TAB_ID,
       worktreeId: WORKTREE_ID,
       leafId: LEAF_ID,

From 78284ca64cad70d91a3f1145eb7b9bae0c08a4a5 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Thu, 29 Oct 2026 22:31:43 -0700
Subject: [PATCH 112/207] Skip unused history work during conversation
 switching

---
 .../structured-agent-session-at-rest-catch-up.ts          | 6 +++---
 .../structured-agent-session-switch-import-coverage.ts    | 8 ++++----
 tests/e2e/native-chat-switch-readable.unit.test.tsx       | 6 ++++++
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.ts
index 0cc2b0f1f144..d28884ce94d7 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.ts
@@ -64,7 +64,7 @@ export async function catchUpStructuredSessionAtRest(input: {
   const stream = createReadStream(input.filePath, { signal: deadline.signal })
   for await (const { line } of splitTranscriptStreamLines(stream, 16 * 1024 * 1024)) {
     deadline.check()
-    const identity = tracker.identify(line, index++)
+    const currentLineIndex = index++
     const record = parseJsonObject(line)
     const payload = asRecord(record?.payload)
     if (record?.type === 'session_meta') {
@@ -123,10 +123,10 @@ export async function catchUpStructuredSessionAtRest(input: {
     if (!isCodexVisibleHistoryRecord(record, paginated)) {
       continue
     }
-    const message = decodeCodexTranscriptLine(line, `#${index - 1}`, { historyImport: true })
+    const message = decodeCodexTranscriptLine(line, `#${currentLineIndex}`, { historyImport: true })
     if (message) {
       retain({
-        identity,
+        identity: tracker.identify(line, currentLineIndex),
         body: legacyItemBody(message, LEGACY_IMPORT_BLOCK_LIMITS),
         ownerFence: 0,
         turnScope: {
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import-coverage.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import-coverage.ts
index 3d942c0a57d4..e82a8b489eee 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import-coverage.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import-coverage.ts
@@ -18,8 +18,11 @@ export function switchTranscriptNativeCoverage(input: {
   items: readonly JournalReplacementItem[]
   check: () => void
 }): ReadonlySet<string> {
-  const snapshot = input.journal.snapshot()
   const covered = new Set<string>()
+  if (!['claude', 'grok', 'opencode', 'opencode2'].includes(input.agent)) {
+    return covered
+  }
+  const snapshot = input.journal.snapshot()
   const segments: JournalReplacementItem[][] = []
   for (const item of input.items) {
     if (item.body.kind === 'message' && item.body.role === 'user') {
@@ -42,9 +45,6 @@ export function switchTranscriptNativeCoverage(input: {
     }
     return covered
   }
-  if (!['grok', 'opencode', 'opencode2'].includes(input.agent)) {
-    return covered
-  }
   const scope = {
     sessionId: snapshot.sessionId,
     providerSessionId: input.providerSessionId,
diff --git a/tests/e2e/native-chat-switch-readable.unit.test.tsx b/tests/e2e/native-chat-switch-readable.unit.test.tsx
index adc0559004bf..0face4c53834 100644
--- a/tests/e2e/native-chat-switch-readable.unit.test.tsx
+++ b/tests/e2e/native-chat-switch-readable.unit.test.tsx
@@ -1,6 +1,7 @@
 import { prepareReadableSwitchSource } from './helpers/native-chat-switch-readable-source'
 import { createRestTestRig } from '../../src/main/native-chat/agent-session-wire/structured-agent-session-rest-test-rig'
 import { HOST_TEST_SESSION } from '../../src/main/native-chat/agent-session-wire/structured-agent-session-host-test-data'
+import { parseAgentJournalItemKey } from '../../src/shared/agent-session-journal-item-key'
 import { setStructuredAgentSessionHost } from '../../src/main/native-chat/agent-session-wire/structured-agent-session-registry'
 import {
   setupMainOwnedWorkspace,
@@ -189,6 +190,11 @@ it.each(['readable'] as const)(
     if (!page.ok || !page.page.liveCursor) {
       throw new Error('missing imported history')
     }
+    expect(
+      page.page.items
+        .filter(({ body }) => body.kind === 'message')
+        .map(({ itemId }) => parseAgentJournalItemKey(itemId))
+    ).toEqual([expect.objectContaining({ provider: 'legacy', agent: 'codex', recordId: '#2' })])
     feed.cursor = page.page.liveCursor
     const read = Promise.withResolvers<AgentSessionHistoryResult>()
     mocks.call.mockImplementation(async (_target, method) => {

From d3689332d1f2ca44e14d4c873cbab70dfa6c0e41 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 01:26:57 -0700
Subject: [PATCH 113/207] Preserve physical ownership across agent view
 switches

---
 src/main/acp/acp-agent-connection.test.ts     |  26 +-
 src/main/acp/acp-agent-connection.ts          |   2 +
 src/main/acp/acp-detached-cleanup.test.ts     |  12 +-
 .../acp-scripted-connection.test-fixture.ts   |   3 +
 src/main/acp/acp-structured-acquire.ts        |   1 +
 .../acp-structured-adapter.test-support.ts    |   2 +
 .../claude/claude-agent-sdk-process-spawn.ts  |   4 +-
 .../claude/claude-stream-json-connection.ts   |   8 +-
 .../claude-structured-session-acquisition.ts  |   1 +
 .../codex-app-server-connection-types.ts      |   1 +
 src/main/codex/codex-app-server-connection.ts |   1 +
 .../codex/codex-structured-session-acquire.ts |   1 +
 ...apter-switch-compatibility.test-fixture.ts |  34 ++-
 src/main/daemon/daemon-pty-daemon-recovery.ts |   3 -
 .../native-pty-spawn-windows.test.ts          |   6 +-
 .../pty/ipc/spawn-commit-run-facts.test.ts    |  18 +-
 .../ipc/pty/pty-launch-race-parity.test.ts    |  13 +-
 .../pty/pty-pane-materialization-race.test.ts |  13 +-
 .../runtime/spawn-commit-run-facts.test.ts    |  39 ++-
 src/main/jsonl-rpc/agent-connection.ts        |   2 +
 ...journal-legacy-import-record-bound.test.ts |   2 +-
 .../structured-agent-session-acquisition.ts   | 113 +++++---
 .../structured-agent-session-adapter.ts       |   2 +
 .../structured-agent-session-attach-flow.ts   |   1 +
 ...ured-agent-session-attach-orchestration.ts |   6 +
 .../structured-agent-session-host.ts          |   2 +
 .../structured-agent-session-rest-test-rig.ts |  36 ++-
 .../structured-agent-session-start-flight.ts  |  36 +++
 .../structured-agent-session-switch-source.ts |  53 +++-
 .../transcript-line-decoders-codex.ts         |  21 +-
 src/main/pi/rpc-session.ts                    |   1 +
 ...ctured-agent-session-create-intent.test.ts |   3 +-
 .../structured-worker-switch-stop.test.ts     |   5 +-
 ...red-agent-session-switch-execution.test.ts |  19 +-
 ...runtime-fake-spawn-binding.test-fixture.ts |   7 +-
 ...agent-session-claude-kill-evidence.test.ts | 250 ++++++++++++++++++
 ...-agent-session-codex-stop-evidence.test.ts |  32 +++
 ...ctured-agent-session-pi-kill-retry.test.ts |  20 ++
 .../structured-claude-piped-test-support.ts   |   1 +
 ...red-native-switch-physical.test-fixture.ts | 130 +++++++++
 .../terminal/launch/mobile-terminal-create.ts |   3 +-
 .../ai-vault-session-in-place-switch.ts       |   9 +-
 ...t-session-resume-in-chat-workspace.test.ts |   5 +-
 .../tab-bar/cli-chat-resume-run.test.ts       |   8 +-
 .../main-loaded-layout-frames.test-fixture.ts | 191 +++++++++++++
 ...ntime-session-browser-create-focus.test.ts |   4 +-
 .../src/runtime/web-runtime-session.test.ts   |   4 +-
 ...-runtime-terminal-switch-placement.test.ts | 135 +++++++++-
 .../workspace-layout-frame-sync.test.ts       | 146 +++++++++-
 .../native-chat-switch-readable-source.ts     |   7 +-
 ...ssion-terminal-host-authority.unit.test.ts |   2 +-
 51 files changed, 1293 insertions(+), 151 deletions(-)
 create mode 100644 src/main/runtime/structured-native-switch-physical.test-fixture.ts

diff --git a/src/main/acp/acp-agent-connection.test.ts b/src/main/acp/acp-agent-connection.test.ts
index 7e0bccfb3f69..97791677f0b7 100644
--- a/src/main/acp/acp-agent-connection.test.ts
+++ b/src/main/acp/acp-agent-connection.test.ts
@@ -333,7 +333,16 @@ describe('ACP process-owning connection', () => {
 
   it('settles a failed spawn but requires processless close evidence before reporting exit', async () => {
     const onExit = vi.fn()
-    const { connection, child, agent } = fixture({ onExit }, { pid: null, exitOnEnd: false })
+    const physical = vi.fn<(exited: Promise<void>) => void>()
+    const { connection, child, agent } = fixture(
+      { onExit, onPhysicalExit: physical },
+      { pid: null, exitOnEnd: false }
+    )
+    let exited = false
+    expect(physical).toHaveBeenCalledOnce()
+    void physical.mock.calls[0]![0].then(() => {
+      exited = true
+    })
     agent.on('initialize', () => {})
     const rejected = expect(connection.initialize()).rejects.toThrow('ENOENT')
     child.emit('error', new Error('ENOENT'))
@@ -341,7 +350,10 @@ describe('ACP process-owning connection', () => {
     await rejected
     expect(connection.rootVerdict).toBe('unverifiable')
     expect(onExit).not.toHaveBeenCalled()
+    expect(exited).toBe(false)
     child.emit('close', null, null)
+    await physical.mock.calls[0]![0]
+    expect(exited).toBe(true)
     expect(connection.rootVerdict).toBe('exited')
     expect(onExit.mock.calls[0][1].exit.processless).toBe(true)
     expect(await connection.close()).toBe(true)
@@ -420,7 +432,13 @@ it.each([true, false])(
   'runs setup through the retained launch gate with initial kill delivery=%s',
   async (initialDelivery) => {
     vi.useFakeTimers()
-    const { connection, child } = fixture({}, { exitOnEnd: false })
+    const physical = vi.fn<(exited: Promise<void>) => void>()
+    const { connection, child } = fixture({ onPhysicalExit: physical }, { exitOnEnd: false })
+    let exited = false
+    expect(physical).toHaveBeenCalledOnce()
+    void physical.mock.calls[0]![0].then(() => {
+      exited = true
+    })
     let permitted = initialDelivery
     let writerGone = false
     const deliver = () => {
@@ -488,5 +506,9 @@ it.each([true, false])(
       root: 'live',
       killDelivered: true
     })
+    expect(exited).toBe(false)
+    child.emit('exit', 0, null)
+    await physical.mock.calls[0]![0]
+    expect(exited).toBe(true)
   }
 )
diff --git a/src/main/acp/acp-agent-connection.ts b/src/main/acp/acp-agent-connection.ts
index 516ce945d91c..caf32a151d88 100644
--- a/src/main/acp/acp-agent-connection.ts
+++ b/src/main/acp/acp-agent-connection.ts
@@ -30,6 +30,7 @@ export type AcpAgentConnectionOptions = Omit<AcpSessionRuntimeOptions, 'peer'> &
   /** Process exit evidence, including expected closes and processless spawn failures. */
   onExit?: (error: Error, context: { expected: boolean; exit: ProviderProcessExit }) => void
   onOutput?: () => void
+  onPhysicalExit?: (exited: Promise<void>) => void
   signIn?: AcpSignInWatch
 }
 
@@ -86,6 +87,7 @@ export class AcpAgentConnection extends AcpSessionRuntime {
           }
         : {})
     })
+    options.onPhysicalExit?.(managed.exitPromise)
     const lifecycle: { closing: boolean; error?: Error } = { closing: false }
     const diagnose = (message: string): void => {
       try {
diff --git a/src/main/acp/acp-detached-cleanup.test.ts b/src/main/acp/acp-detached-cleanup.test.ts
index ed9317737702..9616e9b4e246 100644
--- a/src/main/acp/acp-detached-cleanup.test.ts
+++ b/src/main/acp/acp-detached-cleanup.test.ts
@@ -29,7 +29,13 @@ it.each(['delivered', 'root-exited', 'unproven', 'error'] as const)(
       vi.spyOn(rig.rig.eventSink, 'tryAppendTransition').mockImplementation((transition) =>
         refuse ? { accepted: false, reason: 'closed' } : append(transition)
       )
-      await rig.acquire()
+      const physical = vi.fn<(exited: Promise<void>) => void>()
+      let exited = false
+      await rig.acquire({ onPhysicalExit: physical })
+      expect(physical).toHaveBeenCalledOnce()
+      void physical.mock.calls[0]![0].then(() => {
+        exited = true
+      })
       const child = rig.child()
       const terminal = outcome === 'delivered' || outcome === 'root-exited'
       Object.defineProperty(child, 'lastCloseResult', {
@@ -87,6 +93,7 @@ it.each(['delivered', 'root-exited', 'unproven', 'error'] as const)(
       expect(rig.ended).toHaveLength(terminal ? 1 : 0)
       if (outcome === 'delivered') {
         expect(rig.ended[0]).toMatchObject({ deathEvidenceKind: 'kill-delivered' })
+        expect(exited).toBe(false)
       }
       if (terminal) {
         await rig.acquire({ fence: 2 })
@@ -96,6 +103,9 @@ it.each(['delivered', 'root-exited', 'unproven', 'error'] as const)(
         child.exit()
         return true
       }
+      child.exit()
+      await Promise.resolve()
+      expect(exited).toBe(true)
       await rig.adapter.closeAll()
     }
   }
diff --git a/src/main/acp/acp-scripted-connection.test-fixture.ts b/src/main/acp/acp-scripted-connection.test-fixture.ts
index 05f15498a1fd..460634482d2b 100644
--- a/src/main/acp/acp-scripted-connection.test-fixture.ts
+++ b/src/main/acp/acp-scripted-connection.test-fixture.ts
@@ -23,6 +23,7 @@ export class FakeAcpChild extends AcpSessionRuntime implements AcpStructuredConn
   private closing = false
   private lostWith: Error | undefined
   private exitedWith: ProviderProcessExit | null = null
+  private readonly physical = Promise.withResolvers<void>()
   closes = 0
 
   constructor(
@@ -38,6 +39,7 @@ export class FakeAcpChild extends AcpSessionRuntime implements AcpStructuredConn
     })
     lifecycle.child = this
     this.agent = agent
+    connectionOptions.onPhysicalExit?.(this.physical.promise)
   }
 
   get exited() {
@@ -78,6 +80,7 @@ export class FakeAcpChild extends AcpSessionRuntime implements AcpStructuredConn
       return
     }
     this.exitedWith = status
+    this.physical.resolve()
     // As the real connection: a spawn ENOENT marks the exit error with what it proved absent.
     const error = withProviderSpawnAbsence(
       this.lostWith ?? new AcpConnectionClosedError(this.stderr || `${this.launch.command} exited`),
diff --git a/src/main/acp/acp-structured-acquire.ts b/src/main/acp/acp-structured-acquire.ts
index 347b21805f3b..d4d286dc5a0e 100644
--- a/src/main/acp/acp-structured-acquire.ts
+++ b/src/main/acp/acp-structured-acquire.ts
@@ -104,6 +104,7 @@ export async function acquireAcpStructuredSession(input: {
     },
     {
       clientInfo: { name: 'orca', version: '1' },
+      onPhysicalExit: acquire.onPhysicalExit,
       ...(spec.signIn ? { signIn: spec.signIn } : {}),
       onPermission: (request, context) => {
         if (!isAcpReadySession(session) || !session.turns?.acceptsRequests) {
diff --git a/src/main/acp/acp-structured-adapter.test-support.ts b/src/main/acp/acp-structured-adapter.test-support.ts
index e79111e348e0..d6fdb3174290 100644
--- a/src/main/acp/acp-structured-adapter.test-support.ts
+++ b/src/main/acp/acp-structured-adapter.test-support.ts
@@ -62,6 +62,7 @@ export type AcpAdapterRig = {
   acquire(options?: {
     fence?: number
     onSpawned?: () => Promise<void>
+    onPhysicalExit?: (exited: Promise<void>) => void
     signal?: AbortSignal
     waitForStart?: boolean
     options?: Readonly<Record<string, string>>
@@ -201,6 +202,7 @@ export async function openAcpAdapterRig(
         fence: acquireOptions.fence ?? 1,
         spawnToken: 'spawn-1',
         events: rig.eventSink,
+        onPhysicalExit: acquireOptions.onPhysicalExit,
         ...(acquireOptions.options ? { options: acquireOptions.options } : {}),
         ...(acquireOptions.signal ? { signal: acquireOptions.signal } : {}),
         ...(acquireOptions.permissionMode ? { permissionMode: acquireOptions.permissionMode } : {}),
diff --git a/src/main/claude/claude-agent-sdk-process-spawn.ts b/src/main/claude/claude-agent-sdk-process-spawn.ts
index 34c9f80856c1..046d902e1b2f 100644
--- a/src/main/claude/claude-agent-sdk-process-spawn.ts
+++ b/src/main/claude/claude-agent-sdk-process-spawn.ts
@@ -33,7 +33,8 @@ function definedEnv(env: Record<string, string | undefined>): Record<string, str
 export function createClaudeCodeProcessSpawn(
   spawnImpl: PipedProcessSpawner = spawnProcess,
   platform: NodeJS.Platform = process.platform,
-  launch?: { pathToClaudeCodeExecutable: string; prefixArgs?: readonly string[] }
+  launch?: { pathToClaudeCodeExecutable: string; prefixArgs?: readonly string[] },
+  onPhysicalExit?: (exited: Promise<void>) => void
 ): ClaudeCodeProcessSpawn {
   let managed: ManagedProviderProcess | null = null
   return {
@@ -58,6 +59,7 @@ export function createClaudeCodeProcessSpawn(
           acceptClose: claudeChildCloseProven
         }
       )
+      onPhysicalExit?.(managed.exitPromise)
       // The SDK drains stderr only for its own local spawn; the managed process drains it here.
       return managed.child
     },
diff --git a/src/main/claude/claude-stream-json-connection.ts b/src/main/claude/claude-stream-json-connection.ts
index 692659d1f9ed..b328036d1862 100644
--- a/src/main/claude/claude-stream-json-connection.ts
+++ b/src/main/claude/claude-stream-json-connection.ts
@@ -60,6 +60,7 @@ function withoutKeys(env: Record<string, string>, keys: readonly string[]): Reco
 }
 
 export type ClaudeStreamJsonConnectionHandlers = {
+  onPhysicalExit?: (exited: Promise<void>) => void
   onMessage?: (message: Record<string, unknown>) => void
   /** The SDK handles request IDs, aborts and deduplication; cannot combine with permissionPromptToolName. */
   canUseTool?: CanUseTool
@@ -99,7 +100,12 @@ export async function openClaudeStreamJsonConnection(
   queryImpl?: typeof ClaudeAgentSdk.query
 ): Promise<ClaudeStreamJsonConnection> {
   const { query } = await loadClaudeAgentSdk()
-  const spawner = createClaudeCodeProcessSpawn(spawnImpl, process.platform, launch)
+  const spawner = createClaudeCodeProcessSpawn(
+    spawnImpl,
+    process.platform,
+    launch,
+    handlers.onPhysicalExit
+  )
   // Always supply scrubbed env to prevent ambient auth leaks; only launch.env may pin CLAUDE_CONFIG_DIR.
   const env = await withoutRejectedClaudeApiKey(
     withoutKeys(
diff --git a/src/main/claude/structured/claude-structured-session-acquisition.ts b/src/main/claude/structured/claude-structured-session-acquisition.ts
index 02c70504f0c5..e865711a07fe 100644
--- a/src/main/claude/structured/claude-structured-session-acquisition.ts
+++ b/src/main/claude/structured/claude-structured-session-acquisition.ts
@@ -202,6 +202,7 @@ export async function acquireClaudeSession({
         },
         {
           onMessage,
+          onPhysicalExit: input.onPhysicalExit,
           canUseTool,
           onUserDialog,
           onFault: (error) => {
diff --git a/src/main/codex/app-server/codex-app-server-connection-types.ts b/src/main/codex/app-server/codex-app-server-connection-types.ts
index e2bfbec67042..bdcd08b9f031 100644
--- a/src/main/codex/app-server/codex-app-server-connection-types.ts
+++ b/src/main/codex/app-server/codex-app-server-connection-types.ts
@@ -5,6 +5,7 @@ export type CodexAppServerServerRequest = {
 }
 
 export type CodexAppServerConnectionHandlers = {
+  onPhysicalExit?: (exited: Promise<void>) => void
   onNotification?: (method: string, params: unknown) => void
   onServerRequest?: (request: CodexAppServerServerRequest) => void
   onUnhandledFrame?: (kind: string, payload: unknown) => void
diff --git a/src/main/codex/codex-app-server-connection.ts b/src/main/codex/codex-app-server-connection.ts
index 921daac89b31..0ebd0529a28d 100644
--- a/src/main/codex/codex-app-server-connection.ts
+++ b/src/main/codex/codex-app-server-connection.ts
@@ -38,6 +38,7 @@ async function connectCodexAppServer(
     site: 'codex-app-server-teardown'
   })
   const { child } = managed
+  handlers.onPhysicalExit?.(managed.exitPromise)
   const tree = createClaudeChildTreeReaper(child, {
     exited: () => managed.rootVerdict === 'exited',
     supervised: managed.supervised
diff --git a/src/main/codex/codex-structured-session-acquire.ts b/src/main/codex/codex-structured-session-acquire.ts
index db193c65adb5..cb5bbccb2592 100644
--- a/src/main/codex/codex-structured-session-acquire.ts
+++ b/src/main/codex/codex-structured-session-acquire.ts
@@ -163,6 +163,7 @@ export async function acquireCodexStructuredSession(input: {
             Buffer.byteLength(JSON.stringify(payload ?? null), 'utf8')
           ),
         onSpawned: spawnIdentity.onSpawned,
+        onPhysicalExit: acquireInput.onPhysicalExit,
         onExit: (error, exit) => {
           acquisition.appliedSettings.end()
           try {
diff --git a/src/main/daemon/daemon-pty-adapter-switch-compatibility.test-fixture.ts b/src/main/daemon/daemon-pty-adapter-switch-compatibility.test-fixture.ts
index a6ab020d40f1..a955970ddad3 100644
--- a/src/main/daemon/daemon-pty-adapter-switch-compatibility.test-fixture.ts
+++ b/src/main/daemon/daemon-pty-adapter-switch-compatibility.test-fixture.ts
@@ -35,14 +35,13 @@ export function registerDaemonSwitchCompatibilityTests(fixture: {
         expect(
           await fixture.adapter.spawn({ sessionId: 'legacy-ordinary', cols: 80, rows: 24 })
         ).toMatchObject({ id: 'legacy-ordinary' })
-        await expect(
-          fixture.adapter.spawn({
-            sessionId: 'switch-destination',
-            cols: 80,
-            rows: 24,
-            switchExecution: { invocationId: 'new-click', ...deadline }
-          })
-        ).resolves.toMatchObject({ id: 'switch-destination' })
+        const switched = await fixture.adapter.spawn({
+          sessionId: 'switch-destination',
+          cols: 80,
+          rows: 24,
+          switchExecution: { invocationId: 'new-click', ...deadline }
+        })
+        expect(switched).toMatchObject({ id: 'switch-destination' })
         expect(spawn).toHaveBeenCalledTimes(2)
         const creates = request.mock.calls.filter(([type]) => type === 'createOrAttach')
         if (protocolVersion < 55) {
@@ -55,7 +54,24 @@ export function registerDaemonSwitchCompatibilityTests(fixture: {
           expect(creates[1]?.[1]).toMatchObject({ switchExecution: { phase: 'prepare' } })
           expect(creates[2]?.[1]).toMatchObject({ switchExecution: { phase: 'commit' } })
         }
-        expect(request.mock.calls.some(([type]) => type === 'cancelCreateOrAttach')).toBe(false)
+        const releases = () =>
+          request.mock.calls.filter(([type]) => type === 'cancelCreateOrAttach')
+        if (protocolVersion < 55) {
+          expect(releases()).toEqual([])
+        } else {
+          await vi.waitFor(() => expect(releases()).toHaveLength(1))
+          expect(releases()[0]?.[1]).toEqual({
+            sessionId: 'switch-destination',
+            requestId: expect.any(String),
+            release: {
+              invocationId: 'new-click',
+              anchor: expect.any(String),
+              endpoint: fixture.adapter.getDaemonIdentity(),
+              outcome: 'adopted',
+              incarnationId: switched.incarnationId
+            }
+          })
+        }
       } finally {
         deadline.dispose()
         request.mockRestore()
diff --git a/src/main/daemon/daemon-pty-daemon-recovery.ts b/src/main/daemon/daemon-pty-daemon-recovery.ts
index 706715a59ec1..06e5e3681896 100644
--- a/src/main/daemon/daemon-pty-daemon-recovery.ts
+++ b/src/main/daemon/daemon-pty-daemon-recovery.ts
@@ -9,11 +9,8 @@ import type { DaemonRespawnReason } from './daemon-pty-runtime-state'
 import type { ListSessionsResult } from './types'
 import type { PtyBackgroundStreamEvent } from '../providers/pty-provider-contract'
 import type { TerminalLimitStatus, TerminalLimitUpdate } from '../../shared/terminal-limit-policy'
-import type { DaemonEndpointIdentity } from './daemon-hello-protocol'
 
 export abstract class DaemonPtyDaemonRecovery extends DaemonPtyCheckpointPersistence {
-  abstract getDaemonIdentity(): DaemonEndpointIdentity | null
-
   async terminalLimit(update?: TerminalLimitUpdate): Promise<TerminalLimitStatus | null> {
     await this.ensureConnected()
     const identity = this.getDaemonIdentity()
diff --git a/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts b/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts
index b1c2ae09bad8..defbbe82baa1 100644
--- a/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts
+++ b/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts
@@ -254,9 +254,9 @@ describe('Windows shell fallback over node-pty ConPTY', () => {
     nodePty.spawn.mockReturnValueOnce(broken).mockImplementationOnce(() => {
       throw new Error('retry exported no handle')
     })
-    await expect(spawnNativeDaemonPty({ ...args, creationWork })).rejects.toThrow(
-      'retry exported no handle'
-    )
+    await expect(
+      spawnNativeDaemonPty({ ...args, windowsFallbackAttempts: attempts.slice(0, 1), creationWork })
+    ).rejects.toThrow('retry exported no handle')
     await creationWork.finish()
     const disposition = await creationWork.completion
     if (disposition.kind !== 'failed') {
diff --git a/src/main/ipc/pty/ipc/spawn-commit-run-facts.test.ts b/src/main/ipc/pty/ipc/spawn-commit-run-facts.test.ts
index d70a3556b618..26a5a2614fc5 100644
--- a/src/main/ipc/pty/ipc/spawn-commit-run-facts.test.ts
+++ b/src/main/ipc/pty/ipc/spawn-commit-run-facts.test.ts
@@ -7,11 +7,13 @@ import { ptyIncarnationById, ptyOwnership } from '../provider/ownership-state'
 import { commitPtyIpcSpawn } from './spawn-commit'
 import { createPtyIpcSpawnState } from './spawn-state'
 import type { PtySpawnIpcDeps } from './spawn-types'
+import { createPaneBindingStore } from '../pty-launch-race-test-fixture'
 
 vi.mock('../../../../shared/layout-owner-switch', () => ({ ORCA_LAYOUT_OWNER_IS_MAIN: true }))
 
 const PTY_ID = 'orca-ipc-pty-run-facts'
 const INCARNATION_ID = 'inc-ipc-run-facts'
+const LEAF_ID = 'a1111111-1111-4111-8111-111111111111'
 
 async function commit(
   persistPtyBinding: ReturnType<typeof vi.fn>,
@@ -20,6 +22,14 @@ async function commit(
   const facts = new TerminalRunFactsRegister()
   const stops = new TerminalIntentionalStops()
   stops.mark(PTY_ID, 'reversible', null)(true)
+  const store = createPaneBindingStore()
+  const saveBinding = store.persistPtyBinding.getMockImplementation()!
+  store.persistPtyBinding.mockImplementation(async (input) => {
+    if ((await persistPtyBinding(input)) === false) {
+      return false
+    }
+    return saveBinding(input)
+  })
   const runtime = {
     terminalRunFacts: facts,
     intentionalPtyStops: stops,
@@ -34,7 +44,7 @@ async function commit(
   }
   const ports = {
     runtime,
-    store: { persistPtyBinding },
+    store,
     options: {},
     sendPtySpawnedToRenderer: vi.fn()
   }
@@ -43,11 +53,11 @@ async function commit(
   const ctx = createPtyIpcSpawnState(deps, {
     worktreeId: 'wt-1',
     tabId: 'tab-1',
-    leafId: 'leaf-1',
+    leafId: LEAF_ID,
     cols: 120,
     rows: 40
   })
-  ctx.validatedLeafId = 'leaf-1'
+  ctx.validatedLeafId = LEAF_ID
   ctx.provider = { ...ctx.provider, shutdown: vi.fn().mockResolvedValue(undefined) }
   ctx.result = { id: PTY_ID, incarnationId: INCARNATION_ID }
   prepare?.(ctx)
@@ -87,7 +97,7 @@ describe('renderer spawn commit: run facts', () => {
       const { outcome, reply } = await commit(vi.fn().mockResolvedValue(true), (ctx) => {
         ctx.resumeAdmission = { verdict: 'chat-home', refused }
         if (earlyExit) {
-          ctx.metadataLeafId = 'leaf-1'
+          ctx.metadataLeafId = LEAF_ID
           ctx.deps.runtime!.getPtyLivenessVerdict = vi.fn(() => ({ status: 'exited' as const }))
           ctx.deps.store!.runDurableMutation = vi.fn().mockResolvedValue(true)
           ctx.deps.runtime!.registerPty = vi.fn(() => {
diff --git a/src/main/ipc/pty/pty-launch-race-parity.test.ts b/src/main/ipc/pty/pty-launch-race-parity.test.ts
index a2a8edb1c959..463efe6b9179 100644
--- a/src/main/ipc/pty/pty-launch-race-parity.test.ts
+++ b/src/main/ipc/pty/pty-launch-race-parity.test.ts
@@ -717,11 +717,14 @@ describe('launch race parity, both spawn lanes', () => {
           shutdown
         })
         const runtime = createLaunchRaceRuntime()
-        const store = {
-          persistPtyBinding: vi.fn(async () => {
-            throw new Error('disk full')
-          })
-        }
+        const store = createPaneBindingStore()
+        await store.admitTerminalPane({
+          type: 'createTerminalTab',
+          workspace: pane.worktreeId,
+          tabId: pane.tabId,
+          leafId: pane.leafId
+        })
+        store.persistPtyBinding.mockRejectedValue(new Error('disk full'))
         const lanes = registerLaunchRaceLanes({ handlers, mainWindow, runtime, store })
         forgetPtyAfterTest(ptyId)
 
diff --git a/src/main/ipc/pty/pty-pane-materialization-race.test.ts b/src/main/ipc/pty/pty-pane-materialization-race.test.ts
index 090ba86f516e..75da5d3ff8ec 100644
--- a/src/main/ipc/pty/pty-pane-materialization-race.test.ts
+++ b/src/main/ipc/pty/pty-pane-materialization-race.test.ts
@@ -9,6 +9,7 @@ import { makePaneKey } from '../../../shared/stable-pane-id'
 import { registerPtyHandlers } from './register-handlers'
 import { getPtyIdForPaneKey } from './pane/key-state'
 import { setLocalPtyProvider } from './provider/registry'
+import { createPaneBindingStore } from './pty-launch-race-test-fixture'
 
 vi.mock('electron', () => import('./pty-ipc-mock-registry').then((m) => m.electronModuleMock()))
 vi.mock('fs', () => import('./pty-ipc-mock-registry').then((m) => m.fsModuleMock()))
@@ -312,9 +313,7 @@ describe('registerPtyHandlers', () => {
       getDefaultShell: vi.fn(),
       getProfiles: vi.fn()
     } as never)
-    const store = {
-      persistPtyBinding: vi.fn()
-    }
+    const store = createPaneBindingStore()
     let registeredPane: { ptyId: string; tabId: string; leafId: string } | null = null
     let controller: RuntimeSpawnController | null = null
     const runtime = {
@@ -509,12 +508,18 @@ describe('registerPtyHandlers', () => {
         projectGroupId: 'folder-group'
       }
       const store = {
-        persistPtyBinding: vi.fn(),
+        ...createPaneBindingStore(),
         getFolderWorkspace: vi.fn(() => folderWorkspace),
         getFolderWorkspaces: vi.fn(() => [folderWorkspace]),
         getProjectGroups: vi.fn(() => []),
         getRepos: vi.fn(() => [])
       }
+      await store.admitTerminalPane({
+        type: 'createTerminalTab',
+        workspace: worktreeId,
+        tabId,
+        leafId
+      })
       const prepareClaudeAuth = vi.fn(() => {
         throw new Error('replacement auth preflight must not run')
       })
diff --git a/src/main/ipc/pty/runtime/spawn-commit-run-facts.test.ts b/src/main/ipc/pty/runtime/spawn-commit-run-facts.test.ts
index e18292ef4aee..a223e97b68ea 100644
--- a/src/main/ipc/pty/runtime/spawn-commit-run-facts.test.ts
+++ b/src/main/ipc/pty/runtime/spawn-commit-run-facts.test.ts
@@ -8,9 +8,11 @@ import { ptyIncarnationById, ptyOwnership } from '../provider/ownership-state'
 import { commitRuntimePtySpawn } from './spawn-commit'
 import { createRuntimePtySpawnState, type RuntimePtySpawnArgs } from './spawn-state'
 import type { PtyRuntimeControllerDeps } from './controller-deps'
+import { createPaneBindingStore } from '../pty-launch-race-test-fixture'
 
 const PTY_ID = 'orca-pty-run-facts'
 const INCARNATION_ID = 'inc-run-facts'
+const LEAF_ID = 'b1111111-1111-4111-8111-111111111111'
 
 const ADOPTED = {
   disposition: 'adopted',
@@ -19,7 +21,7 @@ const ADOPTED = {
     generation: 'g1',
     phase: 'live',
     ptyId: PTY_ID,
-    surface: { worktreeId: 'wt-1', tabId: 'tab-1', leafId: 'leaf-1', terminalHandle: 'h1' }
+    surface: { worktreeId: 'wt-1', tabId: 'tab-1', leafId: LEAF_ID, terminalHandle: 'h1' }
   }
 }
 
@@ -116,7 +118,15 @@ describe('runtime spawn commit: run facts', () => {
     'reports unavailable before binding even when the request was erased (%s)',
     async (erased) => {
       const onResumeOutcome = vi.fn()
-      const persistPtyBinding = vi.fn(async () => {
+      const store = createPaneBindingStore()
+      await store.admitTerminalPane({
+        type: 'createTerminalTab',
+        workspace: 'wt-1',
+        tabId: 'tab-1',
+        leafId: LEAF_ID
+      })
+      const persistPtyBinding = store.persistPtyBinding
+      store.bindingWrites.mockImplementation(() => {
         expect(onResumeOutcome.mock.calls).toEqual(
           ORCA_LAYOUT_OWNER_IS_MAIN ? [[PTY_ID, 'resume-unavailable']] : []
         )
@@ -132,13 +142,11 @@ describe('runtime spawn commit: run facts', () => {
         ctx.codexResumeUnavailable = !erased
         ctx.codexResumeArgvDropped = true
         ctx.hostSessionBinding = {
-          // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: this boundary pin observes the bind write without invoking its stored callback.
-          store: { persistPtyBinding } as unknown as NonNullable<
-            typeof ctx.hostSessionBinding
-          >['store'],
+          // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the fixture supplies the binding session and durable callback contract used here.
+          store: store as unknown as NonNullable<typeof ctx.hostSessionBinding>['store'],
           worktreeId: 'wt-1',
           tabId: 'tab-1',
-          leafId: 'leaf-1'
+          leafId: LEAF_ID
         }
       })
 
@@ -150,19 +158,24 @@ describe('runtime spawn commit: run facts', () => {
     const facts = new TerminalRunFactsRegister()
     const stops = new TerminalIntentionalStops()
     stops.mark(PTY_ID, 'reversible', null)(true)
-    const persistPtyBinding = vi.fn().mockRejectedValue(new Error('disk full'))
+    const store = createPaneBindingStore()
+    await store.admitTerminalPane({
+      type: 'createTerminalTab',
+      workspace: 'wt-1',
+      tabId: 'tab-1',
+      leafId: LEAF_ID
+    })
+    const persistPtyBinding = store.persistPtyBinding.mockRejectedValue(new Error('disk full'))
 
     await expect(
       commit({}, facts, stops, (ctx) => {
         ctx.provider = { ...ctx.provider, shutdown: vi.fn().mockResolvedValue(undefined) }
         ctx.hostSessionBinding = {
-          // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the commit calls only persistPtyBinding on this store.
-          store: { persistPtyBinding } as unknown as NonNullable<
-            typeof ctx.hostSessionBinding
-          >['store'],
+          // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the fixture supplies the binding session and failing durable writer used here.
+          store: store as unknown as NonNullable<typeof ctx.hostSessionBinding>['store'],
           worktreeId: 'wt-1',
           tabId: 'tab-1',
-          leafId: 'leaf-1'
+          leafId: LEAF_ID
         }
       })
     ).rejects.toThrow()
diff --git a/src/main/jsonl-rpc/agent-connection.ts b/src/main/jsonl-rpc/agent-connection.ts
index 9d5a9750cbf1..66fdfd0c2413 100644
--- a/src/main/jsonl-rpc/agent-connection.ts
+++ b/src/main/jsonl-rpc/agent-connection.ts
@@ -24,6 +24,7 @@ import { resolveJsonlRpcPeerOptions, type JsonlRpcPeerOptions } from './peer-lim
 export type JsonlRpcAgentConnectionOptions = JsonlRpcPeerHandlers & {
   peer?: JsonlRpcPeerOptions
   onExit?: (error: Error, context: { expected: boolean; exit: ProviderProcessExit }) => void
+  onPhysicalExit?: (exited: Promise<void>) => void
 }
 
 /** The owning runtime keeps process exit evidence separate from transport closure. */
@@ -45,6 +46,7 @@ export class JsonlRpcAgentConnection {
       site: 'jsonl-rpc-agent-teardown'
     })
     const managed = this.managed
+    options.onPhysicalExit?.(managed.exitPromise)
     this.peer = new JsonlRpcPeer(
       managed.child.stdout,
       managed.child.stdin,
diff --git a/src/main/native-chat/agent-session-journal/journal-legacy-import-record-bound.test.ts b/src/main/native-chat/agent-session-journal/journal-legacy-import-record-bound.test.ts
index 9490ded3d07a..54cbd78bf640 100644
--- a/src/main/native-chat/agent-session-journal/journal-legacy-import-record-bound.test.ts
+++ b/src/main/native-chat/agent-session-journal/journal-legacy-import-record-bound.test.ts
@@ -61,7 +61,7 @@ it('streams a valid source past 128 MiB, retaining recent bounded history and cl
         payload: {
           type: 'message',
           role: 'assistant',
-          content: [{ type: 'output_text', text: 'recent answer' }]
+          content: [{ type: 'text', text: 'recent answer' }]
         }
       })}\n`
     )
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition.ts
index 58c1b7d3ffa9..f946c28ee779 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition.ts
@@ -23,6 +23,41 @@ function sameOwnerProcess(
   return isDeepStrictEqual(storedProcess, acquiredProcess)
 }
 
+/** Exit continuations retain only completions, never the attach request or its environment. */
+function physicalAcquisition() {
+  const physical = Promise.withResolvers<void>()
+  let acquiring = true
+  let observedOwner = false
+  let processless = false
+  let pendingOwners = 0
+  const settle = (): void => {
+    if (!acquiring && pendingOwners === 0 && (observedOwner || processless)) {
+      physical.resolve()
+    }
+  }
+  return {
+    promise: physical.promise,
+    observe: (exited: Promise<void>) => {
+      observedOwner = true
+      pendingOwners++
+      void exited.then(
+        () => {
+          pendingOwners--
+          settle()
+        },
+        () => {}
+      )
+    },
+    processless: () => {
+      processless = true
+    },
+    settled: () => {
+      acquiring = false
+      settle()
+    }
+  }
+}
+
 /** Spawn makes a reservation real; the store grants write authority afterward. */
 export async function acquireOwner(
   input: AttachFlowInput,
@@ -36,45 +71,56 @@ export async function acquireOwner(
   if (!spawnToken) {
     throw new Error('agent_session_ownership_unknown')
   }
+  const physical = physicalAcquisition()
+  input.onPhysicalExit?.(physical.promise)
   try {
+    let attempt: ReturnType<typeof mintStructuredAgentSessionStartupAttempt>
+    let progress: ReturnType<NonNullable<AttachFlowInput['onStartupAttempt']>> | undefined
     try {
-      await input.onAcquiring?.()
-    } catch (error) {
-      throw new AgentSessionPreSpawnError(error)
-    }
-    const permissionMode = await input.launchPermissionMode?.(record)
-    try {
-      await input.assertNoTerminalWriter?.(record)
-    } catch (error) {
-      // Not a code: a code message would travel as the census's own conflict, not this reason.
-      throw new AgentSessionPreSpawnError(error, {
-        reason: 'conversationOpenInTerminal',
-        message: 'a terminal may still be writing this conversation'
+      try {
+        await input.onAcquiring?.()
+      } catch (error) {
+        throw new AgentSessionPreSpawnError(error)
+      }
+      const permissionMode = await input.launchPermissionMode?.(record)
+      try {
+        await input.assertNoTerminalWriter?.(record)
+      } catch (error) {
+        // Not a code: a code message would travel as the census's own conflict, not this reason.
+        throw new AgentSessionPreSpawnError(error, {
+          reason: 'conversationOpenInTerminal',
+          message: 'a terminal may still be writing this conversation'
+        })
+      }
+      // Right before the spawn: a close, Stop or quit that landed during any wait above launches nothing.
+      if (input.acquireSignal?.aborted) {
+        throw new AgentSessionPreSpawnError(abortSignalReason(input.acquireSignal))
+      }
+      try {
+        input.checkBeforeAcquire?.()
+      } catch (error) {
+        throw new AgentSessionPreSpawnError(error)
+      }
+      attempt = mintStructuredAgentSessionStartupAttempt({
+        record,
+        identity: journalIdentityFor(record, input.params),
+        // Retry the existing reservation instead of spawning a second child.
+        spawnToken,
+        ...(permissionMode ? { permissionMode } : {}),
+        ...(input.eventSink ? { events: input.eventSink } : {}),
+        ...(input.acquireSignal ? { signal: input.acquireSignal } : {}),
+        ...(input.startupOptions ? { startupOptions: input.startupOptions } : {}),
+        ...(input.startupAttemptId ? { attemptId: input.startupAttemptId } : {})
       })
-    }
-    // Right before the spawn: a close, Stop or quit that landed during any wait above launches nothing.
-    if (input.acquireSignal?.aborted) {
-      throw new AgentSessionPreSpawnError(abortSignalReason(input.acquireSignal))
-    }
-    try {
-      input.checkBeforeAcquire?.()
+      progress = input.onStartupAttempt?.(attempt)
     } catch (error) {
-      throw new AgentSessionPreSpawnError(error)
+      // Adapter entry has not happened; preserve the error's ordinary cleanup classification.
+      physical.processless()
+      throw error
     }
-    const attempt = mintStructuredAgentSessionStartupAttempt({
-      record,
-      identity: journalIdentityFor(record, input.params),
-      // Retry the existing reservation instead of spawning a second child.
-      spawnToken,
-      ...(permissionMode ? { permissionMode } : {}),
-      ...(input.eventSink ? { events: input.eventSink } : {}),
-      ...(input.acquireSignal ? { signal: input.acquireSignal } : {}),
-      ...(input.startupOptions ? { startupOptions: input.startupOptions } : {}),
-      ...(input.startupAttemptId ? { attemptId: input.startupAttemptId } : {})
-    })
-    const progress = input.onStartupAttempt?.(attempt)
     const acquired = await input.adapter.acquire({
       ...attempt,
+      onPhysicalExit: physical.observe,
       checkBeforeSpawn: input.checkBeforeAcquire,
       ...(input.recordPhase ? { recordPhase: input.recordPhase } : {}),
       onSpawned: async (process) => {
@@ -109,8 +155,11 @@ export async function acquireOwner(
     return { record: proved, acquisitionGeneration: acquired.acquisitionGeneration }
   } catch (error) {
     if (isAgentSessionPreSpawnError(error)) {
+      physical.processless()
       throw error
     }
     return rethrowAfterAgentSessionAcquisitionCleanup(input.adapter, record.sessionId, error)
+  } finally {
+    physical.settled()
   }
 }
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 094840088326..3ea66105a4a7 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
@@ -155,6 +155,8 @@ export type StructuredAgentSessionAcquireInput = Pick<
   Partial<Omit<StructuredAgentSessionStartupAttempt, 'identity' | 'fence' | 'spawnToken'>> & {
     checkBeforeSpawn?: () => void
     recordPhase?: AgentSessionCreatePhaseRecorder
+    /** Exact managed-root completion, independent of logical writer retirement. */
+    onPhysicalExit?: (exited: Promise<void>) => void
     /** Persist process identity before handshake so mid-start crashes leave a recoverable owner; returned process must match. */
     onSpawned?: (process: AgentSessionProcessIdentity) => Promise<void>
   }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-attach-flow.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-attach-flow.ts
index 3234aefd89b4..09670cf1e305 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-attach-flow.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-attach-flow.ts
@@ -96,6 +96,7 @@ export type AttachFlowInput = {
   eventSink?: StructuredAgentSessionEventSink
   /** Prevent acquisition-window events from reaching superseded journals. */
   onAcquiring?: () => Promise<void> | void
+  onPhysicalExit?: (exited: Promise<void>) => void
   /** Refuses the spawn while a terminal may still be writing the record's conversation. */
   assertNoTerminalWriter?: (record: AgentSessionRecord) => Promise<void>
   /** Settles writes already captured by the superseded journal before opening another. */
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-attach-orchestration.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-attach-orchestration.ts
index c43b2078f65d..1b073319554b 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-attach-orchestration.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-attach-orchestration.ts
@@ -192,6 +192,12 @@ async function runAttachUnderAbort(
       models: priorRecord ? undefined : options.catalogModels,
       store: context.deps.store,
       adapter: context.deps.adapter,
+      onPhysicalExit: (exited) =>
+        context.runtimeState.startFlights.observePhysicalExit(
+          sessionId,
+          exited,
+          priorDeathEvidence?.kind !== 'kill-delivered'
+        ),
       agents: context.deps.agents,
       logger: context.deps.logger,
       eventSink: attemptSink.sink,
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
index bace6560a316..42c641d85288 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
@@ -191,6 +191,8 @@ export class StructuredAgentSessionHost extends StructuredAgentSessionHostContex
       deps: this.deps,
       cancel: this.cancel,
       switchGeneration: this.switchGeneration,
+      guardSwitchWork: this.guardSwitchWork,
+      startFlights: this.runtimeState.startFlights,
       now: this.now,
       lifetime: this.lifetime,
       sessions: this.sessions,
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-rest-test-rig.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-rest-test-rig.ts
index 79d0335ac40a..31e031ac4887 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-rest-test-rig.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-rest-test-rig.ts
@@ -145,24 +145,34 @@ export async function createRestTestRig(
     readChildWork: vi.fn((): AgentChildWorkView[] => [])
   }
   let store = await openTestAgentSessionRecordStore(root)
+  const physical = new Map<string, ReturnType<typeof Promise.withResolvers<void>>>()
   const adapter: RestTestAdapter = {
     open: async () => ({
       reportedOptions: { model: '' }
     }),
-    acquire: vi.fn(async ({ fence, spawnToken }) => ({
-      acquisitionGeneration: `generation-${++generations}`,
-      process: { hostId: 'local', pid: 4242, processStartTimeMs: 1_700_000_000_000, spawnToken },
-      link: {
-        linkId: `link-${fence}`,
-        handle: codexProviderHandle(THREAD),
-        origin: store.getRecord(SESSION)?.providerHandleChain.length
-          ? ('resumed' as const)
-          : ('created' as const),
-        mintedAtFence: fence,
-        observedAt: clock.now
+    acquire: vi.fn(async ({ identity, fence, spawnToken, onPhysicalExit }) => {
+      const exited = Promise.withResolvers<void>()
+      physical.set(identity.sessionId, exited)
+      onPhysicalExit?.(exited.promise)
+      return {
+        acquisitionGeneration: `generation-${++generations}`,
+        process: { hostId: 'local', pid: 4242, processStartTimeMs: 1_700_000_000_000, spawnToken },
+        link: {
+          linkId: `link-${fence}`,
+          handle: codexProviderHandle(THREAD),
+          origin: store.getRecord(SESSION)?.providerHandleChain.length
+            ? ('resumed' as const)
+            : ('created' as const),
+          mintedAtFence: fence,
+          observedAt: clock.now
+        }
       }
-    })),
-    closeSession: vi.fn(async () => true),
+    }),
+    closeSession: vi.fn(async (sessionId) => {
+      physical.get(sessionId)?.resolve()
+      physical.delete(sessionId)
+      return true
+    }),
     dispatch: vi.fn(async () => acceptedDispatch()),
     acknowledgeSessionRelease: vi.fn(),
     holdsDispatch: vi.fn(() => false),
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-start-flight.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-start-flight.ts
index 5b98a6ed0141..85d6e40f992b 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-start-flight.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-start-flight.ts
@@ -7,6 +7,7 @@ import type { StructuredAgentSessionEndedEvent } from './structured-agent-sessio
 import { sameProviderChild } from './structured-agent-session-provider-child'
 import type { StructuredAgentSessionProviderChildIdentity } from './structured-agent-session-host-types'
 import type { StructuredAgentSessionResumeOutcome } from './structured-agent-session-agent-start'
+import { agentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
 
 export type StructuredAgentSessionStartFlight = {
   readonly abort: () => void
@@ -21,6 +22,41 @@ export class StructuredAgentSessionStartFlights {
   private readonly flying = new Map<string, StructuredAgentSessionStartFlight>()
   /** Buffer exits before child publication. */
   private readonly exits = new Map<string, StructuredAgentSessionEndedEvent[]>()
+  private readonly physical = new Map<string, { owners: Set<Promise<void>>; covered: boolean }>()
+
+  observePhysicalExit(sessionId: string, exited: Promise<void>, priorRootProven: boolean): void {
+    let history = this.physical.get(sessionId)
+    if (!history) {
+      history = { owners: new Set(), covered: priorRootProven }
+      this.physical.set(sessionId, history)
+    }
+    const owners = history.owners
+    owners.add(exited)
+    const captured = owners
+    void exited.then(
+      () => captured.delete(exited),
+      () => {}
+    )
+  }
+
+  /** Empty coverage survives handle eviction; completed process graphs do not. */
+  physicalExit(sessionId: string, retiredWithoutRoot: boolean) {
+    return {
+      wait: (): Promise<void> => {
+        const history = this.physical.get(sessionId)
+        if (history ? !history.covered : retiredWithoutRoot) {
+          throw agentSessionRefusalError('agent_session_ownership_unknown', {
+            reason: 'ownerUnproven'
+          })
+        }
+        return Promise.all(history?.owners ?? []).then(() => {})
+      },
+      current: (): boolean => {
+        const history = this.physical.get(sessionId)
+        return history ? history.covered && history.owners.size === 0 : !retiredWithoutRoot
+      }
+    }
+  }
 
   get(sessionId: string): StructuredAgentSessionStartFlight | undefined {
     return this.flying.get(sessionId)
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts
index 4eca75f26728..6ad0a29ca6b1 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts
@@ -17,11 +17,13 @@ import type { AgentSessionSwitchDeadline } from '../../../shared/agent-session-s
 import type { StructuredAgentSessionHost } from './structured-agent-session-host'
 import type { StructuredAgentSessionConversationLifetimeHost } from './structured-agent-session-conversation-lifetime-host'
 import type { StructuredAgentSessionConversationLifetime } from './structured-agent-session-conversation-lifetime'
+import type { StructuredAgentSessionStartFlights } from './structured-agent-session-start-flight'
 type SwitchSourceContext = Pick<
   StructuredAgentSessionHost,
-  'deps' | 'cancel' | 'switchGeneration'
+  'deps' | 'cancel' | 'switchGeneration' | 'guardSwitchWork'
 > & {
   now: () => number
+  startFlights: Pick<StructuredAgentSessionStartFlights, 'physicalExit'>
   lifetime: Pick<StructuredAgentSessionConversationLifetime, 'conversation' | 'stopAgent'>
   sessions: StructuredAgentSessionConversationLifetimeHost['sessions']
   serialize: StructuredAgentSessionConversationLifetimeHost['serialize']
@@ -55,6 +57,12 @@ export function structuredAgentSessionSwitchSource(context: SwitchSourceContext)
       let admitted = context.deps.store.admittedSendCount(sessionId)
       let accepted = false
       const command = context.switchGeneration(sessionId)
+      const workCurrent = () =>
+        !deadline.signal.aborted &&
+        deadline.remaining() > 0 &&
+        context.deps.store.admittedSendCount(sessionId) === admitted &&
+        context.switchGeneration(sessionId) === command
+      context.guardSwitchWork(sessionId, workCurrent)
       const record = context.deps.store.getRecord(sessionId)
       if (!record) {
         throw agentSessionRefusalError('agent_session_identity_required', {
@@ -93,10 +101,12 @@ export function structuredAgentSessionSwitchSource(context: SwitchSourceContext)
         if (!answer.ok) {
           throw new AgentSessionRefusalError(answer.refusal)
         }
-        await context.serialize(sessionId, async () => {
+        const source = await context.serialize(sessionId, async () => {
+          deadline.check()
           const current = context.sessions.get(sessionId)?.child
           if (
             context.deps.store.admittedSendCount(sessionId) !== admitted ||
+            context.switchGeneration(sessionId) !== command ||
             (current && current !== child)
           ) {
             throw agentSessionRefusalError('agent_session_operation_invalid', {
@@ -127,8 +137,41 @@ export function structuredAgentSessionSwitchSource(context: SwitchSourceContext)
               reason: 'ownerUnproven'
             })
           }
+          const physical = context.startFlights.physicalExit(
+            sessionId,
+            lease.deathEvidence?.kind === 'kill-delivered'
+          )
+          return { physical }
         })
+        // Source completion cannot occupy the serializer or the destination-work barrier.
+        for (;;) {
+          await deadline.wait(source.physical.wait())
+          const complete = await context.serialize(sessionId, async () => {
+            deadline.check()
+            const current = context.sessions.get(sessionId)?.child
+            if (
+              context.deps.store.admittedSendCount(sessionId) !== admitted ||
+              context.switchGeneration(sessionId) !== command ||
+              (current && current !== child)
+            ) {
+              throw agentSessionRefusalError('agent_session_operation_invalid', {
+                reason: 'messagesUnsettled'
+              })
+            }
+            const lease = context.deps.store.getRecord(sessionId)?.lease
+            if (!lease || agentSessionLeasePossiblyWriting(lease)) {
+              throw agentSessionRefusalError('agent_session_ownership_unknown', {
+                reason: 'ownerUnproven'
+              })
+            }
+            return source.physical.current()
+          })
+          if (complete) {
+            break
+          }
+        }
         proven = true
+        return () => workCurrent() && source.physical.current()
       } finally {
         try {
           settleWorker?.(proven)
@@ -140,12 +183,6 @@ export function structuredAgentSessionSwitchSource(context: SwitchSourceContext)
           })
         }
       }
-
-      return () =>
-        !deadline.signal.aborted &&
-        deadline.remaining() > 0 &&
-        context.deps.store.admittedSendCount(sessionId) === admitted &&
-        context.switchGeneration(sessionId) === command
     },
     refreshSwitchTranscript: async (
       sessionId: string,
diff --git a/src/main/native-chat/transcript-line-decoders-codex.ts b/src/main/native-chat/transcript-line-decoders-codex.ts
index 96c21824277b..ec388e48df23 100644
--- a/src/main/native-chat/transcript-line-decoders-codex.ts
+++ b/src/main/native-chat/transcript-line-decoders-codex.ts
@@ -48,12 +48,7 @@ export function decodeCodexTranscriptLine(
   const baseId = extractString(payload.id) ?? fallbackId
 
   if (record.type === 'response_item') {
-    return codexResponseItem(
-      payload,
-      baseId,
-      timestamp,
-      options?.historyImport ? codexTurnItemBlocks : claudeContentBlocks
-    )
+    return codexResponseItem(payload, baseId, timestamp)
   }
   if (record.type === 'event_msg') {
     return codexEventMessage(payload, baseId, timestamp, options?.historyImport === true)
@@ -79,8 +74,7 @@ function codexUnwrappedResponseItem(
 function codexResponseItem(
   payload: Record<string, unknown>,
   id: string,
-  timestamp: number | null,
-  decodeMessageBlocks = claudeContentBlocks
+  timestamp: number | null
 ): NativeChatMessage | null {
   if (payload.type === 'message') {
     const role =
@@ -88,7 +82,7 @@ function codexResponseItem(
     if (!role) {
       return null
     }
-    const decodedBlocks = decodeMessageBlocks(payload.content)
+    const decodedBlocks = claudeContentBlocks(payload.content)
     const blocks =
       role === 'user' ? decodedBlocks.filter((block) => !isSkillContext(block)) : decodedBlocks
     if (blocks.length === 0) {
@@ -230,20 +224,11 @@ function codexCompactionMarker(id: string, timestamp: number | null): NativeChat
 }
 
 function codexTurnItemBlocks(content: unknown): NativeChatBlock[] {
-  if (typeof content === 'string') {
-    return content.trim() ? [{ type: 'text', text: content }] : []
-  }
   if (!Array.isArray(content)) {
     return []
   }
   const blocks: NativeChatBlock[] = []
   for (const value of content) {
-    if (typeof value === 'string') {
-      if (value.trim()) {
-        blocks.push({ type: 'text', text: value })
-      }
-      continue
-    }
     const item = asRecord(value)
     if (!item) {
       continue
diff --git a/src/main/pi/rpc-session.ts b/src/main/pi/rpc-session.ts
index 0b95575eaa90..280436c74b55 100644
--- a/src/main/pi/rpc-session.ts
+++ b/src/main/pi/rpc-session.ts
@@ -132,6 +132,7 @@ export class PiRpcSession {
     this.connection = (
       deps.openConnection ?? ((spec, handlers) => new JsonlRpcAgentConnection(spec, handlers))
     )(launch, {
+      onPhysicalExit: input.onPhysicalExit,
       onRecord: (frame) =>
         frame.type === 'extension_ui_request'
           ? this.dialogs.receive(frame)
diff --git a/src/main/runtime/orca-runtime-structured-agent-session-create-intent.test.ts b/src/main/runtime/orca-runtime-structured-agent-session-create-intent.test.ts
index cdd63546c65d..453f768b321e 100644
--- a/src/main/runtime/orca-runtime-structured-agent-session-create-intent.test.ts
+++ b/src/main/runtime/orca-runtime-structured-agent-session-create-intent.test.ts
@@ -525,8 +525,7 @@ describe('adopting a conversation recorded outside Orca', () => {
         transcriptPath: file,
         source: {
           providerSessionId: '0198c2a4-7d1e-7c3a-9a4b-1f2e3d4c5b6a',
-          workspaceCwd: '/repos/workspace-1',
-          conversationStore: accountHome
+          workspaceCwd: '/repos/workspace-1'
         }
       })
 
diff --git a/src/main/runtime/orchestration/structured-worker-switch-stop.test.ts b/src/main/runtime/orchestration/structured-worker-switch-stop.test.ts
index f6d9bab3902a..15d32a517289 100644
--- a/src/main/runtime/orchestration/structured-worker-switch-stop.test.ts
+++ b/src/main/runtime/orchestration/structured-worker-switch-stop.test.ts
@@ -75,9 +75,10 @@ it.each([false, true])(
     db.markWorkerDispatchReady(dispatch.id)
     const entered = Promise.withResolvers<void>()
     const exit = Promise.withResolvers<boolean>()
-    rig.adapter.closeSession.mockImplementation(async () => {
+    const close = rig.adapter.closeSession.getMockImplementation()!
+    rig.adapter.closeSession.mockImplementation(async (...args) => {
       entered.resolve()
-      return exit.promise
+      return (await exit.promise) ? close(...args) : false
     })
     const stopping = rig.host.stopForSwitch(id, caller, deadline)
     const observed = stopping.then(
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
index f6a4fd6f06f0..6afe32307945 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
@@ -25,6 +25,7 @@ import {
 } from '../../main-owned-workspace-runtime-fixture'
 import { executeStructuredSessionSwitch } from './structured-agent-session-switch-execution'
 import { DaemonRequestTimeoutError } from '../../../daemon/daemon-errors'
+import type { RuntimeMobileSessionTerminalTab } from '../../../../shared/runtime-mobile-session-tab-contracts'
 
 let rig: RestTestRig
 beforeEach(async () => {
@@ -62,11 +63,10 @@ async function savedTranscript() {
         payload: { type: 'task_started', turn_id: 'cli-turn' }
       },
       {
-        type: 'response_item',
+        type: 'event_msg',
         payload: {
-          type: 'message',
-          role: 'user',
-          content: [{ type: 'input_text', text: 'A terminal prompt' }]
+          type: 'user_message',
+          message: 'A terminal prompt'
         }
       },
       {
@@ -294,10 +294,11 @@ it.each([
     await rig.host.switchToChat(id)
     const stopping = Promise.withResolvers<void>()
     const stopped = Promise.withResolvers<void>()
-    rig.adapter.closeSession.mockImplementation(async () => {
+    const close = rig.adapter.closeSession.getMockImplementation()!
+    rig.adapter.closeSession.mockImplementation(async (...args) => {
       stopping.resolve()
       await stopped.promise
-      return true
+      return close(...args)
     })
     const spawn = vi
       .spyOn(runtime, 'createTerminal')
@@ -379,8 +380,10 @@ it.each([
     )
     if (viewerSelection) {
       expect(
-        snapshot.tabs.find((tab) => tab.type === 'terminal' && tab.ptyId === 'switch-destination')
-          ?.openPlacement
+        snapshot.tabs.find(
+          (tab): tab is RuntimeMobileSessionTerminalTab =>
+            tab.type === 'terminal' && tab.ptyId === 'switch-destination'
+        )?.openPlacement
       ).toMatchObject({
         activate: true,
         viewerSelection
diff --git a/src/main/runtime/runtime-fake-spawn-binding.test-fixture.ts b/src/main/runtime/runtime-fake-spawn-binding.test-fixture.ts
index fe9a554e002c..cfc4cd28e9a9 100644
--- a/src/main/runtime/runtime-fake-spawn-binding.test-fixture.ts
+++ b/src/main/runtime/runtime-fake-spawn-binding.test-fixture.ts
@@ -57,7 +57,12 @@ export function captureFakeSpawnBinding(
       'incarnationId' in result && typeof result.incarnationId === 'string'
         ? result.incarnationId
         : undefined
-    runtime.assertPtyRegistrationAllowed(result.id, incarnationId)
+    try {
+      runtime.assertPtyRegistrationAllowed(result.id, incarnationId)
+    } catch (error) {
+      runtime.releaseRejectedPtyRegistrationFence(result.id, incarnationId)
+      throw error
+    }
     const current = sessions.get(hostId)
     const bound = current.terminalLayoutsByTabId[tabId]?.ptyIdsByLeafId?.[leafId]
     const stamp = current.terminalPtyIncarnationsByPaneKey?.[paneKey]
diff --git a/src/main/runtime/structured-agent-session-claude-kill-evidence.test.ts b/src/main/runtime/structured-agent-session-claude-kill-evidence.test.ts
index 632b19f36173..037f0e2d62e0 100644
--- a/src/main/runtime/structured-agent-session-claude-kill-evidence.test.ts
+++ b/src/main/runtime/structured-agent-session-claude-kill-evidence.test.ts
@@ -5,6 +5,9 @@ import { SUPERVISED_GRACEFUL_EXIT_MS } from '../claude/claude-child-exit-proof-l
 import { AgentSessionRecordStore } from './agent-session-record-store'
 import { JournalHostDatabase } from '../native-chat/agent-session-journal/journal-host-database'
 import { AgentSessionAcquisitionRootExitObservedError } from '../native-chat/agent-session-wire/structured-agent-session-adapter'
+import { nativeSwitchPhysicalFixture } from './structured-native-switch-physical.test-fixture'
+import { agentSessionSwitchDeadline } from '../../shared/agent-session-switch-execution'
+import { attachParamsForRecord } from '../native-chat/agent-session-wire/structured-agent-session-conversation-open'
 
 const os = vi.hoisted(() => ({
   capture: vi.fn(),
@@ -107,6 +110,195 @@ it('preserves actual TRUE writer-close through published close, join, and a heal
   expect(fixture.record().lease).toEqual(replacement)
 })
 
+it('joins actual idle Claude root exit before the ordinary switch destination writer', async () => {
+  await attach()
+  const switching = await nativeSwitchPhysicalFixture(
+    fixture.host,
+    SESSION,
+    fixture.directory,
+    'claude'
+  )
+  try {
+    fixture.permitKill.add(0)
+    vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] })
+    const operation = switching.run()
+    await forceTime()
+    await fixture.drain()
+    killEvidence()
+    expect(switching.spawn).not.toHaveBeenCalled()
+    expect(fixture.connections[0]!.exitVerdict.root).toBe('live')
+    const kills = fixture.signal.mock.calls.length
+    fixture.observedExit(0)
+    await vi.advanceTimersByTimeAsync(0)
+    expect(await operation).toMatchObject({ status: 'completed' })
+    expect(switching.spawn).toHaveBeenCalledOnce()
+    expect(fixture.signal.mock.calls).toHaveLength(kills)
+    expect(fixture.prompts).toEqual([])
+  } finally {
+    switching.dispose()
+  }
+})
+
+it('retains every unresolved ordinary generation across eviction and only joins its exact root', async () => {
+  await attach()
+  fixture.permitKill.add(0)
+  vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] })
+  const close = fixture.host.close(SESSION, 'evict')
+  await forceTime()
+  await close
+  expect(fixture.host.collaboratorsForTests().sessions.has(SESSION)).toBe(false)
+  vi.useRealTimers()
+  await fixture.healthy()
+  fixture.permitKill.add(1)
+  vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] })
+  const closeNext = fixture.host.close(SESSION, 'evict')
+  await forceTime()
+  await closeNext
+  const switching = await nativeSwitchPhysicalFixture(
+    fixture.host,
+    SESSION,
+    fixture.directory,
+    'claude'
+  )
+  try {
+    const operation = switching.run()
+    await vi.advanceTimersByTimeAsync(0)
+    await fixture.drain()
+    expect(switching.spawn).not.toHaveBeenCalled()
+    const kills = fixture.signal.mock.calls.length
+    fixture.observedExit(1)
+    await vi.advanceTimersByTimeAsync(0)
+    expect(switching.spawn).not.toHaveBeenCalled()
+    fixture.observedExit(0)
+    await vi.advanceTimersByTimeAsync(0)
+    expect(await operation).toMatchObject({ status: 'completed' })
+    expect(switching.spawn).toHaveBeenCalledOnce()
+    expect(fixture.signal.mock.calls).toHaveLength(kills)
+    expect(fixture.prompts).toHaveLength(1)
+  } finally {
+    switching.dispose()
+  }
+})
+
+it('joins an unpublished failed ensure that enters while an older physical source is pending', async () => {
+  await attach()
+  fixture.permitKill.add(0)
+  vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] })
+  const closing = fixture.host.close(SESSION, 'evict')
+  await forceTime()
+  await closing
+  const switching = await nativeSwitchPhysicalFixture(
+    fixture.host,
+    SESSION,
+    fixture.directory,
+    'claude'
+  )
+  const identity = Promise.withResolvers<void>()
+  try {
+    const operation = switching.run().catch((error: unknown) => error)
+    await vi.advanceTimersByTimeAsync(0)
+    await fixture.drain()
+    expect(switching.spawn).not.toHaveBeenCalled()
+    const admitted = fixture.host.deps.store.admittedSendCount(SESSION)
+    const command = fixture.host.switchGeneration(SESSION)
+    expect(await fixture.host.attach(fixture.caller, fixture.params())).toMatchObject({
+      ok: false,
+      refusal: { code: 'agent_session_conflict', details: { reason: 'sessionExists' } }
+    })
+    expect(fixture.connections).toHaveLength(1)
+    const record = fixture.record()
+    const params = attachParamsForRecord(record, {
+      clientOperationId: fixture.params().envelope.clientOperationId,
+      expectedRuntimeFence: record.lease.runtimeFence
+    })
+    fixture.heldIdentity.set(9100100, identity.promise)
+    fixture.permitKill.add(1)
+    // agentSession.ensure delegates to this ordinary serialized attach owner.
+    const ensuring = fixture.host.attach(fixture.caller, params).catch((error: unknown) => error)
+    await vi.waitFor(() => expect(fixture.connections).toHaveLength(2))
+    fixture.children[1]!.stdin.emit('error', new Error('ordinary ensure startup transport failed'))
+    await forceTime()
+    identity.resolve()
+    await forceTime()
+    expect(await ensuring).toMatchObject({ ok: false })
+    await fixture.drain()
+    killEvidence()
+    expect(fixture.connections[1]!.exitVerdict).toMatchObject({
+      root: 'live',
+      killDelivered: true
+    })
+    expect(fixture.host.deps.store.admittedSendCount(SESSION)).toBe(admitted)
+    expect(fixture.host.switchGeneration(SESSION)).toBe(command)
+    expect(fixture.host.collaboratorsForTests().sessions.get(SESSION)?.child).toBeFalsy()
+    const kills = fixture.signal.mock.calls.length
+    fixture.observedExit(0)
+    await vi.advanceTimersByTimeAsync(0)
+    await fixture.drain()
+    expect(switching.spawn).not.toHaveBeenCalled()
+    fixture.observedExit(1)
+    await vi.advanceTimersByTimeAsync(0)
+    expect(await operation).toMatchObject({ status: 'completed' })
+    expect(switching.spawn).toHaveBeenCalledOnce()
+    expect(fixture.signal.mock.calls).toHaveLength(kills)
+    expect(fixture.prompts).toEqual([])
+  } finally {
+    identity.resolve()
+    switching.dispose()
+  }
+})
+
+it.each(['deadline', 'new-send'] as const)(
+  'ends an unproven switch on %s without blocking the ordinary next send or replaying on late exit',
+  async (end) => {
+    await attach()
+    fixture.permitKill.add(0)
+    vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] })
+    const closing = fixture.host.close(SESSION, 'evict')
+    await forceTime()
+    await closing
+    const switching = await nativeSwitchPhysicalFixture(
+      fixture.host,
+      SESSION,
+      fixture.directory,
+      'claude'
+    )
+    try {
+      const operation = switching
+        .run(end === 'deadline' ? 100 : 120_000)
+        .catch((error: unknown) => error)
+      await vi.advanceTimersByTimeAsync(0)
+      await fixture.drain()
+      expect(switching.spawn).not.toHaveBeenCalled()
+      if (end === 'deadline') {
+        await vi.advanceTimersByTimeAsync(101)
+        expect(await operation).toMatchObject({
+          refusal: { code: 'agent_session_operation_expired' }
+        })
+        expect((await fixture.host.revealSession(SESSION)).readable).toBe(true)
+      }
+      vi.useRealTimers()
+      await fixture.healthy('New user work is never held behind source exit.')
+      if (end === 'new-send') {
+        expect(await operation).toMatchObject({
+          refusal: { details: { reason: 'messagesUnsettled' } }
+        })
+      }
+      const successor = fixture.record().lease
+      fixture.observedExit(0)
+      await fixture.drain()
+      expect(switching.spawn).not.toHaveBeenCalled()
+      expect(fixture.record().lease).toEqual(successor)
+      fixture.observedExit(1)
+      await fixture.drain()
+      expect(await switching.run()).toMatchObject({ status: 'completed' })
+      expect(switching.spawn).toHaveBeenCalledOnce()
+      expect(fixture.prompts).toHaveLength(1)
+    } finally {
+      switching.dispose()
+    }
+  }
+)
+
 it('settles a real failed acquisition with exact kill evidence and rejects dispatch before a healthy wake', async () => {
   await attach()
   fixture.observedExit(0)
@@ -221,6 +413,22 @@ it.each(['identity', 'spawn-return'] as const)(
     expect(report.deathEvidenceKind).toBe('kill-delivered')
     await fixture.drain()
     killEvidence()
+    const deadline = agentSessionSwitchDeadline()
+    try {
+      let proved = false
+      const stopping = fixture.host.stopForSwitch(SESSION, fixture.caller, deadline).then(() => {
+        proved = true
+      })
+      await vi.advanceTimersByTimeAsync(0)
+      await fixture.drain()
+      expect(proved).toBe(false)
+      fixture.observedExit(1)
+      await vi.advanceTimersByTimeAsync(0)
+      await stopping
+      expect(proved).toBe(true)
+    } finally {
+      deadline.dispose()
+    }
     if (!pending.ok) {
       throw new Error('send refused')
     }
@@ -285,6 +493,14 @@ it('keeps undelivered close retryable until an actual root event, without invent
   expect(fixture.delivered.size).toBe(0)
   vi.useRealTimers()
   expect(await fixture.adapter.closeSession!(SESSION)).toBe(true)
+  const deadline = agentSessionSwitchDeadline()
+  try {
+    expect(await fixture.host.stopForSwitch(SESSION, fixture.caller, deadline)).toBeTypeOf(
+      'function'
+    )
+  } finally {
+    deadline.dispose()
+  }
   await fixture.healthy()
 })
 
@@ -305,6 +521,40 @@ it('keeps an actual processless failure and an absent-session close distinct fro
   await fixture.healthy()
 })
 
+it('settles pre-adapter startup failure without holding a later explicit switch', async () => {
+  await attach()
+  fixture.observedExit(0)
+  await fixture.host.close(SESSION, 'evict')
+  const acquire = vi.spyOn(fixture.host.deps.adapter, 'acquire')
+  const track = vi
+    .spyOn(fixture.host.collaboratorsForTests().runtimeState.startupAttempts, 'track')
+    .mockImplementationOnce(() => {
+      throw new Error('fixture startup registration failed before adapter entry')
+    })
+  const record = fixture.record()
+  const params = attachParamsForRecord(record, {
+    clientOperationId: fixture.params().envelope.clientOperationId,
+    expectedRuntimeFence: record.lease.runtimeFence
+  })
+  expect(await fixture.host.attach(fixture.caller, params)).toMatchObject({ ok: false })
+  expect(track).toHaveBeenCalledOnce()
+  expect(acquire).not.toHaveBeenCalled()
+  expect(fixture.children).toHaveLength(1)
+  const switching = await nativeSwitchPhysicalFixture(
+    fixture.host,
+    SESSION,
+    fixture.directory,
+    'claude'
+  )
+  try {
+    expect(await switching.run()).toMatchObject({ status: 'completed' })
+    expect(switching.spawn).toHaveBeenCalledOnce()
+    expect(fixture.delivered.size).toBe(0)
+  } finally {
+    switching.dispose()
+  }
+})
+
 it('preserves known delivery when the published lifecycle callback fails', async () => {
   await attach()
   const fault = new Error('fixture lifecycle callback failure')
diff --git a/src/main/runtime/structured-agent-session-codex-stop-evidence.test.ts b/src/main/runtime/structured-agent-session-codex-stop-evidence.test.ts
index 91d26edae51c..a2d5e93a3bb9 100644
--- a/src/main/runtime/structured-agent-session-codex-stop-evidence.test.ts
+++ b/src/main/runtime/structured-agent-session-codex-stop-evidence.test.ts
@@ -25,6 +25,7 @@ import type { DescendantTreeVerdict } from '../pty-descendant-exit-verification'
 import type { AgentSessionStopOutcome } from '../native-chat/agent-session-wire/structured-agent-session-adapter-stop'
 import { agentVerdictDisplayMark } from '../../shared/agent-main-agent-verdict'
 import { activeProviderContext } from '../../shared/agent-session-provider-context'
+import { nativeSwitchPhysicalFixture } from './structured-native-switch-physical.test-fixture'
 
 const os = vi.hoisted(() => ({
   capture: vi.fn<(pid: number) => Promise<DescendantSnapshot | null>>(),
@@ -267,6 +268,37 @@ const warnings = (items: Awaited<ReturnType<typeof fixture.host.journalSnapshot>
     (item) => item.body.kind === 'status' && item.body.failure?.kind === 'cancelUnconfirmed'
   )
 
+it('joins the exact Codex root after ordinary replying Stop before opening one terminal', async () => {
+  await fixture.start()
+  vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] })
+  expect(await fixture.stop()).toMatchObject({ ok: true, value: { cancelled: true } })
+  await forceTime()
+  await fixture.drain()
+  expect(fixture.record().lease.deathEvidence?.kind).toBe('kill-delivered')
+  expect(fixture.connections[0]!.closeResult?.root).toBe('live')
+  const switching = await nativeSwitchPhysicalFixture(
+    fixture.host,
+    SESSION,
+    fixture.directory,
+    'codex'
+  )
+  try {
+    const operation = switching.run()
+    await vi.advanceTimersByTimeAsync(0)
+    await fixture.drain()
+    expect(switching.spawn).not.toHaveBeenCalled()
+    const kills = fixture.signal.mock.calls.length
+    fixture.children[0]!.emit('exit', 0, null)
+    await vi.advanceTimersByTimeAsync(0)
+    expect(await operation).toMatchObject({ status: 'completed' })
+    expect(switching.spawn).toHaveBeenCalledOnce()
+    expect(fixture.signal.mock.calls).toHaveLength(kills)
+    expect(fixture.connections).toHaveLength(1)
+  } finally {
+    switching.dispose()
+  }
+})
+
 it.each(['fresh', 'cached-before-ack', 'retired-before-join'] as const)(
   'uses exact delivered writer evidence for %s Stop without inventing root exit',
   async (mode) => {
diff --git a/src/main/runtime/structured-agent-session-pi-kill-retry.test.ts b/src/main/runtime/structured-agent-session-pi-kill-retry.test.ts
index c16ea9e086f8..81333be6e54a 100644
--- a/src/main/runtime/structured-agent-session-pi-kill-retry.test.ts
+++ b/src/main/runtime/structured-agent-session-pi-kill-retry.test.ts
@@ -11,6 +11,7 @@ import {
   HOST_TEST_SESSION as SESSION
 } from '../native-chat/agent-session-wire/structured-agent-session-host-test-data'
 import { computeAgentSessionPayloadFingerprint } from '../../shared/agent-session-mutation-envelope'
+import { agentSessionSwitchDeadline } from '../../shared/agent-session-switch-execution'
 import { PROVIDER_SUPERVISOR_MAX_STOP_MS } from '../provider-process/provider-process-supervisor'
 import {
   ensureStructuredAgentSessionHost,
@@ -191,6 +192,21 @@ it('settles a production failed Pi start after background kill, then delivers on
     host['deps'].store.listOperationRows().some((row) => row.outcome.status === 'pending')
   ).toBe(false)
   expect(signal.mock.calls.filter(([pid]) => pid === -9000201)).toHaveLength(1)
+  const deadline = agentSessionSwitchDeadline()
+  let settled = false
+  const switching = host.stopForSwitch(SESSION, caller, deadline).then(
+    () => {
+      settled = true
+      return true
+    },
+    () => {
+      settled = true
+      return false
+    }
+  )
+  await vi.advanceTimersByTimeAsync(0)
+  await host.collaboratorsForTests().serialize(SESSION, async () => {})
+  expect(settled).toBe(false)
   expect(await send('A legitimate new user message.')).toMatchObject({ ok: true })
   await vi.waitFor(() => expect(prompts).toEqual(['A legitimate new user message.']))
   await vi.waitFor(async () => {
@@ -200,4 +216,8 @@ it('settles a production failed Pi start after background kill, then delivers on
   })
   expect(connections).toHaveLength(3)
   expect(observeStructuredSession(SESSION)).toEqual({ status: 'live' })
+  children[1]!.emit('exit', 0, null)
+  expect(await switching).toBe(false)
+  deadline.dispose()
+  expect(observeStructuredSession(SESSION)).toEqual({ status: 'live' })
 })
diff --git a/src/main/runtime/structured-claude-piped-test-support.ts b/src/main/runtime/structured-claude-piped-test-support.ts
index e30508eb2ecc..83a5b0a6aeb6 100644
--- a/src/main/runtime/structured-claude-piped-test-support.ts
+++ b/src/main/runtime/structured-claude-piped-test-support.ts
@@ -191,6 +191,7 @@ export async function claudePipedFixture() {
     host,
     children,
     connections,
+    prompts,
     delivered,
     heldIdentity,
     heldSpawn,
diff --git a/src/main/runtime/structured-native-switch-physical.test-fixture.ts b/src/main/runtime/structured-native-switch-physical.test-fixture.ts
new file mode 100644
index 000000000000..0b550d34ce6a
--- /dev/null
+++ b/src/main/runtime/structured-native-switch-physical.test-fixture.ts
@@ -0,0 +1,130 @@
+import { expect, vi } from 'vitest'
+import { join } from 'node:path'
+import * as cliTranscript from '../ai-vault/structured-chat-cli-fork'
+import { agentSessionProviderHandleChainHead } from '../../shared/agent-session-provider-handle'
+import { agentSessionSwitchDeadline } from '../../shared/agent-session-switch-execution'
+import type { StructuredAgentSessionHost } from '../native-chat/agent-session-wire/structured-agent-session-host'
+import { structuredAgentRuntimeMetadata } from './structured-agent-runtime-metadata'
+import { setupMainOwnedWorkspace } from './main-owned-workspace-runtime-fixture'
+import { executeStructuredSessionTerminalSwitch } from './rpc/methods/structured-agent-session-switch-terminal-execution'
+
+/** Real switch/ordinary layout writers, with only provider transcript I/O and terminal spawn external. */
+export async function nativeSwitchPhysicalFixture(
+  host: StructuredAgentSessionHost,
+  sessionId: string,
+  directory: string,
+  agent: 'claude' | 'codex'
+) {
+  const record = host.deps.store.getRecord(sessionId)!
+  const head = agentSessionProviderHandleChainHead(record.providerHandleChain)!
+  const { runtime, bindPty, handleOf } = setupMainOwnedWorkspace()
+  Object.assign(runtime, {
+    resolveTerminalWorkspaceLaunchScope: async () => ({
+      id: record.location.workspaceId,
+      path: directory,
+      connectionId: null,
+      repo: null,
+      folderWorkspace: null
+    })
+  })
+  await runtime.publishStructuredAgentSessionTab({
+    workspaceId: record.location.workspaceId,
+    sessionId,
+    agent,
+    activate: true
+  })
+  vi.spyOn(cliTranscript, 'resolveStructuredChatCliSource').mockResolvedValue({
+    host,
+    record,
+    head,
+    agent,
+    cwd: directory,
+    providerSessionId: head.handle.nativeId,
+    metadata: structuredAgentRuntimeMetadata(agent)!,
+    requireCurrent: () => {
+      const current = host.deps.store.requireWritableRecord(sessionId)
+      expect(current.location).toEqual(record.location)
+      expect(agentSessionProviderHandleChainHead(current.providerHandleChain)?.linkId).toBe(
+        head.linkId
+      )
+    }
+  })
+  vi.spyOn(cliTranscript, 'prepareStructuredChatCliTranscript').mockResolvedValue({
+    useRealCodexHome: false,
+    cliForkSource: {
+      agent,
+      sourceAgent: agent,
+      sessionId: head.handle.nativeId,
+      filePath: join(directory, 'provider-transcript.jsonl'),
+      cwd: directory,
+      codexHome: null,
+      executionHostPlatform: process.platform
+    }
+  })
+  const spawn = vi
+    .spyOn(runtime, 'createTerminal')
+    .mockImplementation(async (_selector, opts = {}) => {
+      if (!opts.tabId || !opts.leafId) {
+        throw new Error('missing ordinary published pane')
+      }
+      opts.beforePtySpawn?.()
+      opts.onPtySpawnDispatched?.({
+        tabId: opts.tabId,
+        leafId: opts.leafId,
+        launchAgent: agent,
+        ...(opts.launchConfig ? { launchConfig: opts.launchConfig } : {})
+      })
+      bindPty({
+        worktreeId: record.location.workspaceId,
+        tabId: opts.tabId,
+        leafId: opts.leafId,
+        ptyId: 'physical-switch-destination'
+      })
+      runtime.registerPty('physical-switch-destination', record.location.workspaceId, null, {
+        tabId: opts.tabId,
+        leafId: opts.leafId,
+        terminalHandle: opts.preAllocatedHandle
+      })
+      return {
+        handle: handleOf('physical-switch-destination'),
+        ptyId: 'physical-switch-destination',
+        tabId: opts.tabId,
+        paneKey: `${opts.tabId}:${opts.leafId}`,
+        worktreeId: record.location.workspaceId,
+        title: null,
+        surface: 'background'
+      }
+    })
+  let invocation = 0
+  const deadlines: ReturnType<typeof agentSessionSwitchDeadline>[] = []
+  return {
+    runtime,
+    spawn,
+    run: (budget = 120_000) => {
+      const deadline = agentSessionSwitchDeadline(() => performance.now(), budget)
+      deadlines.push(deadline)
+      const execution = {
+        invocationId: `exact-source-${++invocation}`,
+        sourceTabId: `agent-session:${sessionId}`
+      }
+      return host.runSwitch(
+        sessionId,
+        execution.invocationId,
+        deadline,
+        () =>
+          executeStructuredSessionTerminalSwitch(
+            { sessionId, execution },
+            host.deps.store.getRecord(sessionId)!,
+            { runtime },
+            host,
+            sessionId,
+            deadline,
+            execution,
+            runtime.captureSessionSwitchSelection()
+          ),
+        { direction: 'terminal' }
+      )
+    },
+    dispose: () => deadlines.forEach((deadline) => deadline.dispose())
+  }
+}
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-create.ts b/src/main/runtime/terminal/launch/mobile-terminal-create.ts
index 3861ad7b96e6..9982d83fb500 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-create.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-create.ts
@@ -92,7 +92,8 @@ export type OwnedMobileTerminalCreateOptions = {
   resumeOrigin?: 'saved' | 'switch'
   spawnIntent?: SpawnIntent
   launchRuntime?: AgentLaunchRuntime
-  switchExecution?: AgentSessionSwitchAuthority
+  switchExecution?: AgentSessionSwitchAuthority &
+    Pick<NonNullable<MobileTerminalCreateOptions['switchExecution']>, 'viewerSelection'>
   signal?: AbortSignal
   refuseSleptWorktree?: boolean
   resumesSleepingRecord?: true
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts b/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts
index 4ac3126a790d..f15a1518018b 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts
@@ -92,13 +92,17 @@ export function historyConversationSwitch(
 }
 
 function historyPaneSource(session: AiVaultSession, pane?: AiVaultOriginalPaneTarget | null) {
+  const agent = session.agent
+  if (!adoptsCliConversations(agent)) {
+    return null
+  }
   const location =
     pane ??
     collectAgentPaneConversations(useAppStore.getState(), adoptsCliConversations).find(
       (candidate) =>
         candidate.executionHostId === session.executionHostId &&
         candidate.providerSession.id === session.sessionId &&
-        cliConversationRowsShareAgent(candidate.agent, session.agent)
+        cliConversationRowsShareAgent(candidate.agent, agent)
     )
   if (!location) {
     return null
@@ -108,10 +112,9 @@ function historyPaneSource(session: AiVaultSession, pane?: AiVaultOriginalPaneTa
     paneKey: location.paneKey
   })
   return source &&
-    adoptsCliConversations(session.agent) &&
     source.executionHostId === session.executionHostId &&
     source.providerSessionId === session.sessionId &&
-    cliConversationRowsShareAgent(source.agent, session.agent)
+    cliConversationRowsShareAgent(source.agent, agent)
     ? source
     : null
 }
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-workspace.test.ts b/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-workspace.test.ts
index 4289e4dd3ae9..71c43cd1b97e 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-workspace.test.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-workspace.test.ts
@@ -12,7 +12,10 @@ const mocks = vi.hoisted(() => ({
   state: { runtimeStatusByEnvironmentId: new Map<string, unknown>() }
 }))
 
-vi.mock('@/lib/in-place-switch-support', () => ({ inPlaceSwitchCapabilityNow: () => false }))
+vi.mock('@/lib/in-place-switch-support', () => ({
+  inPlaceSwitchCapabilityNow: () => false,
+  inPlaceSwitchSupportedNow: () => false
+}))
 
 vi.mock('@/store', () => ({ useAppStore: { getState: () => mocks.state } }))
 vi.mock('@/runtime/structured-agent-session-owner', () => ({
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
index fb211690d5dc..6766b3540e2f 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
@@ -122,6 +122,7 @@ const SOURCE: CliChatResumeSource = {
 }
 const tabs = () => useAppStore.getState().unifiedTabsByWorktree['wt-1'] ?? []
 let main: TabsDrawnFromMain | undefined
+let snapshotVersion = 0
 afterEach(() => {
   vi.unstubAllGlobals()
   main?.close()
@@ -144,6 +145,7 @@ function refuse(reason: 'transcriptNotFound' | 'transcriptUnreadable'): AgentSes
 }
 
 beforeEach(async () => {
+  snapshotVersion = 0
   vi.clearAllMocks()
   resetLocalStructuredSessionVersionForTests()
   resetWebSessionTabsSnapshotFreshnessForTests()
@@ -171,7 +173,7 @@ function snapshot(sessionId?: string): RuntimeMobileSessionTabsResult {
   return {
     worktree: 'wt-1',
     publicationEpoch: 'publication-test',
-    snapshotVersion: Date.now(),
+    snapshotVersion: ++snapshotVersion,
     activeGroupId: null,
     activeTabId: null,
     activeTabType: null,
@@ -537,9 +539,7 @@ describe('CLI identity resume through the existing launch owner', () => {
       ).toEqual(expectedOrder)
       expect(useAppStore.getState().activeGroupIdByWorktree['wt-1']).toBe(other.groupId)
       useAppStore.getState().moveUnifiedTabToGroup(slotId, other.groupId)
-      applyStructuredSessionTabSnapshots([
-        { ...snapshot(sessionId), snapshotVersion: Date.now() + 1 }
-      ])
+      applyStructuredSessionTabSnapshots([snapshot(sessionId)])
       expect(tabs().find((tab) => tab.entityId === sessionId)?.groupId).toBe(other.groupId)
     }
   )
diff --git a/src/renderer/src/runtime/main-loaded-layout-frames.test-fixture.ts b/src/renderer/src/runtime/main-loaded-layout-frames.test-fixture.ts
index c94d3f1ffbfc..989b65e4f03b 100644
--- a/src/renderer/src/runtime/main-loaded-layout-frames.test-fixture.ts
+++ b/src/renderer/src/runtime/main-loaded-layout-frames.test-fixture.ts
@@ -14,6 +14,13 @@ import {
   indexPublishedLayout
 } from '../../../shared/workspace-layout/workspace-layout-records'
 import type { WorkspaceLayoutChangeFrame } from '../../../shared/workspace-layout/workspace-layout-stream-frames'
+import { vi } from 'vitest'
+import * as placementReads from './web-session-tabs-sync/open-placement-read'
+import * as snapshotPlacements from './web-session-tabs-sync/open-placement'
+import * as frameSelections from './workspace-layout-frame-open-selection'
+import * as mappings from './web-session-tabs-sync/tracking-mappings'
+import { hostSessionTabIdByLocalKey } from './web-session-tabs-sync/state'
+import * as selectionFingerprint from '../../../shared/structured-agent-session-mutation'
 
 /** The model main loads from one stored partition, with the ids it mints at load. */
 export function loadMainLayoutModel(
@@ -99,3 +106,187 @@ export function mainLayoutFrameSender(): {
     }
   }
 }
+
+/** Count metadata work while delegating every read and final writer to production. */
+export function countOpenPlacementWork() {
+  type Pass = 'snapshot' | 'discovery' | 'writer'
+  const reads: {
+    pass: Pass
+    worktreeId: string
+    tabRows: number
+    terminalRows: number
+    snapshotRows: number
+    mappingCopies: number
+    mappingRows: number
+    sourceChecks: number
+    viewerChecks: number
+    destinationLookups: number
+  }[] = []
+  const visits: { pass: Pass; worktreeId: string; rows: number }[] = []
+  const builtKeys: string[][] = []
+  let pass: Pass = 'snapshot'
+  let indexing: (typeof reads)[number] | undefined
+  let fingerprints = 0
+  const restores: (() => void)[] = []
+  const countedRows = <T>(rows: T[], visit: () => void): T[] =>
+    new Proxy(rows, {
+      get(target, property, receiver) {
+        if (typeof property === 'string' && /^(0|[1-9]\d*)$/.test(property)) {
+          visit()
+        }
+        // oxlint-disable-next-line anti-slop/no-reflect-get -- Proxy `get` trap: only Reflect.get forwards a raw string|symbol key with the proxy receiver.
+        return Reflect.get(target, property, receiver)
+      }
+    })
+  const countLayout = <T extends { worktreeId: string; tabs: unknown[] }>(layout: T): T => {
+    const visit = { pass, worktreeId: layout.worktreeId, rows: 0 }
+    visits.push(visit)
+    return {
+      ...layout,
+      tabs: countedRows(layout.tabs, () => {
+        if (!indexing) {
+          visit.rows += 1
+        }
+      })
+    }
+  }
+  const realMappingGet = hostSessionTabIdByLocalKey.get.bind(hostSessionTabIdByLocalKey)
+  const mappingGet = vi.spyOn(hostSessionTabIdByLocalKey, 'get').mockImplementation((key) => {
+    if (indexing) {
+      indexing.mappingCopies += 1
+    }
+    return realMappingGet(key)
+  })
+  restores.push(() => mappingGet.mockRestore())
+  const realMappings = mappings.hostSessionTabIdsByLocalTabForWorktree
+  const mappingRead = vi
+    .spyOn(mappings, 'hostSessionTabIdsByLocalTabForWorktree')
+    .mockImplementation((...args) => {
+      const rows = realMappings(...args)
+      const reading = indexing
+      if (reading) {
+        const iterate = rows[Symbol.iterator].bind(rows)
+        rows[Symbol.iterator] = function* () {
+          for (const entry of iterate()) {
+            reading.mappingRows += 1
+            yield entry
+          }
+        }
+      }
+      return rows
+    })
+  restores.push(() => mappingRead.mockRestore())
+  const realRead = placementReads.createOpenPlacementRead
+  const read = vi
+    .spyOn(placementReads, 'createOpenPlacementRead')
+    .mockImplementation((state, worktreeId, owner, snapshot, now) => {
+      const counts = {
+        pass,
+        worktreeId,
+        tabRows: 0,
+        terminalRows: 0,
+        snapshotRows: 0,
+        mappingCopies: 0,
+        mappingRows: 0,
+        sourceChecks: 0,
+        viewerChecks: 0,
+        destinationLookups: 0
+      }
+      reads.push(counts)
+      const before = indexing
+      indexing = counts
+      let actual: ReturnType<typeof realRead>
+      try {
+        actual = realRead(
+          {
+            ...state,
+            unifiedTabsByWorktree: {
+              ...state.unifiedTabsByWorktree,
+              [worktreeId]: countedRows(
+                state.unifiedTabsByWorktree[worktreeId] ?? [],
+                () => counts.tabRows++
+              )
+            },
+            tabsByWorktree: {
+              ...state.tabsByWorktree,
+              [worktreeId]: countedRows(
+                state.tabsByWorktree[worktreeId] ?? [],
+                () => counts.terminalRows++
+              )
+            }
+          },
+          worktreeId,
+          owner,
+          snapshot && {
+            ...snapshot,
+            tabs: countedRows(snapshot.tabs, () => counts.snapshotRows++)
+          },
+          now
+        )
+      } finally {
+        indexing = before
+      }
+      return {
+        ...actual,
+        sourceCurrent: (...args) => {
+          counts.sourceChecks++
+          return actual.sourceCurrent(...args)
+        },
+        viewerSelectionCurrent: (...args) => {
+          counts.viewerChecks++
+          return actual.viewerSelectionCurrent(...args)
+        },
+        localTabId: (...args) => {
+          counts.destinationLookups++
+          return actual.localTabId(...args)
+        }
+      }
+    })
+  restores.push(() => read.mockRestore())
+  const realSnapshot = snapshotPlacements.prepareSnapshotOpenPlacements
+  const snapshot = vi
+    .spyOn(snapshotPlacements, 'prepareSnapshotOpenPlacements')
+    .mockImplementation((state, layout, ...rest) => {
+      pass = 'snapshot'
+      return realSnapshot(state, countLayout({ ...layout, worktreeId: layout.worktree }), ...rest)
+    })
+  restores.push(() => snapshot.mockRestore())
+  const realDiscovery = frameSelections.frameOpenPlacements
+  const discovery = vi
+    .spyOn(frameSelections, 'frameOpenPlacements')
+    .mockImplementation((state, layout, owner) => {
+      pass = 'discovery'
+      return realDiscovery(state, countLayout(layout), owner)
+    })
+  restores.push(() => discovery.mockRestore())
+  const realWriter = frameSelections.frameOpenSelectionPatch
+  const writer = vi
+    .spyOn(frameSelections, 'frameOpenSelectionPatch')
+    .mockImplementation((before, patch, cache, keys, ...rest) => {
+      pass = 'writer'
+      builtKeys.push([...keys])
+      const countedCache = { ...cache }
+      for (const key of keys) {
+        if (cache[key]) {
+          countedCache[key] = countLayout(cache[key])
+        }
+      }
+      return realWriter(before, patch, countedCache, keys, ...rest)
+    })
+  restores.push(() => writer.mockRestore())
+  const realFingerprint = selectionFingerprint.structuredAgentSessionDomainFingerprint
+  const fingerprint = vi
+    .spyOn(selectionFingerprint, 'structuredAgentSessionDomainFingerprint')
+    .mockImplementation((...args) => {
+      fingerprints++
+      return realFingerprint(...args)
+    })
+  restores.push(() => fingerprint.mockRestore())
+  return {
+    reads,
+    visits,
+    builtKeys,
+    fingerprints: () => fingerprints,
+    stop: () => restores.toReversed().forEach((restore) => restore())
+  }
+}
diff --git a/src/renderer/src/runtime/web-runtime-session-browser-create-focus.test.ts b/src/renderer/src/runtime/web-runtime-session-browser-create-focus.test.ts
index e278a0e22b96..7f1e0f7de301 100644
--- a/src/renderer/src/runtime/web-runtime-session-browser-create-focus.test.ts
+++ b/src/renderer/src/runtime/web-runtime-session-browser-create-focus.test.ts
@@ -149,7 +149,7 @@ describe('createWebRuntimeSessionBrowserTab', () => {
       snapshot,
       ENVIRONMENT_ID,
       undefined,
-      undefined,
+      { offerOpenSelection: undefined },
       mocks.changedAgentPaneKeys
     )
     expect(mocks.acceptReplayedWebSessionTabsSnapshot).toHaveBeenCalledWith(
@@ -429,7 +429,7 @@ describe('createWebRuntimeSessionBrowserTab', () => {
       snapshot,
       ENVIRONMENT_ID,
       undefined,
-      undefined,
+      { offerOpenSelection: undefined },
       mocks.changedAgentPaneKeys
     )
     expect(setStateResults.at(-1)).toEqual({ state: 'after' })
diff --git a/src/renderer/src/runtime/web-runtime-session.test.ts b/src/renderer/src/runtime/web-runtime-session.test.ts
index 086303bf3218..e3a2eeefb504 100644
--- a/src/renderer/src/runtime/web-runtime-session.test.ts
+++ b/src/renderer/src/runtime/web-runtime-session.test.ts
@@ -200,7 +200,7 @@ describe('refreshWebRuntimeSessionTabsSnapshot', () => {
       recovered,
       ENVIRONMENT_ID,
       undefined,
-      undefined,
+      { offerOpenSelection: undefined },
       mocks.changedAgentPaneKeys
     )
   })
@@ -265,7 +265,7 @@ describe('activateWebRuntimeSessionWorktree', () => {
       snapshot,
       ENVIRONMENT_ID,
       undefined,
-      undefined,
+      { offerOpenSelection: undefined },
       mocks.changedAgentPaneKeys
     )
     expect(mocks.acceptReplayedWebSessionTabsSnapshot).toHaveBeenCalledWith(
diff --git a/src/renderer/src/runtime/web-runtime-terminal-switch-placement.test.ts b/src/renderer/src/runtime/web-runtime-terminal-switch-placement.test.ts
index d7b4ac678f43..5b70f35a78a4 100644
--- a/src/renderer/src/runtime/web-runtime-terminal-switch-placement.test.ts
+++ b/src/renderer/src/runtime/web-runtime-terminal-switch-placement.test.ts
@@ -10,7 +10,9 @@ import { registerTerminalUiRoutingIpcBridge } from '@/hooks/ipc-events/terminal-
 import { applyWebSessionTabsStorePatch } from './web-session-tabs-sync/store-patch'
 import {
   createWebSessionTabsSnapshotPatch,
-  applyWebSessionTabsSnapshot
+  applyWebSessionTabsSnapshot,
+  decideWebSessionTabsSnapshotOperations,
+  applyWebSessionTabsSnapshotOperations
 } from './web-session-tabs-sync/snapshot-api'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import { useAppStore } from '@/store'
@@ -22,6 +24,8 @@ import { refreshWebRuntimeSessionTabsSnapshot } from './web-runtime-session-snap
 import { toWebTerminalSurfaceTabId } from '../../../shared/terminal-surface-id'
 import { makePaneKey } from '../../../shared/stable-pane-id'
 import { resetWebSessionTabsSnapshotFreshnessForTests } from './web-session-tabs-sync/tracking-lifecycle'
+import { countOpenPlacementWork } from './main-loaded-layout-frames.test-fixture'
+import { hostSessionTabIdsByLocalTabForWorktree } from './web-session-tabs-sync/tracking-mappings'
 
 const ENV = 'paired-placement',
   WT = 'repo::/repo'
@@ -207,6 +211,134 @@ it.each([{ pinned: false }, { pinned: true }])(
   }
 )
 
+it.each([10, 100])(
+  'indexes retained metadata once on an admitted unchanged snapshot replay (%i destinations)',
+  (count) => {
+    disposeViewerSelection()
+    useAppStore.setState(useAppStore.getInitialState(), true)
+    useAppStore.setState({
+      activeWorktreeId: WT,
+      activeView: 'terminal',
+      settings: createGlobalSettingsFixture({ activeRuntimeEnvironmentId: ENV })
+    })
+    const leafId = '10000000-0000-4000-8000-000000000001'
+    const terminal = (id: string) => ({
+      type: 'terminal' as const,
+      id: `${id}::${leafId}`,
+      parentTabId: id,
+      leafId,
+      title: id,
+      terminal: `term_${id}`,
+      isActive: false,
+      status: 'ready' as const
+    })
+    let snapshot: RuntimeMobileSessionTabsResult = {
+      worktree: WT,
+      publicationEpoch: 'metadata-replay',
+      snapshotVersion: 1,
+      activeGroupId: 'G',
+      activeTabId: 'C',
+      activeTabType: 'terminal',
+      tabs: [terminal('C')],
+      tabGroups: [{ id: 'G', activeTabId: 'C', tabOrder: ['C'] }]
+    }
+    const applyAdmitted = () => {
+      const operations = decideWebSessionTabsSnapshotOperations([{ environmentId: ENV, snapshot }])
+      expect(operations[0].decision.apply).toBe(true)
+      applyWebSessionTabsStorePatch(
+        (state, keys, offerOpenSelection) =>
+          applyWebSessionTabsSnapshotOperations(state, operations, keys, { offerOpenSelection }),
+        { frames: [] }
+      )()
+    }
+    applyAdmitted()
+    const groupId = useAppStore.getState().groupsByWorktree[WT][0].id
+    const deadline = agentSessionSwitchDeadline(Date.now)
+    let counter: ReturnType<typeof countOpenPlacementWork> | undefined
+    try {
+      const requests = Array.from({ length: count }, (_, i) => {
+        const request = beginViewerSelectionRequest(`retained-${i}`, deadline)
+        request.accept()
+        return request
+      })
+      snapshot = {
+        ...snapshot,
+        snapshotVersion: 2,
+        tabs: [
+          terminal('C'),
+          ...requests.map((request, i) => ({
+            ...terminal(`D-${i}`),
+            openPlacement: {
+              invocationId: `retained-${i}`,
+              generation: `generation-${i}`,
+              placement: { groupId, index: i + 1 },
+              activate: true,
+              viewerSelection: request.token,
+              source: {
+                worktreeId: WT,
+                tabId: `absent-source-${i}`,
+                leafId,
+                createdAt: 1,
+                generation: 0,
+                hasLeaf: true,
+                ptyId: `source-pty-${i}`,
+                incarnationId: null
+              }
+            }
+          }))
+        ],
+        tabGroups: [
+          { id: 'G', activeTabId: 'C', tabOrder: ['C', ...requests.map((_, i) => `D-${i}`)] }
+        ]
+      }
+      applyAdmitted()
+      expect(requests.map((request) => viewerSelectionOutcome(request.token))).toEqual([
+        ...Array.from({ length: count - 1 }, () => 'superseded'),
+        'fulfilled'
+      ])
+      const before = useAppStore.getState()
+      const order = before.groupsByWorktree[WT][0].tabOrder
+      const selected = before.activeTabIdByWorktree[WT]
+      const mappingCount = hostSessionTabIdsByLocalTabForWorktree(ENV, WT).size
+      expect(before.unifiedTabsByWorktree[WT]).toHaveLength(count + 1)
+      expect(before.tabsByWorktree[WT]).toHaveLength(count + 1)
+      expect(mappingCount).toBe(count + 1)
+      counter = countOpenPlacementWork()
+      // The host republishes unchanged inventory at a newer admitted version, after selection settled.
+      snapshot = { ...snapshot, snapshotVersion: 3 }
+      applyAdmitted()
+      expect(counter.visits).toEqual([{ pass: 'snapshot', worktreeId: WT, rows: count + 1 }])
+      expect(counter.reads).toEqual([
+        {
+          pass: 'snapshot',
+          worktreeId: WT,
+          tabRows: 2 * (count + 1),
+          terminalRows: count + 1,
+          snapshotRows: count + 1,
+          mappingCopies: mappingCount,
+          mappingRows: mappingCount,
+          sourceChecks: count,
+          viewerChecks: count,
+          destinationLookups: count
+        }
+      ])
+      expect(counter.fingerprints()).toBe(0)
+      const after = useAppStore.getState()
+      expect(after.groupsByWorktree[WT][0].tabOrder).toEqual(order)
+      expect(after.activeTabIdByWorktree[WT]).toBe(selected)
+      expect(after.tabsByWorktree[WT]).toHaveLength(count + 1)
+      expect(after.tabsByWorktree[WT].some((tab) => tab.id.startsWith('absent-source-'))).toBe(
+        false
+      )
+      expect(viewerSelectionOutcome(requests.at(-1)!.token)).toBe('fulfilled')
+    } finally {
+      counter?.stop()
+      deadline.dispose()
+      disposeViewerSelection()
+    }
+  }
+)
+
 it.each([
   {
     owner: 'local-structured-session',
@@ -248,6 +380,7 @@ it.each([
         snapshotVersion: 1,
         activeGroupId: 'G',
         activeTabId: source.id,
+        activeTabType: source.type,
         tabs: [source, terminal('B'), terminal('C')],
         tabGroups: [
           {
diff --git a/src/renderer/src/runtime/workspace-layout-frame-sync.test.ts b/src/renderer/src/runtime/workspace-layout-frame-sync.test.ts
index 99af4fadcfd8..9e4035865ba9 100644
--- a/src/renderer/src/runtime/workspace-layout-frame-sync.test.ts
+++ b/src/renderer/src/runtime/workspace-layout-frame-sync.test.ts
@@ -42,8 +42,10 @@ import { openWorkspaceLayoutFrameSync } from './workspace-layout-frame-sync'
 import {
   layoutSnapshotFrame,
   mainLayoutFrameSender,
-  mainLoadedLayouts
+  mainLoadedLayouts,
+  countOpenPlacementWork
 } from './main-loaded-layout-frames.test-fixture'
+import * as frameFlushPlan from './workspace-layout-frame-flush-plan'
 import { installLayoutFrameApplyCheck } from './workspace-layout-frame-apply-check.test-fixture'
 
 vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } }))
@@ -535,3 +537,145 @@ it.each([false, true])(
     }
   }
 )
+
+it.each([10, 100])(
+  'bounds retained undrawn metadata discovery on an unrelated coalesced frame flush (%i destinations)',
+  async (count) => {
+    const visible = addWorkspace(emptySession(), GIT_KEY, [
+      { id: 'visible', tabs: [{ id: 'C', leaves: [[leaf(1), 'pty-C']] }] }
+    ])
+    const store = createTestStore()
+    await bootWindowFromPartitions(store, [{ hostId: 'local', session: visible }])
+    const session = structuredClone(visible)
+    const undrawnKeys = ['folder:undrawn-one', 'folder:undrawn-two']
+    for (const [workspaceIndex, key] of undrawnKeys.entries()) {
+      addWorkspace(session, key, [
+        {
+          id: `undrawn-${workspaceIndex}`,
+          tabs: Array.from(
+            { length: count / 2 },
+            (_, i): { id: string; leaves: [string, string][] } => {
+              const n = (workspaceIndex * count) / 2 + i
+              return {
+                id: `D-${n}`,
+                leaves: [
+                  [`10000000-0000-4000-8000-${String(n + 2).padStart(12, '0')}`, `pty-D-${n}`]
+                ]
+              }
+            }
+          )
+        }
+      ])
+    }
+    const layouts = mainLoadedLayouts('local', session)
+    const deadline = agentSessionSwitchDeadline(Date.now)
+    const sync = openWorkspaceLayoutFrameSync(store)
+    let counter: ReturnType<typeof countOpenPlacementWork> | undefined
+    let restorePlan: (() => void) | undefined
+    try {
+      const tokens: string[] = []
+      for (const key of undrawnKeys) {
+        for (const tab of layouts[key].tabs) {
+          const request = beginViewerSelectionRequest(`cached-${tab.id}`, deadline)
+          request.accept()
+          tokens.push(request.token)
+          tab.openPlacement = {
+            invocationId: `cached-${tab.id}`,
+            generation: `generation-${tab.id}`,
+            placement: { groupId: layouts[key].groups[0].id, index: 0 },
+            activate: true,
+            viewerSelection: request.token,
+            source: {
+              worktreeId: key,
+              tabId: `absent-source-${tab.id}`,
+              leafId: leaf(1),
+              createdAt: 1,
+              generation: 0,
+              hasLeaf: true,
+              ptyId: `source-pty-${tab.id}`,
+              incarnationId: null
+            }
+          }
+        }
+      }
+      const visibleRequest = beginViewerSelectionRequest('visible-choice', deadline)
+      visibleRequest.accept()
+      // An unchanged startup patch is discarded before the selection writer; publish a real change.
+      layouts[GIT_KEY].tabs[0].customTitle = 'initial publication'
+      layouts[GIT_KEY].tabs[0].openPlacement = {
+        invocationId: 'visible-choice',
+        generation: 'visible-generation',
+        placement: { groupId: 'visible', index: 0 },
+        activate: true,
+        viewerSelection: visibleRequest.token
+      }
+      const frames = mainLayoutFrameSender()
+      stream.onFrame!(frames.snapshot(layouts))
+      sync.start()
+      await flushMicrotasks()
+      expect(viewerSelectionOutcome(visibleRequest.token)).toBe('fulfilled')
+      expect(tokens.map(viewerSelectionOutcome)).toEqual(
+        Array.from({ length: count }, () => 'superseded')
+      )
+      for (const key of undrawnKeys) {
+        expect(store.getState().unifiedTabsByWorktree[key]).toBeUndefined()
+        expect(store.getState().tabsByWorktree[key]).toBeUndefined()
+      }
+      counter = countOpenPlacementWork()
+      const plan = vi.spyOn(frameFlushPlan, 'planLayoutFrameFlush')
+      restorePlan = () => plan.mockRestore()
+      const changed = structuredClone(layouts[GIT_KEY])
+      changed.tabs[0].customTitle = 'first update'
+      stream.onFrame!(frames.records(GIT_KEY, changed))
+      changed.tabs[0].customTitle = 'second update'
+      stream.onFrame!(frames.records(GIT_KEY, changed))
+      await flushMicrotasks()
+      expect(plan).toHaveBeenCalledTimes(1)
+      expect(plan.mock.results[0].value).toMatchObject({ fullBuilt: [], workspaceBuilt: [GIT_KEY] })
+      expect(counter.builtKeys).toEqual([[GIT_KEY]])
+      expect(counter.visits).toEqual([
+        ...undrawnKeys.map((worktreeId) => ({ pass: 'discovery', worktreeId, rows: count / 2 })),
+        { pass: 'writer', worktreeId: GIT_KEY, rows: 2 }
+      ])
+      expect(counter.reads).toEqual([
+        ...undrawnKeys.map((worktreeId) => ({
+          pass: 'discovery',
+          worktreeId,
+          tabRows: 0,
+          terminalRows: 0,
+          snapshotRows: 0,
+          mappingCopies: 0,
+          mappingRows: 0,
+          sourceChecks: 0,
+          viewerChecks: count / 2,
+          destinationLookups: 0
+        })),
+        {
+          pass: 'writer',
+          worktreeId: GIT_KEY,
+          tabRows: 2,
+          terminalRows: 1,
+          snapshotRows: 0,
+          mappingCopies: 0,
+          mappingRows: 0,
+          sourceChecks: 0,
+          viewerChecks: 1,
+          destinationLookups: 0
+        }
+      ])
+      expect(counter.fingerprints()).toBe(0)
+      expect(store.getState().groupsByWorktree[GIT_KEY][0].activeTabId).toBe('C')
+      expect(store.getState().tabsByWorktree[GIT_KEY][0].customTitle).toBe('second update')
+      for (const key of undrawnKeys) {
+        expect(store.getState().unifiedTabsByWorktree[key]).toBeUndefined()
+        expect(store.getState().tabsByWorktree[key]).toBeUndefined()
+      }
+      expect(viewerSelectionOutcome(visibleRequest.token)).toBe('fulfilled')
+    } finally {
+      restorePlan?.()
+      counter?.stop()
+      sync.close()
+      deadline.dispose()
+    }
+  }
+)
diff --git a/tests/e2e/helpers/native-chat-switch-readable-source.ts b/tests/e2e/helpers/native-chat-switch-readable-source.ts
index 1d1447be30c1..5f53bac996f7 100644
--- a/tests/e2e/helpers/native-chat-switch-readable-source.ts
+++ b/tests/e2e/helpers/native-chat-switch-readable-source.ts
@@ -32,11 +32,10 @@ export async function prepareReadableSwitchSource(rig: RestTestRig, workspaceId:
       { type: 'session_meta', payload: { id: nativeId } },
       { type: 'event_msg', payload: { type: 'task_started', turn_id: 'terminal-turn' } },
       {
-        type: 'response_item',
+        type: 'event_msg',
         payload: {
-          type: 'message',
-          role: 'assistant',
-          content: [{ type: 'output_text', text: 'Readable before Codex is ready' }]
+          type: 'agent_message',
+          message: 'Readable before Codex is ready'
         }
       },
       { type: 'event_msg', payload: { type: 'task_complete', turn_id: 'terminal-turn' } }
diff --git a/tests/e2e/web-runtime-session-terminal-host-authority.unit.test.ts b/tests/e2e/web-runtime-session-terminal-host-authority.unit.test.ts
index f3ce4ff5c8bb..f1f76662fe23 100644
--- a/tests/e2e/web-runtime-session-terminal-host-authority.unit.test.ts
+++ b/tests/e2e/web-runtime-session-terminal-host-authority.unit.test.ts
@@ -475,7 +475,7 @@ describe('createWebRuntimeSessionTerminal', () => {
       snapshot,
       ENVIRONMENT_ID,
       undefined,
-      undefined,
+      { offerOpenSelection: undefined },
       mocks.changedAgentPaneKeys
     )
   })

From b9dea4c6877030f8706fed2a6e5b007bc77c6b84 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 01:59:38 -0700
Subject: [PATCH 114/207] Release expired switch observers from physical owners

---
 .../structured-agent-session-start-flight.ts  |   7 +-
 .../structured-agent-session-switch-source.ts |   2 +-
 ...gent-session-physical-exit-scaling.test.ts | 223 ++++++++++++++++++
 3 files changed, 229 insertions(+), 3 deletions(-)
 create mode 100644 src/main/runtime/structured-agent-session-physical-exit-scaling.test.ts

diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-start-flight.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-start-flight.ts
index 85d6e40f992b..e94df69f6c9d 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-start-flight.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-start-flight.ts
@@ -42,14 +42,17 @@ export class StructuredAgentSessionStartFlights {
   /** Empty coverage survives handle eviction; completed process graphs do not. */
   physicalExit(sessionId: string, retiredWithoutRoot: boolean) {
     return {
-      wait: (): Promise<void> => {
+      wait: (signal?: AbortSignal): Promise<void> => {
+        throwIfSignalAborted(signal)
         const history = this.physical.get(sessionId)
         if (history ? !history.covered : retiredWithoutRoot) {
           throw agentSessionRefusalError('agent_session_ownership_unknown', {
             reason: 'ownerUnproven'
           })
         }
-        return Promise.all(history?.owners ?? []).then(() => {})
+        // Rejoin the live set after each exact exit; expired callers detach from this observer.
+        const pending = history?.owners.values().next().value
+        return pending ? waitForPromiseWithSignal(pending, signal) : Promise.resolve()
       },
       current: (): boolean => {
         const history = this.physical.get(sessionId)
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts
index 6ad0a29ca6b1..8bcb3d723cdf 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts
@@ -145,7 +145,7 @@ export function structuredAgentSessionSwitchSource(context: SwitchSourceContext)
         })
         // Source completion cannot occupy the serializer or the destination-work barrier.
         for (;;) {
-          await deadline.wait(source.physical.wait())
+          await deadline.wait(source.physical.wait(deadline.signal))
           const complete = await context.serialize(sessionId, async () => {
             deadline.check()
             const current = context.sessions.get(sessionId)?.child
diff --git a/src/main/runtime/structured-agent-session-physical-exit-scaling.test.ts b/src/main/runtime/structured-agent-session-physical-exit-scaling.test.ts
new file mode 100644
index 000000000000..ddcf0a40a225
--- /dev/null
+++ b/src/main/runtime/structured-agent-session-physical-exit-scaling.test.ts
@@ -0,0 +1,223 @@
+import { afterEach, expect, it, vi } from 'vitest'
+import { claudePipedFixture, SESSION } from './structured-claude-piped-test-support'
+import { nativeSwitchPhysicalFixture } from './structured-native-switch-physical.test-fixture'
+import { SUPERVISED_GRACEFUL_EXIT_MS } from '../claude/claude-child-exit-proof-ladder'
+import { attachParamsForRecord } from '../native-chat/agent-session-wire/structured-agent-session-conversation-open'
+import { hostTestAttachParams } from '../native-chat/agent-session-wire/structured-agent-session-host-test-data'
+import * as settlements from '../../shared/promise-settlement-waiters'
+
+vi.mock('../pty-descendant-termination', () => ({
+  captureDescendantSnapshot: async (pid: number) => ({
+    rootPgid: pid,
+    capturedAtMs: 1,
+    root: { pid, startedAt: 'Mon Jan 1 00:00:00 2026' },
+    descendants: [{ pid: pid + 1, ppid: pid, pgid: pid + 1, startedAt: 'Mon Jan 1 00:00:00 2026' }]
+  })
+}))
+vi.mock('../pty-descendant-exit-verification', () => ({
+  terminateDescendantSnapshotWithVerdict: async () => 'unverifiable'
+}))
+vi.mock('../crash-reporting/self-initiated-tree-kill-log', () => ({
+  recordSelfInitiatedTreeKill: vi.fn()
+}))
+
+afterEach(() => {
+  vi.useRealTimers()
+  vi.restoreAllMocks()
+})
+
+it.each([10, 100])(
+  'bounds actual physical-owner joins and expired switch retries at %i acquisitions',
+  async (count) => {
+    const fixture = await claudePipedFixture()
+    const flights = fixture.host.collaboratorsForTests().runtimeState.startFlights
+    const owners = new Map<unknown, { sessionId: string; reactions: () => number }>()
+    const observers = new Map<unknown, { readonly waiterCount: number }>()
+    const visited: unknown[] = []
+    const removed: unknown[] = []
+    let currentChecks = 0
+    const observe = flights.observePhysicalExit.bind(flights)
+    vi.spyOn(flights, 'observePhysicalExit').mockImplementation((id, exited, covered) => {
+      const then = vi.spyOn(exited, 'then')
+      owners.set(exited, { sessionId: id, reactions: () => then.mock.calls.length })
+      return observe(id, exited, covered)
+    })
+    const shared = settlements.sharedPromiseSettlementWaiters
+    vi.spyOn(settlements, 'sharedPromiseSettlementWaiters').mockImplementation(
+      <T>(promise: Promise<T>) => {
+        const observer = shared(promise)
+        if (owners.has(promise)) {
+          observers.set(promise, observer)
+        }
+        return observer
+      }
+    )
+    const values = Set.prototype.values
+    function observedValues(this: Set<unknown>) {
+      const iterator = values.call(this)
+      const next = iterator.next.bind(iterator)
+      iterator.next = (...args) => {
+        const result = next(...args)
+        if (!result.done && owners.has(result.value)) {
+          visited.push(result.value)
+        }
+        return result
+      }
+      return iterator
+    }
+    vi.spyOn(Set.prototype, 'values').mockImplementation(observedValues)
+    vi.spyOn(Set.prototype, Symbol.iterator).mockImplementation(observedValues)
+    const deleteEntry = Set.prototype.delete
+    vi.spyOn(Set.prototype, 'delete').mockImplementation(function (
+      this: Set<unknown>,
+      value: unknown
+    ) {
+      const deleted = deleteEntry.call(this, value)
+      if (deleted && owners.has(value)) {
+        removed.push(value)
+      }
+      return deleted
+    })
+    const physicalExit = flights.physicalExit.bind(flights)
+    vi.spyOn(flights, 'physicalExit').mockImplementation((...args) => {
+      const view = physicalExit(...args)
+      return {
+        ...view,
+        current: () => {
+          currentChecks++
+          return view.current()
+        }
+      }
+    })
+    const waiterCount = () => [...observers.values()].reduce((n, o) => n + o.waiterCount, 0)
+    const reactions = () => [...owners.values()].reduce((n, o) => n + o.reactions(), 0)
+    const forceClose = () => vi.advanceTimersByTimeAsync(SUPERVISED_GRACEFUL_EXIT_MS + 8000)
+    const paramsFor = (id: string) => {
+      const generated = fixture.params()
+      const record = fixture.host.deps.store.getRecord(id)
+      return record
+        ? attachParamsForRecord(record, {
+            clientOperationId: generated.envelope.clientOperationId,
+            expectedRuntimeFence: record.lease.runtimeFence
+          })
+        : hostTestAttachParams(null, {
+            ...generated,
+            envelope: { ...generated.envelope, sessionId: id }
+          })
+    }
+    const retire = async (id: string) => {
+      expect(await fixture.host.attach(fixture.caller, paramsFor(id))).toMatchObject({ ok: true })
+      await vi.waitFor(() =>
+        expect(fixture.host.readStatusSummary(id)?.hostExecutionPhase).toBe('ready')
+      )
+      const index = fixture.children.length - 1
+      fixture.permitKill.add(index)
+      const closing = fixture.host.close(id, 'evict')
+      await forceClose()
+      await closing
+      expect(fixture.connections[index]!.exitVerdict).toMatchObject({
+        root: 'live',
+        killDelivered: true
+      })
+      return index
+    }
+    vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] })
+    const identity = Promise.withResolvers<void>()
+    let switching: Awaited<ReturnType<typeof nativeSwitchPhysicalFixture>> | undefined
+    try {
+      const target: number[] = []
+      for (let n = 0; n < count; n++) {
+        target.push(await retire(SESSION))
+      }
+      for (let n = 0; n < count; n++) {
+        await retire('unrelated-session')
+      }
+      expect(owners.size).toBe(2 * count)
+      switching = await nativeSwitchPhysicalFixture(
+        fixture.host,
+        SESSION,
+        fixture.directory,
+        'claude'
+      )
+      for (let n = 0; n < count; n++) {
+        const expired = switching.run(1000).catch((error: unknown) => error)
+        await vi.waitFor(() => expect(waiterCount()).toBe(1))
+        await vi.advanceTimersByTimeAsync(1001)
+        expect(await expired).toMatchObject({
+          refusal: { code: 'agent_session_operation_expired' }
+        })
+        expect(waiterCount()).toBe(0)
+      }
+      expect(visited).toHaveLength(count)
+      expect(reactions()).toBe(2 * count + 1)
+      expect(switching.spawn).not.toHaveBeenCalled()
+      const surviving = switching.run().catch((error: unknown) => error)
+      await vi.waitFor(() => expect(waiterCount()).toBe(1))
+      const beforeCurrent = { visits: visited.length, reactions: reactions() }
+      const view = flights.physicalExit(SESSION, true)
+      for (let n = 0; n < count; n++) {
+        expect(view.current()).toBe(false)
+      }
+      expect({ visits: visited.length, reactions: reactions() }).toEqual(beforeCurrent)
+
+      const later = fixture.children.length
+      fixture.heldIdentity.set(9100000 + later * 100, identity.promise)
+      fixture.permitKill.add(later)
+      const ensuring = fixture.host
+        .attach(fixture.caller, paramsFor(SESSION))
+        .catch((error: unknown) => error)
+      await vi.waitFor(() => expect(fixture.connections).toHaveLength(later + 1))
+      fixture.children[later]!.stdin.emit('error', new Error('ordinary later ensure failed'))
+      await forceClose()
+      identity.resolve()
+      await forceClose()
+      expect(await ensuring).toMatchObject({ ok: false })
+      expect(owners.size).toBe(2 * count + 1)
+      const kills = fixture.signal.mock.calls.length
+      const afterRetries = visited.length - 1
+      for (const index of target) {
+        fixture.observedExit(index)
+        await vi.advanceTimersByTimeAsync(0)
+        await fixture.drain()
+      }
+      await vi.waitFor(() => expect(visited).toHaveLength(2 * count + 1))
+      expect(removed).toHaveLength(count)
+      expect(switching.spawn).not.toHaveBeenCalled()
+      expect(waiterCount()).toBe(1)
+      const completed = new Set(removed)
+      expect(visited.slice(afterRetries)).toHaveLength(count + 1)
+      expect(new Set(visited.slice(afterRetries)).size).toBe(count + 1)
+      fixture.observedExit(later)
+      await vi.advanceTimersByTimeAsync(0)
+      expect(await surviving).toMatchObject({ status: 'completed' })
+      expect(switching.spawn).toHaveBeenCalledOnce()
+      expect(fixture.signal.mock.calls).toHaveLength(kills)
+      expect(waiterCount()).toBe(0)
+      expect(removed).toHaveLength(count + 1)
+      expect(reactions()).toBe(3 * count + 2)
+      expect(currentChecks).toBeGreaterThanOrEqual(2 * count + 1)
+      expect(currentChecks).toBeLessThan(3 * count + 20)
+      expect([...observers.keys()].every((p) => owners.get(p)?.sessionId === SESSION)).toBe(true)
+      expect(removed.slice(count).some((p) => completed.has(p))).toBe(false)
+      expect(view.current()).toBe(true)
+      expect(fixture.prompts).toEqual([])
+      console.info(
+        'native-physical-counts',
+        JSON.stringify({
+          acquisitions: owners.size,
+          retries: count,
+          traversed: visited.length,
+          reactions: reactions(),
+          currentChecks,
+          liveWaiters: waiterCount(),
+          removed: removed.length,
+          destinations: switching.spawn.mock.calls.length
+        })
+      )
+    } finally {
+      identity.resolve()
+      switching?.dispose()
+      await fixture.dispose()
+    }
+  }
+)

From ee647c1530684c2c562db03dd05828fc2acd85e1 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 02:51:40 -0700
Subject: [PATCH 115/207] Repair switch integration imports and fixture types

---
 src/main/ipc/pty/ipc/spawn-commit-run-facts.test.ts         | 5 ++++-
 .../structured-agent-session-switch-execution.test.ts       | 4 ++--
 .../runtime/terminal/launch/mobile-terminal-owned-create.ts | 6 ++++--
 .../reconcile-hydrated-server-layout-frames-switch.test.ts  | 2 +-
 .../app-shell/reconcile-hydrated-workspace-tab-models.ts    | 2 +-
 .../tab-group/tab-moves-drawn-from-frames.test.ts           | 2 +-
 src/renderer/src/runtime/divider-ratio-refusal.test.ts      | 2 +-
 .../src/runtime/layout-changes-during-stream-outage.test.ts | 2 +-
 .../src/runtime/main-loaded-layout-frames.test-fixture.ts   | 1 +
 .../src/runtime/pane-titles-drawn-from-frames.test.ts       | 2 +-
 src/renderer/src/runtime/workspace-layout-frame-sync.ts     | 2 --
 .../terminals/restored-terminal-rebind-restarts.test.ts     | 2 +-
 12 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/main/ipc/pty/ipc/spawn-commit-run-facts.test.ts b/src/main/ipc/pty/ipc/spawn-commit-run-facts.test.ts
index 26a5a2614fc5..529b272ebd5b 100644
--- a/src/main/ipc/pty/ipc/spawn-commit-run-facts.test.ts
+++ b/src/main/ipc/pty/ipc/spawn-commit-run-facts.test.ts
@@ -8,6 +8,7 @@ import { commitPtyIpcSpawn } from './spawn-commit'
 import { createPtyIpcSpawnState } from './spawn-state'
 import type { PtySpawnIpcDeps } from './spawn-types'
 import { createPaneBindingStore } from '../pty-launch-race-test-fixture'
+import type { PersistPtyBindingArgs } from '../../../persistence/loading-store/pty-binding-persistence'
 
 vi.mock('../../../../shared/layout-owner-switch', () => ({ ORCA_LAYOUT_OWNER_IS_MAIN: true }))
 
@@ -16,7 +17,9 @@ const INCARNATION_ID = 'inc-ipc-run-facts'
 const LEAF_ID = 'a1111111-1111-4111-8111-111111111111'
 
 async function commit(
-  persistPtyBinding: ReturnType<typeof vi.fn>,
+  persistPtyBinding: (
+    input: PersistPtyBindingArgs | (() => PersistPtyBindingArgs | null)
+  ) => Promise<boolean>,
   prepare?: (ctx: ReturnType<typeof createPtyIpcSpawnState>) => void
 ) {
   const facts = new TerminalRunFactsRegister()
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
index 6afe32307945..b929518eec4f 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
@@ -25,7 +25,7 @@ import {
 } from '../../main-owned-workspace-runtime-fixture'
 import { executeStructuredSessionSwitch } from './structured-agent-session-switch-execution'
 import { DaemonRequestTimeoutError } from '../../../daemon/daemon-errors'
-import type { RuntimeMobileSessionTerminalTab } from '../../../../shared/runtime-mobile-session-tab-contracts'
+import type { RuntimeMobileSessionTerminalClientTab } from '../../../../shared/runtime-mobile-session-tab-contracts'
 
 let rig: RestTestRig
 beforeEach(async () => {
@@ -381,7 +381,7 @@ it.each([
     if (viewerSelection) {
       expect(
         snapshot.tabs.find(
-          (tab): tab is RuntimeMobileSessionTerminalTab =>
+          (tab): tab is RuntimeMobileSessionTerminalClientTab =>
             tab.type === 'terminal' && tab.ptyId === 'switch-destination'
         )?.openPlacement
       ).toMatchObject({
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts b/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
index 9d31e346c7c0..668d02dee184 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
@@ -1,4 +1,7 @@
-import { isSessionTabSelectionRequest } from '../../../../shared/session-tab-placement'
+import {
+  isSessionTabSelectionRequest,
+  placeCreatedSessionTab
+} from '../../../../shared/session-tab-placement'
 import { captureMobileTerminalCreatePlacement } from './mobile-terminal-create-anchor'
 import { OrcaRuntimeWithReconcileOwnedMobileTerminal } from './mobile-terminal-create-reconciliation'
 import type {
@@ -14,7 +17,6 @@ import {
 } from './mobile-terminal-create'
 import { randomUUID } from 'node:crypto'
 import { deriveRemoteRuntimeTerminalCreateHandle } from '../../remote-runtime-terminal-create-identity'
-import { placeCreatedSessionTab } from '../../../../shared/session-tab-placement'
 import type { OrcaRuntimeWithBuildPtyTerminalSummary as PtyTerminalSummaryMethods } from '../query/pty-terminal-summary'
 import {
   buildHeadlessMobileSessionTabGroups,
diff --git a/src/renderer/src/app-shell/reconcile-hydrated-server-layout-frames-switch.test.ts b/src/renderer/src/app-shell/reconcile-hydrated-server-layout-frames-switch.test.ts
index 7943330f02f8..e034d886d150 100644
--- a/src/renderer/src/app-shell/reconcile-hydrated-server-layout-frames-switch.test.ts
+++ b/src/renderer/src/app-shell/reconcile-hydrated-server-layout-frames-switch.test.ts
@@ -15,7 +15,7 @@ vi.mock('../../../shared/layout-owner-switch', () => ({
 vi.mock('../runtime/server-layout-frames', () => ({
   showServerLayoutFrames: hoisted.showServerLayoutFrames
 }))
-vi.mock('../runtime/workspace-layout-frame-sync', () => ({
+vi.mock('../runtime/workspace-layout-frame-startup', () => ({
   showStartupLayoutFrames: hoisted.showStartupLayoutFrames
 }))
 vi.mock('../runtime/sleeping-records-to-layout-owner', () => ({
diff --git a/src/renderer/src/app-shell/reconcile-hydrated-workspace-tab-models.ts b/src/renderer/src/app-shell/reconcile-hydrated-workspace-tab-models.ts
index 7c70f77e2d8f..5a9699cf0214 100644
--- a/src/renderer/src/app-shell/reconcile-hydrated-workspace-tab-models.ts
+++ b/src/renderer/src/app-shell/reconcile-hydrated-workspace-tab-models.ts
@@ -1,6 +1,6 @@
 import type { WorkspaceSessionState } from '../../../shared/workspace-session-state-types'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../shared/layout-owner-switch'
-import { showStartupLayoutFrames } from '../runtime/workspace-layout-frame-sync'
+import { showStartupLayoutFrames } from '../runtime/workspace-layout-frame-startup'
 import { showServerLayoutFrames } from '../runtime/server-layout-frames'
 import { followSleepingRecordsInLayoutOwner } from '../runtime/sleeping-records-to-layout-owner'
 
diff --git a/src/renderer/src/components/tab-group/tab-moves-drawn-from-frames.test.ts b/src/renderer/src/components/tab-group/tab-moves-drawn-from-frames.test.ts
index 85ded5f46800..26e05bedd757 100644
--- a/src/renderer/src/components/tab-group/tab-moves-drawn-from-frames.test.ts
+++ b/src/renderer/src/components/tab-group/tab-moves-drawn-from-frames.test.ts
@@ -27,7 +27,7 @@ vi.mock('@/runtime/runtime-layout-client', async (importOriginal) =>
   ).runtimeLayoutClientWithTestFrames(await importOriginal())
 )
 // The test opens its own stream: boot's document-long one would outlive the test's transport.
-vi.mock('@/runtime/workspace-layout-frame-sync', async (importOriginal) => ({
+vi.mock('@/runtime/workspace-layout-frame-startup', async (importOriginal) => ({
   ...(await importOriginal<object>()),
   showStartupLayoutFrames: () => {}
 }))
diff --git a/src/renderer/src/runtime/divider-ratio-refusal.test.ts b/src/renderer/src/runtime/divider-ratio-refusal.test.ts
index c1f8caf2dfba..c9e1126cb86b 100644
--- a/src/renderer/src/runtime/divider-ratio-refusal.test.ts
+++ b/src/renderer/src/runtime/divider-ratio-refusal.test.ts
@@ -18,7 +18,7 @@ import { openWorkspaceLayoutFrameSync } from './workspace-layout-frame-sync'
 
 vi.mock('../../../shared/layout-owner-switch', () => ({ ORCA_LAYOUT_OWNER_IS_MAIN: true }))
 // The test opens its own stream: boot's document-long one would outlive the test's transport.
-vi.mock('./workspace-layout-frame-sync', async (importOriginal) => ({
+vi.mock('./workspace-layout-frame-startup', async (importOriginal) => ({
   ...(await importOriginal<object>()),
   showStartupLayoutFrames: () => {}
 }))
diff --git a/src/renderer/src/runtime/layout-changes-during-stream-outage.test.ts b/src/renderer/src/runtime/layout-changes-during-stream-outage.test.ts
index 3bf9d2a503b9..9c7c0e5bf043 100644
--- a/src/renderer/src/runtime/layout-changes-during-stream-outage.test.ts
+++ b/src/renderer/src/runtime/layout-changes-during-stream-outage.test.ts
@@ -38,7 +38,7 @@ import { openWorkspaceLayoutFrameSync } from './workspace-layout-frame-sync'
 
 vi.mock('../../../shared/layout-owner-switch', () => ({ ORCA_LAYOUT_OWNER_IS_MAIN: true }))
 // The test opens its own stream: boot's document-long one would outlive the test's double.
-vi.mock('./workspace-layout-frame-sync', async (importOriginal) => ({
+vi.mock('./workspace-layout-frame-startup', async (importOriginal) => ({
   ...(await importOriginal<object>()),
   showStartupLayoutFrames: () => {}
 }))
diff --git a/src/renderer/src/runtime/main-loaded-layout-frames.test-fixture.ts b/src/renderer/src/runtime/main-loaded-layout-frames.test-fixture.ts
index 989b65e4f03b..3e7d1bc6a932 100644
--- a/src/renderer/src/runtime/main-loaded-layout-frames.test-fixture.ts
+++ b/src/renderer/src/runtime/main-loaded-layout-frames.test-fixture.ts
@@ -171,6 +171,7 @@ export function countOpenPlacementWork() {
             reading.mappingRows += 1
             yield entry
           }
+          return undefined
         }
       }
       return rows
diff --git a/src/renderer/src/runtime/pane-titles-drawn-from-frames.test.ts b/src/renderer/src/runtime/pane-titles-drawn-from-frames.test.ts
index b958e0b32127..34e4c787172c 100644
--- a/src/renderer/src/runtime/pane-titles-drawn-from-frames.test.ts
+++ b/src/renderer/src/runtime/pane-titles-drawn-from-frames.test.ts
@@ -26,7 +26,7 @@ vi.mock('@/runtime/runtime-layout-client', async (importOriginal) =>
   ).runtimeLayoutClientWithTestFrames(await importOriginal())
 )
 // The test opens its own stream: boot's document-long one would outlive the test's transport.
-vi.mock('./workspace-layout-frame-sync', async (importOriginal) => ({
+vi.mock('./workspace-layout-frame-startup', async (importOriginal) => ({
   ...(await importOriginal<object>()),
   showStartupLayoutFrames: () => {}
 }))
diff --git a/src/renderer/src/runtime/workspace-layout-frame-sync.ts b/src/renderer/src/runtime/workspace-layout-frame-sync.ts
index 0270a02518c0..a890f68c592a 100644
--- a/src/renderer/src/runtime/workspace-layout-frame-sync.ts
+++ b/src/renderer/src/runtime/workspace-layout-frame-sync.ts
@@ -295,5 +295,3 @@ const FRAME_BUILD_HOLDS: Omit<LayoutFrameBuildHolds, 'newRowFields'> = {
   keepsTerminalLayout: isTabPaneTreeHeld,
   held: { isTabHeld: isDrawnTabHeld, isGroupLayoutHeld: isDrawnGroupLayoutHeld }
 }
-
-export { showStartupLayoutFrames } from './workspace-layout-frame-startup'
diff --git a/src/renderer/src/store/terminals/restored-terminal-rebind-restarts.test.ts b/src/renderer/src/store/terminals/restored-terminal-rebind-restarts.test.ts
index ae9aeafa8710..3599b4eee390 100644
--- a/src/renderer/src/store/terminals/restored-terminal-rebind-restarts.test.ts
+++ b/src/renderer/src/store/terminals/restored-terminal-rebind-restarts.test.ts
@@ -38,7 +38,7 @@ import type { AppState } from '../types'
 
 vi.mock('../../../../shared/layout-owner-switch', () => ({ ORCA_LAYOUT_OWNER_IS_MAIN: true }))
 // Main's frames are applied by hand below; the window's own stream has no main to reach here.
-vi.mock('@/runtime/workspace-layout-frame-sync', () => ({ showStartupLayoutFrames: vi.fn() }))
+vi.mock('@/runtime/workspace-layout-frame-startup', () => ({ showStartupLayoutFrames: vi.fn() }))
 vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } }))
 vi.mock('@/lib/agent-status', async (importOriginal) => {
   const actual = await importOriginal<typeof AgentStatusModule>()

From b672331ab271433894fcc05b91f7243531c74ef0 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 03:10:12 -0700
Subject: [PATCH 116/207] Trace Windows PTY fixture settlement boundaries

---
 .../native-pty-spawn-windows.test.ts          | 95 +++++++++++++++++--
 1 file changed, 88 insertions(+), 7 deletions(-)

diff --git a/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts b/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts
index defbbe82baa1..7d974a31d8cf 100644
--- a/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts
+++ b/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts
@@ -297,7 +297,9 @@ describe('Windows shell fallback over node-pty ConPTY', () => {
         spawnSubprocess: async (options) => {
           const work = new TerminalCreationWork()
           try {
+            trace('native-spawn:before')
             const spawned = await spawnNativeDaemonPty({ ...args, creationWork: work })
+            trace('native-spawn:after')
             return createDaemonPtySubprocessHandle({
               ...spawned,
               env: {},
@@ -307,11 +309,33 @@ describe('Windows shell fallback over node-pty ConPTY', () => {
               startupEvents: spawned.claimStartupEvents?.()
             })
           } finally {
+            trace('lower-finish:before')
             await work.finish()
-            options.onCreationDisposition?.(await work.completion)
+            trace('lower-finish:after')
+            let disposition: Awaited<typeof work.completion> | undefined
+            trace('lower-completion:before')
+            options.onCreationDisposition?.((disposition = await work.completion))
+            trace('lower-completion:after')
+            console.info('R110_H', outcome, 'lower-disposition', disposition?.kind)
+            trace('lower-reported')
           }
         }
       })
+      // Temporary scalar witnesses distinguish the original await from cleanup masking it.
+      const trace = (phase: string): void => {
+        console.info(
+          'R110_H',
+          outcome,
+          phase,
+          nodePty.spawn.mock.calls.length,
+          ptyJob.terminatePtyJob.mock.calls.length,
+          ptyJob.killConptyNow.mock.calls.length,
+          broken.exitSubscriberCount(),
+          gate.snapshot().terminals,
+          host.listSessions().length
+        )
+      }
+      trace('create:before')
       const creating = host.createOrAttach({
         sessionId: 'ordinary-conpty',
         cols: 80,
@@ -319,24 +343,45 @@ describe('Windows shell fallback over node-pty ConPTY', () => {
         streamClient: { onData() {}, onExit() {} }
       })
       const creationSettled = creating.then(
-        () => null,
-        (error: unknown) => error
+        () => {
+          trace('create:fulfilled')
+          return null
+        },
+        (error: unknown) => {
+          trace('create:rejected')
+          return error
+        }
       )
       try {
         if (outcome === 'observation-retry') {
+          trace('close-observation:before')
           await vi.waitFor(() => expect(ptyJob.killConptyNow).toHaveBeenCalledOnce())
+          trace('close-observation:after')
+          trace('creation-exit-budget:before')
           await vi.advanceTimersByTimeAsync(IMMEDIATE_KILL_PHYSICAL_EXIT_TIMEOUT_MS)
+          trace('creation-exit-budget:after')
+          trace('creation-rejection:before')
           expect(await creationSettled).toBeInstanceOf(Error)
+          trace('creation-rejection:after')
           expect(host.listSessions()).toEqual([])
           expect(gate.snapshot().terminals).toBe(1)
           // Let the automatic failed-create recovery also exhaust its bounded exit wait.
+          trace('recovery-exit-budget:before')
           await vi.advanceTimersByTimeAsync(IMMEDIATE_KILL_PHYSICAL_EXIT_TIMEOUT_MS)
+          trace('recovery-exit-budget:after')
           const requests = ptyJob.terminatePtyJob.mock.calls.length
           ptyJob.terminatePtyJob.mockImplementation(() => {
-            queueMicrotask(() => broken.emitExit(137))
+            trace('observation-retry-job:request')
+            queueMicrotask(() => {
+              trace('observation-retry-job:exit-before')
+              broken.emitExit(137)
+              trace('observation-retry-job:exit-delivered')
+            })
             return 'terminated'
           })
+          trace('observation-retry-dispose:before')
           await host.dispose()
+          trace('observation-retry-dispose:after')
           expect(ptyJob.terminatePtyJob.mock.calls.length).toBeGreaterThan(requests)
           expect(ptyJob.killConptyNow).toHaveBeenCalledOnce()
           expect(broken.kill).not.toHaveBeenCalled()
@@ -347,61 +392,97 @@ describe('Windows shell fallback over node-pty ConPTY', () => {
           expect(host.listSessions()).toEqual([])
           return
         }
+        trace('kill-observation:before')
         await vi.waitFor(() => expect(broken.kill).toHaveBeenCalledOnce())
+        trace('kill-observation:after')
         expect(nodePty.spawn).toHaveBeenCalledOnce()
         expect(host.listSessions()).toEqual([])
         if (outcome === 'physical-exit') {
           broken.emitExit(137)
+          trace('replacement-observation:before')
           await vi.waitFor(() => expect(nodePty.spawn).toHaveBeenCalledTimes(2))
+          trace('replacement-observation:after')
           replacement.emitData(CONPTY_PRELUDE)
         } else {
+          trace('startup-deadline:before')
           await vi.advanceTimersByTimeAsync(CONPTY_STARTUP_DECISION_LIMIT_MS)
+          trace('startup-deadline:after')
         }
+        trace('creating:before')
         const created = await creating
+        trace('creating:after')
         expect(created.isNew).toBe(true)
         expect(created.pid).toBe(outcome === 'physical-exit' ? replacement.pid : broken.pid)
         expect(nodePty.spawn).toHaveBeenCalledTimes(outcome === 'physical-exit' ? 2 : 1)
         expect(gate.snapshot().terminals).toBe(1)
         if (outcome === 'deadline') {
           ptyJob.terminatePtyJob.mockReturnValue('unavailable')
+          trace('first-dispose:start')
           const disposing = host.dispose().then(
-            () => null,
-            (error: unknown) => error
+            () => {
+              trace('first-dispose:fulfilled')
+              return null
+            },
+            (error: unknown) => {
+              trace('first-dispose:rejected')
+              return error
+            }
           )
+          trace('dispose-job-observation:before')
           await vi.waitFor(() =>
             expect(
               ptyJob.terminatePtyJob.mock.calls.filter(([proc]) => proc === broken).length
             ).toBeGreaterThan(1)
           )
+          trace('dispose-job-observation:after')
           expect(gate.snapshot().terminals).toBe(1)
           expect(host.listSessions()).toHaveLength(1)
+          trace('disposal-exit-budget:before')
           await vi.advanceTimersByTimeAsync(IMMEDIATE_KILL_PHYSICAL_EXIT_TIMEOUT_MS)
+          trace('disposal-exit-budget:after')
+          trace('disposal-rejection:before')
           expect(await disposing).toBeInstanceOf(Error)
+          trace('disposal-rejection:after')
           expect(gate.snapshot().terminals).toBe(1)
           expect(host.listSessions()).toHaveLength(1)
           // The same owner's force request must reach the now-available job after the timeout.
           const requests = ptyJob.terminatePtyJob.mock.calls.length
           ptyJob.terminatePtyJob.mockImplementation(() => {
-            queueMicrotask(() => broken.emitExit(137))
+            trace('deadline-retry-job:request')
+            queueMicrotask(() => {
+              trace('deadline-retry-job:exit-before')
+              broken.emitExit(137)
+              trace('deadline-retry-job:exit-delivered')
+            })
             return 'terminated'
           })
+          trace('retry-dispose:start')
           const retrying = host.dispose()
+          trace('retry-job-observation:before')
           await vi.waitFor(() =>
             expect(ptyJob.terminatePtyJob.mock.calls.length).toBeGreaterThan(requests)
           )
+          trace('retry-job-observation:after')
+          trace('retry-dispose:before')
           await retrying
+          trace('retry-dispose:after')
           expect(broken.kill).toHaveBeenCalledOnce()
           expect(broken.destroy).not.toHaveBeenCalled()
         } else {
+          trace('physical-exit-dispose:before')
           await host.dispose()
+          trace('physical-exit-dispose:after')
         }
         expect(gate.snapshot().terminals).toBe(0)
         expect(host.listSessions()).toEqual([])
         expect(process.kill).not.toHaveBeenCalled()
       } finally {
+        trace('finally:entered')
         broken.emitExit(137)
         replacement.emitExit(137)
+        trace('final-dispose:before')
         await host.dispose()
+        trace('final-dispose:after')
       }
     }
   )

From 464b4c4fd42b19339ee8711c8662252de5d86165 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 04:38:15 -0700
Subject: [PATCH 117/207] Preserve switch identity, selection and destination
 reuse

---
 .../native-pty-spawn-windows.test.ts          |  97 +----
 ...-agent-session-switch-command-selection.ts |  33 +-
 ...tructured-agent-session-switch-commands.ts |  33 +-
 ...ctured-agent-session-switch-import.test.ts |  82 +++-
 .../structured-agent-session-switch-import.ts |  20 +-
 .../structured-agent-session-switch-source.ts |   9 +-
 .../runtime/client-session-tab-selection.ts   |  33 +-
 ...red-agent-session-switch-execution.test.ts | 373 +++++++++++++++--
 ...ructured-agent-session-switch-execution.ts |  39 +-
 ...ctured-agent-session-switch-preparation.ts |  22 +
 .../session-tabs-graph-changes.ts             |  41 ++
 .../session-tabs/session-tabs-inventory.ts    |  66 ++-
 .../structured-session-tab-restoration.ts     |   9 +-
 src/renderer/src/i18n/locales/en.json         |   1 +
 ...structured-agent-session-tab-activation.ts |  21 +-
 .../lib/conversation-surface-switch.test.tsx  | 389 ++++++++++++++++++
 .../conversation-switch-result-selection.ts   |  17 +-
 ...ss-version-agent-session-wire.unit.test.ts |   2 +-
 .../structured-agent-session-host-fixture.ts  |  14 +-
 19 files changed, 1061 insertions(+), 240 deletions(-)
 create mode 100644 src/main/runtime/session-tabs/session-tabs-graph-changes.ts

diff --git a/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts b/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts
index 7d974a31d8cf..2e002a0e7f2c 100644
--- a/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts
+++ b/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts
@@ -1,3 +1,4 @@
+import '../mock-descendant-sweep'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { spawnNativeDaemonPty } from './native-pty-spawn'
 import { createDaemonPtySubprocessHandle } from './subprocess-handle'
@@ -17,7 +18,6 @@ const ptyJob = vi.hoisted(() => ({
 }))
 vi.mock('../../windows/windows-pty-job', () => ptyJob)
 
-import '../mock-descendant-sweep'
 import { TerminalHost } from '../terminal-host'
 import { TerminalSpawnGate } from '../terminal-spawn-gate'
 import { IMMEDIATE_KILL_PHYSICAL_EXIT_TIMEOUT_MS } from '../immediate-kill-reply-budget'
@@ -297,9 +297,7 @@ describe('Windows shell fallback over node-pty ConPTY', () => {
         spawnSubprocess: async (options) => {
           const work = new TerminalCreationWork()
           try {
-            trace('native-spawn:before')
             const spawned = await spawnNativeDaemonPty({ ...args, creationWork: work })
-            trace('native-spawn:after')
             return createDaemonPtySubprocessHandle({
               ...spawned,
               env: {},
@@ -309,33 +307,11 @@ describe('Windows shell fallback over node-pty ConPTY', () => {
               startupEvents: spawned.claimStartupEvents?.()
             })
           } finally {
-            trace('lower-finish:before')
             await work.finish()
-            trace('lower-finish:after')
-            let disposition: Awaited<typeof work.completion> | undefined
-            trace('lower-completion:before')
-            options.onCreationDisposition?.((disposition = await work.completion))
-            trace('lower-completion:after')
-            console.info('R110_H', outcome, 'lower-disposition', disposition?.kind)
-            trace('lower-reported')
+            options.onCreationDisposition?.(await work.completion)
           }
         }
       })
-      // Temporary scalar witnesses distinguish the original await from cleanup masking it.
-      const trace = (phase: string): void => {
-        console.info(
-          'R110_H',
-          outcome,
-          phase,
-          nodePty.spawn.mock.calls.length,
-          ptyJob.terminatePtyJob.mock.calls.length,
-          ptyJob.killConptyNow.mock.calls.length,
-          broken.exitSubscriberCount(),
-          gate.snapshot().terminals,
-          host.listSessions().length
-        )
-      }
-      trace('create:before')
       const creating = host.createOrAttach({
         sessionId: 'ordinary-conpty',
         cols: 80,
@@ -343,45 +319,24 @@ describe('Windows shell fallback over node-pty ConPTY', () => {
         streamClient: { onData() {}, onExit() {} }
       })
       const creationSettled = creating.then(
-        () => {
-          trace('create:fulfilled')
-          return null
-        },
-        (error: unknown) => {
-          trace('create:rejected')
-          return error
-        }
+        () => null,
+        (error: unknown) => error
       )
       try {
         if (outcome === 'observation-retry') {
-          trace('close-observation:before')
           await vi.waitFor(() => expect(ptyJob.killConptyNow).toHaveBeenCalledOnce())
-          trace('close-observation:after')
-          trace('creation-exit-budget:before')
           await vi.advanceTimersByTimeAsync(IMMEDIATE_KILL_PHYSICAL_EXIT_TIMEOUT_MS)
-          trace('creation-exit-budget:after')
-          trace('creation-rejection:before')
           expect(await creationSettled).toBeInstanceOf(Error)
-          trace('creation-rejection:after')
           expect(host.listSessions()).toEqual([])
           expect(gate.snapshot().terminals).toBe(1)
           // Let the automatic failed-create recovery also exhaust its bounded exit wait.
-          trace('recovery-exit-budget:before')
           await vi.advanceTimersByTimeAsync(IMMEDIATE_KILL_PHYSICAL_EXIT_TIMEOUT_MS)
-          trace('recovery-exit-budget:after')
           const requests = ptyJob.terminatePtyJob.mock.calls.length
           ptyJob.terminatePtyJob.mockImplementation(() => {
-            trace('observation-retry-job:request')
-            queueMicrotask(() => {
-              trace('observation-retry-job:exit-before')
-              broken.emitExit(137)
-              trace('observation-retry-job:exit-delivered')
-            })
+            queueMicrotask(() => broken.emitExit(137))
             return 'terminated'
           })
-          trace('observation-retry-dispose:before')
           await host.dispose()
-          trace('observation-retry-dispose:after')
           expect(ptyJob.terminatePtyJob.mock.calls.length).toBeGreaterThan(requests)
           expect(ptyJob.killConptyNow).toHaveBeenCalledOnce()
           expect(broken.kill).not.toHaveBeenCalled()
@@ -392,97 +347,61 @@ describe('Windows shell fallback over node-pty ConPTY', () => {
           expect(host.listSessions()).toEqual([])
           return
         }
-        trace('kill-observation:before')
         await vi.waitFor(() => expect(broken.kill).toHaveBeenCalledOnce())
-        trace('kill-observation:after')
         expect(nodePty.spawn).toHaveBeenCalledOnce()
         expect(host.listSessions()).toEqual([])
         if (outcome === 'physical-exit') {
           broken.emitExit(137)
-          trace('replacement-observation:before')
           await vi.waitFor(() => expect(nodePty.spawn).toHaveBeenCalledTimes(2))
-          trace('replacement-observation:after')
           replacement.emitData(CONPTY_PRELUDE)
         } else {
-          trace('startup-deadline:before')
           await vi.advanceTimersByTimeAsync(CONPTY_STARTUP_DECISION_LIMIT_MS)
-          trace('startup-deadline:after')
         }
-        trace('creating:before')
         const created = await creating
-        trace('creating:after')
         expect(created.isNew).toBe(true)
         expect(created.pid).toBe(outcome === 'physical-exit' ? replacement.pid : broken.pid)
         expect(nodePty.spawn).toHaveBeenCalledTimes(outcome === 'physical-exit' ? 2 : 1)
         expect(gate.snapshot().terminals).toBe(1)
         if (outcome === 'deadline') {
           ptyJob.terminatePtyJob.mockReturnValue('unavailable')
-          trace('first-dispose:start')
           const disposing = host.dispose().then(
-            () => {
-              trace('first-dispose:fulfilled')
-              return null
-            },
-            (error: unknown) => {
-              trace('first-dispose:rejected')
-              return error
-            }
+            () => null,
+            (error: unknown) => error
           )
-          trace('dispose-job-observation:before')
           await vi.waitFor(() =>
             expect(
               ptyJob.terminatePtyJob.mock.calls.filter(([proc]) => proc === broken).length
             ).toBeGreaterThan(1)
           )
-          trace('dispose-job-observation:after')
           expect(gate.snapshot().terminals).toBe(1)
           expect(host.listSessions()).toHaveLength(1)
-          trace('disposal-exit-budget:before')
           await vi.advanceTimersByTimeAsync(IMMEDIATE_KILL_PHYSICAL_EXIT_TIMEOUT_MS)
-          trace('disposal-exit-budget:after')
-          trace('disposal-rejection:before')
           expect(await disposing).toBeInstanceOf(Error)
-          trace('disposal-rejection:after')
           expect(gate.snapshot().terminals).toBe(1)
           expect(host.listSessions()).toHaveLength(1)
           // The same owner's force request must reach the now-available job after the timeout.
           const requests = ptyJob.terminatePtyJob.mock.calls.length
           ptyJob.terminatePtyJob.mockImplementation(() => {
-            trace('deadline-retry-job:request')
-            queueMicrotask(() => {
-              trace('deadline-retry-job:exit-before')
-              broken.emitExit(137)
-              trace('deadline-retry-job:exit-delivered')
-            })
+            queueMicrotask(() => broken.emitExit(137))
             return 'terminated'
           })
-          trace('retry-dispose:start')
           const retrying = host.dispose()
-          trace('retry-job-observation:before')
           await vi.waitFor(() =>
             expect(ptyJob.terminatePtyJob.mock.calls.length).toBeGreaterThan(requests)
           )
-          trace('retry-job-observation:after')
-          trace('retry-dispose:before')
           await retrying
-          trace('retry-dispose:after')
           expect(broken.kill).toHaveBeenCalledOnce()
           expect(broken.destroy).not.toHaveBeenCalled()
         } else {
-          trace('physical-exit-dispose:before')
           await host.dispose()
-          trace('physical-exit-dispose:after')
         }
         expect(gate.snapshot().terminals).toBe(0)
         expect(host.listSessions()).toEqual([])
         expect(process.kill).not.toHaveBeenCalled()
       } finally {
-        trace('finally:entered')
         broken.emitExit(137)
         replacement.emitExit(137)
-        trace('final-dispose:before')
         await host.dispose()
-        trace('final-dispose:after')
       }
     }
   )
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command-selection.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command-selection.ts
index 43ed15603a5b..a99a08e57576 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command-selection.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command-selection.ts
@@ -38,6 +38,8 @@ export function selectStructuredSessionSwitchCommand(args: {
   onRetained?: (check: () => void) => Promise<void>
   allowUncreated?: boolean
   conversationKey?: string
+  destinationCurrent?: (result: AgentSessionSwitchResult) => boolean | undefined
+  onAccepted?: () => void
 }): SwitchCommand {
   const { host, commands, isDisposed, id, invocationId, direction, deadline, run, onRetained } =
     args
@@ -46,15 +48,27 @@ export function selectStructuredSessionSwitchCommand(args: {
   const prior =
     (args.conversationKey ? commands.get(args.conversationKey) : undefined) ?? commands.get(id)
   if (prior) {
-    if (
-      prior.invocationId === invocationId ||
-      (prior.direction === direction &&
-        (!prior.settled ||
-          (prior.result?.status === 'completed' &&
-            prior.deadline.remaining() > 0 &&
-            !prior.deadline.signal.aborted &&
-            (!prior.workCurrent || prior.workCurrent()))))
-    ) {
+    const replay = prior.invocationId === invocationId
+    const join = prior.direction === direction && !prior.settled
+    const completed =
+      !replay &&
+      !join &&
+      prior.direction === direction &&
+      prior.settled &&
+      prior.result?.status === 'completed'
+    const destinationCurrent = completed ? args.destinationCurrent?.(prior.result!) : undefined
+    if (completed && destinationCurrent === undefined) {
+      throw agentSessionRefusalError('agent_session_ownership_unknown', {
+        reason: 'ownerUnproven'
+      })
+    }
+    const reusable =
+      completed &&
+      destinationCurrent === true &&
+      prior.deadline.remaining() > 0 &&
+      !prior.deadline.signal.aborted &&
+      (!prior.workCurrent || prior.workCurrent())
+    if (replay || join || reusable) {
       commands.set(id, prior)
       if (args.conversationKey) {
         commands.set(args.conversationKey, prior)
@@ -78,6 +92,7 @@ export function selectStructuredSessionSwitchCommand(args: {
   if (!host.context().deps.store.getRecord(id) && !args.allowUncreated) {
     throw new AgentSessionRefusalError(AGENT_SESSION_NOT_ATTACHED)
   }
+  args.onAccepted?.()
   const command: SwitchCommand = {
     invocationId,
     generation: invocationId,
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-commands.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-commands.ts
index 15337e2e5748..a80e31bf8049 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-commands.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-commands.ts
@@ -34,22 +34,29 @@ export function createStructuredAgentSessionSwitchCommands(
           direction: SwitchCommand['direction']
           onRetained?: (check: () => void) => Promise<void>
           allowUncreated?: boolean
+          destinationCurrent?: (result: AgentSessionSwitchResult) => boolean | undefined
+          onAccepted?: () => void
         }
       ): Promise<AgentSessionSwitchResult> => {
-        const selected = await deadline.wait(
-          host.serialize(options.conversationKey ?? id, async () =>
-            selectStructuredSessionSwitchCommand({
-              host,
-              commands,
-              isDisposed,
-              id,
-              invocationId,
-              deadline,
-              run,
-              ...options
-            })
+        const selected = await deadline
+          .wait(
+            host.serialize(options.conversationKey ?? id, async () =>
+              selectStructuredSessionSwitchCommand({
+                host,
+                commands,
+                isDisposed,
+                id,
+                invocationId,
+                deadline,
+                run,
+                ...options
+              })
+            )
           )
-        )
+          .catch((error: unknown) => {
+            deadline.dispose()
+            throw error
+          })
         if (selected.deadline !== deadline) {
           deadline.dispose()
         }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.test.ts
index bdaee7e548cc..4d9ba80ab37f 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.test.ts
@@ -1,7 +1,8 @@
-import { mkdtemp, rm, writeFile, readFile, copyFile } from 'node:fs/promises'
+import { mkdtemp, rm, writeFile, readFile, copyFile, mkdir } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { writeCodexHistoryFixture } from '../agent-session-journal/codex-history-test-fixture'
 import { agentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
 import {
   claudeProviderHandle,
@@ -171,3 +172,82 @@ it.each([
     expect(completed.snapshot()).toEqual(final)
   }
 )
+
+it.each(['adopted-active', 'retained-archive'] as const)(
+  'keeps account-qualified paginated ancestry through capture and final refresh: %s',
+  async (route) => {
+    const sessions = join(root, 'account', 'sessions')
+    const archive = join(root, 'account', 'archived_sessions')
+    await mkdir(sessions, { recursive: true })
+    await mkdir(archive)
+    const parentId = '01a17c7f-6f58-7a73-b87a-a8702ff2da17'
+    const childId = '01a17c81-30d1-72f0-b84e-002ddfe6fd47'
+    const parent = await writeCodexHistoryFixture(
+      route === 'retained-archive' ? archive : sessions,
+      parentId,
+      ['prior completed']
+    )
+    const child = await writeCodexHistoryFixture(sessions, childId, ['current'], parent.position)
+    const source = {
+      agent: 'codex' as const,
+      sessionId: childId,
+      filePath: child.filePath,
+      ...(route === 'adopted-active'
+        ? {
+            source: { providerSessionId: childId, workspaceCwd: root, conversationStore: sessions }
+          }
+        : { codexHome: join(root, 'account') })
+    }
+    const stopped = await captureSwitchStoppedCliTurn(source, true, deadline)
+    expect(stopped).toMatchObject({ sessionId: childId })
+    const journal = await journals.open({
+      ...options(),
+      identity: { ...options().identity, providerHandle: codexProviderHandle(childId) }
+    })
+    expect(
+      await importLegacyTranscriptIntoJournal({
+        journal,
+        agent: 'codex',
+        sessionId: childId,
+        fence: 1,
+        options: { filePath: child.filePath, codexSessionsDirs: [sessions] }
+      })
+    ).toMatchObject({ ok: true, replaced: true })
+    const messages = journal.snapshot().items
+    expect(
+      messages.filter(({ body }) => body.kind === 'message').map(({ body }) => body)
+    ).toMatchObject([
+      { blocks: [{ text: 'prior completed' }] },
+      { blocks: [{ text: 'prior completed answer' }] },
+      { blocks: [{ text: 'current' }] },
+      { blocks: [{ text: 'current answer' }] }
+    ])
+    await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline, stopped })
+    expect(journal.snapshot().items.filter(({ body }) => body.kind !== 'turn')).toEqual(messages)
+    expect(
+      journal
+        .snapshot()
+        .items.filter(({ body }) => body.kind === 'turn')
+        .map(({ body }) => body)
+    ).toEqual([expect.objectContaining({ state: 'interrupted', turnId: stopped!.turnId })])
+    const refreshed = journal.snapshot()
+    await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline })
+    expect(journal.snapshot()).toEqual(refreshed)
+    await expect(
+      captureSwitchStoppedCliTurn(
+        {
+          ...source,
+          source: undefined,
+          codexHome: join(root, 'wrong-account')
+        },
+        true,
+        deadline
+      )
+    ).rejects.toMatchObject({
+      refusal: {
+        code: 'agent_session_identity_required',
+        details: { reason: 'transcriptUnreadable' }
+      }
+    })
+  }
+)
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.ts
index 97080994dc9f..8ed2900f5037 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.ts
@@ -5,8 +5,10 @@ import {
   usablePiHistoryClaim
 } from '../../pi/rpc-history-journal-view'
 import { createHash } from 'node:crypto'
+import { join } from 'node:path'
 import type { AgentType } from '../../../shared/agent-status-types'
-type SwitchTranscriptSource = { agent: AgentType; sessionId: string; filePath: string }
+import { getSystemCodexHomePath } from '../../codex/codex-home-paths'
+import type { AdoptedTranscriptSource } from '../agent-session-journal/adopted-transcript-source'
 import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key'
 import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types'
 import { agentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
@@ -15,6 +17,14 @@ import type { AgentSessionJournal } from '../agent-session-journal/journal-store
 import { prepareLegacyTranscriptImport } from '../agent-session-journal/journal-legacy-import'
 import type { JournalReplacementItem } from '../agent-session-journal/journal-epoch-replacement'
 
+export type SwitchTranscriptSource = {
+  agent: AgentType
+  sessionId: string
+  filePath: string
+  codexHome?: string | null
+  source?: AdoptedTranscriptSource
+}
+
 export type SwitchStoppedCliTurn = {
   sessionId: string
   userItemKey: string
@@ -31,7 +41,13 @@ async function prepare(
     agent: source.agent,
     piAfterEntry,
     sessionId: source.sessionId,
-    options: { filePath: source.filePath }
+    options: {
+      filePath: source.filePath,
+      source: source.source,
+      ...(source.agent === 'codex' && source.codexHome !== undefined
+        ? { codexSessionsDirs: [join(source.codexHome ?? getSystemCodexHomePath(), 'sessions')] }
+        : {})
+    }
   })
   deadline.check()
   if (!prepared.ok) {
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts
index 8bcb3d723cdf..79a09f8a23ae 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts
@@ -9,7 +9,8 @@ import {
 } from '../../../shared/agent-session-wire-refusals'
 import {
   catchUpSwitchedCliTranscript,
-  type SwitchStoppedCliTurn
+  type SwitchStoppedCliTurn,
+  type SwitchTranscriptSource
 } from './structured-agent-session-switch-import'
 import { catchUpStructuredSessionAtRest } from './structured-agent-session-at-rest-catch-up'
 import type * as HostTypes from './structured-agent-session-host-types'
@@ -186,10 +187,8 @@ export function structuredAgentSessionSwitchSource(context: SwitchSourceContext)
     },
     refreshSwitchTranscript: async (
       sessionId: string,
-      source: {
-        sessionId: string
-        filePath: string
-        agent?: HostTypes.StructuredAgentSessionHostSession['params']['agent']
+      source: Omit<SwitchTranscriptSource, 'agent'> & {
+        agent?: SwitchTranscriptSource['agent']
       },
       deadline: AgentSessionSwitchDeadline,
       stopped?: SwitchStoppedCliTurn,
diff --git a/src/main/runtime/client-session-tab-selection.ts b/src/main/runtime/client-session-tab-selection.ts
index a2cf137c4f19..a8f9930f62a8 100644
--- a/src/main/runtime/client-session-tab-selection.ts
+++ b/src/main/runtime/client-session-tab-selection.ts
@@ -23,25 +23,36 @@ export class ClientSessionTabSelectionStore {
   private persistListener: ((state: PersistedMobileClientTabSelections) => void) | null = null
 
   private hostNavigationRevision = 0
-  private hostSelectionRequest = 0
+  private hostSelectionRequest = { issued: 0, accepted: 0 }
 
   /** Only explicit host-target navigation supersedes the host's delayed selection. */
   noteHostNavigation(): void {
     this.hostNavigationRevision++
   }
 
-  captureHostSelection(): (consume?: boolean) => boolean {
+  captureHostSelection(deferAcceptance = false) {
     const revision = this.hostNavigationRevision
-    const request = ++this.hostSelectionRequest
+    const request = ++this.hostSelectionRequest.issued
     let pending = true
-    return (consume = false) => {
-      const current =
-        pending && revision === this.hostNavigationRevision && request === this.hostSelectionRequest
-      if (current && consume) {
-        pending = false
-      }
-      return current
-    }
+    const accept = () => {
+      this.hostSelectionRequest.accepted = Math.max(this.hostSelectionRequest.accepted, request)
+    }
+    if (!deferAcceptance) {
+      accept()
+    }
+    return Object.assign(
+      (consume = false) => {
+        const current =
+          pending &&
+          revision === this.hostNavigationRevision &&
+          request === this.hostSelectionRequest.accepted
+        if (current && consume) {
+          pending = false
+        }
+        return current
+      },
+      { accept }
+    )
   }
 
   // Persist across host restart so phones do not snap back to the first tab.
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
index b929518eec4f..6c6808eb53b7 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
@@ -1,7 +1,8 @@
-import { writeFile } from 'node:fs/promises'
+import { mkdir, writeFile } from 'node:fs/promises'
 import { join } from 'node:path'
 import * as cliTranscript from '../../../ai-vault/structured-chat-cli-fork'
 import { structuredAgentRuntimeMetadata } from '../../structured-agent-runtime-metadata'
+import * as mobileProjection from '../../runtime-mobile-session-projection'
 import { agentSessionProviderHandleChainHead } from '../../../../shared/agent-session-provider-handle'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import {
@@ -28,6 +29,7 @@ import { DaemonRequestTimeoutError } from '../../../daemon/daemon-errors'
 import type { RuntimeMobileSessionTerminalClientTab } from '../../../../shared/runtime-mobile-session-tab-contracts'
 
 let rig: RestTestRig
+let releaseReceiverExit: (() => void) | undefined
 beforeEach(async () => {
   rig = await createRestTestRig({ idleSweep: { intervalMs: 60_000 } })
   const params = createTestParams()
@@ -42,16 +44,21 @@ beforeEach(async () => {
   setStructuredAgentSessionHost(rig.host)
 })
 afterEach(async () => {
+  releaseReceiverExit?.()
+  releaseReceiverExit = undefined
   setStructuredAgentSessionHost(null)
   await rig.dispose()
   vi.restoreAllMocks()
 })
-async function savedTranscript() {
-  await rig.host.switchToChat(id)
-  await rig.host.switchToTerminal(id)
-  const record = rig.store.getRecord(id)!
+async function savedTranscript(sessionId = id) {
+  await rig.host.switchToChat(sessionId)
+  await rig.host.switchToTerminal(sessionId)
+  const record = rig.store.getRecord(sessionId)!
   const head = agentSessionProviderHandleChainHead(record.providerHandleChain)!
-  const filePath = join(rig.root, 'switch-source.jsonl')
+  const codexHome = join(rig.root, 'codex-account')
+  const sessions = join(codexHome, 'sessions')
+  await mkdir(sessions, { recursive: true })
+  const filePath = join(sessions, 'switch-source.jsonl')
   const nativeId = head.handle.nativeId
   await writeFile(
     filePath,
@@ -96,17 +103,46 @@ async function savedTranscript() {
       sessionId: nativeId,
       filePath,
       cwd: rig.root,
-      codexHome: null,
+      codexHome,
       executionHostPlatform: process.platform
     }
   })
 }
 
-it.each(['single', 'split'] as const)(
+it.each(['single', 'split', 'other-workspace'] as const)(
   'uses ordinary exact physical exit and source placement, retaining siblings: %s',
   async (shape) => {
-    const split = shape !== 'single'
-    await savedTranscript()
+    const split = shape === 'split'
+    const elsewhere = shape === 'other-workspace'
+    const sessionId = elsewhere ? 'existing-native-elsewhere' : id
+    const destinationWorkspace = elsewhere ? 'repo-1::/other-workspace' : WORKTREE_ID
+    if (elsewhere) {
+      const acquire = rig.adapter.acquire.getMockImplementation()!
+      rig.adapter.acquire.mockImplementation(async (input) => {
+        const resumed = Boolean(
+          rig.store.getRecord(input.identity.sessionId)?.providerHandleChain.length
+        )
+        const receipt = await acquire(input)
+        if (!receipt.link) {
+          throw new Error('missing fixture provider identity')
+        }
+        return {
+          ...receipt,
+          link: { ...receipt.link, origin: resumed ? 'resumed' : 'created' }
+        }
+      })
+      const params = createTestParams()
+      expect(
+        await rig.host.create(
+          caller,
+          createTestParams(undefined, {
+            envelope: { ...params.envelope, sessionId },
+            location: { ...params.location, workspaceId: destinationWorkspace }
+          })
+        )
+      ).toMatchObject({ ok: true })
+    }
+    await savedTranscript(sessionId)
     const { runtime, session } = setupMainOwnedWorkspace({ split: shape === 'split' })
     const incarnationId = '11111111-1111-4111-8111-111111111111'
     runtime.registerPty(PTY_A, WORKTREE_ID, null, { tabId: TAB_ID, leafId: LEAF_A, incarnationId })
@@ -138,10 +174,35 @@ it.each(['single', 'split'] as const)(
         tabId: 'agent-session:later-tab'
       })
     ).toMatchObject({ ok: true })
+    if (elsewhere) {
+      await runtime.publishStructuredAgentSessionTab({
+        workspaceId: destinationWorkspace,
+        sessionId,
+        agent: 'codex',
+        activate: false
+      })
+    }
+    const existingDestination = elsewhere
+      ? await vi.waitFor(() => {
+          const tabs =
+            session().unifiedTabs?.[destinationWorkspace]?.filter(
+              (tab) => tab.contentType === 'agent-session' && tab.entityId === sessionId
+            ) ?? []
+          expect(tabs).toHaveLength(1)
+          const tab = tabs[0]!
+          const group = session().tabGroups?.[destinationWorkspace]?.find((row) =>
+            row.tabOrder.includes(tab.id)
+          )
+          expect(group?.tabOrder).toEqual([tab.id])
+          return { tabId: tab.id, groupId: group!.id, tabOrder: [...group!.tabOrder] }
+        })
+      : undefined
+    const originalSourceTabs = structuredClone(session().tabsByWorktree[WORKTREE_ID])
+    const originalSourceLayout = structuredClone(session().terminalLayoutsByTabId[TAB_ID])
     const acquisitions = rig.adapter.acquire.mock.calls.length
     const operation = executeStructuredSessionSwitch(
       {
-        sessionId: id,
+        sessionId,
         execution: {
           invocationId: 'from-pane',
           source: {
@@ -162,34 +223,60 @@ it.each(['single', 'split'] as const)(
     ])
     expect(rig.adapter.acquire).toHaveBeenCalledTimes(acquisitions)
     exit.resolve()
-    expect(await operation).toEqual({ status: 'completed', sessionId: id })
+    expect(await operation).toEqual({ status: 'completed', sessionId })
     await vi.waitFor(() => expect(rig.adapter.acquire).toHaveBeenCalledTimes(acquisitions + 1))
     expect(stopped).toHaveBeenCalledOnce()
-    const destination = `agent-session:${id}`
-    const group = session().tabGroups?.[WORKTREE_ID]?.find((row) =>
-      row.tabOrder.includes(destination)
+    const destination = `agent-session:${sessionId}`
+    const savedDestination = existingDestination?.tabId ?? destination
+    const group = session().tabGroups?.[destinationWorkspace]?.find((row) =>
+      existingDestination
+        ? row.id === existingDestination.groupId
+        : row.tabOrder.includes(destination)
     )
-    expect(group?.tabOrder).toEqual([
-      ...(split ? [TAB_ID] : []),
-      destination,
-      'agent-session:later-tab'
-    ])
-    expect(group?.activeTabId).toBe(destination)
-    const published = await runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)
+    expect(group?.tabOrder).toEqual(
+      existingDestination?.tabOrder ?? [
+        ...(split ? [TAB_ID] : []),
+        destination,
+        ...(elsewhere ? [] : ['agent-session:later-tab'])
+      ]
+    )
+    expect(group?.activeTabId).toBe(savedDestination)
+    if (existingDestination) {
+      expect(
+        session().unifiedTabs?.[destinationWorkspace]?.find(
+          (tab) => tab.contentType === 'agent-session' && tab.entityId === sessionId
+        )?.id
+      ).toBe(existingDestination.tabId)
+    }
+    const published = await runtime.listMobileSessionTabs(`id:${destinationWorkspace}`)
     expect(published.activeTabId).toBe(destination)
     expect(published.tabs.find((tab) => tab.id === destination)).toMatchObject({
       openPlacement: {
         invocationId: 'from-pane',
         generation: expect.any(String),
-        placement: { afterTabId: TAB_ID, index: 0 },
-        source: source.presentation.identity
+        placement: elsewhere ? {} : { afterTabId: TAB_ID, index: 0 },
+        ...(elsewhere ? {} : { source: source.presentation.identity })
       }
     })
+    if (elsewhere) {
+      const destinationTab = published.tabs.find(
+        (tab) => tab.type === 'agent-session' && tab.id === destination
+      )
+      expect(
+        destinationTab?.type === 'agent-session' && destinationTab.openPlacement?.source
+      ).toBeUndefined()
+      expect(session().tabsByWorktree[WORKTREE_ID]).toEqual(originalSourceTabs)
+      expect(session().terminalLayoutsByTabId[TAB_ID]).toEqual(originalSourceLayout)
+      expect((await runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)).tabs).toEqual(
+        expect.arrayContaining([expect.objectContaining({ type: 'terminal', parentTabId: TAB_ID })])
+      )
+      expect(rig.store.getRecord(sessionId)?.location.workspaceId).toBe(destinationWorkspace)
+    }
     const layout = session().terminalLayoutsByTabId[TAB_ID]
     if (split) {
       expect(layout?.ptyIdsByLeafId?.[LEAF_B]).toBe(PTY_B)
       expect(layout?.root).toEqual({ type: 'leaf', leafId: LEAF_B })
-    } else {
+    } else if (!elsewhere) {
       expect(session().tabsByWorktree[WORKTREE_ID]?.some((tab) => tab.id === TAB_ID)).toBe(false)
     }
     expect(rig.adapter.dispatch).not.toHaveBeenCalled()
@@ -260,7 +347,7 @@ it.each([
 ])(
   'captures selection before native Stop and consumes it at the ordinary terminal snapshot: $navigate/$viewerSelection',
   async ({ navigate, viewerSelection }) => {
-    const { runtime, bindPty, handleOf } = setupMainOwnedWorkspace()
+    const { runtime, bindPty, handleOf, session } = setupMainOwnedWorkspace()
     Object.assign(runtime, {
       resolveTerminalWorkspaceLaunchScope: async () => ({
         id: WORKTREE_ID,
@@ -292,6 +379,9 @@ it.each([
       activate: false
     })
     await rig.host.switchToChat(id)
+    const nativeIdentity = agentSessionProviderHandleChainHead(
+      rig.store.getRecord(id)!.providerHandleChain
+    )!.handle
     const stopping = Promise.withResolvers<void>()
     const stopped = Promise.withResolvers<void>()
     const close = rig.adapter.closeSession.getMockImplementation()!
@@ -300,12 +390,20 @@ it.each([
       await stopped.promise
       return close(...args)
     })
+    const receiverExit = Promise.withResolvers<void>()
+    releaseReceiverExit = () => receiverExit.resolve()
+    let ordinaryCreates = 0
+    const stopForSwitch = vi.spyOn(rig.host, 'stopForSwitch')
     const spawn = vi
       .spyOn(runtime, 'createTerminal')
       .mockImplementation(async (_selector, opts = {}) => {
+        ordinaryCreates += 1
         if (!opts.tabId || !opts.leafId) {
           throw new Error('missing ordinary published pane')
         }
+        if (!navigate && !viewerSelection && ordinaryCreates === 1) {
+          void rig.host.trackSwitchPhysical(id, receiverExit.promise)
+        }
         opts.beforePtySpawn?.()
         opts.onPtySpawnDispatched?.({
           tabId: opts.tabId,
@@ -313,20 +411,21 @@ it.each([
           launchAgent: 'codex',
           ...(opts.launchConfig ? { launchConfig: opts.launchConfig } : {})
         })
+        const ptyId = ordinaryCreates === 1 ? 'switch-destination' : 'switch-destination-next'
         bindPty({
           worktreeId: WORKTREE_ID,
           tabId: opts.tabId,
           leafId: opts.leafId,
-          ptyId: 'switch-destination'
+          ptyId
         })
-        runtime.registerPty('switch-destination', WORKTREE_ID, null, {
+        runtime.registerPty(ptyId, WORKTREE_ID, null, {
           tabId: opts.tabId,
           leafId: opts.leafId,
           terminalHandle: opts.preAllocatedHandle
         })
         return {
-          handle: handleOf('switch-destination'),
-          ptyId: 'switch-destination',
+          handle: handleOf(ptyId),
+          ptyId,
           tabId: opts.tabId,
           paneKey: `${opts.tabId}:${opts.leafId}`,
           worktreeId: WORKTREE_ID,
@@ -368,8 +467,42 @@ it.each([
       )
       expect(picked.activeTabId).toBe('agent-session:newer-navigation')
     }
+    const outstanding =
+      !navigate && !viewerSelection
+        ? executeStructuredSessionSwitch(
+            {
+              sessionId: id,
+              execution: {
+                invocationId: 'outstanding-duplicate',
+                sourceTabId: `agent-session:${id}`
+              }
+            },
+            { runtime },
+            'terminal'
+          )
+        : undefined
+    const replay =
+      !navigate && !viewerSelection
+        ? executeStructuredSessionSwitch(
+            {
+              sessionId: id,
+              execution: {
+                invocationId: 'ordinary-native-stop',
+                sourceTabId: `agent-session:${id}`
+              }
+            },
+            { runtime },
+            'terminal'
+          )
+        : undefined
     stopped.resolve()
     const answer = await operation
+    if (outstanding) {
+      expect(await outstanding).toEqual(answer)
+    }
+    if (replay) {
+      expect(await replay).toEqual(answer)
+    }
     expect(answer).toMatchObject({ status: 'completed' })
     expect(spawn).toHaveBeenCalledOnce()
     expect(spawn.mock.calls[0]![1]!.presentation).toBe('background')
@@ -396,5 +529,185 @@ it.each([
           ? `agent-session:${id}`
           : `${spawn.mock.calls[0]![1]!.tabId}::${spawn.mock.calls[0]![1]!.leafId}`
     )
+    if (!navigate && !viewerSelection) {
+      const request = (invocationId: string) =>
+        executeStructuredSessionSwitch(
+          {
+            sessionId: id,
+            execution: { invocationId, sourceTabId: `agent-session:${id}` }
+          },
+          { runtime },
+          'terminal'
+        )
+      if (answer.status !== 'completed' || !answer.terminal) {
+        receiverExit.resolve()
+        throw new Error('missing completed destination')
+      }
+      const picked = await runtime.activateMobileSessionTab(
+        `id:${WORKTREE_ID}`,
+        'agent-session:newer-navigation',
+        undefined,
+        { navigation: 'all', intent: 'user', clientNavigationId: 'host-follow-viewer' }
+      )
+      expect(picked.activeTabId).toBe('agent-session:newer-navigation')
+      const projection = vi.spyOn(mobileProjection, 'projectRuntimeMobileSessionTabs')
+      expect(await request('ordinary-native-stop')).toEqual(answer)
+      expect(await request('already-published-physical-join')).toEqual(answer)
+      expect(projection).not.toHaveBeenCalled()
+      expect(
+        (await runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`, 'host-follow-viewer')).activeTabId
+      ).toBe('agent-session:newer-navigation')
+      expect(spawn).toHaveBeenCalledOnce()
+      expect(stopForSwitch).toHaveBeenCalledOnce()
+      try {
+        expect(rig.host.switchExecuting(id)).toBe(true)
+        await runtime.closeMobileSessionTab(`id:${WORKTREE_ID}`, answer.terminal, {
+          reason: 'user'
+        })
+        expect(runtime.currentSessionSwitchDestination(WORKTREE_ID, answer)).toBe(false)
+        expect(await request('missing-but-physically-unsettled')).toEqual(answer)
+        expect(spawn).toHaveBeenCalledOnce()
+        expect(stopForSwitch).toHaveBeenCalledOnce()
+      } finally {
+        receiverExit.resolve()
+      }
+      await vi.waitFor(() => expect(rig.host.switchExecuting(id)).toBe(false))
+      const unknown = vi
+        .spyOn(runtime, 'currentSessionSwitchDestination')
+        .mockReturnValue(undefined)
+      expect(await request('unknown-destination')).toMatchObject({
+        status: 'refused',
+        refusal: { code: 'agent_session_ownership_unknown' }
+      })
+      expect(spawn).toHaveBeenCalledOnce()
+      expect(await request('ordinary-native-stop')).toEqual(answer)
+      expect(unknown).toHaveBeenCalledOnce()
+      unknown.mockRestore()
+      expect(spawn).toHaveBeenCalledOnce()
+      expect(stopForSwitch).toHaveBeenCalledOnce()
+      const replacement = await request('fresh-history-after-close')
+      expect(replacement).toMatchObject({ status: 'completed', sessionId: id })
+      expect(replacement).not.toMatchObject({ terminal: answer.terminal })
+      expect(spawn).toHaveBeenCalledTimes(2)
+      expect(runtime.currentSessionSwitchDestination(WORKTREE_ID, replacement)).toBe(true)
+      await vi.waitFor(() => expect(rig.host.switchExecuting(id)).toBe(false))
+      await runtime.activateMobileSessionTab(
+        `id:${WORKTREE_ID}`,
+        'agent-session:newer-navigation',
+        undefined,
+        { navigation: 'all', intent: 'user', clientNavigationId: 'host-follow-viewer' }
+      )
+      expect(await request('surviving-destination')).toEqual(replacement)
+      expect(
+        (await runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`, 'host-follow-viewer')).activeTabId
+      ).toBe('agent-session:newer-navigation')
+      expect(spawn).toHaveBeenCalledTimes(2)
+      expect(stopForSwitch).toHaveBeenCalledTimes(2)
+      expect(
+        agentSessionProviderHandleChainHead(rig.store.getRecord(id)!.providerHandleChain)!.handle
+      ).toEqual(nativeIdentity)
+      expect(rig.adapter.dispatch).not.toHaveBeenCalled()
+      if (replacement.status !== 'completed' || !replacement.terminal) {
+        throw new Error('missing completed replacement')
+      }
+      const destinationId = replacement.terminal
+      for (const size of [10, 100]) {
+        for (
+          let index = runtime.mobileSessionTabsByWorktree.get(WORKTREE_ID)!.tabs.length;
+          index < size;
+          index += 1
+        ) {
+          const sessionId = `inventory-${index}`
+          expect(
+            await runtime.applyLayoutCommand({
+              type: 'openAgentSessionTab',
+              workspace: WORKTREE_ID,
+              sessionId,
+              agent: 'codex',
+              tabId: `agent-session:${sessionId}`
+            })
+          ).toMatchObject({ ok: true })
+          runtime.projectStructuredAgentSessionTab({
+            workspaceId: WORKTREE_ID,
+            sessionId,
+            agent: 'codex',
+            activate: false
+          })
+          runtime.projectStructuredAgentSessionTab({
+            workspaceId: 'repo-1::/inventory-elsewhere',
+            sessionId,
+            agent: 'codex',
+            activate: false
+          })
+        }
+        const held = runtime.mobileSessionTabsByWorktree.get(WORKTREE_ID)!
+        const unrelated = runtime.mobileSessionTabsByWorktree.get('repo-1::/inventory-elsewhere')!
+        const rows = held.tabs
+        const otherRows = unrelated.tabs
+        const saved = session().unifiedTabs![WORKTREE_ID]!
+        const destination = rows.find((tab) => tab.type === 'terminal' && tab.id === destinationId)
+        if (!destination) {
+          throw new Error('missing completed destination')
+        }
+        const counts = { rows: 0, identity: 0, decorations: 0, saved: 0, unrelated: 0 }
+        held.tabs = new Proxy(
+          [...rows.filter((tab) => tab !== destination), destination].map(
+            (tab) =>
+              new Proxy(tab, {
+                get(target, key, receiver) {
+                  if (key === 'type' || key === 'id' || key === 'sessionId') {
+                    counts.identity += 1
+                  } else if (typeof key === 'string') {
+                    counts.decorations += 1
+                  }
+                  return Reflect.get(target, key, receiver)
+                }
+              })
+          ),
+          {
+            get(target, key, receiver) {
+              if (typeof key === 'string' && /^\d+$/.test(key)) {
+                counts.rows += 1
+              }
+              return Reflect.get(target, key, receiver)
+            }
+          }
+        )
+        session().unifiedTabs![WORKTREE_ID] = new Proxy(saved, {
+          get(target, key, receiver) {
+            if (typeof key === 'string' && /^\d+$/.test(key)) {
+              counts.saved += 1
+            }
+            return Reflect.get(target, key, receiver)
+          }
+        })
+        unrelated.tabs = new Proxy(otherRows, {
+          get(target, key, receiver) {
+            if (typeof key === 'string' && /^\d+$/.test(key)) {
+              counts.unrelated += 1
+            }
+            return Reflect.get(target, key, receiver)
+          }
+        })
+        try {
+          projection.mockClear()
+          expect(await request('fresh-history-after-close')).toEqual(replacement)
+          expect(counts).toEqual({ rows: 0, identity: 0, decorations: 0, saved: 0, unrelated: 0 })
+          expect(await request(`scale-completed-${size}`)).toEqual(replacement)
+          expect(counts.rows).toBe(size)
+          expect(counts.rows + counts.identity).toBeLessThanOrEqual(3 * size)
+          expect({
+            decorations: counts.decorations,
+            saved: counts.saved,
+            unrelated: counts.unrelated
+          }).toEqual({ decorations: 0, saved: 0, unrelated: 0 })
+          expect(projection).not.toHaveBeenCalled()
+        } finally {
+          held.tabs = rows
+          session().unifiedTabs![WORKTREE_ID] = saved
+          unrelated.tabs = otherRows
+        }
+      }
+    }
   }
 )
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
index bc5503fce445..93169325d10c 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
@@ -1,6 +1,7 @@
 import { retainStructuredSwitchSource } from './structured-agent-session-switch-retention'
 import { structuredSessionSwitchFailure } from './structured-agent-session-switch-failure'
 import {
+  captureStructuredSwitchWorkCheck,
   prepareStructuredSessionSwitch,
   requireStructuredSwitchRecord
 } from './structured-agent-session-switch-preparation'
@@ -35,6 +36,7 @@ import { agentLaunchMovesHostWindow } from './agent-launch-tab-publication'
 import { interruptWorkingAgent } from '../../terminal-agent-interrupt'
 import { mainAgentState } from '../../../../shared/main-agent-status'
 import { captureSwitchStoppedCliTurn } from '../../../native-chat/agent-session-wire/structured-agent-session-switch-import'
+import { worktreeIdsEqual } from '../../../../shared/worktree/id'
 export async function executeStructuredSessionSwitch(
   params: z.infer<typeof SwitchToChatParams> | z.infer<typeof SwitchToTerminalParams>,
   ctx: RpcContext,
@@ -44,7 +46,8 @@ export async function executeStructuredSessionSwitch(
   let sessionId = params.sessionId
   const selectionCurrent = ctx.runtime.captureSessionSwitchSelection(
     undefined,
-    params.execution?.viewerSelection
+    params.execution?.viewerSelection,
+    true
   )
   let commandOwned = false
   const operation = (async (): Promise<AgentSessionSwitchResult> => {
@@ -109,7 +112,8 @@ export async function executeStructuredSessionSwitch(
           ? {
               agent: create!.agent,
               sessionId: adopt.providerHandle.nativeId,
-              filePath: adopt.transcriptPath
+              filePath: adopt.transcriptPath,
+              source: adopt.source
             }
           : retainedSource?.cliForkSource
         const stopped = before
@@ -184,20 +188,7 @@ export async function executeStructuredSessionSwitch(
           await host.adoptSwitch(conversation?.commandKey ?? params.sessionId, sessionId)
         }
         const record = requireStructuredSwitchRecord(host, sessionId)
-        const workCurrent = host.captureSwitchWork(sessionId, deadline)
-        const check = () => {
-          deadline.check()
-          if (!workCurrent()) {
-            host.deps.logger.warn('switch destination was superseded by newer work', {
-              scope: 'session-switch',
-              sessionId,
-              direction
-            })
-            throw agentSessionRefusalError('agent_session_operation_invalid', {
-              reason: 'messagesUnsettled'
-            })
-          }
-        }
+        const check = captureStructuredSwitchWorkCheck(host, sessionId, deadline, direction)
         if (
           source ||
           nativeConversationContent(await host.journalSnapshot(sessionId)) === 'saved'
@@ -229,7 +220,10 @@ export async function executeStructuredSessionSwitch(
         if (!revealed.readable && revealed.openRefusal) {
           throw new AgentSessionRefusalError(revealed.openRefusal)
         }
-        const placement = (close ? close.placement() : create?.tabPlacement) ?? {}
+        const replaceSource =
+          close && worktreeIdsEqual(close.source.worktreeId, record.location.workspaceId)
+        const placement =
+          (replaceSource ? close.placement() : close ? undefined : create?.tabPlacement) ?? {}
         await ctx.runtime.publishStructuredAgentSessionTab({
           ...revealed,
           activate: true,
@@ -244,11 +238,11 @@ export async function executeStructuredSessionSwitch(
             placement,
             activate: true,
             viewerSelection: execution.viewerSelection,
-            ...(close ? { source: close.source } : {})
+            ...(replaceSource ? { source: close.source } : {})
           }
         })
         deadline.check()
-        if (close) {
+        if (replaceSource) {
           await close.retire()
         }
         deadline.check()
@@ -263,8 +257,15 @@ export async function executeStructuredSessionSwitch(
       },
       {
         direction,
+        onAccepted: selectionCurrent.accept,
         conversationKey: conversation?.commandKey,
         allowUncreated: Boolean(create),
+        destinationCurrent: (result) => {
+          const record = host.deps.store.getRecord(result.sessionId)
+          return record
+            ? ctx.runtime.currentSessionSwitchDestination(record.location.workspaceId, result)
+            : undefined
+        },
         onRetained:
           direction === 'terminal'
             ? (check) =>
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-preparation.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-preparation.ts
index 48c2f62acd2c..70be260d4e1b 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-preparation.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-preparation.ts
@@ -99,3 +99,25 @@ export function requireStructuredSwitchRecord(host: StructuredAgentSessionHost,
   }
   return record
 }
+
+export function captureStructuredSwitchWorkCheck(
+  host: StructuredAgentSessionHost,
+  sessionId: string,
+  deadline: AgentSessionSwitchDeadline,
+  direction: 'chat' | 'terminal'
+): () => void {
+  const workCurrent = host.captureSwitchWork(sessionId, deadline)
+  return () => {
+    deadline.check()
+    if (!workCurrent()) {
+      host.deps.logger.warn('switch destination was superseded by newer work', {
+        scope: 'session-switch',
+        sessionId,
+        direction
+      })
+      throw agentSessionRefusalError('agent_session_operation_invalid', {
+        reason: 'messagesUnsettled'
+      })
+    }
+  }
+}
diff --git a/src/main/runtime/session-tabs/session-tabs-graph-changes.ts b/src/main/runtime/session-tabs/session-tabs-graph-changes.ts
new file mode 100644
index 000000000000..6a66f81b9de5
--- /dev/null
+++ b/src/main/runtime/session-tabs/session-tabs-graph-changes.ts
@@ -0,0 +1,41 @@
+import type { RuntimeSyncedTab } from '../../../shared/runtime-types'
+import type { RuntimeLeafRecord } from '../runtime-terminal-state-records'
+import { OrcaRuntimeWithSyncWindowGraph } from '../session-graph/session-window-graph'
+
+export abstract class RuntimeSessionTabsGraphChanges extends OrcaRuntimeWithSyncWindowGraph {
+  // Graph changes can alter projected handles/titles without changing snapshot bytes; compare projection fields and fan out affected workspaces.
+  protected collectMobileVisibleGraphChangedWorktrees(
+    previousTabs: Map<string, RuntimeSyncedTab>,
+    previousLeaves: Map<string, RuntimeLeafRecord>
+  ): Set<string> {
+    const changed = new Set<string>()
+    for (const [tabId, tab] of this.tabs) {
+      const prev = previousTabs.get(tabId)
+      if (!prev || prev.title !== tab.title) {
+        changed.add(tab.worktreeId)
+      }
+    }
+    for (const [tabId, tab] of previousTabs) {
+      if (!this.tabs.has(tabId)) {
+        changed.add(tab.worktreeId)
+      }
+    }
+    for (const [leafKey, leaf] of this.leaves) {
+      const prev = previousLeaves.get(leafKey)
+      if (
+        !prev ||
+        prev.ptyId !== leaf.ptyId ||
+        prev.connected !== leaf.connected ||
+        prev.paneTitle !== leaf.paneTitle
+      ) {
+        changed.add(leaf.worktreeId)
+      }
+    }
+    for (const [leafKey, leaf] of previousLeaves) {
+      if (!this.leaves.has(leafKey)) {
+        changed.add(leaf.worktreeId)
+      }
+    }
+    return changed
+  }
+}
diff --git a/src/main/runtime/session-tabs/session-tabs-inventory.ts b/src/main/runtime/session-tabs/session-tabs-inventory.ts
index 8d242e7c0de4..691b48050659 100644
--- a/src/main/runtime/session-tabs/session-tabs-inventory.ts
+++ b/src/main/runtime/session-tabs/session-tabs-inventory.ts
@@ -6,7 +6,7 @@ import type { OrcaRuntimeWithBuildHeadlessMobileSessionBrowserTabs as BuildHeadl
 import type { OrcaRuntimeWithRestoreLivePairedRendererSessionOwnedMobileTerminals as RestoreLivePairedRendererSessionOwnedMobileTerminalsMethods } from './renderer-session-terminal-rescue'
 import type { OrcaRuntimeWithTouchMobileSessionTabsForWorktree as TouchMobileSessionTabsForWorktreeMethods } from './mobile-session-membership'
 import type { OrcaRuntimeWithPruneMobileSessionTabGroupLayout as PruneMobileSessionTabGroupLayoutMethods } from '../session-lifecycle/projection/prune-mobile-session-tab-group-layout'
-import { OrcaRuntimeWithSyncWindowGraph } from '../session-graph/session-window-graph'
+import { RuntimeSessionTabsGraphChanges } from './session-tabs-graph-changes'
 import {
   mainTerminalSurfaces,
   type MainTerminalSurfacesHost
@@ -14,16 +14,15 @@ import {
 import type { WorkspaceLayoutReads } from '../workspace-layout-stream'
 import type {
   RuntimeMobileSessionTabsResult,
-  RuntimeSyncedTab,
   RuntimeSyncWindowGraph
 } from '../../../shared/runtime-types'
-import type { RuntimeLeafRecord } from '../runtime-terminal-state-records'
 import type { PtyControllerInventory } from '../runtime-pty-controller-contract'
 import { parseExecutionHostId } from '../../../shared/execution-host'
 import type { PaneStartStatuses } from '../pane-start-statuses'
+import type { AgentSessionSwitchResult } from '../../../shared/agent-session-switch-execution'
 import { paneOfPty, type PtyPane, type PtyPaneSource } from '../terminal/surface/pty-pane-query'
 
-export abstract class OrcaRuntimeWithCollectMobileVisibleGraphChangedWorktrees extends OrcaRuntimeWithSyncWindowGraph {
+export abstract class OrcaRuntimeWithCollectMobileVisibleGraphChangedWorktrees extends RuntimeSessionTabsGraphChanges {
   abstract get workspaceLayoutReads(): WorkspaceLayoutReads
   declare protected readonly paneStartStatuses: PaneStartStatuses | null
 
@@ -140,42 +139,6 @@ export abstract class OrcaRuntimeWithCollectMobileVisibleGraphChangedWorktrees e
     >
   ): ReturnType<SessionTabsInventoryPublicationMethods['waitForSessionTabsInventoryPublication']>
 
-  // Graph changes can alter projected handles/titles without changing snapshot bytes; compare projection fields and fan out affected workspaces.
-  protected collectMobileVisibleGraphChangedWorktrees(
-    previousTabs: Map<string, RuntimeSyncedTab>,
-    previousLeaves: Map<string, RuntimeLeafRecord>
-  ): Set<string> {
-    const changed = new Set<string>()
-    for (const [tabId, tab] of this.tabs) {
-      const prev = previousTabs.get(tabId)
-      if (!prev || prev.title !== tab.title) {
-        changed.add(tab.worktreeId)
-      }
-    }
-    for (const [tabId, tab] of previousTabs) {
-      if (!this.tabs.has(tabId)) {
-        changed.add(tab.worktreeId)
-      }
-    }
-    for (const [leafKey, leaf] of this.leaves) {
-      const prev = previousLeaves.get(leafKey)
-      if (
-        !prev ||
-        prev.ptyId !== leaf.ptyId ||
-        prev.connected !== leaf.connected ||
-        prev.paneTitle !== leaf.paneTitle
-      ) {
-        changed.add(leaf.worktreeId)
-      }
-    }
-    for (const [leafKey, leaf] of previousLeaves) {
-      if (!this.leaves.has(leafKey)) {
-        changed.add(leaf.worktreeId)
-      }
-    }
-    return changed
-  }
-
   async listMobileSessionTabs(
     worktreeSelector: string,
     clientNavigationId?: string,
@@ -206,6 +169,29 @@ export abstract class OrcaRuntimeWithCollectMobileVisibleGraphChangedWorktrees e
     return this.getMobileSessionTabsForWorktree(worktree.id, clientNavigationId, options)
   }
 
+  currentSessionSwitchDestination(
+    worktreeId: string,
+    result: AgentSessionSwitchResult
+  ): boolean | undefined {
+    if (this.getAuthoritativeSessionTabsInventoryEpoch() === null) {
+      return undefined
+    }
+    const snapshot = this.mobileSessionTabsByWorktree.get(worktreeId)
+    if (
+      !('terminal' in result && result.terminal) &&
+      this.structuredAgentSessionInventoryUnverifiable
+    ) {
+      return undefined
+    }
+    return (
+      snapshot?.tabs.some((tab) =>
+        'terminal' in result && result.terminal
+          ? tab.type === 'terminal' && tab.id === result.terminal
+          : tab.type === 'agent-session' && tab.sessionId === result.sessionId
+      ) ?? false
+    )
+  }
+
   async listAllMobileSessionTabs(
     clientNavigationId?: string
   ): Promise<RuntimeMobileSessionTabsResult[]> {
diff --git a/src/main/runtime/session-tabs/structured-session-tab-restoration.ts b/src/main/runtime/session-tabs/structured-session-tab-restoration.ts
index c350d4dbea98..6381bdc1eff6 100644
--- a/src/main/runtime/session-tabs/structured-session-tab-restoration.ts
+++ b/src/main/runtime/session-tabs/structured-session-tab-restoration.ts
@@ -76,12 +76,13 @@ export abstract class OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce exten
 
   captureSessionSwitchSelection(
     _worktreeId?: string,
-    viewerSelection?: string
-  ): (consume?: boolean) => boolean {
+    viewerSelection?: string,
+    deferAcceptance = false
+  ) {
     // A window request is transported to its viewer; it grants no host-view authority.
     return viewerSelection !== undefined
-      ? () => false
-      : this.clientSessionTabSelections.captureHostSelection()
+      ? Object.assign((_consume = false) => false, { accept: () => {} })
+      : this.clientSessionTabSelections.captureHostSelection(deferAcceptance)
   }
 
   async publishStructuredAgentSessionTab(input: {
diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index a59e4958a79e..e1b06135590f 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -20082,6 +20082,7 @@
           "showAsTerminal": "Show as terminal"
         },
         "switch": {
+          "legacyCopy": "A copy of this {{agent}} conversation opens in a new terminal. The original chat stays open.",
           "toCli": "Switch to CLI",
           "toNativeChat": "Switch to native chat",
           "toCliTooltip": "Switch to CLI: stops {{agent}} in native chat and continues the same conversation in a terminal.",
diff --git a/src/renderer/src/lib/agent-session/structured-agent-session-tab-activation.ts b/src/renderer/src/lib/agent-session/structured-agent-session-tab-activation.ts
index 8c39f4e5fc53..8974e9b22f43 100644
--- a/src/renderer/src/lib/agent-session/structured-agent-session-tab-activation.ts
+++ b/src/renderer/src/lib/agent-session/structured-agent-session-tab-activation.ts
@@ -15,19 +15,28 @@ import type { Tab } from '../../../../shared/tab-types'
 
 export function findStructuredAgentSessionTab(
   unifiedTabsByWorktree: Readonly<Record<string, readonly Tab[]>>,
-  args: { workspaceId: string; sessionId: string; target?: RuntimeClientTarget }
+  args: { sessionId: string } & (
+    | { workspaceId: string; target?: RuntimeClientTarget }
+    | { workspaceId?: undefined; target: RuntimeClientTarget }
+  )
 ): Tab | null {
-  return (
-    unifiedTabsByWorktree[args.workspaceId]?.find(
+  const workspaceIds =
+    args.workspaceId === undefined ? Object.keys(unifiedTabsByWorktree) : [args.workspaceId]
+  for (const workspaceId of workspaceIds) {
+    const tab = unifiedTabsByWorktree[workspaceId]?.find(
       (candidate) =>
-        candidate.worktreeId === args.workspaceId &&
+        candidate.worktreeId === workspaceId &&
         candidate.contentType === 'agent-session' &&
         candidate.entityId === args.sessionId &&
         (!args.target ||
           structuredAgentSessionOwnerForTab(useAppStore.getState(), candidate) ===
             executionHostIdForStructuredTarget(args.target))
-    ) ?? null
-  )
+    )
+    if (tab) {
+      return tab
+    }
+  }
+  return null
 }
 
 export function activateStructuredAgentSessionTab(args: {
diff --git a/src/renderer/src/lib/conversation-surface-switch.test.tsx b/src/renderer/src/lib/conversation-surface-switch.test.tsx
index d8e8857afc6c..e4d55eb94a87 100644
--- a/src/renderer/src/lib/conversation-surface-switch.test.tsx
+++ b/src/renderer/src/lib/conversation-surface-switch.test.tsx
@@ -8,6 +8,18 @@ import { useAppStore } from '@/store'
 import { EMPTY_STRUCTURED_AGENT_SESSION } from '../../../shared/structured-agent-session-reducer'
 import { runConversationSwitch, runNativeChatCliSwitch } from './conversation-surface-switch'
 import { pendingNativeChatCliSwitches } from './pending-conversation-surface-switches'
+import type { RuntimeMobileSessionTabsResult } from '../../../shared/runtime-types'
+import { createWebSessionTabsSnapshotPatch } from '@/runtime/web-session-tabs-sync/snapshot-api'
+import { applyWebSessionTabsStorePatch } from '@/runtime/web-session-tabs-sync/store-patch'
+import { activateTabNumberShortcut } from './tab-number-shortcuts'
+import {
+  beginViewerSelectionRequest,
+  disposeViewerSelection,
+  viewerSelectionOutcome
+} from './viewer-selection-request'
+import { presentConversationSwitchResult } from './conversation-switch-result-selection'
+import { agentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
+import type { Tab } from '../../../shared/tab-types'
 const mocks = vi.hoisted(() => {
   function makeTarget(): { current: RuntimeClientTarget } {
     return { current: { kind: 'local' } }
@@ -176,6 +188,202 @@ it.each([false, true])(
   }
 )
 
+it.each([10, 100])('bounds real result discovery and selection at %i workspaces', async (count) => {
+  const environmentId = 'scale-owner'
+  const target = { kind: 'environment', environmentId } as const
+  const sourceWorkspace = 'folder:scale-0'
+  const destinationWorkspace = `folder:scale-${count - 1}`
+  const sessionId = 'scale-native-A'
+  disposeViewerSelection()
+  useAppStore.setState({ activeWorktreeId: sourceWorkspace, activeView: 'terminal' })
+  for (let index = 0; index < count; index++) {
+    const sibling = terminal(index === 0 ? 'B' : `sibling-${index}`)
+    const id = index === 1 || index === count - 1 ? sessionId : `unrelated-${index}`
+    const second =
+      index === 0
+        ? terminal('C')
+        : {
+            type: 'agent-session' as const,
+            id: `agent-session:${id}`,
+            sessionId: id,
+            agent: 'codex' as const,
+            title: id,
+            isActive: false
+          }
+    applySwitchSnapshot(
+      {
+        worktree: `folder:scale-${index}`,
+        publicationEpoch: 'result-scale',
+        snapshotVersion: 1,
+        activeGroupId: 'G',
+        activeTabId: sibling.id,
+        activeTabType: 'terminal',
+        tabs: [sibling, second],
+        tabGroups: [
+          {
+            id: 'G',
+            activeTabId: sibling.parentTabId,
+            tabOrder: [
+              sibling.parentTabId,
+              second.type === 'terminal' ? second.parentTabId : second.id
+            ]
+          }
+        ]
+      },
+      index === 1 ? 'other-owner' : environmentId
+    )
+  }
+  const before = useAppStore.getState()
+  const destinationRows = before.unifiedTabsByWorktree[destinationWorkspace]
+  const destination = destinationRows.find((tab) => tab.entityId === sessionId)!
+  const originalOrder = before.groupsByWorktree[destinationWorkspace][0].tabOrder
+  const sourceRows = before.unifiedTabsByWorktree[sourceWorkspace]
+  const sourceTerminals = before.tabsByWorktree[sourceWorkspace]
+  const sourceLayouts = sourceRows.map((tab) => before.terminalLayoutsByTabId[tab.entityId])
+  expect(destinationRows).toHaveLength(2)
+  expect(
+    Object.values(before.unifiedTabsByWorktree).reduce((sum, rows) => sum + rows.length, 0)
+  ).toBe(2 * count)
+  expect(destination.executionHostId).toBe('runtime:scale-owner')
+  expect(
+    before.unifiedTabsByWorktree['folder:scale-1'].find((tab) => tab.entityId === sessionId)
+      ?.executionHostId
+  ).toBe('runtime:other-owner')
+
+  const [activation, owners, storePatch, viewer] = await Promise.all([
+    import('./agent-session/structured-agent-session-tab-activation'),
+    import('@/runtime/structured-agent-session-owner'),
+    import('@/runtime/web-session-tabs-sync/store-patch'),
+    import('./viewer-selection-request')
+  ])
+  const discovery = { calls: 0, keyPasses: 0, keys: 0, workspaces: 0, tabs: 0 }
+  const candidateVisits = new Map<string, number>()
+  const realFind = activation.findStructuredAgentSessionTab
+  const lookup = vi
+    .spyOn(activation, 'findStructuredAgentSessionTab')
+    .mockImplementation((tabs, args) => {
+      if (args.workspaceId !== undefined) {
+        return realFind(tabs, args)
+      }
+      discovery.calls++
+      return realFind(
+        new Proxy(tabs, {
+          ownKeys(actual) {
+            const keys = Reflect.ownKeys(actual)
+            discovery.keyPasses++
+            discovery.keys += keys.length
+            return keys
+          },
+          get(actual, property, receiver) {
+            // oxlint-disable-next-line anti-slop/no-reflect-get -- Proxy `get` trap: only Reflect.get forwards a raw string|symbol key with the proxy receiver.
+            const rows: readonly Tab[] | undefined = Reflect.get(actual, property, receiver)
+            if (typeof property !== 'string' || !Object.hasOwn(actual, property) || !rows) {
+              return rows
+            }
+            discovery.workspaces++
+            return new Proxy(rows, {
+              get(actualRows, key, arrayReceiver) {
+                if (typeof key === 'string' && /^(0|[1-9]\d*)$/.test(key)) {
+                  discovery.tabs++
+                  const row = `${property}:${key}`
+                  candidateVisits.set(row, (candidateVisits.get(row) ?? 0) + 1)
+                }
+                // oxlint-disable-next-line anti-slop/no-reflect-get -- Proxy `get` trap: only Reflect.get forwards a raw string|symbol key with the proxy receiver.
+                return Reflect.get(actualRows, key, arrayReceiver)
+              }
+            })
+          }
+        }),
+        args
+      )
+    })
+  const qualification = vi.spyOn(owners, 'structuredAgentSessionOwnerForTab')
+  const selection = vi.spyOn(storePatch, 'selectSessionTabForViewer')
+  const commit = vi.spyOn(viewer, 'commitViewerSelection')
+  const deadline = agentSessionSwitchDeadline(Date.now)
+  const request = beginViewerSelectionRequest(`result-scale-${count}`, deadline)
+  request.accept()
+  mocks.pairedRefresh.mockClear()
+  mocks.rpc.mockClear()
+  try {
+    await presentConversationSwitchResult(
+      {
+        ...subject,
+        direction: 'chat',
+        workspaceId: sourceWorkspace,
+        executionHostId: 'runtime:scale-owner'
+      },
+      target,
+      { status: 'completed', sessionId },
+      request.token
+    )
+    expect(discovery).toEqual({
+      calls: 1,
+      keyPasses: 1,
+      keys: count,
+      workspaces: count,
+      tabs: 2 * count
+    })
+    expect(qualification).toHaveBeenCalledTimes(4)
+    expect(candidateVisits.size).toBe(2 * count)
+    expect(new Set(candidateVisits.values())).toEqual(new Set([1]))
+    expect(qualification.mock.calls.map(([, tab]) => tab.executionHostId)).toEqual([
+      'runtime:other-owner',
+      'runtime:scale-owner',
+      'runtime:scale-owner',
+      'runtime:scale-owner'
+    ])
+    console.info(
+      `[result-selection-work] W=${count} T=${2 * count} discoveryKeys=${discovery.keys} workspaceVisits=${discovery.workspaces} tabVisits=${discovery.tabs} ownerChecks=${qualification.mock.calls.length}`
+    )
+    expect(selection).toHaveBeenCalledExactlyOnceWith(
+      destinationWorkspace,
+      destination.id,
+      request.token,
+      environmentId
+    )
+    expect(commit).toHaveBeenCalledOnce()
+    expect(viewerSelectionOutcome(request.token)).toBe('fulfilled')
+    expect(mocks.pairedRefresh).toHaveBeenCalledExactlyOnceWith(
+      environmentId,
+      destinationWorkspace,
+      {
+        acceptCurrentSnapshot: true,
+        afterCurrentInFlight: true
+      }
+    )
+    expect(mocks.rpc).toHaveBeenCalledExactlyOnceWith(target, 'session.tabs.activate', {
+      worktree: `id:${destinationWorkspace}`,
+      tabId: `agent-session:${sessionId}`,
+      notifyClients: false,
+      navigation: 'caller'
+    })
+    const after = useAppStore.getState()
+    expect(after.activeWorktreeId).toBe(destinationWorkspace)
+    expect(
+      after.groupsByWorktree[destinationWorkspace].find(
+        (group) => group.id === after.activeGroupIdByWorktree[destinationWorkspace]
+      )?.activeTabId
+    ).toBe(destination.id)
+    expect(after.activeTabType).toBe('agent-session')
+    expect(after.unifiedTabsByWorktree[destinationWorkspace]).toHaveLength(2)
+    expect(after.groupsByWorktree[destinationWorkspace][0].tabOrder).toEqual(originalOrder)
+    expect(after.unifiedTabsByWorktree[sourceWorkspace]).toBe(sourceRows)
+    expect(after.tabsByWorktree[sourceWorkspace]).toBe(sourceTerminals)
+    expect(sourceRows.map((tab) => after.terminalLayoutsByTabId[tab.entityId])).toEqual(
+      sourceLayouts
+    )
+  } finally {
+    lookup.mockRestore()
+    qualification.mockRestore()
+    selection.mockRestore()
+    commit.mockRestore()
+    deadline.dispose()
+    disposeViewerSelection()
+    useAppStore.setState(useAppStore.getInitialState(), true)
+  }
+})
+
 it.each(['codex'] as const)(
   'dispatches idle %s once through the common host command, preserving configured commands',
   async (agent) => {
@@ -251,3 +459,184 @@ it('old-host Continue while replying reports its copy outcome without promising
   expect(mocks.call).not.toHaveBeenCalled()
   expect(legacyContinue).toHaveBeenCalledExactlyOnceWith(expect.stringMatching(/^selection-v1:/))
 })
+
+const terminal = (id: string) => ({
+  type: 'terminal' as const,
+  id: `${id}::11111111-1111-4111-8111-111111111111`,
+  parentTabId: id,
+  leafId: '11111111-1111-4111-8111-111111111111',
+  title: id,
+  terminal: `term_${id}`,
+  isActive: false,
+  status: 'ready' as const
+})
+const applySwitchSnapshot = (frame: RuntimeMobileSessionTabsResult, owner: string) =>
+  applyWebSessionTabsStorePatch(createWebSessionTabsSnapshotPatch(frame, owner), {
+    frames: []
+  })()
+
+it.each([
+  { workspace: 'folder:existing-chat', navigate: false },
+  { workspace: 'folder:existing-chat', navigate: true },
+  { workspace: 'folder:terminal-source', navigate: false }
+])(
+  'selects the completed session in its actual $workspace without relocating it (navigation=$navigate)',
+  async ({ workspace, navigate }) => {
+    const environmentId = 'switch-owner'
+    const target = { kind: 'environment', environmentId } as const
+    const sourceWorkspace = 'folder:terminal-source'
+    const sessionId = 'existing-native-A'
+    const sourceFrame: RuntimeMobileSessionTabsResult = {
+      worktree: sourceWorkspace,
+      publicationEpoch: 'result-selection',
+      snapshotVersion: 1,
+      activeGroupId: 'source-group',
+      activeTabId: terminal('B').id,
+      activeTabType: 'terminal',
+      tabs: [terminal('B'), terminal('C')],
+      tabGroups: [{ id: 'source-group', activeTabId: 'B', tabOrder: ['B', 'C'] }]
+    }
+    const destinationFrame: RuntimeMobileSessionTabsResult = {
+      ...sourceFrame,
+      worktree: workspace,
+      activeGroupId: workspace === sourceWorkspace ? 'source-group' : 'chat-group',
+      activeTabId:
+        workspace === sourceWorkspace ? sourceFrame.activeTabId : `agent-session:${sessionId}`,
+      activeTabType: workspace === sourceWorkspace ? 'terminal' : 'agent-session',
+      tabs: [
+        ...(workspace === sourceWorkspace ? sourceFrame.tabs : []),
+        {
+          type: 'agent-session',
+          id: 'agent-session:existing-native-A',
+          sessionId,
+          agent: 'codex',
+          title: 'Existing chat A',
+          isActive: false
+        }
+      ],
+      tabGroups: [
+        ...(workspace === sourceWorkspace ? (sourceFrame.tabGroups ?? []) : []),
+        {
+          id: 'chat-group',
+          activeTabId: `agent-session:${sessionId}`,
+          tabOrder: [`agent-session:${sessionId}`]
+        }
+      ]
+    }
+    const apply = (frame: RuntimeMobileSessionTabsResult, owner = environmentId) =>
+      applySwitchSnapshot(frame, owner)
+    disposeViewerSelection()
+    mocks.target.current = target
+    useAppStore.setState({ activeWorktreeId: sourceWorkspace, activeView: 'terminal' })
+    apply(sourceFrame)
+    // The same session string on a different host is not this command's destination.
+    apply(
+      {
+        ...destinationFrame,
+        worktree: 'folder:foreign-chat',
+        tabs: destinationFrame.tabs.filter((tab) => tab.type === 'agent-session'),
+        tabGroups: destinationFrame.tabGroups?.filter((group) => group.id === 'chat-group'),
+        activeGroupId: 'chat-group',
+        activeTabId: `agent-session:${sessionId}`,
+        activeTabType: 'agent-session'
+      },
+      'other-owner'
+    )
+    apply(destinationFrame)
+    const before = useAppStore.getState()
+    expect(before.activeWorktreeId).toBe(sourceWorkspace)
+    const sourceTabs = before.tabsByWorktree[sourceWorkspace]
+    const sourceRows = before.unifiedTabsByWorktree[sourceWorkspace].filter(
+      (tab) => tab.contentType === 'terminal'
+    )
+    const destination = before.unifiedTabsByWorktree[workspace].find(
+      (tab) => tab.entityId === sessionId
+    )!
+    const chatGroup = before.groupsByWorktree[workspace].find(
+      (group) => group.id === destination.groupId
+    )!
+    const refresh = Promise.withResolvers<void>()
+    mocks.pairedRefresh.mockImplementation(() => refresh.promise)
+    const result = { status: 'completed', sessionId } as const
+    mocks.call.mockResolvedValue(result)
+    const args = {
+      ...subject,
+      direction: 'chat' as const,
+      workspaceId: sourceWorkspace,
+      executionHostId: 'runtime:switch-owner'
+    }
+    try {
+      const switching = runConversationSwitch(args)
+      await vi.waitFor(() => expect(mocks.pairedRefresh).toHaveBeenCalledOnce())
+      expect(mocks.pairedRefresh).toHaveBeenCalledWith(environmentId, workspace, {
+        acceptCurrentSnapshot: true,
+        afterCurrentInFlight: true
+      })
+      const token = mocks.call.mock.calls[0][2].execution.viewerSelection
+      if (navigate) {
+        expect(activateTabNumberShortcut(1)).toBe(true)
+      }
+      const beforeResult = useAppStore.getState()
+      const selectedBeforeResult = beforeResult.activeTabIdByWorktree[sourceWorkspace]
+      const selectedGroupBeforeResult = beforeResult.groupsByWorktree[sourceWorkspace].find(
+        (group) => group.id === beforeResult.activeGroupIdByWorktree[sourceWorkspace]
+      )
+      refresh.resolve()
+      expect(await switching).toBe(true)
+      const after = useAppStore.getState()
+      const selectedWorkspace = navigate ? sourceWorkspace : workspace
+      const activeGroupId = after.activeGroupIdByWorktree[selectedWorkspace]
+      const selectedGroup = after.groupsByWorktree[selectedWorkspace].find(
+        (group) => group.id === activeGroupId
+      )
+      expect(after.activeWorktreeId).toBe(selectedWorkspace)
+      expect(selectedGroup?.activeTabId).toBe(
+        navigate ? selectedGroupBeforeResult?.activeTabId : destination.id
+      )
+      expect(after.activeTabType).toBe(navigate ? 'terminal' : 'agent-session')
+      expect(after.activeTabTypeByWorktree[selectedWorkspace]).toBe(
+        navigate ? 'terminal' : 'agent-session'
+      )
+      expect(after.activeTabIdByWorktree[selectedWorkspace]).toBe(
+        navigate ? selectedBeforeResult : (before.activeTabIdByWorktree[workspace] ?? null)
+      )
+      expect(viewerSelectionOutcome(token)).toBe(navigate ? 'superseded' : 'fulfilled')
+      expect(after.tabsByWorktree[sourceWorkspace]).toEqual(sourceTabs)
+      expect(
+        after.unifiedTabsByWorktree[sourceWorkspace]
+          .filter((tab) => tab.contentType === 'terminal')
+          .map((tab) => ({ id: tab.id, entityId: tab.entityId, groupId: tab.groupId }))
+      ).toEqual(
+        sourceRows.map((tab) => ({ id: tab.id, entityId: tab.entityId, groupId: tab.groupId }))
+      )
+      expect(
+        after.groupsByWorktree[workspace].find((group) => group.id === destination.groupId)
+          ?.tabOrder
+      ).toEqual(chatGroup.tabOrder)
+      expect(
+        after.unifiedTabsByWorktree[workspace].filter((tab) => tab.entityId === sessionId)
+      ).toHaveLength(1)
+      const accepted = after.activeTabIdByWorktree
+      await presentConversationSwitchResult(args, target, result, token)
+      const replayed = useAppStore.getState()
+      expect(replayed.activeTabIdByWorktree).toBe(accepted)
+      expect(replayed.activeWorktreeId).toBe(after.activeWorktreeId)
+      expect(replayed.activeGroupIdByWorktree[selectedWorkspace]).toBe(activeGroupId)
+      expect(
+        replayed.groupsByWorktree[selectedWorkspace].find((group) => group.id === activeGroupId)
+          ?.activeTabId
+      ).toBe(selectedGroup?.activeTabId)
+      expect(mocks.rpc).toHaveBeenCalledTimes(navigate ? 0 : 1)
+      if (!navigate) {
+        expect(mocks.rpc).toHaveBeenCalledWith(target, 'session.tabs.activate', {
+          worktree: `id:${workspace}`,
+          tabId: `agent-session:${sessionId}`,
+          notifyClients: false,
+          navigation: 'caller'
+        })
+      }
+    } finally {
+      disposeViewerSelection()
+    }
+  }
+)
diff --git a/src/renderer/src/lib/conversation-switch-result-selection.ts b/src/renderer/src/lib/conversation-switch-result-selection.ts
index b5def7ef9d1e..b903d3eb1f8f 100644
--- a/src/renderer/src/lib/conversation-switch-result-selection.ts
+++ b/src/renderer/src/lib/conversation-switch-result-selection.ts
@@ -2,7 +2,11 @@ import type { AgentSessionSwitchResult } from '../../../shared/agent-session-swi
 import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
 import { toWebTerminalSurfaceTabId } from '../../../shared/terminal-surface-id'
 import { refreshWebRuntimeSessionTabsSnapshot } from '@/runtime/web-runtime-session-snapshot'
-import { activateStructuredAgentSessionById } from './agent-session/structured-agent-session-tab-activation'
+import {
+  activateStructuredAgentSessionById,
+  findStructuredAgentSessionTab
+} from './agent-session/structured-agent-session-tab-activation'
+import { useAppStore } from '@/store'
 import { presentAgentLaunchTab } from './agent-launch-tab-presentation'
 import { conversationSwitchViewerSelectionCurrent } from './conversation-switch-selection'
 import type { ConversationSwitch } from './conversation-switch-state'
@@ -14,7 +18,14 @@ export async function presentConversationSwitchResult(
   result: Extract<AgentSessionSwitchResult, { status: 'completed' }>,
   viewerSelection: string
 ): Promise<void> {
-  await refreshWebRuntimeSessionTabsSnapshot(target.environmentId, args.workspaceId, {
+  const workspaceId =
+    (args.direction === 'chat'
+      ? findStructuredAgentSessionTab(useAppStore.getState().unifiedTabsByWorktree, {
+          sessionId: result.sessionId,
+          target
+        })?.worktreeId
+      : undefined) ?? args.workspaceId
+  await refreshWebRuntimeSessionTabsSnapshot(target.environmentId, workspaceId, {
     acceptCurrentSnapshot: true,
     afterCurrentInFlight: true
   }).catch(() => {})
@@ -23,7 +34,7 @@ export async function presentConversationSwitchResult(
   }
   if (args.direction === 'chat') {
     activateStructuredAgentSessionById({
-      worktreeId: args.workspaceId,
+      worktreeId: workspaceId,
       sessionId: result.sessionId,
       target,
       callerOnly: true,
diff --git a/tests/e2e/cross-version-wire/cross-version-agent-session-wire.unit.test.ts b/tests/e2e/cross-version-wire/cross-version-agent-session-wire.unit.test.ts
index 20f8f8d3b0e6..a14f93ee9311 100644
--- a/tests/e2e/cross-version-wire/cross-version-agent-session-wire.unit.test.ts
+++ b/tests/e2e/cross-version-wire/cross-version-agent-session-wire.unit.test.ts
@@ -117,7 +117,7 @@ describe('cross-version structured agent sessions', () => {
   )
 
   describe('a client that never asked for structured sessions', () => {
-    let hostCalls: Record<string, ReturnType<typeof vi.fn>>
+    let hostCalls: ReturnType<typeof structuredHostStub>
 
     beforeEach(() => {
       resetOperationIds()
diff --git a/tests/e2e/cross-version-wire/structured-agent-session-host-fixture.ts b/tests/e2e/cross-version-wire/structured-agent-session-host-fixture.ts
index 6194a43e06f6..3be90d5e7da2 100644
--- a/tests/e2e/cross-version-wire/structured-agent-session-host-fixture.ts
+++ b/tests/e2e/cross-version-wire/structured-agent-session-host-fixture.ts
@@ -1,4 +1,5 @@
 import { vi } from 'vitest'
+import type { Mock } from 'vitest'
 import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
@@ -21,11 +22,12 @@ import {
   STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY
 } from '../../../src/shared/protocol-version'
 
+type StructuredHostCalls = Record<string, ReturnType<typeof vi.fn>> & {
+  getRecord: Mock<(sessionId: string) => AgentSessionRecord | null>
+}
+
 // Use per-method spies so every skew can prove which call reached the host.
-export function structuredHostStub(
-  sessionId: string,
-  workspaceId: string
-): Record<string, ReturnType<typeof vi.fn>> {
+export function structuredHostStub(sessionId: string, workspaceId: string): StructuredHostCalls {
   return {
     getRecord: vi.fn<(sessionId: string) => AgentSessionRecord | null>(() => null),
     switchToTerminal: vi.fn<StructuredAgentSessionHost['switchToTerminal']>(async () => undefined),
@@ -135,9 +137,7 @@ export function structuredHostStub(
 }
 
 // Install the nested host shape, but assert against the flat spy map.
-export function installableHost(
-  hostCalls: Record<string, ReturnType<typeof vi.fn>>
-): StructuredAgentSessionHost {
+export function installableHost(hostCalls: StructuredHostCalls): StructuredAgentSessionHost {
   const host = {
     ...hostCalls,
     // The catalog read checks the session's record for a floating chat's own folder; none here.

From cd4bf4dab49e9037806dede4dec0281ca2e2d7e6 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 04:49:37 -0700
Subject: [PATCH 118/207] Explain Proxy forwarding in switch operation count
 test

---
 .../methods/structured-agent-session-switch-execution.test.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
index 6c6808eb53b7..8ce73616dfe5 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
@@ -660,6 +660,7 @@ it.each([
                   } else if (typeof key === 'string') {
                     counts.decorations += 1
                   }
+                  // oxlint-disable-next-line anti-slop/no-reflect-get -- Proxy get trap forwards raw string|symbol keys with the original receiver.
                   return Reflect.get(target, key, receiver)
                 }
               })
@@ -669,6 +670,7 @@ it.each([
               if (typeof key === 'string' && /^\d+$/.test(key)) {
                 counts.rows += 1
               }
+              // oxlint-disable-next-line anti-slop/no-reflect-get -- Proxy get trap forwards raw string|symbol keys with the original receiver.
               return Reflect.get(target, key, receiver)
             }
           }
@@ -678,6 +680,7 @@ it.each([
             if (typeof key === 'string' && /^\d+$/.test(key)) {
               counts.saved += 1
             }
+            // oxlint-disable-next-line anti-slop/no-reflect-get -- Proxy get trap forwards raw string|symbol keys with the original receiver.
             return Reflect.get(target, key, receiver)
           }
         })
@@ -686,6 +689,7 @@ it.each([
             if (typeof key === 'string' && /^\d+$/.test(key)) {
               counts.unrelated += 1
             }
+            // oxlint-disable-next-line anti-slop/no-reflect-get -- Proxy get trap forwards raw string|symbol keys with the original receiver.
             return Reflect.get(target, key, receiver)
           }
         })

From 73687f3ecddbea1a8ceb22e9168b4cc390a598f0 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 05:38:49 -0700
Subject: [PATCH 119/207] Keep chat header actions stable during pane
 activation

---
 .../native-chat/NativeChatPaneHeader.test.tsx | 71 +++++++++++++++++++
 .../native-chat/NativeChatPaneHeader.tsx      |  3 +-
 2 files changed, 73 insertions(+), 1 deletion(-)

diff --git a/src/renderer/src/components/native-chat/NativeChatPaneHeader.test.tsx b/src/renderer/src/components/native-chat/NativeChatPaneHeader.test.tsx
index 2f8bd2abd3f3..d069eb529372 100644
--- a/src/renderer/src/components/native-chat/NativeChatPaneHeader.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatPaneHeader.test.tsx
@@ -10,6 +10,8 @@ import {
 } from '@testing-library/react'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import { TooltipProvider } from '@/components/ui/tooltip'
+import { Button } from '@/components/ui/button'
+import { RetainedPaneHost } from '../tab-group/RetainedPaneHost'
 import { useAppStore } from '@/store'
 import { createTabsSliceMockApi } from '@/store/slices/tabs-slice-test-harness'
 import { makeFolderWorkspace } from '@/store/slices/worktrees-slice-test-fixtures'
@@ -91,6 +93,75 @@ it('puts Hand Off first like the terminal header, only on the focused pane, and
   expect(screen.queryByRole('button', { name: 'Hand Off to Another Agent' })).toBeNull()
 })
 
+it('keeps the switch hit target stable while its inactive pane gains focus during one press', () => {
+  const source = useAppStore.getState().createUnifiedTab('folder:workspace', 'agent-session', {
+    agentSessionAgent: 'claude',
+    executionHostId: 'runtime:remote-host'
+  })
+  const otherGroup = useAppStore
+    .getState()
+    .createEmptySplitGroup(source.worktreeId, source.groupId, 'right')
+  const switchToCli = vi.fn()
+  const handOff = { open: vi.fn(), disabled: false }
+  function FocusableHeader() {
+    const focused = useAppStore(
+      (state) => state.activeGroupIdByWorktree[source.worktreeId] === source.groupId
+    )
+    return (
+      <TooltipProvider>
+        <RetainedPaneHost
+          groupId={source.groupId}
+          isVisible
+          onFocusOwningGroup={(groupId) =>
+            useAppStore.getState().focusGroup(source.worktreeId, groupId)
+          }
+        >
+          <NativeChatPaneHeader
+            tabId={source.id}
+            worktreeId={source.worktreeId}
+            groupId={source.groupId}
+            nativeChat={{ sessionId: source.entityId, agent: 'claude' }}
+            focused={focused}
+            colorScheme="dark"
+            handOff={handOff}
+            topRightAction={<Button onClick={switchToCli}>Switch to CLI</Button>}
+          />
+        </RetainedPaneHost>
+      </TooltipProvider>
+    )
+  }
+  const view = render(<FocusableHeader />)
+  const switchButton = screen.getByRole('button', { name: 'Switch to CLI' })
+  const row = switchButton.closest('.pane-title-actions')!
+  const members = Array.from(row.children)
+  const handOffButton = row.querySelector<HTMLButtonElement>(
+    'button[aria-label="Hand Off to Another Agent"]'
+  )!
+  expect(useAppStore.getState().activeGroupIdByWorktree[source.worktreeId]).toBe(otherGroup)
+  expect(handOffButton).not.toBeNull()
+  expect(getComputedStyle(handOffButton).visibility).toBe('hidden')
+  expect(screen.queryByRole('button', { name: 'Hand Off to Another Agent' })).toBeNull()
+  expect(switchButton.hasAttribute('disabled')).toBe(false)
+
+  fireEvent.pointerDown(switchButton)
+  expect(useAppStore.getState().activeGroupIdByWorktree[source.worktreeId]).toBe(source.groupId)
+  expect(Array.from(row.children)).toEqual(members)
+  expect(screen.getByRole('button', { name: 'Switch to CLI' })).toBe(switchButton)
+  expect(screen.getByRole('button', { name: 'Hand Off to Another Agent' })).toBe(handOffButton)
+  expect(getComputedStyle(handOffButton).visibility).toBe('visible')
+  fireEvent.focus(switchButton)
+  fireEvent.pointerUp(switchButton)
+  fireEvent.click(switchButton)
+  expect(switchToCli).toHaveBeenCalledOnce()
+  expect(handOff.open).not.toHaveBeenCalled()
+
+  act(() => useAppStore.getState().focusGroup(source.worktreeId, otherGroup))
+  expect(Array.from(row.children)).toEqual(members)
+  expect(getComputedStyle(handOffButton).visibility).toBe('hidden')
+  expect(screen.queryByRole('button', { name: 'Hand Off to Another Agent' })).toBeNull()
+  view.unmount()
+})
+
 it('offers the terminal header action order and targets Resume and Close at the displayed chat', async () => {
   const source = renderHeader()
   expect(screen.getAllByRole('button').map((button) => button.getAttribute('aria-label'))).toEqual([
diff --git a/src/renderer/src/components/native-chat/NativeChatPaneHeader.tsx b/src/renderer/src/components/native-chat/NativeChatPaneHeader.tsx
index dc1518624e9b..faf5fe6018fa 100644
--- a/src/renderer/src/components/native-chat/NativeChatPaneHeader.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatPaneHeader.tsx
@@ -57,7 +57,7 @@ export function NativeChatPaneHeader({
     >
       <div className="pane-title-actions ml-auto flex shrink-0 items-center gap-0">
         {topRightAction}
-        {handOff && focused ? (
+        {handOff ? (
           <Tooltip>
             <TooltipTrigger asChild>
               <Button
@@ -65,6 +65,7 @@ export function NativeChatPaneHeader({
                 variant="pane-title"
                 size="icon-xs"
                 aria-label={handOffLabel}
+                style={{ visibility: focused ? 'visible' : 'hidden' }}
                 disabled={handOff.disabled}
                 onClick={(event) => {
                   event.stopPropagation()

From 7ba8b69f47bc867285d994738497aa2d8b89a2d0 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 05:45:48 -0700
Subject: [PATCH 120/207] Narrow split group identity in header activation
 fixture

---
 .../src/components/native-chat/NativeChatPaneHeader.test.tsx   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/renderer/src/components/native-chat/NativeChatPaneHeader.test.tsx b/src/renderer/src/components/native-chat/NativeChatPaneHeader.test.tsx
index d069eb529372..08b2eae7c67d 100644
--- a/src/renderer/src/components/native-chat/NativeChatPaneHeader.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatPaneHeader.test.tsx
@@ -101,6 +101,9 @@ it('keeps the switch hit target stable while its inactive pane gains focus durin
   const otherGroup = useAppStore
     .getState()
     .createEmptySplitGroup(source.worktreeId, source.groupId, 'right')
+  if (otherGroup === null) {
+    throw new Error('Expected the sibling split group to be created')
+  }
   const switchToCli = vi.fn()
   const handOff = { open: vi.fn(), disabled: false }
   function FocusableHeader() {

From 3ef67450be646b12f860e493af26fe2fa695fac8 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 08:20:19 -0700
Subject: [PATCH 121/207] Preserve stopped terminals through exit handoffs

---
 src/main/ipc/pty/delivery/exit.ts             |   6 +-
 ...red-agent-session-switch-execution.test.ts |  58 ++++
 .../terminal-intentional-stop-exit.test.ts    | 115 ++++++-
 src/preload/api/pty-api.ts                    |   3 +-
 .../pty-bridge-stream-and-serialization.ts    |   4 +-
 .../terminal-pane/ipc-pty-session-handlers.ts |  17 +-
 .../launch-parity-window-tab.test.ts          | 285 +++++++++++++++++-
 .../pty-connection-hibernation-wake.spec.ts   | 200 ++++++++----
 ...-connection-hidden-sleeping-resume.spec.ts |  18 +-
 .../pty-connection-layout-owner-wake.test.ts  |   3 +
 ...-connection-sleeping-resume-banner.spec.ts |   3 +
 .../pty-connection/pty-exit-hibernate.ts      |  18 +-
 .../terminal-pane/pty-data-delivery.ts        |  72 +++++
 .../terminal-pane/pty-dispatcher.ts           |  98 ++----
 .../terminal-pane/pty-exit-delivery.ts        |  22 +-
 .../pty-pre-handler-buffer.test.ts            |  29 +-
 .../terminal-pane/pty-pre-handler-buffer.ts   |  21 +-
 .../pty-shutdown-data-suspension.ts           |   3 +-
 .../pty-shutdown-exit-deferral.test.ts        |  40 +++
 .../pty-shutdown-exit-deferral.ts             |  62 ++--
 .../terminal-pane/pty-transport-types.ts      |   5 +-
 .../terminal-parked-pty-watcher.ts            |  26 +-
 ...arked-watcher-sleep-preserved-exit.test.ts |  41 ++-
 .../src/lib/agent-background-session-exit.ts  |  13 +-
 .../launch-agent-background-session.test.ts   | 128 +++++++-
 .../lib/launch-agent-background-session.ts    |   9 +-
 .../main-loaded-layout-frames.test-fixture.ts | 193 ------------
 ...pen-placement-work-counter.test-fixture.ts | 192 ++++++++++++
 ...-runtime-terminal-switch-placement.test.ts |   2 +-
 .../workspace-layout-frame-sync.test.ts       |   4 +-
 30 files changed, 1260 insertions(+), 430 deletions(-)
 create mode 100644 src/renderer/src/components/terminal-pane/pty-data-delivery.ts
 create mode 100644 src/renderer/src/runtime/open-placement-work-counter.test-fixture.ts

diff --git a/src/main/ipc/pty/delivery/exit.ts b/src/main/ipc/pty/delivery/exit.ts
index 79399fe2b4db..836ae16f1047 100644
--- a/src/main/ipc/pty/delivery/exit.ts
+++ b/src/main/ipc/pty/delivery/exit.ts
@@ -153,7 +153,11 @@ function finalizePtyExitForRenderer(
   session.mainWindow.webContents.send('pty:exit', {
     ...payload,
     hostId: resolvePtyExecutionHost(payload.id),
-    ...(intentionalStops.includes('reversible') ? { preserveRendererBinding: true } : {}),
+    ...(intentionalStops.includes('reversible')
+      ? { preserveRendererBinding: true }
+      : intentionalStops.includes('closing')
+        ? { preserveRendererBinding: 'closing' }
+        : {}),
     ...(intentionalStops.includes('replaced') ? { replacedByRestart: true } : {})
   })
 }
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
index 8ce73616dfe5..ac0eb555c7bc 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
@@ -283,6 +283,64 @@ it.each(['single', 'split', 'other-workspace'] as const)(
   }
 )
 
+it('keeps the stopped source when destination publication fails before retirement', async () => {
+  await savedTranscript()
+  const { runtime, session } = setupMainOwnedWorkspace()
+  const incarnationId = '11111111-1111-4111-8111-111111111111'
+  runtime.registerPty(PTY_A, WORKTREE_ID, null, { tabId: TAB_ID, leafId: LEAF_A, incarnationId })
+  const source = runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_A}`, WORKTREE_ID)
+  if (!source.presentation) {
+    throw new Error('missing captured source')
+  }
+  const originalSourceTabs = structuredClone(session().tabsByWorktree[WORKTREE_ID])
+  const originalSourceLayout = structuredClone(session().terminalLayoutsByTabId[TAB_ID])
+  const acquisitions = rig.adapter.acquire.mock.calls.length
+  const stop = vi.fn(async () => {
+    await runtime.onPtyExit(PTY_A, 0, incarnationId, { hostExitConfirmed: true })
+    return true
+  })
+  const kill = vi.fn(() => false)
+  runtime.setPtyController({
+    write: () => true,
+    kill,
+    stopAndWait: stop,
+    getForegroundProcess: async () => null
+  })
+  const publish = vi
+    .spyOn(runtime, 'publishStructuredAgentSessionTab')
+    .mockRejectedValue(new Error('fixture publication failure'))
+  const result = await executeStructuredSessionSwitch(
+    {
+      sessionId: id,
+      execution: {
+        invocationId: 'publication-failure',
+        source: {
+          terminal: source.handle,
+          expectedIncarnationId: incarnationId,
+          originalPresentation: source.presentation
+        }
+      }
+    },
+    { runtime },
+    'chat'
+  )
+  expect(result).toMatchObject({
+    status: 'refused',
+    refusal: { code: 'agent_session_owner_restart_failed' }
+  })
+  expect(stop).toHaveBeenCalledExactlyOnceWith(
+    PTY_A,
+    expect.objectContaining({ expectedIncarnationId: incarnationId })
+  )
+  expect(runtime.getPtyLivenessVerdict(PTY_A)).toMatchObject({ status: 'exited' })
+  expect(publish).toHaveBeenCalledOnce()
+  expect(session().tabsByWorktree[WORKTREE_ID]).toEqual(originalSourceTabs)
+  expect(session().terminalLayoutsByTabId[TAB_ID]).toEqual(originalSourceLayout)
+  expect(rig.adapter.acquire).toHaveBeenCalledTimes(acquisitions)
+  expect(rig.adapter.dispatch).not.toHaveBeenCalled()
+  expect(kill).not.toHaveBeenCalled()
+})
+
 it('does not acquire or retire a terminal whose physical stop is unproven', async () => {
   await savedTranscript()
   const { runtime, session } = setupMainOwnedWorkspace()
diff --git a/src/main/runtime/terminal-intentional-stop-exit.test.ts b/src/main/runtime/terminal-intentional-stop-exit.test.ts
index caf90a615763..aed25e68d2df 100644
--- a/src/main/runtime/terminal-intentional-stop-exit.test.ts
+++ b/src/main/runtime/terminal-intentional-stop-exit.test.ts
@@ -20,7 +20,9 @@ import { createPtyIpcSession } from '../ipc/pty/session'
 import type { IPtyProvider } from '../providers/pty-provider-contract'
 import { OrcaRuntimeService } from './orca-runtime'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../shared/layout-owner-switch'
+import { createCloseContinuityGraphFixture } from './__fixtures__/orca-runtime-terminal-close-continuity-graph-fixture'
 import {
+  CANARY_TAB_ID,
   INCARNATION_ID,
   LEAF_ID,
   PTY_ID,
@@ -53,7 +55,9 @@ afterEach(() => {
 })
 
 /** Use real store/runtime with renderer stub; lateProviderExit lets the kill reply overtake the provider exit and force a synthetic one. */
-function createHarness(opts: { lateProviderExit?: boolean; folder?: boolean } = {}) {
+function createHarness(
+  opts: { lateProviderExit?: boolean; folder?: boolean; includeCanary?: boolean } = {}
+) {
   const directory = mkdtempSync(join(tmpdir(), 'orca-intentional-stop-'))
   directories.push(directory)
   const store = new Store({
@@ -73,7 +77,9 @@ function createHarness(opts: { lateProviderExit?: boolean; folder?: boolean } =
     // Why: a folder workspace resolves without git, which the sleep transaction needs.
     ...(opts.folder ? { kind: 'folder' as const } : {})
   })
-  store.setWorkspaceSession(advanceTerminalTopologyRevision(makeSession(), WORKTREE_ID))
+  store.setWorkspaceSession(
+    advanceTerminalTopologyRevision(makeSession(PTY_ID, opts.includeCanary), WORKTREE_ID)
+  )
   store.flushOrThrow()
   const runtime = new OrcaRuntimeService(store)
   runtime.registerPty(PTY_ID, WORKTREE_ID, null, {
@@ -138,6 +144,111 @@ function createHarness(opts: { lateProviderExit?: boolean; folder?: boolean } =
 }
 
 describe('intentional stops keep the pane through the exit', () => {
+  it('keeps a captured typed source through provider exit until explicit retirement', async () => {
+    const harness = createHarness({ includeCanary: true })
+    const { runtime, store } = harness
+    const closeTerminalTab = vi.fn(async () => {})
+    runtime.setNotifier({
+      worktreesChanged: vi.fn(),
+      reposChanged: vi.fn(),
+      activateWorktree: vi.fn(),
+      createTerminal: vi.fn(),
+      splitTerminal: vi.fn(),
+      renameTerminal: vi.fn(),
+      focusTerminal: vi.fn(),
+      closeTerminal: vi.fn(),
+      terminalFitOverrideChanged: vi.fn(),
+      terminalDriverChanged: vi.fn(),
+      closeTerminalTab
+    })
+    runtime.attachWindow(1)
+    createCloseContinuityGraphFixture({
+      runtime,
+      ptyId: PTY_ID,
+      publishMobileSurface: true,
+      includeCanary: true,
+      getSession: () => store.getWorkspaceSession(),
+      setSession: (session) => store.setWorkspaceSession(session),
+      markSiblingPtyIncluded: () => {}
+    }).syncFixtureGraph()
+    runtime.terminalRunFacts.recordSpawnCommit({ id: PTY_ID, incarnationId: INCARNATION_ID })
+    runtime.terminalRunFacts.recordInput(PTY_ID, 'driving', 'claude --resume fixture\r')
+    runtime.onPtyData(PTY_ID, 'Retained terminal reply\r\n', Date.now())
+    const source = runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_ID}`, WORKTREE_ID)
+    if (!source.presentation || !source.incarnationId) {
+      throw new Error('Missing authenticated source')
+    }
+    const captured = runtime.captureTerminalSwitchClose(
+      source.handle,
+      source.incarnationId,
+      source.presentation
+    )
+    const before = structuredClone(store.getWorkspaceSession())
+    const entered = Promise.withResolvers<void>()
+    const exit = Promise.withResolvers<void>()
+    const stopAndWait = vi.fn(async () => {
+      entered.resolve()
+      await exit.promise
+      harness.emitProviderExit(INCARNATION_ID)
+      return runtime.getPtyLivenessVerdict(PTY_ID)?.status === 'exited'
+    })
+    const kill = vi.fn(() => true)
+    runtime.setPtyController({
+      write: () => true,
+      kill,
+      stopAndWait,
+      getForegroundProcess: async () => 'claude'
+    })
+    let stopped = false
+    const stopping = captured.stop().then(() => {
+      stopped = true
+    })
+    await entered.promise
+    expect(stopped).toBe(false)
+    expect(harness.rendererExits()).toEqual([])
+    expect(closeTerminalTab).not.toHaveBeenCalled()
+    exit.resolve()
+    await stopping
+
+    expect(runtime.getPtyLivenessVerdict(PTY_ID)).toMatchObject({ status: 'exited' })
+    expect(await runtime.readTerminal(source.handle)).toMatchObject({
+      status: 'exited',
+      tail: ['Retained terminal reply']
+    })
+    expect(harness.tabIds()).toEqual([TAB_ID, CANARY_TAB_ID])
+    expect(harness.boundPtyId()).toBe(PTY_ID)
+    expect(store.getWorkspaceSession().terminalLayoutsByTabId).toEqual(
+      before.terminalLayoutsByTabId
+    )
+    expect(harness.rendererExits()).toEqual([
+      {
+        id: PTY_ID,
+        code: 0,
+        incarnationId: INCARNATION_ID,
+        hostId: 'local',
+        preserveRendererBinding: 'closing'
+      }
+    ])
+    expect(closeTerminalTab).not.toHaveBeenCalled()
+    await expect(captured.retire()).resolves.toMatchObject({ ptyKilled: true })
+    expect(harness.tabIds()).toEqual([CANARY_TAB_ID])
+    expect(store.getWorkspaceSession().terminalLayoutsByTabId[CANARY_TAB_ID]).toEqual(
+      before.terminalLayoutsByTabId[CANARY_TAB_ID]
+    )
+    expect(closeTerminalTab).toHaveBeenCalledExactlyOnceWith(TAB_ID, {
+      localPtyTeardownOwnedExternally: true,
+      originalSurface: source.presentation.identity
+    })
+    expect(stopAndWait).toHaveBeenCalledExactlyOnceWith(
+      PTY_ID,
+      expect.objectContaining({
+        expectedIncarnationId: INCARNATION_ID,
+        deadlineMs: expect.any(Number)
+      })
+    )
+    expect(kill).not.toHaveBeenCalled()
+  })
+
   it('retires the pane when an ordinary close ends the process', async () => {
     const harness = createHarness()
 
diff --git a/src/preload/api/pty-api.ts b/src/preload/api/pty-api.ts
index faf45cab1c40..216c5887fd4a 100644
--- a/src/preload/api/pty-api.ts
+++ b/src/preload/api/pty-api.ts
@@ -267,7 +267,8 @@ export type PtyApi = {
     callback: (data: {
       id: string
       code: number
-      preserveRendererBinding?: boolean
+      /** Retain presentation; only true carries reversible wake authority. */
+      preserveRendererBinding?: boolean | 'closing'
       /** Which lifetime of `id` died; absent when the execution host predates the field. */
       incarnationId?: string
       hostId?: string
diff --git a/src/preload/api/pty-bridge-stream-and-serialization.ts b/src/preload/api/pty-bridge-stream-and-serialization.ts
index 2630e78dfb7d..e6dad1e5df85 100644
--- a/src/preload/api/pty-bridge-stream-and-serialization.ts
+++ b/src/preload/api/pty-bridge-stream-and-serialization.ts
@@ -92,7 +92,7 @@ export const ptyStreamAndSerializationApi = {
     callback: (data: {
       id: string
       code: number
-      preserveRendererBinding?: boolean
+      preserveRendererBinding?: boolean | 'closing'
       incarnationId?: string
       hostId?: string
       ptySourceDisowned?: true
@@ -104,7 +104,7 @@ export const ptyStreamAndSerializationApi = {
       data: {
         id: string
         code: number
-        preserveRendererBinding?: boolean
+        preserveRendererBinding?: boolean | 'closing'
         incarnationId?: string
         hostId?: string
         ptySourceDisowned?: true
diff --git a/src/renderer/src/components/terminal-pane/ipc-pty-session-handlers.ts b/src/renderer/src/components/terminal-pane/ipc-pty-session-handlers.ts
index ad225b928bb3..4cea18cd0816 100644
--- a/src/renderer/src/components/terminal-pane/ipc-pty-session-handlers.ts
+++ b/src/renderer/src/components/terminal-pane/ipc-pty-session-handlers.ts
@@ -1,3 +1,4 @@
+import type { PtyExitOptions } from './pty-exit-delivery'
 import {
   drainRolledBackPtyShutdownData,
   isPtyDataHandlerShutdownPending,
@@ -52,7 +53,7 @@ export function createIpcPtySessionHandlers({
       writeUnavailable: () => void
     }
   >()
-  const ownedExitHandlers = new Map<string, (code: number) => void>()
+  const ownedExitHandlers = new Map<string, (code: number, options?: PtyExitOptions) => void>()
 
   function clearAccumulatedState(): void {
     outputProcessor.clearAccumulatedState()
@@ -135,7 +136,7 @@ export function createIpcPtySessionHandlers({
 
   function registerExit(id: string, incarnationId?: string): boolean {
     const hadBufferedExit = hasPreHandlerPtyExit(id, incarnationId)
-    const exit = (code: number): void => {
+    const exit = (code: number, options?: PtyExitOptions): void => {
       const currentId = getPtyId()
       if (currentId !== null && currentId !== id) {
         unregisterAll(id)
@@ -145,9 +146,17 @@ export function createIpcPtySessionHandlers({
       markExited()
       unregisterAll(id)
       const callbacks = getCallbacks()
-      callbacks.onExit?.(code)
+      if (options) {
+        callbacks.onExit?.(code, options)
+      } else {
+        callbacks.onExit?.(code)
+      }
       callbacks.onDisconnect?.()
-      onPtyExit?.(id, code)
+      if (options) {
+        onPtyExit?.(id, code, options)
+      } else {
+        onPtyExit?.(id, code)
+      }
     }
     ptyExitHandlers.set(id, exit)
     ownedExitHandlers.set(id, exit)
diff --git a/src/renderer/src/components/terminal-pane/launch-parity-window-tab.test.ts b/src/renderer/src/components/terminal-pane/launch-parity-window-tab.test.ts
index 1d83dc4475f4..82e5f10c2230 100644
--- a/src/renderer/src/components/terminal-pane/launch-parity-window-tab.test.ts
+++ b/src/renderer/src/components/terminal-pane/launch-parity-window-tab.test.ts
@@ -1,7 +1,8 @@
 import type * as React from 'react'
+import { Terminal } from '@xterm/headless'
 import { afterEach, beforeAll, describe, expect, it, vi } from 'vitest'
 import { flushAsyncTicks } from './pty-connection-test-async'
-import { createManager, createPane } from './pty-connection-test-pane-fixtures'
+import { createManager, createPane, terminalWriteText } from './pty-connection-test-pane-fixtures'
 import { buildPaneConnectionDeps } from './pty-connection-test-deps'
 import {
   installTerminalTestGlobals,
@@ -29,6 +30,8 @@ import {
   type WindowLaunchCase
 } from '../../../../shared/launch-parity-window-request.test-fixture'
 import { mockPanePtyArgs } from './pty-connection-test-connect-mock-pane'
+import { mainLayoutApplyTransport } from './pty-connection-test-main-pane-start-fixtures'
+import type { SleepingAgentSessionRecord } from '../../../../shared/agent-session-resume'
 
 // Main's answer to the window's layout commands, as a switch-on build sends them.
 vi.mock('@/runtime/runtime-rpc-client', async (importOriginal) =>
@@ -79,6 +82,14 @@ const load = perClientLoader(async () => ({
   paneOptions: await import('./terminal-pane-manager-options'),
   defaults: await import('@/lib/pane-manager/pane-terminal-options'),
   lifecycle: await import('./terminal-pane-lifecycle-primitives'),
+  close: await import('../terminal/terminal-tab-actions'),
+  layoutBindings: await import('./use-terminal-pane-layout-bindings'),
+  parked: await import('./terminal-parked-tab-watchers'),
+  parkedRegistry: await import('./terminal-parked-watcher-registry'),
+  dispatcher: await import('./pty-dispatcher'),
+  exitBuffer: await import('./pty-pre-handler-buffer'),
+  react: await import('react'),
+  server: await import('react-dom/server'),
   workspaceStart: await loadWorkspaceStartModules()
 }))
 
@@ -219,6 +230,278 @@ describe('window-tab producers: the pty:spawn request a real pane sends', () =>
     vi.unstubAllGlobals()
   })
 
+  it('keeps a typed parked sole pane readable and unwritable through closing IPC and late reattach until explicit close', async () => {
+    const modules = await load('linux')
+    await installTerminalTestGlobals()
+    Object.assign(window.api.platform, { get: () => ({ platform: 'linux', osRelease: '6' }) })
+    const workspace = { kind: 'folder', path: '/home/alice/source' } as const
+    const worktreeId = launchWorkspaceId(workspace)
+    const store = modules.createStore()
+    holder.store = store
+    store.setState(launchWorkspaceState(workspace, { ...getDefaultSettings('/home/alice') }))
+    const pane = createPane(1)
+    const manager = createManager(1, 1)
+    const ptyId = `${worktreeId}@@retained-source`
+    const incarnationId = 'source-incarnation'
+    const tab = store.getState().createTab(worktreeId, undefined, undefined, {
+      initialPtyId: ptyId,
+      initialLeafId: pane.leafId
+    })
+    const spawn = vi.fn<typeof window.api.pty.spawn>(async () => ({
+      id: ptyId,
+      incarnationId,
+      isReattach: true
+    }))
+    const onData = vi.fn<typeof window.api.pty.onData>(() => () => {})
+    const onExit = vi.fn<typeof window.api.pty.onExit>(() => () => {})
+    const noop = (): (() => void) => () => {}
+    Object.assign(window.api.pty, {
+      spawn,
+      onData,
+      onExit,
+      onReplay: noop,
+      onWriteUnavailable: noop,
+      onSideEffect: noop,
+      resize: vi.fn(),
+      claimViewport: vi.fn()
+    })
+    const output = 'stopped source remains readable'
+    const sink = new Terminal({
+      cols: pane.terminal.cols,
+      rows: pane.terminal.rows,
+      allowProposedApi: true
+    })
+    const painted = Promise.withResolvers<void>()
+    const reset = vi.fn(() => sink.reset())
+    let binding: ReturnType<typeof modules.pane.connectPanePty> | undefined
+    try {
+      if (!('_core' in sink)) {
+        throw new Error('headless terminal must expose the real user-input signal')
+      }
+      Object.assign(pane.terminal, { _core: sink._core, buffer: sink.buffer, reset })
+      pane.terminal.onData.mockImplementation((listener: (data: string) => void) =>
+        sink.onData(listener)
+      )
+      pane.terminal.write.mockImplementation((data, callback) => {
+        sink.write(data, () => {
+          callback?.()
+          if (terminalWriteText(data).includes(output)) {
+            painted.resolve()
+          }
+        })
+      })
+      pane.terminal.clear.mockImplementation(() => sink.clear())
+      const renderedText = (): string =>
+        Array.from({ length: sink.buffer.active.length }, (_, row) =>
+          sink.buffer.active.getLine(row)?.translateToString(true)
+        ).join('\n')
+      const automaticClose = vi.fn((exitedPtyId: string) =>
+        modules.close.closeTerminalTab(tab.id, {
+          reason: 'pty-exit',
+          lifecyclePtyId: exitedPtyId
+        })
+      )
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the real store supplies every state member read by the existing pane fixture.
+      const deps = buildPaneConnectionDeps(() => store.getState() as never, {
+        tabId: tab.id,
+        worktreeId,
+        cwd: workspace.path,
+        restoredLeafId: pane.leafId,
+        restoredPtyIdByLeafId: { [pane.leafId]: ptyId },
+        onPtyExitRef: { current: automaticClose },
+        consumeSuppressedPtyExit: vi.fn(store.getState().consumeSuppressedPtyExit),
+        clearTabPtyId: vi.fn(store.getState().clearTabPtyId),
+        updateTabPtyId: vi.fn(store.getState().updateTabPtyId)
+      })
+      const args = mockPanePtyArgs(pane, manager, deps)
+      const controller: Partial<
+        Parameters<typeof modules.layoutBindings.useTerminalPaneLayoutBindings>[0]
+      > = {
+        tabId: tab.id,
+        managerRef: { current: args[1] },
+        paneTransportsRef: args[2].paneTransportsRef,
+        containerRef: { current: null },
+        expandedPaneIdRef: { current: null },
+        expandedStyleSnapshotRef: { current: new Map() },
+        pendingPaneSizeRefreshFrameIdsRef: { current: [] },
+        persistLayoutSnapshot: vi.fn(),
+        setExpandedPaneId: vi.fn(),
+        setTabPaneExpanded: store.getState().setTabPaneExpanded,
+        setTabLayout: store.getState().setTabLayout
+      }
+      let layoutBindings:
+        | ReturnType<typeof modules.layoutBindings.useTerminalPaneLayoutBindings>
+        | undefined
+      function LayoutBindings(): null {
+        // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the binding hook reads only the supplied layout and expand/collapse controller fields, as in pending-split-close-test-fixture.
+        layoutBindings = modules.layoutBindings.useTerminalPaneLayoutBindings(
+          controller as Parameters<typeof modules.layoutBindings.useTerminalPaneLayoutBindings>[0]
+        )
+        return null
+      }
+      modules.server.renderToString(modules.react.createElement(LayoutBindings))
+      if (!layoutBindings) {
+        throw new Error('real pane layout bindings were not created')
+      }
+      Object.assign(args[2], {
+        syncPanePtyLayoutBinding: layoutBindings.syncPanePtyLayoutBinding,
+        clearExitedPanePtyLayoutBinding: vi.fn(layoutBindings.clearExitedPanePtyLayoutBinding)
+      })
+      binding = modules.pane.connectPanePty(...args)
+      await flushAsyncTicks(20)
+      const transport = args[2].paneTransportsRef.current.get(pane.id)
+      const dispatchData = onData.mock.calls[0]?.[0]
+      const dispatchExit = onExit.mock.calls[0]?.[0]
+      if (!transport || !dispatchData || !dispatchExit) {
+        throw new Error('real IPC pane connection did not register its consumers')
+      }
+      expect(spawn).toHaveBeenCalledTimes(1)
+      expect(spawn).toHaveBeenCalledWith(expect.objectContaining({ sessionId: ptyId }))
+      expect(transport.isConnected()).toBe(true)
+      expect(transport.getPtyId()).toBe(ptyId)
+      expect(store.getState().tabsByWorktree[worktreeId]).toEqual([tab])
+      expect(store.getState().unifiedTabsByWorktree[worktreeId]).toEqual([
+        expect.objectContaining({ contentType: 'terminal', entityId: tab.id })
+      ])
+      expect(manager.getPanes()).toEqual([{ id: pane.id, leafId: pane.leafId }])
+      sink.input('status\r', true)
+      await flushAsyncTicks(20)
+      expect(window.api.pty.write).toHaveBeenCalledWith(ptyId, 'status\r', 'driving')
+      dispatchData({ id: ptyId, data: output })
+      await painted.promise
+      expect(renderedText()).toContain(output)
+      const paneKey = `${tab.id}:${pane.leafId}`
+      const liveAnchor: SleepingAgentSessionRecord = {
+        paneKey,
+        tabId: tab.id,
+        worktreeId,
+        agent: 'claude',
+        providerSession: { key: 'session_id', id: 'retained-source-conversation' },
+        prompt: '',
+        state: 'done',
+        origin: 'live',
+        capturedAt: 1,
+        updatedAt: 1
+      }
+      store.setState({
+        localOnlyScrollbackByTabId: { [tab.id]: { [pane.leafId]: output } },
+        sleepingAgentSessionsByPaneKey: { [paneKey]: liveAnchor }
+      })
+      const layoutApply = await mainLayoutApplyTransport()
+      expect(layoutApply.sentOfType('startPane')).toHaveLength(0)
+      const registerLaunch = vi.spyOn(store.getState(), 'registerAgentLaunchConfig')
+      const beforeExit = store.getState()
+      const layout = beforeExit.terminalLayoutsByTabId[tab.id]
+      expect(layout.root).toEqual({ type: 'leaf', leafId: pane.leafId })
+      expect(layout.ptyIdsByLeafId).toEqual({ [pane.leafId]: ptyId })
+      const writes = vi.mocked(window.api.pty.write).mock.calls.length
+      const clears = pane.terminal.clear.mock.calls.length
+      const resets = reset.mock.calls.length
+      const retireTab = vi.spyOn(store.getState(), 'closeTab')
+
+      modules.parked.captureParkedTerminalPaneCandidates(tab.id, worktreeId, [
+        {
+          ptyId,
+          paneId: pane.id,
+          leafId: pane.leafId,
+          drivesTabTitle: true,
+          untouchedFreshSpawn: binding.isUntouchedFreshSpawnPty(ptyId)
+        }
+      ])
+      transport.detach?.({ preserveExitObserver: false })
+      binding.dispose()
+      args[2].paneTransportsRef.current.clear()
+      modules.parked.syncParkedTerminalTabWatchersForWorkspaces(
+        new Map([[worktreeId, { tabs: [tab], parkedTabIds: new Set([tab.id]) }]])
+      )
+      expect(modules.dispatcher.ptyExitHandlers.has(ptyId)).toBe(false)
+      expect(
+        modules.parkedRegistry.parkedWatchersByTabId.get(tab.id)?.disposersByPtyId.has(ptyId)
+      ).toBe(true)
+      expect(store.getState().isPtyShutdownPending(ptyId)).toBe(false)
+      expect(store.getState().suppressedPtyExitIds[ptyId]).toBeUndefined()
+      dispatchExit({ id: ptyId, code: 0, incarnationId, preserveRendererBinding: 'closing' })
+      expect(modules.exitBuffer.hasPreHandlerPtyExit(ptyId, incarnationId)).toBe(true)
+      expect(modules.parkedRegistry.parkedWatchersByTabId.get(tab.id)?.disposersByPtyId.size).toBe(
+        0
+      )
+      expect(store.getState().terminalLayoutsByTabId[tab.id]).toEqual(layout)
+      expect(store.getState().ptyIdsByTabId[tab.id]).toEqual([ptyId])
+      const afterMarkerGrace = vi.spyOn(Date, 'now').mockReturnValue(Date.now() + 30_001)
+      try {
+        args[2].mountFollowsTerminalPark = true
+        binding = modules.pane.connectPanePty(...args)
+        await flushAsyncTicks(20)
+      } finally {
+        afterMarkerGrace.mockRestore()
+      }
+      const revealedTransport = args[2].paneTransportsRef.current.get(pane.id)
+      if (!revealedTransport) {
+        throw new Error('real reveal did not install its transport')
+      }
+      expect(revealedTransport).not.toBe(transport)
+      expect(modules.exitBuffer.hasPreHandlerPtyExit(ptyId)).toBe(false)
+      await flushAsyncTicks(20)
+      await layoutApply.settle()
+      await flushAsyncTicks(20)
+      expect(layoutApply.sentOfType('startPane')).toHaveLength(0)
+      expect(registerLaunch).not.toHaveBeenCalled()
+      expect(deps.consumeSuppressedPtyExit).toHaveReturnedWith(false)
+      expect(transport.isConnected()).toBe(false)
+      expect(transport.getPtyId()).toBeNull()
+      expect(revealedTransport.isConnected()).toBe(false)
+      expect(revealedTransport.getPtyId()).toBeNull()
+      expect(revealedTransport.sendInput('must not run\r', 'driving')).toBe(false)
+      expect(window.api.pty.write).toHaveBeenCalledTimes(writes)
+      expect(automaticClose).not.toHaveBeenCalled()
+      expect(retireTab).not.toHaveBeenCalled()
+      expect(manager.closePane).not.toHaveBeenCalled()
+      expect(deps.clearTabPtyId).not.toHaveBeenCalled()
+      expect(args[2].clearExitedPanePtyLayoutBinding).not.toHaveBeenCalled()
+      expect(store.getState().tabsByWorktree[worktreeId]).toEqual(
+        beforeExit.tabsByWorktree[worktreeId]
+      )
+      expect(store.getState().unifiedTabsByWorktree[worktreeId]).toEqual(
+        beforeExit.unifiedTabsByWorktree[worktreeId]
+      )
+      expect(store.getState().terminalLayoutsByTabId[tab.id]).toEqual(layout)
+      expect(store.getState().ptyIdsByTabId[tab.id]).toEqual([ptyId])
+      expect(store.getState().localOnlyScrollbackByTabId[tab.id]).toEqual({ [pane.leafId]: output })
+      expect(pane.terminal.clear).toHaveBeenCalledTimes(clears)
+      expect(reset).toHaveBeenCalledTimes(resets)
+      expect(renderedText()).toContain(output)
+      expect(store.getState().sleepingAgentSessionsByPaneKey).toEqual({ [paneKey]: liveAnchor })
+      expect(args[2].paneTransportsRef.current.get(pane.id)).toBe(revealedTransport)
+      expect(spawn).toHaveBeenCalledTimes(1)
+
+      vi.mocked(window.api.pty.inspectProcess).mockResolvedValue({
+        foregroundProcess: null,
+        hasChildProcesses: false,
+        childProcessEvidence: 'no-children'
+      })
+      await new Promise<void>((resolve) =>
+        modules.close.closeTerminalTab(tab.id, { reason: 'user', onClosed: resolve })
+      )
+      expect(retireTab).toHaveBeenCalledExactlyOnceWith(
+        tab.id,
+        expect.objectContaining({ reason: 'user' })
+      )
+      expect(store.getState().tabsByWorktree[worktreeId] ?? []).toEqual([])
+      expect(store.getState().unifiedTabsByWorktree[worktreeId] ?? []).toEqual([])
+      expect(store.getState().terminalLayoutsByTabId[tab.id]).toBeUndefined()
+      expect(store.getState().localOnlyScrollbackByTabId[tab.id]).toBeUndefined()
+      expect(store.getState().ptyIdsByTabId[tab.id]).toBeUndefined()
+      expect(transport.sendInput('still must not run\r', 'driving')).toBe(false)
+      expect(revealedTransport.sendInput('still must not run\r', 'driving')).toBe(false)
+      expect(window.api.pty.write).toHaveBeenCalledTimes(writes)
+      expect(spawn).toHaveBeenCalledTimes(1)
+    } finally {
+      binding?.dispose()
+      modules.parkedRegistry.disposeAllParkedTerminalWatchers()
+      sink.dispose()
+    }
+  })
+
   it.each([...WINDOW_LAUNCH_CASES, ...PLUS_LAUNCH_CASES, ...WORKSPACE_START_LAUNCH_CASES])(
     'row $row: $name',
     async (c) => {
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-hibernation-wake.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection-hibernation-wake.spec.ts
index 72c57e9a4604..8941c9acbe00 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-hibernation-wake.spec.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-hibernation-wake.spec.ts
@@ -65,6 +65,7 @@ export function registerPtyConnectionHibernationWakeTests(): void {
     it('disarms input modes and resumes a hibernated agent session on visibility reveal', async () => {
       // Regression: hibernation suppresses its kill's PTY exit while hidden; before the wake fix onExit permanently latched handledExitPtyId, leaving a frozen inert ghost pane on reveal.
       const { connectPanePty } = await import('./pty-connection')
+      const { settleDeferredPtyShutdownExits } = await import('./pty-shutdown-exit-deferral')
       const transport = createMockTransport('pty-pane-2')
       transportFactoryQueue.push(transport)
       const manager = createManager(1)
@@ -105,7 +106,9 @@ export function registerPtyConnectionHibernationWakeTests(): void {
       // The deferred connect attached this transport to the persisted tab PTY, so the kill's exit must carry that id for the wake guard's same-pty check.
       expect((transport.getPtyId as unknown as () => string | null)()).toBe('tab-pty')
       const connectCallsBeforeExit = transport.connect.mock.calls.length
+      deps.isPtyShutdownPending.mockReturnValueOnce(true)
       onPtyExit?.('tab-pty')
+      settleDeferredPtyShutdownExits(['tab-pty'], 'committed')
       await flushAsyncTicks()
 
       // The frozen frame's input-eating modes are disarmed at hibernation-exit (mouse tracking / bracketed paste would otherwise swallow clicks).
@@ -143,65 +146,125 @@ export function registerPtyConnectionHibernationWakeTests(): void {
     })
 
     // A suppressed exit over a finished turn’s live anchor still arms reveal resume despite its worktree-sleep note (#16308).
-    it('arms an in-place resume from a finished turn idle anchor on a suppressed exit', async () => {
-      const { connectPanePty } = await import('./pty-connection')
-      const transport = createMockTransport('pty-pane-2')
-      transportFactoryQueue.push(transport)
-      const deps = createDeps({
-        consumeSuppressedPtyExit: vi.fn(() => true),
-        isVisibleRef: { current: false }
-      })
-      const pane = createPane(2)
-      const paneKey = `tab-1:${leafIdForPane(2)}`
-      if (ORCA_LAYOUT_OWNER_IS_MAIN) {
-        await mainStartsPaneAs({
-          ptyId: 'pty-main',
-          bind: bindsPaneInStore(() => mockStoreState, 'tab-1', leafIdForPane(2))
+    it.each([10, 100])(
+      'arms an in-place resume from a finished turn idle anchor without scanning %i unrelated hosts',
+      async (hostCount) => {
+        const { connectPanePty } = await import('./pty-connection')
+        const {
+          settleDeferredPtyShutdownExits,
+          applyHostWorktreeTerminalSleepState,
+          consumeCommittedPtyShutdownExit
+        } = await import('./pty-shutdown-exit-deferral')
+        const { toRemoteRuntimePtyId } =
+          await import('../../../../shared/remote-runtime/remote-runtime-pty-id')
+        const transport = createMockTransport('pty-pane-2')
+        transportFactoryQueue.push(transport)
+        const deps = createDeps({
+          consumeSuppressedPtyExit: vi.fn(() => true),
+          isVisibleRef: { current: false }
         })
-      }
-      mockStoreState.sleepingAgentSessionsByPaneKey[paneKey] = {
-        paneKey,
-        tabId: 'tab-1',
-        worktreeId: 'wt-1',
-        agent: 'claude',
-        providerSession: { key: 'session_id', id: 'sess-idle-anchor' },
-        prompt: '',
-        state: 'done',
-        capturedAt: 1,
-        updatedAt: 1,
-        origin: 'live'
-      }
-      mockStoreState.suppressedPtyExitIds['tab-pty'] = true
-      const args = mockPanePtyArgs(pane, createManager(1), deps)
-      const binding = connectPanePty(...args)
-      await flushAsyncTicks()
-      const onPtyExit = createdTransportOptions[0]?.onPtyExit
-      expect(onPtyExit).toBeTypeOf('function')
-      const connectCallsBeforeExit = transport.connect.mock.calls.length
-      if (typeof onPtyExit === 'function') {
-        onPtyExit('tab-pty')
-      }
-      await flushAsyncTicks()
+        const pane = createPane(2)
+        const paneKey = `tab-1:${leafIdForPane(2)}`
+        if (ORCA_LAYOUT_OWNER_IS_MAIN) {
+          await mainStartsPaneAs({
+            ptyId: 'pty-main',
+            bind: bindsPaneInStore(() => mockStoreState, 'tab-1', leafIdForPane(2))
+          })
+        }
+        mockStoreState.sleepingAgentSessionsByPaneKey[paneKey] = {
+          paneKey,
+          tabId: 'tab-1',
+          worktreeId: 'wt-1',
+          agent: 'claude',
+          providerSession: { key: 'session_id', id: 'sess-idle-anchor' },
+          prompt: '',
+          state: 'done',
+          capturedAt: 1,
+          updatedAt: 1,
+          origin: 'live'
+        }
+        mockStoreState.suppressedPtyExitIds['tab-pty'] = true
+        const args = mockPanePtyArgs(pane, createManager(1), deps)
+        const binding = connectPanePty(...args)
+        await flushAsyncTicks()
+        const onPtyExit = createdTransportOptions[0]?.onPtyExit
+        expect(onPtyExit).toBeTypeOf('function')
+        const connectCallsBeforeExit = transport.connect.mock.calls.length
+        const unrelatedHosts = Array.from(
+          { length: hostCount },
+          (_, i) => `env-unrelated-replay-${i}`
+        )
+        for (const environmentId of unrelatedHosts) {
+          applyHostWorktreeTerminalSleepState(environmentId, {
+            type: 'worktreeTerminalSleepState',
+            worktreeId: 'unrelated-workspace',
+            generation: 1,
+            phase: 'committed',
+            ptyIds: [],
+            terminalHandles: ['unrelated-terminal']
+          })
+        }
+        let unrelatedHostVisits = 0
+        const iterate = Map.prototype[Symbol.iterator]
+        Object.defineProperty(Map.prototype, Symbol.iterator, {
+          configurable: true,
+          writable: true,
+          value: function* (this: Map<unknown, unknown>) {
+            for (const entry of iterate.call(this)) {
+              if (typeof entry[0] === 'string' && entry[0].startsWith('env-unrelated-replay-')) {
+                unrelatedHostVisits += 1
+              }
+              yield entry
+            }
+            return undefined
+          }
+        })
+        try {
+          deps.isPtyShutdownPending.mockReturnValueOnce(true)
+          if (typeof onPtyExit === 'function') {
+            onPtyExit('tab-pty')
+          }
+          settleDeferredPtyShutdownExits(['tab-pty'], 'committed')
+        } finally {
+          Object.defineProperty(Map.prototype, Symbol.iterator, {
+            configurable: true,
+            writable: true,
+            value: iterate
+          })
+          for (const environmentId of unrelatedHosts) {
+            expect(
+              consumeCommittedPtyShutdownExit(
+                toRemoteRuntimePtyId('unrelated-terminal', environmentId),
+                environmentId
+              )
+            ).toBe(true)
+          }
+        }
+        expect(unrelatedHostVisits).toBe(0)
+        console.info('R110_HOST_REPLAY', { hostCount, unrelatedHostVisits })
+        await flushAsyncTicks()
 
-      binding.noteVisibilityResume()
-      await flushAsyncTicks()
+        binding.noteVisibilityResume()
+        await flushAsyncTicks()
 
-      if (ORCA_LAYOUT_OWNER_IS_MAIN) {
-        await expectWindowStartAskedMain(transport, paneKey)
-        expect(transport.connect).toHaveBeenLastCalledWith(
-          expect.objectContaining({ sessionId: 'pty-main', attachOnlyView: true })
-        )
-        return
+        if (ORCA_LAYOUT_OWNER_IS_MAIN) {
+          await expectWindowStartAskedMain(transport, paneKey)
+          expect(transport.connect).toHaveBeenLastCalledWith(
+            expect.objectContaining({ sessionId: 'pty-main', attachOnlyView: true })
+          )
+          return
+        }
+        const resumeConnectOptions: { command?: string } | undefined =
+          transport.connect.mock.calls.at(-1)?.[0]
+        expect(transport.connect.mock.calls.length).toBeGreaterThan(connectCallsBeforeExit)
+        expect(resumeConnectOptions?.command).toContain('sess-idle-anchor')
       }
-      const resumeConnectOptions: { command?: string } | undefined =
-        transport.connect.mock.calls.at(-1)?.[0]
-      expect(transport.connect.mock.calls.length).toBeGreaterThan(connectCallsBeforeExit)
-      expect(resumeConnectOptions?.command).toContain('sess-idle-anchor')
-    })
+    )
 
     it('resumes a hibernated agent from a navigation-free wake without a visibility reveal', async () => {
       // Mobile wakes hidden panes without visibility changes; duplicate wake events must resume exactly once (INV-1).
       const { connectPanePty } = await import('./pty-connection')
+      const { settleDeferredPtyShutdownExits } = await import('./pty-shutdown-exit-deferral')
       const transport = createMockTransport('pty-pane-2')
       transportFactoryQueue.push(transport)
       const manager = createManager(1)
@@ -239,7 +302,9 @@ export function registerPtyConnectionHibernationWakeTests(): void {
         | undefined
       expect((transport.getPtyId as unknown as () => string | null)()).toBe('tab-pty')
       const connectCallsBeforeExit = transport.connect.mock.calls.length
+      deps.isPtyShutdownPending.mockReturnValueOnce(true)
       onPtyExit?.('tab-pty')
+      settleDeferredPtyShutdownExits(['tab-pty'], 'committed')
       await flushAsyncTicks()
       // Still hidden: no reveal happened, so nothing respawned on exit.
       expect(transport.connect.mock.calls.length).toBe(connectCallsBeforeExit)
@@ -278,6 +343,7 @@ export function registerPtyConnectionHibernationWakeTests(): void {
 
     it('names the replaced PTY on the restart spawn only, never on a later wake of the same pane', async () => {
       const { connectPanePty } = await import('./pty-connection')
+      const { settleDeferredPtyShutdownExits } = await import('./pty-shutdown-exit-deferral')
       const transport = createMockTransport('pty-restarted')
       transportFactoryQueue.push(transport)
       const deps = createDeps({
@@ -323,7 +389,9 @@ export function registerPtyConnectionHibernationWakeTests(): void {
       const onPtyExit = createdTransportOptions[0]?.onPtyExit as
         | ((ptyId: string) => void)
         | undefined
+      deps.isPtyShutdownPending.mockReturnValueOnce(true)
       onPtyExit?.('pty-restarted')
+      settleDeferredPtyShutdownExits(['pty-restarted'], 'committed')
       await flushAsyncTicks()
       expect(binding.wakeHibernatedAgentIfArmed(new Set())).not.toBeNull()
       await flushAsyncTicks()
@@ -411,6 +479,7 @@ export function registerPtyConnectionHibernationWakeTests(): void {
     it('latches a navigation-free wake that lands before the hibernation kill arms the pane', async () => {
       // Latch wake events between recording sleep and arming the kill’s PTY ID, or the frozen pane remains stranded (#7906).
       const { connectPanePty } = await import('./pty-connection')
+      const { settleDeferredPtyShutdownExits } = await import('./pty-shutdown-exit-deferral')
       const transport = createMockTransport('pty-pane-2')
       transportFactoryQueue.push(transport)
       const manager = createManager(1)
@@ -455,7 +524,9 @@ export function registerPtyConnectionHibernationWakeTests(): void {
       const onPtyExit = createdTransportOptions[0]?.onPtyExit as
         | ((ptyId: string) => void)
         | undefined
+      deps.isPtyShutdownPending.mockReturnValueOnce(true)
       onPtyExit?.('tab-pty')
+      settleDeferredPtyShutdownExits(['tab-pty'], 'committed')
       await flushAsyncTicks()
 
       if (ORCA_LAYOUT_OWNER_IS_MAIN) {
@@ -476,6 +547,7 @@ export function registerPtyConnectionHibernationWakeTests(): void {
 
     it('keeps an in-place provider claim until the replacement PTY spawn settles', async () => {
       const { connectPanePty } = await import('./pty-connection')
+      const { settleDeferredPtyShutdownExits } = await import('./pty-shutdown-exit-deferral')
       const transport = createMockTransport('pty-pane-2')
       transportFactoryQueue.push(transport)
       const deps = createDeps({
@@ -501,7 +573,9 @@ export function registerPtyConnectionHibernationWakeTests(): void {
       const onPtyExit = createdTransportOptions[0]?.onPtyExit as
         | ((ptyId: string) => void)
         | undefined
+      deps.isPtyShutdownPending.mockReturnValueOnce(true)
       onPtyExit?.('tab-pty')
+      settleDeferredPtyShutdownExits(['tab-pty'], 'committed')
       await flushAsyncTicks()
       const deferredSpawn = createDeferred<unknown>()
       transport.connect.mockImplementationOnce(() => deferredSpawn.promise)
@@ -535,6 +609,7 @@ export function registerPtyConnectionHibernationWakeTests(): void {
 
     it('re-arms the exact hibernation target after a replacement spawn fails', async () => {
       const { connectPanePty } = await import('./pty-connection')
+      const { settleDeferredPtyShutdownExits } = await import('./pty-shutdown-exit-deferral')
       const transport = createMockTransport('pty-pane-2')
       transportFactoryQueue.push(transport)
       const paneKey = `tab-1:${leafIdForPane(2)}`
@@ -550,22 +625,19 @@ export function registerPtyConnectionHibernationWakeTests(): void {
         updatedAt: 1,
         origin: 'worktree-sleep'
       }
-      const binding = connectPanePty(
-        ...mockPanePtyArgs(
-          createPane(2),
-          createManager(1),
-          createDeps({
-            consumeSuppressedPtyExit: vi.fn(() => true),
-            isVisibleRef: { current: false }
-          })
-        )
-      )
+      const deps = createDeps({
+        consumeSuppressedPtyExit: vi.fn(() => true),
+        isVisibleRef: { current: false }
+      })
+      const binding = connectPanePty(...mockPanePtyArgs(createPane(2), createManager(1), deps))
       await flushAsyncTicks()
 
       const onPtyExit = createdTransportOptions[0]?.onPtyExit as
         | ((ptyId: string) => void)
         | undefined
+      deps.isPtyShutdownPending.mockReturnValueOnce(true)
       onPtyExit?.('tab-pty')
+      settleDeferredPtyShutdownExits(['tab-pty'], 'committed')
       await flushAsyncTicks()
       transport.connect.mockRejectedValueOnce(new Error('transient spawn failure'))
 
@@ -624,6 +696,7 @@ export function registerPtyConnectionHibernationWakeTests(): void {
     it('auto-resumes a hibernated pane when its kill lands after the pane is already revealed', async () => {
       // If reveal precedes wake arming, the arm-time visibility check must resume the pane immediately.
       const { connectPanePty } = await import('./pty-connection')
+      const { settleDeferredPtyShutdownExits } = await import('./pty-shutdown-exit-deferral')
       const transport = createMockTransport('pty-pane-2')
       transportFactoryQueue.push(transport)
       const manager = createManager(1)
@@ -662,7 +735,9 @@ export function registerPtyConnectionHibernationWakeTests(): void {
       // The deferred connect attached this transport to the persisted tab PTY, so the kill's exit must carry that id for the wake guard's same-pty check.
       expect((transport.getPtyId as unknown as () => string | null)()).toBe('tab-pty')
       const connectCallsBeforeExit = transport.connect.mock.calls.length
+      deps.isPtyShutdownPending.mockReturnValueOnce(true)
       onPtyExit?.('tab-pty')
+      settleDeferredPtyShutdownExits(['tab-pty'], 'committed')
       await flushAsyncTicks()
 
       if (ORCA_LAYOUT_OWNER_IS_MAIN) {
@@ -691,6 +766,7 @@ export function registerPtyConnectionHibernationWakeTests(): void {
     it('invalidates the hibernation wake when another flow rebinds the pane before reveal', async () => {
       // A hidden restart’s rebind permanently invalidates the old armed wake, including after a later PTY death.
       const { connectPanePty } = await import('./pty-connection')
+      const { settleDeferredPtyShutdownExits } = await import('./pty-shutdown-exit-deferral')
       const transport = createMockTransport('pty-pane-2')
       transportFactoryQueue.push(transport)
       const manager = createManager(1)
@@ -722,7 +798,9 @@ export function registerPtyConnectionHibernationWakeTests(): void {
       expect(onPtyExit).toBeTypeOf('function')
       expect((transport.getPtyId as unknown as () => string | null)()).toBe('tab-pty')
       const connectCallsBeforeExit = transport.connect.mock.calls.length
+      deps.isPtyShutdownPending.mockReturnValueOnce(true)
       onPtyExit?.('tab-pty')
+      settleDeferredPtyShutdownExits(['tab-pty'], 'committed')
       await flushAsyncTicks()
 
       // Another flow rebinds the pane to a fresh PTY while it is still hidden.
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-hidden-sleeping-resume.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection-hidden-sleeping-resume.spec.ts
index 8d939d727a2e..d6f04ac19fa2 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-hidden-sleeping-resume.spec.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-hidden-sleeping-resume.spec.ts
@@ -328,14 +328,13 @@ export function registerPtyConnectionHiddenSleepingResumeTests(): void {
       const isVisibleRef = { current: false }
       const transport = createResumingTransport()
       transportFactoryQueue.push(transport)
-      const binding = connectPane(
-        buildPaneConnectionDeps(() => mockStoreState, {
-          restoredLeafId: LEAF_2,
-          restoredPtyIdByLeafId: {},
-          consumeSuppressedPtyExit: vi.fn(() => true),
-          isVisibleRef
-        })
-      )
+      const deps = buildPaneConnectionDeps(() => mockStoreState, {
+        restoredLeafId: LEAF_2,
+        restoredPtyIdByLeafId: {},
+        consumeSuppressedPtyExit: vi.fn(() => true),
+        isVisibleRef
+      })
+      const binding = connectPane(deps)
       await flushAsyncTicks(10)
       isVisibleRef.current = true
       binding.noteVisibilityResume()
@@ -351,7 +350,10 @@ export function registerPtyConnectionHiddenSleepingResumeTests(): void {
       if (typeof onPtyExit !== 'function') {
         throw new Error('expected the transport exit handler')
       }
+      const { settleDeferredPtyShutdownExits } = await import('./pty-shutdown-exit-deferral')
+      deps.isPtyShutdownPending.mockReturnValueOnce(true)
       onPtyExit(resumedPtyId)
+      settleDeferredPtyShutdownExits([resumedPtyId], 'committed')
       await flushAsyncTicks(10)
 
       expect(isPaneSpawnDeferred(PANE_KEY)).toBe(false)
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-layout-owner-wake.test.ts b/src/renderer/src/components/terminal-pane/pty-connection-layout-owner-wake.test.ts
index 8e528db8b1fe..334411db2da2 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-layout-owner-wake.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-layout-owner-wake.test.ts
@@ -85,6 +85,7 @@ describe('wake through main in a layout-owner build', () => {
   // Main's start of the revealed pane is its wake: the window records none of its own.
   it('asks main to start the revealed pane alone, and records no wake itself', async () => {
     const { connectPanePty } = await import('./pty-connection')
+    const { settleDeferredPtyShutdownExits } = await import('./pty-shutdown-exit-deferral')
     const transport = createMockTransport('pty-pane-2')
     transportFactoryQueue.push(transport)
     const deps = buildPaneConnectionDeps(() => mockStoreState, {
@@ -112,9 +113,11 @@ describe('wake through main in a layout-owner build', () => {
     const binding = connectPanePty(...args)
     await flushAsyncTicks()
     const onPtyExit = createdTransportOptions[0]?.onPtyExit
+    deps.isPtyShutdownPending.mockReturnValueOnce(true)
     if (typeof onPtyExit === 'function') {
       onPtyExit('tab-pty')
     }
+    settleDeferredPtyShutdownExits(['tab-pty'], 'committed')
     await flushAsyncTicks()
     // Hidden: the sleep holds until the pane is shown.
     expect(mocks.wake).not.toHaveBeenCalled()
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-sleeping-resume-banner.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection-sleeping-resume-banner.spec.ts
index 12fceec49ae4..b9f3aa9eb47b 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-sleeping-resume-banner.spec.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-sleeping-resume-banner.spec.ts
@@ -360,7 +360,10 @@ export function registerPtyConnectionSleepingResumeBannerTests(): void {
       const onPtyExit = createdTransportOptions[0]?.onPtyExit as
         | ((ptyId: string) => void)
         | undefined
+      const { settleDeferredPtyShutdownExits } = await import('./pty-shutdown-exit-deferral')
+      deps.isPtyShutdownPending.mockReturnValueOnce(true)
       onPtyExit?.('fresh-pty')
+      settleDeferredPtyShutdownExits(['fresh-pty'], 'committed')
       await flushAsyncTicks(10)
       isVisibleRef.current = true
       binding.noteVisibilityResume()
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/pty-exit-hibernate.ts b/src/renderer/src/components/terminal-pane/pty-connection/pty-exit-hibernate.ts
index 4e728854c73f..a2c6707b1cee 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/pty-exit-hibernate.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/pty-exit-hibernate.ts
@@ -90,7 +90,7 @@ export function installPtyExitHibernate(session: ConnectPanePtySession): void {
   session.handledExitPtyId = null
   // Only genuine fresh, never-typed PTYs keep startup errors visible; dead reattached sessions must still close normally.
   session.spawnedFreshPtyId = null
-  // Suppressed hidden hibernation exits still owe a wake; retain the exact PTY/record so a later session cannot be adopted.
+  // Reversible hidden hibernation exits still owe a wake; retain the exact PTY/record so a later session cannot be adopted.
   session.hibernatedWakeTarget = null
   session.wakeHibernatedAgentPane = null
   // Latch mobile wakes between record write and kill-exit arming; mobile never reveals the desktop to retry the lost edge.
@@ -154,7 +154,7 @@ export function installPtyExitHibernate(session: ConnectPanePtySession): void {
   session.onExit = (
     ptyId: string,
     exitCode = 0,
-    opts: { preserveRendererBinding?: boolean } = {}
+    opts: { preserveRendererBinding?: boolean | 'closing' } = {}
   ): void => {
     if (session.handledExitPtyId === ptyId) {
       return
@@ -172,9 +172,10 @@ export function installPtyExitHibernate(session: ConnectPanePtySession): void {
       return
     }
     const isUnverifiedExit = !isProvenProcessExit(exitCode)
+    const committedExit = consumeCommittedPtyShutdownExit(ptyId, session.runtimeEnvironmentId)
+    const reversibleExit = opts.preserveRendererBinding === true || committedExit === true
     const preserveRendererBinding =
-      opts.preserveRendererBinding === true ||
-      consumeCommittedPtyShutdownExit(ptyId, session.runtimeEnvironmentId)
+      reversibleExit || opts.preserveRendererBinding === 'closing' || committedExit === 'closing'
     session.resetRendererOrderedSeqForPtyExit(ptyId)
     const currentPaneTransport = session.deps.paneTransportsRef.current.get(session.pane.id)
     if (currentPaneTransport && currentPaneTransport !== session.transport) {
@@ -225,8 +226,7 @@ export function installPtyExitHibernate(session: ConnectPanePtySession): void {
     }
     // Consume intentional-exit suppression before split close logic so in-place restart keeps its pane.
     if (isSuppressedExit) {
-      // Why: the action that suppressed the exit owns whether the leaf binding
-      // is a wake hint or should be discarded; runtime cleanup above is enough.
+      // Why: retention alone grants no wake; only the committed reversible owner supplies that authority.
       session.manager.setPaneGpuRendering(session.pane.id, true)
       if (replacedByRestart) {
         // Nothing else will replace this process; the pane takes it back when shown.
@@ -234,7 +234,11 @@ export function installPtyExitHibernate(session: ConnectPanePtySession): void {
         return
       }
       const sleepingRecordEntry = session.getSleepingRecordForPane(useAppStore.getState())
-      if (sleepingRecordEntry && noteArmsHibernatedPaneWake(sleepingRecordEntry.record)) {
+      if (
+        reversibleExit &&
+        sleepingRecordEntry &&
+        noteArmsHibernatedPaneWake(sleepingRecordEntry.record)
+      ) {
         // Disarm input-eating modes on the dead frozen TUI, then arm its reveal wake.
         session.writeInputModeGround(POST_REPLAY_MODE_RESET)
         session.hibernatedWakeTarget = { ptyId, record: sleepingRecordEntry.record }
diff --git a/src/renderer/src/components/terminal-pane/pty-data-delivery.ts b/src/renderer/src/components/terminal-pane/pty-data-delivery.ts
new file mode 100644
index 000000000000..252f70add826
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/pty-data-delivery.ts
@@ -0,0 +1,72 @@
+import type { PtyDataMeta } from './pty-dispatcher'
+import { deliverPtyDataWithDeferredAck } from './terminal-pty-ack-gate'
+import { bufferPreHandlerPtyData } from './pty-pre-handler-buffer'
+import { recordPtyDataReceived } from './terminal-delivery-watchdog'
+import {
+  bufferPtyShutdownData,
+  isPtyDataHandlerShutdownPending,
+  ptyDataHandlers,
+  ptyDataSidecars
+} from './pty-shutdown-data-suspension'
+
+export function handleDispatchedPtyData(payload: {
+  id: string
+  data: string
+  seq?: number
+  rawLength?: number
+  transformed?: boolean
+  background?: boolean
+  droppedOutput?: boolean
+  gapEscapeState?: string
+}): void {
+  let meta: PtyDataMeta | undefined
+  if (typeof payload.seq === 'number') {
+    meta ??= {}
+    meta.seq = payload.seq
+  }
+  if (typeof payload.rawLength === 'number') {
+    meta ??= {}
+    meta.rawLength = payload.rawLength
+  }
+  if (payload.transformed === true) {
+    meta ??= {}
+    meta.transformed = true
+  }
+  if (payload.background === true) {
+    meta ??= {}
+    meta.background = true
+  }
+  if (payload.droppedOutput === true) {
+    meta ??= {}
+    meta.droppedOutput = true
+  }
+  if (typeof payload.gapEscapeState === 'string' && payload.gapEscapeState.length > 0) {
+    meta ??= {}
+    meta.gapEscapeState = payload.gapEscapeState
+  }
+  const chars = payload.rawLength ?? payload.data.length
+  const dispatch = (): void => {
+    if (isPtyDataHandlerShutdownPending(payload.id)) {
+      // Why: teardown output is speculative until the owner verifies sleep; retain it so a failed attempt resumes without losing terminal data.
+      bufferPtyShutdownData(payload.id, payload.data, meta)
+      return
+    }
+    const handler = ptyDataHandlers.get(payload.id)
+    if (handler) {
+      handler(payload.data, meta)
+    } else {
+      bufferPreHandlerPtyData(payload.id, payload.data, meta)
+    }
+    const sidecars = ptyDataSidecars.get(payload.id)
+    if (sidecars && sidecars.size > 0) {
+      // Why: snapshot before iterating — watchers often unsubscribe (or subscribe siblings) mid-iteration, and mutating the live Set would skip or double-fire.
+      const snapshot = Array.from(sidecars)
+      for (const watcher of snapshot) {
+        watcher(payload.data)
+      }
+    }
+  }
+  recordPtyDataReceived(payload.id, chars)
+  // Why deferred: main budgets by bytes PARSED not received; ACK fires when xterm consumes, and undelivered chunks settle at return so no PTY stays backpressured.
+  deliverPtyDataWithDeferredAck(payload.id, chars, dispatch)
+}
diff --git a/src/renderer/src/components/terminal-pane/pty-dispatcher.ts b/src/renderer/src/components/terminal-pane/pty-dispatcher.ts
index ee7e8c6a8e90..ecde45fbd8ed 100644
--- a/src/renderer/src/components/terminal-pane/pty-dispatcher.ts
+++ b/src/renderer/src/components/terminal-pane/pty-dispatcher.ts
@@ -1,36 +1,34 @@
+import { handleDispatchedPtyData } from './pty-data-delivery'
 import { TERMINAL_SCROLLBACK_SESSION_BUFFER_BYTE_LIMIT } from '../../../../shared/terminal-scrollback-limits'
 import {
   clearProcessedPtyCharTotal,
-  deliverPtyDataWithDeferredAck,
   exposeE2eTerminalPtyAckGate,
   getProcessedPtyCharTotals
 } from './terminal-pty-ack-gate'
 import { clampUtf8Tail, type EagerBufferChunk } from './pty-eager-buffer-clamp'
 import {
-  bufferPreHandlerPtyData,
   clearPreHandlerPtyState,
   drainPreHandlerPtyData,
   drainPreHandlerPtyExit
 } from './pty-pre-handler-buffer'
-import { deliverPtyExitToHandlers } from './pty-exit-delivery'
+import {
+  deliverPtyExitToHandlers,
+  type PtyExitDeliveryContext,
+  type PtyExitOptions
+} from './pty-exit-delivery'
 import {
   clearReceivedPtyCharTotal,
   isPtyPushDeliveryBlackholed,
-  recordPtyDataReceived,
   startTerminalDeliveryWatchdog
 } from './terminal-delivery-watchdog'
 import { recordTerminalFreezeBreadcrumb } from './terminal-freeze-breadcrumbs'
 import { installTerminalFreezeReport } from './terminal-freeze-report'
 import {
-  bufferPtyShutdownData,
   bufferPtyShutdownReplayData,
-  isPtyDataHandlerShutdownPending,
   ptyDataHandlers,
-  ptyDataSidecars,
   ptyExitHandlers,
   ptyReplayHandlers
 } from './pty-shutdown-data-suspension'
-import { markCommittedPtyShutdowns } from './pty-shutdown-exit-deferral'
 
 export {
   ptyDataHandlers,
@@ -62,7 +60,7 @@ export type PtyDataMeta = {
 /** Per-PTY replay handlers on a dedicated pty:replay channel so the renderer can engage the replay guard and suppress xterm auto-replies. */
 const ptyExitSidecars = new Map<
   string,
-  Set<(code: number, context: { hadPrimary: boolean }) => void>
+  Set<(code: number, context: PtyExitDeliveryContext) => void>
 >()
 export const ptyWriteUnavailableHandlers = new Map<string, () => void>()
 let ptyDispatcherAttached = false
@@ -110,68 +108,6 @@ function attachPtyPushListeners(): void {
   attachPtySecondaryPushListeners(unsubscribes)
 }
 
-function handleDispatchedPtyData(payload: {
-  id: string
-  data: string
-  seq?: number
-  rawLength?: number
-  transformed?: boolean
-  background?: boolean
-  droppedOutput?: boolean
-  gapEscapeState?: string
-}): void {
-  let meta: PtyDataMeta | undefined
-  if (typeof payload.seq === 'number') {
-    meta ??= {}
-    meta.seq = payload.seq
-  }
-  if (typeof payload.rawLength === 'number') {
-    meta ??= {}
-    meta.rawLength = payload.rawLength
-  }
-  if (payload.transformed === true) {
-    meta ??= {}
-    meta.transformed = true
-  }
-  if (payload.background === true) {
-    meta ??= {}
-    meta.background = true
-  }
-  if (payload.droppedOutput === true) {
-    meta ??= {}
-    meta.droppedOutput = true
-  }
-  if (typeof payload.gapEscapeState === 'string' && payload.gapEscapeState.length > 0) {
-    meta ??= {}
-    meta.gapEscapeState = payload.gapEscapeState
-  }
-  const chars = payload.rawLength ?? payload.data.length
-  const dispatch = (): void => {
-    if (isPtyDataHandlerShutdownPending(payload.id)) {
-      // Why: teardown output is speculative until the owner verifies sleep; retain it so a failed attempt resumes without losing terminal data.
-      bufferPtyShutdownData(payload.id, payload.data, meta)
-      return
-    }
-    const handler = ptyDataHandlers.get(payload.id)
-    if (handler) {
-      handler(payload.data, meta)
-    } else {
-      bufferPreHandlerPtyData(payload.id, payload.data, meta)
-    }
-    const sidecars = ptyDataSidecars.get(payload.id)
-    if (sidecars && sidecars.size > 0) {
-      // Why: snapshot before iterating — watchers often unsubscribe (or subscribe siblings) mid-iteration, and mutating the live Set would skip or double-fire.
-      const snapshot = Array.from(sidecars)
-      for (const watcher of snapshot) {
-        watcher(payload.data)
-      }
-    }
-  }
-  recordPtyDataReceived(payload.id, chars)
-  // Why deferred: main budgets by bytes PARSED not received; ACK fires when xterm consumes, and undelivered chunks settle at return so no PTY stays backpressured.
-  deliverPtyDataWithDeferredAck(payload.id, chars, dispatch)
-}
-
 function attachPtySecondaryPushListeners(unsubscribes: (() => void)[]): void {
   const unsubscribeWriteUnavailable = window.api.pty.onWriteUnavailable?.((payload) => {
     ptyWriteUnavailableHandlers.get(payload.id)?.()
@@ -189,10 +125,6 @@ function attachPtySecondaryPushListeners(unsubscribes: (() => void)[]): void {
   )
   unsubscribes.push(
     window.api.pty.onExit((payload) => {
-      if (payload.preserveRendererBinding === true) {
-        // Why: host-initiated remote sleep has no requester transaction in this renderer; classify its ordered exit before pane cleanup runs.
-        markCommittedPtyShutdowns([payload.id])
-      }
       // Why: main drops its accounting on exit; drop totals too so a reused id restarts at zero on both sides.
       clearProcessedPtyCharTotal(payload.id)
       clearReceivedPtyCharTotal(payload.id)
@@ -208,6 +140,10 @@ function attachPtySecondaryPushListeners(unsubscribes: (() => void)[]): void {
       deliverPtyExitToHandlers({
         ptyId: payload.id,
         code: payload.code,
+        ...(payload.preserveRendererBinding === true ||
+        payload.preserveRendererBinding === 'closing'
+          ? { preserveRendererBinding: payload.preserveRendererBinding }
+          : {}),
         // Buffered exits carry their PTY lifetime because reused IDs can name a new shell (#16970).
         ...(payload.incarnationId ? { incarnationId: payload.incarnationId } : {}),
         ...(payload.replacedByRestart === true ? { replacedByRestart: true } : {}),
@@ -232,7 +168,7 @@ function attachPtySecondaryPushListeners(unsubscribes: (() => void)[]): void {
 
 export function subscribeToPtyExit(
   ptyId: string,
-  watcher: (code: number, context: { hadPrimary: boolean }) => void
+  watcher: (code: number, context: PtyExitDeliveryContext) => void
 ): () => void {
   ensurePtyDispatcher()
   let set = ptyExitSidecars.get(ptyId)
@@ -268,7 +204,7 @@ const EAGER_BUFFER_MAX_BYTES = TERMINAL_SCROLLBACK_SESSION_BUFFER_BYTE_LIMIT
 /** Fence the spawned incarnation so recycled relay IDs cannot deliver the prior owner’s exit to a fresh background agent. */
 export function registerEagerPtyBuffer(
   ptyId: string,
-  onExit: (ptyId: string, code: number) => void,
+  onExit: (ptyId: string, code: number, options?: PtyExitOptions) => void,
   incarnationId?: string
 ): EagerPtyHandle {
   ensurePtyDispatcher()
@@ -294,7 +230,7 @@ export function registerEagerPtyBuffer(
       head = 0
     }
   }
-  const exitHandler = (code: number): void => {
+  const exitHandler = (code: number, options?: PtyExitOptions): void => {
     // Shell died before attach; identity-guard so we never evict a handler a transport re-registered for this id (#7894 detach/attach race).
     if (ptyDataHandlers.get(ptyId) === dataHandler) {
       ptyDataHandlers.delete(ptyId)
@@ -302,7 +238,11 @@ export function registerEagerPtyBuffer(
     }
     ptyExitHandlers.delete(ptyId)
     eagerPtyHandles.delete(ptyId)
-    onExit(ptyId, code)
+    if (options) {
+      onExit(ptyId, code, options)
+    } else {
+      onExit(ptyId, code)
+    }
   }
 
   ptyDataHandlers.set(ptyId, dataHandler)
diff --git a/src/renderer/src/components/terminal-pane/pty-exit-delivery.ts b/src/renderer/src/components/terminal-pane/pty-exit-delivery.ts
index ae74d4e0223f..c82ba01954e3 100644
--- a/src/renderer/src/components/terminal-pane/pty-exit-delivery.ts
+++ b/src/renderer/src/components/terminal-pane/pty-exit-delivery.ts
@@ -5,6 +5,9 @@ import {
   discardPreHandlerPtyState
 } from './pty-pre-handler-buffer'
 
+export type PtyExitOptions = { preserveRendererBinding?: boolean | 'closing' }
+export type PtyExitDeliveryContext = { hadPrimary: boolean; exitOptions?: PtyExitOptions }
+
 type PtyExitDelivery = {
   ptyId: string
   code: number
@@ -12,8 +15,9 @@ type PtyExitDelivery = {
   incarnationId?: string
   /** Main stopped this PTY so a new process could take its pane. */
   replacedByRestart?: boolean
-  primary?: (code: number) => void
-  sidecars: readonly ((code: number, context: { hadPrimary: boolean }) => void)[]
+  preserveRendererBinding?: PtyExitOptions['preserveRendererBinding']
+  primary?: (code: number, options?: PtyExitOptions) => void
+  sidecars: readonly ((code: number, context: PtyExitDeliveryContext) => void)[]
 }
 
 // Scope labels to synchronous delivery so no stale record can misclassify a later same-ID exit.
@@ -39,13 +43,21 @@ export function deliverPtyExitToHandlers(delivery: PtyExitDelivery): void {
 }
 
 function deliverClassifiedPtyExit(delivery: PtyExitDelivery): void {
+  // The parked observer resolves genuine authority onto the same buffered event before handoff.
+  const exitOptions: PtyExitOptions = delivery.preserveRendererBinding
+    ? { preserveRendererBinding: delivery.preserveRendererBinding }
+    : {}
   let firstError: unknown
   let hasError = false
   try {
     if (delivery.primary) {
       clearPreHandlerPtyState(delivery.ptyId)
       try {
-        delivery.primary(delivery.code)
+        if (exitOptions.preserveRendererBinding) {
+          delivery.primary(delivery.code, exitOptions)
+        } else {
+          delivery.primary(delivery.code)
+        }
       } finally {
         // Exit ownership is final despite cleanup throws; duplicates cannot become pre-handler state for a later mount.
         consumePreHandlerPtyState(delivery.ptyId)
@@ -54,7 +66,7 @@ function deliverClassifiedPtyExit(delivery: PtyExitDelivery): void {
       // Discard restart exits and old bindings so mid-restart mounts attach by pane to the replacement, not the dead PTY.
       discardPreHandlerPtyState(delivery.ptyId)
     } else {
-      bufferPreHandlerPtyExit(delivery.ptyId, delivery.code, delivery.incarnationId)
+      bufferPreHandlerPtyExit(delivery.ptyId, delivery.code, delivery.incarnationId, exitOptions)
     }
   } catch (error) {
     firstError = error
@@ -63,7 +75,7 @@ function deliverClassifiedPtyExit(delivery: PtyExitDelivery): void {
 
   for (const sidecar of delivery.sidecars) {
     try {
-      sidecar(delivery.code, { hadPrimary: delivery.primary !== undefined })
+      sidecar(delivery.code, { hadPrimary: delivery.primary !== undefined, exitOptions })
     } catch (error) {
       if (!hasError) {
         firstError = error
diff --git a/src/renderer/src/components/terminal-pane/pty-pre-handler-buffer.test.ts b/src/renderer/src/components/terminal-pane/pty-pre-handler-buffer.test.ts
index 9f1f628ec48c..9aa9a2c8d68c 100644
--- a/src/renderer/src/components/terminal-pane/pty-pre-handler-buffer.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-pre-handler-buffer.test.ts
@@ -1,4 +1,9 @@
 import { afterEach, describe, expect, it, vi } from 'vitest'
+import { deliverPtyExitToHandlers } from './pty-exit-delivery'
+import {
+  markCommittedPtyShutdowns,
+  consumeCommittedPtyShutdownExit
+} from './pty-shutdown-exit-deferral'
 import {
   bufferPreHandlerPtyData,
   bufferPreHandlerPtyExit,
@@ -298,15 +303,33 @@ describe('pre-handler PTY buffer', () => {
   })
 
   it('replaces a duplicate exit for the same lifetime instead of crowding out another lifetime', () => {
-    bufferPreHandlerPtyExit(RECYCLED_PTY_ID, 1, FRESH_INCARNATION_ID)
+    markCommittedPtyShutdowns([RECYCLED_PTY_ID])
+    deliverPtyExitToHandlers({
+      ptyId: RECYCLED_PTY_ID,
+      code: 1,
+      incarnationId: FRESH_INCARNATION_ID,
+      preserveRendererBinding: 'closing',
+      sidecars: [
+        (_code, context) => {
+          const disposition = consumeCommittedPtyShutdownExit(RECYCLED_PTY_ID)
+          expect(context.hadPrimary).toBe(false)
+          if (disposition && context.exitOptions) {
+            context.exitOptions.preserveRendererBinding = disposition
+          }
+        }
+      ]
+    })
+    expect(consumeCommittedPtyShutdownExit(RECYCLED_PTY_ID)).toBe(false)
     bufferPreHandlerPtyExit(RECYCLED_PTY_ID, 9, FRESH_INCARNATION_ID)
-    bufferPreHandlerPtyExit(RECYCLED_PTY_ID, 0, PRIOR_INCARNATION_ID)
+    bufferPreHandlerPtyExit(RECYCLED_PTY_ID, 0, PRIOR_INCARNATION_ID, {
+      preserveRendererBinding: 'closing'
+    })
 
     discardPreHandlerPtyExitFromForeignIncarnation(RECYCLED_PTY_ID, FRESH_INCARNATION_ID)
 
     const exit = vi.fn()
     drainPreHandlerPtyExit(RECYCLED_PTY_ID, exit)
-    expect(exit).toHaveBeenCalledWith(9)
+    expect(exit).toHaveBeenCalledWith(9, { preserveRendererBinding: true })
   })
 
   // Reads enforce lifetime filtering even for eager background launches that never invoke explicit discard.
diff --git a/src/renderer/src/components/terminal-pane/pty-pre-handler-buffer.ts b/src/renderer/src/components/terminal-pane/pty-pre-handler-buffer.ts
index ac4b7b3123a1..3c2d6f118b8a 100644
--- a/src/renderer/src/components/terminal-pane/pty-pre-handler-buffer.ts
+++ b/src/renderer/src/components/terminal-pane/pty-pre-handler-buffer.ts
@@ -1,6 +1,7 @@
 import { isPtyIncarnationId } from '../../../../shared/pty-incarnation'
 import { clampUtf8Tail } from './pty-eager-buffer-clamp'
 import type { PtyDataMeta } from './pty-dispatcher'
+import type { PtyExitOptions } from './pty-exit-delivery'
 
 type BufferedPreHandlerPtyData = {
   data: string
@@ -17,6 +18,7 @@ type BufferedPreHandlerPtyState = {
 }
 
 type BufferedPreHandlerPtyExit = {
+  options?: PtyExitOptions
   code: number
   sequence: number
   /** Which lifetime of `ptyId` died. Absent when the emitting host predates the field. */
@@ -181,13 +183,15 @@ export function replayPreHandlerPtyData(ptyId: string, observer: (data: string)
 export function bufferPreHandlerPtyExit(
   ptyId: string,
   code: number,
-  incarnationId?: unknown
+  incarnationId?: unknown,
+  options?: PtyExitOptions
 ): void {
   if (consumedPreHandlerPtyExits.has(ptyId) || discardedPreHandlerPtyStates.has(ptyId)) {
     return
   }
   evictOldestPtyIfAtCap(preHandlerPtyExit, ptyId, PRE_HANDLER_PTY_EXIT_MAX_PTYS)
   const exit: BufferedPreHandlerPtyExit = {
+    ...(options ? { options } : {}),
     code,
     sequence: nextPreHandlerPtySequence(),
     // Record only a well-formed incarnation; a malformed one must not become evidence.
@@ -201,6 +205,13 @@ export function bufferPreHandlerPtyExit(
   // Replace duplicates within their lifetime; unnamed exits keep the single legacy slot.
   const sameLifetime = exits.findIndex((entry) => entry.incarnationId === exit.incarnationId)
   if (sameLifetime !== -1) {
+    const previous = exits[sameLifetime].options?.preserveRendererBinding
+    if (previous) {
+      exit.options ??= {}
+      if (previous === true || !exit.options.preserveRendererBinding) {
+        exit.options.preserveRendererBinding = previous
+      }
+    }
     exits[sameLifetime] = exit
     return
   }
@@ -286,7 +297,7 @@ export function hasPreHandlerPtyExit(ptyId: string, incarnationId?: unknown): bo
 
 export function drainPreHandlerPtyExit(
   ptyId: string,
-  handler: (code: number) => void,
+  handler: (code: number, options?: PtyExitOptions) => void,
   incarnationId?: unknown
 ): void {
   // Select the newest admissible lifetime record to preserve last-write-wins behavior.
@@ -301,7 +312,11 @@ export function drainPreHandlerPtyExit(
   }
   preHandlerPtyExit.delete(ptyId)
   try {
-    handler(exit.code)
+    if (exit.options?.preserveRendererBinding) {
+      handler(exit.code, exit.options)
+    } else {
+      handler(exit.code)
+    }
   } finally {
     // Draining transfers exit ownership despite handler throws; duplicates cannot become new pre-handler events.
     consumePreHandlerPtyState(ptyId)
diff --git a/src/renderer/src/components/terminal-pane/pty-shutdown-data-suspension.ts b/src/renderer/src/components/terminal-pane/pty-shutdown-data-suspension.ts
index 508ea88b2bec..f0e0b571a907 100644
--- a/src/renderer/src/components/terminal-pane/pty-shutdown-data-suspension.ts
+++ b/src/renderer/src/components/terminal-pane/pty-shutdown-data-suspension.ts
@@ -1,3 +1,4 @@
+import type { PtyExitOptions } from './pty-exit-delivery'
 import { clearPreHandlerPtyState, drainPreHandlerPtyData } from './pty-pre-handler-buffer'
 import type { PtyDataMeta } from './pty-dispatcher'
 import { PtyShutdownOutputQueue, type PtyShutdownOutputEvent } from './pty-shutdown-output-queue'
@@ -5,7 +6,7 @@ import { PtyShutdownOutputQueue, type PtyShutdownOutputEvent } from './pty-shutd
 export const ptyDataHandlers = new Map<string, (data: string, meta?: PtyDataMeta) => void>()
 export const ptyDataSidecars = new Map<string, Set<(data: string) => void>>()
 export const ptyReplayHandlers = new Map<string, (data: string) => void>()
-export const ptyExitHandlers = new Map<string, (code: number) => void>()
+export const ptyExitHandlers = new Map<string, (code: number, options?: PtyExitOptions) => void>()
 export const ptyTeardownHandlers = new Map<string, () => void>()
 export const ptyShutdownLifecycleHandlers = new Map<
   string,
diff --git a/src/renderer/src/components/terminal-pane/pty-shutdown-exit-deferral.test.ts b/src/renderer/src/components/terminal-pane/pty-shutdown-exit-deferral.test.ts
index 6672a5e1ce88..15d5989c6a5f 100644
--- a/src/renderer/src/components/terminal-pane/pty-shutdown-exit-deferral.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-shutdown-exit-deferral.test.ts
@@ -38,6 +38,44 @@ it('consumes a committed late-exit guard only once', () => {
 
   expect(consumeCommittedPtyShutdownExit('pty-late-commit')).toBe(true)
   expect(consumeCommittedPtyShutdownExit('pty-late-commit')).toBe(false)
+
+  markCommittedPtyShutdowns(['pty-closing'], 'closing')
+  expect(consumeCommittedPtyShutdownExit('pty-closing')).toBe('closing')
+  expect(consumeCommittedPtyShutdownExit('pty-closing')).toBe(false)
+
+  markCommittedPtyShutdowns(['pty-overlap'])
+  markCommittedPtyShutdowns(['pty-overlap'], 'closing')
+  expect(consumeCommittedPtyShutdownExit('pty-overlap')).toBe(true)
+  expect(consumeCommittedPtyShutdownExit('pty-overlap')).toBe(false)
+
+  markCommittedPtyShutdowns(['pty-overlap'], 'closing')
+  markCommittedPtyShutdowns(['pty-overlap'])
+  expect(consumeCommittedPtyShutdownExit('pty-overlap')).toBe(true)
+  expect(consumeCommittedPtyShutdownExit('pty-overlap')).toBe(false)
+})
+
+it('bounds closing markers by the same count and expiry without reviving old wake authority', () => {
+  vi.useFakeTimers()
+  try {
+    vi.setSystemTime(new Date('2026-07-21T00:00:00Z'))
+    const ptyIds = Array.from({ length: 513 }, (_, index) => `pty-closing-bounded-${index}`)
+    markCommittedPtyShutdowns(ptyIds, 'closing')
+    expect(consumeCommittedPtyShutdownExit('pty-closing-bounded-0')).toBe(false)
+    for (const ptyId of ptyIds.slice(1)) {
+      expect(consumeCommittedPtyShutdownExit(ptyId)).toBe('closing')
+      expect(consumeCommittedPtyShutdownExit(ptyId)).toBe(false)
+    }
+
+    markCommittedPtyShutdowns(['pty-expired-reversible'])
+    markCommittedPtyShutdowns(['pty-expired-closing'], 'closing')
+    vi.advanceTimersByTime(30_001)
+    expect(consumeCommittedPtyShutdownExit('pty-expired-closing')).toBe(false)
+    markCommittedPtyShutdowns(['pty-expired-reversible'], 'closing')
+    expect(consumeCommittedPtyShutdownExit('pty-expired-reversible')).toBe('closing')
+    expect(consumeCommittedPtyShutdownExit('pty-expired-reversible')).toBe(false)
+  } finally {
+    vi.useRealTimers()
+  }
 })
 
 it('clears a committed guard when its deferred exit is replayed', () => {
@@ -69,7 +107,9 @@ it('preserves another client binding through host sleep until the host reports w
 
   applyHostWorktreeTerminalSleepState('env-a', { ...started, phase: 'committed' })
   expect(callback).toHaveBeenCalledWith('committed')
+  markCommittedPtyShutdowns([remotePtyId], 'closing')
   expect(consumeCommittedPtyShutdownExit(remotePtyId, 'env-a')).toBe(true)
+  expect(consumeCommittedPtyShutdownExit(remotePtyId, 'env-a')).toBe(false)
   expect(consumeCommittedPtyShutdownExit(remotePtyId, 'env-b')).toBe(false)
 
   applyHostWorktreeTerminalSleepState('env-a', { ...started, phase: 'woken' })
diff --git a/src/renderer/src/components/terminal-pane/pty-shutdown-exit-deferral.ts b/src/renderer/src/components/terminal-pane/pty-shutdown-exit-deferral.ts
index 707d3f89cb78..0ae70371487f 100644
--- a/src/renderer/src/components/terminal-pane/pty-shutdown-exit-deferral.ts
+++ b/src/renderer/src/components/terminal-pane/pty-shutdown-exit-deferral.ts
@@ -12,7 +12,11 @@ const deferredExitCallbacksByPtyId = new Map<
   string,
   Set<(settlement: PtyShutdownSettlement) => void>
 >()
-const committedExitExpiresAtByPtyId = new Map<string, number>()
+type PtyShutdownExitDisposition = true | 'closing'
+const committedExitByPtyId = new Map<
+  string,
+  { expiresAt: number; disposition: PtyShutdownExitDisposition }
+>()
 const committedPendingSettlements = new Set<string>()
 const hostSleepDispositionByPtyId = new Map<
   string,
@@ -31,17 +35,17 @@ const COMMITTED_EXIT_MAX = 512
 const HOST_SLEEP_DISPOSITION_GRACE_MS = 30_000
 
 function pruneCommittedExitGuards(now = Date.now()): void {
-  for (const [ptyId, expiresAt] of committedExitExpiresAtByPtyId) {
+  for (const [ptyId, { expiresAt }] of committedExitByPtyId) {
     if (expiresAt <= now) {
-      committedExitExpiresAtByPtyId.delete(ptyId)
+      committedExitByPtyId.delete(ptyId)
     }
   }
-  while (committedExitExpiresAtByPtyId.size > COMMITTED_EXIT_MAX) {
-    const oldestPtyId = committedExitExpiresAtByPtyId.keys().next().value
+  while (committedExitByPtyId.size > COMMITTED_EXIT_MAX) {
+    const oldestPtyId = committedExitByPtyId.keys().next().value
     if (typeof oldestPtyId !== 'string') {
       break
     }
-    committedExitExpiresAtByPtyId.delete(oldestPtyId)
+    committedExitByPtyId.delete(oldestPtyId)
   }
 }
 
@@ -53,6 +57,17 @@ function pruneHostSleepDispositions(now = Date.now()): void {
   }
 }
 
+function currentHostSleepDisposition(
+  key: string
+): NonNullable<ReturnType<typeof hostSleepDispositionByPtyId.get>> | undefined {
+  const disposition = hostSleepDispositionByPtyId.get(key)
+  if (disposition && disposition.expiresAt <= Date.now()) {
+    expireHostSleepDisposition(key, disposition)
+    return undefined
+  }
+  return disposition
+}
+
 function installHostSleepDisposition(
   key: string,
   disposition: Omit<NonNullable<ReturnType<typeof hostSleepDispositionByPtyId.get>>, 'expiryTimer'>
@@ -96,11 +111,19 @@ function expireHostSleepDisposition(
   }
 }
 
-export function markCommittedPtyShutdowns(ptyIds: readonly string[]): void {
+export function markCommittedPtyShutdowns(
+  ptyIds: readonly string[],
+  disposition: PtyShutdownExitDisposition = true
+): void {
+  pruneCommittedExitGuards()
   const expiresAt = Date.now() + COMMITTED_EXIT_GRACE_MS
   for (const ptyId of ptyIds) {
-    committedExitExpiresAtByPtyId.delete(ptyId)
-    committedExitExpiresAtByPtyId.set(ptyId, expiresAt)
+    const existing = committedExitByPtyId.get(ptyId)
+    committedExitByPtyId.delete(ptyId)
+    committedExitByPtyId.set(ptyId, {
+      expiresAt,
+      disposition: existing?.disposition === true ? true : disposition
+    })
   }
   pruneCommittedExitGuards()
 }
@@ -124,13 +147,14 @@ export function clearCommittedPtyShutdownSettlements(ptyIds: readonly string[]):
 export function consumeCommittedPtyShutdownExit(
   ptyId: string,
   runtimeEnvironmentId?: string | null
-): boolean {
+): false | PtyShutdownExitDisposition {
   pruneCommittedExitGuards()
-  pruneHostSleepDispositions()
+  const committedExit = committedExitByPtyId.get(ptyId)
+  committedExitByPtyId.delete(ptyId)
   if (runtimeEnvironmentId) {
     const hostKey = hostSleepPtyKey(runtimeEnvironmentId, ptyId)
-    if (hostSleepDispositionByPtyId.get(hostKey)?.phase === 'committed') {
-      const disposition = hostSleepDispositionByPtyId.get(hostKey)
+    const disposition = currentHostSleepDisposition(hostKey)
+    if (disposition?.phase === 'committed') {
       if (disposition?.expiryTimer !== undefined) {
         clearTimeout(disposition.expiryTimer)
       }
@@ -138,22 +162,16 @@ export function consumeCommittedPtyShutdownExit(
       return true
     }
   }
-  if (!committedExitExpiresAtByPtyId.has(ptyId)) {
-    return false
-  }
-  committedExitExpiresAtByPtyId.delete(ptyId)
-  return true
+  return committedExit?.disposition ?? false
 }
 
 export function isHostPtySleepPending(
   ptyId: string,
   runtimeEnvironmentId?: string | null
 ): boolean {
-  pruneHostSleepDispositions()
   return Boolean(
     runtimeEnvironmentId &&
-    hostSleepDispositionByPtyId.get(hostSleepPtyKey(runtimeEnvironmentId, ptyId))?.phase ===
-      'pending'
+    currentHostSleepDisposition(hostSleepPtyKey(runtimeEnvironmentId, ptyId))?.phase === 'pending'
   )
 }
 
@@ -280,7 +298,7 @@ export function settleDeferredPtyShutdownExits(
     deferredExitCallbacksByPtyId.delete(ptyId)
     if (settlement === 'committed') {
       // Why: replay classifies the old exit; retaining its guard could misclassify a same-ID session woken immediately afterward.
-      committedExitExpiresAtByPtyId.delete(ptyId)
+      committedExitByPtyId.delete(ptyId)
     }
     for (const callback of callbacks) {
       try {
diff --git a/src/renderer/src/components/terminal-pane/pty-transport-types.ts b/src/renderer/src/components/terminal-pane/pty-transport-types.ts
index d55df72e6101..44a46c54c9e7 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport-types.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport-types.ts
@@ -1,3 +1,4 @@
+import type { PtyExitOptions } from './pty-exit-delivery'
 import type { TerminalAttachmentLaunchResult } from '../../../../shared/terminal-attachment-launch-result'
 import type { AgentIdleEdgeMeta } from '../../../../shared/terminal-output-side-effects'
 import type {
@@ -138,7 +139,7 @@ type PtyCallbacks = {
   onStatus?: (shell: string) => void
   onError?: (message: string, errors?: string[]) => void
   onErrorCleared?: (message: string) => void
-  onExit?: (code: number) => void
+  onExit?: (code: number, options?: PtyExitOptions) => void
   onWriteUnavailable?: () => void
   onRecoveryStateChange?: (state: PtyTransportRecoveryState) => void
   /** `dropsReported`: the host sends onPausedOutputDropped, so a pause without one lost nothing. */
@@ -314,7 +315,7 @@ export type IpcPtyTransportOptions = {
   terminalKittyKeyboardProtocol?: boolean
   terminalColorQueryReplies?: TerminalOscColorQueryReplyColors
   telemetry?: EventProps<'agent_started'>
-  onPtyExit?: (ptyId: string, exitCode?: number) => void
+  onPtyExit?: (ptyId: string, exitCode?: number, options?: PtyExitOptions) => void
   onTitleChange?: (title: string, rawTitle: string) => void
   onPtySpawn?: (ptyId: string) => void
   /** Current surface may retain a late disposed spawn for its successor; absent/false authorizes kill (disposed-spawn-retention.ts). */
diff --git a/src/renderer/src/components/terminal-pane/terminal-parked-pty-watcher.ts b/src/renderer/src/components/terminal-pane/terminal-parked-pty-watcher.ts
index 7401bdef3eca..9dc631d793a8 100644
--- a/src/renderer/src/components/terminal-pane/terminal-parked-pty-watcher.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-parked-pty-watcher.ts
@@ -5,7 +5,7 @@ import { useAppStore } from '@/store'
 import { closeTerminalTab } from '../terminal/terminal-tab-actions'
 import { startParkedTerminalByteWatcher } from './parked-terminal-byte-watcher'
 import { subscribeToPtyExit } from './pty-dispatcher'
-import { isPtyExitReplacedByRestart } from './pty-exit-delivery'
+import { isPtyExitReplacedByRestart, type PtyExitDeliveryContext } from './pty-exit-delivery'
 import {
   consumePreHandlerPtyState,
   discardPreHandlerPtyState,
@@ -55,9 +55,11 @@ export function startParkedPtyWatcher(args: {
   ) {
     return
   }
-  const handlePtyExit = (code: number, { hadPrimary }: { hadPrimary: boolean }): void => {
+  const handlePtyExit = (code: number, context: PtyExitDeliveryContext): void => {
+    const { hadPrimary } = context
     // Replacement waits for a future connect, but the dead process’s working title must clear now.
     useAppStore.getState().clearRuntimePaneTitle(tab.id, pane.paneId)
+    const preserveRendererBinding = !hadPrimary && isSleepPreservedParkedPtyExit(ptyId, context)
     if (isPtyExitReplacedByRestart(ptyId)) {
       // Why: the pane lives on under its replacement PTY; only this watcher's subscription ends.
       entry.disposersByPtyId.get(ptyId)?.()
@@ -70,7 +72,7 @@ export function startParkedPtyWatcher(args: {
       useAppStore.getState().markUnverifiedPtyLoss(tab.id)
     }
     // Detach removed the primary observer; this sidecar must preserve sleep state/layout and keep the buffered-exit tombstone against stale watcher re-registration.
-    if (!hadPrimary && isSleepPreservedParkedPtyExit(ptyId)) {
+    if (preserveRendererBinding) {
       entry.disposersByPtyId.get(ptyId)?.()
       entry.disposersByPtyId.delete(ptyId)
       return
@@ -143,13 +145,21 @@ export function startParkedPtyWatcher(args: {
   })
 }
 
-// Shutdown, suppressed restart and committed sleep markers preserve state for wake/restart. Remote host-sleep dispositions never reach this sidecar, so no environment ID is needed.
-function isSleepPreservedParkedPtyExit(ptyId: string): boolean {
+// Retained exits preserve presentation only. Remote host-sleep dispositions never reach this sidecar, so no environment ID is needed.
+function isSleepPreservedParkedPtyExit(ptyId: string, context: PtyExitDeliveryContext): boolean {
   const state = useAppStore.getState()
-  if (state.isPtyShutdownPending(ptyId) || state.suppressedPtyExitIds[ptyId]) {
-    return true
+  const disposition = consumeCommittedPtyShutdownExit(ptyId, null)
+  if (disposition && context.exitOptions) {
+    if (disposition === true || context.exitOptions.preserveRendererBinding !== true) {
+      context.exitOptions.preserveRendererBinding = disposition
+    }
   }
-  return consumeCommittedPtyShutdownExit(ptyId, null)
+  return Boolean(
+    context.exitOptions?.preserveRendererBinding ||
+    disposition ||
+    state.isPtyShutdownPending(ptyId) ||
+    state.suppressedPtyExitIds[ptyId]
+  )
 }
 
 export function collapseParkedExitedLeaf(tabId: string, ptyId: string): void {
diff --git a/src/renderer/src/components/terminal-pane/terminal-parked-watcher-sleep-preserved-exit.test.ts b/src/renderer/src/components/terminal-pane/terminal-parked-watcher-sleep-preserved-exit.test.ts
index 2175177f7a62..23f565869ade 100644
--- a/src/renderer/src/components/terminal-pane/terminal-parked-watcher-sleep-preserved-exit.test.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-parked-watcher-sleep-preserved-exit.test.ts
@@ -18,7 +18,10 @@ vi.mock('./parked-terminal-byte-watcher', () => ({
   }
 }))
 
-type ExitCallback = (code: number, context: { hadPrimary: boolean }) => void
+type ExitCallback = (
+  code: number,
+  context: { hadPrimary: boolean; exitOptions?: PtyExitOptions }
+) => void
 const exitCallbacksByPtyId = new Map<string, ExitCallback>()
 vi.mock('./pty-dispatcher', () => ({
   subscribeToPtyExit: (ptyId: string, callback: ExitCallback) => {
@@ -61,6 +64,7 @@ import {
 } from './pty-shutdown-exit-deferral'
 import { startParkedPtyWatcher } from './terminal-parked-pty-watcher'
 import { deliverPtyExitToHandlers } from './pty-exit-delivery'
+import type { PtyExitOptions } from './pty-exit-delivery'
 import type { ParkedTabWatcherEntry } from './terminal-parked-watcher-registry'
 
 function startSplitWatchers(): ParkedTabWatcherEntry {
@@ -113,12 +117,24 @@ describe('sleep-preserved parked exits (sole-owner sidecar)', () => {
   it.each([
     ['pending renderer shutdown', () => mockStoreState.isPtyShutdownPending.mockReturnValue(true)],
     ['suppressed intentional restart', () => (mockStoreState.suppressedPtyExitIds[PTY_ID] = true)],
-    ['committed sleep marker', () => markCommittedPtyShutdowns([PTY_ID])]
+    ['committed sleep marker', () => markCommittedPtyShutdowns([PTY_ID])],
+    [
+      'closing marker with generic suppression',
+      () => {
+        markCommittedPtyShutdowns([PTY_ID], 'closing')
+        mockStoreState.suppressedPtyExitIds[PTY_ID] = true
+      }
+    ]
   ] as const)('keeps the tab and layout on a %s exit', (_marker, arm) => {
     const entry = startSplitWatchers()
     arm()
 
-    exitCallbacksByPtyId.get(PTY_ID)?.(0, { hadPrimary: false })
+    const exitOptions: PtyExitOptions =
+      _marker === 'committed sleep marker' ? { preserveRendererBinding: 'closing' } : {}
+    exitCallbacksByPtyId.get(PTY_ID)?.(0, { hadPrimary: false, exitOptions })
+    if (_marker === 'committed sleep marker') {
+      expect(exitOptions.preserveRendererBinding).toBe(true)
+    }
 
     expect(closeTerminalTab).not.toHaveBeenCalled()
     expect(mockStoreState.setTabLayout).not.toHaveBeenCalled()
@@ -151,16 +167,19 @@ describe('sleep-preserved parked exits (sole-owner sidecar)', () => {
     expect(entry.disposersByPtyId.size).toBe(0)
   })
 
-  it('leaves the committed marker to the primary when one handled the exit', () => {
-    startSplitWatchers()
-    markCommittedPtyShutdowns([PTY_ID])
+  it.each([true, 'closing'] as const)(
+    'leaves the committed marker %s to the primary when one handled the exit',
+    (disposition) => {
+      startSplitWatchers()
+      markCommittedPtyShutdowns([PTY_ID], disposition)
 
-    exitCallbacksByPtyId.get(PTY_ID)?.(0, { hadPrimary: true })
+      exitCallbacksByPtyId.get(PTY_ID)?.(0, { hadPrimary: true })
 
-    // hadPrimary skips the guard entirely: marker untouched, watcher disposed.
-    expect(consumeCommittedPtyShutdownExit(PTY_ID, null)).toBe(true)
-    expect(startedWatcherDisposers[0]).toHaveBeenCalled()
-  })
+      // hadPrimary skips the guard entirely: marker untouched, watcher disposed.
+      expect(consumeCommittedPtyShutdownExit(PTY_ID, null)).toBe(disposition)
+      expect(startedWatcherDisposers[0]).toHaveBeenCalled()
+    }
+  )
 
   it('still collapses the dead leaf on an ordinary parked split exit', () => {
     startSplitWatchers()
diff --git a/src/renderer/src/lib/agent-background-session-exit.ts b/src/renderer/src/lib/agent-background-session-exit.ts
index 2de7a407a5b0..8f59b50c6dbb 100644
--- a/src/renderer/src/lib/agent-background-session-exit.ts
+++ b/src/renderer/src/lib/agent-background-session-exit.ts
@@ -1,4 +1,5 @@
 import { useAppStore } from '@/store'
+import type { PtyExitOptions } from '@/components/terminal-pane/pty-exit-delivery'
 import {
   isProvenProcessExit,
   UNVERIFIED_PROCESS_EXIT_CODE
@@ -9,8 +10,16 @@ export function runtimeWaitExitCode(wait: { exitCode?: number | null }): number
   return wait.exitCode ?? UNVERIFIED_PROCESS_EXIT_CODE
 }
 
-/** Drop tab/PTY identity only on proven exit (as in pty-exit-hibernate); synthetic loss retires transport but preserves reconnect adoption and guards against orphan cleanup. */
-export function settleTabPtyBinding(tabId: string, ptyId: string, code: number): void {
+/** Retained exits settle execution without dropping presentation; ordinary synthetic loss preserves reconnect adoption. */
+export function settleTabPtyBinding(
+  tabId: string,
+  ptyId: string,
+  code: number,
+  options?: PtyExitOptions
+): void {
+  if (options?.preserveRendererBinding === true || options?.preserveRendererBinding === 'closing') {
+    return
+  }
   const state = useAppStore.getState()
   if (isProvenProcessExit(code)) {
     state.clearTabPtyId(tabId, ptyId)
diff --git a/src/renderer/src/lib/launch-agent-background-session.test.ts b/src/renderer/src/lib/launch-agent-background-session.test.ts
index 922464a82629..d18b4f8c6120 100644
--- a/src/renderer/src/lib/launch-agent-background-session.test.ts
+++ b/src/renderer/src/lib/launch-agent-background-session.test.ts
@@ -1,6 +1,12 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { BACKGROUND_MOUNT_TERMINAL_WORKTREE_EVENT } from '@/constants/terminal'
 import { toAppSshPtyId } from '../../../shared/ssh-pty-id'
+import type {
+  registerEagerPtyBuffer,
+  subscribeToPtyExit
+} from '@/components/terminal-pane/pty-dispatcher'
+import type { createTestStore } from '@/store/slices/store-test-helpers'
+import type { AppState } from '@/store/types'
 import {
   AGENT_BACKGROUND_SESSION_UUID_RE as UUID_RE,
   createAgentBackgroundSessionTestState,
@@ -21,9 +27,9 @@ const mockUpdateTabPtyId = vi.fn()
 const mockCloseTab = vi.fn()
 const mockSetTabLayout = vi.fn()
 const mockRegisterAgentLaunchConfig = vi.fn()
-const mockRegisterEagerPtyBuffer = vi.fn()
+const mockRegisterEagerPtyBuffer = vi.fn<typeof registerEagerPtyBuffer>()
 const mockSubscribeToPtyData = vi.fn()
-const mockSubscribeToPtyExit = vi.fn()
+const mockSubscribeToPtyExit = vi.fn<typeof subscribeToPtyExit>()
 const mockPasteDraftWhenAgentReady = vi.fn()
 const mockDispatchEvent = vi.fn()
 const mockGetAgentLaunchPlatformForRepo = vi.fn<() => NodeJS.Platform>()
@@ -37,11 +43,14 @@ const state = createAgentBackgroundSessionTestState({
   registerAgentLaunchConfig: mockRegisterAgentLaunchConfig
 })
 let currentStoreState = state
+let bindingStore: ReturnType<typeof createTestStore> | null = null
 
 vi.mock('@/store', () => ({
   useAppStore: {
-    getState: () => currentStoreState,
-    subscribe: vi.fn(() => () => {})
+    getState: () => bindingStore?.getState() ?? currentStoreState,
+    subscribe: vi.fn((listener: (state: AppState, previous: AppState) => void) =>
+      bindingStore ? bindingStore.subscribe(listener) : () => {}
+    )
   }
 }))
 
@@ -82,6 +91,7 @@ vi.mock('@/components/terminal-pane/pty-data-sidecar-subscriptions', () => ({
 describe('launchAgentBackgroundSession', () => {
   beforeEach(() => {
     currentStoreState = state
+    bindingStore = null
     resetAgentBackgroundSessionTestHarness({
       state,
       createTab: mockCreateTab,
@@ -457,8 +467,11 @@ describe('launchAgentBackgroundSession', () => {
       onExit
     })
 
-    const sidecar = mockSubscribeToPtyExit.mock.calls[0]?.[1] as (code: number) => void
-    sidecar(0)
+    const sidecar = mockSubscribeToPtyExit.mock.calls[0]?.[1]
+    if (!sidecar) {
+      throw new Error('Background exit sidecar was not registered')
+    }
+    sidecar(0, { hadPrimary: true })
 
     const tabId = expectReservedAgentBackgroundTabId(mockSpawn)
     expect(state.clearTabPtyId).toHaveBeenCalledWith(tabId, 'pty-1')
@@ -470,6 +483,102 @@ describe('launchAgentBackgroundSession', () => {
     expect(state.markUnverifiedPtyLoss).not.toHaveBeenCalled()
   })
 
+  it.each(['eager', 'persistent sidecar'] as const)(
+    'retains a closing background binding through %s completion but clears an ordinary exit once',
+    async (entrypoint) => {
+      const { createTestStore, seedStore, makeWorktree, TEST_REPO } =
+        await import('@/store/slices/store-test-helpers')
+      const { launchAgentBackgroundSession } = await import('./launch-agent-background-session')
+      const store = createTestStore()
+      bindingStore = store
+      seedStore(store, {
+        worktreesByRepo: {
+          [TEST_REPO.id]: [makeWorktree({ id: 'wt-1', repoId: TEST_REPO.id, hostId: 'local' })]
+        }
+      })
+      const unsubscribeData = vi.fn()
+      const unsubscribeExit = vi.fn()
+      mockSubscribeToPtyData.mockReturnValue(unsubscribeData)
+      mockSubscribeToPtyExit.mockReturnValue(unsubscribeExit)
+      const onExit = vi.fn()
+      const result = await launchAgentBackgroundSession({
+        agent: 'claude',
+        worktreeId: 'wt-1',
+        prompt: 'run the automation',
+        onExit
+      })
+      if (!result) {
+        throw new Error('Background launch did not create a terminal')
+      }
+      const tab = store.getState().tabsByWorktree['wt-1'].find((tab) => tab.id === result.tabId)
+      const layout = store.getState().terminalLayoutsByTabId[result.tabId]
+      expect(tab?.ptyId).toBe('pty-1')
+      expect(store.getState().ptyIdsByTabId[result.tabId]).toEqual(['pty-1'])
+      expect(store.getState().lastKnownRelayPtyIdByTabId[result.tabId]).toBe('pty-1')
+      expect(store.getState().agentLaunchConfigByPaneKey[result.paneKey]).toBeDefined()
+
+      const eager = mockRegisterEagerPtyBuffer.mock.calls[0]?.[1]
+      const sidecar = mockSubscribeToPtyExit.mock.calls[0]?.[1]
+      if (!eager || !sidecar) {
+        throw new Error('Background exit observers were not registered')
+      }
+      const exitOptions = { preserveRendererBinding: 'closing' as const }
+      if (entrypoint === 'eager') {
+        eager(result.ptyId, 0, exitOptions)
+      } else {
+        sidecar(0, { hadPrimary: true, exitOptions })
+      }
+      // A primary and the captured persistent sidecar may both see the same physical exit.
+      sidecar(0, { hadPrimary: true, exitOptions })
+      expect(onExit).toHaveBeenCalledExactlyOnceWith('pty-1', 0)
+      expect(unsubscribeData).toHaveBeenCalledOnce()
+      expect(unsubscribeExit).toHaveBeenCalledOnce()
+      expect(store.getState().agentLaunchConfigByPaneKey[result.paneKey]).toBeUndefined()
+      expect(store.getState().tabsByWorktree['wt-1'].find((t) => t.id === result.tabId)).toBe(tab)
+      expect(store.getState().terminalLayoutsByTabId[result.tabId]).toBe(layout)
+      expect(store.getState().ptyIdsByTabId[result.tabId]).toEqual(['pty-1'])
+      expect(store.getState().lastKnownRelayPtyIdByTabId[result.tabId]).toBe('pty-1')
+      expect(store.getState().unverifiedPtyLossTabIds[result.tabId]).toBeUndefined()
+
+      mockSpawn.mockResolvedValueOnce({ id: 'pty-ordinary' })
+      const ordinaryExit = vi.fn()
+      const ordinary = await launchAgentBackgroundSession({
+        agent: 'claude',
+        worktreeId: 'wt-1',
+        prompt: 'finish normally',
+        onExit: ordinaryExit
+      })
+      if (!ordinary) {
+        throw new Error('Ordinary background launch did not create a terminal')
+      }
+      const ordinaryEager = mockRegisterEagerPtyBuffer.mock.calls[1]?.[1]
+      const ordinarySidecar = mockSubscribeToPtyExit.mock.calls[1]?.[1]
+      if (!ordinaryEager || !ordinarySidecar) {
+        throw new Error('Ordinary exit observers missing')
+      }
+      if (entrypoint === 'eager') {
+        ordinaryEager(ordinary.ptyId, 0)
+      } else {
+        ordinarySidecar(0, { hadPrimary: true })
+      }
+      ordinarySidecar(0, { hadPrimary: true })
+      expect(ordinaryExit).toHaveBeenCalledExactlyOnceWith('pty-ordinary', 0)
+      expect(unsubscribeData).toHaveBeenCalledTimes(2)
+      expect(unsubscribeExit).toHaveBeenCalledTimes(2)
+      expect(store.getState().agentLaunchConfigByPaneKey[ordinary.paneKey]).toBeUndefined()
+      expect(
+        store.getState().tabsByWorktree['wt-1'].find((t) => t.id === ordinary.tabId)?.ptyId
+      ).toBeNull()
+      expect(store.getState().ptyIdsByTabId[ordinary.tabId]).toEqual([])
+      expect(store.getState().lastKnownRelayPtyIdByTabId[ordinary.tabId]).toBeUndefined()
+      expect(store.getState().unverifiedPtyLossTabIds[ordinary.tabId]).toBeUndefined()
+      expect(store.getState().tabsByWorktree['wt-1'].find((t) => t.id === result.tabId)).toBe(tab)
+      expect(mockSpawn).toHaveBeenCalledTimes(2)
+      result.terminalOwnership?.release()
+      ordinary.terminalOwnership?.release()
+    }
+  )
+
   it('keeps the tab bound to its PTY when contact was lost rather than observed', async () => {
     // Synthetic -1 loss retires transport only; retain bindings for reconnect adoption and orphan-cleanup protection.
     mockSubscribeToPtyExit.mockReturnValue(vi.fn())
@@ -483,8 +592,11 @@ describe('launchAgentBackgroundSession', () => {
       onExit
     })
 
-    const sidecar = mockSubscribeToPtyExit.mock.calls[0]?.[1] as (code: number) => void
-    sidecar(-1)
+    const sidecar = mockSubscribeToPtyExit.mock.calls[0]?.[1]
+    if (!sidecar) {
+      throw new Error('Background exit sidecar was not registered')
+    }
+    sidecar(-1, { hadPrimary: true })
 
     const tabId = expectReservedAgentBackgroundTabId(mockSpawn)
     expect(state.clearTabPtyId).not.toHaveBeenCalled()
diff --git a/src/renderer/src/lib/launch-agent-background-session.ts b/src/renderer/src/lib/launch-agent-background-session.ts
index 44270133e452..0ea838140518 100644
--- a/src/renderer/src/lib/launch-agent-background-session.ts
+++ b/src/renderer/src/lib/launch-agent-background-session.ts
@@ -18,6 +18,7 @@ import {
   type EagerPtyHandle
 } from '@/components/terminal-pane/pty-dispatcher'
 import { subscribeToPtyData } from '@/components/terminal-pane/pty-data-sidecar-subscriptions'
+import type { PtyExitOptions } from '@/components/terminal-pane/pty-exit-delivery'
 import { callRuntimeRpc } from '@/runtime/runtime-rpc-client'
 import { runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/worktree-runtime-owner'
 import { retireProvider } from '@/lib/retire-unowned-background-terminal'
@@ -113,7 +114,7 @@ export async function launchAgentBackgroundSession(
   let unsubscribeExit = (): void => {},
     unsubscribeData = (): void => {},
     releaseRuntimeObservers = (): void => {}
-  const handleExit = (exitPtyId: string, code: number): void => {
+  const handleExit = (exitPtyId: string, code: number, options?: PtyExitOptions): void => {
     if (exitHandled) {
       return
     }
@@ -121,7 +122,7 @@ export async function launchAgentBackgroundSession(
     unsubscribeExit()
     unsubscribeData()
     if (tab) {
-      settleTabPtyBinding(tab.id, exitPtyId, code)
+      settleTabPtyBinding(tab.id, exitPtyId, code, options)
     }
     useAppStore.getState().clearAgentLaunchConfig(paneKey)
     onExit?.(exitPtyId, code)
@@ -269,7 +270,9 @@ export async function launchAgentBackgroundSession(
       eagerPtyBuffer = registerEagerPtyBuffer(ptyId, handleExit, spawned.incarnationId)
       unsubscribeData = subscribeToPtyData(ptyId, handleData)
       // A mounted transport disposes the eager exit handler; this sidecar preserves completion tracking across hidden/visible transitions.
-      unsubscribeExit = subscribeToPtyExit(ptyId, (code) => handleExit(ptyId, code))
+      unsubscribeExit = subscribeToPtyExit(ptyId, (code, context) =>
+        handleExit(ptyId, code, context.exitOptions)
+      )
     }
     // Bind PTY/ownership before mount to prevent duplicate spawn without missing user takeover.
     requestBackgroundTerminalWorktreeMount({ worktreeId, tabIds: [tab.id] })
diff --git a/src/renderer/src/runtime/main-loaded-layout-frames.test-fixture.ts b/src/renderer/src/runtime/main-loaded-layout-frames.test-fixture.ts
index 3e7d1bc6a932..efef1cfb4e9c 100644
--- a/src/renderer/src/runtime/main-loaded-layout-frames.test-fixture.ts
+++ b/src/renderer/src/runtime/main-loaded-layout-frames.test-fixture.ts
@@ -14,14 +14,6 @@ import {
   indexPublishedLayout
 } from '../../../shared/workspace-layout/workspace-layout-records'
 import type { WorkspaceLayoutChangeFrame } from '../../../shared/workspace-layout/workspace-layout-stream-frames'
-import { vi } from 'vitest'
-import * as placementReads from './web-session-tabs-sync/open-placement-read'
-import * as snapshotPlacements from './web-session-tabs-sync/open-placement'
-import * as frameSelections from './workspace-layout-frame-open-selection'
-import * as mappings from './web-session-tabs-sync/tracking-mappings'
-import { hostSessionTabIdByLocalKey } from './web-session-tabs-sync/state'
-import * as selectionFingerprint from '../../../shared/structured-agent-session-mutation'
-
 /** The model main loads from one stored partition, with the ids it mints at load. */
 export function loadMainLayoutModel(
   hostId: ExecutionHostId,
@@ -106,188 +98,3 @@ export function mainLayoutFrameSender(): {
     }
   }
 }
-
-/** Count metadata work while delegating every read and final writer to production. */
-export function countOpenPlacementWork() {
-  type Pass = 'snapshot' | 'discovery' | 'writer'
-  const reads: {
-    pass: Pass
-    worktreeId: string
-    tabRows: number
-    terminalRows: number
-    snapshotRows: number
-    mappingCopies: number
-    mappingRows: number
-    sourceChecks: number
-    viewerChecks: number
-    destinationLookups: number
-  }[] = []
-  const visits: { pass: Pass; worktreeId: string; rows: number }[] = []
-  const builtKeys: string[][] = []
-  let pass: Pass = 'snapshot'
-  let indexing: (typeof reads)[number] | undefined
-  let fingerprints = 0
-  const restores: (() => void)[] = []
-  const countedRows = <T>(rows: T[], visit: () => void): T[] =>
-    new Proxy(rows, {
-      get(target, property, receiver) {
-        if (typeof property === 'string' && /^(0|[1-9]\d*)$/.test(property)) {
-          visit()
-        }
-        // oxlint-disable-next-line anti-slop/no-reflect-get -- Proxy `get` trap: only Reflect.get forwards a raw string|symbol key with the proxy receiver.
-        return Reflect.get(target, property, receiver)
-      }
-    })
-  const countLayout = <T extends { worktreeId: string; tabs: unknown[] }>(layout: T): T => {
-    const visit = { pass, worktreeId: layout.worktreeId, rows: 0 }
-    visits.push(visit)
-    return {
-      ...layout,
-      tabs: countedRows(layout.tabs, () => {
-        if (!indexing) {
-          visit.rows += 1
-        }
-      })
-    }
-  }
-  const realMappingGet = hostSessionTabIdByLocalKey.get.bind(hostSessionTabIdByLocalKey)
-  const mappingGet = vi.spyOn(hostSessionTabIdByLocalKey, 'get').mockImplementation((key) => {
-    if (indexing) {
-      indexing.mappingCopies += 1
-    }
-    return realMappingGet(key)
-  })
-  restores.push(() => mappingGet.mockRestore())
-  const realMappings = mappings.hostSessionTabIdsByLocalTabForWorktree
-  const mappingRead = vi
-    .spyOn(mappings, 'hostSessionTabIdsByLocalTabForWorktree')
-    .mockImplementation((...args) => {
-      const rows = realMappings(...args)
-      const reading = indexing
-      if (reading) {
-        const iterate = rows[Symbol.iterator].bind(rows)
-        rows[Symbol.iterator] = function* () {
-          for (const entry of iterate()) {
-            reading.mappingRows += 1
-            yield entry
-          }
-          return undefined
-        }
-      }
-      return rows
-    })
-  restores.push(() => mappingRead.mockRestore())
-  const realRead = placementReads.createOpenPlacementRead
-  const read = vi
-    .spyOn(placementReads, 'createOpenPlacementRead')
-    .mockImplementation((state, worktreeId, owner, snapshot, now) => {
-      const counts = {
-        pass,
-        worktreeId,
-        tabRows: 0,
-        terminalRows: 0,
-        snapshotRows: 0,
-        mappingCopies: 0,
-        mappingRows: 0,
-        sourceChecks: 0,
-        viewerChecks: 0,
-        destinationLookups: 0
-      }
-      reads.push(counts)
-      const before = indexing
-      indexing = counts
-      let actual: ReturnType<typeof realRead>
-      try {
-        actual = realRead(
-          {
-            ...state,
-            unifiedTabsByWorktree: {
-              ...state.unifiedTabsByWorktree,
-              [worktreeId]: countedRows(
-                state.unifiedTabsByWorktree[worktreeId] ?? [],
-                () => counts.tabRows++
-              )
-            },
-            tabsByWorktree: {
-              ...state.tabsByWorktree,
-              [worktreeId]: countedRows(
-                state.tabsByWorktree[worktreeId] ?? [],
-                () => counts.terminalRows++
-              )
-            }
-          },
-          worktreeId,
-          owner,
-          snapshot && {
-            ...snapshot,
-            tabs: countedRows(snapshot.tabs, () => counts.snapshotRows++)
-          },
-          now
-        )
-      } finally {
-        indexing = before
-      }
-      return {
-        ...actual,
-        sourceCurrent: (...args) => {
-          counts.sourceChecks++
-          return actual.sourceCurrent(...args)
-        },
-        viewerSelectionCurrent: (...args) => {
-          counts.viewerChecks++
-          return actual.viewerSelectionCurrent(...args)
-        },
-        localTabId: (...args) => {
-          counts.destinationLookups++
-          return actual.localTabId(...args)
-        }
-      }
-    })
-  restores.push(() => read.mockRestore())
-  const realSnapshot = snapshotPlacements.prepareSnapshotOpenPlacements
-  const snapshot = vi
-    .spyOn(snapshotPlacements, 'prepareSnapshotOpenPlacements')
-    .mockImplementation((state, layout, ...rest) => {
-      pass = 'snapshot'
-      return realSnapshot(state, countLayout({ ...layout, worktreeId: layout.worktree }), ...rest)
-    })
-  restores.push(() => snapshot.mockRestore())
-  const realDiscovery = frameSelections.frameOpenPlacements
-  const discovery = vi
-    .spyOn(frameSelections, 'frameOpenPlacements')
-    .mockImplementation((state, layout, owner) => {
-      pass = 'discovery'
-      return realDiscovery(state, countLayout(layout), owner)
-    })
-  restores.push(() => discovery.mockRestore())
-  const realWriter = frameSelections.frameOpenSelectionPatch
-  const writer = vi
-    .spyOn(frameSelections, 'frameOpenSelectionPatch')
-    .mockImplementation((before, patch, cache, keys, ...rest) => {
-      pass = 'writer'
-      builtKeys.push([...keys])
-      const countedCache = { ...cache }
-      for (const key of keys) {
-        if (cache[key]) {
-          countedCache[key] = countLayout(cache[key])
-        }
-      }
-      return realWriter(before, patch, countedCache, keys, ...rest)
-    })
-  restores.push(() => writer.mockRestore())
-  const realFingerprint = selectionFingerprint.structuredAgentSessionDomainFingerprint
-  const fingerprint = vi
-    .spyOn(selectionFingerprint, 'structuredAgentSessionDomainFingerprint')
-    .mockImplementation((...args) => {
-      fingerprints++
-      return realFingerprint(...args)
-    })
-  restores.push(() => fingerprint.mockRestore())
-  return {
-    reads,
-    visits,
-    builtKeys,
-    fingerprints: () => fingerprints,
-    stop: () => restores.toReversed().forEach((restore) => restore())
-  }
-}
diff --git a/src/renderer/src/runtime/open-placement-work-counter.test-fixture.ts b/src/renderer/src/runtime/open-placement-work-counter.test-fixture.ts
new file mode 100644
index 000000000000..b0fa1f258e2c
--- /dev/null
+++ b/src/renderer/src/runtime/open-placement-work-counter.test-fixture.ts
@@ -0,0 +1,192 @@
+import { vi } from 'vitest'
+import * as placementReads from './web-session-tabs-sync/open-placement-read'
+import * as snapshotPlacements from './web-session-tabs-sync/open-placement'
+import * as frameSelections from './workspace-layout-frame-open-selection'
+import * as mappings from './web-session-tabs-sync/tracking-mappings'
+import { hostSessionTabIdByLocalKey } from './web-session-tabs-sync/state'
+import * as selectionFingerprint from '../../../shared/structured-agent-session-mutation'
+
+/** Count metadata work while delegating every read and final writer to production. */
+export function countOpenPlacementWork() {
+  type Pass = 'snapshot' | 'discovery' | 'writer'
+  const reads: {
+    pass: Pass
+    worktreeId: string
+    tabRows: number
+    terminalRows: number
+    snapshotRows: number
+    mappingCopies: number
+    mappingRows: number
+    sourceChecks: number
+    viewerChecks: number
+    destinationLookups: number
+  }[] = []
+  const visits: { pass: Pass; worktreeId: string; rows: number }[] = []
+  const builtKeys: string[][] = []
+  let pass: Pass = 'snapshot'
+  let indexing: (typeof reads)[number] | undefined
+  let fingerprints = 0
+  const restores: (() => void)[] = []
+  const countedRows = <T>(rows: T[], visit: () => void): T[] =>
+    new Proxy(rows, {
+      get(target, property, receiver) {
+        if (typeof property === 'string' && /^(0|[1-9]\d*)$/.test(property)) {
+          visit()
+        }
+        // oxlint-disable-next-line anti-slop/no-reflect-get -- Proxy `get` trap: only Reflect.get forwards a raw string|symbol key with the proxy receiver.
+        return Reflect.get(target, property, receiver)
+      }
+    })
+  const countLayout = <T extends { worktreeId: string; tabs: unknown[] }>(layout: T): T => {
+    const visit = { pass, worktreeId: layout.worktreeId, rows: 0 }
+    visits.push(visit)
+    return {
+      ...layout,
+      tabs: countedRows(layout.tabs, () => {
+        if (!indexing) {
+          visit.rows += 1
+        }
+      })
+    }
+  }
+  const realMappingGet = hostSessionTabIdByLocalKey.get.bind(hostSessionTabIdByLocalKey)
+  const mappingGet = vi.spyOn(hostSessionTabIdByLocalKey, 'get').mockImplementation((key) => {
+    if (indexing) {
+      indexing.mappingCopies += 1
+    }
+    return realMappingGet(key)
+  })
+  restores.push(() => mappingGet.mockRestore())
+  const realMappings = mappings.hostSessionTabIdsByLocalTabForWorktree
+  const mappingRead = vi
+    .spyOn(mappings, 'hostSessionTabIdsByLocalTabForWorktree')
+    .mockImplementation((...args) => {
+      const rows = realMappings(...args)
+      const reading = indexing
+      if (reading) {
+        const iterate = rows[Symbol.iterator].bind(rows)
+        rows[Symbol.iterator] = function* () {
+          for (const entry of iterate()) {
+            reading.mappingRows += 1
+            yield entry
+          }
+          return undefined
+        }
+      }
+      return rows
+    })
+  restores.push(() => mappingRead.mockRestore())
+  const realRead = placementReads.createOpenPlacementRead
+  const read = vi
+    .spyOn(placementReads, 'createOpenPlacementRead')
+    .mockImplementation((state, worktreeId, owner, snapshot, now) => {
+      const counts = {
+        pass,
+        worktreeId,
+        tabRows: 0,
+        terminalRows: 0,
+        snapshotRows: 0,
+        mappingCopies: 0,
+        mappingRows: 0,
+        sourceChecks: 0,
+        viewerChecks: 0,
+        destinationLookups: 0
+      }
+      reads.push(counts)
+      const before = indexing
+      indexing = counts
+      let actual: ReturnType<typeof realRead>
+      try {
+        actual = realRead(
+          {
+            ...state,
+            unifiedTabsByWorktree: {
+              ...state.unifiedTabsByWorktree,
+              [worktreeId]: countedRows(
+                state.unifiedTabsByWorktree[worktreeId] ?? [],
+                () => counts.tabRows++
+              )
+            },
+            tabsByWorktree: {
+              ...state.tabsByWorktree,
+              [worktreeId]: countedRows(
+                state.tabsByWorktree[worktreeId] ?? [],
+                () => counts.terminalRows++
+              )
+            }
+          },
+          worktreeId,
+          owner,
+          snapshot && {
+            ...snapshot,
+            tabs: countedRows(snapshot.tabs, () => counts.snapshotRows++)
+          },
+          now
+        )
+      } finally {
+        indexing = before
+      }
+      return {
+        ...actual,
+        sourceCurrent: (...args) => {
+          counts.sourceChecks++
+          return actual.sourceCurrent(...args)
+        },
+        viewerSelectionCurrent: (...args) => {
+          counts.viewerChecks++
+          return actual.viewerSelectionCurrent(...args)
+        },
+        localTabId: (...args) => {
+          counts.destinationLookups++
+          return actual.localTabId(...args)
+        }
+      }
+    })
+  restores.push(() => read.mockRestore())
+  const realSnapshot = snapshotPlacements.prepareSnapshotOpenPlacements
+  const snapshot = vi
+    .spyOn(snapshotPlacements, 'prepareSnapshotOpenPlacements')
+    .mockImplementation((state, layout, ...rest) => {
+      pass = 'snapshot'
+      return realSnapshot(state, countLayout({ ...layout, worktreeId: layout.worktree }), ...rest)
+    })
+  restores.push(() => snapshot.mockRestore())
+  const realDiscovery = frameSelections.frameOpenPlacements
+  const discovery = vi
+    .spyOn(frameSelections, 'frameOpenPlacements')
+    .mockImplementation((state, layout, owner) => {
+      pass = 'discovery'
+      return realDiscovery(state, countLayout(layout), owner)
+    })
+  restores.push(() => discovery.mockRestore())
+  const realWriter = frameSelections.frameOpenSelectionPatch
+  const writer = vi
+    .spyOn(frameSelections, 'frameOpenSelectionPatch')
+    .mockImplementation((before, patch, cache, keys, ...rest) => {
+      pass = 'writer'
+      builtKeys.push([...keys])
+      const countedCache = { ...cache }
+      for (const key of keys) {
+        if (cache[key]) {
+          countedCache[key] = countLayout(cache[key])
+        }
+      }
+      return realWriter(before, patch, countedCache, keys, ...rest)
+    })
+  restores.push(() => writer.mockRestore())
+  const realFingerprint = selectionFingerprint.structuredAgentSessionDomainFingerprint
+  const fingerprint = vi
+    .spyOn(selectionFingerprint, 'structuredAgentSessionDomainFingerprint')
+    .mockImplementation((...args) => {
+      fingerprints++
+      return realFingerprint(...args)
+    })
+  restores.push(() => fingerprint.mockRestore())
+  return {
+    reads,
+    visits,
+    builtKeys,
+    fingerprints: () => fingerprints,
+    stop: () => restores.toReversed().forEach((restore) => restore())
+  }
+}
diff --git a/src/renderer/src/runtime/web-runtime-terminal-switch-placement.test.ts b/src/renderer/src/runtime/web-runtime-terminal-switch-placement.test.ts
index 5b70f35a78a4..c1a38417f77e 100644
--- a/src/renderer/src/runtime/web-runtime-terminal-switch-placement.test.ts
+++ b/src/renderer/src/runtime/web-runtime-terminal-switch-placement.test.ts
@@ -24,7 +24,7 @@ import { refreshWebRuntimeSessionTabsSnapshot } from './web-runtime-session-snap
 import { toWebTerminalSurfaceTabId } from '../../../shared/terminal-surface-id'
 import { makePaneKey } from '../../../shared/stable-pane-id'
 import { resetWebSessionTabsSnapshotFreshnessForTests } from './web-session-tabs-sync/tracking-lifecycle'
-import { countOpenPlacementWork } from './main-loaded-layout-frames.test-fixture'
+import { countOpenPlacementWork } from './open-placement-work-counter.test-fixture'
 import { hostSessionTabIdsByLocalTabForWorktree } from './web-session-tabs-sync/tracking-mappings'
 
 const ENV = 'paired-placement',
diff --git a/src/renderer/src/runtime/workspace-layout-frame-sync.test.ts b/src/renderer/src/runtime/workspace-layout-frame-sync.test.ts
index 9e4035865ba9..db2f7abbad2a 100644
--- a/src/renderer/src/runtime/workspace-layout-frame-sync.test.ts
+++ b/src/renderer/src/runtime/workspace-layout-frame-sync.test.ts
@@ -42,9 +42,9 @@ import { openWorkspaceLayoutFrameSync } from './workspace-layout-frame-sync'
 import {
   layoutSnapshotFrame,
   mainLayoutFrameSender,
-  mainLoadedLayouts,
-  countOpenPlacementWork
+  mainLoadedLayouts
 } from './main-loaded-layout-frames.test-fixture'
+import { countOpenPlacementWork } from './open-placement-work-counter.test-fixture'
 import * as frameFlushPlan from './workspace-layout-frame-flush-plan'
 import { installLayoutFrameApplyCheck } from './workspace-layout-frame-apply-check.test-fixture'
 

From 7f86dc417acf3a800388d46badf4a253bcf5d6a9 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 08:56:48 -0700
Subject: [PATCH 122/207] Keep retained terminals readable after automation
 completes

---
 .../acp-chat-worker-error-escalation.test.ts  |   4 +-
 .../launch-parity-window-tab.test.ts          |   2 +-
 ...-hibernation-kill-shell-foreground.test.ts |   2 +-
 .../pty-dispatcher-pi-routing.test.ts         |   4 +-
 .../pty-transport-eager-buffer-replay.test.ts |   2 +-
 .../pty-transport-handler-suspension.test.ts  |  12 +-
 .../hooks/automation-dispatch-completion.ts   |  22 ++-
 .../src/hooks/automation-dispatch-handler.ts  |   4 +-
 ...omation-dispatch-unverifiable-loss.test.ts | 140 +++++++++++++++++-
 .../lib/agent-background-session-contract.ts  |   3 +-
 .../src/lib/automation-session-observer.ts    |  11 +-
 .../lib/automation-terminal-ownership.test.ts |   4 +-
 .../launch-agent-background-session.test.ts   |   3 +-
 .../lib/launch-agent-background-session.ts    |   6 +-
 .../native-chat-switch-readable-source.ts     |   9 +-
 15 files changed, 199 insertions(+), 29 deletions(-)

diff --git a/src/main/acp/acp-chat-worker-error-escalation.test.ts b/src/main/acp/acp-chat-worker-error-escalation.test.ts
index 32b32d8b123f..d8867c9bb300 100644
--- a/src/main/acp/acp-chat-worker-error-escalation.test.ts
+++ b/src/main/acp/acp-chat-worker-error-escalation.test.ts
@@ -230,10 +230,10 @@ it.each([100, 1000])(
         r.allow(2) // A's generic diagnostic/end commit; the unrelated prefix still blocks its answer.
         await vi.advanceTimersByTimeAsync(250)
         await r.rig.settle()
-        expect(r.failure).toHaveBeenCalledTimes(1)
-        expect(r.mail()).toHaveLength(0)
         // The escalation's first check follows real async work; await it instead of a fixed number of turns.
         await firstCheck.promise
+        expect(r.failure).toHaveBeenCalledTimes(1)
+        expect(r.mail()).toHaveLength(0)
         expect(samples).toHaveLength(1)
         otherReads = 0
         for (clock = 50; clock <= 2000; clock += 50) {
diff --git a/src/renderer/src/components/terminal-pane/launch-parity-window-tab.test.ts b/src/renderer/src/components/terminal-pane/launch-parity-window-tab.test.ts
index 82e5f10c2230..d62ce1008ecf 100644
--- a/src/renderer/src/components/terminal-pane/launch-parity-window-tab.test.ts
+++ b/src/renderer/src/components/terminal-pane/launch-parity-window-tab.test.ts
@@ -333,8 +333,8 @@ describe('window-tab producers: the pty:spawn request a real pane sends', () =>
         | ReturnType<typeof modules.layoutBindings.useTerminalPaneLayoutBindings>
         | undefined
       function LayoutBindings(): null {
-        // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the binding hook reads only the supplied layout and expand/collapse controller fields, as in pending-split-close-test-fixture.
         layoutBindings = modules.layoutBindings.useTerminalPaneLayoutBindings(
+          // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the binding hook reads only the supplied layout and expand/collapse controller fields, as in pending-split-close-test-fixture.
           controller as Parameters<typeof modules.layoutBindings.useTerminalPaneLayoutBindings>[0]
         )
         return null
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-hibernation-kill-shell-foreground.test.ts b/src/renderer/src/components/terminal-pane/pty-connection-hibernation-kill-shell-foreground.test.ts
index 61583e97b488..9f4bd8cc3e55 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-hibernation-kill-shell-foreground.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-hibernation-kill-shell-foreground.test.ts
@@ -213,7 +213,7 @@ describe('shell showing through a hibernation kill', () => {
       exitPty: () => {
         const onPtyExit = createdTransportOptions[0]?.onPtyExit
         if (typeof onPtyExit === 'function') {
-          onPtyExit(ptyId)
+          onPtyExit(ptyId, 0, { preserveRendererBinding: true })
         }
       }
     }
diff --git a/src/renderer/src/components/terminal-pane/pty-dispatcher-pi-routing.test.ts b/src/renderer/src/components/terminal-pane/pty-dispatcher-pi-routing.test.ts
index 4c55bde469cc..29774152e80f 100644
--- a/src/renderer/src/components/terminal-pane/pty-dispatcher-pi-routing.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-dispatcher-pi-routing.test.ts
@@ -351,8 +351,8 @@ describe('dispatcher → transport → onTitleChange for Pi spinner', () => {
     expect(() => exitDispatcherCallback?.({ id: 'pty-throwing-exit', code: 9 })).toThrow(
       'primary exit failed'
     )
-    expect(firstSidecar).toHaveBeenCalledWith(9, { hadPrimary: true })
-    expect(secondSidecar).toHaveBeenCalledWith(9, { hadPrimary: true })
+    expect(firstSidecar).toHaveBeenCalledWith(9, { hadPrimary: true, exitOptions: {} })
+    expect(secondSidecar).toHaveBeenCalledWith(9, { hadPrimary: true, exitOptions: {} })
 
     expect(() => exitDispatcherCallback?.({ id: 'pty-throwing-exit', code: 10 })).not.toThrow()
     expect(primary).toHaveBeenCalledTimes(1)
diff --git a/src/renderer/src/components/terminal-pane/pty-transport-eager-buffer-replay.test.ts b/src/renderer/src/components/terminal-pane/pty-transport-eager-buffer-replay.test.ts
index 2a87c9199399..a63ff8d56aee 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport-eager-buffer-replay.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport-eager-buffer-replay.test.ts
@@ -103,7 +103,7 @@ describe('createIpcPtyTransport', () => {
     onExit?.({ id: 'pty-restored', code: 0 })
 
     expect(eagerExit).not.toHaveBeenCalled()
-    expect(sidecarExit).toHaveBeenCalledWith(0, { hadPrimary: true })
+    expect(sidecarExit).toHaveBeenCalledWith(0, { hadPrimary: true, exitOptions: {} })
   })
 
   it('bounds the eager buffer to its cap and keeps the most recent output', async () => {
diff --git a/src/renderer/src/components/terminal-pane/pty-transport-handler-suspension.test.ts b/src/renderer/src/components/terminal-pane/pty-transport-handler-suspension.test.ts
index 2c77b0a312fd..d1b1966bcb36 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport-handler-suspension.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport-handler-suspension.test.ts
@@ -129,15 +129,17 @@ describe('createIpcPtyTransport', () => {
     expect(onPtyExit).toHaveBeenCalledWith('pty-1', -1)
   })
 
-  it('marks a host reversible-stop exit before delivering it to the pane', async () => {
+  it('delivers a host reversible-stop purpose to the pane callbacks', async () => {
     const { createIpcPtyTransport } = await import('./pty-transport')
-    const { consumeCommittedPtyShutdownExit } = await import('./pty-shutdown-exit-deferral')
-    const transport = createIpcPtyTransport()
-    await transport.connect({ url: '', callbacks: {} })
+    const onExitCallback = vi.fn()
+    const onPtyExit = vi.fn()
+    const transport = createIpcPtyTransport({ onPtyExit })
+    await transport.connect({ url: '', callbacks: { onExit: onExitCallback } })
 
     onExit?.({ id: 'pty-1', code: 0, preserveRendererBinding: true })
 
-    expect(consumeCommittedPtyShutdownExit('pty-1')).toBe(true)
+    expect(onExitCallback).toHaveBeenCalledExactlyOnceWith(0, { preserveRendererBinding: true })
+    expect(onPtyExit).toHaveBeenCalledExactlyOnceWith('pty-1', 0, { preserveRendererBinding: true })
   })
 
   it('restores data handlers when an intentional shutdown fails before exit', async () => {
diff --git a/src/renderer/src/hooks/automation-dispatch-completion.ts b/src/renderer/src/hooks/automation-dispatch-completion.ts
index c0c2b5dc1d04..81dc62f52931 100644
--- a/src/renderer/src/hooks/automation-dispatch-completion.ts
+++ b/src/renderer/src/hooks/automation-dispatch-completion.ts
@@ -16,6 +16,7 @@ import {
 import type { Worktree } from '../../../shared/worktree/types'
 import { isProvenProcessExit } from '../../../shared/terminal-exit-cause'
 import type { AutomationTerminalOwnership } from '@/lib/automation-terminal-ownership'
+import type { PtyExitOptions } from '@/components/terminal-pane/pty-exit-delivery'
 
 type MarkDispatchResult = (result: AutomationDispatchResult) => Promise<void>
 
@@ -32,13 +33,21 @@ export function createAutomationDispatchCompletion(args: {
   const getOutputSnapshot = () =>
     selectAutomationRunOutputSnapshot(latestAssistantMessage, outputSnapshotBuffer.snapshot())
   let dispatchMarked = false
-  let pendingExitCode: number | null = null
+  let pendingExit: { code: number; options?: PtyExitOptions } | null = null
   let pendingDone = false
   let completionMarked = false
   let contactLost = false
   let unsubscribeAgentStatus = (): void => {}
   let unsubscribeSessionObserver = (): void => {}
   let releaseReuseDispatchTab = (): void => {}
+  const releaseRetainedTerminalOwnership = (options?: PtyExitOptions): void => {
+    if (
+      options?.preserveRendererBinding === true ||
+      options?.preserveRendererBinding === 'closing'
+    ) {
+      args.releaseTerminalOwnership()
+    }
+  }
   const cleanupRunObservers = (): void => {
     unsubscribeAgentStatus()
     unsubscribeSessionObserver()
@@ -147,12 +156,13 @@ export function createAutomationDispatchCompletion(args: {
     }
     settleLateResult(markCompletionResult())
   }
-  const handleExit = (code: number): void => {
+  const handleExit = (code: number, options?: PtyExitOptions): void => {
+    releaseRetainedTerminalOwnership(options)
     if (completionMarked) {
       return
     }
     if (!dispatchMarked) {
-      pendingExitCode = code
+      pendingExit = { code, options }
       return
     }
     settleLateResult(markExitResult(code))
@@ -235,10 +245,12 @@ export function createAutomationDispatchCompletion(args: {
     },
     settlePendingAfterDispatch: async () => {
       dispatchMarked = true
+      // An early exit can precede publication of the launch's retirement ownership.
+      releaseRetainedTerminalOwnership(pendingExit?.options)
       if (pendingDone) {
         await markCompletionResult()
-      } else if (pendingExitCode !== null) {
-        await markExitResult(pendingExitCode)
+      } else if (pendingExit !== null) {
+        await markExitResult(pendingExit.code)
       }
     }
   }
diff --git a/src/renderer/src/hooks/automation-dispatch-handler.ts b/src/renderer/src/hooks/automation-dispatch-handler.ts
index 6f101bad103f..b6f3ba112fd6 100644
--- a/src/renderer/src/hooks/automation-dispatch-handler.ts
+++ b/src/renderer/src/hooks/automation-dispatch-handler.ts
@@ -179,8 +179,8 @@ export async function handleAutomationDispatchRequest({
         }
         completion.handleAgentDone()
       },
-      onExit: (_ptyId, code) => {
-        completion.handleExit(code)
+      onExit: (_ptyId, code, options) => {
+        completion.handleExit(code, options)
       }
     })
     if (!result) {
diff --git a/src/renderer/src/hooks/automation-dispatch-unverifiable-loss.test.ts b/src/renderer/src/hooks/automation-dispatch-unverifiable-loss.test.ts
index a8a525495b92..69d2b058f629 100644
--- a/src/renderer/src/hooks/automation-dispatch-unverifiable-loss.test.ts
+++ b/src/renderer/src/hooks/automation-dispatch-unverifiable-loss.test.ts
@@ -1,10 +1,13 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import type { AutomationDispatchResult } from '../../../shared/automations-types'
 import type { AutomationTerminalOwnership } from '@/lib/automation-terminal-ownership'
+import type { createTestStore } from '@/store/slices/store-test-helpers'
+
+let bindingStore: ReturnType<typeof createTestStore> | null = null
 
 vi.mock('@/store', () => ({
   useAppStore: {
-    getState: () => ({ agentStatusByPaneKey: {} }),
+    getState: () => bindingStore?.getState() ?? { agentStatusByPaneKey: {} },
     subscribe: vi.fn(() => () => {})
   }
 }))
@@ -35,6 +38,7 @@ async function createCompletion() {
  */
 describe('automation dispatch completion on an unverifiable loss', () => {
   beforeEach(() => {
+    bindingStore = null
     vi.clearAllMocks()
     markDispatchResult.mockResolvedValue(undefined)
     finalizeTerminalOwnership.mockResolvedValue(null)
@@ -99,4 +103,138 @@ describe('automation dispatch completion on an unverifiable loss', () => {
     )
     warnSpy.mockRestore()
   })
+
+  it.each([
+    'pending exit',
+    'pending done',
+    'exit persistence',
+    'done persistence',
+    'ordinary completion'
+  ] as const)('conserves real unselected terminal ownership through %s', async (phase) => {
+    const { createTestStore, seedStore, makeWorktree, TEST_REPO } =
+      await import('@/store/slices/store-test-helpers')
+    const { makeRun } = await import('@/components/automations/automations-page-fixtures')
+    const { createAutomationTerminalOwnership } =
+      await import('@/lib/automation-terminal-ownership')
+    const { createAutomationDispatchCompletion } = await import('./automation-dispatch-completion')
+    vi.stubGlobal('window', { api: { pty: { kill: vi.fn(async () => {}) } } })
+    try {
+      const store = createTestStore()
+      bindingStore = store
+      const worktree = makeWorktree({ id: 'wt-1', repoId: TEST_REPO.id, hostId: 'local' })
+      seedStore(store, { worktreesByRepo: { [TEST_REPO.id]: [worktree] } })
+      const selected = store.getState().createTab(worktree.id, undefined, undefined, {
+        initialPtyId: 'pty-C'
+      })
+      const tab = store.getState().createTab(worktree.id, undefined, undefined, {
+        initialPtyId: 'pty-B',
+        activate: false,
+        recordInteraction: false
+      })
+      store.getState().updateTabPtyId(tab.id, 'pty-B')
+      store.setState({
+        activeWorktreeId: worktree.id,
+        activeTabId: selected.id,
+        activeTabType: 'terminal'
+      })
+      const layout = store.getState().terminalLayoutsByTabId[tab.id]
+      const leafId = layout.activeLeafId
+      if (!leafId) {
+        throw new Error('Background terminal has no active leaf')
+      }
+      const paneKey = `${tab.id}:${leafId}`
+      const ownership = createAutomationTerminalOwnership({
+        store,
+        worktreeId: worktree.id,
+        tabId: tab.id,
+        paneKey,
+        ptyId: 'pty-B',
+        tabCreatedAt: tab.createdAt,
+        runtimeKind: 'desktop'
+      })
+      const pendingDispatch = phase === 'pending exit' || phase === 'pending done'
+      let acquiredOwnership: AutomationTerminalOwnership | null = pendingDispatch ? null : ownership
+      const release = vi.fn(() => acquiredOwnership?.release())
+      const finalize = vi.fn<AutomationTerminalOwnership['finalize']>((options) =>
+        ownership.finalize(options)
+      )
+      const close = vi.spyOn(store.getState(), 'closeTab')
+      const hibernate = vi.spyOn(store.getState(), 'shutdownCompletedAgentPaneForHibernation')
+      let finishResult!: () => void
+      const persistence = new Promise<void>((resolve) => {
+        finishResult = resolve
+      })
+      markDispatchResult.mockReturnValueOnce(persistence)
+      const completion = createAutomationDispatchCompletion({
+        run: makeRun({ status: 'dispatched', workspaceId: worktree.id }),
+        worktree,
+        precheckResult: null,
+        markDispatchResult,
+        releaseTerminalOwnership: release,
+        finalizeTerminalOwnership: finalize
+      })
+      const exitOptions = { preserveRendererBinding: 'closing' as const }
+      let settlement: Promise<void> | undefined
+      if (pendingDispatch) {
+        if (phase === 'pending done') {
+          completion.handleAgentDone()
+        }
+        completion.handleExit(0, exitOptions)
+        acquiredOwnership = ownership
+        settlement = completion.settlePendingAfterDispatch()
+      } else {
+        await completion.settlePendingAfterDispatch()
+        if (phase === 'done persistence') {
+          completion.handleAgentDone()
+        } else {
+          completion.handleExit(0)
+        }
+        if (phase !== 'ordinary completion') {
+          completion.handleExit(0, exitOptions)
+        }
+      }
+      expect(markDispatchResult).toHaveBeenCalledExactlyOnceWith(
+        expect.objectContaining({ runId: 'run-1', status: 'completed', error: null })
+      )
+      expect(close).not.toHaveBeenCalled()
+      expect(hibernate).not.toHaveBeenCalled()
+      expect(store.getState().activeTabId).toBe(selected.id)
+      expect(store.getState().lastTerminalInputAtByPaneKey[paneKey]).toBeUndefined()
+      finishResult()
+      await settlement
+      await vi.waitFor(() =>
+        expect(finalize).toHaveBeenCalledExactlyOnceWith({ preservePane: false })
+      )
+      if (phase === 'ordinary completion') {
+        await vi.waitFor(() => expect(markDispatchResult).toHaveBeenCalledTimes(2))
+        expect(close).toHaveBeenCalledExactlyOnceWith(tab.id, {
+          recordInteraction: false,
+          reason: 'cleanup'
+        })
+        expect(store.getState().tabsByWorktree[worktree.id].some((t) => t.id === tab.id)).toBe(
+          false
+        )
+        expect(store.getState().ptyIdsByTabId[tab.id]).toBeUndefined()
+        expect(release).not.toHaveBeenCalled()
+      } else {
+        expect(markDispatchResult).toHaveBeenCalledOnce()
+        expect(close).not.toHaveBeenCalled()
+        expect(store.getState().tabsByWorktree[worktree.id].find((t) => t.id === tab.id)).toBe(tab)
+        expect(store.getState().ptyIdsByTabId[tab.id]).toEqual(['pty-B'])
+        expect(store.getState().terminalLayoutsByTabId[tab.id]).toBe(layout)
+        expect(store.getState().lastKnownRelayPtyIdByTabId[tab.id]).toBe('pty-B')
+        expect(release).toHaveBeenCalled()
+      }
+      expect(hibernate).not.toHaveBeenCalled()
+      expect(store.getState().tabsByWorktree[worktree.id].find((t) => t.id === selected.id)).toBe(
+        selected
+      )
+      expect(store.getState().activeTabId).toBe(selected.id)
+      expect(store.getState().lastTerminalInputAtByPaneKey[paneKey]).toBeUndefined()
+      ownership.release()
+    } finally {
+      bindingStore = null
+      vi.unstubAllGlobals()
+    }
+  })
 })
diff --git a/src/renderer/src/lib/agent-background-session-contract.ts b/src/renderer/src/lib/agent-background-session-contract.ts
index bda9de8eac16..f1e0380b43bc 100644
--- a/src/renderer/src/lib/agent-background-session-contract.ts
+++ b/src/renderer/src/lib/agent-background-session-contract.ts
@@ -3,6 +3,7 @@ import type { LaunchSource } from '../../../shared/telemetry-events'
 import type { TuiAgent } from '../../../shared/tui-agent'
 import type { AgentStartupPlan } from '@/lib/tui-agent-startup'
 import type { AutomationTerminalOwnership } from '@/lib/automation-terminal-ownership'
+import type { PtyExitOptions } from '@/components/terminal-pane/pty-exit-delivery'
 
 export type LaunchAgentBackgroundSessionArgs = {
   agent: TuiAgent
@@ -13,7 +14,7 @@ export type LaunchAgentBackgroundSessionArgs = {
   launchSource?: LaunchSource
   title?: string
   onData?: (chunk: string) => void
-  onExit?: (ptyId: string, code: number) => void
+  onExit?: (ptyId: string, code: number, options?: PtyExitOptions) => void
   onAgentStatus?: (payload: ParsedAgentStatusPayload) => void
 }
 
diff --git a/src/renderer/src/lib/automation-session-observer.ts b/src/renderer/src/lib/automation-session-observer.ts
index cc5854df21b7..2100456b6737 100644
--- a/src/renderer/src/lib/automation-session-observer.ts
+++ b/src/renderer/src/lib/automation-session-observer.ts
@@ -1,5 +1,6 @@
 import { subscribeToPtyData } from '@/components/terminal-pane/pty-data-sidecar-subscriptions'
 import { subscribeToPtyExit } from '@/components/terminal-pane/pty-dispatcher'
+import type { PtyExitOptions } from '@/components/terminal-pane/pty-exit-delivery'
 import { callRuntimeRpc } from '@/runtime/runtime-rpc-client'
 import { getRemoteRuntimeTerminalMultiplexer } from '@/runtime/remote-runtime-terminal-multiplexer'
 import { isRemoteRuntimePtyId } from '../../../shared/remote-runtime/remote-runtime-pty-id'
@@ -18,7 +19,7 @@ export async function observeExistingAutomationSession(args: {
   runId: string
   onData: (chunk: string) => void
   onAgentStatus: (payload: ParsedAgentStatusPayload) => void
-  onExit: (code: number) => void
+  onExit: (code: number, options?: PtyExitOptions) => void
 }): Promise<() => void> {
   const { ptyId, paneKey, runId, onData, onExit } = args
   // Main owns local/SSH OSC 9999 writes unless the kill switch restores legacy behavior; runtime bytes still need renderer writes. Completion callbacks always fire here.
@@ -97,7 +98,13 @@ export async function observeExistingAutomationSession(args: {
   }
 
   const unsubscribeData = subscribeToPtyData(ptyId, handleData)
-  const unsubscribeExit = subscribeToPtyExit(ptyId, onExit)
+  const unsubscribeExit = subscribeToPtyExit(ptyId, (code, context) => {
+    if (context.exitOptions?.preserveRendererBinding) {
+      onExit(code, context.exitOptions)
+    } else {
+      onExit(code)
+    }
+  })
   return () => {
     unsubscribeData()
     unsubscribeExit()
diff --git a/src/renderer/src/lib/automation-terminal-ownership.test.ts b/src/renderer/src/lib/automation-terminal-ownership.test.ts
index 836582286904..7e18abb36d21 100644
--- a/src/renderer/src/lib/automation-terminal-ownership.test.ts
+++ b/src/renderer/src/lib/automation-terminal-ownership.test.ts
@@ -262,12 +262,14 @@ describe('automation terminal ownership', () => {
   })
 
   it('release consumes ownership without closing the terminal', async () => {
-    const { closeTab, store } = createStore()
+    const { closeTab, shutdownCompletedAgentPaneForHibernation, store } = createStore()
     const ownership = own(store)
 
     ownership.release()
 
     expect(await ownership.finalize({ preservePane: false })).toBeNull()
+    expect(await ownership.finalize({ preservePane: true })).toBeNull()
     expect(closeTab).not.toHaveBeenCalled()
+    expect(shutdownCompletedAgentPaneForHibernation).not.toHaveBeenCalled()
   })
 })
diff --git a/src/renderer/src/lib/launch-agent-background-session.test.ts b/src/renderer/src/lib/launch-agent-background-session.test.ts
index d18b4f8c6120..2f13147a6ace 100644
--- a/src/renderer/src/lib/launch-agent-background-session.test.ts
+++ b/src/renderer/src/lib/launch-agent-background-session.test.ts
@@ -530,7 +530,8 @@ describe('launchAgentBackgroundSession', () => {
       }
       // A primary and the captured persistent sidecar may both see the same physical exit.
       sidecar(0, { hadPrimary: true, exitOptions })
-      expect(onExit).toHaveBeenCalledExactlyOnceWith('pty-1', 0)
+      expect(onExit).toHaveBeenCalledExactlyOnceWith('pty-1', 0, exitOptions)
+      expect(onExit.mock.calls[0]?.[2]).toBe(exitOptions)
       expect(unsubscribeData).toHaveBeenCalledOnce()
       expect(unsubscribeExit).toHaveBeenCalledOnce()
       expect(store.getState().agentLaunchConfigByPaneKey[result.paneKey]).toBeUndefined()
diff --git a/src/renderer/src/lib/launch-agent-background-session.ts b/src/renderer/src/lib/launch-agent-background-session.ts
index 0ea838140518..0b621b89f434 100644
--- a/src/renderer/src/lib/launch-agent-background-session.ts
+++ b/src/renderer/src/lib/launch-agent-background-session.ts
@@ -125,7 +125,11 @@ export async function launchAgentBackgroundSession(
       settleTabPtyBinding(tab.id, exitPtyId, code, options)
     }
     useAppStore.getState().clearAgentLaunchConfig(paneKey)
-    onExit?.(exitPtyId, code)
+    if (options?.preserveRendererBinding) {
+      onExit?.(exitPtyId, code, options)
+    } else {
+      onExit?.(exitPtyId, code)
+    }
   }
   // Main owns local/SSH status scanning; runtime bytes still need renderer-side writes.
   const mainOwnsAgentStatusWrites = isMainTerminalSideEffectAuthorityForPty({
diff --git a/tests/e2e/helpers/native-chat-switch-readable-source.ts b/tests/e2e/helpers/native-chat-switch-readable-source.ts
index 5f53bac996f7..f2f80b14cd8a 100644
--- a/tests/e2e/helpers/native-chat-switch-readable-source.ts
+++ b/tests/e2e/helpers/native-chat-switch-readable-source.ts
@@ -1,4 +1,4 @@
-import { writeFile } from 'node:fs/promises'
+import { mkdir, writeFile } from 'node:fs/promises'
 import { join } from 'node:path'
 import { expect, vi } from 'vitest'
 import * as cliTranscript from '../../../src/main/ai-vault/structured-chat-cli-fork'
@@ -25,7 +25,10 @@ export async function prepareReadableSwitchSource(rig: RestTestRig, workspaceId:
   const record = rig.store.getRecord(HOST_TEST_SESSION)!
   const head = agentSessionProviderHandleChainHead(record.providerHandleChain)!
   const nativeId = head.handle.nativeId
-  const filePath = join(rig.root, 'readable.jsonl')
+  const codexHome = join(rig.root, 'codex-home')
+  const sessionsDir = join(codexHome, 'sessions')
+  await mkdir(sessionsDir, { recursive: true })
+  const filePath = join(sessionsDir, 'readable.jsonl')
   await writeFile(
     filePath,
     `${[
@@ -68,7 +71,7 @@ export async function prepareReadableSwitchSource(rig: RestTestRig, workspaceId:
       sessionId: nativeId,
       filePath,
       cwd: rig.root,
-      codexHome: null,
+      codexHome,
       executionHostPlatform: process.platform
     }
   })

From 7ef350610964eb8cebb75ff1e7df7daa6142d750 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 10:41:39 -0700
Subject: [PATCH 123/207] Preserve explicit Stop outcomes when switching from
 CLI

---
 ...ructured-agent-session-at-rest-catch-up.ts |   6 +-
 ...ctured-agent-session-switch-import.test.ts | 182 +++++++++++++++++-
 .../structured-agent-session-switch-import.ts |  15 +-
 3 files changed, 192 insertions(+), 11 deletions(-)

diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.ts
index d28884ce94d7..4aa53d512d7c 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.ts
@@ -111,7 +111,11 @@ export async function catchUpStructuredSessionAtRest(input: {
           kind: 'turn',
           turnId: turn,
           state: lifecycle.state,
-          ...(lifecycle.outcome ? { outcome: lifecycle.outcome } : {}),
+          ...(lifecycle.outcome
+            ? { outcome: lifecycle.outcome }
+            : lifecycle.state === 'interrupted' && turn === input.stoppedTurnId
+              ? { outcome: 'cancellation' as const }
+              : {}),
           ...(lifecycle.timestamp === null ? {} : { completedAt: lifecycle.timestamp })
         },
         ownerFence: 0,
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.test.ts
index 4d9ba80ab37f..bce230547583 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.test.ts
@@ -4,6 +4,11 @@ import { join } from 'node:path'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import { writeCodexHistoryFixture } from '../agent-session-journal/codex-history-test-fixture'
 import { agentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
+import { agentTurnVerdict } from '../../../shared/agent-turn-outcome'
+import { agentVerdictDisplayMark } from '../../../shared/agent-main-agent-verdict'
+import { withNativeChatCutTurnNotices } from '../../../shared/native-chat/transcript/native-chat-cut-turn-notice'
+import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key'
+import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types'
 import {
   claudeProviderHandle,
   codexProviderHandle
@@ -11,6 +16,7 @@ import {
 import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
 import { createTrackedJournalOpener } from '../agent-session-journal/journal-host-database-test-support'
 import { importLegacyTranscriptIntoJournal } from '../agent-session-journal/journal-legacy-import'
+import { catchUpStructuredSessionAtRest } from './structured-agent-session-at-rest-catch-up'
 import {
   captureSwitchStoppedCliTurn,
   catchUpSwitchedCliTranscript
@@ -125,10 +131,7 @@ it.each([
       return journal
     }
     const turns = (journal: AgentSessionJournal) =>
-      journal
-        .snapshot()
-        .items.filter((item) => item.body.kind === 'turn')
-        .map((item) => item.body)
+      journal.snapshot().items.flatMap(({ body }) => (body.kind === 'turn' ? [body] : []))
     const blocks = (journal: AgentSessionJournal) =>
       journal
         .snapshot()
@@ -152,9 +155,21 @@ it.each([
     ).toHaveLength(1)
     expect(blocks(journal)).toContain('tool-call')
     await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline, stopped })
-    expect(turns(journal)).toEqual([expect.objectContaining({ state: 'interrupted' })])
+    expect(turns(journal)).toEqual([
+      expect.objectContaining({ state: 'interrupted', outcome: 'cancellation' })
+    ])
     expect(journal.snapshot().items.filter(({ body }) => body.kind !== 'turn')).toEqual(content)
     const interrupted = journal.snapshot()
+    const [turn] = turns(journal)
+    const verdict = agentTurnVerdict({ state: turn!.state, outcome: turn!.outcome ?? null })
+    expect(verdict).toBe('cancellation')
+    expect(
+      agentVerdictDisplayMark({
+        state: 'done',
+        mainAgent: { state: 'done', outcome: verdict ?? undefined }
+      })
+    ).toBe('interrupted')
+    expect(withNativeChatCutTurnNotices(interrupted.items)).toBe(interrupted.items)
     await journal.close()
     journal = await journals.open({
       ...recordedOptions,
@@ -162,6 +177,163 @@ it.each([
     })
     await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline, stopped })
     expect(journal.snapshot()).toEqual(interrupted)
+    if (agent === 'claude') {
+      const prefix = await readFile(filePath, 'utf8')
+      const assistant = JSON.parse(prefix.trimEnd().split('\n').at(-1)!)
+      expect(typeof assistant.uuid).toBe('string')
+      await writeFile(
+        filePath,
+        `${prefix}${JSON.stringify({
+          type: 'user',
+          uuid: 'interrupted-cli-turn',
+          sessionId: recordedId,
+          interruptedMessageId: assistant.uuid,
+          timestamp: new Date(Date.parse(assistant.timestamp) + 1).toISOString(),
+          message: {
+            role: 'user',
+            content: [{ type: 'text', text: '[Request interrupted by user]' }]
+          }
+        })}\n`
+      )
+      const historyWithMarker = await imported('historical-interruption-marker')
+      await catchUpSwitchedCliTranscript({ journal: historyWithMarker, source, fence: 1, deadline })
+      const [historicalTurn] = turns(historyWithMarker)
+      expect(historicalTurn).toMatchObject({ state: 'interrupted', turnId: stopped!.turnId })
+      expect(historicalTurn!.outcome).toBeUndefined()
+      expect(agentTurnVerdict({ state: historicalTurn!.state, outcome: null })).toBe('interruption')
+      const historyItems = historyWithMarker.snapshot().items
+      expect(withNativeChatCutTurnNotices(historyItems)).toHaveLength(historyItems.length + 1)
+      const stoppedWithMarker = await imported('stopped-interruption-marker')
+      await catchUpSwitchedCliTranscript({
+        journal: stoppedWithMarker,
+        source,
+        fence: 1,
+        deadline,
+        stopped
+      })
+      expect(turns(stoppedWithMarker)).toEqual([
+        expect.objectContaining({
+          state: 'interrupted',
+          turnId: stopped!.turnId,
+          outcome: 'cancellation'
+        })
+      ])
+      const stoppedItems = stoppedWithMarker.snapshot().items
+      expect(withNativeChatCutTurnNotices(stoppedItems)).toBe(stoppedItems)
+      const stoppedSnapshot = stoppedWithMarker.snapshot()
+      await catchUpSwitchedCliTranscript({
+        journal: stoppedWithMarker,
+        source,
+        fence: 1,
+        deadline,
+        stopped
+      })
+      expect(stoppedWithMarker.snapshot()).toEqual(stoppedSnapshot)
+    }
+    if (agent === 'codex') {
+      const prefix = await readFile(filePath, 'utf8')
+      const started = prefix
+        .trimEnd()
+        .split('\n')
+        .map((line) => JSON.parse(line))
+        .find((row) => row.type === 'event_msg' && row.payload.type === 'task_started')
+      expect(started.payload.turn_id).toBe(stopped!.turnId)
+      await writeFile(
+        filePath,
+        `${prefix}${JSON.stringify({
+          type: 'event_msg',
+          timestamp: new Date(Date.parse(started.timestamp) + 1).toISOString(),
+          payload: { type: 'turn_aborted', turn_id: stopped!.turnId }
+        })}\n`
+      )
+      const canonicalTurn = agentJournalItemKey({
+        provider: 'legacy',
+        agent,
+        sessionId: recordedId,
+        recordId: `turn-lifecycle:${stopped!.turnId}`
+      })
+      for (const personalStop of [false, true]) {
+        const nativeOptions = {
+          ...recordedOptions,
+          identity: {
+            ...recordedOptions.identity,
+            sessionId: personalStop ? 'at-rest-stopped' : 'at-rest-historical'
+          }
+        }
+        let retained = await journals.open(nativeOptions)
+        await retained.appendItem(
+          { provider: 'codex', threadId: recordedId, turnId: 'prior-native-turn', ordinal: 0 },
+          { kind: 'turn', turnId: 'prior-native-turn', state: 'completed', outcome: 'success' },
+          { fence: 1, turnScope: AGENT_JOURNAL_THREAD_SCOPE }
+        )
+        const nativeItems = retained.snapshot().items
+        expect(turns(retained)).toHaveLength(1)
+        expect(retained.item(canonicalTurn)).toBeNull()
+        await catchUpStructuredSessionAtRest({
+          journal: retained,
+          threadId: recordedId,
+          filePath,
+          fence: 1,
+          deadline,
+          stoppedTurnId: personalStop ? stopped!.turnId : undefined,
+          check: deadline.check
+        })
+        const firstEnd = retained.item(canonicalTurn)
+        expect(firstEnd?.body).toEqual({
+          kind: 'turn',
+          turnId: stopped!.turnId,
+          state: 'interrupted',
+          ...(personalStop ? { outcome: 'cancellation' } : {}),
+          completedAt: Date.parse(started.timestamp) + 1
+        })
+        expect(retained.snapshot().items.slice(0, nativeItems.length)).toEqual(nativeItems)
+        await catchUpSwitchedCliTranscript({
+          journal: retained,
+          source,
+          fence: 1,
+          deadline,
+          stopped: personalStop ? stopped : undefined
+        })
+        expect(retained.item(canonicalTurn)).toEqual(firstEnd)
+        const ended = turns(retained).at(-1)!
+        const verdict = agentTurnVerdict({ state: ended.state, outcome: ended.outcome ?? null })
+        expect(verdict).toBe(personalStop ? 'cancellation' : 'interruption')
+        expect(
+          agentVerdictDisplayMark({
+            state: 'done',
+            mainAgent: { state: 'done', outcome: verdict! }
+          })
+        ).toBe(personalStop ? 'interrupted' : 'failed')
+        const snapshot = retained.snapshot()
+        if (personalStop) {
+          expect(withNativeChatCutTurnNotices(snapshot.items)).toBe(snapshot.items)
+        } else {
+          expect(withNativeChatCutTurnNotices(snapshot.items)).toHaveLength(
+            snapshot.items.length + 1
+          )
+        }
+        await retained.close()
+        retained = await journals.open(nativeOptions)
+        await catchUpStructuredSessionAtRest({
+          journal: retained,
+          threadId: recordedId,
+          filePath,
+          fence: 1,
+          deadline,
+          stoppedTurnId: stopped!.turnId,
+          check: deadline.check
+        })
+        await catchUpSwitchedCliTranscript({
+          journal: retained,
+          source,
+          fence: 1,
+          deadline,
+          stopped
+        })
+        expect(retained.canonicalItemId(canonicalTurn)).toBe(canonicalTurn)
+        expect(retained.snapshot()).toEqual(snapshot)
+      }
+    }
     await install(true)
     const completed = await imported('completed-recording')
     await catchUpSwitchedCliTranscript({ journal: completed, source, fence: 1, deadline, stopped })
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.ts
index 8ed2900f5037..4a80b0cb690c 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.ts
@@ -109,12 +109,14 @@ export async function catchUpSwitchedCliTranscript(input: {
   const items = prepared.items
   const user = lastUser(items)
   const userKey = user && agentJournalItemKey(user.identity)
+  const latest = prepared.latestTurn
   const interrupted =
     input.stopped?.sessionId === input.source.sessionId &&
     input.stopped.userItemKey === userKey &&
-    (!prepared.latestTurn ||
-      (prepared.latestTurn.turnId === input.stopped.turnId &&
-        prepared.latestTurn.state === 'working'))
+    (!latest ||
+      (latest.turnId === input.stopped.turnId &&
+        (latest.state === 'working' ||
+          (latest.state === 'interrupted' && latest.outcome === undefined))))
   const covered = switchTranscriptNativeCoverage({
     agent: input.source.agent,
     providerSessionId: input.source.sessionId,
@@ -126,7 +128,6 @@ export async function catchUpSwitchedCliTranscript(input: {
     input.source.agent === 'codex'
       ? []
       : items.filter((item) => !covered.has(agentJournalItemKey(item.identity)))
-  const latest = prepared.latestTurn
   const ended =
     latest && latest.state !== 'working' ? { ...latest, state: latest.state } : undefined
   const turnId = interrupted ? input.stopped?.turnId : ended?.turnId
@@ -145,7 +146,11 @@ export async function catchUpSwitchedCliTranscript(input: {
         turnId,
         userItemId: userKey,
         state: interrupted ? 'interrupted' : ended!.state,
-        ...(ended?.outcome ? { outcome: ended.outcome } : {}),
+        ...(interrupted
+          ? { outcome: 'cancellation' as const }
+          : ended?.outcome
+            ? { outcome: ended.outcome }
+            : {}),
         ...(ended?.timestamp == null ? {} : { completedAt: ended.timestamp })
       }
     })

From 4a19afd6f9b0300e017740058ebf27ade6e4d769 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 15:03:26 -0700
Subject: [PATCH 124/207] Show Interrupted for a user Stop the host could not
 time

A user's Stop on a native chat turn read as a failure when the host had no
timing for the stopped turn. The turn status now derives "Interrupted" from
the stop itself, on desktop and phone, and the copy no longer names internals.
---
 .../native-chat-turn-status-copy.ts           |   1 +
 .../MobileNativeChatTurnStatus.test.ts        |  79 +++++++++++++
 .../transcript/MobileNativeChatTurnStatus.tsx |   2 +-
 ...NativeChatMessageList.turn-status.test.tsx | 110 +++++++++++++++++-
 ...ucturedSession.history-read-state.test.tsx |   3 +-
 .../native-chat/NativeChatWorkingStatus.tsx   |  22 +++-
 .../ai-vault-history-native-return.test.tsx   |   3 +-
 src/shared/native-chat-turn-status.ts         |  11 +-
 .../structured-agent-session-turn-timing.ts   |  38 ++++--
 9 files changed, 246 insertions(+), 23 deletions(-)

diff --git a/mobile/src/session/native-chat/native-chat-turn-status-copy.ts b/mobile/src/session/native-chat/native-chat-turn-status-copy.ts
index 1c1d60a85343..19c6467ca010 100644
--- a/mobile/src/session/native-chat/native-chat-turn-status-copy.ts
+++ b/mobile/src/session/native-chat/native-chat-turn-status-copy.ts
@@ -55,6 +55,7 @@ export function nativeChatTurnStatusCopy(t: Translate, value0?: string) {
     interruptedAfter: t('chat.turnStatus.interruptedAfter', 'Interrupted after {{value0}}', {
       value0
     }),
+    interrupted: t('worktree.agentRowDisplay.interrupted', 'Interrupted'),
     failedAfter: t('chat.turnStatus.failedAfter', 'Failed after {{value0}}', { value0 }),
     toggleDetails: t('chat.turnStatus.toggleDetails', 'Toggle turn details'),
     responding: t('chat.turnStatus.responding', 'Agent is responding')
diff --git a/mobile/src/session/native-chat/transcript/MobileNativeChatTurnStatus.test.ts b/mobile/src/session/native-chat/transcript/MobileNativeChatTurnStatus.test.ts
index 43bf961fa120..3c6ebd1a3d2a 100644
--- a/mobile/src/session/native-chat/transcript/MobileNativeChatTurnStatus.test.ts
+++ b/mobile/src/session/native-chat/transcript/MobileNativeChatTurnStatus.test.ts
@@ -39,6 +39,9 @@ vi.mock('react-native', async () => {
 vi.mock('lucide-react-native', () => ({ ChevronRight: 'ChevronRight' }))
 
 import { MobileNativeChatTurnStatus } from './MobileNativeChatTurnStatus'
+import type { AgentJournalRenderItem } from '../../../../../src/shared/agent-session-journal-types'
+import { selectStructuredAgentTurnBars } from '../../../../../src/shared/structured-agent-session-turn-timing'
+import { activateMobileUiLocale, getMobileUiLocale } from '../../../i18n/mobile-i18n'
 import {
   findAllByHostType,
   findByHostType
@@ -133,6 +136,82 @@ describe('MobileNativeChatTurnStatus', () => {
     expect(labels(tree.root)).toEqual(['Worked for 5s'])
   })
 
+  it('renders selector-derived untimed cancellation in Spanish without a clock across resume, preserving timed cancellation', async () => {
+    const items: AgentJournalRenderItem[] = [
+      {
+        itemId: 'stopped-user',
+        revision: 0,
+        sequence: 1,
+        observedAt: 1_000,
+        body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'Hello' }] }
+      },
+      {
+        itemId: 'stopped-turn',
+        revision: 0,
+        sequence: 2,
+        observedAt: 22_000,
+        body: {
+          kind: 'turn',
+          turnId: 'stopped',
+          userItemId: 'stopped-user',
+          state: 'interrupted',
+          outcome: 'cancellation'
+        }
+      }
+    ]
+    const bars = selectStructuredAgentTurnBars(items, [], null)
+    const stopped = bars.settledTurns.get('stopped-user')
+    expect(stopped).toEqual({ startedAt: null, workedSeconds: null, verdict: 'cancellation' })
+    expect(bars.runningTiming).toBeNull()
+    if (!stopped) {
+      throw new Error('Expected the canonical stopped turn status')
+    }
+    const previousLocale = getMobileUiLocale()
+    try {
+      await activateMobileUiLocale('es')
+      act(() => {
+        renderer = create(createElement(MobileNativeChatTurnStatus, stopped))
+      })
+      const mounted = renderer
+      if (!mounted) {
+        throw new Error('Expected the mounted turn status')
+      }
+      expect(labels(mounted.root)).toEqual(['Interrumpido'])
+      expect(vi.getTimerCount()).toBe(0)
+      const clockReads = vi.spyOn(Date, 'now')
+      act(() => vi.advanceTimersByTime(12_000))
+      changeAppState('background')
+      act(() => vi.advanceTimersByTime(60_000))
+      expect(vi.getTimerCount()).toBe(0)
+      changeAppState('active')
+      act(() => vi.advanceTimersByTime(12_000))
+      expect(labels(mounted.root)).toEqual(['Interrumpido'])
+      expect(vi.getTimerCount()).toBe(0)
+      expect(clockReads).not.toHaveBeenCalled()
+
+      const timed = selectStructuredAgentTurnBars(
+        items.map((item) =>
+          item.body.kind === 'turn'
+            ? { ...item, body: { ...item.body, startedAt: 10_000, completedAt: 22_000 } }
+            : item
+        ),
+        [],
+        null
+      ).settledTurns.get('stopped-user')
+      expect(timed).toEqual({ startedAt: 10_000, workedSeconds: 12, verdict: 'cancellation' })
+      if (!timed) {
+        throw new Error('Expected the timed stopped turn status')
+      }
+      act(() => mounted.update(createElement(MobileNativeChatTurnStatus, timed)))
+      expect(labels(mounted.root)).toEqual(['Interrumpido tras 12 s'])
+      expect(vi.getTimerCount()).toBe(0)
+    } finally {
+      act(() => renderer?.unmount())
+      renderer = null
+      await activateMobileUiLocale(previousLocale)
+    }
+  })
+
   it('holds no interval once the turn has settled', () => {
     render({ startedAt: Date.now(), workedSeconds: 5 })
     expect(vi.getTimerCount()).toBe(0)
diff --git a/mobile/src/session/native-chat/transcript/MobileNativeChatTurnStatus.tsx b/mobile/src/session/native-chat/transcript/MobileNativeChatTurnStatus.tsx
index ac663bde9d92..531aeb6947b1 100644
--- a/mobile/src/session/native-chat/transcript/MobileNativeChatTurnStatus.tsx
+++ b/mobile/src/session/native-chat/transcript/MobileNativeChatTurnStatus.tsx
@@ -37,7 +37,7 @@ export function MobileNativeChatTurnStatus({
   useMobileColorScheme()
   const t = useMobileTranslation()
   const settled = workedSeconds != null
-  const elapsedSeconds = useElapsedSeconds(startedAt, !settled)
+  const elapsedSeconds = useElapsedSeconds(startedAt, !settled && verdict !== 'cancellation')
   const label = formatMobileNativeChatTurnStatusLabel({ workedSeconds, elapsedSeconds, verdict }, t)
 
   if (settled && onToggleExpanded) {
diff --git a/src/renderer/src/components/native-chat/NativeChatMessageList.turn-status.test.tsx b/src/renderer/src/components/native-chat/NativeChatMessageList.turn-status.test.tsx
index 42873370f3d0..71932b10569e 100644
--- a/src/renderer/src/components/native-chat/NativeChatMessageList.turn-status.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatMessageList.turn-status.test.tsx
@@ -2,6 +2,9 @@
 
 import '@testing-library/jest-dom/vitest'
 
+import { mkdtemp, readFile, rm, writeFile } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
 import { cleanup, screen } from '@testing-library/react'
 import { render } from './native-chat-tooltip-test-harness'
 import { afterAll, afterEach, beforeAll, describe, expect, it, vi } from 'vitest'
@@ -33,7 +36,18 @@ import type {
   AgentJournalTurnItem
 } from '../../../../shared/agent-session-journal-types'
 import type { NativeChatMessage } from '../../../../shared/native-chat-types'
-import { selectStructuredAgentSettledTurns } from '../../../../shared/structured-agent-session-turn-timing'
+import {
+  selectStructuredAgentSettledTurns,
+  selectStructuredAgentTurnBars
+} from '../../../../shared/structured-agent-session-turn-timing'
+import { agentSessionSwitchDeadline } from '../../../../shared/agent-session-switch-execution'
+import { claudeProviderHandle } from '../../../../shared/agent-session-provider-handle-encoding'
+import { createTrackedJournalOpener } from '../../../../main/native-chat/agent-session-journal/journal-host-database-test-support'
+import { importLegacyTranscriptIntoJournal } from '../../../../main/native-chat/agent-session-journal/journal-legacy-import'
+import {
+  captureSwitchStoppedCliTurn,
+  catchUpSwitchedCliTranscript
+} from '../../../../main/native-chat/agent-session-wire/structured-agent-session-switch-import'
 import type { NativeChatLiveSession } from './use-native-chat-live-session'
 import { NativeChatMessageList } from './NativeChatMessageList'
 import { installNativeChatMessageListTestViewport } from './native-chat-message-list-test-viewport'
@@ -148,6 +162,100 @@ const usageLimitView = {
   }
 
   describe('NativeChatMessageList folded turn headers', () => {
+    it('renders an imported explicit Stop without inventing elapsed time and keeps timed cancellation', async () => {
+      const root = await mkdtemp(join(tmpdir(), 'orca-renderer65-stop-import-'))
+      const journals = createTrackedJournalOpener()
+      const deadline = agentSessionSwitchDeadline()
+      try {
+        const recording = await readFile(
+          join(
+            import.meta.dirname,
+            '../../../../main/native-chat/agent-session-wire/__fixtures__/claude-cli-switch-2.1.302.jsonl'
+          ),
+          'utf8'
+        )
+        const rows = recording.trimEnd().split('\n')
+        const sessionId: string = JSON.parse(rows[0]!).sessionId
+        const filePath = join(root, 'cli.jsonl')
+        await writeFile(filePath, `${rows.slice(0, 2).join('\n')}\n`)
+        const source = { agent: 'claude' as const, sessionId, filePath }
+        const imported = await journals.open({
+          stateDirectory: root,
+          identity: {
+            sessionId: 'imported-stop',
+            workspaceId: 'folder',
+            hostId: 'local',
+            agent: 'claude',
+            providerHandle: claudeProviderHandle(sessionId, null)
+          }
+        })
+        expect(
+          await importLegacyTranscriptIntoJournal({
+            journal: imported,
+            agent: 'claude',
+            sessionId,
+            fence: 1,
+            options: { filePath }
+          })
+        ).toMatchObject({ ok: true, replaced: true })
+        expect(
+          selectStructuredAgentTurnBars(imported.snapshot().items, [], null).settledTurns.size
+        ).toBe(0)
+        const stopped = await captureSwitchStoppedCliTurn(source, true, deadline)
+        if (!stopped) {
+          throw new Error('Expected the recorded CLI turn to be working')
+        }
+        await catchUpSwitchedCliTranscript({
+          journal: imported,
+          source,
+          fence: 1,
+          deadline,
+          stopped
+        })
+        const snapshot = imported.snapshot()
+        const lifecycle = snapshot.items.find(({ body }) => body.kind === 'turn')
+        expect(lifecycle?.body).toMatchObject({
+          state: 'interrupted',
+          outcome: 'cancellation',
+          turnId: stopped.turnId
+        })
+        expect(lifecycle?.body).not.toHaveProperty('startedAt')
+        const items = [...snapshot.items, ...journal()]
+        const bars = selectStructuredAgentTurnBars(items, [], null)
+        expect(bars.settledTurns.get(stopped.userItemKey)).toEqual({
+          startedAt: null,
+          workedSeconds: null,
+          verdict: 'cancellation'
+        })
+        expect(bars.runningTiming).toBeNull()
+        render(
+          <NativeChatMessageList
+            session={{
+              ...session(),
+              agent: 'claude',
+              messages: projectStructuredAgentSessionMessages(items, [], [])
+            }}
+            journalItems={items}
+            settledTurns={bars.settledTurns}
+            isWorking={false}
+            expandSignal={false}
+          />
+        )
+        expect(
+          screen.getByText('Interrupted').closest('[data-native-chat-turn-status]')
+        ).toHaveAttribute('data-native-chat-turn-status', 'settled')
+        expect(screen.getByText('Interrupted after 12s')).toBeInTheDocument()
+        expect(screen.getAllByText('Worked for 12s')).toHaveLength(2)
+        expect(screen.queryByText(/^Working for/)).toBeNull()
+        expect(imported.snapshot()).toEqual(snapshot)
+      } finally {
+        cleanup()
+        deadline.dispose()
+        await journals.closeAll()
+        await rm(root, { recursive: true, force: true })
+      }
+    })
+
     it('says a crash-cut turn worked like a finished one and a stopped turn was interrupted', () => {
       render(
         <NativeChatMessageList
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx
index 72176c574e07..3f4942027a41 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx
@@ -13,6 +13,7 @@ import { NativeChatStructuredSession } from './NativeChatStructuredSession'
 import { setLocalRuntimeCapabilitiesForTests } from '@/runtime/local-runtime-capabilities'
 import { createCompatibleRuntimeStatusResponse } from '@/runtime/runtime-compatibility-test-fixture'
 import type { RuntimeStatus } from '../../../../shared/runtime-types'
+import { inPlaceSwitchCapability } from '../../../../shared/structured-agent-cli-conversation-adoption'
 
 const { mocks, moduleFactories, resetStructuredSessionMocks } = await vi.hoisted(async () =>
   (await import('./NativeChatStructuredSession.test-harness')).createStructuredSessionMocks()
@@ -314,7 +315,7 @@ it('gates the native header switch through capability hydration and live Chat UI
   await act(async () => {
     answer({
       ...response.result,
-      capabilities: ['agent-session.structured.switch.creation-settlement-v1:codex']
+      capabilities: [inPlaceSwitchCapability('codex')]
     })
     await status
   })
diff --git a/src/renderer/src/components/native-chat/NativeChatWorkingStatus.tsx b/src/renderer/src/components/native-chat/NativeChatWorkingStatus.tsx
index 131be325fd11..f7d8dee4380e 100644
--- a/src/renderer/src/components/native-chat/NativeChatWorkingStatus.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatWorkingStatus.tsx
@@ -29,6 +29,11 @@ function turnStatusLabel(
         NATIVE_CHAT_TURN_STATUS_COPY.interruptedAfter,
         { value0: duration }
       )
+    case 'interrupted':
+      return translate(
+        'auto.components.AgentStateDot.interrupted',
+        NATIVE_CHAT_TURN_STATUS_COPY.interrupted
+      )
     case 'failedAfter':
       return translate(
         'components.native-chat.status.failedAfter',
@@ -58,7 +63,8 @@ export function NativeChatWorkingStatus({
   expanded?: boolean
   onToggleExpanded?: () => void
 }): React.JSX.Element {
-  const elapsedSeconds = useNativeChatElapsedSeconds(startedAt, workedSeconds == null)
+  const settled = workedSeconds != null || verdict === 'cancellation'
+  const elapsedSeconds = useNativeChatElapsedSeconds(startedAt, !settled)
 
   const { key, duration } = describeNativeChatTurnStatus({
     workedSeconds,
@@ -104,11 +110,15 @@ export function NativeChatWorkingStatus({
   return (
     <div
       className={className}
-      data-native-chat-turn-status={workedSeconds == null ? 'active' : 'settled'}
-      aria-label={translate(
-        'components.native-chat.status.responding',
-        NATIVE_CHAT_TURN_STATUS_COPY.responding
-      )}
+      data-native-chat-turn-status={settled ? 'settled' : 'active'}
+      aria-label={
+        key === 'interrupted'
+          ? label
+          : translate(
+              'components.native-chat.status.responding',
+              NATIVE_CHAT_TURN_STATUS_COPY.responding
+            )
+      }
     >
       <span>{label}</span>
       {caret}
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx b/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx
index c5a1d5a0f08f..29a39a6a1ef1 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx
+++ b/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx
@@ -12,6 +12,7 @@ import {
   setLocalRuntimeCapabilitiesForTests
 } from '@/runtime/local-runtime-capabilities'
 import { STRUCTURED_AGENT_SESSION_RESUME_HISTORY_RUNTIME_CAPABILITY as HISTORY } from '../../../../shared/protocol-version'
+import { inPlaceSwitchCapability } from '../../../../shared/structured-agent-cli-conversation-adoption'
 import type { AiVaultSession } from '../../../../shared/ai-vault-types'
 import { AiVaultVirtualRow } from './AiVaultVirtualRow'
 import { useAiVaultPanelSessionResume } from './use-ai-vault-panel-session-resume'
@@ -54,7 +55,7 @@ vi.mock('@/lib/ai-vault-tab-title-requests', async (original) => ({
   collectAgentPaneConversations: mocks.panes
 }))
 
-const SWITCH = 'agent-session.structured.switch.creation-settlement-v1:codex'
+const SWITCH = inPlaceSwitchCapability('codex')
 const paired = {
   id: 'paired',
   name: 'Paired',
diff --git a/src/shared/native-chat-turn-status.ts b/src/shared/native-chat-turn-status.ts
index 0a6895a28953..c68f299ae1c3 100644
--- a/src/shared/native-chat-turn-status.ts
+++ b/src/shared/native-chat-turn-status.ts
@@ -13,6 +13,7 @@ export const NATIVE_CHAT_TURN_STATUS_COPY = {
   workingFor: 'Working for {{value0}}',
   workedFor: 'Worked for {{value0}}',
   interruptedAfter: 'Interrupted after {{value0}}',
+  interrupted: 'Interrupted',
   failedAfter: 'Failed after {{value0}}',
   toggleDetails: 'Toggle turn details',
   responding: 'Agent is responding'
@@ -48,12 +49,14 @@ export function describeNativeChatTurnStatus({
   /** User Stop/replacement means interrupted; failures mean failed. Crash/quit/eviction cuts use finished wording because a separate notice explains the stop. */
   verdict?: AgentTurnOutcome
 }): {
-  key: 'workingFor' | 'workedFor' | 'interruptedAfter' | 'failedAfter'
+  key: 'workingFor' | 'workedFor' | 'interruptedAfter' | 'interrupted' | 'failedAfter'
   duration: string
 } {
   return workedSeconds != null
     ? { key: settledTurnStatusKey(verdict), duration: formatNativeChatDuration(workedSeconds) }
-    : { key: 'workingFor', duration: formatNativeChatDuration(elapsedSeconds) }
+    : verdict === 'cancellation'
+      ? { key: 'interrupted', duration: '' }
+      : { key: 'workingFor', duration: formatNativeChatDuration(elapsedSeconds) }
 }
 
 function settledTurnStatusKey(
@@ -221,8 +224,8 @@ export function reduceNativeChatTurnTiming(
 /** A turn duration the execution host recorded, which outranks anything this
  *  platform observed locally. */
 export type NativeChatSettledTurn = {
-  startedAt: number
-  workedSeconds: number
+  startedAt: number | null
+  workedSeconds: number | null
   verdict?: AgentTurnOutcome
 }
 
diff --git a/src/shared/structured-agent-session-turn-timing.ts b/src/shared/structured-agent-session-turn-timing.ts
index 03a329ed8c18..694c48b19702 100644
--- a/src/shared/structured-agent-session-turn-timing.ts
+++ b/src/shared/structured-agent-session-turn-timing.ts
@@ -72,10 +72,12 @@ function readTiming(
   }
 }
 
-/** One root-turn scan, indexed by provider ID and opener/self anchor (structuredAgentTurnAnchors).
- * Omit untimed anchor rows unless explicitly unverifiable (null). */
+/** One root-turn scan; cancellation remains meaningful without a host clock. */
 type StructuredAgentJournalTurns = {
-  byAnchor: ReadonlyMap<string, StructuredAgentTurnTiming | null>
+  byAnchor: ReadonlyMap<
+    string,
+    { timing: StructuredAgentTurnTiming | null; verdict: AgentTurnOutcome | null }
+  >
   byTurnId: ReadonlyMap<string, StructuredAgentTurnTiming | null>
 }
 
@@ -84,7 +86,10 @@ function readStructuredAgentJournalTurns(
   submissions: readonly AgentJournalSubmission[] = []
 ): StructuredAgentJournalTurns {
   const anchors = structuredAgentTurnAnchors(items, submissions)
-  const byAnchor = new Map<string, StructuredAgentTurnTiming | null>()
+  const byAnchor = new Map<
+    string,
+    { timing: StructuredAgentTurnTiming | null; verdict: AgentTurnOutcome | null }
+  >()
   const byTurnId = new Map<string, StructuredAgentTurnTiming | null>()
   let precedingTurnEndedAt: number | undefined
   for (const item of items) {
@@ -94,10 +99,18 @@ function readStructuredAgentJournalTurns(
       continue
     }
     const timing = readTiming(item, precedingTurnEndedAt)
+    const verdict =
+      turn.state === 'interrupted'
+        ? agentTurnVerdict({ state: turn.state, outcome: readAgentJournalTurnOutcome(turn) })
+        : null
     precedingTurnEndedAt = timing?.completedAt ?? item.observedAt
     byTurnId.set(turn.turnId, timing)
-    if (timing || turn.state === 'unverifiable') {
-      byAnchor.set(anchor, timing)
+    if (
+      timing ||
+      turn.state === 'unverifiable' ||
+      (turn.state === 'interrupted' && verdict === 'cancellation')
+    ) {
+      byAnchor.set(anchor, { timing, verdict })
     }
   }
   return { byAnchor, byTurnId }
@@ -107,7 +120,12 @@ export function selectStructuredAgentTurnTimings(
   items: readonly AgentJournalRenderItem[],
   submissions: readonly AgentJournalSubmission[] = []
 ): ReadonlyMap<string, StructuredAgentTurnTiming | null> {
-  return readStructuredAgentJournalTurns(items, submissions).byAnchor
+  return new Map(
+    [...readStructuredAgentJournalTurns(items, submissions).byAnchor].flatMap(
+      ([anchor, { timing, verdict }]) =>
+        timing === null && verdict === 'cancellation' ? [] : [[anchor, timing] as const]
+    )
+  )
 }
 
 /** Null timing on older hosts without a host start lets surfaces fall back to local observation. */
@@ -172,12 +190,14 @@ function settledTurnsOf(
   submissions: readonly AgentJournalSubmission[]
 ): NativeChatSettledTurns {
   const settled = new Map<string, NativeChatSettledTurn | null>()
-  for (const [userItemId, timing] of turns.byAnchor) {
+  for (const [userItemId, { timing, verdict }] of turns.byAnchor) {
     const workedSeconds = completedStructuredAgentTurnSeconds(timing)
     settled.set(
       userItemId,
       workedSeconds === null || timing === null
-        ? null
+        ? verdict === 'cancellation'
+          ? { startedAt: timing?.startedAt ?? null, workedSeconds: null, verdict }
+          : null
         : {
             startedAt: timing.startedAt,
             workedSeconds,

From 7f5cc54937598fc6daa697880d993fb61c18b379 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 15:03:58 -0700
Subject: [PATCH 125/207] Make the switch's terminal an ordinary claim-carrying
 create

The chat-to-terminal switch spawned its terminal through a two-phase
prepare/commit protocol on the daemon with its own settlement records,
use-witness, protocol bump and long timers, all so a retry after a lost
connection could find the first spawn. Main already answers that question:
an agent-session claim on the spawn lets a retry adopt the terminal the
first attempt created, and pending-creation coalescing covers the window
in between.

The switch now builds one `createTerminal` with the conversation's claim,
`presentation: 'background'` and no published tab, through the same path
`ensureAgentSession` uses. The daemon, IPC spawn commit, local PTY provider
and spawn contracts go back to main's shapes; the daemon protocol stays at
54. Deadlines are 90s on the host and 105s on the client.
---
 src/main/daemon/client.ts                     |   4 +-
 src/main/daemon/daemon-client-connection.ts   |  23 --
 src/main/daemon/daemon-client-connections.ts  |   8 -
 src/main/daemon/daemon-client-rpc-request.ts  |  16 --
 .../daemon-create-or-attach-cancellation.ts   |  65 -----
 .../daemon-create-or-attach-contract.ts       |  31 ---
 .../daemon/daemon-create-or-attach-result.ts  |   3 -
 src/main/daemon/daemon-fenced-termination.ts  |  10 +-
 .../daemon-foreground-process-protocol.ts     |   1 -
 .../daemon/daemon-init-dependency-mocks.ts    |   4 -
 src/main/daemon/daemon-init-mock-types.ts     |   3 -
 .../daemon-init-restart-sequence.test.ts      |   8 -
 src/main/daemon/daemon-protocol-version.ts    |   6 +-
 src/main/daemon/daemon-provider-restart.ts    |   4 -
 ...on-pty-adapter-concurrent-recovery.test.ts |  94 +------
 ...tate.ts => daemon-pty-adapter-contract.ts} |   6 -
 ...pty-adapter-protocol-compatibility.test.ts |  28 +-
 ...apter-switch-compatibility.test-fixture.ts |  81 ------
 src/main/daemon/daemon-pty-adapter.ts         |  14 +-
 .../daemon/daemon-pty-connection-lifecycle.ts |   1 -
 src/main/daemon/daemon-pty-daemon-recovery.ts |   3 -
 .../daemon/daemon-pty-event-subscriptions.ts  |   4 +-
 .../daemon/daemon-pty-process-inspection.ts   |   5 -
 src/main/daemon/daemon-pty-runtime-state.ts   |  23 +-
 src/main/daemon/daemon-pty-session-spawn.ts   |  32 +--
 .../daemon-pty-spawn-preparation-release.ts   | 107 --------
 .../daemon-pty-spawn-preparation-state.ts     |  32 ---
 .../daemon-pty-spawn-preparations.test.ts     |  37 ---
 .../daemon/daemon-pty-spawn-preparations.ts   | 217 +--------------
 src/main/daemon/daemon-pty-spawn-request.ts   | 174 +++---------
 src/main/daemon/daemon-pty-spawn-result.ts    |  12 -
 .../daemon/daemon-pty-spawn-settlement.ts     | 259 ------------------
 src/main/daemon/daemon-request-router.ts      |   4 -
 ...on-server-async-spawn-cancellation.test.ts | 114 --------
 ...on-server-creation-failure.test-fixture.ts |  90 ------
 src/main/daemon/daemon-server.ts              |   6 +-
 .../daemon/daemon-spawn-result-identity.ts    |  11 +-
 src/main/daemon/daemon-terminal-admission.ts  | 100 +------
 src/main/daemon/session-input-path.ts         |   5 +-
 src/main/daemon/session-process-inspection.ts |   3 +-
 .../daemon/session-shell-ready-barrier.ts     |  10 +-
 src/main/daemon/session-switch-use.ts         |  52 ----
 src/main/daemon/session.ts                    |  23 +-
 src/main/daemon/terminal-creation-work.ts     |   3 +-
 .../terminal-host-agent-session-claim.ts      |  12 +-
 .../terminal-host-agent-session.test.ts       |  19 +-
 .../daemon/terminal-host-create-contract.ts   |   3 -
 .../terminal-host-fenced-termination.ts       |  30 +-
 .../terminal-host-process-inspection.ts       |  10 +-
 .../daemon/terminal-host-session-publish.ts   |  17 +-
 src/main/daemon/terminal-host.ts              |  30 +-
 src/main/daemon/terminal-session-teardown.ts  |  31 +--
 src/main/daemon/types.ts                      |   4 -
 .../pty/ipc/spawn-commit-run-facts.test.ts    |  23 +-
 src/main/ipc/pty/pane/spawn-registration.ts   |  32 +++
 .../runtime/spawn-commit-run-facts.test.ts    |  39 +--
 src/main/ipc/pty/runtime/spawn-options.ts     |   5 +-
 src/main/ipc/pty/runtime/spawn-state.ts       |   2 -
 .../ipc/pty/spawn-commit-adopted-session.ts   |  87 ------
 src/main/ipc/pty/spawn-commit-assembly.ts     |  99 ++++---
 src/main/ipc/pty/spawn-commit-binding.ts      | 132 +--------
 src/main/ipc/pty/spawn-commit-publication.ts  |  40 +--
 src/main/ipc/pty/spawn-execute.ts             |   9 -
 .../local-pty-foreground-inspection.ts        |   5 +-
 .../providers/local-pty-provider-state.ts     |  20 +-
 src/main/providers/local-pty-provider.ts      |  72 +----
 .../providers/local-pty-session-activation.ts |  32 +--
 .../providers/local-pty-session-operations.ts |   4 -
 src/main/providers/local-pty-spawn-state.ts   |   4 -
 src/main/providers/local-pty-spawn.ts         |  16 +-
 src/main/providers/local-pty-termination.ts   |  41 +--
 src/main/providers/pty-provider-contract.ts   |   2 -
 src/main/providers/pty-spawn-result.ts        |   5 -
 .../orca-runtime-create-agent-session.ts      |   4 +-
 .../orca-runtime-report-pty-spawn-commit.ts   |  15 -
 .../runtime-pty-controller-contract.ts        |   3 -
 .../agent-session/switch-terminal-spawn.ts    | 102 +++++++
 .../launch/mobile-terminal-startup.ts         |  59 ----
 src/shared/agent-session-switch-execution.ts  |  27 +-
 .../claimed-agent-pty-ensure-options.ts       |  25 --
 src/shared/claimed-agent-pty-owner.ts         |  77 +++---
 src/shared/pty-fenced-termination.ts          |   6 -
 82 files changed, 432 insertions(+), 2447 deletions(-)
 rename src/main/daemon/{daemon-pty-operation-state.ts => daemon-pty-adapter-contract.ts} (90%)
 delete mode 100644 src/main/daemon/daemon-pty-adapter-switch-compatibility.test-fixture.ts
 delete mode 100644 src/main/daemon/daemon-pty-spawn-preparation-release.ts
 delete mode 100644 src/main/daemon/daemon-pty-spawn-preparation-state.ts
 delete mode 100644 src/main/daemon/daemon-pty-spawn-preparations.test.ts
 delete mode 100644 src/main/daemon/daemon-pty-spawn-settlement.ts
 delete mode 100644 src/main/daemon/session-switch-use.ts
 delete mode 100644 src/main/ipc/pty/spawn-commit-adopted-session.ts
 create mode 100644 src/main/runtime/session-construction/agent-session/switch-terminal-spawn.ts
 delete mode 100644 src/shared/claimed-agent-pty-ensure-options.ts

diff --git a/src/main/daemon/client.ts b/src/main/daemon/client.ts
index 8efa1a282c4e..c1673c15d81b 100644
--- a/src/main/daemon/client.ts
+++ b/src/main/daemon/client.ts
@@ -16,8 +16,7 @@ export class DaemonClient extends DaemonClientConnection {
     type: string,
     payload: unknown,
     timeoutMs = REQUEST_TIMEOUT_MS,
-    signal?: AbortSignal,
-    onSent?: (requestId: string) => void
+    signal?: AbortSignal
   ): Promise<T> {
     if (!this.connected || !this.controlSocket) {
       // No socket is a transport failure, distinct from a daemon refusing the request.
@@ -33,7 +32,6 @@ export class DaemonClient extends DaemonClientConnection {
       payload,
       timeoutMs,
       ...(signal ? { signal } : {}),
-      ...(onSent ? { onSent } : {}),
       unmatchedCancelGraceMs: NOTIFY_SETTLEMENT_TIMEOUT_MS,
       onCreateCancellationFailure: () => this.handleDisconnect(generation),
       settleCreateCancellation: (sessionId, requestId) =>
diff --git a/src/main/daemon/daemon-client-connection.ts b/src/main/daemon/daemon-client-connection.ts
index 387600a8f317..f0fc98da236c 100644
--- a/src/main/daemon/daemon-client-connection.ts
+++ b/src/main/daemon/daemon-client-connection.ts
@@ -35,10 +35,6 @@ export class DaemonClientConnection {
 
   private streamSocket: Socket | null = null
 
-  private connectionBorrowers = 0
-
-  private ownerReleased = false
-
   protected connected = false
 
   private disconnectArmed = false
@@ -192,25 +188,6 @@ export class DaemonClientConnection {
     }
   }
 
-  async withRetainedConnection<T>(operation: () => Promise<T>): Promise<T> {
-    this.connectionBorrowers++
-    try {
-      return await operation()
-    } finally {
-      this.connectionBorrowers--
-      if (this.ownerReleased && this.connectionBorrowers === 0) {
-        this.disconnect()
-      }
-    }
-  }
-
-  releaseOwner(): void {
-    this.ownerReleased = true
-    if (this.connectionBorrowers === 0) {
-      this.disconnect()
-    }
-  }
-
   disconnect(): void {
     this.connectionAttemptGeneration++
     this.connected = false
diff --git a/src/main/daemon/daemon-client-connections.ts b/src/main/daemon/daemon-client-connections.ts
index 9059f6fcfd8b..8d67473511b8 100644
--- a/src/main/daemon/daemon-client-connections.ts
+++ b/src/main/daemon/daemon-client-connections.ts
@@ -77,14 +77,6 @@ export class DaemonClientConnections {
     socket.on('data', (chunk) => parser.feed(decoder.write(chunk)))
   }
 
-  matchesEndpoint(identity: { pid: number; startedAtMs: number; launchNonce: string }): boolean {
-    return (
-      identity.pid === process.pid &&
-      identity.startedAtMs === this.options.identity.startedAtMs &&
-      identity.launchNonce === this.options.identity.launchNonce
-    )
-  }
-
   get(clientId: string): ConnectedDaemonClient | undefined {
     return this.clients.get(clientId)
   }
diff --git a/src/main/daemon/daemon-client-rpc-request.ts b/src/main/daemon/daemon-client-rpc-request.ts
index e38e9484dfdc..d559476b07d1 100644
--- a/src/main/daemon/daemon-client-rpc-request.ts
+++ b/src/main/daemon/daemon-client-rpc-request.ts
@@ -15,7 +15,6 @@ type DaemonRpcRequestOptions = {
   type: string
   payload: unknown
   timeoutMs: number
-  onSent?: (requestId: string) => void
   signal?: AbortSignal
   /** Bound late-response waits after unmatched cancellation, including attach-only requests with no reply coming. */
   unmatchedCancelGraceMs: number
@@ -40,15 +39,6 @@ function wedgedDaemonError(requestError: Error, cancelError: unknown): Error | n
 export function requestDaemonRpc<T>(opts: DaemonRpcRequestOptions): Promise<T> {
   // A stalled event loop can deliver a daemon cancellation before its overdue timer runs.
   const { payload, type } = opts
-  const retainSwitchOutcome =
-    type === 'createOrAttach' &&
-    payload !== null &&
-    typeof payload === 'object' &&
-    'switchExecution' in payload &&
-    payload.switchExecution !== null &&
-    typeof payload.switchExecution === 'object' &&
-    'phase' in payload.switchExecution &&
-    payload.switchExecution.phase === 'commit'
   const createTimeoutError = (): DaemonRequestTimeoutError =>
     new DaemonRequestTimeoutError(`Request ${type} timed out after ${opts.timeoutMs}ms`)
   const createSessionId =
@@ -119,11 +109,6 @@ export function requestDaemonRpc<T>(opts: DaemonRpcRequestOptions): Promise<T> {
       void opts
         .settleCreateCancellation(createSessionId, opts.id)
         .then((result) => {
-          // The acknowledged revocation is not proof that a dispatched child exited.
-          if (retainSwitchOutcome) {
-            awaitLateResponseThenReject(error)
-            return
-          }
           if (result.canceled) {
             rejectAndDrop(error)
             return
@@ -184,7 +169,6 @@ export function requestDaemonRpc<T>(opts: DaemonRpcRequestOptions): Promise<T> {
       return
     }
     try {
-      opts.onSent?.(opts.id)
       opts.socket.write(encoded)
       sent = true
     } catch (err) {
diff --git a/src/main/daemon/daemon-create-or-attach-cancellation.ts b/src/main/daemon/daemon-create-or-attach-cancellation.ts
index 8fce79e5c38d..432a84e7d20a 100644
--- a/src/main/daemon/daemon-create-or-attach-cancellation.ts
+++ b/src/main/daemon/daemon-create-or-attach-cancellation.ts
@@ -5,71 +5,6 @@ export async function cancelDaemonCreateOrAttach(
   clientId: string,
   request: Extract<DaemonRequest, { type: 'cancelCreateOrAttach' }>
 ): Promise<unknown> {
-  const client = options.connections.get(clientId)
-  if (request.payload.release) {
-    const release = request.payload.release
-    if (
-      request.payload.settlement ||
-      !client?.authenticatedPairEstablished ||
-      !client.streamSocket ||
-      !release ||
-      typeof release.anchor !== 'string' ||
-      typeof release.invocationId !== 'string' ||
-      (release.outcome !== 'exited' &&
-        release.outcome !== 'adopted' &&
-        release.outcome !== 'failed') ||
-      typeof request.payload.requestId !== 'string' ||
-      typeof request.payload.sessionId !== 'string' ||
-      (release.incarnationId !== undefined && typeof release.incarnationId !== 'string') ||
-      !release.endpoint ||
-      typeof release.endpoint.pid !== 'number' ||
-      typeof release.endpoint.startedAtMs !== 'number' ||
-      typeof release.endpoint.launchNonce !== 'string' ||
-      !options.connections.matchesEndpoint(release.endpoint)
-    ) {
-      return { canceled: false, released: false }
-    }
-    const released = options.preparations.release(
-      request.payload.sessionId,
-      clientId,
-      request.payload.requestId,
-      release
-    )
-    options.lifecycle.reevaluateIdleShutdown()
-    return { canceled: false, released }
-  }
-  if (request.payload.settlement) {
-    if (
-      !client?.authenticatedPairEstablished ||
-      !client.streamSocket ||
-      !options.connections.matchesEndpoint(request.payload.settlement.endpoint)
-    ) {
-      return { canceled: false, settlement: { outcome: 'unknown' } }
-    }
-    return {
-      canceled: true,
-      retention: 'creation-settlement-v1',
-      settlement: await options.preparations.settle(
-        request.payload.sessionId,
-        clientId,
-        request.payload.requestId,
-        request.payload.settlement,
-        (result, code) => {
-          const sessionId = result.agentSessionEnsure?.owner.ptyId ?? request.payload.sessionId
-          options.streamDataBatcher.enqueueControlEvent(clientId, sessionId, {
-            type: 'event',
-            event: 'exit',
-            sessionId,
-            payload: {
-              code,
-              ...(result.incarnationId ? { incarnationId: result.incarnationId } : {})
-            }
-          })
-          options.streamDataBatcher.flush(clientId)
-        }
-      )
-    }
-  }
   return {
     canceled: options.preparations.cancel(request.payload.sessionId, {
       clientId,
diff --git a/src/main/daemon/daemon-create-or-attach-contract.ts b/src/main/daemon/daemon-create-or-attach-contract.ts
index 3429ac0800e3..25e4c94e848d 100644
--- a/src/main/daemon/daemon-create-or-attach-contract.ts
+++ b/src/main/daemon/daemon-create-or-attach-contract.ts
@@ -7,8 +7,6 @@ import type {
   AgentSessionSurfaceBinding
 } from '../../shared/agent-session-host-authority'
 import type * as HistorySeedProtocol from './terminal-history-seed-transfer-protocol'
-import type { DaemonCreateOrAttachResult as CreateOrAttachResult } from './daemon-create-or-attach-result'
-import type { DaemonEndpointIdentity } from './daemon-hello-protocol'
 export type CreateOrAttachRequest = {
   id: string
   type: 'createOrAttach'
@@ -33,14 +31,6 @@ export type CreateOrAttachRequest = {
     terminalWindowsPowerShellImplementation?: 'auto' | 'powershell.exe' | 'pwsh.exe'
     shellReadySupported?: boolean
     shellReadyTimeoutMs?: number
-    /** Server-side fence that prevents a client timeout from publishing an orphan PTY. */
-    switchExecution?: {
-      phase: 'prepare' | 'commit'
-      invocationId: string
-      anchor?: string
-      contract?: 'creation-settlement-v1'
-      remainingMs?: number
-    }
     cancelAfterMs?: number
     startupIngress?: PtyStartupIngressIntent
     /** Optional; an old daemon ignores it and an old client omits it (legacy pacing). */
@@ -52,32 +42,11 @@ export type CreateOrAttachRequest = {
   }
 }
 
-export type CreateOrAttachSettlement =
-  | { outcome: 'exited' }
-  | { outcome: 'failed' }
-  | { outcome: 'owned'; result: CreateOrAttachResult }
-  | { outcome: 'unknown' }
-
-export type CancelCreateOrAttachResult = {
-  canceled: boolean
-  settlement?: CreateOrAttachSettlement
-  retention?: 'creation-settlement-v1'
-  released?: boolean
-}
-
 export type CancelCreateOrAttachRequest = {
   id: string
   type: 'cancelCreateOrAttach'
   payload: {
     sessionId: string
     requestId?: string
-    settlement?: { invocationId: string; anchor: string; endpoint: DaemonEndpointIdentity }
-    release?: {
-      invocationId: string
-      anchor: string
-      endpoint: DaemonEndpointIdentity
-      outcome: 'exited' | 'adopted' | 'failed'
-      incarnationId?: string
-    }
   }
 }
diff --git a/src/main/daemon/daemon-create-or-attach-result.ts b/src/main/daemon/daemon-create-or-attach-result.ts
index 766346b7bb7e..44e10000f339 100644
--- a/src/main/daemon/daemon-create-or-attach-result.ts
+++ b/src/main/daemon/daemon-create-or-attach-result.ts
@@ -4,9 +4,6 @@ import type { AgentSessionClaimedSpawnResult } from '../../shared/agent-session-
 import type { PtyIncarnationId } from '../../shared/pty-incarnation'
 
 export type DaemonCreateOrAttachResult = {
-  /** A dispatched child remains owned after its initiating handoff lost authority. */
-  switchOutcomeUnknown?: true
-  switchCleanupWitness?: string
   isNew: boolean
   snapshot: TerminalSnapshot | null
   pid: number | null
diff --git a/src/main/daemon/daemon-fenced-termination.ts b/src/main/daemon/daemon-fenced-termination.ts
index 28049553281d..47d4c4073b7c 100644
--- a/src/main/daemon/daemon-fenced-termination.ts
+++ b/src/main/daemon/daemon-fenced-termination.ts
@@ -36,7 +36,6 @@ export async function handleDaemonFencedTermination(
     expectedIncarnationId?: string
     requireNoAgentOwner?: boolean
     requireUnattached?: boolean
-    switchCondition?: PtyFencedTerminationRequest['switchCondition']
   },
   deps: {
     host: TerminalHost
@@ -51,15 +50,12 @@ export async function handleDaemonFencedTermination(
     id: payload.sessionId,
     expectedIncarnationId: payload.expectedIncarnationId,
     requireNoAgentOwner: payload.requireNoAgentOwner === true,
-    requireUnattached: payload.requireUnattached === true,
-    ...(payload.switchCondition ? { switchCondition: payload.switchCondition } : {})
+    requireUnattached: payload.requireUnattached === true
   })
   if (!termination.accepted) {
     return termination.result
   }
-  if (!payload.switchCondition) {
-    deps.preparations.cancel(payload.sessionId)
-    deps.attachments.clearInput(payload.sessionId)
-  }
+  deps.preparations.cancel(payload.sessionId)
+  deps.attachments.clearInput(payload.sessionId)
   return termination.completion
 }
diff --git a/src/main/daemon/daemon-foreground-process-protocol.ts b/src/main/daemon/daemon-foreground-process-protocol.ts
index d2b6c277c2d7..29e53c32ff2f 100644
--- a/src/main/daemon/daemon-foreground-process-protocol.ts
+++ b/src/main/daemon/daemon-foreground-process-protocol.ts
@@ -17,7 +17,6 @@ export type ConfirmShellForegroundRequest = Omit<GetForegroundProcessRequest, 't
 export type InspectProcessRequest = Omit<GetForegroundProcessRequest, 'type'> & {
   type: 'inspectProcess'
   payload: GetForegroundProcessRequest['payload'] & {
-    captureSwitchWitness?: string
     expectedIncarnationId?: string
     /** Older daemons ignore this and return a full capture. */
     steadyState?: boolean
diff --git a/src/main/daemon/daemon-init-dependency-mocks.ts b/src/main/daemon/daemon-init-dependency-mocks.ts
index 027ef6f10e02..c7891cd20ef4 100644
--- a/src/main/daemon/daemon-init-dependency-mocks.ts
+++ b/src/main/daemon/daemon-init-dependency-mocks.ts
@@ -124,8 +124,6 @@ export function createDaemonInitModuleFactories(state: DaemonInitMockState) {
     readonly listProcesses: Mock
     readonly listSessions: Mock
     readonly establishLifecycleLease: Mock
-    readonly settleSwitchWorkForReplacement: MockAdapter['settleSwitchWorkForReplacement']
-    readonly inheritSwitchReleaseCleanup: MockAdapter['inheritSwitchReleaseCleanup']
     readonly shutdown: Mock
     readonly dispose: Mock
     readonly disconnectOnly: Mock
@@ -151,8 +149,6 @@ export function createDaemonInitModuleFactories(state: DaemonInitMockState) {
           throw lifecycleLeaseError
         }
       })
-      this.settleSwitchWorkForReplacement = vi.fn(async () => {})
-      this.inheritSwitchReleaseCleanup = vi.fn()
       this.shutdown = vi.fn(async () => {})
       this.dispose = vi.fn()
       const disconnectOnlyError = disconnectOnlyErrors.shift()
diff --git a/src/main/daemon/daemon-init-mock-types.ts b/src/main/daemon/daemon-init-mock-types.ts
index 06d730c2f916..187136a66425 100644
--- a/src/main/daemon/daemon-init-mock-types.ts
+++ b/src/main/daemon/daemon-init-mock-types.ts
@@ -1,5 +1,4 @@
 import type { Mock } from 'vitest'
-import type { DaemonPtyAdapter } from './daemon-pty-adapter'
 
 export type MockSpawner = {
   ensureRunning: Mock
@@ -28,8 +27,6 @@ export type MockAdapter = {
   listProcesses: Mock
   listSessions: Mock
   establishLifecycleLease: Mock
-  settleSwitchWorkForReplacement: Mock<DaemonPtyAdapter['settleSwitchWorkForReplacement']>
-  inheritSwitchReleaseCleanup: Mock<DaemonPtyAdapter['inheritSwitchReleaseCleanup']>
   shutdown: Mock
   dispose: Mock
   disconnectOnly: Mock
diff --git a/src/main/daemon/daemon-init-restart-sequence.test.ts b/src/main/daemon/daemon-init-restart-sequence.test.ts
index e24f4bcfd1ce..56e34a5c0d8d 100644
--- a/src/main/daemon/daemon-init-restart-sequence.test.ts
+++ b/src/main/daemon/daemon-init-restart-sequence.test.ts
@@ -97,14 +97,6 @@ describe('daemon-init: runRestartDaemon (7-step sequence)', () => {
       replacedByRestart: true
     })
     expect(order).toEqual(['fanout', 'unbind'])
-    expect(originalAdapter.settleSwitchWorkForReplacement).toHaveBeenCalledOnce()
-    expect(originalAdapter.settleSwitchWorkForReplacement.mock.invocationCallOrder[0]).toBeLessThan(
-      originalAdapter.fanoutSyntheticExits.mock.invocationCallOrder[0]
-    )
-    expect(adapterInstances[1].inheritSwitchReleaseCleanup).toHaveBeenCalledWith(originalAdapter)
-    expect(
-      adapterInstances[1].inheritSwitchReleaseCleanup.mock.invocationCallOrder[0]
-    ).toBeLessThan(originalAdapter.dispose.mock.invocationCallOrder[0])
     expect(recoverRetired).toHaveBeenCalledOnce()
     expect(recoverRetired.mock.invocationCallOrder[0]).toBeLessThan(
       originalAdapter.fanoutSyntheticExits.mock.invocationCallOrder[0]
diff --git a/src/main/daemon/daemon-protocol-version.ts b/src/main/daemon/daemon-protocol-version.ts
index 916d943042f1..091383b5d8a8 100644
--- a/src/main/daemon/daemon-protocol-version.ts
+++ b/src/main/daemon/daemon-protocol-version.ts
@@ -1,5 +1,4 @@
 // Why: daemons survive app updates, so wire behavior must be version-gated.
-// v55 distinguishes physical session-switch authority from earlier daemons.
 // v54 reads the macOS process table in process instead of forking setuid ps on every poll (#31783).
 // v53 rolls the daemon-side terminal fixes since v1.4.241 (foreground confirmation for chat continuation, ConPTY reflow, WSL malloc tunables) into a fresh daemon.
 // v52 rolls the daemon-side terminal fixes since v1.4.240 (ConPTY, teardown, spawn pane keys) into a fresh daemon.
@@ -13,8 +12,7 @@
 // v43 dropped it with the revert); v41 stages long startup commands as sourced scripts; v40 rolled
 // the #25130/#24636 shell-wrapper changes and the wider agent list into a fresh daemon; older owners
 // stay attachable.
-export const PROTOCOL_VERSION = 55
-export const SESSION_SWITCH_PHYSICAL_PROTOCOL_VERSION = 55
+export const PROTOCOL_VERSION = 54
 export const FENCED_TERMINATION_PROTOCOL_VERSION = 51
 export const CLAUDE_ACCOUNT_FUNCTION_DAEMON_PROTOCOL_VERSION = 42
 export const CLAUDE_ACCOUNT_FUNCTION_REVERTED_DAEMON_PROTOCOL_VERSION = 43
@@ -50,7 +48,7 @@ export const MODE_2031_UNSUBSCRIBE_FACT_PROTOCOL_VERSION = 29
 export const PREVIOUS_DAEMON_PROTOCOL_VERSIONS = [
   1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
   28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
-  52, 53, 54
+  52, 53
 ] as const
 
 export function supportsColorQueryReplyColors(protocolVersion: number): boolean {
diff --git a/src/main/daemon/daemon-provider-restart.ts b/src/main/daemon/daemon-provider-restart.ts
index 0a960e62203b..b1d1aa91d56e 100644
--- a/src/main/daemon/daemon-provider-restart.ts
+++ b/src/main/daemon/daemon-provider-restart.ts
@@ -90,8 +90,6 @@ async function runRestartDaemon(
     (legacy) => !legacy.hasRetiredForIdle()
   )
 
-  await currentOnly.settleSwitchWorkForReplacement()
-
   // Fan out exits before teardown: daemon shutdown does not deliver session exits to the renderer.
   const fallbackKilledCount =
     currentAdapter instanceof DegradedDaemonPtyProvider
@@ -185,8 +183,6 @@ async function runRestartDaemon(
     throw error
   }
 
-  newCurrent.inheritSwitchReleaseCleanup(currentOnly)
-
   // Dispose only old subscriptions after adoption; full disposal would kill shared legacy adapters.
   disposeProviderSubscriptionsOnly(currentAdapter)
   currentOnly.dispose()
diff --git a/src/main/daemon/daemon-pty-adapter-concurrent-recovery.test.ts b/src/main/daemon/daemon-pty-adapter-concurrent-recovery.test.ts
index 4c607dcd8566..66a3320ac812 100644
--- a/src/main/daemon/daemon-pty-adapter-concurrent-recovery.test.ts
+++ b/src/main/daemon/daemon-pty-adapter-concurrent-recovery.test.ts
@@ -1,14 +1,12 @@
 import './mock-descendant-sweep'
 import { expect, it, vi } from 'vitest'
-import { mkdtempSync, rmSync, unlinkSync } from 'node:fs'
+import { mkdtempSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { DaemonPtyAdapter } from './daemon-pty-adapter'
 import { DaemonServer } from './daemon-server'
 import { createMockSubprocess } from './daemon-pty-adapter-test-harness'
 import { getDaemonSocketPath } from './daemon-spawner'
-import type { DaemonClientConnections } from './daemon-client-connections'
-import { agentSessionSwitchDeadline } from '../../shared/agent-session-switch-execution'
 
 it('recovers concurrent spawns rejected by an adapter-initiated disconnect', async () => {
   const concurrentSpawnCount = 70
@@ -79,93 +77,3 @@ it('recovers concurrent spawns rejected by an adapter-initiated disconnect', asy
     rmSync(dir, { recursive: true, force: true })
   }
 })
-
-it.skipIf(process.platform === 'win32')(
-  'keeps an exact dispatched owner unknown across an authenticated empty endpoint replacement',
-  async () => {
-    const directory = mkdtempSync(join(tmpdir(), 'daemon-switch-replacement-'))
-    const socketPath = getDaemonSocketPath(directory)
-    const tokenPath = join(directory, 'test.token')
-    const entered = Promise.withResolvers<void>()
-    const release = Promise.withResolvers<void>()
-    const child = createMockSubprocess()
-    const originalSpawn = vi.fn(async () => {
-      entered.resolve()
-      await release.promise
-      return child
-    })
-    const original = new DaemonServer({
-      socketPath,
-      tokenPath,
-      launchNonce: 'original',
-      preparePtySpawn: async () => {},
-      spawnSubprocess: originalSpawn
-    })
-    await original.start()
-    const adapter = new DaemonPtyAdapter({ socketPath, tokenPath })
-    const deadline = agentSessionSwitchDeadline()
-    let settled = false
-    let recover: (() => Promise<void>) | undefined
-    const operation = adapter
-      .spawn({
-        sessionId: 'exact-owner',
-        cols: 80,
-        rows: 24,
-        signal: deadline.signal,
-        switchExecution: {
-          invocationId: 'original-click',
-          ...deadline,
-          trackPhysical: (work, recovery) => {
-            recover = recovery
-            void work.then(() => {
-              settled = true
-            })
-            return work
-          }
-        }
-      })
-      .catch((error: unknown) => error)
-    let replacement: DaemonServer | undefined
-    try {
-      await entered.promise
-      // Replace only this fixture's POSIX socket; the original receiver and pending child remain alive.
-      unlinkSync(socketPath)
-      const replacementSpawn = vi.fn(() => createMockSubprocess())
-      replacement = new DaemonServer({
-        socketPath,
-        tokenPath,
-        launchNonce: 'replacement',
-        spawnSubprocess: replacementSpawn
-      })
-      await replacement.start()
-      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: this is the exact owned fixture server's authenticated connection registry.
-      const connections = (original as unknown as { connections: DaemonClientConnections })
-        .connections
-      connections.values().next().value?.controlSocket.destroy()
-      expect(await operation).toBeInstanceOf(Error)
-      await vi.waitFor(() =>
-        expect(adapter.getLastAuthenticatedDaemonIdentity()?.launchNonce).toBe('replacement')
-      )
-      expect(await adapter.listProcesses()).toEqual([])
-      if (!recover) {
-        throw new Error('dispatched settlement recovery missing')
-      }
-      await expect(recover()).rejects.toThrow('Terminal owner unavailable')
-      expect(settled).toBe(false)
-      expect(replacementSpawn).not.toHaveBeenCalled()
-      expect(originalSpawn).toHaveBeenCalledOnce()
-      release.resolve()
-      await vi.waitFor(() => expect(child.forceKill).toHaveBeenCalled())
-      // An empty new daemon still cannot answer for the old receiver's exact child.
-      expect(settled).toBe(false)
-    } finally {
-      release.resolve()
-      deadline.dispose()
-      adapter.dispose()
-      await operation
-      await original.shutdown()
-      await replacement?.shutdown()
-      rmSync(directory, { recursive: true, force: true })
-    }
-  }
-)
diff --git a/src/main/daemon/daemon-pty-operation-state.ts b/src/main/daemon/daemon-pty-adapter-contract.ts
similarity index 90%
rename from src/main/daemon/daemon-pty-operation-state.ts
rename to src/main/daemon/daemon-pty-adapter-contract.ts
index c7a2f11380c0..022f09018331 100644
--- a/src/main/daemon/daemon-pty-operation-state.ts
+++ b/src/main/daemon/daemon-pty-adapter-contract.ts
@@ -4,12 +4,6 @@ import type { TakePendingOutputResult } from './types'
 import type { HistoryCheckpointResult, HistoryRecoveryFreeze } from './history-manager'
 import type { ReadRunningWslDistros } from './daemon-wsl-bridge-exit'
 export type PendingDaemonSpawnOperation = {
-  switchSettlement?: {
-    adopt?: (incarnationId: string) => void
-    completion: Promise<void>
-    recover: () => Promise<void>
-    consume: (outcome: 'exited' | 'adopted' | 'failed', incarnationId?: string) => void
-  }
   exitsBySessionId: Map<string, { code: number; incarnationId?: string }[]>
   ignoredExitIncarnationIds: Set<string>
   ignoreNextExit: boolean
diff --git a/src/main/daemon/daemon-pty-adapter-protocol-compatibility.test.ts b/src/main/daemon/daemon-pty-adapter-protocol-compatibility.test.ts
index 1210bc78e6f4..ffb3c302a790 100644
--- a/src/main/daemon/daemon-pty-adapter-protocol-compatibility.test.ts
+++ b/src/main/daemon/daemon-pty-adapter-protocol-compatibility.test.ts
@@ -1,4 +1,3 @@
-import { registerDaemonSwitchCompatibilityTests } from './daemon-pty-adapter-switch-compatibility.test-fixture'
 import './mock-descendant-sweep'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { rmSync } from 'node:fs'
@@ -15,6 +14,7 @@ import type { DaemonServer } from './daemon-server'
 import { createMockSubprocess, startDaemonAdapterHarness } from './daemon-pty-adapter-test-harness'
 import type * as DaemonHealthModule from './daemon-health'
 import type * as DaemonTccAttributionModule from './daemon-tcc-attribution'
+
 const { getMacDaemonSystemResolverHealthMock, getMacDaemonTccAttributionHealthMock } = vi.hoisted(
   () => ({
     getMacDaemonSystemResolverHealthMock: vi.fn(
@@ -797,30 +797,4 @@ describe('DaemonPtyAdapter (IPtyProvider)', () => {
       current.dispose()
     })
   })
-  registerDaemonSwitchCompatibilityTests({
-    get server() {
-      return server
-    },
-    set server(value) {
-      server = value
-    },
-    get adapter() {
-      return adapter
-    },
-    set adapter(value) {
-      adapter = value
-    },
-    get socketPath() {
-      return socketPath
-    },
-    set socketPath(value) {
-      socketPath = value
-    },
-    get tokenPath() {
-      return tokenPath
-    },
-    set tokenPath(value) {
-      tokenPath = value
-    }
-  })
 })
diff --git a/src/main/daemon/daemon-pty-adapter-switch-compatibility.test-fixture.ts b/src/main/daemon/daemon-pty-adapter-switch-compatibility.test-fixture.ts
deleted file mode 100644
index a955970ddad3..000000000000
--- a/src/main/daemon/daemon-pty-adapter-switch-compatibility.test-fixture.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-import './mock-descendant-sweep'
-import { expect, it, vi } from 'vitest'
-import { DaemonClient } from './client'
-import { DaemonPtyAdapter } from './daemon-pty-adapter'
-import { DaemonServer } from './daemon-server'
-import { agentSessionSwitchDeadline } from '../../shared/agent-session-switch-execution'
-import { createMockSubprocess } from './daemon-pty-adapter-test-harness'
-export function registerDaemonSwitchCompatibilityTests(fixture: {
-  server: DaemonServer
-  adapter: DaemonPtyAdapter
-  socketPath: string
-  tokenPath: string
-}) {
-  it.each([53, 54, 55])(
-    'uses v%i creation with its supported switch authority',
-    async (protocolVersion) => {
-      fixture.adapter.dispose()
-      await fixture.server.shutdown()
-      const spawn = vi.fn(() => createMockSubprocess())
-      fixture.server = new DaemonServer({
-        socketPath: fixture.socketPath,
-        tokenPath: fixture.tokenPath,
-        protocolVersion,
-        spawnSubprocess: spawn
-      })
-      await fixture.server.start()
-      fixture.adapter = new DaemonPtyAdapter({
-        socketPath: fixture.socketPath,
-        tokenPath: fixture.tokenPath,
-        protocolVersion
-      })
-      const request = vi.spyOn(DaemonClient.prototype, 'request')
-      const deadline = agentSessionSwitchDeadline()
-      try {
-        expect(
-          await fixture.adapter.spawn({ sessionId: 'legacy-ordinary', cols: 80, rows: 24 })
-        ).toMatchObject({ id: 'legacy-ordinary' })
-        const switched = await fixture.adapter.spawn({
-          sessionId: 'switch-destination',
-          cols: 80,
-          rows: 24,
-          switchExecution: { invocationId: 'new-click', ...deadline }
-        })
-        expect(switched).toMatchObject({ id: 'switch-destination' })
-        expect(spawn).toHaveBeenCalledTimes(2)
-        const creates = request.mock.calls.filter(([type]) => type === 'createOrAttach')
-        if (protocolVersion < 55) {
-          expect(creates).toHaveLength(2)
-          for (const create of creates) {
-            expect(create[1]).not.toHaveProperty('switchExecution')
-          }
-        } else {
-          expect(creates).toHaveLength(3)
-          expect(creates[1]?.[1]).toMatchObject({ switchExecution: { phase: 'prepare' } })
-          expect(creates[2]?.[1]).toMatchObject({ switchExecution: { phase: 'commit' } })
-        }
-        const releases = () =>
-          request.mock.calls.filter(([type]) => type === 'cancelCreateOrAttach')
-        if (protocolVersion < 55) {
-          expect(releases()).toEqual([])
-        } else {
-          await vi.waitFor(() => expect(releases()).toHaveLength(1))
-          expect(releases()[0]?.[1]).toEqual({
-            sessionId: 'switch-destination',
-            requestId: expect.any(String),
-            release: {
-              invocationId: 'new-click',
-              anchor: expect.any(String),
-              endpoint: fixture.adapter.getDaemonIdentity(),
-              outcome: 'adopted',
-              incarnationId: switched.incarnationId
-            }
-          })
-        }
-      } finally {
-        deadline.dispose()
-        request.mockRestore()
-      }
-    }
-  )
-}
diff --git a/src/main/daemon/daemon-pty-adapter.ts b/src/main/daemon/daemon-pty-adapter.ts
index bf8af2bad0b4..7aa10319157a 100644
--- a/src/main/daemon/daemon-pty-adapter.ts
+++ b/src/main/daemon/daemon-pty-adapter.ts
@@ -3,10 +3,7 @@ import {
   type PtyFencedTerminationRequest,
   type PtyFencedTerminationOutcome
 } from '../../shared/pty-fenced-termination'
-import {
-  FENCED_TERMINATION_PROTOCOL_VERSION,
-  SESSION_SWITCH_PHYSICAL_PROTOCOL_VERSION
-} from './daemon-protocol-version'
+import { FENCED_TERMINATION_PROTOCOL_VERSION } from './daemon-protocol-version'
 import { emitPtyListeners, createPtyExitPayload } from './daemon-pty-listener-emission'
 import type { DaemonPtyRouterExitEvent } from './daemon-pty-router-events'
 import { logWslPaneDiagnostic } from './daemon-wsl-diagnostic-log'
@@ -43,10 +40,7 @@ export class DaemonPtyAdapter extends DaemonPtyDaemonRecovery implements IPtyPro
   }
 
   async killFenced(request: PtyFencedTerminationRequest): Promise<PtyFencedTerminationOutcome> {
-    if (
-      !this.supportsFencedTermination(request.id) ||
-      (request.switchCondition && this.protocolVersion < SESSION_SWITCH_PHYSICAL_PROTOCOL_VERSION)
-    ) {
+    if (!this.supportsFencedTermination(request.id)) {
       return { outcome: 'refused', reason: 'unsupported' }
     }
     // Capture the checked identity before waiting on connection or lifecycle locks.
@@ -60,8 +54,7 @@ export class DaemonPtyAdapter extends DaemonPtyDaemonRecovery implements IPtyPro
           immediate: true,
           expectedIncarnationId,
           requireNoAgentOwner,
-          requireUnattached,
-          ...(request.switchCondition ? { switchCondition: request.switchCondition } : {})
+          requireUnattached
         })
         if (!isPtyFencedTerminationOutcome(result)) {
           return { outcome: 'refused', reason: 'unverifiable' }
@@ -239,7 +232,6 @@ export class DaemonPtyAdapter extends DaemonPtyDaemonRecovery implements IPtyPro
           return
         }
         this.finishExit(event.sessionId, event.payload)
-        void this.reconcileSwitchSpawns().catch(() => {})
       }
     })
   }
diff --git a/src/main/daemon/daemon-pty-connection-lifecycle.ts b/src/main/daemon/daemon-pty-connection-lifecycle.ts
index 853668110af3..721fc6da8339 100644
--- a/src/main/daemon/daemon-pty-connection-lifecycle.ts
+++ b/src/main/daemon/daemon-pty-connection-lifecycle.ts
@@ -35,7 +35,6 @@ export abstract class DaemonPtyConnectionLifecycle extends DaemonPtyEventSubscri
       this.releasePendingRespawnAdoptionLease()
     }
     this.recordAuthenticatedIdentity()
-    this.drainSwitchReleaseCleanup()
     // Sample before installing routing so a fresh connection resyncs daemon-local background state.
     const isFreshConnection = this.removeEventListener === null
     this.setupEventRouting()
diff --git a/src/main/daemon/daemon-pty-daemon-recovery.ts b/src/main/daemon/daemon-pty-daemon-recovery.ts
index 06e5e3681896..a84c2aecb215 100644
--- a/src/main/daemon/daemon-pty-daemon-recovery.ts
+++ b/src/main/daemon/daemon-pty-daemon-recovery.ts
@@ -96,9 +96,6 @@ export abstract class DaemonPtyDaemonRecovery extends DaemonPtyCheckpointPersist
 
   // Reconnect on endpoint loss without waiting for input; only daemon-gone errors permit respawn.
   protected recoverAfterEndpointLoss(): void {
-    if (this.switchSpawnSettlements.size > 0) {
-      void this.reconcileSwitchSpawns().catch(() => {})
-    }
     if (this.activeSessionIds.size > 0) {
       this.reconnectAfterWriteFailure()
     }
diff --git a/src/main/daemon/daemon-pty-event-subscriptions.ts b/src/main/daemon/daemon-pty-event-subscriptions.ts
index 31e54ba56e9d..79e7f385ffd2 100644
--- a/src/main/daemon/daemon-pty-event-subscriptions.ts
+++ b/src/main/daemon/daemon-pty-event-subscriptions.ts
@@ -82,7 +82,7 @@ export abstract class DaemonPtyEventSubscriptions extends DaemonPtySessionInvent
     for (const cleanup of this.disconnectedListenerCleanups.splice(0)) {
       cleanup()
     }
-    this.client.releaseOwner()
+    this.client.disconnect()
   }
 
   async establishLifecycleLease(): Promise<void> {
@@ -257,6 +257,6 @@ export abstract class DaemonPtyEventSubscriptions extends DaemonPtySessionInvent
     for (const cleanup of this.disconnectedListenerCleanups.splice(0)) {
       cleanup()
     }
-    this.client.releaseOwner()
+    this.client.disconnect()
   }
 }
diff --git a/src/main/daemon/daemon-pty-process-inspection.ts b/src/main/daemon/daemon-pty-process-inspection.ts
index 2cee61155bf9..fc93492bf5db 100644
--- a/src/main/daemon/daemon-pty-process-inspection.ts
+++ b/src/main/daemon/daemon-pty-process-inspection.ts
@@ -1,4 +1,3 @@
-import { SESSION_SWITCH_PHYSICAL_PROTOCOL_VERSION } from './daemon-protocol-version'
 import { isShellProcess } from '../../shared/agent-detection'
 import { DaemonPtyBufferSnapshots } from './daemon-pty-buffer-snapshots'
 import { parsePtySessionId } from '../../shared/pty-session-id-format'
@@ -47,10 +46,6 @@ export abstract class DaemonPtyProcessInspection extends DaemonPtyBufferSnapshot
     }
     return this.client.request<PtyProcessInspection>('inspectProcess', {
       sessionId: id,
-      ...(options?.captureSwitchWitness &&
-      this.protocolVersion >= SESSION_SWITCH_PHYSICAL_PROTOCOL_VERSION
-        ? { captureSwitchWitness: options.captureSwitchWitness }
-        : {}),
       ...(options?.expectedIncarnationId
         ? { expectedIncarnationId: options.expectedIncarnationId }
         : {}),
diff --git a/src/main/daemon/daemon-pty-runtime-state.ts b/src/main/daemon/daemon-pty-runtime-state.ts
index bb3cca942310..028017ebd329 100644
--- a/src/main/daemon/daemon-pty-runtime-state.ts
+++ b/src/main/daemon/daemon-pty-runtime-state.ts
@@ -3,7 +3,17 @@ import type {
   DaemonPtyAdapterOptions,
   DaemonIdentityChangeEvent,
   DaemonIdleRetirementResult
-} from './daemon-pty-operation-state'
+} from './daemon-pty-adapter-contract'
+export type {
+  PendingDaemonSpawnOperation,
+  HistoryRecoveryContext,
+  SnapshotCheckpointResult,
+  DaemonPtyShutdownOptions,
+  DaemonPtyAdapterOptions,
+  DaemonRespawnReason,
+  DaemonIdentityChangeEvent,
+  DaemonIdleRetirementResult
+} from './daemon-pty-adapter-contract'
 import { DaemonClient } from './client'
 import { DaemonPtyInputClosedIncarnations } from './daemon-pty-input-closed-incarnations'
 import { DaemonPtyInventoryObservation } from './daemon-pty-inventory-observation'
@@ -35,17 +45,6 @@ import type { PtyBackgroundStreamEvent } from '../providers/pty-provider-contrac
 import type { DaemonPtyRouterDataEvent, DaemonPtyRouterExitEvent } from './daemon-pty-router-events'
 import type { ReadRunningWslDistros } from './daemon-wsl-bridge-exit'
 import { WslBridgeBootIdentity } from './daemon-wsl-bridge-boot-identity'
-export {
-  type PendingDaemonSpawnOperation,
-  type HistoryRecoveryContext,
-  type SnapshotCheckpointResult,
-  type DaemonPtyShutdownOptions,
-  type DaemonPtyAdapterOptions,
-  type DaemonRespawnReason,
-  type DaemonIdentityChangeEvent,
-  type DaemonIdleRetirementResult
-} from './daemon-pty-operation-state'
-
 export abstract class DaemonPtyRuntimeState {
   protected readonly readRunningWslDistros: ReadRunningWslDistros | undefined
   protected readonly wslBridgeBootIdentity: WslBridgeBootIdentity
diff --git a/src/main/daemon/daemon-pty-session-spawn.ts b/src/main/daemon/daemon-pty-session-spawn.ts
index 18189acb17bb..b3aaa305b4b9 100644
--- a/src/main/daemon/daemon-pty-session-spawn.ts
+++ b/src/main/daemon/daemon-pty-session-spawn.ts
@@ -51,36 +51,16 @@ export abstract class DaemonPtySessionSpawn extends DaemonPtySpawnResult {
       identityChanged: false
     }
     try {
-      const create = async () => {
-        const retained = operation.switchSettlement
-        if (retained) {
-          await retained.recover()
-          throw new Error('Terminal creation was interrupted; try again')
-        }
-        return this.doSpawn({ ...spawnOpts, sessionId }, operation, historyRecovery)
-      }
-      return await this.withHistorySpawnLock(sessionId, () =>
-        // Switch authority already owns the source proof; an uncertain ordinary send cannot replay.
-        opts.switchExecution ? create() : this.withDaemonRetry(create)
-      )
+      const create = () => this.doSpawn({ ...spawnOpts, sessionId }, operation, historyRecovery)
+      return await this.withHistorySpawnLock(sessionId, () => this.withDaemonRetry(create))
     } finally {
       if (historyRecovery.freeze) {
         this.historyManager?.abandonRecoveryFreeze(historyRecovery.freeze)
       }
-      const forget = () => {
-        this.pendingClaimSpawnOperations.delete(operation)
-        operations.delete(operation)
-        if (operations.size === 0) {
-          this.pendingSpawnOperationsBySessionId.delete(sessionId)
-        }
-      }
-      const retained = this.switchSpawnSettlements.get(operation)
-      if (retained) {
-        void retained.completion.then(forget)
-        // This is the same receiver join; it cannot replay the failed creation.
-        void retained.recover().catch(() => {})
-      } else {
-        forget()
+      this.pendingClaimSpawnOperations.delete(operation)
+      operations.delete(operation)
+      if (operations.size === 0) {
+        this.pendingSpawnOperationsBySessionId.delete(sessionId)
       }
     }
   }
diff --git a/src/main/daemon/daemon-pty-spawn-preparation-release.ts b/src/main/daemon/daemon-pty-spawn-preparation-release.ts
deleted file mode 100644
index 7c92323cf896..000000000000
--- a/src/main/daemon/daemon-pty-spawn-preparation-release.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-import type {
-  PendingPtySpawnPreparation,
-  CompletedPreparation
-} from './daemon-pty-spawn-preparation-state'
-export function releaseDaemonSpawnPreparation(
-  retained: Map<string, PendingPtySpawnPreparation | CompletedPreparation>,
-  sessionId: string,
-  clientId: string,
-  requestId: unknown,
-  release: {
-    anchor: string
-    invocationId: string
-    outcome: 'exited' | 'adopted' | 'failed'
-    incarnationId?: string
-  }
-): boolean {
-  const key = JSON.stringify([sessionId, clientId, release.anchor])
-  const entry = retained.get(key)
-  // GC acknowledgement is distinct from physical proof and is safe to repeat after deletion.
-  if (!entry) {
-    return true
-  }
-  if (typeof requestId !== 'string' || entry.requestId !== requestId) {
-    return false
-  }
-  if ('outcome' in entry) {
-    if (
-      entry.invocationId !== release.invocationId ||
-      (release.outcome === 'failed' ? entry.outcome !== 'failed' : entry.outcome === 'failed') ||
-      (release.outcome === 'adopted' &&
-        (!release.incarnationId || release.incarnationId !== entry.incarnationId))
-    ) {
-      return false
-    }
-  } else {
-    const settlement = entry.settlement
-    if (
-      entry.switchAnchor?.invocationId !== release.invocationId ||
-      !settlement?.producerFinished
-    ) {
-      return false
-    }
-    if (release.outcome === 'failed') {
-      // Pending failed dependencies must compact before their terminal fact can be released.
-      return false
-    } else if (settlement.failed) {
-      return false
-    } else if (release.outcome === 'exited') {
-      if (!settlement.noChild) {
-        return false
-      }
-    } else if (
-      !release.incarnationId ||
-      settlement.result?.incarnationId !== release.incarnationId
-    ) {
-      return false
-    }
-  }
-  retained.delete(key)
-  if (!('outcome' in entry) && entry.settlement) {
-    entry.settlement.result = undefined
-    entry.settlement.reconcile = undefined
-    entry.settlement.notifyExit = undefined
-    entry.settlement.preparationWork = undefined
-    entry.settlement.physicalCompletion = undefined
-  }
-  return true
-}
-
-export function compactDaemonSpawnPreparation(
-  retained: Map<string, PendingPtySpawnPreparation | CompletedPreparation>,
-  sessionId: string,
-  preparation: PendingPtySpawnPreparation
-): void {
-  const settlement = preparation.settlement
-  if (!settlement) {
-    return
-  }
-  if (!settlement.failed) {
-    settlement.noChild = true
-  }
-  void Promise.all([
-    settlement.completion,
-    settlement.failed ? settlement.physicalCompletion : undefined
-  ]).then(() => {
-    const anchor = preparation.switchAnchor
-    const key = JSON.stringify([sessionId, preparation.clientId, anchor?.token])
-    if (!anchor || retained.get(key) !== preparation || !settlement.producerFinished) {
-      return
-    }
-    retained.set(key, {
-      outcome: settlement.failed ? 'failed' : 'exited',
-      clientId: preparation.clientId,
-      requestId: preparation.requestId,
-      anchor: anchor.token,
-      invocationId: anchor.invocationId,
-      ...(settlement.result?.incarnationId
-        ? { incarnationId: settlement.result.incarnationId }
-        : {})
-    })
-    settlement.result = undefined
-    settlement.reconcile = undefined
-    settlement.notifyExit = undefined
-    settlement.preparationWork = undefined
-    settlement.physicalCompletion = undefined
-  })
-}
diff --git a/src/main/daemon/daemon-pty-spawn-preparation-state.ts b/src/main/daemon/daemon-pty-spawn-preparation-state.ts
deleted file mode 100644
index f0a359ccf5ef..000000000000
--- a/src/main/daemon/daemon-pty-spawn-preparation-state.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import type { CreateOrAttachResult } from './types'
-export type PendingPtySpawnPreparation = {
-  canceled: boolean
-  switchAnchor?: { token: string; invocationId: string; at: number; deadline: number }
-  // Unlike the polled canceled flag, the signal interrupts in-flight cwd probes on dead shares.
-  readonly controller: AbortController
-  settlement?: {
-    completion: Promise<void>
-    finish: () => void
-    notifyExit?: (result: CreateOrAttachResult, code: number) => void
-    result?: CreateOrAttachResult
-    noChild: boolean
-    failed?: true
-    preparationWork?: Promise<void>
-    physicalCompletion?: Promise<void>
-    reconcile?: () => Promise<void>
-    producerFinished?: boolean
-  }
-  cancelTimer?: ReturnType<typeof setTimeout>
-  // Session IDs can be shared; disconnect cancels only this client's preparations.
-  clientId: string
-  requestId: string
-}
-
-export type CompletedPreparation = {
-  outcome: 'exited' | 'failed'
-  clientId: string
-  requestId: string
-  anchor: string
-  invocationId: string
-  incarnationId?: string
-}
diff --git a/src/main/daemon/daemon-pty-spawn-preparations.test.ts b/src/main/daemon/daemon-pty-spawn-preparations.test.ts
deleted file mode 100644
index b8e118e0aee0..000000000000
--- a/src/main/daemon/daemon-pty-spawn-preparations.test.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { afterEach, expect, it, vi } from 'vitest'
-import { DaemonPtySpawnPreparations } from './daemon-pty-spawn-preparations'
-
-afterEach(() => vi.restoreAllMocks())
-it('anchors the commit on receiver preparation, so network and queued delay consume authority without timer delivery', () => {
-  let now = 10
-  vi.spyOn(performance, 'now').mockImplementation(() => now)
-  const preparations = new DaemonPtySpawnPreparations(async () => {})
-  const receipt = preparations.prepareSwitch('pane', 'connection', 'prepare', 'click')
-  now = 20
-  const commit = preparations.commitSwitch('pane', 'connection', 'commit', {
-    contract: 'creation-settlement-v1',
-    invocationId: 'click',
-    anchor: receipt.anchor,
-    remainingMs: 100
-  })
-  expect(preparations.isCanceled(commit)).toBe(false)
-  // a+r = 110; receipt-relative 120 would incorrectly allow this continuation.
-  now = 111
-  expect(preparations.isCanceled(commit)).toBe(true)
-  preparations.finish('pane', commit)
-})
-it('rejects another connection and a reused anchor while the actual selected preparation remains owned', () => {
-  const preparations = new DaemonPtySpawnPreparations(async () => {})
-  const receipt = preparations.prepareSwitch('pane', 'connection', 'prepare', 'click')
-  const execution = {
-    contract: 'creation-settlement-v1',
-    invocationId: 'click',
-    anchor: receipt.anchor,
-    remainingMs: 1000
-  }
-  expect(() => preparations.commitSwitch('pane', 'different', 'commit', execution)).toThrow()
-  const selected = preparations.commitSwitch('pane', 'connection', 'commit', execution)
-  expect(() => preparations.commitSwitch('pane', 'connection', 'duplicate', execution)).toThrow()
-  expect(preparations.isCanceled(selected)).toBe(false)
-  preparations.finish('pane', selected)
-})
diff --git a/src/main/daemon/daemon-pty-spawn-preparations.ts b/src/main/daemon/daemon-pty-spawn-preparations.ts
index 25f0a4fc1d2c..bffed73e94ef 100644
--- a/src/main/daemon/daemon-pty-spawn-preparations.ts
+++ b/src/main/daemon/daemon-pty-spawn-preparations.ts
@@ -1,28 +1,16 @@
-import {
-  compactDaemonSpawnPreparation,
-  releaseDaemonSpawnPreparation
-} from './daemon-pty-spawn-preparation-release'
-import type {
-  PendingPtySpawnPreparation,
-  CompletedPreparation
-} from './daemon-pty-spawn-preparation-state'
-import {
-  TerminalAttachCanceledError,
-  type CreateOrAttachResult,
-  type CreateOrAttachSettlement
-} from './types'
-export {
-  type PendingPtySpawnPreparation,
-  type CompletedPreparation
-} from './daemon-pty-spawn-preparation-state'
+import { TerminalAttachCanceledError } from './types'
+
+export type PendingPtySpawnPreparation = {
+  canceled: boolean
+  // Unlike the polled canceled flag, the signal interrupts in-flight cwd probes on dead shares.
+  readonly controller: AbortController
+  cancelTimer?: ReturnType<typeof setTimeout>
+  // Session IDs can be shared; disconnect cancels only this client's preparations.
+  clientId: string
+  requestId: string
+}
 
 export class DaemonPtySpawnPreparations {
-  private readonly retained = new Map<string, PendingPtySpawnPreparation | CompletedPreparation>()
-
-  hasOwedOutcomes(): boolean {
-    return this.retained.size > 0
-  }
-
   private readonly pending = new Map<string, Set<PendingPtySpawnPreparation>>()
   private readonly cancellationByPreparation = new WeakMap<
     PendingPtySpawnPreparation,
@@ -64,81 +52,8 @@ export class DaemonPtySpawnPreparations {
     return preparation
   }
 
-  prepareSwitch(sessionId: string, clientId: string, requestId: string, invocationId: string) {
-    const preparation = this.register(sessionId, clientId, requestId, undefined)
-    const completion = Promise.withResolvers<void>()
-    preparation.settlement = {
-      completion: completion.promise,
-      finish: completion.resolve,
-      noChild: true
-    }
-    this.retained.set(JSON.stringify([sessionId, clientId, requestId]), preparation)
-    preparation.switchAnchor = {
-      token: requestId,
-      invocationId,
-      at: performance.now(),
-      deadline: Infinity
-    }
-    preparation.cancelTimer = setTimeout(() => {
-      this.cancelPreparation(preparation)
-      this.finish(sessionId, preparation)
-    }, 720_000)
-    preparation.cancelTimer.unref?.()
-    return { anchor: requestId, retention: 'creation-settlement-v1' as const }
-  }
-
-  commitSwitch(
-    sessionId: string,
-    clientId: string,
-    requestId: string,
-    execution: { invocationId: string; anchor?: string; remainingMs?: number; contract?: string }
-  ): PendingPtySpawnPreparation {
-    const preparation = [...(this.pending.get(sessionId) ?? [])].find(
-      (entry) =>
-        entry.clientId === clientId &&
-        entry.switchAnchor?.token === execution.anchor &&
-        entry.switchAnchor?.invocationId === execution.invocationId
-    )
-    const anchor = preparation?.switchAnchor
-    if (!preparation || !anchor || anchor.deadline !== Infinity) {
-      throw new TerminalAttachCanceledError(sessionId)
-    }
-    preparation.requestId = requestId
-    if (
-      execution.contract !== 'creation-settlement-v1' ||
-      preparation.canceled ||
-      !Number.isFinite(execution.remainingMs) ||
-      execution.remainingMs! <= 0 ||
-      execution.remainingMs! > 720_000
-    ) {
-      this.cancelPreparation(preparation)
-      this.finish(sessionId, preparation)
-      throw new TerminalAttachCanceledError(sessionId)
-    }
-    anchor.deadline = anchor.at + execution.remainingMs!
-    if (performance.now() >= anchor.deadline) {
-      this.cancelPreparation(preparation)
-      this.finish(sessionId, preparation)
-      throw new TerminalAttachCanceledError(sessionId)
-    }
-    preparation.settlement!.noChild = false
-    if (preparation.cancelTimer) {
-      clearTimeout(preparation.cancelTimer)
-    }
-    preparation.cancelTimer = setTimeout(
-      () => this.cancelPreparation(preparation),
-      anchor.deadline - performance.now()
-    )
-    preparation.cancelTimer.unref?.()
-    return preparation
-  }
-
   isCanceled(preparation: PendingPtySpawnPreparation): boolean {
-    return (
-      preparation.canceled ||
-      (preparation.switchAnchor !== undefined &&
-        performance.now() >= preparation.switchAnchor.deadline)
-    )
+    return preparation.canceled
   }
 
   async prepareUnlessCanceled(
@@ -147,11 +62,9 @@ export class DaemonPtySpawnPreparations {
   ): Promise<void> {
     // Return protocol cancellation before shutdown tears down the client transport.
     const cancellation = this.cancellationByPreparation.get(preparation)
-    const work = this.preparePtySpawn()
-    if (preparation.settlement) {
-      preparation.settlement.preparationWork = work
-    }
-    const preparationTask = cancellation ? Promise.race([work, cancellation.promise]) : work
+    const preparationTask = cancellation
+      ? Promise.race([this.preparePtySpawn(), cancellation.promise])
+      : this.preparePtySpawn()
     await preparationTask
     if (this.isCanceled(preparation)) {
       throw new TerminalAttachCanceledError(sessionId)
@@ -163,18 +76,6 @@ export class DaemonPtySpawnPreparations {
       clearTimeout(preparation.cancelTimer)
     }
     this.cancellationByPreparation.delete(preparation)
-    if (preparation.settlement) {
-      const settlement = preparation.settlement
-      void Promise.resolve(settlement.preparationWork)
-        .catch(() => {})
-        .then(() => {
-          settlement.producerFinished = true
-          settlement.finish()
-          if (settlement.noChild || settlement.failed) {
-            this.retireSettled(sessionId, preparation)
-          }
-        })
-    }
     const pendingForSession = this.pending.get(sessionId)
     pendingForSession?.delete(preparation)
     if (pendingForSession?.size === 0) {
@@ -202,94 +103,6 @@ export class DaemonPtySpawnPreparations {
     return canceled
   }
 
-  async settle(
-    sessionId: string,
-    clientId: string,
-    requestId: string | undefined,
-    identity: { anchor: string; invocationId: string },
-    notifyExit?: (result: CreateOrAttachResult, code: number) => void
-  ): Promise<CreateOrAttachSettlement> {
-    const key = JSON.stringify([sessionId, clientId, identity.anchor])
-    const preparation = this.retained.get(key)
-    if (preparation && 'outcome' in preparation) {
-      return preparation.requestId === requestId &&
-        preparation.invocationId === identity.invocationId
-        ? { outcome: preparation.outcome }
-        : { outcome: 'unknown' }
-    }
-    const preparedOnly =
-      preparation?.switchAnchor?.deadline === Infinity && preparation.requestId === identity.anchor
-    if (
-      !preparation ||
-      typeof requestId !== 'string' ||
-      (!preparedOnly && preparation.requestId !== requestId) ||
-      preparation.switchAnchor?.invocationId !== identity.invocationId ||
-      !preparation.settlement
-    ) {
-      return { outcome: 'unknown' }
-    }
-    this.cancelPreparation(preparation)
-    if (preparedOnly) {
-      preparation.requestId = requestId
-      this.finish(sessionId, preparation)
-    }
-    const settlement = preparation.settlement
-    settlement.notifyExit = notifyExit
-    await settlement.completion
-    if (!settlement.noChild) {
-      await settlement.reconcile?.()
-    }
-    if (settlement.failed) {
-      await settlement.physicalCompletion
-      return { outcome: 'failed' }
-    }
-    if (settlement.noChild) {
-      return { outcome: 'exited' }
-    }
-    return settlement.result
-      ? { outcome: 'owned', result: settlement.result }
-      : { outcome: 'unknown' }
-  }
-
-  trackPhysical(
-    sessionId: string,
-    preparation: PendingPtySpawnPreparation,
-    completion: Promise<void>,
-    exitCode?: () => number | null
-  ): void {
-    if (!preparation.settlement) {
-      return
-    }
-    preparation.settlement.physicalCompletion = completion
-    if (!exitCode) {
-      preparation.settlement.failed = true
-    }
-    const reference = new WeakRef(preparation)
-    void completion.then(() => {
-      const current = reference.deref()
-      if (!current) {
-        return
-      }
-      const result = current.settlement?.result
-      if (result && exitCode) {
-        current.settlement?.notifyExit?.(result, exitCode() ?? -1)
-      }
-      this.retireSettled(sessionId, current)
-    })
-  }
-
-  retireSettled(sessionId: string, preparation: PendingPtySpawnPreparation): void {
-    compactDaemonSpawnPreparation(this.retained, sessionId, preparation)
-  }
-
-  release(
-    ...args: Parameters<typeof releaseDaemonSpawnPreparation> extends [unknown, ...infer A]
-      ? A
-      : never
-  ): boolean {
-    return releaseDaemonSpawnPreparation(this.retained, ...args)
-  }
-
   cancelForClient(clientId: string): void {
     for (const pendingForSession of this.pending.values()) {
       for (const preparation of pendingForSession) {
diff --git a/src/main/daemon/daemon-pty-spawn-request.ts b/src/main/daemon/daemon-pty-spawn-request.ts
index 9ad869086246..19fb39590e2e 100644
--- a/src/main/daemon/daemon-pty-spawn-request.ts
+++ b/src/main/daemon/daemon-pty-spawn-request.ts
@@ -1,9 +1,6 @@
 import type { DaemonPtySpawnContext } from './daemon-pty-spawn-context'
-import { DaemonPtySpawnSettlement } from './daemon-pty-spawn-settlement'
-import {
-  SESSION_SWITCH_PHYSICAL_PROTOCOL_VERSION,
-  HISTORY_SEED_TRANSFER_PROTOCOL_VERSION
-} from './daemon-protocol-version'
+import { DaemonPtyRuntimeState } from './daemon-pty-runtime-state'
+import { HISTORY_SEED_TRANSFER_PROTOCOL_VERSION } from './daemon-protocol-version'
 import type { SpawnIntent } from '../../shared/host-spawn-admission'
 import type { ColdRestorePayload } from './cold-restore-payload-cache'
 import type { DaemonAuditObservation } from './daemon-audit-classifier'
@@ -11,7 +8,6 @@ import type {
   PendingDaemonSpawnOperation,
   SnapshotCheckpointResult
 } from './daemon-pty-runtime-state'
-import type { DaemonClient } from './client'
 import { isDaemonGoneError } from './daemon-endpoint-errors'
 import type { ColdRestoreInfo } from './history-reader'
 import { NdjsonLineTooLongError } from './ndjson'
@@ -31,7 +27,7 @@ function forwardedSpawnIntent(intent: SpawnIntent, claim: unknown): SpawnIntent
   return intent === 'interactive' && claim !== undefined ? 'automatic-restore' : intent
 }
 
-export abstract class DaemonPtySpawnRequest extends DaemonPtySpawnSettlement {
+export abstract class DaemonPtySpawnRequest extends DaemonPtyRuntimeState {
   protected abstract takeSnapshotAndCheckpoint(
     sessionId: string,
     opts: {
@@ -91,137 +87,55 @@ export abstract class DaemonPtySpawnRequest extends DaemonPtySpawnSettlement {
     context: DaemonPtySpawnContext,
     historySeedSegments: readonly string[] | null
   ): Promise<CreateOrAttachResult> {
-    let anchor: string | undefined
     const requestCreateOrAttach = async (
       historySeed: string | undefined,
       historySeedTransferId: string | undefined
     ) => {
       const { opts } = context
-      let strong = Boolean(
-        opts.switchExecution && this.protocolVersion >= SESSION_SWITCH_PHYSICAL_PROTOCOL_VERSION
-      )
-      let preparedEndpoint: ReturnType<DaemonClient['getDaemonIdentity']> = null
-      const observeDispatch = (requestId: string, contract = 'creation-settlement-v1') =>
-        this.observeSwitchSpawn(context, requestId, anchor, preparedEndpoint, contract)
-
-      try {
-        if (context.operation.switchSettlement) {
-          throw new Error('Terminal creation was interrupted; try again')
-        }
-        if (opts.signal?.aborted) {
-          throw new Error('client_disconnected')
-        }
-        opts.switchExecution?.check()
-        if (opts.switchExecution && strong && !anchor) {
-          preparedEndpoint = this.client.getDaemonIdentity()
-          const prepared = await this.client.request<{ anchor: string; retention?: string }>(
+      if (opts.signal?.aborted) {
+        throw new Error('client_disconnected')
+      }
+      const payload = {
+        sessionId: context.sessionId,
+        cols: context.effectiveCols,
+        rows: context.effectiveRows,
+        cwd: context.attachOnly ? undefined : context.effectiveCwd,
+        env: context.attachOnly ? undefined : opts.env,
+        envToDelete: context.attachOnly ? undefined : opts.envToDelete,
+        command: context.attachOnly ? undefined : opts.command,
+        startupCommandDelivery: context.attachOnly ? undefined : opts.startupCommandDelivery,
+        launchAgent: context.attachOnly ? undefined : opts.launchAgent,
+        ...(context.attachOnly && !context.emulateLegacyAttachOnly ? { attachOnly: true } : {}),
+        shellOverride: context.attachOnly ? undefined : opts.shellOverride,
+        terminalShellArgs: context.attachOnly ? undefined : opts.terminalShellArgs,
+        terminalWindowsWslDistro: context.attachOnly ? undefined : opts.terminalWindowsWslDistro,
+        terminalWindowsPowerShellImplementation: context.attachOnly
+          ? undefined
+          : opts.terminalWindowsPowerShellImplementation,
+        shellReadySupported: context.attachOnly ? false : context.shellReadySupported,
+        ...(!context.attachOnly && context.shellReadyTimeoutMs !== undefined
+          ? { shellReadyTimeoutMs: context.shellReadyTimeoutMs }
+          : {}),
+        ...(historySeed ? { historySeed } : {}),
+        ...(historySeedTransferId ? { historySeedTransferId } : {}),
+        ...(this.supportsStartupIngress && !context.attachOnly && opts.startupIngress
+          ? { startupIngress: opts.startupIngress }
+          : {}),
+        ...(!context.attachOnly && opts.spawnIntent
+          ? { spawnIntent: forwardedSpawnIntent(opts.spawnIntent, opts.agentSessionEnsure) }
+          : {}),
+        ...(!context.attachOnly && opts.agentSessionEnsure
+          ? { agentSessionEnsure: opts.agentSessionEnsure }
+          : {})
+      }
+      return opts.signal
+        ? this.client.request<CreateOrAttachResult>(
             'createOrAttach',
-            {
-              sessionId: context.sessionId,
-              cols: context.effectiveCols,
-              rows: context.effectiveRows,
-              switchExecution: { phase: 'prepare', invocationId: opts.switchExecution.invocationId }
-            },
-            Math.max(1, opts.switchExecution.remaining()),
+            payload,
+            undefined,
             opts.signal
           )
-          if (
-            prepared.retention !== 'creation-settlement-v1' ||
-            typeof prepared.anchor !== 'string' ||
-            !prepared.anchor
-          ) {
-            // Negotiate before destination dispatch; an unaware peer keeps its ordinary route.
-            if (typeof prepared.anchor === 'string' && prepared.anchor) {
-              if (prepared.retention === 'consumer-release-v1' && preparedEndpoint) {
-                // Known old prepared-only cleanup uses the same exact owner, never a strong commit.
-                anchor = prepared.anchor
-                observeDispatch(anchor, 'consumer-release-v1')
-                await context.operation.switchSettlement!.recover()
-                context.operation.switchSettlement = undefined
-                anchor = undefined
-              } else {
-                await this.client.request(
-                  'cancelCreateOrAttach',
-                  { sessionId: context.sessionId, requestId: prepared.anchor },
-                  Math.max(1, opts.switchExecution.remaining())
-                )
-              }
-            }
-            strong = false
-          }
-          if (strong) {
-            anchor = prepared.anchor
-          }
-          opts.switchExecution.check()
-        }
-        const payload = {
-          ...(opts.switchExecution && strong
-            ? {
-                switchExecution: {
-                  phase: 'commit' as const,
-                  contract: 'creation-settlement-v1' as const,
-                  invocationId: opts.switchExecution.invocationId,
-                  anchor,
-                  remainingMs: opts.switchExecution.remaining()
-                }
-              }
-            : {}),
-          sessionId: context.sessionId,
-          cols: context.effectiveCols,
-          rows: context.effectiveRows,
-          cwd: context.attachOnly ? undefined : context.effectiveCwd,
-          env: context.attachOnly ? undefined : opts.env,
-          envToDelete: context.attachOnly ? undefined : opts.envToDelete,
-          command: context.attachOnly ? undefined : opts.command,
-          startupCommandDelivery: context.attachOnly ? undefined : opts.startupCommandDelivery,
-          launchAgent: context.attachOnly ? undefined : opts.launchAgent,
-          ...(context.attachOnly && !context.emulateLegacyAttachOnly ? { attachOnly: true } : {}),
-          shellOverride: context.attachOnly ? undefined : opts.shellOverride,
-          terminalShellArgs: context.attachOnly ? undefined : opts.terminalShellArgs,
-          terminalWindowsWslDistro: context.attachOnly ? undefined : opts.terminalWindowsWslDistro,
-          terminalWindowsPowerShellImplementation: context.attachOnly
-            ? undefined
-            : opts.terminalWindowsPowerShellImplementation,
-          shellReadySupported: context.attachOnly ? false : context.shellReadySupported,
-          ...(!context.attachOnly && context.shellReadyTimeoutMs !== undefined
-            ? { shellReadyTimeoutMs: context.shellReadyTimeoutMs }
-            : {}),
-          ...(historySeed ? { historySeed } : {}),
-          ...(historySeedTransferId ? { historySeedTransferId } : {}),
-          ...(this.supportsStartupIngress && !context.attachOnly && opts.startupIngress
-            ? { startupIngress: opts.startupIngress }
-            : {}),
-          ...(!context.attachOnly && opts.spawnIntent
-            ? { spawnIntent: forwardedSpawnIntent(opts.spawnIntent, opts.agentSessionEnsure) }
-            : {}),
-          ...(!context.attachOnly && opts.agentSessionEnsure
-            ? { agentSessionEnsure: opts.agentSessionEnsure }
-            : {})
-        }
-        const result = await (opts.switchExecution
-          ? this.client.request<CreateOrAttachResult>(
-              'createOrAttach',
-              payload,
-              Math.max(1, opts.switchExecution.remaining()),
-              opts.signal,
-              (requestId) =>
-                observeDispatch(requestId, strong ? 'creation-settlement-v1' : 'ordinary')
-            )
-          : opts.signal
-            ? this.client.request<CreateOrAttachResult>(
-                'createOrAttach',
-                payload,
-                undefined,
-                opts.signal
-              )
-            : this.client.request<CreateOrAttachResult>('createOrAttach', payload))
-        return result
-      } catch (error) {
-        if (anchor && !context.operation.switchSettlement) {
-          observeDispatch(anchor)
-        }
-        throw error
-      }
+        : this.client.request<CreateOrAttachResult>('createOrAttach', payload)
     }
 
     let historySeedUnavailable = false
diff --git a/src/main/daemon/daemon-pty-spawn-result.ts b/src/main/daemon/daemon-pty-spawn-result.ts
index a7c2a0318964..15d71991bbc7 100644
--- a/src/main/daemon/daemon-pty-spawn-result.ts
+++ b/src/main/daemon/daemon-pty-spawn-result.ts
@@ -32,16 +32,6 @@ export abstract class DaemonPtySpawnResult extends DaemonPtySpawnRequest {
     let result = initialResult
     const finalizeSpawnResult = (spawnResult: PtySpawnResult): PtySpawnResult => {
       const exited = this.resultForExitBeforeSpawnReply(sessionId, result, operation)
-      if (!result.switchOutcomeUnknown && result.incarnationId) {
-        operation.switchSettlement?.consume(exited ? 'exited' : 'adopted', result.incarnationId)
-      }
-      if (!result.switchOutcomeUnknown && result.incarnationId) {
-        for (const pending of this.pendingSpawnOperationsBySessionId.get(sessionId) ?? []) {
-          if (pending !== operation) {
-            pending.switchSettlement?.adopt?.(result.incarnationId)
-          }
-        }
-      }
       return (
         exited ??
         (result.isNew && !historyRecovery.identityChanged
@@ -91,7 +81,6 @@ export abstract class DaemonPtySpawnResult extends DaemonPtySpawnRequest {
     this.ptyInventory.spawned(sessionId, result.incarnationId)
     const exitedResult = this.resultForExitBeforeSpawnReply(sessionId, result, operation)
     if (exitedResult) {
-      operation.switchSettlement?.consume('exited')
       return exitedResult
     }
     if (result.incarnationId) {
@@ -167,7 +156,6 @@ export abstract class DaemonPtySpawnResult extends DaemonPtySpawnRequest {
         this.ptyInventory.spawned(sessionId, result.incarnationId)
         const exitedRetryResult = this.resultForExitBeforeSpawnReply(sessionId, result, operation)
         if (exitedRetryResult) {
-          operation.switchSettlement?.consume('exited')
           return exitedRetryResult
         }
         if (result.incarnationId) {
diff --git a/src/main/daemon/daemon-pty-spawn-settlement.ts b/src/main/daemon/daemon-pty-spawn-settlement.ts
deleted file mode 100644
index 11c523a55e6a..000000000000
--- a/src/main/daemon/daemon-pty-spawn-settlement.ts
+++ /dev/null
@@ -1,259 +0,0 @@
-import { isProvenProcessExit } from '../../shared/terminal-exit-cause'
-import type { DaemonClient } from './client'
-import { sameEndpointIdentity } from './daemon-endpoint-incarnation'
-import { STABLE_PANE_ATTACH_ONLY_DAEMON_PROTOCOL_VERSION } from './daemon-protocol-version'
-import { DaemonPtyRuntimeState, type PendingDaemonSpawnOperation } from './daemon-pty-runtime-state'
-import type { DaemonPtySpawnContext } from './daemon-pty-spawn-request'
-import type {
-  CancelCreateOrAttachResult,
-  CancelCreateOrAttachRequest,
-  CreateOrAttachResult
-} from './types'
-
-export abstract class DaemonPtySpawnSettlement extends DaemonPtyRuntimeState {
-  protected readonly switchSpawnSettlements = new Map<
-    PendingDaemonSpawnOperation,
-    NonNullable<PendingDaemonSpawnOperation['switchSettlement']>
-  >()
-  private readonly switchReleaseCleanup = new Map<
-    string,
-    {
-      client: DaemonClient
-      payload: CancelCreateOrAttachRequest['payload']
-    }
-  >()
-  private switchReleaseDrain: Promise<void> | undefined
-
-  protected async reconcileSwitchSpawns(): Promise<void> {
-    await Promise.all([...this.switchSpawnSettlements.values()].map((owner) => owner.recover()))
-  }
-
-  async settleSwitchWorkForReplacement(): Promise<void> {
-    await this.reconcileSwitchSpawns()
-    await Promise.all([...this.switchSpawnSettlements.values()].map((owner) => owner.completion))
-  }
-
-  inheritSwitchReleaseCleanup(previous: DaemonPtySpawnSettlement): void {
-    for (const [key, entry] of previous.switchReleaseCleanup) {
-      this.switchReleaseCleanup.set(key, entry)
-    }
-    previous.switchReleaseCleanup.clear()
-    this.drainSwitchReleaseCleanup()
-  }
-
-  protected drainSwitchReleaseCleanup(): void {
-    if (this.switchReleaseDrain || !this.switchReleaseCleanup.size) {
-      return
-    }
-    const batch = new Map(this.switchReleaseCleanup)
-    this.switchReleaseDrain = Promise.all(
-      [...batch].map(async ([key, entry]) => {
-        try {
-          await entry.client.withRetainedConnection(async () => {
-            await entry.client.ensureConnected()
-            const endpoint = entry.payload.release?.endpoint
-            const current = entry.client.getDaemonIdentity()
-            if (!endpoint || !current) {
-              return
-            }
-            if (!sameEndpointIdentity(endpoint, current)) {
-              // Only consumed GC debt is obsolete at an authenticated replacement endpoint.
-              if (this.switchReleaseCleanup.get(key) === entry) {
-                this.switchReleaseCleanup.delete(key)
-              }
-              return
-            }
-            const result = await entry.client.request<CancelCreateOrAttachResult>(
-              'cancelCreateOrAttach',
-              entry.payload,
-              5000
-            )
-            if (result.released === true && this.switchReleaseCleanup.get(key) === entry) {
-              this.switchReleaseCleanup.delete(key)
-            }
-          })
-        } catch {
-          /* Release debt never holds physical completion or user work. */
-        }
-      })
-    )
-      .then(() => {})
-      .finally(() => {
-        this.switchReleaseDrain = undefined
-        if ([...this.switchReleaseCleanup].some(([key, entry]) => batch.get(key) !== entry)) {
-          this.drainSwitchReleaseCleanup()
-        }
-      })
-  }
-
-  protected abstract ensureConnected(deadlineMs?: number): Promise<void>
-  protected abstract withDaemonRetry<T>(fn: () => Promise<T>): Promise<T>
-
-  protected observeSwitchSpawn(
-    context: DaemonPtySpawnContext,
-    requestId: string,
-    anchor: string | undefined,
-    preparedEndpoint: ReturnType<DaemonClient['getDaemonIdentity']>,
-    contract = 'creation-settlement-v1'
-  ): void {
-    const { opts } = context
-    const authority = opts.switchExecution
-    const endpoint = preparedEndpoint ?? this.client.getDaemonIdentity()
-    if (!authority || (contract !== 'ordinary' && !anchor)) {
-      return
-    }
-    const completion = Promise.withResolvers<void>()
-    const originalAnchor = anchor
-    let consumed = false
-    const dispatchedClient = this.client
-    const dispatchedSessionId = context.sessionId
-    let recovery: Promise<void> | undefined
-    let ordinaryIncarnation: string | undefined
-    const consume = (outcome: 'exited' | 'adopted' | 'failed', incarnationId?: string) => {
-      if (consumed) {
-        return
-      }
-      consumed = true
-      completion.resolve()
-      if (this.switchSpawnSettlements.get(context.operation) === owner) {
-        this.switchSpawnSettlements.delete(context.operation)
-      }
-      if (endpoint && originalAnchor && contract !== 'ordinary') {
-        const payload = {
-          sessionId: dispatchedSessionId,
-          requestId,
-          release: {
-            invocationId: authority.invocationId,
-            anchor: originalAnchor,
-            endpoint,
-            outcome,
-            ...(incarnationId ? { incarnationId } : {})
-          }
-        }
-        this.switchReleaseCleanup.set(
-          JSON.stringify([endpoint, dispatchedSessionId, requestId, originalAnchor]),
-          { client: dispatchedClient, payload }
-        )
-        this.drainSwitchReleaseCleanup()
-      }
-    }
-    const recover = (): Promise<void> => {
-      if (consumed) {
-        return owner.completion
-      }
-      if (recovery) {
-        return recovery
-      }
-      recovery = this.withDaemonRetry(async () => {
-        await this.ensureConnected()
-        if (consumed) {
-          return
-        }
-        const current = this.client.getDaemonIdentity()
-        if (!endpoint || !current || !sameEndpointIdentity(endpoint, current)) {
-          throw new Error('Terminal owner unavailable; reconnect and try again')
-        }
-        if (contract === 'ordinary') {
-          const exited =
-            ordinaryIncarnation &&
-            (context.operation.exitsBySessionId.get(dispatchedSessionId) ?? []).some(
-              (exit) => exit.incarnationId === ordinaryIncarnation && isProvenProcessExit(exit.code)
-            )
-          if (exited) {
-            consume('exited')
-            return
-          }
-          if (this.protocolVersion < STABLE_PANE_ATTACH_ONLY_DAEMON_PROTOCOL_VERSION) {
-            throw new Error('Terminal owner unavailable; reconnect and try again')
-          }
-          const result = await this.client.request<CreateOrAttachResult>(
-            'createOrAttach',
-            {
-              sessionId: dispatchedSessionId,
-              cols: context.effectiveCols,
-              rows: context.effectiveRows,
-              attachOnly: true
-            },
-            5000
-          )
-          if (consumed) {
-            return
-          }
-          if (
-            result.isNew ||
-            !result.incarnationId ||
-            (ordinaryIncarnation && ordinaryIncarnation !== result.incarnationId)
-          ) {
-            throw new Error('Terminal owner has not confirmed physical completion; try again')
-          }
-          ordinaryIncarnation = result.incarnationId
-          this.sessionIncarnations.set(dispatchedSessionId, ordinaryIncarnation)
-          this.activeSessionIds.add(dispatchedSessionId)
-          // Attach observes the exact live resource; only ordinary adoption or its positive exit settles it.
-          throw new Error('Terminal is still running; open its tab or close it and try again')
-        }
-        if (!originalAnchor) {
-          throw new Error('Terminal owner unavailable; reconnect and try again')
-        }
-        const response = await this.client.request<CancelCreateOrAttachResult>(
-          'cancelCreateOrAttach',
-          {
-            sessionId: dispatchedSessionId,
-            requestId,
-            settlement: {
-              invocationId: authority.invocationId,
-              anchor: originalAnchor,
-              endpoint
-            }
-          },
-          5000
-        )
-        if (consumed) {
-          return
-        }
-        if (response.retention !== contract) {
-          throw new Error('Terminal owner has not confirmed physical completion; try again')
-        }
-        if (
-          response.settlement?.outcome === 'exited' ||
-          (contract === 'creation-settlement-v1' && response.settlement?.outcome === 'failed')
-        ) {
-          consume(response.settlement.outcome)
-          return
-        }
-        if (response.settlement?.outcome === 'owned') {
-          const result = response.settlement.result
-          const id = result.agentSessionEnsure?.owner.ptyId ?? dispatchedSessionId
-          // Publish the actual surviving incarnation through ordinary adapter inventory.
-          if (result.incarnationId) {
-            this.sessionIncarnations.set(id, result.incarnationId)
-          }
-          this.activeSessionIds.add(id)
-        }
-        throw new Error('Terminal owner has not confirmed physical completion; try again')
-      })
-        .catch((error) => {
-          if (!consumed) {
-            throw error
-          }
-        })
-        .finally(() => {
-          recovery = undefined
-        })
-      return recovery
-    }
-    const owner = {
-      completion: completion.promise,
-      recover,
-      consume,
-      adopt: (incarnationId: string) => {
-        if (contract === 'ordinary' && ordinaryIncarnation === incarnationId) {
-          consume('adopted', incarnationId)
-        }
-      }
-    }
-    context.operation.switchSettlement = owner
-    this.switchSpawnSettlements.set(context.operation, owner)
-    authority.trackPhysical?.(owner.completion, recover)
-  }
-}
diff --git a/src/main/daemon/daemon-request-router.ts b/src/main/daemon/daemon-request-router.ts
index 13016337e721..68907e06adc7 100644
--- a/src/main/daemon/daemon-request-router.ts
+++ b/src/main/daemon/daemon-request-router.ts
@@ -117,9 +117,6 @@ export class DaemonRequestRouter {
         }
       case 'inspectProcess': {
         const options = {
-          ...(request.payload.captureSwitchWitness
-            ? { captureSwitchWitness: request.payload.captureSwitchWitness }
-            : {}),
           ...(request.payload.expectedIncarnationId
             ? { expectedIncarnationId: request.payload.expectedIncarnationId }
             : {}),
@@ -214,7 +211,6 @@ export class DaemonRequestRouter {
       client.streamSocket !== null &&
       this.options.connections.size === 1 &&
       this.options.admission.inFlight === 0 &&
-      !this.options.preparations.hasOwedOutcomes() &&
       this.options.host.listSessions().length === 0 &&
       this.options.connections.hasOnlyTransportsFor(client)
     if (retiring) {
diff --git a/src/main/daemon/daemon-server-async-spawn-cancellation.test.ts b/src/main/daemon/daemon-server-async-spawn-cancellation.test.ts
index 6837f9ef613a..bef5cad77e87 100644
--- a/src/main/daemon/daemon-server-async-spawn-cancellation.test.ts
+++ b/src/main/daemon/daemon-server-async-spawn-cancellation.test.ts
@@ -8,9 +8,6 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { DaemonClient } from './client'
 import { createMockSubprocess } from './daemon-pty-adapter-test-harness'
 import { DaemonServer } from './daemon-server'
-import { DaemonPtyAdapter } from './daemon-pty-adapter'
-import * as transport from './daemon-client-socket-connect'
-import type { DaemonClientConnections } from './daemon-client-connections'
 import { getDaemonSocketPath } from './daemon-spawner'
 const nativePty = vi.hoisted(() => ({ spawn: vi.fn() }))
 vi.mock('node-pty', () => nativePty)
@@ -77,117 +74,6 @@ describe('daemon async spawn cancellation', () => {
     rmSync(directory, { recursive: true, force: true })
   })
 
-  it.each(['healthy', 'release-reply-lost'] as const)(
-    'consumes only after actual adoption and reclaims without a physical hold: %s',
-    async (loss) => {
-      const adapter = new DaemonPtyAdapter({
-        socketPath: getDaemonSocketPath(directory),
-        tokenPath: join(directory, 'daemon.token')
-      })
-      let owner: { work: Promise<unknown>; recover: () => Promise<void> } | undefined
-      let blocked = false
-      let releaseReplyDropped = false
-      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: inspect only this fixture's receiver connections.
-      const receiver = server as unknown as {
-        connections: DaemonClientConnections
-      }
-      const connect = transport.connectDaemonSocket
-      vi.spyOn(transport, 'connectDaemonSocket').mockImplementation(async (...args) => {
-        if (blocked) {
-          throw new Error('Connection lost')
-        }
-        const socket = await connect(...args)
-        const write = socket.write.bind(socket)
-        vi.spyOn(socket, 'write').mockImplementation(
-          (...values: Parameters<typeof socket.write>) => {
-            const frame = JSON.parse(String(values[0]))
-            if (frame.payload?.switchExecution?.phase === 'commit') {
-              const peer = [...receiver.connections.values()].at(-1)?.controlSocket
-              if (!peer) {
-                throw new Error('fixture control missing')
-              }
-              const respond = peer.write.bind(peer)
-              vi.spyOn(peer, 'write').mockImplementation(
-                (...bytes: Parameters<typeof peer.write>) => {
-                  const result = JSON.parse(String(bytes[0]))
-                  if (
-                    loss === 'release-reply-lost' &&
-                    !releaseReplyDropped &&
-                    result.payload?.released === true
-                  ) {
-                    releaseReplyDropped = true
-                    blocked = true
-                    peer.destroy()
-                    return true
-                  }
-                  return respond(...bytes)
-                }
-              )
-            }
-            return write(...values)
-          }
-        )
-        return socket
-      })
-      const starting = adapter.spawn({
-        sessionId: 'receipt-pane',
-        cols: 80,
-        rows: 24,
-        switchExecution: {
-          invocationId: 'adoption-click',
-          signal: new AbortController().signal,
-          remaining: () => 60_000,
-          check: () => {},
-          trackPhysical: (work, recover) => {
-            if (recover) {
-              owner = { work, recover }
-            }
-            return work
-          }
-        }
-      })
-      const observed = starting.then(
-        (result) => ({ result }),
-        (error: unknown) => ({ error })
-      )
-      try {
-        await spawnStarted
-        releaseSpawn()
-        expect(await observed).toMatchObject({ result: { id: 'receipt-pane' } })
-        if (!owner) {
-          throw new Error('receiver completion was not tracked')
-        }
-        await owner.work
-        if (loss !== 'healthy') {
-          await vi.waitFor(() => expect(blocked).toBe(true))
-          blocked = false
-          await adapter.listProcesses()
-          await expect(
-            adapter.spawn({ sessionId: 'receipt-pane', cols: 80, rows: 24 })
-          ).resolves.toMatchObject({ id: 'receipt-pane', isReattach: true })
-        }
-        expect(server.host.listSessions()).toMatchObject([
-          { sessionId: 'receipt-pane', isAlive: true }
-        ])
-        expect(subprocess.forceKill).not.toHaveBeenCalled()
-        expect(spawned).toBe(1)
-        const exit = vi.fn()
-        adapter.onExit(exit)
-        subprocess._simulateExit(0)
-        await vi.waitFor(() => expect(exit).toHaveBeenCalledOnce())
-      } finally {
-        blocked = false
-        releaseSpawn()
-        await observed
-        subprocess?._simulateExit(0)
-        await owner?.recover().catch(() => {})
-        await owner?.work
-        adapter.dispose()
-      }
-    },
-    15_000
-  )
-
   it.each(['cancelCreateOrAttach', 'kill'] as const)(
     'reaps a subprocess canceled by %s during async spawn',
     async (requestType) => {
diff --git a/src/main/daemon/daemon-server-creation-failure.test-fixture.ts b/src/main/daemon/daemon-server-creation-failure.test-fixture.ts
index 07fd2fb12af2..331a416ffffe 100644
--- a/src/main/daemon/daemon-server-creation-failure.test-fixture.ts
+++ b/src/main/daemon/daemon-server-creation-failure.test-fixture.ts
@@ -1,14 +1,9 @@
 import { registerDaemonNativeFailureTests } from './daemon-server-native-failure.test-fixture'
 import './mock-descendant-sweep'
-import { join } from 'node:path'
 import { expect, it, vi } from 'vitest'
 import type { DaemonClient } from './client'
 import type { createMockSubprocess } from './daemon-pty-adapter-test-harness'
 import type { DaemonServer } from './daemon-server'
-import { DaemonPtyAdapter } from './daemon-pty-adapter'
-import * as transport from './daemon-client-socket-connect'
-import type { DaemonClientConnections } from './daemon-client-connections'
-import { getDaemonSocketPath } from './daemon-spawner'
 type DaemonServerInternals = {
   preparations: { pending: Map<string, Set<{ canceled: boolean }>> }
 }
@@ -102,91 +97,6 @@ export function registerDaemonCreationFailureTests(fixture: DaemonCreationFailur
     }
   )
 
-  it.each(['authority', 'canceled-before-send'] as const)(
-    'finishes a known successful prepare when %s refuses before commit',
-    async (failure) => {
-      const adapter = new DaemonPtyAdapter({
-        socketPath: getDaemonSocketPath(fixture.directory),
-        tokenPath: join(fixture.directory, 'daemon.token')
-      })
-      const abort = new AbortController()
-      let checks = 0
-      let owner: { work: Promise<unknown>; recover: () => Promise<void> } | undefined
-      const frames: {
-        type: string
-        payload?: { switchExecution?: { phase: string }; settlement?: unknown; release?: unknown }
-      }[] = []
-      const connect = transport.connectDaemonSocket
-      vi.spyOn(transport, 'connectDaemonSocket').mockImplementation(async (...args) => {
-        const socket = await connect(...args)
-        const write = socket.write.bind(socket)
-        vi.spyOn(socket, 'write').mockImplementation(
-          (...bytes: Parameters<typeof socket.write>) => {
-            frames.push(JSON.parse(String(bytes[0])))
-            return write(...bytes)
-          }
-        )
-        return socket
-      })
-      try {
-        await expect(
-          adapter.spawn({
-            sessionId: 'known-prepared',
-            cols: 80,
-            rows: 24,
-            signal: abort.signal,
-            switchExecution: {
-              invocationId: 'abandoned-click',
-              signal: abort.signal,
-              remaining: () => 60_000,
-              check: () => {
-                if (++checks !== 2) {
-                  return
-                }
-                if (failure === 'authority') {
-                  throw new Error('fixture newer authority')
-                }
-                abort.abort()
-              },
-              trackPhysical: (work, recover) => {
-                if (recover) {
-                  owner = { work, recover }
-                }
-                return work
-              }
-            }
-          })
-        ).rejects.toThrow(failure === 'authority' ? 'fixture newer authority' : /abort|disconnect/i)
-        if (!owner) {
-          throw new Error('known preparation lost its ordinary owner')
-        }
-        await owner.work
-        // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: inspect only this fixture receiver's actual outcome owner.
-        const receiver = fixture.server as unknown as {
-          preparations: { hasOwedOutcomes(): boolean }
-          connections: DaemonClientConnections
-        }
-        await vi.waitFor(() => expect(receiver.preparations.hasOwedOutcomes()).toBe(false))
-        expect(
-          frames.filter((frame) => frame.payload?.switchExecution?.phase === 'prepare')
-        ).toHaveLength(1)
-        expect(
-          frames.filter((frame) => frame.payload?.switchExecution?.phase === 'commit')
-        ).toHaveLength(0)
-        expect(frames.some((frame) => frame.payload?.settlement)).toBe(true)
-        expect(frames.some((frame) => frame.payload?.release)).toBe(true)
-        expect(fixture.spawned).toBe(0)
-        await owner.recover()
-        adapter.dispose()
-        await vi.waitFor(() => expect(receiver.connections.size).toBe(1))
-        expect(await fixture.client.request('shutdownIfIdle', undefined)).toMatchObject({
-          retiring: true
-        })
-      } finally {
-        adapter.dispose()
-      }
-    }
-  )
   it('matches a cancel for an attach-only request queued behind a hung create', async () => {
     const create = fixture.client.request('createOrAttach', {
       sessionId: 'shared-session',
diff --git a/src/main/daemon/daemon-server.ts b/src/main/daemon/daemon-server.ts
index ab168192016f..59f160974cc0 100644
--- a/src/main/daemon/daemon-server.ts
+++ b/src/main/daemon/daemon-server.ts
@@ -254,11 +254,7 @@ export class DaemonServer {
   }
 
   private isIdle(): boolean {
-    if (
-      this.admission.inFlight > 0 ||
-      this.host.hasLiveSessions() ||
-      this.preparations.hasOwedOutcomes()
-    ) {
+    if (this.admission.inFlight > 0 || this.host.hasLiveSessions()) {
       return false
     }
     if (this.endpoint.lost) {
diff --git a/src/main/daemon/daemon-spawn-result-identity.ts b/src/main/daemon/daemon-spawn-result-identity.ts
index c27929f20659..3a57274ea12b 100644
--- a/src/main/daemon/daemon-spawn-result-identity.ts
+++ b/src/main/daemon/daemon-spawn-result-identity.ts
@@ -3,17 +3,8 @@ import type { CreateOrAttachResult } from './types'
 
 export function daemonSpawnResultIdentity(
   result: CreateOrAttachResult
-): Pick<
-  PtySpawnResult,
-  | 'incarnationId'
-  | 'agentSessionEnsure'
-  | 'launchAgent'
-  | 'switchOutcomeUnknown'
-  | 'switchCleanupWitness'
-> {
+): Pick<PtySpawnResult, 'incarnationId' | 'agentSessionEnsure' | 'launchAgent'> {
   return {
-    ...(result.switchCleanupWitness ? { switchCleanupWitness: result.switchCleanupWitness } : {}),
-    ...(result.switchOutcomeUnknown ? { switchOutcomeUnknown: true as const } : {}),
     ...(result.incarnationId ? { incarnationId: result.incarnationId } : {}),
     ...(result.agentSessionEnsure ? { agentSessionEnsure: result.agentSessionEnsure } : {}),
     ...(result.launchAgent ? { launchAgent: result.launchAgent } : {})
diff --git a/src/main/daemon/daemon-terminal-admission.ts b/src/main/daemon/daemon-terminal-admission.ts
index 09bd40432954..91cf0f5e225c 100644
--- a/src/main/daemon/daemon-terminal-admission.ts
+++ b/src/main/daemon/daemon-terminal-admission.ts
@@ -1,6 +1,4 @@
 import { createAdmissionStreamClient } from './daemon-terminal-stream-client'
-import type { PtyCreationDisposition } from '../../shared/claimed-agent-pty-owner'
-import { performance } from 'node:perf_hooks'
 import type { BackgroundTransientFactRelay } from './daemon-background-transient-facts'
 import type { DaemonClientConnections } from './daemon-client-connections'
 import type { DaemonEndpointLifecycle } from './daemon-endpoint-lifecycle'
@@ -73,21 +71,11 @@ export class DaemonTerminalAdmission {
       this.options.requestEndpointRetirement()
       throw new Error(DAEMON_ENDPOINT_LOST_MESSAGE)
     }
-    if (payload.switchExecution?.phase === 'prepare') {
-      this.options.host.noteSpawnPreparation(payload.sessionId)
-      return this.options.preparations.prepareSwitch(
-        payload.sessionId,
-        clientId,
-        request.id,
-        payload.switchExecution.invocationId
-      )
-    }
     this.options.host.noteSpawnPreparation(payload.sessionId)
     this.createOrAttachInFlight++
     let routedSessionId = payload.sessionId
     let result: CreateOrAttachResult
     let spawnPreparation: PendingPtySpawnPreparation | null = null
-    const creation: { current: PtyCreationDisposition } = { current: { kind: 'no-fork' } }
     try {
       if (
         payload.agentSessionEnsure !== undefined &&
@@ -96,19 +84,12 @@ export class DaemonTerminalAdmission {
       ) {
         throw new Error('agent_session_identity_required')
       }
-      spawnPreparation = payload.switchExecution
-        ? this.options.preparations.commitSwitch(
-            payload.sessionId,
-            clientId,
-            request.id,
-            payload.switchExecution
-          )
-        : this.options.preparations.register(
-            payload.sessionId,
-            clientId,
-            request.id,
-            payload.cancelAfterMs
-          )
+      spawnPreparation = this.options.preparations.register(
+        payload.sessionId,
+        clientId,
+        request.id,
+        payload.cancelAfterMs
+      )
       if (!attachOnly) {
         await this.options.preparations.prepareUnlessCanceled(payload.sessionId, spawnPreparation)
       }
@@ -121,7 +102,6 @@ export class DaemonTerminalAdmission {
           : payload.historySeed !== undefined
             ? [payload.historySeed]
             : undefined
-      creation.current = { kind: 'unknown' }
       result = await this.options.host.createOrAttach({
         sessionId: payload.sessionId,
         cols: payload.cols,
@@ -149,10 +129,6 @@ export class DaemonTerminalAdmission {
           declaredIntent: isSpawnIntent(payload.spawnIntent) ? payload.spawnIntent : null,
           deadlineAt: resolveSpawnAdmissionDeadline(payload.cancelAfterMs)
         },
-        retainCanceledChild: Boolean(payload.switchExecution),
-        onCreationDisposition: (disposition) => {
-          creation.current = disposition
-        },
         isCanceled: () =>
           spawnPreparation !== null && this.options.preparations.isCanceled(spawnPreparation),
         cancelSignal: spawnPreparation.controller.signal,
@@ -161,58 +137,9 @@ export class DaemonTerminalAdmission {
         },
         streamClient: createAdmissionStreamClient(this.options, clientId, () => routedSessionId)
       })
-      if (spawnPreparation.settlement) {
-        const { attachToken: _attachToken, ...wireResult } = result
-        spawnPreparation.settlement.result = wireResult
-        const sessionId = result.agentSessionEnsure?.owner.ptyId ?? payload.sessionId
-        const anchor = spawnPreparation.switchAnchor
-        if (result.isNew && result.switchCleanupWitness && anchor) {
-          const token = result.switchCleanupWitness
-          spawnPreparation.settlement.reconcile = async () => {
-            const close = this.options.host.beginFencedTermination({
-              id: sessionId,
-              expectedIncarnationId: result.incarnationId,
-              requireNoAgentOwner: !result.agentSessionEnsure,
-              requireUnattached: true,
-              switchCondition: {
-                token,
-                remainingMs: Math.max(0, anchor.deadline - performance.now()),
-                ownedSpawn: true,
-                ...(result.agentSessionEnsure
-                  ? { claimGeneration: result.agentSessionEnsure.owner.generation }
-                  : {})
-              }
-            })
-            if (close.accepted) {
-              await close.completion
-            }
-          }
-        }
-      }
     } finally {
-      const hostDisposition = creation.current
       if (spawnPreparation) {
-        const preparation = spawnPreparation
-        const settlement = preparation.settlement
-        if (settlement) {
-          if (hostDisposition.kind === 'unknown' && settlement.result) {
-            settlement.result.switchOutcomeUnknown = true
-            result!.switchOutcomeUnknown = true
-          }
-          settlement.noChild = hostDisposition.kind === 'no-fork'
-          if (!settlement.result && hostDisposition.kind !== 'no-fork') {
-            settlement.reconcile = hostDisposition.recover
-          }
-          if (hostDisposition.kind === 'physical' || hostDisposition.kind === 'failed') {
-            this.options.preparations.trackPhysical(
-              payload.sessionId,
-              preparation,
-              hostDisposition.completion,
-              hostDisposition.kind === 'physical' ? hostDisposition.exitCode : undefined
-            )
-          }
-        }
-        this.options.preparations.finish(payload.sessionId, preparation)
+        this.options.preparations.finish(payload.sessionId, spawnPreparation)
       }
       this.createOrAttachInFlight--
       this.options.reevaluateIdleShutdown()
@@ -227,16 +154,7 @@ export class DaemonTerminalAdmission {
       this.options.host.detach(routedSessionId, result.attachToken)
       throw new TerminalAttachCanceledError(routedSessionId)
     }
-    if (
-      payload.switchExecution &&
-      spawnPreparation &&
-      this.options.preparations.isCanceled(spawnPreparation)
-    ) {
-      result.switchOutcomeUnknown = true
-    }
-    if (!result.switchOutcomeUnknown) {
-      this.options.attachments.attach(routedSessionId, clientId, result.attachToken)
-    }
+    this.options.attachments.attach(routedSessionId, clientId, result.attachToken)
     this.options.streamDataBatcher.refreshSessionDroppability(routedSessionId)
     if (this.options.transientFactRelay.isBackgrounded(routedSessionId)) {
       this.options.streamDataBatcher.enqueueControlEvent(clientId, routedSessionId, {
@@ -252,8 +170,6 @@ export class DaemonTerminalAdmission {
     })
     return {
       isNew: result.isNew,
-      ...(result.switchCleanupWitness ? { switchCleanupWitness: result.switchCleanupWitness } : {}),
-      ...(result.switchOutcomeUnknown ? { switchOutcomeUnknown: true as const } : {}),
       snapshot: result.snapshot,
       pid: result.pid,
       shellState: result.shellState,
diff --git a/src/main/daemon/session-input-path.ts b/src/main/daemon/session-input-path.ts
index ed92b7ef86d8..754f8622b391 100644
--- a/src/main/daemon/session-input-path.ts
+++ b/src/main/daemon/session-input-path.ts
@@ -44,10 +44,7 @@ export function attachSessionInputViewer(
 }
 
 export function isSessionInputClosed(session: Session): boolean {
-  return (
-    session.isAlive &&
-    (session.isSwitchClosing || inputPaths.get(session)?.subprocess.isInputClosed?.() === true)
-  )
+  return session.isAlive && inputPaths.get(session)?.subprocess.isInputClosed?.() === true
 }
 
 /** Dropping bytes a retired master cannot take would let every caller report delivery. */
diff --git a/src/main/daemon/session-process-inspection.ts b/src/main/daemon/session-process-inspection.ts
index 84a434c06895..c350291a6711 100644
--- a/src/main/daemon/session-process-inspection.ts
+++ b/src/main/daemon/session-process-inspection.ts
@@ -2,8 +2,7 @@ import type { SessionTerminationController } from './session-termination-control
 import type { SessionOutputPlane } from './session-output-plane'
 import type { TerminalShellRecoveryBarrier } from './terminal-shell-recovery-barrier'
 import type { SubprocessHandle, ChildProcessVerdictRead } from './session-subprocess-handle'
-import { SessionSwitchUse } from './session-switch-use'
-export abstract class SessionProcessInspection extends SessionSwitchUse {
+export abstract class SessionProcessInspection {
   protected abstract subprocess: SubprocessHandle
   protected abstract readonly output: SessionOutputPlane
   protected abstract readonly recoveryBarrier: TerminalShellRecoveryBarrier
diff --git a/src/main/daemon/session-shell-ready-barrier.ts b/src/main/daemon/session-shell-ready-barrier.ts
index cc45fd8e7688..1858b6ce1b41 100644
--- a/src/main/daemon/session-shell-ready-barrier.ts
+++ b/src/main/daemon/session-shell-ready-barrier.ts
@@ -26,7 +26,6 @@ export type SessionShellReadyBarrierDeps = {
   installDeviceAttributesFilter(): void
   releaseDeviceAttributesFilter(): void
   acceptStartupIngress(data: string): void
-  beforeCommandWrite?(): boolean
   /** Use an injected file-log sink because detached daemon stdio is ignored. */
   reportReadinessEvent?(event: string, details: Record<string, unknown>): void
 }
@@ -68,11 +67,6 @@ export class SessionShellReadyBarrier {
     return this._state
   }
 
-  /** Keep queuing through the post-marker flush window to preserve input order. */
-  get hasPendingWrites(): boolean {
-    return this.preReadyStdinQueue.length > 0
-  }
-
   /** Keep startup commands queued through the post-marker flush window. */
   get isGatingWrites(): boolean {
     return this._state === 'pending' || this.postReadyFlushGate.isPending
@@ -188,9 +182,7 @@ export class SessionShellReadyBarrier {
     const queued = this.preReadyStdinQueue
     this.preReadyStdinQueue = []
     for (const data of queued) {
-      if (this.deps.beforeCommandWrite?.() !== false) {
-        this.deps.subprocess.write(data)
-      }
+      this.deps.subprocess.write(data)
     }
   }
 }
diff --git a/src/main/daemon/session-switch-use.ts b/src/main/daemon/session-switch-use.ts
deleted file mode 100644
index 50899e8f4b19..000000000000
--- a/src/main/daemon/session-switch-use.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { randomUUID } from 'node:crypto'
-
-export abstract class SessionSwitchUse {
-  abstract get isTerminating(): boolean
-  abstract beginTermination(): boolean
-  private useRevision = 0
-
-  protected switchClosing = false
-
-  private switchWitness?: { token: string; revision: number; anchor: number }
-
-  get isSwitchClosing(): boolean {
-    return this.switchClosing
-  }
-
-  noteUse(): void {
-    this.useRevision++
-  }
-
-  captureSwitchWitness(): string {
-    const token = randomUUID()
-    this.switchWitness = { token, revision: this.useRevision, anchor: performance.now() }
-    return token
-  }
-
-  switchCloseCondition(condition: {
-    token: string
-    remainingMs: number
-    ownedSpawn?: true
-  }): () => boolean {
-    const witness = this.switchWitness
-    const deadline = (witness?.anchor ?? -Infinity) + Math.max(0, condition.remainingMs)
-    return () =>
-      Boolean(
-        condition.ownedSpawn &&
-        witness &&
-        this.switchWitness === witness &&
-        witness.token === condition.token &&
-        witness.revision === this.useRevision &&
-        performance.now() < deadline &&
-        !this.isTerminating
-      )
-  }
-
-  commitSwitchClose(check: () => boolean): boolean {
-    if (!check() || !this.beginTermination()) {
-      return false
-    }
-    this.switchClosing = true
-    return true
-  }
-}
diff --git a/src/main/daemon/session.ts b/src/main/daemon/session.ts
index ad70733f2da6..ef572e626662 100644
--- a/src/main/daemon/session.ts
+++ b/src/main/daemon/session.ts
@@ -71,13 +71,6 @@ export class Session extends SessionProcessInspection {
       shellReadyTimeoutMs: opts.shellReadyTimeoutMs,
       installDeviceAttributesFilter: () => this.output.installDeviceAttributesFilter(),
       releaseDeviceAttributesFilter: () => this.output.releaseDeviceAttributesFilter(),
-      beforeCommandWrite: () => {
-        if (this.switchClosing) {
-          return false
-        }
-        this.noteUse()
-        return true
-      },
       acceptStartupIngress: (data) => this.startupIngress.accept(data)
     })
 
@@ -85,10 +78,6 @@ export class Session extends SessionProcessInspection {
       ...(opts.startupIngress ? { intent: opts.startupIngress } : {}),
       ...(opts.ownerBackend ? { ownerBackend: opts.ownerBackend } : {}),
       write: (data) => {
-        if (this.switchClosing) {
-          return
-        }
-        this.noteUse()
         this.subprocess.write(data)
       },
       onEmission: (emission) => this.recoveryBarrier.accept(emission)
@@ -156,10 +145,9 @@ export class Session extends SessionProcessInspection {
   }
 
   write(data: string): void {
-    if (this._state === 'exited' || this._disposed || this.switchClosing) {
+    if (this._state === 'exited' || this._disposed) {
       return
     }
-    this.noteUse()
     // Human input must reach rc-file readers while automatic startup commands wait for readiness.
     if (!this.startupIngress.answerLiveQueryReply(data)) {
       this.subprocess.write(data)
@@ -168,10 +156,9 @@ export class Session extends SessionProcessInspection {
 
   /** Orca's own startup command: held by the shell-ready barrier until the shell can read it. */
   writeStartupCommand(data: string): void {
-    if (this._state === 'exited' || this._disposed || this.switchClosing) {
+    if (this._state === 'exited' || this._disposed) {
       return
     }
-    this.noteUse()
     if (!this.shellReady.tryEnqueue(data)) {
       this.subprocess.write(data)
     }
@@ -202,15 +189,10 @@ export class Session extends SessionProcessInspection {
   /** Arm escalation after a coordinator begins snapshot-first teardown. */
 
   attachClient(client: Omit<AttachedClient, 'token'>): symbol {
-    if (this.switchClosing) {
-      throw new Error('Terminal is closing')
-    }
-    this.noteUse()
     return this.output.attachClient(client)
   }
 
   detachClient(token: symbol): void {
-    this.noteUse()
     this.output.detachClient(token)
     // With no viewer left to resume the producer, release its pause eagerly.
     if (!this.output.hasAttachedClients) {
@@ -219,7 +201,6 @@ export class Session extends SessionProcessInspection {
   }
 
   detachAllClients(): void {
-    this.noteUse()
     this.output.clearClients()
     this.producerPause.release({ resume: true })
   }
diff --git a/src/main/daemon/terminal-creation-work.ts b/src/main/daemon/terminal-creation-work.ts
index 539b960380d9..ff29b5035028 100644
--- a/src/main/daemon/terminal-creation-work.ts
+++ b/src/main/daemon/terminal-creation-work.ts
@@ -95,7 +95,7 @@ export function reconcileUnpublishedTerminalCreation(
   sessionId: string
 ): (release: () => Promise<void>) => Promise<void> {
   return async (release) => {
-    // Registered Sessions retain their ordinary current/use-fenced close authority.
+    // Registered Sessions retain their ordinary teardown owner.
     if (!sessions.has(sessionId)) {
       await release()
     }
@@ -205,7 +205,6 @@ export async function runTerminalCreation<Result>(
     }
     assertCreateAllowed(opts)
 
-    sessions.get(opts.sessionId)?.noteUse()
     const finishPending = registerPendingTerminalCreation(
       pendingCreations,
       opts.sessionId,
diff --git a/src/main/daemon/terminal-host-agent-session-claim.ts b/src/main/daemon/terminal-host-agent-session-claim.ts
index 1b1a2f000fc0..b514418cda33 100644
--- a/src/main/daemon/terminal-host-agent-session-claim.ts
+++ b/src/main/daemon/terminal-host-agent-session-claim.ts
@@ -14,7 +14,6 @@ export type InternalCreateOrAttachOptions = CreateOrAttachOptions & {
   creationWork?: TerminalCreationWork
   onCreationDisposition?: (disposition: PtyCreationDisposition) => void
   onPhysicalOwner?: (completion: Promise<void>, exitCode: () => number | null) => void
-  retainCanceledChild?: boolean
   isCanceled?: () => boolean
   cancelSignal?: AbortSignal
 }
@@ -22,7 +21,6 @@ export type InternalCreateOrAttachOptions = CreateOrAttachOptions & {
 export async function createOrAttachClaimedAgentSession(args: {
   options: InternalCreateOrAttachOptions
   owners: ClaimedAgentPtyOwnerRegistry
-  check?: () => void
   isLive: (owner: AgentSessionOwnerBinding) => boolean
   createOrAttach: (options: InternalCreateOrAttachOptions) => Promise<CreateOrAttachResult>
 }): Promise<CreateOrAttachResult> {
@@ -49,15 +47,7 @@ export async function createOrAttachClaimedAgentSession(args: {
       })
       return { ptyId: args.options.sessionId }
     },
-    isLive: args.isLive,
-    check: args.check,
-    onDispatchedRevoked: args.options.retainCanceledChild
-      ? () => {
-          if (created) {
-            created.switchOutcomeUnknown = true
-          }
-        }
-      : undefined
+    isLive: args.isLive
   })
   if (ensured.disposition === 'created' && created) {
     return { ...(created as CreateOrAttachResult), agentSessionEnsure: ensured }
diff --git a/src/main/daemon/terminal-host-agent-session.test.ts b/src/main/daemon/terminal-host-agent-session.test.ts
index 41b2f0c53e39..2a1b07a4775d 100644
--- a/src/main/daemon/terminal-host-agent-session.test.ts
+++ b/src/main/daemon/terminal-host-agent-session.test.ts
@@ -61,15 +61,15 @@ describe('TerminalHost agent-session claims', () => {
     await host.dispose()
   })
 
-  it('adopts one claimed provider session across different requested daemon ids', async () => {
-    const first = await host.createOrAttach({
+  it('joins a pending claimed creation and later adopts its owner across requested daemon ids', async () => {
+    const creating = host.createOrAttach({
       sessionId: 'session-claimed-first',
       cols: 80,
       rows: 24,
       streamClient: { onData: vi.fn(), onExit: vi.fn() },
       agentSessionEnsure: { claim, surface }
     })
-    const second = await host.createOrAttach({
+    const joining = host.createOrAttach({
       sessionId: 'session-claimed-retry',
       cols: 80,
       rows: 24,
@@ -80,6 +80,8 @@ describe('TerminalHost agent-session claims', () => {
       }
     })
 
+    const [first, second] = await Promise.all([creating, joining])
+
     expect(first.agentSessionEnsure).toMatchObject({
       disposition: 'created',
       owner: { ptyId: 'session-claimed-first', surface }
@@ -88,6 +90,17 @@ describe('TerminalHost agent-session claims', () => {
       disposition: 'adopted',
       owner: { ptyId: 'session-claimed-first', surface }
     })
+    const later = await host.createOrAttach({
+      sessionId: 'session-claimed-later',
+      cols: 80,
+      rows: 24,
+      streamClient: { onData: vi.fn(), onExit: vi.fn() },
+      agentSessionEnsure: { claim, surface: { ...surface, terminalHandle: 'term_later' } }
+    })
+    expect(later.agentSessionEnsure).toMatchObject({
+      disposition: 'adopted',
+      owner: { ptyId: 'session-claimed-first', surface }
+    })
     expect(spawnSubprocess).toHaveBeenCalledOnce()
   })
 
diff --git a/src/main/daemon/terminal-host-create-contract.ts b/src/main/daemon/terminal-host-create-contract.ts
index 5b8da6a439bd..4a29ec3350c3 100644
--- a/src/main/daemon/terminal-host-create-contract.ts
+++ b/src/main/daemon/terminal-host-create-contract.ts
@@ -45,9 +45,6 @@ export type CreateOrAttachOptions = {
 }
 
 export type CreateOrAttachResult = {
-  /** A dispatched child remains owned after its initiating handoff lost authority. */
-  switchOutcomeUnknown?: true
-  switchCleanupWitness?: string
   isNew: boolean
   snapshot: TerminalSnapshot | null
   pid: number | null
diff --git a/src/main/daemon/terminal-host-fenced-termination.ts b/src/main/daemon/terminal-host-fenced-termination.ts
index 0f96885b409b..97f93c7ee257 100644
--- a/src/main/daemon/terminal-host-fenced-termination.ts
+++ b/src/main/daemon/terminal-host-fenced-termination.ts
@@ -15,10 +15,7 @@ export function beginTerminalHostFencedTermination(
     sessions: ReadonlyMap<string, Session>
     pendingCreations: ReadonlyMap<string, unknown>
     owners: ClaimedAgentPtyOwnerRegistry
-    kill: (
-      id: string,
-      options: { immediate: true; switchCheck?: () => boolean; ownedSpawn?: true }
-    ) => Promise<void>
+    kill: (id: string, options: { immediate: true }) => Promise<void>
   }
 ): FencedTermination {
   const session = deps.sessions.get(request.id)
@@ -39,33 +36,10 @@ export function beginTerminalHostFencedTermination(
   if (request.requireUnattached && session.hasAttachedClients) {
     return { accepted: false, result: { outcome: 'refused', reason: 'attached' } }
   }
-  if (request.switchCondition && !request.switchCondition.ownedSpawn) {
-    return { accepted: false, result: { outcome: 'refused', reason: 'unsupported' } }
-  }
-  const physicalCheck = request.switchCondition
-    ? session.switchCloseCondition(request.switchCondition)
-    : undefined
-  const switchCheck = physicalCheck
-    ? () =>
-        deps.sessions.get(request.id) === session &&
-        !deps.pendingCreations.has(request.id) &&
-        (!request.requireNoAgentOwner || deps.owners.listForPty(request.id).length === 0) &&
-        (!request.switchCondition?.ownedSpawn ||
-          deps.owners
-            .listForPty(request.id)
-            .every((owner) => owner.generation === request.switchCondition?.claimGeneration)) &&
-        physicalCheck()
-    : undefined
-  if (switchCheck && !switchCheck()) {
-    return { accepted: false, result: { outcome: 'refused', reason: 'unverifiable' } }
-  }
   try {
     // kill reserves the exact Session synchronously, before its first OS probe.
     const completion = deps
-      .kill(request.id, {
-        immediate: true,
-        ...(switchCheck ? { switchCheck, ownedSpawn: request.switchCondition?.ownedSpawn } : {})
-      })
+      .kill(request.id, { immediate: true })
       .then((): PtyFencedTerminationOutcome =>
         session.isAlive ? { outcome: 'refused', reason: 'unverifiable' } : { outcome: 'ended' }
       )
diff --git a/src/main/daemon/terminal-host-process-inspection.ts b/src/main/daemon/terminal-host-process-inspection.ts
index 2ef76d914635..9aa786c6afd0 100644
--- a/src/main/daemon/terminal-host-process-inspection.ts
+++ b/src/main/daemon/terminal-host-process-inspection.ts
@@ -20,8 +20,6 @@ import { SessionNotFoundError } from './types'
 import type { PtyProcessInspectionOptions } from '../providers/pty-process-inspection'
 
 export type TerminalHostProcessInspection = {
-  switchWitness?: string
-
   foregroundProcess: string | null
   hasChildProcesses: boolean
   childProcessEvidence?: PtyChildProcessVerdict
@@ -41,7 +39,6 @@ export async function inspectTerminalHostProcess(args: {
   /** The caller is a self-correcting poll that only reads the process name, never evidence. */
   steadyState?: boolean
   ignoreDetached?: boolean
-  strictChildren?: boolean
   retiredIncarnation?: RetiredIncarnation
   authorityGeneration: string
   nextObservationEpoch: () => number
@@ -107,7 +104,7 @@ export async function inspectTerminalHostProcess(args: {
   } else {
     try {
       const snapshot = await getStrictProcessTableSnapshotWithAge()
-      if (session.processNameIsSpawnFile || args.strictChildren) {
+      if (session.processNameIsSpawnFile) {
         const observed = resolveSpawnFileForegroundFromRows(snapshot.rows, session.pid)
         foregroundProcess = observed.available ? observed.processName : foregroundProcess
         childProcessEvidence = inspectSpawnFileChildProcessesFromRows(
@@ -214,16 +211,13 @@ export function inspectTerminalHostSession(
     sessionId,
     options?.expectedIncarnationId
   )
-  const witness =
-    options?.captureSwitchWitness && session?.isAlive ? session.captureSwitchWitness() : undefined
   return inspectTerminalHostProcess({
     sessionId,
     currentSession: () => sessions.get(sessionId),
     session: session?.isAlive ? session : null,
     ...options,
-    strictChildren: Boolean(options?.captureSwitchWitness),
     retiredIncarnation: retired.get(sessionId),
     authorityGeneration,
     nextObservationEpoch
-  }).then((result) => ({ ...result, ...(witness ? { switchWitness: witness } : {}) }))
+  })
 }
diff --git a/src/main/daemon/terminal-host-session-publish.ts b/src/main/daemon/terminal-host-session-publish.ts
index f07e63d466cb..0d9e06592b33 100644
--- a/src/main/daemon/terminal-host-session-publish.ts
+++ b/src/main/daemon/terminal-host-session-publish.ts
@@ -154,21 +154,7 @@ export async function spawnAndPublishSession(
       deps.onDeadSessionRemoved(opts.sessionId)
       deps.spawnGate?.onSessionExit(opts.sessionId)
     }
-    if (!opts.retainCanceledChild || !session.isAlive) {
-      throw new TerminalAttachCanceledError(opts.sessionId)
-    }
-    deps.onSessionCreated(opts.sessionId, opts.agentSessionGeneration, true)
-    return {
-      isNew: true,
-      switchOutcomeUnknown: true,
-      switchCleanupWitness: session.captureSwitchWitness(),
-      snapshot: session.getSnapshot(),
-      pid: session.pid,
-      shellState: session.shellState,
-      incarnationId: session.incarnationId,
-      ...getDaemonSessionResultMetadata(session),
-      attachToken: Symbol('retained-switch-child')
-    }
+    throw new TerminalAttachCanceledError(opts.sessionId)
   }
 
   deps.sessions.set(opts.sessionId, session)
@@ -220,7 +206,6 @@ export async function spawnAndPublishSession(
 
   return {
     isNew: true,
-    ...(opts.retainCanceledChild ? { switchCleanupWitness: session.captureSwitchWitness() } : {}),
     snapshot: null,
     pid: subprocess.pid,
     shellState: session.shellState,
diff --git a/src/main/daemon/terminal-host.ts b/src/main/daemon/terminal-host.ts
index 506cc15d8493..28a1fdca5b71 100644
--- a/src/main/daemon/terminal-host.ts
+++ b/src/main/daemon/terminal-host.ts
@@ -62,7 +62,6 @@ export class TerminalHost extends TerminalHostInspection {
     if (session?.isTerminating) {
       throw new SessionNotFoundError(sessionId)
     }
-    session?.noteUse()
   }
 
   createOrAttach(opts: InternalCreateOrAttachOptions): Promise<CreateOrAttachResult> {
@@ -75,9 +74,6 @@ export class TerminalHost extends TerminalHostInspection {
         createOrAttachClaimedAgentSession({
           options: opts,
           owners: this.agentSessionOwners,
-          check: opts.retainCanceledChild
-            ? () => this.assertCreateOrAttachAllowed(opts)
-            : undefined,
           isLive: (owner) => {
             const session = this.sessions.get(owner.ptyId)
             const live = this.agentSessionGenerations.isCurrent(
@@ -160,35 +156,17 @@ export class TerminalHost extends TerminalHostInspection {
     this.sessions.get(sessionId)?.resumeProducer(source)
   }
 
-  kill(
-    sessionId: string,
-    opts: { immediate?: boolean; switchCheck?: () => boolean; ownedSpawn?: true } = {}
-  ): Promise<void> {
+  kill(sessionId: string, opts: { immediate?: boolean } = {}): Promise<void> {
     const pending = this.sessionTeardown.get(sessionId)
     if (pending) {
-      if (opts.switchCheck) {
-        return Promise.resolve()
-      }
       return Promise.resolve(
         opts.immediate ? this.sessionTeardown.requestImmediate(sessionId) : pending
       )
     }
     const session = getAliveTerminalHostSession(this.sessions, sessionId)
-    const killed = this.sessionTeardown.killSession(
-      sessionId,
-      session,
-      opts.immediate === true,
-      opts.switchCheck,
-      opts.ownedSpawn
-    )
-    if (!opts.switchCheck) {
-      this.killedTombstones.record(sessionId)
-    }
-    return Promise.resolve(killed).then(() => {
-      if (opts.switchCheck && (!session.isAlive || session.isTerminating)) {
-        this.killedTombstones.record(sessionId)
-      }
-    })
+    const killed = this.sessionTeardown.killSession(sessionId, session, opts.immediate === true)
+    this.killedTombstones.record(sessionId)
+    return Promise.resolve(killed)
   }
 
   beginFencedTermination(request: PtyFencedTerminationRequest) {
diff --git a/src/main/daemon/terminal-session-teardown.ts b/src/main/daemon/terminal-session-teardown.ts
index b2a979c94436..252cc8f8d316 100644
--- a/src/main/daemon/terminal-session-teardown.ts
+++ b/src/main/daemon/terminal-session-teardown.ts
@@ -68,36 +68,7 @@ export class TerminalSessionTeardown {
     await Promise.all(this.requestImmediateAll())
   }
 
-  killSession(
-    sessionId: string,
-    session: Session,
-    immediate: boolean,
-    switchCheck?: () => boolean,
-    ownedSpawn?: true
-  ): void | Promise<void> {
-    if (switchCheck) {
-      return this.track(sessionId, session, true, async () => {
-        let committed = false
-        await killWithDescendantSweep(session.pid, () => {}, {
-          ownsRoot: () => this.sessions.get(sessionId) === session && session.isAlive && committed,
-          admitClose: async () => {
-            if (!switchCheck()) {
-              return false
-            }
-            if (!ownedSpawn || !switchCheck() || this.sessions.get(sessionId) !== session) {
-              return false
-            }
-            committed = session.commitSwitchClose(switchCheck)
-            return committed
-          },
-          terminateOwnedTree: () => session.terminateOwnedTree(),
-          awaitEscalation: true
-        })
-        if (committed && this.sessions.get(sessionId) === session && session.isAlive) {
-          await session.forceKillAndWaitForExit()
-        }
-      })
-    }
+  killSession(sessionId: string, session: Session, immediate: boolean): void | Promise<void> {
     if (!session.launchAgent && !immediate && process.platform === 'win32') {
       // The PTY job would also end `start /b` and GUI children, which a graceful close leaves running.
       if (session.beginTermination()) {
diff --git a/src/main/daemon/types.ts b/src/main/daemon/types.ts
index a9feed168caf..87892bf9e09e 100644
--- a/src/main/daemon/types.ts
+++ b/src/main/daemon/types.ts
@@ -19,11 +19,8 @@ import type {
 import type * as HistorySeedProtocol from './terminal-history-seed-transfer-protocol'
 import type * as PtyOwnerQueryProtocol from './daemon-pty-owner-query-protocol'
 import type { TerminalSnapshot } from './terminal-snapshot'
-import type { PtyFencedTerminationRequest } from '../../shared/pty-fenced-termination'
 export {
   type CreateOrAttachRequest,
-  type CreateOrAttachSettlement,
-  type CancelCreateOrAttachResult,
   type CancelCreateOrAttachRequest
 } from './daemon-create-or-attach-contract'
 
@@ -116,7 +113,6 @@ export type KillRequest = {
     expectedIncarnationId?: string
     requireNoAgentOwner?: boolean
     requireUnattached?: boolean
-    switchCondition?: PtyFencedTerminationRequest['switchCondition']
   }
 }
 
diff --git a/src/main/ipc/pty/ipc/spawn-commit-run-facts.test.ts b/src/main/ipc/pty/ipc/spawn-commit-run-facts.test.ts
index 529b272ebd5b..d70a3556b618 100644
--- a/src/main/ipc/pty/ipc/spawn-commit-run-facts.test.ts
+++ b/src/main/ipc/pty/ipc/spawn-commit-run-facts.test.ts
@@ -7,32 +7,19 @@ import { ptyIncarnationById, ptyOwnership } from '../provider/ownership-state'
 import { commitPtyIpcSpawn } from './spawn-commit'
 import { createPtyIpcSpawnState } from './spawn-state'
 import type { PtySpawnIpcDeps } from './spawn-types'
-import { createPaneBindingStore } from '../pty-launch-race-test-fixture'
-import type { PersistPtyBindingArgs } from '../../../persistence/loading-store/pty-binding-persistence'
 
 vi.mock('../../../../shared/layout-owner-switch', () => ({ ORCA_LAYOUT_OWNER_IS_MAIN: true }))
 
 const PTY_ID = 'orca-ipc-pty-run-facts'
 const INCARNATION_ID = 'inc-ipc-run-facts'
-const LEAF_ID = 'a1111111-1111-4111-8111-111111111111'
 
 async function commit(
-  persistPtyBinding: (
-    input: PersistPtyBindingArgs | (() => PersistPtyBindingArgs | null)
-  ) => Promise<boolean>,
+  persistPtyBinding: ReturnType<typeof vi.fn>,
   prepare?: (ctx: ReturnType<typeof createPtyIpcSpawnState>) => void
 ) {
   const facts = new TerminalRunFactsRegister()
   const stops = new TerminalIntentionalStops()
   stops.mark(PTY_ID, 'reversible', null)(true)
-  const store = createPaneBindingStore()
-  const saveBinding = store.persistPtyBinding.getMockImplementation()!
-  store.persistPtyBinding.mockImplementation(async (input) => {
-    if ((await persistPtyBinding(input)) === false) {
-      return false
-    }
-    return saveBinding(input)
-  })
   const runtime = {
     terminalRunFacts: facts,
     intentionalPtyStops: stops,
@@ -47,7 +34,7 @@ async function commit(
   }
   const ports = {
     runtime,
-    store,
+    store: { persistPtyBinding },
     options: {},
     sendPtySpawnedToRenderer: vi.fn()
   }
@@ -56,11 +43,11 @@ async function commit(
   const ctx = createPtyIpcSpawnState(deps, {
     worktreeId: 'wt-1',
     tabId: 'tab-1',
-    leafId: LEAF_ID,
+    leafId: 'leaf-1',
     cols: 120,
     rows: 40
   })
-  ctx.validatedLeafId = LEAF_ID
+  ctx.validatedLeafId = 'leaf-1'
   ctx.provider = { ...ctx.provider, shutdown: vi.fn().mockResolvedValue(undefined) }
   ctx.result = { id: PTY_ID, incarnationId: INCARNATION_ID }
   prepare?.(ctx)
@@ -100,7 +87,7 @@ describe('renderer spawn commit: run facts', () => {
       const { outcome, reply } = await commit(vi.fn().mockResolvedValue(true), (ctx) => {
         ctx.resumeAdmission = { verdict: 'chat-home', refused }
         if (earlyExit) {
-          ctx.metadataLeafId = LEAF_ID
+          ctx.metadataLeafId = 'leaf-1'
           ctx.deps.runtime!.getPtyLivenessVerdict = vi.fn(() => ({ status: 'exited' as const }))
           ctx.deps.store!.runDurableMutation = vi.fn().mockResolvedValue(true)
           ctx.deps.runtime!.registerPty = vi.fn(() => {
diff --git a/src/main/ipc/pty/pane/spawn-registration.ts b/src/main/ipc/pty/pane/spawn-registration.ts
index 9c9e72718121..5c42f2e98ffc 100644
--- a/src/main/ipc/pty/pane/spawn-registration.ts
+++ b/src/main/ipc/pty/pane/spawn-registration.ts
@@ -52,6 +52,38 @@ function exitedBeforeAdmission(
   }
 }
 
+/** Best-effort late-create cleanup uses the ordinary host fence, never a retained switch permit. */
+export async function discardUnattachedPtySpawn(
+  provider: IPtyProvider,
+  result: PtySpawnResult
+): Promise<boolean> {
+  if (
+    !result.incarnationId ||
+    result.isReattach ||
+    result.agentSessionEnsure?.disposition === 'adopted'
+  ) {
+    return false
+  }
+  const cleanup = await provider
+    .killFenced?.({
+      id: result.id,
+      expectedIncarnationId: result.incarnationId,
+      requireNoAgentOwner: true,
+      requireUnattached: true
+    })
+    .catch(() => undefined)
+  if (cleanup?.outcome !== 'ended' && cleanup?.outcome !== 'already_exited') {
+    return false
+  }
+  finishPtyShutdown(
+    result.id,
+    null,
+    undefined,
+    PtyExitProof.from('shutdown-acknowledged', result.incarnationId)
+  )
+  return true
+}
+
 export async function discardUnpersistedPtySpawn(
   provider: IPtyProvider,
   result: PtySpawnResult,
diff --git a/src/main/ipc/pty/runtime/spawn-commit-run-facts.test.ts b/src/main/ipc/pty/runtime/spawn-commit-run-facts.test.ts
index a223e97b68ea..e18292ef4aee 100644
--- a/src/main/ipc/pty/runtime/spawn-commit-run-facts.test.ts
+++ b/src/main/ipc/pty/runtime/spawn-commit-run-facts.test.ts
@@ -8,11 +8,9 @@ import { ptyIncarnationById, ptyOwnership } from '../provider/ownership-state'
 import { commitRuntimePtySpawn } from './spawn-commit'
 import { createRuntimePtySpawnState, type RuntimePtySpawnArgs } from './spawn-state'
 import type { PtyRuntimeControllerDeps } from './controller-deps'
-import { createPaneBindingStore } from '../pty-launch-race-test-fixture'
 
 const PTY_ID = 'orca-pty-run-facts'
 const INCARNATION_ID = 'inc-run-facts'
-const LEAF_ID = 'b1111111-1111-4111-8111-111111111111'
 
 const ADOPTED = {
   disposition: 'adopted',
@@ -21,7 +19,7 @@ const ADOPTED = {
     generation: 'g1',
     phase: 'live',
     ptyId: PTY_ID,
-    surface: { worktreeId: 'wt-1', tabId: 'tab-1', leafId: LEAF_ID, terminalHandle: 'h1' }
+    surface: { worktreeId: 'wt-1', tabId: 'tab-1', leafId: 'leaf-1', terminalHandle: 'h1' }
   }
 }
 
@@ -118,15 +116,7 @@ describe('runtime spawn commit: run facts', () => {
     'reports unavailable before binding even when the request was erased (%s)',
     async (erased) => {
       const onResumeOutcome = vi.fn()
-      const store = createPaneBindingStore()
-      await store.admitTerminalPane({
-        type: 'createTerminalTab',
-        workspace: 'wt-1',
-        tabId: 'tab-1',
-        leafId: LEAF_ID
-      })
-      const persistPtyBinding = store.persistPtyBinding
-      store.bindingWrites.mockImplementation(() => {
+      const persistPtyBinding = vi.fn(async () => {
         expect(onResumeOutcome.mock.calls).toEqual(
           ORCA_LAYOUT_OWNER_IS_MAIN ? [[PTY_ID, 'resume-unavailable']] : []
         )
@@ -142,11 +132,13 @@ describe('runtime spawn commit: run facts', () => {
         ctx.codexResumeUnavailable = !erased
         ctx.codexResumeArgvDropped = true
         ctx.hostSessionBinding = {
-          // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the fixture supplies the binding session and durable callback contract used here.
-          store: store as unknown as NonNullable<typeof ctx.hostSessionBinding>['store'],
+          // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: this boundary pin observes the bind write without invoking its stored callback.
+          store: { persistPtyBinding } as unknown as NonNullable<
+            typeof ctx.hostSessionBinding
+          >['store'],
           worktreeId: 'wt-1',
           tabId: 'tab-1',
-          leafId: LEAF_ID
+          leafId: 'leaf-1'
         }
       })
 
@@ -158,24 +150,19 @@ describe('runtime spawn commit: run facts', () => {
     const facts = new TerminalRunFactsRegister()
     const stops = new TerminalIntentionalStops()
     stops.mark(PTY_ID, 'reversible', null)(true)
-    const store = createPaneBindingStore()
-    await store.admitTerminalPane({
-      type: 'createTerminalTab',
-      workspace: 'wt-1',
-      tabId: 'tab-1',
-      leafId: LEAF_ID
-    })
-    const persistPtyBinding = store.persistPtyBinding.mockRejectedValue(new Error('disk full'))
+    const persistPtyBinding = vi.fn().mockRejectedValue(new Error('disk full'))
 
     await expect(
       commit({}, facts, stops, (ctx) => {
         ctx.provider = { ...ctx.provider, shutdown: vi.fn().mockResolvedValue(undefined) }
         ctx.hostSessionBinding = {
-          // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the fixture supplies the binding session and failing durable writer used here.
-          store: store as unknown as NonNullable<typeof ctx.hostSessionBinding>['store'],
+          // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the commit calls only persistPtyBinding on this store.
+          store: { persistPtyBinding } as unknown as NonNullable<
+            typeof ctx.hostSessionBinding
+          >['store'],
           worktreeId: 'wt-1',
           tabId: 'tab-1',
-          leafId: LEAF_ID
+          leafId: 'leaf-1'
         }
       })
     ).rejects.toThrow()
diff --git a/src/main/ipc/pty/runtime/spawn-options.ts b/src/main/ipc/pty/runtime/spawn-options.ts
index 25dce5093286..c9e5688fc9eb 100644
--- a/src/main/ipc/pty/runtime/spawn-options.ts
+++ b/src/main/ipc/pty/runtime/spawn-options.ts
@@ -88,10 +88,7 @@ export async function buildRuntimePtySpawnOptions(
     store: ctx.deps.store,
     claudeAuth: ctx.claudeAuth
   })
-  ctx.spawnOptions = {
-    ...launch.spawnOptions,
-    ...(args.switchExecution ? { switchExecution: args.switchExecution } : {})
-  }
+  ctx.spawnOptions = launch.spawnOptions
   ctx.env = launch.env
   ctx.launchCommand = launch.launchCommand
   ctx.provisionalPtySize = seedPtySpawnSize({
diff --git a/src/main/ipc/pty/runtime/spawn-state.ts b/src/main/ipc/pty/runtime/spawn-state.ts
index 4d92277a2ba5..688c9d2ebc44 100644
--- a/src/main/ipc/pty/runtime/spawn-state.ts
+++ b/src/main/ipc/pty/runtime/spawn-state.ts
@@ -33,7 +33,6 @@ import type {
 import { localProvider } from '../provider/registry'
 import type { PaneResumeOutcome } from '../../../../shared/workspace-layout/workspace-layout-published'
 import type { StartupCwdFallback } from '../../../../shared/startup-cwd-fallback'
-import type { AgentSessionSwitchAuthority } from '../../../../shared/agent-session-switch-execution'
 
 export type RuntimePtySpawnState = {
   deps: PtyRuntimeControllerDeps
@@ -161,7 +160,6 @@ export type RuntimePtySpawnArgs = {
   agentSessionCreateOperationId?: string
   spawnIntent?: SpawnIntent
   signal?: AbortSignal
-  switchExecution?: AgentSessionSwitchAuthority
   refuseSleptWorktree?: boolean
   onPtySpawnCommitted?: () => void
   /** Publish fresh resume outcome before writing its pane binding. */
diff --git a/src/main/ipc/pty/spawn-commit-adopted-session.ts b/src/main/ipc/pty/spawn-commit-adopted-session.ts
deleted file mode 100644
index cbf90d05db33..000000000000
--- a/src/main/ipc/pty/spawn-commit-adopted-session.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-import type { AgentSessionClaimedSpawnResult } from '../../../shared/agent-session-host-authority'
-import type { PtySpawnOutcome } from './spawn-outcome'
-import { codexReattachedHomeRouteField } from './host-env/codex-home'
-import { commitAttachedPtySize } from './delivery/attached-pty-size'
-import type { admitProviderReattachLaunchIdentity } from './pane/launch-authority'
-import { registerPersistedPtySpawn } from './pane/spawn-registration'
-import { savePtySpawnPaneBinding } from './spawn-commit-binding'
-import type { PtySpawnCommitInput } from './spawn-commit-assembly'
-
-export async function commitAdoptedAgentSession(
-  input: PtySpawnCommitInput,
-  adopted: AgentSessionClaimedSpawnResult,
-  providerReattachLaunchIdentity: ReturnType<typeof admitProviderReattachLaunchIdentity>
-): Promise<PtySpawnOutcome> {
-  const { state } = input
-  const { result } = state
-  const runtime = state.deps.runtime
-  let surface = adopted.owner.surface
-  if (state.args.switchExecution) {
-    const current = runtime?.resolveLiveTerminalSurface(result.id, result.incarnationId)
-    if (current) {
-      surface = current
-    } else if (input.registration.store) {
-      const binding = {
-        worktreeId: surface.worktreeId,
-        tabId: surface.tabId,
-        leafId: surface.leafId,
-        ptyId: result.id,
-        incarnationId: result.incarnationId,
-        mayCreate: false
-      }
-      await savePtySpawnPaneBinding(
-        state,
-        {
-          store: input.registration.store,
-          binding,
-          refusal: 'terminal_pane_owner_changed',
-          failureLog: 'Failed to reconcile attached terminal placement'
-        },
-        state.args.connectionId
-      )
-      surface = { ...surface, tabId: binding.tabId, leafId: binding.leafId }
-    }
-    result.switchRecoveredSurface = { tabId: surface.tabId, leafId: surface.leafId }
-  }
-  // Adoption proves attach even without the reply flag; size commit and joiners must agree.
-  const adoptedResult = { ...result, isReattach: true }
-  const rejectedRegistration = registerPersistedPtySpawn(
-    runtime,
-    input.registration.store,
-    state.pendingRegistrationClaim,
-    result.id,
-    surface.worktreeId,
-    null,
-    {
-      tabId: surface.tabId,
-      leafId: surface.leafId,
-      terminalHandle: surface.terminalHandle,
-      ...(result.incarnationId ? { incarnationId: result.incarnationId } : {}),
-      ...(providerReattachLaunchIdentity ? { providerReattachLaunchIdentity } : {})
-    }
-  )
-  if (rejectedRegistration) {
-    return rejectedRegistration
-  }
-  runtime?.noteTerminalSpawnCommit?.(result, input.expectedSourceBinding)
-  runtime?.registerPreAllocatedHandleForPty(result.id, surface.terminalHandle)
-  state.deps.options?.onCodexHomePtySpawned?.({
-    id: result.id,
-    codexHomePath: state.selectedCodexHomePath,
-    reattached: true,
-    startedAt: state.codexHomeLaunchStartedAt,
-    startedSequence: state.codexHomeLaunchStartedSequence,
-    ...codexReattachedHomeRouteField(state.reattachedCodexHomeRoutes, result.id, true),
-    ...(input.codexLaunchEnv ? { launchEnv: input.codexLaunchEnv } : {})
-  })
-  commitAttachedPtySize({
-    result: adoptedResult,
-    requested: { cols: state.args.cols, rows: state.args.rows },
-    cachedBeforeAttach: state.provisionalPtySize?.cachedBeforeAttach,
-    reflowHeadlessTerminalToPtyGrid: runtime?.reflowHeadlessTerminalToPtyGrid?.bind(runtime)
-  })
-  return {
-    kind: 'adopted',
-    result: { ...input.response, ...adoptedResult, agentSessionEnsure: adopted }
-  }
-}
diff --git a/src/main/ipc/pty/spawn-commit-assembly.ts b/src/main/ipc/pty/spawn-commit-assembly.ts
index 2d99ba6f2024..0d1a6cdc16c4 100644
--- a/src/main/ipc/pty/spawn-commit-assembly.ts
+++ b/src/main/ipc/pty/spawn-commit-assembly.ts
@@ -1,4 +1,3 @@
-import { agentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
 import type { PtySpawnSizeSeed } from './spawn-options-assembly'
 import { isValidTerminalTabId } from '../../../shared/terminal-tab-id'
 import type { AgentSessionClaimedSpawnResult } from '../../../shared/agent-session-host-authority'
@@ -13,7 +12,11 @@ import type { CodexPaneHomeRoute } from '../../codex/codex-pane-account-registry
 import type { CodexAccountSelectionTarget } from '../../codex-accounts/runtime-selection'
 import type { PtySpawnTiming } from './pty-spawn-timing'
 import type { CodexHomePtySpawnedLifecycleArgs } from './host-env/types'
-import { shouldSkipCodexHomeEnvForWindowsShell } from './host-env/codex-home'
+import {
+  codexReattachedHomeRouteField,
+  shouldSkipCodexHomeEnvForWindowsShell
+} from './host-env/codex-home'
+import { commitAttachedPtySize } from './delivery/attached-pty-size'
 import { seedTerminalRestoreRecordsFromSpawnResult } from './pane/agent-session-owners'
 import { admitProviderReattachLaunchIdentity } from './pane/launch-authority'
 import type { ReplacedPaneOwner } from './pane/replaced-pane-owner'
@@ -23,13 +26,8 @@ import type { StablePaneOwner } from './pane/stable-owner'
 import { seedHeadlessTerminalFromSpawnResult } from './pane/terminal-spawn-restore'
 import type { RuntimePtySpawnArgs } from './runtime/spawn-state'
 import { reportRuntimeResumeOutcome } from './runtime/spawn-commit-response'
-import {
-  closeUnusedSwitchSpawn,
-  savePtySpawnPaneBinding,
-  type PtySpawnPaneBinding
-} from './spawn-commit-binding'
+import { savePtySpawnPaneBinding, type PtySpawnPaneBinding } from './spawn-commit-binding'
 import { publishCommittedPtySpawn, type PtySpawnPaneKeyAliases } from './spawn-commit-publication'
-import { commitAdoptedAgentSession } from './spawn-commit-adopted-session'
 
 export type PtySpawnCommitState = {
   deps: {
@@ -51,8 +49,7 @@ export type PtySpawnCommitState = {
     | 'resumeProviderSession'
     | 'onResumeOutcome'
     | 'telemetry'
-    | 'switchExecution'
-  > & { resumeOrigin?: unknown }
+  >
   result: PtySpawnResult
   provider: IPtyProvider
   cwd: string | undefined
@@ -114,23 +111,6 @@ export async function commitPtySpawn(input: PtySpawnCommitInput): Promise<PtySpa
   const { result } = state
   const runtime = state.deps.runtime
   admitPtySpawnOwnership(runtime, result)
-  if (state.args.switchExecution) {
-    let revoked = result.switchOutcomeUnknown === true
-    try {
-      state.args.switchExecution.check()
-    } catch {
-      revoked = true
-    }
-    if (revoked) {
-      if (await closeUnusedSwitchSpawn(state.provider, result)) {
-        throw agentSessionRefusalError('agent_session_operation_expired', {
-          reason: 'operationExpired'
-        })
-      }
-      result.switchOutcomeUnknown = true
-      input.response.switchOutcomeUnknown = true
-    }
-  }
   if (input.nativeWindowsConptySpawn) {
     markNativeWindowsConptyPty(result.id)
   }
@@ -153,18 +133,6 @@ export async function commitPtySpawn(input: PtySpawnCommitInput): Promise<PtySpa
   })
   if (input.paneBinding) {
     await savePtySpawnPaneBinding(state, input.paneBinding, state.args.connectionId)
-    if (result.switchOutcomeUnknown) {
-      input.response.switchOutcomeUnknown = true
-    }
-    if (result.switchRecoveredSurface) {
-      const recovered = result.switchRecoveredSurface
-      state.args.tabId = recovered.tabId
-      state.metadataLeafId = recovered.leafId
-      input.paneKey = `${recovered.tabId}:${recovered.leafId}`
-      input.expectedSourceBinding = undefined
-      input.paneKeyAliases = undefined
-      input.response.switchRecoveredSurface = recovered
-    }
   }
   const { registration } = input
   if (registration.worktreeId) {
@@ -218,3 +186,56 @@ export async function commitPtySpawn(input: PtySpawnCommitInput): Promise<PtySpa
   }
   return publishCommittedPtySpawn(input)
 }
+
+/** An adopted claim attaches to a live owner: it publishes the owner's surface, not a new pane. */
+async function commitAdoptedAgentSession(
+  input: PtySpawnCommitInput,
+  adopted: AgentSessionClaimedSpawnResult,
+  providerReattachLaunchIdentity: ReturnType<typeof admitProviderReattachLaunchIdentity>
+): Promise<PtySpawnOutcome> {
+  const { state } = input
+  const { result } = state
+  const runtime = state.deps.runtime
+  // Adoption proves attach even without the reply flag; size commit and joiners must agree.
+  const adoptedResult = { ...result, isReattach: true }
+  const { surface } = adopted.owner
+  const rejectedRegistration = registerPersistedPtySpawn(
+    runtime,
+    input.registration.store,
+    state.pendingRegistrationClaim,
+    result.id,
+    surface.worktreeId,
+    null,
+    {
+      tabId: surface.tabId,
+      leafId: surface.leafId,
+      terminalHandle: surface.terminalHandle,
+      ...(result.incarnationId ? { incarnationId: result.incarnationId } : {}),
+      ...(providerReattachLaunchIdentity ? { providerReattachLaunchIdentity } : {})
+    }
+  )
+  if (rejectedRegistration) {
+    return rejectedRegistration
+  }
+  runtime?.noteTerminalSpawnCommit?.(result, input.expectedSourceBinding)
+  runtime?.registerPreAllocatedHandleForPty(result.id, surface.terminalHandle)
+  state.deps.options?.onCodexHomePtySpawned?.({
+    id: result.id,
+    codexHomePath: state.selectedCodexHomePath,
+    reattached: true,
+    startedAt: state.codexHomeLaunchStartedAt,
+    startedSequence: state.codexHomeLaunchStartedSequence,
+    ...codexReattachedHomeRouteField(state.reattachedCodexHomeRoutes, result.id, true),
+    ...(input.codexLaunchEnv ? { launchEnv: input.codexLaunchEnv } : {})
+  })
+  commitAttachedPtySize({
+    result: adoptedResult,
+    requested: { cols: state.args.cols, rows: state.args.rows },
+    cachedBeforeAttach: state.provisionalPtySize?.cachedBeforeAttach,
+    reflowHeadlessTerminalToPtyGrid: runtime?.reflowHeadlessTerminalToPtyGrid?.bind(runtime)
+  })
+  return {
+    kind: 'adopted',
+    result: { ...input.response, isReattach: true, agentSessionEnsure: adopted }
+  }
+}
diff --git a/src/main/ipc/pty/spawn-commit-binding.ts b/src/main/ipc/pty/spawn-commit-binding.ts
index 8b964d5e0608..a26731b2ca47 100644
--- a/src/main/ipc/pty/spawn-commit-binding.ts
+++ b/src/main/ipc/pty/spawn-commit-binding.ts
@@ -1,4 +1,3 @@
-import { randomUUID } from 'node:crypto'
 import type { Store } from '../../persistence'
 import type { PersistPtyBindingArgs } from '../../persistence/loading-store/pty-binding-persistence'
 import { ptyBindingIsRefused } from '../../persistence/loading-store/pty-binding-refusals'
@@ -14,10 +13,7 @@ import {
 } from './pane/pane-spawn-operation'
 import { swapReplacedPaneBinding } from './pane/pane-owner-replacement'
 import type { ReplacedPaneOwner } from './pane/replaced-pane-owner'
-import { finishPtyShutdown } from './provider/liveness'
-import { PtyExitProof } from '../../pty-exit-proof'
 import { discardUnpersistedPtySpawn } from './pane/spawn-registration'
-import type { AgentSessionSwitchAuthority } from '../../../shared/agent-session-switch-execution'
 
 /** A lane's pane binding for its new process, saved before the spawn is acknowledged. */
 export type PtySpawnPaneBinding = {
@@ -35,29 +31,16 @@ export async function savePtySpawnPaneBinding(
     result: PtySpawnResult
     provider: IPtyProvider
     replacedPaneOwner?: ReplacedPaneOwner | null
-    args?: {
-      switchExecution?: AgentSessionSwitchAuthority
-    }
-    deps: { runtime?: OrcaRuntimeService; sendPtySpawnedToRenderer?: (id: string) => void }
+    deps: { runtime?: OrcaRuntimeService }
   },
   { store, binding, absentOwner, refusal, failureLog }: PtySpawnPaneBinding,
   connectionId: string | null | undefined
 ): Promise<void> {
   const replaced = state.replacedPaneOwner
-  const observeAuthority = () => {
-    try {
-      state.args?.switchExecution?.check()
-    } catch {
-      state.result.switchOutcomeUnknown = true
-    }
-  }
   try {
     const persisted = replaced
-      ? await store.persistPtyBinding(() => {
-          observeAuthority()
-          return swapReplacedPaneBinding(store, binding, replaced)()
-        })
-      : await persistFreshPaneBinding(store, binding, connectionId, absentOwner, observeAuthority)
+      ? await store.persistPtyBinding(swapReplacedPaneBinding(store, binding, replaced))
+      : await persistFreshPaneBinding(store, binding, connectionId, absentOwner)
     if (persisted === false) {
       throw new Error(refusal)
     }
@@ -67,31 +50,6 @@ export async function savePtySpawnPaneBinding(
     }
   } catch (err) {
     console.error(failureLog, err)
-    if (state.args?.switchExecution) {
-      if (await closeUnusedSwitchSpawn(state.provider, state.result)) {
-        throw err
-      }
-      // A dispatched child can have acquired users during the durable wait; never generic-close it.
-      state.result.switchOutcomeUnknown = true
-      const recovered = { tabId: randomUUID(), leafId: randomUUID() }
-      // Rehome the real child through ordinary topology creation, never overwrite the winner.
-      const recovery: PersistPtyBindingArgs = {
-        worktreeId: binding.worktreeId,
-        ...recovered,
-        ptyId: binding.ptyId,
-        incarnationId: binding.incarnationId,
-        startupCwd: binding.startupCwd,
-        mayCreate: true
-      }
-      await store
-        .persistPtyBinding(recovery, connectionId ? toSshExecutionHostId(connectionId) : undefined)
-        .catch(() => false)
-      // Even a failed disk remains an owned, visibly published runtime terminal, not a second start.
-      state.result.switchRecoveredSurface = recovered
-      Object.assign(binding, recovery)
-      state.replacedPaneOwner = null
-      return
-    }
     await discardUnpersistedPtySpawn(state.provider, state.result, state.deps.runtime)
     if (
       err instanceof PaneOwnerContentionError ||
@@ -105,38 +63,17 @@ export async function savePtySpawnPaneBinding(
   }
 }
 
-type PaneBindingStore = Pick<Store, 'persistPtyBinding' | 'getWorkspaceSession'>
-
 /** Runs inside the existing durable mutation, after source/topology checks and before any bind. */
-export function persistFreshPaneBinding(
-  store: PaneBindingStore,
-  input: PersistPtyBindingArgs | (() => PersistPtyBindingArgs),
+export async function persistFreshPaneBinding(
+  store: Store,
+  binding: PersistPtyBindingArgs,
   connectionId?: string | null,
-  absentOwner?: AbsentPaneBinding,
-  observeAuthority?: () => void
-): Promise<boolean>
-export function persistFreshPaneBinding(
-  store: Partial<PaneBindingStore> | null | undefined,
-  input: PersistPtyBindingArgs | (() => PersistPtyBindingArgs),
-  connectionId?: string | null
-): Promise<boolean> | undefined
-export function persistFreshPaneBinding(
-  store: Partial<PaneBindingStore> | null | undefined,
-  input: PersistPtyBindingArgs | (() => PersistPtyBindingArgs),
-  connectionId?: string | null,
-  absentOwner?: AbsentPaneBinding,
-  observeAuthority?: () => void
-): Promise<boolean> | undefined {
-  if (!store?.getWorkspaceSession) {
-    return undefined
-  }
-  const getWorkspaceSession = store.getWorkspaceSession.bind(store)
+  absentOwner?: AbsentPaneBinding
+): Promise<boolean> {
   let targetChanged = false
   const hostId = connectionId ? toSshExecutionHostId(connectionId) : undefined
-  const pending = store.persistPtyBinding?.(() => {
-    observeAuthority?.()
-    const binding = typeof input === 'function' ? input() : input
-    const session = getWorkspaceSession(hostId)
+  const persisted = await store.persistPtyBinding(() => {
+    const session = store.getWorkspaceSession(hostId)
     const paneKey = makePaneKey(binding.tabId, binding.leafId)
     if (ptyBindingIsRefused(binding, session, binding.worktreeId, paneKey, [])) {
       return binding
@@ -153,51 +90,8 @@ export function persistFreshPaneBinding(
     }
     return binding
   }, hostId)
-  return pending === undefined
-    ? undefined
-    : Promise.resolve(pending).then((persisted) => {
-        if (targetChanged) {
-          throw new PaneOwnerContentionError()
-        }
-        return persisted
-      })
-}
-
-/** Only the original unused physical witness can authorize cleanup after a dispatched result. */
-export async function closeUnusedSwitchSpawn(
-  provider: IPtyProvider,
-  result: PtySpawnResult
-): Promise<boolean> {
-  if (
-    !result.switchCleanupWitness ||
-    !result.incarnationId ||
-    result.isReattach ||
-    result.agentSessionEnsure?.disposition === 'adopted'
-  ) {
-    return false
-  }
-  const cleanup = await provider
-    .killFenced?.({
-      id: result.id,
-      expectedIncarnationId: result.incarnationId,
-      requireNoAgentOwner: false,
-      requireUnattached: false,
-      switchCondition: {
-        token: result.switchCleanupWitness,
-        remainingMs: 8_000,
-        ownedSpawn: true,
-        claimGeneration: result.agentSessionEnsure?.owner.generation
-      }
-    })
-    .catch(() => undefined)
-  if (cleanup?.outcome !== 'ended' && cleanup?.outcome !== 'already_exited') {
-    return false
+  if (targetChanged) {
+    throw new PaneOwnerContentionError()
   }
-  finishPtyShutdown(
-    result.id,
-    null,
-    undefined,
-    PtyExitProof.from('shutdown-acknowledged', result.incarnationId)
-  )
-  return true
+  return persisted
 }
diff --git a/src/main/ipc/pty/spawn-commit-publication.ts b/src/main/ipc/pty/spawn-commit-publication.ts
index 0a1d30abc3e6..bb7203a26208 100644
--- a/src/main/ipc/pty/spawn-commit-publication.ts
+++ b/src/main/ipc/pty/spawn-commit-publication.ts
@@ -1,4 +1,3 @@
-import { retireChatForAdmittedTerminalLaunch } from '../../runtime/session-tabs/structured-session-terminal-launch-retirement'
 import { agentHookServer } from '../../agent-hooks/server'
 import { clearMigrationUnsupportedPtysForPaneKey } from '../../agent-hooks/migration-unsupported-pty-state'
 import { registerPty } from '../../memory/pty-registry'
@@ -29,20 +28,10 @@ export type PtySpawnPaneKeyAliases = {
   opaqueRemintedSpawnPaneKey: string | null
 }
 
-/** Everything a registered spawn publishes, in one order for both lanes. */
-export async function publishCommittedPtySpawn(
-  input: PtySpawnCommitInput
-): Promise<PtySpawnOutcome> {
+/** Everything a registered spawn publishes, in one order for both lanes; nothing here awaits. */
+export function publishCommittedPtySpawn(input: PtySpawnCommitInput): PtySpawnOutcome {
   const { state } = input
   const { deps, args, result } = state
-  let switchRevoked = result.switchOutcomeUnknown === true
-  try {
-    args.switchExecution?.check()
-  } catch {
-    switchRevoked = true
-  }
-  // A dispatched result still needs its ordinary binding and visible inventory.
-
   const runtime = deps.runtime
   runtime?.noteTerminalSpawnCommit?.(
     { ...result, spawnRequestedAt: state.spawnRequestedAt },
@@ -108,18 +97,16 @@ export async function publishCommittedPtySpawn(
         : null
   })
   // Rejected spawns must not leave a published resume identity.
-  if (!switchRevoked) {
-    seedResumeLaunchIdentityFromSpawn({
-      paneKey: input.paneKey,
-      launchAgent: args.launchAgent,
-      resumeProviderSession: args.resumeProviderSession,
-      connectionId: args.connectionId,
-      worktreeId: args.worktreeId,
-      launchedAt: state.codexHomeLaunchStartedAt,
-      resumeArgvDropped: input.resumeArgvDropped,
-      result
-    })
-  }
+  seedResumeLaunchIdentityFromSpawn({
+    paneKey: input.paneKey,
+    launchAgent: args.launchAgent,
+    resumeProviderSession: args.resumeProviderSession,
+    connectionId: args.connectionId,
+    worktreeId: args.worktreeId,
+    launchedAt: state.codexHomeLaunchStartedAt,
+    resumeArgvDropped: input.resumeArgvDropped,
+    result
+  })
   // Inventory cannot infer background/reattached PTYs from mounted views.
   deps.sendPtySpawnedToRenderer(result.id)
   deps.options?.onCodexHomePtySpawned?.({
@@ -138,9 +125,6 @@ export async function publishCommittedPtySpawn(
         ? { launchEnv: input.codexLaunchEnv }
         : {})
   })
-  if (!switchRevoked) {
-    await retireChatForAdmittedTerminalLaunch(runtime, args, input.response)
-  }
   return { kind: 'committed', result: input.response }
 }
 
diff --git a/src/main/ipc/pty/spawn-execute.ts b/src/main/ipc/pty/spawn-execute.ts
index 06e1f0eafb81..c1119fe41a7d 100644
--- a/src/main/ipc/pty/spawn-execute.ts
+++ b/src/main/ipc/pty/spawn-execute.ts
@@ -76,7 +76,6 @@ export async function executePtySpawn(
       : 0
     ctx.spawnTiming?.mark('options')
     const validateDispatch = (): void => {
-      args.switchExecution?.check()
       facts.validateDispatch?.()
       if (ctx.paneSpawnOperation?.mustExist && args.worktreeId && args.tabId && args.leafId) {
         assertPaneStillExists(
@@ -149,14 +148,6 @@ export async function executePtySpawn(
             }
           },
           isLive: isRegisteredAgentSessionOwnerLive,
-          check: args.switchExecution?.check,
-          onDispatchedRevoked: args.switchExecution
-            ? () => {
-                if (providerResult) {
-                  providerResult.switchOutcomeUnknown = true
-                }
-              }
-            : undefined,
           onJoin: () => {
             awaitingAnotherStart = true
           }
diff --git a/src/main/providers/local-pty-foreground-inspection.ts b/src/main/providers/local-pty-foreground-inspection.ts
index e77ee24ce50f..19510fafa7f7 100644
--- a/src/main/providers/local-pty-foreground-inspection.ts
+++ b/src/main/providers/local-pty-foreground-inspection.ts
@@ -37,8 +37,7 @@ import { isWindowsPtyJobReadable, readWindowsPtyJobProcessIds } from './windows-
 export async function inspectLocalPtyChildProcesses(
   id: string,
   fresh = true,
-  ignoreDetached = false,
-  strict = false
+  ignoreDetached = false
 ): Promise<PtyChildProcessVerdict> {
   const proc = ptyProcesses.get(id)
   if (!proc) {
@@ -57,7 +56,7 @@ export async function inspectLocalPtyChildProcesses(
       )
       return ptyProcesses.get(id) === proc ? verdict : 'unverifiable'
     }
-    if (strict || ptyProcessNameIsSpawnFile(proc)) {
+    if (ptyProcessNameIsSpawnFile(proc)) {
       const snapshot = await getStrictProcessTableSnapshotWithAge()
       return ptyProcesses.get(id) === proc
         ? inspectSpawnFileChildProcessesFromRows(
diff --git a/src/main/providers/local-pty-provider-state.ts b/src/main/providers/local-pty-provider-state.ts
index 4c2da4ec5b36..4ef1d48f32c0 100644
--- a/src/main/providers/local-pty-provider-state.ts
+++ b/src/main/providers/local-pty-provider-state.ts
@@ -52,18 +52,12 @@ export const ptyDisposables = new Map<string, { dispose: () => void }[]>()
 export const ptyExitDisposables = new Map<string, { dispose: () => void }>()
 export const ptyCleanupCallbacks = new Map<string, () => void>()
 export const ptyTerminationMode = new Map<string, 'graceful' | 'force'>()
-export class LocalPtyPhysicalExit extends PhysicalExitTracker {
-  useRevision = 0
-  closing = false
-  pendingCommand = false
-  witness?: { token: string; revision: number; at: number }
-}
-export const ptyPhysicalExits = new Map<string, LocalPtyPhysicalExit>()
+export const ptyPhysicalExits = new Map<string, PhysicalExitTracker>()
 
 export const LOCAL_PTY_PHYSICAL_EXIT_TIMEOUT_MS = 8_000
 
 export function createPtyPhysicalExit(id: string): void {
-  ptyPhysicalExits.set(id, new LocalPtyPhysicalExit())
+  ptyPhysicalExits.set(id, new PhysicalExitTracker())
 }
 
 export function waitForPtyPhysicalExit(
@@ -79,16 +73,6 @@ export function waitForPtyPhysicalExit(
   )
 }
 
-export function noteLocalPtyUse(id: string): boolean {
-  const owner = ptyPhysicalExits.get(id)
-  if (owner?.closing) {
-    return false
-  }
-  if (owner) {
-    owner.useRevision++
-  }
-  return true
-}
 // macOS TCC wrapper status is not the shell/agent exit status (STA-4536).
 export const ptyReportsChildExitStatus = new Map<string, boolean>()
 export const ptyForceKillTimers = new Map<string, ReturnType<typeof setTimeout>>()
diff --git a/src/main/providers/local-pty-provider.ts b/src/main/providers/local-pty-provider.ts
index 5616fd69276f..3dc45aa71301 100644
--- a/src/main/providers/local-pty-provider.ts
+++ b/src/main/providers/local-pty-provider.ts
@@ -1,7 +1,3 @@
-import type {
-  PtyFencedTerminationRequest,
-  PtyFencedTerminationOutcome
-} from '../../shared/pty-fenced-termination'
 import type * as pty from 'node-pty'
 import type {
   IPtyProvider,
@@ -29,8 +25,6 @@ import {
   setPtyOwnerHostColors
 } from '../../shared/pty-owner-color-query-colors'
 import {
-  ptyPhysicalExits,
-  noteLocalPtyUse,
   advanceLoadGeneration,
   clearPtyState,
   pendingLocalPtySpawns,
@@ -85,11 +79,7 @@ export class LocalPtyProvider implements IPtyProvider {
   }
 
   // Local PTYs are always attached -- no-op. Remote providers use this to resubscribe.
-  async attach(id: string): Promise<void> {
-    if (!noteLocalPtyUse(id)) {
-      throw new Error('terminal_handle_stale')
-    }
-  }
+  async attach(_id: string): Promise<void> {}
   hasPty(id: string): boolean {
     return ptyProcesses.has(id)
   }
@@ -172,14 +162,6 @@ export class LocalPtyProvider implements IPtyProvider {
         childProcessEvidence: 'unverifiable'
       }
     }
-    const owner = ptyPhysicalExits.get(id)
-    if (options?.captureSwitchWitness && owner) {
-      owner.witness = {
-        token: options.captureSwitchWitness,
-        revision: owner.useRevision,
-        at: performance.now()
-      }
-    }
     let suspendedAgentProcess: string | undefined
     const foregroundProcess = await (options?.scanChildProcesses ||
     (process.platform === 'win32' && options?.steadyState !== true)
@@ -191,8 +173,7 @@ export class LocalPtyProvider implements IPtyProvider {
     const childProcessEvidence = await inspectLocalPtyChildProcesses(
       id,
       options?.steadyState !== true,
-      options?.ignoreDetached === true,
-      Boolean(options?.captureSwitchWitness)
+      options?.ignoreDetached === true
     )
     // Neither asynchronous inspection may publish a replacement pane's identity.
     if (ptyProcesses.get(id) !== proc || ptyIncarnations.get(id) !== incarnation) {
@@ -205,60 +186,11 @@ export class LocalPtyProvider implements IPtyProvider {
     return {
       foregroundProcess,
       ...(suspendedAgentProcess ? { suspendedAgentProcess } : {}),
-      ...(options?.captureSwitchWitness && owner?.witness
-        ? { switchWitness: owner.witness.token }
-        : {}),
       hasChildProcesses: childProcessEvidence !== 'no-children',
       childProcessEvidence
     }
   }
 
-  supportsFencedTermination(): boolean {
-    return true
-  }
-  async killFenced(request: PtyFencedTerminationRequest): Promise<PtyFencedTerminationOutcome> {
-    const proc = ptyProcesses.get(request.id)
-    if (!proc) {
-      return { outcome: 'already_exited' }
-    }
-    if (ptyIncarnations.get(request.id) !== request.expectedIncarnationId) {
-      return { outcome: 'refused', reason: 'replaced' }
-    }
-    const owner = ptyPhysicalExits.get(request.id)
-    const witness = owner?.witness
-    const condition = request.switchCondition
-    if (!condition || !witness || condition.token !== witness.token) {
-      return { outcome: 'refused', reason: 'unsupported' }
-    }
-    if (!condition.ownedSpawn) {
-      return { outcome: 'refused', reason: 'unsupported' }
-    }
-    const deadline = witness.at + condition.remainingMs
-    const current = () =>
-      ptyProcesses.get(request.id) === proc &&
-      ptyPhysicalExits.get(request.id) === owner &&
-      owner?.useRevision === witness.revision &&
-      !owner?.closing &&
-      !pendingLocalPtySpawns.has(request.id) &&
-      performance.now() < deadline
-    if (!current()) {
-      return { outcome: 'refused', reason: 'unverifiable' }
-    }
-    try {
-      await shutdownLocalPty(request.id, {
-        immediate: true,
-        expectedIncarnationId: request.expectedIncarnationId,
-        switchCheck: current,
-        switchOwnedSpawn: condition.ownedSpawn
-      })
-    } catch {
-      return { outcome: 'refused', reason: 'unverifiable' }
-    }
-    return ptyProcesses.get(request.id) === proc
-      ? { outcome: 'refused', reason: 'unverifiable' }
-      : { outcome: 'ended' }
-  }
-
   getForegroundProcess(id: string): Promise<string | null> {
     return getLocalPtyForegroundProcess(id)
   }
diff --git a/src/main/providers/local-pty-session-activation.ts b/src/main/providers/local-pty-session-activation.ts
index 6e55be2bc6ec..68cf14429732 100644
--- a/src/main/providers/local-pty-session-activation.ts
+++ b/src/main/providers/local-pty-session-activation.ts
@@ -27,7 +27,6 @@ import {
   ptyInitialCwd,
   ptyLoadGeneration,
   ptyPhysicalExits,
-  noteLocalPtyUse,
   ptyProcesses,
   ptyReportsChildExitStatus,
   ptyShellPath,
@@ -112,9 +111,7 @@ export function activateLocalPtySession(args: {
       wslDistro: spawnedWslDistro
     }),
     write: (data) => {
-      if (noteLocalPtyUse(id)) {
-        proc.write(data)
-      }
+      proc.write(data)
     },
     onEmission: emitIngressData
   })
@@ -204,10 +201,6 @@ export function activateLocalPtySession(args: {
         reason: staging.failure
       })
     }
-    const physical = ptyPhysicalExits.get(id)
-    if (physical) {
-      physical.pendingCommand = true
-    }
     writeStartupCommandWhenShellReady(
       readiness.shellReadyPromise,
       proc,
@@ -217,17 +210,7 @@ export function activateLocalPtySession(args: {
       },
       {
         bracketedPasteSafe,
-        beforeWrite: () => {
-          if (physical) {
-            physical.pendingCommand = false
-          }
-          try {
-            spawn.switchExecution?.check()
-          } catch {
-            return false
-          }
-          return ptyProcesses.get(id) === proc && noteLocalPtyUse(id)
-        }
+        beforeWrite: () => ptyProcesses.get(id) === proc
       }
     )
   }
@@ -235,21 +218,10 @@ export function activateLocalPtySession(args: {
   // Memory collection needs a proven positive OS PID; node-pty can briefly publish zero during spawn.
   const rawPid = proc.pid
   const pid = typeof rawPid === 'number' && Number.isFinite(rawPid) && rawPid > 0 ? rawPid : null
-  const physical = ptyPhysicalExits.get(id)
-  if (spawn.switchExecution && physical) {
-    physical.witness = {
-      token: spawn.switchExecution.invocationId,
-      revision: physical.useRevision,
-      at: performance.now()
-    }
-  }
   return {
     id,
     incarnationId,
     pid,
-    ...(spawn.switchExecution && physical?.witness
-      ? { switchCleanupWitness: physical.witness.token }
-      : {}),
     startupCwdSource: 'request',
     ...(exitedBeforeSpawnReply ? { exitedBeforeSpawnReply: true } : {}),
     ...(spawnedWslDistro !== undefined ? { wslDistro: spawnedWslDistro } : {})
diff --git a/src/main/providers/local-pty-session-operations.ts b/src/main/providers/local-pty-session-operations.ts
index 4f75c2b2da36..b9d23d363306 100644
--- a/src/main/providers/local-pty-session-operations.ts
+++ b/src/main/providers/local-pty-session-operations.ts
@@ -8,7 +8,6 @@ import { isWslAvailableAsync } from '../wsl'
 import { resolveGitBashPath } from '../git-bash'
 import { resolveProcessCwd } from './process-cwd'
 import {
-  noteLocalPtyUse,
   dataListeners,
   exitListeners,
   ptyIncarnations,
@@ -30,9 +29,6 @@ export function writeLocalPty(id: string, data: string): boolean {
   if (startupIngressByPty.get(id)?.answerLiveQueryReply(data)) {
     return true
   }
-  if (!noteLocalPtyUse(id)) {
-    return false
-  }
   const proc = ptyProcesses.get(id)
   if (!proc) {
     return false
diff --git a/src/main/providers/local-pty-spawn-state.ts b/src/main/providers/local-pty-spawn-state.ts
index e24a9faa416d..c862a6dbba4a 100644
--- a/src/main/providers/local-pty-spawn-state.ts
+++ b/src/main/providers/local-pty-spawn-state.ts
@@ -1,6 +1,5 @@
 import type { PtySpawnResult } from './pty-provider-contract'
 import {
-  noteLocalPtyUse,
   pendingLocalPtySpawns,
   ptyIncarnations,
   ptyProcesses,
@@ -29,9 +28,6 @@ export async function runCancelableLocalPtySpawn<T>(
   id: string,
   operation: (throwIfCanceled: () => void, signal: AbortSignal) => Promise<T>
 ): Promise<T> {
-  if (!noteLocalPtyUse(id)) {
-    throw new Error('terminal_handle_stale')
-  }
   const cancellation = new AbortController()
   const pendingSpawn: PendingLocalPtySpawn = { cancellation }
   const pending = pendingLocalPtySpawns.get(id) ?? new Set()
diff --git a/src/main/providers/local-pty-spawn.ts b/src/main/providers/local-pty-spawn.ts
index 115341739788..55136a4248a0 100644
--- a/src/main/providers/local-pty-spawn.ts
+++ b/src/main/providers/local-pty-spawn.ts
@@ -36,7 +36,6 @@ export async function spawnLocalPty(
     if (pendingShutdown) {
       await pendingShutdown.promise
     }
-    args.switchExecution?.check()
     const existing = reattachLocalPty(reattachId, args.cols, args.rows)
     if (existing) {
       return existing
@@ -100,7 +99,6 @@ export async function spawnLocalPty(
     return reserveLocalPtySpawn(id, async () => {
       const checkCanceled = (): void => {
         throwIfCanceled()
-        args.switchExecution?.check()
         if (args.signal?.aborted) {
           throw new Error('client_disconnected')
         }
@@ -133,16 +131,12 @@ export async function spawnLocalPty(
       try {
         checkCanceled()
       } catch (error) {
-        if (args.switchExecution) {
-          args = { ...args, command: undefined }
-        } else {
-          try {
-            spawnResult.process.kill('SIGKILL')
-          } finally {
-            destroyPtyProcess(spawnResult.process)
-          }
-          throw error
+        try {
+          spawnResult.process.kill('SIGKILL')
+        } finally {
+          destroyPtyProcess(spawnResult.process)
         }
+        throw error
       }
       args.onPtySpawnCommitted?.()
       plan.shellPath = spawnResult.shellPath
diff --git a/src/main/providers/local-pty-termination.ts b/src/main/providers/local-pty-termination.ts
index 517b57d210ef..407ab5fe5b8f 100644
--- a/src/main/providers/local-pty-termination.ts
+++ b/src/main/providers/local-pty-termination.ts
@@ -178,9 +178,7 @@ function requestTrackedPtyShutdown(id: string, proc: pty.IPty, immediate: boolea
 async function shutdownTrackedPty(
   id: string,
   proc: pty.IPty,
-  operation: PtyShutdownOperation,
-  switchCheck?: () => boolean,
-  switchOwnedSpawn = false
+  operation: PtyShutdownOperation
 ): Promise<void> {
   const physicalExit = ptyPhysicalExits.get(id)
   const signalRoot = (): void => {
@@ -197,24 +195,6 @@ async function shutdownTrackedPty(
     // Typed agents also detach tool process groups; immediate close must snapshot before root exit.
     await killWithDescendantSweep(proc.pid, signalRoot, {
       ownsRoot: () => ptyProcesses.get(id) === proc,
-      ...(switchCheck
-        ? {
-            admitClose: async () => {
-              if (!switchCheck()) {
-                return false
-              }
-              if (!switchOwnedSpawn || !switchCheck()) {
-                return false
-              }
-              const owner = ptyPhysicalExits.get(id)
-              if (!owner || ptyProcesses.get(id) !== proc) {
-                return false
-              }
-              owner.closing = true
-              return true
-            }
-          }
-        : {}),
       terminateOwnedTree: () => terminatePtyJob(proc),
       terminateDescendants: terminateShutdownDescendants,
       // Group SIGKILL must wait out the SIGTERM grace so agents can run exit hooks (Claude SessionEnd).
@@ -223,9 +203,7 @@ async function shutdownTrackedPty(
   } else {
     signalRoot()
   }
-  if (!switchCheck || operation.rootSignalled || ptyPhysicalExits.get(id)?.closing) {
-    await waitForPtyPhysicalExit(id, physicalExit)
-  }
+  await waitForPtyPhysicalExit(id, physicalExit)
 }
 
 export async function shutdownLocalPty(
@@ -234,25 +212,14 @@ export async function shutdownLocalPty(
     immediate?: boolean
     keepHistory?: boolean
     expectedIncarnationId?: string
-    switchCheck?: () => boolean
-    switchOwnedSpawn?: boolean
   }
 ): Promise<void> {
   if (opts.expectedIncarnationId && ptyIncarnations.get(id) !== opts.expectedIncarnationId) {
     throw new Error('terminal_handle_stale')
   }
-  if (opts.switchCheck) {
-    if (!opts.switchCheck()) {
-      return
-    }
-  } else {
-    cancelPendingLocalPtySpawns(id)
-  }
+  cancelPendingLocalPtySpawns(id)
   const pending = ptyShutdownOperations.get(id)
   if (pending) {
-    if (opts.switchCheck) {
-      return
-    }
     if (opts.immediate === true) {
       pending.immediate = true
       if (pending.rootSignalled && ptyProcesses.get(id) === pending.proc) {
@@ -272,7 +239,7 @@ export async function shutdownLocalPty(
     rootSignalled: false,
     proc
   }
-  entry.promise = shutdownTrackedPty(id, proc, entry, opts.switchCheck, opts.switchOwnedSpawn)
+  entry.promise = shutdownTrackedPty(id, proc, entry)
   ptyShutdownOperations.set(id, entry)
   try {
     await entry.promise
diff --git a/src/main/providers/pty-provider-contract.ts b/src/main/providers/pty-provider-contract.ts
index eb620a72d804..6b15dbbd9c71 100644
--- a/src/main/providers/pty-provider-contract.ts
+++ b/src/main/providers/pty-provider-contract.ts
@@ -20,7 +20,6 @@ import type { PtyProcessInfo } from './pty-process-info'
 import type { TerminalExitCause } from '../../shared/terminal-exit-cause'
 import type { TerminalOwner } from '../../shared/terminal-owner'
 import type { WriteSettlement } from '../../shared/pty-write-settlement'
-import type { AgentSessionSwitchAuthority } from '../../shared/agent-session-switch-execution'
 
 export type {
   PtyBackgroundStreamEvent,
@@ -112,7 +111,6 @@ export type PtySpawnOptions = {
   onPtySpawnCommitted?: () => void
   /** Cancels only before physical dispatch; operation identity fences later ambiguity. */
   signal?: AbortSignal
-  switchExecution?: AgentSessionSwitchAuthority
 }
 
 export type { PtyProcessInfo, PtySpawnResult }
diff --git a/src/main/providers/pty-spawn-result.ts b/src/main/providers/pty-spawn-result.ts
index 528fd2ff54b4..118e6e5702e3 100644
--- a/src/main/providers/pty-spawn-result.ts
+++ b/src/main/providers/pty-spawn-result.ts
@@ -7,11 +7,6 @@ import type { TerminalOwner } from '../../shared/terminal-owner'
 import type { OpenCodeCliCapabilities } from '../../shared/opencode-cli-version'
 
 export type PtySpawnResult = TerminalLaunchResult & {
-  /** A dispatched child remains owned after its initiating handoff lost authority. */
-  switchOutcomeUnknown?: true
-  switchCleanupWitness?: string
-  /** Main-only placement reconciliation of the same dispatched process; never a provider identity. */
-  switchRecoveredSurface?: { tabId: string; leafId: string }
   /** Execution-host probe; absent on older hosts and reattachments. */
   openCodeCapabilities?: OpenCodeCliCapabilities
   agentSessionEnsure?: AgentSessionClaimedSpawnResult
diff --git a/src/main/runtime/orca-runtime-create-agent-session.ts b/src/main/runtime/orca-runtime-create-agent-session.ts
index f2068ccfedf3..b86083a1801a 100644
--- a/src/main/runtime/orca-runtime-create-agent-session.ts
+++ b/src/main/runtime/orca-runtime-create-agent-session.ts
@@ -1,6 +1,6 @@
 import type { BrowserWindow } from 'electron'
 import type { TerminalWorkspaceLaunchScope } from './runtime-legacy-worker-terminal-recovery-types'
-import { OrcaRuntimeWithGetAgentSessionExecutionNamespace } from './session-construction/agent-session/get-agent-session-execution-namespace'
+import { OrcaRuntimeWithSpawnSwitchTerminal } from './session-construction/agent-session/switch-terminal-spawn'
 import type {
   RuntimeAgentSessionRpcCaller,
   RuntimeCreateAgentSessionRequest,
@@ -24,7 +24,7 @@ import {
 } from './runtime-agent-launch-resolution'
 import { AgentLaunchUnbuildableError } from './runtime-agent-terminal-startup'
 
-export abstract class OrcaRuntimeWithCreateAgentSession extends OrcaRuntimeWithGetAgentSessionExecutionNamespace {
+export abstract class OrcaRuntimeWithCreateAgentSession extends OrcaRuntimeWithSpawnSwitchTerminal {
   abstract resolveWorkspaceTerminalStartupCwd(
     workspace: Pick<TerminalWorkspaceLaunchScope, 'path'>,
     requestedCwd?: string | null
diff --git a/src/main/runtime/orca-runtime-report-pty-spawn-commit.ts b/src/main/runtime/orca-runtime-report-pty-spawn-commit.ts
index 3ef23174150b..b0aa9a6a3dca 100644
--- a/src/main/runtime/orca-runtime-report-pty-spawn-commit.ts
+++ b/src/main/runtime/orca-runtime-report-pty-spawn-commit.ts
@@ -1,5 +1,3 @@
-import type { TerminalCreateOptions } from './runtime-terminal-contracts'
-
 export function createIdempotentCallback(callback?: () => void): () => void {
   let reported = false
   return () => {
@@ -10,16 +8,3 @@ export function createIdempotentCallback(callback?: () => void): () => void {
     callback?.()
   }
 }
-
-/** Observe the admitted dispatch using the identity and effective recipe sent to spawn. */
-export function reportTerminalSpawnDispatched(
-  opts: TerminalCreateOptions,
-  launch: () => NonNullable<
-    Parameters<NonNullable<TerminalCreateOptions['onPtySpawnDispatched']>>[0]
-  >
-): () => void {
-  return () => {
-    opts.beforePtySpawn?.()
-    opts.onPtySpawnDispatched?.(launch())
-  }
-}
diff --git a/src/main/runtime/runtime-pty-controller-contract.ts b/src/main/runtime/runtime-pty-controller-contract.ts
index 3df04cf3c853..f0d412d4ee4c 100644
--- a/src/main/runtime/runtime-pty-controller-contract.ts
+++ b/src/main/runtime/runtime-pty-controller-contract.ts
@@ -36,7 +36,6 @@ import type {
   PtyFencedTerminationRequest,
   PtyFencedTerminationOutcome
 } from '../../shared/pty-fenced-termination'
-import type { AgentSessionSwitchAuthority } from '../../shared/agent-session-switch-execution'
 
 export type PtyInventoryRefreshOptions = {
   includeForegroundProcessEvidence?: boolean
@@ -53,7 +52,6 @@ export type RuntimePtyController = {
   adoptStablePane?(opts: {
     onOutcome?: (outcome: PtySpawnOutcome, operation: PaneSpawnOperation) => void
     signal?: AbortSignal
-    switchExecution?: AgentSessionSwitchAuthority
     spawnFresh?: (operation: PaneSpawnOperation) => Promise<PtySpawnResult>
     cols: number
     rows: number
@@ -120,7 +118,6 @@ export type RuntimePtyController = {
     agentSessionCreateOperationId?: string
     spawnIntent?: SpawnIntent
     signal?: AbortSignal
-    switchExecution?: AgentSessionSwitchAuthority
     refuseSleptWorktree?: boolean
     onPtySpawnCommitted?: () => void
     /** Layout-owner build: whether a fresh start resumed its agent, told before its bind is written. */
diff --git a/src/main/runtime/session-construction/agent-session/switch-terminal-spawn.ts b/src/main/runtime/session-construction/agent-session/switch-terminal-spawn.ts
new file mode 100644
index 000000000000..b4e03ddfd5c3
--- /dev/null
+++ b/src/main/runtime/session-construction/agent-session/switch-terminal-spawn.ts
@@ -0,0 +1,102 @@
+import { randomUUID } from 'node:crypto'
+import type { AiVaultChatForkSource } from '../../../../shared/ai-vault-resume-preparation'
+import {
+  buildAiVaultLocalResumeStartup,
+  getAiVaultResumeCodexHome
+} from '../../../../shared/ai-vault-resume-startup'
+import { agentLaunchQuotingShell } from '../../../../shared/agent-launch-runtime'
+import type { TuiAgent } from '../../../../shared/tui-agent'
+import type { RuntimeTerminalCreate } from '../../../../shared/runtime-terminal-create-contract'
+import type { TerminalWorkspaceLaunchScope } from '../../runtime-legacy-worker-terminal-recovery-types'
+import type { MobileTerminalCommand } from '../../terminal/launch/mobile-terminal-startup'
+import { canonicalizeAgentSessionIdentity } from '../../agent-session/ownership/agent-session-claim-identity'
+import { OrcaRuntimeWithGetAgentSessionExecutionNamespace } from './get-agent-session-execution-namespace'
+
+export type SwitchTerminalSpawn = {
+  agent: TuiAgent
+  /** The chat's saved transcript; absent for a chat that never saved a turn. */
+  source?: AiVaultChatForkSource
+  commandOverride?: string
+  options?: Record<string, string>
+  signal?: AbortSignal
+}
+
+export abstract class OrcaRuntimeWithSpawnSwitchTerminal extends OrcaRuntimeWithGetAgentSessionExecutionNamespace {
+  protected abstract resolveMobileSessionTerminalCommand(
+    workspace: TerminalWorkspaceLaunchScope,
+    opts: { agent: TuiAgent; commandOverride?: string; sessionOptions?: Record<string, string> }
+  ): Promise<MobileTerminalCommand>
+
+  /**
+   * A switch's terminal: main's ordinary claim-carrying create, parked with no tab until the
+   * layout replace shows it. Re-issuing the same create after a lost reply adopts the running
+   * terminal through the conversation's claim (the common pattern: an idempotent keyed create),
+   * joins an in-flight one, or creates; no custody is owed anywhere.
+   */
+  async spawnSwitchTerminal(
+    workspaceId: string,
+    args: SwitchTerminalSpawn
+  ): Promise<RuntimeTerminalCreate> {
+    const workspace = await this.resolveTerminalWorkspaceLaunchScope(
+      `id:${workspaceId}`,
+      undefined,
+      {
+        wslUserAct: true
+      }
+    )
+    const launchRuntime = this.resolveAgentLaunchRuntime(workspace, args.agent)
+    const startup = args.source
+      ? buildAiVaultLocalResumeStartup({
+          session: args.source,
+          settings: this.store?.getSettings(),
+          commandOverride: args.commandOverride,
+          host: {
+            platform: launchRuntime.platform,
+            liveShell: agentLaunchQuotingShell(launchRuntime),
+            codexHome: getAiVaultResumeCodexHome(args.source.codexHome, launchRuntime.platform)
+          },
+          embedCwd: false
+        })
+      : await this.resolveMobileSessionTerminalCommand(workspace, {
+          agent: args.agent,
+          commandOverride: args.commandOverride,
+          sessionOptions: args.options
+        })
+    const providerSession = 'providerSession' in startup ? startup.providerSession : undefined
+    const namespace = this.getAgentSessionExecutionNamespace(workspace, args.agent)
+    // No claim on routes that cannot attest one (SSH): a lost reply there may leave a stray, never a fork of saved data.
+    const claim =
+      providerSession &&
+      namespace &&
+      (await this.executionOwnerSupportsAgentSessionOperation(workspace, 'resume', args.signal))
+        ? this.agentSessionClaimSigner.createClaim({
+            namespace,
+            identity: canonicalizeAgentSessionIdentity(args.agent, providerSession),
+            canonicalWorktreeId: workspace.id
+          })
+        : undefined
+    if (args.signal?.aborted) {
+      throw new Error('client_disconnected')
+    }
+    return this.createTerminal(`id:${workspace.id}`, {
+      wslUserAct: true,
+      command: startup.command,
+      env: startup.env,
+      envToDelete: startup.envToDelete,
+      launchConfig: startup.launchConfig,
+      startupCommandDelivery:
+        'startupCommandDelivery' in startup ? startup.startupCommandDelivery : undefined,
+      launchAgent: args.agent,
+      launchRuntime,
+      ...(providerSession ? { resumeProviderSession: providerSession } : {}),
+      resumeOrigin: 'switch',
+      presentation: 'background',
+      tabId: randomUUID(),
+      leafId: randomUUID(),
+      ...(claim ? { agentSessionClaim: claim } : {}),
+      persistHostSessionBinding: true,
+      deferMobileSessionPublish: true,
+      signal: args.signal
+    })
+  }
+}
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-startup.ts b/src/main/runtime/terminal/launch/mobile-terminal-startup.ts
index f479603bd13d..0ed2ae3389b8 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-startup.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-startup.ts
@@ -1,9 +1,3 @@
-import type { AiVaultChatForkSource } from '../../../../shared/ai-vault-resume-preparation'
-import {
-  buildAiVaultLocalResumeStartup,
-  getAiVaultResumeCodexHome
-} from '../../../../shared/ai-vault-resume-startup'
-import type { MobileTerminalCreateOptions } from './mobile-terminal-renderer-create'
 import { OrcaRuntimeWithRunCreateMobileSessionTerminal } from './mobile-terminal-renderer-create'
 import type { TerminalWorkspaceLaunchScope } from '../../runtime-legacy-worker-terminal-recovery-types'
 import type { WorktreeStartupLaunch } from '../../../../shared/worktree/launch-types'
@@ -74,59 +68,6 @@ function normalizeOriginConnectionId(connectionId: string | null | undefined): s
 }
 
 export abstract class OrcaRuntimeWithResolveMobileSessionTerminalCommand extends OrcaRuntimeWithRunCreateMobileSessionTerminal {
-  async createSessionSwitchTerminal(
-    workspaceId: string,
-    args: {
-      source?: AiVaultChatForkSource
-      agent: TuiAgent
-      options?: Record<string, string>
-      commandOverride?: string
-      invocationId: string
-      sessionId: string
-      afterTabId?: string
-      groupId?: string
-      execution: NonNullable<MobileTerminalCreateOptions['switchExecution']>
-    }
-  ) {
-    const workspace = await this.resolveTerminalWorkspaceLaunchScope(`id:${workspaceId}`)
-    args.execution.check()
-    const source = args.source
-    const runtime = this.resolveAgentLaunchRuntime(workspace, args.agent)
-    const startup = source
-      ? buildAiVaultLocalResumeStartup({
-          session: source,
-          settings: this.store?.getSettings(),
-          commandOverride: args.commandOverride,
-          host: {
-            platform: runtime.platform,
-            liveShell: agentLaunchQuotingShell(runtime),
-            codexHome: getAiVaultResumeCodexHome(source.codexHome, runtime.platform)
-          },
-          embedCwd: false
-        })
-      : undefined
-    args.execution.check()
-    return this.createMobileSessionTerminal(`id:${workspaceId}`, {
-      ...(startup
-        ? {
-            ...startup,
-            launchRuntime: runtime,
-            resumeProviderSession: startup.providerSession,
-            resumeOrigin: 'switch' as const,
-            launchAgent: args.agent
-          }
-        : {
-            agent: args.agent,
-            commandOverride: args.commandOverride,
-            sessionOptions: args.options
-          }),
-      afterTabId: args.afterTabId ? `agent-session:${args.sessionId}` : undefined,
-      targetGroupId: args.groupId,
-      clientMutationId: args.invocationId,
-      switchExecution: { ...args.execution, afterTabId: args.afterTabId }
-    })
-  }
-
   /** The `--resume` launch for a pane's recorded agent session, as the host window's cold restore builds it. */
   protected resolveMobileSessionResumeCommand(
     workspace: TerminalWorkspaceLaunchScope,
diff --git a/src/shared/agent-session-switch-execution.ts b/src/shared/agent-session-switch-execution.ts
index 3b7027021505..711b5c6f9fe8 100644
--- a/src/shared/agent-session-switch-execution.ts
+++ b/src/shared/agent-session-switch-execution.ts
@@ -1,10 +1,10 @@
-import type { SessionTabOpenPlacement } from './session-tab-placement'
 import type { AgentSessionWireRefusal } from './agent-session-wire'
 import { agentSessionRefusalError } from './agent-session-wire-refusals'
 import { waitForPromiseWithSignal } from './abort-signal-reason'
 
-export const AGENT_SESSION_SWITCH_HOST_MS = 720_000
-export const AGENT_SESSION_SWITCH_CLIENT_MS = 735_000
+/** Stop (≤15 s) + at-rest prepare + one layout replace; the client allows one IPC round trip more. */
+export const AGENT_SESSION_SWITCH_HOST_MS = 90_000
+export const AGENT_SESSION_SWITCH_CLIENT_MS = 105_000
 
 export type AgentSessionSwitchResult =
   | {
@@ -88,24 +88,3 @@ export function agentSessionSwitchDeadline(
   }
 }
 export type AgentSessionSwitchDeadline = ReturnType<typeof agentSessionSwitchDeadline>
-
-/** In-process authority; never serialize the callbacks as a transport permit. */
-export type AgentSessionSwitchAuthority = {
-  invocationId: string
-  openPlacement?: SessionTabOpenPlacement
-  /** View freshness is independent of process authority. */
-  selectionCurrent?: (consume?: boolean) => boolean
-  check: () => void
-  remaining: () => number
-  signal: AbortSignal
-  /** Existing acquisition/creation settlement only; logical failure never proves source exit. */
-  trackPhysical?: <T>(work: Promise<T>, recover?: () => Promise<void>) => Promise<T>
-}
-
-export type SessionSwitchProjection = {
-  invocationId: string
-  generation: string
-  sessionId: string
-  tabId: string
-  phase: 'prepare' | 'retire' | 'retain'
-}
diff --git a/src/shared/claimed-agent-pty-ensure-options.ts b/src/shared/claimed-agent-pty-ensure-options.ts
deleted file mode 100644
index cd5b5a7958ab..000000000000
--- a/src/shared/claimed-agent-pty-ensure-options.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import type { PtyCreationDisposition } from './pty-creation-disposition'
-import type {
-  AgentSessionClaimedSpawnResult,
-  AgentSessionExecutionClaim,
-  AgentSessionOwnerBinding,
-  AgentSessionSurfaceBinding
-} from './agent-session-host-authority'
-import type { LiveAgentSessionOwner } from './claimed-agent-pty-owner-snapshot'
-export type ClaimedAgentPtyEnsureOptions = {
-  claim: AgentSessionExecutionClaim
-  surface: AgentSessionSurfaceBinding
-  spawn: (reservation: { generation: string }) => Promise<{
-    ptyId: string
-    owner?: AgentSessionOwnerBinding
-    disposition?: AgentSessionClaimedSpawnResult['disposition']
-  }>
-  isLive?: (owner: LiveAgentSessionOwner) => boolean | Promise<boolean>
-  /** Called when this request waits on another request's start instead of starting its own. */
-  creation?: Promise<PtyCreationDisposition>
-  onJoin?: (creation?: Promise<PtyCreationDisposition>) => void
-  /** Checked at mutation, including after asynchronous liveness proof. */
-  check?: () => void
-  /** Reconcile an already dispatched creator without granting new attach authority. */
-  onDispatchedRevoked?: () => void
-}
diff --git a/src/shared/claimed-agent-pty-owner.ts b/src/shared/claimed-agent-pty-owner.ts
index e6fe9195afd4..dd5f233b5e09 100644
--- a/src/shared/claimed-agent-pty-owner.ts
+++ b/src/shared/claimed-agent-pty-owner.ts
@@ -1,10 +1,11 @@
-import type { ClaimedAgentPtyEnsureOptions } from './claimed-agent-pty-ensure-options'
 import type { PtyCreationDisposition } from './pty-creation-disposition'
+export type { PtyCreationDisposition } from './pty-creation-disposition'
 import { randomUUID } from 'node:crypto'
 import type {
   AgentSessionClaimedSpawnResult,
   AgentSessionExecutionClaim,
-  AgentSessionOwnerBinding
+  AgentSessionOwnerBinding,
+  AgentSessionSurfaceBinding
 } from './agent-session-host-authority'
 import {
   agentSessionClaimKey,
@@ -13,14 +14,12 @@ import {
   buildClaimedAgentPtyOwnerIndex,
   cloneAgentSessionClaim,
   cloneAgentSessionOwner,
-  cloneAgentSessionOwnerBinding,
   cloneAgentSessionSurface,
   prepareRegisteredAgentSessionOwner,
   reconcileClaimedAgentPtyOwnerSnapshot,
   scopedAgentSessionClaimsEqual,
   type LiveAgentSessionOwner
 } from './claimed-agent-pty-owner-snapshot'
-export { type PtyCreationDisposition } from './pty-creation-disposition'
 
 export { agentSessionOwnerBindingsEqual } from './claimed-agent-pty-owner-snapshot'
 
@@ -37,17 +36,40 @@ type ReservedOwner = {
 
 type LiveOwner = LiveAgentSessionOwner
 
+function cloneClaim(claim: AgentSessionExecutionClaim): AgentSessionExecutionClaim {
+  return cloneAgentSessionClaim(claim)
+}
+
+function cloneSurface(surface: AgentSessionSurfaceBinding): AgentSessionSurfaceBinding {
+  return cloneAgentSessionSurface(surface)
+}
+
+function cloneOwner(owner: LiveOwner): LiveOwner {
+  return cloneAgentSessionOwner(owner)
+}
+
 export class ClaimedAgentPtyOwnerRegistry {
   private readonly reserved = new Map<string, ReservedOwner>()
   private readonly live = new Map<string, LiveOwner>()
   private readonly conflicts = new Map<string, LiveOwner[]>()
   private keysByPtyId = new Map<string, Set<string>>()
 
-  async ensure(args: ClaimedAgentPtyEnsureOptions): Promise<AgentSessionClaimedSpawnResult> {
+  async ensure(args: {
+    claim: AgentSessionExecutionClaim
+    surface: AgentSessionSurfaceBinding
+    spawn: (reservation: { generation: string }) => Promise<{
+      ptyId: string
+      owner?: AgentSessionOwnerBinding
+      disposition?: AgentSessionClaimedSpawnResult['disposition']
+    }>
+    isLive?: (owner: LiveAgentSessionOwner) => boolean | Promise<boolean>
+    /** Called when this request waits on another request's start instead of starting its own. */
+    onJoin?: (creation?: Promise<PtyCreationDisposition>) => void
+    creation?: Promise<PtyCreationDisposition>
+  }): Promise<AgentSessionClaimedSpawnResult> {
     // Snapshot reused retry arguments before awaits so caller mutations cannot change registry keys.
-    args.check?.()
-    const requestedClaim = cloneAgentSessionClaim(args.claim)
-    const requestedSurface = cloneAgentSessionSurface(args.surface)
+    const requestedClaim = cloneClaim(args.claim)
+    const requestedSurface = cloneSurface(args.surface)
     const key = agentSessionClaimKey(requestedClaim)
     if (this.conflicts.has(key)) {
       throw new Error('agent_session_conflict')
@@ -60,15 +82,13 @@ export class ClaimedAgentPtyOwnerRegistry {
       if (live.claim.worktreeScopeDigest !== requestedClaim.worktreeScopeDigest) {
         throw new Error('agent_session_conflict')
       }
-      if (!args.isLive || (await args.isLive(cloneAgentSessionOwner(live)))) {
-        args.check?.()
+      if (!args.isLive || (await args.isLive(cloneOwner(live)))) {
         const current = this.live.get(key)
         if (current?.ptyId === live.ptyId && current.generation === live.generation) {
-          return { disposition: 'adopted', owner: cloneAgentSessionOwner(current) }
+          return { disposition: 'adopted', owner: cloneOwner(current) }
         }
         return await this.ensure(args)
       }
-      args.check?.()
       this.release(live.ptyId, live.generation)
     }
 
@@ -79,11 +99,9 @@ export class ClaimedAgentPtyOwnerRegistry {
       }
       args.onJoin?.(reserved.creation)
       const result = await reserved.promise
-      args.check?.()
-      return { disposition: 'adopted', owner: cloneAgentSessionOwnerBinding(result.owner) }
+      return { disposition: 'adopted', owner: cloneOwner(result.owner as LiveOwner) }
     }
 
-    args.check?.()
     this.assertCapacityForNewOwner()
     const generation = randomUUID()
     let resolveReservation!: (result: AgentSessionClaimedSpawnResult) => void
@@ -108,11 +126,11 @@ export class ClaimedAgentPtyOwnerRegistry {
       const spawned = await args.spawn({ generation })
       const owner: LiveOwner = spawned.owner
         ? {
-            claim: cloneAgentSessionClaim(spawned.owner.claim),
+            claim: cloneClaim(spawned.owner.claim),
             generation: spawned.owner.generation,
             phase: 'live',
             ptyId: spawned.owner.ptyId,
-            surface: cloneAgentSessionSurface(spawned.owner.surface)
+            surface: cloneSurface(spawned.owner.surface)
           }
         : {
             claim: requestedClaim,
@@ -138,36 +156,23 @@ export class ClaimedAgentPtyOwnerRegistry {
       if (reservation?.generation !== generation) {
         throw new Error('agent_session_ownership_unknown')
       }
-      const checkDispatched = () => {
-        try {
-          args.check?.()
-        } catch (error) {
-          if (!args.onDispatchedRevoked) {
-            throw error
-          }
-          args.onDispatchedRevoked()
-        }
-      }
-      checkDispatched()
       this.live.set(key, owner)
       const keys = this.keysByPtyId.get(owner.ptyId) ?? new Set<string>()
       keys.add(key)
       this.keysByPtyId.set(owner.ptyId, keys)
       // Index before awaited proof so an exit beating spawn completion can remove the matching generation.
-      if (args.isLive && !(await args.isLive(cloneAgentSessionOwner(owner)))) {
+      if (args.isLive && !(await args.isLive(cloneOwner(owner)))) {
         this.release(owner.ptyId, owner.generation)
         throw new Error('agent_session_exited_during_start')
       }
-      checkDispatched()
       const current = this.live.get(key)
       if (current?.ptyId !== owner.ptyId || current.generation !== owner.generation) {
         throw new Error('agent_session_exited_during_start')
       }
       const result: AgentSessionClaimedSpawnResult = {
         disposition: spawned.disposition ?? 'created',
-        owner: cloneAgentSessionOwner(owner)
+        owner: cloneOwner(owner)
       }
-      // Dispatch already happened: reconcile its real owner even if this observer expired.
       resolveReservation(result)
       published = true
       return result
@@ -277,7 +282,7 @@ export class ClaimedAgentPtyOwnerRegistry {
   }
 
   list(): AgentSessionOwnerBinding[] {
-    return [...this.live.values()].map(cloneAgentSessionOwner)
+    return [...this.live.values()].map(cloneOwner)
   }
 
   listForPty(ptyId: string): AgentSessionOwnerBinding[] {
@@ -288,14 +293,12 @@ export class ClaimedAgentPtyOwnerRegistry {
     return [...keys]
       .map((key) => this.live.get(key))
       .filter((owner): owner is LiveOwner => owner !== undefined)
-      .map(cloneAgentSessionOwner)
+      .map(cloneOwner)
   }
 
   find(claim: AgentSessionExecutionClaim): AgentSessionOwnerBinding | null {
     const owner = this.live.get(agentSessionClaimKey(claim))
-    return owner && scopedAgentSessionClaimsEqual(owner.claim, claim)
-      ? cloneAgentSessionOwner(owner)
-      : null
+    return owner && scopedAgentSessionClaimsEqual(owner.claim, claim) ? cloneOwner(owner) : null
   }
 
   private rebuildPtyIndex(): void {
diff --git a/src/shared/pty-fenced-termination.ts b/src/shared/pty-fenced-termination.ts
index 9037e5374946..4d277958b7d2 100644
--- a/src/shared/pty-fenced-termination.ts
+++ b/src/shared/pty-fenced-termination.ts
@@ -3,12 +3,6 @@ export type PtyFencedTerminationRequest = {
   expectedIncarnationId: string
   requireNoAgentOwner: boolean
   requireUnattached: boolean
-  switchCondition?: {
-    token: string
-    remainingMs: number
-    ownedSpawn?: true
-    claimGeneration?: string
-  }
 }
 
 export type PtyFencedTerminationOutcome =

From 8b629b7bf86a110c016cb6b2a4a333a201322c9b Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 15:04:01 -0700
Subject: [PATCH 126/207] Let a tab open in another tab's slot in one layout
 write

The switch needs its destination to take the source tab's place without a
publish-then-close gap. `openAgentSessionTab` and `createTerminalTab` take
an optional `replaces: { tabId }`: the pure layout model inserts at the
replaced tab's index and closes it in the same command, the host snapshot
splices the row the same way, the window learns the slot through the
`ui:createTerminal` payload, and paired clients read the hint from the
published row. The field is optional on the wire, so older clients and
hosts ignore it.
---
 .../agent-session/agent-session-tab-layout.ts |  14 ++-
 src/main/runtime/runtime-notifier-contract.ts |  12 +-
 .../chat-tab-layout-queue-owner.ts            |  17 +++
 .../pty-backed-session-publication.ts         |  18 +++
 .../session-tabs/session-tab-replace.test.ts  | 109 ++++++++++++++++++
 .../session-tabs/session-tab-replace.ts       |  75 ++++++++++++
 .../structured-session-tab-projection.ts      |  46 +++++---
 .../structured-session-tab-restoration.ts     |  60 ++--------
 .../session-tabs/switch-terminal-placement.ts |  94 +++++++++++++++
 src/main/window/runtime-window-lifecycle.ts   |  14 +--
 .../ui-bridge-terminal-and-session-tabs.ts    |  12 +-
 src/preload/api/ui-command-event-api.ts       |   1 -
 .../terminal-presentation-ipc-bridge.ts       |  22 ++--
 .../src/lib/unified-tab-anchor-insertion.ts   |  44 +++++++
 .../apply-preparation-groups.ts               |  83 ++++++-------
 .../rpc-contract/workspace-layout-params.ts   |   5 +
 .../workspace-layout-terminal-tab-params.ts   |   5 +
 .../runtime-mobile-session-tab-contracts.ts   |   7 +-
 .../workspace-layout-command-steps.ts         |  12 ++
 .../workspace-layout-command-types.ts         |   8 ++
 .../workspace-layout-content-commands.ts      |  23 +++-
 .../workspace-layout-published.ts             |   3 -
 .../workspace-layout-replaces.test.ts         |  86 ++++++++++++++
 .../workspace-layout-tab-close.ts             |  67 +++++++++++
 .../workspace-layout-tab-commands.ts          |  62 +++-------
 25 files changed, 687 insertions(+), 212 deletions(-)
 create mode 100644 src/main/runtime/session-tabs/chat-tab-layout-queue-owner.ts
 create mode 100644 src/main/runtime/session-tabs/session-tab-replace.test.ts
 create mode 100644 src/main/runtime/session-tabs/session-tab-replace.ts
 create mode 100644 src/main/runtime/session-tabs/switch-terminal-placement.ts
 create mode 100644 src/shared/workspace-layout/workspace-layout-replaces.test.ts
 create mode 100644 src/shared/workspace-layout/workspace-layout-tab-close.ts

diff --git a/src/main/runtime/agent-session/agent-session-tab-layout.ts b/src/main/runtime/agent-session/agent-session-tab-layout.ts
index 7aa5fef84969..85f46583f105 100644
--- a/src/main/runtime/agent-session/agent-session-tab-layout.ts
+++ b/src/main/runtime/agent-session/agent-session-tab-layout.ts
@@ -17,7 +17,16 @@ import { structuredAgentSessionTabId } from '../../../shared/structured-agent-se
 export type ChatTabPlacement = { groupId?: string; afterTabId?: string; index?: number }
 
 export type ChatTabChange =
-  | { open: { sessionId: string; agent: AgentType; tabId: string; placement?: ChatTabPlacement } }
+  | {
+      open: {
+        sessionId: string
+        agent: AgentType
+        tabId: string
+        placement?: ChatTabPlacement
+        /** A same-slot switch: the chat takes this tab's slot and the tab closes, in one write. */
+        replaces?: string
+      }
+    }
   | { close: string }
 
 export type ChatTabLayoutCommand =
@@ -68,7 +77,8 @@ export function chatTabLayoutCommand(
       ? { afterTabId }
       : placement?.index !== undefined
         ? { index: placement.index }
-        : {})
+        : {}),
+    ...(change.open.replaces ? { replaces: { tabId: change.open.replaces } } : {})
   }
 }
 
diff --git a/src/main/runtime/runtime-notifier-contract.ts b/src/main/runtime/runtime-notifier-contract.ts
index 12eb423acc68..5370641a28a6 100644
--- a/src/main/runtime/runtime-notifier-contract.ts
+++ b/src/main/runtime/runtime-notifier-contract.ts
@@ -30,7 +30,7 @@ import type {
   RuntimeTerminalDriverState,
   RuntimeTerminalPresentation
 } from '../../shared/runtime-types'
-import type { SessionSwitchProjection } from '../../shared/agent-session-switch-execution'
+import type { ReplacedTab } from '../../shared/workspace-layout/workspace-layout-command-types'
 
 type DriverState = RuntimeTerminalDriverState
 
@@ -94,6 +94,8 @@ export type RuntimeNotifier = {
         terminalHandle: string
         incarnationId: string
       }
+      /** The tab this terminal takes the slot of, closed by the same window write. */
+      replaces?: ReplacedTab
     }
   ):
     | Promise<{ tabId: string; title?: string | null; identity?: TerminalRevealIdentity }>
@@ -132,12 +134,8 @@ export type RuntimeNotifier = {
   focusTerminal(tabId: string, worktreeId: string, leafId?: string | null): void
   /** Raises the window onto a pane it shows; resolves false when the window does not know the worktree. */
   revealTerminalPane?(target: TerminalPaneRevealTarget): Promise<boolean>
-  focusEditorTab?(tabId: string, worktreeId: string, viewerSelection?: string): void
-  closeSessionTab?(
-    tabId: string,
-    worktreeId: string,
-    switchProjection?: SessionSwitchProjection
-  ): void | Promise<void | boolean>
+  focusEditorTab?(tabId: string, worktreeId: string): void
+  closeSessionTab?(tabId: string, worktreeId: string): void | Promise<void | boolean>
   moveSessionTab?(worktreeId: string, move: RuntimeMobileSessionTabMove): void
   /** Host window only: host/all move it; caller/clients open without moving it; absence keeps legacy switching. Paired clients never navigate (all means host). */
   openFile?(
diff --git a/src/main/runtime/session-tabs/chat-tab-layout-queue-owner.ts b/src/main/runtime/session-tabs/chat-tab-layout-queue-owner.ts
new file mode 100644
index 000000000000..1d90518864fd
--- /dev/null
+++ b/src/main/runtime/session-tabs/chat-tab-layout-queue-owner.ts
@@ -0,0 +1,17 @@
+import { createChatTabLayoutQueue } from '../agent-session-tab-layout-queue'
+import type { LayoutCommandRunOptions, WindowLayoutCommand } from '../runtime-layout-apply'
+import type { LayoutApplyReply } from '../../../shared/workspace-layout/workspace-layout-command-types'
+import { OrcaRuntimeWithStructuredSessionTabProjection } from './restored-chat-tab-changes'
+
+/** Chat tab opens and closes main applies to the layout it owns, one at a time. */
+export abstract class OrcaRuntimeWithChatTabLayoutQueue extends OrcaRuntimeWithStructuredSessionTabProjection {
+  abstract applyLayoutCommand(
+    command: WindowLayoutCommand,
+    options?: LayoutCommandRunOptions
+  ): Promise<LayoutApplyReply>
+  protected readonly queueChatTabChanges = createChatTabLayoutQueue({
+    sessionOf: (worktreeId) => this.getWorkspaceSessionForWorktree(worktreeId),
+    hostIdOf: (worktreeId) => this.getWorkspaceSessionHostIdForWorktree(worktreeId),
+    apply: (command, options) => this.applyLayoutCommand(command, options)
+  })
+}
diff --git a/src/main/runtime/session-tabs/pty-backed-session-publication.ts b/src/main/runtime/session-tabs/pty-backed-session-publication.ts
index b494dcddbf59..2914d5c2f2ab 100644
--- a/src/main/runtime/session-tabs/pty-backed-session-publication.ts
+++ b/src/main/runtime/session-tabs/pty-backed-session-publication.ts
@@ -3,6 +3,7 @@ import { OrcaRuntimeWithHasLiveOrPersistedServeOrSshOwnedPtyBinding } from '../s
 import type { RuntimePtyWorktreeRecord } from '../runtime-terminal-state-records'
 import { normalizeCompatibleAgentTitleForOwner } from '../../../shared/agent-title-owner'
 import { getLatestPtyTitle } from '../runtime-worktree-status-projection'
+import { replaceSessionTabInSnapshot } from './session-tab-replace'
 import type { OrcaRuntimeWithBuildPtyTerminalSummary as PtyTerminalSummaryMethods } from '../terminal/query/pty-terminal-summary'
 import type {
   RuntimeMobileSessionTabsSnapshot,
@@ -52,6 +53,8 @@ export abstract class OrcaRuntimeWithPublishPtyBackedMobileSessionTerminal exten
       viewMode?: 'terminal' | 'chat'
       split?: { splitFromLeafId: string; direction: 'horizontal' | 'vertical' }
       notify?: boolean
+      /** A same-slot switch: this row takes that tab's slot and the tab's rows leave, in one write. */
+      replaces?: string
     }
   ): void {
     if (
@@ -128,6 +131,21 @@ export abstract class OrcaRuntimeWithPublishPtyBackedMobileSessionTerminal exten
       isActive:
         args.activate || (args.selectIfNoActiveTab !== false && existing?.activeTabId == null)
     }
+    if (args.replaces) {
+      this.storeMobileSessionSnapshot(
+        worktreeId,
+        replaceSessionTabInSnapshot(existing, {
+          workspaceId: worktreeId,
+          replacedTabId: args.replaces,
+          row: tab,
+          activate: args.activate
+        })
+      )
+      if (args.notify !== false) {
+        this.notifyMobileSessionTabsChanged(worktreeId)
+      }
+      return
+    }
     const existingTabs = (existing?.tabs ?? []).filter(
       (candidate) =>
         !(
diff --git a/src/main/runtime/session-tabs/session-tab-replace.test.ts b/src/main/runtime/session-tabs/session-tab-replace.test.ts
new file mode 100644
index 000000000000..3fa9e012a631
--- /dev/null
+++ b/src/main/runtime/session-tabs/session-tab-replace.test.ts
@@ -0,0 +1,109 @@
+import { describe, expect, it } from 'vitest'
+import type { RuntimeMobileSessionTabsSnapshot } from '../../../shared/runtime-types'
+import { replaceSessionTabInSnapshot } from './session-tab-replace'
+
+const snapshot: RuntimeMobileSessionTabsSnapshot = {
+  worktree: 'ws',
+  publicationEpoch: 'e1',
+  snapshotVersion: 3,
+  activeGroupId: 'g1',
+  activeTabId: 'agent-session:s1',
+  activeTabType: 'agent-session',
+  tabGroups: [
+    { id: 'g1', activeTabId: 'agent-session:s1', tabOrder: ['t0', 'agent-session:s1', 't2'] }
+  ],
+  tabs: [
+    {
+      type: 'terminal',
+      id: 't0::l0',
+      parentTabId: 't0',
+      leafId: 'l0',
+      title: 'A',
+      isActive: false
+    },
+    {
+      type: 'agent-session',
+      id: 'agent-session:s1',
+      title: 'Chat',
+      sessionId: 's1',
+      agent: 'codex',
+      isActive: true
+    },
+    { type: 'terminal', id: 't2::l2', parentTabId: 't2', leafId: 'l2', title: 'B', isActive: false }
+  ]
+}
+
+describe('replaceSessionTabInSnapshot', () => {
+  it('puts the terminal in the chat’s slot, drops the chat row and hints the client', () => {
+    const next = replaceSessionTabInSnapshot(snapshot, {
+      workspaceId: 'ws',
+      replacedTabId: 'agent-session:s1',
+      row: {
+        type: 'terminal',
+        id: 't9::l9',
+        parentTabId: 't9',
+        leafId: 'l9',
+        title: 'C',
+        isActive: false
+      },
+      activate: true
+    })
+    expect(next.tabGroups?.[0]?.tabOrder).toEqual(['t0', 't9', 't2'])
+    expect(next.tabs.map((tab) => tab.id)).toEqual(['t0::l0', 't2::l2', 't9::l9'])
+    expect(next.tabs.at(-1)).toMatchObject({
+      replaces: { tabId: 'agent-session:s1' },
+      isActive: true
+    })
+    expect(next).toMatchObject({
+      activeTabId: 't9::l9',
+      activeTabType: 'terminal',
+      snapshotVersion: 4
+    })
+  })
+
+  it('removes every pane row of a replaced terminal tab and appends when the slot is gone', () => {
+    const withSplit = {
+      ...snapshot,
+      tabs: [
+        ...snapshot.tabs,
+        {
+          type: 'terminal' as const,
+          id: 't0::l1',
+          parentTabId: 't0',
+          leafId: 'l1',
+          title: 'A2',
+          isActive: false
+        }
+      ]
+    }
+    const chat = {
+      type: 'agent-session' as const,
+      id: 'agent-session:s2',
+      title: 'Chat 2',
+      sessionId: 's2',
+      agent: 'codex' as const,
+      isActive: false
+    }
+    const next = replaceSessionTabInSnapshot(withSplit, {
+      workspaceId: 'ws',
+      replacedTabId: 't0',
+      row: chat,
+      activate: false
+    })
+    expect(next.tabs.some((tab) => tab.type === 'terminal' && tab.parentTabId === 't0')).toBe(false)
+    expect(next.tabGroups?.[0]?.tabOrder).toEqual(['agent-session:s2', 'agent-session:s1', 't2'])
+    const gone = replaceSessionTabInSnapshot(snapshot, {
+      workspaceId: 'ws',
+      replacedTabId: 'missing',
+      row: chat,
+      activate: false
+    })
+    expect(gone.tabGroups?.[0]?.tabOrder).toEqual([
+      't0',
+      'agent-session:s1',
+      't2',
+      'agent-session:s2'
+    ])
+    expect(gone.tabs.at(-1)).not.toHaveProperty('replaces')
+  })
+})
diff --git a/src/main/runtime/session-tabs/session-tab-replace.ts b/src/main/runtime/session-tabs/session-tab-replace.ts
new file mode 100644
index 000000000000..210dc30d6e41
--- /dev/null
+++ b/src/main/runtime/session-tabs/session-tab-replace.ts
@@ -0,0 +1,75 @@
+import type {
+  RuntimeMobileSessionAgentTab,
+  RuntimeMobileSessionTabsSnapshot,
+  RuntimeMobileSessionTerminalTab
+} from '../../../shared/runtime-types'
+import { getHeadlessMobileSessionGroupId } from '../mobile-session-layout-projection'
+
+type ReplacementRow = RuntimeMobileSessionTerminalTab | RuntimeMobileSessionAgentTab
+
+/** A tab-bar entry's rows: a chat's one row, or every pane row of a terminal tab. */
+function rowsOfTab(snapshot: RuntimeMobileSessionTabsSnapshot, tabId: string) {
+  return snapshot.tabs.filter(
+    (row) => row.id === tabId || (row.type === 'terminal' && row.parentTabId === tabId)
+  )
+}
+
+function tabBarIdOf(row: ReplacementRow): string {
+  return row.type === 'terminal' ? row.parentTabId : row.id
+}
+
+/**
+ * One snapshot write for a same-slot switch: the new row takes the replaced tab's place in its
+ * group and the replaced tab's rows leave. A replaced tab no group lists degrades to an append at
+ * the end of the active group; a tab this snapshot never knew gets no hint either.
+ */
+export function replaceSessionTabInSnapshot(
+  existing: RuntimeMobileSessionTabsSnapshot | undefined,
+  input: { workspaceId: string; replacedTabId: string; row: ReplacementRow; activate: boolean }
+): RuntimeMobileSessionTabsSnapshot {
+  const { replacedTabId, activate } = input
+  const replaced = new Set(existing ? rowsOfTab(existing, replacedTabId).map((row) => row.id) : [])
+  const groups = existing?.tabGroups ?? [
+    { id: getHeadlessMobileSessionGroupId(input.workspaceId), activeTabId: null, tabOrder: [] }
+  ]
+  const slot = groups.find((group) => group.tabOrder.includes(replacedTabId))
+  // The hint names a tab this snapshot knew; a client that still shows it puts the row there.
+  const row: ReplacementRow = {
+    ...input.row,
+    ...(slot || replaced.size > 0 ? { replaces: { tabId: replacedTabId } } : {}),
+    isActive: activate
+  }
+  const newId = tabBarIdOf(row)
+  const tabs = [
+    ...(existing?.tabs ?? [])
+      .filter((candidate) => !replaced.has(candidate.id) && candidate.id !== row.id)
+      .map((candidate) => (activate ? { ...candidate, isActive: false } : candidate)),
+    row
+  ]
+  const targetId =
+    slot?.id ?? groups.find((group) => group.id === existing?.activeGroupId)?.id ?? groups[0]!.id
+  const tabGroups = groups.map((group) => {
+    if (group.id !== targetId) {
+      return group
+    }
+    const tabOrder = group.tabOrder.filter((id) => id !== newId)
+    const at = slot ? tabOrder.indexOf(replacedTabId) : -1
+    if (at >= 0) {
+      tabOrder.splice(at, 1, newId)
+    } else {
+      tabOrder.push(newId)
+    }
+    return { ...group, tabOrder, activeTabId: activate ? row.id : group.activeTabId }
+  })
+  return {
+    ...existing,
+    worktree: input.workspaceId,
+    publicationEpoch: existing?.publicationEpoch ?? `headless:${Date.now().toString(36)}`,
+    snapshotVersion: (existing?.snapshotVersion ?? 0) + 1,
+    activeGroupId: activate ? targetId : (existing?.activeGroupId ?? targetId),
+    activeTabId: activate ? row.id : (existing?.activeTabId ?? null),
+    activeTabType: activate ? row.type : (existing?.activeTabType ?? null),
+    tabGroups,
+    tabs
+  }
+}
diff --git a/src/main/runtime/session-tabs/structured-session-tab-projection.ts b/src/main/runtime/session-tabs/structured-session-tab-projection.ts
index c8855c833b48..586aa9a389de 100644
--- a/src/main/runtime/session-tabs/structured-session-tab-projection.ts
+++ b/src/main/runtime/session-tabs/structured-session-tab-projection.ts
@@ -1,46 +1,56 @@
 import { defaultAgentChatLabel } from '../../../shared/agent-session/agent-session-chat-label'
 import type { StructuredAgentId } from '../../../shared/agent-session-provider-handle'
-import type { SessionTabOpenPlacement } from '../../../shared/session-tab-placement'
+import type { RuntimeMobileSessionTabsSnapshot } from '../../../shared/runtime-types'
+import { getHeadlessMobileSessionGroupId } from '../mobile-session-layout-projection'
 import {
   insertTabIdIntoOrder,
   partitionPinnedTabOrder
 } from '../../../shared/workspace-layout/tab-order'
-import type { RuntimeMobileSessionTabsSnapshot } from '../../../shared/runtime-types'
-import { getHeadlessMobileSessionGroupId } from '../mobile-session-layout-projection'
+import { replaceSessionTabInSnapshot } from './session-tab-replace'
 
 export type StructuredSessionTabProjection = {
   workspaceId: string
   sessionId: string
   agent: StructuredAgentId
   activate: boolean
-  openPlacement?: SessionTabOpenPlacement
+  /** Where a new chat goes; absent means the end of the active group. */
+  placement?: { groupId?: string; afterTabId?: string; index?: number }
+  /** A same-slot switch: the chat takes this tab's slot and the tab's rows leave, in one write. */
+  replaces?: string
 }
 
-/** Publish membership and its addressed open together; existing destinations keep their current place. */
+/** Publish membership; a listed chat keeps its place, a new one goes last or into the replaced slot. */
 export function projectStructuredSessionTab(
   existing: RuntimeMobileSessionTabsSnapshot | undefined,
   input: StructuredSessionTabProjection
 ): RuntimeMobileSessionTabsSnapshot | null {
   const id = `agent-session:${input.sessionId}`
   const listed = existing?.tabs.some((tab) => tab.id === id)
-  if (listed && !input.activate && !input.openPlacement) {
+  if (listed && !input.activate) {
     return null
   }
+  const row = {
+    type: 'agent-session' as const,
+    id,
+    title: defaultAgentChatLabel(input.agent),
+    sessionId: input.sessionId,
+    agent: input.agent,
+    isActive: input.activate
+  }
+  if (input.replaces && !listed) {
+    return replaceSessionTabInSnapshot(existing, {
+      workspaceId: input.workspaceId,
+      replacedTabId: input.replaces,
+      row,
+      activate: input.activate
+    })
+  }
   const tabs = [...(existing?.tabs ?? [])].map((tab) => ({
     ...tab,
-    isActive: input.activate ? tab.id === id : tab.isActive,
-    ...(tab.id === id && input.openPlacement ? { openPlacement: input.openPlacement } : {})
+    isActive: input.activate ? tab.id === id : tab.isActive
   }))
   if (!listed) {
-    tabs.push({
-      type: 'agent-session',
-      id,
-      title: defaultAgentChatLabel(input.agent),
-      sessionId: input.sessionId,
-      agent: input.agent,
-      isActive: input.activate,
-      ...(input.openPlacement ? { openPlacement: input.openPlacement } : {})
-    })
+    tabs.push(row)
   }
   const priorGroups = existing?.tabGroups ?? [
     {
@@ -49,7 +59,7 @@ export function projectStructuredSessionTab(
       tabOrder: []
     }
   ]
-  const placement = input.openPlacement?.placement
+  const { placement } = input
   const listedGroup = priorGroups.find((group) => group.tabOrder.includes(id))
   const anchorGroup = priorGroups.find((group) =>
     group.tabOrder.includes(placement?.afterTabId ?? '')
diff --git a/src/main/runtime/session-tabs/structured-session-tab-restoration.ts b/src/main/runtime/session-tabs/structured-session-tab-restoration.ts
index 6381bdc1eff6..d4135294e1f3 100644
--- a/src/main/runtime/session-tabs/structured-session-tab-restoration.ts
+++ b/src/main/runtime/session-tabs/structured-session-tab-restoration.ts
@@ -5,10 +5,6 @@ import { LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host'
 import { restoredChatTabChanges } from './restored-chat-tab-changes'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../shared/layout-owner-switch'
 import type { StructuredAgentId } from '../../../shared/agent-session-provider-handle'
-import {
-  isSessionTabSelectionRequest,
-  type SessionTabOpenPlacement
-} from '../../../shared/session-tab-placement'
 import { projectStructuredSessionTab } from './structured-session-tab-projection'
 import { OrcaRuntimeWithStructuredSessionLaunchRuntime } from './structured-session-launch-runtime'
 
@@ -74,25 +70,13 @@ export abstract class OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce exten
     }
   }
 
-  captureSessionSwitchSelection(
-    _worktreeId?: string,
-    viewerSelection?: string,
-    deferAcceptance = false
-  ) {
-    // A window request is transported to its viewer; it grants no host-view authority.
-    return viewerSelection !== undefined
-      ? Object.assign((_consume = false) => false, { accept: () => {} })
-      : this.clientSessionTabSelections.captureHostSelection(deferAcceptance)
-  }
-
   async publishStructuredAgentSessionTab(input: {
     workspaceId: string
     sessionId: string
     agent: StructuredAgentId
     activate: boolean
+    /** A switch's open: refused once newer work supersedes it, and its tab write is awaited. */
     check?: () => void
-    selectionCurrent?: (consume?: boolean) => boolean
-    viewerSelection?: string
     focusWindow?: boolean
     notify?: boolean
     /** The host tab id a create reserved; a session that already has a tab keeps its own. */
@@ -102,14 +86,11 @@ export abstract class OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce exten
     /** Where the creating paired client opens the chat. */
     /** A ChatTabPlacement, typed in place: this file is at its line limit. */
     placement?: { groupId?: string; afterTabId?: string; index?: number }
-    openPlacement?: SessionTabOpenPlacement
+    /** A same-slot switch: the chat takes this tab's slot and the tab's rows leave, in one write. */
+    replaces?: string
   }): Promise<void> {
     const host = getStructuredAgentSessionHost()
     input.check?.()
-    // First membership includes placement, even while visibility or the durable queue is awaited.
-    if (input.openPlacement) {
-      this.projectStructuredAgentSessionTab({ ...input, activate: false, notify: false })
-    }
     if (input.check && host) {
       await host.deps.store.setSessionTabVisibility(input.sessionId, true, input.tabId, input.check)
     } else if (typeof host?.setSessionTabVisibility === 'function') {
@@ -147,26 +128,9 @@ export abstract class OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce exten
       this.saveWindowlessAgentSessionTab(input.workspaceId, input)
     }
     input.check?.()
-    const viewerRequest = isSessionTabSelectionRequest(input.viewerSelection)
-    const activate = input.activate && !viewerRequest && (input.selectionCurrent?.() ?? true)
-    if (activate) {
-      input.check?.()
-      input.selectionCurrent?.(true)
-    }
-    this.projectStructuredAgentSessionTab({
-      ...input,
-      activate,
-      ...(input.openPlacement
-        ? {
-            openPlacement: {
-              ...input.openPlacement,
-              activate: viewerRequest ? input.openPlacement.activate : activate
-            }
-          }
-        : {})
-    })
-    if (activate) {
-      input.check?.()
+    this.projectStructuredAgentSessionTab(input)
+    if (input.activate && input.check) {
+      // The saved view selects the chat the switch put in the slot; the window draws from it.
       this.commitWindowlessChatSession(input.workspaceId, (session) =>
         withSelectedChatTab(
           this.getWorkspaceSessionHostIdForWorktree(input.workspaceId),
@@ -176,12 +140,10 @@ export abstract class OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce exten
         )
       )
     }
-    if ((activate || (viewerRequest && input.activate)) && input.focusWindow !== false) {
-      input.check?.()
+    if (input.activate && input.focusWindow !== false && input.check) {
       this.notifier?.focusEditorTab?.(
         input.tabId ?? host?.getSessionTabId(input.sessionId) ?? `agent-session:${input.sessionId}`,
-        input.workspaceId,
-        input.viewerSelection
+        input.workspaceId
       )
     }
   }
@@ -193,7 +155,8 @@ export abstract class OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce exten
     agent: StructuredAgentId
     activate: boolean
     notify?: boolean
-    openPlacement?: SessionTabOpenPlacement
+    /** A same-slot switch: the chat takes this tab's slot and the tab's rows leave, in one write. */
+    replaces?: string
   }): void {
     const next = projectStructuredSessionTab(
       this.mobileSessionTabsByWorktree.get(input.workspaceId),
@@ -203,9 +166,6 @@ export abstract class OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce exten
       return
     }
     const stored = this.storeMobileSessionSnapshot(input.workspaceId, next)
-    if (input.openPlacement) {
-      this.markPaneLiveTitlesDirty()
-    }
     if (input.notify !== false) {
       this.emitMobileSessionTabsSnapshot(stored)
     }
diff --git a/src/main/runtime/session-tabs/switch-terminal-placement.ts b/src/main/runtime/session-tabs/switch-terminal-placement.ts
new file mode 100644
index 000000000000..275549745193
--- /dev/null
+++ b/src/main/runtime/session-tabs/switch-terminal-placement.ts
@@ -0,0 +1,94 @@
+import { chatTabId } from '../agent-session/agent-session-tab-layout'
+import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../shared/layout-owner-switch'
+import type { RuntimeTerminalCreate } from '../../../shared/runtime-terminal-create-contract'
+import type { LayoutApplyReply } from '../../../shared/workspace-layout/workspace-layout-command-types'
+import type { LayoutCommandRunOptions, WindowLayoutCommand } from '../runtime-layout-apply'
+import { OrcaRuntimeWithPublishPtyBackedMobileSessionTerminal } from './pty-backed-session-publication'
+
+export abstract class OrcaRuntimeWithSwitchTerminalPlacement extends OrcaRuntimeWithPublishPtyBackedMobileSessionTerminal {
+  protected abstract getAvailableAuthoritativeWindow(): unknown
+  abstract applyLayoutCommand(
+    command: WindowLayoutCommand,
+    options?: LayoutCommandRunOptions
+  ): Promise<LayoutApplyReply>
+
+  /**
+   * A switch's one layout write: the parked terminal takes the chat tab's slot and the chat tab
+   * goes, in whichever store owns this workspace's layout (the window, main's model, or the host
+   * snapshot paired clients mirror). Nothing was shown before the terminal was real.
+   */
+  async placeSwitchTerminal(
+    workspaceId: string,
+    args: {
+      terminal: RuntimeTerminalCreate
+      chatSessionId: string
+      /** The window's own id for the chat tab, when the switch came from a window. */
+      windowTabId?: string
+      activate: boolean
+      focusWindow: boolean
+    }
+  ): Promise<{ tabId: string; leafId: string; replaced: boolean }> {
+    const { terminal } = args
+    const pty = terminal.ptyId ? this.ptysById.get(terminal.ptyId) : undefined
+    const tabId = terminal.tabId
+    const leafId =
+      tabId && terminal.paneKey?.startsWith(`${tabId}:`)
+        ? terminal.paneKey.slice(tabId.length + 1)
+        : undefined
+    if (!pty || !tabId || !leafId) {
+      throw new Error('terminal_handle_stale')
+    }
+    const layoutTabId = chatTabId(args.chatSessionId)
+    let replaced = false
+    if (ORCA_LAYOUT_OWNER_IS_MAIN) {
+      const reply = await this.applyLayoutCommand({
+        type: 'createTerminalTab',
+        workspace: workspaceId,
+        tabId,
+        leafId,
+        adopt: {
+          ptyId: pty.ptyId,
+          ...(pty.incarnationId ? { incarnationId: pty.incarnationId } : {})
+        },
+        replaces: { tabId: layoutTabId }
+      })
+      if (!reply.ok) {
+        throw new Error(reply.code)
+      }
+      replaced = reply.result.closed?.includes(layoutTabId) === true
+    } else if (this.getAvailableAuthoritativeWindow() && this.notifier?.revealTerminalSession) {
+      const windowTabId = args.windowTabId ?? layoutTabId
+      await this.notifier.revealTerminalSession(workspaceId, {
+        ptyId: pty.ptyId,
+        title: terminal.title,
+        ...(pty.launchAgent ? { launchAgent: pty.launchAgent } : {}),
+        activate: args.activate,
+        focus: args.focusWindow,
+        tabId,
+        leafId,
+        replaces: { tabId: windowTabId },
+        ...(pty.incarnationId
+          ? {
+              expectedProcessIdentity: {
+                terminalHandle: terminal.handle,
+                incarnationId: pty.incarnationId
+              }
+            }
+          : {})
+      })
+      replaced = true
+    }
+    const snapshotTabId = `agent-session:${args.chatSessionId}`
+    const listed = this.mobileSessionTabsByWorktree
+      .get(workspaceId)
+      ?.tabGroups?.some((group) => group.tabOrder.includes(snapshotTabId))
+    this.publishPtyBackedMobileSessionTerminal(workspaceId, pty, {
+      tabId,
+      leafId,
+      title: terminal.title,
+      activate: args.activate,
+      replaces: snapshotTabId
+    })
+    return { tabId, leafId, replaced: replaced || listed === true }
+  }
+}
diff --git a/src/main/window/runtime-window-lifecycle.ts b/src/main/window/runtime-window-lifecycle.ts
index 5073330746e9..fb5e079abcc0 100644
--- a/src/main/window/runtime-window-lifecycle.ts
+++ b/src/main/window/runtime-window-lifecycle.ts
@@ -142,7 +142,8 @@ export function registerRuntimeWindowLifecycle(
           ...(opts.splitTelemetrySource !== undefined
             ? { splitTelemetrySource: opts.splitTelemetrySource }
             : {}),
-          ...(opts.focus !== undefined ? { focus: opts.focus } : {})
+          ...(opts.focus !== undefined ? { focus: opts.focus } : {}),
+          ...(opts.replaces ? { replaces: opts.replaces } : {})
         })
         if (!sent) {
           clearTimeout(timer)
@@ -178,14 +179,9 @@ export function registerRuntimeWindowLifecycle(
     focusTerminal: (tabId, worktreeId, leafId) =>
       send('ui:focusTerminal', { tabId, worktreeId, leafId }),
     revealTerminalPane: (target) => revealTerminalPaneInWindow(mainWindow, target),
-    focusEditorTab: (tabId, worktreeId, viewerSelection) =>
-      send('ui:focusEditorTab', {
-        tabId,
-        worktreeId,
-        ...(viewerSelection !== undefined ? { viewerSelection } : {})
-      }),
-    closeSessionTab: (tabId, worktreeId, switchProjection) =>
-      requestSessionTabCloseFromRenderer(mainWindow, tabId, worktreeId, switchProjection),
+    focusEditorTab: (tabId, worktreeId) => send('ui:focusEditorTab', { tabId, worktreeId }),
+    closeSessionTab: (tabId, worktreeId) =>
+      requestSessionTabCloseFromRenderer(mainWindow, tabId, worktreeId),
     moveSessionTab: (worktreeId: string, move: RuntimeMobileSessionTabMove) =>
       send('ui:moveSessionTab', { worktreeId, ...move }),
     openFile: (worktreeId, filePath, relativePath, runtimeEnvironmentId?, navigation?, position?) =>
diff --git a/src/preload/api/ui-bridge-terminal-and-session-tabs.ts b/src/preload/api/ui-bridge-terminal-and-session-tabs.ts
index 59615da3bbc6..56d7f050ba93 100644
--- a/src/preload/api/ui-bridge-terminal-and-session-tabs.ts
+++ b/src/preload/api/ui-bridge-terminal-and-session-tabs.ts
@@ -57,6 +57,8 @@ export const uiTerminalAndSessionTabsApi = {
       splitFromLeafId?: string
       splitDirection?: 'horizontal' | 'vertical'
       splitTelemetrySource?: TerminalPaneSplitSource
+      /** The tab this terminal takes the slot of, closed in the same store write. */
+      replaces?: { tabId: string }
     }) => void
   ): (() => void) => {
     const listener = (
@@ -87,6 +89,7 @@ export const uiTerminalAndSessionTabsApi = {
         splitFromLeafId?: string
         splitDirection?: 'horizontal' | 'vertical'
         splitTelemetrySource?: TerminalPaneSplitSource
+        replaces?: { tabId: string }
       }
     ) => callback(data)
     ipcRenderer.on('ui:createTerminal', listener)
@@ -221,16 +224,11 @@ export const uiTerminalAndSessionTabsApi = {
     return () => ipcRenderer.removeListener('ui:focusTerminal', listener)
   },
   onFocusEditorTab: (
-    callback: (data: {
-      tabId: string
-      worktreeId: string
-      viewerSelection?: string
-      userInitiated?: boolean
-    }) => void
+    callback: (data: { tabId: string; worktreeId: string; userInitiated?: boolean }) => void
   ): (() => void) => {
     const listener = (
       _event: Electron.IpcRendererEvent,
-      data: { tabId: string; worktreeId: string; viewerSelection?: string; userInitiated?: boolean }
+      data: { tabId: string; worktreeId: string; userInitiated?: boolean }
     ) => callback(data)
     ipcRenderer.on('ui:focusEditorTab', listener)
     return () => ipcRenderer.removeListener('ui:focusEditorTab', listener)
diff --git a/src/preload/api/ui-command-event-api.ts b/src/preload/api/ui-command-event-api.ts
index 3e973c76dbcc..1d880559b168 100644
--- a/src/preload/api/ui-command-event-api.ts
+++ b/src/preload/api/ui-command-event-api.ts
@@ -252,7 +252,6 @@ export type UiCommandEventApi = {
     callback: (data: {
       tabId: string
       worktreeId: string
-      viewerSelection?: string
       /** A notification click authorizes revealing the tab. */
       userInitiated?: boolean
     }) => void
diff --git a/src/renderer/src/hooks/ipc-events/terminal-presentation-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/terminal-presentation-ipc-bridge.ts
index 4d97e494a02a..fda6a307d939 100644
--- a/src/renderer/src/hooks/ipc-events/terminal-presentation-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/terminal-presentation-ipc-bridge.ts
@@ -7,7 +7,7 @@ import { SPLIT_TERMINAL_PANE_EVENT } from '@/constants/terminal'
 import type { SplitTerminalPaneDetail } from '@/constants/terminal'
 import { singlePaneLayoutSnapshot } from '@/store/slices/terminal-helpers'
 import { verifyTerminalRevealIdentity } from '@/lib/terminal-reveal-identity'
-import { insertUnifiedTabAfterAnchor } from '@/lib/unified-tab-anchor-insertion'
+import { findUnifiedTab, placeCreatedTerminalTab } from '@/lib/unified-tab-anchor-insertion'
 import { tryMakePaneKey } from './agent-status-routing'
 import { registerLaunchRecipe } from './launch-recipe-registration'
 import { wasAgentLaunchPaneClosedByUser } from '@/lib/agent-launch-pane-closes'
@@ -50,10 +50,13 @@ export function registerTerminalPresentationIpcBridge(unsubs: (() => void)[]): v
         leafId,
         splitFromLeafId,
         splitDirection,
-        splitTelemetrySource
+        splitTelemetrySource,
+        replaces
       }) => {
         try {
           const store = useAppStore.getState()
+          // A replace opens in the replaced tab's group and takes its slot once the tab exists.
+          const replaced = replaces && findUnifiedTab(worktreeId, replaces.tabId)
           const terminalPresentation = resolveTerminalPresentation({
             presentation,
             activate,
@@ -107,7 +110,7 @@ export function registerTerminalPresentationIpcBridge(unsubs: (() => void)[]): v
           const tab =
             reusedTab ??
             (ptyId
-              ? store.createTab(worktreeId, targetGroupId, shellOverride, {
+              ? store.createTab(worktreeId, replaced?.groupId ?? targetGroupId, shellOverride, {
                   initialPtyId: ptyId,
                   activate:
                     shouldActivate ||
@@ -130,7 +133,7 @@ export function registerTerminalPresentationIpcBridge(unsubs: (() => void)[]): v
                 })
               : store.createTab(
                   worktreeId,
-                  targetGroupId,
+                  replaced?.groupId ?? targetGroupId,
                   shellOverride,
                   shouldActivate
                     ? cwd
@@ -142,16 +145,7 @@ export function registerTerminalPresentationIpcBridge(unsubs: (() => void)[]): v
                         ...(cwd ? { startupCwd: cwd } : {})
                       }
                 ))
-          if (afterTabId) {
-            const unifiedTabs = useAppStore.getState().unifiedTabsByWorktree[worktreeId] ?? []
-            const createdUnified = unifiedTabs.find((item) => item.entityId === tab.id)?.id
-            const anchorUnified = unifiedTabs.find(
-              (item) => item.id === afterTabId || item.entityId === afterTabId
-            )?.id
-            if (createdUnified && anchorUnified) {
-              insertUnifiedTabAfterAnchor(worktreeId, createdUnified, anchorUnified)
-            }
-          }
+          placeCreatedTerminalTab(worktreeId, tab.id, { afterTabId, replaced })
           // Different reused IDs break the PTY’s baked-in paneKey attribution; warn in dev.
           if (tabId !== undefined && tab.id !== tabId) {
             console.warn(
diff --git a/src/renderer/src/lib/unified-tab-anchor-insertion.ts b/src/renderer/src/lib/unified-tab-anchor-insertion.ts
index 7192bf7c165e..07cdefacdb54 100644
--- a/src/renderer/src/lib/unified-tab-anchor-insertion.ts
+++ b/src/renderer/src/lib/unified-tab-anchor-insertion.ts
@@ -1,7 +1,34 @@
+import { closeMobileSessionTabInStore } from '@/runtime/mobile-session-tab-close'
 import { useAppStore } from '../store'
 import { insertTabIdIntoOrder } from '../../../shared/workspace-layout/tab-order'
 
 /** Move `tabId` to sit immediately after `anchorTabId`; no-op unless both share a live group. */
+export function findUnifiedTab(worktreeId: string, tabId: string) {
+  return (useAppStore.getState().unifiedTabsByWorktree[worktreeId] ?? []).find(
+    (candidate) => candidate.id === tabId || candidate.entityId === tabId
+  )
+}
+
+/** A same-slot switch's window write: the new tab takes the replaced tab's index, then the replaced tab closes. */
+export function replaceUnifiedTab(worktreeId: string, tabId: string, replacedTabId: string): void {
+  const state = useAppStore.getState()
+  const tabs = state.unifiedTabsByWorktree[worktreeId] ?? []
+  const tab = tabs.find((candidate) => candidate.id === tabId || candidate.entityId === tabId)
+  const replaced = tabs.find((candidate) => candidate.id === replacedTabId)
+  const group = (state.groupsByWorktree[worktreeId] ?? []).find((candidate) =>
+    candidate.tabOrder.includes(replacedTabId)
+  )
+  if (!tab || !replaced || !group || tab.id === replaced.id) {
+    return
+  }
+  const order = group.tabOrder.filter((id) => id !== tab.id)
+  order.splice(order.indexOf(replaced.id), 0, tab.id)
+  if (group.tabOrder.includes(tab.id)) {
+    state.reorderUnifiedTabs(group.id, order, { recordInteraction: false })
+  }
+  closeMobileSessionTabInStore(useAppStore.getState(), worktreeId, replaced.id)
+}
+
 export function insertUnifiedTabAfterAnchor(
   worktreeId: string,
   tabId: string,
@@ -38,3 +65,20 @@ export function insertUnifiedTabAfterAnchor(
   }
   state.reorderUnifiedTabs(group.id, order, { recordInteraction: false })
 }
+
+/** Where a main-created terminal tab goes: into a replaced tab's slot, else after its anchor. */
+export function placeCreatedTerminalTab(
+  worktreeId: string,
+  tabId: string,
+  placement: { afterTabId?: string; replaced?: { id: string } }
+): void {
+  if (placement.replaced) {
+    replaceUnifiedTab(worktreeId, tabId, placement.replaced.id)
+    return
+  }
+  const created = findUnifiedTab(worktreeId, tabId)
+  const anchor = placement.afterTabId && findUnifiedTab(worktreeId, placement.afterTabId)
+  if (created && anchor) {
+    insertUnifiedTabAfterAnchor(worktreeId, created.id, anchor.id)
+  }
+}
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-groups.ts b/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-groups.ts
index 8cdeab57ce66..7891674ce607 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-groups.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-groups.ts
@@ -9,7 +9,6 @@ import { peekWebSessionTerminalPlacementGroup } from '../web-session-terminal-pl
 import { reconcileClientOwnedTabPlacement } from '../web-session-client-owned-tab-placement'
 import { buildMirroredHostGroups, retainClientPlacedMirroredTabs } from './layout-groups'
 import { sanitizeRecentTabIds, pushRecentTabId } from './state-equality-core'
-import { insertOpenPlacementTab } from '../../lib/session-tab-open-placement-order'
 
 export function prepareWebSessionTabsSnapshotGroups(
   base: ReturnType<typeof prepareWebSessionTabsSnapshotUnified>
@@ -39,36 +38,6 @@ export function prepareWebSessionTabsSnapshotGroups(
     reservedEmptyPreviewFallbackTabId
   } = base
   const currentGroups = state.groupsByWorktree[worktreeId] ?? []
-  const currentGroupIds = new Set<string | undefined>(currentGroups.map((group) => group.id))
-  const currentTabsById = new Map<
-    string | undefined,
-    (typeof state.unifiedTabsByWorktree)[string][number]
-  >()
-  for (const tab of state.unifiedTabsByWorktree[worktreeId] ?? []) {
-    if (!currentTabsById.has(tab.id)) {
-      currentTabsById.set(tab.id, tab)
-    }
-  }
-  const openPlacementByTabId = new Map(
-    base.openPlacements.flatMap((entry) => {
-      const tabId = hostToLocalTabId.get(entry.hostTabId)
-      if (!tabId) {
-        return []
-      }
-      const anchor = currentTabsById.get(entry.placement.afterTabId)
-      return [
-        [
-          tabId,
-          {
-            ...entry.placement,
-            groupId: currentGroupIds.has(entry.placement.groupId)
-              ? entry.placement.groupId
-              : (anchor?.groupId ?? entry.placement.groupId)
-          }
-        ] as const
-      ]
-    })
-  )
   const clientGroupIdByLocalTabId = new Map(
     mirroredBrowserTabs.flatMap((entry) =>
       entry.clientGroupId ? [[entry.unifiedTab.id, entry.clientGroupId]] : []
@@ -128,18 +97,13 @@ export function prepareWebSessionTabsSnapshotGroups(
       .filter((tab) => !knownGroupTabIds.has(tab.id))
       .map((tab) => ({
         tabId: tab.id,
-        groupId:
-          openPlacementByTabId.get(tab.id)?.groupId ??
-          clientGroupIdByLocalTabId.get(tab.id) ??
-          tab.groupId,
-        openPlacement: openPlacementByTabId.get(tab.id)
+        groupId: clientGroupIdByLocalTabId.get(tab.id) ?? tab.groupId
       }))
     return reconcileClientOwnedTabPlacement({
       currentGroups,
       worktreeId,
       validUnifiedTabIds,
       adoptedTabs,
-      tabs: nextUnifiedTabs,
       placementMoves,
       rekeyedTabIds,
       intentTabId: honorSnapshotActiveFocus ? (intentUnifiedTabId ?? null) : null,
@@ -220,6 +184,39 @@ export function prepareWebSessionTabsSnapshotGroups(
     )
   })()
 
+  // A row published in a replaced tab's slot lands where this client showed that tab, not at the end.
+  let placedGroups = nextGroups
+  for (const row of snapshot.tabs) {
+    const tabId =
+      row.replaces && hostToLocalTabId.get(row.type === 'terminal' ? row.parentTabId : row.id)
+    const replaced = row.replaces
+      ? [row.replaces.tabId, toWebTerminalSurfaceTabId(row.replaces.tabId)].map(
+          (id) => hostToLocalTabId.get(id) ?? id
+        )
+      : []
+    const slot = currentGroups.find((group) => group.tabOrder.some((id) => replaced.includes(id)))
+    if (
+      !tabId ||
+      !slot ||
+      currentGroups.some((group) => group.tabOrder.includes(tabId)) ||
+      !placedGroups?.some((group) => group.tabOrder.includes(tabId)) ||
+      !placedGroups.some((group) => group.id === slot.id)
+    ) {
+      continue
+    }
+    const index = slot.tabOrder.findIndex((id) => replaced.includes(id))
+    placedGroups = placedGroups.map((group) => {
+      if (group.id !== slot.id && !group.tabOrder.includes(tabId)) {
+        return group
+      }
+      const tabOrder = group.tabOrder.filter((id) => id !== tabId)
+      if (group.id === slot.id) {
+        tabOrder.splice(Math.min(index, tabOrder.length), 0, tabId)
+      }
+      return { ...group, tabOrder }
+    })
+  }
+
   const nextTabBarOrder = (() => {
     const current = state.tabBarOrderByWorktree[worktreeId] ?? []
     const validTabBarIds = new Set([
@@ -249,22 +246,14 @@ export function prepareWebSessionTabsSnapshotGroups(
     for (const tabId of hostOrMirroredOrder) {
       push(tabId)
     }
-    const currentIds = new Set(current)
-    let placed = next
-    for (const [tabId, placement] of openPlacementByTabId) {
-      if (currentIds.has(tabId) || !validTabBarIds.has(tabId)) {
-        continue
-      }
-      placed = insertOpenPlacementTab(placed, nextUnifiedTabs ?? [], tabId, placement)
-    }
-    return placed
+    return next
   })()
   return {
     ...base,
     currentGroups,
     clientGroupIdByLocalTabId,
     clientOwnedPlacement,
-    nextGroups,
+    nextGroups: placedGroups,
     nextTabBarOrder
   }
 }
diff --git a/src/shared/rpc-contract/workspace-layout-params.ts b/src/shared/rpc-contract/workspace-layout-params.ts
index c1c096fede88..f9cbbe041172 100644
--- a/src/shared/rpc-contract/workspace-layout-params.ts
+++ b/src/shared/rpc-contract/workspace-layout-params.ts
@@ -193,6 +193,11 @@ const OpenAgentSessionTabCommand = z.object({
   afterTabId: z.string().min(1).optional(),
   index: z.number().int().nonnegative().optional(),
   createdAt: z.number().int().nonnegative().optional(),
+  /** Takes this tab's slot and closes it in the same write; optional, so older peers omit it. */
+  replaces: z
+    .object({ tabId: z.string().min(1) })
+    .strict()
+    .optional(),
   split: NewGroupSplit
 })
 
diff --git a/src/shared/rpc-contract/workspace-layout-terminal-tab-params.ts b/src/shared/rpc-contract/workspace-layout-terminal-tab-params.ts
index 8555fdd336c8..d6073889f01c 100644
--- a/src/shared/rpc-contract/workspace-layout-terminal-tab-params.ts
+++ b/src/shared/rpc-contract/workspace-layout-terminal-tab-params.ts
@@ -38,6 +38,11 @@ export const CreateTerminalTabCommand = z.object({
   creation: TerminalCreation.optional(),
   /** Only into a workspace with no tab in main's copy; otherwise nothing is created. */
   initial: z.literal('activation').optional(),
+  /** Takes this tab's slot and closes it in the same write; optional, so older peers omit it. */
+  replaces: z
+    .object({ tabId: z.string().min(1) })
+    .strict()
+    .optional(),
   split: NewGroupSplit
 })
 
diff --git a/src/shared/runtime-mobile-session-tab-contracts.ts b/src/shared/runtime-mobile-session-tab-contracts.ts
index 1b584e587780..33eb4860247a 100644
--- a/src/shared/runtime-mobile-session-tab-contracts.ts
+++ b/src/shared/runtime-mobile-session-tab-contracts.ts
@@ -1,4 +1,4 @@
-import type { SessionTabOpenPlacement } from './session-tab-placement'
+import type { ReplacedTab } from './workspace-layout/workspace-layout-command-types'
 import type { AgentStatusEntry } from './agent-status-types'
 import type { BrowserCertificateFailure, BrowserLoadError } from './browser-workspace-types'
 import type { RuntimeBrowserPlacement } from './runtime-browser-placement'
@@ -8,7 +8,8 @@ import type { TuiAgent } from './tui-agent'
 import type { StructuredAgentId } from './agent-session-provider-handle'
 
 export type RuntimeMobileSessionTerminalTab = {
-  openPlacement?: SessionTabOpenPlacement
+  /** Published in the tab it replaced's slot; a client whose order differs puts it where that tab was. */
+  replaces?: ReplacedTab
   type: 'terminal'
   id: string
   title: string
@@ -106,7 +107,7 @@ export type RuntimeMobileSessionBrowserTab = {
 }
 
 export type RuntimeMobileSessionAgentTab = {
-  openPlacement?: SessionTabOpenPlacement
+  replaces?: ReplacedTab
   type: 'agent-session'
   id: string
   title: string
diff --git a/src/shared/workspace-layout/workspace-layout-command-steps.ts b/src/shared/workspace-layout/workspace-layout-command-steps.ts
index bea63ecf23c3..026d6cfb3772 100644
--- a/src/shared/workspace-layout/workspace-layout-command-steps.ts
+++ b/src/shared/workspace-layout/workspace-layout-command-steps.ts
@@ -111,6 +111,18 @@ export function locatePane(
 
 export type TabPlacement = { groupId?: string; afterTabId?: string; index?: number }
 
+/** The replaced tab's own slot, so placing before the close keeps its group alive and its index. */
+export function replacedTabSlot(
+  workspace: WorkspaceLayout,
+  placement: TabPlacement & { replaces?: { tabId: string } }
+): TabPlacement {
+  const replaced = placement.replaces?.tabId
+  const group = replaced && workspace.groups.find((entry) => entry.tabOrder.includes(replaced))
+  return group
+    ? { groupId: group.id, index: group.tabOrder.indexOf(replaced!) }
+    : { groupId: placement.groupId, afterTabId: placement.afterTabId, index: placement.index }
+}
+
 /** In owner builds, reuse the sender’s empty group or the window/Loader root ID; otherwise mint an ID. */
 function firstGroupId(key: string, placement: TabPlacement, context: LayoutContext): string {
   if (ORCA_LAYOUT_OWNER_IS_MAIN) {
diff --git a/src/shared/workspace-layout/workspace-layout-command-types.ts b/src/shared/workspace-layout/workspace-layout-command-types.ts
index 0e3d1e00722a..96b471921fd1 100644
--- a/src/shared/workspace-layout/workspace-layout-command-types.ts
+++ b/src/shared/workspace-layout/workspace-layout-command-types.ts
@@ -27,6 +27,12 @@ export type WindowPaneDetach = {
   startupCwd?: string
 }
 
+/**
+ * The new tab takes this tab's slot and this tab goes, in the one write. A replaced tab that is
+ * already gone or moved degrades to the command's own placement; the result says what closed.
+ */
+export type ReplacedTab = { tabId: string }
+
 export type LayoutCommand =
   | (On & {
       type: 'createTerminalTab'
@@ -47,6 +53,7 @@ export type LayoutCommand =
       initial?: InitialSurfaceReason
       /** A live terminal no pane shows: its pane when main holds one, else this tab, bound to it. */
       adopt?: LiveTerminalAdoption
+      replaces?: ReplacedTab
       split?: NewGroupSplit
     })
   | (On & {
@@ -219,6 +226,7 @@ export type LayoutCommand =
       /** When the window drew the tab, so a later save of it matches main's copy. */
       createdAt?: number
       initial?: InitialSurfaceReason
+      replaces?: ReplacedTab
       split?: NewGroupSplit
     })
   | (On & { type: 'startPane'; paneKey: string })
diff --git a/src/shared/workspace-layout/workspace-layout-content-commands.ts b/src/shared/workspace-layout/workspace-layout-content-commands.ts
index 886770fb1f22..3e96e1b65ad4 100644
--- a/src/shared/workspace-layout/workspace-layout-content-commands.ts
+++ b/src/shared/workspace-layout/workspace-layout-content-commands.ts
@@ -1,5 +1,11 @@
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../layout-owner-switch'
-import { applied, refuse, workspaceOrEmpty, type Applied } from './workspace-layout-command-steps'
+import {
+  applied,
+  refuse,
+  replacedTabSlot,
+  workspaceOrEmpty,
+  type Applied
+} from './workspace-layout-command-steps'
 import type { CommandOf, LayoutContext } from './workspace-layout-command-types'
 import { editorOpenFileId } from './workspace-layout-editor-open-file-id'
 import { sameEditorFile } from './workspace-layout-editor-tab-file'
@@ -12,7 +18,11 @@ import type {
   WorkspaceLayoutModel
 } from './workspace-layout-model'
 import { withWorkspace } from './workspace-layout-removal'
-import { placeContentTab, promotePreviewTab } from './workspace-layout-tab-commands'
+import {
+  closeReplacedTab,
+  placeContentTab,
+  promotePreviewTab
+} from './workspace-layout-tab-commands'
 
 function contentTab(
   context: LayoutContext,
@@ -226,9 +236,12 @@ export function openAgentSessionTab(
     agentSessionAgent: command.agent
   })
   const target = withSendersGroup(model, command.workspace, command.groupId)
-  return applied(placeContentTab(target, command.workspace, tab, command, context).model, {
-    tabId: tab.id
-  })
+  const slot = replacedTabSlot(workspaceOrEmpty(target, command.workspace), command)
+  return closeReplacedTab(
+    placeContentTab(target, command.workspace, tab, slot, context).model,
+    command,
+    { tabId: tab.id }
+  )
 }
 
 /** Drawn tab IDs make resent or already-saved opens idempotent; refuseTaken rejects IDs held by another tab. Null proceeds with creation. */
diff --git a/src/shared/workspace-layout/workspace-layout-published.ts b/src/shared/workspace-layout/workspace-layout-published.ts
index 6b86bc46c619..ad435a572519 100644
--- a/src/shared/workspace-layout/workspace-layout-published.ts
+++ b/src/shared/workspace-layout/workspace-layout-published.ts
@@ -1,6 +1,5 @@
 // Explicit layout.subscribe wire projection includes terminal startup inputs and permits live pane titles/status. Persistence-only records and view selection stay private.
 
-import type { SessionTabOpenPlacement } from '../session-tab-placement'
 import type { AgentType } from '../agent-status-types'
 import type { AiVaultSessionTitle } from '../ai-vault-session-title'
 import type { ExecutionHostId } from '../execution-host'
@@ -56,8 +55,6 @@ export type PublishedTerminal = {
 >
 
 export type PublishedTab = {
-  /** Ephemeral ordinary open intent, overlaid by the runtime; never a stored LayoutTab field. */
-  openPlacement?: SessionTabOpenPlacement
   id: string
   kind: TabContentType
   entityId: string
diff --git a/src/shared/workspace-layout/workspace-layout-replaces.test.ts b/src/shared/workspace-layout/workspace-layout-replaces.test.ts
new file mode 100644
index 000000000000..d57f23347427
--- /dev/null
+++ b/src/shared/workspace-layout/workspace-layout-replaces.test.ts
@@ -0,0 +1,86 @@
+import { describe, expect, it } from 'vitest'
+import { applyLayoutCommand } from './workspace-layout-commands'
+import { build, testContext, WS } from './workspace-layout-command.test-fixture'
+
+describe('replaces: one write puts the new tab in the replaced tab’s slot', () => {
+  it('a terminal takes a chat tab’s index and the chat tab closes', () => {
+    const ctx = testContext()
+    const { model, results } = build(ctx, [
+      { type: 'createTerminalTab', workspace: WS },
+      {
+        type: 'openAgentSessionTab',
+        workspace: WS,
+        tabId: 'chat-tab',
+        sessionId: 's1',
+        agent: 'codex'
+      },
+      { type: 'createTerminalTab', workspace: WS }
+    ])
+    const replaced = applyLayoutCommand(
+      model,
+      {
+        type: 'createTerminalTab',
+        workspace: WS,
+        adopt: { ptyId: 'pty-1' },
+        replaces: { tabId: 'chat-tab' }
+      },
+      ctx
+    )
+    expect(replaced.ok).toBe(true)
+    if (!replaced.ok) {
+      return
+    }
+    expect(replaced.result.closed).toEqual(['chat-tab'])
+    expect(replaced.model.workspaces[WS]?.groups[0]?.tabOrder).toEqual([
+      results[0]!.tabId,
+      replaced.result.tabId,
+      results[2]!.tabId
+    ])
+    expect(replaced.model.workspaces[WS]?.tabs.some((tab) => tab.id === 'chat-tab')).toBe(false)
+    expect(replaced.effects.startPaneKeys).toEqual([])
+  })
+
+  it('a chat takes a terminal tab’s index, keeping a one-tab group alive', () => {
+    const ctx = testContext()
+    const { model, results } = build(ctx, [{ type: 'createTerminalTab', workspace: WS }])
+    const terminal = results[0]!.tabId!
+    const replaced = applyLayoutCommand(
+      model,
+      {
+        type: 'openAgentSessionTab',
+        workspace: WS,
+        tabId: 'chat-tab',
+        sessionId: 's1',
+        agent: 'codex',
+        replaces: { tabId: terminal }
+      },
+      ctx
+    )
+    expect(replaced.ok && replaced.result.closed).toEqual([terminal])
+    expect(replaced.ok && replaced.model.workspaces[WS]?.groups).toEqual([
+      { id: model.workspaces[WS]!.groups[0]!.id, tabOrder: ['chat-tab'] }
+    ])
+  })
+
+  it('degrades to an ordinary open when the replaced tab is already gone', () => {
+    const ctx = testContext()
+    const { model, results } = build(ctx, [{ type: 'createTerminalTab', workspace: WS }])
+    const opened = applyLayoutCommand(
+      model,
+      {
+        type: 'openAgentSessionTab',
+        workspace: WS,
+        tabId: 'chat-tab',
+        sessionId: 's1',
+        agent: 'codex',
+        replaces: { tabId: 'gone' }
+      },
+      ctx
+    )
+    expect(opened.ok && opened.result.closed).toBeUndefined()
+    expect(opened.ok && opened.model.workspaces[WS]?.groups[0]?.tabOrder).toEqual([
+      results[0]!.tabId,
+      'chat-tab'
+    ])
+  })
+})
diff --git a/src/shared/workspace-layout/workspace-layout-tab-close.ts b/src/shared/workspace-layout/workspace-layout-tab-close.ts
new file mode 100644
index 000000000000..717414dce31d
--- /dev/null
+++ b/src/shared/workspace-layout/workspace-layout-tab-close.ts
@@ -0,0 +1,67 @@
+import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../layout-owner-switch'
+import { filterRecord, withoutKey } from './stored-record-fields'
+import { editorTabShowsFile, keptAfterEditorClose } from './workspace-layout-editor-tab-file'
+import { applied, findTab, leafIdsOf, type Applied } from './workspace-layout-command-steps'
+import type {
+  CommandOf,
+  LayoutCommandResult,
+  LayoutEffects
+} from './workspace-layout-command-types'
+import type { WorkspaceLayout, WorkspaceLayoutModel } from './workspace-layout-model'
+import { removeTabFromWorkspace, withWorkspace } from './workspace-layout-removal'
+
+/** Removes a tab and its content record; a terminal tab's pane data goes with it. */
+export function closeTab(
+  model: WorkspaceLayoutModel,
+  key: string,
+  tabId: string
+): WorkspaceLayoutModel {
+  const workspace = model.workspaces[key]!
+  const tab = findTab(workspace, tabId)!
+  let next: WorkspaceLayout = removeTabFromWorkspace(workspace, tabId)
+  if (tab.kind === 'terminal' && next.leaves) {
+    const leafIds = leafIdsOf(tab)
+    next = { ...next, leaves: filterRecord(next.leaves, (leafId) => !leafIds.includes(leafId)) }
+  }
+  if (
+    tab.kind === 'editor' &&
+    next.editorFiles &&
+    !next.tabs.some((entry) => entry.entityId === tab.entityId)
+  ) {
+    next = {
+      ...next,
+      editorFiles: next.editorFiles.filter(
+        // Why the switch: shipped builds close through this code too.
+        ORCA_LAYOUT_OWNER_IS_MAIN
+          ? keptAfterEditorClose(workspace, next, tab.entityId)
+          : (file) => !editorTabShowsFile(tab.entityId, file, next.worktreeId)
+      )
+    }
+  }
+  if (next.editorViews) {
+    next = { ...next, editorViews: withoutKey(next.editorViews, tabId) }
+  }
+  if (tab.kind === 'browser' && next.browserTabs) {
+    next = { ...next, browserTabs: next.browserTabs.filter((entry) => entry.id !== tab.entityId) }
+  }
+  return withWorkspace(model, key, next)
+}
+
+/** After the new tab is placed: the replaced tab leaves in the same write, when it is still there. */
+export function closeReplacedTab(
+  model: WorkspaceLayoutModel,
+  command: CommandOf<'createTerminalTab' | 'openAgentSessionTab'>,
+  result: LayoutCommandResult,
+  effects?: Partial<LayoutEffects>
+): Applied {
+  const replaced = command.replaces?.tabId
+  const workspace = model.workspaces[command.workspace]
+  if (!replaced || !workspace || !findTab(workspace, replaced)) {
+    return applied(model, result, effects)
+  }
+  return applied(
+    closeTab(model, command.workspace, replaced),
+    { ...result, closed: [replaced] },
+    effects
+  )
+}
diff --git a/src/shared/workspace-layout/workspace-layout-tab-commands.ts b/src/shared/workspace-layout/workspace-layout-tab-commands.ts
index 3fe5b48418c5..dcc560e2a93c 100644
--- a/src/shared/workspace-layout/workspace-layout-tab-commands.ts
+++ b/src/shared/workspace-layout/workspace-layout-tab-commands.ts
@@ -1,18 +1,16 @@
-import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../layout-owner-switch'
-import { filterRecord, omitStoredFields, withoutKey } from './stored-record-fields'
+import { omitStoredFields } from './stored-record-fields'
 import { canReplacePreviewContentType, partitionPinnedTabOrder } from './tab-order'
 import { getNextTerminalOrdinal } from './terminal-tab-ordinal'
 import { layoutContainsLeafId } from './terminal-pane-tree'
-import { editorTabShowsFile, keptAfterEditorClose } from './workspace-layout-editor-tab-file'
 import {
   applied,
   boundPtyIds,
   workspaceOrEmpty,
   findTab,
   findTerminal,
-  leafIdsOf,
   placeNewTab,
   refuse,
+  replacedTabSlot,
   updateTab,
   type Applied,
   type TabPlacement
@@ -28,12 +26,14 @@ import {
   type LayoutContentTab,
   type LayoutTab,
   type LayoutTerminalTab,
-  type WorkspaceLayout,
   type WorkspaceLayoutModel
 } from './workspace-layout-model'
 import { admitsInitialSurface } from './workspace-layout-initial-surface'
 import { adoptedLeaf, appliedHeldAdoption } from './workspace-layout-terminal-adoption'
-import { removeTabFromWorkspace, withWorkspace } from './workspace-layout-removal'
+import { withWorkspace } from './workspace-layout-removal'
+import { closeReplacedTab, closeTab } from './workspace-layout-tab-close'
+
+export { closeReplacedTab, closeTab } from './workspace-layout-tab-close'
 
 type RefusedClose = NonNullable<LayoutCommandResult['refused']>[number]
 
@@ -68,58 +68,28 @@ export function createTerminalTab(
     terminal: { defaultTitle: `Terminal ${ordinal}`, ...command.creation },
     panes: { root: { type: 'leaf', leafId } }
   }
-  const placed = placeNewTab(workspace, command.workspace, tab, command, context)
+  const placed = placeNewTab(
+    workspace,
+    command.workspace,
+    tab,
+    replacedTabSlot(workspace, command),
+    context
+  )
   const paneKey = paneKeyOf(id, leafId)
   if (command.adopt) {
     // Its terminal already runs: the pane binds to it and nothing starts.
     const leaves = { ...placed.leaves, [leafId]: adoptedLeaf(command.adopt) }
     const adopted = withWorkspace(model, command.workspace, { ...placed, leaves })
-    return applied(adopted, { tabId: id, leafId, paneKey })
+    return closeReplacedTab(adopted, command, { tabId: id, leafId, paneKey })
   }
-  return applied(
+  return closeReplacedTab(
     withWorkspace(model, command.workspace, placed),
+    command,
     { tabId: id, leafId, paneKey },
     { startPaneKeys: [paneKey] }
   )
 }
 
-/** Removes a tab and its content record; a terminal tab's pane data goes with it. */
-export function closeTab(
-  model: WorkspaceLayoutModel,
-  key: string,
-  tabId: string
-): WorkspaceLayoutModel {
-  const workspace = model.workspaces[key]!
-  const tab = findTab(workspace, tabId)!
-  let next: WorkspaceLayout = removeTabFromWorkspace(workspace, tabId)
-  if (tab.kind === 'terminal' && next.leaves) {
-    const leafIds = leafIdsOf(tab)
-    next = { ...next, leaves: filterRecord(next.leaves, (leafId) => !leafIds.includes(leafId)) }
-  }
-  if (
-    tab.kind === 'editor' &&
-    next.editorFiles &&
-    !next.tabs.some((entry) => entry.entityId === tab.entityId)
-  ) {
-    next = {
-      ...next,
-      editorFiles: next.editorFiles.filter(
-        // Why the switch: shipped builds close through this code too.
-        ORCA_LAYOUT_OWNER_IS_MAIN
-          ? keptAfterEditorClose(workspace, next, tab.entityId)
-          : (file) => !editorTabShowsFile(tab.entityId, file, next.worktreeId)
-      )
-    }
-  }
-  if (next.editorViews) {
-    next = { ...next, editorViews: withoutKey(next.editorViews, tabId) }
-  }
-  if (tab.kind === 'browser' && next.browserTabs) {
-    next = { ...next, browserTabs: next.browserTabs.filter((entry) => entry.id !== tab.entityId) }
-  }
-  return withWorkspace(model, key, next)
-}
-
 export function closeTabs(
   model: WorkspaceLayoutModel,
   command: CommandOf<'closeTabs'>,

From 4c7c50a6b744cec02a44707530ee365426083248 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 15:04:04 -0700
Subject: [PATCH 127/207] Switch surfaces by stopping, preparing at rest, then
 replacing the tab

The host ran the switch as publish an empty tab, spawn into it, poll for
its placement, then hide and retire the source, with projections and
retention bookkeeping to cover each gap. Each gap was a place a crash,
a lost connection or a second click could leave two tabs or none.

Both directions now follow one shape: stop the exact source incarnation
with proof of exit, prepare the destination with no tab (the claim-carrying
create for a terminal, create-or-adopt for a chat), then place it with one
`replaces` layout write. A failed switch leaves the agent stopped in the
untouched source tab, and Retry adopts whatever the first attempt made.
Split-pane sources keep their siblings: only a whole tab is replaced.

Deletes the publish-then-spawn path, placement poll, open-placement
intents, switch projections, tab hiding and retention records.
---
 .../agent-launch-pane-attachment.ts           |  34 +-
 ...-agent-session-switch-command-selection.ts |  40 +-
 ...tructured-agent-session-switch-commands.ts |  32 +-
 src/main/providers/pty-process-inspection.ts  |   1 -
 src/main/pty-descendant-termination.ts        |  27 +-
 .../construction/runtime-identity-state.ts    |   5 -
 .../mobile-session-layout-projection.ts       |  25 --
 .../mobile-session-tab-close-outcome.ts       |   8 +
 ...ca-runtime-create-terminal-dependencies.ts |   9 +-
 src/main/runtime/orca-runtime.ts              |  24 --
 .../methods/agent-launch-caller-support.ts    |  13 -
 .../methods/agent-launch-instant-tab.test.ts  |  72 ++--
 .../methods/agent-launch-tab-publication.ts   |  39 +-
 .../rpc/methods/agent-launch.test-fixture.ts  |  28 --
 src/main/runtime/rpc/methods/agent-launch.ts  |   6 -
 ...red-agent-session-switch-execution.test.ts | 400 +-----------------
 ...ructured-agent-session-switch-execution.ts | 392 ++++++++---------
 ...ructured-agent-session-switch-retention.ts |  28 --
 ...agent-session-switch-terminal-execution.ts | 123 ++----
 .../runtime-mobile-session-projection.ts      |   1 -
 ...time-mobile-session-result-finalization.ts |   1 -
 src/main/runtime/runtime-pane-admission.ts    |  33 +-
 .../runtime/runtime-terminal-contracts.ts     |   3 -
 .../session-graph/session-window-graph.ts     |  14 -
 ...ld-headless-mobile-session-browser-tabs.ts |  12 +-
 .../explicit-terminal-close-pty-stops.ts      |  11 +-
 .../main-layout-agent-launch-tabs.ts          | 169 ++------
 .../session-tabs/main-session-tab-rows.ts     |   6 +-
 .../session-tabs/mobile-session-membership.ts |   4 +-
 .../session-tab-open-placement.ts             |  81 ----
 .../structured-session-switch-projection.ts   | 192 ---------
 .../structured-session-tab-close.ts           |   4 +-
 ...ured-session-terminal-launch-retirement.ts |  65 ---
 .../terminal-switch-close-capture.ts          |  22 +-
 ...red-native-switch-physical.test-fixture.ts |   4 +-
 .../launch/mobile-terminal-create-anchor.ts   |  21 -
 .../launch/mobile-terminal-create-options.ts  |  43 --
 .../launch/mobile-terminal-create-owner.ts    |  62 ---
 .../terminal/launch/mobile-terminal-create.ts |  41 +-
 .../launch/mobile-terminal-owned-create.ts    | 111 ++---
 .../launch/mobile-terminal-renderer-create.ts | 106 +++--
 .../mobile-terminal-switch-publication.ts     | 178 --------
 .../launch/terminal-create-completion.ts      |   1 -
 .../terminal/launch/terminal-create.ts        |  74 ++--
 .../terminal/launch/terminal-launch-result.ts |   8 -
 .../bind-first-registration-census.test.ts    | 132 ------
 src/main/runtime/workspace-layout-stream.ts   |  13 +-
 .../window/agent-launch-tab-publish-relay.ts  |   8 +-
 .../window/session-tab-close-request-relay.ts |  21 +-
 src/shared/agent-launch-pane-verdict.ts       |   9 +-
 src/shared/agent-launch-tab-publication.ts    |  21 -
 src/shared/runtime-session-contracts.ts       |   5 -
 .../runtime-terminal-create-contract.ts       |   1 -
 src/shared/session-tab-close.ts               |   4 -
 src/shared/session-tab-placement.ts           |  17 -
 ...uctured-agent-cli-conversation-adoption.ts |  11 +-
 src/shared/terminal-process-inspection.ts     |   1 -
 57 files changed, 544 insertions(+), 2272 deletions(-)
 delete mode 100644 src/main/runtime/rpc/methods/agent-launch-caller-support.ts
 delete mode 100644 src/main/runtime/rpc/methods/structured-agent-session-switch-retention.ts
 delete mode 100644 src/main/runtime/session-tabs/session-tab-open-placement.ts
 delete mode 100644 src/main/runtime/session-tabs/structured-session-switch-projection.ts
 delete mode 100644 src/main/runtime/session-tabs/structured-session-terminal-launch-retirement.ts
 delete mode 100644 src/main/runtime/terminal/launch/mobile-terminal-create-options.ts
 delete mode 100644 src/main/runtime/terminal/launch/mobile-terminal-create-owner.ts
 delete mode 100644 src/main/runtime/terminal/launch/mobile-terminal-switch-publication.ts
 delete mode 100644 src/main/runtime/terminal/lifecycle/bind-first-registration-census.test.ts

diff --git a/src/main/agent-launch/agent-launch-pane-attachment.ts b/src/main/agent-launch/agent-launch-pane-attachment.ts
index ff3f50d46c56..6b69411c9f92 100644
--- a/src/main/agent-launch/agent-launch-pane-attachment.ts
+++ b/src/main/agent-launch/agent-launch-pane-attachment.ts
@@ -1,9 +1,9 @@
+/** Use process-local launch state; after restart, ordinary pane attachment handles recovery. */
+
 import type { AgentLaunchPaneVerdict } from '../../shared/agent-launch-pane-verdict'
 import { parsePaneKey } from '../../shared/stable-pane-id'
 import type { TerminalSurfaceCloseTarget } from '../../shared/terminal-surface-close-target'
 
-/** Use process-local launch state; after restart, ordinary pane attachment handles recovery. */
-
 const PROCEED: AgentLaunchPaneVerdict = { kind: 'proceed' }
 
 export type AgentLaunchPane = { worktreeId: string; paneKey: string }
@@ -14,13 +14,12 @@ type RunningLaunch = {
   settled: Promise<AgentLaunchPaneVerdict>
   finished: Promise<AgentLaunchPaneVerdict>
   closedByUser: boolean
-  superseded: boolean
 }
 
 const runningLaunchesByPane = new Map<string, RunningLaunch>()
 const failedLaunchesByPane = new Map<
   string,
-  { pane: AgentLaunchPane; verdict: AgentLaunchPaneVerdict; running?: RunningLaunch }
+  { pane: AgentLaunchPane; verdict: AgentLaunchPaneVerdict }
 >()
 
 function paneKeyOf(pane: AgentLaunchPane): string {
@@ -31,7 +30,6 @@ export type RunningAgentLaunchPane = {
   /** Attach as soon as the agent binds, without waiting for prompt delivery. */
   agentBound(): void
   finish(verdict: AgentLaunchPaneVerdict): void
-  current(): boolean
   closedByUser(): boolean
 }
 
@@ -48,10 +46,8 @@ export function trackRunningAgentLaunchPane(pane: AgentLaunchPane): RunningAgent
     finished: new Promise((done) => {
       resolve = done
     }),
-    superseded: false,
     closedByUser: false
   }
-  noteAgentLaunchPaneAccepted(pane.paneKey)
   runningLaunchesByPane.set(key, running)
   failedLaunchesByPane.delete(key)
   let finished = false
@@ -66,38 +62,18 @@ export function trackRunningAgentLaunchPane(pane: AgentLaunchPane): RunningAgent
         runningLaunchesByPane.delete(key)
         if (
           !running.closedByUser &&
-          (verdict.kind === 'not-started' ||
-            verdict.kind === 'unconfirmed' ||
-            verdict.kind === 'withdrawn')
+          (verdict.kind === 'not-started' || verdict.kind === 'unconfirmed')
         ) {
-          failedLaunchesByPane.set(key, { pane, verdict, running })
+          failedLaunchesByPane.set(key, { pane, verdict })
         }
       }
       settle(verdict)
       resolve(verdict)
     },
-    current: () =>
-      !running.superseded &&
-      !running.closedByUser &&
-      (runningLaunchesByPane.get(key) ?? failedLaunchesByPane.get(key)?.running) === running,
     closedByUser: () => running.closedByUser
   }
 }
 
-/** Acceptance precedes option resolution, including callers that do not publish an early tab. */
-export function noteAgentLaunchPaneAccepted(paneKey: string): void {
-  for (const running of runningLaunchesByPane.values()) {
-    if (running.pane.paneKey === paneKey) {
-      running.superseded = true
-    }
-  }
-  for (const failed of failedLaunchesByPane.values()) {
-    if (failed.pane.paneKey === paneKey && failed.running) {
-      failed.running.superseded = true
-    }
-  }
-}
-
 /** `null` targets every pane of the workspace. */
 function launchesIn<T extends { pane: AgentLaunchPane }>(
   launches: Map<string, T>,
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command-selection.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command-selection.ts
index a99a08e57576..b7be48350394 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command-selection.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-command-selection.ts
@@ -17,11 +17,8 @@ export type SwitchCommand = {
   settled: boolean
   result?: AgentSessionSwitchResult
   deadline: AgentSessionSwitchDeadline
-  retain: () => Promise<void>
-  retentionAllowed: boolean
   completion: Promise<AgentSessionSwitchResult>
   physical?: Promise<void>
-  physicalRecovery?: Set<() => Promise<void>>
   cleanupTimer?: ReturnType<typeof setTimeout>
 }
 
@@ -35,14 +32,12 @@ export function selectStructuredSessionSwitchCommand(args: {
   direction: SwitchCommand['direction']
   deadline: AgentSessionSwitchDeadline
   run: () => Promise<AgentSessionSwitchResult>
-  onRetained?: (check: () => void) => Promise<void>
   allowUncreated?: boolean
   conversationKey?: string
   destinationCurrent?: (result: AgentSessionSwitchResult) => boolean | undefined
   onAccepted?: () => void
 }): SwitchCommand {
-  const { host, commands, isDisposed, id, invocationId, direction, deadline, run, onRetained } =
-    args
+  const { host, commands, isDisposed, id, invocationId, direction, deadline, run } = args
   const { sessions, serialize } = host
   deadline.check()
   const prior =
@@ -80,7 +75,6 @@ export function selectStructuredSessionSwitchCommand(args: {
         reason: 'handoffInFlight'
       })
     }
-    prior.retentionAllowed = false
     clearTimeout(prior.cleanupTimer)
     prior.deadline.revoke()
     for (const [alias, current] of commands) {
@@ -99,18 +93,6 @@ export function selectStructuredSessionSwitchCommand(args: {
     direction,
     settled: false,
     deadline,
-    retentionAllowed: true,
-    retain: async () => {
-      const check = () => {
-        if (!command.retentionAllowed || commands.get(id) !== command) {
-          throw agentSessionRefusalError('agent_session_operation_expired', {
-            reason: 'operationExpired'
-          })
-        }
-      }
-      check()
-      await onRetained?.(check)
-    },
     completion: Promise.resolve().then(async () => {
       if (host.context().deps.store.getRecord(id)) {
         await serialize(id, async () => {
@@ -122,27 +104,15 @@ export function selectStructuredSessionSwitchCommand(args: {
           }
         })
       }
-      try {
-        const result = await run()
-        command.result = result
-        if (result.status !== 'completed') {
-          await command.retain()
-        }
-        return result
-      } catch (error) {
-        await command.retain().catch(() => {})
-        throw error
-      }
+      const result = await run()
+      command.result = result
+      return result
     })
   }
   commands.set(id, command)
   if (args.conversationKey) {
     commands.set(args.conversationKey, command)
   }
-  const retainOnExpiry = () => {
-    void command.retain().catch(() => {})
-  }
-  deadline.signal.addEventListener('abort', retainOnExpiry, { once: true })
   const session = sessions.get(id)
   if (session) {
     session.switchCommand = command
@@ -153,7 +123,6 @@ export function selectStructuredSessionSwitchCommand(args: {
       await command.physical
       command.settled = true
       deadline.dispose()
-      deadline.signal.removeEventListener('abort', retainOnExpiry)
       for (const [key, current] of commands) {
         if (current === command && sessions.get(key)?.switchCommand === command) {
           delete sessions.get(key)!.switchCommand
@@ -165,7 +134,6 @@ export function selectStructuredSessionSwitchCommand(args: {
       }
       command.cleanupTimer = setTimeout(
         () => {
-          command.retentionAllowed = false
           for (const [key, current] of commands) {
             if (current === command) {
               commands.delete(key)
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-commands.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-commands.ts
index a80e31bf8049..58a9fc4e3555 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-commands.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-commands.ts
@@ -32,7 +32,6 @@ export function createStructuredAgentSessionSwitchCommands(
         options: {
           conversationKey?: string
           direction: SwitchCommand['direction']
-          onRetained?: (check: () => void) => Promise<void>
           allowUncreated?: boolean
           destinationCurrent?: (result: AgentSessionSwitchResult) => boolean | undefined
           onAccepted?: () => void
@@ -60,15 +59,7 @@ export function createStructuredAgentSessionSwitchCommands(
         if (selected.deadline !== deadline) {
           deadline.dispose()
         }
-        try {
-          return await selected.completion
-        } catch (error) {
-          // Each ordinary retry drives the original receiver join, never another Stop/create.
-          void Promise.all(
-            [...(selected.physicalRecovery ?? [])].map((recover) => recover())
-          ).catch(() => {})
-          throw error
-        }
+        return selected.completion
       },
       adoptSwitch: (from: string, to: string) =>
         host.serialize(to, async () => {
@@ -89,30 +80,17 @@ export function createStructuredAgentSessionSwitchCommands(
         }
       },
       switchGeneration: (id: string) => commands.get(id)?.generation,
-      retainSwitch: async (id: string) => {
-        await commands.get(id)?.retain()
-      },
       switchExecuting: (id: string) => Boolean(commands.get(id) && !commands.get(id)?.settled),
-      trackSwitchPhysical: <T>(
-        id: string,
-        work: Promise<T>,
-        recover?: () => Promise<void>
-      ): Promise<T> => {
+      /** Stop and spawn work already dispatched settles even when the observing request expired. */
+      trackSwitchPhysical: <T>(id: string, work: Promise<T>): Promise<T> => {
         const command = commands.get(id)
         if (command) {
           command.physical = Promise.allSettled([command.physical, work]).then(() => {})
-          if (recover) {
-            const recoveries = (command.physicalRecovery ??= new Set())
-            recoveries.add(recover)
-            void work.finally(() => recoveries.delete(recover)).catch(() => {})
-          }
         }
         return work
       },
       waitSwitchPhysical: async (id: string): Promise<void> => {
-        const command = commands.get(id)
-        await Promise.all([...(command?.physicalRecovery ?? [])].map((recover) => recover()))
-        await command?.physical
+        await commands.get(id)?.physical
       }
     },
     revoke: (id: string): boolean => {
@@ -120,14 +98,12 @@ export function createStructuredAgentSessionSwitchCommands(
       if (!command) {
         return false
       }
-      command.retentionAllowed = false
       command.deadline.revoke()
       return true
     },
     dispose: () => {
       unsubscribe()
       for (const command of commands.values()) {
-        command.retentionAllowed = false
         clearTimeout(command.cleanupTimer)
         command.deadline.revoke()
       }
diff --git a/src/main/providers/pty-process-inspection.ts b/src/main/providers/pty-process-inspection.ts
index 7720c7fb3b42..2810a5915578 100644
--- a/src/main/providers/pty-process-inspection.ts
+++ b/src/main/providers/pty-process-inspection.ts
@@ -17,7 +17,6 @@ type CompletionSensitivePtyProvider = IPtyProvider & {
 
 /** scanChildProcesses requests decision-time evidence; steady polls may rely on the next tick to correct stale reads. */
 export type PtyProcessInspectionOptions = {
-  captureSwitchWitness?: string
   expectedIncarnationId?: PtyIncarnationId
   scanChildProcesses?: boolean
   /** Adoption only: ignore members outside both shell ancestry and console; close still reaches the whole job. */
diff --git a/src/main/pty-descendant-termination.ts b/src/main/pty-descendant-termination.ts
index 02f1713367eb..1515edc5c915 100644
--- a/src/main/pty-descendant-termination.ts
+++ b/src/main/pty-descendant-termination.ts
@@ -135,8 +135,6 @@ export async function captureDescendantSnapshot(
 type KillSweepDeps = SnapshotDeps &
   TerminateDeps & {
     ownsRoot?: () => boolean
-    /** Conditional ordinary close admits only after the final census; refusal signals nothing. */
-    admitClose?: () => Promise<boolean>
     /** Shutdown can retain the owner until descendant escalation finishes. */
     terminateDescendants?: (snapshot: DescendantSnapshot) => void | Promise<unknown>
     awaitEscalation?: boolean | (() => boolean)
@@ -153,14 +151,7 @@ export async function killWithDescendantSweep(
   deps: KillSweepDeps = {}
 ): Promise<void> {
   const platform = deps.platform ?? process.platform
-  let admitted = !deps.admitClose
   if (platform === 'win32') {
-    if (deps.admitClose) {
-      admitted = await deps.admitClose()
-      if (!admitted) {
-        return
-      }
-    }
     try {
       if ((deps.ownsRoot?.() ?? true) && Number.isInteger(rootPid) && rootPid > 0) {
         // Owned jobs survive PID reuse and include descendants reparented away from the shell.
@@ -180,20 +171,12 @@ export async function killWithDescendantSweep(
         }
       }
     } finally {
-      if (!deps.admitClose || (admitted && (deps.ownsRoot?.() ?? true))) {
-        killRoot()
-      }
+      killRoot()
     }
     return
   }
 
   const snapshot = await captureDescendantSnapshot(rootPid, deps)
-  if (deps.admitClose) {
-    admitted = await deps.admitClose()
-    if (!admitted) {
-      return
-    }
-  }
   let descendants: void | Promise<unknown> = undefined
   const awaitEscalation =
     typeof deps.awaitEscalation === 'function' ? deps.awaitEscalation() : deps.awaitEscalation
@@ -206,9 +189,7 @@ export async function killWithDescendantSweep(
       }
       await descendants
     } finally {
-      if (!deps.admitClose || (admitted && (deps.ownsRoot?.() ?? true))) {
-        killRoot()
-      }
+      killRoot()
     }
     return
   }
@@ -220,9 +201,7 @@ export async function killWithDescendantSweep(
         : terminateDescendantSnapshot(snapshot, deps)
     }
   } finally {
-    if (!deps.admitClose || (admitted && (deps.ownsRoot?.() ?? true))) {
-      killRoot()
-    }
+    killRoot()
   }
 }
 
diff --git a/src/main/runtime/construction/runtime-identity-state.ts b/src/main/runtime/construction/runtime-identity-state.ts
index 798eb1d1698a..3190951f28bb 100644
--- a/src/main/runtime/construction/runtime-identity-state.ts
+++ b/src/main/runtime/construction/runtime-identity-state.ts
@@ -1,5 +1,4 @@
 import { randomUUID } from 'node:crypto'
-import { preserveSessionTabOpenPlacements } from '../session-tabs/session-tab-open-placement'
 import { preserveTerminalRetirementProofs } from '../mobile-session-terminal-retirement-proof'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../shared/layout-owner-switch'
 import { startedMainTerminalSurfaces } from '../terminal/surface/main-terminal-surfaces'
@@ -116,10 +115,6 @@ export abstract class OrcaRuntimeWithRuntimeId extends RuntimeConstructionServic
     snapshot: RuntimeMobileSessionTabsSnapshot
   ): RuntimeMobileSessionTabsSnapshot {
     const existing = this.mobileSessionTabsByWorktree.get(worktreeId)
-    snapshot = preserveSessionTabOpenPlacements(snapshot, existing)
-    if (snapshot.switchProjections === undefined && existing?.switchProjections) {
-      snapshot = { ...snapshot, switchProjections: existing.switchProjections }
-    }
     if (ORCA_LAYOUT_OWNER_IS_MAIN) {
       const merged = startedMainTerminalSurfaces(this)?.withMainOrder(snapshot) ?? snapshot
       // Main-order-only rebuilds are no-ops unless occupant/publication/retirement evidence changed.
diff --git a/src/main/runtime/mobile-session-layout-projection.ts b/src/main/runtime/mobile-session-layout-projection.ts
index a7c1768ba233..d10cb89f79a0 100644
--- a/src/main/runtime/mobile-session-layout-projection.ts
+++ b/src/main/runtime/mobile-session-layout-projection.ts
@@ -1,7 +1,3 @@
-import {
-  placeUnpinnedSessionTabAtCapture,
-  type CapturedSessionTabPlacement
-} from '../../shared/session-tab-placement'
 import { createHash, randomUUID } from 'node:crypto'
 import { isTerminalLeafId } from '../../shared/stable-pane-id'
 import type {
@@ -289,24 +285,3 @@ export function buildMaterializedHeadlessParentLayout(
     }
   }
 }
-
-/** Captured neighbors settle into the current group through ordinary pin-aware insertion. */
-export function placeHeadlessSessionTabAtCapture(
-  groups: RuntimeMobileSessionTabGroup[],
-  tabs: readonly RuntimeMobileSessionSnapshotTab[],
-  tabId: string,
-  captured: CapturedSessionTabPlacement
-): void {
-  const group = groups.find((candidate) => candidate.tabOrder.includes(tabId))
-  if (group) {
-    group.tabOrder = placeUnpinnedSessionTabAtCapture(
-      group.tabOrder,
-      tabs.map((tab) => ({
-        id: tab.type === 'terminal' ? tab.parentTabId : tab.id,
-        isPinned: tab.isPinned === true
-      })),
-      tabId,
-      captured
-    )
-  }
-}
diff --git a/src/main/runtime/mobile-session-tab-close-outcome.ts b/src/main/runtime/mobile-session-tab-close-outcome.ts
index 82c9db50882f..166517c314b8 100644
--- a/src/main/runtime/mobile-session-tab-close-outcome.ts
+++ b/src/main/runtime/mobile-session-tab-close-outcome.ts
@@ -50,10 +50,18 @@ export function refusedMobileSessionTabClose(
   } as MobileSessionTabCloseOutcome
 }
 
+/** What retiring one terminal pane may carry: its captured presentation and proofs. */
+export type TerminalPaneRetirementOptions = Pick<
+  MobileSessionTabCloseOptions,
+  'originalPresentation' | 'rendererOwnsPresentation' | 'retirementProofs' | 'presentationRetired'
+>
+
 export type MobileSessionTabCloseOptions = {
   originalPresentation?: TerminalSurfaceCloseCapture
   rendererOwnsPresentation?: boolean
   retirementProofs?: RuntimeMobileSessionRetiredTerminalSurface[]
+  /** The pane's presentation is already gone (a replace's write or its own exit); retire only its bookkeeping. */
+  presentationRetired?: boolean
   reason?: RuntimeSessionTabCloseReason
   expectedPublicationEpoch?: string
   expectedTerminalHandle?: string
diff --git a/src/main/runtime/orca-runtime-create-terminal-dependencies.ts b/src/main/runtime/orca-runtime-create-terminal-dependencies.ts
index 93bddc22f1b3..93a4a48ee20c 100644
--- a/src/main/runtime/orca-runtime-create-terminal-dependencies.ts
+++ b/src/main/runtime/orca-runtime-create-terminal-dependencies.ts
@@ -53,18 +53,15 @@ export const spawnShellInputs = ({
 
 /** Abort disconnected callers, refuse sleeping workspaces, and pass fork intent and the user's act for host validation. */
 export function callerSpawnScope(
-  opts: Pick<
-    TerminalCreateOptions,
-    'signal' | 'refuseSleptWorktree' | 'spawnIntent' | 'switchExecution' | 'wslUserAct'
-  >
-): Pick<TerminalCreateOptions, 'signal' | 'switchExecution'> & {
+  opts: Pick<TerminalCreateOptions, 'signal' | 'refuseSleptWorktree' | 'spawnIntent' | 'wslUserAct'>
+): {
+  signal?: AbortSignal
   refuseSleptWorktree?: true
   spawnIntent?: SpawnIntent
   wslUserAct?: true
 } {
   return {
     ...(opts.signal ? { signal: opts.signal } : {}),
-    ...(opts.switchExecution ? { switchExecution: opts.switchExecution } : {}),
     ...(opts.refuseSleptWorktree ? { refuseSleptWorktree: true } : {}),
     ...(opts.spawnIntent ? { spawnIntent: opts.spawnIntent } : {}),
     ...(opts.wslUserAct ? { wslUserAct: true } : {})
diff --git a/src/main/runtime/orca-runtime.ts b/src/main/runtime/orca-runtime.ts
index 076b0a6e5516..51dcae843e44 100644
--- a/src/main/runtime/orca-runtime.ts
+++ b/src/main/runtime/orca-runtime.ts
@@ -1,6 +1,3 @@
-import { withPublishedSessionTabOpenPlacements } from './session-tabs/session-tab-open-placement'
-import { parsePaneKey } from '../../shared/stable-pane-id'
-import { noteAgentLaunchPaneAccepted } from '../agent-launch/agent-launch-pane-attachment'
 import { conversationRecordReader } from './orchestration/structured-session-lineage'
 import type { RuntimeLinearCommandSurface } from './runtime-linear-command-surface'
 import { installRuntimeLinearCommandSurface } from './runtime-linear-command-surface'
@@ -193,22 +190,6 @@ class OrcaRuntimeService extends OrcaRuntimeSidebarBase {
     return this.notifier.publishAgentLaunchTab(request)
   }
 
-  /** Retain final verdicts, clear settled ones, and remove withdrawn panes without removing split siblings. */
-  noteAcceptedAgentLaunchPane(paneKey: string, operationId?: string): void {
-    noteAgentLaunchPaneAccepted(paneKey)
-    const pane = parsePaneKey(paneKey)
-    if (!pane || !this.supportsConditionalSwitchProjection()) {
-      return
-    }
-    this.notifier?.agentLaunchPaneVerdict?.({
-      worktreeId: '',
-      ...pane,
-      operationId,
-      accepted: true,
-      verdict: { kind: 'proceed' }
-    })
-  }
-
   reportAgentLaunchPaneVerdict(
     pane: AgentLaunchPaneAddress,
     verdict: AgentLaunchPaneVerdict
@@ -244,11 +225,6 @@ class OrcaRuntimeService extends OrcaRuntimeSidebarBase {
     store: () => this.store,
     homeHostId: (key) => this.tryGetWorkspaceSessionHostIdForWorktree(key),
     liveTitle: (ptyId) => this.getTrackedDisplayTitleForPty(ptyId) || null,
-    withOpenPlacements: (layout) =>
-      withPublishedSessionTabOpenPlacements(
-        layout,
-        this.mobileSessionTabsByWorktree.get(layout.worktreeId)
-      ),
     ...this.paneFactSources()
   })
 
diff --git a/src/main/runtime/rpc/methods/agent-launch-caller-support.ts b/src/main/runtime/rpc/methods/agent-launch-caller-support.ts
deleted file mode 100644
index 34f87b7324f5..000000000000
--- a/src/main/runtime/rpc/methods/agent-launch-caller-support.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { AGENT_LAUNCH_RUNTIME_CAPABILITY } from '../../../../shared/agent-launch-runtime-capability'
-import type { RpcContext } from '../core'
-export { callerRendersLaunchedChat } from './agent-launch-caller-selection'
-
-/** agent.launch.v2 declares support for both outcomes. CLI/runtime-socket and SSH bridges have no clientKind/capabilities; the desktop renderer is a runtime client and must advertise support. */
-export function supportsAgentLaunch(
-  context: Pick<RpcContext, 'clientKind' | 'clientCapabilities'>
-): boolean {
-  return (
-    context.clientKind === undefined ||
-    context.clientCapabilities?.includes(AGENT_LAUNCH_RUNTIME_CAPABILITY) === true
-  )
-}
diff --git a/src/main/runtime/rpc/methods/agent-launch-instant-tab.test.ts b/src/main/runtime/rpc/methods/agent-launch-instant-tab.test.ts
index 5690349e75da..83bcb85418eb 100644
--- a/src/main/runtime/rpc/methods/agent-launch-instant-tab.test.ts
+++ b/src/main/runtime/rpc/methods/agent-launch-instant-tab.test.ts
@@ -20,7 +20,6 @@ import type {
 import { parsePaneKey } from '../../../../shared/stable-pane-id'
 import {
   markAgentLaunchesClosedByUser,
-  noteAgentLaunchPaneAccepted,
   resetAgentLaunchPanesForTests,
   resolveAgentLaunchPaneVerdict
 } from '../../../agent-launch/agent-launch-pane-attachment'
@@ -31,10 +30,6 @@ import type { RpcContext } from '../core'
 import { DESKTOP_RPC_CALLER } from '../rpc-caller-identity'
 import {
   STRUCTURED_PREFERENCE,
-  terminalOptions,
-  coldRecord,
-  failBeforeDispatch,
-  failAfterDispatch,
   methodNamed,
   rpcContext,
   runtimeStub,
@@ -167,9 +162,9 @@ function hostWithWindow(
       (request: Omit<AgentLaunchTabPublishRequest, 'requestId'>) =>
         runtime.publishAgentLaunchTab(request)
     ),
-    withdrawAgentLaunchPaneInMainLayout: vi.fn<
-      RpcContext['runtime']['withdrawAgentLaunchPaneInMainLayout']
-    >(async (_address, current) => current?.() ?? false)
+    withdrawAgentLaunchPaneInMainLayout: vi.fn(
+      (_address: { worktreeId: string; tabId: string; leafId: string }) => true
+    )
   })
 }
 
@@ -197,6 +192,10 @@ function plainLaunch(
   )
 }
 
+function terminalOptions(runtime: Host): Record<string, unknown> {
+  return runtime.createTerminal.mock.calls[0]?.[1] ?? {}
+}
+
 /** What the pane's spawn decides when it mounts; `unowned` is an ordinary pane's spawn. */
 async function paneVerdict(
   runtime: Host,
@@ -209,6 +208,28 @@ async function paneVerdict(
   )
 }
 
+/** The record not open yet when the request arrives, as on the first launch after a restart. */
+function coldRecord(runtime: Host): Host {
+  runtime.openedAgentSessionRecordStore.mockReturnValueOnce(null)
+  return runtime
+}
+
+/** A spawn that fails before the daemon was asked for a process: nothing can be running. */
+function failBeforeDispatch(runtime: Host, message: string): void {
+  runtime.createTerminal.mockRejectedValueOnce(new Error(message))
+}
+
+/** A spawn the daemon was asked for, whose answer was lost: the process may exist. */
+function failAfterDispatch(runtime: Host, message: string): void {
+  runtime.createTerminal.mockImplementationOnce(async (_selector, createOptions) => {
+    const dispatched = createOptions?.onPtySpawnDispatched
+    if (typeof dispatched === 'function') {
+      dispatched()
+    }
+    throw new Error(message)
+  })
+}
+
 describe.each(['window', 'main'] as const)('the %s owning the layout', (owner) => {
   beforeEach(() => {
     layoutOwner.isMain = owner === 'main'
@@ -374,12 +395,7 @@ describe.each(['window', 'main'] as const)('the %s owning the layout', (owner) =
       })
       await vi.waitFor(() =>
         expect(runtime.reportAgentLaunchPaneVerdict).toHaveBeenCalledWith(
-          {
-            worktreeId: 'wt-7',
-            tabId: TAB_ID,
-            leafId: LEAF_ID,
-            operationId: runtime.published[0]?.operationId
-          },
+          { worktreeId: 'wt-7', tabId: TAB_ID, leafId: LEAF_ID },
           { kind: 'not-started', code: 'spawn claude ENOENT' }
         )
       )
@@ -495,12 +511,7 @@ describe.each(['window', 'main'] as const)('the %s owning the layout', (owner) =
 
       await vi.waitFor(() =>
         expect(runtime.reportAgentLaunchPaneVerdict).toHaveBeenCalledWith(
-          {
-            worktreeId: 'wt-7',
-            tabId: TAB_ID,
-            leafId: LEAF_ID,
-            operationId: runtime.published[0]?.operationId
-          },
+          { worktreeId: 'wt-7', tabId: TAB_ID, leafId: LEAF_ID },
           { kind: 'not-started', code: 'spawn claude ENOENT' }
         )
       )
@@ -559,7 +570,7 @@ describe.each(['window', 'main'] as const)('the %s owning the layout', (owner) =
       expect(retried.published[0]?.operationId).toBe(operationId)
       await vi.waitFor(() =>
         expect(retried.reportAgentLaunchPaneVerdict).toHaveBeenCalledWith(
-          { worktreeId: 'wt-7', tabId: TAB_ID, leafId: LEAF_ID, operationId },
+          { worktreeId: 'wt-7', tabId: TAB_ID, leafId: LEAF_ID },
           { kind: 'proceed' }
         )
       )
@@ -577,7 +588,7 @@ describe.each(['window', 'main'] as const)('the %s owning the layout', (owner) =
       await replayLaunch(remadeForNothing, { paneKey: PANE_KEY, operationId }, CLI)
       await vi.waitFor(() =>
         expect(remadeForNothing.reportAgentLaunchPaneVerdict).toHaveBeenCalledWith(
-          { worktreeId: 'wt-7', tabId: TAB_ID, leafId: LEAF_ID, operationId },
+          { worktreeId: 'wt-7', tabId: TAB_ID, leafId: LEAF_ID },
           { kind: 'withdrawn' }
         )
       )
@@ -591,7 +602,7 @@ describe.each(['window', 'main'] as const)('the %s owning the layout', (owner) =
       await replayLaunch(survived, { paneKey: PANE_KEY, operationId }, CLI)
       await vi.waitFor(() =>
         expect(survived.reportAgentLaunchPaneVerdict).toHaveBeenCalledWith(
-          { worktreeId: 'wt-7', tabId: TAB_ID, leafId: LEAF_ID, operationId },
+          { worktreeId: 'wt-7', tabId: TAB_ID, leafId: LEAF_ID },
           { kind: 'proceed' }
         )
       )
@@ -879,18 +890,11 @@ describe.each(['window', 'main'] as const)('the %s owning the layout', (owner) =
         )
       )
       expect(refused.publishAgentLaunchTabInMainLayout).toHaveBeenCalledOnce()
-      const publication = await refused.publishAgentLaunchTabInMainLayout.mock.results[0]!.value
-      const [, current] = refused.withdrawAgentLaunchPaneInMainLayout.mock.calls[0]!
       await vi.waitFor(() =>
         expect(refused.withdrawAgentLaunchPaneInMainLayout).toHaveBeenCalledWith(
-          { worktreeId: 'wt-7', tabId: TAB_ID, leafId: LEAF_ID, operationId },
-          current,
-          publication?.withdrawalRoot
+          expect.objectContaining({ worktreeId: 'wt-7', tabId: TAB_ID, leafId: LEAF_ID })
         )
       )
-      expect(current?.()).toBe(true)
-      noteAgentLaunchPaneAccepted(PANE_KEY)
-      expect(current?.()).toBe(false)
     }
   )
 
@@ -909,8 +913,8 @@ describe.each(['window', 'main'] as const)('the %s owning the layout', (owner) =
       refused.publishAgentLaunchTabInMainLayout.mockImplementation((request) =>
         real.runtime.publishAgentLaunchTabInMainLayout(request)
       )
-      refused.withdrawAgentLaunchPaneInMainLayout.mockImplementation((...args) =>
-        real.runtime.withdrawAgentLaunchPaneInMainLayout(...args)
+      refused.withdrawAgentLaunchPaneInMainLayout.mockImplementation((address) =>
+        real.runtime.withdrawAgentLaunchPaneInMainLayout(address)
       )
       const mainTabIds = () =>
         real.session().tabsByWorktree[MAIN_WORKTREE_ID]?.map((tab) => tab.id) ?? []
@@ -937,7 +941,7 @@ describe.each(['window', 'main'] as const)('the %s owning the layout', (owner) =
       ).resolves.toMatchObject({ tabId: TAB_ID, created: true })
       await vi.waitFor(() => expect(mainTabIds()).not.toContain(TAB_ID))
       expect(refused.reportAgentLaunchPaneVerdict).toHaveBeenCalledWith(
-        { worktreeId: MAIN_WORKTREE_ID, tabId: TAB_ID, leafId: LEAF_ID, operationId },
+        { worktreeId: MAIN_WORKTREE_ID, tabId: TAB_ID, leafId: LEAF_ID },
         { kind: 'withdrawn' }
       )
     }
diff --git a/src/main/runtime/rpc/methods/agent-launch-tab-publication.ts b/src/main/runtime/rpc/methods/agent-launch-tab-publication.ts
index c14f0df503bc..836b3578a2cb 100644
--- a/src/main/runtime/rpc/methods/agent-launch-tab-publication.ts
+++ b/src/main/runtime/rpc/methods/agent-launch-tab-publication.ts
@@ -1,3 +1,7 @@
+/** Publish a stable-id tab before cold admission/spawn for replay-safe launches; its pane waits for the launch.
+ * Best-effort only: unresolved workspace, chat default, absent layout owner or occupied pane falls back to publication at spawn.
+ * After restart the pane behaves as an ordinary pane. */
+
 import { randomUUID } from 'node:crypto'
 import type {
   AgentLaunchPlacementReceipt,
@@ -25,10 +29,6 @@ import type { AgentLaunchParams } from '../../../../shared/rpc-contract/agent-la
 import { agentLaunchOperationCallerKey } from './agent-launch-replay'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
 
-/** Publish a stable-id tab before cold admission/spawn for replay-safe launches; its pane waits for the launch.
- * Best-effort only: unresolved workspace, chat default, absent layout owner or occupied pane falls back to publication at spawn.
- * After restart the pane behaves as an ordinary pane. */
-
 /** Paired launches move only the caller's view; both early publication and spawn must obey this. */
 export function agentLaunchMovesHostWindow(
   context: Pick<RpcContext, 'caller' | 'clientKind'>
@@ -192,28 +192,13 @@ export async function publishAgentLaunchTabEarly(
     publishing,
     finishRunning: (verdict) => running.finish(verdict),
     agentBound: () => running.agentBound(),
-    paneIsLive: () => !running.current() || runtime.hasLiveTerminalForPaneKey(paneKey),
+    paneIsLive: () => runtime.hasLiveTerminalForPaneKey(paneKey),
     closedByUser: () => running.closedByUser(),
-    report: async (verdict) => {
-      const address = {
-        worktreeId: workspace.id,
-        tabId: pane.tabId,
-        leafId: pane.leafId,
-        operationId: params.operationId
-      }
-      if (!running.current()) {
-        return
-      }
-      if (verdict.kind === 'withdrawn') {
-        const published = await publishing
-        const withdrawn = await runtime.withdrawAgentLaunchPaneInMainLayout(
-          address,
-          running.current,
-          published.withdrawalRoot
-        )
-        if (!withdrawn || !running.current()) {
-          return
-        }
+    report: (verdict) => {
+      const address = { worktreeId: workspace.id, tabId: pane.tabId, leafId: pane.leafId }
+      // Main withdraws panes it owns; the window still receives the verdict to release retained launch state.
+      if (ORCA_LAYOUT_OWNER_IS_MAIN && verdict.kind === 'withdrawn') {
+        runtime.withdrawAgentLaunchPaneInMainLayout(address)
       }
       runtime.reportAgentLaunchPaneVerdict(address, verdict)
     }
@@ -227,7 +212,7 @@ function trackEarlyAgentLaunchTab(args: {
   agentBound: () => void
   paneIsLive: () => boolean
   closedByUser: () => boolean
-  report: (verdict: AgentLaunchPaneVerdict) => Promise<void>
+  report: (verdict: AgentLaunchPaneVerdict) => void
 }): EarlyAgentLaunchTab {
   let reply: AgentLaunchTabPublished | null = null
   let publicationFailed = false
@@ -279,8 +264,8 @@ function trackEarlyAgentLaunchTab(args: {
               : failureCode === null
                 ? { kind: 'unconfirmed' }
                 : { kind: 'not-started', code: failureCode }
-        void args.report(verdict).catch(() => {})
         args.finishRunning(verdict)
+        args.report(verdict)
       })
     },
     placement: () => reply?.placement
diff --git a/src/main/runtime/rpc/methods/agent-launch.test-fixture.ts b/src/main/runtime/rpc/methods/agent-launch.test-fixture.ts
index 96da46a66851..f85a8a8e8a01 100644
--- a/src/main/runtime/rpc/methods/agent-launch.test-fixture.ts
+++ b/src/main/runtime/rpc/methods/agent-launch.test-fixture.ts
@@ -1,4 +1,3 @@
-import { noteAgentLaunchPaneAccepted } from '../../../agent-launch/agent-launch-pane-attachment'
 /** Use one runtime stub for RPC and replay tests so they exercise the same host surface. */
 
 import { vi } from 'vitest'
@@ -166,7 +165,6 @@ export function runtimeStub(options: AgentLaunchRuntimeStubOptions = {}) {
       (request: Omit<AgentLaunchTabPublishRequest, 'requestId'>) =>
         options.publishAgentLaunchTab?.(request) ?? null
     ),
-    noteAcceptedAgentLaunchPane: vi.fn((paneKey: string) => noteAgentLaunchPaneAccepted(paneKey)),
     reportAgentLaunchPaneVerdict: vi.fn(
       (_pane: { worktreeId: string; tabId: string; leafId: string }, _verdict: unknown) => {}
     ),
@@ -206,29 +204,3 @@ export const CAPABLE_CLIENT: Partial<RpcContext> = {
   pairedDeviceId: 'device-1',
   clientCapabilities: [AGENT_LAUNCH_RUNTIME_CAPABILITY]
 }
-
-export function terminalOptions(runtime: AgentLaunchRuntimeStub): Record<string, unknown> {
-  return runtime.createTerminal.mock.calls[0]?.[1] ?? {}
-}
-
-/** The record not open yet when the request arrives, as on the first launch after a restart. */
-export function coldRecord<T extends AgentLaunchRuntimeStub>(runtime: T): T {
-  runtime.openedAgentSessionRecordStore.mockReturnValueOnce(null)
-  return runtime
-}
-
-/** A spawn that fails before the daemon was asked for a process: nothing can be running. */
-export function failBeforeDispatch(runtime: AgentLaunchRuntimeStub, message: string): void {
-  runtime.createTerminal.mockRejectedValueOnce(new Error(message))
-}
-
-/** A spawn the daemon was asked for, whose answer was lost: the process may exist. */
-export function failAfterDispatch(runtime: AgentLaunchRuntimeStub, message: string): void {
-  runtime.createTerminal.mockImplementationOnce(async (_selector, createOptions) => {
-    const dispatched = createOptions?.onPtySpawnDispatched
-    if (typeof dispatched === 'function') {
-      dispatched()
-    }
-    throw new Error(message)
-  })
-}
diff --git a/src/main/runtime/rpc/methods/agent-launch.ts b/src/main/runtime/rpc/methods/agent-launch.ts
index a736b41ce10c..bf91871e1e2c 100644
--- a/src/main/runtime/rpc/methods/agent-launch.ts
+++ b/src/main/runtime/rpc/methods/agent-launch.ts
@@ -193,9 +193,6 @@ function runReplaySafeAgentLaunch(
     return active.promise
   }
 
-  if (params.paneKey) {
-    context.runtime.noteAcceptedAgentLaunchPane(params.paneKey, params.operationId)
-  }
   let promise: Promise<AgentLaunchResult>
   promise = executeReplaySafeAgentLaunch(params, context, fingerprint).finally(() => {
     if (activeAgentLaunches.get(key)?.promise === promise) {
@@ -260,9 +257,6 @@ export async function launchAgentOnHost(
   }
   assertAgentLaunchTargetAuthorized(params.target, host)
   if (!operationId) {
-    if (params.paneKey) {
-      host.runtime.noteAcceptedAgentLaunchPane(params.paneKey, operationId)
-    }
     return runLegacyAgentLaunch(params, host)
   }
   return runReplaySafeAgentLaunch({ ...params, operationId }, host).catch((error: unknown) => {
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
index ac0eb555c7bc..06731b3d2a75 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
@@ -2,7 +2,6 @@ import { mkdir, writeFile } from 'node:fs/promises'
 import { join } from 'node:path'
 import * as cliTranscript from '../../../ai-vault/structured-chat-cli-fork'
 import { structuredAgentRuntimeMetadata } from '../../structured-agent-runtime-metadata'
-import * as mobileProjection from '../../runtime-mobile-session-projection'
 import { agentSessionProviderHandleChainHead } from '../../../../shared/agent-session-provider-handle'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import {
@@ -26,7 +25,6 @@ import {
 } from '../../main-owned-workspace-runtime-fixture'
 import { executeStructuredSessionSwitch } from './structured-agent-session-switch-execution'
 import { DaemonRequestTimeoutError } from '../../../daemon/daemon-errors'
-import type { RuntimeMobileSessionTerminalClientTab } from '../../../../shared/runtime-mobile-session-tab-contracts'
 
 let rig: RestTestRig
 let releaseReceiverExit: (() => void) | undefined
@@ -250,21 +248,13 @@ it.each(['single', 'split', 'other-workspace'] as const)(
     }
     const published = await runtime.listMobileSessionTabs(`id:${destinationWorkspace}`)
     expect(published.activeTabId).toBe(destination)
-    expect(published.tabs.find((tab) => tab.id === destination)).toMatchObject({
-      openPlacement: {
-        invocationId: 'from-pane',
-        generation: expect.any(String),
-        placement: elsewhere ? {} : { afterTabId: TAB_ID, index: 0 },
-        ...(elsewhere ? {} : { source: source.presentation.identity })
-      }
-    })
-    if (elsewhere) {
-      const destinationTab = published.tabs.find(
-        (tab) => tab.type === 'agent-session' && tab.id === destination
-      )
+    if (!split && !elsewhere) {
+      // A whole tab is replaced in the one write: its rows are gone from the published snapshot.
       expect(
-        destinationTab?.type === 'agent-session' && destinationTab.openPlacement?.source
-      ).toBeUndefined()
+        published.tabs.some((tab) => tab.type === 'terminal' && tab.parentTabId === TAB_ID)
+      ).toBe(false)
+    }
+    if (elsewhere) {
       expect(session().tabsByWorktree[WORKTREE_ID]).toEqual(originalSourceTabs)
       expect(session().terminalLayoutsByTabId[TAB_ID]).toEqual(originalSourceLayout)
       expect((await runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)).tabs).toEqual(
@@ -383,7 +373,7 @@ it('reports a dispatched terminal with a lost answer as uncertain, preserving it
   const { runtime } = setupMainOwnedWorkspace()
   await rig.store.setSessionTabVisibility(id, false)
   await rig.store.setSessionTabVisibility(id, true, 'source-chat')
-  vi.spyOn(runtime, 'createSessionSwitchTerminal').mockRejectedValue(
+  vi.spyOn(runtime, 'spawnSwitchTerminal').mockRejectedValue(
     new DaemonRequestTimeoutError('raw daemon text must not become start-failed copy')
   )
   const result = await executeStructuredSessionSwitch(
@@ -397,379 +387,3 @@ it('reports a dispatched terminal with a lost answer as uncertain, preserving it
   })
   expect(rig.store.getSessionTabId(id)).toBe('source-chat')
 })
-
-it.each([
-  { navigate: false, viewerSelection: undefined },
-  { navigate: true, viewerSelection: undefined },
-  { navigate: false, viewerSelection: 'selection-v1:initiating-viewer' }
-])(
-  'captures selection before native Stop and consumes it at the ordinary terminal snapshot: $navigate/$viewerSelection',
-  async ({ navigate, viewerSelection }) => {
-    const { runtime, bindPty, handleOf, session } = setupMainOwnedWorkspace()
-    Object.assign(runtime, {
-      resolveTerminalWorkspaceLaunchScope: async () => ({
-        id: WORKTREE_ID,
-        path: rig.root,
-        connectionId: null,
-        repo: null,
-        folderWorkspace: null
-      })
-    })
-    await runtime.publishStructuredAgentSessionTab({
-      workspaceId: WORKTREE_ID,
-      sessionId: id,
-      agent: 'codex',
-      activate: true,
-      check: () => {}
-    })
-    const other = createTestParams()
-    expect(
-      await rig.host.create(caller, {
-        ...other,
-        envelope: { ...other.envelope, sessionId: 'newer-navigation' },
-        location: { ...other.location, workspaceId: WORKTREE_ID }
-      })
-    ).toMatchObject({ ok: true })
-    await runtime.publishStructuredAgentSessionTab({
-      workspaceId: WORKTREE_ID,
-      sessionId: 'newer-navigation',
-      agent: 'codex',
-      activate: false
-    })
-    await rig.host.switchToChat(id)
-    const nativeIdentity = agentSessionProviderHandleChainHead(
-      rig.store.getRecord(id)!.providerHandleChain
-    )!.handle
-    const stopping = Promise.withResolvers<void>()
-    const stopped = Promise.withResolvers<void>()
-    const close = rig.adapter.closeSession.getMockImplementation()!
-    rig.adapter.closeSession.mockImplementation(async (...args) => {
-      stopping.resolve()
-      await stopped.promise
-      return close(...args)
-    })
-    const receiverExit = Promise.withResolvers<void>()
-    releaseReceiverExit = () => receiverExit.resolve()
-    let ordinaryCreates = 0
-    const stopForSwitch = vi.spyOn(rig.host, 'stopForSwitch')
-    const spawn = vi
-      .spyOn(runtime, 'createTerminal')
-      .mockImplementation(async (_selector, opts = {}) => {
-        ordinaryCreates += 1
-        if (!opts.tabId || !opts.leafId) {
-          throw new Error('missing ordinary published pane')
-        }
-        if (!navigate && !viewerSelection && ordinaryCreates === 1) {
-          void rig.host.trackSwitchPhysical(id, receiverExit.promise)
-        }
-        opts.beforePtySpawn?.()
-        opts.onPtySpawnDispatched?.({
-          tabId: opts.tabId,
-          leafId: opts.leafId,
-          launchAgent: 'codex',
-          ...(opts.launchConfig ? { launchConfig: opts.launchConfig } : {})
-        })
-        const ptyId = ordinaryCreates === 1 ? 'switch-destination' : 'switch-destination-next'
-        bindPty({
-          worktreeId: WORKTREE_ID,
-          tabId: opts.tabId,
-          leafId: opts.leafId,
-          ptyId
-        })
-        runtime.registerPty(ptyId, WORKTREE_ID, null, {
-          tabId: opts.tabId,
-          leafId: opts.leafId,
-          terminalHandle: opts.preAllocatedHandle
-        })
-        return {
-          handle: handleOf(ptyId),
-          ptyId,
-          tabId: opts.tabId,
-          paneKey: `${opts.tabId}:${opts.leafId}`,
-          worktreeId: WORKTREE_ID,
-          title: null,
-          surface: 'background'
-        }
-      })
-    const operation = executeStructuredSessionSwitch(
-      {
-        sessionId: id,
-        execution: {
-          invocationId: 'ordinary-native-stop',
-          sourceTabId: `agent-session:${id}`,
-          ...(viewerSelection ? { viewerSelection } : {})
-        }
-      },
-      { runtime },
-      'terminal'
-    )
-    await Promise.race([
-      stopping.promise,
-      operation.then((answer) => {
-        throw new Error(JSON.stringify(answer))
-      })
-    ])
-    expect(spawn).not.toHaveBeenCalled()
-    runtime.projectStructuredAgentSessionTab({
-      workspaceId: 'another-workspace',
-      sessionId: 'automatic-publication',
-      agent: 'codex',
-      activate: true
-    })
-    if (navigate) {
-      const picked = await runtime.activateMobileSessionTab(
-        `id:${WORKTREE_ID}`,
-        'agent-session:newer-navigation',
-        undefined,
-        { navigation: 'all', intent: 'user', clientNavigationId: 'host-follow-viewer' }
-      )
-      expect(picked.activeTabId).toBe('agent-session:newer-navigation')
-    }
-    const outstanding =
-      !navigate && !viewerSelection
-        ? executeStructuredSessionSwitch(
-            {
-              sessionId: id,
-              execution: {
-                invocationId: 'outstanding-duplicate',
-                sourceTabId: `agent-session:${id}`
-              }
-            },
-            { runtime },
-            'terminal'
-          )
-        : undefined
-    const replay =
-      !navigate && !viewerSelection
-        ? executeStructuredSessionSwitch(
-            {
-              sessionId: id,
-              execution: {
-                invocationId: 'ordinary-native-stop',
-                sourceTabId: `agent-session:${id}`
-              }
-            },
-            { runtime },
-            'terminal'
-          )
-        : undefined
-    stopped.resolve()
-    const answer = await operation
-    if (outstanding) {
-      expect(await outstanding).toEqual(answer)
-    }
-    if (replay) {
-      expect(await replay).toEqual(answer)
-    }
-    expect(answer).toMatchObject({ status: 'completed' })
-    expect(spawn).toHaveBeenCalledOnce()
-    expect(spawn.mock.calls[0]![1]!.presentation).toBe('background')
-    expect(spawn.mock.calls[0]![1]!.agentLaunchViewer?.()).toBe('none')
-    const snapshot = await runtime.listMobileSessionTabs(
-      `id:${WORKTREE_ID}`,
-      navigate ? 'host-follow-viewer' : undefined
-    )
-    if (viewerSelection) {
-      expect(
-        snapshot.tabs.find(
-          (tab): tab is RuntimeMobileSessionTerminalClientTab =>
-            tab.type === 'terminal' && tab.ptyId === 'switch-destination'
-        )?.openPlacement
-      ).toMatchObject({
-        activate: true,
-        viewerSelection
-      })
-    }
-    expect(snapshot.activeTabId).toBe(
-      navigate
-        ? 'agent-session:newer-navigation'
-        : viewerSelection
-          ? `agent-session:${id}`
-          : `${spawn.mock.calls[0]![1]!.tabId}::${spawn.mock.calls[0]![1]!.leafId}`
-    )
-    if (!navigate && !viewerSelection) {
-      const request = (invocationId: string) =>
-        executeStructuredSessionSwitch(
-          {
-            sessionId: id,
-            execution: { invocationId, sourceTabId: `agent-session:${id}` }
-          },
-          { runtime },
-          'terminal'
-        )
-      if (answer.status !== 'completed' || !answer.terminal) {
-        receiverExit.resolve()
-        throw new Error('missing completed destination')
-      }
-      const picked = await runtime.activateMobileSessionTab(
-        `id:${WORKTREE_ID}`,
-        'agent-session:newer-navigation',
-        undefined,
-        { navigation: 'all', intent: 'user', clientNavigationId: 'host-follow-viewer' }
-      )
-      expect(picked.activeTabId).toBe('agent-session:newer-navigation')
-      const projection = vi.spyOn(mobileProjection, 'projectRuntimeMobileSessionTabs')
-      expect(await request('ordinary-native-stop')).toEqual(answer)
-      expect(await request('already-published-physical-join')).toEqual(answer)
-      expect(projection).not.toHaveBeenCalled()
-      expect(
-        (await runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`, 'host-follow-viewer')).activeTabId
-      ).toBe('agent-session:newer-navigation')
-      expect(spawn).toHaveBeenCalledOnce()
-      expect(stopForSwitch).toHaveBeenCalledOnce()
-      try {
-        expect(rig.host.switchExecuting(id)).toBe(true)
-        await runtime.closeMobileSessionTab(`id:${WORKTREE_ID}`, answer.terminal, {
-          reason: 'user'
-        })
-        expect(runtime.currentSessionSwitchDestination(WORKTREE_ID, answer)).toBe(false)
-        expect(await request('missing-but-physically-unsettled')).toEqual(answer)
-        expect(spawn).toHaveBeenCalledOnce()
-        expect(stopForSwitch).toHaveBeenCalledOnce()
-      } finally {
-        receiverExit.resolve()
-      }
-      await vi.waitFor(() => expect(rig.host.switchExecuting(id)).toBe(false))
-      const unknown = vi
-        .spyOn(runtime, 'currentSessionSwitchDestination')
-        .mockReturnValue(undefined)
-      expect(await request('unknown-destination')).toMatchObject({
-        status: 'refused',
-        refusal: { code: 'agent_session_ownership_unknown' }
-      })
-      expect(spawn).toHaveBeenCalledOnce()
-      expect(await request('ordinary-native-stop')).toEqual(answer)
-      expect(unknown).toHaveBeenCalledOnce()
-      unknown.mockRestore()
-      expect(spawn).toHaveBeenCalledOnce()
-      expect(stopForSwitch).toHaveBeenCalledOnce()
-      const replacement = await request('fresh-history-after-close')
-      expect(replacement).toMatchObject({ status: 'completed', sessionId: id })
-      expect(replacement).not.toMatchObject({ terminal: answer.terminal })
-      expect(spawn).toHaveBeenCalledTimes(2)
-      expect(runtime.currentSessionSwitchDestination(WORKTREE_ID, replacement)).toBe(true)
-      await vi.waitFor(() => expect(rig.host.switchExecuting(id)).toBe(false))
-      await runtime.activateMobileSessionTab(
-        `id:${WORKTREE_ID}`,
-        'agent-session:newer-navigation',
-        undefined,
-        { navigation: 'all', intent: 'user', clientNavigationId: 'host-follow-viewer' }
-      )
-      expect(await request('surviving-destination')).toEqual(replacement)
-      expect(
-        (await runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`, 'host-follow-viewer')).activeTabId
-      ).toBe('agent-session:newer-navigation')
-      expect(spawn).toHaveBeenCalledTimes(2)
-      expect(stopForSwitch).toHaveBeenCalledTimes(2)
-      expect(
-        agentSessionProviderHandleChainHead(rig.store.getRecord(id)!.providerHandleChain)!.handle
-      ).toEqual(nativeIdentity)
-      expect(rig.adapter.dispatch).not.toHaveBeenCalled()
-      if (replacement.status !== 'completed' || !replacement.terminal) {
-        throw new Error('missing completed replacement')
-      }
-      const destinationId = replacement.terminal
-      for (const size of [10, 100]) {
-        for (
-          let index = runtime.mobileSessionTabsByWorktree.get(WORKTREE_ID)!.tabs.length;
-          index < size;
-          index += 1
-        ) {
-          const sessionId = `inventory-${index}`
-          expect(
-            await runtime.applyLayoutCommand({
-              type: 'openAgentSessionTab',
-              workspace: WORKTREE_ID,
-              sessionId,
-              agent: 'codex',
-              tabId: `agent-session:${sessionId}`
-            })
-          ).toMatchObject({ ok: true })
-          runtime.projectStructuredAgentSessionTab({
-            workspaceId: WORKTREE_ID,
-            sessionId,
-            agent: 'codex',
-            activate: false
-          })
-          runtime.projectStructuredAgentSessionTab({
-            workspaceId: 'repo-1::/inventory-elsewhere',
-            sessionId,
-            agent: 'codex',
-            activate: false
-          })
-        }
-        const held = runtime.mobileSessionTabsByWorktree.get(WORKTREE_ID)!
-        const unrelated = runtime.mobileSessionTabsByWorktree.get('repo-1::/inventory-elsewhere')!
-        const rows = held.tabs
-        const otherRows = unrelated.tabs
-        const saved = session().unifiedTabs![WORKTREE_ID]!
-        const destination = rows.find((tab) => tab.type === 'terminal' && tab.id === destinationId)
-        if (!destination) {
-          throw new Error('missing completed destination')
-        }
-        const counts = { rows: 0, identity: 0, decorations: 0, saved: 0, unrelated: 0 }
-        held.tabs = new Proxy(
-          [...rows.filter((tab) => tab !== destination), destination].map(
-            (tab) =>
-              new Proxy(tab, {
-                get(target, key, receiver) {
-                  if (key === 'type' || key === 'id' || key === 'sessionId') {
-                    counts.identity += 1
-                  } else if (typeof key === 'string') {
-                    counts.decorations += 1
-                  }
-                  // oxlint-disable-next-line anti-slop/no-reflect-get -- Proxy get trap forwards raw string|symbol keys with the original receiver.
-                  return Reflect.get(target, key, receiver)
-                }
-              })
-          ),
-          {
-            get(target, key, receiver) {
-              if (typeof key === 'string' && /^\d+$/.test(key)) {
-                counts.rows += 1
-              }
-              // oxlint-disable-next-line anti-slop/no-reflect-get -- Proxy get trap forwards raw string|symbol keys with the original receiver.
-              return Reflect.get(target, key, receiver)
-            }
-          }
-        )
-        session().unifiedTabs![WORKTREE_ID] = new Proxy(saved, {
-          get(target, key, receiver) {
-            if (typeof key === 'string' && /^\d+$/.test(key)) {
-              counts.saved += 1
-            }
-            // oxlint-disable-next-line anti-slop/no-reflect-get -- Proxy get trap forwards raw string|symbol keys with the original receiver.
-            return Reflect.get(target, key, receiver)
-          }
-        })
-        unrelated.tabs = new Proxy(otherRows, {
-          get(target, key, receiver) {
-            if (typeof key === 'string' && /^\d+$/.test(key)) {
-              counts.unrelated += 1
-            }
-            // oxlint-disable-next-line anti-slop/no-reflect-get -- Proxy get trap forwards raw string|symbol keys with the original receiver.
-            return Reflect.get(target, key, receiver)
-          }
-        })
-        try {
-          projection.mockClear()
-          expect(await request('fresh-history-after-close')).toEqual(replacement)
-          expect(counts).toEqual({ rows: 0, identity: 0, decorations: 0, saved: 0, unrelated: 0 })
-          expect(await request(`scale-completed-${size}`)).toEqual(replacement)
-          expect(counts.rows).toBe(size)
-          expect(counts.rows + counts.identity).toBeLessThanOrEqual(3 * size)
-          expect({
-            decorations: counts.decorations,
-            saved: counts.saved,
-            unrelated: counts.unrelated
-          }).toEqual({ decorations: 0, saved: 0, unrelated: 0 })
-          expect(projection).not.toHaveBeenCalled()
-        } finally {
-          held.tabs = rows
-          session().unifiedTabs![WORKTREE_ID] = saved
-          unrelated.tabs = otherRows
-        }
-      }
-    }
-  }
-)
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
index 93169325d10c..44c1bbdc604a 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
@@ -1,4 +1,3 @@
-import { retainStructuredSwitchSource } from './structured-agent-session-switch-retention'
 import { structuredSessionSwitchFailure } from './structured-agent-session-switch-failure'
 import {
   captureStructuredSwitchWorkCheck,
@@ -10,6 +9,7 @@ import type { RpcContext } from '../core'
 import type { SwitchToChatParams, SwitchToTerminalParams } from './structured-agent-session-schemas'
 import {
   agentSessionSwitchDeadline,
+  type AgentSessionSwitchDeadline,
   type AgentSessionSwitchResult
 } from '../../../../shared/agent-session-switch-execution'
 import {
@@ -37,6 +37,15 @@ import { interruptWorkingAgent } from '../../terminal-agent-interrupt'
 import { mainAgentState } from '../../../../shared/main-agent-status'
 import { captureSwitchStoppedCliTurn } from '../../../native-chat/agent-session-wire/structured-agent-session-switch-import'
 import { worktreeIdsEqual } from '../../../../shared/worktree/id'
+import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
+
+type Prepared = Awaited<ReturnType<typeof prepareStructuredSessionSwitch>>
+
+/**
+ * One switch, both directions: stop the exact source with proof, prepare the destination at
+ * rest with no tab, then one layout replace. A failure before the replace leaves the source tab
+ * untouched with its agent stopped; nothing was shown that could need withdrawing.
+ */
 export async function executeStructuredSessionSwitch(
   params: z.infer<typeof SwitchToChatParams> | z.infer<typeof SwitchToTerminalParams>,
   ctx: RpcContext,
@@ -44,23 +53,10 @@ export async function executeStructuredSessionSwitch(
 ): Promise<AgentSessionSwitchResult> {
   const deadline = agentSessionSwitchDeadline()
   let sessionId = params.sessionId
-  const selectionCurrent = ctx.runtime.captureSessionSwitchSelection(
-    undefined,
-    params.execution?.viewerSelection,
-    true
-  )
   let commandOwned = false
   const operation = (async (): Promise<AgentSessionSwitchResult> => {
     const prepared = await prepareStructuredSessionSwitch(params, ctx, sessionId, deadline)
-    const {
-      host,
-      execution,
-      create,
-      sourceEvidence,
-      createIdentity,
-      providerSessionId,
-      conversation
-    } = prepared
+    const { host, execution, create, conversation } = prepared
     sessionId = prepared.sessionId
     commandOwned = true
     return host.runSwitch(
@@ -76,188 +72,15 @@ export async function executeStructuredSessionSwitch(
             ctx,
             host,
             sessionId,
-            deadline,
-            execution,
-            selectionCurrent
+            deadline
           )
         }
-        deadline.check()
-        const source = 'source' in execution ? execution.source : undefined
-        const close = source
-          ? captureStructuredSwitchTerminalSource(
-              ctx.runtime,
-              host,
-              sessionId,
-              direction,
-              source.terminal,
-              source.expectedIncarnationId,
-              source.originalPresentation
-            )
-          : undefined
-        const paneKey = close ? `${close.source.tabId}:${close.source.leafId}` : undefined
-        const row = paneKey ? ctx.runtime.agentTransitions.latestRow(paneKey) : null
-        const adopt = createIdentity?.adopt
-        const retainedSource =
-          !adopt && source
-            ? await prepareStructuredChatCliTranscript(
-                await resolveStructuredChatCliSource(
-                  { sessionId, workspaceId: recordWorkspace(host, sessionId) },
-                  false
-                ),
-                (args) => ctx.runtime.prepareAiVaultSessionResume(args),
-                false
-              )
-            : undefined
-        const before = adopt?.transcriptPath
-          ? {
-              agent: create!.agent,
-              sessionId: adopt.providerHandle.nativeId,
-              filePath: adopt.transcriptPath,
-              source: adopt.source
-            }
-          : retainedSource?.cliForkSource
-        const stopped = before
-          ? await captureSwitchStoppedCliTurn(
-              before,
-              Boolean(row && mainAgentState(row) === 'working'),
-              deadline
-            )
-          : undefined
-        deadline.check()
-        if (close) {
-          if (paneKey) {
-            await interruptWorkingAgent(
-              ctx.runtime,
-              (key) => ctx.runtime.agentTransitions.latestRow(key),
-              paneKey,
-              {
-                signal: deadline.signal,
-                beforeWrite: async () => {
-                  deadline.check()
-                }
-              }
-            )
-          }
-          // Shutdown already accepted must finish even when the observing request expires.
-          try {
-            await host.trackSwitchPhysical(sessionId, close.stop())
-          } catch {
-            host.deps.logger.warn('switch source exit was not confirmed', {
-              scope: 'session-switch',
-              sessionId,
-              direction,
-              source: 'terminal',
-              exactIncarnation: true
-            })
-            throw agentSessionRefusalError('agent_session_ownership_unknown', {
-              reason: 'ownerUnproven'
-            })
-          }
-        }
-        deadline.check()
-        if (create) {
-          try {
-            const preparedCreate = await prepareStructuredAgentSessionCreateForWorktree({
-              ...create,
-              runtime: ctx.runtime,
-              caller: structuredCallerFor(ctx),
-              atRest: true,
-              ensureHost: async () => host,
-              structuredAgentCliSourceEvidence: sourceEvidence
-            })
-            deadline.check()
-            const created = await commitStructuredAgentSessionCreate({
-              runtime: ctx.runtime,
-              caller: structuredCallerFor(ctx),
-              prepared: { ...preparedCreate, tab: null },
-              activate: false,
-              check: deadline.check
-            })
-            if (!created.ok) {
-              throw new AgentSessionRefusalError(created.refusal)
-            }
-            sessionId = created.value.sessionId
-          } catch (error) {
-            sessionId = resolveStructuredSwitchRetainedOwner(
-              error,
-              host,
-              createIdentity,
-              providerSessionId
-            )
-          }
-          await host.adoptSwitch(conversation?.commandKey ?? params.sessionId, sessionId)
-        }
-        const record = requireStructuredSwitchRecord(host, sessionId)
-        const check = captureStructuredSwitchWorkCheck(host, sessionId, deadline, direction)
-        if (
-          source ||
-          nativeConversationContent(await host.journalSnapshot(sessionId)) === 'saved'
-        ) {
-          const transcript = await prepareStructuredChatCliTranscript(
-            await resolveStructuredChatCliSource(
-              { sessionId, workspaceId: record.location.workspaceId },
-              false
-            ),
-            (args) => ctx.runtime.prepareAiVaultSessionResume(args),
-            false
-          )
-          check()
-          if (!transcript.cliForkSource) {
-            throw agentSessionRefusalError('agent_session_identity_required', {
-              reason: 'transcriptUnreadable'
-            })
-          }
-          await host.refreshSwitchTranscript(
-            sessionId,
-            transcript.cliForkSource,
-            deadline,
-            stopped,
-            check
-          )
-        }
-        const revealed = await host.revealSession(sessionId)
-        check()
-        if (!revealed.readable && revealed.openRefusal) {
-          throw new AgentSessionRefusalError(revealed.openRefusal)
-        }
-        const replaceSource =
-          close && worktreeIdsEqual(close.source.worktreeId, record.location.workspaceId)
-        const placement =
-          (replaceSource ? close.placement() : close ? undefined : create?.tabPlacement) ?? {}
-        await ctx.runtime.publishStructuredAgentSessionTab({
-          ...revealed,
-          activate: true,
-          check,
-          selectionCurrent,
-          viewerSelection: execution.viewerSelection,
-          focusWindow: agentLaunchMovesHostWindow(ctx),
-          placement,
-          openPlacement: {
-            invocationId: execution.invocationId,
-            generation: host.switchGeneration(sessionId)!,
-            placement,
-            activate: true,
-            viewerSelection: execution.viewerSelection,
-            ...(replaceSource ? { source: close.source } : {})
-          }
-        })
-        deadline.check()
-        if (replaceSource) {
-          await close.retire()
-        }
-        deadline.check()
-        // Publication is complete; a first new send may already own the ordinary start.
-        const starting = await host.openSwitchToChat(sessionId, deadline)
-        if (starting.owned) {
-          void host.trackSwitchPhysical(sessionId, starting.outcome).catch(() => {})
-        } else {
-          void starting.outcome.catch(() => {})
-        }
-        return { status: 'completed', sessionId }
+        const result = await switchToChat(params, ctx, prepared, sessionId, deadline)
+        sessionId = result.sessionId
+        return result
       },
       {
         direction,
-        onAccepted: selectionCurrent.accept,
         conversationKey: conversation?.commandKey,
         allowUncreated: Boolean(create),
         destinationCurrent: (result) => {
@@ -265,18 +88,7 @@ export async function executeStructuredSessionSwitch(
           return record
             ? ctx.runtime.currentSessionSwitchDestination(record.location.workspaceId, result)
             : undefined
-        },
-        onRetained:
-          direction === 'terminal'
-            ? (check) =>
-                retainStructuredSwitchSource(
-                  ctx.runtime,
-                  host,
-                  sessionId,
-                  execution.invocationId,
-                  check
-                )
-            : undefined
+        }
       }
     )
   })()
@@ -293,3 +105,175 @@ export async function executeStructuredSessionSwitch(
     return structuredSessionSwitchFailure(error, sessionId)
   }
 }
+
+async function switchToChat(
+  params: z.infer<typeof SwitchToChatParams> | z.infer<typeof SwitchToTerminalParams>,
+  ctx: RpcContext,
+  prepared: Prepared,
+  sessionId: string,
+  deadline: AgentSessionSwitchDeadline
+): Promise<AgentSessionSwitchResult> {
+  const {
+    host,
+    execution,
+    create,
+    sourceEvidence,
+    createIdentity,
+    providerSessionId,
+    conversation
+  } = prepared
+  deadline.check()
+  const source = 'source' in execution ? execution.source : undefined
+  const close = source
+    ? captureStructuredSwitchTerminalSource(
+        ctx.runtime,
+        host,
+        sessionId,
+        'chat',
+        source.terminal,
+        source.expectedIncarnationId,
+        source.originalPresentation
+      )
+    : undefined
+  const paneKey = close ? `${close.source.tabId}:${close.source.leafId}` : undefined
+  const row = paneKey ? ctx.runtime.agentTransitions.latestRow(paneKey) : null
+  const adopt = createIdentity?.adopt
+  const retainedSource =
+    !adopt && source
+      ? await prepareStructuredChatCliTranscript(
+          await resolveStructuredChatCliSource(
+            { sessionId, workspaceId: recordWorkspace(host, sessionId) },
+            false
+          ),
+          (args) => ctx.runtime.prepareAiVaultSessionResume(args),
+          false
+        )
+      : undefined
+  const before = adopt?.transcriptPath
+    ? {
+        agent: create!.agent,
+        sessionId: adopt.providerHandle.nativeId,
+        filePath: adopt.transcriptPath,
+        source: adopt.source
+      }
+    : retainedSource?.cliForkSource
+  const stopped = before
+    ? await captureSwitchStoppedCliTurn(
+        before,
+        Boolean(row && mainAgentState(row) === 'working'),
+        deadline
+      )
+    : undefined
+  deadline.check()
+  if (close && paneKey) {
+    await interruptWorkingAgent(
+      ctx.runtime,
+      (key) => ctx.runtime.agentTransitions.latestRow(key),
+      paneKey,
+      { signal: deadline.signal, beforeWrite: async () => deadline.check() }
+    )
+    // Shutdown already accepted must finish even when the observing request expires.
+    try {
+      await host.trackSwitchPhysical(sessionId, close.stop())
+    } catch {
+      host.deps.logger.warn('switch source exit was not confirmed', {
+        scope: 'session-switch',
+        sessionId,
+        direction: 'chat',
+        source: 'terminal',
+        exactIncarnation: true
+      })
+      throw agentSessionRefusalError('agent_session_ownership_unknown', { reason: 'ownerUnproven' })
+    }
+  }
+  deadline.check()
+  if (create) {
+    try {
+      const preparedCreate = await prepareStructuredAgentSessionCreateForWorktree({
+        ...create,
+        runtime: ctx.runtime,
+        caller: structuredCallerFor(ctx),
+        atRest: true,
+        ensureHost: async () => host,
+        structuredAgentCliSourceEvidence: sourceEvidence
+      })
+      deadline.check()
+      const created = await commitStructuredAgentSessionCreate({
+        runtime: ctx.runtime,
+        caller: structuredCallerFor(ctx),
+        prepared: { ...preparedCreate, tab: null },
+        activate: false,
+        check: deadline.check
+      })
+      if (!created.ok) {
+        throw new AgentSessionRefusalError(created.refusal)
+      }
+      sessionId = created.value.sessionId
+    } catch (error) {
+      sessionId = resolveStructuredSwitchRetainedOwner(
+        error,
+        host,
+        createIdentity,
+        providerSessionId
+      )
+    }
+    await host.adoptSwitch(conversation?.commandKey ?? params.sessionId, sessionId)
+  }
+  const record = requireStructuredSwitchRecord(host, sessionId)
+  const check = captureStructuredSwitchWorkCheck(host, sessionId, deadline, 'chat')
+  if (source || nativeConversationContent(await host.journalSnapshot(sessionId)) === 'saved') {
+    const transcript = await prepareStructuredChatCliTranscript(
+      await resolveStructuredChatCliSource(
+        { sessionId, workspaceId: record.location.workspaceId },
+        false
+      ),
+      (args) => ctx.runtime.prepareAiVaultSessionResume(args),
+      false
+    )
+    check()
+    if (!transcript.cliForkSource) {
+      throw agentSessionRefusalError('agent_session_identity_required', {
+        reason: 'transcriptUnreadable'
+      })
+    }
+    await host.refreshSwitchTranscript(
+      sessionId,
+      transcript.cliForkSource,
+      deadline,
+      stopped,
+      check
+    )
+  }
+  const revealed = await host.revealSession(sessionId)
+  check()
+  if (!revealed.readable && revealed.openRefusal) {
+    throw new AgentSessionRefusalError(revealed.openRefusal)
+  }
+  // The one layout write: the chat takes the terminal tab's slot. A split sibling keeps the tab,
+  // so the chat opens beside it; a source in another workspace keeps its tab untouched.
+  const sameWorkspace =
+    close !== undefined && worktreeIdsEqual(close.source.worktreeId, record.location.workspaceId)
+  const replaces = sameWorkspace && close.wholeTab() ? close.source.tabId : undefined
+  await ctx.runtime.publishStructuredAgentSessionTab({
+    ...revealed,
+    activate: true,
+    check,
+    focusWindow: agentLaunchMovesHostWindow(ctx),
+    ...(replaces ? { replaces } : sameWorkspace ? { placement: close.placement() } : {})
+  })
+  deadline.check()
+  if (sameWorkspace) {
+    // Whole tab: the replace closed it in main's model, the window closes its own. Split pane: the
+    // window retired it on exit, main's model closes it here.
+    await close.retire(replaces ? ORCA_LAYOUT_OWNER_IS_MAIN : !ORCA_LAYOUT_OWNER_IS_MAIN)
+  }
+  deadline.check()
+  // Publication is complete; a first new send may already own the ordinary start.
+  const starting = await host.openSwitchToChat(sessionId, deadline)
+  if (starting.owned) {
+    void host.trackSwitchPhysical(sessionId, starting.outcome).catch(() => {})
+  } else {
+    void starting.outcome.catch(() => {})
+  }
+  return { status: 'completed', sessionId }
+}
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-retention.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-retention.ts
deleted file mode 100644
index be4da359ad14..000000000000
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-retention.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import type { RpcContext } from '../core'
-import { recordWorkspace } from './structured-agent-session-switch-source'
-import type { StructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-host'
-export async function retainStructuredSwitchSource(
-  runtime: RpcContext['runtime'],
-  host: StructuredAgentSessionHost,
-  sessionId: string,
-  invocationId: string,
-  check: () => void
-): Promise<void> {
-  if (!host.deps.store.getRecord(sessionId)) {
-    return
-  }
-  check()
-  const revealed = await host.revealSession(sessionId)
-  check()
-  await runtime.publishStructuredAgentSessionTab({
-    ...revealed,
-    activate: false,
-    check
-  })
-  runtime.retainSessionSwitchProjection(
-    recordWorkspace(host, sessionId),
-    sessionId,
-    invocationId,
-    host.switchGeneration(sessionId) ?? invocationId
-  )
-}
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts
index 70a3bf534d17..ea05479b4c6f 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts
@@ -3,10 +3,10 @@ import type { AgentSessionRecord } from '../../../../shared/agent-session-record
 import type { StructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-host'
 import type { z } from 'zod'
 import type { RpcContext } from '../core'
-import { agentLaunchTabViewerRule } from './agent-launch-tab-publication'
+import { agentLaunchMovesHostWindow } from './agent-launch-tab-publication'
 import { SwitchToTerminalParams } from './structured-agent-session-schemas'
 import type {
-  agentSessionSwitchDeadline,
+  AgentSessionSwitchDeadline,
   AgentSessionSwitchResult
 } from '../../../../shared/agent-session-switch-execution'
 import { agentSessionRefusalError } from '../../../../shared/agent-session-wire-refusals'
@@ -16,15 +16,14 @@ import {
   resolveStructuredChatCliSource
 } from '../../../ai-vault/structured-chat-cli-fork'
 
+/** Stop the chat with proof, spawn the terminal parked, then one layout replace into the chat's slot. */
 export async function executeStructuredSessionTerminalSwitch(
   params: z.infer<typeof SwitchToTerminalParams>,
   record: AgentSessionRecord,
   ctx: RpcContext,
   host: StructuredAgentSessionHost,
   sessionId: string,
-  deadline: ReturnType<typeof agentSessionSwitchDeadline>,
-  execution: NonNullable<z.infer<typeof SwitchToTerminalParams>['execution']>,
-  selectionCurrent: (consume?: boolean) => boolean
+  deadline: AgentSessionSwitchDeadline
 ): Promise<AgentSessionSwitchResult> {
   const agent = record.provider
   if (!isTuiAgent(agent)) {
@@ -32,32 +31,23 @@ export async function executeStructuredSessionTerminalSwitch(
       reason: 'hostUnsupported'
     })
   }
-  const terminalExecution = SwitchToTerminalParams.parse(params).execution
-  const sourceTabId = terminalExecution?.sourceTabId
-  let workCurrent = () => false
-  const retire = ctx.runtime.captureSessionSwitchRetirement(
-    record.location.workspaceId,
-    sessionId,
-    sourceTabId,
-    () => workCurrent(),
-    () => host.retainSwitch(sessionId),
-    {
-      invocationId: execution.invocationId,
-      generation: host.switchGeneration(sessionId)!,
-      sessionId,
-      tabId: sourceTabId ?? `agent-session:${sessionId}`,
-      phase: 'prepare'
-    }
-  )
-  workCurrent = await host.stopForSwitch(
+  const execution = SwitchToTerminalParams.parse(params).execution
+  const workCurrent = await host.stopForSwitch(
     sessionId,
     { callerKey: 'trusted-local:session-switch' },
     deadline
   )
   host.guardSwitchWork(sessionId, workCurrent)
-  const snapshot = await host.journalSnapshot(sessionId)
-  deadline.check()
-  const content = nativeConversationContent(snapshot)
+  const check = () => {
+    deadline.check()
+    if (!workCurrent()) {
+      throw agentSessionRefusalError('agent_session_operation_invalid', {
+        reason: 'messagesUnsettled'
+      })
+    }
+  }
+  const content = nativeConversationContent(await host.journalSnapshot(sessionId))
+  check()
   if (content === 'uncertain') {
     throw agentSessionRefusalError('agent_session_operation_invalid', {
       reason: 'messagesUnsettled'
@@ -74,74 +64,37 @@ export async function executeStructuredSessionTerminalSwitch(
           false
         )
       : undefined
-  deadline.check()
+  check()
   if (content === 'saved' && !prepared?.cliForkSource) {
     throw agentSessionRefusalError('agent_session_identity_required', {
       reason: 'transcriptNotFound'
     })
   }
-  deadline.check()
-  const placement = retire.placement() ?? {
-    afterTabId: sourceTabId,
-    groupId: terminalExecution?.groupId
-  }
-  const terminal = await ctx.runtime.createSessionSwitchTerminal(record.location.workspaceId, {
-    invocationId: execution.invocationId,
+  // Parked: bound to a pane no layout shows yet. A lost reply is answered by re-issuing this same
+  // create, which adopts the running terminal through the conversation's claim.
+  const terminal = await host.trackSwitchPhysical(
     sessionId,
-    agent,
-    source: prepared?.cliForkSource,
-    commandOverride: terminalExecution?.commandOverride,
-    options: record.options,
-    afterTabId: sourceTabId,
-    groupId: terminalExecution?.groupId,
-    execution: {
-      invocationId: execution.invocationId,
-      openPlacement: {
-        invocationId: execution.invocationId,
-        generation: host.switchGeneration(sessionId)!,
-        placement,
-        activate: true,
-        viewerSelection: execution.viewerSelection
-      },
-      signal: deadline.signal,
-      trackPhysical: (work, recover) => host.trackSwitchPhysical(sessionId, work, recover),
-      remaining: deadline.remaining,
-      check: () => {
-        deadline.check()
-        if (!workCurrent()) {
-          throw agentSessionRefusalError('agent_session_operation_invalid', {
-            reason: 'messagesUnsettled'
-          })
-        }
-      },
-      selectionCurrent,
-      viewerSelection: execution.viewerSelection,
-      viewer: agentLaunchTabViewerRule(ctx, 'focused')
-    }
+    ctx.runtime.spawnSwitchTerminal(record.location.workspaceId, {
+      agent,
+      source: prepared?.cliForkSource,
+      commandOverride: execution?.commandOverride,
+      options: record.options,
+      signal: deadline.signal
+    })
+  )
+  check()
+  const placed = await ctx.runtime.placeSwitchTerminal(record.location.workspaceId, {
+    terminal,
+    chatSessionId: sessionId,
+    windowTabId: execution?.sourceTabId,
+    activate: true,
+    focusWindow: agentLaunchMovesHostWindow(ctx)
   })
-  if (terminal.agentResumeRefused || terminal.agentResumeUnavailable) {
-    return {
-      status: 'refused',
-      sessionId,
-      refusal: agentSessionRefusalError('agent_session_operation_unknown', {
-        reason: 'outcomeUnknown'
-      }).refusal
-    }
-  }
-  if (terminal.switchOutcomeUnknown) {
-    return {
-      status: 'uncertain',
-      sessionId,
-      refusal: agentSessionRefusalError('agent_session_operation_unknown', {
-        reason: 'outcomeUnknown'
-      }).refusal
-    }
-  }
-  const retired = await retire()
+  await host.setSessionTabVisibility(sessionId, false)
   return {
     status: 'completed',
     sessionId,
-    terminal: terminal.tab.id,
-    sourceRetained: Boolean(sourceTabId && !retired)
+    terminal: placed.tabId,
+    sourceRetained: !placed.replaced
   }
 }
diff --git a/src/main/runtime/runtime-mobile-session-projection.ts b/src/main/runtime/runtime-mobile-session-projection.ts
index af9847842c98..3d6cf075c2fd 100644
--- a/src/main/runtime/runtime-mobile-session-projection.ts
+++ b/src/main/runtime/runtime-mobile-session-projection.ts
@@ -284,7 +284,6 @@ export function projectRuntimeMobileSessionTabs(
       : {}
     tabs.push({
       type: 'terminal',
-      ...(tab.openPlacement ? { openPlacement: tab.openPlacement } : {}),
       id: tab.id,
       parentTabId: tab.parentTabId,
       leafId: tab.leafId,
diff --git a/src/main/runtime/runtime-mobile-session-result-finalization.ts b/src/main/runtime/runtime-mobile-session-result-finalization.ts
index fc8167245488..e35949780551 100644
--- a/src/main/runtime/runtime-mobile-session-result-finalization.ts
+++ b/src/main/runtime/runtime-mobile-session-result-finalization.ts
@@ -34,7 +34,6 @@ export function finalizeRuntimeMobileSessionTabsResult(
         null)
   return {
     worktree: snapshot.worktree,
-    ...(snapshot.switchProjections ? { switchProjections: snapshot.switchProjections } : {}),
     publicationEpoch: snapshot.publicationEpoch,
     snapshotVersion: snapshot.snapshotVersion,
     activeGroupId,
diff --git a/src/main/runtime/runtime-pane-admission.ts b/src/main/runtime/runtime-pane-admission.ts
index 68f973f588a7..e0633ad9e415 100644
--- a/src/main/runtime/runtime-pane-admission.ts
+++ b/src/main/runtime/runtime-pane-admission.ts
@@ -23,9 +23,6 @@ type Spawn = NonNullable<RuntimePtyController['spawn']>
 type PaneStartStatusSink = Pick<PaneStartStatuses, 'set' | 'clear'>
 /** Main-owned/keepOnFailure panes retain failed start status. Each start clears prior resume outcome; only resumesSleepingRecord publishes a new one. */
 export type PaneStartArgs = {
-  beforeAdmission?: () => void
-  beforeSpawn?: () => void
-  keepOnFailure?: boolean
   startStatus?: {
     sink: PaneStartStatusSink
     keepOnFailure: boolean
@@ -121,13 +118,9 @@ export async function withdrawAdmittedPane(
 export async function admitRuntimePane(
   store: RuntimeStore | null | undefined,
   admission: TerminalPaneAdmission,
-  hostId: string | undefined,
-  check?: () => void
+  hostId: string | undefined
 ): Promise<TerminalPaneAdmissionOutcome | undefined> {
-  const args: Parameters<NonNullable<RuntimeStore['admitTerminalPane']>> = check
-    ? [admission, hostId, check]
-    : [admission, hostId]
-  return store?.admitTerminalPane?.(...args)
+  return store?.admitTerminalPane?.(admission, hostId)
 }
 
 /** Admit before starting (design 4.1); withdraw failed newly admitted panes unless keepOnFailure retains the error surface. */
@@ -136,10 +129,9 @@ export async function startInAdmittedPane<T>(
   admission: TerminalPaneAdmission,
   hostId: string | undefined,
   start: (outcome: TerminalPaneAdmissionOutcome | undefined) => Promise<T>,
-  keepOnFailure = false,
-  check?: () => void
+  keepOnFailure = false
 ): Promise<{ outcome: TerminalPaneAdmissionOutcome | undefined; result: T }> {
-  const outcome = await admitRuntimePane(store, admission, hostId, check)
+  const outcome = await admitRuntimePane(store, admission, hostId)
   try {
     return { outcome, result: await start(outcome) }
   } catch (error) {
@@ -155,13 +147,7 @@ export async function startInAdmittedPane<T>(
 export async function spawnInAdmittedPane(
   store: RuntimeStore | null | undefined,
   controller: Pick<RuntimePtyController, 'spawn'>,
-  {
-    startStatus,
-    beforeAdmission,
-    beforeSpawn,
-    keepOnFailure,
-    ...args
-  }: AdmittedSpawnArgs & PaneStartArgs
+  { startStatus, ...args }: AdmittedSpawnArgs & PaneStartArgs
 ): ReturnType<Spawn> {
   const { groupId: _groupId, afterTabId: _afterTabId, ...spawnArgs } = args
   const paneKey = `${args.tabId}:${args.leafId}`
@@ -196,7 +182,6 @@ export async function spawnInAdmittedPane(
         admitted === 'tab_closed' ? 'tab_not_found' : 'terminal_split_source_not_found'
       )
     }
-    beforeSpawn?.()
     admittedAs = admitted
     // SAFETY: Callers require spawn; a lost capability during admission keeps the original failure.
     return controller.spawn!(spawnArgs)
@@ -210,8 +195,7 @@ export async function spawnInAdmittedPane(
           admissionFor(args),
           hostIdOf(args),
           start,
-          keepOnFailure || startStatus?.keepOnFailure,
-          beforeAdmission
+          startStatus?.keepOnFailure
         )
   } catch (error) {
     if (
@@ -242,10 +226,7 @@ export async function spawnInAdmittedPane(
   }
   startStatus?.sink.clear(paneKey)
   const { outcome, result } = run
-  const started =
-    result.switchRecoveredSurface ??
-    result.agentSessionEnsure?.owner.surface ??
-    result.stablePaneOwner
+  const started = result.agentSessionEnsure?.owner.surface ?? result.stablePaneOwner
   const elsewhere = started && (started.tabId !== args.tabId || started.leafId !== args.leafId)
   if (outcome === 'admitted' && elsewhere) {
     await withdrawRuntimePane(store, args)
diff --git a/src/main/runtime/runtime-terminal-contracts.ts b/src/main/runtime/runtime-terminal-contracts.ts
index 639fd0e621a8..efec4416a9b9 100644
--- a/src/main/runtime/runtime-terminal-contracts.ts
+++ b/src/main/runtime/runtime-terminal-contracts.ts
@@ -27,7 +27,6 @@ import type { TerminalInputKind } from '../../shared/terminal-input-kind'
 import type { RuntimePtyController } from './runtime-pty-controller-contract'
 import type { RuntimeAgentRowSnapshot } from './runtime-worktree-agent-rows'
 import type { WorkerTerminalHostScope } from '../../shared/worker-terminal-host-scope'
-import type { AgentSessionSwitchAuthority } from '../../shared/agent-session-switch-execution'
 
 export type TerminalCreateOptions = {
   command?: string
@@ -107,12 +106,10 @@ export type TerminalCreateOptions = {
   /** The user's own act (a CLI command, a paired client's create, a launch); without it a stopped WSL distro holds the start. */
   wslUserAct?: true
   signal?: AbortSignal
-  switchExecution?: AgentSessionSwitchAuthority
   /** Refuse (`worktree_terminals_sleeping`) instead of waking a worktree the host has put to sleep. */
   refuseSleptWorktree?: boolean
   onPtySpawnCommitted?: () => void
   /** Called before the spawn request leaves this process; a throw before it proves nothing spawned. */
-  beforePtySpawn?: () => void
   onPtySpawnDispatched?: (launch?: {
     tabId: string
     leafId: string
diff --git a/src/main/runtime/session-graph/session-window-graph.ts b/src/main/runtime/session-graph/session-window-graph.ts
index 907bebf5dc81..c18bd78326f3 100644
--- a/src/main/runtime/session-graph/session-window-graph.ts
+++ b/src/main/runtime/session-graph/session-window-graph.ts
@@ -24,16 +24,6 @@ function assertUniqueRuntimeGraphTabIds(tabs: readonly RuntimeSyncedTab[]): void
 }
 
 export abstract class OrcaRuntimeWithSyncWindowGraph extends OrcaRuntimeWithAttachWindow {
-  private switchProjectionViewer: { windowId: number; generation: string | undefined } | undefined
-
-  supportsConditionalSwitchProjection(): boolean {
-    return (
-      this.graphStatus === 'ready' &&
-      this.switchProjectionViewer?.windowId === this.authoritativeWindowId &&
-      this.switchProjectionViewer?.generation === this.rendererGeneration
-    )
-  }
-
   /** Layout-owner builds: main's panes in place of the window's (session-tabs-inventory.ts). */
   protected abstract withMainSurfaces(windowId: number, graph: Graph): Graph
   declare protected terminalGroupGridSizes?: RuntimeSyncWindowGraph['terminalGroupGridSizes']
@@ -96,10 +86,6 @@ export abstract class OrcaRuntimeWithSyncWindowGraph extends OrcaRuntimeWithAtta
       this.servesHeadlessGraph = true
       this.rendererGeneration = null
     }
-    this.switchProjectionViewer =
-      graph.conditionalSwitchProjection === 1
-        ? { windowId, generation: rendererGeneration ?? undefined }
-        : undefined
     graph = ORCA_LAYOUT_OWNER_IS_MAIN ? this.withMainSurfaces(windowId, graph) : graph
 
     if (graph.terminalGroupGridSizes) {
diff --git a/src/main/runtime/session-lifecycle/projection/build-headless-mobile-session-browser-tabs.ts b/src/main/runtime/session-lifecycle/projection/build-headless-mobile-session-browser-tabs.ts
index 4e6b5d5ed93f..fe9b225b6fee 100644
--- a/src/main/runtime/session-lifecycle/projection/build-headless-mobile-session-browser-tabs.ts
+++ b/src/main/runtime/session-lifecycle/projection/build-headless-mobile-session-browser-tabs.ts
@@ -19,12 +19,7 @@ import type { PtyControllerInventory } from '../../runtime-pty-controller-contra
 import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../shared/constants'
 import { markAgentLaunchesClosedByUser } from '../../../agent-launch/agent-launch-pane-attachment'
 
-import type { MobileSessionTabCloseOptions } from '../../mobile-session-tab-close-outcome'
-
-type TerminalPaneRetirementOptions = Pick<
-  MobileSessionTabCloseOptions,
-  'originalPresentation' | 'rendererOwnsPresentation' | 'retirementProofs'
->
+import type { TerminalPaneRetirementOptions } from '../../mobile-session-tab-close-outcome'
 
 export abstract class OrcaRuntimeWithBuildHeadlessMobileSessionBrowserTabs extends OrcaRuntimeWithTerminalSurfaceCloseCommit {
   protected abstract getRendererOwnedBrowserPageIds(
@@ -123,6 +118,7 @@ export abstract class OrcaRuntimeWithBuildHeadlessMobileSessionBrowserTabs exten
     }
     if (
       options.originalPresentation &&
+      !options.presentationRetired &&
       (options.rendererOwnsPresentation || windowListsTab(this, this.tabs, target.tabId))
     ) {
       if (!this.notifier?.closeTerminalTab) {
@@ -138,7 +134,9 @@ export abstract class OrcaRuntimeWithBuildHeadlessMobileSessionBrowserTabs exten
       markAgentLaunchesClosedByUser(worktreeId, target)
     }
     try {
-      if (ORCA_LAYOUT_OWNER_IS_MAIN && options.originalPresentation) {
+      if (options.presentationRetired && ORCA_LAYOUT_OWNER_IS_MAIN) {
+        closedTab = true
+      } else if (ORCA_LAYOUT_OWNER_IS_MAIN && options.originalPresentation) {
         const reply = await this.applyLayoutCommand(
           {
             type: 'closePane',
diff --git a/src/main/runtime/session-tabs/explicit-terminal-close-pty-stops.ts b/src/main/runtime/session-tabs/explicit-terminal-close-pty-stops.ts
index f0fa321efa6c..bea7c4193893 100644
--- a/src/main/runtime/session-tabs/explicit-terminal-close-pty-stops.ts
+++ b/src/main/runtime/session-tabs/explicit-terminal-close-pty-stops.ts
@@ -13,7 +13,9 @@ export abstract class OrcaRuntimeWithExplicitCloseTabPtyStops extends OrcaRuntim
   protected async stopExplicitlyClosedTabPtys(
     ptyIds: readonly string[],
     addressedPtyId: string,
-    capturedIncarnationId?: string
+    capturedIncarnationId?: string,
+    /** `closing` keeps the exited pane shown until its tab is replaced; off, the exit retires it. */
+    options: { closing?: boolean } = {}
   ): Promise<ExplicitCloseStop> {
     let addressedPtyStop = NO_STOP
     const deadlineMs = Date.now() + EXPLICIT_TERMINAL_CLOSE_STOP_TIMEOUT_MS
@@ -27,9 +29,10 @@ export abstract class OrcaRuntimeWithExplicitCloseTabPtyStops extends OrcaRuntim
         (!current || current.incarnationId === capturedIncarnationId) &&
         (!replacement || replacement.incarnationId === capturedIncarnationId) &&
         this.getPtyLivenessVerdict(ptyId)?.status === 'exited'
-      const settle = capturedIncarnationId
-        ? this.intentionalPtyStops.mark(ptyId, 'closing', capturedIncarnationId)
-        : null
+      const settle =
+        capturedIncarnationId && options.closing !== false
+          ? this.intentionalPtyStops.mark(ptyId, 'closing', capturedIncarnationId)
+          : null
       try {
         if (!stopped && this.ptyController?.stopAndWait) {
           try {
diff --git a/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.ts b/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.ts
index 578cb9236723..36774471c0ab 100644
--- a/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.ts
+++ b/src/main/runtime/session-tabs/main-layout-agent-launch-tabs.ts
@@ -1,5 +1,4 @@
-import { isSessionTabSelectionRequest } from '../../../shared/session-tab-placement'
-import { launchTabWithdrawalIdentity } from '../../../shared/agent-launch-tab-publication'
+// Main-owned early launch tabs are written before launch and withdrawn through main close; paired-runtime workspaces retain window relay.
 import { OrcaRuntimeWithCloseStructuredAgentSessionTab } from './structured-session-tab-close'
 import type {
   AgentLaunchTabPublished,
@@ -11,8 +10,6 @@ import { parseExecutionHostId } from '../../../shared/execution-host'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../shared/layout-owner-switch'
 import type { RuntimePtyWorktreeRecord } from '../runtime-terminal-state-records'
 
-// Main-owned early launch tabs are written before launch and withdrawn through main close; paired-runtime workspaces retain window relay.
-
 /** Where the tab landed against where the launch asked for it, as the window reports it. */
 function placementFallback(
   asked: AgentLaunchTabPublishRequest['placement'],
@@ -51,82 +48,26 @@ export abstract class OrcaRuntimeWithMainLayoutAgentLaunchTabs extends OrcaRunti
     )?.groupId
   }
 
-  private launchWithdrawalIdentity(worktreeId: string, tabId: string): string {
-    const session = this.getWorkspaceSessionForWorktree(worktreeId)
-    return launchTabWithdrawalIdentity(
-      session?.terminalLayoutsByTabId?.[tabId]?.root,
-      session?.unifiedTabs?.[worktreeId] ?? [],
-      session?.tabGroups?.[worktreeId] ?? [],
-      tabId
-    )
-  }
-
   /** The launch's tab in main's layout; null for a workspace main does not own (today's path). */
   publishAgentLaunchTabInMainLayout(
-    request: Omit<AgentLaunchTabPublishRequest, 'requestId'>,
-    check?: () => void,
-    selectionCurrent?: (consume?: boolean) => boolean
+    request: Omit<AgentLaunchTabPublishRequest, 'requestId'>
   ): Promise<AgentLaunchTabPublished> | null {
     const { worktreeId, tabId, leafId, placement } = request
     if (!this.ownsLaunchTab(worktreeId, tabId)) {
       return null
     }
     const existed = this.groupOfTab(worktreeId, tabId) !== undefined
-    let withdrawalRoot: string | undefined
-    return this.applyLayoutCommand(
-      {
-        type: 'createTerminalTab',
-        workspace: worktreeId,
-        tabId,
-        leafId,
-        viewMode: request.viewMode,
-        ...(placement?.groupId ? { groupId: placement.groupId } : {}),
-        ...(placement?.afterTabId ? { afterTabId: placement.afterTabId } : {}),
-        ...(placement?.index !== undefined ? { index: placement.index } : {}),
-        creation: { launchAgent: request.launchAgent }
-      },
-      {
-        ...(check
-          ? {
-              admit: () => {
-                check()
-                return true
-              }
-            }
-          : {}),
-        onApplied: () => {
-          withdrawalRoot = this.launchWithdrawalIdentity(worktreeId, tabId)
-          const openPlacement = request.openPlacement
-          if (openPlacement) {
-            this.hydrateHeadlessMobileSessionTabsFromWorkspaceSession(worktreeId, {
-              allowAttachedWindow: true,
-              force: true
-            })
-            const snapshot = this.mobileSessionTabsByWorktree.get(worktreeId)
-            if (snapshot) {
-              this.storeMobileSessionSnapshot(worktreeId, {
-                ...snapshot,
-                tabs: snapshot.tabs.map((tab) =>
-                  tab.type === 'terminal' && tab.parentTabId === tabId && tab.leafId === leafId
-                    ? {
-                        ...tab,
-                        openPlacement: {
-                          ...openPlacement,
-                          activate:
-                            openPlacement.activate &&
-                            (isSessionTabSelectionRequest(openPlacement.viewerSelection) ||
-                              (selectionCurrent?.() ?? true))
-                        }
-                      }
-                    : tab
-                )
-              })
-              this.markPaneLiveTitlesDirty()
-            }
-          }
-        }
-      }
-    ).then((reply) => {
+    return this.applyLayoutCommand({
+      type: 'createTerminalTab',
+      workspace: worktreeId,
+      tabId,
+      leafId,
+      viewMode: request.viewMode,
+      ...(placement?.groupId ? { groupId: placement.groupId } : {}),
+      ...(placement?.afterTabId ? { afterTabId: placement.afterTabId } : {}),
+      ...(placement?.index !== undefined ? { index: placement.index } : {}),
+      creation: { launchAgent: request.launchAgent }
+    }).then((reply) => {
       if (!reply.ok) {
         throw new Error(reply.code)
       }
@@ -134,16 +75,7 @@ export abstract class OrcaRuntimeWithMainLayoutAgentLaunchTabs extends OrcaRunti
       if (!landed) {
         throw new Error('agent_launch_tab_unplaced')
       }
-      this.showLaunchTabInWindow(
-        {
-          ...request,
-          viewer:
-            isSessionTabSelectionRequest(request.viewerSelection) || (selectionCurrent?.() ?? true)
-              ? request.viewer
-              : 'none'
-        },
-        { frameSeq: reply.frameSeq, created: !existed }
-      )
+      this.showLaunchTabInWindow(request, { frameSeq: reply.frameSeq, created: !existed })
       // A retry naming the same tab finds it: the launch made no tab, so it takes none back.
       if (existed) {
         return { tabId, created: false, placement: { groupId: landed } }
@@ -155,7 +87,6 @@ export abstract class OrcaRuntimeWithMainLayoutAgentLaunchTabs extends OrcaRunti
       return {
         tabId,
         created: true,
-        withdrawalRoot,
         placement: { groupId: landed, ...(fallback ? { fallback } : {}) }
       }
     })
@@ -178,70 +109,28 @@ export abstract class OrcaRuntimeWithMainLayoutAgentLaunchTabs extends OrcaRunti
   }
 
   /** Withdraw main-owned launch panes, closing the tab for its last pane; false leaves unowned workspaces to window cleanup. */
-  async withdrawAgentLaunchPaneInMainLayout(
-    pane: AgentLaunchPaneAddress,
-    current: () => boolean = () => true,
-    withdrawalRoot?: string,
-    publicationOwner?: 'main' | 'window'
-  ): Promise<boolean> {
-    if (!withdrawalRoot || !current()) {
+  withdrawAgentLaunchPaneInMainLayout(pane: AgentLaunchPaneAddress): boolean {
+    if (!this.ownsLaunchTab(pane.worktreeId, pane.tabId)) {
       return false
     }
-    if (
-      publicationOwner === 'window' ||
-      (publicationOwner === undefined && !this.ownsLaunchTab(pane.worktreeId, pane.tabId))
-    ) {
-      if (!this.supportsConditionalSwitchProjection()) {
-        return false
-      }
-      const published = this.notifier?.publishAgentLaunchTab?.({
-        ...pane,
-        launchAgent: 'codex',
-        viewMode: 'terminal',
-        viewer: 'none',
-        withdraw: { root: withdrawalRoot }
-      })
-      return (await published)?.withdrawn === true
-    }
-    return this.takeBackLaunchPane(pane, current, withdrawalRoot)
+    // The verdict is a report: a failed take-back leaves an idle pane, never a failed launch.
+    void this.takeBackLaunchPane(pane).catch((error: unknown) => {
+      console.warn('[agent-launch] could not take back a withdrawn launch pane', error)
+    })
+    return true
   }
 
-  private async takeBackLaunchPane(
-    pane: AgentLaunchPaneAddress,
-    current: () => boolean,
-    captured: string
-  ): Promise<boolean> {
+  private async takeBackLaunchPane(pane: AgentLaunchPaneAddress): Promise<void> {
     const { worktreeId: workspace, tabId, leafId } = pane
-    const read = () => this.getWorkspaceSessionForWorktree(workspace)
-    const admit = () => {
-      const session = read()
-      const root = session?.terminalLayoutsByTabId?.[tabId]?.root
-      return (
-        current() &&
-        root?.type === 'leaf' &&
-        root.leafId === leafId &&
-        this.launchWithdrawalIdentity(workspace, tabId) === captured &&
-        !this.hasLiveTerminalForPaneKey(`${tabId}:${leafId}`) &&
-        !session?.terminalPtyIncarnationsByPaneKey?.[`${tabId}:${leafId}`]
-      )
-    }
-    const reply = await this.applyLayoutCommand(
-      { type: 'closePane', workspace, tabId, leafId },
-      { admit }
-    )
+    const reply = await this.applyLayoutCommand({ type: 'closePane', workspace, tabId, leafId })
     // A pane close keeps a tab's last pane; that pane goes with its tab.
     if (!reply.ok && reply.code === 'last_pane') {
-      const closed = await this.applyLayoutCommand(
-        {
-          type: 'closeTabs',
-          workspace,
-          tabIds: [tabId],
-          recordClose: 'cleanup'
-        },
-        { admit }
-      )
-      return closed.ok
+      await this.applyLayoutCommand({
+        type: 'closeTabs',
+        workspace,
+        tabIds: [tabId],
+        recordClose: 'cleanup'
+      })
     }
-    return reply.ok
   }
 }
diff --git a/src/main/runtime/session-tabs/main-session-tab-rows.ts b/src/main/runtime/session-tabs/main-session-tab-rows.ts
index fcfeab4588bc..0fd652a42fe6 100644
--- a/src/main/runtime/session-tabs/main-session-tab-rows.ts
+++ b/src/main/runtime/session-tabs/main-session-tab-rows.ts
@@ -1,6 +1,5 @@
 // Use main's rows/order/groups, augmented by window-only rows and live view facts (selection, dirty state, titles, theme/status and editor drafts).
 
-import { preserveSessionTabOpenPlacement } from './session-tab-open-placement'
 import type { RuntimeMobileSessionSnapshotTab } from '../../../shared/runtime-mobile-session-tab-contracts'
 import { orderIdOf, placeInMainGroups, withStrayIn } from './main-session-tab-group-placement'
 import type {
@@ -128,10 +127,7 @@ export function withMainSessionTabRows(
   // A main-held row is main's; a browser or chat row stays the window's while both list it.
   const rows = projected.tabs.map((row) =>
     isMainRow(row)
-      ? preserveSessionTabOpenPlacement(
-          withWindowFacts(row, windowRows.get(row.id), rules),
-          windowRows.get(row.id)
-        )
+      ? withWindowFacts(row, windowRows.get(row.id), rules)
       : (windowRows.get(row.id) ?? row)
   )
   const windowOnlyIds = new Set(windowOnly.map((row) => row.id))
diff --git a/src/main/runtime/session-tabs/mobile-session-membership.ts b/src/main/runtime/session-tabs/mobile-session-membership.ts
index 2cf722862d69..02add510adf1 100644
--- a/src/main/runtime/session-tabs/mobile-session-membership.ts
+++ b/src/main/runtime/session-tabs/mobile-session-membership.ts
@@ -1,5 +1,5 @@
 import type { OrcaRuntimeWithGetTerminalInteractiveWait as GetTerminalInteractiveWaitMethods } from '../terminal/wait/terminal-interactive-wait'
-import { OrcaRuntimeWithPublishPtyBackedMobileSessionTerminal } from './pty-backed-session-publication'
+import { OrcaRuntimeWithSwitchTerminalPlacement } from './switch-terminal-placement'
 import { getRepoIdFromWorktreeId } from '../../../shared/worktree/id'
 import { parsePaneKey } from '../../../shared/stable-pane-id'
 import { hasHostAuthoritativeTerminalMembership } from '../../persistence/terminal-topology/terminal-topology-membership'
@@ -11,7 +11,7 @@ import { retireTerminalSurfacesFromSnapshot } from '../mobile-session-terminal-r
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../shared/layout-owner-switch'
 import { startedMainTerminalSurfaces } from '../terminal/surface/main-terminal-surfaces'
 
-export abstract class OrcaRuntimeWithTouchMobileSessionTabsForWorktree extends OrcaRuntimeWithPublishPtyBackedMobileSessionTerminal {
+export abstract class OrcaRuntimeWithTouchMobileSessionTabsForWorktree extends OrcaRuntimeWithSwitchTerminalPlacement {
   abstract getTerminalWorktreeIdForPaneKey(
     ...args: Parameters<GetTerminalInteractiveWaitMethods['getTerminalWorktreeIdForPaneKey']>
   ): ReturnType<GetTerminalInteractiveWaitMethods['getTerminalWorktreeIdForPaneKey']>
diff --git a/src/main/runtime/session-tabs/session-tab-open-placement.ts b/src/main/runtime/session-tabs/session-tab-open-placement.ts
deleted file mode 100644
index e451bd608c48..000000000000
--- a/src/main/runtime/session-tabs/session-tab-open-placement.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-import type { PublishedWorkspaceLayout } from '../../../shared/workspace-layout/workspace-layout-published'
-import type { RuntimeMobileSessionSnapshotTab as Row } from '../../../shared/runtime-mobile-session-tab-contracts'
-import type { RuntimeMobileSessionTabsSnapshot } from '../../../shared/runtime-types'
-
-/** Rebuilds retain the open intent only for the same ordinary destination resource. */
-export function preserveSessionTabOpenPlacement(row: Row, prior: Row | undefined): Row {
-  if (row.type === 'agent-session' && prior?.type === 'agent-session') {
-    return row.openPlacement || row.id !== prior.id || row.sessionId !== prior.sessionId
-      ? row
-      : { ...row, ...(prior.openPlacement ? { openPlacement: prior.openPlacement } : {}) }
-  }
-  if (
-    row.type === 'terminal' &&
-    prior?.type === 'terminal' &&
-    !row.openPlacement &&
-    prior.openPlacement &&
-    row.id === prior.id &&
-    row.parentTabId === prior.parentTabId &&
-    row.leafId === prior.leafId &&
-    (!prior.ptyId || row.ptyId === prior.ptyId) &&
-    (!prior.incarnationId || row.incarnationId === prior.incarnationId)
-  ) {
-    return { ...row, openPlacement: prior.openPlacement }
-  }
-  return row
-}
-
-export function preserveSessionTabOpenPlacements(
-  snapshot: RuntimeMobileSessionTabsSnapshot,
-  existing: RuntimeMobileSessionTabsSnapshot | undefined
-): RuntimeMobileSessionTabsSnapshot {
-  if (
-    !existing ||
-    (snapshot.worktreeInstanceId &&
-      existing.worktreeInstanceId &&
-      snapshot.worktreeInstanceId !== existing.worktreeInstanceId)
-  ) {
-    return snapshot
-  }
-  const prior = new Map(existing.tabs.map((row) => [row.id, row]))
-  return {
-    ...snapshot,
-    tabs: snapshot.tabs.map((row) => preserveSessionTabOpenPlacement(row, prior.get(row.id)))
-  }
-}
-
-/** Frames and snapshots carry the same unsaved intent from the ordinary row owner. */
-export function withPublishedSessionTabOpenPlacements(
-  layout: PublishedWorkspaceLayout,
-  snapshot: RuntimeMobileSessionTabsSnapshot | undefined
-): PublishedWorkspaceLayout {
-  const chats = new Map<string, Extract<Row, { type: 'agent-session' }>>()
-  const terminals = new Map<string, Extract<Row, { type: 'terminal' }>[]>()
-  for (const row of snapshot?.tabs ?? []) {
-    if (row.type === 'agent-session' && row.openPlacement) {
-      chats.set(row.sessionId, row)
-    } else if (row.type === 'terminal' && row.openPlacement) {
-      const siblings = terminals.get(row.parentTabId) ?? []
-      siblings.push(row)
-      terminals.set(row.parentTabId, siblings)
-    }
-  }
-  if (chats.size === 0 && terminals.size === 0) {
-    return layout
-  }
-  return {
-    ...layout,
-    tabs: layout.tabs.map((tab) => {
-      let openPlacement =
-        tab.kind === 'agent-session' ? chats.get(tab.entityId)?.openPlacement : undefined
-      if (tab.kind === 'terminal') {
-        const panes = new Map(tab.terminal?.panes.map((pane) => [pane.leafId, pane]))
-        openPlacement = terminals.get(tab.id)?.find((row) => {
-          const pane = panes.get(row.leafId)
-          return pane && (!row.ptyId || pane.ptyId === row.ptyId)
-        })?.openPlacement
-      }
-      return openPlacement ? { ...tab, openPlacement } : tab
-    })
-  }
-}
diff --git a/src/main/runtime/session-tabs/structured-session-switch-projection.ts b/src/main/runtime/session-tabs/structured-session-switch-projection.ts
deleted file mode 100644
index eefc366d8e46..000000000000
--- a/src/main/runtime/session-tabs/structured-session-switch-projection.ts
+++ /dev/null
@@ -1,192 +0,0 @@
-import { getStructuredAgentSessionHost } from '../../native-chat/agent-session-wire/structured-agent-session-registry'
-
-import { retireStructuredAgentSessionTabFrom } from '../agent-session/structured-agent-session-tab-retirement'
-import type { ChatTabChange } from '../agent-session/agent-session-tab-layout'
-import { createChatTabLayoutQueue } from '../agent-session-tab-layout-queue'
-import type { LayoutCommandRunOptions, WindowLayoutCommand } from '../runtime-layout-apply'
-import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../shared/layout-owner-switch'
-import type { LayoutApplyReply } from '../../../shared/workspace-layout/workspace-layout-command-types'
-
-import type { SessionSwitchProjection } from '../../../shared/agent-session-switch-execution'
-import { OrcaRuntimeWithStructuredSessionTabProjection } from './restored-chat-tab-changes'
-
-import { loadChatTabLayout } from '../agent-session/agent-session-tab-layout'
-
-export abstract class OrcaRuntimeWithStructuredSessionSwitchProjection extends OrcaRuntimeWithStructuredSessionTabProjection {
-  protected abstract changeWindowlessChatTabs(
-    worktreeId: string,
-    changes: readonly ChatTabChange[]
-  ): void
-  retainSessionSwitchProjection(
-    worktreeId: string,
-    sessionId: string,
-    invocationId: string,
-    generation: string
-  ): void {
-    const snapshot = this.mobileSessionTabsByWorktree.get(worktreeId)
-    if (!snapshot) {
-      return
-    }
-    const next = this.storeMobileSessionSnapshot(worktreeId, {
-      ...snapshot,
-      snapshotVersion: snapshot.snapshotVersion + 1,
-      switchProjections: [
-        ...(snapshot.switchProjections ?? []).filter((item) => item.sessionId !== sessionId),
-        {
-          sessionId,
-          invocationId,
-          generation,
-          tabId: `agent-session:${sessionId}`,
-          phase: 'retain'
-        }
-      ]
-    })
-    this.emitMobileSessionTabsSnapshot(next)
-  }
-
-  convergeSessionSwitchProjection(worktreeId: string, generation: string): void {
-    const snapshot = this.mobileSessionTabsByWorktree.get(worktreeId)
-    if (!snapshot?.switchProjections?.some((item) => item.generation === generation)) {
-      return
-    }
-    const next = this.storeMobileSessionSnapshot(worktreeId, {
-      ...snapshot,
-      snapshotVersion: snapshot.snapshotVersion + 1,
-      switchProjections: snapshot.switchProjections.filter((item) => item.generation !== generation)
-    })
-    this.emitMobileSessionTabsSnapshot(next)
-  }
-
-  captureSessionSwitchRetirement(
-    worktreeId: string,
-    sessionId: string,
-    tabId: string | undefined,
-    workCurrent: () => boolean,
-    restore: () => Promise<void>,
-    projection?: SessionSwitchProjection
-  ) {
-    const read = () => {
-      const session = this.getWorkspaceSessionForWorktree(worktreeId)
-      const workspace =
-        session &&
-        loadChatTabLayout(
-          this.getWorkspaceSessionHostIdForWorktree(worktreeId),
-          session,
-          worktreeId
-        ).loaded.layout.workspaces[worktreeId]
-      const tab = workspace?.tabs.find(
-        (row) => row.id === tabId && row.kind === 'agent-session' && row.entityId === sessionId
-      )
-      const group = workspace?.groups.find((row) => row.tabOrder.includes(tabId ?? ''))
-      return tab && group
-        ? { tab, group: group.id, before: group.tabOrder.slice(0, group.tabOrder.indexOf(tab.id)) }
-        : null
-    }
-    const captured = JSON.stringify(read())
-    const presentationCurrent = () =>
-      captured === 'null' ? windowAvailable && viewerSupported : JSON.stringify(read()) === captured
-    const announce = (phase: 'prepare' | 'retire' | 'retain') => {
-      const snapshot = this.mobileSessionTabsByWorktree.get(worktreeId)
-      if (!snapshot || !projection) {
-        return
-      }
-      const next = this.storeMobileSessionSnapshot(worktreeId, {
-        ...snapshot,
-        snapshotVersion: snapshot.snapshotVersion + 1,
-        switchProjections: [
-          ...(snapshot.switchProjections ?? []).filter((item) => item.sessionId !== sessionId),
-          { ...projection, phase }
-        ]
-      })
-      this.emitMobileSessionTabsSnapshot(next)
-    }
-    announce('prepare')
-    const windowAvailable = Boolean(this.getAvailableAuthoritativeWindow())
-    const viewerSupported = !windowAvailable || this.supportsConditionalSwitchProjection()
-    const capturedWindow =
-      viewerSupported && projection && tabId && windowAvailable
-        ? Promise.resolve(
-            this.notifier?.closeSessionTab?.(tabId, worktreeId, { ...projection, phase: 'prepare' })
-          ).catch(() => false)
-        : undefined
-    const retire = async () => {
-      const host = getStructuredAgentSessionHost()
-      if (!host || !tabId) {
-        return false
-      }
-      if (!viewerSupported) {
-        await restore()
-        return false
-      }
-      const admit = () => workCurrent() && presentationCurrent()
-      if (capturedWindow && (await capturedWindow) !== true) {
-        await restore()
-        return false
-      }
-      if (!admit()) {
-        await restore()
-        return false
-      }
-      if (
-        !(await host.deps.store.setSwitchedSessionTabVisibility(sessionId, tabId, false, admit))
-      ) {
-        await restore()
-        return false
-      }
-      if (
-        windowAvailable &&
-        projection &&
-        (await this.notifier?.closeSessionTab?.(tabId, worktreeId, {
-          ...projection,
-          phase: 'retire'
-        })) !== true
-      ) {
-        await restore()
-        return false
-      }
-      const closed = ORCA_LAYOUT_OWNER_IS_MAIN
-        ? await this.queueChatTabChanges(
-            () => [{ worktreeId, change: { close: sessionId } }],
-            admit
-          )
-        : windowAvailable
-          ? admit()
-          : admit() && (this.changeWindowlessChatTabs(worktreeId, [{ close: sessionId }]), true)
-      if (!closed || !workCurrent()) {
-        await restore()
-        return false
-      }
-      const snapshot = this.mobileSessionTabsByWorktree.get(worktreeId)
-      if (!workCurrent()) {
-        await restore()
-        return false
-      }
-      const next = snapshot && retireStructuredAgentSessionTabFrom(snapshot, sessionId)
-      if (next) {
-        this.storeMobileSessionSnapshot(worktreeId, next)
-        this.emitMobileSessionTabsSnapshot(next)
-      }
-      announce('retire')
-      host.notifySessionTabHidden(sessionId)
-      return true
-    }
-    return Object.assign(retire, {
-      placement: () => {
-        const current = read()
-        return current
-          ? { groupId: current.group, afterTabId: current.tab.id, index: current.before.length }
-          : undefined
-      }
-    })
-  }
-
-  abstract applyLayoutCommand(
-    command: WindowLayoutCommand,
-    options?: LayoutCommandRunOptions
-  ): Promise<LayoutApplyReply>
-  protected readonly queueChatTabChanges = createChatTabLayoutQueue({
-    sessionOf: (worktreeId) => this.getWorkspaceSessionForWorktree(worktreeId),
-    hostIdOf: (worktreeId) => this.getWorkspaceSessionHostIdForWorktree(worktreeId),
-    apply: (command, options) => this.applyLayoutCommand(command, options)
-  })
-}
diff --git a/src/main/runtime/session-tabs/structured-session-tab-close.ts b/src/main/runtime/session-tabs/structured-session-tab-close.ts
index 6a40a8a6ad31..e2c8b07ace6d 100644
--- a/src/main/runtime/session-tabs/structured-session-tab-close.ts
+++ b/src/main/runtime/session-tabs/structured-session-tab-close.ts
@@ -27,9 +27,9 @@ import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../shared/layout-owner-switch'
 import { savedSessionId } from '../saved-structured-agent-session-restoration'
 import { structuredSessionTabRetired } from '../structured-worker-custody'
 import type { StructuredAgentId } from '../../../shared/agent-session-provider-handle'
-import { OrcaRuntimeWithStructuredSessionSwitchProjection } from './structured-session-switch-projection'
+import { OrcaRuntimeWithChatTabLayoutQueue } from './chat-tab-layout-queue-owner'
 
-export abstract class OrcaRuntimeWithCloseStructuredAgentSessionTab extends OrcaRuntimeWithStructuredSessionSwitchProjection {
+export abstract class OrcaRuntimeWithCloseStructuredAgentSessionTab extends OrcaRuntimeWithChatTabLayoutQueue {
   protected abstract isHeadlessOwnedMobileBrowserTab(
     ...args: Parameters<BrowserOwnership['isHeadlessOwnedMobileBrowserTab']>
   ): ReturnType<BrowserOwnership['isHeadlessOwnedMobileBrowserTab']>
diff --git a/src/main/runtime/session-tabs/structured-session-terminal-launch-retirement.ts b/src/main/runtime/session-tabs/structured-session-terminal-launch-retirement.ts
deleted file mode 100644
index 986c2aeff059..000000000000
--- a/src/main/runtime/session-tabs/structured-session-terminal-launch-retirement.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import { LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host'
-import type { TerminalLaunchResult } from '../../../shared/agent-session-resume'
-import { getStructuredAgentSessionHost } from '../../native-chat/agent-session-wire/structured-agent-session-registry'
-import { listStructuredProviderSessionOwnership } from '../../native-chat/agent-session-wire/structured-provider-session-ownership'
-import {
-  keysMayMatch,
-  terminalConversationKey
-} from '../../native-chat/structured-conversation-key'
-
-/** Presentation only: a delayed successful spawn must never close a newer native child. */
-export async function retireChatForAdmittedTerminalLaunch(
-  runtime: { retireStructuredAgentSessionTabFromSnapshot(sessionId: string): boolean } | undefined,
-  args: { resumeOrigin?: unknown; worktreeId?: unknown },
-  result: TerminalLaunchResult & { isReattach?: boolean }
-): Promise<void> {
-  const decision = result.savedResumeDecision
-  if (
-    args.resumeOrigin !== 'switch' ||
-    result.isReattach ||
-    decision?.verdict !== 'admitted' ||
-    result.agentResumeRefused ||
-    result.agentResumeUnavailable
-  ) {
-    return
-  }
-  const host = getStructuredAgentSessionHost()
-  if (!host) {
-    return
-  }
-  const key = terminalConversationKey(decision.agent, decision.providerSession.id)
-  const holders = listStructuredProviderSessionOwnership(
-    host.deps.store.listConversations()
-  ).filter((holding) => holding.role === 'head' && keysMayMatch(holding.key, key))
-  for (const sessionId of new Set(holders.map((holding) => holding.sessionId))) {
-    if (host.switchExecuting(sessionId)) {
-      continue
-    }
-    const record = host.deps.store.getRecord(sessionId)
-    if (
-      record?.location.executionHostId !== LOCAL_EXECUTION_HOST_ID ||
-      record.location.workspaceId !== args.worktreeId
-    ) {
-      continue
-    }
-    try {
-      await host.setSessionTabVisibility(sessionId, false)
-    } catch (error) {
-      // The terminal is admitted regardless of a failed visibility write; never stop another child.
-      host.deps.logger.warn('recording a switched chat tab retirement failed', {
-        scope: 'switch-tab-retirement',
-        sessionId: sessionId,
-        error
-      })
-    }
-    try {
-      runtime?.retireStructuredAgentSessionTabFromSnapshot(sessionId)
-    } catch (error) {
-      host.deps.logger.warn('publishing a switched chat tab retirement failed', {
-        scope: 'switch-tab-retirement',
-        sessionId: sessionId,
-        error
-      })
-    }
-  }
-}
diff --git a/src/main/runtime/session-tabs/terminal-switch-close-capture.ts b/src/main/runtime/session-tabs/terminal-switch-close-capture.ts
index 607d63cf3a06..b4ba4c138ebb 100644
--- a/src/main/runtime/session-tabs/terminal-switch-close-capture.ts
+++ b/src/main/runtime/session-tabs/terminal-switch-close-capture.ts
@@ -68,8 +68,18 @@ export abstract class OrcaRuntimeWithTerminalSwitchCloseCapture extends OrcaRunt
       terminal: handle,
       incarnationId: incarnation
     }
+    /** Whether retiring this pane retires its tab: only then may the chat take the tab's slot. */
+    const wholeTab = () => {
+      const resolution = this.resolveTerminalCloseTarget(source.worktreeId, {
+        kind: 'pane',
+        tabId: source.tabId,
+        leafId: source.leafId
+      })
+      return resolution === 'tab' || resolution === 'last-pane'
+    }
     return {
       source,
+      wholeTab,
       placement: () =>
         matchesTerminalSurfaceCapture(
           originalPresentation,
@@ -79,22 +89,28 @@ export abstract class OrcaRuntimeWithTerminalSwitchCloseCapture extends OrcaRunt
           ? (readPlacement() ?? originalPlacement)
           : undefined,
       stop: async () => {
+        // A split sibling keeps the tab, so that pane may retire on exit as any pane does.
         const stop = await this.stopExplicitlyClosedTabPtys(
           [addressedPty],
           addressedPty,
-          incarnation
+          incarnation,
+          {
+            closing: wholeTab()
+          }
         )
         if (!stop.stopped) {
           throw new Error('terminal_close_unverifiable')
         }
       },
-      retire: async () => {
+      /** Retires the pane's bookkeeping; its presentation too, unless a replace or its exit already did. */
+      retire: async (presentationRetired = false) => {
         const outcome = await this.closeMobileSessionTab(`id:${source.worktreeId}`, source.tabId, {
           originalPresentation,
           rendererOwnsPresentation,
           localPtyTeardownOwnedExternally: true,
           force: replacement,
-          retirementProofs: [proof]
+          retirementProofs: [proof],
+          presentationRetired
         })
         if (outcome.refused) {
           throw new Error('terminal_pane_close_failed')
diff --git a/src/main/runtime/structured-native-switch-physical.test-fixture.ts b/src/main/runtime/structured-native-switch-physical.test-fixture.ts
index 0b550d34ce6a..1f4ff56943e3 100644
--- a/src/main/runtime/structured-native-switch-physical.test-fixture.ts
+++ b/src/main/runtime/structured-native-switch-physical.test-fixture.ts
@@ -118,9 +118,7 @@ export async function nativeSwitchPhysicalFixture(
             { runtime },
             host,
             sessionId,
-            deadline,
-            execution,
-            runtime.captureSessionSwitchSelection()
+            deadline
           ),
         { direction: 'terminal' }
       )
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-create-anchor.ts b/src/main/runtime/terminal/launch/mobile-terminal-create-anchor.ts
index e5acb344c974..a5dcf9aef6ea 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-create-anchor.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-create-anchor.ts
@@ -1,5 +1,3 @@
-import type { RuntimeMobileSessionTabsSnapshot } from '../../../../shared/runtime-types'
-import { captureSessionTabPlacement } from '../../../../shared/session-tab-placement'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
 import type { RuntimeMobileSessionSnapshotTab } from '../../../../shared/runtime-mobile-session-tab-contracts'
 
@@ -32,22 +30,3 @@ export function mainPlacedAfter(
     ? { afterDesktopTabId: heldTabId() ?? afterDesktopTabId }
     : {}
 }
-
-export function captureMobileTerminalCreatePlacement(
-  beforeCreate: RuntimeMobileSessionTabsSnapshot | undefined,
-  afterTabId: string | undefined,
-  afterDesktopTabId: string | undefined
-) {
-  const anchor = beforeCreate?.tabs.find((tab) => tab.id === afterTabId)
-  const anchorParentId =
-    afterDesktopTabId ?? (anchor?.type === 'terminal' ? anchor.parentTabId : anchor?.id)
-  const sourceGroup = beforeCreate?.tabGroups?.find((group) =>
-    group.tabOrder.includes(anchorParentId ?? '')
-  )
-  const capturedOrder = captureSessionTabPlacement(sourceGroup?.tabOrder ?? [], anchorParentId)
-  const capturedTabs = captureSessionTabPlacement(
-    beforeCreate?.tabs.map((tab) => tab.id) ?? [],
-    afterTabId
-  )
-  return { sourceGroup, capturedOrder, capturedTabs }
-}
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-create-options.ts b/src/main/runtime/terminal/launch/mobile-terminal-create-options.ts
deleted file mode 100644
index 4f6f48799804..000000000000
--- a/src/main/runtime/terminal/launch/mobile-terminal-create-options.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import type { AgentSessionSwitchAuthority } from '../../../../shared/agent-session-switch-execution'
-import type { AgentLaunchRuntime } from '../../../../shared/agent-launch-runtime'
-import type { AgentLaunchTabViewerRule } from '../../../../shared/agent-launch-tab-publication'
-import type { WorktreeStartupLaunch } from '../../../../shared/worktree/launch-types'
-import type { TuiAgent } from '../../../../shared/tui-agent'
-import type {
-  AgentProviderSessionMetadata,
-  SleepingAgentLaunchConfig
-} from '../../../../shared/agent-session-resume'
-
-export type MobileTerminalCreateOptions = {
-  terminalImageViewerSupported?: boolean
-  afterTabId?: string
-  sourceChatFork?: { sessionId: string }
-  targetGroupId?: string
-  command?: string
-  sessionOptions?: Record<string, string>
-  commandOverride?: string
-  launchRuntime?: AgentLaunchRuntime
-  shellOverride?: string
-  cwd?: string
-  env?: Record<string, string>
-  envToDelete?: string[]
-  startupCommandDelivery?: WorktreeStartupLaunch['startupCommandDelivery']
-  agent?: TuiAgent
-  agentPrompt?: string
-  launchConfig?: SleepingAgentLaunchConfig
-  launchAgent?: TuiAgent
-  /** A switch's start: its ordinary spawn admission checks the conversation. */
-  resumeProviderSession?: AgentProviderSessionMetadata
-  resumeOrigin?: 'switch'
-  viewMode?: 'terminal' | 'chat'
-  activate?: boolean
-  clientNavigationId?: string
-  clientMutationId?: string
-  supportsSplitGroupPlacement?: boolean
-  signal?: AbortSignal
-  switchExecution?: AgentSessionSwitchAuthority & {
-    afterTabId?: string
-    viewer: AgentLaunchTabViewerRule
-    viewerSelection?: string
-  }
-}
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-create-owner.ts b/src/main/runtime/terminal/launch/mobile-terminal-create-owner.ts
deleted file mode 100644
index dd33511d1381..000000000000
--- a/src/main/runtime/terminal/launch/mobile-terminal-create-owner.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import type {
-  AgentLaunchTabPublishRequest,
-  AgentLaunchTabPublished
-} from '../../../../shared/agent-launch-tab-publication'
-import type {
-  AgentLaunchPaneAddress,
-  AgentLaunchPaneVerdict
-} from '../../../../shared/agent-launch-pane-verdict'
-import type { MobileTerminalCommandOptions, MobileTerminalCommand } from './mobile-terminal-startup'
-import type { RuntimePtyWorktreeRecord } from '../../runtime-terminal-state-records'
-import type { TerminalWorkspaceLaunchScope } from '../../runtime-legacy-worker-terminal-recovery-types'
-import type { RuntimeMobileSessionCreateTerminalResult } from '../../../../shared/runtime-types'
-import { OrcaRuntimeWithMobileChatForkCreate } from './mobile-terminal-chat-fork-create'
-
-export abstract class OrcaRuntimeWithMobileTerminalCreateOwner extends OrcaRuntimeWithMobileChatForkCreate {
-  abstract publishAgentLaunchTab(
-    request: Omit<AgentLaunchTabPublishRequest, 'requestId'>
-  ): Promise<AgentLaunchTabPublished> | null
-
-  abstract reportAgentLaunchPaneVerdict(
-    pane: AgentLaunchPaneAddress,
-    verdict: AgentLaunchPaneVerdict
-  ): void
-
-  protected abstract resolveMobileSessionTerminalCommand(
-    workspace: TerminalWorkspaceLaunchScope,
-    opts: MobileTerminalCommandOptions
-  ): Promise<MobileTerminalCommand>
-
-  protected abstract ensurePtyBackedMobileSurfaceForRendererTab(
-    worktreeId: string,
-    tabId: string
-  ): RuntimeMobileSessionCreateTerminalResult | null
-
-  protected abstract waitForMobileTerminalSurface(
-    worktreeId: string,
-    parentTabId: string,
-    options?: { timeoutMs?: number; requireReady?: boolean; signal?: AbortSignal }
-  ): Promise<RuntimeMobileSessionCreateTerminalResult>
-
-  protected abstract isReadyMobileTerminalSurface(
-    surface: RuntimeMobileSessionCreateTerminalResult | null
-  ): boolean
-
-  protected abstract deliverPendingStartupCommandToBareRendererPty(
-    worktreeId: string,
-    tabId: string
-  ): void
-
-  protected abstract findMobileTerminalSurface(
-    worktreeId: string,
-    parentTabId: string,
-    options?: { requireReady?: boolean }
-  ): RuntimeMobileSessionCreateTerminalResult | null
-
-  protected abstract findLiveRegisteredPtyForRendererTab(
-    worktreeId: string,
-    tabId: string
-  ): RuntimePtyWorktreeRecord | null
-
-  protected abstract hasLiveShellForRendererTab(worktreeId: string, tabId: string): boolean
-}
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-create.ts b/src/main/runtime/terminal/launch/mobile-terminal-create.ts
index 9982d83fb500..a9ae2ceb1cb7 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-create.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-create.ts
@@ -1,5 +1,4 @@
 import { copySleepingAgentLaunchConfig } from '../../runtime-agent-launch-resolution'
-import type { MobileTerminalCreateOptions } from './mobile-terminal-create-options'
 import type { RuntimeMobileSessionTabsResult } from '../../../../shared/runtime-session-contracts'
 import { OrcaRuntimeWithFailedStartPanes } from './failed-start-pane'
 import type { WorktreeStartupLaunch } from '../../../../shared/worktree/launch-types'
@@ -19,7 +18,36 @@ import type { AgentLaunchRuntime } from '../../../../shared/agent-launch-runtime
 import { navigationTargetsHost } from '../../../../shared/runtime-navigation'
 import { MOBILE_TERMINAL_CREATE_RESULT_TTL_MS } from '../../orca-runtime-core'
 import { seedResumeLaunchIdentity } from '../../../ipc/pty/pane/resume-launch-identity'
-import type { AgentSessionSwitchAuthority } from '../../../../shared/agent-session-switch-execution'
+
+/** A paired client's terminal create request. */
+export type MobileTerminalCreateOptions = {
+  terminalImageViewerSupported?: boolean
+  afterTabId?: string
+  sourceChatFork?: { sessionId: string }
+  targetGroupId?: string
+  command?: string
+  sessionOptions?: Record<string, string>
+  commandOverride?: string
+  launchRuntime?: AgentLaunchRuntime
+  shellOverride?: string
+  cwd?: string
+  env?: Record<string, string>
+  envToDelete?: string[]
+  startupCommandDelivery?: WorktreeStartupLaunch['startupCommandDelivery']
+  agent?: TuiAgent
+  agentPrompt?: string
+  launchConfig?: SleepingAgentLaunchConfig
+  launchAgent?: TuiAgent
+  /** A switch's start: its ordinary spawn admission checks the conversation. */
+  resumeProviderSession?: AgentProviderSessionMetadata
+  resumeOrigin?: 'switch'
+  viewMode?: 'terminal' | 'chat'
+  activate?: boolean
+  clientNavigationId?: string
+  clientMutationId?: string
+  supportsSplitGroupPlacement?: boolean
+  signal?: AbortSignal
+}
 
 export type OwnedMobileTerminalDispatchRecipe = {
   tabId: string
@@ -68,8 +96,6 @@ export function recordOwnedMobileTerminalDispatchRecipe(
   })
 }
 
-export type { MobileTerminalCreateOptions } from './mobile-terminal-create-options'
-
 export type OwnedMobileTerminalCreateOptions = {
   /** A paired client's own create or tab open; without it a stopped WSL distro holds the start. */
   wslUserAct?: true
@@ -92,14 +118,10 @@ export type OwnedMobileTerminalCreateOptions = {
   resumeOrigin?: 'saved' | 'switch'
   spawnIntent?: SpawnIntent
   launchRuntime?: AgentLaunchRuntime
-  switchExecution?: AgentSessionSwitchAuthority &
-    Pick<NonNullable<MobileTerminalCreateOptions['switchExecution']>, 'viewerSelection'>
   signal?: AbortSignal
   refuseSleptWorktree?: boolean
   resumesSleepingRecord?: true
   /** See TerminalCreateOptions; a create that throws before it proves nothing spawned. */
-  beforePtySpawn?: () => void
-  keepPaneOnStartFailure?: true
   onPtySpawnDispatched?: () => void
   /** The PTY this create produced, reported before publication can fail. */
   onPtyCreated?: (ptyId: string, result: RuntimeTerminalCreate) => void
@@ -153,13 +175,12 @@ export abstract class OrcaRuntimeWithCreateMobileSessionTerminal extends OrcaRun
       // Older mobile clients optimistically append; preserve that placement until they advertise
       // split-group ordering support.
       supportsSplitGroupPlacement?: boolean
-      switchExecution?: MobileTerminalCreateOptions['switchExecution']
       signal?: AbortSignal
     } = {}
   ): Promise<RuntimeMobileSessionCreateTerminalResult> {
     const navigation = opts.navigation ?? 'all'
     const select = opts.select ?? opts.activate !== false
-    if (select && navigationTargetsHost(navigation) && !opts.switchExecution) {
+    if (select && navigationTargetsHost(navigation)) {
       this.clientSessionTabSelections.noteHostNavigation()
     }
     const runOpts = {
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts b/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
index 668d02dee184..c8de687b6e0c 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
@@ -1,8 +1,5 @@
-import {
-  isSessionTabSelectionRequest,
-  placeCreatedSessionTab
-} from '../../../../shared/session-tab-placement'
-import { captureMobileTerminalCreatePlacement } from './mobile-terminal-create-anchor'
+import { placeCreatedSessionTab } from '../../../../shared/session-tab-placement'
+import { insertTabIdIntoOrder } from '../../../../shared/workspace-layout/tab-order'
 import { OrcaRuntimeWithReconcileOwnedMobileTerminal } from './mobile-terminal-create-reconciliation'
 import type {
   RuntimeMobileSessionCreateTerminalResult,
@@ -20,7 +17,6 @@ import { deriveRemoteRuntimeTerminalCreateHandle } from '../../remote-runtime-te
 import type { OrcaRuntimeWithBuildPtyTerminalSummary as PtyTerminalSummaryMethods } from '../query/pty-terminal-summary'
 import {
   buildHeadlessMobileSessionTabGroups,
-  placeHeadlessSessionTabAtCapture,
   buildMaterializedHeadlessParentLayout,
   getHeadlessMobileSessionGroupId
 } from '../../mobile-session-layout-projection'
@@ -63,15 +59,8 @@ export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal ext
     const create = (preAllocatedHandle?: string) =>
       this.createTerminal(`id:${worktreeId}`, {
         focus: false,
-        ...(opts.switchExecution
-          ? { presentation: 'background' as const, agentLaunchViewer: () => 'none' as const }
-          : opts.presentation
-            ? { presentation: opts.presentation }
-            : {}),
+        ...(opts.presentation ? { presentation: opts.presentation } : {}),
         ...(opts.afterDesktopTabId ? { afterTabId: opts.afterDesktopTabId } : {}),
-        beforePtySpawn: opts.beforePtySpawn,
-        switchExecution: opts.switchExecution,
-        ...(opts.keepPaneOnStartFailure ? { keepPaneOnStartFailure: true as const } : {}),
         onPtySpawnDispatched: (launch) => {
           if (mutationHandle && launch) {
             recordOwnedMobileTerminalDispatchRecipe(
@@ -119,13 +108,6 @@ export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal ext
         ...(opts.refuseSleptWorktree ? { refuseSleptWorktree: true } : {}),
         ...(opts.resumesSleepingRecord ? { resumesSleepingRecord: true } : {})
       })
-    const beforeCreate = this.mobileSessionTabsByWorktree.get(worktreeId)
-    const { sourceGroup, capturedOrder, capturedTabs } = captureMobileTerminalCreatePlacement(
-      beforeCreate,
-      afterTabId,
-      opts.afterDesktopTabId
-    )
-    let targetGroupId = opts.targetGroupId ?? sourceGroup?.id
     const terminal = opts.createMutation
       ? await this.dedupeTerminalCreate(
           opts.createMutation.clientIdentity,
@@ -174,9 +156,6 @@ export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal ext
           candidate.parentTabId === parentTabId &&
           candidate.leafId === leafId
       ) ?? null
-    if (existingSurface) {
-      targetGroupId = existing?.tabGroups?.find((group) => group.tabOrder.includes(parentTabId))?.id
-    }
     const parentLayout = buildMaterializedHeadlessParentLayout(
       leafId,
       livePty.pty.ptyId,
@@ -187,34 +166,14 @@ export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal ext
       existingSurface?.customTitle !== undefined
         ? existingSurface.customTitle
         : this.getPtyManualTitle(livePty.pty, false) || undefined
-    const viewerRequest = isSessionTabSelectionRequest(opts.switchExecution?.viewerSelection)
-    const publishActivate = opts.switchExecution?.openPlacement?.activate ?? activate
-    activate = activate && !viewerRequest && (opts.switchExecution?.selectionCurrent?.() ?? true)
     const tab: RuntimeMobileSessionTerminalTab = {
       type: 'terminal',
-      ...(existingSurface?.openPlacement
-        ? {
-            openPlacement: {
-              ...existingSurface.openPlacement,
-              activate:
-                existingSurface.openPlacement.activate &&
-                (viewerRequest ? publishActivate : activate)
-            }
-          }
-        : opts.switchExecution?.openPlacement
-          ? {
-              openPlacement: {
-                ...opts.switchExecution.openPlacement,
-                activate: viewerRequest ? publishActivate : activate
-              }
-            }
-          : {}),
       id: `${parentTabId}::${leafId}`,
       parentTabId,
       leafId,
       ptyId: livePty.pty.ptyId,
       incarnationId: livePty.pty.incarnationId,
-      title: existingSurface?.title ?? terminal.title ?? livePty.pty.title ?? 'Terminal',
+      title: terminal.title ?? livePty.pty.title ?? 'Terminal',
       ...(customTitle !== undefined ? { customTitle } : {}),
       // Omit only a proven root correction; an unverifiable fallback keeps its saved request.
       ...((terminal.savedStartupCwd ?? cwd) && (terminal.savedStartupCwd ?? cwd) !== workspace.path
@@ -225,34 +184,42 @@ export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal ext
         ? { viewMode: opts.viewMode }
         : {}),
       parentLayout,
-      isActive: activate || (existingSurface?.isActive ?? false)
+      isActive: activate
     }
-    const currentTabs = (existing?.tabs ?? []).map((candidate) => ({
-      ...candidate,
-      ...(candidate.type === 'terminal' && candidate.parentTabId === parentTabId
-        ? { parentLayout }
-        : {}),
-      isActive: activate ? false : candidate.isActive
-    }))
-    const tabs = existingSurface
-      ? currentTabs.map((candidate) => (candidate.id === tab.id ? tab : candidate))
-      : placeCreatedSessionTab(currentTabs, tab, afterTabId, {
-          afterParentGroup: opts.supportsSplitGroupPlacement !== false,
-          captured: capturedTabs
-        })
+    const tabs = placeCreatedSessionTab(
+      (existing?.tabs ?? []).map((candidate) => ({
+        ...candidate,
+        ...(candidate.type === 'terminal' && candidate.parentTabId === parentTabId
+          ? { parentLayout }
+          : {}),
+        isActive: activate ? false : candidate.isActive
+      })),
+      tab,
+      afterTabId,
+      { afterParentGroup: opts.supportsSplitGroupPlacement !== false }
+    )
     const tabGroups = buildHeadlessMobileSessionTabGroups(
       worktreeId,
       tabs,
       activate ? tab : null,
       existing?.tabGroups,
-      targetGroupId ? { tabId: parentTabId, groupId: targetGroupId } : undefined
+      opts.targetGroupId ? { tabId: parentTabId, groupId: opts.targetGroupId } : undefined
     )
-    if (
-      !existingSurface &&
-      capturedOrder &&
-      (!opts.targetGroupId || opts.targetGroupId === sourceGroup?.id)
-    ) {
-      placeHeadlessSessionTabAtCapture(tabGroups, tabs, parentTabId, capturedOrder)
+    if (opts.afterDesktopTabId) {
+      const group = tabGroups.find((candidate) => candidate.tabOrder.includes(parentTabId))
+      if (group?.tabOrder.includes(opts.afterDesktopTabId)) {
+        const topLevelTabs = tabs.map((candidate) => ({
+          id: candidate.type === 'terminal' ? candidate.parentTabId : candidate.id,
+          isPinned: candidate.isPinned === true
+        }))
+        group.tabOrder = insertTabIdIntoOrder(
+          group.tabOrder,
+          topLevelTabs,
+          parentTabId,
+          tab.isPinned === true,
+          opts.afterDesktopTabId
+        )
+      }
     }
     const next: RuntimeMobileSessionTabsSnapshot = {
       worktree: worktreeId,
@@ -261,8 +228,8 @@ export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal ext
       snapshotVersion: (existing?.snapshotVersion ?? 0) + 1,
       // Activating the new tab must also focus its requested split group.
       activeGroupId:
-        activate && targetGroupId && tabGroups.some((group) => group.id === targetGroupId)
-          ? targetGroupId
+        activate && opts.targetGroupId
+          ? opts.targetGroupId
           : (existing?.activeGroupId ?? getHeadlessMobileSessionGroupId(worktreeId)),
       activeTabId: activate ? tab.id : (existing?.activeTabId ?? null),
       activeTabType: activate ? 'terminal' : (existing?.activeTabType ?? null),
@@ -272,14 +239,7 @@ export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal ext
       tabs
     }
     // Store adds retirement proofs; emit that snapshot because version-deduping subscribers would miss proofs from a pre-store frame.
-    if (activate) {
-      opts.switchExecution?.check()
-      opts.switchExecution?.selectionCurrent?.(true)
-    }
     const stored = this.storeMobileSessionSnapshot(worktreeId, next)
-    if (opts.switchExecution?.openPlacement) {
-      this.markPaneLiveTitlesDirty()
-    }
     const result = this.toMobileSessionTabsResult(stored)
     const changeSequence = ++this.mobileSessionTabsChangeSequence
     for (const subscription of this.mobileSessionTabListeners) {
@@ -297,7 +257,6 @@ export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal ext
     }
     return {
       tab: created,
-      ...(terminal.switchOutcomeUnknown ? { switchOutcomeUnknown: true as const } : {}),
       ...(terminal.agentResumeUnavailable ? { agentResumeUnavailable: true as const } : {}),
       ...(terminal.agentResumeRefused ? { agentResumeRefused: true as const } : {}),
       publicationEpoch: result.publicationEpoch,
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-renderer-create.ts b/src/main/runtime/terminal/launch/mobile-terminal-renderer-create.ts
index f8d21c073331..28facdd1cc22 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-renderer-create.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-renderer-create.ts
@@ -1,4 +1,8 @@
 import { applyRemoteViewerLaunchEnv } from '../../remote-viewer-launch-env'
+import type { MobileTerminalCommandOptions, MobileTerminalCommand } from './mobile-terminal-startup'
+import type { RuntimePtyWorktreeRecord } from '../../runtime-terminal-state-records'
+import type { TerminalWorkspaceLaunchScope } from '../../runtime-legacy-worker-terminal-recovery-types'
+import { OrcaRuntimeWithMobileChatForkCreate } from './mobile-terminal-chat-fork-create'
 import type { RuntimeMobileSessionCreateTerminalResult } from '../../../../shared/runtime-types'
 import { randomUUID } from 'node:crypto'
 import { getRuntimeDesktopSurface } from '../../runtime-desktop-surface'
@@ -12,11 +16,47 @@ import { rendererPublicationThrottle } from '../../../window/renderer-publicatio
 import { deterministicAgentSessionUuid } from '../../runtime-agent-launch-resolution'
 import { assertMobileTerminalShellSupported } from './mobile-terminal-shell-refusal'
 import { anchorTabOfCreate, mainPlacedAfter } from './mobile-terminal-create-anchor'
-import { createPublishedSwitchTerminal } from './mobile-terminal-switch-publication'
-import { OrcaRuntimeWithMobileTerminalCreateOwner } from './mobile-terminal-create-owner'
-import type { MobileTerminalCreateOptions } from './mobile-terminal-create-options'
+import type { MobileTerminalCreateOptions } from './mobile-terminal-create'
+
+export abstract class OrcaRuntimeWithRunCreateMobileSessionTerminal extends OrcaRuntimeWithMobileChatForkCreate {
+  protected abstract resolveMobileSessionTerminalCommand(
+    workspace: TerminalWorkspaceLaunchScope,
+    opts: MobileTerminalCommandOptions
+  ): Promise<MobileTerminalCommand>
+
+  protected abstract ensurePtyBackedMobileSurfaceForRendererTab(
+    worktreeId: string,
+    tabId: string
+  ): RuntimeMobileSessionCreateTerminalResult | null
+
+  protected abstract waitForMobileTerminalSurface(
+    worktreeId: string,
+    parentTabId: string,
+    options?: { timeoutMs?: number; requireReady?: boolean; signal?: AbortSignal }
+  ): Promise<RuntimeMobileSessionCreateTerminalResult>
+
+  protected abstract isReadyMobileTerminalSurface(
+    surface: RuntimeMobileSessionCreateTerminalResult | null
+  ): boolean
+
+  protected abstract deliverPendingStartupCommandToBareRendererPty(
+    worktreeId: string,
+    tabId: string
+  ): void
+
+  protected abstract findMobileTerminalSurface(
+    worktreeId: string,
+    parentTabId: string,
+    options?: { requireReady?: boolean }
+  ): RuntimeMobileSessionCreateTerminalResult | null
+
+  protected abstract findLiveRegisteredPtyForRendererTab(
+    worktreeId: string,
+    tabId: string
+  ): RuntimePtyWorktreeRecord | null
+
+  protected abstract hasLiveShellForRendererTab(worktreeId: string, tabId: string): boolean
 
-export abstract class OrcaRuntimeWithRunCreateMobileSessionTerminal extends OrcaRuntimeWithMobileTerminalCreateOwner {
   protected async runCreateMobileSessionTerminal(
     worktreeSelector: string,
     opts: MobileTerminalCreateOptions = {}
@@ -88,13 +128,7 @@ export abstract class OrcaRuntimeWithRunCreateMobileSessionTerminal extends Orca
       opts.resumeOrigin === 'switch'
         ? { resumeProviderSession: opts.resumeProviderSession, resumeOrigin: opts.resumeOrigin }
         : {}
-    let destinationCurrent = () => {}
-    let dispatched = false
-    let targetGroupId = opts.targetGroupId
-    const createOwned = (
-      identity?: { tabId: string; leafId: string },
-      trackPhysical = opts.switchExecution?.trackPhysical
-    ) =>
+    const createOwned = (identity?: { tabId: string; leafId: string }) =>
       this.createRuntimeOwnedMobileSessionTerminal(
         worktreeId,
         opts.activate !== false,
@@ -110,7 +144,7 @@ export abstract class OrcaRuntimeWithRunCreateMobileSessionTerminal extends Orca
           ...(identity ? { identity } : {}),
           launchAgent: startupCommand.launchAgent,
           viewMode: opts.viewMode,
-          targetGroupId,
+          targetGroupId: opts.targetGroupId,
           ...mainPlacedAfter(
             () => this.mainLayoutTabOfRow(worktreeId, requestedAfterTabId),
             afterDesktopTabId
@@ -119,53 +153,9 @@ export abstract class OrcaRuntimeWithRunCreateMobileSessionTerminal extends Orca
           launchConfig: startupCommand.launchConfig,
           launchRuntime: startupCommand.launchRuntime,
           ...switchStart,
-          ...(opts.switchExecution
-            ? {
-                createMutation: {
-                  clientIdentity: opts.clientNavigationId ?? 'local',
-                  id: opts.clientMutationId!
-                },
-                keepPaneOnStartFailure: true as const,
-                beforePtySpawn: () => {
-                  opts.switchExecution?.check()
-                  destinationCurrent()
-                },
-                onPtySpawnDispatched: () => {
-                  dispatched = true
-                }
-              }
-            : {}),
-          signal: opts.switchExecution?.signal ?? opts.signal,
-          switchExecution: opts.switchExecution
-            ? {
-                ...opts.switchExecution,
-                trackPhysical,
-                check: () => {
-                  opts.switchExecution?.check()
-                  destinationCurrent()
-                }
-              }
-            : undefined
+          signal: opts.signal
         }
       )
-    if (opts.switchExecution) {
-      return createPublishedSwitchTerminal({
-        owner: this,
-        windowAvailable: () => Boolean(this.getAvailableAuthoritativeWindow()),
-        worktreeId,
-        opts,
-        startupCommand,
-        afterDesktopTabId,
-        createOwned,
-        setDestinationCurrent: (check) => {
-          destinationCurrent = check
-        },
-        setTargetGroup: (group) => {
-          targetGroupId = group
-        },
-        wasDispatched: () => dispatched
-      })
-    }
     const win = this.getAvailableAuthoritativeWindow()
     if (!win) {
       return await createOwned()
@@ -304,4 +294,4 @@ export abstract class OrcaRuntimeWithRunCreateMobileSessionTerminal extends Orca
   }
 }
 
-export type { MobileTerminalCreateOptions } from './mobile-terminal-create-options'
+export type { MobileTerminalCreateOptions } from './mobile-terminal-create'
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-switch-publication.ts b/src/main/runtime/terminal/launch/mobile-terminal-switch-publication.ts
deleted file mode 100644
index 0848b1aebc86..000000000000
--- a/src/main/runtime/terminal/launch/mobile-terminal-switch-publication.ts
+++ /dev/null
@@ -1,178 +0,0 @@
-import { isSessionTabSelectionRequest } from '../../../../shared/session-tab-placement'
-import type { OrcaRuntimeWithMobileTerminalCreateOwner } from './mobile-terminal-create-owner'
-import type { MobileTerminalCreateOptions } from './mobile-terminal-create-options'
-import { trackRunningAgentLaunchPane } from '../../../agent-launch/agent-launch-pane-attachment'
-import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
-import type { AgentLaunchTabPublished } from '../../../../shared/agent-launch-tab-publication'
-import type { AgentLaunchPaneVerdict } from '../../../../shared/agent-launch-pane-verdict'
-import type { MobileTerminalCommand } from './mobile-terminal-startup'
-import type { RuntimeMobileSessionCreateTerminalResult } from '../../../../shared/runtime-types'
-import { randomUUID } from 'node:crypto'
-import type { AgentSessionSwitchAuthority } from '../../../../shared/agent-session-switch-execution'
-
-export async function createPublishedSwitchTerminal(args: {
-  owner: Pick<
-    OrcaRuntimeWithMobileTerminalCreateOwner,
-    | 'publishAgentLaunchTabInMainLayout'
-    | 'publishAgentLaunchTab'
-    | 'reportAgentLaunchPaneVerdict'
-    | 'hasLiveTerminalForPaneKey'
-    | 'withdrawAgentLaunchPaneInMainLayout'
-  >
-  windowAvailable: () => boolean
-  worktreeId: string
-  opts: MobileTerminalCreateOptions
-  startupCommand: MobileTerminalCommand
-  afterDesktopTabId: string | undefined
-  createOwned: (
-    identity: { tabId: string; leafId: string },
-    trackPhysical: NonNullable<AgentSessionSwitchAuthority['trackPhysical']>
-  ) => Promise<RuntimeMobileSessionCreateTerminalResult>
-  setDestinationCurrent: (check: () => void) => void
-  setTargetGroup: (group: string) => void
-  wasDispatched: () => boolean
-}): Promise<RuntimeMobileSessionCreateTerminalResult> {
-  const {
-    owner,
-    windowAvailable,
-    worktreeId,
-    opts,
-    startupCommand,
-    afterDesktopTabId,
-    createOwned,
-    setDestinationCurrent,
-    setTargetGroup,
-    wasDispatched
-  } = args
-  opts.switchExecution!.check()
-  const identity = { tabId: randomUUID(), leafId: randomUUID() }
-  const pane = { worktreeId, ...identity, operationId: opts.clientMutationId }
-  const paneKey = `${identity.tabId}:${identity.leafId}`
-  const running = trackRunningAgentLaunchPane({ worktreeId, paneKey })
-  setDestinationCurrent(() => {
-    if (!running.current()) {
-      throw new Error('tab_not_found')
-    }
-  })
-  let shown: AgentLaunchTabPublished | undefined
-  let publicationOwner: 'main' | 'window' = 'window'
-  const physicalOwners = new Set<Promise<unknown>>()
-  const trackPhysical: NonNullable<AgentSessionSwitchAuthority['trackPhysical']> = (
-    work,
-    recover
-  ) => {
-    // Recovery-bearing work is the receiver settlement, independent of acquisition observation.
-    if (recover) {
-      physicalOwners.add(work)
-      void work.then(() => physicalOwners.delete(work)).catch(() => {})
-    }
-    return opts.switchExecution!.trackPhysical?.(work, recover) ?? work
-  }
-  const withdrawUnused = async () => {
-    if (shown?.created !== true || !running.current() || owner.hasLiveTerminalForPaneKey(paneKey)) {
-      return false
-    }
-    const withdrawn = await owner.withdrawAgentLaunchPaneInMainLayout(
-      pane,
-      running.current,
-      shown.withdrawalRoot,
-      publicationOwner
-    )
-    if (withdrawn && running.current()) {
-      owner.reportAgentLaunchPaneVerdict(pane, { kind: 'withdrawn' })
-    }
-    return withdrawn
-  }
-  try {
-    const request = {
-      ...pane,
-      launchAgent: startupCommand.launchAgent ?? 'codex',
-      viewMode: 'terminal' as const,
-      viewer:
-        isSessionTabSelectionRequest(opts.switchExecution!.viewerSelection) ||
-        (opts.switchExecution!.selectionCurrent?.() ?? true)
-          ? opts.switchExecution!.viewer
-          : ('none' as const),
-      viewerSelection: opts.switchExecution!.viewerSelection,
-      placement: opts.switchExecution!.openPlacement?.placement ?? {
-        afterTabId: opts.switchExecution!.afterTabId ?? afterDesktopTabId,
-        groupId: opts.targetGroupId
-      },
-      ...(opts.switchExecution!.openPlacement
-        ? { openPlacement: opts.switchExecution!.openPlacement }
-        : {}),
-      operationId: opts.clientMutationId
-    }
-    const mainPublication =
-      ORCA_LAYOUT_OWNER_IS_MAIN || !windowAvailable()
-        ? owner.publishAgentLaunchTabInMainLayout(
-            request,
-            opts.switchExecution!.check,
-            opts.switchExecution!.selectionCurrent
-          )
-        : null
-    publicationOwner = mainPublication ? 'main' : 'window'
-    const publishing = mainPublication ?? owner.publishAgentLaunchTab(request)
-    if (!publishing) {
-      throw new Error('runtime_unavailable')
-    }
-    shown = await publishing
-    setTargetGroup(shown.placement.groupId)
-    opts.switchExecution!.check()
-    if (!running.current()) {
-      throw new Error('tab_not_found')
-    }
-    const result = await createOwned(identity, trackPhysical)
-    if (result.tab.parentTabId === identity.tabId && result.tab.leafId === identity.leafId) {
-      running.agentBound()
-      running.finish({ kind: 'proceed' })
-      owner.reportAgentLaunchPaneVerdict(pane, { kind: 'proceed' })
-    } else {
-      const { parentTabId, leafId } = result.tab
-      if (!parentTabId || !leafId) {
-        throw new Error('terminal_handle_stale')
-      }
-      owner.reportAgentLaunchPaneVerdict(
-        {
-          worktreeId,
-          tabId: parentTabId,
-          leafId,
-          operationId: opts.clientMutationId
-        },
-        { kind: 'proceed' }
-      )
-      const cleanup =
-        physicalOwners.size > 0
-          ? Promise.all(physicalOwners).then(withdrawUnused)
-          : withdrawUnused()
-      void cleanup
-        .then((withdrawn) => {
-          running.finish(withdrawn ? { kind: 'withdrawn' } : { kind: 'unconfirmed' })
-        })
-        .catch(() => running.finish({ kind: 'unconfirmed' }))
-    }
-    return result
-  } catch (error) {
-    const live = owner.hasLiveTerminalForPaneKey(paneKey)
-    const withdraw =
-      shown?.created === true && running.current() && !live && physicalOwners.size === 0
-    const verdict: AgentLaunchPaneVerdict = withdraw
-      ? { kind: 'withdrawn' }
-      : wasDispatched() && !live
-        ? { kind: 'unconfirmed' }
-        : { kind: 'proceed' }
-    running.finish(verdict)
-    if (withdraw) {
-      await withdrawUnused()
-    } else if (running.current() || live) {
-      owner.reportAgentLaunchPaneVerdict(pane, verdict)
-    }
-    if (physicalOwners.size > 0) {
-      // The receiver's real completion, not this observer's error, permits unused cleanup.
-      void Promise.all(physicalOwners)
-        .then(withdrawUnused)
-        .catch(() => {})
-    }
-    throw error
-  }
-}
diff --git a/src/main/runtime/terminal/launch/terminal-create-completion.ts b/src/main/runtime/terminal/launch/terminal-create-completion.ts
index b73463389520..cdd45b9611e1 100644
--- a/src/main/runtime/terminal/launch/terminal-create-completion.ts
+++ b/src/main/runtime/terminal/launch/terminal-create-completion.ts
@@ -67,7 +67,6 @@ export function prepareTerminalCreateCompletion(args: {
     result: ({ surface, warning }: Awaited<ReturnType<typeof revealCreatedTerminal>>) => {
       return {
         ...terminalLaunchPublicFacts(result, launch.adoptedStablePane, pty),
-        ...(result.switchOutcomeUnknown ? { switchOutcomeUnknown: true as const } : {}),
         handle,
         savedStartupCwd,
         tabId,
diff --git a/src/main/runtime/terminal/launch/terminal-create.ts b/src/main/runtime/terminal/launch/terminal-create.ts
index a908981534f6..e35e98b9e541 100644
--- a/src/main/runtime/terminal/launch/terminal-create.ts
+++ b/src/main/runtime/terminal/launch/terminal-create.ts
@@ -4,10 +4,7 @@ import { OrcaRuntimeWithTerminalCreateDeduplication } from './terminal-create-de
 import * as dependencies from '../../orca-runtime-create-terminal-dependencies'
 import { createDesktopTerminal } from '../../orca-runtime-create-terminal-desktop'
 import { terminalCreateTeamAllocation } from './terminal-create-team-allocation'
-import {
-  createIdempotentCallback,
-  reportTerminalSpawnDispatched
-} from '../../orca-runtime-report-pty-spawn-commit'
+import { createIdempotentCallback } from '../../orca-runtime-report-pty-spawn-commit'
 import { recordPtySurface, spawnSurfaceClaimSequence } from '../../pty-recorded-surface-topology'
 import { agentLaunchTokenFor, withAgentLaunchToken } from '../../../agent-launch/agent-launch-token'
 import { seedPtyLaunchTitle } from './pty-launch-title'
@@ -40,7 +37,6 @@ export abstract class OrcaRuntimeWithCreateTerminal extends OrcaRuntimeWithTermi
       }
       const workspace = await this.resolveTerminalCreateLaunchScope(worktreeSelector, created, opts)
       const launchOpts = await this.resolveAgentTerminalCreateOptions(workspace, opts)
-      launchOpts.switchExecution?.check()
       const launchTitleAt = { sequence: this.nextTitleObservationSequence(), epochMs: Date.now() }
       let cwd = this.resolveWorkspaceTerminalStartupCwd(workspace, launchOpts.cwd) ?? workspace.path
       const session = this.getWorkspaceSessionForWorktree(workspace.id)
@@ -110,15 +106,13 @@ export abstract class OrcaRuntimeWithCreateTerminal extends OrcaRuntimeWithTermi
         }
         try {
           const { launchAgent } = launchOpts
+          launchOpts.onPtySpawnDispatched?.({
+            tabId,
+            leafId,
+            launchConfig: effectiveLaunchConfig,
+            launchAgent
+          })
           result = await dependencies.spawnInAdmittedPane(this.store, ptyController, {
-            keepOnFailure: launchOpts.keepPaneOnStartFailure,
-            beforeAdmission: launchOpts.beforePtySpawn,
-            beforeSpawn: reportTerminalSpawnDispatched(launchOpts, () => ({
-              tabId,
-              leafId,
-              launchConfig: effectiveLaunchConfig,
-              launchAgent
-            })),
             ...initialSize,
             cwd,
             command: sequencedStartupCommand
@@ -189,36 +183,28 @@ export abstract class OrcaRuntimeWithCreateTerminal extends OrcaRuntimeWithTermi
         if (launchOpts.signal?.aborted) {
           throw new Error('client_disconnected')
         }
-        const acquire = async () => {
-          const adoptedBeforeLaunch = await ptyController.adoptStablePane?.({
-            ...initialSize,
-            cwd,
-            connectionId: workspace.connectionId,
-            worktreeId: workspace.id,
-            preAllocatedHandle,
-            tabId,
-            leafId,
-            spawnFresh,
-            onOutcome: (outcome, operation) => {
-              claimedStablePaneCreate?.acceptOutcome?.(outcome, operation)
-              teamAllocation.acceptOutcome(outcome)
-            },
-            switchExecution: launchOpts.switchExecution,
-            signal: launchOpts.signal
-          })
-          if (adoptedBeforeLaunch) {
-            result = dependencies.materializedStablePaneReply(
-              adoptedBeforeLaunch,
-              preAllocatedHandle
-            )
-            Object.assign(result, this.getTerminalLaunchResult(result.id))
-          } else if (!ptyController.adoptStablePane) {
-            result = await spawnFresh({ mustExist: false })
-            teamAllocation.acceptFresh(result)
-          }
+        const adoptedBeforeLaunch = await ptyController.adoptStablePane?.({
+          ...initialSize,
+          cwd,
+          connectionId: workspace.connectionId,
+          worktreeId: workspace.id,
+          preAllocatedHandle,
+          tabId,
+          leafId,
+          spawnFresh,
+          onOutcome: (outcome, operation) => {
+            claimedStablePaneCreate?.acceptOutcome?.(outcome, operation)
+            teamAllocation.acceptOutcome(outcome)
+          },
+          signal: launchOpts.signal
+        })
+        if (adoptedBeforeLaunch) {
+          result = dependencies.materializedStablePaneReply(adoptedBeforeLaunch, preAllocatedHandle)
+          Object.assign(result, this.getTerminalLaunchResult(result.id))
+        } else if (!ptyController.adoptStablePane) {
+          result = await spawnFresh({ mustExist: false })
+          teamAllocation.acceptFresh(result)
         }
-        const physical = acquire()
-        await (launchOpts.switchExecution?.trackPhysical?.(physical) ?? physical)
         if (!result.stablePaneOwner) {
           reportPtySpawnCommitted()
         }
@@ -231,9 +217,7 @@ export abstract class OrcaRuntimeWithCreateTerminal extends OrcaRuntimeWithTermi
           launchToken
         })
         if (launch.surface) {
-          tabId = launch.surface.tabId
-          leafId = launch.surface.leafId
-          preAllocatedHandle = launch.surface.terminalHandle ?? preAllocatedHandle
+          ;({ terminalHandle: preAllocatedHandle, tabId, leafId } = launch.surface)
           paneKey = dependencies.makePaneKey(tabId, leafId)
         }
         this.assertCreatedPtyRegistrationAllowed(result.id, result.incarnationId)
diff --git a/src/main/runtime/terminal/launch/terminal-launch-result.ts b/src/main/runtime/terminal/launch/terminal-launch-result.ts
index 1a4e689f7e3e..aff6c0d4dfed 100644
--- a/src/main/runtime/terminal/launch/terminal-launch-result.ts
+++ b/src/main/runtime/terminal/launch/terminal-launch-result.ts
@@ -26,14 +26,6 @@ export function resolveTerminalLaunchResult(
   const requestedRecipeUnavailable = refused || result.agentResumeUnavailable || adoptedStablePane
   const owner = result.stablePaneOwner
   const surface =
-    (result.switchRecoveredSurface
-      ? {
-          ...result.switchRecoveredSurface,
-          terminalHandle:
-            result.agentSessionEnsure?.owner.surface.terminalHandle ??
-            result.stablePaneOwner?.handle
-        }
-      : undefined) ??
     result.agentSessionEnsure?.owner.surface ??
     (owner ? { terminalHandle: owner.handle, tabId: owner.tabId, leafId: owner.leafId } : undefined)
   return {
diff --git a/src/main/runtime/terminal/lifecycle/bind-first-registration-census.test.ts b/src/main/runtime/terminal/lifecycle/bind-first-registration-census.test.ts
deleted file mode 100644
index 831da7cbb110..000000000000
--- a/src/main/runtime/terminal/lifecycle/bind-first-registration-census.test.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-// Census every registration path and its preceding binding write; new paths must establish pane ownership before registering (L80).
-import { readFileSync } from 'node:fs'
-import path from 'node:path'
-import ts from 'typescript-api'
-import { describe, expect, it } from 'vitest'
-
-const ROOT = path.resolve(__dirname, '../../../../..')
-
-/** Create path → the registration site and the binding write that precedes it in the same function. */
-const CREATE_PATHS = [
-  {
-    // Both start lanes (window spawn, agent launch included, and runtime spawn) commit here.
-    path: 'spawn commit, a new terminal',
-    file: 'src/main/ipc/pty/spawn-commit-assembly.ts',
-    bindsWith: 'savePtySpawnPaneBinding('
-  },
-  {
-    // Adoption reuses the live owner surface; switch reconciliation binds it before registration.
-    path: 'spawn commit, an adopted live owner',
-    file: 'src/main/ipc/pty/spawn-commit-adopted-session.ts',
-    bindsWith: 'adopted.owner'
-  },
-  {
-    path: 'pane adoption of a live session',
-    file: 'src/main/ipc/pty/pane/complete-pane-adoption.ts',
-    bindsWith: 'persistAdmittedStablePaneBinding('
-  },
-  {
-    path: 'runtime create: CLI terminal.create, orchestration and federated workers, provisioning',
-    file: 'src/main/runtime/terminal/launch/terminal-create.ts',
-    bindsWith: 'spawnInAdmittedPane('
-  },
-  {
-    path: 'runtime-owned mobile create and restored-pane start',
-    file: 'src/main/runtime/terminal/launch/mobile-terminal-create-reconciliation.ts',
-    bindsWith: 'persistFreshPaneBinding('
-  },
-  {
-    path: 'CLI split of a terminal',
-    file: 'src/main/runtime/terminal/launch/terminal-split-surface.ts',
-    bindsWith: 'spawnInAdmittedPane('
-  },
-  {
-    path: 'split main starts in its own layout',
-    file: 'src/main/runtime/terminal/launch/terminal-split-in-main.ts',
-    bindsWith: 'spawnInAdmittedPane('
-  }
-] as const
-
-/** The registration call itself, not a site that registers a terminal. */
-const DEFINITION = 'src/main/ipc/pty/pane/spawn-registration.ts'
-
-function calleeName(call: ts.CallExpression): string | null {
-  const callee = call.expression
-  if (ts.isIdentifier(callee)) {
-    return callee.text
-  }
-  return ts.isPropertyAccessExpression(callee) ? callee.name.text : null
-}
-
-function enclosingFunction(node: ts.Node): ts.Node | null {
-  for (let current = node.parent; current; current = current.parent) {
-    if (ts.isFunctionLike(current)) {
-      return current
-    }
-  }
-  return null
-}
-
-/** Each runtime registration in the file, with its function's source before the call. */
-function registrations(file: string): { line: number; textBefore: string }[] {
-  const text = readFileSync(path.join(ROOT, file), 'utf8')
-  const source = ts.createSourceFile(file, text, ts.ScriptTarget.Latest, true)
-  const found: { line: number; textBefore: string }[] = []
-  const visit = (node: ts.Node): void => {
-    if (ts.isCallExpression(node)) {
-      const name = calleeName(node)
-      if (
-        name === 'registerPersistedPtySpawn' ||
-        (name === 'registerPty' && ts.isPropertyAccessExpression(node.expression))
-      ) {
-        const fn = enclosingFunction(node)
-        found.push({
-          line: source.getLineAndCharacterOfPosition(node.getStart()).line + 1,
-          textBefore: fn ? text.slice(fn.getStart(), node.getStart()) : ''
-        })
-      }
-    }
-    ts.forEachChild(node, visit)
-  }
-  visit(source)
-  return found
-}
-
-function productionFiles(dir: string): string[] {
-  const out: string[] = []
-  const walk = (current: string): void => {
-    for (const entry of ts.sys.readDirectory(current, ['.ts'], undefined, undefined)) {
-      const relative = path.relative(ROOT, entry).split(path.sep).join('/')
-      if (
-        !/\.(test|spec)\.ts$/.test(relative) &&
-        !/(fixture|harness)/.test(relative) &&
-        relative !== DEFINITION
-      ) {
-        out.push(relative)
-      }
-    }
-  }
-  walk(path.join(ROOT, dir))
-  return out
-}
-
-describe('bind-first registration census (L80)', () => {
-  it('lists every runtime registration site with the binding write before it', () => {
-    const listed = new Set<string>(CREATE_PATHS.map((entry) => entry.file))
-    const unlisted = productionFiles('src/main').filter(
-      (file) => !listed.has(file) && registrations(file).length > 0
-    )
-    expect(unlisted).toEqual([])
-    for (const file of listed) {
-      const binds = CREATE_PATHS.filter((entry) => entry.file === file).map((e) => e.bindsWith)
-      const sites = registrations(file)
-      expect(sites.length, file).toBeGreaterThan(0)
-      // Every registration in the file runs after one of its paths' binding writes, in its function.
-      const unbound = sites.filter((site) => !binds.some((bind) => site.textBefore.includes(bind)))
-      expect(
-        unbound.map((site) => `${file}:${site.line}`),
-        `registers before binding (${binds.join(', ')})`
-      ).toEqual([])
-    }
-  })
-})
diff --git a/src/main/runtime/workspace-layout-stream.ts b/src/main/runtime/workspace-layout-stream.ts
index de968ad87caf..4dff05ebf472 100644
--- a/src/main/runtime/workspace-layout-stream.ts
+++ b/src/main/runtime/workspace-layout-stream.ts
@@ -79,7 +79,6 @@ export class WorkspaceLayoutStream {
       store: () => StreamStore | null
       homeHostId: (key: string) => ExecutionHostId | null
       liveTitle: (ptyId: string) => string | null
-      withOpenPlacements?: (layout: PublishedWorkspaceLayout) => PublishedWorkspaceLayout
     }
   ) {
     this.projection = new WorkspaceLayoutProjection(deps)
@@ -246,18 +245,13 @@ export class WorkspaceLayoutStream {
       const titles = paneLiveTitlesOf(layout, this.deps)
       // Switch point: a pane's start facts are live state, laid over as its title is.
       const starts = ORCA_LAYOUT_OWNER_IS_MAIN ? paneStartFactsOf(layout, this.deps) : null
-      const placed = this.deps.withOpenPlacements?.(layout) ?? layout
-      const liveTitles = JSON.stringify([
-        titles,
-        starts,
-        placed.tabs.map((tab) => tab.openPlacement)
-      ])
+      const liveTitles = JSON.stringify(starts ? [titles, starts] : titles)
       const previous = before.get(key)
       if (previous?.json === json && previous.liveTitles === liveTitles) {
         shown.set(key, previous)
         continue
       }
-      const shownLayout = withLiveTitles(placed, titles)
+      const shownLayout = withLiveTitles(layout, titles)
       const laid = starts ? withPaneStartFacts(shownLayout, starts) : shownLayout
       shown.set(key, { json, liveTitles, layout: laid })
       changed.push(key)
@@ -309,8 +303,7 @@ export class WorkspaceLayoutStream {
   private freshLayouts(): Map<string, PublishedWorkspaceLayout> {
     const fresh = new Map<string, PublishedWorkspaceLayout>()
     for (const [key, { layout }] of this.projection.projectFresh()) {
-      const placed = this.deps.withOpenPlacements?.(layout) ?? layout
-      const titled = withLiveTitles(placed, paneLiveTitlesOf(layout, this.deps))
+      const titled = withLiveTitles(layout, paneLiveTitlesOf(layout, this.deps))
       const starts = ORCA_LAYOUT_OWNER_IS_MAIN ? paneStartFactsOf(layout, this.deps) : null
       fresh.set(key, starts ? withPaneStartFacts(titled, starts) : titled)
     }
diff --git a/src/main/window/agent-launch-tab-publish-relay.ts b/src/main/window/agent-launch-tab-publish-relay.ts
index 3986f043b4fb..cef2fd887cee 100644
--- a/src/main/window/agent-launch-tab-publish-relay.ts
+++ b/src/main/window/agent-launch-tab-publish-relay.ts
@@ -43,13 +43,7 @@ export function requestAgentLaunchTabPublishFromRenderer(
         finish(new Error(reply.error))
         return
       }
-      finish(null, {
-        tabId: reply.tabId,
-        created: reply.created,
-        placement: reply.placement,
-        withdrawalRoot: reply.withdrawalRoot,
-        withdrawn: reply.withdrawn
-      })
+      finish(null, { tabId: reply.tabId, created: reply.created, placement: reply.placement })
     }
     ipcMain.on('agentLaunch:tabPublishReply', onReply)
     webContents.send('ui:publishAgentLaunchTab', { ...request, requestId })
diff --git a/src/main/window/session-tab-close-request-relay.ts b/src/main/window/session-tab-close-request-relay.ts
index 409e87d99b2d..834da75f24fb 100644
--- a/src/main/window/session-tab-close-request-relay.ts
+++ b/src/main/window/session-tab-close-request-relay.ts
@@ -15,18 +15,17 @@ const SESSION_TAB_CLOSE_RESPONSE_GRACE_MS = 5_000
 export async function requestSessionTabCloseFromRenderer(
   mainWindow: BrowserWindow,
   tabId: string,
-  worktreeId: string,
-  switchProjection?: SessionTabCloseRequest['switchProjection']
-): Promise<void | boolean> {
+  worktreeId: string
+): Promise<void> {
   if (mainWindow.isDestroyed() || mainWindow.webContents.isDestroyed()) {
     throw new Error('renderer_unavailable')
   }
   const webContents = mainWindow.webContents
   const requestId = randomUUID()
-  return await new Promise<void | boolean>((resolve, reject) => {
+  await new Promise<void>((resolve, reject) => {
     let settled = false
     const releaseListeners: (() => void)[] = []
-    const finish = (error?: Error, applied?: boolean): void => {
+    const finish = (error?: Error): void => {
       if (settled) {
         return
       }
@@ -38,7 +37,7 @@ export async function requestSessionTabCloseFromRenderer(
       if (error) {
         reject(error)
       } else {
-        resolve(applied)
+        resolve()
       }
     }
     const onRendererUnavailable = (): void => finish(new Error('renderer_unavailable'))
@@ -46,7 +45,7 @@ export async function requestSessionTabCloseFromRenderer(
       if (event.sender !== webContents || response.requestId !== requestId) {
         return
       }
-      finish(response.error ? new Error(response.error) : undefined, response.switchApplied)
+      finish(response.error ? new Error(response.error) : undefined)
     }
     const expiresAt = Date.now() + SESSION_TAB_CLOSE_CONFIRMATION_MS
     const timeout = setTimeout(
@@ -63,13 +62,7 @@ export async function requestSessionTabCloseFromRenderer(
         onRendererUnavailable
       )
     )
-    const request: SessionTabCloseRequest = {
-      requestId,
-      tabId,
-      worktreeId,
-      expiresAt,
-      ...(switchProjection ? { switchProjection } : {})
-    }
+    const request: SessionTabCloseRequest = { requestId, tabId, worktreeId, expiresAt }
     try {
       webContents.send('ui:sessionTabCloseRequest', request)
     } catch {
diff --git a/src/shared/agent-launch-pane-verdict.ts b/src/shared/agent-launch-pane-verdict.ts
index 8bb1c47cb4d9..b36ece9c65d5 100644
--- a/src/shared/agent-launch-pane-verdict.ts
+++ b/src/shared/agent-launch-pane-verdict.ts
@@ -22,17 +22,10 @@ export type AgentLaunchPaneVerdict =
 export const AGENT_LAUNCH_PANE_REFUSED_CODE = 'agent_launch_pane_refused'
 
 /** The pane a verdict is about, as the window addresses it. */
-export type AgentLaunchPaneAddress = {
-  worktreeId: string
-  tabId: string
-  leafId: string
-  operationId?: string
-}
+export type AgentLaunchPaneAddress = { worktreeId: string; tabId: string; leafId: string }
 
 export type AgentLaunchPaneVerdictEvent = AgentLaunchPaneAddress & {
   verdict: AgentLaunchPaneVerdict
-  accepted?: true
-  withdrawalRoot?: string
 }
 
 /** A launch pane as the window saves it: only a pending one, since its outcome is this session's. */
diff --git a/src/shared/agent-launch-tab-publication.ts b/src/shared/agent-launch-tab-publication.ts
index d41abfade4c9..d62125604354 100644
--- a/src/shared/agent-launch-tab-publication.ts
+++ b/src/shared/agent-launch-tab-publication.ts
@@ -2,7 +2,6 @@
 
 import type { AgentLaunchPlacement, AgentLaunchPlacementReceipt } from './agent-launch-intent'
 import type { TuiAgent } from './tui-agent'
-import type { SessionTabOpenPlacement } from './session-tab-placement'
 
 /**
  * Whose screen moves, decided on the host from who called. Mirrors the browser-tab split between
@@ -22,17 +21,13 @@ export type AgentLaunchTabViewerRule =
 
 export type AgentLaunchTabPublishRequest = {
   requestId: string
-  withdraw?: { root: string }
   worktreeId: string
   tabId: string
   leafId: string
   launchAgent: TuiAgent
   viewMode: 'terminal' | 'chat'
   placement?: AgentLaunchPlacement
-  openPlacement?: SessionTabOpenPlacement
   viewer: AgentLaunchTabViewerRule
-  /** Original caller navigation, compared by the addressed viewer at its final selection writer. */
-  viewerSelection?: string
   /** The launch's prompt, so a pane whose agent did not start can offer to copy it. */
   prompt?: string
   /** Which launch this is: a retry of the same one never resets what the tab keeps about it. */
@@ -48,8 +43,6 @@ export type AgentLaunchTabPublishReply =
       /** True for a tab created by this launch (including just before request); false for retries finding it. */
       created: boolean
       placement: AgentLaunchPlacementReceipt
-      withdrawalRoot?: string
-      withdrawn?: boolean
     }
   | { requestId: string; error: string }
 
@@ -58,18 +51,4 @@ export type AgentLaunchTabPublished = {
   tabId: string
   created: boolean
   placement: AgentLaunchPlacementReceipt
-  /** Original provisional root, used only by the creating owner for conditional withdrawal. */
-  withdrawalRoot?: string
-  withdrawn?: boolean
-}
-
-export function launchTabWithdrawalIdentity(
-  root: unknown,
-  tabs: readonly { id: string; entityId?: string; groupId?: string }[],
-  groups: readonly { id: string; tabOrder: string[] }[],
-  tabId: string
-): string {
-  const tab = tabs.find((row) => row.entityId === tabId || row.id === tabId)
-  const group = groups.find((row) => row.id === tab?.groupId)
-  return JSON.stringify([root, tab?.groupId, group?.tabOrder.indexOf(tab?.id ?? '')])
 }
diff --git a/src/shared/runtime-session-contracts.ts b/src/shared/runtime-session-contracts.ts
index 06b72c7be3da..0144a0308efe 100644
--- a/src/shared/runtime-session-contracts.ts
+++ b/src/shared/runtime-session-contracts.ts
@@ -18,7 +18,6 @@ import type {
 import type { CliStatusCaller } from './orchestration-caller-status'
 import type { RuntimeHostDescriptor } from './runtime-host-descriptor'
 import type { TuiAgent } from './tui-agent'
-import type { SessionSwitchProjection } from './agent-session-switch-execution'
 
 export type * from './runtime-mobile-session-tab-contracts'
 
@@ -166,7 +165,6 @@ export type RuntimeMountedLeaf = {
 }
 
 export type RuntimeSyncWindowGraph = {
-  conditionalSwitchProjection?: 1
   tabs: RuntimeSyncedTab[]
   leaves: RuntimeSyncedLeaf[]
   /** Layout-owner windows report main-owned panes here; tabs/leaves then cover other workspaces. Window-to-main only. */
@@ -255,7 +253,6 @@ export type RuntimeMobileSessionTabsSnapshot = {
   activeTabType: 'terminal' | 'markdown' | 'file' | 'browser' | 'agent-session' | null
   tabGroups?: RuntimeMobileSessionTabGroup[]
   tabGroupLayout?: TabGroupLayoutNode | null
-  switchProjections?: SessionSwitchProjection[]
   retiredTerminalSurfaces?: RuntimeMobileSessionRetiredTerminalSurface[]
   tabs: RuntimeMobileSessionSnapshotTab[]
 }
@@ -280,7 +277,6 @@ export type RuntimeMobileSessionTabsResult = {
   activeTabType: 'terminal' | 'markdown' | 'file' | 'browser' | 'agent-session' | null
   tabGroups?: RuntimeMobileSessionTabGroup[]
   tabGroupLayout?: TabGroupLayoutNode | null
-  switchProjections?: SessionSwitchProjection[]
   retiredTerminalSurfaces?: RuntimeMobileSessionRetiredTerminalSurface[]
   tabs: RuntimeMobileSessionClientTab[]
   /** After restart, client-hosted browser rows may be unknown while terminals are authoritative. Preserve absent
@@ -298,7 +294,6 @@ export type RuntimeMobileSessionCreateTerminalResult = {
   warning?: 'desktop-tab-not-shown'
   agentResumeRefused?: true
   agentResumeUnavailable?: true
-  switchOutcomeUnknown?: true
   /** The saved folder was gone, so the terminal started at the workspace root. */
   startupCwdFallback?: 'workspace-root'
 }
diff --git a/src/shared/runtime-terminal-create-contract.ts b/src/shared/runtime-terminal-create-contract.ts
index 4b4ac8d5c8e7..e4fc3e55ca52 100644
--- a/src/shared/runtime-terminal-create-contract.ts
+++ b/src/shared/runtime-terminal-create-contract.ts
@@ -3,7 +3,6 @@ import type { ExecutionHostId } from './execution-host'
 import type { StartupCwdFallback } from './startup-cwd-fallback'
 
 export type RuntimeTerminalCreate = TerminalLaunchResult & {
-  switchOutcomeUnknown?: true
   coldRestore?: { scrollback: string; cwd: string; cols?: number; rows?: number }
   handle: string
   /** Host-owned PTY incarnation used to fence remote identity observations. */
diff --git a/src/shared/session-tab-close.ts b/src/shared/session-tab-close.ts
index 85d91f49a58f..2817e729a92a 100644
--- a/src/shared/session-tab-close.ts
+++ b/src/shared/session-tab-close.ts
@@ -1,5 +1,3 @@
-import type { SessionSwitchProjection } from './agent-session-switch-execution'
-
 export const SESSION_TAB_CLOSE_CANCELED_ERROR = 'session_tab_close_canceled'
 export const SESSION_TAB_CLOSE_FAILED_ERROR = 'session_tab_close_failed'
 export const SESSION_TAB_NOT_FOUND_ERROR = 'session_tab_not_found'
@@ -10,11 +8,9 @@ export type SessionTabCloseRequest = {
   tabId: string
   worktreeId: string
   expiresAt?: number
-  switchProjection?: SessionSwitchProjection
 }
 
 export type SessionTabCloseResponse = {
   requestId: string
   error?: string
-  switchApplied?: boolean
 }
diff --git a/src/shared/session-tab-placement.ts b/src/shared/session-tab-placement.ts
index 3e75fd0e089e..0727f809675c 100644
--- a/src/shared/session-tab-placement.ts
+++ b/src/shared/session-tab-placement.ts
@@ -1,22 +1,5 @@
-import type { TerminalSurfaceCloseIdentity } from './terminal-tab-close'
 import { insertTabIdIntoOrder, partitionPinnedTabOrder } from './workspace-layout/tab-order'
 
-/** The existing host command's open intent, carried with membership to the actual layout owner. */
-export type SessionTabOpenPlacement = {
-  invocationId: string
-  generation: string
-  placement: { groupId?: string; afterTabId?: string; index?: number }
-  activate: boolean
-  viewerSelection?: string
-  /** Present for terminal-to-chat; source reuse cannot turn its captured index into authority. */
-  source?: TerminalSurfaceCloseIdentity
-}
-
-/** Recognizes viewer-owned requests; only the initiating viewer can admit or consume one. */
-export function isSessionTabSelectionRequest(token: string | undefined): boolean {
-  return token?.startsWith('selection-v1:') === true && token.length > 'selection-v1:'.length
-}
-
 /** Call-local neighbors survive an anchor retiring while creation is awaited. */
 export type CapturedSessionTabPlacement = { preceding: string[]; following: string[] }
 
diff --git a/src/shared/structured-agent-cli-conversation-adoption.ts b/src/shared/structured-agent-cli-conversation-adoption.ts
index fa68a5e3e5cd..9e61f5a80edf 100644
--- a/src/shared/structured-agent-cli-conversation-adoption.ts
+++ b/src/shared/structured-agent-cli-conversation-adoption.ts
@@ -54,15 +54,16 @@ export function inPlaceSwitchEnabled(agent: unknown): boolean {
 
 /** What a host advertises per enabled agent; a peer without it never receives a switch. */
 export function inPlaceSwitchCapability(agent: string): string {
-  return `agent-session.structured.switch.creation-settlement-v1:${agent}`
+  return `agent-session.structured.switch.v1:${agent}`
 }
 
-export const IN_PLACE_SWITCH_RUNTIME_CAPABILITIES = IN_PLACE_SWITCH_AGENTS.map(
-  inPlaceSwitchExecutionCapability
-)
+export const IN_PLACE_SWITCH_RUNTIME_CAPABILITIES = IN_PLACE_SWITCH_AGENTS.flatMap((agent) => [
+  inPlaceSwitchCapability(agent),
+  inPlaceSwitchExecutionCapability(agent)
+])
 
 export function inPlaceSwitchExecutionCapability(agent: string): string {
-  return `agent-session.structured.switch.creation-settlement-v1:${agent}`
+  return `agent-session.structured.switch-execution.v1:${agent}`
 }
 
 /** `saved`: built from a pane's saved facts; `switch`: the terminal half of a chat's switch. */
diff --git a/src/shared/terminal-process-inspection.ts b/src/shared/terminal-process-inspection.ts
index 7f16368dea34..a469fd4a9868 100644
--- a/src/shared/terminal-process-inspection.ts
+++ b/src/shared/terminal-process-inspection.ts
@@ -27,7 +27,6 @@ export type ClientOnlyUnverifiableInspection = {
 
 /** Compatibility-shaped host/local inspection returned by the inspect RPC. */
 export type HostProcessInspection = {
-  switchWitness?: string
   suspendedAgentProcess?: string
 
   foregroundProcess: string | null

From 263ed74b2e6d7ce8cb2ea6f7adb158788fbf6d6d Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 15:04:06 -0700
Subject: [PATCH 128/207] Send the switch as one request and show progress on
 its control

The renderer drove the switch through presentation visits, selection tokens
and projection reads that mirrored the host's phases. With the host placing
the destination in one write, the client needs one RPC and one settle: the
control that started the switch disables at once and shows a spinner after
200 ms, no empty tab appears before the terminal exists, and every exit
reports once. Deletes the selection-token, presentation-retirement and
open-placement machinery and their tests.
---
 config/renderer-layout-writer-baseline.txt    |   2 -
 config/scripts/vitest-node-runtime-files.mjs  |   1 -
 .../BrowserPaneOverlayLayer.tsx               |   6 +-
 .../dashboard/reveal-dashboard-agent.ts       |   2 -
 .../editor/check-annotation-open.ts           |   2 -
 .../EmulatorPaneOverlayLayer.tsx              |   6 +-
 .../use-floating-terminal-create-actions.ts   |   5 -
 .../native-chat/NativeChatMessageList.tsx     |   2 -
 .../native-chat/NativeChatNoticeRow.tsx       |   7 +-
 .../NativeChatResumeInCliButton.tsx           |  13 +-
 .../NativeChatStructuredSession.tsx           | 273 +++++----
 .../NativeChatTopRightControls.tsx            |   7 +-
 ...StructuredAgentSessionPaneOverlayLayer.tsx |   6 +-
 ...structured-agent-session-message-sender.ts |   3 -
 .../use-native-chat-toggle-shortcut.ts        |   2 -
 .../components/quick-open-file-navigation.ts  |   2 -
 .../ai-vault-original-pane-actions.ts         |   3 -
 .../ai-vault-session-launch-actions.ts        |   4 -
 .../ai-vault-session-resume-in-chat-launch.ts |  15 -
 .../use-right-sidebar-tab-routing.ts          |   2 -
 .../right-sidebar/useFileExplorerHandlers.ts  |   2 -
 .../sidebar/WorkspaceAttachmentOrigins.tsx    |   2 -
 .../sidebar/activate-retained-agent-row.ts    |   2 -
 .../sidebar/use-worktree-agent-activation.ts  |   2 -
 .../status-bar/resource-session-navigation.ts |   2 -
 .../status-bar/use-resource-usage-actions.ts  |   3 -
 .../tab-bar/TabSessionSwitchHoverAction.tsx   |  11 +-
 .../tab-bar/cli-chat-resume-feedback.ts       |  14 +-
 .../cli-chat-resume-ordinary-feedback.ts      |  16 +-
 .../tab-bar/cli-chat-resume-ordinary-run.ts   |  20 +-
 .../components/tab-bar/cli-chat-resume-run.ts |   5 -
 .../tab-bar/native-chat-cli-fork-run.ts       |   4 +-
 .../tab-bar/native-chat-cli-switch-run.ts     |   1 -
 .../tab-bar/use-tab-bar-item-actions.ts       |  23 +-
 .../tab-group/tab-drag-drop-commit.ts         |   4 -
 .../tab-group-layout-owner-commands.ts        |   4 -
 .../useTabGroupActivationCommands.ts          |   5 -
 .../tab-group/useTabGroupCreationCommands.ts  |   8 -
 .../tab-group/useTabGroupWorkspaceModel.ts    |   2 -
 .../TerminalPaneOverlayLayer.tsx              |   6 +-
 .../TerminalPaneResumeInChatButton.tsx        |  16 +-
 .../terminal-file-open-routing.ts             |   2 -
 .../terminal-pane/terminal-handle-links.ts    |   2 -
 .../terminal-pane-mount-context.ts            |   1 -
 .../terminal-pane-mount-preparation.ts        |  21 +-
 .../terminal-pane-mount-registration.ts       |  76 ---
 .../terminal-pane-pane-closed.ts              |  10 +-
 .../terminal-parked-watcher-registry.ts       |  49 --
 ...al-presentation-retirement.test-fixture.ts | 260 ---------
 .../terminal-presentation-retirement.ts       |  89 ---
 .../use-terminal-pane-chat-state.ts           |   3 -
 .../use-terminal-pane-mount-lifecycle.ts      |  58 +-
 .../use-terminal-activation-actions.ts        |   4 -
 .../components/use-terminal-create-actions.ts |   4 -
 .../mobile-terminal-close-ipc-bridge.ts       |  36 +-
 .../ipc-events/session-tab-ipc-bridge.ts      | 135 ++---
 .../terminal-ui-routing-ipc-bridge.ts         |  24 +-
 src/renderer/src/hooks/ipc-tab-switch.ts      |   3 -
 .../activate-ai-vault-structured-session.ts   |  21 +-
 .../lib/agent-launch-pane-ordinary-verdict.ts |  75 ---
 .../agent-launch-pane-verdict-application.ts  | 149 ++---
 .../lib/agent-launch-tab-main-written.test.ts |  72 ---
 .../src/lib/agent-launch-tab-main-written.ts  |  74 +--
 .../src/lib/agent-launch-tab-presentation.ts  |  21 +-
 .../lib/agent-launch-tab-publication.test.ts  |   9 +-
 .../src/lib/agent-launch-tab-publication.ts   |  79 +--
 ...tructured-agent-session-provisional-tab.ts |  39 +-
 ...structured-agent-session-tab-activation.ts |  26 +-
 .../lib/conversation-surface-switch.test.tsx  | 550 ++----------------
 .../src/lib/conversation-surface-switch.ts    | 253 +++-----
 .../src/lib/conversation-switch-legacy.ts     |  11 +-
 .../conversation-switch-presentation.test.tsx |  82 ---
 .../lib/conversation-switch-presentation.tsx  | 195 -------
 .../src/lib/conversation-switch-projection.ts | 301 ----------
 .../conversation-switch-result-selection.ts   |  52 --
 .../src/lib/conversation-switch-selection.ts  |  48 --
 .../src/lib/conversation-switch-state.ts      |  28 +-
 .../lib/launch-ai-vault-session-and-reveal.ts |   5 +-
 .../launch-ai-vault-session-placement.test.ts | 132 -----
 .../src/lib/launch-ai-vault-session.ts        |  29 +-
 .../lib/open-existing-structured-session.ts   |  48 +-
 .../client-hosted-browser-row-state.ts        |   2 -
 .../lib/session-tab-open-placement-order.ts   |  27 -
 .../lib/simulator-tab-palette-activation.ts   |   2 -
 ...structured-agent-session-launch-surface.ts |  24 +-
 ...t-session-tab-open-through-layout-owner.ts |   9 +-
 src/renderer/src/lib/tab-number-shortcuts.ts  |   2 -
 .../src/lib/viewer-selection-request.ts       | 154 -----
 .../src/lib/workspace-switch-user-act.ts      |   2 -
 .../lib/workspace-tab-palette-activation.ts   |   2 -
 .../snapshot-apply.ts                         |  15 +-
 .../runtime/mounted-terminal-tab-registry.ts  |   3 -
 ...pen-placement-work-counter.test-fixture.ts | 192 ------
 .../sync-runtime-graph/graph-publication.ts   |   1 -
 ...ntime-session-browser-create-focus.test.ts |   4 +-
 .../runtime/web-runtime-session-snapshot.ts   |   4 +-
 .../src/runtime/web-runtime-session.test.ts   |   4 +-
 .../web-runtime-terminal-create-operation.ts  |  67 +--
 .../runtime/web-runtime-terminal-creation.ts  |  13 +-
 ...b-runtime-terminal-placement-settlement.ts |  55 +-
 ...-runtime-terminal-switch-placement.test.ts | 531 -----------------
 .../web-session-client-owned-tab-placement.ts |  15 +-
 .../apply-preparation-base.ts                 |   3 -
 .../web-session-tabs-sync/apply-snapshot.ts   |  22 +-
 .../global-session-inventory-event.ts         |   5 +-
 .../web-session-tabs-sync/load-initial.ts     |   5 +-
 .../open-placement-read.ts                    | 126 ----
 .../open-placement-selection.ts               | 108 ----
 .../web-session-tabs-sync/open-placement.ts   |  82 ---
 .../web-session-tabs-sync/snapshot-api.ts     |  21 +-
 .../runtime/web-session-tabs-sync/state.ts    |  15 -
 .../web-session-tabs-sync/store-patch.ts      |  73 +--
 .../visibility-resume-repair.ts               |   6 +-
 .../workspace-layout-frame-flush-plan.ts      |  12 +-
 .../workspace-layout-frame-open-selection.ts  |  69 ---
 .../workspace-layout-frame-sync.test.ts       | 247 --------
 .../runtime/workspace-layout-frame-sync.ts    |  36 +-
 .../slices/browser/browser-tab-actions.ts     |   2 -
 .../actions/markdown-preview-actions.ts       |   2 -
 src/renderer/src/store/slices/settings.ts     |   2 -
 .../store/slices/tabs/moved-tab-selection.ts  |  26 +-
 .../store/slices/tabs/tabs-close-actions.ts   |   2 -
 .../store/slices/tabs/tabs-drop-actions.ts    |   2 -
 .../store/slices/tabs/tabs-focus-actions.ts   |   2 -
 .../store/slices/tabs/tabs-label-actions.ts   |   6 -
 .../store/slices/tabs/tabs-move-actions.ts    |   2 -
 .../slices/ui/ui-slice-settings-actions.ts    |  11 +-
 .../store/slices/ui/ui-slice-task-actions.ts  |   2 -
 .../store/slices/ui/ui-slice-view-actions.ts  |  64 +-
 .../src/store/slices/worktree-nav-history.ts  |   2 -
 .../src/store/terminals/terminal-actions.ts   |   2 -
 .../terminal-active-workspace-creation.ts     |   2 -
 .../src/store/terminals/terminal-tab-close.ts |   2 -
 .../store/terminals/terminal-tab-creation.ts  |  11 +-
 ...ion-switch-desktop-retirement.unit.test.ts | 247 --------
 ...obile-terminal-session-switch.unit.test.ts | 220 -------
 ...minal-presentation-retirement.unit.test.ts | 119 ----
 ...ssion-terminal-host-authority.unit.test.ts |   2 +-
 138 files changed, 609 insertions(+), 5670 deletions(-)
 delete mode 100644 src/renderer/src/components/terminal-pane/terminal-pane-mount-registration.ts
 delete mode 100644 src/renderer/src/components/terminal-pane/terminal-presentation-retirement.test-fixture.ts
 delete mode 100644 src/renderer/src/components/terminal-pane/terminal-presentation-retirement.ts
 delete mode 100644 src/renderer/src/lib/agent-launch-pane-ordinary-verdict.ts
 delete mode 100644 src/renderer/src/lib/conversation-switch-presentation.test.tsx
 delete mode 100644 src/renderer/src/lib/conversation-switch-presentation.tsx
 delete mode 100644 src/renderer/src/lib/conversation-switch-projection.ts
 delete mode 100644 src/renderer/src/lib/conversation-switch-result-selection.ts
 delete mode 100644 src/renderer/src/lib/conversation-switch-selection.ts
 delete mode 100644 src/renderer/src/lib/launch-ai-vault-session-placement.test.ts
 delete mode 100644 src/renderer/src/lib/session-tab-open-placement-order.ts
 delete mode 100644 src/renderer/src/lib/viewer-selection-request.ts
 delete mode 100644 src/renderer/src/runtime/open-placement-work-counter.test-fixture.ts
 delete mode 100644 src/renderer/src/runtime/web-runtime-terminal-switch-placement.test.ts
 delete mode 100644 src/renderer/src/runtime/web-session-tabs-sync/open-placement-read.ts
 delete mode 100644 src/renderer/src/runtime/web-session-tabs-sync/open-placement-selection.ts
 delete mode 100644 src/renderer/src/runtime/web-session-tabs-sync/open-placement.ts
 delete mode 100644 src/renderer/src/runtime/workspace-layout-frame-open-selection.ts
 delete mode 100644 tests/e2e/conversation-switch-desktop-retirement.unit.test.ts
 delete mode 100644 tests/e2e/mobile-terminal-session-switch.unit.test.ts
 delete mode 100644 tests/e2e/terminal-presentation-retirement.unit.test.ts

diff --git a/config/renderer-layout-writer-baseline.txt b/config/renderer-layout-writer-baseline.txt
index 1b002b487922..2ec2aab42ee8 100644
--- a/config/renderer-layout-writer-baseline.txt
+++ b/config/renderer-layout-writer-baseline.txt
@@ -21,8 +21,6 @@
 3 src/renderer/src/components/worktree-jump-palette-status-inputs.ts
 9 src/renderer/src/lib/agent-background-session-test-state.ts
 1 src/renderer/src/lib/agent-hibernation-coordinator.ts
-7 src/renderer/src/lib/agent-launch-pane-verdict-application.ts # Shipped window owner: fenced launch withdrawal/outcome; port when main owns layout.
-8 src/renderer/src/lib/conversation-switch-projection.ts # Shipped window owner: fenced retirement/restoration; port when main owns layout.
 4 src/renderer/src/lib/floating-workspace-terminal-actions.ts
 1 src/renderer/src/lib/pane-manager/client-hosted-browser-row-state.ts
 4 src/renderer/src/lib/session-write-subscriber.ts
diff --git a/config/scripts/vitest-node-runtime-files.mjs b/config/scripts/vitest-node-runtime-files.mjs
index c059c7df95f4..94103e0dd7f3 100644
--- a/config/scripts/vitest-node-runtime-files.mjs
+++ b/config/scripts/vitest-node-runtime-files.mjs
@@ -40,7 +40,6 @@ const NODE_RUNTIME_INCLUDE = [
   // Asserts an observer survives a forced collection; conservative retention would hide a lost one.
   'config/scripts/happy-dom-mutation-observer-retention.test.ts',
   // These reach Node SQLite through a shared helper or a dynamic import, which the scan skips.
-  'tests/e2e/mobile-terminal-session-switch.unit.test.ts',
   'src/main/claude/claude-transcript-catch-up.test.ts',
   'src/main/claude/claude-transcript-duration.test.ts',
   'tests/e2e/native-chat-startup-option-pickers.unit.test.ts',
diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/BrowserPaneOverlayLayer.tsx b/src/renderer/src/components/browser-pane/assemble-chrome/BrowserPaneOverlayLayer.tsx
index df734927e906..136c0b379756 100644
--- a/src/renderer/src/components/browser-pane/assemble-chrome/BrowserPaneOverlayLayer.tsx
+++ b/src/renderer/src/components/browser-pane/assemble-chrome/BrowserPaneOverlayLayer.tsx
@@ -1,4 +1,3 @@
-import { noteViewerGroupNavigation } from '@/lib/viewer-selection-request'
 import { memo, useCallback, useEffect, useMemo } from 'react'
 import { registerBrowserOverlaySlotViewport } from '../host-guest/browser-page-viewport'
 import { useShallow } from 'zustand/react/shallow'
@@ -148,10 +147,7 @@ const BrowserPaneOverlayLayer = memo(function BrowserPaneOverlayLayer({
 
   // Why: stable identity so BrowserOverlaySlot's memo holds; groupId is passed at call time so one callback serves every slot.
   const focusOwningGroup = useCallback(
-    (groupId: string) => {
-      noteViewerGroupNavigation(useAppStore.getState(), worktreeId, groupId)
-      focusGroup(worktreeId, groupId)
-    },
+    (groupId: string) => focusGroup(worktreeId, groupId),
     [focusGroup, worktreeId]
   )
 
diff --git a/src/renderer/src/components/dashboard/reveal-dashboard-agent.ts b/src/renderer/src/components/dashboard/reveal-dashboard-agent.ts
index 9c553da565e4..5bd062be10c0 100644
--- a/src/renderer/src/components/dashboard/reveal-dashboard-agent.ts
+++ b/src/renderer/src/components/dashboard/reveal-dashboard-agent.ts
@@ -1,4 +1,3 @@
-import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { revealTerminalPane } from '@/lib/reveal-terminal-pane'
 import { activateAndRevealWorkspace } from '@/lib/worktree-activation'
 import { activateStructuredAgentSessionTab } from '@/lib/agent-session/structured-agent-session-tab-activation'
@@ -10,7 +9,6 @@ import { useAppStore } from '@/store'
 import type { DashboardRevealAgentArgs } from '../../../../shared/dashboard-snapshot'
 
 export function revealDashboardAgent(args: DashboardRevealAgentArgs): boolean {
-  noteViewerNavigation()
   const state = useAppStore.getState()
   const tab = state.unifiedTabsByWorktree[args.worktreeId]?.find(
     (candidate) =>
diff --git a/src/renderer/src/components/editor/check-annotation-open.ts b/src/renderer/src/components/editor/check-annotation-open.ts
index 602dc974bd9a..d099f521b1cd 100644
--- a/src/renderer/src/components/editor/check-annotation-open.ts
+++ b/src/renderer/src/components/editor/check-annotation-open.ts
@@ -1,4 +1,3 @@
-import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { detectLanguage } from '@/lib/language-detect'
 import { activateAndRevealWorktree } from '@/lib/worktree-activation'
 import { useAppStore } from '@/store'
@@ -30,7 +29,6 @@ export function openAnnotationLocation(params: {
   const { absolutePath, relativePath } = resolvedPath
   const language = detectLanguage(relativePath)
 
-  noteViewerNavigation()
   // Use shared activation so annotation jumps join sidebar, palette and terminal-link navigation history.
   activateAndRevealWorktree(worktreeId, { providesInitialSurface: true, executionHostId })
 
diff --git a/src/renderer/src/components/emulator-pane/EmulatorPaneOverlayLayer.tsx b/src/renderer/src/components/emulator-pane/EmulatorPaneOverlayLayer.tsx
index fd8e7bb9822a..410d9d3ac665 100644
--- a/src/renderer/src/components/emulator-pane/EmulatorPaneOverlayLayer.tsx
+++ b/src/renderer/src/components/emulator-pane/EmulatorPaneOverlayLayer.tsx
@@ -1,4 +1,3 @@
-import { noteViewerGroupNavigation } from '@/lib/viewer-selection-request'
 import { memo, useCallback, useMemo } from 'react'
 import { useShallow } from 'zustand/react/shallow'
 import { useAppStore } from '@/store'
@@ -71,10 +70,7 @@ const EmulatorPaneOverlayLayer = memo(function EmulatorPaneOverlayLayer({
   )
   const focusGroup = useAppStore((state) => state.focusGroup)
   const focusOwningGroup = useCallback(
-    (groupId: string) => {
-      noteViewerGroupNavigation(useAppStore.getState(), worktreeId, groupId)
-      focusGroup(worktreeId, groupId)
-    },
+    (groupId: string) => focusGroup(worktreeId, groupId),
     [focusGroup, worktreeId]
   )
 
diff --git a/src/renderer/src/components/floating-terminal/use-floating-terminal-create-actions.ts b/src/renderer/src/components/floating-terminal/use-floating-terminal-create-actions.ts
index 6c92f28dfe4c..448390791129 100644
--- a/src/renderer/src/components/floating-terminal/use-floating-terminal-create-actions.ts
+++ b/src/renderer/src/components/floating-terminal/use-floating-terminal-create-actions.ts
@@ -1,4 +1,3 @@
-import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { useCallback } from 'react'
 import { toast } from 'sonner'
 import { resolveGroupTabFromVisibleId } from '@/components/tab-group/tab-group-visible-id'
@@ -44,7 +43,6 @@ export function useFloatingTerminalCreateActions({
 }: FloatingTerminalCreateActionsInput) {
   const activateFloatingItem = useCallback(
     (visibleId: string) => {
-      noteViewerNavigation()
       const item = resolveGroupTabFromVisibleId(groupTabs, visibleId)
       if (!item) {
         return
@@ -69,7 +67,6 @@ export function useFloatingTerminalCreateActions({
 
   const createFloatingTerminalTab = useCallback(
     (shellOverride?: string) => {
-      noteViewerNavigation()
       const tabId = createBrowserUuid()
       createTab(FLOATING_TERMINAL_WORKTREE_ID, activeGroup?.id, shellOverride, { id: tabId })
       focusTerminalTabSurface(tabId)
@@ -78,7 +75,6 @@ export function useFloatingTerminalCreateActions({
   )
 
   const createFloatingBrowserTab = useCallback(() => {
-    noteViewerNavigation()
     if (!ensureClientCreationActionAllowed(FLOATING_TERMINAL_WORKTREE_ID, 'managed-browser')) {
       return
     }
@@ -95,7 +91,6 @@ export function useFloatingTerminalCreateActions({
   }, [activeGroup, browserDefaultUrl, createBrowserTab])
 
   const createFloatingMarkdownTab = useCallback(() => {
-    noteViewerNavigation()
     if (!markdownCwd) {
       return
     }
diff --git a/src/renderer/src/components/native-chat/NativeChatMessageList.tsx b/src/renderer/src/components/native-chat/NativeChatMessageList.tsx
index d192758c451d..c84e62279dba 100644
--- a/src/renderer/src/components/native-chat/NativeChatMessageList.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatMessageList.tsx
@@ -1,4 +1,3 @@
-import { useSwitchPresentationRows } from '@/lib/conversation-switch-presentation'
 import { copyChatMathSelection } from '../sidebar/chat-markdown-math-selection'
 import {
   nativeChatTranscriptOuterClass,
@@ -133,7 +132,6 @@ export function NativeChatMessageList({
     [journalItems]
   )
   const scrollRef = useRef<HTMLDivElement | null>(null)
-  useSwitchPresentationRows(scrollRef)
   const contentRef = useRef<HTMLDivElement | null>(null)
   const [expandedTurnIds, setExpandedTurnIds] = useState<ReadonlySet<string>>(new Set())
   const disclosures = useNativeChatDisclosures()
diff --git a/src/renderer/src/components/native-chat/NativeChatNoticeRow.tsx b/src/renderer/src/components/native-chat/NativeChatNoticeRow.tsx
index 7845097bff51..407d1f109ad1 100644
--- a/src/renderer/src/components/native-chat/NativeChatNoticeRow.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatNoticeRow.tsx
@@ -1,4 +1,3 @@
-import { useSwitchFailureSuppressed } from '@/lib/conversation-switch-presentation'
 import { agentSessionGoalControlWords } from './agent-session-goal-control-words'
 import { AlertCircle, AlertTriangle, Info } from 'lucide-react'
 import { useTranslation } from 'react-i18next'
@@ -73,15 +72,11 @@ export function NativeChatNoticeRow({
   agentName?: string
   onLinkClick?: CommentMarkdownLinkClickHandler
   allowFileUriLinks?: boolean
-}): React.JSX.Element | null {
-  const switchSuppressed = useSwitchFailureSuppressed(messageId)
+}): React.JSX.Element {
   useTranslation()
   const orcaStopView = useNativeChatOrcaStopView()
   const claudeSignIn = useNativeChatClaudeSignInView()
   const look = nativeChatNoticeLook(block)
-  if (switchSuppressed) {
-    return null
-  }
   if (look.kind === 'divider') {
     const label =
       look.label === 'contextCleared'
diff --git a/src/renderer/src/components/native-chat/NativeChatResumeInCliButton.tsx b/src/renderer/src/components/native-chat/NativeChatResumeInCliButton.tsx
index 1a1f7bd38edb..2fa8b33e74e0 100644
--- a/src/renderer/src/components/native-chat/NativeChatResumeInCliButton.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatResumeInCliButton.tsx
@@ -1,7 +1,6 @@
 import { inPlaceSwitchEnabled } from '../../../../shared/structured-agent-cli-conversation-adoption'
 import { useConfirmationDialog } from '@/components/confirmation-dialog-context'
 import {
-  conversationSwitchFailureText,
   runNativeChatCliSwitch,
   useConversationSwitchPending
 } from '@/lib/conversation-surface-switch'
@@ -121,22 +120,12 @@ export function NativeChatResumeInCliButton({
               nativeChat
             })
             if (subject?.kind === 'chat') {
-              const legacyContinue = (viewerSelection?: string) =>
+              const legacyContinue = () =>
                 runNativeChatCliFork({
                   subject,
                   tab,
                   agent,
                   commandOverrides,
-                  ...(viewerSelection
-                    ? {
-                        viewerSelection,
-                        describeFailure: (message: string) =>
-                          conversationSwitchFailureText(new Error(message), {
-                            agent,
-                            direction: 'terminal'
-                          })
-                      }
-                    : {}),
                   queuedMessage: translate(
                     'components.tab.bar.switch.legacyCopy',
                     'A copy of this {{agent}} conversation opens in a new terminal. The original chat stays open.',
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx
index fa650ca86db0..f2771e4be912 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx
@@ -1,7 +1,3 @@
-import {
-  SwitchPresentationContext,
-  useSwitchPresentation
-} from '@/lib/conversation-switch-presentation'
 import { useNativeChatHandOff } from './use-native-chat-hand-off'
 import { cn } from '@/lib/utils'
 import { NATIVE_CHAT_APPEARANCE_ROOT_CLASS } from './native-chat-appearance-style'
@@ -140,7 +136,6 @@ export function NativeChatStructuredSession(
   // Final read refusal replaces the pane because no existing action can succeed.
   const readFailedFinally = readFailure?.final === true
   const viewState = selectNativeChatViewState(session, { readRetries: !readFailedFinally })
-  const switchPresentation = useSwitchPresentation(props.target, props.sessionId, props.isVisible)
   const paneActive = props.isVisible && props.isFocusedGroup
   useNativeChatFontSize(viewState.kind === 'ready' && paneActive, rootRef)
   const find = useNativeChatFind(paneActive, rootRef, composerRef, submits.messageListRef)
@@ -259,146 +254,144 @@ export function NativeChatStructuredSession(
     !find.isOpen && <NativeChatTopRightControls {...controls} inline />
   )
   return (
-    <SwitchPresentationContext.Provider value={switchPresentation}>
-      <div
-        ref={rootRef}
-        data-native-chat-root="true"
-        data-native-chat-working={controller.isWorking ? 'true' : 'false'}
-        tabIndex={-1}
-        {...nativeChatPaneCaptureHandlers(find, paneCommands, rootInput)}
-        onContextMenuCapture={paneCommands.onContextMenuCapture}
-        className={cn(
-          NATIVE_CHAT_APPEARANCE_ROOT_CLASS,
-          'flex h-full min-h-0 w-full flex-col focus:outline-none'
+    <div
+      ref={rootRef}
+      data-native-chat-root="true"
+      data-native-chat-working={controller.isWorking ? 'true' : 'false'}
+      tabIndex={-1}
+      {...nativeChatPaneCaptureHandlers(find, paneCommands, rootInput)}
+      onContextMenuCapture={paneCommands.onContextMenuCapture}
+      className={cn(
+        NATIVE_CHAT_APPEARANCE_ROOT_CLASS,
+        'flex h-full min-h-0 w-full flex-col focus:outline-none'
+      )}
+      style={appearanceStyle}
+      data-native-chat-scheme={appearanceStyle.colorScheme}
+    >
+      {paneHeader}
+      <NativeChatContextClearFade clearing={controller.contextClear.clearing}>
+        {(find.isOpen || !paneHeader) && <NativeChatTopRightControls {...controls} />}
+        {viewState.kind === 'loading' || (viewState.kind === 'error' && !readFailure) ? (
+          historyPhase !== 'unread' && <NativeChatLoadingCue />
+        ) : viewState.kind === 'error' ? (
+          <NativeChatEmptyState
+            kind="error"
+            retrying={!readFailure?.final}
+            {...(readFailure?.named ? { headline: readFailure.text } : {})}
+          />
+        ) : viewState.kind === 'empty' ? (
+          <NativeChatEmptyPane slot={install.slot} agent={props.agent} />
+        ) : (
+          <NativeChatRewindContext.Provider value={controller.rewind.surface}>
+            <NativeChatOrcaStopContext.Provider value={continuation.view}>
+              <NativeChatClaudeSignInContext.Provider value={claudeSignIn}>
+                <NativeChatMessageList
+                  // A rewind or a /clear replaces the conversation; nothing the old one held carries over.
+                  key={`${controller.epoch}:${controller.contextClear.clears}`}
+                  ref={submits.messageListRef}
+                  session={session}
+                  journalItems={controller.journalItems}
+                  journalSubmissions={controller.submissions}
+                  journalLatestTurn={controller.latestTurn}
+                  journalHostWork={controller.hostWork}
+                  subagentRoster={controller.subagentRoster}
+                  railOutline={controller.railOutline}
+                  isVisible={props.isVisible}
+                  isWorking={controller.isWorking}
+                  expandSignal={false}
+                  workingStartedAt={controller.workingStartedAt}
+                  settledTurns={controller.settledTurns}
+                  awaitingInput={prompt === null ? null : 'shown'}
+                  turnActivity={controller.turnActivity}
+                  stopping={stopControls.stopping}
+                  {...fileLinkProps}
+                  runtimeContext={imageRuntimeContext}
+                  deliveryNotices={deliveryNotices}
+                />
+              </NativeChatClaudeSignInContext.Provider>
+            </NativeChatOrcaStopContext.Provider>
+          </NativeChatRewindContext.Provider>
         )}
-        style={appearanceStyle}
-        data-native-chat-scheme={appearanceStyle.colorScheme}
-      >
-        {paneHeader}
-        <NativeChatContextClearFade clearing={controller.contextClear.clearing}>
-          {(find.isOpen || !paneHeader) && <NativeChatTopRightControls {...controls} />}
-          {viewState.kind === 'loading' || (viewState.kind === 'error' && !readFailure) ? (
-            historyPhase !== 'unread' && <NativeChatLoadingCue />
-          ) : viewState.kind === 'error' ? (
-            <NativeChatEmptyState
-              kind="error"
-              retrying={!readFailure?.final}
-              {...(readFailure?.named ? { headline: readFailure.text } : {})}
+      </NativeChatContextClearFade>
+      {readFailure?.final ? null : (
+        <>
+          {/* Keep queued drafts outside the transcript and above the background-task dock. */}
+          <NativeChatQueuedMessageList
+            controller={submits.queuedMessages}
+            chatWorktreeId={ownerWorktreeId ?? null}
+            agentName={agentLabel}
+            statedFailures={startFailures}
+            steerHeld={stopControls.stopping || hostHeld}
+            focusComposer={focusComposer}
+            editAttachTo={{ terminalTabId: props.tabId, agent: props.agent, transport }}
+          />
+          <NativeChatStructuredSessionStatus
+            sessionId={props.sessionId}
+            paneKey={paneKey}
+            isVisible={props.isVisible}
+            backgroundTasks={controller.backgroundTasks}
+            stopBackgroundTask={controller.stopBackgroundTask}
+          />
+          {prompt ? null : (
+            <NativeChatStructuredGoalStrip
+              sessionId={props.sessionId}
+              threadGoal={controller.threadGoal}
+              transport={transport}
+              isWorking={controller.isWorking}
+              isVisible={props.isVisible}
+              turnId={controller.turnId}
+              workingStartedAt={controller.workingStartedAt}
             />
-          ) : viewState.kind === 'empty' ? (
-            <NativeChatEmptyPane slot={install.slot} agent={props.agent} />
-          ) : (
-            <NativeChatRewindContext.Provider value={controller.rewind.surface}>
-              <NativeChatOrcaStopContext.Provider value={continuation.view}>
-                <NativeChatClaudeSignInContext.Provider value={claudeSignIn}>
-                  <NativeChatMessageList
-                    // A rewind or a /clear replaces the conversation; nothing the old one held carries over.
-                    key={`${controller.epoch}:${controller.contextClear.clears}`}
-                    ref={submits.messageListRef}
-                    session={session}
-                    journalItems={controller.journalItems}
-                    journalSubmissions={controller.submissions}
-                    journalLatestTurn={controller.latestTurn}
-                    journalHostWork={controller.hostWork}
-                    subagentRoster={controller.subagentRoster}
-                    railOutline={controller.railOutline}
-                    isVisible={props.isVisible}
-                    isWorking={controller.isWorking}
-                    expandSignal={false}
-                    workingStartedAt={controller.workingStartedAt}
-                    settledTurns={controller.settledTurns}
-                    awaitingInput={prompt === null ? null : 'shown'}
-                    turnActivity={controller.turnActivity}
-                    stopping={stopControls.stopping}
-                    {...fileLinkProps}
-                    runtimeContext={imageRuntimeContext}
-                    deliveryNotices={deliveryNotices}
-                  />
-                </NativeChatClaudeSignInContext.Provider>
-              </NativeChatOrcaStopContext.Provider>
-            </NativeChatRewindContext.Provider>
           )}
-        </NativeChatContextClearFade>
-        {readFailure?.final ? null : (
-          <>
-            {/* Keep queued drafts outside the transcript and above the background-task dock. */}
-            <NativeChatQueuedMessageList
-              controller={submits.queuedMessages}
-              chatWorktreeId={ownerWorktreeId ?? null}
-              agentName={agentLabel}
-              statedFailures={startFailures}
-              steerHeld={stopControls.stopping || hostHeld}
-              focusComposer={focusComposer}
-              editAttachTo={{ terminalTabId: props.tabId, agent: props.agent, transport }}
+          {composerShown ? null : <NativeChatPromptSlotNotices notices={notices} />}
+          {prompt && approval ? (
+            <NativeChatApprovalCard
+              key={`${prompt.itemId}:${prompt.revision}`}
+              approval={approval}
+              onChoose={(optionId) =>
+                void promptResponse.respond(prompt, { kind: 'option', optionId })
+              }
+              isSubmitting={promptResponse.holds(prompt)}
+              onCancel={cancelPrompt}
+              shouldFocus={!promptsUnanswerable && props.isVisible && props.isFocusedGroup}
+              {...fileLinkProps}
             />
-            <NativeChatStructuredSessionStatus
-              sessionId={props.sessionId}
+          ) : null}
+          {prompt && questionBody ? (
+            <NativeChatStructuredQuestionCard
+              key={`${prompt.itemId}:${prompt.revision}`}
+              questions={agentSessionPromptQuestions(questionBody)}
+              onAnswer={(response) => void promptResponse.respond(prompt, response)}
+              isSubmitting={promptResponse.holds(prompt)}
+              onCancel={cancelPrompt}
+              shouldFocus={!promptsUnanswerable && props.isVisible && props.isFocusedGroup}
+              answerInputRef={questionAnswerInputRef}
+            />
+          ) : null}
+          {nativeChatStructuredAsyncQuestion(props, controller, session, transport.send)}
+          {composerShown && <NativeChatInstallSlot slot={install.slot} agentLabel={agentLabel} />}
+          {composerShown ? (
+            <NativeChatComposer
+              ref={composerRef}
+              terminalTabId={props.tabId}
               paneKey={paneKey}
-              isVisible={props.isVisible}
-              backgroundTasks={controller.backgroundTasks}
-              stopBackgroundTask={controller.stopBackgroundTask}
+              draftScopeKey={structuredAgentSessionDraftScopeKey(props.sessionId)}
+              targetPtyId={null}
+              agent={props.agent}
+              {...stopControls.composer}
+              unavailableHint={install.unavailableHint}
+              steerQueued={stopControls.stopping ? undefined : submits.queuedMessages.steerNewest}
+              structuredTransport={transport}
+              launchSeed={{ ...launchDraftSignal, ownsTabWideLaunchDraft: true }}
+              notices={notices}
+              recallSource={{ messages: session.messages, withoutImageMarkers: true }}
             />
-            {prompt ? null : (
-              <NativeChatStructuredGoalStrip
-                sessionId={props.sessionId}
-                threadGoal={controller.threadGoal}
-                transport={transport}
-                isWorking={controller.isWorking}
-                isVisible={props.isVisible}
-                turnId={controller.turnId}
-                workingStartedAt={controller.workingStartedAt}
-              />
-            )}
-            {composerShown ? null : <NativeChatPromptSlotNotices notices={notices} />}
-            {prompt && approval ? (
-              <NativeChatApprovalCard
-                key={`${prompt.itemId}:${prompt.revision}`}
-                approval={approval}
-                onChoose={(optionId) =>
-                  void promptResponse.respond(prompt, { kind: 'option', optionId })
-                }
-                isSubmitting={promptResponse.holds(prompt)}
-                onCancel={cancelPrompt}
-                shouldFocus={!promptsUnanswerable && props.isVisible && props.isFocusedGroup}
-                {...fileLinkProps}
-              />
-            ) : null}
-            {prompt && questionBody ? (
-              <NativeChatStructuredQuestionCard
-                key={`${prompt.itemId}:${prompt.revision}`}
-                questions={agentSessionPromptQuestions(questionBody)}
-                onAnswer={(response) => void promptResponse.respond(prompt, response)}
-                isSubmitting={promptResponse.holds(prompt)}
-                onCancel={cancelPrompt}
-                shouldFocus={!promptsUnanswerable && props.isVisible && props.isFocusedGroup}
-                answerInputRef={questionAnswerInputRef}
-              />
-            ) : null}
-            {nativeChatStructuredAsyncQuestion(props, controller, session, transport.send)}
-            {composerShown && <NativeChatInstallSlot slot={install.slot} agentLabel={agentLabel} />}
-            {composerShown ? (
-              <NativeChatComposer
-                ref={composerRef}
-                terminalTabId={props.tabId}
-                paneKey={paneKey}
-                draftScopeKey={structuredAgentSessionDraftScopeKey(props.sessionId)}
-                targetPtyId={null}
-                agent={props.agent}
-                {...stopControls.composer}
-                unavailableHint={install.unavailableHint}
-                steerQueued={stopControls.stopping ? undefined : submits.queuedMessages.steerNewest}
-                structuredTransport={transport}
-                launchSeed={{ ...launchDraftSignal, ownsTabWideLaunchDraft: true }}
-                notices={notices}
-                recallSource={{ messages: session.messages, withoutImageMarkers: true }}
-              />
-            ) : null}
-          </>
-        )}
-        {paneCommands.menu}
-        {handOff.dialog}
-        <LinkActionPopover request={linkActionRequest} onClose={closeLinkActions} />
-      </div>
-    </SwitchPresentationContext.Provider>
+          ) : null}
+        </>
+      )}
+      {paneCommands.menu}
+      {handOff.dialog}
+      <LinkActionPopover request={linkActionRequest} onClose={closeLinkActions} />
+    </div>
   )
 }
diff --git a/src/renderer/src/components/native-chat/NativeChatTopRightControls.tsx b/src/renderer/src/components/native-chat/NativeChatTopRightControls.tsx
index 516ff74e2eef..32653caf1db0 100644
--- a/src/renderer/src/components/native-chat/NativeChatTopRightControls.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatTopRightControls.tsx
@@ -1,11 +1,12 @@
 import { inPlaceSwitchEnabled } from '../../../../shared/structured-agent-cli-conversation-adoption'
 import { useConfirmationDialog } from '@/components/confirmation-dialog-context'
 import {
+  useConversationSwitchBusy,
   useConversationSwitchReadiness,
   runNativeChatCliSwitch
 } from '@/lib/conversation-surface-switch'
 import { isNativeChatEnabled } from '../../../../shared/structured-native-chat-launch-route'
-import { SquareTerminal } from 'lucide-react'
+import { Loader2, SquareTerminal } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import { translate } from '@/i18n/i18n'
@@ -54,6 +55,8 @@ export function NativeChatTopRightControls({
         }
       : null
   )
+  const busy = useConversationSwitchBusy(readiness.pending)
+
   const enabled = useAppStore((state) => isNativeChatEnabled(state.settings))
   if (find.isOpen) {
     return <NativeChatFindBar find={find} isVisible={session.isVisible} />
@@ -86,7 +89,7 @@ export function NativeChatTopRightControls({
               }
             }}
           >
-            <SquareTerminal />
+            {busy ? <Loader2 className="animate-spin" /> : <SquareTerminal />}
           </Button>
         </TooltipTrigger>
         <TooltipContent side="bottom" sideOffset={4}>
diff --git a/src/renderer/src/components/native-chat/StructuredAgentSessionPaneOverlayLayer.tsx b/src/renderer/src/components/native-chat/StructuredAgentSessionPaneOverlayLayer.tsx
index bfcdb8fc8412..a2a527240564 100644
--- a/src/renderer/src/components/native-chat/StructuredAgentSessionPaneOverlayLayer.tsx
+++ b/src/renderer/src/components/native-chat/StructuredAgentSessionPaneOverlayLayer.tsx
@@ -1,4 +1,3 @@
-import { noteViewerGroupNavigation } from '@/lib/viewer-selection-request'
 import { memo, useCallback, useMemo } from 'react'
 import { useShallow } from 'zustand/react/shallow'
 import type { Tab, TabGroup } from '../../../../shared/tab-types'
@@ -79,10 +78,7 @@ const StructuredAgentSessionPaneOverlayLayer = memo(
     )
     const focusGroup = useAppStore((state) => state.focusGroup)
     const focusOwningGroup = useCallback(
-      (groupId: string) => {
-        noteViewerGroupNavigation(useAppStore.getState(), worktreeId, groupId)
-        focusGroup(worktreeId, groupId)
-      },
+      (groupId: string) => focusGroup(worktreeId, groupId),
       [focusGroup, worktreeId]
     )
     const groupActiveTabById = useMemo(
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-message-sender.ts b/src/renderer/src/components/native-chat/structured-agent-session-message-sender.ts
index 167687481aa2..98a8b5bbc8ae 100644
--- a/src/renderer/src/components/native-chat/structured-agent-session-message-sender.ts
+++ b/src/renderer/src/components/native-chat/structured-agent-session-message-sender.ts
@@ -1,4 +1,3 @@
-import { noteSwitchPresentationUse } from '@/lib/conversation-switch-projection'
 // Allow one unanswered send per chat in memory; host rows/cards own admitted messages. Never retry a send or retain it past its deadline.
 
 import type {
@@ -98,7 +97,6 @@ function dispatch(
 export function sendStructuredAgentSessionMessage(
   input: StructuredAgentSessionSendInput & { target: RuntimeClientTarget }
 ): StructuredAgentSessionSent | null {
-  noteSwitchPresentationUse(input.sessionId)
   const entry = takeStructuredAgentSessionSendSlot(input)
   return entry ? dispatch(entry, input.target) : null
 }
@@ -128,7 +126,6 @@ export type StructuredAgentSessionCreateSend = StructuredAgentSessionSent & {
 export function reserveStructuredAgentSessionSend(
   input: StructuredAgentSessionSendInput
 ): StructuredAgentSessionReservedSend | null {
-  noteSwitchPresentationUse(input.sessionId)
   const entry = takeStructuredAgentSessionSendSlot(input)
   if (!entry) {
     return null
diff --git a/src/renderer/src/components/native-chat/use-native-chat-toggle-shortcut.ts b/src/renderer/src/components/native-chat/use-native-chat-toggle-shortcut.ts
index 79ac9c3a98e7..106c3bcd8f54 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-toggle-shortcut.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-toggle-shortcut.ts
@@ -1,4 +1,3 @@
-import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { usePluginCommands } from '@/store/plugin-panels'
 import { useEffect, useLayoutEffect, useRef } from 'react'
 import { matchesRecentTabSwitcherChord } from '../../../../shared/window-shortcut-policy'
@@ -133,7 +132,6 @@ export function useNativeChatToggleShortcut(worktreeId: string, isWorktreeActive
       ) {
         return
       }
-      noteViewerNavigation()
       state.toggleTabViewMode(tab.id)
       e.preventDefault()
       e.stopImmediatePropagation()
diff --git a/src/renderer/src/components/quick-open-file-navigation.ts b/src/renderer/src/components/quick-open-file-navigation.ts
index 84436cc7a119..87ab1782bf45 100644
--- a/src/renderer/src/components/quick-open-file-navigation.ts
+++ b/src/renderer/src/components/quick-open-file-navigation.ts
@@ -1,4 +1,3 @@
-import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { prepareQuickOpenFiles, rankQuickOpenFiles } from '../../../shared/quick-open-path-search'
 import { statUserOpenedPath } from '@/lib/user-opened-local-path'
 import { detectLanguage } from '@/lib/language-detect'
@@ -30,7 +29,6 @@ export async function openQuickOpenFile(
   rawQuery?: string,
   assertInteractionCurrent: () => void = () => {}
 ): Promise<void> {
-  noteViewerNavigation()
   const guard = captureFileExplorerOperationGuard(
     worktreeId,
     getFileExplorerOperationOwner(worktreeId)
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-original-pane-actions.ts b/src/renderer/src/components/right-sidebar/ai-vault-original-pane-actions.ts
index fb81b57309c8..746e47c784fb 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-original-pane-actions.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault-original-pane-actions.ts
@@ -1,4 +1,3 @@
-import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { useCallback, useMemo } from 'react'
 import { useShallow } from 'zustand/react/shallow'
 import { toast } from 'sonner'
@@ -74,7 +73,6 @@ export function useAiVaultOriginalPaneActions(): {
 
   const jumpToOriginalPane = useCallback(
     async (session: AiVaultSession): Promise<boolean> => {
-      noteViewerNavigation()
       if (session.structuredSession && isStructuredSessionOpen(session)) {
         return activateAiVaultStructuredSession(session)
       }
@@ -104,7 +102,6 @@ export function useAiVaultOriginalPaneActions(): {
   )
 
   const jumpToWorktree = useCallback((worktreeId: string): void => {
-    noteViewerNavigation()
     revealSessionWorkspace(worktreeId)
   }, [])
 
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 018be48a8df5..25a85b8a87a5 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
@@ -1,4 +1,3 @@
-import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { useConfirmationDialog } from '@/components/confirmation-dialog-context'
 import type { AiVaultOriginalPaneTarget } from './ai-vault-original-pane'
 import {
@@ -135,7 +134,6 @@ export function useAiVaultSessionLaunchActions({
 
   const handleResume = useCallback(
     (session: AiVaultSession, targetWorktreeId?: string): void => {
-      noteViewerNavigation()
       if (session.structuredSession) {
         void activateAiVaultStructuredSession(session)
         return
@@ -156,7 +154,6 @@ export function useAiVaultSessionLaunchActions({
   // Supported chats transfer the same conversation; other history rows keep their ordinary resume.
   const handleResumeInNewCli = useCallback(
     (session: AiVaultSession, targetWorktreeId: string): void => {
-      noteViewerNavigation()
       if (switchAiVaultSessionToCli(session, confirm)) {
         return
       }
@@ -207,7 +204,6 @@ export function useAiVaultSessionLaunchActions({
       targetWorktreeId?: string,
       pane?: AiVaultOriginalPaneTarget | null
     ): void => {
-      noteViewerNavigation()
       if (
         !adoptsCliConversations(session.agent) ||
         switchAiVaultSessionToNativeChat(
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.ts b/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.ts
index 07f29a2cc1d1..06e7ef9a54fa 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault-session-resume-in-chat-launch.ts
@@ -1,5 +1,3 @@
-import { isSessionTabSelectionRequest } from '../../../../shared/session-tab-placement'
-import { conversationSwitchViewerSelectionCurrent } from '@/lib/conversation-switch-selection'
 import { toast } from 'sonner'
 import {
   parseRoutableExecutionHostId,
@@ -58,7 +56,6 @@ export async function resumeAiVaultSessionInNewChat(
   worktreeId: string,
   requestId: AgentLaunchRequestId,
   replacing?: AiVaultChatReplacement,
-  viewerSelection?: string,
   reportFailure: (error: unknown) => void = (error) =>
     notifyAiVaultSessionResumeInChatFailure(error, rowAgent)
 ): Promise<void> {
@@ -91,22 +88,12 @@ export async function resumeAiVaultSessionInNewChat(
     const launch = beginStructuredAgentSessionProvisionalLaunch({
       plan,
       hooks: {},
-      viewerSelection,
-      ...(viewerSelection !== undefined
-        ? { canActivate: () => conversationSwitchViewerSelectionCurrent(viewerSelection) }
-        : {}),
       ...(replacing
         ? { afterTabId: replacing.afterTabId, focusIntent: replacing.focusIntent }
         : {}),
       beforeOpen: waitForCreate
         ? undefined
         : () => {
-            if (
-              isSessionTabSelectionRequest(viewerSelection) ||
-              !conversationSwitchViewerSelectionCurrent(viewerSelection)
-            ) {
-              return true
-            }
             if (
               useAppStore.getState().activeWorktreeId !== worktreeId ||
               structuredLaunchOwner({ route: 'structured-native-chat' }, worktreeId)
@@ -124,8 +111,6 @@ export async function resumeAiVaultSessionInNewChat(
     void launch.settlement.then((settlement) => {
       const state = useAppStore.getState()
       if (
-        conversationSwitchViewerSelectionCurrent(viewerSelection) &&
-        !isSessionTabSelectionRequest(viewerSelection) &&
         waitForCreate &&
         settlement.kind === 'structured' &&
         state.activeWorktreeId !== worktreeId &&
diff --git a/src/renderer/src/components/right-sidebar/use-right-sidebar-tab-routing.ts b/src/renderer/src/components/right-sidebar/use-right-sidebar-tab-routing.ts
index a52a61169f75..cab92c7de0f7 100644
--- a/src/renderer/src/components/right-sidebar/use-right-sidebar-tab-routing.ts
+++ b/src/renderer/src/components/right-sidebar/use-right-sidebar-tab-routing.ts
@@ -1,4 +1,3 @@
-import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { useEffect, useRef } from 'react'
 import { useAppStore } from '@/store'
 import type { ActiveRightSidebarTab } from '@/store/slices/editor'
@@ -80,7 +79,6 @@ export function useRightSidebarTabRouting({
     rememberedFolderTabByWorkspaceKeyRef.current[activeFolderWorkspaceKey] = effectiveTab
   }, [activeFolderWorkspaceKey, effectiveTab, visibleItems])
   const selectActivityTab = (tab: ActiveRightSidebarTab): void => {
-    noteViewerNavigation()
     if (activeFolderWorkspaceKey) {
       rememberedFolderTabByWorkspaceKeyRef.current[activeFolderWorkspaceKey] = tab
     }
diff --git a/src/renderer/src/components/right-sidebar/useFileExplorerHandlers.ts b/src/renderer/src/components/right-sidebar/useFileExplorerHandlers.ts
index 2837b7a51b67..18c92059f73b 100644
--- a/src/renderer/src/components/right-sidebar/useFileExplorerHandlers.ts
+++ b/src/renderer/src/components/right-sidebar/useFileExplorerHandlers.ts
@@ -1,4 +1,3 @@
-import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { useCallback } from 'react'
 import type React from 'react'
 import type { RefObject } from 'react'
@@ -90,7 +89,6 @@ export async function activateFileExplorerNode(args: {
     toggleDir(activeWorktreeId, node.path)
     return
   }
-  noteViewerNavigation()
   let escapesWorktree = false
   if (node.isSymlink) {
     // Resolve symlinks only on explicit activation because targets may be protected by macOS TCC.
diff --git a/src/renderer/src/components/sidebar/WorkspaceAttachmentOrigins.tsx b/src/renderer/src/components/sidebar/WorkspaceAttachmentOrigins.tsx
index 638216044f73..61b8267a50a4 100644
--- a/src/renderer/src/components/sidebar/WorkspaceAttachmentOrigins.tsx
+++ b/src/renderer/src/components/sidebar/WorkspaceAttachmentOrigins.tsx
@@ -1,4 +1,3 @@
-import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import React from 'react'
 import { Terminal } from 'lucide-react'
 import { useAppStore } from '@/store'
@@ -30,7 +29,6 @@ function useReferenceTabs(workspace: Worktree): Tab[] {
 }
 
 function focusOrigin(workspace: Worktree, tab: Tab, paneKey: string | undefined): void {
-  noteViewerNavigation()
   const state = useAppStore.getState()
   if (!state.setActiveWorktree(workspace.id, workspace.hostId)) {
     return
diff --git a/src/renderer/src/components/sidebar/activate-retained-agent-row.ts b/src/renderer/src/components/sidebar/activate-retained-agent-row.ts
index f57f92d250dc..9b335088379f 100644
--- a/src/renderer/src/components/sidebar/activate-retained-agent-row.ts
+++ b/src/renderer/src/components/sidebar/activate-retained-agent-row.ts
@@ -1,4 +1,3 @@
-import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { useAppStore } from '@/store'
 import { activateAndRevealWorkspace } from '@/lib/worktree-activation'
 import { activateTabAndFocusPane } from '@/lib/activate-tab-and-focus-pane'
@@ -35,7 +34,6 @@ export function activateRetainedAgentRow(worktreeId: string, tabId: string, pane
   if ((nativeTab ? !target : !hasLiveTerminal) || owner === 'foreign') {
     return
   }
-  noteViewerNavigation()
   // Verify an existing destination before workspace activation can resume sleeping panes.
   if (
     activateAndRevealWorkspace(worktreeId, owner ? { executionHostId: owner } : undefined) === false
diff --git a/src/renderer/src/components/sidebar/use-worktree-agent-activation.ts b/src/renderer/src/components/sidebar/use-worktree-agent-activation.ts
index 06f58946d953..c19404427c44 100644
--- a/src/renderer/src/components/sidebar/use-worktree-agent-activation.ts
+++ b/src/renderer/src/components/sidebar/use-worktree-agent-activation.ts
@@ -1,4 +1,3 @@
-import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { useCallback } from 'react'
 import { useAppStore } from '@/store'
 import { activateAndRevealWorktree } from '@/lib/worktree-activation'
@@ -26,7 +25,6 @@ export function useWorktreeAgentActivation(worktreeId: string) {
         dismissStaleAgentRowByKey(paneKey)
         return
       }
-      noteViewerNavigation()
       // Use shared activation for cross-repo reveal and navigation history.
       activateAndRevealWorktree(worktreeId)
       const tabs = useAppStore.getState().tabsByWorktree[worktreeId] ?? []
diff --git a/src/renderer/src/components/status-bar/resource-session-navigation.ts b/src/renderer/src/components/status-bar/resource-session-navigation.ts
index 1a1ff7f7a8d5..94f11f862c8e 100644
--- a/src/renderer/src/components/status-bar/resource-session-navigation.ts
+++ b/src/renderer/src/components/status-bar/resource-session-navigation.ts
@@ -1,4 +1,3 @@
-import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { parsePaneKey } from '../../../../shared/stable-pane-id'
 
 type TabLookup = Record<string, { id: string }[]>
@@ -23,7 +22,6 @@ export function navigateResourceSessionToTab(
   paneKey: string | null,
   deps: ResourceSessionNavigationDeps
 ): void {
-  noteViewerNavigation()
   for (const [worktreeId, tabs] of Object.entries(deps.tabsByWorktree)) {
     if (tabs.some((tab) => tab.id === tabId)) {
       deps.activateAndRevealWorktree(worktreeId)
diff --git a/src/renderer/src/components/status-bar/use-resource-usage-actions.ts b/src/renderer/src/components/status-bar/use-resource-usage-actions.ts
index dbd260e66846..502995f714de 100644
--- a/src/renderer/src/components/status-bar/use-resource-usage-actions.ts
+++ b/src/renderer/src/components/status-bar/use-resource-usage-actions.ts
@@ -1,4 +1,3 @@
-import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import {
   useCallback,
   useState,
@@ -104,7 +103,6 @@ export function useResourceUsageActions({
     }
     // Folder activation owns host/path gating; git-worktree target resolution cannot handle folder keys.
     if (parseWorkspaceKey(worktreeId)?.type === 'folder') {
-      noteViewerNavigation()
       activateAndRevealWorkspace(worktreeId)
       return
     }
@@ -115,7 +113,6 @@ export function useResourceUsageActions({
     if (!target) {
       return
     }
-    noteViewerNavigation()
     activateAndRevealWorktree(worktreeId, { executionHostId: target.hostId })
   }, [])
 
diff --git a/src/renderer/src/components/tab-bar/TabSessionSwitchHoverAction.tsx b/src/renderer/src/components/tab-bar/TabSessionSwitchHoverAction.tsx
index fc6915bfd964..64fb8a88b41c 100644
--- a/src/renderer/src/components/tab-bar/TabSessionSwitchHoverAction.tsx
+++ b/src/renderer/src/components/tab-bar/TabSessionSwitchHoverAction.tsx
@@ -1,12 +1,13 @@
 import { useConfirmationDialog } from '@/components/confirmation-dialog-context'
 import {
+  useConversationSwitchBusy,
   useConversationSwitchReadiness,
   runCliChatResume,
   runNativeChatCliSwitch
 } from '@/lib/conversation-surface-switch'
 import { isNativeChatEnabled } from '../../../../shared/structured-native-chat-launch-route'
 import { useShallow } from 'zustand/react/shallow'
-import { MessagesSquare, SquareTerminal } from 'lucide-react'
+import { Loader2, MessagesSquare, SquareTerminal } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import { translate } from '@/i18n/i18n'
 import { useAppStore } from '@/store'
@@ -61,6 +62,8 @@ function ChatSwitchAction({
         }
       : null
   )
+  const busy = useConversationSwitchBusy(readiness.pending)
+
   if (!chat || !agent || !inPlaceSwitchEnabled(agent)) {
     return null
   }
@@ -81,7 +84,7 @@ function ChatSwitchAction({
         })
       }
     >
-      <SquareTerminal />
+      {busy ? <Loader2 className="animate-spin" /> : <SquareTerminal />}
       {translate('components.tab.bar.switch.toCli', 'Switch to CLI')}
     </Button>
   )
@@ -97,6 +100,8 @@ function TerminalSwitchAction({
   const readiness = useConversationSwitchReadiness(
     source ? { direction: 'chat', ...source, source } : null
   )
+  const busy = useConversationSwitchBusy(readiness.pending)
+
   if (!source || !inPlaceSwitchEnabled(source.agent)) {
     return null
   }
@@ -108,7 +113,7 @@ function TerminalSwitchAction({
       title={readiness.explanation}
       onClick={() => void runCliChatResume(source, confirm)}
     >
-      <MessagesSquare />
+      {busy ? <Loader2 className="animate-spin" /> : <MessagesSquare />}
       {translate('components.tab.bar.switch.toNativeChat', 'Switch to native chat')}
     </Button>
   )
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
index 43ac60bdcc7c..182ad881250d 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
@@ -1,4 +1,3 @@
-import { conversationSwitchViewerSelectionCurrent } from '@/lib/conversation-switch-selection'
 import { conversationSwitchFailureText } from '@/lib/conversation-switch-feedback'
 import { useAppStore } from '@/store'
 import { parseWorkspaceKey } from '../../../../shared/workspace-scope'
@@ -26,12 +25,11 @@ import type { CliChatResumeSource } from './cli-chat-resume-source'
 export async function reportCliChatResumeFailure(
   source: CliChatResumeSource,
   error: unknown,
-  target: RuntimeClientTarget,
-  viewerSelection?: string
+  target: RuntimeClientTarget
 ): Promise<boolean> {
   const owner = structuredLaunchFailure(error)?.owner
   if (owner) {
-    return switchIntoOwnerLegacy(source, owner, target, viewerSelection)
+    return switchIntoOwnerLegacy(source, owner, target)
   }
   toastCliChatResumeFailure(source, error)
   return false
@@ -41,7 +39,6 @@ export async function switchIntoOwnerLegacy(
   source: Pick<AiVaultSession, 'agent'> & Pick<CliChatResumeSource, 'tabId' | 'workspaceId'>,
   structuredSession: NonNullable<AiVaultSession['structuredSession']>,
   target: RuntimeClientTarget,
-  viewerSelection?: string,
   reportFailure?: (error: unknown) => void
 ): Promise<boolean> {
   // A host without the switch keeps the earlier behaviour: the chat is shown, the terminal stays.
@@ -50,7 +47,6 @@ export async function switchIntoOwnerLegacy(
       { structuredSession },
       undefined,
       target,
-      viewerSelection,
       ...(reportFailure ? ([() => reportFailure(undefined)] as const) : ([] as const))
     )
     return false
@@ -62,7 +58,6 @@ export async function switchIntoOwnerLegacy(
     { structuredSession },
     undefined,
     target,
-    viewerSelection,
     ...(reportFailure ? ([() => reportFailure(undefined)] as const) : ([] as const))
   )
   if (shown !== 'activated') {
@@ -107,10 +102,7 @@ export async function switchIntoOwnerLegacy(
         order.splice(index, 0, chat.id)
         state.reorderUnifiedTabs(group.id, order)
       } else {
-        state.moveUnifiedTabToGroup(chat.id, group.id, {
-          index,
-          activate: conversationSwitchViewerSelectionCurrent(viewerSelection)
-        })
+        state.moveUnifiedTabToGroup(chat.id, group.id, { index, activate: true })
       }
     }
   }
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-ordinary-feedback.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-ordinary-feedback.ts
index 6286f37ebbbd..a93ff9670e1f 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-ordinary-feedback.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-ordinary-feedback.ts
@@ -13,7 +13,6 @@ export async function reportCliChatResumeFailure(
   error: unknown,
   openOwner: boolean,
   target: RuntimeClientTarget,
-  viewerSelection?: string,
   reportFailure?: (error: unknown) => void
 ): Promise<void> {
   const refusal = structuredLaunchFailure(error)
@@ -23,15 +22,12 @@ export async function reportCliChatResumeFailure(
   ) {
     const owner = refusal.owner
     if (openOwner && owner) {
-      await (viewerSelection === undefined
-        ? activateAiVaultStructuredSession({ structuredSession: owner }, undefined, target)
-        : activateAiVaultStructuredSession(
-            { structuredSession: owner },
-            undefined,
-            target,
-            viewerSelection,
-            ...(reportFailure ? ([() => reportFailure(error)] as const) : ([] as const))
-          ))
+      await activateAiVaultStructuredSession(
+        { structuredSession: owner },
+        undefined,
+        target,
+        ...(reportFailure ? ([() => reportFailure(error)] as const) : ([] as const))
+      )
       return
     }
     if (reportFailure) {
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-ordinary-run.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-ordinary-run.ts
index 82227b7a604b..b3feca28608d 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-ordinary-run.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-ordinary-run.ts
@@ -40,9 +40,7 @@ export async function runOrdinaryCliChatResume(
   source: CliChatResumeSource,
   openOwner = false,
   selection?: {
-    token?: string
     reportFailure?: (error: unknown) => void
-    current: () => boolean
     sourceCurrent: () => boolean
     afterTabId: string
   }
@@ -148,13 +146,7 @@ export async function runOrdinaryCliChatResume(
       plan,
       hooks: { beforeCreate: handoff },
       deferPublication: true,
-      ...(selection
-        ? {
-            viewerSelection: selection.token,
-            canActivate: selection.current,
-            afterTabId: selection.afterTabId
-          }
-        : {})
+      ...(selection ? { afterTabId: selection.afterTabId } : {})
     })
     if (!launch) {
       return
@@ -169,20 +161,12 @@ export async function runOrdinaryCliChatResume(
         result.error,
         openOwner,
         target,
-        selection?.token,
         selection?.reportFailure
       )
     }
   } catch (error) {
     if (pending.get(key) === controller) {
-      await reportCliChatResumeFailure(
-        source,
-        error,
-        false,
-        target,
-        selection?.token,
-        selection?.reportFailure
-      )
+      await reportCliChatResumeFailure(source, error, false, target, selection?.reportFailure)
     }
   } finally {
     clearTimeout(timer)
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
index 06081cea36c3..bf923c0eb7ec 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
@@ -17,12 +17,10 @@ import { adoptingAgentOnHost } from '../right-sidebar/ai-vault-session-resume-in
 import { callRuntimeRpc } from '@/runtime/runtime-rpc-client'
 import { captureSourceTerminal } from './cli-chat-resume-terminal-capture'
 import { agentSessionRefusalError } from '../../../../shared/agent-session-wire-refusals'
-import { captureConversationSwitchSelection } from '@/lib/conversation-switch-state'
 
 /** Old peers stop the addressed PTY before ordinary adoption; a kill acknowledgement is never exit proof. */
 export async function runLegacyCliChatResume(
   source: CliChatResumeSource,
-  viewerSelection?: string,
   reportFailure?: (error: unknown) => void
 ): Promise<void> {
   const key = `${source.executionHostId}\0${source.agent}\0${source.providerSessionId}`
@@ -30,7 +28,6 @@ export async function runLegacyCliChatResume(
   if (!target || source.hostUpdateRequired || isCliChatResumePending(key)) {
     return
   }
-  const stillSelected = captureConversationSwitchSelection(viewerSelection)
   const leafId = source.paneKey.slice(source.tabId.length + 1)
   const rendererIdentity = captureTerminalSurfaceIdentity(
     useAppStore.getState(),
@@ -114,9 +111,7 @@ export async function runLegacyCliChatResume(
       return
     }
     await runOrdinaryCliChatResume(source, true, {
-      token: viewerSelection,
       reportFailure,
-      current: stillSelected,
       sourceCurrent: stillCaptured,
       afterTabId: source.tabId
     })
diff --git a/src/renderer/src/components/tab-bar/native-chat-cli-fork-run.ts b/src/renderer/src/components/tab-bar/native-chat-cli-fork-run.ts
index 25c906b0ba76..b7a6fe20a44e 100644
--- a/src/renderer/src/components/tab-bar/native-chat-cli-fork-run.ts
+++ b/src/renderer/src/components/tab-bar/native-chat-cli-fork-run.ts
@@ -51,7 +51,6 @@ export async function runNativeChatCliFork(args: {
   subject: NativeChatCliForkSubject
   tab: { id: string; worktreeId: string }
   agent: AiVaultAgent
-  viewerSelection?: string
   queuedMessage?: string
   describeFailure?: (message: string) => string
   onComplete?: () => void
@@ -149,8 +148,7 @@ export async function runNativeChatCliFork(args: {
       {
         agent: target.agent,
         worktreeId: subject.workspaceId,
-        ...startup,
-        ...(args.viewerSelection ? { viewerSelection: args.viewerSelection } : {})
+        ...startup
       },
       args.describeFailure ?? describeAiVaultCliForkFailure,
       args.queuedMessage
diff --git a/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts b/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts
index 55b906f2adfa..928245d29919 100644
--- a/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts
+++ b/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts
@@ -29,7 +29,6 @@ export async function runLegacyNativeChatCliSwitch(args: {
   agent: AiVaultAgent
   chatTabId: string | null
   onComplete?: () => void
-  viewerSelection?: string
   reportFailure?: (error: unknown) => void
 }): Promise<void> {
   const key = `${args.executionHostId}\0${args.sessionId}\0legacy`
diff --git a/src/renderer/src/components/tab-bar/use-tab-bar-item-actions.ts b/src/renderer/src/components/tab-bar/use-tab-bar-item-actions.ts
index 20d410d9b453..1a78071df886 100644
--- a/src/renderer/src/components/tab-bar/use-tab-bar-item-actions.ts
+++ b/src/renderer/src/components/tab-bar/use-tab-bar-item-actions.ts
@@ -1,4 +1,3 @@
-import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { useLayoutEffect, useMemo, useRef } from 'react'
 import { clearClientHostedBrowserRowSelection } from '@/lib/pane-manager/client-hosted-browser-row-state'
 import { noteUserWorkspaceSwitch } from '@/lib/workspace-switch-user-act'
@@ -71,10 +70,6 @@ export function useTabBarItemActions(source: TabBarItemActionSource): TabBarItem
       noteUserWorkspaceSwitch(useAppStore.getState().activeWorktreeId)
       activate()
     }
-    const navigate = (action: () => void): void => {
-      noteViewerNavigation()
-      action()
-    }
     const actions: TabBarItemActions = {
       activateTerminal: (tabId) => activateRealTab(() => latest.current.props.onActivate(tabId)),
       activateFile: (fileId) =>
@@ -83,14 +78,14 @@ export function useTabBarItemActions(source: TabBarItemActionSource): TabBarItem
         activateRealTab(() => latest.current.props.onActivateBrowserTab?.(tabId)),
       activateAgentSession: (tabId) =>
         activateRealTab(() => latest.current.props.onActivateAgentSession?.(tabId)),
-      close: (tabId) => navigate(() => latest.current.props.onClose(tabId)),
-      closeFile: (fileId) => navigate(() => latest.current.props.onCloseFile?.(fileId)),
-      closeBrowserTab: (tabId) => navigate(() => latest.current.props.onCloseBrowserTab?.(tabId)),
-      closeOthers: (tabId) => navigate(() => latest.current.props.onCloseOthers(tabId)),
-      closeToRight: (tabId) => navigate(() => latest.current.props.onCloseToRight(tabId)),
-      closeToLeft: (tabId) => navigate(() => latest.current.props.onCloseToLeft(tabId)),
-      closeSplitPane: () => navigate(() => latest.current.props.onCloseSplitPane?.()),
-      closeAllFiles: () => navigate(() => latest.current.props.onCloseAllFiles?.()),
+      close: (tabId) => latest.current.props.onClose(tabId),
+      closeFile: (fileId) => latest.current.props.onCloseFile?.(fileId),
+      closeBrowserTab: (tabId) => latest.current.props.onCloseBrowserTab?.(tabId),
+      closeOthers: (tabId) => latest.current.props.onCloseOthers(tabId),
+      closeToRight: (tabId) => latest.current.props.onCloseToRight(tabId),
+      closeToLeft: (tabId) => latest.current.props.onCloseToLeft(tabId),
+      closeSplitPane: () => latest.current.props.onCloseSplitPane?.(),
+      closeAllFiles: () => latest.current.props.onCloseAllFiles?.(),
       setCustomTitle: (tabId, title) => latest.current.props.onSetCustomTitle(tabId, title),
       setTabColor: (tabId, color) => latest.current.props.onSetTabColor(tabId, color),
       togglePaneExpand: (tabId) => latest.current.props.onTogglePaneExpand(tabId),
@@ -99,7 +94,7 @@ export function useTabBarItemActions(source: TabBarItemActionSource): TabBarItem
       makePreviewFilePermanent: (fileId, tabId) =>
         latest.current.props.onMakePreviewFilePermanent?.(fileId, tabId),
       togglePinned: (item) => latest.current.togglePinned(item),
-      toggleViewMode: (tabId) => navigate(() => latest.current.toggleTabViewMode(tabId))
+      toggleViewMode: (tabId) => latest.current.toggleTabViewMode(tabId)
     }
     return ORCA_LAYOUT_OWNER_IS_MAIN
       ? { ...actions, ...withLayoutOwnerTabProps(actions, () => latest.current.props.worktreeId) }
diff --git a/src/renderer/src/components/tab-group/tab-drag-drop-commit.ts b/src/renderer/src/components/tab-group/tab-drag-drop-commit.ts
index ca1ff0baddf6..ca7f1e27c8e3 100644
--- a/src/renderer/src/components/tab-group/tab-drag-drop-commit.ts
+++ b/src/renderer/src/components/tab-group/tab-drag-drop-commit.ts
@@ -1,4 +1,3 @@
-import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import type { RefObject } from 'react'
 import type { DragEndEvent } from '@dnd-kit/core'
 import { useAppStore } from '../../store'
@@ -64,7 +63,6 @@ export function commitTabDragDrop({
       finishDrag(true)
       return
     }
-    noteViewerNavigation()
     const moved = dropUnifiedTab(activeData.unifiedTabId, {
       groupId: paneColumnSplit.groupId,
       splitDirection: paneColumnSplit.zone
@@ -160,7 +158,6 @@ export function commitTabDragDrop({
         finishDrag(true)
         return
       }
-      noteViewerNavigation()
       const moved = dropUnifiedTab(activeData.unifiedTabId, {
         groupId: overData.groupId,
         index
@@ -197,7 +194,6 @@ export function commitTabDragDrop({
         finishDrag(true)
         return
       }
-      noteViewerNavigation()
       const moved = dropUnifiedTab(activeData.unifiedTabId, {
         groupId: overData.groupId
       })
diff --git a/src/renderer/src/components/tab-group/tab-group-layout-owner-commands.ts b/src/renderer/src/components/tab-group/tab-group-layout-owner-commands.ts
index fbdd21271667..ae33f4c836c2 100644
--- a/src/renderer/src/components/tab-group/tab-group-layout-owner-commands.ts
+++ b/src/renderer/src/components/tab-group/tab-group-layout-owner-commands.ts
@@ -1,4 +1,3 @@
-import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 // Main frames/reconnect snapshots draw moves and select them unless selection changed; divider ratios persist on release.
 
 import { useAppStore } from '@/store'
@@ -28,9 +27,6 @@ export function dropTabThroughLayoutOwner(worktreeId: string, drop: TabDrop): bo
   if (!command) {
     return false
   }
-  if (drop.kind !== 'reorder') {
-    noteViewerNavigation()
-  }
   const forget = expectSelectionAfterMove(worktreeId, drop)
   const sent = sendLayoutCommandToOwner(worktreeId, command, {
     // Forget after the answering frame; without a stream, retain selection intent for the reconnect snapshot.
diff --git a/src/renderer/src/components/tab-group/useTabGroupActivationCommands.ts b/src/renderer/src/components/tab-group/useTabGroupActivationCommands.ts
index ec3cda39716c..517d2d8860ba 100644
--- a/src/renderer/src/components/tab-group/useTabGroupActivationCommands.ts
+++ b/src/renderer/src/components/tab-group/useTabGroupActivationCommands.ts
@@ -1,4 +1,3 @@
-import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { useCallback } from 'react'
 import type { Tab } from '../../../../shared/tab-types'
 import { useAppStore } from '../../store'
@@ -37,7 +36,6 @@ export function useTabGroupActivationCommands({
       if (!item) {
         return
       }
-      noteViewerNavigation()
       focusGroup(worktreeId, groupId)
       activateTab(item.id)
       const runtimeEnvironmentId = runtimeEnvironmentIdOrLocalUnlessTwin(
@@ -96,7 +94,6 @@ export function useTabGroupActivationCommands({
       if (!item) {
         return
       }
-      noteViewerNavigation()
       focusGroup(worktreeId, groupId)
       activateTab(item.id)
       if (item.contentType === 'simulator') {
@@ -118,7 +115,6 @@ export function useTabGroupActivationCommands({
       if (!item) {
         return
       }
-      noteViewerNavigation()
       focusGroup(worktreeId, groupId)
       activateTab(item.id)
       const runtimeEnvironmentId = runtimeEnvironmentIdOrLocalUnlessTwin(
@@ -143,7 +139,6 @@ export function useTabGroupActivationCommands({
 
   const activateAgentSession = useCallback(
     (tabId: string) => {
-      noteViewerNavigation()
       activateStructuredAgentSessionTab({ worktreeId, tabId })
     },
     [worktreeId]
diff --git a/src/renderer/src/components/tab-group/useTabGroupCreationCommands.ts b/src/renderer/src/components/tab-group/useTabGroupCreationCommands.ts
index 71d4cec4853d..95c674cf9e8c 100644
--- a/src/renderer/src/components/tab-group/useTabGroupCreationCommands.ts
+++ b/src/renderer/src/components/tab-group/useTabGroupCreationCommands.ts
@@ -1,4 +1,3 @@
-import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { toast } from 'sonner'
 import { useAppStore } from '../../store'
 import { focusTerminalTabSurface } from '../../lib/focus-terminal-tab-surface'
@@ -41,14 +40,12 @@ export function useTabGroupCreationCommands({
 
   return {
     newBrowserTab: () => {
-      noteViewerNavigation()
       void openNewBrowserTabInActiveWorkspace(groupId).catch((error) => {
         toast.error(error instanceof Error ? error.message : String(error))
       })
     },
     newSimulatorTab: worktreeState.mobileEmulatorEnabled
       ? () => {
-          noteViewerNavigation()
           if (getSimulatorTabForWorktree(worktreeId)) {
             void ensureSimulatorTab(worktreeId, { surfacePane: true })
             return
@@ -62,11 +59,9 @@ export function useTabGroupCreationCommands({
         }
       : undefined,
     openEntry: async (args: TabCreateEntryArgs) => {
-      noteViewerNavigation()
       await openTabBarEntry(args)
     },
     duplicateBrowserTab: (browserTabId: string, sourceUnifiedTabId: string) => {
-      noteViewerNavigation()
       void (async () => {
         const state = useAppStore.getState()
         const tabs = state.browserTabsByWorktree[worktreeId] ?? []
@@ -115,15 +110,12 @@ export function useTabGroupCreationCommands({
     },
     // Why: target the owning group explicitly; the "+" menu can fire from an unfocused panel without updating global group focus.
     newFileTab: async () => {
-      noteViewerNavigation()
       await openNewMarkdownInActiveWorkspace(groupId)
     },
     newTerminalTab: () => {
-      noteViewerNavigation()
       void openNewTerminalTabInActiveWorkspace(groupId)
     },
     newTerminalWithShell: (shellOverride: string) => {
-      noteViewerNavigation()
       void (async () => {
         const environmentId = runtimeEnvironmentIdOrLocalUnlessTwin(
           useAppStore.getState(),
diff --git a/src/renderer/src/components/tab-group/useTabGroupWorkspaceModel.ts b/src/renderer/src/components/tab-group/useTabGroupWorkspaceModel.ts
index b54233cb01bf..662721214e45 100644
--- a/src/renderer/src/components/tab-group/useTabGroupWorkspaceModel.ts
+++ b/src/renderer/src/components/tab-group/useTabGroupWorkspaceModel.ts
@@ -1,4 +1,3 @@
-import { noteViewerGroupNavigation } from '@/lib/viewer-selection-request'
 import { useShallow } from 'zustand/react/shallow'
 import type { BrowserTab as BrowserTabState } from '../../../../shared/browser-workspace-types'
 import type { Tab, TabGroup } from '../../../../shared/tab-types'
@@ -89,7 +88,6 @@ export function useTabGroupWorkspaceModel({
     expandedPaneByTabId: worktreeState.expandedPaneByTabId,
     commands: {
       focusGroup: () => {
-        noteViewerGroupNavigation(useAppStore.getState(), worktreeId, groupId)
         focusGroup(worktreeId, groupId)
       },
       activateAgentSession,
diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneOverlayLayer.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneOverlayLayer.tsx
index 8596c09f973d..0db5597d9b2c 100644
--- a/src/renderer/src/components/terminal-pane/TerminalPaneOverlayLayer.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalPaneOverlayLayer.tsx
@@ -1,4 +1,3 @@
-import { noteViewerGroupNavigation } from '@/lib/viewer-selection-request'
 import { memo, useCallback, useMemo } from 'react'
 import { useShallow } from 'zustand/react/shallow'
 import type { Tab, TabGroup } from '../../../../shared/tab-types'
@@ -77,10 +76,7 @@ const TerminalPaneOverlayLayer = memo(function TerminalPaneOverlayLayer({
   )
 
   const focusOwningGroup = useCallback(
-    (groupId: string) => {
-      noteViewerGroupNavigation(useAppStore.getState(), worktreeId, groupId)
-      focusGroup(worktreeId, groupId)
-    },
+    (groupId: string) => focusGroup(worktreeId, groupId),
     [focusGroup, worktreeId]
   )
 
diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx
index 25b7446088dc..b2b35277e71e 100644
--- a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx
@@ -1,8 +1,12 @@
 import { useConfirmationDialog } from '@/components/confirmation-dialog-context'
-import { useConversationSwitchReadiness, runCliChatResume } from '@/lib/conversation-surface-switch'
+import {
+  useConversationSwitchBusy,
+  useConversationSwitchReadiness,
+  runCliChatResume
+} from '@/lib/conversation-surface-switch'
 import { isNativeChatEnabled } from '../../../../shared/structured-native-chat-launch-route'
 import { useShallow } from 'zustand/react/shallow'
-import { MessagesSquare } from 'lucide-react'
+import { Loader2, MessagesSquare } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import { translate } from '@/i18n/i18n'
@@ -31,6 +35,8 @@ export function TerminalPaneResumeInChatButton({
   const readiness = useConversationSwitchReadiness(
     source ? { direction: 'chat', ...source, source } : null
   )
+  const busy = useConversationSwitchBusy(readiness.pending)
+
   const enabled = useAppStore((state) => isNativeChatEnabled(state.settings))
   if (!enabled) {
     return null
@@ -75,7 +81,11 @@ export function TerminalPaneResumeInChatButton({
               }
             }}
           >
-            <MessagesSquare className="size-3" />
+            {busy ? (
+              <Loader2 className="size-3 animate-spin" />
+            ) : (
+              <MessagesSquare className="size-3" />
+            )}
           </Button>
         </span>
       </TooltipTrigger>
diff --git a/src/renderer/src/components/terminal-pane/terminal-file-open-routing.ts b/src/renderer/src/components/terminal-pane/terminal-file-open-routing.ts
index 99b7b2c6bd47..31056fadf744 100644
--- a/src/renderer/src/components/terminal-pane/terminal-file-open-routing.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-file-open-routing.ts
@@ -1,4 +1,3 @@
-import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { downloadAndOpenRemoteTerminalFile } from './terminal-remote-file-download-open'
 import { findWorkspaceFileRoute } from '@/lib/runtime-workspace-file-route'
 import { isPathInsideWorktree, toWorktreeRelativePath } from '../../../../shared/terminal-links'
@@ -84,7 +83,6 @@ export function openDetectedFilePath(
   column: number | null,
   deps: TerminalFileOpenDeps
 ): void {
-  noteViewerNavigation()
   const { openWithSystemDefault = false, runtimeEnvironmentId } = deps
   let { worktreeId, worktreePath } = deps
   let mappedFilePath = mapTerminalFilePath(
diff --git a/src/renderer/src/components/terminal-pane/terminal-handle-links.ts b/src/renderer/src/components/terminal-pane/terminal-handle-links.ts
index 3a416a2de0dd..dbdb387e5bd5 100644
--- a/src/renderer/src/components/terminal-pane/terminal-handle-links.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-handle-links.ts
@@ -1,4 +1,3 @@
-import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import type { ILink, ILinkProvider, Terminal } from '@xterm/xterm'
 import type { AppState } from '@/store'
 import { useAppStore } from '@/store'
@@ -146,7 +145,6 @@ export function focusRendererTerminalHandle(
     return false
   }
 
-  noteViewerNavigation()
   revealWorkspaceSurface(store, target.worktreeId)
   store.setActiveTabType('terminal', target.worktreeId)
   if (target.leafId) {
diff --git a/src/renderer/src/components/terminal-pane/terminal-pane-mount-context.ts b/src/renderer/src/components/terminal-pane/terminal-pane-mount-context.ts
index de7b89b5ff9d..d66b0e8cde19 100644
--- a/src/renderer/src/components/terminal-pane/terminal-pane-mount-context.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-pane-mount-context.ts
@@ -13,7 +13,6 @@ import type { resolveTerminalHttpLinkSourceOwner } from './terminal-http-link-so
 import type { SessionRestoredBannerReason } from './session-restored-banner-pane-state'
 
 export type TerminalPaneMountContext = {
-  getOwnedManager?: () => PaneManager | null
   deps: UseTerminalPaneLifecycleDeps
   refs: TerminalPaneLifecycleRefs
   ptyDeps: PtyConnectionDeps
diff --git a/src/renderer/src/components/terminal-pane/terminal-pane-mount-preparation.ts b/src/renderer/src/components/terminal-pane/terminal-pane-mount-preparation.ts
index 6ff1cb41a836..223d441afefe 100644
--- a/src/renderer/src/components/terminal-pane/terminal-pane-mount-preparation.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-pane-mount-preparation.ts
@@ -1,4 +1,3 @@
-import { registerTerminalPaneMount } from './terminal-pane-mount-registration'
 import type { PaneManager } from '@/lib/pane-manager/pane-manager'
 import { useAppStore } from '@/store'
 import { getConnectionId } from '@/lib/connection-context'
@@ -26,6 +25,7 @@ import type { PtyConnectionDeps } from './pty-connection-types'
 import type { UseTerminalPaneLifecycleDeps } from './terminal-pane-lifecycle-types'
 import type { TerminalPaneLifecycleRefs } from './use-terminal-pane-lifecycle-refs'
 import { fitAndFocusPanes, fitPanes } from './pane-helpers'
+import { registerRuntimeTerminalTab } from '@/runtime/mounted-terminal-tab-registry'
 import { normalizeTerminalLayoutSnapshot } from './layout-serialization'
 import { applyTerminalAppearance } from './terminal-appearance'
 import { terminalLinkClickBehaviorFor } from './terminal-link-click-behavior'
@@ -52,8 +52,6 @@ export type TerminalPaneMountPreparation = {
   ptyDeps: PtyConnectionDeps
   deferredSplitHandoffs: Map<number, DeferredSplitPaneHandoffHandle>
   unregisterRuntimeTab: () => void
-  setOwnedManager: (manager: PaneManager) => void
-  getOwnedManager: () => PaneManager | null
   fileOpenLinkHint: string
   getPaneLinkCwd: (paneId: number) => string
   getUrlOpenLinkHint: (paneId: number) => string
@@ -77,8 +75,7 @@ export type TerminalPaneMountPreparation = {
 export function prepareTerminalPaneMount(
   deps: UseTerminalPaneLifecycleDeps,
   refs: TerminalPaneLifecycleRefs,
-  mountFollowsTerminalPark: boolean,
-  onEmpty: (manager: PaneManager) => void
+  mountFollowsTerminalPark: boolean
 ): TerminalPaneMountPreparation | null {
   const { containerRef, expandedStyleSnapshotRef, paneTransportsRef, panePtyBindingsRef } = deps
   const container = containerRef.current
@@ -235,10 +232,14 @@ export function prepareTerminalPaneMount(
     restoredPtyIdByLeafId: deps.initialLayoutRef.current.ptyIdsByLeafId ?? {},
     deferredSplitHandoffs
   })
-  const { unregisterRuntimeTab, setOwnedManager, getOwnedManager } = registerTerminalPaneMount(
-    { deps, refs, deferredSplitHandoffs },
-    onEmpty
-  )
+  const unregisterRuntimeTab = registerRuntimeTerminalTab({
+    tabId: deps.tabId,
+    worktreeId: deps.worktreeId,
+    getManager: () => deps.managerRef.current,
+    getContainer: () => deps.containerRef.current,
+    getPtyIdForPane: (paneId) => paneTransports.get(paneId)?.getPtyId() ?? null,
+    getTabWideAgentHintLeafId: deps.getTabWideAgentHintLeafId
+  })
   const fileOpenLinkHint = getTerminalFileOpenHint()
   const getUrlOpenLinkHint = (paneId: number): string =>
     getTerminalUrlOpenHint({
@@ -262,8 +263,6 @@ export function prepareTerminalPaneMount(
     ptyDeps,
     deferredSplitHandoffs,
     unregisterRuntimeTab,
-    setOwnedManager,
-    getOwnedManager,
     fileOpenLinkHint,
     getPaneLinkCwd,
     getUrlOpenLinkHint,
diff --git a/src/renderer/src/components/terminal-pane/terminal-pane-mount-registration.ts b/src/renderer/src/components/terminal-pane/terminal-pane-mount-registration.ts
deleted file mode 100644
index 8b2b183ad184..000000000000
--- a/src/renderer/src/components/terminal-pane/terminal-pane-mount-registration.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import type { PaneManager } from '@/lib/pane-manager/pane-manager'
-import { registerRuntimeTerminalTab } from '@/runtime/mounted-terminal-tab-registry'
-import { removeTerminalPresentation } from './terminal-presentation-retirement'
-import type { PaneClosedHandlerContext } from './terminal-pane-mount-context'
-
-/** The mount retains its actual manager even while the rendering ref is temporarily cleared. */
-export function registerTerminalPaneMount(
-  context: Pick<PaneClosedHandlerContext, 'deps' | 'refs' | 'deferredSplitHandoffs'>,
-  onEmpty: (manager: PaneManager) => void
-) {
-  const { deps } = context
-  let ownedManager: PaneManager | null = null
-  const unregisterRuntimeTab = registerRuntimeTerminalTab({
-    retirePresentation: (original) => {
-      const manager = ownedManager
-      const pane = manager?.getPanes().find((candidate) => candidate.leafId === original.leafId)
-      const transport = pane ? deps.paneTransportsRef.current.get(pane.id) : null
-      if (transport?.getPtyId() && transport.getPtyId() !== original.ptyId) {
-        throw new Error('terminal_pane_owner_changed')
-      }
-      if (
-        !pane &&
-        [...deps.paneTransportsRef.current.values()].some(
-          (candidate) => !manager || candidate.getPtyId() === original.ptyId
-        )
-      ) {
-        throw new Error('terminal_pane_owner_unavailable')
-      }
-      removeTerminalPresentation(original, (failures) => {
-        if (pane && manager) {
-          const structuralFailures: unknown[] = []
-          try {
-            if (!manager.retirePanePreservingPty(pane.id, true, failures)) {
-              throw new Error('terminal_pane_close_failed')
-            }
-          } catch (error) {
-            structuralFailures.push(error)
-          } finally {
-            if (manager.getPanes().length === 0) {
-              try {
-                onEmpty(manager)
-              } catch (error) {
-                structuralFailures.push(error)
-              } finally {
-                if (deps.managerRef.current === manager) {
-                  deps.managerRef.current = null
-                }
-                ownedManager = null
-                unregisterRuntimeTab()
-              }
-            }
-          }
-          if (structuralFailures.length === 1) {
-            throw structuralFailures[0]
-          }
-          if (structuralFailures.length > 1) {
-            throw new AggregateError(structuralFailures, 'terminal_tab_close_failed')
-          }
-        }
-      })
-    },
-    tabId: deps.tabId,
-    worktreeId: deps.worktreeId,
-    getManager: () => deps.managerRef.current,
-    getContainer: () => deps.containerRef.current,
-    getPtyIdForPane: (paneId) => deps.paneTransportsRef.current.get(paneId)?.getPtyId() ?? null,
-    getTabWideAgentHintLeafId: deps.getTabWideAgentHintLeafId
-  })
-  return {
-    unregisterRuntimeTab,
-    getOwnedManager: () => ownedManager,
-    setOwnedManager: (manager: PaneManager) => {
-      ownedManager = manager
-    }
-  }
-}
diff --git a/src/renderer/src/components/terminal-pane/terminal-pane-pane-closed.ts b/src/renderer/src/components/terminal-pane/terminal-pane-pane-closed.ts
index 847b93ed1a7f..3475c2c00bd3 100644
--- a/src/renderer/src/components/terminal-pane/terminal-pane-pane-closed.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-pane-pane-closed.ts
@@ -17,10 +17,7 @@ import {
 import type { PaneClosedHandlerContext } from './terminal-pane-mount-context'
 
 export function createTerminalPaneClosedHandler(
-  context: Pick<
-    PaneClosedHandlerContext,
-    'deps' | 'refs' | 'deferredSplitHandoffs' | 'getOwnedManager'
-  >
+  context: Omit<PaneClosedHandlerContext, 'paneId' | 'closedPane'>
 ): (paneId: number, closedPane?: PaneClosedHandlerContext['closedPane']) => void {
   return (paneId, closedPane) => {
     const { deps, refs } = context
@@ -158,9 +155,8 @@ export function createTerminalPaneClosedHandler(
       paneTitlesRef.current = next
     }
     setRenamingPaneId((current) => (current === paneId ? null : current))
-    const manager = context.getOwnedManager?.() ?? managerRef.current
-    setPaneCount(manager?.getPanes().length ?? 0)
-    const activePane = manager?.getActivePane()
+    setPaneCount(managerRef.current?.getPanes().length ?? 0)
+    const activePane = managerRef.current?.getActivePane()
     if (activePane) {
       reportActiveRendererPtyForPane(paneTransportsRef.current, activePane.id)
       const paneTitles = useAppStore.getState().runtimePaneTitlesByTabId[tabId] ?? {}
diff --git a/src/renderer/src/components/terminal-pane/terminal-parked-watcher-registry.ts b/src/renderer/src/components/terminal-pane/terminal-parked-watcher-registry.ts
index fd5dd85e13a0..4344d28495f9 100644
--- a/src/renderer/src/components/terminal-pane/terminal-parked-watcher-registry.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-parked-watcher-registry.ts
@@ -170,52 +170,3 @@ export function pruneParkedTerminalWatchers(liveWorktreeIds: ReadonlySet<string>
     }
   }
 }
-
-/** Permanent removal consumes one leaf's sidecars, including ended watcher slots. */
-export function retireParkedTerminalLeaf(
-  original: { worktreeId: string; tabId: string; leafId: string; ptyId: string | null },
-  retainedPtyIds: ReadonlySet<string> = new Set()
-): number[] {
-  const { worktreeId, tabId, leafId, ptyId } = original
-  const capture = capturedPanesByTabId.get(tabId)
-  const entry = parkedWatchersByTabId.get(tabId)
-  if (
-    (capture && capture.worktreeId !== worktreeId) ||
-    (entry && entry.worktreeId !== worktreeId)
-  ) {
-    throw new Error('terminal_pane_owner_changed')
-  }
-  const panes = capture?.panes.filter((pane) => pane.leafId === leafId) ?? []
-  if (panes.some((pane) => pane.ptyId !== null && pane.ptyId !== ptyId)) {
-    throw new Error('terminal_pane_owner_changed')
-  }
-  const ids = new Set(panes.flatMap((pane) => (pane.ptyId ? [pane.ptyId] : [])))
-  if (ptyId) {
-    ids.add(ptyId)
-  }
-  const paneIds = new Set(panes.map((pane) => pane.paneId))
-  for (const id of ids) {
-    if (retainedPtyIds.has(id)) {
-      continue
-    }
-    const paneId = entry?.paneIdByPtyId.get(id)
-    if (paneId !== undefined) {
-      paneIds.add(paneId)
-    }
-    entry?.disposersByPtyId.get(id)?.()
-    entry?.disposersByPtyId.delete(id)
-    entry?.paneIdByPtyId.delete(id)
-    discardPreHandlerPtyState(id)
-  }
-  if (entry && entry.disposersByPtyId.size === 0 && entry.paneIdByPtyId.size === 0) {
-    parkedWatchersByTabId.delete(tabId)
-  }
-  if (capture) {
-    capture.panes = capture.panes.filter((pane) => pane.leafId !== leafId)
-    if (capture.panes.length === 0) {
-      capturedPanesByTabId.delete(tabId)
-    }
-  }
-  releaseTerminalScrollIntentKey(leafId)
-  return [...paneIds]
-}
diff --git a/src/renderer/src/components/terminal-pane/terminal-presentation-retirement.test-fixture.ts b/src/renderer/src/components/terminal-pane/terminal-presentation-retirement.test-fixture.ts
deleted file mode 100644
index a64213671c02..000000000000
--- a/src/renderer/src/components/terminal-pane/terminal-presentation-retirement.test-fixture.ts
+++ /dev/null
@@ -1,260 +0,0 @@
-import { vi } from 'vitest'
-import { renderHook } from '@testing-library/react'
-import { Terminal } from '@xterm/xterm'
-import { SearchAddon } from '@xterm/addon-search'
-import { SerializeAddon } from '@xterm/addon-serialize'
-import { Unicode11Addon } from '@xterm/addon-unicode11'
-import { WebLinksAddon } from '@xterm/addon-web-links'
-import { FitAddon } from '@xterm/addon-fit'
-import { WebglAddon } from '@xterm/addon-webgl'
-import { ImageAddon } from '@xterm/addon-image'
-import { isTerminalLeafId } from '../../../../shared/stable-pane-id'
-import type { ManagedPaneInternal } from '@/lib/pane-manager/pane-manager-types'
-import { PaneManager } from '@/lib/pane-manager/pane-manager'
-import { retireManagedPanePreservingPty } from '@/lib/pane-manager/pane-split-close'
-import { createTerminalPaneClosedHandler } from './terminal-pane-pane-closed'
-import { registerTerminalPaneMount } from './terminal-pane-mount-registration'
-import { cleanupTerminalPaneMount } from './terminal-pane-mount-cleanup'
-import { installTerminalPaneMountEvents } from './terminal-pane-mount-events'
-import type { PaneClosedHandlerContext } from './terminal-pane-mount-context'
-import { useTerminalPaneLifecycleRefs } from './use-terminal-pane-lifecycle-refs'
-import type { UseTerminalPaneLifecycleDeps } from './terminal-pane-lifecycle-types'
-import type { PtyTransport } from './pty-transport-types'
-import { useAppStore } from '@/store'
-
-export const LEAF = '11111111-1111-4111-8111-111111111111'
-
-function disposable<T extends { dispose(): void }>(value: T): T {
-  return Object.assign(value, { dispose: vi.fn<() => void>() })
-}
-
-function pane(id: number, leafId: string): ManagedPaneInternal {
-  if (!isTerminalLeafId(leafId)) {
-    throw new Error('Expected a valid fixture leaf id')
-  }
-  const terminal = disposable(new Terminal())
-  vi.spyOn(terminal, 'clearSelection').mockImplementation(() => {})
-  vi.spyOn(terminal, 'focus').mockImplementation(() => {})
-  const container = document.createElement('div')
-  container.classList.add('pane')
-  container.dataset.leafId = leafId
-  return {
-    id,
-    leafId,
-    stablePaneId: leafId,
-    terminal,
-    container,
-    xtermContainer: container,
-    linkTooltip: document.createElement('div'),
-    terminalGpuAcceleration: 'off',
-    gpuRenderingEnabled: false,
-    webglAttachmentDeferred: false,
-    webglDisabledAfterContextLoss: false,
-    hasComplexScriptOutput: false,
-    compositionHandler: null,
-    pendingSplitScrollState: null,
-    debugLabel: null,
-    searchAddon: disposable(new SearchAddon()),
-    serializeAddon: disposable(new SerializeAddon()),
-    unicode11Addon: disposable(new Unicode11Addon()),
-    webLinksAddon: disposable(new WebLinksAddon()),
-    fitAddon: disposable(new FitAddon()),
-    webglAddon: disposable(new WebglAddon()),
-    imageAddon: disposable(new ImageAddon()),
-    ligaturesAddon: null,
-    fitResizeObserver: null,
-    pendingObservedFitRafId: null,
-    paneDragCleanup: vi.fn(),
-    focusClassSyncCleanup: vi.fn()
-  }
-}
-
-type MountedOwner = {
-  source: ManagedPaneInternal
-  sourceTransport: PtyTransport
-  transports: Map<number, PtyTransport>
-  manager: PaneManager
-  unregister: () => void
-}
-
-/** Uses the production tree teardown, real pane disposer and real mount closure callback. */
-export function mountedOwner(
-  address = {
-    tabId: 'terminal',
-    worktreeId: 'wt-1',
-    leafId: LEAF,
-    ptyId: 'pty-1'
-  }
-): MountedOwner {
-  const source = pane(1, address.leafId)
-  const panes = new Map([[1, source]])
-  const sourceTransport: PtyTransport = {
-    getPtyId: () => address.ptyId,
-    detach: vi.fn(),
-    destroy: vi.fn(),
-    connect: vi.fn(),
-    attach: vi.fn(),
-    disconnect: vi.fn(),
-    sendInput: () => true,
-    sendInputImmediate: () => true,
-    resize: () => true,
-    isConnected: () => false
-  }
-  const transports = new Map([[1, sourceTransport]])
-  const binding = { dispose: vi.fn() }
-  const bindings = new Map([[1, binding]])
-  const lifecycleRefs = renderHook(useTerminalPaneLifecycleRefs)
-  const refs = lifecycleRefs.result.current
-  const ref = <T>() => ({ current: new Map<number, T>() })
-  const link = { dispose: vi.fn() }
-  refs.linkProviderDisposablesRef.current.set(1, link)
-  const state = useAppStore.getState()
-  let manager: PaneManager
-  const managerRef: { current: PaneManager | null } = { current: null }
-  const deps: UseTerminalPaneLifecycleDeps = {
-    tabId: address.tabId,
-    worktreeId: address.worktreeId,
-    managerRef,
-    containerRef: { current: null },
-    paneTransportsRef: { current: transports },
-    panePtyBindingsRef: { current: bindings },
-    paneMode2031Ref: ref(),
-    paneKittyKeyboardModesRef: ref(),
-    paneLastThemeModeRef: ref(),
-    paneCwdRef: ref(),
-    paneFontSizesRef: ref(),
-    replayingPanesRef: refs.replayingPanesRef,
-    clearRuntimePaneTitle: state.clearRuntimePaneTitle,
-    syncPanePtyLayoutBinding: vi.fn(),
-    clearTabPtyId: state.clearTabPtyId,
-    setPaneTitles: vi.fn(),
-    paneTitlesRef: { current: {} },
-    setRenamingPaneId: vi.fn(),
-    setPaneCount: vi.fn(),
-    setTabPaneExpanded: state.setTabPaneExpanded,
-    setTabCanExpandPane: state.setTabCanExpandPane,
-    updateTabTitle: state.updateTabTitle,
-    persistLayoutSnapshot: vi.fn(),
-    getTabWideAgentHintLeafId: () => null,
-    isActive: false,
-    isVisible: false,
-    systemPrefersDark: false,
-    settings: null,
-    settingsRef: { current: null },
-    requestOpenLinksInAppPreference: vi.fn(),
-    requestTerminalLinkAction: vi.fn(),
-    effectiveMacOptionAsAlt: 'false',
-    effectiveMacOptionAsAltRef: { current: 'false' },
-    initialLayoutRef: {
-      current: {
-        root: { type: 'leaf', leafId: address.leafId },
-        activeLeafId: address.leafId,
-        expandedLeafId: null
-      }
-    },
-    expandedStyleSnapshotRef: { current: new Map() },
-    isActiveRef: { current: false },
-    isVisibleRef: { current: false },
-    onPtyExitRef: { current: vi.fn() },
-    onAgentExitedRef: { current: vi.fn() },
-    consumeSuppressedPtyExit: () => false,
-    isPtyShutdownPending: () => false,
-    setRuntimePaneTitle: state.setRuntimePaneTitle,
-    updateTabPtyId: state.updateTabPtyId,
-    markTerminalBell: state.markTerminalBell,
-    onShowSessionRestoredBanner: vi.fn(),
-    dispatchNotification: vi.fn(),
-    setCacheTimerStartedAt: vi.fn(),
-    clearExitedPanePtyLayoutBinding: vi.fn(),
-    setExpandedPane: vi.fn(),
-    syncExpandedLayout: vi.fn(),
-    showPaneTitle: vi.fn(),
-    setPaneLayoutRevision: vi.fn()
-  }
-  const context: Pick<
-    PaneClosedHandlerContext,
-    'deps' | 'refs' | 'deferredSplitHandoffs' | 'getOwnedManager'
-  > = {
-    deps,
-    refs,
-    deferredSplitHandoffs: new Map(),
-    getOwnedManager: () => manager
-  }
-  const onPaneClosed = createTerminalPaneClosedHandler(context)
-  const onLayoutChanged = vi.fn()
-  manager = new PaneManager(document.createElement('div'), { linkOpenHint: () => '' })
-  vi.spyOn(manager, 'getPanes').mockImplementation(() => [...panes.values()])
-  vi.spyOn(manager, 'getActivePane').mockImplementation(() => panes.get(1) ?? null)
-  vi.spyOn(manager, 'retirePanePreservingPty').mockImplementation((id, permanent, failures) =>
-    retireManagedPanePreservingPty(
-      {
-        paneId: id,
-        failures,
-        activePaneId: 1,
-        panes,
-        root: document.createElement('div'),
-        styleOptions: {},
-        managerOptions: { linkOpenHint: () => '', onPaneClosed, onLayoutChanged },
-        getDragCallbacks: () => ({
-          getPanes: () => panes,
-          getRoot: () => source.container,
-          getStyleOptions: () => ({}),
-          isDestroyed: () => false,
-          safeFit: vi.fn(),
-          applyPaneOpacity: vi.fn(),
-          applyDividerStyles: vi.fn(),
-          refitPanesUnder: vi.fn()
-        }),
-        releasePaneIdentity: vi.fn(),
-        setActivePaneId: vi.fn()
-      },
-      permanent
-    )
-  )
-  vi.spyOn(manager, 'destroy')
-  managerRef.current = manager
-  const cancelResize = vi.fn()
-  const expandedElement = document.createElement('div')
-  expandedElement.style.display = 'none'
-  const expandedStyleSnapshots = new Map([[expandedElement, { display: 'flex', flex: '1' }]])
-  const removeMountEvents = installTerminalPaneMountEvents({
-    manager,
-    deps: {
-      ...deps,
-      isActive: false,
-      showPaneTitle: vi.fn(),
-      syncCanExpandState: vi.fn(),
-      queueResizeAll: vi.fn()
-    },
-    ptyDeps: { ...deps, mountFollowsTerminalPark: false }
-  })
-  const empty = vi.fn(() => {
-    removeMountEvents()
-    cleanupTerminalPaneMount({
-      manager,
-      deps: context.deps,
-      refs: context.refs,
-      deferredSplitHandoffs: context.deferredSplitHandoffs,
-      expandedStyleSnapshots,
-      unregisterRuntimeTab: registration.unregisterRuntimeTab,
-      cancelResize,
-      permanent: true
-    })
-  })
-  const registration = registerTerminalPaneMount(context, empty)
-  registration.setOwnedManager(manager)
-  // A null rendering ref does not release the actual mounted owner.
-  managerRef.current = null
-  return {
-    source,
-    sourceTransport,
-    transports,
-    manager,
-    unregister: () => {
-      removeMountEvents()
-      registration.unregisterRuntimeTab()
-      manager.destroy()
-      lifecycleRefs.unmount()
-    }
-  }
-}
diff --git a/src/renderer/src/components/terminal-pane/terminal-presentation-retirement.ts b/src/renderer/src/components/terminal-pane/terminal-presentation-retirement.ts
deleted file mode 100644
index 8c024ae1aa9b..000000000000
--- a/src/renderer/src/components/terminal-pane/terminal-presentation-retirement.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import { useAppStore } from '@/store'
-import { findRegisteredTerminalTab } from '@/runtime/mounted-terminal-tab-registry'
-import { isUnifiedTabPinned } from '@/store/pinned-tab-close-guard'
-import {
-  captureTerminalSurfaceIdentity,
-  isRetainedTerminalSurfaceIdentity,
-  type TerminalSurfaceCloseIdentity
-} from '../../../../shared/terminal-tab-close'
-import { detachTerminalLayoutLeaf } from './terminal-layout-leaf-detach'
-import { retireParkedTerminalLeaf } from './terminal-parked-watcher-registry'
-import { collapseParkedTerminalLeaf } from './terminal-parked-pty-watcher'
-
-/** Admission and disposal share one synchronous owner action. */
-export function removeTerminalPresentation(
-  original: TerminalSurfaceCloseIdentity,
-  dispose: (failures: unknown[]) => void
-): void {
-  const state = useAppStore.getState()
-  const current = captureTerminalSurfaceIdentity(
-    state,
-    original.worktreeId,
-    original.tabId,
-    original.leafId
-  )
-  if (!isRetainedTerminalSurfaceIdentity(original, current)) {
-    throw new Error('terminal_pane_owner_changed')
-  }
-  const layout = state.terminalLayoutsByTabId[original.tabId]
-  const split = detachTerminalLayoutLeaf(layout, original.leafId)
-  if (
-    current?.hasLeaf &&
-    !split &&
-    (isUnifiedTabPinned(state, original.worktreeId, original.tabId) ||
-      state.tabsByWorktree[original.worktreeId]?.some(
-        (tab) => tab.id === original.tabId && tab.isPinned
-      ))
-  ) {
-    throw new Error('terminal_tab_pinned')
-  }
-  const retainedPtyIds = new Set(
-    Object.entries(layout?.ptyIdsByLeafId ?? {})
-      .filter(([leafId]) => leafId !== original.leafId)
-      .map(([, ptyId]) => ptyId)
-  )
-  const paneIds = retireParkedTerminalLeaf(original, retainedPtyIds)
-  for (const paneId of paneIds) {
-    state.clearRuntimePaneTitle(original.tabId, paneId)
-  }
-  const failures: unknown[] = []
-  try {
-    dispose(failures)
-    if (current?.hasLeaf) {
-      if (split) {
-        useAppStore.getState().setTabLayout(original.tabId, split.sourceLayout)
-      } else {
-        useAppStore.getState().closeTab(original.tabId, {
-          reason: 'user',
-          captureRecentlyClosed: false,
-          localPtyTeardownOwnedExternally: true,
-          remoteCloseOwnedByHost: true
-        })
-      }
-    }
-  } catch (error) {
-    if (failures.length === 0) {
-      throw error
-    }
-    failures.push(error)
-  }
-  if (failures.length > 0) {
-    throw new AggregateError(failures, 'terminal_tab_close_failed')
-  }
-}
-
-export function retireTerminalPresentation(original: TerminalSurfaceCloseIdentity): void {
-  const mounted = findRegisteredTerminalTab(original.tabId, original.worktreeId)?.tab
-  if (mounted) {
-    if (!mounted.retirePresentation) {
-      throw new Error('runtime_unavailable')
-    }
-    mounted.retirePresentation(original)
-    return
-  }
-  removeTerminalPresentation(original, () => {
-    const state = useAppStore.getState()
-    state.retireAgentPaneAuthority(`${original.tabId}:${original.leafId}`)
-    collapseParkedTerminalLeaf(original.tabId, original.leafId, original.ptyId ?? undefined)
-  })
-}
diff --git a/src/renderer/src/components/terminal-pane/use-terminal-pane-chat-state.ts b/src/renderer/src/components/terminal-pane/use-terminal-pane-chat-state.ts
index d08fdd2a3ecd..3692d9f3db8c 100644
--- a/src/renderer/src/components/terminal-pane/use-terminal-pane-chat-state.ts
+++ b/src/renderer/src/components/terminal-pane/use-terminal-pane-chat-state.ts
@@ -1,4 +1,3 @@
-import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { useCallback, useEffect, useMemo, useRef } from 'react'
 import { useShallow } from 'zustand/react/shallow'
 import { useAppStore } from '../../store'
@@ -217,7 +216,6 @@ export function useTerminalPaneChatState(controller: TerminalPaneTitleController
       if (!unifiedTabId) {
         return
       }
-      noteViewerNavigation()
       if (effectiveChatViewMode && chatLeafId === leafId) {
         setChatLeafId(null)
         toggleTabViewMode(unifiedTabId)
@@ -240,7 +238,6 @@ export function useTerminalPaneChatState(controller: TerminalPaneTitleController
   const switchNativeChatToTerminal = useCallback(() => {
     if (chatLeafId && unifiedTabId) {
       setChatLeafId(null)
-      noteViewerNavigation()
       setTabViewMode(unifiedTabId, 'terminal')
     }
   }, [chatLeafId, setChatLeafId, setTabViewMode, unifiedTabId])
diff --git a/src/renderer/src/components/terminal-pane/use-terminal-pane-mount-lifecycle.ts b/src/renderer/src/components/terminal-pane/use-terminal-pane-mount-lifecycle.ts
index deb446e8a8b2..a4e0e8d96442 100644
--- a/src/renderer/src/components/terminal-pane/use-terminal-pane-mount-lifecycle.ts
+++ b/src/renderer/src/components/terminal-pane/use-terminal-pane-mount-lifecycle.ts
@@ -4,10 +4,7 @@ import { configureTerminalOutputBacklogCap } from '@/lib/pane-manager/pane-termi
 import { scheduleRuntimeGraphSync } from '@/runtime/sync-runtime-graph'
 import { e2eConfig } from '@/lib/e2e-config'
 import { useTerminalParkMountIntent } from './use-terminal-park-mount-intent'
-import {
-  prepareTerminalPaneMount,
-  type TerminalPaneMountPreparation
-} from './terminal-pane-mount-preparation'
+import { prepareTerminalPaneMount } from './terminal-pane-mount-preparation'
 import { createTerminalPaneManagerOptions } from './terminal-pane-manager-options'
 import { restoreTerminalPaneLayout } from './terminal-pane-layout-restore'
 import { runTerminalPaneBootstrapSplits } from './terminal-pane-mount-bootstrap'
@@ -26,31 +23,7 @@ export function useTerminalPaneMountLifecycle(
   configureTerminalOutputBacklogCap(deps.settings?.terminalScrollbackRows)
 
   useEffect(() => {
-    let removeMountEvents = (): void => {}
-    const releaseWebviewDragPassthrough: { current: (() => void) | null } = { current: null }
-    const preparation: TerminalPaneMountPreparation | null = prepareTerminalPaneMount(
-      deps,
-      refs,
-      mountFollowsTerminalPark,
-      (manager) => {
-        if (!preparation) {
-          throw new Error('terminal_pane_owner_unavailable')
-        }
-        removeMountEvents()
-        cleanupTerminalPaneMount({
-          manager,
-          deps,
-          refs,
-          deferredSplitHandoffs: preparation.deferredSplitHandoffs,
-          expandedStyleSnapshots: preparation.expandedStyleSnapshots,
-          unregisterRuntimeTab: preparation.unregisterRuntimeTab,
-          cancelResize: preparation.cancelResizeAll,
-          permanent: true
-        })
-        releaseWebviewDragPassthrough.current?.()
-        releaseWebviewDragPassthrough.current = null
-      }
-    )
+    const preparation = prepareTerminalPaneMount(deps, refs, mountFollowsTerminalPark)
     if (!preparation) {
       return
     }
@@ -62,9 +35,11 @@ export function useTerminalPaneMountLifecycle(
       unregisterRuntimeTab
     } = preparation
     let shouldPersistLayout = false
+    const releaseWebviewDragPassthrough: { current: (() => void) | null } = {
+      current: null
+    }
     const queueResizeAll = preparation.queueResizeAll
     const managerContext = {
-      getOwnedManager: preparation.getOwnedManager,
       deps,
       refs,
       ptyDeps,
@@ -97,7 +72,6 @@ export function useTerminalPaneMountLifecycle(
     }
     const manager = new PaneManager(container, createTerminalPaneManagerOptions(managerContext))
     deps.managerRef.current = manager
-    preparation.setOwnedManager(manager)
     if (e2eConfig.exposeStore) {
       window.__paneManagers = window.__paneManagers ?? new Map()
       window.__paneManagers.set(deps.tabId, manager)
@@ -133,7 +107,7 @@ export function useTerminalPaneMountLifecycle(
     queueResizeAll(deps.isActive)
     deps.persistLayoutSnapshot()
     scheduleRuntimeGraphSync()
-    removeMountEvents = installTerminalPaneMountEvents({
+    const removeMountEvents = installTerminalPaneMountEvents({
       manager,
       deps: {
         tabId: deps.tabId,
@@ -149,17 +123,15 @@ export function useTerminalPaneMountLifecycle(
     })
     return () => {
       removeMountEvents()
-      if (preparation.getOwnedManager() === manager) {
-        cleanupTerminalPaneMount({
-          manager,
-          deps,
-          refs,
-          deferredSplitHandoffs,
-          expandedStyleSnapshots,
-          unregisterRuntimeTab,
-          cancelResize: preparation.cancelResizeAll
-        })
-      }
+      cleanupTerminalPaneMount({
+        manager,
+        deps,
+        refs,
+        deferredSplitHandoffs,
+        expandedStyleSnapshots,
+        unregisterRuntimeTab,
+        cancelResize: preparation.cancelResizeAll
+      })
       releaseWebviewDragPassthrough.current?.()
       releaseWebviewDragPassthrough.current = null
     }
diff --git a/src/renderer/src/components/use-terminal-activation-actions.ts b/src/renderer/src/components/use-terminal-activation-actions.ts
index 0d4936b536b3..cfa5190a1057 100644
--- a/src/renderer/src/components/use-terminal-activation-actions.ts
+++ b/src/renderer/src/components/use-terminal-activation-actions.ts
@@ -1,4 +1,3 @@
-import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { useCallback } from 'react'
 import { useAppStore } from '../store'
 import { TOGGLE_TERMINAL_PANE_EXPAND_EVENT } from '@/constants/terminal'
@@ -12,7 +11,6 @@ export function useTerminalActivationActions(controller: TerminalBulkCloseContro
   const { activeWorktreeId, setActiveBrowserTab, setActiveTab, setActiveTabType } = controller
   const handleActivateTab = useCallback(
     (tabId: string) => {
-      noteViewerNavigation()
       const runtimeEnvironmentId = getActiveWorktreeRuntimeEnvironmentId(activeWorktreeId)
       if (activeWorktreeId && isWebRuntimeSessionActive(runtimeEnvironmentId)) {
         void activateWebRuntimeSessionTab({
@@ -29,7 +27,6 @@ export function useTerminalActivationActions(controller: TerminalBulkCloseContro
 
   const handleTogglePaneExpand = useCallback(
     (tabId: string) => {
-      noteViewerNavigation()
       setActiveTab(tabId)
       requestAnimationFrame(() => {
         window.dispatchEvent(
@@ -42,7 +39,6 @@ export function useTerminalActivationActions(controller: TerminalBulkCloseContro
 
   const handleActivateBrowserTab = useCallback(
     (tabId: string) => {
-      noteViewerNavigation()
       const state = useAppStore.getState()
       const runtimeEnvironmentId = getActiveWorktreeRuntimeEnvironmentId(activeWorktreeId)
       if (
diff --git a/src/renderer/src/components/use-terminal-create-actions.ts b/src/renderer/src/components/use-terminal-create-actions.ts
index 8d1cf4e57c4e..7fc7a9c470d3 100644
--- a/src/renderer/src/components/use-terminal-create-actions.ts
+++ b/src/renderer/src/components/use-terminal-create-actions.ts
@@ -1,4 +1,3 @@
-import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { useCallback } from 'react'
 import { toast } from 'sonner'
 import { useAppStore } from '../store'
@@ -31,7 +30,6 @@ export function useTerminalCreateActions(controller: TerminalColdActivationContr
   } = controller
   const handleNewTab = useCallback(
     (shellOverride?: string) => {
-      noteViewerNavigation()
       if (!activeWorktreeId) {
         return
       }
@@ -66,7 +64,6 @@ export function useTerminalCreateActions(controller: TerminalColdActivationContr
   )
 
   const handleNewSimulatorTab = useCallback(() => {
-    noteViewerNavigation()
     if (!activeWorktreeId) {
       return
     }
@@ -81,7 +78,6 @@ export function useTerminalCreateActions(controller: TerminalColdActivationContr
 
   const openNewBrowserTab = useCallback(
     (splitDirection?: TabSplitDirection) => {
-      noteViewerNavigation()
       if (!activeWorktreeId) {
         return
       }
diff --git a/src/renderer/src/hooks/ipc-events/mobile-terminal-close-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/mobile-terminal-close-ipc-bridge.ts
index a2fd72669f18..398b40d79916 100644
--- a/src/renderer/src/hooks/ipc-events/mobile-terminal-close-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/mobile-terminal-close-ipc-bridge.ts
@@ -1,4 +1,3 @@
-import { retireTerminalPresentation } from '@/components/terminal-pane/terminal-presentation-retirement'
 import { createRuntimeFilePositionQueue } from './runtime-file-position'
 import { applyClosedTerminalLeafNotice } from '@/components/terminal-pane/closed-terminal-leaf-notice'
 import { closeTerminalTab } from '@/components/terminal/terminal-tab-actions'
@@ -168,7 +167,7 @@ export function registerMobileAndTerminalCloseIpcBridge(
   if (window.api.ui.onTerminalTabCloseRequest) {
     unsubs.push(
       window.api.ui.onTerminalTabCloseRequest(
-        ({ requestId, tabId, localPtyTeardownOwnedExternally, force, originalSurface }) => {
+        ({ requestId, tabId, localPtyTeardownOwnedExternally, force }) => {
           let responded = false
           const respond = (error?: string): void => {
             if (responded) {
@@ -177,39 +176,6 @@ export function registerMobileAndTerminalCloseIpcBridge(
             responded = true
             window.api.ui.respondTerminalTabClose({ requestId, ...(error ? { error } : {}) })
           }
-          if (originalSurface) {
-            void (async () => {
-              if (originalSurface.tabId !== tabId || !localPtyTeardownOwnedExternally) {
-                throw new Error('terminal_pane_owner_changed')
-              }
-              const failures: unknown[] = []
-              try {
-                retireTerminalPresentation(originalSurface)
-              } catch (error) {
-                failures.push(error)
-              }
-              try {
-                const state = useAppStore.getState()
-                await persistWorkspaceSessionByHost(
-                  window.api.session,
-                  buildWorkspaceSessionPayload(state),
-                  state
-                )
-              } catch (error) {
-                failures.push(error)
-              }
-              if (failures.length === 1) {
-                throw failures[0]
-              }
-              if (failures.length > 1) {
-                throw new AggregateError(failures, 'terminal_tab_close_failed')
-              }
-              respond()
-            })().catch((error: unknown) =>
-              respond(error instanceof Error ? error.message : 'terminal_tab_close_failed')
-            )
-            return
-          }
           closeTerminalTab(tabId, {
             rejectPinned: true,
             ...(force ? { force: true } : {}),
diff --git a/src/renderer/src/hooks/ipc-events/session-tab-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/session-tab-ipc-bridge.ts
index d5851fd49086..fcbf23ca82c1 100644
--- a/src/renderer/src/hooks/ipc-events/session-tab-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/session-tab-ipc-bridge.ts
@@ -1,9 +1,3 @@
-import { disposeViewerSelection } from '@/lib/viewer-selection-request'
-import {
-  disposeSwitchProjections,
-  captureSwitchProjection,
-  retireSwitchProjection
-} from '@/lib/conversation-switch-projection'
 import { isLocalSessionTabCloseOwned } from '@/runtime/local-session-tab-close-owner'
 import { closeMobileSessionTabInStore } from '@/runtime/mobile-session-tab-close'
 import {
@@ -28,7 +22,6 @@ import { resolveBrowserSessionTabTarget } from './browser-session-tab-target'
 import { resolveWindowTabIdForHostTab } from './host-session-tab-target'
 
 export function registerSessionTabIpcBridge(unsubs: (() => void)[]): void {
-  unsubs.push(disposeSwitchProjections, disposeViewerSelection)
   unsubs.push(
     window.api.ui.onCloseSessionTab(({ tabId, worktreeId }) => {
       if (isLocalSessionTabCloseOwned(worktreeId, tabId)) {
@@ -57,89 +50,69 @@ export function registerSessionTabIpcBridge(unsubs: (() => void)[]): void {
   )
 
   unsubs.push(
-    window.api.ui.onSessionTabCloseRequest(
-      ({ requestId, tabId, worktreeId, expiresAt, switchProjection }) => {
-        if (switchProjection) {
-          let switchApplied = false
-          useAppStore.setState((state) => {
-            if (expiresAt !== undefined && Date.now() >= expiresAt) {
-              return state
-            }
-            if (switchProjection.phase === 'prepare') {
-              captureSwitchProjection(state, worktreeId, switchProjection, () => {})
-              switchApplied = true
-              return state
-            }
-            const patch = retireSwitchProjection(state, switchProjection)
-            switchApplied = patch !== null
-            return patch ?? state
-          })
-          window.api.ui.respondSessionTabClose({ requestId, switchApplied })
+    window.api.ui.onSessionTabCloseRequest(({ requestId, tabId, worktreeId, expiresAt }) => {
+      const localTabId = resolveWindowTabIdForHostTab(worktreeId, tabId)
+      const store = useAppStore.getState()
+      const browserTarget = resolveBrowserSessionTabTarget(store, worktreeId, localTabId)
+      let cancelConfirmation: (() => void) | undefined
+      let timeout: ReturnType<typeof setTimeout> | undefined
+      let settled = false
+      const respond = (error?: string): void => {
+        if (settled) {
           return
         }
-        const localTabId = resolveWindowTabIdForHostTab(worktreeId, tabId)
-        const store = useAppStore.getState()
-        const browserTarget = resolveBrowserSessionTabTarget(store, worktreeId, localTabId)
-        let cancelConfirmation: (() => void) | undefined
-        let timeout: ReturnType<typeof setTimeout> | undefined
-        let settled = false
-        const respond = (error?: string): void => {
-          if (settled) {
-            return
-          }
-          settled = true
-          if (timeout !== undefined) {
-            clearTimeout(timeout)
-          }
-          window.api.ui.respondSessionTabClose({ requestId, ...(error ? { error } : {}) })
-        }
-        if (expiresAt !== undefined) {
-          timeout = setTimeout(
-            () => {
-              cancelConfirmation?.()
-              respond(SESSION_TAB_CLOSE_TIMEOUT_ERROR)
-            },
-            Math.max(0, expiresAt - Date.now())
-          )
+        settled = true
+        if (timeout !== undefined) {
+          clearTimeout(timeout)
         }
-        const closeAndRespond = (): void => {
-          if (expiresAt !== undefined && Date.now() >= expiresAt) {
+        window.api.ui.respondSessionTabClose({ requestId, ...(error ? { error } : {}) })
+      }
+      if (expiresAt !== undefined) {
+        timeout = setTimeout(
+          () => {
+            cancelConfirmation?.()
             respond(SESSION_TAB_CLOSE_TIMEOUT_ERROR)
+          },
+          Math.max(0, expiresAt - Date.now())
+        )
+      }
+      const closeAndRespond = (): void => {
+        if (expiresAt !== undefined && Date.now() >= expiresAt) {
+          respond(SESSION_TAB_CLOSE_TIMEOUT_ERROR)
+          return
+        }
+        try {
+          if (browserTarget) {
+            useAppStore.getState().closeBrowserTab(browserTarget.workspaceId)
+            respond()
             return
           }
-          try {
-            if (browserTarget) {
-              useAppStore.getState().closeBrowserTab(browserTarget.workspaceId)
-              respond()
-              return
-            }
-            const closed = closeMobileSessionTabInStore(
-              useAppStore.getState(),
-              worktreeId,
-              localTabId
-            )
-            respond(closed ? undefined : SESSION_TAB_NOT_FOUND_ERROR)
-          } catch (error) {
-            respond(error instanceof Error ? error.message : SESSION_TAB_CLOSE_FAILED_ERROR)
-          }
-        }
-        if (isLocalSessionTabCloseOwned(worktreeId, tabId)) {
-          respond(
-            expiresAt !== undefined && Date.now() >= expiresAt
-              ? SESSION_TAB_CLOSE_TIMEOUT_ERROR
-              : undefined
+          const closed = closeMobileSessionTabInStore(
+            useAppStore.getState(),
+            worktreeId,
+            localTabId
           )
-          return
+          respond(closed ? undefined : SESSION_TAB_NOT_FOUND_ERROR)
+        } catch (error) {
+          respond(error instanceof Error ? error.message : SESSION_TAB_CLOSE_FAILED_ERROR)
         }
-        const visibleId = browserTarget?.workspaceId ?? localTabId
-        cancelConfirmation = guardPinnedTabClose({
-          isPinned: isUnifiedTabPinned(store, worktreeId, visibleId),
-          tabLabel: resolvePinnedTabLabel(store, worktreeId, visibleId),
-          onClose: closeAndRespond,
-          onCancel: () => respond(SESSION_TAB_CLOSE_CANCELED_ERROR)
-        })
       }
-    )
+      if (isLocalSessionTabCloseOwned(worktreeId, tabId)) {
+        respond(
+          expiresAt !== undefined && Date.now() >= expiresAt
+            ? SESSION_TAB_CLOSE_TIMEOUT_ERROR
+            : undefined
+        )
+        return
+      }
+      const visibleId = browserTarget?.workspaceId ?? localTabId
+      cancelConfirmation = guardPinnedTabClose({
+        isPinned: isUnifiedTabPinned(store, worktreeId, visibleId),
+        tabLabel: resolvePinnedTabLabel(store, worktreeId, visibleId),
+        onClose: closeAndRespond,
+        onCancel: () => respond(SESSION_TAB_CLOSE_CANCELED_ERROR)
+      })
+    })
   )
 
   unsubs.push(
diff --git a/src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge.ts
index 579fac02b9d6..7538f0fc793b 100644
--- a/src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge.ts
@@ -1,7 +1,3 @@
-import { noteViewerNavigation } from '@/lib/viewer-selection-request'
-import { isSessionTabSelectionRequest } from '../../../../shared/session-tab-placement'
-import { selectSessionTabForViewer } from '@/runtime/web-session-tabs-sync/store-patch'
-import { conversationSwitchViewerSelectionCurrent } from '@/lib/conversation-switch-selection'
 import type { SplitTerminalPaneDetail } from '@/constants/terminal'
 import { requestBackgroundTerminalWorktreeMount } from '@/components/terminal/background-terminal-worktree-mount'
 import {
@@ -135,15 +131,10 @@ export function registerTerminalUiRoutingIpcBridge(unsubs: (() => void)[]): void
         flashFocusedPane,
         scrollToBottomIfOutputSinceLastView
       }) => {
-        const notificationFocus =
-          ackPaneKeyOnSuccess || flashFocusedPane || scrollToBottomIfOutputSinceLastView
-        if (notificationFocus) {
-          noteViewerNavigation()
-        }
         const store = useAppStore.getState()
         revealWorkspaceSurface(store, worktreeId)
         store.setActiveTab(tabId)
-        if (notificationFocus) {
+        if (ackPaneKeyOnSuccess || flashFocusedPane || scrollToBottomIfOutputSinceLastView) {
           activateTabAndFocusPane(tabId, leafId ?? null, {
             ...(ackPaneKeyOnSuccess ? { ackPaneKeyOnSuccess } : {}),
             ...(flashFocusedPane ? { flashFocusedPane: true } : {}),
@@ -159,13 +150,7 @@ export function registerTerminalUiRoutingIpcBridge(unsubs: (() => void)[]): void
   )
 
   unsubs.push(
-    window.api.ui.onFocusEditorTab(({ tabId, worktreeId, userInitiated, viewerSelection }) => {
-      if (userInitiated && viewerSelection === undefined) {
-        noteViewerNavigation()
-      }
-      if (!conversationSwitchViewerSelectionCurrent(viewerSelection)) {
-        return
-      }
+    window.api.ui.onFocusEditorTab(({ tabId, worktreeId, userInitiated }) => {
       const localTabId = resolveWindowTabIdForHostTab(worktreeId, tabId)
       const store = useAppStore.getState()
       const tab = (store.unifiedTabsByWorktree[worktreeId] ?? []).find(
@@ -175,7 +160,6 @@ export function registerTerminalUiRoutingIpcBridge(unsubs: (() => void)[]): void
       // Courtesy completion reveals must not undo user navigation; explicit notification clicks may reveal before async activation updates the active ID.
       if (
         !userInitiated &&
-        viewerSelection === undefined &&
         tab?.contentType === 'agent-session' &&
         store.activeWorktreeId !== worktreeId
       ) {
@@ -190,10 +174,6 @@ export function registerTerminalUiRoutingIpcBridge(unsubs: (() => void)[]): void
         }
         return
       }
-      if (viewerSelection && isSessionTabSelectionRequest(viewerSelection)) {
-        selectSessionTabForViewer(worktreeId, tab.id, viewerSelection)
-        return
-      }
       revealWorkspaceSurface(store, worktreeId)
       store.focusGroup(worktreeId, tab.groupId)
       store.activateTab(tab.id)
diff --git a/src/renderer/src/hooks/ipc-tab-switch.ts b/src/renderer/src/hooks/ipc-tab-switch.ts
index f070cbf9d630..c2543fd24233 100644
--- a/src/renderer/src/hooks/ipc-tab-switch.ts
+++ b/src/renderer/src/hooks/ipc-tab-switch.ts
@@ -1,4 +1,3 @@
-import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { useAppStore } from '../store'
 import { getActiveTabNavOrder } from '@/components/tab-bar/group-tab-order'
 import {
@@ -45,7 +44,6 @@ function resolveCycleContext(): CycleContext | null {
 
 /** Activate by unified tab ID after file/browser updates so duplicate entities focus the correct split instance. */
 export function activateCyclableTab(store: AppStoreState, next: TypeCyclableTab): void {
-  noteViewerNavigation()
   const worktreeId = store.activeWorktreeId
   if (next.type === 'terminal') {
     store.setActiveTab(next.id)
@@ -311,7 +309,6 @@ export function handleSwitchTerminalTab(direction: number): boolean {
   if (next.id === store.activeTabId && store.activeTabType === 'terminal') {
     return false
   }
-  noteViewerNavigation()
   store.setActiveTab(next.id)
   store.setActiveTabType('terminal', worktreeId)
   activateCycledTabOnOwner(worktreeId, next)
diff --git a/src/renderer/src/lib/activate-ai-vault-structured-session.ts b/src/renderer/src/lib/activate-ai-vault-structured-session.ts
index 8826ff14d41e..eb07d069f1f5 100644
--- a/src/renderer/src/lib/activate-ai-vault-structured-session.ts
+++ b/src/renderer/src/lib/activate-ai-vault-structured-session.ts
@@ -1,4 +1,3 @@
-import { isSessionTabSelectionRequest } from '../../../shared/session-tab-placement'
 import { toast } from 'sonner'
 import type { AiVaultSession } from '../../../shared/ai-vault-types'
 import { translate } from '@/i18n/i18n'
@@ -58,18 +57,10 @@ export async function activateAiVaultStructuredSession(
   session: Pick<AiVaultSession, 'structuredSession'>,
   deps?: StructuredSessionActivationDeps,
   target?: RuntimeClientTarget,
-  viewerSelection?: string,
   onFailure?: () => void
 ): Promise<boolean> {
-  return (
-    (await activateAiVaultStructuredSessionVerified(
-      session,
-      deps,
-      target,
-      viewerSelection,
-      onFailure
-    )) !== 'none'
-  )
+  await activateAiVaultStructuredSessionVerified(session, deps, target, onFailure)
+  return true
 }
 
 /** `activated` only when the chat's tab is really active; `reported` means the click's toast said why
@@ -78,7 +69,6 @@ export async function activateAiVaultStructuredSessionVerified(
   session: Pick<AiVaultSession, 'structuredSession'>,
   deps?: StructuredSessionActivationDeps,
   target?: RuntimeClientTarget,
-  viewerSelection?: string,
   onFailure?: () => void
 ): Promise<'activated' | 'reported' | 'none'> {
   const structured = session.structuredSession
@@ -88,16 +78,13 @@ export async function activateAiVaultStructuredSessionVerified(
   const feedback = onFailure
     ? { unavailable: onFailure, gone: onFailure, hostCannotOpen: onFailure }
     : (deps ?? structuredSessionOpenFeedback)
-  const modern = viewerSelection !== undefined && isSessionTabSelectionRequest(viewerSelection)
   const outcome = await openExistingStructuredSession(structured, {
     target,
     deps,
-    viewerSelection,
     present: (outcome) => {
       if (outcome === 'activated') {
         // A moved project's chat opens under its retained entry; the catalog does not list it.
         if (
-          !modern &&
           useAppStore.getState().activeWorktreeId !== structured.workspaceId &&
           !activateWslMovedWorkspace(structured.workspaceId)
         ) {
@@ -107,10 +94,10 @@ export async function activateAiVaultStructuredSessionVerified(
         feedback.gone()
       } else if (outcome === 'host-cannot-open') {
         feedback.hostCannotOpen()
-      } else if (outcome === 'unavailable') {
+      } else {
         feedback.unavailable()
       }
     }
   })
-  return outcome === 'activated' || outcome === 'none' ? outcome : 'reported'
+  return outcome === 'activated' ? 'activated' : 'reported'
 }
diff --git a/src/renderer/src/lib/agent-launch-pane-ordinary-verdict.ts b/src/renderer/src/lib/agent-launch-pane-ordinary-verdict.ts
deleted file mode 100644
index 6ab4340ebcf0..000000000000
--- a/src/renderer/src/lib/agent-launch-pane-ordinary-verdict.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-/** Apply main’s typed spawn/takeback verdicts, retaining final pane outcomes until session cleanup. */
-
-import type { AgentLaunchPaneVerdictEvent } from '../../../shared/agent-launch-pane-verdict'
-import { applyClosedTerminalLeafNotice } from '@/components/terminal-pane/closed-terminal-leaf-notice'
-import { collectLeafIdsInOrder } from '@/components/terminal-pane/terminal-layout-leaf-ids'
-import { useAppStore } from '@/store'
-import { forgetAgentLaunchPanePrompt } from './agent-launch-pane-prompt'
-import {
-  agentLaunchPaneAttemptCurrent,
-  settleAgentLaunchPaneStart
-} from './agent-launch-pane-start'
-import {
-  applyVerdictToUndrawnLaunchTab,
-  releaseMainWrittenLaunchTab
-} from './agent-launch-tab-main-written'
-
-export function applyOrdinaryAgentLaunchPaneVerdict(event: AgentLaunchPaneVerdictEvent): boolean {
-  if (!agentLaunchPaneAttemptCurrent(event.tabId, event.leafId, event.operationId)) {
-    return false
-  }
-  const { worktreeId, tabId, leafId, verdict } = event
-  const state = useAppStore.getState()
-  const tab = state.tabsByWorktree[worktreeId]?.find((candidate) => candidate.id === tabId)
-  // A main-written tab this window does not draw yet keeps the verdict until it draws.
-  if (!tab && applyVerdictToUndrawnLaunchTab(event)) {
-    return true
-  }
-  // Only a pane its tab says a launch laid out: a verdict never touches anything else.
-  if (
-    tab?.agentLaunchPane?.leafId !== leafId ||
-    tab.agentLaunchPane.operationId !== event.operationId
-  ) {
-    return false
-  }
-  if (verdict.kind !== 'proceed') {
-    settleAgentLaunchPaneStart(tabId, leafId, null)
-  }
-  switch (verdict.kind) {
-    case 'proceed':
-      releaseMainWrittenLaunchTab(tabId)
-      forgetAgentLaunchPanePrompt(tabId)
-      state.setTabAgentLaunchPane(tabId, undefined)
-      return true
-    case 'not-started':
-    case 'unconfirmed': {
-      const root = state.terminalLayoutsByTabId[tabId]?.root
-      if (root && !collectLeafIdsInOrder(root).includes(leafId)) {
-        forgetAgentLaunchPanePrompt(tabId)
-        state.setTabAgentLaunchPane(tabId, undefined)
-        return true
-      }
-      state.setTabAgentLaunchPane(tabId, { ...tab.agentLaunchPane, outcome: verdict })
-      return true
-    }
-    case 'withdrawn': {
-      forgetAgentLaunchPanePrompt(tabId)
-      if (releaseMainWrittenLaunchTab(tabId)) {
-        state.setTabAgentLaunchPane(tabId, undefined)
-        return true
-      }
-      // The pane alone when the user split the tab while it waited; their split stays.
-      if (state.terminalLayoutsByTabId[tabId]?.root?.type === 'leaf') {
-        state.closeTab(tabId, {
-          reason: 'cleanup',
-          recordInteraction: false,
-          captureRecentlyClosed: false
-        })
-      } else {
-        state.setTabAgentLaunchPane(tabId, undefined)
-        applyClosedTerminalLeafNotice(tabId, leafId)
-      }
-    }
-  }
-  return true
-}
diff --git a/src/renderer/src/lib/agent-launch-pane-verdict-application.ts b/src/renderer/src/lib/agent-launch-pane-verdict-application.ts
index 4a4642eb5662..e8d4bbd59f97 100644
--- a/src/renderer/src/lib/agent-launch-pane-verdict-application.ts
+++ b/src/renderer/src/lib/agent-launch-pane-verdict-application.ts
@@ -1,118 +1,65 @@
-import { endViewerSelectionForDestination } from './viewer-selection-request'
-import { applyOrdinaryAgentLaunchPaneVerdict } from './agent-launch-pane-ordinary-verdict'
-import { launchTabWithdrawalIdentity } from '../../../shared/agent-launch-tab-publication'
+/** Apply main’s typed spawn/takeback verdicts, retaining final pane outcomes until session cleanup. */
+
 import type { AgentLaunchPaneVerdictEvent } from '../../../shared/agent-launch-pane-verdict'
-import { createKeptWorktreeSurfacePruners } from '@/store/slices/tabs/kept-worktree-surface-pruning'
+import { applyClosedTerminalLeafNotice } from '@/components/terminal-pane/closed-terminal-leaf-notice'
+import { collectLeafIdsInOrder } from '@/components/terminal-pane/terminal-layout-leaf-ids'
 import { useAppStore } from '@/store'
 import { forgetAgentLaunchPanePrompt } from './agent-launch-pane-prompt'
-import {
-  agentLaunchPaneAttemptCurrent,
-  confirmAgentLaunchPaneAttempt,
-  settleAgentLaunchPaneStart
-} from './agent-launch-pane-start'
+import { settleAgentLaunchPaneStart } from './agent-launch-pane-start'
 import {
   applyVerdictToUndrawnLaunchTab,
   releaseMainWrittenLaunchTab
 } from './agent-launch-tab-main-written'
 
-/** Apply main’s typed spawn/takeback verdicts, retaining final pane outcomes until session cleanup. */
-
-export function applyAgentLaunchPaneVerdict(event: AgentLaunchPaneVerdictEvent): boolean {
-  if (event.accepted) {
-    confirmAgentLaunchPaneAttempt(event.tabId, event.leafId, event.operationId)
-    return true
+export function applyAgentLaunchPaneVerdict(event: AgentLaunchPaneVerdictEvent): void {
+  const { worktreeId, tabId, leafId, verdict } = event
+  const state = useAppStore.getState()
+  const tab = state.tabsByWorktree[worktreeId]?.find((candidate) => candidate.id === tabId)
+  // A main-written tab this window does not draw yet keeps the verdict until it draws.
+  if (!tab && applyVerdictToUndrawnLaunchTab(event)) {
+    return
   }
-  if (event.withdrawalRoot === undefined) {
-    const applied = applyOrdinaryAgentLaunchPaneVerdict(event)
-    if (applied && (event.verdict.kind === 'withdrawn' || event.verdict.kind === 'not-started')) {
-      endViewerSelectionForDestination(event.worktreeId, event.tabId)
-    }
-    return applied
+  // Only a pane its tab says a launch laid out: a verdict never touches anything else.
+  if (tab?.agentLaunchPane?.leafId !== leafId) {
+    return
   }
-  const { worktreeId, tabId, leafId, verdict } = event
-  // Commit the state verdict first; never call ordinary Close on a launch's provisional pane.
-  let accepted = false
-  let withdrawn = false
-  useAppStore.setState((state) => {
-    if (!agentLaunchPaneAttemptCurrent(tabId, leafId, event.operationId)) {
-      return state
-    }
-    const tab = state.tabsByWorktree[worktreeId]?.find((candidate) => candidate.id === tabId)
-    if (!tab) {
-      accepted = applyVerdictToUndrawnLaunchTab(event)
-      return state
-    }
-    if (
-      tab.agentLaunchPane?.leafId !== leafId ||
-      tab.agentLaunchPane.operationId !== event.operationId
-    ) {
-      return state
-    }
-    if (verdict.kind === 'withdrawn') {
+  if (verdict.kind !== 'proceed') {
+    settleAgentLaunchPaneStart(tabId, leafId, null)
+  }
+  switch (verdict.kind) {
+    case 'proceed':
+      releaseMainWrittenLaunchTab(tabId)
+      forgetAgentLaunchPanePrompt(tabId)
+      state.setTabAgentLaunchPane(tabId, undefined)
+      return
+    case 'not-started':
+    case 'unconfirmed': {
       const root = state.terminalLayoutsByTabId[tabId]?.root
-      if (
-        (event.withdrawalRoot !== undefined &&
-          event.withdrawalRoot !==
-            launchTabWithdrawalIdentity(
-              root,
-              state.unifiedTabsByWorktree[worktreeId] ?? [],
-              state.groupsByWorktree[worktreeId] ?? [],
-              tabId
-            )) ||
-        root?.type !== 'leaf' ||
-        root.leafId !== leafId ||
-        state.ptyIdsByTabId[tabId]?.length ||
-        state.lastTerminalInputAtByPaneKey[`${tabId}:${leafId}`]
-      ) {
-        return state
-      }
-      const prune = createKeptWorktreeSurfacePruners(state, {
-        worktreeIds: new Set([worktreeId]),
-        terminalTabIds: new Set([tabId]),
-        unifiedTabIds: new Set(),
-        fileIds: new Set(),
-        browserTabIds: new Set()
-      })
-      accepted = withdrawn = true
-      endViewerSelectionForDestination(worktreeId, tabId)
-      const layouts = { ...state.terminalLayoutsByTabId }
-      delete layouts[tabId]
-      return {
-        tabsByWorktree: prune.tabs(state.tabsByWorktree),
-        unifiedTabsByWorktree: prune.unifiedTabs(state.unifiedTabsByWorktree),
-        groupsByWorktree: prune.groups(state.groupsByWorktree),
-        tabBarOrderByWorktree: prune.tabBarOrder(state.tabBarOrderByWorktree),
-        activeTabIdByWorktree: prune.activeTabIds(state.activeTabIdByWorktree),
-        terminalLayoutsByTabId: layouts
+      if (root && !collectLeafIdsInOrder(root).includes(leafId)) {
+        forgetAgentLaunchPanePrompt(tabId)
+        state.setTabAgentLaunchPane(tabId, undefined)
+        return
       }
+      state.setTabAgentLaunchPane(tabId, { ...tab.agentLaunchPane, outcome: verdict })
+      return
     }
-    accepted = true
-    return {
-      tabsByWorktree: {
-        ...state.tabsByWorktree,
-        [worktreeId]: state.tabsByWorktree[worktreeId].map((row) =>
-          row !== tab
-            ? row
-            : {
-                ...row,
-                agentLaunchPane:
-                  verdict.kind === 'proceed'
-                    ? undefined
-                    : { ...tab.agentLaunchPane!, outcome: verdict }
-              }
-        )
+    case 'withdrawn': {
+      forgetAgentLaunchPanePrompt(tabId)
+      if (releaseMainWrittenLaunchTab(tabId)) {
+        state.setTabAgentLaunchPane(tabId, undefined)
+        return
+      }
+      // The pane alone when the user split the tab while it waited; their split stays.
+      if (state.terminalLayoutsByTabId[tabId]?.root?.type === 'leaf') {
+        state.closeTab(tabId, {
+          reason: 'cleanup',
+          recordInteraction: false,
+          captureRecentlyClosed: false
+        })
+      } else {
+        state.setTabAgentLaunchPane(tabId, undefined)
+        applyClosedTerminalLeafNotice(tabId, leafId)
       }
     }
-  })
-  if (!accepted) {
-    return false
-  }
-  if (verdict.kind !== 'proceed') {
-    settleAgentLaunchPaneStart(tabId, leafId, null)
-  }
-  if (withdrawn || verdict.kind === 'proceed') {
-    releaseMainWrittenLaunchTab(tabId)
-    forgetAgentLaunchPanePrompt(tabId)
   }
-  return true
 }
diff --git a/src/renderer/src/lib/agent-launch-tab-main-written.test.ts b/src/renderer/src/lib/agent-launch-tab-main-written.test.ts
index 949e11d02fb9..2984b504ad47 100644
--- a/src/renderer/src/lib/agent-launch-tab-main-written.test.ts
+++ b/src/renderer/src/lib/agent-launch-tab-main-written.test.ts
@@ -1,11 +1,3 @@
-import {
-  beginViewerSelectionRequest,
-  disposeViewerSelection,
-  viewerSelectionOutcome
-} from './viewer-selection-request'
-import { agentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
-import { noteUserWorkspaceSwitch } from './workspace-switch-user-act'
-import { _resetLayoutFramePositionForTests } from '@/runtime/layout-frame-position'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type * as AgentStatusModule from '@/lib/agent-status'
 import type { AgentLaunchTabPublishRequest } from '../../../shared/agent-launch-tab-publication'
@@ -32,8 +24,6 @@ vi.mock('@/store', () => {
   return {
     useAppStore: {
       getState: () => current().getState(),
-      setState: (...args: Parameters<ReturnType<typeof createTestStore>['setState']>) =>
-        current().setState(...args),
       subscribe: (listener: () => void) => current().subscribe(listener)
     }
   }
@@ -97,14 +87,12 @@ const launchPane = () =>
   store.getState().tabsByWorktree[WT]?.find((tab) => tab.id === TAB_ID)?.agentLaunchPane
 
 beforeEach(() => {
-  _resetLayoutFramePositionForTests()
   store = createTestStore()
   testStore.current = store
   focusTerminalInitiatedTab.mockClear()
   store.getState().setActiveWorktree(WT)
 })
 afterEach(() => {
-  disposeViewerSelection()
   _resetUndrawnLaunchTabsForTests()
   frames.flowing = false
   frames.holdsTab = true
@@ -143,7 +131,6 @@ describe("a launch tab main wrote, in a layout-owner build's window", () => {
       worktreeId: WT,
       tabId: TAB_ID,
       leafId: LEAF_ID,
-      operationId: 'op-1',
       verdict: { kind: 'not-started', code: 'boom' }
     })
 
@@ -160,7 +147,6 @@ describe("a launch tab main wrote, in a layout-owner build's window", () => {
       worktreeId: WT,
       tabId: TAB_ID,
       leafId: LEAF_ID,
-      operationId: 'op-1',
       verdict: { kind: 'unconfirmed' }
     })
 
@@ -179,7 +165,6 @@ describe("a launch tab main wrote, in a layout-owner build's window", () => {
       worktreeId: WT,
       tabId: TAB_ID,
       leafId: LEAF_ID,
-      operationId: 'op-1',
       verdict: { kind: 'proceed' }
     })
 
@@ -197,7 +182,6 @@ describe("a launch tab main wrote, in a layout-owner build's window", () => {
       worktreeId: WT,
       tabId: TAB_ID,
       leafId: LEAF_ID,
-      operationId: 'op-1',
       verdict: { kind: 'withdrawn' }
     })
 
@@ -228,59 +212,3 @@ describe("a launch tab main wrote, in a layout-owner build's window", () => {
     expect(agentLaunchPanePrompt(TAB_ID)).toBeNull()
   })
 })
-
-it.each([false, true])(
-  'the actual undrawn callback fulfils once, preserving a newer user choice=%s',
-  (navigate) => {
-    const other = store.getState().createTab(WT)
-    const deadline = agentSessionSwitchDeadline(Date.now)
-    try {
-      const older = beginViewerSelectionRequest('older-dialog', deadline)
-      const selection = beginViewerSelectionRequest('accepted-action', deadline)
-      selection.accept()
-      older.accept()
-      expect(viewerSelectionOutcome(selection.token)).toBe('pending')
-      keepAgentLaunchTabMainWrote(
-        request({
-          viewer: 'focus-window',
-          openPlacement: {
-            invocationId: 'accepted-action',
-            generation: 'op-1',
-            placement: {},
-            activate: true,
-            viewerSelection: selection.token
-          }
-        })
-      )
-      expect(viewerSelectionOutcome(selection.token)).toBe('pending')
-      expect(revealWorkspaceSurface).not.toHaveBeenCalled()
-      if (navigate) {
-        noteUserWorkspaceSwitch(WT)
-        store
-          .getState()
-          .activateTab(
-            store.getState().unifiedTabsByWorktree[WT].find((tab) => tab.entityId === other.id)!.id
-          )
-      }
-      drawMainTab()
-      expect(viewerSelectionOutcome(selection.token)).toBe(navigate ? 'superseded' : 'fulfilled')
-      expect(store.getState().getActiveTab(WT)?.entityId).toBe(navigate ? other.id : TAB_ID)
-      const focusCount = focusTerminalInitiatedTab.mock.calls.length
-      keepAgentLaunchTabMainWrote(
-        request({
-          viewer: 'focus-window',
-          openPlacement: {
-            invocationId: 'accepted-action',
-            generation: 'op-1',
-            placement: {},
-            activate: true,
-            viewerSelection: selection.token
-          }
-        })
-      )
-      expect(focusTerminalInitiatedTab).toHaveBeenCalledTimes(focusCount)
-    } finally {
-      deadline.dispose()
-    }
-  }
-)
diff --git a/src/renderer/src/lib/agent-launch-tab-main-written.ts b/src/renderer/src/lib/agent-launch-tab-main-written.ts
index 1fc811c52462..9ce97730d3a5 100644
--- a/src/renderer/src/lib/agent-launch-tab-main-written.ts
+++ b/src/renderer/src/lib/agent-launch-tab-main-written.ts
@@ -1,12 +1,5 @@
-import { isSessionTabSelectionRequest } from '../../../shared/session-tab-placement'
-import { openPlacementSourceCurrent } from '@/runtime/web-session-tabs-sync/open-placement'
-import {
-  bindViewerSelectionDestination,
-  endViewerSelectionForDestination
-} from './viewer-selection-request'
-import { conversationSwitchViewerSelectionCurrent } from '@/lib/conversation-switch-selection'
-import { agentLaunchPaneAttemptCurrent } from './agent-launch-pane-start'
-import { afterLayoutFrame, layoutFramesFlowing } from '@/runtime/layout-frame-position'
+/** Main owns tab creation/closure; attach this window’s session-only prompt, pane verdict and presentation state when its frame draws, retaining them for undrawn workspaces. */
+
 import type { AgentLaunchPaneVerdictEvent } from '../../../shared/agent-launch-pane-verdict'
 import type {
   AgentLaunchTabPublished,
@@ -20,10 +13,9 @@ import {
   rememberAgentLaunchPanePrompt
 } from './agent-launch-pane-prompt'
 import { revealWorkspaceSurface } from './workspace-surface-reveal'
+import { layoutFramesFlowing } from '@/runtime/layout-frame-position'
 import { layoutFrameTerminalTab } from '@/runtime/layout-frame-terminal-panes'
 
-/** Main owns tab creation/closure; attach this window’s session-only prompt, pane verdict and presentation state when its frame draws, retaining them for undrawn workspaces. */
-
 type LaunchPane = NonNullable<TerminalTab['agentLaunchPane']>
 
 const undrawn = new Map<string, { pane: LaunchPane; present: () => void; stop: () => void }>()
@@ -84,80 +76,57 @@ function goneFromFrames(worktreeId: string, tabId: string): boolean {
 function keepWhenDrawn(request: AgentLaunchTabPublishRequest, present: () => void): boolean {
   const { worktreeId, tabId } = request
   undrawn.get(tabId)?.stop()
-
-  const forgetIfGone = () => {
-    if (
-      undrawn.get(tabId)?.pane.operationId === request.operationId &&
-      goneFromFrames(worktreeId, tabId)
-    ) {
-      endViewerSelectionForDestination(worktreeId, tabId)
-      dropUndrawn(tabId)
-    }
+  if (goneFromFrames(worktreeId, tabId)) {
+    dropUndrawn(tabId)
+    return false
   }
   const stop = useAppStore.subscribe(() => {
     const tab = drawnTab(worktreeId, tabId)
     if (!tab) {
-      afterLayoutFrame(request.shownByMain?.frameSeq, forgetIfGone)
+      if (goneFromFrames(worktreeId, tabId)) {
+        dropUndrawn(tabId)
+      }
       return
     }
     const entry = undrawn.get(tabId)
     undrawn.delete(tabId)
     stop()
-    if (entry && agentLaunchPaneAttemptCurrent(tabId, entry.pane.leafId, entry.pane.operationId)) {
+    if (entry) {
       keepLaunchPane(tabId, tab, entry.pane)
       entry.present()
     }
   })
   undrawn.set(tabId, { pane: launchPaneOf(request), present, stop })
-  if (request.shownByMain) {
-    afterLayoutFrame(request.shownByMain.frameSeq, forgetIfGone)
-  }
-  return undrawn.has(tabId)
+  return true
 }
 
 export function keepAgentLaunchTabMainWrote(
   request: AgentLaunchTabPublishRequest
 ): AgentLaunchTabPublished {
   const { worktreeId, tabId, leafId, viewer } = request
-  if (!agentLaunchPaneAttemptCurrent(tabId, leafId, request.operationId)) {
-    throw new Error('agent_launch_superseded')
-  }
   const created = request.shownByMain?.created === true
-  const viewerSelection = request.openPlacement?.viewerSelection ?? request.viewerSelection
-  bindViewerSelectionDestination(viewerSelection, { worktreeId, tabId })
   noteMainWritten(tabId)
   if (request.prompt) {
     rememberAgentLaunchPanePrompt(tabId, request.prompt)
   }
-  // Ordinary retries retain focus; explicit viewer requests use their one-shot owner.
+  // Only the launch that made the tab moves anyone, as the window's own publication.
   const present = (): void => {
-    if (
-      (created || isSessionTabSelectionRequest(viewerSelection)) &&
-      (!request.openPlacement ||
-        (request.openPlacement.activate &&
-          openPlacementSourceCurrent(useAppStore.getState(), worktreeId, request.openPlacement)))
-    ) {
-      presentAgentLaunchTab(viewer, worktreeId, tabId, leafId, viewerSelection)
+    if (created) {
+      presentAgentLaunchTab(viewer, worktreeId, tabId, leafId)
     }
   }
   const tab = drawnTab(worktreeId, tabId)
   if (tab) {
     keepLaunchPane(tabId, tab, launchPaneOf(request))
     present()
-  } else if (
-    created &&
-    viewer === 'focus-window' &&
-    conversationSwitchViewerSelectionCurrent(viewerSelection)
-  ) {
+  } else if (created && viewer === 'focus-window') {
     // Reveal the workspace while awaiting its tab frame, unless main already closed the tab.
     if (keepWhenDrawn(request, present)) {
-      if (viewerSelection === undefined) {
-        revealWorkspaceSurface(useAppStore.getState(), worktreeId, [tabId])
-      }
+      revealWorkspaceSurface(useAppStore.getState(), worktreeId, [tabId])
     }
   } else {
     // Nobody is moved to an undrawn workspace; its tab keeps the launch when it draws.
-    keepWhenDrawn(request, present)
+    keepWhenDrawn(request, () => {})
   }
   const groupId =
     useAppStore
@@ -168,22 +137,15 @@ export function keepAgentLaunchTabMainWrote(
 
 /** Retain verdicts for undrawn launch panes; return false when no such pane is pending. */
 export function applyVerdictToUndrawnLaunchTab(event: AgentLaunchPaneVerdictEvent): boolean {
-  if (!agentLaunchPaneAttemptCurrent(event.tabId, event.leafId, event.operationId)) {
-    return false
-  }
   const entry = undrawn.get(event.tabId)
-  if (entry?.pane.leafId !== event.leafId || entry.pane.operationId !== event.operationId) {
+  if (entry?.pane.leafId !== event.leafId) {
     return false
   }
   const { verdict } = event
-  if (verdict.kind === 'not-started') {
-    endViewerSelectionForDestination(event.worktreeId, event.tabId)
-  }
   if (verdict.kind === 'not-started' || verdict.kind === 'unconfirmed') {
     entry.pane = { ...entry.pane, outcome: verdict }
     return true
   }
-  endViewerSelectionForDestination(event.worktreeId, event.tabId)
   dropUndrawn(event.tabId)
   return true
 }
diff --git a/src/renderer/src/lib/agent-launch-tab-presentation.ts b/src/renderer/src/lib/agent-launch-tab-presentation.ts
index e4b33b0f6290..90cfdfd39e36 100644
--- a/src/renderer/src/lib/agent-launch-tab-presentation.ts
+++ b/src/renderer/src/lib/agent-launch-tab-presentation.ts
@@ -1,6 +1,3 @@
-import { isSessionTabSelectionRequest } from '../../../shared/session-tab-placement'
-import { selectSessionTabForViewer } from '@/runtime/web-session-tabs-sync/store-patch'
-import { conversationSwitchViewerSelectionCurrent } from '@/lib/conversation-switch-selection'
 import type { AgentLaunchTabViewerRule } from '../../../shared/agent-launch-tab-publication'
 import { focusTerminalInitiatedTab } from '../hooks/ipc-events/terminal-command-state'
 import { useAppStore } from '../store'
@@ -11,24 +8,8 @@ export function presentAgentLaunchTab(
   viewer: AgentLaunchTabViewerRule,
   worktreeId: string,
   tabId: string,
-  leafId?: string,
-  viewerSelection?: string
+  leafId?: string
 ): void {
-  if (!conversationSwitchViewerSelectionCurrent(viewerSelection)) {
-    return
-  }
-  if (viewerSelection && isSessionTabSelectionRequest(viewerSelection)) {
-    const state = useAppStore.getState()
-    if (
-      viewer === 'focus-window' ||
-      (viewer === 'focus-in-workspace' && state.activeWorktreeId === worktreeId)
-    ) {
-      if (selectSessionTabForViewer(worktreeId, tabId, viewerSelection)) {
-        focusTerminalInitiatedTab(tabId, leafId, worktreeId)
-      }
-    }
-    return
-  }
   if (viewer === 'focus-window') {
     revealWorkspaceSurface(useAppStore.getState(), worktreeId, [tabId])
   }
diff --git a/src/renderer/src/lib/agent-launch-tab-publication.test.ts b/src/renderer/src/lib/agent-launch-tab-publication.test.ts
index 90bf6c5e389f..baec5addfdc5 100644
--- a/src/renderer/src/lib/agent-launch-tab-publication.test.ts
+++ b/src/renderer/src/lib/agent-launch-tab-publication.test.ts
@@ -1,7 +1,4 @@
-import type { AppState } from '@/store/types'
-import { forgetAgentLaunchPaneAttempts } from './agent-launch-pane-start'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { disposeSwitchProjections } from './conversation-switch-projection'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
 import type * as AgentStatusModule from '@/lib/agent-status'
 import type { AgentLaunchTabPublishRequest } from '../../../shared/agent-launch-tab-publication'
 import { createTabsSliceMockApi } from '../store/slices/tabs-slice-test-harness'
@@ -19,8 +16,6 @@ const testStore = vi.hoisted(() => {
 })
 vi.mock('@/store', () => ({
   useAppStore: {
-    setState: (patch: Partial<AppState> | ((state: AppState) => Partial<AppState>)) =>
-      testStore.current!.setState(patch),
     getState: () => {
       if (!testStore.current) {
         throw new Error('no test store')
@@ -67,13 +62,11 @@ function launchTab() {
 }
 
 beforeEach(() => {
-  forgetAgentLaunchPaneAttempts(TAB_ID)
   store = createTestStore()
   testStore.current = store
   focusTerminalInitiatedTab.mockClear()
   store.getState().setActiveWorktree(WT)
 })
-afterEach(() => disposeSwitchProjections())
 
 describe('publishing a launch tab before its agent exists', () => {
   it('creates the tab under the host ids with its one pane laid out and no process', () => {
diff --git a/src/renderer/src/lib/agent-launch-tab-publication.ts b/src/renderer/src/lib/agent-launch-tab-publication.ts
index 214b1a448d11..05492aacb766 100644
--- a/src/renderer/src/lib/agent-launch-tab-publication.ts
+++ b/src/renderer/src/lib/agent-launch-tab-publication.ts
@@ -1,8 +1,5 @@
-import { isSessionTabSelectionRequest } from '../../../shared/session-tab-placement'
-import { conversationSwitchViewerSelectionCurrent } from '@/lib/conversation-switch-selection'
-import { applyAgentLaunchPaneVerdict } from './agent-launch-pane-verdict-application'
-import { launchTabWithdrawalIdentity } from '../../../shared/agent-launch-tab-publication'
-import { agentLaunchPaneAttemptCurrent } from './agent-launch-pane-start'
+/** Publish under host-reserved IDs before the agent exists so PTY routing names this pane and retries reuse its tab; the pane’s spawn waits in main and attaches to the host’s process. */
+
 import type { AgentLaunchPlacementReceipt } from '../../../shared/agent-launch-intent'
 import type {
   AgentLaunchTabPublished,
@@ -15,9 +12,6 @@ import { resolveUnifiedTabCreatePlacement } from '../store/slices/tabs/tabs-crea
 import { insertUnifiedTabAfterAnchor } from './unified-tab-anchor-insertion'
 import { rememberAgentLaunchPanePrompt } from './agent-launch-pane-prompt'
 import { selectFolderWorkspaces } from '@/store/workspace-record-selectors'
-import { openPlacementSourceCurrent } from '@/runtime/web-session-tabs-sync/open-placement'
-
-/** Publish under host-reserved IDs before the agent exists so PTY routing names this pane and retries reuse its tab; the pane’s spawn waits in main and attaches to the host’s process. */
 
 function landedGroupId(worktreeId: string, tabId: string): string | undefined {
   return useAppStore
@@ -51,24 +45,6 @@ export function publishAgentLaunchTab(
   request: AgentLaunchTabPublishRequest
 ): AgentLaunchTabPublished {
   const { worktreeId, tabId, leafId } = request
-  if (request.withdraw) {
-    return {
-      tabId,
-      created: false,
-      placement: { groupId: '' },
-      withdrawn: applyAgentLaunchPaneVerdict({
-        worktreeId,
-        tabId,
-        leafId,
-        operationId: request.operationId,
-        verdict: { kind: 'withdrawn' },
-        withdrawalRoot: request.withdraw.root
-      })
-    }
-  }
-  if (!agentLaunchPaneAttemptCurrent(tabId, leafId, request.operationId)) {
-    throw new Error('agent_launch_superseded')
-  }
   const store = useAppStore.getState()
   const owner = Object.entries(store.tabsByWorktree).find(([, tabs]) =>
     tabs.some((tab) => tab.id === tabId)
@@ -93,63 +69,34 @@ export function publishAgentLaunchTab(
         remount: kept?.leafId === leafId && kept.outcome !== undefined
       })
     }
-    const retrySelection = request.openPlacement?.viewerSelection ?? request.viewerSelection
-    if (
-      isSessionTabSelectionRequest(retrySelection) &&
-      (!request.openPlacement ||
-        (request.openPlacement.activate &&
-          openPlacementSourceCurrent(store, worktreeId, request.openPlacement)))
-    ) {
-      presentAgentLaunchTab(
-        request.viewer,
-        worktreeId,
-        tabId,
-        leafId,
-        request.openPlacement?.viewerSelection ?? request.viewerSelection
-      )
-    }
     return { tabId, created: false, placement: { groupId } }
   }
 
-  const openPlacement =
-    request.openPlacement && openPlacementSourceCurrent(store, worktreeId, request.openPlacement)
-      ? request.openPlacement
-      : undefined
-  const requestedPlacement = request.openPlacement ? openPlacement?.placement : request.placement
-  const viewerSelection = openPlacement?.viewerSelection ?? request.viewerSelection
   const placement = resolveUnifiedTabCreatePlacement({
     groups: store.groupsByWorktree[worktreeId] ?? [],
     tabs: store.unifiedTabsByWorktree[worktreeId] ?? [],
     activeGroupId: store.activeGroupIdByWorktree[worktreeId],
-    targetGroupId: requestedPlacement?.groupId,
-    afterTabId: requestedPlacement?.afterTabId,
+    targetGroupId: request.placement?.groupId,
+    afterTabId: request.placement?.afterTabId,
     lookupWorktrees: () =>
       [
         ...(store.allWorktrees?.() ?? []),
         ...(selectFolderWorkspaces(store) ?? []).map(folderWorkspaceToWorktree)
       ].filter((worktree) => worktree.id === worktreeId)
   })
-  const focuses =
-    (request.viewer === 'focus-window' || request.viewer === 'focus-in-workspace') &&
-    (!request.openPlacement || openPlacement?.activate === true) &&
-    conversationSwitchViewerSelectionCurrent(viewerSelection)
+  const focuses = request.viewer === 'focus-window' || request.viewer === 'focus-in-workspace'
   const tab = store.createTab(worktreeId, placement.groupId, undefined, {
     id: tabId,
     initialLeafId: leafId,
     agentLaunchPane: launchPaneFor(request),
     launchAgent: request.launchAgent,
     viewMode: request.viewMode,
-    ...(openPlacement
-      ? { placement: { ...openPlacement.placement, afterTabId: placement.anchorTabId } }
-      : {}),
-    ...(focuses && viewerSelection === undefined
-      ? {}
-      : { activate: false, recordInteraction: false })
+    ...(focuses ? {} : { activate: false, recordInteraction: false })
   })
   if (request.prompt) {
     rememberAgentLaunchPanePrompt(tabId, request.prompt)
   }
-  if (placement.anchorTabId && !request.openPlacement) {
+  if (placement.anchorTabId) {
     const unifiedTabId = useAppStore
       .getState()
       .unifiedTabsByWorktree[worktreeId]?.find((item) => item.entityId === tab.id)?.id
@@ -157,22 +104,12 @@ export function publishAgentLaunchTab(
       insertUnifiedTabAfterAnchor(worktreeId, unifiedTabId, placement.anchorTabId)
     }
   }
-  if (focuses) {
-    presentAgentLaunchTab(request.viewer, worktreeId, tab.id, leafId, viewerSelection)
-  } else if (!request.openPlacement) {
-    presentAgentLaunchTab(request.viewer, worktreeId, tab.id, leafId, viewerSelection)
-  }
+  presentAgentLaunchTab(request.viewer, worktreeId, tab.id, leafId)
   const landed = landedGroupId(worktreeId, tab.id) ?? placement.groupId ?? ''
   const fallback = placementFallback(request, landed, placement.anchorTabId !== undefined)
   return {
     tabId: tab.id,
     created: true,
-    withdrawalRoot: launchTabWithdrawalIdentity(
-      useAppStore.getState().terminalLayoutsByTabId[tab.id]?.root,
-      useAppStore.getState().unifiedTabsByWorktree[worktreeId] ?? [],
-      useAppStore.getState().groupsByWorktree[worktreeId] ?? [],
-      tab.id
-    ),
     placement: { groupId: landed, ...(fallback ? { fallback } : {}) }
   }
 }
diff --git a/src/renderer/src/lib/agent-session/structured-agent-session-provisional-tab.ts b/src/renderer/src/lib/agent-session/structured-agent-session-provisional-tab.ts
index 7539d4ff0cad..8cf8075cdb6f 100644
--- a/src/renderer/src/lib/agent-session/structured-agent-session-provisional-tab.ts
+++ b/src/renderer/src/lib/agent-session/structured-agent-session-provisional-tab.ts
@@ -57,9 +57,7 @@ export function structuredLaunchOwner(
 
 /** Only a launch that takes the user to its chat may ask host publication to select it. */
 function launchHooks(args: ProvisionalLaunchArgs): StructuredAgentLaunchHooks {
-  return args.activate === false || args.canActivate
-    ? { ...args.hooks, activate: false }
-    : args.hooks
+  return args.activate === false ? { ...args.hooks, activate: false } : args.hooks
 }
 
 export type ProvisionalLaunchArgs = {
@@ -70,8 +68,6 @@ export type ProvisionalLaunchArgs = {
   targetGroupId?: string
   afterTabId?: string
   activate?: boolean
-  viewerSelection?: string
-  canActivate?: () => boolean
   /** Identity-only resumes publish on commit; unknown outcomes keep their recovery tab. */
   deferPublication?: true
   /** Allow workspace reveal before host acquisition, when the launch has no session ID or owned chat tab yet. */
@@ -106,7 +102,7 @@ export function beginStructuredAgentSessionProvisionalLaunch(
   ): ReturnType<typeof beginLocalProvisionalLaunch> => {
     if (launch?.tab) {
       tabOpened = true
-      if (args.activate !== false && args.canActivate?.() !== false) {
+      if (args.activate !== false) {
         focusIntent?.request(launch.tab.id)
       }
     } else if (!launch) {
@@ -208,9 +204,7 @@ function beginLocalProvisionalLaunch(
       agent: args.plan.agent,
       ...(args.targetGroupId ? { targetGroupId: args.targetGroupId } : {}),
       ...(args.afterTabId ? { afterTabId: args.afterTabId } : {}),
-      ...(args.activate !== undefined ? { activate: args.activate } : {}),
-      viewerSelection: args.viewerSelection,
-      canActivate: args.canActivate
+      ...(args.activate !== undefined ? { activate: args.activate } : {})
     })
     return { ...handle, tab }
   } catch (error) {
@@ -230,32 +224,7 @@ function beginDeferredPublication(
   const releaseHold = holdEmptyWorkspaceDefaultSurfaceForLaunch(worktreeId)
   let handle: StructuredAgentLaunchHandle | null
   try {
-    const hooks = launchHooks(args)
-    handle = args.plan.begin(
-      args.viewerSelection
-        ? {
-            ...hooks,
-            onStructuredReady: (sessionId) => {
-              hooks.onStructuredReady?.(sessionId)
-              if (!handle) {
-                return
-              }
-              openStructuredAgentSessionProvisionalTab({
-                worktreeId,
-                executionHostId: handle.executionHostId,
-                sessionId,
-                agent: args.plan.agent,
-                targetGroupId: args.targetGroupId,
-                afterTabId: args.afterTabId,
-                activate: args.activate,
-                viewerSelection: args.viewerSelection,
-                canActivate: args.canActivate
-              })
-            }
-          }
-        : hooks,
-      args.target
-    )
+    handle = args.plan.begin(launchHooks(args), args.target)
   } catch (error) {
     releaseHold()
     throw error
diff --git a/src/renderer/src/lib/agent-session/structured-agent-session-tab-activation.ts b/src/renderer/src/lib/agent-session/structured-agent-session-tab-activation.ts
index 8974e9b22f43..ebecfb8ee0af 100644
--- a/src/renderer/src/lib/agent-session/structured-agent-session-tab-activation.ts
+++ b/src/renderer/src/lib/agent-session/structured-agent-session-tab-activation.ts
@@ -1,5 +1,3 @@
-import { isSessionTabSelectionRequest } from '../../../../shared/session-tab-placement'
-import { selectSessionTabForViewer } from '@/runtime/web-session-tabs-sync/store-patch'
 import { runtimeEnvironmentIdOrLocalUnlessTwin } from '../worktree-runtime-owner'
 import { requestNativeChatComposerFocus } from '@/components/native-chat/use-native-chat-composer-reveal-focus'
 import { useAppStore } from '@/store/index'
@@ -44,7 +42,6 @@ export function activateStructuredAgentSessionTab(args: {
   tabId: string
   target?: RuntimeClientTarget
   callerOnly?: boolean
-  viewerSelection?: string
 }): boolean {
   const state = useAppStore.getState()
   const tab = (state.unifiedTabsByWorktree[args.worktreeId] ?? []).find(
@@ -58,22 +55,9 @@ export function activateStructuredAgentSessionTab(args: {
   if (!tab) {
     return false
   }
-  if (args.viewerSelection && isSessionTabSelectionRequest(args.viewerSelection)) {
-    if (
-      !selectSessionTabForViewer(
-        args.worktreeId,
-        tab.id,
-        args.viewerSelection,
-        args.target?.kind === 'environment' ? args.target.environmentId : undefined
-      )
-    ) {
-      return false
-    }
-  } else {
-    state.focusGroup(args.worktreeId, tab.groupId)
-    state.activateTab(tab.id, { worktreeId: args.worktreeId })
-    state.setActiveTabType('agent-session', args.worktreeId)
-  }
+  state.focusGroup(args.worktreeId, tab.groupId)
+  state.activateTab(tab.id, { worktreeId: args.worktreeId })
+  state.setActiveTabType('agent-session', args.worktreeId)
   requestNativeChatComposerFocus(tab.id)
   activateStructuredAgentSessionTabOnOwner(args.worktreeId, tab.entityId, args.target, {
     callerOnly: args.callerOnly
@@ -106,7 +90,6 @@ export function activateStructuredAgentSessionById(args: {
   sessionId: string
   target?: RuntimeClientTarget
   callerOnly?: boolean
-  viewerSelection?: string
 }): boolean {
   const tab = findStructuredAgentSessionTab(useAppStore.getState().unifiedTabsByWorktree, {
     workspaceId: args.worktreeId,
@@ -118,8 +101,7 @@ export function activateStructuredAgentSessionById(args: {
         worktreeId: args.worktreeId,
         tabId: tab.id,
         target: args.target,
-        callerOnly: args.callerOnly,
-        viewerSelection: args.viewerSelection
+        callerOnly: args.callerOnly
       })
     : false
 }
diff --git a/src/renderer/src/lib/conversation-surface-switch.test.tsx b/src/renderer/src/lib/conversation-surface-switch.test.tsx
index e4d55eb94a87..1dd1bb640d29 100644
--- a/src/renderer/src/lib/conversation-surface-switch.test.tsx
+++ b/src/renderer/src/lib/conversation-surface-switch.test.tsx
@@ -5,21 +5,8 @@ import { createTabsSliceMockApi } from '../store/slices/tabs-slice-test-harness'
 import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
 import type * as SessionOwner from '@/runtime/structured-agent-session-owner'
 import { useAppStore } from '@/store'
-import { EMPTY_STRUCTURED_AGENT_SESSION } from '../../../shared/structured-agent-session-reducer'
-import { runConversationSwitch, runNativeChatCliSwitch } from './conversation-surface-switch'
+import { runConversationSwitch } from './conversation-surface-switch'
 import { pendingNativeChatCliSwitches } from './pending-conversation-surface-switches'
-import type { RuntimeMobileSessionTabsResult } from '../../../shared/runtime-types'
-import { createWebSessionTabsSnapshotPatch } from '@/runtime/web-session-tabs-sync/snapshot-api'
-import { applyWebSessionTabsStorePatch } from '@/runtime/web-session-tabs-sync/store-patch'
-import { activateTabNumberShortcut } from './tab-number-shortcuts'
-import {
-  beginViewerSelectionRequest,
-  disposeViewerSelection,
-  viewerSelectionOutcome
-} from './viewer-selection-request'
-import { presentConversationSwitchResult } from './conversation-switch-result-selection'
-import { agentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
-import type { Tab } from '../../../shared/tab-types'
 const mocks = vi.hoisted(() => {
   function makeTarget(): { current: RuntimeClientTarget } {
     return { current: { kind: 'local' } }
@@ -127,516 +114,45 @@ afterEach(() => {
   vi.useRealTimers()
   pendingNativeChatCliSwitches.clear()
 })
-it('reserves pending before negotiation, sends one execution request and leaves all launching to the host', async () => {
-  const negotiation = Promise.withResolvers<boolean>()
-  mocks.support.mockReturnValue(negotiation.promise)
-  const first = runConversationSwitch(subject)
-  expect(await runConversationSwitch(subject)).toBe(false)
-  negotiation.resolve(true)
-  expect(await first).toBe(true)
-  expect(mocks.support).toHaveBeenCalledOnce()
-  expect(mocks.call).toHaveBeenCalledWith(
-    { kind: 'local' },
-    'agentSession.switchToTerminal',
-    expect.objectContaining({
-      sessionId: subject.sessionId,
-      execution: expect.objectContaining({ sourceTabId: 'source' })
-    }),
-    expect.objectContaining({ signal: expect.any(AbortSignal), beforeSend: expect.any(Function) })
-  )
-  expect(mocks.legacy).not.toHaveBeenCalled()
-  expect(pendingNativeChatCliSwitches.size).toBe(0)
-})
-it('formats real refusal categories once, with agent and next step, never raw errors or platform-wrong job control', async () => {
-  mocks.call.mockRejectedValue(new Error('secret raw transport/provider failure'))
-  await runConversationSwitch({ ...subject, direction: 'chat' })
-  expect(mocks.error).toHaveBeenCalledExactlyOnceWith(
-    'Codex could not start in chat. Check its setup and try again.'
-  )
-})
-
-it.each([false, true])(
-  'asks once for a live reply; consent=%s has only the authorized effects',
-  async (yes) => {
-    mocks.reader.mockReturnValue({
-      getSnapshot: () => ({
-        current: true,
-        state: {
-          ...EMPTY_STRUCTURED_AGENT_SESSION,
-          working: true,
-          latestTurn: { itemId: 'turn', observedAt: 1, turn: { turnId: 'turn', state: 'running' } }
-        }
-      })
-    })
-    const answer = Promise.withResolvers<boolean>()
-    const confirm = vi.fn(() => answer.promise)
-    const first = runConversationSwitch({ ...subject, confirm })
-    expect(await runConversationSwitch({ ...subject, confirm })).toBe(false)
-    await vi.waitFor(() => expect(confirm).toHaveBeenCalledOnce())
-    expect(confirm).toHaveBeenCalledExactlyOnceWith(
-      expect.objectContaining({
-        title: 'Codex is replying. Stop it and switch?',
-        compact: true
-      })
-    )
-    expect(mocks.support).toHaveBeenCalledOnce()
-    expect(mocks.call).not.toHaveBeenCalled()
-    answer.resolve(yes)
-    expect(await first).toBe(yes)
-    expect(mocks.call).toHaveBeenCalledTimes(yes ? 1 : 0)
-    expect(mocks.refresh).toHaveBeenCalledTimes(yes ? 1 : 0)
-  }
-)
-
-it.each([10, 100])('bounds real result discovery and selection at %i workspaces', async (count) => {
-  const environmentId = 'scale-owner'
-  const target = { kind: 'environment', environmentId } as const
-  const sourceWorkspace = 'folder:scale-0'
-  const destinationWorkspace = `folder:scale-${count - 1}`
-  const sessionId = 'scale-native-A'
-  disposeViewerSelection()
-  useAppStore.setState({ activeWorktreeId: sourceWorkspace, activeView: 'terminal' })
-  for (let index = 0; index < count; index++) {
-    const sibling = terminal(index === 0 ? 'B' : `sibling-${index}`)
-    const id = index === 1 || index === count - 1 ? sessionId : `unrelated-${index}`
-    const second =
-      index === 0
-        ? terminal('C')
-        : {
-            type: 'agent-session' as const,
-            id: `agent-session:${id}`,
-            sessionId: id,
-            agent: 'codex' as const,
-            title: id,
-            isActive: false
-          }
-    applySwitchSnapshot(
-      {
-        worktree: `folder:scale-${index}`,
-        publicationEpoch: 'result-scale',
-        snapshotVersion: 1,
-        activeGroupId: 'G',
-        activeTabId: sibling.id,
-        activeTabType: 'terminal',
-        tabs: [sibling, second],
-        tabGroups: [
-          {
-            id: 'G',
-            activeTabId: sibling.parentTabId,
-            tabOrder: [
-              sibling.parentTabId,
-              second.type === 'terminal' ? second.parentTabId : second.id
-            ]
-          }
-        ]
-      },
-      index === 1 ? 'other-owner' : environmentId
-    )
-  }
-  const before = useAppStore.getState()
-  const destinationRows = before.unifiedTabsByWorktree[destinationWorkspace]
-  const destination = destinationRows.find((tab) => tab.entityId === sessionId)!
-  const originalOrder = before.groupsByWorktree[destinationWorkspace][0].tabOrder
-  const sourceRows = before.unifiedTabsByWorktree[sourceWorkspace]
-  const sourceTerminals = before.tabsByWorktree[sourceWorkspace]
-  const sourceLayouts = sourceRows.map((tab) => before.terminalLayoutsByTabId[tab.entityId])
-  expect(destinationRows).toHaveLength(2)
-  expect(
-    Object.values(before.unifiedTabsByWorktree).reduce((sum, rows) => sum + rows.length, 0)
-  ).toBe(2 * count)
-  expect(destination.executionHostId).toBe('runtime:scale-owner')
-  expect(
-    before.unifiedTabsByWorktree['folder:scale-1'].find((tab) => tab.entityId === sessionId)
-      ?.executionHostId
-  ).toBe('runtime:other-owner')
 
-  const [activation, owners, storePatch, viewer] = await Promise.all([
-    import('./agent-session/structured-agent-session-tab-activation'),
-    import('@/runtime/structured-agent-session-owner'),
-    import('@/runtime/web-session-tabs-sync/store-patch'),
-    import('./viewer-selection-request')
-  ])
-  const discovery = { calls: 0, keyPasses: 0, keys: 0, workspaces: 0, tabs: 0 }
-  const candidateVisits = new Map<string, number>()
-  const realFind = activation.findStructuredAgentSessionTab
-  const lookup = vi
-    .spyOn(activation, 'findStructuredAgentSessionTab')
-    .mockImplementation((tabs, args) => {
-      if (args.workspaceId !== undefined) {
-        return realFind(tabs, args)
-      }
-      discovery.calls++
-      return realFind(
-        new Proxy(tabs, {
-          ownKeys(actual) {
-            const keys = Reflect.ownKeys(actual)
-            discovery.keyPasses++
-            discovery.keys += keys.length
-            return keys
-          },
-          get(actual, property, receiver) {
-            // oxlint-disable-next-line anti-slop/no-reflect-get -- Proxy `get` trap: only Reflect.get forwards a raw string|symbol key with the proxy receiver.
-            const rows: readonly Tab[] | undefined = Reflect.get(actual, property, receiver)
-            if (typeof property !== 'string' || !Object.hasOwn(actual, property) || !rows) {
-              return rows
-            }
-            discovery.workspaces++
-            return new Proxy(rows, {
-              get(actualRows, key, arrayReceiver) {
-                if (typeof key === 'string' && /^(0|[1-9]\d*)$/.test(key)) {
-                  discovery.tabs++
-                  const row = `${property}:${key}`
-                  candidateVisits.set(row, (candidateVisits.get(row) ?? 0) + 1)
-                }
-                // oxlint-disable-next-line anti-slop/no-reflect-get -- Proxy `get` trap: only Reflect.get forwards a raw string|symbol key with the proxy receiver.
-                return Reflect.get(actualRows, key, arrayReceiver)
-              }
-            })
-          }
-        }),
-        args
-      )
-    })
-  const qualification = vi.spyOn(owners, 'structuredAgentSessionOwnerForTab')
-  const selection = vi.spyOn(storePatch, 'selectSessionTabForViewer')
-  const commit = vi.spyOn(viewer, 'commitViewerSelection')
-  const deadline = agentSessionSwitchDeadline(Date.now)
-  const request = beginViewerSelectionRequest(`result-scale-${count}`, deadline)
-  request.accept()
-  mocks.pairedRefresh.mockClear()
-  mocks.rpc.mockClear()
-  try {
-    await presentConversationSwitchResult(
-      {
-        ...subject,
-        direction: 'chat',
-        workspaceId: sourceWorkspace,
-        executionHostId: 'runtime:scale-owner'
-      },
-      target,
-      { status: 'completed', sessionId },
-      request.token
-    )
-    expect(discovery).toEqual({
-      calls: 1,
-      keyPasses: 1,
-      keys: count,
-      workspaces: count,
-      tabs: 2 * count
-    })
-    expect(qualification).toHaveBeenCalledTimes(4)
-    expect(candidateVisits.size).toBe(2 * count)
-    expect(new Set(candidateVisits.values())).toEqual(new Set([1]))
-    expect(qualification.mock.calls.map(([, tab]) => tab.executionHostId)).toEqual([
-      'runtime:other-owner',
-      'runtime:scale-owner',
-      'runtime:scale-owner',
-      'runtime:scale-owner'
-    ])
-    console.info(
-      `[result-selection-work] W=${count} T=${2 * count} discoveryKeys=${discovery.keys} workspaceVisits=${discovery.workspaces} tabVisits=${discovery.tabs} ownerChecks=${qualification.mock.calls.length}`
-    )
-    expect(selection).toHaveBeenCalledExactlyOnceWith(
-      destinationWorkspace,
-      destination.id,
-      request.token,
-      environmentId
-    )
-    expect(commit).toHaveBeenCalledOnce()
-    expect(viewerSelectionOutcome(request.token)).toBe('fulfilled')
-    expect(mocks.pairedRefresh).toHaveBeenCalledExactlyOnceWith(
-      environmentId,
-      destinationWorkspace,
-      {
-        acceptCurrentSnapshot: true,
-        afterCurrentInFlight: true
-      }
-    )
-    expect(mocks.rpc).toHaveBeenCalledExactlyOnceWith(target, 'session.tabs.activate', {
-      worktree: `id:${destinationWorkspace}`,
-      tabId: `agent-session:${sessionId}`,
-      notifyClients: false,
-      navigation: 'caller'
-    })
-    const after = useAppStore.getState()
-    expect(after.activeWorktreeId).toBe(destinationWorkspace)
-    expect(
-      after.groupsByWorktree[destinationWorkspace].find(
-        (group) => group.id === after.activeGroupIdByWorktree[destinationWorkspace]
-      )?.activeTabId
-    ).toBe(destination.id)
-    expect(after.activeTabType).toBe('agent-session')
-    expect(after.unifiedTabsByWorktree[destinationWorkspace]).toHaveLength(2)
-    expect(after.groupsByWorktree[destinationWorkspace][0].tabOrder).toEqual(originalOrder)
-    expect(after.unifiedTabsByWorktree[sourceWorkspace]).toBe(sourceRows)
-    expect(after.tabsByWorktree[sourceWorkspace]).toBe(sourceTerminals)
-    expect(sourceRows.map((tab) => after.terminalLayoutsByTabId[tab.entityId])).toEqual(
-      sourceLayouts
-    )
-  } finally {
-    lookup.mockRestore()
-    qualification.mockRestore()
-    selection.mockRestore()
-    commit.mockRestore()
-    deadline.dispose()
-    disposeViewerSelection()
-    useAppStore.setState(useAppStore.getInitialState(), true)
-  }
-})
-
-it.each(['codex'] as const)(
-  'dispatches idle %s once through the common host command, preserving configured commands',
-  async (agent) => {
-    const confirm = vi.fn()
-    useAppStore.setState({
-      settings: {
-        ...useAppStore.getState().settings!,
-        agentCmdOverrides: { [agent]: 'my-alias --option' }
-      }
-    })
-    expect(await runConversationSwitch({ ...subject, agent, confirm })).toBe(true)
-    expect(confirm).not.toHaveBeenCalled()
-    expect(mocks.call).toHaveBeenCalledExactlyOnceWith(
-      { kind: 'local' },
-      'agentSession.switchToTerminal',
-      expect.objectContaining({
-        sessionId: subject.sessionId,
-        execution: expect.objectContaining({ commandOverride: 'my-alias --option' })
-      }),
-      expect.any(Object)
-    )
-  }
-)
-
-it('does not offer chat switching while Chat UI is off', async () => {
-  useAppStore.setState({
-    settings: { ...useAppStore.getState().settings!, experimentalNativeChat: false }
+it('sends one switch, shows pending only while the host runs it, and settles without a message', async () => {
+  mocks.support.mockResolvedValue(true)
+  let pendingDuringCall = false
+  mocks.call.mockImplementation(async () => {
+    pendingDuringCall = pendingNativeChatCliSwitches.size > 0
+    return { status: 'completed', sessionId: subject.sessionId }
   })
-  expect(await runConversationSwitch({ ...subject, direction: 'chat' })).toBe(false)
-  expect(mocks.support).not.toHaveBeenCalled()
-  expect(mocks.call).not.toHaveBeenCalled()
+  await expect(runConversationSwitch(subject)).resolves.toBe(true)
+  expect(pendingDuringCall).toBe(true)
+  expect(pendingNativeChatCliSwitches.size).toBe(0)
+  const [, method, params] = mocks.call.mock.calls[0]!
+  expect(method).toBe('agentSession.switchToTerminal')
+  expect(params).toMatchObject({
+    sessionId: subject.sessionId,
+    execution: { invocationId: expect.any(String), sourceTabId: 'source' }
+  })
+  expect(mocks.error).not.toHaveBeenCalled()
+  expect(mocks.info).not.toHaveBeenCalled()
 })
 
-it('Continue with Chat UI off uses the same host switch identity, never copied/fork startup', async () => {
-  useAppStore.setState({
-    settings: { ...useAppStore.getState().settings!, experimentalNativeChat: false }
+it('reports a refused switch once and leaves nothing pending', async () => {
+  mocks.support.mockResolvedValue(true)
+  mocks.call.mockResolvedValue({
+    status: 'refused',
+    sessionId: subject.sessionId,
+    refusal: { code: 'agent_session_operation_invalid', details: { reason: 'messagesUnsettled' } }
   })
-  const legacyContinue = vi.fn(async () => {})
-  await runNativeChatCliSwitch({ ...subject, legacyContinue })
-  expect(mocks.call).toHaveBeenCalledExactlyOnceWith(
-    { kind: 'local' },
-    'agentSession.switchToTerminal',
-    expect.objectContaining({
-      sessionId: subject.sessionId,
-      execution: expect.objectContaining({
-        sourceTabId: subject.chatTabId,
-        viewerSelection: expect.stringMatching(/^selection-v1:/)
-      })
-    }),
-    expect.any(Object)
-  )
-  expect(legacyContinue).not.toHaveBeenCalled()
-  expect(mocks.legacy).not.toHaveBeenCalled()
+  await expect(runConversationSwitch(subject)).resolves.toBe(false)
+  expect(mocks.error).toHaveBeenCalledOnce()
+  expect(pendingNativeChatCliSwitches.size).toBe(0)
+  // A second click is a fresh switch, never swallowed by a stale pending entry.
+  mocks.call.mockResolvedValue({ status: 'completed', sessionId: subject.sessionId })
+  await expect(runConversationSwitch(subject)).resolves.toBe(true)
 })
 
-it('old-host Continue while replying reports its copy outcome without promising Stop', async () => {
+it('falls back to the legacy path when the host cannot switch in place', async () => {
   mocks.support.mockResolvedValue(false)
-  mocks.reader.mockReturnValue({
-    getSnapshot: () => ({
-      current: true,
-      state: {
-        ...EMPTY_STRUCTURED_AGENT_SESSION,
-        working: true,
-        latestTurn: { itemId: 'turn', observedAt: 1, turn: { turnId: 'turn', state: 'running' } }
-      }
-    })
-  })
-  const confirm = vi.fn()
-  const legacyContinue = vi.fn(async () => {})
-  await runNativeChatCliSwitch({ ...subject, confirm, legacyContinue })
-  expect(mocks.support).toHaveBeenCalledOnce()
-  expect(confirm).not.toHaveBeenCalled()
+  await expect(runConversationSwitch(subject)).resolves.toBe(false)
+  expect(mocks.legacy).toHaveBeenCalledOnce()
   expect(mocks.call).not.toHaveBeenCalled()
-  expect(legacyContinue).toHaveBeenCalledExactlyOnceWith(expect.stringMatching(/^selection-v1:/))
 })
-
-const terminal = (id: string) => ({
-  type: 'terminal' as const,
-  id: `${id}::11111111-1111-4111-8111-111111111111`,
-  parentTabId: id,
-  leafId: '11111111-1111-4111-8111-111111111111',
-  title: id,
-  terminal: `term_${id}`,
-  isActive: false,
-  status: 'ready' as const
-})
-const applySwitchSnapshot = (frame: RuntimeMobileSessionTabsResult, owner: string) =>
-  applyWebSessionTabsStorePatch(createWebSessionTabsSnapshotPatch(frame, owner), {
-    frames: []
-  })()
-
-it.each([
-  { workspace: 'folder:existing-chat', navigate: false },
-  { workspace: 'folder:existing-chat', navigate: true },
-  { workspace: 'folder:terminal-source', navigate: false }
-])(
-  'selects the completed session in its actual $workspace without relocating it (navigation=$navigate)',
-  async ({ workspace, navigate }) => {
-    const environmentId = 'switch-owner'
-    const target = { kind: 'environment', environmentId } as const
-    const sourceWorkspace = 'folder:terminal-source'
-    const sessionId = 'existing-native-A'
-    const sourceFrame: RuntimeMobileSessionTabsResult = {
-      worktree: sourceWorkspace,
-      publicationEpoch: 'result-selection',
-      snapshotVersion: 1,
-      activeGroupId: 'source-group',
-      activeTabId: terminal('B').id,
-      activeTabType: 'terminal',
-      tabs: [terminal('B'), terminal('C')],
-      tabGroups: [{ id: 'source-group', activeTabId: 'B', tabOrder: ['B', 'C'] }]
-    }
-    const destinationFrame: RuntimeMobileSessionTabsResult = {
-      ...sourceFrame,
-      worktree: workspace,
-      activeGroupId: workspace === sourceWorkspace ? 'source-group' : 'chat-group',
-      activeTabId:
-        workspace === sourceWorkspace ? sourceFrame.activeTabId : `agent-session:${sessionId}`,
-      activeTabType: workspace === sourceWorkspace ? 'terminal' : 'agent-session',
-      tabs: [
-        ...(workspace === sourceWorkspace ? sourceFrame.tabs : []),
-        {
-          type: 'agent-session',
-          id: 'agent-session:existing-native-A',
-          sessionId,
-          agent: 'codex',
-          title: 'Existing chat A',
-          isActive: false
-        }
-      ],
-      tabGroups: [
-        ...(workspace === sourceWorkspace ? (sourceFrame.tabGroups ?? []) : []),
-        {
-          id: 'chat-group',
-          activeTabId: `agent-session:${sessionId}`,
-          tabOrder: [`agent-session:${sessionId}`]
-        }
-      ]
-    }
-    const apply = (frame: RuntimeMobileSessionTabsResult, owner = environmentId) =>
-      applySwitchSnapshot(frame, owner)
-    disposeViewerSelection()
-    mocks.target.current = target
-    useAppStore.setState({ activeWorktreeId: sourceWorkspace, activeView: 'terminal' })
-    apply(sourceFrame)
-    // The same session string on a different host is not this command's destination.
-    apply(
-      {
-        ...destinationFrame,
-        worktree: 'folder:foreign-chat',
-        tabs: destinationFrame.tabs.filter((tab) => tab.type === 'agent-session'),
-        tabGroups: destinationFrame.tabGroups?.filter((group) => group.id === 'chat-group'),
-        activeGroupId: 'chat-group',
-        activeTabId: `agent-session:${sessionId}`,
-        activeTabType: 'agent-session'
-      },
-      'other-owner'
-    )
-    apply(destinationFrame)
-    const before = useAppStore.getState()
-    expect(before.activeWorktreeId).toBe(sourceWorkspace)
-    const sourceTabs = before.tabsByWorktree[sourceWorkspace]
-    const sourceRows = before.unifiedTabsByWorktree[sourceWorkspace].filter(
-      (tab) => tab.contentType === 'terminal'
-    )
-    const destination = before.unifiedTabsByWorktree[workspace].find(
-      (tab) => tab.entityId === sessionId
-    )!
-    const chatGroup = before.groupsByWorktree[workspace].find(
-      (group) => group.id === destination.groupId
-    )!
-    const refresh = Promise.withResolvers<void>()
-    mocks.pairedRefresh.mockImplementation(() => refresh.promise)
-    const result = { status: 'completed', sessionId } as const
-    mocks.call.mockResolvedValue(result)
-    const args = {
-      ...subject,
-      direction: 'chat' as const,
-      workspaceId: sourceWorkspace,
-      executionHostId: 'runtime:switch-owner'
-    }
-    try {
-      const switching = runConversationSwitch(args)
-      await vi.waitFor(() => expect(mocks.pairedRefresh).toHaveBeenCalledOnce())
-      expect(mocks.pairedRefresh).toHaveBeenCalledWith(environmentId, workspace, {
-        acceptCurrentSnapshot: true,
-        afterCurrentInFlight: true
-      })
-      const token = mocks.call.mock.calls[0][2].execution.viewerSelection
-      if (navigate) {
-        expect(activateTabNumberShortcut(1)).toBe(true)
-      }
-      const beforeResult = useAppStore.getState()
-      const selectedBeforeResult = beforeResult.activeTabIdByWorktree[sourceWorkspace]
-      const selectedGroupBeforeResult = beforeResult.groupsByWorktree[sourceWorkspace].find(
-        (group) => group.id === beforeResult.activeGroupIdByWorktree[sourceWorkspace]
-      )
-      refresh.resolve()
-      expect(await switching).toBe(true)
-      const after = useAppStore.getState()
-      const selectedWorkspace = navigate ? sourceWorkspace : workspace
-      const activeGroupId = after.activeGroupIdByWorktree[selectedWorkspace]
-      const selectedGroup = after.groupsByWorktree[selectedWorkspace].find(
-        (group) => group.id === activeGroupId
-      )
-      expect(after.activeWorktreeId).toBe(selectedWorkspace)
-      expect(selectedGroup?.activeTabId).toBe(
-        navigate ? selectedGroupBeforeResult?.activeTabId : destination.id
-      )
-      expect(after.activeTabType).toBe(navigate ? 'terminal' : 'agent-session')
-      expect(after.activeTabTypeByWorktree[selectedWorkspace]).toBe(
-        navigate ? 'terminal' : 'agent-session'
-      )
-      expect(after.activeTabIdByWorktree[selectedWorkspace]).toBe(
-        navigate ? selectedBeforeResult : (before.activeTabIdByWorktree[workspace] ?? null)
-      )
-      expect(viewerSelectionOutcome(token)).toBe(navigate ? 'superseded' : 'fulfilled')
-      expect(after.tabsByWorktree[sourceWorkspace]).toEqual(sourceTabs)
-      expect(
-        after.unifiedTabsByWorktree[sourceWorkspace]
-          .filter((tab) => tab.contentType === 'terminal')
-          .map((tab) => ({ id: tab.id, entityId: tab.entityId, groupId: tab.groupId }))
-      ).toEqual(
-        sourceRows.map((tab) => ({ id: tab.id, entityId: tab.entityId, groupId: tab.groupId }))
-      )
-      expect(
-        after.groupsByWorktree[workspace].find((group) => group.id === destination.groupId)
-          ?.tabOrder
-      ).toEqual(chatGroup.tabOrder)
-      expect(
-        after.unifiedTabsByWorktree[workspace].filter((tab) => tab.entityId === sessionId)
-      ).toHaveLength(1)
-      const accepted = after.activeTabIdByWorktree
-      await presentConversationSwitchResult(args, target, result, token)
-      const replayed = useAppStore.getState()
-      expect(replayed.activeTabIdByWorktree).toBe(accepted)
-      expect(replayed.activeWorktreeId).toBe(after.activeWorktreeId)
-      expect(replayed.activeGroupIdByWorktree[selectedWorkspace]).toBe(activeGroupId)
-      expect(
-        replayed.groupsByWorktree[selectedWorkspace].find((group) => group.id === activeGroupId)
-          ?.activeTabId
-      ).toBe(selectedGroup?.activeTabId)
-      expect(mocks.rpc).toHaveBeenCalledTimes(navigate ? 0 : 1)
-      if (!navigate) {
-        expect(mocks.rpc).toHaveBeenCalledWith(target, 'session.tabs.activate', {
-          worktree: `id:${workspace}`,
-          tabId: `agent-session:${sessionId}`,
-          notifyClients: false,
-          navigation: 'caller'
-        })
-      }
-    } finally {
-      disposeViewerSelection()
-    }
-  }
-)
diff --git a/src/renderer/src/lib/conversation-surface-switch.ts b/src/renderer/src/lib/conversation-surface-switch.ts
index a8ce45df2bd5..5db174b16a30 100644
--- a/src/renderer/src/lib/conversation-surface-switch.ts
+++ b/src/renderer/src/lib/conversation-surface-switch.ts
@@ -8,16 +8,6 @@ import {
   adoptsCliConversations
 } from '../../../shared/structured-agent-cli-conversation-adoption'
 import { toHostSessionPaneKey } from '../../../shared/terminal-surface-id'
-import {
-  captureSwitchProjection,
-  releaseUnsentSwitchProjection
-} from './conversation-switch-projection'
-import {
-  beginSwitchPresentation,
-  reportSwitchPresentationFailure,
-  settleSwitchPresentation,
-  type SwitchPresentationVisit
-} from './conversation-switch-presentation'
 import { parseExecutionHostId } from '../../../shared/execution-host'
 import { toast } from 'sonner'
 import { useAppStore } from '@/store'
@@ -45,8 +35,6 @@ import {
 import { AgentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
 import { prepareAiVaultSessionForResume } from './ai-vault-session-resume-preparation'
 import type { CliChatResumeSource } from '@/components/tab-bar/cli-chat-resume-source'
-import { beginViewerSelectionRequest } from './viewer-selection-request'
-import { presentConversationSwitchResult } from './conversation-switch-result-selection'
 import { runLegacyConversationSwitch } from './conversation-switch-legacy'
 import {
   type ConversationSwitch,
@@ -75,6 +63,11 @@ export function runNativeChatCliSwitch(
     .finally(args.onComplete)
 }
 
+/**
+ * Consent, one RPC, one settle. The host stops the agent, prepares the other view at rest and
+ * replaces the tab in one layout write; here the source tab only shows the pending state. Every
+ * exit is visible: the tab is replaced, or it stays as it was with one message.
+ */
 export async function runConversationSwitch(args: ConversationSwitch): Promise<boolean> {
   if (
     (args.direction === 'chat' && !isNativeChatEnabled(useAppStore.getState().settings)) ||
@@ -86,16 +79,14 @@ export async function runConversationSwitch(args: ConversationSwitch): Promise<b
   args = withConversationSwitchPlatform(args)
   const target = structuredAgentSessionTargetForHost(args.executionHostId)
   const hostId = parseExecutionHostId(args.executionHostId)?.id
+  const feedback =
+    args.feedback ?? ((message: string, kind: 'error' | 'info') => toast[kind](message))
   if (!target || !hostId) {
+    feedback(conversationSwitchFailureText(new Error('host unavailable'), args), 'error')
     return false
   }
   const deadline = agentSessionSwitchDeadline(Date.now, AGENT_SESSION_SWITCH_CLIENT_MS)
-  const invocationId = createBrowserUuid()
-  const selection = beginViewerSelectionRequest(invocationId, deadline)
-  const viewerSelection = selection.token
   const key = keyFor(args)
-  const feedback =
-    args.feedback ?? ((message: string, kind: 'error' | 'info') => toast[kind](message))
   pending.set(key, {
     chatTabId: args.source?.tabId ?? args.chatTabId ?? null,
     workspaceId: args.workspaceId,
@@ -103,14 +94,11 @@ export async function runConversationSwitch(args: ConversationSwitch): Promise<b
   })
   conversationSwitchChanged()
   let consented = false
-  let sent = false
-  let presentation: SwitchPresentationVisit | undefined
   try {
     const supported = await deadline.wait(supportsInPlaceSwitch(target, args.agent, true))
     if (!supported && args.legacyContinue) {
-      selection.accept()
       consented = true
-      await args.legacyContinue(viewerSelection)
+      await args.legacyContinue()
       return false
     }
     if (conversationSwitchReplying(args)) {
@@ -129,158 +117,39 @@ export async function runConversationSwitch(args: ConversationSwitch): Promise<b
         return false
       }
     }
-    selection.accept()
     consented = true
-    if (args.direction === 'terminal' && args.sessionId && args.chatTabId) {
-      captureSwitchProjection(
-        useAppStore.getState(),
-        args.workspaceId,
-        {
-          invocationId,
-          generation: invocationId,
-          sessionId: args.sessionId,
-          tabId: args.chatTabId,
-          phase: 'prepare'
-        },
-        () => {}
-      )
-    }
     if (!supported) {
-      await runLegacyConversationSwitch(args, target, viewerSelection)
+      await runLegacyConversationSwitch(args, target)
       return false
     }
-    let sessionId = args.sessionId
-    let execution: Record<string, unknown> = { invocationId, viewerSelection }
-    if (args.direction === 'chat' && args.source) {
-      const captured = await deadline.wait(captureSourceTerminal(args.source))
-      if (!captured) {
-        throw new Error('source unavailable')
-      }
-      const intent = createStructuredAgentSessionLaunchIntent(
-        args.workspaceId,
-        await deadline.wait(
-          adoptingAgentOnHost(args.source.agent, args.workspaceId, args.source.executionHostId)
-        ),
-        args.source.executionHostId,
+    const { sessionId, execution } = await switchRequest(args, hostId, deadline)
+    const answer = await deadline.wait(
+      callStructuredAgentSession<AgentSessionSwitchResult>(
+        target,
+        args.direction === 'chat' ? 'agentSession.switchToChat' : 'agentSession.switchToTerminal',
+        { sessionId, execution },
         {
-          providerSessionId: args.source.providerSessionId,
-          cliSource: {
-            workspaceId: args.workspaceId,
-            paneKey: toHostSessionPaneKey(args.source.paneKey)
-          }
-        },
-        undefined,
-        false
-      )
-      sessionId = intent.sessionId
-      const group = useAppStore
-        .getState()
-        .groupsByWorktree[args.workspaceId]?.find((row) =>
-          row.tabOrder.includes(args.source!.tabId)
-        )
-      execution = {
-        ...execution,
-        create: {
-          ...intent.params,
-          tabPlacement: { groupId: group?.id, afterTabId: args.source.tabId }
-        },
-        source: {
-          terminal: captured.handle,
-          expectedIncarnationId: captured.incarnationId,
-          originalPresentation: captured.presentation
+          signal: deadline.signal,
+          dispatchObservation: deadline.delegateSend,
+          beforeSend: (sentAt) => deadline.beforeSend(sentAt)
         }
-      }
-    } else if (
-      args.direction === 'chat' &&
-      !sessionId &&
-      args.history &&
-      adoptsCliConversations(args.history.agent)
-    ) {
-      const prepared = await deadline.wait(prepareAiVaultSessionForResume(args.history))
-      const intent = createStructuredAgentSessionLaunchIntent(
-        args.workspaceId,
-        await deadline.wait(adoptingAgentOnHost(args.history.agent, args.workspaceId, hostId)),
-        hostId,
-        {
-          providerSessionId: prepared.sessionId
-        },
-        undefined,
-        false
       )
-      sessionId = intent.sessionId
-      execution = { ...execution, create: intent.params }
-    } else if (args.direction === 'terminal') {
-      const state = useAppStore.getState()
-      execution = {
-        ...execution,
-        sourceTabId: args.chatTabId ?? undefined,
-        groupId: state.groupsByWorktree[args.workspaceId]?.find((row) =>
-          row.tabOrder.includes(args.chatTabId ?? '')
-        )?.id,
-        commandOverride: state.settings?.agentCmdOverrides?.[args.agent]
-      }
-    }
-    const method =
-      args.direction === 'chat' ? 'agentSession.switchToChat' : 'agentSession.switchToTerminal'
-    const invoke = () =>
-      deadline.wait(
-        callStructuredAgentSession<AgentSessionSwitchResult>(
-          target,
-          method,
-          { sessionId, execution },
-          {
-            signal: deadline.signal,
-            dispatchObservation: deadline.delegateSend,
-            beforeSend: (sentAt) => {
-              deadline.beforeSend(sentAt)
-              sent = true
-            }
-          }
-        )
-      )
-    if (args.direction === 'chat' && sessionId) {
-      presentation = beginSwitchPresentation(target, sessionId)
-    }
-    const answer = await invoke()
-    if (args.direction === 'chat' && answer.sessionId !== sessionId) {
-      presentation?.release()
-      presentation = beginSwitchPresentation(target, answer.sessionId)
-    }
+    )
     if (answer.status !== 'completed') {
-      if (answer.status === 'refused') {
-        selection.discard()
-      }
-      if (!presentation || reportSwitchPresentationFailure(presentation, answer.failureItemId)) {
-        feedback(
-          conversationSwitchFailureText(new AgentSessionRefusalError(answer.refusal), args),
-          'error'
-        )
-      }
+      feedback(
+        conversationSwitchFailureText(new AgentSessionRefusalError(answer.refusal), args),
+        'error'
+      )
       return false
     }
-    if (target.kind === 'environment') {
-      await presentConversationSwitchResult(args, target, answer, viewerSelection)
-    }
     if (answer.sourceRetained) {
       feedback(conversationSwitchSourceKept(args.agent), 'info')
     }
     return true
   } catch (error) {
-    if (!sent) {
-      selection.discard()
-    }
-    if (!presentation || reportSwitchPresentationFailure(presentation)) {
-      feedback(conversationSwitchFailureText(error, args), 'error')
-    }
+    feedback(conversationSwitchFailureText(error, args), 'error')
     return false
   } finally {
-    if (!consented) {
-      selection.discard()
-    }
-    if (!sent) {
-      releaseUnsentSwitchProjection(invocationId)
-    }
-    settleSwitchPresentation(presentation)
     deadline.dispose()
     pending.delete(key)
     conversationSwitchChanged()
@@ -290,8 +159,80 @@ export async function runConversationSwitch(args: ConversationSwitch): Promise<b
   }
 }
 
+/** The host call's identity and execution facts, captured after consent. */
+async function switchRequest(
+  args: ConversationSwitch,
+  hostId: string,
+  deadline: ReturnType<typeof agentSessionSwitchDeadline>
+): Promise<{ sessionId: string | undefined; execution: Record<string, unknown> }> {
+  const invocationId = createBrowserUuid()
+  if (args.direction === 'chat' && args.source) {
+    const captured = await deadline.wait(captureSourceTerminal(args.source))
+    if (!captured) {
+      throw new Error('source unavailable')
+    }
+    const intent = createStructuredAgentSessionLaunchIntent(
+      args.workspaceId,
+      await deadline.wait(
+        adoptingAgentOnHost(args.source.agent, args.workspaceId, args.source.executionHostId)
+      ),
+      args.source.executionHostId,
+      {
+        providerSessionId: args.source.providerSessionId,
+        cliSource: {
+          workspaceId: args.workspaceId,
+          paneKey: toHostSessionPaneKey(args.source.paneKey)
+        }
+      },
+      undefined,
+      false
+    )
+    return {
+      sessionId: intent.sessionId,
+      execution: {
+        invocationId,
+        create: intent.params,
+        source: {
+          terminal: captured.handle,
+          expectedIncarnationId: captured.incarnationId,
+          originalPresentation: captured.presentation
+        }
+      }
+    }
+  }
+  if (
+    args.direction === 'chat' &&
+    !args.sessionId &&
+    args.history &&
+    adoptsCliConversations(args.history.agent)
+  ) {
+    const prepared = await deadline.wait(prepareAiVaultSessionForResume(args.history))
+    const intent = createStructuredAgentSessionLaunchIntent(
+      args.workspaceId,
+      await deadline.wait(adoptingAgentOnHost(args.history.agent, args.workspaceId, hostId)),
+      hostId,
+      { providerSessionId: prepared.sessionId },
+      undefined,
+      false
+    )
+    return { sessionId: intent.sessionId, execution: { invocationId, create: intent.params } }
+  }
+  if (args.direction === 'terminal') {
+    return {
+      sessionId: args.sessionId,
+      execution: {
+        invocationId,
+        sourceTabId: args.chatTabId ?? undefined,
+        commandOverride: useAppStore.getState().settings?.agentCmdOverrides?.[args.agent]
+      }
+    }
+  }
+  return { sessionId: args.sessionId, execution: { invocationId } }
+}
+
 export {
   useConversationSwitchPending,
+  useConversationSwitchBusy,
   useConversationSwitchReadiness,
   type ConversationSwitch
 } from './conversation-switch-state'
diff --git a/src/renderer/src/lib/conversation-switch-legacy.ts b/src/renderer/src/lib/conversation-switch-legacy.ts
index 7d80e8939097..e6a363799db2 100644
--- a/src/renderer/src/lib/conversation-switch-legacy.ts
+++ b/src/renderer/src/lib/conversation-switch-legacy.ts
@@ -10,28 +10,22 @@ import { resumeAiVaultSessionInNewChat } from '@/components/right-sidebar/ai-vau
 
 import type { ConversationSwitch } from './conversation-switch-state'
 import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
-export function runLegacyConversationSwitch(
-  args: ConversationSwitch,
-  target: RuntimeClientTarget,
-  viewerSelection: string
-) {
+export function runLegacyConversationSwitch(args: ConversationSwitch, target: RuntimeClientTarget) {
   const reportFailure = (error: unknown) => toast.error(conversationSwitchFailureText(error, args))
   if (args.direction === 'terminal' && args.sessionId) {
     return runLegacyNativeChatCliSwitch({
       ...args,
       sessionId: args.sessionId,
       chatTabId: args.chatTabId ?? null,
-      viewerSelection,
       reportFailure
     })
   } else if (args.source) {
-    return runLegacyCliChatResume(args.source, viewerSelection, reportFailure)
+    return runLegacyCliChatResume(args.source, reportFailure)
   } else if (args.sessionId) {
     return switchIntoOwnerLegacy(
       { agent: args.agent, tabId: args.chatTabId ?? '', workspaceId: args.workspaceId },
       { sessionId: args.sessionId, workspaceId: args.workspaceId },
       target,
-      viewerSelection,
       reportFailure
     )
   } else if (args.history && adoptsCliConversations(args.agent)) {
@@ -41,7 +35,6 @@ export function runLegacyConversationSwitch(
       args.workspaceId,
       newAgentLaunchRequestId(),
       undefined,
-      viewerSelection,
       reportFailure
     )
   }
diff --git a/src/renderer/src/lib/conversation-switch-presentation.test.tsx b/src/renderer/src/lib/conversation-switch-presentation.test.tsx
deleted file mode 100644
index e889bfcc5b15..000000000000
--- a/src/renderer/src/lib/conversation-switch-presentation.test.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import { useRef } from 'react'
-import { act, cleanup, render, screen } from '@testing-library/react'
-import { afterEach, expect, it, vi } from 'vitest'
-import { NativeChatNoticeRow } from '@/components/native-chat/NativeChatNoticeRow'
-import {
-  beginSwitchPresentation,
-  reportSwitchPresentationFailure,
-  SwitchPresentationContext,
-  useSwitchPresentation,
-  useSwitchPresentationRows
-} from './conversation-switch-presentation'
-
-// @vitest-environment happy-dom
-
-const target = { kind: 'local' as const }
-afterEach(() => {
-  cleanup()
-  vi.restoreAllMocks()
-})
-function List({ item }: { item?: string }) {
-  const root = useRef<HTMLDivElement>(null)
-  useSwitchPresentationRows(root)
-  return (
-    <div ref={root} data-testid="list">
-      {item && (
-        <div data-switch-item-id={item}>
-          <NativeChatNoticeRow
-            messageId={item}
-            agentName="Codex"
-            block={{ type: 'text', text: 'Codex could not start. Try again.' }}
-          />
-        </div>
-      )}
-    </div>
-  )
-}
-function Visit({ item, visible = true }: { item?: string; visible?: boolean }) {
-  const visit = useSwitchPresentation(target, 'conversation', visible)
-  return (
-    <SwitchPresentationContext.Provider value={visit}>
-      <List item={item} />
-    </SwitchPresentationContext.Provider>
-  )
-}
-function bounds(top: number): DOMRect {
-  return {
-    x: 0,
-    y: top,
-    width: 200,
-    height: 30,
-    top,
-    bottom: top + 30,
-    left: 0,
-    right: 200,
-    toJSON: () => ({})
-  }
-}
-it.each([true, false])(
-  'reports the exact failure once in the clicked context (visible: %s)',
-  (visible) => {
-    vi.spyOn(HTMLElement.prototype, 'getBoundingClientRect').mockImplementation(function (
-      this: HTMLElement
-    ) {
-      return bounds(!visible && this.dataset.switchItemId ? 5_000 : 0)
-    })
-    const visit = beginSwitchPresentation(target, 'conversation')
-    const view = render(<Visit item="failed-new" />)
-    act(() => {
-      expect(reportSwitchPresentationFailure(visit, 'failed-new')).toBe(!visible)
-    })
-    expect(reportSwitchPresentationFailure(visit, 'failed-new')).toBe(false)
-    if (visible) {
-      expect(screen.getByText('Codex could not start. Try again.')).toBeTruthy()
-    } else {
-      expect(screen.queryByText('Codex could not start. Try again.')).toBeNull()
-    }
-    view.unmount()
-    visit.release()
-    render(<Visit item="failed-new" />)
-    expect(screen.getByText('Codex could not start. Try again.')).toBeTruthy()
-  }
-)
diff --git a/src/renderer/src/lib/conversation-switch-presentation.tsx b/src/renderer/src/lib/conversation-switch-presentation.tsx
deleted file mode 100644
index e4d02e7cef7a..000000000000
--- a/src/renderer/src/lib/conversation-switch-presentation.tsx
+++ /dev/null
@@ -1,195 +0,0 @@
-import { createContext, useContext, useLayoutEffect, useSyncExternalStore } from 'react'
-import type { RefObject } from 'react'
-import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
-import { executionHostIdForStructuredTarget } from '@/runtime/structured-agent-session-owner'
-
-export type SwitchPresentationVisit = {
-  subscribe: (listener: () => void) => () => void
-  changed: () => void
-  stopObserving?: () => void
-  observeRows?: () => void
-  itemVisible?: (id: string) => boolean
-  presentedItems: Set<string>
-  settled: boolean
-  failureItemId?: string
-  reporter?: 'inline' | 'clicked'
-  mounted: boolean
-  visible: boolean
-  release: () => void
-}
-const visits = new Map<string, SwitchPresentationVisit>()
-const listeners = new Map<string, Set<() => void>>()
-const subscribe = (key: string, listener: () => void) => {
-  const rows = listeners.get(key) ?? new Set<() => void>()
-  rows.add(listener)
-  listeners.set(key, rows)
-  return () => {
-    rows.delete(listener)
-    if (!rows.size) {
-      listeners.delete(key)
-    }
-  }
-}
-const changed = (key: string) => listeners.get(key)?.forEach((listener) => listener())
-const keyFor = (target: RuntimeClientTarget, id: string) =>
-  `${executionHostIdForStructuredTarget(target)}\0${id}`
-export const SwitchPresentationContext = createContext<SwitchPresentationVisit | undefined>(
-  undefined
-)
-
-/** Only this automatic visit owns the click's selected failure; a later manual visit reads history normally. */
-export function beginSwitchPresentation(
-  target: RuntimeClientTarget,
-  id: string
-): SwitchPresentationVisit {
-  const key = keyFor(target, id)
-  visits.get(key)?.release()
-  const visit: SwitchPresentationVisit = {
-    subscribe: (listener) => subscribe(key, listener),
-    changed: () => changed(key),
-    presentedItems: new Set(),
-    settled: false,
-    mounted: false,
-    visible: false,
-    release: () => {
-      if (visits.get(key) === visit) {
-        visit.stopObserving?.()
-        visits.delete(key)
-        changed(key)
-      }
-    }
-  }
-  visits.set(key, visit)
-  changed(key)
-  return visit
-}
-export function reportSwitchPresentationFailure(
-  visit: SwitchPresentationVisit,
-  itemId?: string
-): boolean {
-  if (visit.reporter) {
-    return false
-  }
-  visit.failureItemId = itemId
-  visit.reporter =
-    itemId && (visit.presentedItems.has(itemId) || (visit.visible && visit.itemVisible?.(itemId)))
-      ? 'inline'
-      : 'clicked'
-  settleSwitchPresentation(visit)
-  return visit.reporter === 'clicked'
-}
-export function settleSwitchPresentation(visit: SwitchPresentationVisit | undefined): void {
-  if (!visit || visit.settled) {
-    return
-  }
-  visit.settled = true
-  visit.stopObserving?.()
-  visit.presentedItems.clear()
-  visit.itemVisible = undefined
-  if (!visit.mounted && !visit.reporter) {
-    visit.release()
-  }
-  visit.changed()
-}
-export function useSwitchPresentation(target: RuntimeClientTarget, id: string, visible: boolean) {
-  const key = keyFor(target, id)
-  const visit = useSyncExternalStore(
-    (listener) => subscribe(key, listener),
-    () => visits.get(key),
-    () => undefined
-  )
-  useLayoutEffect(() => {
-    if (!visit) {
-      return
-    }
-    visit.mounted = true
-    visit.visible = visible
-    visit.observeRows?.()
-
-    if (!visible) {
-      visit.release()
-    }
-    return () => {
-      visit.visible = false
-      visit.release()
-    }
-  }, [visit, visible])
-  return visit
-}
-export function useSwitchPresentationRows(root: RefObject<HTMLDivElement | null>): void {
-  const visit = useContext(SwitchPresentationContext)
-  useLayoutEffect(() => {
-    if (!visit || visit.settled) {
-      return
-    }
-    const rowVisible = (row: HTMLElement): boolean => {
-      const element = root.current
-      if (!element || !element.isConnected) {
-        return false
-      }
-      const bounds = element.getBoundingClientRect()
-      const rect = row.getBoundingClientRect()
-      return (
-        bounds.width > 0 &&
-        bounds.height > 0 &&
-        rect.height > 0 &&
-        rect.width > 0 &&
-        rect.right > Math.max(0, bounds.left) &&
-        rect.left < Math.min(window.innerWidth, bounds.right) &&
-        rect.bottom > Math.max(0, bounds.top) &&
-        rect.top < Math.min(window.innerHeight, bounds.bottom)
-      )
-    }
-    const itemVisible = (id: string): boolean => {
-      for (const row of root.current?.querySelectorAll<HTMLElement>('[data-switch-item-id]') ??
-        []) {
-        if (row.dataset.switchItemId === id) {
-          return rowVisible(row)
-        }
-      }
-      return false
-    }
-    visit.itemVisible = itemVisible
-    const observe = () => {
-      if (!visit.visible || visit.settled) {
-        return
-      }
-      for (const row of root.current?.querySelectorAll<HTMLElement>('[data-switch-item-id]') ??
-        []) {
-        const id = row.dataset.switchItemId
-        if (id && rowVisible(row)) {
-          visit.presentedItems.add(id)
-        }
-      }
-    }
-    observe()
-    const element = root.current
-    element?.addEventListener('scroll', observe, { passive: true })
-    const stop = () => {
-      element?.removeEventListener('scroll', observe)
-      if (visit.itemVisible === itemVisible) {
-        visit.itemVisible = undefined
-      }
-      if (visit.stopObserving === stop) {
-        visit.stopObserving = undefined
-      }
-      if (visit.observeRows === observe) {
-        visit.observeRows = undefined
-      }
-    }
-    visit.stopObserving = stop
-    visit.observeRows = observe
-    return () => {
-      observe()
-      stop()
-    }
-  })
-}
-export function useSwitchFailureSuppressed(itemId: string | undefined): boolean {
-  const visit = useContext(SwitchPresentationContext)
-  return useSyncExternalStore(
-    visit?.subscribe ?? (() => () => {}),
-    () => Boolean(itemId && visit?.failureItemId === itemId && visit.reporter === 'clicked'),
-    () => false
-  )
-}
diff --git a/src/renderer/src/lib/conversation-switch-projection.ts b/src/renderer/src/lib/conversation-switch-projection.ts
deleted file mode 100644
index 975c4a40c4b0..000000000000
--- a/src/renderer/src/lib/conversation-switch-projection.ts
+++ /dev/null
@@ -1,301 +0,0 @@
-import type { AppState } from '@/store'
-import type { Tab } from '../../../shared/tab-types'
-import {
-  AGENT_SESSION_SWITCH_CLIENT_MS,
-  type SessionSwitchProjection
-} from '../../../shared/agent-session-switch-execution'
-import { recordWebSessionCloseIntent } from '@/runtime/web-session-close-intent'
-import { LOCAL_STRUCTURED_SESSION_OWNER } from '@/runtime/local-structured-session-owner'
-import type { RuntimeMobileSessionTabsResult } from '../../../shared/runtime-types'
-import { createKeptWorktreeSurfacePruners } from '@/store/slices/tabs/kept-worktree-surface-pruning'
-
-type Guard = {
-  proposal: SessionSwitchProjection
-  workspaceId: string
-  tab?: Tab
-  placement: string
-  used: boolean
-  notified: boolean
-  releaseClose?: () => void
-  retain: (converged?: boolean) => void
-}
-const guards = new Map<string, Guard>()
-function placement(state: Pick<AppState, 'groupsByWorktree'>, workspaceId: string, tab?: Tab) {
-  const group = state.groupsByWorktree[workspaceId]?.find((row) => row.id === tab?.groupId)
-  return JSON.stringify([
-    tab?.id,
-    tab?.entityId,
-    tab?.groupId,
-    group?.tabOrder.indexOf(tab?.id ?? '')
-  ])
-}
-
-/** Only active handoffs own guards; ordinary tab use never waits for a host receipt. */
-export function captureSwitchProjection(
-  state: AppState,
-  workspaceId: string,
-  proposal: SessionSwitchProjection,
-  retain: (converged?: boolean) => void
-): void {
-  const provisional = [...guards.entries()].find(
-    ([, guard]) => guard.proposal.invocationId === proposal.invocationId
-  )
-  const previous = guards.get(proposal.generation) ?? provisional?.[1]
-  if (previous && provisional && provisional[0] !== proposal.generation) {
-    guards.delete(provisional[0])
-    guards.set(proposal.generation, previous)
-    previous.proposal = proposal
-  }
-  if (previous?.proposal.invocationId === proposal.invocationId) {
-    previous.retain = retain
-    if (previous.used) {
-      previous.notified = true
-      queueMicrotask(retain)
-    }
-    return
-  }
-  for (const [generation, guard] of guards) {
-    if (guard.workspaceId !== workspaceId || guard.proposal.sessionId !== proposal.sessionId) {
-      continue
-    }
-    guard.releaseClose?.()
-    guard.retain()
-    guards.delete(generation)
-  }
-  const tab = state.unifiedTabsByWorktree[workspaceId]?.find(
-    (row) =>
-      row.id === proposal.tabId ||
-      (row.contentType === 'agent-session' && row.entityId === proposal.sessionId)
-  )
-  guards.set(proposal.generation, {
-    proposal,
-    workspaceId,
-    tab,
-    placement: placement(state, workspaceId, tab),
-    used: false,
-    notified: false,
-    retain
-  })
-}
-export function noteSwitchPresentationUse(tabOrSessionId: string): void {
-  for (const guard of guards.values()) {
-    if (guard.tab?.id === tabOrSessionId || guard.proposal.sessionId === tabOrSessionId) {
-      guard.releaseClose?.()
-      guard.used = true
-      if (!guard.notified) {
-        guard.notified = true
-        queueMicrotask(guard.retain)
-      }
-    }
-  }
-}
-export function observeSwitchProjections(
-  state: AppState,
-  snapshot: RuntimeMobileSessionTabsResult,
-  retain: (proposal: SessionSwitchProjection, converged?: boolean) => void
-): void {
-  for (const proposal of snapshot.switchProjections ?? []) {
-    if (proposal.phase === 'prepare') {
-      captureSwitchProjection(state, snapshot.worktree, proposal, (converged) =>
-        retain(proposal, converged)
-      )
-    }
-    const guard = guards.get(proposal.generation)
-    if (guard) {
-      guard.proposal = proposal
-      if (proposal.phase === 'retain') {
-        guard.releaseClose?.()
-      }
-    }
-  }
-}
-
-/** A switch projection changes presentation only, never drafts, readers or provider ownership. */
-export function retireSwitchProjection(
-  state: AppState,
-  proposal: SessionSwitchProjection
-): Partial<AppState> | null {
-  const guard = guards.get(proposal.generation)
-  if (!guard || !guard.tab || guard.used) {
-    return null
-  }
-  const tab = state.unifiedTabsByWorktree[guard.workspaceId]?.find(
-    (row) => row.id === guard.tab!.id
-  )
-  if (!tab || placement(state, guard.workspaceId, tab) !== guard.placement) {
-    noteSwitchPresentationUse(proposal.sessionId)
-    return null
-  }
-  const prune = createKeptWorktreeSurfacePruners(state, {
-    worktreeIds: new Set([guard.workspaceId]),
-    unifiedTabIds: new Set([tab.id]),
-    terminalTabIds: new Set(),
-    fileIds: new Set(),
-    browserTabIds: new Set()
-  })
-  guard.releaseClose = recordWebSessionCloseIntent(
-    { environmentId: LOCAL_STRUCTURED_SESSION_OWNER },
-    guard.workspaceId,
-    `agent-session:${proposal.sessionId}`,
-    Date.now(),
-    AGENT_SESSION_SWITCH_CLIENT_MS
-  )
-  return {
-    unifiedTabsByWorktree: prune.unifiedTabs(state.unifiedTabsByWorktree),
-    groupsByWorktree: prune.groups(state.groupsByWorktree),
-    tabBarOrderByWorktree: prune.tabBarOrder(state.tabBarOrderByWorktree),
-    activeTabIdByWorktree: prune.activeTabIds(state.activeTabIdByWorktree)
-  }
-}
-
-/** Recheck inside the actual producer, including prepared patches and later omission frames. */
-export function protectSwitchProjections<
-  State extends Pick<AppState, 'unifiedTabsByWorktree' | 'groupsByWorktree'> &
-    Partial<Pick<AppState, 'activeTabIdByWorktree' | 'activeGroupIdByWorktree'>>
->(state: State, patch: Partial<State>): Partial<State> {
-  const workspaces = new Map<
-    string,
-    {
-      current: Map<string, Tab>
-      present: Set<string>
-      placements: Map<string, string>
-      restored: Tab[]
-    }
-  >()
-  for (const guard of guards.values()) {
-    const rows = patch.unifiedTabsByWorktree?.[guard.workspaceId]
-    if (!rows || !guard.tab) {
-      continue
-    }
-    let indexed = workspaces.get(guard.workspaceId)
-    if (!indexed) {
-      const currentRows = state.unifiedTabsByWorktree[guard.workspaceId] ?? []
-      const positions = new Map<string, number>()
-      const groupIds = new Set(
-        (state.groupsByWorktree[guard.workspaceId] ?? []).map((group) => group.id)
-      )
-      for (const group of state.groupsByWorktree[guard.workspaceId] ?? []) {
-        group.tabOrder.forEach((id, index) => positions.set(id, index))
-      }
-      indexed = {
-        current: new Map(currentRows.map((tab) => [tab.id, tab])),
-        present: new Set(rows.map((tab) => tab.id)),
-        placements: new Map(
-          currentRows.map((tab) => [
-            tab.id,
-            JSON.stringify([
-              tab.id,
-              tab.entityId,
-              tab.groupId,
-              positions.get(tab.id) ?? (groupIds.has(tab.groupId ?? '') ? -1 : undefined)
-            ])
-          ])
-        ),
-        restored: []
-      }
-      workspaces.set(guard.workspaceId, indexed)
-    }
-    const current = indexed.current.get(guard.tab.id)
-    if (current && indexed.placements.get(current.id) !== guard.placement) {
-      guard.releaseClose?.()
-      guard.used = true
-    }
-    const present = indexed.present.has(guard.tab.id)
-    if (
-      (guard.proposal.phase === 'retain' && present) ||
-      (guard.proposal.phase === 'retire' && !guard.used && !present)
-    ) {
-      guard.releaseClose?.()
-      guards.delete(guard.proposal.generation)
-      queueMicrotask(() => guard.retain(true))
-      continue
-    }
-    if (!guard.used || present) {
-      continue
-    }
-    if (!guard.notified) {
-      guard.notified = true
-      queueMicrotask(guard.retain)
-    }
-    const kept = current ?? guard.tab
-    indexed.restored.push(kept)
-    indexed.present.add(kept.id)
-  }
-  let next = patch
-  for (const [workspaceId, indexed] of workspaces) {
-    if (!indexed.restored.length) {
-      continue
-    }
-    const currentGroups = new Map(
-      (state.groupsByWorktree[workspaceId] ?? []).map((group) => [group.id, group])
-    )
-    const additions = new Map<string, string[]>()
-    for (const tab of indexed.restored) {
-      if (!tab.groupId) {
-        continue
-      }
-      const ids = additions.get(tab.groupId) ?? []
-      ids.push(tab.id)
-      additions.set(tab.groupId, ids)
-    }
-    const groups = (
-      patch.groupsByWorktree?.[workspaceId] ??
-      state.groupsByWorktree[workspaceId] ??
-      []
-    ).map((group) => {
-      const ids = additions.get(group.id)
-      additions.delete(group.id)
-      if (!ids) {
-        return group
-      }
-      const present = new Set(group.tabOrder)
-      return { ...group, tabOrder: [...group.tabOrder, ...ids.filter((id) => !present.has(id))] }
-    })
-    for (const id of additions.keys()) {
-      const group = currentGroups.get(id)
-      if (group) {
-        groups.push(group)
-      }
-    }
-    next = {
-      ...next,
-      unifiedTabsByWorktree: {
-        ...(next.unifiedTabsByWorktree ?? state.unifiedTabsByWorktree),
-        [workspaceId]: [...(patch.unifiedTabsByWorktree?.[workspaceId] ?? []), ...indexed.restored]
-      },
-      groupsByWorktree: {
-        ...(next.groupsByWorktree ?? state.groupsByWorktree),
-        [workspaceId]: groups
-      },
-      ...(indexed.restored.some((tab) => state.activeTabIdByWorktree?.[workspaceId] === tab.id)
-        ? {
-            activeTabIdByWorktree: {
-              ...next.activeTabIdByWorktree,
-              ...state.activeTabIdByWorktree
-            },
-            activeGroupIdByWorktree: {
-              ...next.activeGroupIdByWorktree,
-              ...state.activeGroupIdByWorktree
-            }
-          }
-        : {})
-    }
-  }
-  return next
-}
-
-/** Teardown retains unresolved sources before releasing this view's transient protection. */
-export function disposeSwitchProjections(): void {
-  for (const guard of guards.values()) {
-    guard.releaseClose?.()
-    guard.retain()
-  }
-  guards.clear()
-}
-
-export function releaseUnsentSwitchProjection(invocationId: string): void {
-  const guard = guards.get(invocationId)
-  if (guard?.proposal.invocationId === invocationId) {
-    guards.delete(invocationId)
-  }
-}
diff --git a/src/renderer/src/lib/conversation-switch-result-selection.ts b/src/renderer/src/lib/conversation-switch-result-selection.ts
deleted file mode 100644
index b903d3eb1f8f..000000000000
--- a/src/renderer/src/lib/conversation-switch-result-selection.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import type { AgentSessionSwitchResult } from '../../../shared/agent-session-switch-execution'
-import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
-import { toWebTerminalSurfaceTabId } from '../../../shared/terminal-surface-id'
-import { refreshWebRuntimeSessionTabsSnapshot } from '@/runtime/web-runtime-session-snapshot'
-import {
-  activateStructuredAgentSessionById,
-  findStructuredAgentSessionTab
-} from './agent-session/structured-agent-session-tab-activation'
-import { useAppStore } from '@/store'
-import { presentAgentLaunchTab } from './agent-launch-tab-presentation'
-import { conversationSwitchViewerSelectionCurrent } from './conversation-switch-selection'
-import type { ConversationSwitch } from './conversation-switch-state'
-
-/** The owning host published membership; this caller alone may move its viewer. */
-export async function presentConversationSwitchResult(
-  args: ConversationSwitch,
-  target: Extract<RuntimeClientTarget, { kind: 'environment' }>,
-  result: Extract<AgentSessionSwitchResult, { status: 'completed' }>,
-  viewerSelection: string
-): Promise<void> {
-  const workspaceId =
-    (args.direction === 'chat'
-      ? findStructuredAgentSessionTab(useAppStore.getState().unifiedTabsByWorktree, {
-          sessionId: result.sessionId,
-          target
-        })?.worktreeId
-      : undefined) ?? args.workspaceId
-  await refreshWebRuntimeSessionTabsSnapshot(target.environmentId, workspaceId, {
-    acceptCurrentSnapshot: true,
-    afterCurrentInFlight: true
-  }).catch(() => {})
-  if (!conversationSwitchViewerSelectionCurrent(viewerSelection)) {
-    return
-  }
-  if (args.direction === 'chat') {
-    activateStructuredAgentSessionById({
-      worktreeId: workspaceId,
-      sessionId: result.sessionId,
-      target,
-      callerOnly: true,
-      viewerSelection
-    })
-  } else if (result.terminal) {
-    presentAgentLaunchTab(
-      'focus-window',
-      args.workspaceId,
-      toWebTerminalSurfaceTabId(result.terminal),
-      undefined,
-      viewerSelection
-    )
-  }
-}
diff --git a/src/renderer/src/lib/conversation-switch-selection.ts b/src/renderer/src/lib/conversation-switch-selection.ts
deleted file mode 100644
index 14b04076fcae..000000000000
--- a/src/renderer/src/lib/conversation-switch-selection.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { isSessionTabSelectionRequest } from '../../../shared/session-tab-placement'
-import { viewerSelectionOutcome } from './viewer-selection-request'
-import { structuredAgentSessionDomainFingerprint } from '../../../shared/structured-agent-session-mutation'
-import { useAppStore } from '@/store'
-import { resolveWebSessionVisibleTabId } from '@/runtime/web-session-focus-intent'
-
-/** Presentation freshness only; the execution host retains all process authority. */
-type ViewerState = Parameters<typeof resolveWebSessionVisibleTabId>[0] &
-  Partial<
-    Pick<
-      ReturnType<typeof useAppStore.getState>,
-      | 'activeWorkspaceExecutionHostId'
-      | 'activeView'
-      | 'worktreeNavHistory'
-      | 'worktreeNavHistoryIndex'
-    >
-  >
-
-export function captureConversationSwitchViewerSelection(
-  state: ViewerState = useAppStore.getState()
-): string {
-  const workspaceId = state.activeWorktreeId ?? ''
-  return structuredAgentSessionDomainFingerprint({
-    domain: 'conversation-switch-viewer',
-    sessionId: workspaceId,
-    fields: {
-      workspaceId: state.activeWorktreeId,
-      executionHostId: state.activeWorkspaceExecutionHostId,
-      view: state.activeView,
-      history: state.worktreeNavHistory,
-      historyIndex: state.worktreeNavHistoryIndex,
-      groupId: state.activeGroupIdByWorktree?.[workspaceId],
-      tabId: resolveWebSessionVisibleTabId(state, workspaceId)
-    }
-  })
-}
-
-export function conversationSwitchViewerSelectionCurrent(
-  selection?: string,
-  state?: ViewerState
-): boolean {
-  return (
-    selection === undefined ||
-    (isSessionTabSelectionRequest(selection)
-      ? viewerSelectionOutcome(selection) === 'pending'
-      : selection === captureConversationSwitchViewerSelection(state))
-  )
-}
diff --git a/src/renderer/src/lib/conversation-switch-state.ts b/src/renderer/src/lib/conversation-switch-state.ts
index 8c2fe57e2cb5..6f3ed9d37e3f 100644
--- a/src/renderer/src/lib/conversation-switch-state.ts
+++ b/src/renderer/src/lib/conversation-switch-state.ts
@@ -1,6 +1,6 @@
 import { resolveWorktreeExecutionHostPlatform } from './execution-host-facts'
 import { translate } from '@/i18n/i18n'
-import { useSyncExternalStore } from 'react'
+import { useEffect, useState, useSyncExternalStore } from 'react'
 import { useAppStore } from '@/store'
 import type { ConfirmationDialogContextValue } from '@/components/confirmation-dialog-context'
 import { getStructuredAgentSessionStatusFeed } from '@/runtime/structured-agent-session-status-feed'
@@ -9,10 +9,6 @@ import { runningStructuredAgentSessionTurnId } from '../../../shared/structured-
 import { useInPlaceSwitchCapability } from './in-place-switch-support'
 import { structuredAgentSessionTargetForHost } from '@/runtime/structured-agent-session-owner'
 import { refreshLocalStructuredSessionWorktreeTabs } from '@/runtime/local-structured-session-tabs-sync/inventory-refresh'
-import {
-  captureConversationSwitchViewerSelection,
-  conversationSwitchViewerSelectionCurrent
-} from './conversation-switch-selection'
 import {
   pendingNativeChatCliSwitches as pending,
   pendingCliChatResumes,
@@ -22,7 +18,7 @@ import type { AiVaultSession, AiVaultAgent } from '../../../shared/ai-vault-type
 import type { CliChatResumeSource } from '@/components/tab-bar/cli-chat-resume-source'
 
 export type ConversationSwitch = {
-  legacyContinue?: (viewerSelection: string) => Promise<void>
+  legacyContinue?: () => Promise<void>
   confirm?: ConfirmationDialogContextValue
   direction: 'chat' | 'terminal'
   executionHostId: string
@@ -71,6 +67,20 @@ export function useConversationSwitchPending(args: ConversationSwitch | null): b
   )
 }
 
+/** Controls bind disabled at once; the visible working state waits so a fast local switch stays clean. */
+export function useConversationSwitchBusy(pending: boolean, delayMs = 200): boolean {
+  const [busy, setBusy] = useState(false)
+  useEffect(() => {
+    if (!pending) {
+      setBusy(false)
+      return
+    }
+    const timer = setTimeout(() => setBusy(true), delayMs)
+    return () => clearTimeout(timer)
+  }, [pending, delayMs])
+  return pending && busy
+}
+
 /** Live facts choose consent only; never open a reader to classify saved work. */
 export function conversationSwitchReplying(args: ConversationSwitch): boolean {
   const state = useAppStore.getState()
@@ -113,12 +123,6 @@ export function useConversationSwitchReadiness(args: ConversationSwitch | null)
   }
 }
 
-export function captureConversationSwitchSelection(
-  selection = captureConversationSwitchViewerSelection()
-): () => boolean {
-  return () => conversationSwitchViewerSelectionCurrent(selection)
-}
-
 export function rederiveConversationSwitch(args: ConversationSwitch): void {
   const target = structuredAgentSessionTargetForHost(args.executionHostId)
   if (!target) {
diff --git a/src/renderer/src/lib/launch-ai-vault-session-and-reveal.ts b/src/renderer/src/lib/launch-ai-vault-session-and-reveal.ts
index 24ea69d5137a..d94482957edc 100644
--- a/src/renderer/src/lib/launch-ai-vault-session-and-reveal.ts
+++ b/src/renderer/src/lib/launch-ai-vault-session-and-reveal.ts
@@ -26,10 +26,7 @@ export async function launchAiVaultSessionAndReveal(
       return
     }
   }
-  if (
-    args.viewerSelection === undefined &&
-    useAppStore.getState().activeWorktreeId !== args.worktreeId
-  ) {
+  if (useAppStore.getState().activeWorktreeId !== args.worktreeId) {
     activateAiVaultResumeWorkspace(args.worktreeId)
   }
   if (queuedMessage === undefined) {
diff --git a/src/renderer/src/lib/launch-ai-vault-session-placement.test.ts b/src/renderer/src/lib/launch-ai-vault-session-placement.test.ts
deleted file mode 100644
index c9dbd82dd152..000000000000
--- a/src/renderer/src/lib/launch-ai-vault-session-placement.test.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-// @vitest-environment happy-dom
-import { agentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
-import {
-  beginViewerSelectionRequest,
-  disposeViewerSelection,
-  viewerSelectionOutcome
-} from './viewer-selection-request'
-import { activateTabNumberShortcut } from './tab-number-shortcuts'
-import { expect, it, vi } from 'vitest'
-import type { Tab } from '../../../shared/tab-types'
-import { createTestStore } from '@/store/slices/store-test-helpers'
-import { createTabsSliceMockApi } from '@/store/slices/tabs-slice-test-harness'
-import { launchAiVaultSessionInNewTab } from './launch-ai-vault-session'
-
-const mocks = vi.hoisted(() => {
-  const held: { store: unknown } = { store: null }
-  return held
-})
-vi.mock('@/store', () => ({
-  get useAppStore() {
-    return mocks.store
-  }
-}))
-vi.mock('@/lib/worktree-runtime-owner', () => ({
-  runtimeEnvironmentIdOrLocalUnlessTwin: () => null
-}))
-vi.mock('@/runtime/structured-agent-session-tab-retirement', () => ({
-  beginStructuredAgentSessionTabClose: vi.fn()
-}))
-vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } }))
-
-createTabsSliceMockApi()
-
-it('keeps the pinned partition and neighbor order after a local switch retires its source', () => {
-  const worktreeId = 'repo1::/work/app'
-  const groupId = 'group-1'
-  const tab = (id: string, extra: Partial<Tab> = {}): Tab => ({
-    id,
-    entityId: id,
-    groupId,
-    worktreeId,
-    contentType: 'browser',
-    label: id,
-    customLabel: null,
-    color: null,
-    sortOrder: 0,
-    createdAt: 1,
-    ...extra
-  })
-  const source = tab('agent-session:chat', {
-    entityId: 'chat',
-    contentType: 'agent-session',
-    agentSessionAgent: 'codex',
-    executionHostId: 'local',
-    isPinned: true
-  })
-  const store = createTestStore()
-  mocks.store = store
-  store.setState({
-    unifiedTabsByWorktree: {
-      [worktreeId]: [source, tab('pinned', { isPinned: true }), tab('unpinned')]
-    },
-    groupsByWorktree: {
-      [worktreeId]: [
-        {
-          id: groupId,
-          worktreeId,
-          activeTabId: source.id,
-          tabOrder: [source.id, 'pinned', 'unpinned']
-        }
-      ]
-    },
-    activeGroupIdByWorktree: { [worktreeId]: groupId },
-    layoutByWorktree: { [worktreeId]: { type: 'leaf', groupId } }
-  })
-
-  const result = launchAiVaultSessionInNewTab({
-    agent: 'codex',
-    worktreeId,
-    command: 'codex resume provider-1',
-    afterTabId: source.id,
-    resumeOrigin: 'switch'
-  })
-  expect(result.tabId).toEqual(expect.any(String))
-  store.getState().closeUnifiedTab(source.id)
-
-  expect(store.getState().groupsByWorktree[worktreeId]?.[0]?.tabOrder).toEqual([
-    'pinned',
-    result.tabId,
-    'unpinned'
-  ])
-  expect(store.getState().unifiedTabsByWorktree[worktreeId]?.some((t) => t.id === source.id)).toBe(
-    false
-  )
-})
-
-it.each([false, true])(
-  'old Continue ordinary create consumes the original selection, newer reclick=%s',
-  (navigate) => {
-    const store = createTestStore()
-    mocks.store = store
-    const worktreeId = 'repo1::/work/app'
-    store.setState({ activeWorktreeId: worktreeId, activeView: 'terminal' })
-    const source = store.getState().createTab(worktreeId)
-    const deadline = agentSessionSwitchDeadline(Date.now)
-    try {
-      const selection = beginViewerSelectionRequest('old-continue', deadline)
-      selection.accept()
-      if (navigate) {
-        expect(activateTabNumberShortcut(0)).toBe(true)
-      }
-      const result = launchAiVaultSessionInNewTab({
-        agent: 'codex',
-        worktreeId,
-        command: 'codex resume copied-conversation',
-        viewerSelection: selection.token
-      })
-      expect(result.tabId).not.toBeNull()
-      expect(store.getState().tabsByWorktree[worktreeId]).toHaveLength(2)
-      expect(store.getState().getActiveTab(worktreeId)?.entityId).toBe(
-        navigate ? source.id : result.tabId
-      )
-      expect(viewerSelectionOutcome(selection.token)).toBe(navigate ? 'superseded' : 'fulfilled')
-      expect(store.getState().pendingStartupByTabId[result.tabId ?? '']?.command).toBe(
-        'codex resume copied-conversation'
-      )
-    } finally {
-      deadline.dispose()
-      disposeViewerSelection()
-    }
-  }
-)
diff --git a/src/renderer/src/lib/launch-ai-vault-session.ts b/src/renderer/src/lib/launch-ai-vault-session.ts
index 31d68483d207..3f4200cdb66c 100644
--- a/src/renderer/src/lib/launch-ai-vault-session.ts
+++ b/src/renderer/src/lib/launch-ai-vault-session.ts
@@ -1,5 +1,3 @@
-import { conversationSwitchViewerSelectionCurrent } from './conversation-switch-selection'
-import { presentAgentLaunchTab } from './agent-launch-tab-presentation'
 import { useAppStore } from '@/store'
 import { persistAgentLaunchTabOrder } from '@/lib/launch-agent-tab-order'
 import { insertUnifiedTabAfterAnchor } from '@/lib/unified-tab-anchor-insertion'
@@ -34,16 +32,8 @@ export function launchAiVaultSessionInNewTab(args: {
   afterTabId?: string
   /** A chat's switch, whose ordinary spawn admits the resume; set only for a capable host. */
   resumeOrigin?: 'switch'
-  viewerSelection?: string
-  canActivate?: () => boolean
 }): LaunchAiVaultSessionInNewTabResult {
   const store = useAppStore.getState()
-  const canActivate =
-    args.viewerSelection === undefined
-      ? args.canActivate
-      : () =>
-          conversationSwitchViewerSelectionCurrent(args.viewerSelection) &&
-          args.canActivate?.() !== false
   const slot = args.afterTabId
     ? store.unifiedTabsByWorktree[args.worktreeId]?.find((tab) => tab.id === args.afterTabId)
     : undefined
@@ -79,17 +69,11 @@ export function launchAiVaultSessionInNewTab(args: {
         ...(args.launchConfig ? { agentArgs: args.launchConfig.agentArgs } : {}),
         activate: true
       },
-      {
-        notifyFailure: false,
-        ...(canActivate ? { canActivate } : {}),
-        ...(args.viewerSelection ? { viewerSelection: args.viewerSelection } : {})
-      }
+      { notifyFailure: false }
     )
     const observedRuntimeLaunch = runtimeLaunch.then((outcome) => {
       if (outcome.status === 'created') {
-        if (canActivate?.() !== false && args.viewerSelection === undefined) {
-          useAppStore.getState().setActiveTabType('terminal', args.worktreeId)
-        }
+        useAppStore.getState().setActiveTabType('terminal', args.worktreeId)
       } else if (splitGroupId) {
         // A refused or failed drop must not leave a blank pane behind.
         useAppStore.getState().closeEmptyGroup(args.worktreeId, splitGroupId)
@@ -99,10 +83,8 @@ export function launchAiVaultSessionInNewTab(args: {
     return { tabId: null, runtimeLaunch: observedRuntimeLaunch }
   }
 
-  const activate = canActivate?.() !== false && args.viewerSelection === undefined
   const tab = store.createTab(args.worktreeId, sourceGroupId, undefined, {
     ...(split ? { split } : {}),
-    ...(activate ? {} : { activate: false, recordInteraction: false }),
     ...(args.cwd ? { startupCwd: args.cwd } : {}),
     pendingStartup: {
       command: args.command,
@@ -118,17 +100,12 @@ export function launchAiVaultSessionInNewTab(args: {
       }
     }
   })
-  if (activate) {
-    store.setActiveTabType('terminal', args.worktreeId)
-  }
+  store.setActiveTabType('terminal', args.worktreeId)
 
   persistAgentLaunchTabOrder(args.worktreeId, tab.id)
   if (slot && !split && (!args.targetGroupId || args.targetGroupId === slot.groupId)) {
     insertUnifiedTabAfterAnchor(args.worktreeId, tab.id, slot.id)
   }
 
-  if (args.viewerSelection) {
-    presentAgentLaunchTab('focus-window', args.worktreeId, tab.id, undefined, args.viewerSelection)
-  }
   return { tabId: tab.id }
 }
diff --git a/src/renderer/src/lib/open-existing-structured-session.ts b/src/renderer/src/lib/open-existing-structured-session.ts
index 94adc3662dc6..71f70935b0e7 100644
--- a/src/renderer/src/lib/open-existing-structured-session.ts
+++ b/src/renderer/src/lib/open-existing-structured-session.ts
@@ -9,9 +9,6 @@ import { refreshLocalStructuredSessionWorktreeTabs } from '@/runtime/local-struc
 import { STRUCTURED_AGENT_SESSION_REVEAL_RUNTIME_CAPABILITY } from '../../../shared/protocol-version'
 import { isRuntimeCompatBlockError } from '@/runtime/runtime-protocol-compat'
 import { executionHostIdForStructuredTarget } from '@/runtime/structured-agent-session-owner'
-import { isSessionTabSelectionRequest } from '../../../shared/session-tab-placement'
-import { viewerSelectionOutcome } from './viewer-selection-request'
-import { conversationSwitchViewerSelectionCurrent } from './conversation-switch-selection'
 
 type StructuredSessionIdentity = { workspaceId: string; sessionId: string }
 
@@ -34,12 +31,7 @@ export type StructuredSessionOpenDeps = {
   }) => Promise<StructuredSessionRevealOutcome>
 }
 
-export type StructuredSessionOpenOutcome =
-  | 'activated'
-  | 'gone'
-  | 'host-cannot-open'
-  | 'unavailable'
-  | 'none'
+export type StructuredSessionOpenOutcome = 'activated' | 'gone' | 'host-cannot-open' | 'unavailable'
 
 const defaultDeps: StructuredSessionOpenDeps = {
   activate: activateStructuredAgentSessionById,
@@ -55,24 +47,23 @@ export async function openExistingStructuredSession(
   options: {
     target?: RuntimeClientTarget
     deps?: StructuredSessionOpenDeps
-    viewerSelection?: string
     present: (outcome: StructuredSessionOpenOutcome) => void
     onError?: () => void
   }
 ): Promise<StructuredSessionOpenOutcome> {
-  const { target, deps = defaultDeps, present, viewerSelection } = options
+  const { target, deps = defaultDeps, present } = options
   const hostKey = executionHostIdForStructuredTarget(
     target ??
       runtimeTargetForOwnerEnvironment(
         runtimeEnvironmentIdOrLocalUnlessTwin(useAppStore.getState(), structured.workspaceId)
       )
   )
-  const key = `${hostKey}\0${structured.workspaceId}\0${structured.sessionId}\0${viewerSelection ?? ''}`
+  const key = `${hostKey}\0${structured.workspaceId}\0${structured.sessionId}`
   const inFlight = activationsInFlight.get(key)
   if (inFlight) {
     return inFlight
   }
-  const activation = activateStructuredSession(structured, deps, target, viewerSelection).then(
+  const activation = activateStructuredSession(structured, deps, target).then(
     (outcome) => {
       present(outcome)
       return outcome
@@ -93,51 +84,28 @@ export async function openExistingStructuredSession(
 async function activateStructuredSession(
   structured: StructuredSessionIdentity,
   deps: StructuredSessionOpenDeps,
-  host?: RuntimeClientTarget,
-  viewerSelection?: string
+  host?: RuntimeClientTarget
 ): Promise<StructuredSessionOpenOutcome> {
   const target = {
     worktreeId: structured.workspaceId,
     sessionId: structured.sessionId,
     ...(host ? { target: host } : {})
   }
-  const modern = viewerSelection !== undefined && isSessionTabSelectionRequest(viewerSelection)
-  const activate = () => {
-    if (modern && viewerSelectionOutcome(viewerSelection) === 'fulfilled') {
-      return true
-    }
-    return (
-      conversationSwitchViewerSelectionCurrent(viewerSelection) &&
-      deps.activate({
-        ...target,
-        ...(modern ? { viewerSelection, callerOnly: true } : {})
-      })
-    )
-  }
-  if (!activate()) {
+  if (!deps.activate(target)) {
     // Refresh can avoid reveal, but failure must fall through: host republication is the actual repair.
     const refreshed = await refreshedWithoutThrowing(deps, structured.workspaceId, host)
-    if (!refreshed || !activate()) {
-      if (!conversationSwitchViewerSelectionCurrent(viewerSelection)) {
-        return 'none'
-      }
+    if (!refreshed || !deps.activate(target)) {
       // Ask the host to republish a closed or unpublished tab from its persisted record.
       const revealed = await deps.reveal(target)
       if (revealed !== 'revealed') {
         return revealed === 'unreachable' ? 'unavailable' : revealed
       }
       await refreshedWithoutThrowing(deps, structured.workspaceId, host)
-      if (!activate()) {
-        if (!conversationSwitchViewerSelectionCurrent(viewerSelection)) {
-          return 'none'
-        }
+      if (!deps.activate(target)) {
         return 'unavailable'
       }
     }
   }
-  if (modern) {
-    return viewerSelectionOutcome(viewerSelection) === 'fulfilled' ? 'activated' : 'none'
-  }
   return 'activated'
 }
 
diff --git a/src/renderer/src/lib/pane-manager/client-hosted-browser-row-state.ts b/src/renderer/src/lib/pane-manager/client-hosted-browser-row-state.ts
index 49366e479ea9..4dfbf14f8a5b 100644
--- a/src/renderer/src/lib/pane-manager/client-hosted-browser-row-state.ts
+++ b/src/renderer/src/lib/pane-manager/client-hosted-browser-row-state.ts
@@ -1,4 +1,3 @@
-import { noteViewerNavigation } from '../viewer-selection-request'
 import { useCallback, useSyncExternalStore } from 'react'
 import type {
   ClientHostedBrowserRow,
@@ -92,7 +91,6 @@ export function useClientHostedBrowserRows(worktreeId: string): readonly ClientH
 }
 
 export function selectClientHostedBrowserRow(next: ClientHostedBrowserRowSelection): void {
-  noteViewerNavigation()
   selection = next
   notifyChange()
 }
diff --git a/src/renderer/src/lib/session-tab-open-placement-order.ts b/src/renderer/src/lib/session-tab-open-placement-order.ts
deleted file mode 100644
index 2fa50d711c05..000000000000
--- a/src/renderer/src/lib/session-tab-open-placement-order.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import type { SessionTabOpenPlacement } from '../../../shared/session-tab-placement'
-import type { Tab } from '../../../shared/tab-types'
-import {
-  insertTabIdIntoOrder,
-  partitionPinnedTabOrder
-} from '../../../shared/workspace-layout/tab-order'
-
-/** Explicit fallback index retains information absent from a coalesced inventory's neighbours. */
-export function insertOpenPlacementTab(
-  order: readonly string[],
-  tabs: readonly Tab[],
-  tabId: string,
-  placement: SessionTabOpenPlacement['placement']
-): string[] {
-  const tab = tabs.find((row) => row.id === tabId)
-  const without = order.filter((id) => id !== tabId)
-  if (placement.afterTabId && without.includes(placement.afterTabId)) {
-    return insertTabIdIntoOrder(without, tabs, tabId, tab?.isPinned === true, placement.afterTabId)
-  }
-  if (placement.index !== undefined) {
-    const index = Math.max(0, Math.min(Math.trunc(placement.index), without.length))
-    return index === 0
-      ? partitionPinnedTabOrder([...without], tabs, tabId)
-      : insertTabIdIntoOrder(without, tabs, tabId, tab?.isPinned === true, without[index - 1])
-  }
-  return insertTabIdIntoOrder(without, tabs, tabId, tab?.isPinned === true)
-}
diff --git a/src/renderer/src/lib/simulator-tab-palette-activation.ts b/src/renderer/src/lib/simulator-tab-palette-activation.ts
index fc3c0161dbb7..84e1294c4fc9 100644
--- a/src/renderer/src/lib/simulator-tab-palette-activation.ts
+++ b/src/renderer/src/lib/simulator-tab-palette-activation.ts
@@ -1,4 +1,3 @@
-import { noteViewerNavigation } from './viewer-selection-request'
 import { useAppStore } from '@/store'
 import type { ExecutionHostId } from '../../../shared/execution-host'
 import { activateAndRevealWorkspace } from './worktree-activation'
@@ -59,7 +58,6 @@ export function activateSimulatorTabPaletteResult({
   }
 
   const state = useAppStore.getState()
-  noteViewerNavigation()
   state.focusGroup(worktreeId, tab.groupId)
   state.activateTab(tab.id, { worktreeId })
   state.setActiveTab(tab.id)
diff --git a/src/renderer/src/lib/structured-agent-session-launch-surface.ts b/src/renderer/src/lib/structured-agent-session-launch-surface.ts
index 7687f1f88287..416637fcf1b4 100644
--- a/src/renderer/src/lib/structured-agent-session-launch-surface.ts
+++ b/src/renderer/src/lib/structured-agent-session-launch-surface.ts
@@ -1,4 +1,3 @@
-import { selectSessionTabForViewer } from '@/runtime/web-session-tabs-sync/store-patch'
 import {
   findIndexedProjectGroupOwner,
   findIndexedRepoOwner,
@@ -155,20 +154,14 @@ export function openStructuredAgentSessionProvisionalTab(args: {
   /** The tab the chat opens right after, in that tab's group. */
   afterTabId?: string
   activate?: boolean
-  viewerSelection?: string
-  canActivate?: () => boolean
 }): OpenedAgentSessionTab {
   const state = useAppStore.getState()
   const existing = findStructuredLaunchTab(args)
   if (existing) {
-    if (args.activate !== false && args.canActivate?.() !== false) {
-      if (args.viewerSelection) {
-        selectSessionTabForViewer(args.worktreeId, existing.id, args.viewerSelection)
-      } else {
-        state.focusGroup(args.worktreeId, existing.groupId)
-        state.activateTab(existing.id, { worktreeId: args.worktreeId })
-        state.setActiveTabType('agent-session', args.worktreeId)
-      }
+    if (args.activate !== false) {
+      state.focusGroup(args.worktreeId, existing.groupId)
+      state.activateTab(existing.id, { worktreeId: args.worktreeId })
+      state.setActiveTabType('agent-session', args.worktreeId)
     }
     return existing
   }
@@ -183,7 +176,6 @@ export function openStructuredAgentSessionProvisionalTab(args: {
     group?.id ??
     (address?.worktreeId === args.worktreeId ? address.targetGroupId : args.targetGroupId)
   const drawHere = (): Tab => {
-    const activate = args.activate !== false && args.canActivate?.() !== false
     const tab = state.createUnifiedTab(args.worktreeId, 'agent-session', {
       id: tabId,
       entityId: args.sessionId,
@@ -192,13 +184,11 @@ export function openStructuredAgentSessionProvisionalTab(args: {
       label: defaultAgentChatLabel(args.agent),
       targetGroupId,
       ...(args.afterTabId ? { afterTabId: args.afterTabId } : {}),
-      activate: activate && args.viewerSelection === undefined
+      activate: args.activate !== false
     })
     const target = structuredAgentSessionTargetForHost(args.executionHostId)
     holdFrameDrawnProvisionalChatTab(target, args.worktreeId, tab.id)
-    if (activate && args.viewerSelection) {
-      selectSessionTabForViewer(args.worktreeId, tab.id, args.viewerSelection)
-    } else if (activate) {
+    if (args.activate !== false) {
       state.setActiveTabType('agent-session', args.worktreeId)
     }
     return tab
@@ -216,8 +206,6 @@ export function openStructuredAgentSessionProvisionalTab(args: {
           ? { afterTabId: args.afterTabId }
           : slotAnchor(address, args.worktreeId)),
         activate: args.activate !== false,
-        viewerSelection: args.viewerSelection,
-        canActivate: args.canActivate,
         drawHere
       })
     : null
diff --git a/src/renderer/src/lib/structured-agent-session-tab-open-through-layout-owner.ts b/src/renderer/src/lib/structured-agent-session-tab-open-through-layout-owner.ts
index 4d0a7ef4cfb7..0375143af756 100644
--- a/src/renderer/src/lib/structured-agent-session-tab-open-through-layout-owner.ts
+++ b/src/renderer/src/lib/structured-agent-session-tab-open-through-layout-owner.ts
@@ -1,4 +1,3 @@
-import { selectSessionTabForViewer } from '@/runtime/web-session-tabs-sync/store-patch'
 // Send open with the chat’s own tab ID, select only after main draws it, and use afterPendingTab before reading the returned tab from store.
 
 import type { ExecutionHostId } from '../../../shared/execution-host'
@@ -19,8 +18,6 @@ export type AgentSessionTabOpen = {
   targetGroupId?: string
   afterTabId?: string
   activate: boolean
-  viewerSelection?: string
-  canActivate?: () => boolean
   /** Today's draw, for a twin main may route to a paired server. */
   drawHere: () => Tab
 }
@@ -55,11 +52,7 @@ export function openAgentSessionTabThroughLayoutOwner(
     command: { type: 'openAgentSessionTab', tabId, sessionId, agent: open.agent, ...placement },
     facts: { label },
     shown: (shownId) => {
-      if (!open.activate || open.canActivate?.() === false) {
-        return
-      }
-      if (open.viewerSelection) {
-        selectSessionTabForViewer(worktreeId, shownId, open.viewerSelection)
+      if (!open.activate) {
         return
       }
       // As the window's own open: the chat is selected in its group; the focused group stays.
diff --git a/src/renderer/src/lib/tab-number-shortcuts.ts b/src/renderer/src/lib/tab-number-shortcuts.ts
index b9ba6c783ac5..d28334741fb5 100644
--- a/src/renderer/src/lib/tab-number-shortcuts.ts
+++ b/src/renderer/src/lib/tab-number-shortcuts.ts
@@ -1,4 +1,3 @@
-import { noteViewerNavigation } from './viewer-selection-request'
 import { focusTerminalTabSurface } from '@/lib/focus-terminal-tab-surface'
 import { useAppStore } from '@/store'
 import type { AppState } from '@/store/types'
@@ -58,7 +57,6 @@ export function activateTabNumberShortcut(index: number): boolean {
     return false
   }
 
-  noteViewerNavigation()
   const worktreeId = target.worktreeId
   const runtimeEnvironmentId = runtimeEnvironmentIdOrLocalUnlessTwin(store, worktreeId)
   store.focusGroup(worktreeId, target.groupId)
diff --git a/src/renderer/src/lib/viewer-selection-request.ts b/src/renderer/src/lib/viewer-selection-request.ts
deleted file mode 100644
index 43cc15d9f991..000000000000
--- a/src/renderer/src/lib/viewer-selection-request.ts
+++ /dev/null
@@ -1,154 +0,0 @@
-import { isSessionTabSelectionRequest } from '../../../shared/session-tab-placement'
-import type { AgentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
-import { createBrowserUuid } from './browser-uuid'
-
-type Destination = { worktreeId: string; tabId: string }
-type Request = {
-  token: string
-  order: number
-  revision: number
-  deadline: Pick<AgentSessionSwitchDeadline, 'check'>
-  outcome: 'pending' | 'fulfilled' | 'superseded'
-  destination?: Destination
-}
-
-let lifetime = createBrowserUuid()
-let navigationRevision = 0
-let actionOrder = 0
-let acceptedOrder = 0
-let current: Request | undefined
-
-/** Explicit navigation only; automatic layout repair/publication never calls this ingress. */
-export function noteViewerNavigation(): void {
-  navigationRevision += 1
-  if (current) {
-    current.outcome = 'superseded'
-  }
-}
-
-/** Capture before preparation/consent; accepting an older dialog cannot replace a newer action. */
-export function beginViewerSelectionRequest(
-  invocationId: string,
-  deadline: Pick<AgentSessionSwitchDeadline, 'check'>
-) {
-  const candidate: Request = {
-    token: `selection-v1:${lifetime}:${invocationId}:${++actionOrder}`,
-    order: actionOrder,
-    revision: navigationRevision,
-    deadline,
-    outcome: 'pending'
-  }
-  return {
-    token: candidate.token,
-    accept: () => {
-      if (candidate.order <= acceptedOrder) {
-        candidate.outcome = 'superseded'
-        return
-      }
-      acceptedOrder = candidate.order
-      if (current) {
-        current.outcome = 'superseded'
-      }
-      current = candidate
-      if (candidate.revision !== navigationRevision) {
-        candidate.outcome = 'superseded'
-      }
-    },
-    discard: () => {
-      candidate.outcome = 'superseded'
-    }
-  }
-}
-
-export function viewerSelectionOutcome(token: string): 'pending' | 'fulfilled' | 'superseded' {
-  if (!isSessionTabSelectionRequest(token) || current?.token !== token) {
-    return 'superseded'
-  }
-  if (current.outcome === 'pending') {
-    try {
-      current.deadline.check()
-    } catch {
-      current.outcome = 'superseded'
-    }
-    if (current.revision !== navigationRevision) {
-      current.outcome = 'superseded'
-    }
-  }
-  return current.outcome
-}
-
-/** Called inside the accepted ordinary writer after resolving membership, before its subscribers. */
-export function commitViewerSelection(
-  token: string,
-  destination: Destination,
-  apply: () => boolean
-): boolean {
-  if (viewerSelectionOutcome(token) !== 'pending' || !current) {
-    return false
-  }
-  const request = current
-  if (
-    request.destination &&
-    (request.destination.worktreeId !== destination.worktreeId ||
-      request.destination.tabId !== destination.tabId)
-  ) {
-    return false
-  }
-  request.destination = destination
-  request.outcome = 'fulfilled'
-  try {
-    if (apply()) {
-      return true
-    }
-  } catch (error) {
-    if (current === request) {
-      request.outcome = 'pending'
-    }
-    throw error
-  }
-  // Missing membership is not success; no state was applied.
-  if (current === request && request.outcome === 'fulfilled') {
-    request.outcome = 'pending'
-  }
-  return false
-}
-
-/** The ordinary publication owner knows the destination before it can be drawn. */
-export function bindViewerSelectionDestination(
-  token: string | undefined,
-  destination: Destination
-): void {
-  if (token && viewerSelectionOutcome(token) === 'pending' && current) {
-    current.destination ??= destination
-  }
-}
-
-/** A definite close/withdrawal cannot leave an undrawn destination's selection armed. */
-export function endViewerSelectionForDestination(worktreeId: string, tabId: string): void {
-  if (current?.destination?.worktreeId === worktreeId && current.destination.tabId === tabId) {
-    current.outcome = 'superseded'
-  }
-}
-
-/** Pointer focus on another pane is navigation; typing/copying in the current pane is not. */
-export function noteViewerGroupNavigation(
-  state: {
-    activeWorktreeId: string | null
-    activeGroupIdByWorktree: Record<string, string | undefined>
-  },
-  worktreeId: string,
-  groupId: string
-): void {
-  if (
-    state.activeWorktreeId !== worktreeId ||
-    state.activeGroupIdByWorktree[worktreeId] !== groupId
-  ) {
-    noteViewerNavigation()
-  }
-}
-
-export function disposeViewerSelection(): void {
-  current = undefined
-  lifetime = createBrowserUuid()
-  navigationRevision = actionOrder = acceptedOrder = 0
-}
diff --git a/src/renderer/src/lib/workspace-switch-user-act.ts b/src/renderer/src/lib/workspace-switch-user-act.ts
index bc8f3f237803..cf832e29033c 100644
--- a/src/renderer/src/lib/workspace-switch-user-act.ts
+++ b/src/renderer/src/lib/workspace-switch-user-act.ts
@@ -1,4 +1,3 @@
-import { noteViewerNavigation } from './viewer-selection-request'
 /**
  * The user's own switches to a workspace (opening it, picking one of its tabs) in this window. Only
  * these may wake or start a stopped WSL distro (E9); launch restore, a reload, remounts and Orca's own
@@ -22,7 +21,6 @@ export function noteUserWorkspaceSwitch(workspaceKey: string | null | undefined)
   if (!workspaceKey) {
     return
   }
-  noteViewerNavigation()
   lastSwitchAt.set(workspaceKey, Date.now())
   switchCounts.set(workspaceKey, (switchCounts.get(workspaceKey) ?? 0) + 1)
 }
diff --git a/src/renderer/src/lib/workspace-tab-palette-activation.ts b/src/renderer/src/lib/workspace-tab-palette-activation.ts
index 387e0c2dae3d..43ca1bccb5ac 100644
--- a/src/renderer/src/lib/workspace-tab-palette-activation.ts
+++ b/src/renderer/src/lib/workspace-tab-palette-activation.ts
@@ -1,4 +1,3 @@
-import { noteViewerNavigation } from './viewer-selection-request'
 import { focusTerminalTabSurface } from '@/lib/focus-terminal-tab-surface'
 import { runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/worktree-runtime-owner'
 import { activateWebRuntimeSessionTab } from '@/runtime/web-runtime-session-tab-lifecycle'
@@ -105,7 +104,6 @@ export function activateWorkspaceTabPaletteResult(
     return { status: 'failed', reason: initialFailure }
   }
 
-  noteViewerNavigation()
   const executionHostId =
     result.executionHostId ?? initialState.getKnownWorktreeById(result.worktreeId)?.hostId
   const activated = executionHostId
diff --git a/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts b/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts
index 92e7e4f51198..400e2893e331 100644
--- a/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts
+++ b/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts
@@ -7,10 +7,7 @@ import type { WorktreeRuntimeOwnerState } from '../../lib/worktree-runtime-owner
 import { getExecutionHostIdForWorktree } from '../../lib/worktree-runtime-owner'
 import { applyWebSessionTabsSnapshot } from '../web-session-tabs-sync/snapshot-api'
 import { applyWebSessionTabsStorePatch } from '../web-session-tabs-sync/store-patch'
-import type {
-  SnapshotOpenSelectionOffer,
-  WebSessionTabsSyncState
-} from '../web-session-tabs-sync/state'
+import type { WebSessionTabsSyncState } from '../web-session-tabs-sync/state'
 import {
   admitRetiredValueUnderAuthority,
   noteRetiredValue,
@@ -49,7 +46,6 @@ function isWorktreeRetraction(
 }
 
 export type StructuredSessionSnapshotApplyOptions = {
-  offerOpenSelection?: (offer: SnapshotOpenSelectionOffer) => void
   /** Authority census replies answer a just-issued listAll, so exempt them from retired-epoch fencing of delayed dead-generation stream frames. */
   authoritative?: boolean
   /** Re-applies a publication at the version already applied: the window removed a chat early. */
@@ -74,7 +70,7 @@ export function applyStructuredSessionTabSnapshots(
   const acceptedAgentSessions: { worktreeId: string; sessionId: string }[] = []
   const drawnChatLabels: DrawnChatLabel[] = []
   const settleStructuredSessionMirror = applyWebSessionTabsStorePatch(
-    (state, changedAgentPaneKeys, offerOpenSelection) =>
+    (state, changedAgentPaneKeys) =>
       applyLocalStructuredSessionTabSnapshots(
         state,
         snapshots,
@@ -82,7 +78,6 @@ export function applyStructuredSessionTabSnapshots(
         undefined,
         {
           ...options,
-          offerOpenSelection,
           onAcceptedAgentSession: (worktreeId, sessionId) => {
             acceptedAgentSessions.push({ worktreeId, sessionId })
             options.onAcceptedAgentSession?.(worktreeId, sessionId)
@@ -93,8 +88,7 @@ export function applyStructuredSessionTabSnapshots(
         },
         changedAgentPaneKeys
       ),
-    { frames: [] },
-    snapshots
+    { frames: [] }
   )
   settleStructuredSessionMirror()
   const { setTabLabel } = useAppStore.getState()
@@ -180,9 +174,6 @@ export function applyLocalStructuredSessionTabSnapshots<
       owner,
       now,
       {
-        offerOpenSelection: options.framesDraw?.(snapshot.worktree)
-          ? undefined
-          : options.offerOpenSelection,
         contentScope: 'agent-session',
         preserveLocalLayout: true,
         terminalPtyMode: 'local'
diff --git a/src/renderer/src/runtime/mounted-terminal-tab-registry.ts b/src/renderer/src/runtime/mounted-terminal-tab-registry.ts
index 536fa73d2aea..727f68be9c8e 100644
--- a/src/renderer/src/runtime/mounted-terminal-tab-registry.ts
+++ b/src/renderer/src/runtime/mounted-terminal-tab-registry.ts
@@ -5,10 +5,7 @@ import {
 import type { PaneManager } from '@/lib/pane-manager/pane-manager'
 import { resolveLeafIdForManager } from '@/lib/pane-manager/pane-key-resolution'
 
-import type { TerminalSurfaceCloseIdentity } from '../../../shared/terminal-tab-close'
-
 export type RegisteredTerminalTab = {
-  retirePresentation?: (original: TerminalSurfaceCloseIdentity) => void
   tabId: string
   worktreeId: string
   getManager: () => PaneManager | null
diff --git a/src/renderer/src/runtime/open-placement-work-counter.test-fixture.ts b/src/renderer/src/runtime/open-placement-work-counter.test-fixture.ts
deleted file mode 100644
index b0fa1f258e2c..000000000000
--- a/src/renderer/src/runtime/open-placement-work-counter.test-fixture.ts
+++ /dev/null
@@ -1,192 +0,0 @@
-import { vi } from 'vitest'
-import * as placementReads from './web-session-tabs-sync/open-placement-read'
-import * as snapshotPlacements from './web-session-tabs-sync/open-placement'
-import * as frameSelections from './workspace-layout-frame-open-selection'
-import * as mappings from './web-session-tabs-sync/tracking-mappings'
-import { hostSessionTabIdByLocalKey } from './web-session-tabs-sync/state'
-import * as selectionFingerprint from '../../../shared/structured-agent-session-mutation'
-
-/** Count metadata work while delegating every read and final writer to production. */
-export function countOpenPlacementWork() {
-  type Pass = 'snapshot' | 'discovery' | 'writer'
-  const reads: {
-    pass: Pass
-    worktreeId: string
-    tabRows: number
-    terminalRows: number
-    snapshotRows: number
-    mappingCopies: number
-    mappingRows: number
-    sourceChecks: number
-    viewerChecks: number
-    destinationLookups: number
-  }[] = []
-  const visits: { pass: Pass; worktreeId: string; rows: number }[] = []
-  const builtKeys: string[][] = []
-  let pass: Pass = 'snapshot'
-  let indexing: (typeof reads)[number] | undefined
-  let fingerprints = 0
-  const restores: (() => void)[] = []
-  const countedRows = <T>(rows: T[], visit: () => void): T[] =>
-    new Proxy(rows, {
-      get(target, property, receiver) {
-        if (typeof property === 'string' && /^(0|[1-9]\d*)$/.test(property)) {
-          visit()
-        }
-        // oxlint-disable-next-line anti-slop/no-reflect-get -- Proxy `get` trap: only Reflect.get forwards a raw string|symbol key with the proxy receiver.
-        return Reflect.get(target, property, receiver)
-      }
-    })
-  const countLayout = <T extends { worktreeId: string; tabs: unknown[] }>(layout: T): T => {
-    const visit = { pass, worktreeId: layout.worktreeId, rows: 0 }
-    visits.push(visit)
-    return {
-      ...layout,
-      tabs: countedRows(layout.tabs, () => {
-        if (!indexing) {
-          visit.rows += 1
-        }
-      })
-    }
-  }
-  const realMappingGet = hostSessionTabIdByLocalKey.get.bind(hostSessionTabIdByLocalKey)
-  const mappingGet = vi.spyOn(hostSessionTabIdByLocalKey, 'get').mockImplementation((key) => {
-    if (indexing) {
-      indexing.mappingCopies += 1
-    }
-    return realMappingGet(key)
-  })
-  restores.push(() => mappingGet.mockRestore())
-  const realMappings = mappings.hostSessionTabIdsByLocalTabForWorktree
-  const mappingRead = vi
-    .spyOn(mappings, 'hostSessionTabIdsByLocalTabForWorktree')
-    .mockImplementation((...args) => {
-      const rows = realMappings(...args)
-      const reading = indexing
-      if (reading) {
-        const iterate = rows[Symbol.iterator].bind(rows)
-        rows[Symbol.iterator] = function* () {
-          for (const entry of iterate()) {
-            reading.mappingRows += 1
-            yield entry
-          }
-          return undefined
-        }
-      }
-      return rows
-    })
-  restores.push(() => mappingRead.mockRestore())
-  const realRead = placementReads.createOpenPlacementRead
-  const read = vi
-    .spyOn(placementReads, 'createOpenPlacementRead')
-    .mockImplementation((state, worktreeId, owner, snapshot, now) => {
-      const counts = {
-        pass,
-        worktreeId,
-        tabRows: 0,
-        terminalRows: 0,
-        snapshotRows: 0,
-        mappingCopies: 0,
-        mappingRows: 0,
-        sourceChecks: 0,
-        viewerChecks: 0,
-        destinationLookups: 0
-      }
-      reads.push(counts)
-      const before = indexing
-      indexing = counts
-      let actual: ReturnType<typeof realRead>
-      try {
-        actual = realRead(
-          {
-            ...state,
-            unifiedTabsByWorktree: {
-              ...state.unifiedTabsByWorktree,
-              [worktreeId]: countedRows(
-                state.unifiedTabsByWorktree[worktreeId] ?? [],
-                () => counts.tabRows++
-              )
-            },
-            tabsByWorktree: {
-              ...state.tabsByWorktree,
-              [worktreeId]: countedRows(
-                state.tabsByWorktree[worktreeId] ?? [],
-                () => counts.terminalRows++
-              )
-            }
-          },
-          worktreeId,
-          owner,
-          snapshot && {
-            ...snapshot,
-            tabs: countedRows(snapshot.tabs, () => counts.snapshotRows++)
-          },
-          now
-        )
-      } finally {
-        indexing = before
-      }
-      return {
-        ...actual,
-        sourceCurrent: (...args) => {
-          counts.sourceChecks++
-          return actual.sourceCurrent(...args)
-        },
-        viewerSelectionCurrent: (...args) => {
-          counts.viewerChecks++
-          return actual.viewerSelectionCurrent(...args)
-        },
-        localTabId: (...args) => {
-          counts.destinationLookups++
-          return actual.localTabId(...args)
-        }
-      }
-    })
-  restores.push(() => read.mockRestore())
-  const realSnapshot = snapshotPlacements.prepareSnapshotOpenPlacements
-  const snapshot = vi
-    .spyOn(snapshotPlacements, 'prepareSnapshotOpenPlacements')
-    .mockImplementation((state, layout, ...rest) => {
-      pass = 'snapshot'
-      return realSnapshot(state, countLayout({ ...layout, worktreeId: layout.worktree }), ...rest)
-    })
-  restores.push(() => snapshot.mockRestore())
-  const realDiscovery = frameSelections.frameOpenPlacements
-  const discovery = vi
-    .spyOn(frameSelections, 'frameOpenPlacements')
-    .mockImplementation((state, layout, owner) => {
-      pass = 'discovery'
-      return realDiscovery(state, countLayout(layout), owner)
-    })
-  restores.push(() => discovery.mockRestore())
-  const realWriter = frameSelections.frameOpenSelectionPatch
-  const writer = vi
-    .spyOn(frameSelections, 'frameOpenSelectionPatch')
-    .mockImplementation((before, patch, cache, keys, ...rest) => {
-      pass = 'writer'
-      builtKeys.push([...keys])
-      const countedCache = { ...cache }
-      for (const key of keys) {
-        if (cache[key]) {
-          countedCache[key] = countLayout(cache[key])
-        }
-      }
-      return realWriter(before, patch, countedCache, keys, ...rest)
-    })
-  restores.push(() => writer.mockRestore())
-  const realFingerprint = selectionFingerprint.structuredAgentSessionDomainFingerprint
-  const fingerprint = vi
-    .spyOn(selectionFingerprint, 'structuredAgentSessionDomainFingerprint')
-    .mockImplementation((...args) => {
-      fingerprints++
-      return realFingerprint(...args)
-    })
-  restores.push(() => fingerprint.mockRestore())
-  return {
-    reads,
-    visits,
-    builtKeys,
-    fingerprints: () => fingerprints,
-    stop: () => restores.toReversed().forEach((restore) => restore())
-  }
-}
diff --git a/src/renderer/src/runtime/sync-runtime-graph/graph-publication.ts b/src/renderer/src/runtime/sync-runtime-graph/graph-publication.ts
index bf18e6b77684..778b53c01303 100644
--- a/src/renderer/src/runtime/sync-runtime-graph/graph-publication.ts
+++ b/src/renderer/src/runtime/sync-runtime-graph/graph-publication.ts
@@ -80,7 +80,6 @@ export async function syncRuntimeGraph(): Promise<void> {
     tabs: [],
     leaves: [],
     rendererGeneration: mobilePublicationEpoch,
-    conditionalSwitchProjection: 1,
     mobileSessionTabs: publication.changed,
     unchangedMobileSessionWorktrees: publication.unchangedWorktrees,
     ...(gridSizes ? { terminalGroupGridSizes: gridSizes.groups } : {}),
diff --git a/src/renderer/src/runtime/web-runtime-session-browser-create-focus.test.ts b/src/renderer/src/runtime/web-runtime-session-browser-create-focus.test.ts
index 7f1e0f7de301..e278a0e22b96 100644
--- a/src/renderer/src/runtime/web-runtime-session-browser-create-focus.test.ts
+++ b/src/renderer/src/runtime/web-runtime-session-browser-create-focus.test.ts
@@ -149,7 +149,7 @@ describe('createWebRuntimeSessionBrowserTab', () => {
       snapshot,
       ENVIRONMENT_ID,
       undefined,
-      { offerOpenSelection: undefined },
+      undefined,
       mocks.changedAgentPaneKeys
     )
     expect(mocks.acceptReplayedWebSessionTabsSnapshot).toHaveBeenCalledWith(
@@ -429,7 +429,7 @@ describe('createWebRuntimeSessionBrowserTab', () => {
       snapshot,
       ENVIRONMENT_ID,
       undefined,
-      { offerOpenSelection: undefined },
+      undefined,
       mocks.changedAgentPaneKeys
     )
     expect(setStateResults.at(-1)).toEqual({ state: 'after' })
diff --git a/src/renderer/src/runtime/web-runtime-session-snapshot.ts b/src/renderer/src/runtime/web-runtime-session-snapshot.ts
index c0684f70cc98..cae80cb6df86 100644
--- a/src/renderer/src/runtime/web-runtime-session-snapshot.ts
+++ b/src/renderer/src/runtime/web-runtime-session-snapshot.ts
@@ -157,7 +157,7 @@ export async function refreshWebRuntimeSessionTabsSnapshot(
       ? decideWebSessionTabsSnapshot(recovered, environmentId)
       : WEB_SESSION_TABS_FRAME_OUTRANKED
     const settleMirror = applyWebSessionTabsStorePatch(
-      (state, changedAgentPaneKeys, offerOpenSelection) => {
+      (state, changedAgentPaneKeys) => {
         // Eager refresh can outlive workspace switches; update tabs without taking focus.
         const patch = decision.apply
           ? applyWebSessionTabsSnapshot(
@@ -165,7 +165,7 @@ export async function refreshWebRuntimeSessionTabsSnapshot(
               recovered,
               environmentId,
               undefined,
-              { offerOpenSelection },
+              undefined,
               changedAgentPaneKeys
             )
           : state
diff --git a/src/renderer/src/runtime/web-runtime-session.test.ts b/src/renderer/src/runtime/web-runtime-session.test.ts
index e3a2eeefb504..086303bf3218 100644
--- a/src/renderer/src/runtime/web-runtime-session.test.ts
+++ b/src/renderer/src/runtime/web-runtime-session.test.ts
@@ -200,7 +200,7 @@ describe('refreshWebRuntimeSessionTabsSnapshot', () => {
       recovered,
       ENVIRONMENT_ID,
       undefined,
-      { offerOpenSelection: undefined },
+      undefined,
       mocks.changedAgentPaneKeys
     )
   })
@@ -265,7 +265,7 @@ describe('activateWebRuntimeSessionWorktree', () => {
       snapshot,
       ENVIRONMENT_ID,
       undefined,
-      { offerOpenSelection: undefined },
+      undefined,
       mocks.changedAgentPaneKeys
     )
     expect(mocks.acceptReplayedWebSessionTabsSnapshot).toHaveBeenCalledWith(
diff --git a/src/renderer/src/runtime/web-runtime-terminal-create-operation.ts b/src/renderer/src/runtime/web-runtime-terminal-create-operation.ts
index 044cb3494c75..26004eb9c758 100644
--- a/src/renderer/src/runtime/web-runtime-terminal-create-operation.ts
+++ b/src/renderer/src/runtime/web-runtime-terminal-create-operation.ts
@@ -1,4 +1,3 @@
-import { presentAgentLaunchTab } from '@/lib/agent-launch-tab-presentation'
 import { createWebRuntimeAgentTerminalHostAuthority } from './web-runtime-agent-terminal-host-authority'
 import type { RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope'
 import type { RuntimeMobileSessionCreateTerminalResult } from '../../../shared/runtime-types'
@@ -10,16 +9,13 @@ import { runRemoteAgentSessionLaunch } from './remote-agent-session-launch'
 import { unwrapRuntimeRpcResult } from './runtime-rpc-result'
 import { toRuntimeWorktreeSelector } from './runtime-worktree-selector'
 import { resolveWebRuntimeSessionEnvironmentId } from './web-runtime-session-workspace-routing'
-import {
-  recordWebSessionFocusIntent,
-  resolveWebSessionVisibleTabId
-} from './web-session-focus-intent'
+import { recordWebSessionFocusIntent } from './web-session-focus-intent'
 import {
   forgetWebSessionTerminalPlacement,
   recordWebSessionTerminalPlacement,
   webTerminalPlacementParentTabId
 } from './web-session-terminal-placement'
-import { toHostSessionTabId, toWebTerminalSurfaceTabId } from '../../../shared/terminal-surface-id'
+import { toHostSessionTabId } from '../../../shared/terminal-surface-id'
 import {
   captureRuntimeEnvironmentCall,
   captureWebSessionIntentOwner,
@@ -39,16 +35,11 @@ import {
   type WebRuntimeSessionWorkspaceSelectionRollback
 } from './web-runtime-session-workspace-selection'
 import { createdTerminalLeafId } from './web-runtime-terminal-identity'
-import {
-  captureWebRuntimeTerminalPlacement,
-  settleWebRuntimeTerminalPlacement
-} from './web-runtime-terminal-placement-settlement'
+import { settleWebRuntimeTerminalPlacement } from './web-runtime-terminal-placement-settlement'
 import { buildPlainCreateTerminalParams } from './web-runtime-plain-terminal-create-params'
 
 export async function createWebRuntimeSessionTerminalResult(
-  args: CreateWebRuntimeSessionTerminalArgs,
-  canActivate?: () => boolean,
-  viewerSelection?: string
+  args: CreateWebRuntimeSessionTerminalArgs
 ): Promise<CreatedWebRuntimeSessionTerminal> {
   const environmentId = resolveWebRuntimeSessionEnvironmentId(
     args.environmentId,
@@ -69,7 +60,7 @@ export async function createWebRuntimeSessionTerminalResult(
   const callEnvironment = captureRuntimeEnvironmentCall(environmentId, intentOwner.pairingRevision)
 
   let workspaceSelectionRollback: WebRuntimeSessionWorkspaceSelectionRollback | null = null
-  if (args.selectWorktree !== false && !canActivate) {
+  if (args.selectWorktree !== false) {
     const previous = readActiveWorkspaceSelection()
     selectWebRuntimeSessionWorktree(args.worktreeId, environmentId)
     workspaceSelectionRollback = {
@@ -80,7 +71,6 @@ export async function createWebRuntimeSessionTerminalResult(
       }
     }
   }
-  const { captured, placementGroupId } = captureWebRuntimeTerminalPlacement(args)
   let hostCreated = false
   let createdTabId: string | undefined
   let createdLeafId: string | undefined
@@ -129,7 +119,7 @@ export async function createWebRuntimeSessionTerminalResult(
               ...(args.viewMode ? { viewMode: args.viewMode } : {}),
               // Old hosts use activate:false; new hosts use select/navigation for caller-local focus.
               activate: false,
-              select: args.activate !== false && !canActivate,
+              select: args.activate !== false,
               navigation: 'caller'
             },
             timeoutMs: 15_000
@@ -176,33 +166,18 @@ export async function createWebRuntimeSessionTerminalResult(
       createdTabId = created.tab.id
       createdLeafId = created.tab.leafId
     }
-    if (placementGroupId && createdTabId) {
-      // Why: the host drops client-minted group ids, so this client's own record is what
-      // lands the mirrored tab in the requested pane under client-owned placement.
+    if (args.targetGroupId && createdTabId) {
+      // Host drops client-minted group IDs; client placement must land the mirrored tab in the requested pane.
       recordWebSessionTerminalPlacement({
         environmentId,
         worktreeId: args.worktreeId,
         hostTabId: webTerminalPlacementParentTabId(createdTabId),
-        groupId: placementGroupId
+        groupId: args.targetGroupId
       })
     }
-    if (
-      viewerSelection === undefined &&
-      args.activate !== false &&
-      canActivate?.() !== false &&
-      createdTabId &&
-      matchesWebSessionIntentOwner(intentOwner)
-    ) {
+    if (args.activate !== false && createdTabId && matchesWebSessionIntentOwner(intentOwner)) {
       // Intent lets reconciliation focus this new terminal instead of sticky-keeping the previous tab.
-      recordWebSessionFocusIntent(
-        intentOwner,
-        args.worktreeId,
-        createdTabId,
-        createdLeafId,
-        canActivate
-          ? resolveWebSessionVisibleTabId(useAppStore.getState(), args.worktreeId)
-          : undefined
-      )
+      recordWebSessionFocusIntent(intentOwner, args.worktreeId, createdTabId, createdLeafId)
     }
     const placementTabId =
       createdTabId && (args.targetGroupId || args.afterTabId) ? createdTabId : undefined
@@ -220,28 +195,12 @@ export async function createWebRuntimeSessionTerminalResult(
         args.worktreeId,
         webTerminalPlacementParentTabId(placementTabId),
         {
-          groupId: placementGroupId,
+          groupId: args.targetGroupId,
           afterTabId: args.afterTabId,
-          captured,
-          activate: args.activate !== false && viewerSelection === undefined,
-          canActivate
+          activate: args.activate !== false
         }
       )
     }
-    if (
-      viewerSelection &&
-      createdTabId &&
-      args.activate !== false &&
-      matchesWebSessionIntentOwner(intentOwner)
-    ) {
-      presentAgentLaunchTab(
-        'focus-window',
-        args.worktreeId,
-        toWebTerminalSurfaceTabId(webTerminalPlacementParentTabId(createdTabId)),
-        createdLeafId,
-        viewerSelection
-      )
-    }
     return {
       outcome: { status: 'created' },
       ...(createdTabId ? { hostTabId: createdTabId } : {})
diff --git a/src/renderer/src/runtime/web-runtime-terminal-creation.ts b/src/renderer/src/runtime/web-runtime-terminal-creation.ts
index 4c6d8afdd899..67408edd066a 100644
--- a/src/renderer/src/runtime/web-runtime-terminal-creation.ts
+++ b/src/renderer/src/runtime/web-runtime-terminal-creation.ts
@@ -19,22 +19,13 @@ import type {
  */
 export async function createWebRuntimeSessionTerminal(
   args: CreateWebRuntimeSessionTerminalArgs,
-  options: {
-    notifyFailure?: boolean
-    userAct?: boolean
-    canActivate?: () => boolean
-    viewerSelection?: string
-  } = {}
+  options: { notifyFailure?: boolean; userAct?: boolean } = {}
 ): Promise<WebRuntimeTerminalCreateOutcome> {
   if (options.userAct && !(await startStoppedWslHostForUserAct(args.environmentId))) {
     // The start already told the user why; the host is still stopped.
     return { status: 'failed', message: stoppedWslHostMessage(args.environmentId) }
   }
-  const created = await createWebRuntimeSessionTerminalResult(
-    args,
-    options.canActivate,
-    options.viewerSelection
-  )
+  const created = await createWebRuntimeSessionTerminalResult(args)
   if (
     created.hostFailed &&
     created.outcome.status === 'failed' &&
diff --git a/src/renderer/src/runtime/web-runtime-terminal-placement-settlement.ts b/src/renderer/src/runtime/web-runtime-terminal-placement-settlement.ts
index a39d5dd9eb40..e737508de280 100644
--- a/src/renderer/src/runtime/web-runtime-terminal-placement-settlement.ts
+++ b/src/renderer/src/runtime/web-runtime-terminal-placement-settlement.ts
@@ -1,8 +1,3 @@
-import {
-  captureSessionTabPlacement,
-  placeUnpinnedSessionTabAtCapture,
-  type CapturedSessionTabPlacement
-} from '../../../shared/session-tab-placement'
 import { insertUnifiedTabAfterAnchor } from '../lib/unified-tab-anchor-insertion'
 import { useAppStore } from '../store'
 import {
@@ -25,38 +20,12 @@ function anchorUnifiedTabId(worktreeId: string, afterTabId: string): string {
     : toWebTerminalSurfaceTabId(webTerminalPlacementParentTabId(toHostSessionTabId(afterTabId)))
 }
 
-/** Capture before creation can retire the anchor on the execution host. */
-export function captureWebRuntimeTerminalPlacement(args: {
-  worktreeId: string
-  afterTabId?: string
-  targetGroupId?: string
-}) {
-  const sourceGroup = useAppStore
-    .getState()
-    .groupsByWorktree[args.worktreeId]?.find(
-      (group) => args.afterTabId && group.tabOrder.includes(args.afterTabId)
-    )
-  return {
-    placementGroupId: args.targetGroupId ?? sourceGroup?.id,
-    captured:
-      !args.targetGroupId || args.targetGroupId === sourceGroup?.id
-        ? captureSessionTabPlacement(sourceGroup?.tabOrder ?? [], args.afterTabId)
-        : undefined
-  }
-}
-
 /** Settle the placement once the mirrored tab exists (bounded poll), then consume the record. */
 export async function settleWebRuntimeTerminalPlacement(
   environmentId: string,
   worktreeId: string,
   hostTabId: string,
-  placement: {
-    groupId?: string
-    afterTabId?: string
-    activate: boolean
-    canActivate?: () => boolean
-    captured?: CapturedSessionTabPlacement
-  }
+  placement: { groupId?: string; afterTabId?: string; activate: boolean }
 ): Promise<void> {
   const unifiedTabId = toWebTerminalSurfaceTabId(hostTabId)
   const findTab = () =>
@@ -89,29 +58,13 @@ export async function settleWebRuntimeTerminalPlacement(
     if (tab.groupId !== targetGroup.id) {
       // Snapshot may beat placement recording; repair through the same client-owned move as user drags.
       state.moveUnifiedTabToGroup(unifiedTabId, targetGroup.id, {
-        activate: placement.activate && placement.canActivate?.() !== false,
+        activate: placement.activate,
         recordInteraction: false
       })
     }
-    if (anchorId && targetGroup.tabOrder.includes(anchorId)) {
+    if (anchorId) {
+      // The create caller owns this insertion; subsequent host snapshots preserve client order.
       insertUnifiedTabAfterAnchor(worktreeId, unifiedTabId, anchorId)
-    } else if (placement.captured) {
-      const current = useAppStore.getState()
-      const group = current.groupsByWorktree[worktreeId]?.find(
-        (group) => group.id === targetGroup.id
-      )
-      if (group) {
-        current.reorderUnifiedTabs(
-          group.id,
-          placeUnpinnedSessionTabAtCapture(
-            group.tabOrder,
-            current.unifiedTabsByWorktree[worktreeId] ?? [],
-            unifiedTabId,
-            placement.captured
-          ),
-          { recordInteraction: false }
-        )
-      }
     }
   } finally {
     forgetWebSessionTerminalPlacement({ environmentId, worktreeId, hostTabId })
diff --git a/src/renderer/src/runtime/web-runtime-terminal-switch-placement.test.ts b/src/renderer/src/runtime/web-runtime-terminal-switch-placement.test.ts
deleted file mode 100644
index c1a38417f77e..000000000000
--- a/src/renderer/src/runtime/web-runtime-terminal-switch-placement.test.ts
+++ /dev/null
@@ -1,531 +0,0 @@
-// @vitest-environment happy-dom
-import { agentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
-import {
-  beginViewerSelectionRequest,
-  disposeViewerSelection,
-  viewerSelectionOutcome
-} from '@/lib/viewer-selection-request'
-import { activateTabNumberShortcut } from '@/lib/tab-number-shortcuts'
-import { registerTerminalUiRoutingIpcBridge } from '@/hooks/ipc-events/terminal-ui-routing-ipc-bridge'
-import { applyWebSessionTabsStorePatch } from './web-session-tabs-sync/store-patch'
-import {
-  createWebSessionTabsSnapshotPatch,
-  applyWebSessionTabsSnapshot,
-  decideWebSessionTabsSnapshotOperations,
-  applyWebSessionTabsSnapshotOperations
-} from './web-session-tabs-sync/snapshot-api'
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import { useAppStore } from '@/store'
-import { makeOpenFile } from '@/store/slices/store-session-test-harness'
-import type { RuntimeMobileSessionTabsResult } from '../../../shared/runtime-types'
-import { createGlobalSettingsFixture } from '../../../shared/global-settings-test-fixture'
-import { createWebRuntimeSessionTerminalResult } from './web-runtime-terminal-create-operation'
-import { refreshWebRuntimeSessionTabsSnapshot } from './web-runtime-session-snapshot'
-import { toWebTerminalSurfaceTabId } from '../../../shared/terminal-surface-id'
-import { makePaneKey } from '../../../shared/stable-pane-id'
-import { resetWebSessionTabsSnapshotFreshnessForTests } from './web-session-tabs-sync/tracking-lifecycle'
-import { countOpenPlacementWork } from './open-placement-work-counter.test-fixture'
-import { hostSessionTabIdsByLocalTabForWorktree } from './web-session-tabs-sync/tracking-mappings'
-
-const ENV = 'paired-placement',
-  WT = 'repo::/repo'
-const chat = (id: string) => ({
-  type: 'agent-session' as const,
-  id: `agent-session:${id}`,
-  sessionId: id,
-  agent: 'codex' as const,
-  title: id,
-  isActive: false
-})
-type TerminalFocusCallback = Parameters<typeof window.api.ui.onFocusTerminal>[0]
-function routeTerminalFocus(data: Parameters<TerminalFocusCallback>[0]): void {
-  let focusTerminal: TerminalFocusCallback = () => {
-    throw new Error('Terminal focus listener was not registered')
-  }
-  const originalApi = window.api
-  Object.assign(window, {
-    api: {
-      ...originalApi,
-      ui: {
-        ...originalApi?.ui,
-        onSplitTerminal: () => () => {},
-        onRenameTerminal: () => () => {},
-        onSetPaneTitle: () => () => {},
-        onFocusEditorTab: () => () => {},
-        onFocusTerminal: (callback: TerminalFocusCallback) => {
-          focusTerminal = callback
-          return () => {}
-        }
-      }
-    }
-  })
-  const unsubs: (() => void)[] = []
-  try {
-    registerTerminalUiRoutingIpcBridge(unsubs)
-    focusTerminal(data)
-  } finally {
-    unsubs.forEach((unsubscribe) => unsubscribe())
-    Object.assign(window, { api: originalApi })
-  }
-}
-
-let frame: RuntimeMobileSessionTabsResult
-function resetFrame() {
-  resetWebSessionTabsSnapshotFreshnessForTests()
-  useAppStore.setState(useAppStore.getInitialState(), true)
-  useAppStore.setState({
-    activeWorktreeId: WT,
-    activeWorkspaceExecutionHostId: `runtime:${ENV}`,
-    settings: createGlobalSettingsFixture({
-      ...useAppStore.getState().settings,
-      activeRuntimeEnvironmentId: ENV
-    })
-  })
-  const source = ['A', 'C', 'B']
-  frame = {
-    worktree: WT,
-    publicationEpoch: 'host-placement',
-    snapshotVersion: 1,
-    activeGroupId: 'R',
-    activeTabId: 'agent-session:D',
-    activeTabType: 'agent-session',
-    tabs: [...source, 'D'].map(chat),
-    tabGroups: [
-      {
-        id: 'L',
-        activeTabId: 'agent-session:C',
-        tabOrder: source.map((id) => `agent-session:${id}`)
-      },
-      { id: 'R', activeTabId: 'agent-session:D', tabOrder: ['agent-session:D'] }
-    ]
-  }
-  useAppStore.setState((state) => applyWebSessionTabsSnapshot(state, frame, ENV))
-}
-beforeEach(() => resetFrame())
-afterEach(() => vi.restoreAllMocks())
-it.each([{ pinned: false }, { pinned: true }])(
-  'keeps client neighbors and pin partitions through early retirement and refresh (pinned: $pinned)',
-  async ({ pinned }) => {
-    if (pinned) {
-      frame = {
-        ...frame,
-        snapshotVersion: frame.snapshotVersion + 1,
-        tabs: [
-          ...frame.tabs.map((tab) => ({
-            ...tab,
-            isPinned: ['agent-session:A', 'agent-session:C', 'agent-session:B'].includes(tab.id)
-          })),
-          chat('U')
-        ],
-        tabGroups: frame.tabGroups?.map((group) =>
-          group.id === 'L' ? { ...group, tabOrder: [...group.tabOrder, 'agent-session:U'] } : group
-        )
-      }
-      useAppStore.setState((state) => applyWebSessionTabsSnapshot(state, frame, ENV))
-    }
-    const before = useAppStore.getState()
-    const source = before.unifiedTabsByWorktree[WT].find((tab) => tab.entityId === 'C')!
-    const sourceGroup = source.groupId
-    const runtimeCall = vi.fn(async ({ method }: { method: string }) => {
-      if (method === 'session.tabs.createTerminal') {
-        frame = {
-          ...frame,
-          snapshotVersion: frame.snapshotVersion + 1,
-          tabs: [
-            ...frame.tabs.filter((tab) => tab.id !== 'agent-session:C'),
-            {
-              type: 'terminal',
-              id: 'T::leaf',
-              parentTabId: 'T',
-              leafId: 'leaf',
-              title: 'Terminal',
-              terminal: 'term_T',
-              isActive: false,
-              status: 'ready'
-            }
-          ],
-          tabGroups: [
-            {
-              id: 'L',
-              activeTabId: 'T',
-              tabOrder: [
-                'agent-session:A',
-                'agent-session:B',
-                'T',
-                ...(pinned ? ['agent-session:U'] : [])
-              ]
-            },
-            frame.tabGroups![1]
-          ]
-        }
-        // Publication beats the create response, with C already gone and T at the host's old fallback.
-        useAppStore.setState((state) => applyWebSessionTabsSnapshot(state, frame, ENV))
-        expect(
-          useAppStore.getState().unifiedTabsByWorktree[WT].some((tab) => tab.entityId === 'C')
-        ).toBe(false)
-        useAppStore.getState().createUnifiedTab(WT, 'editor', {
-          id: 'concurrent',
-          entityId: '/repo/concurrent',
-          targetGroupId: sourceGroup
-        })
-        return { id: 'create', ok: true as const, result: { tab: frame.tabs.at(-1) } }
-      }
-      if (method === 'session.tabs.list') {
-        return { id: 'list', ok: true as const, result: frame }
-      }
-      throw new Error(`Unexpected ${method}`)
-    })
-    Object.assign(window, {
-      api: {
-        ...window.api,
-        runtimeEnvironments: { ...window.api?.runtimeEnvironments, call: runtimeCall }
-      }
-    })
-    const result = await createWebRuntimeSessionTerminalResult({
-      environmentId: ENV,
-      worktreeId: WT,
-      afterTabId: source.id,
-      targetGroupId: sourceGroup,
-      launchAgent: 'codex',
-      command: 'codex resume conversation',
-      resumeOrigin: 'switch',
-      providerSession: { key: 'session_id', id: 'conversation' },
-      selectWorktree: false,
-      activate: true
-    })
-    expect(result.outcome.status).toBe('created')
-    const order = () =>
-      useAppStore.getState().groupsByWorktree[WT].find((group) => group.id === sourceGroup)!
-        .tabOrder
-    const expected = [
-      'structured-agent-session-A',
-      ...(pinned ? ['structured-agent-session-B'] : []),
-      toWebTerminalSurfaceTabId('T'),
-      ...(pinned ? ['structured-agent-session-U'] : ['structured-agent-session-B']),
-      'concurrent'
-    ]
-    expect(order()).toEqual(expected)
-    expect(useAppStore.getState().activeGroupIdByWorktree[WT]).toBe(sourceGroup)
-    await refreshWebRuntimeSessionTabsSnapshot(ENV, WT, { acceptCurrentSnapshot: true })
-    expect(order()).toEqual(expected)
-  }
-)
-
-it.each([10, 100])(
-  'indexes retained metadata once on an admitted unchanged snapshot replay (%i destinations)',
-  (count) => {
-    disposeViewerSelection()
-    useAppStore.setState(useAppStore.getInitialState(), true)
-    useAppStore.setState({
-      activeWorktreeId: WT,
-      activeView: 'terminal',
-      settings: createGlobalSettingsFixture({ activeRuntimeEnvironmentId: ENV })
-    })
-    const leafId = '10000000-0000-4000-8000-000000000001'
-    const terminal = (id: string) => ({
-      type: 'terminal' as const,
-      id: `${id}::${leafId}`,
-      parentTabId: id,
-      leafId,
-      title: id,
-      terminal: `term_${id}`,
-      isActive: false,
-      status: 'ready' as const
-    })
-    let snapshot: RuntimeMobileSessionTabsResult = {
-      worktree: WT,
-      publicationEpoch: 'metadata-replay',
-      snapshotVersion: 1,
-      activeGroupId: 'G',
-      activeTabId: 'C',
-      activeTabType: 'terminal',
-      tabs: [terminal('C')],
-      tabGroups: [{ id: 'G', activeTabId: 'C', tabOrder: ['C'] }]
-    }
-    const applyAdmitted = () => {
-      const operations = decideWebSessionTabsSnapshotOperations([{ environmentId: ENV, snapshot }])
-      expect(operations[0].decision.apply).toBe(true)
-      applyWebSessionTabsStorePatch(
-        (state, keys, offerOpenSelection) =>
-          applyWebSessionTabsSnapshotOperations(state, operations, keys, { offerOpenSelection }),
-        { frames: [] }
-      )()
-    }
-    applyAdmitted()
-    const groupId = useAppStore.getState().groupsByWorktree[WT][0].id
-    const deadline = agentSessionSwitchDeadline(Date.now)
-    let counter: ReturnType<typeof countOpenPlacementWork> | undefined
-    try {
-      const requests = Array.from({ length: count }, (_, i) => {
-        const request = beginViewerSelectionRequest(`retained-${i}`, deadline)
-        request.accept()
-        return request
-      })
-      snapshot = {
-        ...snapshot,
-        snapshotVersion: 2,
-        tabs: [
-          terminal('C'),
-          ...requests.map((request, i) => ({
-            ...terminal(`D-${i}`),
-            openPlacement: {
-              invocationId: `retained-${i}`,
-              generation: `generation-${i}`,
-              placement: { groupId, index: i + 1 },
-              activate: true,
-              viewerSelection: request.token,
-              source: {
-                worktreeId: WT,
-                tabId: `absent-source-${i}`,
-                leafId,
-                createdAt: 1,
-                generation: 0,
-                hasLeaf: true,
-                ptyId: `source-pty-${i}`,
-                incarnationId: null
-              }
-            }
-          }))
-        ],
-        tabGroups: [
-          { id: 'G', activeTabId: 'C', tabOrder: ['C', ...requests.map((_, i) => `D-${i}`)] }
-        ]
-      }
-      applyAdmitted()
-      expect(requests.map((request) => viewerSelectionOutcome(request.token))).toEqual([
-        ...Array.from({ length: count - 1 }, () => 'superseded'),
-        'fulfilled'
-      ])
-      const before = useAppStore.getState()
-      const order = before.groupsByWorktree[WT][0].tabOrder
-      const selected = before.activeTabIdByWorktree[WT]
-      const mappingCount = hostSessionTabIdsByLocalTabForWorktree(ENV, WT).size
-      expect(before.unifiedTabsByWorktree[WT]).toHaveLength(count + 1)
-      expect(before.tabsByWorktree[WT]).toHaveLength(count + 1)
-      expect(mappingCount).toBe(count + 1)
-      counter = countOpenPlacementWork()
-      // The host republishes unchanged inventory at a newer admitted version, after selection settled.
-      snapshot = { ...snapshot, snapshotVersion: 3 }
-      applyAdmitted()
-      expect(counter.visits).toEqual([{ pass: 'snapshot', worktreeId: WT, rows: count + 1 }])
-      expect(counter.reads).toEqual([
-        {
-          pass: 'snapshot',
-          worktreeId: WT,
-          tabRows: 2 * (count + 1),
-          terminalRows: count + 1,
-          snapshotRows: count + 1,
-          mappingCopies: mappingCount,
-          mappingRows: mappingCount,
-          sourceChecks: count,
-          viewerChecks: count,
-          destinationLookups: count
-        }
-      ])
-      expect(counter.fingerprints()).toBe(0)
-      const after = useAppStore.getState()
-      expect(after.groupsByWorktree[WT][0].tabOrder).toEqual(order)
-      expect(after.activeTabIdByWorktree[WT]).toBe(selected)
-      expect(after.tabsByWorktree[WT]).toHaveLength(count + 1)
-      expect(after.tabsByWorktree[WT].some((tab) => tab.id.startsWith('absent-source-'))).toBe(
-        false
-      )
-      expect(viewerSelectionOutcome(requests.at(-1)!.token)).toBe('fulfilled')
-    } finally {
-      counter?.stop()
-      deadline.dispose()
-      disposeViewerSelection()
-    }
-  }
-)
-
-it.each([
-  {
-    owner: 'local-structured-session',
-    direction: 'chat',
-    inventoryFirst: false,
-    navigation: 'notification'
-  },
-  {
-    owner: 'local-structured-session',
-    direction: 'terminal',
-    inventoryFirst: true,
-    navigation: 'shortcut'
-  },
-  { owner: ENV, direction: 'chat', inventoryFirst: true, navigation: 'shortcut' },
-  { owner: ENV, direction: 'terminal', inventoryFirst: false, navigation: 'shortcut' }
-] as const)(
-  'consumes the original viewer choice once at the real $owner $direction snapshot writer ($navigation)',
-  async ({ owner, direction, inventoryFirst, navigation }) => {
-    const worktreeId = navigation === 'notification' ? 'folder:folder-1' : WT
-    for (const navigate of [false, true]) {
-      disposeViewerSelection()
-      useAppStore.setState(useAppStore.getInitialState(), true)
-      useAppStore.setState({ activeWorktreeId: worktreeId, activeView: 'terminal' })
-      const leafId = '10000000-0000-4000-8000-000000000001'
-      const terminal = (id: string) => ({
-        type: 'terminal' as const,
-        id: `${id}::${leafId}`,
-        parentTabId: id,
-        leafId,
-        title: id,
-        terminal: `term_${id}`,
-        isActive: false,
-        status: 'ready' as const
-      })
-      const source = direction === 'chat' ? terminal('A') : chat('A')
-      let snapshot: RuntimeMobileSessionTabsResult = {
-        worktree: worktreeId,
-        publicationEpoch: 'selection',
-        snapshotVersion: 1,
-        activeGroupId: 'G',
-        activeTabId: source.id,
-        activeTabType: source.type,
-        tabs: [source, terminal('B'), terminal('C')],
-        tabGroups: [
-          {
-            id: 'G',
-            activeTabId: source.id,
-            tabOrder: [source.type === 'terminal' ? 'A' : source.id, 'B', 'C']
-          }
-        ]
-      }
-      const apply = () =>
-        applyWebSessionTabsStorePatch(createWebSessionTabsSnapshotPatch(snapshot, owner), {
-          frames: []
-        })()
-      apply()
-      const initial = useAppStore.getState()
-      const sourceTab = initial.unifiedTabsByWorktree[worktreeId].find(
-        (tab) => tab.entityId === (direction === 'chat' ? toWebTerminalSurfaceTabId('A') : 'A')
-      )!
-      const siblings = ['B', 'C'].map((id) =>
-        initial.unifiedTabsByWorktree[worktreeId].find(
-          (tab) => tab.entityId === toWebTerminalSurfaceTabId(id)
-        )!
-      )
-      const groupId = sourceTab.groupId
-      useAppStore.setState({
-        openFiles: [makeOpenFile({ id: '/repo/client-only', worktreeId })]
-      })
-      initial.createUnifiedTab(worktreeId, 'editor', {
-        id: 'X',
-        entityId: '/repo/client-only',
-        targetGroupId: groupId,
-        afterTabId: sourceTab.id,
-        activate: false
-      })
-      const deadline = agentSessionSwitchDeadline(Date.now)
-      try {
-        const selection = beginViewerSelectionRequest('snapshot-choice', deadline)
-        selection.accept()
-        const openPlacement = {
-          invocationId: 'snapshot-choice',
-          generation: 'snapshot-generation',
-          placement: { groupId, afterTabId: sourceTab.id, index: 0 },
-          activate: true,
-          viewerSelection: selection.token
-        }
-        // Natural disappearance and ordinary fallback are not navigation.
-        snapshot = {
-          ...snapshot,
-          snapshotVersion: 2,
-          tabs: snapshot.tabs.slice(1),
-          tabGroups: [{ id: 'G', activeTabId: 'C', tabOrder: ['B', 'C'] }]
-        }
-        apply()
-        if (navigation === 'notification') {
-          routeTerminalFocus({
-            tabId: toWebTerminalSurfaceTabId('C'),
-            worktreeId,
-            leafId,
-            ...(navigate
-              ? {
-                  ackPaneKeyOnSuccess: makePaneKey(toWebTerminalSurfaceTabId('C'), leafId),
-                  flashFocusedPane: true,
-                  scrollToBottomIfOutputSinceLastView: true
-                }
-              : {})
-          })
-          await new Promise<void>((resolve) =>
-            requestAnimationFrame(() => requestAnimationFrame(() => resolve()))
-          )
-          expect(useAppStore.getState().activeWorktreeId).toBe(worktreeId)
-          expect(useAppStore.getState().activeTabIdByWorktree[worktreeId]).toBe(
-            toWebTerminalSurfaceTabId('C')
-          )
-        } else if (navigate) {
-          // A real shortcut/re-click, including ABA, must supersede the captured gesture.
-          expect(activateTabNumberShortcut(2)).toBe(true)
-          expect(activateTabNumberShortcut(1)).toBe(true)
-          expect(activateTabNumberShortcut(2)).toBe(true)
-        }
-        const userChoice = useAppStore.getState().activeTabIdByWorktree[worktreeId]
-        const destination = direction === 'chat' ? chat('canonical-D') : terminal('D')
-        snapshot = {
-          ...snapshot,
-          snapshotVersion: 3,
-          tabs: [destination, ...snapshot.tabs],
-          tabGroups: [
-            {
-              id: 'G',
-              activeTabId: 'C',
-              tabOrder: [destination.type === 'terminal' ? 'D' : destination.id, 'B', 'C']
-            }
-          ]
-        }
-        if (inventoryFirst) {
-          snapshot = {
-            ...snapshot,
-            tabs: snapshot.tabs.map((row) =>
-              row.id === destination.id
-                ? { ...row, openPlacement: { ...openPlacement, activate: false } }
-                : row
-            )
-          }
-          apply()
-        }
-        if (navigation !== 'notification' || !navigate) {
-          expect(viewerSelectionOutcome(selection.token)).toBe(navigate ? 'superseded' : 'pending')
-        }
-        snapshot = {
-          ...snapshot,
-          snapshotVersion: 4,
-          tabs: snapshot.tabs.map((row) =>
-            row.id === destination.id ? { ...row, openPlacement } : row
-          )
-        }
-        apply()
-        const after = useAppStore.getState()
-        const landed = after.unifiedTabsByWorktree[worktreeId].find(
-          (row) =>
-            row.entityId === (direction === 'chat' ? 'canonical-D' : toWebTerminalSurfaceTabId('D'))
-        )!
-        expect(landed).toBeDefined()
-        const group = after.groupsByWorktree[worktreeId].find((row) => row.id === groupId)!
-        expect(group.tabOrder).toEqual([landed.id, 'X', ...siblings.map((row) => row.id)])
-        expect(group.activeTabId).toBe(navigate ? userChoice : landed.id)
-        expect(viewerSelectionOutcome(selection.token)).toBe(navigate ? 'superseded' : 'fulfilled')
-        expect(
-          after.unifiedTabsByWorktree[worktreeId].filter((row) => row.id === landed.id)
-        ).toHaveLength(1)
-        apply()
-        expect(
-          useAppStore.getState().groupsByWorktree[worktreeId].find((row) => row.id === groupId)!
-            .activeTabId
-        ).toBe(group.activeTabId)
-        // The same retained metadata is inventory after fulfilment, even after an ordinary repair.
-        expect(activateTabNumberShortcut(3)).toBe(true)
-        const later = useAppStore.getState().activeTabIdByWorktree[worktreeId]
-        apply()
-        expect(useAppStore.getState().activeTabIdByWorktree[worktreeId]).toBe(later)
-        expect(
-          useAppStore.getState().groupsByWorktree[worktreeId].find((row) => row.id === groupId)!
-            .tabOrder
-        ).toEqual(group.tabOrder)
-      } finally {
-        deadline.dispose()
-      }
-    }
-  }
-)
diff --git a/src/renderer/src/runtime/web-session-client-owned-tab-placement.ts b/src/renderer/src/runtime/web-session-client-owned-tab-placement.ts
index bfa23453c901..9ac23eefd73f 100644
--- a/src/renderer/src/runtime/web-session-client-owned-tab-placement.ts
+++ b/src/renderer/src/runtime/web-session-client-owned-tab-placement.ts
@@ -1,7 +1,5 @@
 import { structuredLaunchSlotIds } from '@/lib/agent-session/launch/structured-agent-session-launch-persistence'
-import type { Tab, TabGroup, TabGroupLayoutNode } from '../../../shared/tab-types'
-import type { SessionTabOpenPlacement } from '../../../shared/session-tab-placement'
-import { insertOpenPlacementTab } from '../lib/session-tab-open-placement-order'
+import type { TabGroup, TabGroupLayoutNode } from '../../../shared/tab-types'
 import {
   pickNextActiveTab,
   pushRecentTabId,
@@ -12,7 +10,6 @@ import {
 export type ClientOwnedAdoptedTab = {
   tabId: string
   groupId: string
-  openPlacement?: SessionTabOpenPlacement['placement']
 }
 
 export type ClientOwnedPlacementInput = {
@@ -22,7 +19,6 @@ export type ClientOwnedPlacementInput = {
   validUnifiedTabIds: ReadonlySet<string>
   /** Never-seen tabs in snapshot order; groupId is a hint (host group or fallback). */
   adoptedTabs: readonly ClientOwnedAdoptedTab[]
-  tabs?: readonly Tab[]
   /** Client-recorded placements; these are authoritative and may move an already-placed tab. */
   placementMoves: readonly ClientOwnedAdoptedTab[]
   /** Identity rekeys (provisional/local unified id → mirrored id); placement carries over. */
@@ -179,14 +175,7 @@ export function reconcileClientOwnedTabPlacement(
     }
     const target = ensureGroup(targetGroupId)
     if (!target.tabOrder.includes(adopted.tabId)) {
-      target.tabOrder = adopted.openPlacement
-        ? insertOpenPlacementTab(
-            target.tabOrder,
-            input.tabs ?? [],
-            adopted.tabId,
-            adopted.openPlacement
-          )
-        : [...target.tabOrder, adopted.tabId]
+      target.tabOrder.push(adopted.tabId)
     }
   }
 
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-base.ts b/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-base.ts
index bcc7b4ee70b3..02f59921677b 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-base.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-base.ts
@@ -34,7 +34,6 @@ import {
   isTerminalRowRetiredByHost
 } from './host-retired-terminal-rows'
 import { hostSnapshotAffirmsWorktreeContents } from '../host-session-snapshot-authority'
-import { prepareSnapshotOpenPlacements } from './open-placement'
 
 export function prepareWebSessionTabsSnapshotBase(
   state: WebSessionTabsSyncState,
@@ -45,7 +44,6 @@ export function prepareWebSessionTabsSnapshotBase(
   batchContext: WebSessionTabsBatchContext | undefined,
   options: WebSessionTabsSnapshotApplyOptions | undefined
 ) {
-  const openPlacements = prepareSnapshotOpenPlacements(state, rawSnapshot, environmentId, now)
   const snapshotHostTabId = (tab: RuntimeMobileSessionTabsResult['tabs'][number]): string =>
     tab.type === 'terminal' ? tab.parentTabId : tab.id
   reconcileWebSessionCloseIntents(
@@ -221,7 +219,6 @@ export function prepareWebSessionTabsSnapshotBase(
     now,
     batchContext,
     options,
-    openPlacements,
     focusIntent,
     matchingFocusIntentTab,
     callerFocusIntentTab,
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/apply-snapshot.ts b/src/renderer/src/runtime/web-session-tabs-sync/apply-snapshot.ts
index f3acaabf4f33..87333d16dfcf 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/apply-snapshot.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/apply-snapshot.ts
@@ -20,7 +20,6 @@ import { buildWebSessionTabsFinalPatch } from './apply-final-patch'
 import { isFrameDrawnServerWorkspace } from './frame-drawn-server-workspaces'
 import { buildFrameDrawnWorkspaceStatusPatch } from './frame-drawn-workspace-status-patch'
 import { indexMirroredTerminalSurfaces } from './mirrored-terminal-handle-index'
-import { applySnapshotOpenSelection } from './open-placement-selection'
 
 export function applyWebSessionTabsSnapshotWithContext(
   state: WebSessionTabsSyncState,
@@ -79,24 +78,5 @@ export function applyWebSessionTabsSnapshotWithContext(
   const browserRecords = applyBrowserRecordUpdates(terminalRecords)
   const worktreeRecords = applyWorktreeRecordUpdates(browserRecords)
   const activeState = applyActiveStateUpdates(worktreeRecords)
-  const patch = buildWebSessionTabsFinalPatch(activeState)
-  options?.offerOpenSelection?.((current, membership) =>
-    applySnapshotOpenSelection(
-      current,
-      membership,
-      worktreeId,
-      environmentId,
-      base.openPlacements,
-      unified.hostToLocalTabId,
-      true
-    )
-  )
-  return applySnapshotOpenSelection(
-    state,
-    patch,
-    worktreeId,
-    environmentId,
-    base.openPlacements,
-    unified.hostToLocalTabId
-  )
+  return buildWebSessionTabsFinalPatch(activeState)
 }
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/global-session-inventory-event.ts b/src/renderer/src/runtime/web-session-tabs-sync/global-session-inventory-event.ts
index 3ccc2cd55f1b..ad7eca835864 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/global-session-inventory-event.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/global-session-inventory-event.ts
@@ -131,14 +131,13 @@ export function handleGlobalSessionInventoryEvent({
         decisions[index]!.apply ? [snapshot] : []
       )
       settleHydration = applyWebSessionTabsStorePatch(
-        (state, changedAgentPaneKeys, offerOpenSelection) =>
+        (state, changedAgentPaneKeys) =>
           applyWebSessionTabsSnapshots(
             state,
             freshSnapshots,
             environmentId,
             undefined,
-            changedAgentPaneKeys,
-            { offerOpenSelection }
+            changedAgentPaneKeys
           ),
         {
           frames: applicable.map(({ snapshot }, index) => ({
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/load-initial.ts b/src/renderer/src/runtime/web-session-tabs-sync/load-initial.ts
index 8c5cec1ccf44..1bbcd81f03bc 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/load-initial.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/load-initial.ts
@@ -128,14 +128,13 @@ export function loadInitialWebSessionTabs({
         (latestReceivedSessionTabsInventoryFrameByEnvironment.get(environmentId) ?? 0) <=
           requestReceivedFrame
       settleHydration = applyWebSessionTabsStorePatch(
-        (state, changedAgentPaneKeys, offerOpenSelection) =>
+        (state, changedAgentPaneKeys) =>
           applyWebSessionTabsSnapshots(
             state,
             freshSnapshots,
             environmentId,
             undefined,
-            changedAgentPaneKeys,
-            { offerOpenSelection }
+            changedAgentPaneKeys
           ),
         {
           frames: applicable.map((snapshot, index) => ({
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/open-placement-read.ts b/src/renderer/src/runtime/web-session-tabs-sync/open-placement-read.ts
deleted file mode 100644
index 126ec13de170..000000000000
--- a/src/renderer/src/runtime/web-session-tabs-sync/open-placement-read.ts
+++ /dev/null
@@ -1,126 +0,0 @@
-import type { SessionTabOpenPlacement } from '../../../../shared/session-tab-placement'
-import type { RuntimeMobileSessionTabsResult } from '../../../../shared/runtime-types'
-import {
-  captureTerminalSurfaceIdentityFromRow,
-  isRetainedTerminalSurfaceIdentity
-} from '../../../../shared/terminal-tab-close'
-import { toWebTerminalSurfaceTabId } from '../../../../shared/terminal-surface-id'
-import { conversationSwitchViewerSelectionCurrent } from '../../lib/conversation-switch-selection'
-import { isWebSessionCloseIntentPending } from '../web-session-close-intent'
-import { LOCAL_STRUCTURED_SESSION_OWNER } from '../local-structured-session-owner'
-import { getRemoteRuntimePtyOwner } from '../runtime-terminal-stream'
-import { hostSessionTabIdsByLocalTabForWorktree } from './tracking-mappings'
-import type { WebSessionTabsSyncState } from './state'
-
-/** Call-local indexes of the same ordinary transaction input, never retained across applies. */
-export function createOpenPlacementRead(
-  state: WebSessionTabsSyncState,
-  worktreeId: string,
-  environmentId: string,
-  snapshot?: RuntimeMobileSessionTabsResult,
-  now = Date.now()
-) {
-  const tabs = state.unifiedTabsByWorktree[worktreeId] ?? []
-  const tabIds = new Set(tabs.map((tab) => tab.id))
-  const entityIds = new Map<string, Set<string>>()
-  for (const tab of tabs) {
-    const ids = entityIds.get(tab.contentType) ?? new Set<string>()
-    ids.add(tab.entityId)
-    entityIds.set(tab.contentType, ids)
-  }
-  const localByHost = new Map<string, string>()
-  for (const [localId, hostId] of hostSessionTabIdsByLocalTabForWorktree(
-    environmentId,
-    worktreeId
-  )) {
-    if (!localByHost.has(hostId)) {
-      localByHost.set(hostId, localId)
-    }
-  }
-  const terminalRows = new Map<string, (typeof state.tabsByWorktree)[string][number]>()
-  for (const row of state.tabsByWorktree[worktreeId] ?? []) {
-    if (!terminalRows.has(row.id)) {
-      terminalRows.set(row.id, row)
-    }
-  }
-  type Surface = Extract<NonNullable<typeof snapshot>['tabs'][number], { type: 'terminal' }>
-  const surfaces = new Map<string, Map<string, Surface>>()
-  for (const tab of snapshot?.tabs ?? []) {
-    if (tab.type === 'terminal') {
-      const leaves = surfaces.get(tab.parentTabId) ?? new Map<string, Surface>()
-      if (!leaves.has(tab.leafId)) {
-        leaves.set(tab.leafId, tab)
-      }
-      surfaces.set(tab.parentTabId, leaves)
-    }
-  }
-  const closingHostIds = new Set<string>()
-  for (const close of state.pairedTerminalTabCloseIntentsByEnvironment?.[environmentId] ?? []) {
-    if (close.worktreeId === worktreeId) {
-      for (const hostId of close.hostTabIds) {
-        closingHostIds.add(hostId)
-      }
-    }
-  }
-  const localTabId = (hostId: string): string => {
-    const mirroredId = toWebTerminalSurfaceTabId(hostId)
-    return (
-      localByHost.get(hostId) ??
-      (tabIds.has(hostId) ? hostId : tabIds.has(mirroredId) ? mirroredId : hostId)
-    )
-  }
-  return {
-    localTabId,
-    hasTab: (id: string) => tabIds.has(id),
-    hasEntity: (kind: string, id: string) => entityIds.get(kind)?.has(id) === true,
-    viewerSelectionCurrent: (original?: string): boolean =>
-      conversationSwitchViewerSelectionCurrent(original, state),
-    sourceCurrent: (intent: SessionTabOpenPlacement): boolean => {
-      const source = intent.source
-      if (!source) {
-        return true
-      }
-      const tabId = localTabId(source.tabId)
-      if (
-        source.worktreeId !== worktreeId ||
-        state.closedTerminalTabTombstonesByTabId?.[tabId] ||
-        closingHostIds.has(source.tabId) ||
-        isWebSessionCloseIntentPending({ environmentId }, worktreeId, source.tabId, now)
-      ) {
-        return false
-      }
-      const row = terminalRows.get(tabId)
-      const current = captureTerminalSurfaceIdentityFromRow(
-        state,
-        row,
-        worktreeId,
-        tabId,
-        source.leafId
-      )
-      if (environmentId === LOCAL_STRUCTURED_SESSION_OWNER || tabId === source.tabId) {
-        return isRetainedTerminalSurfaceIdentity(source, current)
-      }
-      const surface = surfaces.get(source.tabId)?.get(source.leafId)
-      if (surface) {
-        if (
-          (surface.ptyId != null && surface.ptyId !== source.ptyId) ||
-          (surface.incarnationId != null && surface.incarnationId !== source.incarnationId)
-        ) {
-          return false
-        }
-        if (
-          current?.ptyId &&
-          typeof surface.terminal === 'string' &&
-          getRemoteRuntimePtyOwner(current.ptyId)?.terminal !== surface.terminal
-        ) {
-          return false
-        }
-      }
-      // Mirror creation times belong to this viewer; host PTY/incarnation facts belong to the source.
-      return (
-        current === null ||
-        (current.generation === source.generation && (!current.hasLeaf || source.hasLeaf))
-      )
-    }
-  }
-}
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/open-placement-selection.ts b/src/renderer/src/runtime/web-session-tabs-sync/open-placement-selection.ts
deleted file mode 100644
index 6abc6e1ee6eb..000000000000
--- a/src/renderer/src/runtime/web-session-tabs-sync/open-placement-selection.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-import { isSessionTabSelectionRequest } from '../../../../shared/session-tab-placement'
-import { commitViewerSelection } from '@/lib/viewer-selection-request'
-import { isFloatingWorkspaceId } from '../../../../shared/floating-workspace-worktree'
-import { isWorkspaceKey, worktreeWorkspaceKey } from '../../../../shared/workspace-scope'
-import { appendHistoryEntry } from '../../store/slices/worktree-nav-history'
-import { tabActivationPatch } from '../../store/slices/tabs/tabs-focus-actions'
-import { deriveActiveSurfaceForWorktree } from '../../store/slices/tabs/tabs-surface'
-import { executionHostIdForSessionTabsOwner } from '../local-structured-session-owner'
-import type { SnapshotOpenPlacement } from './open-placement'
-import type { WebSessionTabsSyncState } from './state'
-import { snapshotOpenSelectionRecords } from './store-patch'
-
-/** Membership and original-view admission share one synchronous ordinary snapshot transaction. */
-export function applySnapshotOpenSelection(
-  state: WebSessionTabsSyncState,
-  patch: WebSessionTabsSyncState | Partial<WebSessionTabsSyncState>,
-  worktreeId: string,
-  environmentId: string,
-  placements: readonly SnapshotOpenPlacement[],
-  hostToLocalTabId: ReadonlyMap<string, string>,
-  consume = false,
-  onSelection?: (patch: Partial<WebSessionTabsSyncState>) => void
-): WebSessionTabsSyncState | Partial<WebSessionTabsSyncState> {
-  const requested =
-    placements.find(
-      (entry) => entry.activate && isSessionTabSelectionRequest(entry.intent.viewerSelection)
-    ) ?? placements.find((entry) => entry.activate)
-  if (!requested) {
-    return patch
-  }
-  const localId = hostToLocalTabId.get(requested.hostTabId)
-  return localId
-    ? applyOpenDestinationSelection(
-        state,
-        patch,
-        worktreeId,
-        environmentId,
-        localId,
-        requested.intent.viewerSelection,
-        consume,
-        onSelection
-      )
-    : patch
-}
-
-export function applyOpenDestinationSelection(
-  state: WebSessionTabsSyncState,
-  patch: Partial<WebSessionTabsSyncState>,
-  worktreeId: string,
-  environmentId: string,
-  tabId: string,
-  token: string | undefined,
-  consume: boolean,
-  onSelection?: (patch: Partial<WebSessionTabsSyncState>) => void
-): Partial<WebSessionTabsSyncState> {
-  if (token && isSessionTabSelectionRequest(token) && !consume) {
-    return patch
-  }
-  const next = { ...state, ...patch }
-  const tab = next.unifiedTabsByWorktree[worktreeId]?.find(
-    (row) => row.id === tabId || row.entityId === tabId
-  )
-  if (
-    !tab ||
-    !next.groupsByWorktree[worktreeId]?.some((group) => group.tabOrder.includes(tab.id))
-  ) {
-    return patch
-  }
-  const activation = tabActivationPatch(next, tab, worktreeId, { recordFocus: false }, true)
-  const activated = { ...next, ...activation }
-  const surface = deriveActiveSurfaceForWorktree(activated, worktreeId, tab.groupId, {
-    preferredTabId: tab.id
-  })
-  const selectionPatch = {
-    ...activation,
-    ...snapshotOpenSelectionRecords(next, worktreeId, surface),
-    ...(isFloatingWorkspaceId(worktreeId)
-      ? {}
-      : {
-          ...surface,
-          ...(state.worktreeNavHistory &&
-          state.worktreeNavHistoryIndex !== undefined &&
-          !state.isNavigatingHistory
-            ? appendHistoryEntry(
-                {
-                  worktreeNavHistory: state.worktreeNavHistory,
-                  worktreeNavHistoryIndex: state.worktreeNavHistoryIndex
-                },
-                worktreeId
-              )
-            : {}),
-          activeWorktreeId: worktreeId,
-          activeWorkspaceKey: isWorkspaceKey(worktreeId)
-            ? worktreeId
-            : worktreeWorkspaceKey(worktreeId),
-          activeWorkspaceExecutionHostId: executionHostIdForSessionTabsOwner(environmentId),
-          activePendingCreationId: null,
-          activeView: 'terminal' as const
-        })
-  }
-  if (token && isSessionTabSelectionRequest(token)) {
-    return consume && commitViewerSelection(token, { worktreeId, tabId: tab.id }, () => true)
-      ? (onSelection?.(selectionPatch), { ...patch, ...selectionPatch })
-      : patch
-  }
-  onSelection?.(selectionPatch)
-  return { ...patch, ...selectionPatch }
-}
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/open-placement.ts b/src/renderer/src/runtime/web-session-tabs-sync/open-placement.ts
deleted file mode 100644
index 050720394a20..000000000000
--- a/src/renderer/src/runtime/web-session-tabs-sync/open-placement.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import type { SessionTabOpenPlacement } from '../../../../shared/session-tab-placement'
-import type { RuntimeMobileSessionTabsResult } from '../../../../shared/runtime-types'
-import { createOpenPlacementRead } from './open-placement-read'
-import { LOCAL_STRUCTURED_SESSION_OWNER } from '../local-structured-session-owner'
-import type { WebSessionTabsSyncState } from './state'
-
-export type SnapshotOpenPlacement = {
-  hostTabId: string
-  intent: SessionTabOpenPlacement
-  placement: SessionTabOpenPlacement['placement']
-  activate: boolean
-}
-
-export function localOpenPlacementTabId(
-  state: WebSessionTabsSyncState,
-  worktreeId: string,
-  hostTabId: string,
-  environmentId: string
-): string {
-  return createOpenPlacementRead(state, worktreeId, environmentId).localTabId(hostTabId)
-}
-
-/** Placement never grants authority over a source the user closed or replaced. */
-export function openPlacementSourceCurrent(
-  state: WebSessionTabsSyncState,
-  worktreeId: string,
-  intent: SessionTabOpenPlacement,
-  environmentId = LOCAL_STRUCTURED_SESSION_OWNER,
-  snapshot?: RuntimeMobileSessionTabsResult,
-  now = Date.now()
-): boolean {
-  return (
-    !intent.source ||
-    createOpenPlacementRead(state, worktreeId, environmentId, snapshot, now).sourceCurrent(intent)
-  )
-}
-
-/** Read before close-ledger reconciliation and identity-map replacement in the same apply. */
-export function prepareSnapshotOpenPlacements(
-  state: WebSessionTabsSyncState,
-  snapshot: RuntimeMobileSessionTabsResult,
-  environmentId: string,
-  now: number
-): SnapshotOpenPlacement[] {
-  let read: ReturnType<typeof createOpenPlacementRead> | undefined
-  return snapshot.tabs.flatMap((tab) => {
-    if (tab.type !== 'terminal' && tab.type !== 'agent-session') {
-      return []
-    }
-    const intent = tab.openPlacement
-    if (!intent) {
-      return []
-    }
-    read ??= createOpenPlacementRead(state, snapshot.worktree, environmentId, snapshot, now)
-    if (!read.sourceCurrent(intent)) {
-      return []
-    }
-    const hostTabId = tab.type === 'terminal' ? tab.parentTabId : tab.id
-    const currentId = read.localTabId(hostTabId)
-    const alreadyPresent =
-      read.hasTab(currentId) ||
-      (tab.type === 'agent-session' && read.hasEntity('agent-session', tab.sessionId))
-    return [
-      {
-        hostTabId,
-        intent,
-        placement: {
-          ...intent.placement,
-          ...(intent.placement.afterTabId
-            ? {
-                afterTabId: read.localTabId(intent.placement.afterTabId)
-              }
-            : {})
-        },
-        activate:
-          intent.activate &&
-          (!alreadyPresent || intent.viewerSelection !== undefined) &&
-          read.viewerSelectionCurrent(intent.viewerSelection)
-      }
-    ]
-  })
-}
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/snapshot-api.ts b/src/renderer/src/runtime/web-session-tabs-sync/snapshot-api.ts
index 5477d915d281..7e549997c665 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/snapshot-api.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/snapshot-api.ts
@@ -1,6 +1,5 @@
 import type { RuntimeMobileSessionTabsResult } from '../../../../shared/runtime-types'
 import type {
-  SnapshotOpenSelectionOffer,
   WebSessionTabsBatchContext,
   WebSessionTabsSnapshotApplyOptions,
   WebSessionTabsSyncState
@@ -44,19 +43,8 @@ export function createWebSessionTabsSnapshotPatch(
   snapshot: RuntimeMobileSessionTabsResult,
   environmentId: string
 ) {
-  return (
-    state: WebSessionTabsSyncState,
-    keys: Set<string>,
-    offerOpenSelection?: (offer: SnapshotOpenSelectionOffer) => void
-  ) =>
-    applyWebSessionTabsSnapshot(
-      state,
-      snapshot,
-      environmentId,
-      undefined,
-      { offerOpenSelection },
-      keys
-    )
+  return (state: WebSessionTabsSyncState, keys: Set<string>) =>
+    applyWebSessionTabsSnapshot(state, snapshot, environmentId, undefined, undefined, keys)
 }
 
 export function applyWebSessionTabsSnapshots(
@@ -147,8 +135,7 @@ export function decideWebSessionTabsSnapshotOperations(
 export function applyWebSessionTabsSnapshotOperations(
   state: WebSessionTabsSyncState,
   operations: readonly DecidedWebSessionTabsSnapshotOperation[],
-  changedAgentPaneKeys?: Set<string>,
-  options?: WebSessionTabsSnapshotApplyOptions
+  changedAgentPaneKeys?: Set<string>
 ): WebSessionTabsSyncState | Partial<WebSessionTabsSyncState> {
   let nextState = state
   let mergedPatch: Partial<WebSessionTabsSyncState> = {}
@@ -161,7 +148,7 @@ export function applyWebSessionTabsSnapshotOperations(
       snapshot,
       environmentId,
       undefined,
-      options,
+      undefined,
       changedAgentPaneKeys
     )
     if (patch === nextState) {
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/state.ts b/src/renderer/src/runtime/web-session-tabs-sync/state.ts
index 1ba5ff10479b..4db715f9adda 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/state.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/state.ts
@@ -61,13 +61,7 @@ export type SessionTabsRuntimeHistory = RetiredValueHistory
 /** Bounded retired-epoch history prevents sibling streams’ delayed frames rolling back accepted replacements after restart. */
 export type SessionTabsPublicationEpochHistory = RetiredValueHistory
 
-export type SnapshotOpenSelectionOffer = (
-  state: WebSessionTabsSyncState,
-  patch: Partial<WebSessionTabsSyncState>
-) => Partial<WebSessionTabsSyncState>
-
 export type WebSessionTabsSnapshotApplyOptions = {
-  offerOpenSelection?: (offer: SnapshotOpenSelectionOffer) => void
   contentScope?: 'all' | 'agent-session'
   preserveLocalLayout?: boolean
   terminalPtyMode?: 'local' | 'remote'
@@ -237,15 +231,6 @@ export type WebSessionTabsSyncState = Pick<
   Partial<
     Pick<
       AppState,
-      | 'activeWorkspaceExecutionHostId'
-      | 'activeWorkspaceKey'
-      | 'activePendingCreationId'
-      | 'activeView'
-      | 'worktreeNavHistory'
-      | 'worktreeNavHistoryIndex'
-      | 'isNavigatingHistory'
-      | 'closedTerminalTabTombstonesByTabId'
-      | 'pairedTerminalTabCloseIntentsByEnvironment'
       | 'acknowledgedAgentsByPaneKey'
       | 'activityClearedAtByPaneKey'
       | 'agentLaunchConfigByPaneKey'
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/store-patch.ts b/src/renderer/src/runtime/web-session-tabs-sync/store-patch.ts
index ff9840710026..682ce6064dcb 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/store-patch.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/store-patch.ts
@@ -1,10 +1,3 @@
-import { applyOpenDestinationSelection } from './open-placement-selection'
-import { runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/worktree-runtime-owner'
-import { LOCAL_STRUCTURED_SESSION_OWNER } from '../local-structured-session-owner'
-import {
-  observeSwitchProjections,
-  protectSwitchProjections
-} from '@/lib/conversation-switch-projection'
 import {
   markStructuredAgentSessionLaunchesPublished,
   publishedStructuredSessions
@@ -27,7 +20,6 @@ import { agentStatusEntryEqual } from './state-equality-core'
 import {
   HOST_WORKING_CLIENT_BOUNDARY_LIMIT,
   hostWorkingClientBoundaryByPaneKey,
-  type SnapshotOpenSelectionOffer,
   type WebSessionTabsSyncState
 } from './state'
 import { reportVisibleTabPickToHost } from '../web-session-visible-tab-pick-report'
@@ -37,58 +29,11 @@ import {
   type HostSessionMirrorSettle
 } from './mirror-settle'
 
-export function snapshotOpenSelectionRecords(
-  state: WebSessionTabsSyncState,
-  worktreeId: string,
-  surface: Pick<WebSessionTabsSyncState, 'activeTabId' | 'activeTabType'>
-): Pick<WebSessionTabsSyncState, 'activeTabIdByWorktree' | 'activeTabTypeByWorktree'> {
-  return {
-    activeTabIdByWorktree: { ...state.activeTabIdByWorktree, [worktreeId]: surface.activeTabId },
-    activeTabTypeByWorktree: {
-      ...state.activeTabTypeByWorktree,
-      [worktreeId]: surface.activeTabType
-    }
-  }
-}
-
-/** The ordinary snapshot selection writer also handles an addressed publication/focus offer. */
-export function selectSessionTabForViewer(
-  worktreeId: string,
-  tabId: string,
-  viewerSelection: string,
-  environmentId = runtimeEnvironmentIdOrLocalUnlessTwin(useAppStore.getState(), worktreeId) ??
-    LOCAL_STRUCTURED_SESSION_OWNER
-): boolean {
-  let selected = false
-  applyWebSessionTabsStorePatch(
-    (_state, _keys, offer) => {
-      offer((state, patch) =>
-        applyOpenDestinationSelection(
-          state,
-          patch,
-          worktreeId,
-          environmentId,
-          tabId,
-          viewerSelection,
-          true,
-          () => {
-            selected = true
-          }
-        )
-      )
-      return {}
-    },
-    { frames: [] }
-  )()
-  return selected
-}
-
 /** Commit a reconciliation patch and return a receipt for its host evidence. */
 export function applyWebSessionTabsStorePatch(
   buildPatch: (
     state: AppState,
-    changedAgentPaneKeys: Set<string>,
-    offerOpenSelection: (offer: SnapshotOpenSelectionOffer) => void
+    changedAgentPaneKeys: Set<string>
   ) => WebSessionTabsSyncState | Partial<WebSessionTabsSyncState>,
   hostMirrorVerdict: HostSessionMirrorPatchVerdict,
   agentStatusSnapshots?: RuntimeMobileSessionTabsResult | readonly RuntimeMobileSessionTabsResult[],
@@ -113,18 +58,7 @@ export function applyWebSessionTabsStorePatch(
     state: AppState,
     changedAgentPaneKeys: Set<string>
   ): WebSessionTabsSyncState | Partial<WebSessionTabsSyncState> => {
-    for (const snapshot of agentStatusSnapshots
-      ? Array.isArray(agentStatusSnapshots)
-        ? agentStatusSnapshots
-        : [agentStatusSnapshots]
-      : []) {
-      observeSwitchProjections(state, snapshot, () => {})
-    }
-    const offers: SnapshotOpenSelectionOffer[] = []
-    let patch = protectSwitchProjections(
-      state,
-      buildPatch(state, changedAgentPaneKeys, (offer) => offers.push(offer))
-    )
+    const patch = buildPatch(state, changedAgentPaneKeys)
     mirroredAgentStatusChanged = patch !== state && Object.hasOwn(patch, 'agentStatusByPaneKey')
     if (agentStatusSnapshots) {
       const nextAgentStatuses = patch.agentStatusByPaneKey ?? state.agentStatusByPaneKey
@@ -247,9 +181,6 @@ export function applyWebSessionTabsStorePatch(
         }
       }
     }
-    for (const offer of offers) {
-      patch = offer(state, patch)
-    }
     patchCommitted = true
     return patch
   }
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/visibility-resume-repair.ts b/src/renderer/src/runtime/web-session-tabs-sync/visibility-resume-repair.ts
index b95128cb92d5..7bb5eafb9baa 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/visibility-resume-repair.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/visibility-resume-repair.ts
@@ -15,10 +15,8 @@ export function applyVisibilityResumeRepairs(
   }
   const decided = decideWebSessionTabsSnapshotOperations(operations)
   const settle = applyWebSessionTabsStorePatch(
-    (state, changedAgentPaneKeys, offerOpenSelection) =>
-      applyWebSessionTabsSnapshotOperations(state, decided, changedAgentPaneKeys, {
-        offerOpenSelection
-      }),
+    (state, changedAgentPaneKeys) =>
+      applyWebSessionTabsSnapshotOperations(state, decided, changedAgentPaneKeys),
     {
       frames: decided.map(({ environmentId, snapshot, decision }) => ({
         environmentId,
diff --git a/src/renderer/src/runtime/workspace-layout-frame-flush-plan.ts b/src/renderer/src/runtime/workspace-layout-frame-flush-plan.ts
index 7575810c29d0..086423bac1fd 100644
--- a/src/renderer/src/runtime/workspace-layout-frame-flush-plan.ts
+++ b/src/renderer/src/runtime/workspace-layout-frame-flush-plan.ts
@@ -3,8 +3,6 @@ import type { WorkspaceLayoutCache } from '@/store/workspace-layout-cache'
 import type { TerminalTabTitleUpdate } from '@/store/slices/terminal-tab-title-batch'
 import type { PendingWorkspaceChanges } from './workspace-layout-frame-pending'
 import type { LayoutFrameSource } from './layout-frame-stream'
-import { LOCAL_STRUCTURED_SESSION_OWNER } from './local-structured-session-owner'
-import { frameOpenPlacements } from './workspace-layout-frame-open-selection'
 import { liveTitleUpdates } from './workspace-layout-frame-changes'
 
 /** Classify and take accumulated frame work before the ordinary store writer builds it. */
@@ -15,10 +13,6 @@ export function planLayoutFrameFlush(
   shown: Set<string>,
   source: LayoutFrameSource
 ) {
-  const owner =
-    source.target.kind === 'environment'
-      ? source.target.environmentId
-      : LOCAL_STRUCTURED_SESSION_OWNER
   const drawn = source.draws(state)
   const changed: string[] = []
   const fullBuilt: string[] = []
@@ -27,11 +21,7 @@ export function planLayoutFrameFlush(
   const titleUpdates: TerminalTabTitleUpdate[] = []
   for (const [key, layout] of Object.entries(cache)) {
     const changes = pending.get(key)
-    const opensHere =
-      !drawn(key) &&
-      frameOpenPlacements(state, layout, owner).some((entry) => entry.activate) &&
-      source.draws(state, new Set([key]))(key)
-    if (!drawn(key) && !opensHere) {
+    if (!drawn(key)) {
       // Frames the window did not draw: its next draw takes the full build.
       if (changes) {
         shown.delete(key)
diff --git a/src/renderer/src/runtime/workspace-layout-frame-open-selection.ts b/src/renderer/src/runtime/workspace-layout-frame-open-selection.ts
deleted file mode 100644
index 7207861bbdb9..000000000000
--- a/src/renderer/src/runtime/workspace-layout-frame-open-selection.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import type { AppState } from '@/store/types'
-import type { PublishedWorkspaceLayout } from '../../../shared/workspace-layout/workspace-layout-published'
-import type { WorkspaceLayoutCache } from '@/store/workspace-layout-cache'
-import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
-import { LOCAL_STRUCTURED_SESSION_OWNER } from './local-structured-session-owner'
-import type { SnapshotOpenPlacement } from './web-session-tabs-sync/open-placement'
-import { createOpenPlacementRead } from './web-session-tabs-sync/open-placement-read'
-import { applySnapshotOpenSelection } from './web-session-tabs-sync/open-placement-selection'
-
-/** Frames already carry main's applied layout; only original-view selection remains window-owned. */
-export function frameOpenSelectionPatch(
-  before: AppState,
-  patch: Partial<AppState>,
-  cache: WorkspaceLayoutCache,
-  keys: readonly string[],
-  target: RuntimeClientTarget,
-  consume = false,
-  onSelection?: (patch: Partial<AppState>) => void
-): Partial<AppState> {
-  const owner =
-    target.kind === 'environment' ? target.environmentId : LOCAL_STRUCTURED_SESSION_OWNER
-  let next = patch
-  for (const key of keys) {
-    const layout = cache[key]
-    if (!layout) {
-      continue
-    }
-    const placements = frameOpenPlacements(before, layout, owner)
-    next = applySnapshotOpenSelection(
-      before,
-      next,
-      key,
-      owner,
-      placements,
-      new Map(layout.tabs.map((tab) => [tab.id, tab.id])),
-      consume,
-      onSelection
-    )
-  }
-  return next
-}
-
-/** Only an admitted explicit open asks the existing draw owner to materialize an unheld workspace. */
-export function frameOpenPlacements(
-  before: AppState,
-  layout: PublishedWorkspaceLayout,
-  owner: string
-): SnapshotOpenPlacement[] {
-  let read: ReturnType<typeof createOpenPlacementRead> | undefined
-  return layout.tabs.flatMap((tab) => {
-    const intent = tab.openPlacement
-    if (!intent?.activate) {
-      return []
-    }
-    read ??= createOpenPlacementRead(before, layout.worktreeId, owner)
-    if (!read.viewerSelectionCurrent(intent.viewerSelection) || !read.sourceCurrent(intent)) {
-      return []
-    }
-    const alreadyPresent = read.hasTab(tab.id) || read.hasEntity(tab.kind, tab.entityId)
-    return [
-      {
-        hostTabId: tab.id,
-        intent,
-        placement: intent.placement,
-        activate: !alreadyPresent || intent.viewerSelection !== undefined
-      }
-    ]
-  })
-}
diff --git a/src/renderer/src/runtime/workspace-layout-frame-sync.test.ts b/src/renderer/src/runtime/workspace-layout-frame-sync.test.ts
index db2f7abbad2a..cf5fdaf884cf 100644
--- a/src/renderer/src/runtime/workspace-layout-frame-sync.test.ts
+++ b/src/renderer/src/runtime/workspace-layout-frame-sync.test.ts
@@ -1,19 +1,6 @@
-import {
-  beginViewerSelectionRequest,
-  disposeViewerSelection,
-  viewerSelectionOutcome
-} from '@/lib/viewer-selection-request'
-import { agentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
-import {
-  captureSwitchProjection,
-  retireSwitchProjection,
-  disposeSwitchProjections
-} from '@/lib/conversation-switch-projection'
-import { noteUserWorkspaceSwitch } from '@/lib/workspace-switch-user-act'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type * as AgentStatusModule from '@/lib/agent-status'
 import type { ExecutionHostId } from '../../../shared/execution-host'
-import type { PublishedTab } from '../../../shared/workspace-layout/workspace-layout-published'
 import type { WorkspaceSessionState } from '../../../shared/workspace-session-state-types'
 import { LEGACY_WORKSPACE_LAYOUT_PROFILES } from '../../../shared/workspace-layout/workspace-layout-legacy-profile.test-fixture'
 import {
@@ -22,8 +9,6 @@ import {
 } from '../../../shared/workspace-layout/workspace-layout-profile.test-fixture'
 import type { WorkspaceLayoutChangeFrame } from '../../../shared/workspace-layout/workspace-layout-stream-frames'
 import {
-  addWorkspace,
-  leaf,
   emptySession,
   GIT_KEY
 } from '../../../shared/workspace-layout/workspace-layout-session.test-fixture'
@@ -44,8 +29,6 @@ import {
   mainLayoutFrameSender,
   mainLoadedLayouts
 } from './main-loaded-layout-frames.test-fixture'
-import { countOpenPlacementWork } from './open-placement-work-counter.test-fixture'
-import * as frameFlushPlan from './workspace-layout-frame-flush-plan'
 import { installLayoutFrameApplyCheck } from './workspace-layout-frame-apply-check.test-fixture'
 
 vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } }))
@@ -135,8 +118,6 @@ beforeEach(() => {
   check = installLayoutFrameApplyCheck()
 })
 afterEach(() => {
-  disposeViewerSelection()
-  disposeSwitchProjections()
   endLayoutFramePositions()
   check.uninstall()
   expect(check.failures).toEqual([])
@@ -451,231 +432,3 @@ describe('the window drawn from layout frames', () => {
     sync.close()
   })
 })
-
-it.each([false, true])(
-  'selects once after natural retirement and a real coalesced frame; later re-click=%s',
-  async (navigate) => {
-    const session = addWorkspace(emptySession(), GIT_KEY, [
-      {
-        id: 'G',
-        activeTabId: 'A',
-        recent: ['C'],
-        tabs: [
-          {
-            id: 'A',
-            entityId: 'canonical-A',
-            kind: 'agent-session',
-            entry: { agentSessionAgent: 'codex' }
-          },
-          { id: 'B', leaves: [[leaf(1), 'pty-B']] },
-          { id: 'C', leaves: [[leaf(2), 'pty-C']] }
-        ]
-      }
-    ])
-    const { store, sync, layouts, frames } = await bootWithFrames('local', session)
-    const deadline = agentSessionSwitchDeadline(Date.now)
-    sync.start()
-    await flushMicrotasks()
-    try {
-      const request = beginViewerSelectionRequest('frame-switch', deadline)
-      request.accept()
-      const proposal = {
-        invocationId: 'frame-switch',
-        generation: 'generation',
-        sessionId: 'canonical-A',
-        tabId: 'A',
-        phase: 'prepare' as const
-      }
-      captureSwitchProjection(store.getState(), GIT_KEY, proposal, () => {})
-      const retired = retireSwitchProjection(store.getState(), { ...proposal, phase: 'retire' })
-      expect(retired).not.toBeNull()
-      store.setState(retired!)
-      const siblingTree = store.getState().terminalLayoutsByTabId.B
-      const fallback = store.getState().groupsByWorktree[GIT_KEY][0].activeTabId
-      expect(fallback).toBe('C')
-      if (navigate) {
-        // The ordinary explicit tab ingress counts even a re-click at the automatic fallback.
-        noteUserWorkspaceSwitch(GIT_KEY)
-        store.getState().activateTab('C', { worktreeId: GIT_KEY })
-      }
-      const destination = structuredClone(layouts[GIT_KEY]!)
-      destination.tabs = destination.tabs.filter((tab) => tab.id !== 'A')
-      const published: PublishedTab = {
-        id: 'D',
-        entityId: 'D',
-        kind: 'terminal',
-        createdAt: 123,
-        customTitle: null,
-        color: null,
-        executionHostId: 'local',
-        terminal: {
-          root: { type: 'leaf', leafId: leaf(3) },
-          panes: [{ leafId: leaf(3), ptyId: 'pty-D' }]
-        },
-        openPlacement: {
-          invocationId: 'frame-switch',
-          generation: 'generation',
-          placement: { groupId: 'G', index: 0 },
-          activate: true,
-          viewerSelection: request.token
-        }
-      }
-      destination.tabs.unshift(published)
-      destination.groups[0].tabIds = ['D', 'B', 'C']
-      stream.onFrame!(frames.records(GIT_KEY, destination))
-      await flushMicrotasks()
-      expect(store.getState().groupsByWorktree[GIT_KEY][0].tabOrder).toEqual(['D', 'B', 'C'])
-      expect(store.getState().groupsByWorktree[GIT_KEY][0].activeTabId).toBe(navigate ? 'C' : 'D')
-      expect(store.getState().terminalLayoutsByTabId.B).toEqual(siblingTree)
-      expect(viewerSelectionOutcome(request.token)).toBe(navigate ? 'superseded' : 'fulfilled')
-      stream.onFrame!(frames.snapshot({ [GIT_KEY]: destination }))
-      await flushMicrotasks()
-      expect(store.getState().groupsByWorktree[GIT_KEY][0].activeTabId).toBe(navigate ? 'C' : 'D')
-    } finally {
-      deadline.dispose()
-      sync.close()
-    }
-  }
-)
-
-it.each([10, 100])(
-  'bounds retained undrawn metadata discovery on an unrelated coalesced frame flush (%i destinations)',
-  async (count) => {
-    const visible = addWorkspace(emptySession(), GIT_KEY, [
-      { id: 'visible', tabs: [{ id: 'C', leaves: [[leaf(1), 'pty-C']] }] }
-    ])
-    const store = createTestStore()
-    await bootWindowFromPartitions(store, [{ hostId: 'local', session: visible }])
-    const session = structuredClone(visible)
-    const undrawnKeys = ['folder:undrawn-one', 'folder:undrawn-two']
-    for (const [workspaceIndex, key] of undrawnKeys.entries()) {
-      addWorkspace(session, key, [
-        {
-          id: `undrawn-${workspaceIndex}`,
-          tabs: Array.from(
-            { length: count / 2 },
-            (_, i): { id: string; leaves: [string, string][] } => {
-              const n = (workspaceIndex * count) / 2 + i
-              return {
-                id: `D-${n}`,
-                leaves: [
-                  [`10000000-0000-4000-8000-${String(n + 2).padStart(12, '0')}`, `pty-D-${n}`]
-                ]
-              }
-            }
-          )
-        }
-      ])
-    }
-    const layouts = mainLoadedLayouts('local', session)
-    const deadline = agentSessionSwitchDeadline(Date.now)
-    const sync = openWorkspaceLayoutFrameSync(store)
-    let counter: ReturnType<typeof countOpenPlacementWork> | undefined
-    let restorePlan: (() => void) | undefined
-    try {
-      const tokens: string[] = []
-      for (const key of undrawnKeys) {
-        for (const tab of layouts[key].tabs) {
-          const request = beginViewerSelectionRequest(`cached-${tab.id}`, deadline)
-          request.accept()
-          tokens.push(request.token)
-          tab.openPlacement = {
-            invocationId: `cached-${tab.id}`,
-            generation: `generation-${tab.id}`,
-            placement: { groupId: layouts[key].groups[0].id, index: 0 },
-            activate: true,
-            viewerSelection: request.token,
-            source: {
-              worktreeId: key,
-              tabId: `absent-source-${tab.id}`,
-              leafId: leaf(1),
-              createdAt: 1,
-              generation: 0,
-              hasLeaf: true,
-              ptyId: `source-pty-${tab.id}`,
-              incarnationId: null
-            }
-          }
-        }
-      }
-      const visibleRequest = beginViewerSelectionRequest('visible-choice', deadline)
-      visibleRequest.accept()
-      // An unchanged startup patch is discarded before the selection writer; publish a real change.
-      layouts[GIT_KEY].tabs[0].customTitle = 'initial publication'
-      layouts[GIT_KEY].tabs[0].openPlacement = {
-        invocationId: 'visible-choice',
-        generation: 'visible-generation',
-        placement: { groupId: 'visible', index: 0 },
-        activate: true,
-        viewerSelection: visibleRequest.token
-      }
-      const frames = mainLayoutFrameSender()
-      stream.onFrame!(frames.snapshot(layouts))
-      sync.start()
-      await flushMicrotasks()
-      expect(viewerSelectionOutcome(visibleRequest.token)).toBe('fulfilled')
-      expect(tokens.map(viewerSelectionOutcome)).toEqual(
-        Array.from({ length: count }, () => 'superseded')
-      )
-      for (const key of undrawnKeys) {
-        expect(store.getState().unifiedTabsByWorktree[key]).toBeUndefined()
-        expect(store.getState().tabsByWorktree[key]).toBeUndefined()
-      }
-      counter = countOpenPlacementWork()
-      const plan = vi.spyOn(frameFlushPlan, 'planLayoutFrameFlush')
-      restorePlan = () => plan.mockRestore()
-      const changed = structuredClone(layouts[GIT_KEY])
-      changed.tabs[0].customTitle = 'first update'
-      stream.onFrame!(frames.records(GIT_KEY, changed))
-      changed.tabs[0].customTitle = 'second update'
-      stream.onFrame!(frames.records(GIT_KEY, changed))
-      await flushMicrotasks()
-      expect(plan).toHaveBeenCalledTimes(1)
-      expect(plan.mock.results[0].value).toMatchObject({ fullBuilt: [], workspaceBuilt: [GIT_KEY] })
-      expect(counter.builtKeys).toEqual([[GIT_KEY]])
-      expect(counter.visits).toEqual([
-        ...undrawnKeys.map((worktreeId) => ({ pass: 'discovery', worktreeId, rows: count / 2 })),
-        { pass: 'writer', worktreeId: GIT_KEY, rows: 2 }
-      ])
-      expect(counter.reads).toEqual([
-        ...undrawnKeys.map((worktreeId) => ({
-          pass: 'discovery',
-          worktreeId,
-          tabRows: 0,
-          terminalRows: 0,
-          snapshotRows: 0,
-          mappingCopies: 0,
-          mappingRows: 0,
-          sourceChecks: 0,
-          viewerChecks: count / 2,
-          destinationLookups: 0
-        })),
-        {
-          pass: 'writer',
-          worktreeId: GIT_KEY,
-          tabRows: 2,
-          terminalRows: 1,
-          snapshotRows: 0,
-          mappingCopies: 0,
-          mappingRows: 0,
-          sourceChecks: 0,
-          viewerChecks: 1,
-          destinationLookups: 0
-        }
-      ])
-      expect(counter.fingerprints()).toBe(0)
-      expect(store.getState().groupsByWorktree[GIT_KEY][0].activeTabId).toBe('C')
-      expect(store.getState().tabsByWorktree[GIT_KEY][0].customTitle).toBe('second update')
-      for (const key of undrawnKeys) {
-        expect(store.getState().unifiedTabsByWorktree[key]).toBeUndefined()
-        expect(store.getState().tabsByWorktree[key]).toBeUndefined()
-      }
-      expect(viewerSelectionOutcome(visibleRequest.token)).toBe('fulfilled')
-    } finally {
-      restorePlan?.()
-      counter?.stop()
-      sync.close()
-      deadline.dispose()
-    }
-  }
-)
diff --git a/src/renderer/src/runtime/workspace-layout-frame-sync.ts b/src/renderer/src/runtime/workspace-layout-frame-sync.ts
index a890f68c592a..c229a1a7b24a 100644
--- a/src/renderer/src/runtime/workspace-layout-frame-sync.ts
+++ b/src/renderer/src/runtime/workspace-layout-frame-sync.ts
@@ -1,6 +1,5 @@
 // Layout-owner windows draw main’s locally owned, held workspaces; paired servers remain mirror-owned. Local tab changes stay drawn until main answers (layout-owner-drawn-tab-holds). Records frames apply binding/title deltas directly and rebuild other changed workspaces from store. Startup/reopen/new/whole workspaces use full save/Loader builds (E2a/E2b).
 
-import { frameOpenSelectionPatch } from './workspace-layout-frame-open-selection'
 import { showFramePatch, withMovedTabsSelected } from '@/store/slices/tabs/moved-tab-selection'
 import type { AppState } from '@/store/types'
 import type { TerminalTab } from '../../../shared/terminal-tab-types'
@@ -50,7 +49,7 @@ import {
 
 type FrameSyncStore = {
   getState: () => AppState
-  setState: (patch: Partial<AppState> | ((state: AppState) => Partial<AppState>)) => void
+  setState: (patch: Partial<AppState>) => void
   subscribe: (listener: (state: AppState) => void) => () => void
 }
 
@@ -84,11 +83,8 @@ export function openWorkspaceLayoutFrameSync(
 
   /** The moved tabs' selections this flush's writes took. */
   let selectionsTaken: MovedTabSelection[] = []
-  const show = (
-    patch: LayoutFrameBuildPatch | ((current: AppState) => LayoutFrameBuildPatch),
-    select?: (current: AppState, accepted: Partial<AppState>) => Partial<AppState>
-  ): void => {
-    selectionsTaken.push(...showFramePatch(store, patch, select))
+  const show = (patch: LayoutFrameBuildPatch): void => {
+    selectionsTaken.push(...showFramePatch(store, patch))
   }
 
   // Pane trees show at once; only a tab the window's own pane command holds waits.
@@ -133,24 +129,10 @@ export function openWorkspaceLayoutFrameSync(
     // One update: a move's or rename's content rekeys with the frame that shows it.
     const rekeyed = shownContentRekeyPatch(state, cache)
     const base: AppState = { ...state, ...rekeyed }
-    const membership = {
+    show({
       ...rekeyed,
       ...layoutFrameFlushPatch(base, cache, { fullBuilt, workspaceBuilt, rebound }, holds)
-    }
-    let openSelectionTaken: Partial<AppState> = {}
-    show(membership, (current, accepted) =>
-      frameOpenSelectionPatch(
-        current,
-        accepted,
-        cache,
-        [...fullBuilt, ...workspaceBuilt],
-        source.target,
-        true,
-        (selection) => {
-          openSelectionTaken = { ...openSelectionTaken, ...selection }
-        }
-      )
-    )
+    })
     if (titleUpdates.length > 0) {
       store.getState().updateTabTitles(titleUpdates)
     }
@@ -180,13 +162,7 @@ export function openWorkspaceLayoutFrameSync(
       workspaceBuilt,
       rowFieldsTaken,
       held: holds.held,
-      selectTakenMovedTabs: (built) => {
-        const moved = withMovedTabsSelected(built, selectionsTaken)
-        return {
-          ...moved,
-          ...openSelectionTaken
-        }
-      }
+      selectTakenMovedTabs: (state) => withMovedTabsSelected(state, selectionsTaken)
     })
     followHeldTabs()
   }
diff --git a/src/renderer/src/store/slices/browser/browser-tab-actions.ts b/src/renderer/src/store/slices/browser/browser-tab-actions.ts
index a143bbcc6ddd..22105d6c894f 100644
--- a/src/renderer/src/store/slices/browser/browser-tab-actions.ts
+++ b/src/renderer/src/store/slices/browser/browser-tab-actions.ts
@@ -1,4 +1,3 @@
-import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { createBrowserUuid } from '@/lib/browser-uuid'
 import { translate } from '@/i18n/i18n'
 import type { BrowserSlice, BrowserSliceGet, BrowserSliceSet } from './browser-slice-contract'
@@ -178,7 +177,6 @@ export function createBrowserTabActions(
     },
 
     openNewBrowserTabInActiveWorkspace: async (groupId, splitDirection) => {
-      noteViewerNavigation()
       const state = get()
       // Why: the invoking group owns its workspace; global selection may already point elsewhere.
       const worktreeId =
diff --git a/src/renderer/src/store/slices/editor/actions/markdown-preview-actions.ts b/src/renderer/src/store/slices/editor/actions/markdown-preview-actions.ts
index 18214fb916df..2b576c451ba8 100644
--- a/src/renderer/src/store/slices/editor/actions/markdown-preview-actions.ts
+++ b/src/renderer/src/store/slices/editor/actions/markdown-preview-actions.ts
@@ -1,4 +1,3 @@
-import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import type { EditorGet, EditorSet } from '../types/editor-set-get'
 import type { EditorSlice } from '../types/editor-slice'
 import { createUntitledMarkdownFileWithTemplateSelection } from '@/lib/create-untitled-markdown'
@@ -46,7 +45,6 @@ export function createMarkdownPreviewActions(
 > {
   return {
     openNewMarkdownInActiveWorkspace: async (groupId) => {
-      noteViewerNavigation()
       const created = await createUntitledFileInActiveWorkspace(
         get,
         groupId,
diff --git a/src/renderer/src/store/slices/settings.ts b/src/renderer/src/store/slices/settings.ts
index 55979754568f..70e33babea43 100644
--- a/src/renderer/src/store/slices/settings.ts
+++ b/src/renderer/src/store/slices/settings.ts
@@ -1,4 +1,3 @@
-import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { normalizeNativeChatAppearanceSettings } from '../../../../shared/native-chat/native-chat-appearance-settings'
 import type { StateCreator } from 'zustand'
 import type { AppState } from '../types'
@@ -242,7 +241,6 @@ export const createSettingsSlice: StateCreator<AppState, [], [], SettingsSlice>
   },
 
   setActiveRuntimeEnvironmentPreference: async (environmentId) => {
-    noteViewerNavigation()
     const nextId = normalizeRuntimeEnvironmentId(environmentId)
     const previousId = normalizeRuntimeEnvironmentId(get().settings?.activeRuntimeEnvironmentId)
     if (previousId === nextId) {
diff --git a/src/renderer/src/store/slices/tabs/moved-tab-selection.ts b/src/renderer/src/store/slices/tabs/moved-tab-selection.ts
index 2714dd6d9b59..7fd2a2e1dd03 100644
--- a/src/renderer/src/store/slices/tabs/moved-tab-selection.ts
+++ b/src/renderer/src/store/slices/tabs/moved-tab-selection.ts
@@ -1,4 +1,3 @@
-import { protectSwitchProjections } from '@/lib/conversation-switch-projection'
 // Select moved tabs with the frame showing the move (L120); a later reply may already be superseded by another drag.
 
 import type { AppState } from '../../types'
@@ -85,26 +84,13 @@ export function withMovedTabsSelected(
 
 /** Writes a frame's patch, with the selection of each moved tab it shows; returns those moves. */
 export function showFramePatch(
-  store: {
-    getState: () => AppState
-    setState: (patch: Partial<AppState> | ((state: AppState) => Partial<AppState>)) => void
-  },
-  patch: Partial<AppState> | ((current: AppState) => Partial<AppState>),
-  select?: (current: AppState, accepted: Partial<AppState>) => Partial<AppState>
+  store: { getState: () => AppState; setState: (patch: Partial<AppState>) => void },
+  patch: Partial<AppState>
 ): MovedTabSelection[] {
-  if (typeof patch !== 'function' && Object.keys(patch).length === 0) {
+  if (Object.keys(patch).length === 0) {
     return []
   }
-  let taken: MovedTabSelection[] = []
-  store.setState((current) => {
-    const shown = withMovedTabSelections(
-      current,
-      typeof patch === 'function' ? patch(current) : patch
-    )
-    taken = shown.taken
-    const protectedPatch = protectSwitchProjections(current, shown.patch)
-    const next = select ? select(current, protectedPatch) : protectedPatch
-    return Object.keys(next).length === 0 ? current : next
-  })
-  return taken
+  const shown = withMovedTabSelections(store.getState(), patch)
+  store.setState(shown.patch)
+  return shown.taken
 }
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 b07fbe64aa26..57611166d12c 100644
--- a/src/renderer/src/store/slices/tabs/tabs-close-actions.ts
+++ b/src/renderer/src/store/slices/tabs/tabs-close-actions.ts
@@ -1,4 +1,3 @@
-import { endViewerSelectionForDestination } from '@/lib/viewer-selection-request'
 import { retireStructuredAgentSessionReadOwner } from '@/components/native-chat/structured-agent-session-read-owner-registry'
 import type { TabsSlice, TabsSliceGet, TabsSliceSet } from './tabs-slice-contract'
 import { collapseGroupLayout } from '../../../../../shared/workspace-layout/tab-group-layout-tree'
@@ -46,7 +45,6 @@ export function createTabsCloseActions(
         return null
       }
       const { tab, worktreeId } = found
-      endViewerSelectionForDestination(worktreeId, tab.id)
       forgetDesktopCreatedServerTab(tab.id)
       forgetDesktopCreatedServerTab(tab.entityId)
       const group = findGroupForTab(state.groupsByWorktree, worktreeId, tab.groupId)
diff --git a/src/renderer/src/store/slices/tabs/tabs-drop-actions.ts b/src/renderer/src/store/slices/tabs/tabs-drop-actions.ts
index e5b441128e06..c47d530519e4 100644
--- a/src/renderer/src/store/slices/tabs/tabs-drop-actions.ts
+++ b/src/renderer/src/store/slices/tabs/tabs-drop-actions.ts
@@ -1,4 +1,3 @@
-import { noteSwitchPresentationUse } from '@/lib/conversation-switch-projection'
 import { createBrowserUuid } from '@/lib/browser-uuid'
 import type { TabGroup } from '../../../../../shared/tab-types'
 import type { TabsSlice, TabsSliceGet, TabsSliceSet } from './tabs-slice-contract'
@@ -25,7 +24,6 @@ export function createTabsDropActions(
 ): Pick<TabsSlice, 'dropUnifiedTab'> {
   return {
     dropUnifiedTab: (tabId, target) => {
-      noteSwitchPresentationUse(tabId)
       let moved = false
       set((state) => {
         const foundTab = findTabAndWorktree(state.unifiedTabsByWorktree, tabId)
diff --git a/src/renderer/src/store/slices/tabs/tabs-focus-actions.ts b/src/renderer/src/store/slices/tabs/tabs-focus-actions.ts
index 7715da0a461d..ee078883aadf 100644
--- a/src/renderer/src/store/slices/tabs/tabs-focus-actions.ts
+++ b/src/renderer/src/store/slices/tabs/tabs-focus-actions.ts
@@ -1,4 +1,3 @@
-import { noteSwitchPresentationUse } from '@/lib/conversation-switch-projection'
 import type { TabsSlice, TabsSliceGet, TabsSliceSet } from './tabs-slice-contract'
 import {
   findTabAndWorktree,
@@ -104,7 +103,6 @@ export function createTabsFocusActions(
       ),
 
     activateTab: (tabId, opts) => {
-      noteSwitchPresentationUse(tabId)
       const promoted: Tab[] = []
       set((state) => {
         const scopedWorktreeId = opts?.worktreeId
diff --git a/src/renderer/src/store/slices/tabs/tabs-label-actions.ts b/src/renderer/src/store/slices/tabs/tabs-label-actions.ts
index e625a0d3398b..965a00e0fba7 100644
--- a/src/renderer/src/store/slices/tabs/tabs-label-actions.ts
+++ b/src/renderer/src/store/slices/tabs/tabs-label-actions.ts
@@ -1,4 +1,3 @@
-import { noteSwitchPresentationUse } from '@/lib/conversation-switch-projection'
 import { emitNativeChatToggled } from '@/lib/native-chat-telemetry'
 import type { TuiAgent } from '../../../../../shared/tui-agent'
 import type { AppState } from '../../types'
@@ -148,11 +147,6 @@ export function createTabsLabelActions(set: TabsSliceSet, get: TabsSliceGet): Ta
 
   return {
     reorderUnifiedTabs: (groupId, tabIds, opts) => {
-      if (opts?.recordInteraction !== false) {
-        for (const tabId of tabIds) {
-          noteSwitchPresentationUse(tabId)
-        }
-      }
       let reordered = false
       const changes: { worktreeId: string; from: string[]; to: string[] }[] = []
       set((state) => {
diff --git a/src/renderer/src/store/slices/tabs/tabs-move-actions.ts b/src/renderer/src/store/slices/tabs/tabs-move-actions.ts
index c745a19c76eb..112bc5173462 100644
--- a/src/renderer/src/store/slices/tabs/tabs-move-actions.ts
+++ b/src/renderer/src/store/slices/tabs/tabs-move-actions.ts
@@ -1,4 +1,3 @@
-import { noteSwitchPresentationUse } from '@/lib/conversation-switch-projection'
 import type { TabsSlice, TabsSliceGet, TabsSliceSet } from './tabs-slice-contract'
 import { collapseGroupLayout } from '../../../../../shared/workspace-layout/tab-group-layout-tree'
 import { buildActiveSurfacePatch } from './tabs-surface'
@@ -18,7 +17,6 @@ export function createTabsMoveActions(
 ): Pick<TabsSlice, 'moveUnifiedTabToGroup'> {
   return {
     moveUnifiedTabToGroup: (tabId, targetGroupId, opts) => {
-      noteSwitchPresentationUse(tabId)
       let moved = false
       set((state) => {
         const foundTab = findTabAndWorktree(state.unifiedTabsByWorktree, tabId)
diff --git a/src/renderer/src/store/slices/ui/ui-slice-settings-actions.ts b/src/renderer/src/store/slices/ui/ui-slice-settings-actions.ts
index a868c057d6e4..81de3888e343 100644
--- a/src/renderer/src/store/slices/ui/ui-slice-settings-actions.ts
+++ b/src/renderer/src/store/slices/ui/ui-slice-settings-actions.ts
@@ -1,11 +1,9 @@
-import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import type { UISlice, UISliceGet, UISliceSet } from './ui-slice-contract'
 import { isSettingsNavigationTarget } from '../../../lib/settings-navigation-types'
 
 export function createUiSettingsActions(set: UISliceSet, get: UISliceGet): Partial<UISlice> {
   return {
     openSettingsPage: () => {
-      noteViewerNavigation()
       // Why: settings search is a transient filter; opening Settings shouldn't inherit hidden sections from last visit.
       get().setSettingsSearchQuery('')
       set((state) => ({
@@ -15,13 +13,12 @@ export function createUiSettingsActions(set: UISliceSet, get: UISliceGet): Parti
           state.activeView === 'settings' ? state.previousViewBeforeSettings : state.activeView
       }))
     },
-    closeSettingsPage: () => {
-      noteViewerNavigation()
-      set((state) => ({ activeView: state.previousViewBeforeSettings }))
-    },
+    closeSettingsPage: () =>
+      set((state) => {
+        return { activeView: state.previousViewBeforeSettings }
+      }),
     settingsNavigationTarget: null,
     openSettingsTarget: (target) => {
-      noteViewerNavigation()
       if (!isSettingsNavigationTarget(target)) {
         if (import.meta.env.DEV) {
           throw new TypeError('openSettingsTarget received an invalid navigation target')
diff --git a/src/renderer/src/store/slices/ui/ui-slice-task-actions.ts b/src/renderer/src/store/slices/ui/ui-slice-task-actions.ts
index c527bbd104b6..6faa5283c335 100644
--- a/src/renderer/src/store/slices/ui/ui-slice-task-actions.ts
+++ b/src/renderer/src/store/slices/ui/ui-slice-task-actions.ts
@@ -1,4 +1,3 @@
-import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import type { UISlice, UISliceGet, UISliceSet } from './ui-slice-contract'
 import { findPrevLiveNonTaskStackHistoryIndex } from '../worktree-nav-history'
 import { hasFeatureInteraction } from '../../../../../shared/feature-interactions'
@@ -33,7 +32,6 @@ export function createUiTaskActions(set: UISliceSet, get: UISliceGet): Partial<U
     githubTaskDrawerWorkItem: null,
     newWorkspaceDraft: null,
     openTaskPage: (data = {}, options = {}) => {
-      noteViewerNavigation()
       if (options.recordTasksInteraction !== false) {
         const wasTasksPreviouslyInteracted = hasFeatureInteraction(
           get().featureInteractions,
diff --git a/src/renderer/src/store/slices/ui/ui-slice-view-actions.ts b/src/renderer/src/store/slices/ui/ui-slice-view-actions.ts
index 897f4969333b..ccece2d27c83 100644
--- a/src/renderer/src/store/slices/ui/ui-slice-view-actions.ts
+++ b/src/renderer/src/store/slices/ui/ui-slice-view-actions.ts
@@ -1,30 +1,25 @@
-import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import type { UISlice, UISliceGet, UISliceSet } from './ui-slice-contract'
 import { rewindHistoryIndexPastView } from '../worktree-nav-history'
 
 export function createUiViewActions(set: UISliceSet, get: UISliceGet): Partial<UISlice> {
   return {
     openActivityPage: () => {
-      noteViewerNavigation()
       set((state) => ({
         activeView: 'activity',
         previousViewBeforeActivity:
           state.activeView === 'activity' ? state.previousViewBeforeActivity : state.activeView
       }))
     },
-    closeActivityPage: () => {
-      noteViewerNavigation()
-      return set((state) => ({
+    closeActivityPage: () =>
+      set((state) => ({
         activeView: state.previousViewBeforeActivity
-      }))
-    },
+      })),
     selectedAutomationId: null,
     setSelectedAutomationId: (id) => set({ selectedAutomationId: id }),
     pendingAutomationRunNavigation: null,
     setPendingAutomationRunNavigation: (navigation) =>
       set({ pendingAutomationRunNavigation: navigation }),
     openAutomationsPage: () => {
-      noteViewerNavigation()
       get().recordViewVisit('automations')
       set((state) => ({
         activeView: 'automations',
@@ -34,15 +29,12 @@ export function createUiViewActions(set: UISliceSet, get: UISliceGet): Partial<U
             : state.activeView
       }))
     },
-    closeAutomationsPage: () => {
-      noteViewerNavigation()
-      return set((state) => ({
+    closeAutomationsPage: () =>
+      set((state) => ({
         activeView: state.previousViewBeforeAutomations,
         worktreeNavHistoryIndex: rewindHistoryIndexPastView(state, 'automations')
-      }))
-    },
+      })),
     openSpacePage: () => {
-      noteViewerNavigation()
       get().recordFeatureInteraction?.('workspace-cleanup')
       if (typeof window !== 'undefined' && window.api?.workspaceSpace?.openWindow) {
         void window.api.workspaceSpace.openWindow()
@@ -54,14 +46,11 @@ export function createUiViewActions(set: UISliceSet, get: UISliceGet): Partial<U
           state.activeView === 'space' ? state.previousViewBeforeSpace : state.activeView
       }))
     },
-    closeSpacePage: () => {
-      noteViewerNavigation()
-      return set((state) => ({
+    closeSpacePage: () =>
+      set((state) => ({
         activeView: state.previousViewBeforeSpace
-      }))
-    },
+      })),
     openSkillsPage: () => {
-      noteViewerNavigation()
       get().recordViewVisit('skills')
       set((state) => ({
         activeView: 'skills',
@@ -69,15 +58,12 @@ export function createUiViewActions(set: UISliceSet, get: UISliceGet): Partial<U
           state.activeView === 'skills' ? state.previousViewBeforeSkills : state.activeView
       }))
     },
-    closeSkillsPage: () => {
-      noteViewerNavigation()
-      return set((state) => ({
+    closeSkillsPage: () =>
+      set((state) => ({
         activeView: state.previousViewBeforeSkills,
         worktreeNavHistoryIndex: rewindHistoryIndexPastView(state, 'skills')
-      }))
-    },
+      })),
     openSkillShare: (shareId) => {
-      noteViewerNavigation()
       get().recordViewVisit('skills')
       set((state) => ({
         activeView: 'skills',
@@ -88,7 +74,6 @@ export function createUiViewActions(set: UISliceSet, get: UISliceGet): Partial<U
     },
     clearPendingSkillShare: () => set({ pendingSkillShareId: null }),
     openSkillsSharedLinks: () => {
-      noteViewerNavigation()
       get().recordViewVisit('skills')
       set((state) => ({
         activeView: 'skills',
@@ -99,7 +84,6 @@ export function createUiViewActions(set: UISliceSet, get: UISliceGet): Partial<U
     },
     clearPendingSkillsSharedView: () => set({ pendingSkillsSharedView: false }),
     openArtifactsPage: () => {
-      noteViewerNavigation()
       get().recordViewVisit('artifacts')
       set((state) => ({
         activeView: 'artifacts',
@@ -107,27 +91,21 @@ export function createUiViewActions(set: UISliceSet, get: UISliceGet): Partial<U
           state.activeView === 'artifacts' ? state.previousViewBeforeArtifacts : state.activeView
       }))
     },
-    closeArtifactsPage: () => {
-      noteViewerNavigation()
-      return set((state) => ({
+    closeArtifactsPage: () =>
+      set((state) => ({
         activeView: state.previousViewBeforeArtifacts,
         worktreeNavHistoryIndex: rewindHistoryIndexPastView(state, 'artifacts')
-      }))
-    },
-    openMobilePage: () => {
-      noteViewerNavigation()
-      return set((state) => ({
+      })),
+    openMobilePage: () =>
+      set((state) => ({
         activeView: 'mobile',
         previousViewBeforeMobile:
           state.activeView === 'mobile' ? state.previousViewBeforeMobile : state.activeView
-      }))
-    },
-    closeMobilePage: () => {
-      noteViewerNavigation()
-      return set((state) => ({
+      })),
+    closeMobilePage: () =>
+      set((state) => ({
         activeView: state.previousViewBeforeMobile
-      }))
-    },
+      })),
     setNewWorkspaceDraft: (draft) => set({ newWorkspaceDraft: draft }),
     clearNewWorkspaceDraft: () => set({ newWorkspaceDraft: null })
   }
diff --git a/src/renderer/src/store/slices/worktree-nav-history.ts b/src/renderer/src/store/slices/worktree-nav-history.ts
index 118f55de0b6e..bd6fa428ad3f 100644
--- a/src/renderer/src/store/slices/worktree-nav-history.ts
+++ b/src/renderer/src/store/slices/worktree-nav-history.ts
@@ -1,4 +1,3 @@
-import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import type { StateCreator } from 'zustand'
 import type { AppState } from '../types'
 import { findWorktreeById } from './worktree-helpers'
@@ -272,7 +271,6 @@ function navigateToIndex(
   if (targetIndex === null) {
     return
   }
-  noteViewerNavigation()
   const targetEntry = state.worktreeNavHistory[targetIndex]
 
   // Why: capture-and-restore (not force false) so re-entrant navigation doesn't clobber the flag.
diff --git a/src/renderer/src/store/terminals/terminal-actions.ts b/src/renderer/src/store/terminals/terminal-actions.ts
index 05e2894ebacc..77695a87b3d5 100644
--- a/src/renderer/src/store/terminals/terminal-actions.ts
+++ b/src/renderer/src/store/terminals/terminal-actions.ts
@@ -1,6 +1,5 @@
 import type { TerminalState } from './terminal-state'
 import type { Tab } from '../../../../shared/tab-types'
-import type { SessionTabOpenPlacement } from '../../../../shared/session-tab-placement'
 import type { TabSplitTarget } from '../slices/tabs/tabs-slice-contract'
 import type { TerminalLayoutSnapshot, TerminalTab } from '../../../../shared/terminal-tab-types'
 import type { TuiAgent } from '../../../../shared/tui-agent'
@@ -77,7 +76,6 @@ export type TerminalActions = {
       /** Published atomically with pendingStartup for automatic resume ownership. */
       automaticResumeClaim?: AutomaticAgentResumeClaim
       activate?: boolean
-      placement?: SessionTabOpenPlacement['placement']
       /** Creates the tab in a new split group instead of targetGroupId. */
       split?: TabSplitTarget
       recordInteraction?: boolean
diff --git a/src/renderer/src/store/terminals/terminal-active-workspace-creation.ts b/src/renderer/src/store/terminals/terminal-active-workspace-creation.ts
index ba85d9daab54..a3ce2cab5578 100644
--- a/src/renderer/src/store/terminals/terminal-active-workspace-creation.ts
+++ b/src/renderer/src/store/terminals/terminal-active-workspace-creation.ts
@@ -1,4 +1,3 @@
-import { noteViewerNavigation } from '@/lib/viewer-selection-request'
 import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../shared/constants'
 import { parseWorkspaceKey } from '../../../../shared/workspace-scope'
 import { focusTerminalTabSurface } from '@/lib/focus-terminal-tab-surface'
@@ -13,7 +12,6 @@ export function createActiveWorkspaceTerminalActions(
 ): Pick<TerminalSlice, 'openNewTerminalTabInActiveWorkspace'> {
   return {
     openNewTerminalTabInActiveWorkspace: async (groupId) => {
-      noteViewerNavigation()
       const state = get()
       const worktreeId = state.activeWorktreeId
       if (!worktreeId) {
diff --git a/src/renderer/src/store/terminals/terminal-tab-close.ts b/src/renderer/src/store/terminals/terminal-tab-close.ts
index f5806c026d01..6fd6977f8a6c 100644
--- a/src/renderer/src/store/terminals/terminal-tab-close.ts
+++ b/src/renderer/src/store/terminals/terminal-tab-close.ts
@@ -1,4 +1,3 @@
-import { endViewerSelectionForDestination } from '@/lib/viewer-selection-request'
 import type { TerminalTab } from '../../../../shared/terminal-tab-types'
 import { sweepRetiredTerminalTabState } from '../slices/retired-terminal-tab-state-sweep'
 import {
@@ -73,7 +72,6 @@ export function createTerminalTabCloseActions(
             const closing = before.find((t) => t.id === tabId)
             if (closing) {
               closingWorktreeId = wId
-              endViewerSelectionForDestination(wId, tabId)
               // User close cancels pending agent launch; every close settles its startup wait to prevent delivery into a vanished tab.
               if (closing.agentLaunchPane && !closing.agentLaunchPane.outcome) {
                 if (closeReason === 'user') {
diff --git a/src/renderer/src/store/terminals/terminal-tab-creation.ts b/src/renderer/src/store/terminals/terminal-tab-creation.ts
index d4d6ea523015..22d365671185 100644
--- a/src/renderer/src/store/terminals/terminal-tab-creation.ts
+++ b/src/renderer/src/store/terminals/terminal-tab-creation.ts
@@ -21,7 +21,6 @@ import {
   updateGroup
 } from '../slices/tab-group-state'
 import { dedupeTabOrder } from '../../../../shared/workspace-layout/tab-order'
-import { insertOpenPlacementTab } from '../../lib/session-tab-open-placement-order'
 import { createBrowserUuid } from '@/lib/browser-uuid'
 import { emptySplitGroup, insertSplitGroup } from '../slices/tabs/tabs-group-actions'
 import { ownsGlobalSelection } from '../global-selection-owner'
@@ -203,15 +202,7 @@ export function createTerminalTabCreationActions(
           // Why: omit for non-agent tabs so they keep the implicit 'terminal' view mode.
           ...(options?.viewMode ? { viewMode: options.viewMode } : {})
         }
-        const nextGroupOrder =
-          options?.placement && !existingTerminalTab
-            ? insertOpenPlacementTab(
-                cleanedGroupOrder,
-                [...existingUnifiedTabs, unifiedTab],
-                unifiedTab.id,
-                options.placement
-              )
-            : dedupeTabOrder([...cleanedGroupOrder, unifiedTab.id])
+        const nextGroupOrder = dedupeTabOrder([...cleanedGroupOrder, unifiedTab.id])
         const nextRecent = shouldActivate
           ? pushRecentTabId(sanitizeRecentTabIds(group.recentTabIds, nextGroupOrder), unifiedTab.id)
           : sanitizeRecentTabIds(cleanedTargetGroup.recentTabIds, nextGroupOrder)
diff --git a/tests/e2e/conversation-switch-desktop-retirement.unit.test.ts b/tests/e2e/conversation-switch-desktop-retirement.unit.test.ts
deleted file mode 100644
index a832ec5a95a2..000000000000
--- a/tests/e2e/conversation-switch-desktop-retirement.unit.test.ts
+++ /dev/null
@@ -1,247 +0,0 @@
-// @vitest-environment happy-dom
-import { afterEach, expect, it, vi } from 'vitest'
-import { useAppStore } from '@/store'
-import { publishAgentLaunchTab } from '@/lib/agent-launch-tab-publication'
-import { buildWorkspaceSessionPayload } from '@/lib/workspace-session'
-import { registerSessionTabIpcBridge } from '@/hooks/ipc-events/session-tab-ipc-bridge'
-import { buildMobileSessionTabSnapshots } from '@/runtime/sync-runtime-graph/mobile-session-snapshots'
-import { mobilePublicationEpoch } from '@/runtime/sync-runtime-graph/graph-state'
-import { applyStructuredSessionTabSnapshots } from '@/runtime/local-structured-session-tabs-sync/snapshot-apply'
-import { resetLocalStructuredSessionVersionForTests } from '@/runtime/local-structured-session-tabs-sync/inventory-generation-fence'
-import { createTabsSliceMockApi } from '@/store/slices/tabs-slice-test-harness'
-import {
-  createHarness,
-  WORKTREE_ID
-} from '../../src/main/runtime/__fixtures__/orca-runtime-terminal-close-continuity-fixtures'
-import { createMobileCreateTestNotifier } from '../../src/main/runtime/orca-runtime-test-scenario-builders.spec'
-import { electronMocks } from '../../src/main/runtime/orca-runtime-test-mocks.spec'
-import { setRuntimeDesktopSurface } from '../../src/main/runtime/runtime-desktop-surface'
-import { electronRuntimeDesktopSurface } from '../../src/main/host/electron-runtime-desktop-surface'
-import { createRestTestRig } from '../../src/main/native-chat/agent-session-wire/structured-agent-session-rest-test-rig'
-import {
-  createTestParams,
-  CREATE_TEST_CALLER
-} from '../../src/main/native-chat/agent-session-wire/structured-agent-session-create-test-fixture'
-import {
-  HOST_TEST_SESSION,
-  HOST_TEST_THREAD,
-  hostTestMessage
-} from '../../src/main/native-chat/agent-session-wire/structured-agent-session-host-test-data'
-import { setStructuredAgentSessionHost } from '../../src/main/native-chat/agent-session-wire/structured-agent-session-registry'
-import { agentSessionSwitchDeadline } from '../../src/shared/agent-session-switch-execution'
-import { structuredAgentSessionTabId } from '../../src/shared/structured-agent-session-projection'
-import type {
-  SessionTabCloseRequest,
-  SessionTabCloseResponse
-} from '../../src/shared/session-tab-close'
-
-const { receipts } = vi.hoisted(() => ({ receipts: vi.fn(async () => {}) }))
-vi.mock('@/runtime/structured-agent-session-client', () => ({
-  callStructuredAgentSession: receipts
-}))
-vi.mock('@/runtime/sync-runtime-graph', () => ({ scheduleRuntimeGraphSync: vi.fn() }))
-
-afterEach(() => {
-  setRuntimeDesktopSurface(null)
-  electronMocks.BrowserWindow.fromId.mockReset()
-  resetLocalStructuredSessionVersionForTests()
-  vi.clearAllMocks()
-})
-
-it.each(['saved', 'empty'] as const)(
-  'diagnoses focused %s desktop retirement through real IPC, visibility and inventory owners',
-  async (content) => {
-    useAppStore.setState(useAppStore.getInitialState(), true)
-    createTabsSliceMockApi()
-    const state = () => useAppStore.getState()
-    state().setActiveWorktree(WORKTREE_ID)
-    const neighbor = state().createTab(WORKTREE_ID)
-    const source = state().createUnifiedTab(WORKTREE_ID, 'agent-session', {
-      id: structuredAgentSessionTabId(HOST_TEST_SESSION),
-      entityId: HOST_TEST_SESSION,
-      agentSessionAgent: 'codex'
-    })
-    useAppStore.setState({
-      unifiedTabsByWorktree: {
-        ...state().unifiedTabsByWorktree,
-        [WORKTREE_ID]: state().unifiedTabsByWorktree[WORKTREE_ID]!.map((tab) =>
-          tab.id === source.id ? { ...tab, sortOrder: 0 } : tab
-        )
-      }
-    })
-    state().activateTab(source.id)
-    const order = () =>
-      state().groupsByWorktree[WORKTREE_ID]!.find((group) => group.id === source.groupId)!.tabOrder
-    expect(order()).toEqual([neighbor.id, source.id])
-    const rig = await createRestTestRig({ idleSweep: { intervalMs: 60_000 } })
-    const deadline = agentSessionSwitchDeadline()
-    const unsubs: (() => void)[] = []
-    try {
-      const params = createTestParams(undefined, {
-        surfaceTabId: source.id,
-        location: {
-          executionHostId: 'local',
-          wslDistro: null,
-          workspaceId: WORKTREE_ID,
-          workspaceKind: 'git-worktree'
-        }
-      })
-      expect(await rig.host.create(CREATE_TEST_CALLER, params)).toMatchObject({ ok: true })
-      if (content === 'saved') {
-        expect(await rig.host.switchToChat(HOST_TEST_SESSION)).toMatchObject({ ok: true })
-        const events = rig.adapter.acquire.mock.calls[0]?.[0].events
-        if (!events) {
-          throw new Error('Expected the host acquisition event sink')
-        }
-        events.appendItem(
-          { provider: 'codex', threadId: HOST_TEST_THREAD, turnId: 'saved', ordinal: 1 },
-          hostTestMessage('Saved conversation'),
-          { turnScope: { kind: 'thread' } }
-        )
-        await rig.host.flushStreamedEvents(HOST_TEST_SESSION)
-      }
-      await rig.host.switchToTerminal(HOST_TEST_SESSION, deadline)
-      setStructuredAgentSessionHost(rig.host)
-      await rig.store.setSessionTabVisibility(HOST_TEST_SESSION, true, source.id)
-      electronMocks.BrowserWindow.fromId.mockReturnValue({
-        isDestroyed: () => false,
-        webContents: { isDestroyed: () => false, setBackgroundThrottling: () => {} }
-      })
-      setRuntimeDesktopSurface({
-        showNotification: () => false,
-        findWindowById: electronRuntimeDesktopSurface.findWindowById,
-        onIpc: () => {},
-        removeIpcListener: () => {}
-      })
-      const harness = createHarness()
-      harness.removeVictimFromInventory()
-      harness.editSession(() => buildWorkspaceSessionPayload(state()))
-      const publishGraph = () =>
-        harness.runtime.syncWindowGraph(1, {
-          tabs: [],
-          leaves: [],
-          rendererGeneration: mobilePublicationEpoch,
-          conditionalSwitchProjection: 1,
-          mobileSessionTabs: buildMobileSessionTabSnapshots(state(), false)
-        })
-      publishGraph()
-      harness.runtime.projectStructuredAgentSessionTab({
-        workspaceId: WORKTREE_ID,
-        sessionId: HOST_TEST_SESSION,
-        agent: 'codex',
-        activate: false
-      })
-      const before = await harness.runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)
-      let onClose!: (request: SessionTabCloseRequest) => void
-      const pending = new Map<string, (applied: boolean) => void>()
-      const responses: SessionTabCloseResponse[] = []
-      Object.assign(window.api.ui, {
-        onCloseSessionTab: () => () => {},
-        onMoveSessionTab: () => () => {},
-        onSessionTabCloseRequest: (listener: typeof onClose) => {
-          onClose = listener
-          return () => {}
-        },
-        respondSessionTabClose: (response: SessionTabCloseResponse) => {
-          responses.push(response)
-          pending.get(response.requestId)!(response.switchApplied === true)
-          pending.delete(response.requestId)
-        }
-      })
-      registerSessionTabIpcBridge(unsubs)
-      const entered = Promise.withResolvers<void>()
-      const release = Promise.withResolvers<void>()
-      const phases: string[] = []
-      harness.runtime.setNotifier({
-        ...createMobileCreateTestNotifier(vi.fn()),
-        closeSessionTab: async (tabId, worktreeId, switchProjection) => {
-          const requestId = `close-${phases.length}`
-          phases.push(switchProjection?.phase ?? 'ordinary')
-          const answer = new Promise<boolean>((resolve) => {
-            pending.set(requestId, resolve)
-            onClose({ requestId, tabId, worktreeId, switchProjection })
-          })
-          if (switchProjection?.phase === 'retire') {
-            entered.resolve()
-            await release.promise
-          }
-          return answer
-        }
-      })
-      const restore = vi.fn(async () => {
-        await rig.store.setSessionTabVisibility(HOST_TEST_SESSION, true, source.id)
-      })
-      const retire = harness.runtime.captureSessionSwitchRetirement(
-        WORKTREE_ID,
-        HOST_TEST_SESSION,
-        source.id,
-        rig.host.captureSwitchWork(HOST_TEST_SESSION, deadline),
-        restore,
-        {
-          invocationId: 'desktop-diagnostic',
-          generation: 'desktop-generation',
-          sessionId: HOST_TEST_SESSION,
-          tabId: source.id,
-          phase: 'prepare'
-        }
-      )
-      const destination = '9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d'
-      publishAgentLaunchTab({
-        requestId: 'destination',
-        operationId: 'desktop-diagnostic',
-        worktreeId: WORKTREE_ID,
-        tabId: destination,
-        leafId: '3f2504e0-4f89-41d3-9a0c-0305e82c3301',
-        launchAgent: 'codex',
-        viewMode: 'terminal',
-        viewer: 'focus-window',
-        placement: { groupId: source.groupId!, afterTabId: source.id }
-      })
-      expect(state().activeTabId).toBe(destination)
-      expect(order()).toEqual([neighbor.id, source.id, destination])
-      publishGraph()
-      const closing = retire()
-      const retired = await Promise.race([
-        entered.promise.then(() => 'ipc'),
-        closing.then(() => 'settled')
-      ])
-      try {
-        if (retired === 'ipc') {
-          expect(rig.store.listVisibleSessionIds()).not.toContain(HOST_TEST_SESSION)
-          applyStructuredSessionTabSnapshots([before], undefined, { reacceptCurrentVersion: true })
-        }
-      } finally {
-        release.resolve()
-        await closing
-      }
-      expect(await closing).toBe(true)
-      expect(phases).toEqual(['prepare', 'retire'])
-      expect(responses.map((response) => response.switchApplied)).toEqual([true, true])
-      expect(restore).not.toHaveBeenCalled()
-      const inventory = await harness.runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)
-      applyStructuredSessionTabSnapshots([inventory], undefined, { reacceptCurrentVersion: true })
-      expect(rig.store.getVisibleSessionTabIndex().sessionIds).not.toContain(HOST_TEST_SESSION)
-      expect(
-        inventory.tabs.some(
-          (tab) => tab.type === 'agent-session' && tab.sessionId === HOST_TEST_SESSION
-        )
-      ).toBe(false)
-      expect(state().unifiedTabsByWorktree[WORKTREE_ID]!.some((tab) => tab.id === source.id)).toBe(
-        false
-      )
-      expect(order()).toEqual([neighbor.id, destination])
-      expect(receipts.mock.calls.flat()).not.toContainEqual(
-        expect.objectContaining({
-          execution: expect.objectContaining({
-            receipt: expect.objectContaining({ retained: true })
-          })
-        })
-      )
-    } finally {
-      unsubs.forEach((unsubscribe) => unsubscribe())
-      setStructuredAgentSessionHost(null)
-      deadline.dispose()
-      await rig.dispose()
-    }
-  }
-)
diff --git a/tests/e2e/mobile-terminal-session-switch.unit.test.ts b/tests/e2e/mobile-terminal-session-switch.unit.test.ts
deleted file mode 100644
index 987001526c3a..000000000000
--- a/tests/e2e/mobile-terminal-session-switch.unit.test.ts
+++ /dev/null
@@ -1,220 +0,0 @@
-import type { StoreApi } from 'zustand'
-import type { AppState } from '../../src/renderer/src/store/types'
-import { createTestStore } from '@/store/slices/store-test-helpers'
-import { createTabsSliceMockApi } from '@/store/slices/tabs-slice-test-harness'
-import { publishAgentLaunchTab as windowPublish } from '@/lib/agent-launch-tab-publication'
-import { applyAgentLaunchPaneVerdict } from '@/lib/agent-launch-pane-verdict-application'
-import { agentSessionSwitchDeadline } from '../../src/shared/agent-session-switch-execution'
-import { afterEach, expect, it, vi } from 'vitest'
-import '../../src/main/runtime/orca-runtime-test-lifecycle.spec'
-import {
-  OrcaRuntimeService,
-  electronMocks
-} from '../../src/main/runtime/orca-runtime-test-mocks.spec'
-import {
-  TEST_WORKTREE_ID as wt,
-  makeRuntimeStoreWithWorkspaceSession,
-  makeWorkspaceSessionWithHeadlessTerminal
-} from '../../src/main/runtime/orca-runtime-test-fixtures.spec'
-import { withChatTabChanges } from '../../src/main/runtime/agent-session/agent-session-tab-layout'
-import { committingSpawn } from '../../src/main/runtime/bind-first-pane.test-fixture'
-import type { RuntimeNotifier } from '../../src/main/runtime/runtime-notifier-contract'
-import '../../src/main/daemon/mock-descendant-sweep'
-import type { RuntimePtyController } from '../../src/main/runtime/runtime-pty-controller-contract'
-
-const renderer = vi.hoisted(() => {
-  const ref: { store: StoreApi<AppState> | null } = { store: null }
-  return ref
-})
-vi.mock('@/store', () => ({
-  useAppStore: {
-    getState: () => renderer.store!.getState(),
-    setState: (...args: Parameters<ReturnType<typeof createTestStore>['setState']>) =>
-      renderer.store!.setState(...args)
-  }
-}))
-vi.mock('@/hooks/ipc-events/terminal-command-state', () => ({
-  focusTerminalInitiatedTab: () => {}
-}))
-
-vi.mock('../../src/shared/layout-owner-switch', () => ({ ORCA_LAYOUT_OWNER_IS_MAIN: false }))
-
-type Spawn = NonNullable<RuntimePtyController['spawn']>
-
-async function setup(outcome: 'ready' | 'failed' = 'ready', create?: Spawn) {
-  createTabsSliceMockApi()
-  renderer.store = createTestStore()
-  renderer.store.getState().setActiveWorktree(wt)
-  renderer.store.getState().createUnifiedTab(wt, 'agent-session', {
-    id: 'custom-source',
-    entityId: 'source-chat',
-    agentSessionAgent: 'codex'
-  })
-  const initial = makeWorkspaceSessionWithHeadlessTerminal()
-  const session =
-    withChatTabChanges('local', initial, wt, [
-      { open: { sessionId: 'source-chat', agent: 'codex', tabId: 'custom-source' } }
-    ]) ?? initial
-  const fixture = makeRuntimeStoreWithWorkspaceSession(session)
-  const service = new OrcaRuntimeService(fixture.runtimeStore)
-  const events: string[] = []
-  const spawn = vi.fn(async (options: Parameters<Spawn>[0]) => {
-    events.push('spawn')
-    if (outcome === 'failed') {
-      throw new Error('spawn rejected')
-    }
-    if (create) {
-      return create(options)
-    }
-    return { id: 'pty-switch', incarnationId: '45454545-4545-4545-8545-454545454545' }
-  })
-  service.setPtyController({
-    spawn: committingSpawn(service, spawn),
-    write: () => true,
-    kill: () => true,
-    getForegroundProcess: async () => null,
-    listProcesses: async () => []
-  })
-  electronMocks.BrowserWindow.fromId.mockReturnValue({
-    isDestroyed: () => false,
-    webContents: { isDestroyed: () => false, setBackgroundThrottling: vi.fn() }
-  })
-  service.attachWindow(1)
-  service.syncWindowGraph(1, {
-    tabs: [],
-    leaves: [],
-    conditionalSwitchProjection: 1,
-    rendererGeneration: 'window-test'
-  })
-  const publish = vi.spyOn(service, 'publishAgentLaunchTab').mockImplementation(async (request) => {
-    events.push('published')
-    expect(request.placement?.afterTabId).toBe('custom-source')
-    expect(request.viewer).toBe('focus-in-workspace')
-    expect(fixture.getSession().terminalLayoutsByTabId[request.tabId]).toBeUndefined()
-    return windowPublish({ ...request, requestId: 'window-publication' })
-  })
-  const report = vi.spyOn(service, 'reportAgentLaunchPaneVerdict')
-  const reveal = vi.fn<NonNullable<RuntimeNotifier['revealTerminalSession']>>(
-    (_workspace, opts) => ({
-      tabId: opts.tabId!,
-      identity: { worktreeId: wt, tabId: opts.tabId!, leafId: opts.leafId!, ptyId: opts.ptyId }
-    })
-  )
-  const { createMobileCreateTestNotifier } =
-    await import('../../src/main/runtime/orca-runtime-test-scenario-builders.spec')
-  service.setNotifier({
-    ...createMobileCreateTestNotifier(vi.fn()),
-    revealTerminalSession: reveal,
-    publishAgentLaunchTab: async (request) =>
-      windowPublish({ ...request, requestId: 'window-verdict' }),
-    agentLaunchPaneVerdict: applyAgentLaunchPaneVerdict
-  })
-  service.projectStructuredAgentSessionTab({
-    workspaceId: wt,
-    sessionId: 'source-chat',
-    agent: 'codex',
-    activate: true
-  })
-  return { service, fixture, events, spawn, publish, report, reveal }
-}
-const deadlines: ReturnType<typeof agentSessionSwitchDeadline>[] = []
-afterEach(() => {
-  for (const deadline of deadlines) {
-    deadline.dispose()
-  }
-})
-function execution() {
-  const deadline = agentSessionSwitchDeadline()
-  deadlines.push(deadline)
-  return {
-    ...deadline,
-    invocationId: 'click-1',
-    viewer: 'focus-in-workspace' as const
-  }
-}
-const args = () => ({
-  agent: 'codex' as const,
-  invocationId: 'click-1',
-  sessionId: 'source-chat',
-  afterTabId: 'custom-source',
-  commandOverride: 'my-codex',
-  options: { model: 'gpt-5.4', effort: 'high' },
-  execution: execution()
-})
-
-const nativeId = '019aef12-1234-7000-8000-123456789abc'
-it.each([false, true])(
-  'publishes before ordinary startup and preserves fresh/saved caller choices: saved=%s',
-  async (saved) => {
-    const { service, events, spawn, publish } = await setup()
-    const created = await service.createSessionSwitchTerminal(wt, {
-      ...args(),
-      ...(saved
-        ? {
-            source: {
-              agent: 'codex' as const,
-              sourceAgent: 'codex' as const,
-              sessionId: nativeId,
-              filePath: '/tmp/rollout.jsonl',
-              cwd: '/repo',
-              codexHome: null,
-              executionHostPlatform: process.platform
-            }
-          }
-        : {})
-    })
-    expect(events.slice(0, 2)).toEqual(['published', 'spawn'])
-    expect(publish).toHaveBeenCalledOnce()
-    expect(spawn).toHaveBeenCalledWith(
-      expect.objectContaining({
-        command: expect.stringContaining('my-codex'),
-        launchAgent: 'codex'
-      })
-    )
-    if (saved) {
-      expect(spawn).toHaveBeenCalledWith(
-        expect.objectContaining({
-          command: expect.stringContaining(nativeId),
-          resumeProviderSession: expect.objectContaining({ id: nativeId }),
-          launchRuntime: expect.any(Object)
-        })
-      )
-      expect(spawn.mock.calls[0]?.[0].command).not.toContain('fork')
-    } else {
-      expect(spawn.mock.calls[0]?.[0]).not.toHaveProperty('resumeProviderSession')
-    }
-    expect(created.tab.terminal).toBeDefined()
-  }
-)
-
-it.each([false, true])(
-  'withdraws a failed unused destination and retains one the user typed into: used=%s',
-  async (used) => {
-    const { service, publish, spawn, report } = await setup('failed')
-    const original = publish.getMockImplementation()!
-    publish.mockImplementation(async (request) => {
-      const receipt = await original(request)
-      if (!receipt) {
-        throw new Error('missing window publication')
-      }
-      if (used) {
-        const key = `${request.tabId}:${request.leafId}`
-        renderer.store!.setState({ lastTerminalInputAtByPaneKey: { [key]: 1 } })
-      }
-      return receipt
-    })
-    await expect(service.createSessionSwitchTerminal(wt, args())).rejects.toThrow()
-    const published = await publish.mock.results[0]!.value
-    if (used) {
-      expect(
-        renderer.store!.getState().tabsByWorktree[wt]?.some((row) => row.id === published.tabId)
-      ).toBe(true)
-    } else {
-      expect(report).toHaveBeenCalledWith(expect.objectContaining({ worktreeId: wt }), {
-        kind: 'withdrawn'
-      })
-      expect(renderer.store!.getState().terminalLayoutsByTabId[published.tabId]).toBeUndefined()
-    }
-    expect(spawn).toHaveBeenCalledOnce()
-  }
-)
diff --git a/tests/e2e/terminal-presentation-retirement.unit.test.ts b/tests/e2e/terminal-presentation-retirement.unit.test.ts
deleted file mode 100644
index 91c8e4f1353c..000000000000
--- a/tests/e2e/terminal-presentation-retirement.unit.test.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-// @vitest-environment happy-dom
-import { beforeEach, expect, it, vi } from 'vitest'
-import { useAppStore } from '@/store'
-import type {
-  TerminalTabCloseRequest,
-  TerminalTabCloseResponse
-} from '../../src/shared/terminal-tab-close'
-import type { WorkspaceSessionState } from '../../src/shared/workspace-session-state-types'
-import { registerMobileAndTerminalCloseIpcBridge } from '@/hooks/ipc-events/mobile-terminal-close-ipc-bridge'
-import { mountedOwner } from '@/components/terminal-pane/terminal-presentation-retirement.test-fixture'
-import {
-  createHarness,
-  WORKTREE_ID,
-  TAB_ID,
-  LEAF_ID,
-  PTY_ID
-} from '../../src/main/runtime/__fixtures__/orca-runtime-terminal-close-continuity-fixtures'
-
-vi.mock('@/runtime/sync-runtime-graph', () => ({ scheduleRuntimeGraphSync: vi.fn() }))
-beforeEach(() => {
-  localStorage.clear()
-  useAppStore.setState(useAppStore.getInitialState(), true)
-})
-
-it.each([false, true])(
-  'persists the actual renderer effects after caught disposal failure before one failed IPC receipt (write fails=%s)',
-  async (writeFails) => {
-    const harness = createHarness({ registerPtyBacked: true, publishMobileSurface: true })
-    const session = harness.getSession()
-    useAppStore.setState({
-      tabsByWorktree: session.tabsByWorktree,
-      terminalLayoutsByTabId: session.terminalLayoutsByTabId
-    })
-    const source = harness.runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_ID}`, WORKTREE_ID)
-    if (!source.presentation || !source.incarnationId) {
-      throw new Error('Expected original')
-    }
-    const { presentation, incarnationId } = source
-    const owner = mountedOwner({
-      tabId: TAB_ID,
-      worktreeId: WORKTREE_ID,
-      leafId: LEAF_ID,
-      ptyId: PTY_ID
-    })
-    vi.spyOn(owner.source.terminal, 'dispose').mockImplementation(() => {
-      throw new Error('terminal dispose failed')
-    })
-    let request: ((value: TerminalTabCloseRequest) => void) | undefined
-    let rejectReceipt = (_error: Error): void => {}
-    const receipt = new Promise<void>((_resolve, reject) => {
-      rejectReceipt = reject
-    })
-    const respond = vi.fn((response: TerminalTabCloseResponse) => {
-      rejectReceipt(new Error(response.error ?? 'Unexpected success'))
-    })
-    const set = vi.fn(async (_state: WorkspaceSessionState) => {
-      expect(owner.manager.destroy).toHaveBeenCalledOnce()
-      expect(useAppStore.getState().terminalLayoutsByTabId[TAB_ID]).toBeUndefined()
-      if (writeFails) {
-        throw new Error('persistence failed')
-      }
-    })
-    const flush = vi.fn(async () => {})
-    Object.assign(window, {
-      api: {
-        ...window.api,
-        session: { set, flush },
-        ui: {
-          onOpenFileFromMobile: () => () => {},
-          onOpenDiffFromMobile: () => () => {},
-          onCloseTerminal: () => () => {},
-          onWorkspaceSleep: () => () => {},
-          onResumeSleepingAgents: () => () => {},
-          onTerminalTabCloseRequest: (listener: (value: TerminalTabCloseRequest) => void) => {
-            request = listener
-            return () => {}
-          },
-          respondTerminalTabClose: respond
-        }
-      }
-    })
-    const unsubs: (() => void)[] = []
-    registerMobileAndTerminalCloseIpcBridge(unsubs, vi.fn())
-    if (!request) {
-      throw new Error('Expected IPC listener')
-    }
-    const dispatch = request
-    harness.setVerifiedStopResult(true)
-    harness.setCloseTerminalTabAction(() => {
-      dispatch({
-        requestId: 'close',
-        tabId: TAB_ID,
-        localPtyTeardownOwnedExternally: true,
-        originalSurface: presentation.identity
-      })
-      return receipt
-    })
-    try {
-      await expect(
-        harness.runtime.closeTerminal(source.handle, incarnationId, presentation)
-      ).rejects.toThrow('terminal_tab_close_failed')
-      expect(harness.flushOrThrow).not.toHaveBeenCalled()
-      expect(harness.getSession().closedTerminalTabTombstonesByTabId?.[TAB_ID]).toBeUndefined()
-      await vi.waitFor(() =>
-        expect(respond).toHaveBeenCalledExactlyOnceWith({
-          requestId: 'close',
-          error: 'terminal_tab_close_failed'
-        })
-      )
-      expect(set).toHaveBeenCalledOnce()
-      expect(set.mock.calls[0][0].tabsByWorktree[WORKTREE_ID]).toEqual([])
-      expect(flush).toHaveBeenCalledTimes(writeFails ? 0 : 1)
-      expect(owner.sourceTransport.detach).toHaveBeenCalledOnce()
-    } finally {
-      unsubs.forEach((unsubscribe) => unsubscribe())
-      owner.unregister()
-    }
-  }
-)
diff --git a/tests/e2e/web-runtime-session-terminal-host-authority.unit.test.ts b/tests/e2e/web-runtime-session-terminal-host-authority.unit.test.ts
index f1f76662fe23..f3ce4ff5c8bb 100644
--- a/tests/e2e/web-runtime-session-terminal-host-authority.unit.test.ts
+++ b/tests/e2e/web-runtime-session-terminal-host-authority.unit.test.ts
@@ -475,7 +475,7 @@ describe('createWebRuntimeSessionTerminal', () => {
       snapshot,
       ENVIRONMENT_ID,
       undefined,
-      { offerOpenSelection: undefined },
+      undefined,
       mocks.changedAgentPaneKeys
     )
   })

From 8c738edeee35b1ec7d09c590c4bbb39c827e2e1c Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 16:06:18 -0700
Subject: [PATCH 129/207] Remove what the redesigned switch left behind

The host now spawns the switch's terminal itself, so the 'switch' resume
origin on the paired-client and renderer create paths has no sender, and
the owned-create reconciliation it carried is back to main's inline
block. Also drops the unused viewer selection, the unattached-spawn
discard, the lifetime calls that no longer exist, the daemon protocol
bump in the build contract, and a test of the old 735 s budget.
---
 src/main/ipc/pty/pane/spawn-registration.ts   |  32 ----
 .../structured-agent-session-host.ts          |   5 +-
 src/main/runtime/rpc/methods/session-tabs.ts  |   1 -
 .../runtime/runtime-terminal-contracts.ts     |   2 -
 .../mobile-terminal-create-reconciliation.ts  | 163 ------------------
 .../terminal/launch/mobile-terminal-create.ts |  60 +------
 .../launch/mobile-terminal-owned-create.ts    | 130 +++++++++-----
 .../launch/mobile-terminal-renderer-create.ts |  45 +++--
 .../terminal/launch/terminal-create.ts        |   7 +-
 src/preload/api/pty-api.ts                    |   2 +-
 src/preload/api/pty-bridge-session-control.ts |   2 +-
 .../terminal-pane/pty-connection-types.ts     |   2 +-
 .../terminal-pane/pty-transport-types.ts      |   4 +-
 .../ipc-events/terminal-request-ipc-bridge.ts |   1 -
 .../src/lib/launch-ai-vault-session.ts        |  20 +--
 ...b-runtime-agent-terminal-host-authority.ts |  91 ----------
 .../src/runtime/web-runtime-session-types.ts  |   2 -
 .../web-runtime-terminal-create-operation.ts  |  94 ++++++++--
 .../src/store/terminals/terminal-actions.ts   |   4 +-
 .../src/store/terminals/terminal-state.ts     |   2 +-
 .../local-build-compatibility-contract.json   |   4 +-
 .../local-build-compatibility-contract.ts     |   4 +-
 .../session-tabs-schemas-params.ts            |   9 -
 .../structured-agent-session-params.ts        |   2 -
 src/shared/runtime-terminal-contracts.ts      |   2 -
 ...ronment-switch-dispatch-clock.unit.test.ts | 141 ---------------
 26 files changed, 214 insertions(+), 617 deletions(-)
 delete mode 100644 src/main/runtime/terminal/launch/mobile-terminal-create-reconciliation.ts
 delete mode 100644 src/renderer/src/runtime/web-runtime-agent-terminal-host-authority.ts
 delete mode 100644 tests/e2e/runtime-environment-switch-dispatch-clock.unit.test.ts

diff --git a/src/main/ipc/pty/pane/spawn-registration.ts b/src/main/ipc/pty/pane/spawn-registration.ts
index 5c42f2e98ffc..9c9e72718121 100644
--- a/src/main/ipc/pty/pane/spawn-registration.ts
+++ b/src/main/ipc/pty/pane/spawn-registration.ts
@@ -52,38 +52,6 @@ function exitedBeforeAdmission(
   }
 }
 
-/** Best-effort late-create cleanup uses the ordinary host fence, never a retained switch permit. */
-export async function discardUnattachedPtySpawn(
-  provider: IPtyProvider,
-  result: PtySpawnResult
-): Promise<boolean> {
-  if (
-    !result.incarnationId ||
-    result.isReattach ||
-    result.agentSessionEnsure?.disposition === 'adopted'
-  ) {
-    return false
-  }
-  const cleanup = await provider
-    .killFenced?.({
-      id: result.id,
-      expectedIncarnationId: result.incarnationId,
-      requireNoAgentOwner: true,
-      requireUnattached: true
-    })
-    .catch(() => undefined)
-  if (cleanup?.outcome !== 'ended' && cleanup?.outcome !== 'already_exited') {
-    return false
-  }
-  finishPtyShutdown(
-    result.id,
-    null,
-    undefined,
-    PtyExitProof.from('shutdown-acknowledged', result.incarnationId)
-  )
-  return true
-}
-
 export async function discardUnpersistedPtySpawn(
   provider: IPtyProvider,
   result: PtySpawnResult,
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
index 6d701656e999..590a053f1e4e 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
@@ -173,11 +173,10 @@ export class StructuredAgentSessionHost extends StructuredAgentSessionHostContex
     this.lifetime.runSwitch(...args)
   adoptSwitch = (from: string, to: string) => this.lifetime.adoptSwitch(from, to)
   switchGeneration = (id: string) => this.lifetime.switchGeneration(id)
-  retainSwitch = (id: string) => this.lifetime.retainSwitch(id)
   guardSwitchWork = (id: string, current: () => boolean) =>
     this.lifetime.guardSwitchWork(id, current)
-  trackSwitchPhysical = <T>(id: string, work: Promise<T>, recover?: () => Promise<void>) =>
-    this.lifetime.trackSwitchPhysical(id, work, recover)
+  trackSwitchPhysical = <T>(id: string, work: Promise<T>) =>
+    this.lifetime.trackSwitchPhysical(id, work)
 
   /** Ordinary Stop owns interruption; only its captured child may be physically closed. */
 
diff --git a/src/main/runtime/rpc/methods/session-tabs.ts b/src/main/runtime/rpc/methods/session-tabs.ts
index b70416f16b0f..0372b9125e72 100644
--- a/src/main/runtime/rpc/methods/session-tabs.ts
+++ b/src/main/runtime/rpc/methods/session-tabs.ts
@@ -84,7 +84,6 @@ export const SESSION_TAB_METHODS = [
           ? { resumeProviderSession: params.resumeProviderSession }
           : {}),
         ...(params.launchAgent ? { launchAgent: params.launchAgent } : {}),
-        ...(params.resumeOrigin ? { resumeOrigin: params.resumeOrigin } : {}),
         ...(params.viewMode ? { viewMode: params.viewMode } : {}),
         activate: params.activate,
         select: params.select,
diff --git a/src/main/runtime/runtime-terminal-contracts.ts b/src/main/runtime/runtime-terminal-contracts.ts
index efec4416a9b9..9e6cd8880a1a 100644
--- a/src/main/runtime/runtime-terminal-contracts.ts
+++ b/src/main/runtime/runtime-terminal-contracts.ts
@@ -111,8 +111,6 @@ export type TerminalCreateOptions = {
   onPtySpawnCommitted?: () => void
   /** Called before the spawn request leaves this process; a throw before it proves nothing spawned. */
   onPtySpawnDispatched?: (launch?: {
-    tabId: string
-    leafId: string
     launchConfig?: SleepingAgentLaunchConfig
     launchAgent?: TuiAgent
   }) => void
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-create-reconciliation.ts b/src/main/runtime/terminal/launch/mobile-terminal-create-reconciliation.ts
deleted file mode 100644
index 320d266d4be3..000000000000
--- a/src/main/runtime/terminal/launch/mobile-terminal-create-reconciliation.ts
+++ /dev/null
@@ -1,163 +0,0 @@
-import { OrcaRuntimeWithResolveMobileSessionTerminalCommand } from './mobile-terminal-startup'
-import type {
-  OwnedMobileTerminalCreateOptions,
-  OwnedMobileTerminalDispatchRecipe
-} from './mobile-terminal-create'
-import type { RuntimeTerminalCreate } from '../../../../shared/runtime-types'
-import type { RuntimePtyWorktreeRecord } from '../../runtime-terminal-state-records'
-import { copySleepingAgentLaunchConfig } from '../../runtime-agent-launch-resolution'
-import { parsePaneKey } from '../../../../shared/stable-pane-id'
-import {
-  ptyHoldsRecordedSurface,
-  type PtySurfaceTopology
-} from '../../pty-recorded-surface-topology'
-import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
-import { persistFreshPaneBinding } from '../../../ipc/pty/spawn-commit-binding'
-
-export abstract class OrcaRuntimeWithReconcileOwnedMobileTerminal extends OrcaRuntimeWithResolveMobileSessionTerminalCommand {
-  protected abstract ptySurfaceTopology(): PtySurfaceTopology
-
-  protected validateOwnedMobileDispatch(
-    pty: RuntimePtyWorktreeRecord,
-    terminal: RuntimeTerminalCreate,
-    opts: OwnedMobileTerminalCreateOptions,
-    dispatched: OwnedMobileTerminalDispatchRecipe | undefined,
-    connectionId: string | null
-  ): OwnedMobileTerminalDispatchRecipe | undefined {
-    const recipe =
-      dispatched?.connectionId === connectionId &&
-      (!pty.launchAgent || pty.launchAgent === dispatched.launchAgent)
-        ? dispatched
-        : undefined
-    const originalAgent = pty.launchAgent ?? recipe?.launchAgent
-    if (originalAgent && opts.launchAgent && originalAgent !== opts.launchAgent) {
-      throw new Error('terminal_create_identity_conflict')
-    }
-    if (
-      !terminal.agentResumeRefused &&
-      !terminal.agentResumeUnavailable &&
-      opts.launchConfig &&
-      !pty.launchConfig &&
-      !recipe?.launchConfig
-    ) {
-      throw new Error('runtime_unavailable')
-    }
-    if (recipe && !terminal.agentResumeRefused && !terminal.agentResumeUnavailable) {
-      pty.launchAgent ??= recipe.launchAgent ?? null
-      if (!pty.launchConfig && recipe.launchConfig) {
-        pty.launchConfig = copySleepingAgentLaunchConfig(recipe.launchConfig)
-      }
-    }
-    return recipe
-  }
-
-  private currentOwnedMobileSurface(pty: RuntimePtyWorktreeRecord) {
-    const recorded = this.paneOfPty(pty)
-    if (!ORCA_LAYOUT_OWNER_IS_MAIN) {
-      const leaf = this.getLeavesForPty(pty.ptyId).find((row) => row.worktreeId === pty.worktreeId)
-      if (leaf) {
-        return { tabId: leaf.tabId, leafId: leaf.leafId }
-      }
-    }
-    const pane = parsePaneKey(recorded.paneKey ?? '')
-    if (ORCA_LAYOUT_OWNER_IS_MAIN && pane) {
-      return pane
-    }
-    const session = this.getWorkspaceSessionForWorktree(pty.worktreeId)
-    for (const tab of session?.tabsByWorktree[pty.worktreeId] ?? []) {
-      for (const [leafId, id] of Object.entries(
-        session?.terminalLayoutsByTabId[tab.id]?.ptyIdsByLeafId ?? {}
-      )) {
-        if (
-          id === pty.ptyId &&
-          (!pty.incarnationId ||
-            session?.terminalPtyIncarnationsByPaneKey?.[`${tab.id}:${leafId}`] ===
-              pty.incarnationId)
-        ) {
-          return { tabId: tab.id, leafId }
-        }
-      }
-    }
-    if (pane && ptyHoldsRecordedSurface(pty.ptyId, recorded, this.ptySurfaceTopology())) {
-      return pane
-    }
-    if (recorded.tabId || recorded.paneKey) {
-      throw new Error('terminal_handle_stale')
-    }
-    return null
-  }
-
-  protected async reconcileOwnedMobileTerminalSurface(
-    worktreeId: string,
-    connectionId: string | null,
-    terminal: RuntimeTerminalCreate,
-    pty: RuntimePtyWorktreeRecord,
-    recipe: OwnedMobileTerminalDispatchRecipe | undefined
-  ) {
-    const incarnationId = pty.incarnationId
-    const resolve = () => {
-      const live = this.getLivePtyForHandle(terminal.handle)?.pty
-      if (
-        live !== pty ||
-        !pty.connected ||
-        pty.incarnationId !== incarnationId ||
-        pty.worktreeId !== worktreeId ||
-        terminal.worktreeId !== worktreeId ||
-        pty.connectionId !== connectionId ||
-        (terminal.ptyId && terminal.ptyId !== pty.ptyId) ||
-        (terminal.incarnationId && terminal.incarnationId !== incarnationId)
-      ) {
-        throw new Error('terminal_handle_stale')
-      }
-      const current = this.currentOwnedMobileSurface(pty)
-      if (current) {
-        return current
-      }
-      const returned = terminal.tabId && terminal.paneKey ? parsePaneKey(terminal.paneKey) : null
-      if (terminal.tabId && terminal.paneKey && (!returned || returned.tabId !== terminal.tabId)) {
-        throw new Error('terminal_handle_stale')
-      }
-      const candidate = returned ?? recipe
-      if (!candidate) {
-        throw new Error('terminal_handle_stale')
-      }
-      const leaf = this.leaves.get(this.getLeafKey(candidate.tabId, candidate.leafId))
-      if (leaf && (leaf.worktreeId !== worktreeId || (leaf.ptyId && leaf.ptyId !== pty.ptyId))) {
-        throw new Error('terminal_handle_stale')
-      }
-      return { tabId: candidate.tabId, leafId: candidate.leafId }
-    }
-    const pendingBinding = persistFreshPaneBinding(
-      this.store,
-      () => ({
-        ...resolve(),
-        worktreeId,
-        ptyId: pty.ptyId,
-        ...(incarnationId ? { incarnationId } : {}),
-        mayReviveRetiredSurface: false
-      }),
-      connectionId
-    )
-    if (pendingBinding && !(await pendingBinding)) {
-      throw new Error('terminal_handle_stale')
-    }
-    const surface = resolve()
-    if (
-      ORCA_LAYOUT_OWNER_IS_MAIN &&
-      this.paneOfPty(pty).paneKey !== `${surface.tabId}:${surface.leafId}`
-    ) {
-      throw new Error('terminal_handle_stale')
-    }
-    if (
-      !ORCA_LAYOUT_OWNER_IS_MAIN &&
-      this.paneOfPty(pty).paneKey !== `${surface.tabId}:${surface.leafId}`
-    ) {
-      this.registerPty(pty.ptyId, worktreeId, connectionId, {
-        ...surface,
-        terminalHandle: terminal.handle,
-        ...(incarnationId ? { incarnationId } : {})
-      })
-    }
-    return surface
-  }
-}
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-create.ts b/src/main/runtime/terminal/launch/mobile-terminal-create.ts
index a9ae2ceb1cb7..0153460897ef 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-create.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-create.ts
@@ -1,4 +1,3 @@
-import { copySleepingAgentLaunchConfig } from '../../runtime-agent-launch-resolution'
 import type { RuntimeMobileSessionTabsResult } from '../../../../shared/runtime-session-contracts'
 import { OrcaRuntimeWithFailedStartPanes } from './failed-start-pane'
 import type { WorktreeStartupLaunch } from '../../../../shared/worktree/launch-types'
@@ -26,9 +25,6 @@ export type MobileTerminalCreateOptions = {
   sourceChatFork?: { sessionId: string }
   targetGroupId?: string
   command?: string
-  sessionOptions?: Record<string, string>
-  commandOverride?: string
-  launchRuntime?: AgentLaunchRuntime
   shellOverride?: string
   cwd?: string
   env?: Record<string, string>
@@ -38,9 +34,6 @@ export type MobileTerminalCreateOptions = {
   agentPrompt?: string
   launchConfig?: SleepingAgentLaunchConfig
   launchAgent?: TuiAgent
-  /** A switch's start: its ordinary spawn admission checks the conversation. */
-  resumeProviderSession?: AgentProviderSessionMetadata
-  resumeOrigin?: 'switch'
   viewMode?: 'terminal' | 'chat'
   activate?: boolean
   clientNavigationId?: string
@@ -49,53 +42,6 @@ export type MobileTerminalCreateOptions = {
   signal?: AbortSignal
 }
 
-export type OwnedMobileTerminalDispatchRecipe = {
-  tabId: string
-  leafId: string
-  launchConfig?: SleepingAgentLaunchConfig
-  launchAgent?: TuiAgent
-  connectionId: string | null
-  recordedAt: number
-}
-
-const OWNED_MOBILE_DISPATCH_RECIPE_TTL_MS = 15 * 60_000
-
-export function pruneOwnedMobileTerminalDispatchRecipes(
-  recipes: Map<string, OwnedMobileTerminalDispatchRecipe>
-): void {
-  const now = Date.now()
-  for (const [handle, recipe] of recipes) {
-    if (now - recipe.recordedAt >= OWNED_MOBILE_DISPATCH_RECIPE_TTL_MS) {
-      recipes.delete(handle)
-    }
-  }
-}
-
-export function recordOwnedMobileTerminalDispatchRecipe(
-  recipes: Map<string, OwnedMobileTerminalDispatchRecipe>,
-  handle: string,
-  launch: Pick<
-    OwnedMobileTerminalDispatchRecipe,
-    'tabId' | 'leafId' | 'launchConfig' | 'launchAgent'
-  >,
-  workspace: { connectionId?: string | null }
-): void {
-  if (!recipes.has(handle) && recipes.size >= 4096) {
-    throw new Error('runtime_unavailable')
-  }
-  // Retain original dispatch evidence across an ambiguous response; retry payloads cannot replace it.
-  recipes.set(handle, {
-    tabId: launch.tabId,
-    leafId: launch.leafId,
-    connectionId: workspace.connectionId ?? null,
-    recordedAt: Date.now(),
-    ...(launch.launchConfig
-      ? { launchConfig: copySleepingAgentLaunchConfig(launch.launchConfig) }
-      : {}),
-    ...(launch.launchAgent ? { launchAgent: launch.launchAgent } : {})
-  })
-}
-
 export type OwnedMobileTerminalCreateOptions = {
   /** A paired client's own create or tab open; without it a stopped WSL distro holds the start. */
   wslUserAct?: true
@@ -115,7 +61,7 @@ export type OwnedMobileTerminalCreateOptions = {
   supportsSplitGroupPlacement?: boolean
   launchConfig?: SleepingAgentLaunchConfig
   resumeProviderSession?: AgentProviderSessionMetadata
-  resumeOrigin?: 'saved' | 'switch'
+  resumeOrigin?: 'saved'
   spawnIntent?: SpawnIntent
   launchRuntime?: AgentLaunchRuntime
   signal?: AbortSignal
@@ -151,9 +97,6 @@ export abstract class OrcaRuntimeWithCreateMobileSessionTerminal extends OrcaRun
       sourceChatFork?: { sessionId: string }
       targetGroupId?: string
       command?: string
-      sessionOptions?: Record<string, string>
-      commandOverride?: string
-      launchRuntime?: AgentLaunchRuntime
       shellOverride?: string
       cwd?: string
       env?: Record<string, string>
@@ -163,7 +106,6 @@ export abstract class OrcaRuntimeWithCreateMobileSessionTerminal extends OrcaRun
       agentPrompt?: string
       launchConfig?: SleepingAgentLaunchConfig
       resumeProviderSession?: AgentProviderSessionMetadata
-      resumeOrigin?: 'switch'
       launchAgent?: TuiAgent
       terminalImageViewerSupported?: boolean
       viewMode?: 'terminal' | 'chat'
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts b/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
index c8de687b6e0c..b29cc01cb7cb 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-owned-create.ts
@@ -1,19 +1,18 @@
-import { placeCreatedSessionTab } from '../../../../shared/session-tab-placement'
-import { insertTabIdIntoOrder } from '../../../../shared/workspace-layout/tab-order'
-import { OrcaRuntimeWithReconcileOwnedMobileTerminal } from './mobile-terminal-create-reconciliation'
+import { OrcaRuntimeWithResolveMobileSessionTerminalCommand } from './mobile-terminal-startup'
+import type { TuiAgent } from '../../../../shared/tui-agent'
+import type { SleepingAgentLaunchConfig } from '../../../../shared/agent-session-resume'
 import type {
   RuntimeMobileSessionCreateTerminalResult,
   RuntimeMobileSessionTabsSnapshot,
   RuntimeMobileSessionTerminalTab
 } from '../../../../shared/runtime-types'
-import {
-  pruneOwnedMobileTerminalDispatchRecipes,
-  recordOwnedMobileTerminalDispatchRecipe,
-  type OwnedMobileTerminalCreateOptions,
-  type OwnedMobileTerminalDispatchRecipe
-} from './mobile-terminal-create'
+import type { OwnedMobileTerminalCreateOptions } from './mobile-terminal-create'
 import { randomUUID } from 'node:crypto'
+import { copySleepingAgentLaunchConfig } from '../../runtime-agent-launch-resolution'
 import { deriveRemoteRuntimeTerminalCreateHandle } from '../../remote-runtime-terminal-create-identity'
+import { parsePaneKey } from '../../../../shared/stable-pane-id'
+import { placeCreatedSessionTab } from '../../../../shared/session-tab-placement'
+import { insertTabIdIntoOrder } from '../../../../shared/workspace-layout/tab-order'
 import type { OrcaRuntimeWithBuildPtyTerminalSummary as PtyTerminalSummaryMethods } from '../query/pty-terminal-summary'
 import {
   buildHeadlessMobileSessionTabGroups,
@@ -21,14 +20,31 @@ import {
   getHeadlessMobileSessionGroupId
 } from '../../mobile-session-layout-projection'
 
-export type { OwnedMobileTerminalCreateOptions } from './mobile-terminal-create'
+const OWNED_MOBILE_DISPATCH_RECIPE_TTL_MS = 15 * 60_000
 
-export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal extends OrcaRuntimeWithReconcileOwnedMobileTerminal {
+export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal extends OrcaRuntimeWithResolveMobileSessionTerminalCommand {
   protected abstract getPtyManualTitle(
     ...args: Parameters<PtyTerminalSummaryMethods['getPtyManualTitle']>
   ): ReturnType<PtyTerminalSummaryMethods['getPtyManualTitle']>
 
-  private readonly ownedMobileDispatchRecipes = new Map<string, OwnedMobileTerminalDispatchRecipe>()
+  private readonly ownedMobileDispatchRecipes = new Map<
+    string,
+    {
+      launchConfig?: SleepingAgentLaunchConfig
+      launchAgent?: TuiAgent
+      connectionId: string | null
+      recordedAt: number
+    }
+  >()
+
+  private pruneOwnedMobileDispatchRecipes(): void {
+    const now = Date.now()
+    for (const [handle, recipe] of this.ownedMobileDispatchRecipes) {
+      if (now - recipe.recordedAt >= OWNED_MOBILE_DISPATCH_RECIPE_TTL_MS) {
+        this.ownedMobileDispatchRecipes.delete(handle)
+      }
+    }
+  }
 
   protected async createRuntimeOwnedMobileSessionTerminal(
     worktreeId: string,
@@ -36,7 +52,7 @@ export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal ext
     afterTabId?: string,
     opts: OwnedMobileTerminalCreateOptions = {}
   ): Promise<RuntimeMobileSessionCreateTerminalResult> {
-    pruneOwnedMobileTerminalDispatchRecipes(this.ownedMobileDispatchRecipes)
+    this.pruneOwnedMobileDispatchRecipes()
     const workspace = await this.resolveTerminalWorkspaceLaunchScope(
       `id:${worktreeId}`,
       undefined,
@@ -63,12 +79,21 @@ export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal ext
         ...(opts.afterDesktopTabId ? { afterTabId: opts.afterDesktopTabId } : {}),
         onPtySpawnDispatched: (launch) => {
           if (mutationHandle && launch) {
-            recordOwnedMobileTerminalDispatchRecipe(
-              this.ownedMobileDispatchRecipes,
-              mutationHandle,
-              launch,
-              workspace
-            )
+            if (
+              !this.ownedMobileDispatchRecipes.has(mutationHandle) &&
+              this.ownedMobileDispatchRecipes.size >= 4096
+            ) {
+              throw new Error('runtime_unavailable')
+            }
+            // Retain original dispatch evidence across an ambiguous response; retry payloads cannot replace it.
+            this.ownedMobileDispatchRecipes.set(mutationHandle, {
+              connectionId: workspace.connectionId ?? null,
+              recordedAt: Date.now(),
+              ...(launch.launchConfig
+                ? { launchConfig: copySleepingAgentLaunchConfig(launch.launchConfig) }
+                : {}),
+              ...(launch.launchAgent ? { launchAgent: launch.launchAgent } : {})
+            })
           }
           // Why after the recipe: its refusal above is still before dispatch.
           opts.onPtySpawnDispatched?.()
@@ -125,29 +150,53 @@ export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal ext
     if (!livePty) {
       throw new Error('terminal_handle_stale')
     }
-    const dispatched =
-      mutationHandle === terminal.handle
-        ? this.ownedMobileDispatchRecipes.get(terminal.handle)
-        : undefined
-    const recipe = opts.createMutation
-      ? this.validateOwnedMobileDispatch(
-          livePty.pty,
-          terminal,
-          opts,
-          dispatched,
-          workspace.connectionId ?? null
-        )
-      : undefined
-    const { tabId: parentTabId, leafId } = await this.reconcileOwnedMobileTerminalSurface(
-      worktreeId,
-      workspace.connectionId ?? null,
-      terminal,
-      livePty.pty,
-      recipe
-    )
     if (opts.createMutation) {
+      if (
+        livePty.pty.launchAgent &&
+        opts.launchAgent &&
+        livePty.pty.launchAgent !== opts.launchAgent
+      ) {
+        throw new Error('terminal_create_identity_conflict')
+      }
+      const dispatchedRecipe =
+        mutationHandle === terminal.handle && this.ownedMobileDispatchRecipes.get(terminal.handle)
+      const recipe =
+        dispatchedRecipe &&
+        dispatchedRecipe.connectionId === (workspace.connectionId ?? null) &&
+        (!livePty.pty.launchAgent || livePty.pty.launchAgent === dispatchedRecipe.launchAgent)
+          ? dispatchedRecipe
+          : null
+      if (
+        !terminal.agentResumeRefused &&
+        !terminal.agentResumeUnavailable &&
+        opts.launchConfig &&
+        !livePty.pty.launchConfig &&
+        !recipe?.launchConfig
+      ) {
+        // Missing original dispatch evidence cannot authorize a retry's captured recipe.
+        throw new Error('runtime_unavailable')
+      }
+      if (recipe && !terminal.agentResumeRefused && !terminal.agentResumeUnavailable) {
+        livePty.pty.launchAgent ??= recipe.launchAgent ?? null
+        if (!livePty.pty.launchConfig && recipe.launchConfig) {
+          livePty.pty.launchConfig = copySleepingAgentLaunchConfig(recipe.launchConfig)
+        }
+      }
       livePty.pty.runtimeSessionOwned = true
+      if (mutationHandle) {
+        this.ownedMobileDispatchRecipes.delete(mutationHandle)
+      }
     }
+    if (opts.createMutation && opts.identity && terminal.ptyId) {
+      this.registerPty(terminal.ptyId, worktreeId, workspace.connectionId ?? null, {
+        tabId: opts.identity.tabId,
+        leafId: opts.identity.leafId,
+        terminalHandle: terminal.handle
+      })
+    }
+    const recorded = this.paneOfPty(livePty.pty)
+    const parentTabId = recorded.tabId ?? `pty:${livePty.pty.ptyId}`
+    const leafId = parsePaneKey(recorded.paneKey ?? '')?.leafId ?? randomUUID()
     const existing = this.mobileSessionTabsByWorktree.get(worktreeId)
     const existingSurface =
       existing?.tabs.find(
@@ -252,9 +301,6 @@ export abstract class OrcaRuntimeWithCreateRuntimeOwnedMobileSessionTerminal ext
     if (!created || created.type !== 'terminal') {
       throw new Error('terminal_handle_stale')
     }
-    if (recipe && this.ownedMobileDispatchRecipes.get(terminal.handle) === recipe) {
-      this.ownedMobileDispatchRecipes.delete(terminal.handle)
-    }
     return {
       tab: created,
       ...(terminal.agentResumeUnavailable ? { agentResumeUnavailable: true as const } : {}),
diff --git a/src/main/runtime/terminal/launch/mobile-terminal-renderer-create.ts b/src/main/runtime/terminal/launch/mobile-terminal-renderer-create.ts
index 28facdd1cc22..245b0e985ba1 100644
--- a/src/main/runtime/terminal/launch/mobile-terminal-renderer-create.ts
+++ b/src/main/runtime/terminal/launch/mobile-terminal-renderer-create.ts
@@ -124,12 +124,9 @@ export abstract class OrcaRuntimeWithRunCreateMobileSessionTerminal extends Orca
         }
       )
     }
-    const switchStart =
-      opts.resumeOrigin === 'switch'
-        ? { resumeProviderSession: opts.resumeProviderSession, resumeOrigin: opts.resumeOrigin }
-        : {}
-    const createOwned = (identity?: { tabId: string; leafId: string }) =>
-      this.createRuntimeOwnedMobileSessionTerminal(
+    const win = this.getAvailableAuthoritativeWindow()
+    if (!win) {
+      return await this.createRuntimeOwnedMobileSessionTerminal(
         worktreeId,
         opts.activate !== false,
         afterTabId,
@@ -141,7 +138,6 @@ export abstract class OrcaRuntimeWithRunCreateMobileSessionTerminal extends Orca
           env: startupCommand.env,
           envToDelete: startupCommand.envToDelete,
           startupCommandDelivery: startupCommand.startupCommandDelivery,
-          ...(identity ? { identity } : {}),
           launchAgent: startupCommand.launchAgent,
           viewMode: opts.viewMode,
           targetGroupId: opts.targetGroupId,
@@ -152,13 +148,9 @@ export abstract class OrcaRuntimeWithRunCreateMobileSessionTerminal extends Orca
           supportsSplitGroupPlacement: opts.supportsSplitGroupPlacement,
           launchConfig: startupCommand.launchConfig,
           launchRuntime: startupCommand.launchRuntime,
-          ...switchStart,
           signal: opts.signal
         }
       )
-    const win = this.getAvailableAuthoritativeWindow()
-    if (!win) {
-      return await createOwned()
     }
     const rendererWebContents = win.webContents
     if (rendererWebContents.isDestroyed?.()) {
@@ -212,7 +204,6 @@ export abstract class OrcaRuntimeWithRunCreateMobileSessionTerminal extends Orca
           ...(startupCommand.envToDelete ? { envToDelete: startupCommand.envToDelete } : {}),
           ...(startupCommand.launchConfig ? { launchConfig: startupCommand.launchConfig } : {}),
           ...(startupCommand.launchAgent ? { launchAgent: startupCommand.launchAgent } : {}),
-          ...switchStart,
           ...(opts.viewMode ? { viewMode: opts.viewMode } : {}),
           startupCommandDelivery: startupCommand.startupCommandDelivery,
           source: 'runtime-session',
@@ -261,11 +252,29 @@ export abstract class OrcaRuntimeWithRunCreateMobileSessionTerminal extends Orca
         if (!pendingSurface) {
           throw new Error('Timed out waiting for terminal surface after creation')
         }
-        // Why: a hidden renderer can publish the tab shell before the PTY spawns; reuse the same identity so later focus adopts instead of creating another tab.
-        return await createOwned({
-          tabId: pendingSurface.tab.parentTabId,
-          leafId: pendingSurface.tab.leafId
-        })
+        // Hidden renderers may publish tab shells before spawn; reuse identity so later focus adopts the tab.
+        return await this.createRuntimeOwnedMobileSessionTerminal(
+          worktreeId,
+          opts.activate !== false,
+          afterTabId,
+          {
+            wslUserAct: true,
+            command: startupCommand.command,
+            ...(opts.shellOverride ? { shellOverride: opts.shellOverride } : {}),
+            cwd,
+            env: startupCommand.env,
+            envToDelete: startupCommand.envToDelete,
+            startupCommandDelivery: startupCommand.startupCommandDelivery,
+            identity: { tabId: pendingSurface.tab.parentTabId, leafId: pendingSurface.tab.leafId },
+            launchAgent: startupCommand.launchAgent,
+            viewMode: opts.viewMode,
+            targetGroupId: opts.targetGroupId,
+            supportsSplitGroupPlacement: opts.supportsSplitGroupPlacement,
+            launchConfig: startupCommand.launchConfig,
+            launchRuntime: startupCommand.launchRuntime,
+            signal: opts.signal
+          }
+        )
       } catch (error) {
         // Hidden-renderer publication can time out; rescue only a live-backed tab or rollback would leave a ghost (#7587).
         if (this.findLiveRegisteredPtyForRendererTab(worktreeId, reply.tabId)) {
@@ -293,5 +302,3 @@ export abstract class OrcaRuntimeWithRunCreateMobileSessionTerminal extends Orca
     }
   }
 }
-
-export type { MobileTerminalCreateOptions } from './mobile-terminal-create'
diff --git a/src/main/runtime/terminal/launch/terminal-create.ts b/src/main/runtime/terminal/launch/terminal-create.ts
index e35e98b9e541..61adcf7a3923 100644
--- a/src/main/runtime/terminal/launch/terminal-create.ts
+++ b/src/main/runtime/terminal/launch/terminal-create.ts
@@ -106,12 +106,7 @@ export abstract class OrcaRuntimeWithCreateTerminal extends OrcaRuntimeWithTermi
         }
         try {
           const { launchAgent } = launchOpts
-          launchOpts.onPtySpawnDispatched?.({
-            tabId,
-            leafId,
-            launchConfig: effectiveLaunchConfig,
-            launchAgent
-          })
+          launchOpts.onPtySpawnDispatched?.({ launchConfig: effectiveLaunchConfig, launchAgent })
           result = await dependencies.spawnInAdmittedPane(this.store, ptyController, {
             ...initialSize,
             cwd,
diff --git a/src/preload/api/pty-api.ts b/src/preload/api/pty-api.ts
index 216c5887fd4a..42938f007f16 100644
--- a/src/preload/api/pty-api.ts
+++ b/src/preload/api/pty-api.ts
@@ -51,7 +51,7 @@ export type PtyApi = {
     commandDelivery?: 'renderer' | 'provider'
     launchConfig?: SleepingAgentLaunchConfig
     resumeProviderSession?: AgentProviderSessionMetadata
-    resumeOrigin?: 'saved' | 'switch'
+    resumeOrigin?: 'saved'
     launchToken?: string
     launchAgent?: TuiAgent
     startupCommandDelivery?: StartupCommandDelivery
diff --git a/src/preload/api/pty-bridge-session-control.ts b/src/preload/api/pty-bridge-session-control.ts
index f50900ecbf1a..765d81ee44f6 100644
--- a/src/preload/api/pty-bridge-session-control.ts
+++ b/src/preload/api/pty-bridge-session-control.ts
@@ -43,7 +43,7 @@ export const ptySessionControlApi = {
     commandDelivery?: 'renderer' | 'provider'
     launchConfig?: SleepingAgentLaunchConfig
     resumeProviderSession?: AgentProviderSessionMetadata
-    resumeOrigin?: 'saved' | 'switch'
+    resumeOrigin?: 'saved'
     launchToken?: string
     launchAgent?: TuiAgent
     startupCommandDelivery?: StartupCommandDelivery
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-types.ts b/src/renderer/src/components/terminal-pane/pty-connection-types.ts
index 2565965e0ab5..eda4aada2de2 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-types.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-types.ts
@@ -31,7 +31,7 @@ export type PtyPaneStartup = {
   launchConfig?: SleepingAgentLaunchConfig
   resumeProviderSession?: AgentProviderSessionMetadata
   /** `saved`: a resume built from saved facts, which the host refuses for a chat's conversation. */
-  resumeOrigin?: 'saved' | 'switch'
+  resumeOrigin?: 'saved'
   resumeSource?: SavedResumeStartupSource
   launchToken?: string
   launchAgent?: TuiAgent
diff --git a/src/renderer/src/components/terminal-pane/pty-transport-types.ts b/src/renderer/src/components/terminal-pane/pty-transport-types.ts
index 44a46c54c9e7..3f61baf1b540 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport-types.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport-types.ts
@@ -191,7 +191,7 @@ export type PtyTransport = {
     envToDelete?: string[]
     launchConfig?: SleepingAgentLaunchConfig
     resumeProviderSession?: AgentProviderSessionMetadata
-    resumeOrigin?: 'saved' | 'switch'
+    resumeOrigin?: 'saved'
     launchToken?: string
     launchAgent?: TuiAgent
     startupCommandDelivery?: StartupCommandDelivery
@@ -293,7 +293,7 @@ export type IpcPtyTransportOptions = {
   commandDelivery?: 'renderer' | 'provider'
   launchConfig?: SleepingAgentLaunchConfig
   resumeProviderSession?: AgentProviderSessionMetadata
-  resumeOrigin?: 'saved' | 'switch'
+  resumeOrigin?: 'saved'
   agentPrompt?: string
   agentPromptDelivery?: AgentPromptDelivery
   agentArgsOverride?: string | null
diff --git a/src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge.ts
index eb5f52a9e8d9..64898b7ef134 100644
--- a/src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge.ts
@@ -71,7 +71,6 @@ export function registerTerminalRequestIpcBridge(unsubs: (() => void)[]): void {
               ...(data.resumeProviderSession
                 ? { resumeProviderSession: data.resumeProviderSession }
                 : {}),
-              ...(data.resumeOrigin ? { resumeOrigin: data.resumeOrigin } : {}),
               ...(data.launchToken ? { launchToken: data.launchToken } : {}),
               ...(data.launchAgent ? { launchAgent: data.launchAgent } : {}),
               ...(data.startupCommandDelivery
diff --git a/src/renderer/src/lib/launch-ai-vault-session.ts b/src/renderer/src/lib/launch-ai-vault-session.ts
index 3f4200cdb66c..0827b314878b 100644
--- a/src/renderer/src/lib/launch-ai-vault-session.ts
+++ b/src/renderer/src/lib/launch-ai-vault-session.ts
@@ -1,6 +1,5 @@
 import { useAppStore } from '@/store'
 import { persistAgentLaunchTabOrder } from '@/lib/launch-agent-tab-order'
-import { insertUnifiedTabAfterAnchor } from '@/lib/unified-tab-anchor-insertion'
 import { tuiAgentToAgentKind } from '@/lib/telemetry'
 import { runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/worktree-runtime-owner'
 import { createWebRuntimeSessionTerminal } from '@/runtime/web-runtime-terminal-creation'
@@ -28,17 +27,8 @@ export function launchAiVaultSessionInNewTab(args: {
   providerSession?: AgentProviderSessionMetadata
   targetGroupId?: string
   splitDirection?: TabSplitDirection
-  /** Opens in this tab's slot: the next tab in its group. */
-  afterTabId?: string
-  /** A chat's switch, whose ordinary spawn admits the resume; set only for a capable host. */
-  resumeOrigin?: 'switch'
 }): LaunchAiVaultSessionInNewTabResult {
   const store = useAppStore.getState()
-  const slot = args.afterTabId
-    ? store.unifiedTabsByWorktree[args.worktreeId]?.find((tab) => tab.id === args.afterTabId)
-    : undefined
-  const sourceGroupId = args.targetGroupId ?? slot?.groupId
-  const switchStart = args.resumeOrigin ? { resumeOrigin: args.resumeOrigin } : {}
   // Why both paths split: the runtime path used to return first and drop the split (#22791).
   const split =
     args.splitDirection && args.targetGroupId
@@ -50,14 +40,12 @@ export function launchAiVaultSessionInNewTab(args: {
     const splitGroupId = split
       ? store.createEmptySplitGroup(args.worktreeId, split.sourceGroupId, split.splitDirection)
       : null
-    const targetGroupId = splitGroupId ?? sourceGroupId
+    const targetGroupId = splitGroupId ?? args.targetGroupId
     const runtimeLaunch = createWebRuntimeSessionTerminal(
       {
         worktreeId: args.worktreeId,
         environmentId: runtimeEnvironmentId,
         ...(targetGroupId ? { targetGroupId } : {}),
-        ...(args.afterTabId ? { afterTabId: args.afterTabId } : {}),
-        ...switchStart,
         agentSessionKind: 'resume',
         launchAgent: args.agent,
         command: args.command,
@@ -83,7 +71,7 @@ export function launchAiVaultSessionInNewTab(args: {
     return { tabId: null, runtimeLaunch: observedRuntimeLaunch }
   }
 
-  const tab = store.createTab(args.worktreeId, sourceGroupId, undefined, {
+  const tab = store.createTab(args.worktreeId, args.targetGroupId, undefined, {
     ...(split ? { split } : {}),
     ...(args.cwd ? { startupCwd: args.cwd } : {}),
     pendingStartup: {
@@ -92,7 +80,6 @@ export function launchAiVaultSessionInNewTab(args: {
       ...(args.envToDelete ? { envToDelete: args.envToDelete } : {}),
       ...(args.launchConfig ? { launchConfig: args.launchConfig, launchAgent: args.agent } : {}),
       ...(args.providerSession ? { resumeProviderSession: args.providerSession } : {}),
-      ...(args.resumeOrigin ? { launchAgent: args.agent, ...switchStart } : {}),
       telemetry: {
         agent_kind: tuiAgentToAgentKind(args.agent),
         launch_source: 'sidebar',
@@ -103,9 +90,6 @@ export function launchAiVaultSessionInNewTab(args: {
   store.setActiveTabType('terminal', args.worktreeId)
 
   persistAgentLaunchTabOrder(args.worktreeId, tab.id)
-  if (slot && !split && (!args.targetGroupId || args.targetGroupId === slot.groupId)) {
-    insertUnifiedTabAfterAnchor(args.worktreeId, tab.id, slot.id)
-  }
 
   return { tabId: tab.id }
 }
diff --git a/src/renderer/src/runtime/web-runtime-agent-terminal-host-authority.ts b/src/renderer/src/runtime/web-runtime-agent-terminal-host-authority.ts
deleted file mode 100644
index 39f060f24e95..000000000000
--- a/src/renderer/src/runtime/web-runtime-agent-terminal-host-authority.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import { buildDefaultTerminalOptions } from '@/lib/pane-manager/pane-terminal-options'
-import type { TuiAgent } from '../../../shared/tui-agent'
-import { createAgentSessionKeyboardOptions } from './agent-session-keyboard-capability'
-import { agentProviderSessionForHostEnsure } from './agent-session-ensure-provider-session'
-import {
-  createAgentSessionCreateOperation,
-  withAgentSessionCreateOperationId
-} from './agent-session-create-operation'
-import { unwrapRuntimeRpcResult } from './runtime-rpc-result'
-import { toRuntimeWorktreeSelector } from './runtime-worktree-selector'
-import type { captureRuntimeEnvironmentCall } from './web-runtime-session-environment'
-import type { CreateWebRuntimeSessionTerminalArgs } from './web-runtime-session-types'
-import { readCreatedAgentTerminalIdentity } from './web-runtime-terminal-identity'
-
-export function createWebRuntimeAgentTerminalHostAuthority(
-  environmentId: string,
-  args: CreateWebRuntimeSessionTerminalArgs,
-  agent: TuiAgent,
-  agentArgsOverride: string | null | undefined,
-  callEnvironment: ReturnType<typeof captureRuntimeEnvironmentCall>
-) {
-  // Paired panes retain the default keyboard advertisement, including on Windows clients.
-  const keyboardProtocol = buildDefaultTerminalOptions().vtExtensions?.kittyKeyboard
-  const keyboardOptions = createAgentSessionKeyboardOptions(keyboardProtocol)
-  // Why: structured creation cannot yet express afterTabId; keep the exact legacy placement contract until it can.
-  // Why: focus belongs to the paired client; a headless execution host has no renderer to focus.
-  // Why: rebuilding a prepared command through host authority can discard its embedded prompt and delivery flags.
-  // A switch uses the ordinary prepared command and admission.
-  const mustUseLegacyAgentCreate =
-    args.preparedAgentCommand || args.afterTabId || args.resumeOrigin === 'switch'
-  return mustUseLegacyAgentCreate
-    ? undefined
-    : args.agentSessionKind === 'resume'
-      ? args.providerSession
-        ? async () =>
-            readCreatedAgentTerminalIdentity(
-              unwrapRuntimeRpcResult(
-                await callEnvironment({
-                  method: 'terminal.ensureAgentSession',
-                  params: {
-                    ...(await keyboardOptions(environmentId)),
-                    kind: 'explicit',
-                    worktree: toRuntimeWorktreeSelector(args.worktreeId),
-                    agent,
-                    providerSession: await agentProviderSessionForHostEnsure(
-                      environmentId,
-                      args.providerSession!
-                    ),
-                    ...(args.launchConfig?.ompResumeFilePath
-                      ? { ompResumeFilePath: args.launchConfig.ompResumeFilePath }
-                      : {}),
-                    ...(agentArgsOverride !== undefined ? { agentArgs: agentArgsOverride } : {}),
-                    ...(args.launchPreferences
-                      ? { launchPreferences: args.launchPreferences }
-                      : {}),
-                    presentation: 'background'
-                  },
-                  timeoutMs: 15_000
-                })
-              )
-            )
-        : undefined
-      : async () =>
-          await createAgentSessionCreateOperation().run(async (clientOperationId) =>
-            readCreatedAgentTerminalIdentity(
-              unwrapRuntimeRpcResult(
-                await callEnvironment({
-                  method: 'terminal.createAgentSession',
-                  params: withAgentSessionCreateOperationId(
-                    {
-                      ...(await keyboardOptions(environmentId)),
-                      worktree: toRuntimeWorktreeSelector(args.worktreeId),
-                      agent,
-                      ...(args.prompt ? { prompt: args.prompt } : {}),
-                      ...(args.promptDelivery ? { promptDelivery: args.promptDelivery } : {}),
-                      ...(agentArgsOverride !== undefined ? { agentArgs: agentArgsOverride } : {}),
-                      ...(args.launchPreferences
-                        ? { launchPreferences: args.launchPreferences }
-                        : {}),
-                      ...(args.cwd ? { startupCwd: args.cwd } : {}),
-                      ...(args.viewMode ? { viewMode: args.viewMode } : {}),
-                      presentation: 'background'
-                    },
-                    clientOperationId
-                  ),
-                  timeoutMs: 15_000
-                })
-              )
-            )
-          )
-}
diff --git a/src/renderer/src/runtime/web-runtime-session-types.ts b/src/renderer/src/runtime/web-runtime-session-types.ts
index a09629f34a61..aeb015419d91 100644
--- a/src/renderer/src/runtime/web-runtime-session-types.ts
+++ b/src/renderer/src/runtime/web-runtime-session-types.ts
@@ -39,8 +39,6 @@ export type CreateWebRuntimeSessionTerminalArgs = {
   agentArgs?: string | null
   launchPreferences?: AgentLaunchPreferences
   providerSession?: AgentProviderSessionMetadata
-  /** A chat's switch: sent only to a host advertising the agent's switch capability. */
-  resumeOrigin?: 'switch'
   viewMode?: 'terminal' | 'chat'
   activate?: boolean
   selectWorktree?: boolean
diff --git a/src/renderer/src/runtime/web-runtime-terminal-create-operation.ts b/src/renderer/src/runtime/web-runtime-terminal-create-operation.ts
index 26004eb9c758..01184bb175ad 100644
--- a/src/renderer/src/runtime/web-runtime-terminal-create-operation.ts
+++ b/src/renderer/src/runtime/web-runtime-terminal-create-operation.ts
@@ -1,10 +1,16 @@
-import { createWebRuntimeAgentTerminalHostAuthority } from './web-runtime-agent-terminal-host-authority'
+import { buildDefaultTerminalOptions } from '@/lib/pane-manager/pane-terminal-options'
+import { createAgentSessionKeyboardOptions } from './agent-session-keyboard-capability'
 import type { RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope'
 import type { RuntimeMobileSessionCreateTerminalResult } from '../../../shared/runtime-types'
 import { toRuntimeExecutionHostId } from '../../../shared/execution-host'
+import { agentProviderSessionForHostEnsure } from './agent-session-ensure-provider-session'
 import { translate } from '../i18n/i18n'
 import { useAppStore } from '../store'
 import { agentResumeHostAuthorityCapability } from './agent-resume-host-authority-capability'
+import {
+  createAgentSessionCreateOperation,
+  withAgentSessionCreateOperationId
+} from './agent-session-create-operation'
 import { runRemoteAgentSessionLaunch } from './remote-agent-session-launch'
 import { unwrapRuntimeRpcResult } from './runtime-rpc-result'
 import { toRuntimeWorktreeSelector } from './runtime-worktree-selector'
@@ -34,7 +40,10 @@ import {
   selectWebRuntimeSessionWorktree,
   type WebRuntimeSessionWorkspaceSelectionRollback
 } from './web-runtime-session-workspace-selection'
-import { createdTerminalLeafId } from './web-runtime-terminal-identity'
+import {
+  createdTerminalLeafId,
+  readCreatedAgentTerminalIdentity
+} from './web-runtime-terminal-identity'
 import { settleWebRuntimeTerminalPlacement } from './web-runtime-terminal-placement-settlement'
 import { buildPlainCreateTerminalParams } from './web-runtime-plain-terminal-create-params'
 
@@ -79,14 +88,78 @@ export async function createWebRuntimeSessionTerminalResult(
     const agentArgsOverride =
       args.agentArgs !== undefined ? args.agentArgs : args.launchConfig?.agentArgs
     if (agent) {
+      // Paired panes retain the default keyboard advertisement, including on Windows clients.
+      const keyboardProtocol = buildDefaultTerminalOptions().vtExtensions?.kittyKeyboard
+      const keyboardOptions = createAgentSessionKeyboardOptions(keyboardProtocol)
       let legacyAlreadyPlacedInGroup = false
-      const hostAuthority = createWebRuntimeAgentTerminalHostAuthority(
-        environmentId,
-        args,
-        agent,
-        agentArgsOverride,
-        callEnvironment
-      )
+      // Keep legacy placement until structured creation supports afterTabId.
+      // Focus belongs to this client; headless hosts have no renderer.
+      // Rebuilding prepared commands under host authority can discard prompts/delivery flags.
+      const mustUseLegacyAgentCreate = args.preparedAgentCommand || args.afterTabId
+      const hostAuthority = mustUseLegacyAgentCreate
+        ? undefined
+        : args.agentSessionKind === 'resume'
+          ? args.providerSession
+            ? async () =>
+                readCreatedAgentTerminalIdentity(
+                  unwrapRuntimeRpcResult(
+                    await callEnvironment({
+                      method: 'terminal.ensureAgentSession',
+                      params: {
+                        ...(await keyboardOptions(environmentId)),
+                        kind: 'explicit',
+                        worktree: toRuntimeWorktreeSelector(args.worktreeId),
+                        agent,
+                        providerSession: await agentProviderSessionForHostEnsure(
+                          environmentId,
+                          args.providerSession!
+                        ),
+                        ...(args.launchConfig?.ompResumeFilePath
+                          ? { ompResumeFilePath: args.launchConfig.ompResumeFilePath }
+                          : {}),
+                        ...(agentArgsOverride !== undefined
+                          ? { agentArgs: agentArgsOverride }
+                          : {}),
+                        ...(args.launchPreferences
+                          ? { launchPreferences: args.launchPreferences }
+                          : {}),
+                        presentation: 'background'
+                      },
+                      timeoutMs: 15_000
+                    })
+                  )
+                )
+            : undefined
+          : async () =>
+              await createAgentSessionCreateOperation().run(async (clientOperationId) =>
+                readCreatedAgentTerminalIdentity(
+                  unwrapRuntimeRpcResult(
+                    await callEnvironment({
+                      method: 'terminal.createAgentSession',
+                      params: withAgentSessionCreateOperationId(
+                        {
+                          ...(await keyboardOptions(environmentId)),
+                          worktree: toRuntimeWorktreeSelector(args.worktreeId),
+                          agent,
+                          ...(args.prompt ? { prompt: args.prompt } : {}),
+                          ...(args.promptDelivery ? { promptDelivery: args.promptDelivery } : {}),
+                          ...(agentArgsOverride !== undefined
+                            ? { agentArgs: agentArgsOverride }
+                            : {}),
+                          ...(args.launchPreferences
+                            ? { launchPreferences: args.launchPreferences }
+                            : {}),
+                          ...(args.cwd ? { startupCwd: args.cwd } : {}),
+                          ...(args.viewMode ? { viewMode: args.viewMode } : {}),
+                          presentation: 'background'
+                        },
+                        clientOperationId
+                      ),
+                      timeoutMs: 15_000
+                    })
+                  )
+                )
+              )
       const resumeHostAuthorityCapability =
         args.agentSessionKind === 'resume' ? agentResumeHostAuthorityCapability(agent) : undefined
       const created = await runRemoteAgentSessionLaunch<{
@@ -113,9 +186,6 @@ export async function createWebRuntimeSessionTerminalResult(
               ...(args.launchToken ? { launchToken: args.launchToken } : {}),
               ...(args.agent ? { agent: args.agent } : {}),
               ...(args.launchAgent ? { launchAgent: args.launchAgent } : {}),
-              ...(args.resumeOrigin && args.providerSession
-                ? { resumeOrigin: args.resumeOrigin, resumeProviderSession: args.providerSession }
-                : {}),
               ...(args.viewMode ? { viewMode: args.viewMode } : {}),
               // Old hosts use activate:false; new hosts use select/navigation for caller-local focus.
               activate: false,
diff --git a/src/renderer/src/store/terminals/terminal-actions.ts b/src/renderer/src/store/terminals/terminal-actions.ts
index 77695a87b3d5..76870709c833 100644
--- a/src/renderer/src/store/terminals/terminal-actions.ts
+++ b/src/renderer/src/store/terminals/terminal-actions.ts
@@ -210,7 +210,7 @@ export type TerminalActions = {
       envToDelete?: string[]
       launchConfig?: SleepingAgentLaunchConfig
       resumeProviderSession?: AgentProviderSessionMetadata
-      resumeOrigin?: 'saved' | 'switch'
+      resumeOrigin?: 'saved'
       launchToken?: string
       launchAgent?: TuiAgent
       agentArgsOverride?: string | null
@@ -237,7 +237,7 @@ export type TerminalActions = {
     envToDelete?: string[]
     launchConfig?: SleepingAgentLaunchConfig
     resumeProviderSession?: AgentProviderSessionMetadata
-    resumeOrigin?: 'saved' | 'switch'
+    resumeOrigin?: 'saved'
     launchToken?: string
     launchAgent?: TuiAgent
     agentArgsOverride?: string | null
diff --git a/src/renderer/src/store/terminals/terminal-state.ts b/src/renderer/src/store/terminals/terminal-state.ts
index 68160b0627eb..c0b076fb5c47 100644
--- a/src/renderer/src/store/terminals/terminal-state.ts
+++ b/src/renderer/src/store/terminals/terminal-state.ts
@@ -64,7 +64,7 @@ export type TerminalState = {
       envToDelete?: string[]
       launchConfig?: SleepingAgentLaunchConfig
       resumeProviderSession?: AgentProviderSessionMetadata
-      resumeOrigin?: 'saved' | 'switch'
+      resumeOrigin?: 'saved'
       resumeSource?: SavedResumeStartupSource
       launchToken?: string
       launchAgent?: TuiAgent
diff --git a/src/shared/local-build-compatibility-contract.json b/src/shared/local-build-compatibility-contract.json
index 046d29c66854..f878cefa3d2c 100644
--- a/src/shared/local-build-compatibility-contract.json
+++ b/src/shared/local-build-compatibility-contract.json
@@ -3,10 +3,10 @@
   "appId": "com.stablyai.orca",
   "stateSchemaVersion": 1,
   "readableStateSchemaVersions": [1],
-  "daemonProtocolVersion": 55,
+  "daemonProtocolVersion": 54,
   "attachableDaemonProtocolVersions": [
     1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
     27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
-    51, 52, 53, 54, 55
+    51, 52, 53, 54
   ]
 }
diff --git a/src/shared/local-build-compatibility-contract.ts b/src/shared/local-build-compatibility-contract.ts
index 55f5434432d7..244e01dc6a1c 100644
--- a/src/shared/local-build-compatibility-contract.ts
+++ b/src/shared/local-build-compatibility-contract.ts
@@ -3,10 +3,10 @@ export const LOCAL_BUILD_COMPATIBILITY_CONTRACT = {
   appId: 'com.stablyai.orca',
   stateSchemaVersion: 1,
   readableStateSchemaVersions: [1],
-  daemonProtocolVersion: 55,
+  daemonProtocolVersion: 54,
   attachableDaemonProtocolVersions: [
     1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
     27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
-    51, 52, 53, 54, 55
+    51, 52, 53, 54
   ]
 } as const
diff --git a/src/shared/rpc-contract/session-tabs-schemas-params.ts b/src/shared/rpc-contract/session-tabs-schemas-params.ts
index 0a95717959b5..0cbf8598fbaf 100644
--- a/src/shared/rpc-contract/session-tabs-schemas-params.ts
+++ b/src/shared/rpc-contract/session-tabs-schemas-params.ts
@@ -166,8 +166,6 @@ export const CreateTerminalTab = WorktreeTabSelector.extend({
   launchToken: z.string().min(1).max(128).optional(),
   // Record the resumed conversation before hook reports; drop malformed hints, never the create (#10923).
   resumeProviderSession: ResumeProviderSessionParam.optional().catch(undefined),
-  // Sent only to hosts advertising the agent's switch capability: an older host strips it unprotected.
-  resumeOrigin: z.literal('switch').optional(),
   agent: z
     .custom<TuiAgent>(isTuiAgent, {
       message: 'Unknown agent preset'
@@ -192,13 +190,6 @@ export const CreateTerminalTab = WorktreeTabSelector.extend({
   // Retry the same in-flight create on double-tap/reconnect instead of spawning another terminal.
   clientMutationId: z.string().min(1).max(128).optional()
 }).superRefine((value, context) => {
-  if (value.resumeOrigin === 'switch' && (!value.resumeProviderSession || !value.launchAgent)) {
-    context.addIssue({
-      code: 'custom',
-      path: ['resumeOrigin'],
-      message: 'A switch names its conversation and agent'
-    })
-  }
   if (value.sourceChatFork) {
     if (!value.clientMutationId) {
       context.addIssue({
diff --git a/src/shared/rpc-contract/structured-agent-session-params.ts b/src/shared/rpc-contract/structured-agent-session-params.ts
index 695114ca7080..dbc1335139ea 100644
--- a/src/shared/rpc-contract/structured-agent-session-params.ts
+++ b/src/shared/rpc-contract/structured-agent-session-params.ts
@@ -221,7 +221,6 @@ export const SwitchToChatParams = OptionsParams.extend({
   execution: z
     .object({
       invocationId: Identifier('Invalid invocation'),
-      viewerSelection: z.string().max(16384).optional(),
       create: CreateIntentParams.omit({ firstMessage: true }).optional(),
       source: TerminalClose.required().optional()
     })
@@ -232,7 +231,6 @@ export const SwitchToTerminalParams = OptionsParams.extend({
   execution: z
     .object({
       invocationId: Identifier('Invalid invocation'),
-      viewerSelection: z.string().max(16384).optional(),
       sourceTabId: Identifier('Invalid tab').optional(),
       groupId: Identifier('Invalid group').optional(),
       commandOverride: z.string().max(8192).optional()
diff --git a/src/shared/runtime-terminal-contracts.ts b/src/shared/runtime-terminal-contracts.ts
index f744d02a8cd8..c2ad610a9ca1 100644
--- a/src/shared/runtime-terminal-contracts.ts
+++ b/src/shared/runtime-terminal-contracts.ts
@@ -250,8 +250,6 @@ type RuntimeTerminalCreateBaseRequestPayload = {
   envToDelete?: string[]
   launchConfig?: AgentSessionResume.SleepingAgentLaunchConfig
   resumeProviderSession?: AgentSessionResume.AgentProviderSessionMetadata
-  /** A chat's switch: the pane's spawn admission claims the conversation. */
-  resumeOrigin?: 'switch'
   launchToken?: string
   launchAgent?: TuiAgent
   viewMode?: 'terminal' | 'chat'
diff --git a/tests/e2e/runtime-environment-switch-dispatch-clock.unit.test.ts b/tests/e2e/runtime-environment-switch-dispatch-clock.unit.test.ts
deleted file mode 100644
index 36e2422310cf..000000000000
--- a/tests/e2e/runtime-environment-switch-dispatch-clock.unit.test.ts
+++ /dev/null
@@ -1,141 +0,0 @@
-import { afterEach, expect, it, vi } from 'vitest'
-import { registerRuntimeEnvironmentSubscriptionHandlers } from '../../src/main/ipc/runtime-environments/runtime-environment-subscription-handlers'
-import { subscribeRuntimeEnvironmentFromPreload } from '../../src/preload/runtime-environment-subscriptions'
-import { sendSharedControlSubscription } from '../../src/shared/remote-runtime/control/remote-runtime-shared-control-send'
-import type { SharedControlLogicalSubscription } from '../../src/shared/remote-runtime/control/remote-runtime-shared-control-types'
-import { agentSessionSwitchDeadline } from '../../src/shared/agent-session-switch-execution'
-import { callAbortableRuntimeEnvironment } from '../../src/renderer/src/runtime/abortable-runtime-environment-call'
-import { stubRuntimeEnvironmentBridge } from '../../src/renderer/src/runtime/runtime-environment-bridge-fixture'
-
-// @vitest-environment happy-dom
-
-type SubscriptionIpc = Parameters<typeof subscribeRuntimeEnvironmentFromPreload>[0]
-type SubscriptionEvent = Parameters<Parameters<SubscriptionIpc['on']>[1]>[1]
-const mocks = vi.hoisted(() => ({ handle: vi.fn(), subscribe: vi.fn() }))
-vi.mock('electron', () => ({ ipcMain: { handle: mocks.handle, on: vi.fn() } }))
-vi.mock('../../src/shared/runtime-environment-store', () => ({
-  resolveEnvironment: () => ({ id: 'paired', createdAt: 1, runtimeId: 'host' })
-}))
-vi.mock(
-  '../../src/main/ipc/runtime-environments/runtime-environment-connectivity-handlers',
-  () => ({
-    isRuntimeEnvironmentManuallyDisconnected: () => false
-  })
-)
-vi.mock('../../src/main/ipc/runtime-environments/runtime-environment-transport-generation', () => ({
-  getRuntimeEnvironmentTransportGeneration: () => 1
-}))
-vi.mock('../../src/main/ipc/runtime-environments/runtime-environment-transport-routing', () => ({
-  subscribeRuntimeEnvironment: mocks.subscribe
-}))
-afterEach(() => {
-  vi.useRealTimers()
-  vi.unstubAllGlobals()
-  vi.clearAllMocks()
-})
-it.each(['ready after expiry', 'delayed sent receipt'] as const)(
-  'uses actual main/shared-control dispatch authority with %s across preload',
-  async () => {
-    vi.useFakeTimers()
-    vi.setSystemTime(0)
-    const deadline = agentSessionSwitchDeadline(Date.now, 735_000)
-    const ready = Promise.withResolvers<void>()
-    const queuedEvents: (() => void)[] = []
-    let deliver: Parameters<SubscriptionIpc['on']>[1] | undefined
-    const wire = vi.fn(() => true)
-    const sender = {
-      id: 1,
-      isDestroyed: () => false,
-      on: vi.fn(),
-      removeListener: vi.fn(),
-      send: (_channel: string, payload: SubscriptionEvent) => {
-        queuedEvents.push(() => deliver?.(null, payload))
-      }
-    }
-    registerRuntimeEnvironmentSubscriptionHandlers({
-      getUserDataPath: () => '/unused',
-      remoteRuntimeSubscriptions: new Map(),
-      pendingSubscriptions: new Map(),
-      recordLayoutFrame: () => {}
-    })
-    const handler = (channel: string) =>
-      mocks.handle.mock.calls.find(([name]) => name === channel)?.[1]
-    const ipc: SubscriptionIpc = {
-      invoke: async (channel: string, args: unknown) => {
-        // Cancellation delivery is independently stalled; the main deadline must suffice.
-        if (channel.endsWith(':unsubscribe')) {
-          return new Promise(() => {})
-        }
-        const call = handler(channel)
-        if (!call) {
-          throw new Error('missing handler')
-        }
-        return call({ sender }, args)
-      },
-      send: vi.fn(),
-      on: (_channel: string, listener: typeof deliver) => {
-        deliver = listener
-      },
-      removeListener: vi.fn()
-    }
-    mocks.subscribe.mockImplementation(async (_root, _id, method, params, _timeout, callbacks) => {
-      await ready.promise
-      const logical: SharedControlLogicalSubscription = {
-        requestId: 'request',
-        method,
-        params,
-        retainedParamsBytes: 0,
-        sent: false,
-        closed: false,
-        closeAfterReady: false,
-        remoteSubscriptionId: null,
-        callbacks: {
-          beforeSend: callbacks.beforeSend,
-          onResponse: (response) => callbacks.onEvent({ type: 'response', response }),
-          onError: (error) =>
-            callbacks.onEvent({ type: 'error', code: error.code, message: error.message }),
-          onClose: callbacks.onClose
-        }
-      }
-      sendSharedControlSubscription({
-        subscriptions: new Map([['request', logical]]),
-        subscription: logical,
-        deviceToken: 'fixture-token',
-        send: wire
-      })
-      return { requestId: 'request', close: vi.fn(), sendBinary: () => false }
-    })
-    stubRuntimeEnvironmentBridge({
-      subscribe: (
-        args: Parameters<typeof subscribeRuntimeEnvironmentFromPreload>[1],
-        callbacks: Parameters<typeof subscribeRuntimeEnvironmentFromPreload>[2]
-      ) => subscribeRuntimeEnvironmentFromPreload(ipc, args, callbacks),
-      cancelSubscription: () => new Promise(() => {})
-    })
-    await vi.advanceTimersByTimeAsync(700_000)
-    const sent = vi.fn((at?: number) => deadline.beforeSend(at))
-    const call = callAbortableRuntimeEnvironment(
-      'paired',
-      'agentSession.switchToChat',
-      {},
-      735_000,
-      deadline.signal,
-      undefined,
-      undefined,
-      sent,
-      deadline.delegateSend()
-    )
-    void call.catch(() => undefined)
-    expect(mocks.subscribe).toHaveBeenCalledOnce()
-    await vi.advanceTimersByTimeAsync(36_000)
-    ready.resolve()
-    await Promise.resolve()
-    await Promise.resolve()
-    expect(wire).not.toHaveBeenCalled()
-    for (const send of queuedEvents.splice(0)) {
-      send()
-    }
-    await expect(call).rejects.toThrow()
-    deadline.dispose()
-  }
-)

From 372c682bfab9070688159769d9b4a97cae37a5cb Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 16:07:17 -0700
Subject: [PATCH 130/207] Replace the chat's tab as layout only, and say what
 the replace closed

Switching a chat to its terminal no longer closes the chat tab as if the
user had closed it: that sent agentSession.close back to the host while
the switch was still running, which revoked it and reported a failure on
a switch that had worked. The window's replace now closes the tab as
layout only, takes the slot's pin, and its reply says which tab it closed,
so the host hides the chat's saved tab only when the chat actually left.

The layout model moves a terminal that a parked spawn already admitted
into the replaced slot instead of leaving it at the end of the group, and
a host without a window takes that same layout command.
---
 .../terminal-pane-admission.ts                |   5 +-
 ...agent-session-switch-terminal-execution.ts |   5 +-
 src/main/runtime/runtime-notifier-contract.ts |   8 +-
 .../session-tabs/switch-terminal-placement.ts |  53 ++++-----
 src/main/window/runtime-window-lifecycle.ts   |   3 +-
 .../terminal-presentation-ipc-bridge.ts       |   6 +-
 .../src/lib/unified-tab-anchor-insertion.ts   |  38 +++++--
 .../src/lib/unified-tab-replace.test.ts       | 107 ++++++++++++++++++
 ...structured-agent-session-tab-retirement.ts |  26 +++++
 .../store/slices/tabs/tabs-close-actions.ts   |   1 +
 .../store/slices/tabs/tabs-slice-contract.ts  |   2 +
 src/shared/terminal-reveal-identity.ts        |   2 +
 .../workspace-layout-content-commands.ts      |  18 +--
 .../workspace-layout-tab-close.ts             |  49 +++++++-
 .../workspace-layout-tab-commands.ts          |  13 ++-
 15 files changed, 280 insertions(+), 56 deletions(-)
 create mode 100644 src/renderer/src/lib/unified-tab-replace.test.ts

diff --git a/src/main/persistence/terminal-topology/terminal-pane-admission.ts b/src/main/persistence/terminal-topology/terminal-pane-admission.ts
index 618a48b38e6b..2102edde7e9c 100644
--- a/src/main/persistence/terminal-topology/terminal-pane-admission.ts
+++ b/src/main/persistence/terminal-topology/terminal-pane-admission.ts
@@ -235,7 +235,10 @@ function takenTabId(
   const workspace = layout.workspaces[key]
   const paneKey = leafId ? paneKeyOf(tabId, leafId) : null
   if (workspace && paneKey && locatePane(workspace, paneKey)) {
-    return { ok: true, result: { tabId, leafId, paneKey } }
+    // A switch's parked spawn already admitted its pane; the replace still moves it into the slot.
+    return command.adopt && command.replaces
+      ? null
+      : { ok: true, result: { tabId, leafId, paneKey } }
   }
   const holds = Object.values(layout.workspaces).some((entry) =>
     entry.tabs.some((tab) => tab.id === tabId || tab.entityId === tabId)
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts
index ea05479b4c6f..33d399f8f047 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts
@@ -90,7 +90,10 @@ export async function executeStructuredSessionTerminalSwitch(
     activate: true,
     focusWindow: agentLaunchMovesHostWindow(ctx)
   })
-  await host.setSessionTabVisibility(sessionId, false)
+  // A chat tab the layout owner kept stays listed; only a replaced one leaves the saved tabs.
+  if (placed.replaced) {
+    await host.setSessionTabVisibility(sessionId, false)
+  }
   return {
     status: 'completed',
     sessionId,
diff --git a/src/main/runtime/runtime-notifier-contract.ts b/src/main/runtime/runtime-notifier-contract.ts
index 5370641a28a6..da00251d6d9a 100644
--- a/src/main/runtime/runtime-notifier-contract.ts
+++ b/src/main/runtime/runtime-notifier-contract.ts
@@ -98,7 +98,13 @@ export type RuntimeNotifier = {
       replaces?: ReplacedTab
     }
   ):
-    | Promise<{ tabId: string; title?: string | null; identity?: TerminalRevealIdentity }>
+    | Promise<{
+        tabId: string
+        title?: string | null
+        identity?: TerminalRevealIdentity
+        /** Tabs the same window write closed: a replace's replaced tab. */
+        closed?: string[]
+      }>
     | { tabId: string; title?: string | null; identity?: TerminalRevealIdentity }
     | void
   /** Shows an agent launch's tab before its process exists; the pane attaches when it does. */
diff --git a/src/main/runtime/session-tabs/switch-terminal-placement.ts b/src/main/runtime/session-tabs/switch-terminal-placement.ts
index 275549745193..40507d8bfa56 100644
--- a/src/main/runtime/session-tabs/switch-terminal-placement.ts
+++ b/src/main/runtime/session-tabs/switch-terminal-placement.ts
@@ -39,26 +39,13 @@ export abstract class OrcaRuntimeWithSwitchTerminalPlacement extends OrcaRuntime
       throw new Error('terminal_handle_stale')
     }
     const layoutTabId = chatTabId(args.chatSessionId)
-    let replaced = false
-    if (ORCA_LAYOUT_OWNER_IS_MAIN) {
-      const reply = await this.applyLayoutCommand({
-        type: 'createTerminalTab',
-        workspace: workspaceId,
-        tabId,
-        leafId,
-        adopt: {
-          ptyId: pty.ptyId,
-          ...(pty.incarnationId ? { incarnationId: pty.incarnationId } : {})
-        },
-        replaces: { tabId: layoutTabId }
-      })
-      if (!reply.ok) {
-        throw new Error(reply.code)
-      }
-      replaced = reply.result.closed?.includes(layoutTabId) === true
-    } else if (this.getAvailableAuthoritativeWindow() && this.notifier?.revealTerminalSession) {
+    const snapshotTabId = `agent-session:${args.chatSessionId}`
+    // Whether the chat left is the layout owner's answer, never assumed.
+    let replaced: boolean
+    const windowOwnsLayout = !ORCA_LAYOUT_OWNER_IS_MAIN && this.getAvailableAuthoritativeWindow()
+    if (windowOwnsLayout && this.notifier?.revealTerminalSession) {
       const windowTabId = args.windowTabId ?? layoutTabId
-      await this.notifier.revealTerminalSession(workspaceId, {
+      const reply = await this.notifier.revealTerminalSession(workspaceId, {
         ptyId: pty.ptyId,
         title: terminal.title,
         ...(pty.launchAgent ? { launchAgent: pty.launchAgent } : {}),
@@ -76,19 +63,33 @@ export abstract class OrcaRuntimeWithSwitchTerminalPlacement extends OrcaRuntime
             }
           : {})
       })
-      replaced = true
+      replaced = reply?.closed?.includes(windowTabId) === true
+    } else {
+      // Main's layout model, or a windowless host's saved layout: the same one command.
+      const reply = await this.applyLayoutCommand({
+        type: 'createTerminalTab',
+        workspace: workspaceId,
+        tabId,
+        leafId,
+        adopt: {
+          ptyId: pty.ptyId,
+          ...(pty.incarnationId ? { incarnationId: pty.incarnationId } : {}),
+          recordedPaneKey: `${tabId}:${leafId}`
+        },
+        replaces: { tabId: layoutTabId }
+      })
+      if (!reply.ok) {
+        throw new Error(reply.code)
+      }
+      replaced = reply.result.closed?.includes(layoutTabId) === true
     }
-    const snapshotTabId = `agent-session:${args.chatSessionId}`
-    const listed = this.mobileSessionTabsByWorktree
-      .get(workspaceId)
-      ?.tabGroups?.some((group) => group.tabOrder.includes(snapshotTabId))
     this.publishPtyBackedMobileSessionTerminal(workspaceId, pty, {
       tabId,
       leafId,
       title: terminal.title,
       activate: args.activate,
-      replaces: snapshotTabId
+      ...(replaced ? { replaces: snapshotTabId } : {})
     })
-    return { tabId, leafId, replaced: replaced || listed === true }
+    return { tabId, leafId, replaced }
   }
 }
diff --git a/src/main/window/runtime-window-lifecycle.ts b/src/main/window/runtime-window-lifecycle.ts
index fb5e079abcc0..ebebc5fe360d 100644
--- a/src/main/window/runtime-window-lifecycle.ts
+++ b/src/main/window/runtime-window-lifecycle.ts
@@ -113,7 +113,8 @@ export function registerRuntimeWindowLifecycle(
           resolve({
             tabId: reply.tabId!,
             title: reply.title,
-            ...(reply.identity ? { identity: reply.identity } : {})
+            ...(reply.identity ? { identity: reply.identity } : {}),
+            ...(reply.closed ? { closed: reply.closed } : {})
           })
         }
         ipcMain.on('terminal:tabCreateReply', handler)
diff --git a/src/renderer/src/hooks/ipc-events/terminal-presentation-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/terminal-presentation-ipc-bridge.ts
index fda6a307d939..d739b4113e46 100644
--- a/src/renderer/src/hooks/ipc-events/terminal-presentation-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/terminal-presentation-ipc-bridge.ts
@@ -145,7 +145,8 @@ export function registerTerminalPresentationIpcBridge(unsubs: (() => void)[]): v
                         ...(cwd ? { startupCwd: cwd } : {})
                       }
                 ))
-          placeCreatedTerminalTab(worktreeId, tab.id, { afterTabId, replaced })
+          const closedReplaced =
+            placeCreatedTerminalTab(worktreeId, tab.id, { afterTabId, replaced }) && replaces
           // Different reused IDs break the PTY’s baked-in paneKey attribution; warn in dev.
           if (tabId !== undefined && tab.id !== tabId) {
             console.warn(
@@ -260,7 +261,8 @@ export function registerTerminalPresentationIpcBridge(unsubs: (() => void)[]): v
               requestId,
               tabId: tab.id,
               title: title ?? tab.title,
-              ...(identity ? { identity } : {})
+              ...(identity ? { identity } : {}),
+              ...(closedReplaced ? { closed: [closedReplaced.tabId] } : {})
             })
           }
         } catch (err) {
diff --git a/src/renderer/src/lib/unified-tab-anchor-insertion.ts b/src/renderer/src/lib/unified-tab-anchor-insertion.ts
index 07cdefacdb54..105c1a8ee72e 100644
--- a/src/renderer/src/lib/unified-tab-anchor-insertion.ts
+++ b/src/renderer/src/lib/unified-tab-anchor-insertion.ts
@@ -1,4 +1,3 @@
-import { closeMobileSessionTabInStore } from '@/runtime/mobile-session-tab-close'
 import { useAppStore } from '../store'
 import { insertTabIdIntoOrder } from '../../../shared/workspace-layout/tab-order'
 
@@ -9,8 +8,16 @@ export function findUnifiedTab(worktreeId: string, tabId: string) {
   )
 }
 
-/** A same-slot switch's window write: the new tab takes the replaced tab's index, then the replaced tab closes. */
-export function replaceUnifiedTab(worktreeId: string, tabId: string, replacedTabId: string): void {
+/**
+ * A same-slot switch's window write: the new tab takes the replaced tab's index and pin, then the
+ * replaced tab closes as layout only; its host already stopped what it showed. Returns whether
+ * the replaced tab closed.
+ */
+export function replaceUnifiedTab(
+  worktreeId: string,
+  tabId: string,
+  replacedTabId: string
+): boolean {
   const state = useAppStore.getState()
   const tabs = state.unifiedTabsByWorktree[worktreeId] ?? []
   const tab = tabs.find((candidate) => candidate.id === tabId || candidate.entityId === tabId)
@@ -19,14 +26,21 @@ export function replaceUnifiedTab(worktreeId: string, tabId: string, replacedTab
     candidate.tabOrder.includes(replacedTabId)
   )
   if (!tab || !replaced || !group || tab.id === replaced.id) {
-    return
+    return false
   }
   const order = group.tabOrder.filter((id) => id !== tab.id)
   order.splice(order.indexOf(replaced.id), 0, tab.id)
   if (group.tabOrder.includes(tab.id)) {
     state.reorderUnifiedTabs(group.id, order, { recordInteraction: false })
   }
-  closeMobileSessionTabInStore(useAppStore.getState(), worktreeId, replaced.id)
+  if (replaced.isPinned && !tab.isPinned) {
+    state.pinTab(tab.id, { recordInteraction: false })
+  }
+  return (
+    useAppStore
+      .getState()
+      .closeUnifiedTab(replaced.id, { replaced: true, recordInteraction: false }) !== null
+  )
 }
 
 export function insertUnifiedTabAfterAnchor(
@@ -66,19 +80,23 @@ export function insertUnifiedTabAfterAnchor(
   state.reorderUnifiedTabs(group.id, order, { recordInteraction: false })
 }
 
-/** Where a main-created terminal tab goes: into a replaced tab's slot, else after its anchor. */
+/** Where a main-created terminal tab goes: into a replaced tab's slot, else after its anchor.
+ *  Returns whether a replaced tab closed. */
 export function placeCreatedTerminalTab(
   worktreeId: string,
   tabId: string,
   placement: { afterTabId?: string; replaced?: { id: string } }
-): void {
+): boolean {
   if (placement.replaced) {
-    replaceUnifiedTab(worktreeId, tabId, placement.replaced.id)
-    return
+    return replaceUnifiedTab(worktreeId, tabId, placement.replaced.id)
+  }
+  if (!placement.afterTabId) {
+    return false
   }
   const created = findUnifiedTab(worktreeId, tabId)
-  const anchor = placement.afterTabId && findUnifiedTab(worktreeId, placement.afterTabId)
+  const anchor = findUnifiedTab(worktreeId, placement.afterTabId)
   if (created && anchor) {
     insertUnifiedTabAfterAnchor(worktreeId, created.id, anchor.id)
   }
+  return false
 }
diff --git a/src/renderer/src/lib/unified-tab-replace.test.ts b/src/renderer/src/lib/unified-tab-replace.test.ts
new file mode 100644
index 000000000000..5beb7c2bd225
--- /dev/null
+++ b/src/renderer/src/lib/unified-tab-replace.test.ts
@@ -0,0 +1,107 @@
+import { beforeEach, expect, it, vi } from 'vitest'
+import type { AppState } from '@/store/types'
+import type * as RuntimeRpcClientModule from '@/runtime/runtime-rpc-client'
+
+// The real store: a replace must close the chat as layout only, never as a user's close of its conversation.
+
+const rpc = vi.hoisted(() => ({
+  closeSession: vi.fn(() => Promise.resolve()),
+  call: vi.fn(() => Promise.resolve({ ok: true }))
+}))
+vi.mock('@/runtime/structured-agent-session-close', () => ({
+  closeStructuredAgentSession: rpc.closeSession
+}))
+vi.mock('@/runtime/runtime-rpc-client', async (actual) => ({
+  ...(await actual<typeof RuntimeRpcClientModule>()),
+  callRuntimeRpc: rpc.call
+}))
+
+const { createTabsSliceMockApi } = await import('@/store/slices/tabs-slice-test-harness')
+createTabsSliceMockApi()
+const { createTestStore, makeTab, makeTabGroup, makeUnifiedTab, makeWorktree, seedStore } =
+  await import('@/store/slices/store-test-helpers')
+const store = createTestStore()
+vi.mock('@/store', () => ({ useAppStore: store }))
+
+const { replaceUnifiedTab } = await import('./unified-tab-anchor-insertion')
+
+const WT = 'repo1::/tmp/wt1'
+const GROUP = 'group-1'
+
+function seed(pinnedChat: boolean): void {
+  const pinned = makeUnifiedTab({
+    id: 'u-pinned',
+    entityId: 'pinned',
+    groupId: GROUP,
+    worktreeId: WT,
+    contentType: 'terminal',
+    isPinned: true
+  })
+  const chat = makeUnifiedTab({
+    id: 'chat-tab',
+    entityId: 'session-1',
+    groupId: GROUP,
+    worktreeId: WT,
+    contentType: 'agent-session',
+    executionHostId: 'local',
+    isPinned: pinnedChat
+  })
+  const other = makeUnifiedTab({
+    id: 'u-other',
+    entityId: 'other',
+    groupId: GROUP,
+    worktreeId: WT,
+    contentType: 'terminal'
+  })
+  const terminal = makeUnifiedTab({
+    id: 'u-switched',
+    entityId: 'switched',
+    groupId: GROUP,
+    worktreeId: WT,
+    contentType: 'terminal'
+  })
+  seedStore(store, {
+    activeWorktreeId: WT,
+    worktreesByRepo: { repo1: [makeWorktree({ id: WT, repoId: 'repo1', path: '/tmp/wt1' })] },
+    tabsByWorktree: {
+      [WT]: ['pinned', 'other', 'switched'].map((id) => makeTab({ id, worktreeId: WT }))
+    },
+    unifiedTabsByWorktree: { [WT]: [pinned, chat, other, terminal] },
+    groupsByWorktree: {
+      [WT]: [
+        makeTabGroup({
+          id: GROUP,
+          worktreeId: WT,
+          activeTabId: 'chat-tab',
+          tabOrder: ['u-pinned', 'chat-tab', 'u-other', 'u-switched'],
+          recentTabIds: ['chat-tab']
+        })
+      ]
+    },
+    layoutByWorktree: { [WT]: { type: 'leaf', groupId: GROUP } },
+    activeGroupIdByWorktree: { [WT]: GROUP },
+    openFiles: [],
+    browserTabsByWorktree: {}
+  } as Partial<AppState>)
+}
+
+beforeEach(() => {
+  rpc.closeSession.mockClear()
+  rpc.call.mockClear()
+})
+
+it.each([false, true])(
+  'takes the chat tab’s slot (pinned: %s) and sends no close for its conversation',
+  (pinnedChat) => {
+    seed(pinnedChat)
+    expect(replaceUnifiedTab(WT, 'u-switched', 'chat-tab')).toBe(true)
+    const state = store.getState()
+    expect(state.groupsByWorktree[WT]?.[0]?.tabOrder).toEqual(['u-pinned', 'u-switched', 'u-other'])
+    expect(
+      state.unifiedTabsByWorktree[WT]?.find((tab) => tab.id === 'u-switched')?.isPinned === true
+    ).toBe(pinnedChat)
+    expect(state.unifiedTabsByWorktree[WT]?.some((tab) => tab.id === 'chat-tab')).toBe(false)
+    expect(rpc.closeSession).not.toHaveBeenCalled()
+    expect(rpc.call).not.toHaveBeenCalled()
+  }
+)
diff --git a/src/renderer/src/runtime/structured-agent-session-tab-retirement.ts b/src/renderer/src/runtime/structured-agent-session-tab-retirement.ts
index 528962d9eb27..4e58cbb710de 100644
--- a/src/renderer/src/runtime/structured-agent-session-tab-retirement.ts
+++ b/src/renderer/src/runtime/structured-agent-session-tab-retirement.ts
@@ -116,17 +116,43 @@ function reacceptHostSessionTabs(
   )
 }
 
+/** A chat tab another tab replaced: the host owns the conversation, so this only drops local readers
+ *  and holds the tab closed until the host's own frame omits it. */
+export function retireReplacedStructuredAgentSessionTab(args: {
+  target: RuntimeClientTarget
+  worktreeId: string
+  sessionId: string
+}): void {
+  retireStructuredAgentSessionReadOwner(args.sessionId, args.target)
+  forgetStructuredSessionSelection(args.sessionId, args.target)
+  const intentOwner = captureWebSessionIntentOwner(
+    structuredAgentSessionFocusOwner(args.target).environmentId
+  )
+  recordWebSessionCloseIntent(
+    intentOwner,
+    args.worktreeId,
+    `agent-session:${args.sessionId}`,
+    Date.now()
+  )
+}
+
 /** Mark cancellation before removing the row so a late host publication cannot resurrect it. */
 export function beginStructuredAgentSessionTabClose(args: {
   target: RuntimeClientTarget
   worktreeId: string
   sessionId: string
   provisional: boolean
+  /** Another tab took this one's slot: the host stopped the chat and keeps its conversation. */
+  replaced?: boolean
   layoutOwner: StructuredLaunchSlotOwner
   onError?: (error: unknown) => void
   /** Main dropped the tab before the host answered: a host still listing the chat shows it again. */
   reopen?: () => void
 }): void {
+  if (args.replaced) {
+    retireReplacedStructuredAgentSessionTab(args)
+    return
+  }
   forgetUnlistedCreatedChat(args.worktreeId, args.sessionId)
   if (args.provisional) {
     markStructuredAgentSessionLaunchCancelled(
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 57611166d12c..fbfa18ad9f41 100644
--- a/src/renderer/src/store/slices/tabs/tabs-close-actions.ts
+++ b/src/renderer/src/store/slices/tabs/tabs-close-actions.ts
@@ -85,6 +85,7 @@ export function createTabsCloseActions(
             worktreeId,
             sessionId: tab.entityId,
             provisional,
+            replaced: opts?.replaced === true,
             layoutOwner: state,
             // Switch point: main's frames draw this machine's chats, so main opens it again.
             ...(ORCA_LAYOUT_OWNER_IS_MAIN &&
diff --git a/src/renderer/src/store/slices/tabs/tabs-slice-contract.ts b/src/renderer/src/store/slices/tabs/tabs-slice-contract.ts
index 9f4b72b9b360..fe48dec466c6 100644
--- a/src/renderer/src/store/slices/tabs/tabs-slice-contract.ts
+++ b/src/renderer/src/store/slices/tabs/tabs-slice-contract.ts
@@ -104,6 +104,8 @@ export type TabsSlice = {
       preserveWorktreeSelection?: boolean
       recordInteraction?: boolean
       terminalRetirementHandled?: boolean
+      /** Another tab took this one's slot; its host already owns what the content does next. */
+      replaced?: boolean
     }
   ) => { closedTabId: string; wasLastTab: boolean; worktreeId: string } | null
   reorderUnifiedTabs: (
diff --git a/src/shared/terminal-reveal-identity.ts b/src/shared/terminal-reveal-identity.ts
index 514e45e3b6d4..8bb83df8f793 100644
--- a/src/shared/terminal-reveal-identity.ts
+++ b/src/shared/terminal-reveal-identity.ts
@@ -10,5 +10,7 @@ export type TerminalTabCreateReply = {
   tabId?: string
   title?: string
   identity?: TerminalRevealIdentity
+  /** Tabs this create closed in the same write: a replace's replaced tab. */
+  closed?: string[]
   error?: string
 }
diff --git a/src/shared/workspace-layout/workspace-layout-content-commands.ts b/src/shared/workspace-layout/workspace-layout-content-commands.ts
index 3e96e1b65ad4..c54d656611f4 100644
--- a/src/shared/workspace-layout/workspace-layout-content-commands.ts
+++ b/src/shared/workspace-layout/workspace-layout-content-commands.ts
@@ -18,11 +18,8 @@ import type {
   WorkspaceLayoutModel
 } from './workspace-layout-model'
 import { withWorkspace } from './workspace-layout-removal'
-import {
-  closeReplacedTab,
-  placeContentTab,
-  promotePreviewTab
-} from './workspace-layout-tab-commands'
+import { placeContentTab, promotePreviewTab } from './workspace-layout-tab-commands'
+import { closeReplacedTab, withReplacedPin } from './workspace-layout-tab-close'
 
 function contentTab(
   context: LayoutContext,
@@ -236,9 +233,16 @@ export function openAgentSessionTab(
     agentSessionAgent: command.agent
   })
   const target = withSendersGroup(model, command.workspace, command.groupId)
-  const slot = replacedTabSlot(workspaceOrEmpty(target, command.workspace), command)
+  const slotWorkspace = workspaceOrEmpty(target, command.workspace)
+  const slot = replacedTabSlot(slotWorkspace, command)
   return closeReplacedTab(
-    placeContentTab(target, command.workspace, tab, slot, context).model,
+    placeContentTab(
+      target,
+      command.workspace,
+      withReplacedPin(slotWorkspace, command, tab),
+      slot,
+      context
+    ).model,
     command,
     { tabId: tab.id }
   )
diff --git a/src/shared/workspace-layout/workspace-layout-tab-close.ts b/src/shared/workspace-layout/workspace-layout-tab-close.ts
index 717414dce31d..746aae53ca6a 100644
--- a/src/shared/workspace-layout/workspace-layout-tab-close.ts
+++ b/src/shared/workspace-layout/workspace-layout-tab-close.ts
@@ -1,13 +1,22 @@
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../layout-owner-switch'
 import { filterRecord, withoutKey } from './stored-record-fields'
 import { editorTabShowsFile, keptAfterEditorClose } from './workspace-layout-editor-tab-file'
-import { applied, findTab, leafIdsOf, type Applied } from './workspace-layout-command-steps'
+import {
+  applied,
+  findTab,
+  leafIdsOf,
+  placeNewTab,
+  replacedTabSlot,
+  type Applied
+} from './workspace-layout-command-steps'
 import type {
   CommandOf,
   LayoutCommandResult,
-  LayoutEffects
+  LayoutContext,
+  LayoutEffects,
+  ReplacedTab
 } from './workspace-layout-command-types'
-import type { WorkspaceLayout, WorkspaceLayoutModel } from './workspace-layout-model'
+import type { LayoutTab, WorkspaceLayout, WorkspaceLayoutModel } from './workspace-layout-model'
 import { removeTabFromWorkspace, withWorkspace } from './workspace-layout-removal'
 
 /** Removes a tab and its content record; a terminal tab's pane data goes with it. */
@@ -65,3 +74,37 @@ export function closeReplacedTab(
     effects
   )
 }
+
+/** A pinned slot stays pinned: the tab that fills it takes the replaced tab's pin. */
+export function withReplacedPin<T extends LayoutTab>(
+  workspace: WorkspaceLayout,
+  command: { replaces?: ReplacedTab },
+  tab: T
+): T {
+  const replaced = command.replaces && findTab(workspace, command.replaces.tabId)
+  return replaced?.isPinned ? { ...tab, isPinned: true } : tab
+}
+
+/** A replace whose tab already exists (its parked spawn admitted it): it moves into the slot. */
+export function moveIntoReplacedSlot(
+  held: Extract<Applied, { ok: true }>,
+  command: CommandOf<'createTerminalTab'>,
+  context: LayoutContext
+): Applied {
+  const { model, result, effects } = held
+  const workspace = model.workspaces[command.workspace]
+  const tab = workspace && result.tabId ? findTab(workspace, result.tabId) : undefined
+  const replaced = command.replaces?.tabId
+  if (!workspace || !tab || !replaced || replaced === tab.id || !findTab(workspace, replaced)) {
+    return held
+  }
+  const without = removeTabFromWorkspace(workspace, tab.id)
+  const placed = placeNewTab(
+    without,
+    command.workspace,
+    withReplacedPin(without, command, tab),
+    replacedTabSlot(without, command),
+    context
+  )
+  return closeReplacedTab(withWorkspace(model, command.workspace, placed), command, result, effects)
+}
diff --git a/src/shared/workspace-layout/workspace-layout-tab-commands.ts b/src/shared/workspace-layout/workspace-layout-tab-commands.ts
index dcc560e2a93c..1fe52ff9c0f3 100644
--- a/src/shared/workspace-layout/workspace-layout-tab-commands.ts
+++ b/src/shared/workspace-layout/workspace-layout-tab-commands.ts
@@ -31,9 +31,14 @@ import {
 import { admitsInitialSurface } from './workspace-layout-initial-surface'
 import { adoptedLeaf, appliedHeldAdoption } from './workspace-layout-terminal-adoption'
 import { withWorkspace } from './workspace-layout-removal'
-import { closeReplacedTab, closeTab } from './workspace-layout-tab-close'
+import {
+  closeReplacedTab,
+  closeTab,
+  moveIntoReplacedSlot,
+  withReplacedPin
+} from './workspace-layout-tab-close'
 
-export { closeReplacedTab, closeTab } from './workspace-layout-tab-close'
+export { closeTab } from './workspace-layout-tab-close'
 
 type RefusedClose = NonNullable<LayoutCommandResult['refused']>[number]
 
@@ -47,7 +52,7 @@ export function createTerminalTab(
   }
   const held = command.adopt && appliedHeldAdoption(model, command.workspace, command.adopt)
   if (held) {
-    return held
+    return held.ok && command.replaces ? moveIntoReplacedSlot(held, command, context) : held
   }
   const workspace = workspaceOrEmpty(model, command.workspace)
   const terminals = workspace.tabs.flatMap((tab) => (tab.kind === 'terminal' ? [tab] : []))
@@ -71,7 +76,7 @@ export function createTerminalTab(
   const placed = placeNewTab(
     workspace,
     command.workspace,
-    tab,
+    withReplacedPin(workspace, command, tab),
     replacedTabSlot(workspace, command),
     context
   )

From 92fea47ca450225adcb504909e063e597a65341c Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 16:07:31 -0700
Subject: [PATCH 131/207] Open a terminal's chat in its slot with one window
 pass

On the desktop window, switching a terminal to chat used to insert the
chat and then ask the window, in a separate request, to close the
terminal tab. That close refused a pinned tab and could time out, which
reported a failure while the chat was already open. The window now
closes the replaced terminal tab in the same pass that places the chat,
from the slot the host's chat row already names, and a pinned slot stays
pinned. The host retires the pane's bookkeeping without asking.

The stopped terminal is kept on screen for the replace only when a
replace follows; a source in another workspace exits as any pane does.
Phones and the web client now put a terminal that replaced a chat where
they showed that chat.
---
 ...red-agent-session-switch-execution.test.ts | 128 ++++++++++++++++--
 ...ructured-agent-session-switch-execution.ts |  17 ++-
 .../terminal-switch-close-capture.ts          |   7 +-
 ...l-structured-session-replaced-slot.test.ts |  96 +++++++++++++
 .../snapshot-apply.ts                         |  47 ++++++-
 .../apply-preparation-groups.ts               |  23 +++-
 .../replaced-slot-placement.test.ts           | 102 ++++++++++++++
 7 files changed, 399 insertions(+), 21 deletions(-)
 create mode 100644 src/renderer/src/runtime/local-structured-session-replaced-slot.test.ts
 create mode 100644 src/renderer/src/runtime/web-session-tabs-sync/replaced-slot-placement.test.ts

diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
index 06731b3d2a75..da84619da7ed 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
@@ -25,6 +25,9 @@ import {
 } from '../../main-owned-workspace-runtime-fixture'
 import { executeStructuredSessionSwitch } from './structured-agent-session-switch-execution'
 import { DaemonRequestTimeoutError } from '../../../daemon/daemon-errors'
+import { chatTabId } from '../../agent-session/agent-session-tab-layout'
+import { ClaimedAgentPtyOwnerRegistry } from '../../../../shared/claimed-agent-pty-owner'
+import type { RuntimePtyController } from '../../runtime-pty-controller-contract'
 
 let rig: RestTestRig
 let releaseReceiverExit: (() => void) | undefined
@@ -195,8 +198,6 @@ it.each(['single', 'split', 'other-workspace'] as const)(
           return { tabId: tab.id, groupId: group!.id, tabOrder: [...group!.tabOrder] }
         })
       : undefined
-    const originalSourceTabs = structuredClone(session().tabsByWorktree[WORKTREE_ID])
-    const originalSourceLayout = structuredClone(session().terminalLayoutsByTabId[TAB_ID])
     const acquisitions = rig.adapter.acquire.mock.calls.length
     const operation = executeStructuredSessionSwitch(
       {
@@ -255,18 +256,15 @@ it.each(['single', 'split', 'other-workspace'] as const)(
       ).toBe(false)
     }
     if (elsewhere) {
-      expect(session().tabsByWorktree[WORKTREE_ID]).toEqual(originalSourceTabs)
-      expect(session().terminalLayoutsByTabId[TAB_ID]).toEqual(originalSourceLayout)
-      expect((await runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)).tabs).toEqual(
-        expect.arrayContaining([expect.objectContaining({ type: 'terminal', parentTabId: TAB_ID })])
-      )
       expect(rig.store.getRecord(sessionId)?.location.workspaceId).toBe(destinationWorkspace)
     }
     const layout = session().terminalLayoutsByTabId[TAB_ID]
     if (split) {
       expect(layout?.ptyIdsByLeafId?.[LEAF_B]).toBe(PTY_B)
       expect(layout?.root).toEqual({ type: 'leaf', leafId: LEAF_B })
-    } else if (!elsewhere) {
+    } else {
+      // Replaced in place, or (in another workspace, where nothing replaces it) exited as any
+      // stopped pane does.
       expect(session().tabsByWorktree[WORKTREE_ID]?.some((tab) => tab.id === TAB_ID)).toBe(false)
     }
     expect(rig.adapter.dispatch).not.toHaveBeenCalled()
@@ -387,3 +385,117 @@ it('reports a dispatched terminal with a lost answer as uncertain, preserving it
   })
   expect(rig.store.getSessionTabId(id)).toBe('source-chat')
 })
+
+it('puts the switched terminal in the chat tab’s slot and closes the chat tab, in one write', async () => {
+  const { runtime, session } = setupMainOwnedWorkspace()
+  const chatTab = chatTabId(id)
+  for (const [sessionId, tabId] of [
+    [id, chatTab],
+    ['later-tab', 'agent-session:later-tab']
+  ] as const) {
+    expect(
+      await runtime.applyLayoutCommand({
+        type: 'openAgentSessionTab',
+        workspace: WORKTREE_ID,
+        sessionId,
+        agent: 'codex',
+        tabId
+      })
+    ).toMatchObject({ ok: true })
+  }
+  vi.spyOn(runtime, 'resolveTerminalWorkspaceLaunchScope').mockResolvedValue({
+    id: WORKTREE_ID,
+    path: rig.root,
+    connectionId: null,
+    repo: null,
+    folderWorkspace: null
+  })
+  let spawned = 0
+  const spawn = vi.fn(async () => ({
+    id: `switch-pty-${++spawned}`,
+    incarnationId: '33333333-3333-4333-8333-333333333333'
+  }))
+  runtime.setPtyController({
+    spawn,
+    write: () => true,
+    kill: () => true,
+    stopAndWait: async () => true,
+    getForegroundProcess: async () => null
+  })
+  const result = await executeStructuredSessionSwitch(
+    { sessionId: id, execution: { invocationId: 'to-terminal' } },
+    { runtime },
+    'terminal'
+  )
+  expect(result).toMatchObject({ status: 'completed', sessionId: id, sourceRetained: false })
+  expect(spawn).toHaveBeenCalledOnce()
+  const terminal = result.status === 'completed' ? result.terminal : undefined
+  const group = session().tabGroups?.[WORKTREE_ID]?.find((row) =>
+    row.tabOrder.includes(terminal ?? '')
+  )
+  expect(group?.tabOrder).toEqual([TAB_ID, terminal, 'agent-session:later-tab'])
+  expect(
+    session().unifiedTabs?.[WORKTREE_ID]?.some(
+      (tab) => tab.contentType === 'agent-session' && tab.entityId === id
+    )
+  ).toBe(false)
+})
+
+it('re-issuing a switch whose first answer was lost adopts the terminal it started', async () => {
+  await savedTranscript()
+  const { runtime, session } = setupMainOwnedWorkspace()
+  vi.spyOn(runtime, 'resolveTerminalWorkspaceLaunchScope').mockResolvedValue({
+    id: WORKTREE_ID,
+    path: rig.root,
+    connectionId: null,
+    repo: null,
+    folderWorkspace: null
+  })
+  // Answers as the daemon does: one live owner per conversation claim; a repeat adopts it.
+  const owners = new ClaimedAgentPtyOwnerRegistry()
+  let started = 0
+  const spawn = vi.fn(async (args: Parameters<NonNullable<RuntimePtyController['spawn']>>[0]) => {
+    if (!args.agentSessionEnsure) {
+      throw new Error('a switch terminal carries its conversation claim')
+    }
+    const ensured = await owners.ensure({
+      claim: args.agentSessionEnsure.claim,
+      surface: args.agentSessionEnsure.surface,
+      spawn: async () => ({ ptyId: `switch-pty-${++started}` })
+    })
+    return {
+      id: ensured.owner.ptyId,
+      incarnationId: '44444444-4444-4444-8444-444444444444',
+      agentSessionEnsure: ensured,
+      ...(ensured.disposition === 'adopted' ? { isReattach: true } : {})
+    }
+  })
+  runtime.setPtyController({
+    spawn,
+    write: () => true,
+    kill: () => true,
+    getForegroundProcess: async () => null
+  })
+  const { cliForkSource: source } = await cliTranscript.prepareStructuredChatCliTranscript(
+    await cliTranscript.resolveStructuredChatCliSource({ sessionId: id, workspaceId: WORKTREE_ID }),
+    async () => {
+      throw new Error('unused')
+    },
+    false
+  )
+  const lost = await runtime.spawnSwitchTerminal(WORKTREE_ID, { agent: 'codex', source })
+  const retried = await runtime.spawnSwitchTerminal(WORKTREE_ID, { agent: 'codex', source })
+  expect(started).toBe(1)
+  expect(spawn).toHaveBeenCalledTimes(2)
+  expect(retried).toMatchObject({
+    ptyId: lost.ptyId,
+    tabId: lost.tabId,
+    paneKey: lost.paneKey
+  })
+  // The retry's own pane was withdrawn: only the source tab and the first terminal remain.
+  expect(
+    session()
+      .tabsByWorktree[WORKTREE_ID]?.map((tab) => tab.id)
+      .sort()
+  ).toEqual([TAB_ID, lost.tabId].sort())
+})
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
index 44c1bbdc604a..3400994d1516 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
@@ -172,9 +172,18 @@ async function switchToChat(
       paneKey,
       { signal: deadline.signal, beforeWrite: async () => deadline.check() }
     )
+    // Only a tab the chat will replace keeps its exited pane shown for that write; a source in
+    // another workspace, or a pane in a split, exits as any pane does.
+    const destination =
+      host.deps.store.getRecord(sessionId)?.location.workspaceId ??
+      create?.worktree.replace(/^id:/, '')
+    const replacing =
+      destination !== undefined &&
+      worktreeIdsEqual(close.source.worktreeId, destination) &&
+      close.wholeTab()
     // Shutdown already accepted must finish even when the observing request expires.
     try {
-      await host.trackSwitchPhysical(sessionId, close.stop())
+      await host.trackSwitchPhysical(sessionId, close.stop(replacing))
     } catch {
       host.deps.logger.warn('switch source exit was not confirmed', {
         scope: 'session-switch',
@@ -263,9 +272,9 @@ async function switchToChat(
   })
   deadline.check()
   if (sameWorkspace) {
-    // Whole tab: the replace closed it in main's model, the window closes its own. Split pane: the
-    // window retired it on exit, main's model closes it here.
-    await close.retire(replaces ? ORCA_LAYOUT_OWNER_IS_MAIN : !ORCA_LAYOUT_OWNER_IS_MAIN)
+    // Whole tab: the layout owner's replace removed it (main's model, or the window applying the
+    // snapshot's hint). Split pane: the window retired it on exit, main's model closes it here.
+    await close.retire(replaces !== undefined || !ORCA_LAYOUT_OWNER_IS_MAIN)
   }
   deadline.check()
   // Publication is complete; a first new send may already own the ordinary start.
diff --git a/src/main/runtime/session-tabs/terminal-switch-close-capture.ts b/src/main/runtime/session-tabs/terminal-switch-close-capture.ts
index b4ba4c138ebb..52996976c44e 100644
--- a/src/main/runtime/session-tabs/terminal-switch-close-capture.ts
+++ b/src/main/runtime/session-tabs/terminal-switch-close-capture.ts
@@ -88,14 +88,15 @@ export abstract class OrcaRuntimeWithTerminalSwitchCloseCapture extends OrcaRunt
         )
           ? (readPlacement() ?? originalPlacement)
           : undefined,
-      stop: async () => {
-        // A split sibling keeps the tab, so that pane may retire on exit as any pane does.
+      /** `closing` keeps the exited pane shown for the write that removes its tab; without one
+       *  coming (a split sibling keeps the tab), the pane retires on exit as any pane does. */
+      stop: async (closing = wholeTab()) => {
         const stop = await this.stopExplicitlyClosedTabPtys(
           [addressedPty],
           addressedPty,
           incarnation,
           {
-            closing: wholeTab()
+            closing
           }
         )
         if (!stop.stopped) {
diff --git a/src/renderer/src/runtime/local-structured-session-replaced-slot.test.ts b/src/renderer/src/runtime/local-structured-session-replaced-slot.test.ts
new file mode 100644
index 000000000000..07aea9b0fbb5
--- /dev/null
+++ b/src/renderer/src/runtime/local-structured-session-replaced-slot.test.ts
@@ -0,0 +1,96 @@
+// @vitest-environment happy-dom
+
+import { afterEach, expect, it, vi } from 'vitest'
+import type { RuntimeMobileSessionTabsResult } from '../../../shared/runtime-types'
+import type { Tab } from '../../../shared/tab-types'
+import type { WorktreeRuntimeOwnerState } from '../lib/worktree-runtime-owner-state'
+import { applyLocalStructuredSessionTabSnapshots } from './local-structured-session-tabs-sync/snapshot-apply'
+import { resetLocalStructuredSessionVersionForTests } from './local-structured-session-tabs-sync/inventory-generation-fence'
+import type { WebSessionTabsSyncState } from './web-session-tabs-sync/state'
+import { resetWebSessionTabsSnapshotFreshnessForTests } from './web-session-tabs-sync/tracking-lifecycle'
+import { makeState } from './web-session-tabs-sync-test-harness'
+
+// The window's half of a terminal→chat switch: the host's frame carries the chat with the slot it
+// replaced, and the window puts the chat there and reports the terminal tab for closing.
+
+const WORKTREE = 'repo-1::/tmp/wt-switch'
+const GROUP = 'group-1'
+
+type SyncState = WebSessionTabsSyncState & WorktreeRuntimeOwnerState
+
+afterEach(() => {
+  resetLocalStructuredSessionVersionForTests()
+  resetWebSessionTabsSnapshotFreshnessForTests()
+})
+
+const terminalTab = (id: string): Tab => ({
+  id,
+  entityId: id,
+  groupId: GROUP,
+  worktreeId: WORKTREE,
+  contentType: 'terminal',
+  label: id,
+  customLabel: null,
+  color: null,
+  sortOrder: 0,
+  createdAt: 1
+})
+
+it('puts the chat in the replaced terminal’s slot and reports that terminal', () => {
+  const state = {
+    ...makeState({ activeWorktreeId: WORKTREE }),
+    unifiedTabsByWorktree: {
+      [WORKTREE]: [terminalTab('before'), terminalTab('switched'), terminalTab('after')]
+    },
+    groupsByWorktree: {
+      [WORKTREE]: [
+        {
+          id: GROUP,
+          worktreeId: WORKTREE,
+          activeTabId: 'switched',
+          tabOrder: ['before', 'switched', 'after'],
+          recentTabIds: ['switched']
+        }
+      ]
+    },
+    worktreesByRepo: { 'repo-1': [{ id: WORKTREE, path: '/tmp/wt-switch' }] }
+  } as unknown as SyncState
+  const frame = {
+    worktree: WORKTREE,
+    publicationEpoch: 'renderer:switch',
+    snapshotVersion: 1,
+    activeGroupId: GROUP,
+    activeTabId: 'agent-session:session-1',
+    activeTabType: 'agent-session',
+    tabs: [
+      {
+        type: 'agent-session',
+        id: 'agent-session:session-1',
+        title: 'Codex',
+        sessionId: 'session-1',
+        agent: 'codex',
+        isActive: true,
+        replaces: { tabId: 'switched' }
+      }
+    ],
+    tabGroups: [{ id: GROUP, activeTabId: null, tabOrder: ['agent-session:session-1'] }]
+  } as unknown as RuntimeMobileSessionTabsResult
+  const onReplacedTab = vi.fn()
+  const next = applyLocalStructuredSessionTabSnapshots(state, [frame], undefined, 1, {
+    onReplacedTab
+  })
+  const chat = next.unifiedTabsByWorktree[WORKTREE]?.find(
+    (tab) => tab.contentType === 'agent-session'
+  )
+  expect(next.groupsByWorktree[WORKTREE]?.[0]?.tabOrder).toEqual([
+    'before',
+    chat?.id,
+    'switched',
+    'after'
+  ])
+  expect(onReplacedTab).toHaveBeenCalledExactlyOnceWith({
+    worktreeId: WORKTREE,
+    tabId: 'switched',
+    sessionId: 'session-1'
+  })
+})
diff --git a/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts b/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts
index 400e2893e331..5e7bb7b2bf55 100644
--- a/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts
+++ b/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts
@@ -35,6 +35,7 @@ import { LOCAL_STRUCTURED_SESSION_OWNER } from '../local-structured-session-owne
 import { closeStructuredAgentSession } from '../structured-agent-session-close'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
 import { useAppStore } from '../../store'
+import { closeTerminalTab } from '@/components/terminal/terminal-tab-actions'
 import { framesDrawWorkspace } from '../workspace-layout-frame-drawn-workspaces'
 import { drawnChatLabelChanges, type DrawnChatLabel } from './frame-drawn-chat-tabs'
 
@@ -60,8 +61,12 @@ export type StructuredSessionSnapshotApplyOptions = {
   framesDraw?: (worktreeId: string) => boolean
   /** Collects host titles for drawn chat tabs, applied as content after the store patch. */
   onDrawnChatLabel?: (change: DrawnChatLabel) => void
+  /** Collects chats the host put in another tab's slot; that tab closes after the store patch. */
+  onReplacedTab?: (replacement: ReplacedSessionTab) => void
 }
 
+type ReplacedSessionTab = { worktreeId: string; tabId: string; sessionId: string }
+
 export function applyStructuredSessionTabSnapshots(
   snapshots: readonly RuntimeMobileSessionTabsResult[],
   owner = LOCAL_STRUCTURED_SESSION_OWNER,
@@ -69,6 +74,7 @@ export function applyStructuredSessionTabSnapshots(
 ): void {
   const acceptedAgentSessions: { worktreeId: string; sessionId: string }[] = []
   const drawnChatLabels: DrawnChatLabel[] = []
+  const replacements: ReplacedSessionTab[] = []
   const settleStructuredSessionMirror = applyWebSessionTabsStorePatch(
     (state, changedAgentPaneKeys) =>
       applyLocalStructuredSessionTabSnapshots(
@@ -84,7 +90,8 @@ export function applyStructuredSessionTabSnapshots(
           },
           // Switch point: main places the listed chats' tabs; its frames draw them.
           framesDraw: ORCA_LAYOUT_OWNER_IS_MAIN ? framesDrawWorkspace(state) : undefined,
-          onDrawnChatLabel: (change) => drawnChatLabels.push(change)
+          onDrawnChatLabel: (change) => drawnChatLabels.push(change),
+          onReplacedTab: (replacement) => replacements.push(replacement)
         },
         changedAgentPaneKeys
       ),
@@ -95,6 +102,7 @@ export function applyStructuredSessionTabSnapshots(
   for (const { tabId, label } of drawnChatLabels) {
     setTabLabel(tabId, label)
   }
+  closeReplacedTerminalTabs(replacements)
   markStructuredAgentSessionLaunchesPublished(LOCAL_EXECUTION_HOST_ID, acceptedAgentSessions)
   if (options.authoritative) {
     startStructuredAgentLaunchCancellationCleanup(LOCAL_EXECUTION_HOST_ID, (sessionId) =>
@@ -190,6 +198,15 @@ export function applyLocalStructuredSessionTabSnapshots<
       }
     } else {
       next = patch === next ? next : ({ ...next, ...patch } as State)
+      for (const tab of effectiveSnapshot.tabs) {
+        if (tab.type === 'agent-session' && tab.replaces) {
+          options.onReplacedTab?.({
+            worktreeId: snapshot.worktree,
+            tabId: tab.replaces.tabId,
+            sessionId: tab.sessionId
+          })
+        }
+      }
     }
     if (isWorktreeRetraction(effectiveSnapshot)) {
       // Retraction removes rows but is not a publication: recording it would retire this consumer/publisher renderer’s lifetime epoch. Retain version cursor against pre-close replies; rebuilt entries mint fresh epochs. Preserve retired tombstones but clear current so the next lineage cannot retire our lifetime epoch one cycle later. Clearing all history would admit dead-epoch stragglers across lineages.
@@ -222,3 +239,31 @@ export function applyLocalStructuredSessionTabSnapshots<
   forgetRetiredEpochRepairsOutside(knownWorktreeIds)
   return next
 }
+
+/**
+ * The other half of the host's one replace write: the chat already sits in the terminal's slot, so
+ * the terminal tab, whose process the switch stopped, leaves now. A pinned slot stays pinned, and
+ * nothing is asked of the host: it retired the pane itself.
+ */
+function closeReplacedTerminalTabs(replacements: readonly ReplacedSessionTab[]): void {
+  for (const { worktreeId, tabId, sessionId } of replacements) {
+    const tabs = useAppStore.getState().unifiedTabsByWorktree[worktreeId] ?? []
+    const replaced = tabs.find(
+      (tab) => tab.contentType === 'terminal' && (tab.id === tabId || tab.entityId === tabId)
+    )
+    const chat = tabs.find(
+      (tab) => tab.contentType === 'agent-session' && tab.entityId === sessionId
+    )
+    if (!replaced || !chat) {
+      continue
+    }
+    if (replaced.isPinned && !chat.isPinned) {
+      useAppStore.getState().pinTab(chat.id, { recordInteraction: false })
+    }
+    closeTerminalTab(replaced.entityId, {
+      force: true,
+      skipRunningProcessConfirm: true,
+      localPtyTeardownOwnedExternally: true
+    })
+  }
+}
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-groups.ts b/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-groups.ts
index 7891674ce607..f57ede76f4b5 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-groups.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-groups.ts
@@ -1,6 +1,7 @@
 import type { TabGroup } from '../../../../shared/tab-types'
 import type { prepareWebSessionTabsSnapshotUnified } from './apply-preparation-unified'
 import { toWebTerminalSurfaceTabId } from '../../../../shared/terminal-surface-id'
+import { isStructuredAgentSessionHostTabId } from '../../../../shared/structured-agent-session-host-tab-id'
 import {
   isWebSessionBrowserPlacementGroupReserved,
   peekWebSessionBrowserPlacementGroup
@@ -184,16 +185,28 @@ export function prepareWebSessionTabsSnapshotGroups(
     )
   })()
 
+  // A replaced chat has already left this snapshot, so its local tab is found by its session.
+  const replacedLocalTabIds = (hostTabId: string): string[] => {
+    const chat = isStructuredAgentSessionHostTabId(hostTabId)
+      ? (state.unifiedTabsByWorktree[worktreeId] ?? []).find(
+          (tab) =>
+            tab.contentType === 'agent-session' &&
+            tab.entityId === hostTabId.slice('agent-session:'.length)
+        )
+      : undefined
+    return [
+      ...(chat ? [chat.id] : []),
+      ...[hostTabId, toWebTerminalSurfaceTabId(hostTabId)].map(
+        (id) => hostToLocalTabId.get(id) ?? id
+      )
+    ]
+  }
   // A row published in a replaced tab's slot lands where this client showed that tab, not at the end.
   let placedGroups = nextGroups
   for (const row of snapshot.tabs) {
     const tabId =
       row.replaces && hostToLocalTabId.get(row.type === 'terminal' ? row.parentTabId : row.id)
-    const replaced = row.replaces
-      ? [row.replaces.tabId, toWebTerminalSurfaceTabId(row.replaces.tabId)].map(
-          (id) => hostToLocalTabId.get(id) ?? id
-        )
-      : []
+    const replaced = row.replaces ? replacedLocalTabIds(row.replaces.tabId) : []
     const slot = currentGroups.find((group) => group.tabOrder.some((id) => replaced.includes(id)))
     if (
       !tabId ||
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/replaced-slot-placement.test.ts b/src/renderer/src/runtime/web-session-tabs-sync/replaced-slot-placement.test.ts
new file mode 100644
index 000000000000..814349ab7692
--- /dev/null
+++ b/src/renderer/src/runtime/web-session-tabs-sync/replaced-slot-placement.test.ts
@@ -0,0 +1,102 @@
+import { beforeEach, expect, it, vi } from 'vitest'
+import type { RuntimeMobileSessionTabsResult } from '../../../../shared/runtime-types'
+import { applyWebSessionTabsSnapshot } from './snapshot-api'
+import type { WebSessionTabsSyncState } from './state'
+import {
+  ENV,
+  LEAF_ID,
+  NOW,
+  WT,
+  makeSnapshot,
+  makeState,
+  resetWebSessionTabsSyncTestState
+} from '../web-session-tabs-sync-test-harness'
+
+vi.mock('../../store', () => ({ useAppStore: { setState: vi.fn() } }))
+
+type Row = RuntimeMobileSessionTabsResult['tabs'][number]
+
+const terminal = (hostTabId: string, extra: Partial<Row> = {}): Row =>
+  ({
+    type: 'terminal',
+    id: `${hostTabId}::${LEAF_ID}`,
+    parentTabId: hostTabId,
+    leafId: LEAF_ID,
+    title: hostTabId,
+    isActive: false,
+    status: 'ready',
+    terminal: `handle-${hostTabId}`,
+    ...extra
+  }) as Row
+
+const chat: Row = {
+  type: 'agent-session',
+  id: 'agent-session:session-1',
+  title: 'Codex',
+  sessionId: 'session-1',
+  agent: 'codex',
+  isActive: false
+}
+
+function apply(
+  state: WebSessionTabsSyncState,
+  snapshot: RuntimeMobileSessionTabsResult
+): WebSessionTabsSyncState {
+  const patch = applyWebSessionTabsSnapshot(state, snapshot, ENV, NOW)
+  return patch === state ? state : { ...state, ...patch }
+}
+
+beforeEach(resetWebSessionTabsSyncTestState)
+
+it('puts a terminal that replaced a chat where this client showed the chat', () => {
+  const shown = apply(
+    makeState(),
+    makeSnapshot([terminal('host-a'), chat, terminal('host-b')], {
+      tabGroups: [
+        {
+          id: 'host-group-1',
+          activeTabId: null,
+          tabOrder: ['host-a', chat.id, 'host-b']
+        }
+      ]
+    })
+  )
+  const group = shown.groupsByWorktree[WT]![0]!
+  const chatTabId = group.tabOrder[1]!
+  expect(shown.unifiedTabsByWorktree[WT]?.find((tab) => tab.id === chatTabId)?.entityId).toBe(
+    'session-1'
+  )
+  // This client moved the chat first; the host's order still has it in the middle.
+  const moved = {
+    ...shown,
+    groupsByWorktree: {
+      [WT]: [{ ...group, tabOrder: [chatTabId, group.tabOrder[0]!, group.tabOrder[2]!] }]
+    }
+  }
+  const replaced = apply(
+    moved,
+    makeSnapshot(
+      [
+        terminal('host-a'),
+        terminal('host-switched', { replaces: { tabId: chat.id } }),
+        terminal('host-b')
+      ],
+      {
+        snapshotVersion: 2,
+        tabGroups: [
+          {
+            id: 'host-group-1',
+            activeTabId: null,
+            tabOrder: ['host-a', 'host-switched', 'host-b']
+          }
+        ]
+      }
+    )
+  )
+  const order = replaced.groupsByWorktree[WT]![0]!.tabOrder
+  const switched = replaced.unifiedTabsByWorktree[WT]?.find(
+    (tab) => tab.contentType === 'terminal' && tab.label === 'host-switched'
+  )
+  expect(switched).toBeDefined()
+  expect(order).toEqual([switched!.id, group.tabOrder[0], group.tabOrder[2]])
+})

From 9dbed7c5427c7836764364124933316bc559606f Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 16:07:45 -0700
Subject: [PATCH 132/207] Say another change is still finishing when a switch
 must wait

A switch refused because the conversation's messages were still settling
or another switch was in flight said to check the agent's setup. It now
says the agent is still finishing another change and to try again in a
moment, and a missing conversation points to Session History. Comments on
the switch budget and on when a retry cannot adopt now say what they cover.
---
 .../agent-session/switch-terminal-spawn.ts         |  4 +++-
 src/renderer/src/i18n/en-runtime-required.json     |  4 +++-
 src/renderer/src/i18n/locales/en.json              |  4 +++-
 .../src/lib/conversation-switch-feedback.ts        | 14 ++++++++++++++
 src/shared/agent-session-switch-execution.ts       |  6 +++++-
 5 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/main/runtime/session-construction/agent-session/switch-terminal-spawn.ts b/src/main/runtime/session-construction/agent-session/switch-terminal-spawn.ts
index b4e03ddfd5c3..5ec78da65994 100644
--- a/src/main/runtime/session-construction/agent-session/switch-terminal-spawn.ts
+++ b/src/main/runtime/session-construction/agent-session/switch-terminal-spawn.ts
@@ -64,7 +64,9 @@ export abstract class OrcaRuntimeWithSpawnSwitchTerminal extends OrcaRuntimeWith
         })
     const providerSession = 'providerSession' in startup ? startup.providerSession : undefined
     const namespace = this.getAgentSessionExecutionNamespace(workspace, args.agent)
-    // No claim on routes that cannot attest one (SSH): a lost reply there may leave a stray, never a fork of saved data.
+    // No claim when nothing can adopt by one: a chat that never saved a turn (no provider session
+    // to name), a route that cannot attest one (SSH), or an execution owner too old to adopt. A
+    // retry after a lost reply there starts a second CLI, which the user can close.
     const claim =
       providerSession &&
       namespace &&
diff --git a/src/renderer/src/i18n/en-runtime-required.json b/src/renderer/src/i18n/en-runtime-required.json
index 02dee2f44c03..f7deb4e2a304 100644
--- a/src/renderer/src/i18n/en-runtime-required.json
+++ b/src/renderer/src/i18n/en-runtime-required.json
@@ -1913,7 +1913,9 @@
           "writerUnconfirmed": "Orca could not confirm {{agent}} stopped. Check its open chats and terminals, then try this action again.",
           "sourceExitUnconfirmed": "Orca could not confirm {{agent}} stopped in this terminal. Quit {{agent}} here, then try this action again.",
           "sourceKept": "{{agent}} opened successfully. The original tab was kept; continue in the new tab.",
-          "sourceStopUnknown": "Orca could not confirm {{agent}} stopped. Check {{agent}} in the original terminal, then try switching again."
+          "sourceStopUnknown": "Orca could not confirm {{agent}} stopped. Check {{agent}} in the original terminal, then try switching again.",
+          "changeInProgress": "{{agent}} is still finishing another change to this conversation. Try again in a moment.",
+          "conversationMissing": "Orca could not find this {{agent}} conversation. Open it from Session History, then try again."
         },
         "SortableTabContextMenu": {
           "switchToTerminalView": "Continue with Terminal Agent"
diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index 4e58db1d19f5..265756d3ad84 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -20102,7 +20102,9 @@
           "terminalStartFailed": "{{agent}} could not start in a terminal. Check its setup and try again.",
           "writerUnconfirmed": "Orca could not confirm {{agent}} stopped. Check its open chats and terminals, then try this action again.",
           "sourceExitUnconfirmed": "Orca could not confirm {{agent}} stopped in this terminal. Quit {{agent}} here, then try this action again.",
-          "sourceKept": "{{agent}} opened successfully. The original tab was kept; continue in the new tab."
+          "sourceKept": "{{agent}} opened successfully. The original tab was kept; continue in the new tab.",
+          "changeInProgress": "{{agent}} is still finishing another change to this conversation. Try again in a moment.",
+          "conversationMissing": "Orca could not find this {{agent}} conversation. Open it from Session History, then try again."
         },
         "BrowserTab": {
           "closeOthers": "Close Others",
diff --git a/src/renderer/src/lib/conversation-switch-feedback.ts b/src/renderer/src/lib/conversation-switch-feedback.ts
index 89a57c80b2e8..4b192e7ec83c 100644
--- a/src/renderer/src/lib/conversation-switch-feedback.ts
+++ b/src/renderer/src/lib/conversation-switch-feedback.ts
@@ -54,6 +54,20 @@ export function conversationSwitchFailureText(
       values
     )
   }
+  if (reason === 'messagesUnsettled' || reason === 'handoffInFlight') {
+    return translate(
+      'components.tab.bar.switch.changeInProgress',
+      '{{agent}} is still finishing another change to this conversation. Try again in a moment.',
+      values
+    )
+  }
+  if (reason === 'recordMissing') {
+    return translate(
+      'components.tab.bar.switch.conversationMissing',
+      'Orca could not find this {{agent}} conversation. Open it from Session History, then try again.',
+      values
+    )
+  }
   if (reason === 'transcriptNotFound') {
     return translate(
       'components.native-chat.resumeInNewChat.notSavedYet',
diff --git a/src/shared/agent-session-switch-execution.ts b/src/shared/agent-session-switch-execution.ts
index 711b5c6f9fe8..093b7a331207 100644
--- a/src/shared/agent-session-switch-execution.ts
+++ b/src/shared/agent-session-switch-execution.ts
@@ -2,7 +2,11 @@ import type { AgentSessionWireRefusal } from './agent-session-wire'
 import { agentSessionRefusalError } from './agent-session-wire-refusals'
 import { waitForPromiseWithSignal } from './abort-signal-reason'
 
-/** Stop (≤15 s) + at-rest prepare + one layout replace; the client allows one IPC round trip more. */
+/**
+ * The whole switch: stop (≤15 s), the at-rest prepare (transcript import, or the terminal spawn,
+ * which the daemon request bounds at 30 s), and one layout replace. The client allows one IPC
+ * round trip more.
+ */
 export const AGENT_SESSION_SWITCH_HOST_MS = 90_000
 export const AGENT_SESSION_SWITCH_CLIENT_MS = 105_000
 

From a4b9e579cc5357b3f79fe10f1e7346bd3d8188a9 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 16:08:58 -0700
Subject: [PATCH 133/207] Type the window's reveal reply once, with the tabs it
 closed

---
 src/main/runtime/runtime-notifier-contract.ts | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/main/runtime/runtime-notifier-contract.ts b/src/main/runtime/runtime-notifier-contract.ts
index da00251d6d9a..3f3fc379e2d1 100644
--- a/src/main/runtime/runtime-notifier-contract.ts
+++ b/src/main/runtime/runtime-notifier-contract.ts
@@ -34,6 +34,14 @@ import type { ReplacedTab } from '../../shared/workspace-layout/workspace-layout
 
 type DriverState = RuntimeTerminalDriverState
 
+type TerminalRevealReply = {
+  tabId: string
+  title?: string | null
+  identity?: TerminalRevealIdentity
+  /** Tabs the same window write closed: a replace's replaced tab. */
+  closed?: string[]
+}
+
 export type RuntimeNotifier = {
   automationsChanged?(payload: {
     selector?: { kind: 'self' } | { kind: 'ssh'; targetId: string } | { kind: 'orphan' }
@@ -97,16 +105,7 @@ export type RuntimeNotifier = {
       /** The tab this terminal takes the slot of, closed by the same window write. */
       replaces?: ReplacedTab
     }
-  ):
-    | Promise<{
-        tabId: string
-        title?: string | null
-        identity?: TerminalRevealIdentity
-        /** Tabs the same window write closed: a replace's replaced tab. */
-        closed?: string[]
-      }>
-    | { tabId: string; title?: string | null; identity?: TerminalRevealIdentity }
-    | void
+  ): Promise<TerminalRevealReply> | TerminalRevealReply | void
   /** Shows an agent launch's tab before its process exists; the pane attaches when it does. */
   publishAgentLaunchTab?(
     request: Omit<AgentLaunchTabPublishRequest, 'requestId'>

From b2dc10b303c2adb69bc66e2d3b93fb005d5ba7bd Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 16:49:39 -0700
Subject: [PATCH 134/207] Close a replaced terminal as a replace, not a user
 close

---
 ...l-structured-session-replaced-slot.test.ts | 107 ++++++++++--------
 .../snapshot-apply.ts                         |   2 +
 2 files changed, 61 insertions(+), 48 deletions(-)

diff --git a/src/renderer/src/runtime/local-structured-session-replaced-slot.test.ts b/src/renderer/src/runtime/local-structured-session-replaced-slot.test.ts
index 07aea9b0fbb5..4063422f5582 100644
--- a/src/renderer/src/runtime/local-structured-session-replaced-slot.test.ts
+++ b/src/renderer/src/runtime/local-structured-session-replaced-slot.test.ts
@@ -1,60 +1,78 @@
 // @vitest-environment happy-dom
 
 import { afterEach, expect, it, vi } from 'vitest'
+import type { AppState } from '@/store/types'
 import type { RuntimeMobileSessionTabsResult } from '../../../shared/runtime-types'
-import type { Tab } from '../../../shared/tab-types'
-import type { WorktreeRuntimeOwnerState } from '../lib/worktree-runtime-owner-state'
-import { applyLocalStructuredSessionTabSnapshots } from './local-structured-session-tabs-sync/snapshot-apply'
-import { resetLocalStructuredSessionVersionForTests } from './local-structured-session-tabs-sync/inventory-generation-fence'
-import type { WebSessionTabsSyncState } from './web-session-tabs-sync/state'
-import { resetWebSessionTabsSnapshotFreshnessForTests } from './web-session-tabs-sync/tracking-lifecycle'
-import { makeState } from './web-session-tabs-sync-test-harness'
 
-// The window's half of a terminal→chat switch: the host's frame carries the chat with the slot it
-// replaced, and the window puts the chat there and reports the terminal tab for closing.
+// The window's half of a terminal→chat switch, through the real store: the host's frame carries the
+// chat with the slot it replaced, and one pass puts the chat there and closes the terminal tab, as
+// a replace rather than a user's close.
+
+vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } }))
+vi.mock('@/runtime/structured-agent-session-close', () => ({
+  closeStructuredAgentSession: vi.fn(() => Promise.resolve())
+}))
+
+const { createTabsSliceMockApi } = await import('@/store/slices/tabs-slice-test-harness')
+createTabsSliceMockApi()
+const { createTestStore, makeTab, makeTabGroup, makeUnifiedTab, makeWorktree, seedStore } =
+  await import('@/store/slices/store-test-helpers')
+const store = createTestStore()
+vi.mock('@/store', () => ({ useAppStore: store }))
+
+const { applyStructuredSessionTabSnapshots } =
+  await import('./local-structured-session-tabs-sync/snapshot-apply')
+const { resetLocalStructuredSessionVersionForTests } =
+  await import('./local-structured-session-tabs-sync/inventory-generation-fence')
+const { resetWebSessionTabsSnapshotFreshnessForTests } =
+  await import('./web-session-tabs-sync/tracking-lifecycle')
 
 const WORKTREE = 'repo-1::/tmp/wt-switch'
 const GROUP = 'group-1'
 
-type SyncState = WebSessionTabsSyncState & WorktreeRuntimeOwnerState
-
 afterEach(() => {
   resetLocalStructuredSessionVersionForTests()
   resetWebSessionTabsSnapshotFreshnessForTests()
 })
 
-const terminalTab = (id: string): Tab => ({
-  id,
-  entityId: id,
-  groupId: GROUP,
-  worktreeId: WORKTREE,
-  contentType: 'terminal',
-  label: id,
-  customLabel: null,
-  color: null,
-  sortOrder: 0,
-  createdAt: 1
-})
-
-it('puts the chat in the replaced terminal’s slot and reports that terminal', () => {
-  const state = {
-    ...makeState({ activeWorktreeId: WORKTREE }),
+it('puts the chat in the replaced terminal’s pinned slot and closes it without a reopen entry', () => {
+  const terminal = (id: string, isPinned = false) =>
+    makeUnifiedTab({
+      id,
+      entityId: id,
+      groupId: GROUP,
+      worktreeId: WORKTREE,
+      contentType: 'terminal',
+      isPinned
+    })
+  seedStore(store, {
+    activeWorktreeId: WORKTREE,
+    worktreesByRepo: {
+      'repo-1': [makeWorktree({ id: WORKTREE, repoId: 'repo-1', path: '/tmp/wt-switch' })]
+    },
+    tabsByWorktree: {
+      [WORKTREE]: ['before', 'switched', 'after'].map((id) => makeTab({ id, worktreeId: WORKTREE }))
+    },
     unifiedTabsByWorktree: {
-      [WORKTREE]: [terminalTab('before'), terminalTab('switched'), terminalTab('after')]
+      [WORKTREE]: [terminal('before', true), terminal('switched', true), terminal('after')]
     },
     groupsByWorktree: {
       [WORKTREE]: [
-        {
+        makeTabGroup({
           id: GROUP,
           worktreeId: WORKTREE,
           activeTabId: 'switched',
           tabOrder: ['before', 'switched', 'after'],
           recentTabIds: ['switched']
-        }
+        })
       ]
     },
-    worktreesByRepo: { 'repo-1': [{ id: WORKTREE, path: '/tmp/wt-switch' }] }
-  } as unknown as SyncState
+    layoutByWorktree: { [WORKTREE]: { type: 'leaf', groupId: GROUP } },
+    activeGroupIdByWorktree: { [WORKTREE]: GROUP },
+    openFiles: [],
+    browserTabsByWorktree: {}
+  } as Partial<AppState>)
+  const reopenStack = store.getState().recentlyClosedTerminalTabsByWorktree
   const frame = {
     worktree: WORKTREE,
     publicationEpoch: 'renderer:switch',
@@ -75,22 +93,15 @@ it('puts the chat in the replaced terminal’s slot and reports that terminal',
     ],
     tabGroups: [{ id: GROUP, activeTabId: null, tabOrder: ['agent-session:session-1'] }]
   } as unknown as RuntimeMobileSessionTabsResult
-  const onReplacedTab = vi.fn()
-  const next = applyLocalStructuredSessionTabSnapshots(state, [frame], undefined, 1, {
-    onReplacedTab
-  })
-  const chat = next.unifiedTabsByWorktree[WORKTREE]?.find(
+
+  applyStructuredSessionTabSnapshots([frame])
+
+  const state = store.getState()
+  const chat = state.unifiedTabsByWorktree[WORKTREE]?.find(
     (tab) => tab.contentType === 'agent-session'
   )
-  expect(next.groupsByWorktree[WORKTREE]?.[0]?.tabOrder).toEqual([
-    'before',
-    chat?.id,
-    'switched',
-    'after'
-  ])
-  expect(onReplacedTab).toHaveBeenCalledExactlyOnceWith({
-    worktreeId: WORKTREE,
-    tabId: 'switched',
-    sessionId: 'session-1'
-  })
+  expect(state.groupsByWorktree[WORKTREE]?.[0]?.tabOrder).toEqual(['before', chat?.id, 'after'])
+  expect(chat?.isPinned).toBe(true)
+  expect(state.tabsByWorktree[WORKTREE]?.some((tab) => tab.id === 'switched')).toBe(false)
+  expect(state.recentlyClosedTerminalTabsByWorktree).toEqual(reopenStack)
 })
diff --git a/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts b/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts
index 5e7bb7b2bf55..53c11a98e40e 100644
--- a/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts
+++ b/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts
@@ -260,7 +260,9 @@ function closeReplacedTerminalTabs(replacements: readonly ReplacedSessionTab[]):
     if (replaced.isPinned && !chat.isPinned) {
       useAppStore.getState().pinTab(chat.id, { recordInteraction: false })
     }
+    // Not a user close: a replace never feeds Reopen Closed Tab or drops the tab's drafts.
     closeTerminalTab(replaced.entityId, {
+      reason: 'cleanup',
       force: true,
       skipRunningProcessConfirm: true,
       localPtyTeardownOwnedExternally: true

From 7d3acb3d30973ac38e8aa16f16cb0bc287c4f018 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 16:49:41 -0700
Subject: [PATCH 135/207] Show a switch's stopped source as exited when no
 replace removes it

---
 ...red-agent-session-switch-execution.test.ts | 109 ++++++++
 ...ructured-agent-session-switch-execution.ts |  27 +-
 src/main/runtime/runtime-notifier-contract.ts |   3 +
 .../terminal-switch-close-capture.ts          |  23 ++
 src/main/window/runtime-window-lifecycle.ts   |   1 +
 ...ui-bridge-clipboard-and-window-controls.ts |   7 +
 src/preload/api/ui-command-event-api.ts       |   3 +
 .../pty-connection/pty-exit-hibernate.ts      |   4 +
 .../session-reconcile-dispose.ts              |   2 +
 .../stopped-switch-source-exit.ts             |  37 +++
 .../stopped-switch-source.test.ts             | 250 ++++++++++++++++++
 .../terminal-pane/stopped-switch-sources.ts   | 104 ++++++++
 .../mobile-terminal-close-ipc-bridge.ts       |   5 +
 src/shared/stopped-switch-source.ts           |  10 +
 14 files changed, 582 insertions(+), 3 deletions(-)
 create mode 100644 src/renderer/src/components/terminal-pane/pty-connection/stopped-switch-source-exit.ts
 create mode 100644 src/renderer/src/components/terminal-pane/stopped-switch-source.test.ts
 create mode 100644 src/renderer/src/components/terminal-pane/stopped-switch-sources.ts
 create mode 100644 src/shared/stopped-switch-source.ts

diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
index da84619da7ed..accf8def515f 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
@@ -499,3 +499,112 @@ it('re-issuing a switch whose first answer was lost adopts the terminal it start
       .sort()
   ).toEqual([TAB_ID, lost.tabId].sort())
 })
+
+/** A whole-tab terminal→chat switch whose stop keeps the pane for the replace; records main's settlements. */
+async function switchFromKeptTerminal(
+  options: {
+    afterStop?: (runtime: ReturnType<typeof setupMainOwnedWorkspace>['runtime']) => Promise<void>
+  } = {}
+) {
+  const { runtime } = setupMainOwnedWorkspace()
+  const incarnationId = '11111111-1111-4111-8111-111111111111'
+  runtime.registerPty(PTY_A, WORKTREE_ID, null, { tabId: TAB_ID, leafId: LEAF_A, incarnationId })
+  const source = runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_A}`, WORKTREE_ID)
+  if (!source.presentation) {
+    throw new Error('missing captured source')
+  }
+  const settled = vi.fn()
+  runtime.setNotifier({
+    settleStoppedSwitchSource: settled,
+    closeTerminal: () => {},
+    worktreesChanged: () => {},
+    reposChanged: () => {},
+    activateWorktree: () => {},
+    createTerminal: () => {},
+    splitTerminal: () => {},
+    renameTerminal: () => {},
+    focusTerminal: () => {},
+    terminalFitOverrideChanged: () => {},
+    terminalDriverChanged: () => {}
+  })
+  runtime.setPtyController({
+    write: () => true,
+    kill: () => false,
+    stopAndWait: async () => {
+      await runtime.onPtyExit(PTY_A, 0, incarnationId, { hostExitConfirmed: true })
+      await options.afterStop?.(runtime)
+      return true
+    },
+    getForegroundProcess: async () => null
+  })
+  const result = await executeStructuredSessionSwitch(
+    {
+      sessionId: id,
+      execution: {
+        invocationId: 'kept-source',
+        source: {
+          terminal: source.handle,
+          expectedIncarnationId: incarnationId,
+          originalPresentation: source.presentation
+        }
+      }
+    },
+    { runtime },
+    'chat'
+  )
+  const stoppedSource = {
+    worktreeId: WORKTREE_ID,
+    tabId: TAB_ID,
+    leafId: LEAF_A,
+    ptyId: PTY_A,
+    incarnationId
+  }
+  return { result, settled, stoppedSource }
+}
+
+it('settles a kept source once when the switch fails after stopping it', async () => {
+  await savedTranscript()
+  const prepare = vi.mocked(cliTranscript.prepareStructuredChatCliTranscript)
+  const readable = await prepare.getMockImplementation()!(
+    undefined as never,
+    undefined as never,
+    false
+  )
+  prepare.mockReset()
+  prepare
+    .mockResolvedValueOnce(readable)
+    .mockResolvedValue({ useRealCodexHome: false, cliForkSource: undefined } as never)
+  const { result, settled, stoppedSource } = await switchFromKeptTerminal()
+  expect(result).toMatchObject({
+    status: 'refused',
+    refusal: { details: { reason: 'transcriptUnreadable' } }
+  })
+  expect(settled).toHaveBeenCalledExactlyOnceWith(stoppedSource)
+})
+
+it('settles a kept source once when its tab became a split after the stop', async () => {
+  await savedTranscript()
+  const { result, settled, stoppedSource } = await switchFromKeptTerminal({
+    afterStop: async (runtime) => {
+      expect(
+        await runtime.applyLayoutCommand({
+          type: 'splitPane',
+          workspace: WORKTREE_ID,
+          tabId: TAB_ID,
+          leafId: LEAF_A,
+          direction: 'vertical',
+          newLeafId: LEAF_B
+        })
+      ).toMatchObject({ ok: true })
+    }
+  })
+  expect(result).toEqual({ status: 'completed', sessionId: id })
+  expect(settled).toHaveBeenCalledExactlyOnceWith(stoppedSource)
+})
+
+it('settles a replaced source naming its chat, so the window waits for that replace', async () => {
+  await savedTranscript()
+  const { result, settled, stoppedSource } = await switchFromKeptTerminal()
+  expect(result).toEqual({ status: 'completed', sessionId: id })
+  expect(settled).toHaveBeenCalledExactlyOnceWith({ ...stoppedSource, replacedBySessionId: id })
+})
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
index 3400994d1516..d7faa44eb930 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
@@ -54,6 +54,17 @@ export async function executeStructuredSessionSwitch(
   const deadline = agentSessionSwitchDeadline()
   let sessionId = params.sessionId
   let commandOwned = false
+  // A source kept on screen for a replace is settled when this switch settles, by its own result
+  // or the deadline, even while work it started is still running; a later proven stop settles then.
+  let switchSettled = false
+  let settleSource: (() => void) | undefined
+  const keepSource = (settle: () => void): void => {
+    if (switchSettled) {
+      settle()
+    } else {
+      settleSource = settle
+    }
+  }
   const operation = (async (): Promise<AgentSessionSwitchResult> => {
     const prepared = await prepareStructuredSessionSwitch(params, ctx, sessionId, deadline)
     const { host, execution, create, conversation } = prepared
@@ -75,7 +86,7 @@ export async function executeStructuredSessionSwitch(
             deadline
           )
         }
-        const result = await switchToChat(params, ctx, prepared, sessionId, deadline)
+        const result = await switchToChat(params, ctx, prepared, sessionId, deadline, keepSource)
         sessionId = result.sessionId
         return result
       },
@@ -103,6 +114,9 @@ export async function executeStructuredSessionSwitch(
     return await deadline.wait(operation)
   } catch (error) {
     return structuredSessionSwitchFailure(error, sessionId)
+  } finally {
+    switchSettled = true
+    settleSource?.()
   }
 }
 
@@ -111,7 +125,8 @@ async function switchToChat(
   ctx: RpcContext,
   prepared: Prepared,
   sessionId: string,
-  deadline: AgentSessionSwitchDeadline
+  deadline: AgentSessionSwitchDeadline,
+  keepSource: (settle: () => void) => void
 ): Promise<AgentSessionSwitchResult> {
   const {
     host,
@@ -123,6 +138,7 @@ async function switchToChat(
     conversation
   } = prepared
   deadline.check()
+  let replacedBy: string | undefined
   const source = 'source' in execution ? execution.source : undefined
   const close = source
     ? captureStructuredSwitchTerminalSource(
@@ -184,6 +200,9 @@ async function switchToChat(
     // Shutdown already accepted must finish even when the observing request expires.
     try {
       await host.trackSwitchPhysical(sessionId, close.stop(replacing))
+      // The window decides whether the stopped pane is still there; a chat that replaced it is
+      // named so the window waits for that replace's own pass.
+      keepSource(() => close.settleStoppedSource(replacedBy))
     } catch {
       host.deps.logger.warn('switch source exit was not confirmed', {
         scope: 'session-switch',
@@ -270,10 +289,12 @@ async function switchToChat(
     focusWindow: agentLaunchMovesHostWindow(ctx),
     ...(replaces ? { replaces } : sameWorkspace ? { placement: close.placement() } : {})
   })
+  replacedBy = replaces ? sessionId : undefined
   deadline.check()
   if (sameWorkspace) {
     // Whole tab: the layout owner's replace removed it (main's model, or the window applying the
-    // snapshot's hint). Split pane: the window retired it on exit, main's model closes it here.
+    // snapshot's hint). Split pane: the window retired it on exit, or shows it exited once this
+    // switch settles if the stop kept it; main's model closes it here.
     await close.retire(replaces !== undefined || !ORCA_LAYOUT_OWNER_IS_MAIN)
   }
   deadline.check()
diff --git a/src/main/runtime/runtime-notifier-contract.ts b/src/main/runtime/runtime-notifier-contract.ts
index 3f3fc379e2d1..df8dcedf6829 100644
--- a/src/main/runtime/runtime-notifier-contract.ts
+++ b/src/main/runtime/runtime-notifier-contract.ts
@@ -1,4 +1,5 @@
 import type { TerminalSurfaceCloseIdentity } from '../../shared/terminal-tab-close'
+import type { StoppedSwitchSource } from '../../shared/stopped-switch-source'
 import type {
   RuntimeEditorTabReveal,
   RuntimeFileOpenPosition
@@ -166,6 +167,8 @@ export type RuntimeNotifier = {
   closeTerminal(tabId: string): void
   /** Drops one split pane main already closed; never closes its tab. */
   closeTerminalPane?(tabId: string, leafId: string): void
+  /** A switch stopped this exact pane's process; the window shows it exited unless it is gone. */
+  settleStoppedSwitchSource?(source: StoppedSwitchSource): void
   closeTerminalTab?(
     tabId: string,
     options?: {
diff --git a/src/main/runtime/session-tabs/terminal-switch-close-capture.ts b/src/main/runtime/session-tabs/terminal-switch-close-capture.ts
index 52996976c44e..0725dbff49a2 100644
--- a/src/main/runtime/session-tabs/terminal-switch-close-capture.ts
+++ b/src/main/runtime/session-tabs/terminal-switch-close-capture.ts
@@ -61,6 +61,9 @@ export abstract class OrcaRuntimeWithTerminalSwitchCloseCapture extends OrcaRunt
     const originalPlacement = readPlacement()
     const addressedPty = source.ptyId
     const rendererOwnsPresentation = windowListsTab(this, this.tabs, source.tabId)
+    // A `closing` stop keeps the pane's screen for a replace; it is owed one settlement.
+    let keptStopped = false
+    let stoppedSourceSettled = false
     const proof = {
       parentTabId: source.tabId,
       leafId: source.leafId,
@@ -102,6 +105,26 @@ export abstract class OrcaRuntimeWithTerminalSwitchCloseCapture extends OrcaRunt
         if (!stop.stopped) {
           throw new Error('terminal_close_unverifiable')
         }
+        keptStopped = closing
+      },
+      /**
+       * Settles a `closing` stop: the window shows that exact pane exited unless it is gone. Sent
+       * once, only after proof of the stop; a replace's chat names itself, so the window settles
+       * only once that chat is there and its replace has had its pass.
+       */
+      settleStoppedSource: (replacedBySessionId?: string) => {
+        if (!keptStopped || stoppedSourceSettled) {
+          return
+        }
+        stoppedSourceSettled = true
+        this.notifier?.settleStoppedSwitchSource?.({
+          worktreeId: source.worktreeId,
+          tabId: source.tabId,
+          leafId: source.leafId,
+          ptyId: addressedPty,
+          incarnationId: incarnation,
+          ...(replacedBySessionId ? { replacedBySessionId } : {})
+        })
       },
       /** Retires the pane's bookkeeping; its presentation too, unless a replace or its exit already did. */
       retire: async (presentationRetired = false) => {
diff --git a/src/main/window/runtime-window-lifecycle.ts b/src/main/window/runtime-window-lifecycle.ts
index ebebc5fe360d..818e94e5f918 100644
--- a/src/main/window/runtime-window-lifecycle.ts
+++ b/src/main/window/runtime-window-lifecycle.ts
@@ -215,6 +215,7 @@ export function registerRuntimeWindowLifecycle(
       }),
     closeTerminal: (tabId) => send('ui:closeTerminal', { kind: 'tab', tabId }),
     closeTerminalPane: (tabId, leafId) => send('ui:closeTerminal', { kind: 'pane', tabId, leafId }),
+    settleStoppedSwitchSource: (source) => send('ui:stoppedSwitchSource', source),
     closeTerminalTab: (tabId, options) =>
       requestTerminalTabCloseFromRenderer(mainWindow, tabId, options),
     workspaceSleepChanged: (notice) => send('ui:workspaceSleep', notice),
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 7ed63415ac9b..ef12c61697bd 100644
--- a/src/preload/api/ui-bridge-clipboard-and-window-controls.ts
+++ b/src/preload/api/ui-bridge-clipboard-and-window-controls.ts
@@ -9,6 +9,7 @@ import {
 } from '../../shared/rich-markdown-context-menu'
 import type { RuntimeNavigationTarget } from '../../shared/runtime-navigation'
 import type { TerminalSurfaceCloseTarget } from '../../shared/terminal-surface-close-target'
+import type { StoppedSwitchSource } from '../../shared/stopped-switch-source'
 import type { ClipboardImageThumbnail } from '../../shared/clipboard-image'
 import type { ReadClipboardTextOptions } from '../../shared/clipboard-text'
 import type { PreloadApi } from '../api-types'
@@ -46,6 +47,12 @@ export const uiClipboardAndWindowControlsApi = {
     ipcRenderer.on('ui:closeTerminal', listener)
     return () => ipcRenderer.removeListener('ui:closeTerminal', listener)
   },
+  onStoppedSwitchSource: (callback: (source: StoppedSwitchSource) => void): (() => void) => {
+    const listener = (_event: Electron.IpcRendererEvent, source: StoppedSwitchSource) =>
+      callback(source)
+    ipcRenderer.on('ui:stoppedSwitchSource', listener)
+    return () => ipcRenderer.removeListener('ui:stoppedSwitchSource', listener)
+  },
   onTerminalTabCloseRequest: (callback) => {
     const listener = (_event: Electron.IpcRendererEvent, request: Parameters<typeof callback>[0]) =>
       callback(request)
diff --git a/src/preload/api/ui-command-event-api.ts b/src/preload/api/ui-command-event-api.ts
index 1d880559b168..08ab1d545441 100644
--- a/src/preload/api/ui-command-event-api.ts
+++ b/src/preload/api/ui-command-event-api.ts
@@ -17,6 +17,7 @@ import type {
   AgentLaunchTabPublishRequest
 } from '../../shared/agent-launch-tab-publication'
 import type { AgentLaunchPaneVerdictEvent } from '../../shared/agent-launch-pane-verdict'
+import type { StoppedSwitchSource } from '../../shared/stopped-switch-source'
 import type { PaneLaunchRecipe } from '../../shared/terminal-attachment-launch-result'
 import type {
   TerminalPaneRevealReply,
@@ -285,6 +286,8 @@ export type UiCommandEventApi = {
     }) => void
   ) => () => void
   onCloseTerminal: (callback: (target: TerminalSurfaceCloseTarget) => void) => () => void
+  /** A switch stopped this pane's process and no replace removed it: show it exited. */
+  onStoppedSwitchSource?: (callback: (source: StoppedSwitchSource) => void) => () => void
   onTerminalTabCloseRequest: (callback: (request: TerminalTabCloseRequest) => void) => () => void
   respondTerminalTabClose: (response: TerminalTabCloseResponse) => void
   /** Follow main's workspace sleep even when another client requested it. */
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/pty-exit-hibernate.ts b/src/renderer/src/components/terminal-pane/pty-connection/pty-exit-hibernate.ts
index a2c6707b1cee..019624150e3f 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/pty-exit-hibernate.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/pty-exit-hibernate.ts
@@ -20,6 +20,7 @@ import type { PtyPaneStartup } from '../pty-connection-types'
 import type { ConnectPanePtySession } from './connect-pane-pty-session'
 import { isPtyExitReplacedByRestart } from '../pty-exit-delivery'
 import { armRestartReplacement } from './restart-replacement-on-show'
+import { holdClosingExit } from './stopped-switch-source-exit'
 import { noteHiddenAgentResumePtyEnded } from './hidden-agent-resume-deferral'
 import { expectExitedSplitPaneClose } from './exited-split-pane-close'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../shared/layout-owner-switch'
@@ -233,6 +234,9 @@ export function installPtyExitHibernate(session: ConnectPanePtySession): void {
         armRestartReplacement(session, ptyId)
         return
       }
+      if (preserveRendererBinding && !reversibleExit) {
+        holdClosingExit(session, ptyId, exitCode)
+      }
       const sleepingRecordEntry = session.getSleepingRecordForPane(useAppStore.getState())
       if (
         reversibleExit &&
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/session-reconcile-dispose.ts b/src/renderer/src/components/terminal-pane/pty-connection/session-reconcile-dispose.ts
index edf90a94a062..b8f3d591853e 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/session-reconcile-dispose.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/session-reconcile-dispose.ts
@@ -149,6 +149,8 @@ export function installSessionReconcileDispose(session: ConnectPanePtySession):
       session.spawnedFreshPtyId === ptyId && !Number.isFinite(session.lastTerminalInputAt),
     dispose() {
       session.disposed = true
+      // A pane parked before main settled its stopped process takes that settlement when shown.
+      session.stopWatchingStoppedSwitchSource?.()
       session.discardAgentPreReadyDraft?.()
       session.cleanupKittyFileReader()
       session.disposeSpawnDeferral()
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/stopped-switch-source-exit.ts b/src/renderer/src/components/terminal-pane/pty-connection/stopped-switch-source-exit.ts
new file mode 100644
index 000000000000..1181783498f8
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/pty-connection/stopped-switch-source-exit.ts
@@ -0,0 +1,37 @@
+import { watchStoppedSwitchSource } from '../stopped-switch-sources'
+import type { ConnectPanePtySession } from './connect-pane-pty-session'
+
+/**
+ * A `closing` exit keeps the stopped process's screen for the replace that should remove its tab.
+ * If main says no replace removed it, the pane takes the ordinary exited state: the overlay with
+ * Restart and Close, at the exit code it recorded, never an automatic close or restart.
+ */
+export function holdClosingExit(
+  session: ConnectPanePtySession,
+  ptyId: string,
+  exitCode: number
+): void {
+  session.stopWatchingStoppedSwitchSource?.()
+  session.stopWatchingStoppedSwitchSource = watchStoppedSwitchSource(
+    {
+      tabId: session.deps.tabId,
+      leafId: session.pane.leafId,
+      ptyId,
+      incarnationId: session.inputModeOwnerIncarnationId ?? null
+    },
+    () => {
+      session.stopWatchingStoppedSwitchSource = null
+      if (session.disposed || session.handledExitPtyId !== ptyId) {
+        return
+      }
+      session.clearExitedPanePtyLayoutBinding(ptyId)
+      session.deps.clearTabPtyId(session.deps.tabId, ptyId)
+      session.deps.onPaneProcessDied?.({
+        paneId: session.pane.id,
+        exitCode,
+        startup: null,
+        reason: 'process-failed'
+      })
+    }
+  )
+}
diff --git a/src/renderer/src/components/terminal-pane/stopped-switch-source.test.ts b/src/renderer/src/components/terminal-pane/stopped-switch-source.test.ts
new file mode 100644
index 000000000000..20b5aff98fe5
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/stopped-switch-source.test.ts
@@ -0,0 +1,250 @@
+import { afterEach, beforeAll, expect, it, vi } from 'vitest'
+import { flushAsyncTicks } from './pty-connection-test-async'
+import { createManager, createPane } from './pty-connection-test-pane-fixtures'
+import { buildPaneConnectionDeps } from './pty-connection-test-deps'
+import {
+  installTerminalTestGlobals,
+  restoreTerminalTestGlobals
+} from './pty-connection-test-environment'
+import {
+  launchWorkspaceState,
+  perClientLoader,
+  type LaunchStoreHolder
+} from '@/lib/launch-parity-renderer.test-fixture'
+import { getDefaultSettings } from '../../../../shared/constants'
+import { launchWorkspaceId } from '../../../../shared/launch-parity-window-request.test-fixture'
+import { mockPanePtyArgs } from './pty-connection-test-connect-mock-pane'
+
+// A real pane and store: a switch kept this pane's stopped screen for a replace that never came,
+// and main's settlement turns it into the ordinary exited state.
+
+vi.mock('@/runtime/runtime-rpc-client', async (importOriginal) =>
+  (
+    await import('@/runtime/layout-apply-test-transport.test-fixture')
+  ).runtimeRpcClientWithLayoutApply(await importOriginal())
+)
+const holder = vi.hoisted((): LaunchStoreHolder => ({ store: null }))
+vi.mock('@/store', async () =>
+  (await import('@/lib/launch-parity-renderer.test-fixture')).launchStoreModuleMock(holder)
+)
+vi.mock('@/runtime/sync-runtime-graph', () => ({ scheduleRuntimeGraphSync: vi.fn() }))
+vi.mock('@/lib/agent-status', async (importOriginal) => {
+  const { buildAgentStatusModuleMock } = await import('./pty-connection-test-environment')
+  return buildAgentStatusModuleMock(await importOriginal<Record<string, unknown>>())
+})
+vi.mock('./cache-timer-seeding', () => ({ shouldSeedCacheTimerOnInitialTitle: () => false }))
+vi.mock('sonner', () => ({ toast: { info: vi.fn(), message: vi.fn(), error: vi.fn() } }))
+vi.mock('@/lib/codex-stale-pane-sweep', () => ({ notifyCodexPaneBoundForStaleSweep: vi.fn() }))
+
+const load = perClientLoader(async () => ({
+  pane: await import('./pty-connection'),
+  parked: await import('./terminal-parked-tab-watchers'),
+  parkedRegistry: await import('./terminal-parked-watcher-registry'),
+  sources: await import('./stopped-switch-sources')
+}))
+
+beforeAll(async () => {
+  await load('linux')
+}, 240_000)
+
+afterEach(async () => {
+  await restoreTerminalTestGlobals()
+  vi.unstubAllGlobals()
+})
+
+const incarnationId = 'source-incarnation'
+// The PTY dispatcher subscribes to exits once per module load; later panes share that listener.
+let dispatchExit: Parameters<typeof window.api.pty.onExit>[0] | undefined
+
+async function keptStoppedPane() {
+  const modules = await load('linux')
+  modules.sources.resetStoppedSwitchSourcesForTests()
+  await installTerminalTestGlobals()
+  Object.assign(window.api.platform, { get: () => ({ platform: 'linux', osRelease: '6' }) })
+  const workspace = { kind: 'folder', path: '/home/alice/source' } as const
+  const worktreeId = launchWorkspaceId(workspace)
+  const store = modules.createStore()
+  holder.store = store
+  store.setState(launchWorkspaceState(workspace, { ...getDefaultSettings('/home/alice') }))
+  const pane = createPane(1)
+  const manager = createManager(1, 1)
+  const ptyId = `${worktreeId}@@switch-source`
+  const tab = store.getState().createTab(worktreeId, undefined, undefined, {
+    initialPtyId: ptyId,
+    initialLeafId: pane.leafId
+  })
+  const onExit = vi.fn<typeof window.api.pty.onExit>((listener) => {
+    dispatchExit = listener
+    return () => {}
+  })
+  const noop = (): (() => void) => () => {}
+  Object.assign(window.api.pty, {
+    spawn: vi.fn(async () => ({ id: ptyId, incarnationId, isReattach: true })),
+    onData: noop,
+    onExit,
+    onReplay: noop,
+    onWriteUnavailable: noop,
+    onSideEffect: noop,
+    resize: vi.fn(),
+    claimViewport: vi.fn()
+  })
+  const automaticClose = vi.fn()
+  const died = vi.fn()
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the real store supplies every state member read by the pane fixture.
+  const deps = buildPaneConnectionDeps(() => store.getState() as never, {
+    tabId: tab.id,
+    worktreeId,
+    cwd: workspace.path,
+    restoredLeafId: pane.leafId,
+    restoredPtyIdByLeafId: { [pane.leafId]: ptyId },
+    onPtyExitRef: { current: automaticClose },
+    onPaneProcessDied: died,
+    consumeSuppressedPtyExit: vi.fn(store.getState().consumeSuppressedPtyExit),
+    clearTabPtyId: vi.fn(store.getState().clearTabPtyId),
+    updateTabPtyId: vi.fn(store.getState().updateTabPtyId)
+  })
+  const args = mockPanePtyArgs(pane, manager, deps)
+  let binding = modules.pane.connectPanePty(...args)
+  await flushAsyncTicks(20)
+  const transport = args[2].paneTransportsRef.current.get(pane.id)
+  const exit = dispatchExit
+  if (!transport || !exit) {
+    throw new Error('the pane did not connect')
+  }
+  const source = { worktreeId, tabId: tab.id, leafId: pane.leafId, ptyId, incarnationId }
+  return {
+    modules,
+    store,
+    tab,
+    pane,
+    args,
+    transport,
+    automaticClose,
+    died,
+    source,
+    stoppedForReplace: () =>
+      exit({ id: ptyId, code: 0, incarnationId, preserveRendererBinding: 'closing' }),
+    park: () => {
+      modules.parked.captureParkedTerminalPaneCandidates(tab.id, worktreeId, [
+        { ptyId, paneId: pane.id, leafId: pane.leafId, drivesTabTitle: true }
+      ])
+      transport.detach?.({ preserveExitObserver: false })
+      binding.dispose()
+      args[2].paneTransportsRef.current.clear()
+      modules.parked.syncParkedTerminalTabWatchersForWorkspaces(
+        new Map([[worktreeId, { tabs: [tab], parkedTabIds: new Set([tab.id]) }]])
+      )
+    },
+    reveal: async () => {
+      const afterMarkerGrace = vi.spyOn(Date, 'now').mockReturnValue(Date.now() + 30_001)
+      try {
+        args[2].mountFollowsTerminalPark = true
+        binding = modules.pane.connectPanePty(...args)
+        await flushAsyncTicks(20)
+      } finally {
+        afterMarkerGrace.mockRestore()
+      }
+    },
+    dispose: () => {
+      binding.dispose()
+      modules.parkedRegistry.disposeAllParkedTerminalWatchers()
+    }
+  }
+}
+
+it('shows the kept pane exited at its own code once main settles it, with no close', async () => {
+  const kept = await keptStoppedPane()
+  try {
+    kept.stoppedForReplace()
+    await flushAsyncTicks(5)
+    expect(kept.died).not.toHaveBeenCalled()
+    kept.modules.sources.noteStoppedSwitchSource(kept.source)
+    await flushAsyncTicks(5)
+    expect(kept.died).toHaveBeenCalledExactlyOnceWith({
+      paneId: kept.pane.id,
+      exitCode: 0,
+      startup: null,
+      reason: 'process-failed'
+    })
+    expect(kept.automaticClose).not.toHaveBeenCalled()
+    expect(kept.transport.sendInput('must not run\r', 'driving')).toBe(false)
+    expect(kept.store.getState().tabsByWorktree[kept.source.worktreeId]).toHaveLength(1)
+    // A later notice for the same pane changes nothing.
+    kept.modules.sources.noteStoppedSwitchSource(kept.source)
+    await flushAsyncTicks(5)
+    expect(kept.died).toHaveBeenCalledOnce()
+  } finally {
+    kept.dispose()
+  }
+})
+
+it.each([
+  ['another process', { ptyId: 'successor-pty' }],
+  ['another incarnation', { incarnationId: 'successor-incarnation' }]
+])('ignores a settlement for %s', async (_label, other) => {
+  const kept = await keptStoppedPane()
+  try {
+    kept.stoppedForReplace()
+    kept.modules.sources.noteStoppedSwitchSource({ ...kept.source, ...other })
+    await flushAsyncTicks(5)
+    expect(kept.died).not.toHaveBeenCalled()
+  } finally {
+    kept.dispose()
+  }
+})
+
+it.each([
+  ['closed the tab in the same pass, so nothing shows', true, false],
+  ['missed the tab, so the pane shows exited', false, true]
+])(
+  'waits for the chat a replace named; the replace %s',
+  async (_label, replaceClosesTab, settles) => {
+    const kept = await keptStoppedPane()
+    try {
+      kept.stoppedForReplace()
+      kept.modules.sources.noteStoppedSwitchSource({
+        ...kept.source,
+        replacedBySessionId: 'session-1'
+      })
+      await flushAsyncTicks(5)
+      expect(kept.died).not.toHaveBeenCalled()
+      const { worktreeId, tabId } = kept.source
+      const state = kept.store.getState()
+      const tabs = state.unifiedTabsByWorktree[worktreeId] ?? []
+      const chat = {
+        ...tabs[0]!,
+        id: 'chat-tab',
+        entityId: 'session-1',
+        contentType: 'agent-session' as const
+      }
+      // The snapshot pass brings the chat and, when the replace applies, drops the terminal.
+      const { [tabId]: _closed, ...layouts } = state.terminalLayoutsByTabId
+      kept.store.setState({
+        unifiedTabsByWorktree: { ...state.unifiedTabsByWorktree, [worktreeId]: [...tabs, chat] },
+        ...(replaceClosesTab ? { terminalLayoutsByTabId: layouts } : {})
+      })
+      await flushAsyncTicks(5)
+      expect(kept.died).toHaveBeenCalledTimes(settles ? 1 : 0)
+    } finally {
+      kept.dispose()
+    }
+  }
+)
+
+it('settles a pane that was parked when main settled it, once it is shown', async () => {
+  const kept = await keptStoppedPane()
+  try {
+    kept.park()
+    kept.stoppedForReplace()
+    kept.modules.sources.noteStoppedSwitchSource(kept.source)
+    await flushAsyncTicks(5)
+    expect(kept.died).not.toHaveBeenCalled()
+    await kept.reveal()
+    expect(kept.died).toHaveBeenCalledExactlyOnceWith(
+      expect.objectContaining({ paneId: kept.pane.id, exitCode: 0 })
+    )
+    expect(kept.automaticClose).not.toHaveBeenCalled()
+  } finally {
+    kept.dispose()
+  }
+})
diff --git a/src/renderer/src/components/terminal-pane/stopped-switch-sources.ts b/src/renderer/src/components/terminal-pane/stopped-switch-sources.ts
new file mode 100644
index 000000000000..2fecdbc2c8fa
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/stopped-switch-sources.ts
@@ -0,0 +1,104 @@
+import { useAppStore } from '@/store'
+import type { StoppedSwitchSource } from '../../../../shared/stopped-switch-source'
+
+/**
+ * Main's word that a switch stopped this exact pane's process and no replace removed it. Held per
+ * leaf only while that leaf still shows that process, so a closed, rebound or successor pane
+ * drops it; a pane that is parked when it arrives takes it when it mounts.
+ */
+const sources = new Map<string, StoppedSwitchSource>()
+const watchers = new Map<string, () => void>()
+let unsubscribeStore: (() => void) | null = null
+
+const keyOf = (tabId: string, leafId: string): string => `${tabId}:${leafId}`
+
+function stillShown(source: StoppedSwitchSource): boolean {
+  const layout = useAppStore.getState().terminalLayoutsByTabId[source.tabId]
+  return layout?.ptyIdsByLeafId?.[source.leafId] === source.ptyId
+}
+
+/** A switch that put a chat in this tab's slot settles only once that chat is here: by then the
+ *  replace's own pass has closed the tab, so a successful switch never shows the exited state. */
+function replaceSettled(source: StoppedSwitchSource): boolean {
+  const { replacedBySessionId } = source
+  return (
+    !replacedBySessionId ||
+    (useAppStore.getState().unifiedTabsByWorktree[source.worktreeId] ?? []).some(
+      (tab) => tab.contentType === 'agent-session' && tab.entityId === replacedBySessionId
+    )
+  )
+}
+
+function reconcile(): void {
+  for (const [key, source] of sources) {
+    if (!stillShown(source)) {
+      sources.delete(key)
+    } else if (replaceSettled(source)) {
+      watchers.get(key)?.()
+    }
+  }
+  if (sources.size === 0) {
+    unsubscribeStore?.()
+    unsubscribeStore = null
+  }
+}
+
+let reconcileQueued = false
+// After the store write that brought the chat: the same pass closes a replaced tab first.
+function scheduleReconcile(): void {
+  if (reconcileQueued) {
+    return
+  }
+  reconcileQueued = true
+  queueMicrotask(() => {
+    reconcileQueued = false
+    reconcile()
+  })
+}
+
+export function noteStoppedSwitchSource(source: StoppedSwitchSource): void {
+  if (!stillShown(source)) {
+    return
+  }
+  sources.set(keyOf(source.tabId, source.leafId), source)
+  unsubscribeStore ??= useAppStore.subscribe(scheduleReconcile)
+  scheduleReconcile()
+}
+
+/**
+ * A pane that kept a stopped process's screen for a replace watches for main's settlement. The
+ * callback runs once, for this exact process; the returned function stops watching.
+ */
+export function watchStoppedSwitchSource(
+  pane: { tabId: string; leafId: string; ptyId: string; incarnationId: string | null },
+  settle: () => void
+): () => void {
+  const key = keyOf(pane.tabId, pane.leafId)
+  const watcher = (): void => {
+    const source = sources.get(key)
+    if (
+      !source ||
+      source.ptyId !== pane.ptyId ||
+      (pane.incarnationId && source.incarnationId && source.incarnationId !== pane.incarnationId)
+    ) {
+      return
+    }
+    sources.delete(key)
+    watchers.delete(key)
+    settle()
+  }
+  watchers.set(key, watcher)
+  scheduleReconcile()
+  return () => {
+    if (watchers.get(key) === watcher) {
+      watchers.delete(key)
+    }
+  }
+}
+
+export function resetStoppedSwitchSourcesForTests(): void {
+  sources.clear()
+  watchers.clear()
+  unsubscribeStore?.()
+  unsubscribeStore = null
+}
diff --git a/src/renderer/src/hooks/ipc-events/mobile-terminal-close-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/mobile-terminal-close-ipc-bridge.ts
index 398b40d79916..058259d1ae4e 100644
--- a/src/renderer/src/hooks/ipc-events/mobile-terminal-close-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/mobile-terminal-close-ipc-bridge.ts
@@ -1,4 +1,5 @@
 import { createRuntimeFilePositionQueue } from './runtime-file-position'
+import { noteStoppedSwitchSource } from '@/components/terminal-pane/stopped-switch-sources'
 import { applyClosedTerminalLeafNotice } from '@/components/terminal-pane/closed-terminal-leaf-notice'
 import { closeTerminalTab } from '@/components/terminal/terminal-tab-actions'
 import { detectLanguage } from '@/lib/language-detect'
@@ -163,6 +164,10 @@ export function registerMobileAndTerminalCloseIpcBridge(
     })
   )
 
+  if (window.api.ui.onStoppedSwitchSource) {
+    unsubs.push(window.api.ui.onStoppedSwitchSource(noteStoppedSwitchSource))
+  }
+
   // Why: during an in-place renderer reload an older preload can linger; keep this listener additive at that seam.
   if (window.api.ui.onTerminalTabCloseRequest) {
     unsubs.push(
diff --git a/src/shared/stopped-switch-source.ts b/src/shared/stopped-switch-source.ts
new file mode 100644
index 000000000000..452fb519c46c
--- /dev/null
+++ b/src/shared/stopped-switch-source.ts
@@ -0,0 +1,10 @@
+/** One stopped switch source: the exact pane whose process a switch stopped and kept on screen. */
+export type StoppedSwitchSource = {
+  worktreeId: string
+  tabId: string
+  leafId: string
+  ptyId: string
+  incarnationId?: string
+  /** The chat a replace put in this tab's slot; the window settles the pane only once it has it. */
+  replacedBySessionId?: string
+}

From 96b28a198dfd193200a98501cc20d9bae0f764c1 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 17:16:27 -0700
Subject: [PATCH 136/207] Keep a stopped switch source stopped when it is shown
 again, and watch only its own slices

---
 .../deferred-session-reattach-choice.ts       |   4 +
 .../stopped-switch-source-exit.ts             |  31 +++-
 .../stopped-switch-source.test.ts             |  80 ++++++++-
 .../terminal-pane/stopped-switch-sources.ts   | 160 +++++++++++++-----
 4 files changed, 221 insertions(+), 54 deletions(-)

diff --git a/src/renderer/src/components/terminal-pane/pty-connection/deferred-session-reattach-choice.ts b/src/renderer/src/components/terminal-pane/pty-connection/deferred-session-reattach-choice.ts
index 119355120d43..7f4e2ce6a58a 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/deferred-session-reattach-choice.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/deferred-session-reattach-choice.ts
@@ -14,6 +14,7 @@ import {
   isSessionOwnedByWorktree
 } from './paired-parked-terminal-restore'
 import { startDeferredSessionReattachUnlessHiddenAgentResume } from './hidden-agent-resume-deferral'
+import { remountStoppedSwitchSource } from './stopped-switch-source-exit'
 
 import type { ConnectPanePtySession } from './connect-pane-pty-session'
 
@@ -28,6 +29,9 @@ export function runDeferredSessionReattachChoice(session: ConnectPanePtySession)
     session.deps.restoredLeafId && session.deps.restoredPtyIdByLeafId
       ? (session.deps.restoredPtyIdByLeafId[session.deps.restoredLeafId] ?? null)
       : null
+  if (remountStoppedSwitchSource(session, restoredPtyId)) {
+    return
+  }
   const storeSnapshot = useAppStore.getState()
   const existingPtyId = storeSnapshot.tabsByWorktree[session.deps.worktreeId]?.find(
     (t) => t.id === session.deps.tabId
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/stopped-switch-source-exit.ts b/src/renderer/src/components/terminal-pane/pty-connection/stopped-switch-source-exit.ts
index 1181783498f8..8b0c91fcac22 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/stopped-switch-source-exit.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/stopped-switch-source-exit.ts
@@ -1,4 +1,4 @@
-import { watchStoppedSwitchSource } from '../stopped-switch-sources'
+import { readStoppedSwitchSource, watchStoppedSwitchSource } from '../stopped-switch-sources'
 import type { ConnectPanePtySession } from './connect-pane-pty-session'
 
 /**
@@ -9,16 +9,12 @@ import type { ConnectPanePtySession } from './connect-pane-pty-session'
 export function holdClosingExit(
   session: ConnectPanePtySession,
   ptyId: string,
-  exitCode: number
+  exitCode: number,
+  incarnationId: string | null = session.inputModeOwnerIncarnationId ?? null
 ): void {
   session.stopWatchingStoppedSwitchSource?.()
   session.stopWatchingStoppedSwitchSource = watchStoppedSwitchSource(
-    {
-      tabId: session.deps.tabId,
-      leafId: session.pane.leafId,
-      ptyId,
-      incarnationId: session.inputModeOwnerIncarnationId ?? null
-    },
+    { tabId: session.deps.tabId, leafId: session.pane.leafId, ptyId, incarnationId, exitCode },
     () => {
       session.stopWatchingStoppedSwitchSource = null
       if (session.disposed || session.handledExitPtyId !== ptyId) {
@@ -35,3 +31,22 @@ export function holdClosingExit(
     }
   )
 }
+
+/**
+ * A pane remounting onto a process a switch stopped (its exit was handled before it was parked)
+ * has nothing to reattach: it stays stopped and takes main's settlement, as it would have mounted.
+ */
+export function remountStoppedSwitchSource(
+  session: ConnectPanePtySession,
+  ptyId: string | null
+): boolean {
+  const stopped = ptyId
+    ? readStoppedSwitchSource(session.deps.tabId, session.pane.leafId, ptyId)
+    : null
+  if (!ptyId || !stopped) {
+    return false
+  }
+  session.handledExitPtyId = ptyId
+  holdClosingExit(session, ptyId, stopped.exitCode, stopped.incarnationId)
+  return true
+}
diff --git a/src/renderer/src/components/terminal-pane/stopped-switch-source.test.ts b/src/renderer/src/components/terminal-pane/stopped-switch-source.test.ts
index 20b5aff98fe5..b28636be5d89 100644
--- a/src/renderer/src/components/terminal-pane/stopped-switch-source.test.ts
+++ b/src/renderer/src/components/terminal-pane/stopped-switch-source.test.ts
@@ -73,13 +73,14 @@ async function keptStoppedPane() {
     initialPtyId: ptyId,
     initialLeafId: pane.leafId
   })
+  const spawn = vi.fn(async () => ({ id: ptyId, incarnationId, isReattach: true }))
   const onExit = vi.fn<typeof window.api.pty.onExit>((listener) => {
     dispatchExit = listener
     return () => {}
   })
   const noop = (): (() => void) => () => {}
   Object.assign(window.api.pty, {
-    spawn: vi.fn(async () => ({ id: ptyId, incarnationId, isReattach: true })),
+    spawn,
     onData: noop,
     onExit,
     onReplay: noop,
@@ -121,6 +122,7 @@ async function keptStoppedPane() {
     transport,
     automaticClose,
     died,
+    spawn,
     source,
     stoppedForReplace: () =>
       exit({ id: ptyId, code: 0, incarnationId, preserveRendererBinding: 'closing' }),
@@ -248,3 +250,79 @@ it('settles a pane that was parked when main settled it, once it is shown', asyn
     kept.dispose()
   }
 })
+
+it('settles a pane parked after its exit when shown, without reattaching the stopped process', async () => {
+  const kept = await keptStoppedPane()
+  try {
+    kept.stoppedForReplace()
+    await flushAsyncTicks(5)
+    kept.park()
+    kept.modules.sources.noteStoppedSwitchSource(kept.source)
+    await flushAsyncTicks(5)
+    expect(kept.died).not.toHaveBeenCalled()
+    kept.spawn.mockClear()
+    await kept.reveal()
+    expect(kept.spawn).not.toHaveBeenCalled()
+    expect(kept.died).toHaveBeenCalledExactlyOnceWith(
+      expect.objectContaining({ paneId: kept.pane.id, exitCode: 0 })
+    )
+    expect(kept.automaticClose).not.toHaveBeenCalled()
+  } finally {
+    kept.dispose()
+  }
+})
+
+it('does no settlement work for store writes outside the held pane, however many', async () => {
+  const kept = await keptStoppedPane()
+  try {
+    kept.stoppedForReplace()
+    kept.park()
+    kept.modules.sources.noteStoppedSwitchSource({
+      ...kept.source,
+      replacedBySessionId: 'session-1'
+    })
+    await flushAsyncTicks(5)
+    const { getStoppedSwitchSourceReconcileCountForTests: reconciles } = kept.modules.sources
+    const unrelatedWrites = async (count: number): Promise<number> => {
+      const before = reconciles()
+      for (let i = 0; i < count; i += 1) {
+        const state = kept.store.getState()
+        kept.store.setState({
+          terminalLayoutsByTabId: {
+            ...state.terminalLayoutsByTabId,
+            [`other-tab-${i}`]: state.terminalLayoutsByTabId[kept.tab.id]!
+          },
+          unifiedTabsByWorktree: {
+            ...state.unifiedTabsByWorktree,
+            'other-worktree': [
+              ...(state.unifiedTabsByWorktree['other-worktree'] ?? []),
+              { ...state.unifiedTabsByWorktree[kept.source.worktreeId]![0]!, id: `other-${i}` }
+            ]
+          }
+        })
+        await flushAsyncTicks(1)
+      }
+      return reconciles() - before
+    }
+    expect(await unrelatedWrites(20)).toBe(0)
+    expect(await unrelatedWrites(200)).toBe(0)
+    // A write to the pane's own slice still settles it once it is shown.
+    const state = kept.store.getState()
+    const tabs = state.unifiedTabsByWorktree[kept.source.worktreeId] ?? []
+    kept.store.setState({
+      unifiedTabsByWorktree: {
+        ...state.unifiedTabsByWorktree,
+        [kept.source.worktreeId]: [
+          ...tabs,
+          { ...tabs[0]!, id: 'chat-tab', entityId: 'session-1', contentType: 'agent-session' }
+        ]
+      }
+    })
+    await flushAsyncTicks(5)
+    expect(reconciles()).toBeGreaterThan(0)
+    await kept.reveal()
+    expect(kept.died).toHaveBeenCalledOnce()
+  } finally {
+    kept.dispose()
+  }
+})
diff --git a/src/renderer/src/components/terminal-pane/stopped-switch-sources.ts b/src/renderer/src/components/terminal-pane/stopped-switch-sources.ts
index 2fecdbc2c8fa..9804bfbcff9c 100644
--- a/src/renderer/src/components/terminal-pane/stopped-switch-sources.ts
+++ b/src/renderer/src/components/terminal-pane/stopped-switch-sources.ts
@@ -1,43 +1,90 @@
 import { useAppStore } from '@/store'
+import type { AppState } from '@/store/types'
 import type { StoppedSwitchSource } from '../../../../shared/stopped-switch-source'
 
 /**
- * Main's word that a switch stopped this exact pane's process and no replace removed it. Held per
- * leaf only while that leaf still shows that process, so a closed, rebound or successor pane
- * drops it; a pane that is parked when it arrives takes it when it mounts.
+ * A pane whose process a switch stopped for a replace, and main's word that no replace removed it.
+ * Both are held per leaf only while that leaf still shows that process, so a closed, rebound or
+ * successor pane drops them; module memory, so nothing outlives the window. The stopped fact is
+ * kept apart from the mounted pane, so a pane parked before or after its exit takes the settlement
+ * when it is shown again.
  */
-const sources = new Map<string, StoppedSwitchSource>()
-const watchers = new Map<string, () => void>()
+type StoppedPane = { ptyId: string; incarnationId: string | null; exitCode: number }
+type Entry = {
+  tabId: string
+  leafId: string
+  stopped?: StoppedPane
+  notice?: StoppedSwitchSource
+  watcher?: () => void
+}
+
+const entries = new Map<string, Entry>()
 let unsubscribeStore: (() => void) | null = null
+let reconcileCount = 0
 
 const keyOf = (tabId: string, leafId: string): string => `${tabId}:${leafId}`
 
-function stillShown(source: StoppedSwitchSource): boolean {
-  const layout = useAppStore.getState().terminalLayoutsByTabId[source.tabId]
-  return layout?.ptyIdsByLeafId?.[source.leafId] === source.ptyId
+function entryFor(tabId: string, leafId: string): Entry {
+  const key = keyOf(tabId, leafId)
+  let entry = entries.get(key)
+  if (!entry) {
+    entry = { tabId, leafId }
+    entries.set(key, entry)
+  }
+  return entry
+}
+
+function shownPtyId(state: AppState, tabId: string, leafId: string): string | undefined {
+  return state.terminalLayoutsByTabId[tabId]?.ptyIdsByLeafId?.[leafId]
 }
 
 /** A switch that put a chat in this tab's slot settles only once that chat is here: by then the
  *  replace's own pass has closed the tab, so a successful switch never shows the exited state. */
-function replaceSettled(source: StoppedSwitchSource): boolean {
-  const { replacedBySessionId } = source
+function replaceSettled(state: AppState, notice: StoppedSwitchSource): boolean {
+  const { replacedBySessionId } = notice
   return (
     !replacedBySessionId ||
-    (useAppStore.getState().unifiedTabsByWorktree[source.worktreeId] ?? []).some(
+    (state.unifiedTabsByWorktree[notice.worktreeId] ?? []).some(
       (tab) => tab.contentType === 'agent-session' && tab.entityId === replacedBySessionId
     )
   )
 }
 
+function settles(state: AppState, entry: Entry): boolean {
+  const { stopped, notice } = entry
+  return Boolean(
+    stopped &&
+    notice &&
+    notice.ptyId === stopped.ptyId &&
+    !(
+      stopped.incarnationId &&
+      notice.incarnationId &&
+      notice.incarnationId !== stopped.incarnationId
+    ) &&
+    replaceSettled(state, notice)
+  )
+}
+
 function reconcile(): void {
-  for (const [key, source] of sources) {
-    if (!stillShown(source)) {
-      sources.delete(key)
-    } else if (replaceSettled(source)) {
-      watchers.get(key)?.()
+  reconcileCount += 1
+  const state = useAppStore.getState()
+  for (const [key, entry] of entries) {
+    const shown = shownPtyId(state, entry.tabId, entry.leafId)
+    if (entry.stopped && entry.stopped.ptyId !== shown) {
+      entry.stopped = undefined
+    }
+    if (entry.notice && entry.notice.ptyId !== shown) {
+      entry.notice = undefined
+    }
+    if (!entry.stopped && !entry.notice) {
+      entries.delete(key)
+    } else if (entry.watcher && settles(state, entry)) {
+      const settle = entry.watcher
+      entries.delete(key)
+      settle()
     }
   }
-  if (sources.size === 0) {
+  if (entries.size === 0) {
     unsubscribeStore?.()
     unsubscribeStore = null
   }
@@ -56,49 +103,72 @@ function scheduleReconcile(): void {
   })
 }
 
-export function noteStoppedSwitchSource(source: StoppedSwitchSource): void {
-  if (!stillShown(source)) {
-    return
+/** Only writes to the slices an entry reads can change its outcome; every other write is ignored. */
+function onStoreWrite(state: AppState, prev: AppState): void {
+  for (const entry of entries.values()) {
+    if (
+      state.terminalLayoutsByTabId[entry.tabId] !== prev.terminalLayoutsByTabId[entry.tabId] ||
+      (entry.notice?.replacedBySessionId &&
+        state.unifiedTabsByWorktree[entry.notice.worktreeId] !==
+          prev.unifiedTabsByWorktree[entry.notice.worktreeId])
+    ) {
+      scheduleReconcile()
+      return
+    }
   }
-  sources.set(keyOf(source.tabId, source.leafId), source)
-  unsubscribeStore ??= useAppStore.subscribe(scheduleReconcile)
+}
+
+function track(): void {
+  unsubscribeStore ??= useAppStore.subscribe(onStoreWrite)
   scheduleReconcile()
 }
 
+export function noteStoppedSwitchSource(notice: StoppedSwitchSource): void {
+  if (shownPtyId(useAppStore.getState(), notice.tabId, notice.leafId) !== notice.ptyId) {
+    return
+  }
+  entryFor(notice.tabId, notice.leafId).notice = notice
+  track()
+}
+
 /**
- * A pane that kept a stopped process's screen for a replace watches for main's settlement. The
- * callback runs once, for this exact process; the returned function stops watching.
+ * A pane that kept a stopped process's screen for a replace records that fact and watches for
+ * main's settlement. The callback runs once, for this exact process; the returned function stops
+ * watching but keeps the fact, so the pane takes the settlement when it is shown again.
  */
 export function watchStoppedSwitchSource(
-  pane: { tabId: string; leafId: string; ptyId: string; incarnationId: string | null },
+  pane: { tabId: string; leafId: string } & StoppedPane,
   settle: () => void
 ): () => void {
-  const key = keyOf(pane.tabId, pane.leafId)
-  const watcher = (): void => {
-    const source = sources.get(key)
-    if (
-      !source ||
-      source.ptyId !== pane.ptyId ||
-      (pane.incarnationId && source.incarnationId && source.incarnationId !== pane.incarnationId)
-    ) {
-      return
-    }
-    sources.delete(key)
-    watchers.delete(key)
-    settle()
-  }
-  watchers.set(key, watcher)
-  scheduleReconcile()
+  const entry = entryFor(pane.tabId, pane.leafId)
+  entry.stopped = { ptyId: pane.ptyId, incarnationId: pane.incarnationId, exitCode: pane.exitCode }
+  const watcher = (): void => settle()
+  entry.watcher = watcher
+  track()
   return () => {
-    if (watchers.get(key) === watcher) {
-      watchers.delete(key)
+    if (entry.watcher === watcher) {
+      entry.watcher = undefined
     }
   }
 }
 
+/** The stopped process a remounting leaf still shows, if a switch stopped it: nothing to reattach. */
+export function readStoppedSwitchSource(
+  tabId: string,
+  leafId: string,
+  ptyId: string
+): StoppedPane | null {
+  const stopped = entries.get(keyOf(tabId, leafId))?.stopped
+  return stopped?.ptyId === ptyId ? stopped : null
+}
+
+export function getStoppedSwitchSourceReconcileCountForTests(): number {
+  return reconcileCount
+}
+
 export function resetStoppedSwitchSourcesForTests(): void {
-  sources.clear()
-  watchers.clear()
+  entries.clear()
+  reconcileCount = 0
   unsubscribeStore?.()
   unsubscribeStore = null
 }

From 203689d075f3449d3f7984054e82f28d9a37dae6 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 17:16:29 -0700
Subject: [PATCH 137/207] Test that a switch's deadline settles its stopped
 source

---
 ...red-agent-session-switch-execution.test.ts | 79 +++++++++++++++++--
 1 file changed, 73 insertions(+), 6 deletions(-)

diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
index accf8def515f..8618dda3a2c4 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
@@ -24,6 +24,7 @@ import {
   LEAF_B
 } from '../../main-owned-workspace-runtime-fixture'
 import { executeStructuredSessionSwitch } from './structured-agent-session-switch-execution'
+import { AGENT_SESSION_SWITCH_HOST_MS } from '../../../../shared/agent-session-switch-execution'
 import { DaemonRequestTimeoutError } from '../../../daemon/daemon-errors'
 import { chatTabId } from '../../agent-session/agent-session-tab-layout'
 import { ClaimedAgentPtyOwnerRegistry } from '../../../../shared/claimed-agent-pty-owner'
@@ -501,11 +502,17 @@ it('re-issuing a switch whose first answer was lost adopts the terminal it start
 })
 
 /** A whole-tab terminal→chat switch whose stop keeps the pane for the replace; records main's settlements. */
-async function switchFromKeptTerminal(
-  options: {
-    afterStop?: (runtime: ReturnType<typeof setupMainOwnedWorkspace>['runtime']) => Promise<void>
-  } = {}
-) {
+async function switchFromKeptTerminal(options: KeptTerminalSwitchOptions = {}) {
+  const started = startSwitchFromKeptTerminal(options)
+  return { ...started, result: await started.result }
+}
+
+type KeptTerminalSwitchOptions = {
+  beforeStop?: () => Promise<void>
+  afterStop?: (runtime: ReturnType<typeof setupMainOwnedWorkspace>['runtime']) => Promise<void>
+}
+
+function startSwitchFromKeptTerminal(options: KeptTerminalSwitchOptions = {}) {
   const { runtime } = setupMainOwnedWorkspace()
   const incarnationId = '11111111-1111-4111-8111-111111111111'
   runtime.registerPty(PTY_A, WORKTREE_ID, null, { tabId: TAB_ID, leafId: LEAF_A, incarnationId })
@@ -531,13 +538,14 @@ async function switchFromKeptTerminal(
     write: () => true,
     kill: () => false,
     stopAndWait: async () => {
+      await options.beforeStop?.()
       await runtime.onPtyExit(PTY_A, 0, incarnationId, { hostExitConfirmed: true })
       await options.afterStop?.(runtime)
       return true
     },
     getForegroundProcess: async () => null
   })
-  const result = await executeStructuredSessionSwitch(
+  const result = executeStructuredSessionSwitch(
     {
       sessionId: id,
       execution: {
@@ -608,3 +616,62 @@ it('settles a replaced source naming its chat, so the window waits for that repl
   expect(result).toEqual({ status: 'completed', sessionId: id })
   expect(settled).toHaveBeenCalledExactlyOnceWith({ ...stoppedSource, replacedBySessionId: id })
 })
+
+function holdUntilReleased() {
+  let release = (): void => {}
+  const held = new Promise<void>((resolve) => {
+    release = resolve
+  })
+  return { held, release }
+}
+
+it('settles a kept source once at the deadline while work after the stop is still running', async () => {
+  await savedTranscript()
+  const prepare = vi.mocked(cliTranscript.prepareStructuredChatCliTranscript)
+  const readable = await prepare.getMockImplementation()!(
+    undefined as never,
+    undefined as never,
+    false
+  )
+  const work = holdUntilReleased()
+  prepare.mockReset()
+  prepare.mockResolvedValueOnce(readable).mockImplementation(async () => {
+    await work.held
+    return readable
+  })
+  vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] })
+  try {
+    const { result, settled, stoppedSource } = startSwitchFromKeptTerminal()
+    await vi.advanceTimersByTimeAsync(0)
+    expect(settled).not.toHaveBeenCalled()
+    await vi.advanceTimersByTimeAsync(AGENT_SESSION_SWITCH_HOST_MS)
+    expect(await result).toMatchObject({ refusal: { details: { reason: 'operationExpired' } } })
+    expect(settled).toHaveBeenCalledExactlyOnceWith(stoppedSource)
+    work.release()
+    await vi.advanceTimersByTimeAsync(0)
+    expect(settled).toHaveBeenCalledOnce()
+  } finally {
+    work.release()
+    vi.useRealTimers()
+  }
+})
+
+it('settles a kept source at once when its stop is proven only after the deadline', async () => {
+  await savedTranscript()
+  const stop = holdUntilReleased()
+  vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] })
+  try {
+    const { result, settled, stoppedSource } = startSwitchFromKeptTerminal({
+      beforeStop: () => stop.held
+    })
+    await vi.advanceTimersByTimeAsync(AGENT_SESSION_SWITCH_HOST_MS)
+    expect(await result).toMatchObject({ refusal: { details: { reason: 'operationExpired' } } })
+    expect(settled).not.toHaveBeenCalled()
+    stop.release()
+    await vi.advanceTimersByTimeAsync(0)
+    expect(settled).toHaveBeenCalledExactlyOnceWith(stoppedSource)
+  } finally {
+    stop.release()
+    vi.useRealTimers()
+  }
+})

From 409dc3297f6f99893e115ba2f68bf4aba525704f Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 17:24:54 -0700
Subject: [PATCH 138/207] Settle a stopped pane when an addressed close cannot
 retire its tab

---
 ...red-agent-session-switch-execution.test.ts | 37 +++++++++++++++----
 .../explicit-terminal-close-stops.ts          |  8 +++-
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
index 8618dda3a2c4..4019389a54a3 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
@@ -512,7 +512,8 @@ type KeptTerminalSwitchOptions = {
   afterStop?: (runtime: ReturnType<typeof setupMainOwnedWorkspace>['runtime']) => Promise<void>
 }
 
-function startSwitchFromKeptTerminal(options: KeptTerminalSwitchOptions = {}) {
+/** A whole-tab terminal whose stop keeps the pane; records main's settlements for it. */
+function keptSourceTerminal(options: KeptTerminalSwitchOptions = {}) {
   const { runtime } = setupMainOwnedWorkspace()
   const incarnationId = '11111111-1111-4111-8111-111111111111'
   runtime.registerPty(PTY_A, WORKTREE_ID, null, { tabId: TAB_ID, leafId: LEAF_A, incarnationId })
@@ -545,6 +546,24 @@ function startSwitchFromKeptTerminal(options: KeptTerminalSwitchOptions = {}) {
     },
     getForegroundProcess: async () => null
   })
+  const stoppedSource = {
+    worktreeId: WORKTREE_ID,
+    tabId: TAB_ID,
+    leafId: LEAF_A,
+    ptyId: PTY_A,
+    incarnationId
+  }
+  return {
+    runtime,
+    source: { ...source, presentation: source.presentation },
+    incarnationId,
+    settled,
+    stoppedSource
+  }
+}
+
+function startSwitchFromKeptTerminal(options: KeptTerminalSwitchOptions = {}) {
+  const { runtime, source, incarnationId, settled, stoppedSource } = keptSourceTerminal(options)
   const result = executeStructuredSessionSwitch(
     {
       sessionId: id,
@@ -560,13 +579,6 @@ function startSwitchFromKeptTerminal(options: KeptTerminalSwitchOptions = {}) {
     { runtime },
     'chat'
   )
-  const stoppedSource = {
-    worktreeId: WORKTREE_ID,
-    tabId: TAB_ID,
-    leafId: LEAF_A,
-    ptyId: PTY_A,
-    incarnationId
-  }
   return { result, settled, stoppedSource }
 }
 
@@ -675,3 +687,12 @@ it('settles a kept source at once when its stop is proven only after the deadlin
     vi.useRealTimers()
   }
 })
+
+it('settles a kept source once when an addressed close stops it but cannot retire its tab', async () => {
+  const { runtime, source, incarnationId, settled, stoppedSource } = keptSourceTerminal()
+  vi.spyOn(runtime, 'closeMobileSessionTab').mockResolvedValue({ refused: true } as never)
+  await expect(
+    runtime.closeTerminal(source.handle, incarnationId, source.presentation)
+  ).rejects.toThrow('terminal_pane_close_failed')
+  expect(settled).toHaveBeenCalledExactlyOnceWith(stoppedSource)
+})
diff --git a/src/main/runtime/session-tabs/explicit-terminal-close-stops.ts b/src/main/runtime/session-tabs/explicit-terminal-close-stops.ts
index 197d662ff346..02c75e59de66 100644
--- a/src/main/runtime/session-tabs/explicit-terminal-close-stops.ts
+++ b/src/main/runtime/session-tabs/explicit-terminal-close-stops.ts
@@ -96,7 +96,13 @@ export abstract class OrcaRuntimeWithStopExplicitlyClosedTabPtys extends OrcaRun
         throw new Error('terminal_tab_pinned')
       }
       await captured.stop()
-      return captured.retire()
+      try {
+        return await captured.retire()
+      } catch (error) {
+        // The stopped pane stays; the window shows it exited rather than waiting on a replace.
+        captured.settleStoppedSource()
+        throw error
+      }
     }
 
     if (incarnation && pty?.pty.incarnationId !== incarnation) {

From 110eeb34ec3b5e6c6477eca83d3012e2af5e10ed Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 17:45:34 -0700
Subject: [PATCH 139/207] Restore what the merge dropped: the seed-options
 import and the menu test's confirmation provider

---
 .../session-tabs/structured-session-create-support.ts     | 1 +
 .../src/components/tab-bar/tab-context-menu.test.tsx      | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/runtime/session-tabs/structured-session-create-support.ts b/src/main/runtime/session-tabs/structured-session-create-support.ts
index 4af15d864b3c..1cd82a2bd757 100644
--- a/src/main/runtime/session-tabs/structured-session-create-support.ts
+++ b/src/main/runtime/session-tabs/structured-session-create-support.ts
@@ -20,6 +20,7 @@ import {
 } from '../structured-agent-launch-support'
 import { structuredAgentRuntimeMetadata } from '../structured-agent-runtime-metadata'
 import { structuredAgentChatProgramNeedsInstall } from '../structured-agent-availability'
+import { structuredLaunchSeedOptions } from '../../../shared/native-chat/input/native-chat-session-option-defaults'
 import { hasPersistedStructuredAgentSessionStore as hasPersistedStructuredAgentSessionStoreOnDisk } from '../structured-agent-session-runtime'
 import { ensureStructuredAgentSessionHostUnlessRefused } from '../structured-agent-session-host-refusal'
 import { getProfileUserDataPath } from '../../orca-profiles/profile-storage-paths'
diff --git a/src/renderer/src/components/tab-bar/tab-context-menu.test.tsx b/src/renderer/src/components/tab-bar/tab-context-menu.test.tsx
index b713f46b0685..19fbaba48ab9 100644
--- a/src/renderer/src/components/tab-bar/tab-context-menu.test.tsx
+++ b/src/renderer/src/components/tab-bar/tab-context-menu.test.tsx
@@ -6,6 +6,7 @@ import { SortableContext } from '@dnd-kit/sortable'
 import { afterEach, expect, it, vi } from 'vitest'
 import { useAppStore } from '@/store'
 import { TooltipProvider } from '../ui/tooltip'
+import { ConfirmationDialogProvider } from '../confirmation-dialog'
 import BrowserTab from './BrowserTab'
 import EditorFileTab from './EditorFileTab'
 import SortableTab from './SortableTab'
@@ -220,7 +221,12 @@ async function mount(kind: Kind = 'browser', workspace = GIT_KEY, singleton = fa
   frames.start()
   stopFrames = () => frames.close()
   await settle()
-  return render(<Harness kind={kind} singleton={singleton} />)
+  // The app renders tab menus inside the confirmation provider; the chat switch items ask through it.
+  return render(
+    <ConfirmationDialogProvider>
+      <Harness kind={kind} singleton={singleton} />
+    </ConfirmationDialogProvider>
+  )
 }
 function source(): HTMLElement {
   const element = document.querySelector(`[data-tab-id="${ENTITY}"]`)

From 2b94b3b873bf4b5672904cd903b9ca859bf5c4a4 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 17:45:36 -0700
Subject: [PATCH 140/207] Let a newer tab choice keep the selection while a
 switch waits for its host

---
 ...tructured-agent-session-provisional-tab.ts | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/renderer/src/lib/agent-session/structured-agent-session-provisional-tab.ts b/src/renderer/src/lib/agent-session/structured-agent-session-provisional-tab.ts
index 433331d27e2a..dfc57c95e668 100644
--- a/src/renderer/src/lib/agent-session/structured-agent-session-provisional-tab.ts
+++ b/src/renderer/src/lib/agent-session/structured-agent-session-provisional-tab.ts
@@ -5,6 +5,7 @@ import {
 import { nativeChatDraftPositions } from '@/components/native-chat/native-chat-composer-draft-memory'
 import { structuredAgentSessionTabId } from '../../../../shared/structured-agent-session-projection'
 import { afterPendingTab } from '@/runtime/layout-owner-pending-tabs'
+import { resolveWebSessionVisibleTabId } from '@/runtime/web-session-focus-intent'
 import type { NativeChatComposerFocusIntent } from '@/components/native-chat/use-native-chat-composer-reveal-focus'
 import type {
   AgentSessionLaunchPlan,
@@ -146,6 +147,10 @@ export function beginStructuredAgentSessionProvisionalLaunch(
         )
       }
     }
+    // A deferred launch's slot and its claim on the selection are both the user's at the action.
+    const visibleAtAction = args.deferPublication
+      ? resolveWebSessionVisibleTabId(useAppStore.getState(), worktreeId)
+      : undefined
     if (args.deferPublication && !args.target?.surfaceAddress) {
       args = {
         ...args,
@@ -161,8 +166,16 @@ export function beginStructuredAgentSessionProvisionalLaunch(
       worktreeId,
       executionHostId: owner.executionHostId,
       target: owner.target,
-      openAdmitted: (seedOptions) =>
-        open(
+      openAdmitted: (seedOptions) => {
+        // The host can answer after the user picked another tab; their newer selection wins.
+        if (
+          args.deferPublication &&
+          resolveWebSessionVisibleTabId(useAppStore.getState(), worktreeId) !== visibleAtAction
+        ) {
+          focusIntent?.cancel()
+          args = { ...args, activate: false }
+        }
+        return open(
           beginLocalProvisionalLaunch({
             ...args,
             target: {
@@ -173,7 +186,8 @@ export function beginStructuredAgentSessionProvisionalLaunch(
             },
             beforeOpen: undefined
           })
-        ),
+        )
+      },
       onHostDeclined: (target) => openDeclinedTerminal(args, worktreeId, target),
       ...(args.declinedOpensCallerSurface ? { declinedOpensCallerSurface: true as const } : {})
     })

From 00b0344c844ae26ccf72fa6adeb45b53000dcf1f Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 17:46:59 -0700
Subject: [PATCH 141/207] Release a switched worker by its session, and stub
 startup frames where they now live

---
 src/main/runtime/orchestration/structured-worker-switch-stop.ts | 2 +-
 src/renderer/src/components/tab-bar/tab-context-menu.test.tsx   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/runtime/orchestration/structured-worker-switch-stop.ts b/src/main/runtime/orchestration/structured-worker-switch-stop.ts
index e3e35ea3d00f..990a79510caf 100644
--- a/src/main/runtime/orchestration/structured-worker-switch-stop.ts
+++ b/src/main/runtime/orchestration/structured-worker-switch-stop.ts
@@ -48,7 +48,7 @@ export function captureStructuredWorkerSwitchStop(
         }
       }
     } finally {
-      releaseStructuredWorkerSession(dispatchId, runtime, identity.sessionId)
+      releaseStructuredWorkerSession(identity.sessionId, runtime)
     }
   }
 }
diff --git a/src/renderer/src/components/tab-bar/tab-context-menu.test.tsx b/src/renderer/src/components/tab-bar/tab-context-menu.test.tsx
index 19fbaba48ab9..5fdd36d426e1 100644
--- a/src/renderer/src/components/tab-bar/tab-context-menu.test.tsx
+++ b/src/renderer/src/components/tab-bar/tab-context-menu.test.tsx
@@ -40,7 +40,7 @@ vi.mock('@/runtime/runtime-layout-client', async (original) =>
     await import('@/runtime/layout-apply-test-transport.test-fixture')
   ).runtimeLayoutClientWithTestFrames(await original())
 )
-vi.mock('@/runtime/workspace-layout-frame-sync', async (original) => ({
+vi.mock('@/runtime/workspace-layout-frame-startup', async (original) => ({
   ...(await original<object>()),
   showStartupLayoutFrames: () => {}
 }))

From 447fc0fd13ad12e6f3442560cc4cfa675c7d6c7e Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 18:13:45 -0700
Subject: [PATCH 142/207] Keep the tab menu's terminal copy for chats that
 cannot switch in place

---
 .../tab-bar/NativeChatCliForkMenuItems.tsx    | 65 +++++++++++++++++--
 .../TabSessionSurfaceSwitchMenuItems.test.tsx | 17 +++--
 2 files changed, 71 insertions(+), 11 deletions(-)

diff --git a/src/renderer/src/components/tab-bar/NativeChatCliForkMenuItems.tsx b/src/renderer/src/components/tab-bar/NativeChatCliForkMenuItems.tsx
index c401d71a2c59..4f938863a760 100644
--- a/src/renderer/src/components/tab-bar/NativeChatCliForkMenuItems.tsx
+++ b/src/renderer/src/components/tab-bar/NativeChatCliForkMenuItems.tsx
@@ -1,3 +1,4 @@
+import { useState } from 'react'
 import { useConfirmationDialog } from '@/components/confirmation-dialog-context'
 import {
   useConversationSwitchReadiness,
@@ -10,22 +11,37 @@ import { AI_VAULT_AGENTS } from '../../../../shared/ai-vault-types'
 import { AiVaultSessionSurfaceSwitchMenuItems } from '../right-sidebar/AiVaultSessionSurfaceSwitchMenuItems'
 import {
   resolveNativeChatCliForkIdentity,
+  resolveTabSessionHistorySubject,
   type NativeChatTabSession
 } from './tab-session-history-switch'
+import { runNativeChatCliFork, useNativeChatCliForkPending } from './native-chat-cli-fork-run'
 import { inPlaceSwitchEnabled } from '../../../../shared/structured-agent-cli-conversation-adoption'
 
+type NativeChatCliMenuItemsProps = {
+  tab: { id: string; worktreeId: string }
+  nativeChat: NativeChatTabSession
+  leadingSeparator: boolean
+  onComplete?: () => void
+}
+
+/** An agent that switches in place moves the conversation; any other agent opens a copy in its CLI. */
+export function NativeChatCliForkMenuItems(
+  props: NativeChatCliMenuItemsProps
+): React.JSX.Element | null {
+  return inPlaceSwitchEnabled(props.nativeChat.agent) ? (
+    <NativeChatCliSwitchMenuItems {...props} />
+  ) : (
+    <NativeChatCliCopyMenuItems {...props} />
+  )
+}
+
 /** Every supported chat switch uses the same consent and owning-host command. */
-export function NativeChatCliForkMenuItems({
+function NativeChatCliSwitchMenuItems({
   tab,
   nativeChat,
   leadingSeparator,
   onComplete
-}: {
-  tab: { id: string; worktreeId: string }
-  nativeChat: NativeChatTabSession
-  leadingSeparator: boolean
-  onComplete?: () => void
-}): React.JSX.Element | null {
+}: NativeChatCliMenuItemsProps): React.JSX.Element | null {
   const chat = useAppStore(
     useShallow((state) => resolveNativeChatCliForkIdentity(state, { tab, nativeChat }))
   )
@@ -73,3 +89,38 @@ export function NativeChatCliForkMenuItems({
     </>
   )
 }
+
+function NativeChatCliCopyMenuItems({
+  tab,
+  nativeChat,
+  leadingSeparator,
+  onComplete
+}: NativeChatCliMenuItemsProps): React.JSX.Element | null {
+  const [subject] = useState(() =>
+    resolveTabSessionHistorySubject(useAppStore.getState(), { tab, nativeChat })
+  )
+  const chat = subject?.kind === 'chat' ? subject : null
+  const pending = useNativeChatCliForkPending(
+    chat ? { executionHostScope: chat.request.executionHostScope, sessionId: chat.sessionId } : null
+  )
+  const commandOverrides = useAppStore((state) => state.settings?.agentCmdOverrides)
+  const agent = AI_VAULT_AGENTS.find((candidate) => candidate === nativeChat.agent)
+  if (!chat || !agent) {
+    return null
+  }
+  return (
+    <>
+      {leadingSeparator ? <ContextMenuSeparator /> : null}
+      <AiVaultSessionSurfaceSwitchMenuItems
+        action="switch"
+        menuKind="context"
+        tooltipSide="right"
+        cliPending={pending}
+        onResumeInNewCli={(event) => {
+          event.preventDefault()
+          void runNativeChatCliFork({ subject: chat, tab, agent, commandOverrides, onComplete })
+        }}
+      />
+    </>
+  )
+}
diff --git a/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx b/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx
index 5a1aa768664b..3c50b6c124e7 100644
--- a/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx
+++ b/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx
@@ -93,7 +93,7 @@ beforeEach(() => {
 
 afterEach(cleanup)
 
-function renderItemsNow(structuredSessionId?: string): void {
+function renderItemsNow(structuredSessionId?: string, agent = 'claude'): void {
   render(
     <TooltipProvider>
       <ContextMenu>
@@ -101,9 +101,7 @@ function renderItemsNow(structuredSessionId?: string): void {
         <ContextMenuContent>
           <TabSessionSurfaceSwitchMenuItems
             tab={{ id: 'tab-1', worktreeId: 'wt-1' }}
-            nativeChat={
-              structuredSessionId ? { sessionId: structuredSessionId, agent: 'claude' } : undefined
-            }
+            nativeChat={structuredSessionId ? { sessionId: structuredSessionId, agent } : undefined}
             leadingSeparator
           />
         </ContextMenuContent>
@@ -141,6 +139,17 @@ describe('TabSessionSurfaceSwitchMenuItems', () => {
     )
   })
 
+  it('keeps the copy-in-a-new-terminal item for a chat agent that cannot switch in place', async () => {
+    mocks.subject = CHAT_SUBJECT
+    renderItemsNow('orca-chat-1', 'omp')
+    expect(screen.queryByRole('menuitem', { name: 'Switch to CLI' })).toBeNull()
+    fireEvent.click(screen.getByRole('menuitem'))
+    expect(mocks.runNativeChatCliFork).toHaveBeenCalledWith(
+      expect.objectContaining({ subject: CHAT_SUBJECT, agent: 'omp' })
+    )
+    expect(mocks.runNativeChatCliSwitch).not.toHaveBeenCalled()
+  })
+
   it('offers and dispatches a CLI identity while History never answers', async () => {
     const source = {
       tabId: 'tab-1',

From 8fa64aa8d719886a4bf2c0b7dfd3d57c3e7c3ef3 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 18:57:17 -0700
Subject: [PATCH 143/207] Type the switch against main's current shapes

---
 src/main/runtime/session-tabs/switch-terminal-placement.ts  | 1 -
 src/preload/api/ui-command-event-api.ts                     | 2 ++
 src/renderer/src/lib/conversation-surface-switch.ts         | 4 ++--
 .../web-session-tabs-sync/apply-preparation-groups.ts       | 6 ++++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/runtime/session-tabs/switch-terminal-placement.ts b/src/main/runtime/session-tabs/switch-terminal-placement.ts
index 40507d8bfa56..83fc685ea58c 100644
--- a/src/main/runtime/session-tabs/switch-terminal-placement.ts
+++ b/src/main/runtime/session-tabs/switch-terminal-placement.ts
@@ -6,7 +6,6 @@ import type { LayoutCommandRunOptions, WindowLayoutCommand } from '../runtime-la
 import { OrcaRuntimeWithPublishPtyBackedMobileSessionTerminal } from './pty-backed-session-publication'
 
 export abstract class OrcaRuntimeWithSwitchTerminalPlacement extends OrcaRuntimeWithPublishPtyBackedMobileSessionTerminal {
-  protected abstract getAvailableAuthoritativeWindow(): unknown
   abstract applyLayoutCommand(
     command: WindowLayoutCommand,
     options?: LayoutCommandRunOptions
diff --git a/src/preload/api/ui-command-event-api.ts b/src/preload/api/ui-command-event-api.ts
index 08ab1d545441..810bedd95214 100644
--- a/src/preload/api/ui-command-event-api.ts
+++ b/src/preload/api/ui-command-event-api.ts
@@ -206,6 +206,8 @@ export type UiCommandEventApi = {
       splitFromLeafId?: string
       splitDirection?: 'horizontal' | 'vertical'
       splitTelemetrySource?: TerminalPaneSplitSource
+      /** The tab this terminal takes the slot of, closed in the same store write. */
+      replaces?: { tabId: string }
     }) => void
   ) => () => void
   onRequestTerminalCreate: (
diff --git a/src/renderer/src/lib/conversation-surface-switch.ts b/src/renderer/src/lib/conversation-surface-switch.ts
index 51b278cc6dda..840e3ac3e512 100644
--- a/src/renderer/src/lib/conversation-surface-switch.ts
+++ b/src/renderer/src/lib/conversation-surface-switch.ts
@@ -7,7 +7,7 @@ import {
   adoptsCliConversations
 } from '../../../shared/structured-agent-cli-conversation-adoption'
 import { toHostSessionPaneKey } from '../../../shared/terminal-surface-id'
-import { parseExecutionHostId } from '../../../shared/execution-host'
+import { parseExecutionHostId, type ExecutionHostId } from '../../../shared/execution-host'
 import { toast } from 'sonner'
 import { useAppStore } from '@/store'
 import {
@@ -157,7 +157,7 @@ export async function runConversationSwitch(args: ConversationSwitch): Promise<b
 /** The host call's identity and execution facts, captured after consent. */
 async function switchRequest(
   args: ConversationSwitch,
-  hostId: string,
+  hostId: ExecutionHostId,
   deadline: ReturnType<typeof agentSessionSwitchDeadline>
 ): Promise<{ sessionId: string | undefined; execution: Record<string, unknown> }> {
   const invocationId = createBrowserUuid()
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-groups.ts b/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-groups.ts
index f57ede76f4b5..bfaacdfe863e 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-groups.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-groups.ts
@@ -204,9 +204,11 @@ export function prepareWebSessionTabsSnapshotGroups(
   // A row published in a replaced tab's slot lands where this client showed that tab, not at the end.
   let placedGroups = nextGroups
   for (const row of snapshot.tabs) {
+    // Only terminal and chat rows can name the tab they replaced.
+    const replaces = 'replaces' in row ? row.replaces : undefined
     const tabId =
-      row.replaces && hostToLocalTabId.get(row.type === 'terminal' ? row.parentTabId : row.id)
-    const replaced = row.replaces ? replacedLocalTabIds(row.replaces.tabId) : []
+      replaces && hostToLocalTabId.get(row.type === 'terminal' ? row.parentTabId : row.id)
+    const replaced = replaces ? replacedLocalTabIds(replaces.tabId) : []
     const slot = currentGroups.find((group) => group.tabOrder.some((id) => replaced.includes(id)))
     if (
       !tabId ||

From 8a99d89107f32bc7fe77f291b489b02520dc78a1 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 18:57:19 -0700
Subject: [PATCH 144/207] Report a row with no chat as not opened, as before
 the switch

---
 src/renderer/src/lib/activate-ai-vault-structured-session.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/renderer/src/lib/activate-ai-vault-structured-session.ts b/src/renderer/src/lib/activate-ai-vault-structured-session.ts
index eb07d069f1f5..4ce8e02fdc61 100644
--- a/src/renderer/src/lib/activate-ai-vault-structured-session.ts
+++ b/src/renderer/src/lib/activate-ai-vault-structured-session.ts
@@ -59,8 +59,9 @@ export async function activateAiVaultStructuredSession(
   target?: RuntimeClientTarget,
   onFailure?: () => void
 ): Promise<boolean> {
-  await activateAiVaultStructuredSessionVerified(session, deps, target, onFailure)
-  return true
+  return (
+    (await activateAiVaultStructuredSessionVerified(session, deps, target, onFailure)) !== 'none'
+  )
 }
 
 /** `activated` only when the chat's tab is really active; `reported` means the click's toast said why

From 39f2848689d1175b47f93c3da542be0db5457447 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 18:57:20 -0700
Subject: [PATCH 145/207] Bring the switch's tests in line with main and the
 redesign

---
 .../MobileNativeChatTurnStatus.test.ts        | 12 +++++--
 ...red-agent-session-switch-execution.test.ts | 35 +++++++++----------
 ...red-native-switch-physical.test-fixture.ts | 14 ++------
 .../native-chat/NativeChatPaneHeader.test.tsx | 17 +++++----
 ...tStructuredSession.retained-draft.test.tsx | 24 +++++++------
 .../ai-vault-account-native.test.tsx          |  6 +++-
 .../ai-vault-account-peer.test.tsx            |  6 +++-
 .../ai-vault-session-account-render.test.tsx  |  6 +++-
 .../tab-bar/cli-chat-resume-run.test.ts       |  1 -
 ...nt-launch-pane-verdict-application.test.ts |  2 +-
 .../src/lib/unified-tab-replace.test.ts       |  3 +-
 ...l-structured-session-replaced-slot.test.ts |  7 ++--
 .../replaced-slot-placement.test.ts           | 24 ++++++-------
 .../e2e/ai-vault-account-stream.unit.test.ts  |  6 +++-
 14 files changed, 90 insertions(+), 73 deletions(-)

diff --git a/mobile/src/session/native-chat/transcript/MobileNativeChatTurnStatus.test.ts b/mobile/src/session/native-chat/transcript/MobileNativeChatTurnStatus.test.ts
index 3c6ebd1a3d2a..25c4912b0c05 100644
--- a/mobile/src/session/native-chat/transcript/MobileNativeChatTurnStatus.test.ts
+++ b/mobile/src/session/native-chat/transcript/MobileNativeChatTurnStatus.test.ts
@@ -179,12 +179,18 @@ describe('MobileNativeChatTurnStatus', () => {
       expect(labels(mounted.root)).toEqual(['Interrumpido'])
       expect(vi.getTimerCount()).toBe(0)
       const clockReads = vi.spyOn(Date, 'now')
-      act(() => vi.advanceTimersByTime(12_000))
+      act(() => {
+        vi.advanceTimersByTime(12_000)
+      })
       changeAppState('background')
-      act(() => vi.advanceTimersByTime(60_000))
+      act(() => {
+        vi.advanceTimersByTime(60_000)
+      })
       expect(vi.getTimerCount()).toBe(0)
       changeAppState('active')
-      act(() => vi.advanceTimersByTime(12_000))
+      act(() => {
+        vi.advanceTimersByTime(12_000)
+      })
       expect(labels(mounted.root)).toEqual(['Interrumpido'])
       expect(vi.getTimerCount()).toBe(0)
       expect(clockReads).not.toHaveBeenCalled()
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
index 4019389a54a3..020e5648d1b7 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
@@ -24,6 +24,8 @@ import {
   LEAF_B
 } from '../../main-owned-workspace-runtime-fixture'
 import { executeStructuredSessionSwitch } from './structured-agent-session-switch-execution'
+import type { AiVaultPrepareSessionResumeResult } from '../../../../shared/ai-vault-resume-preparation'
+import { refusedMobileSessionTabClose } from '../../mobile-session-tab-close-outcome'
 import { AGENT_SESSION_SWITCH_HOST_MS } from '../../../../shared/agent-session-switch-execution'
 import { DaemonRequestTimeoutError } from '../../../daemon/daemon-errors'
 import { chatTabId } from '../../agent-session/agent-session-tab-layout'
@@ -97,7 +99,7 @@ async function savedTranscript(sessionId = id) {
     requireCurrent: vi.fn(),
     metadata: structuredAgentRuntimeMetadata('codex')!
   })
-  vi.spyOn(cliTranscript, 'prepareStructuredChatCliTranscript').mockResolvedValue({
+  const readable: AiVaultPrepareSessionResumeResult = {
     useRealCodexHome: false,
     cliForkSource: {
       agent: 'codex',
@@ -108,7 +110,9 @@ async function savedTranscript(sessionId = id) {
       codexHome,
       executionHostPlatform: process.platform
     }
-  })
+  }
+  vi.spyOn(cliTranscript, 'prepareStructuredChatCliTranscript').mockResolvedValue(readable)
+  return readable
 }
 
 it.each(['single', 'split', 'other-workspace'] as const)(
@@ -478,7 +482,10 @@ it('re-issuing a switch whose first answer was lost adopts the terminal it start
     getForegroundProcess: async () => null
   })
   const { cliForkSource: source } = await cliTranscript.prepareStructuredChatCliTranscript(
-    await cliTranscript.resolveStructuredChatCliSource({ sessionId: id, workspaceId: WORKTREE_ID }),
+    await cliTranscript.resolveStructuredChatCliSource(
+      { sessionId: id, workspaceId: WORKTREE_ID },
+      false
+    ),
     async () => {
       throw new Error('unused')
     },
@@ -583,17 +590,10 @@ function startSwitchFromKeptTerminal(options: KeptTerminalSwitchOptions = {}) {
 }
 
 it('settles a kept source once when the switch fails after stopping it', async () => {
-  await savedTranscript()
+  const readable = await savedTranscript()
   const prepare = vi.mocked(cliTranscript.prepareStructuredChatCliTranscript)
-  const readable = await prepare.getMockImplementation()!(
-    undefined as never,
-    undefined as never,
-    false
-  )
   prepare.mockReset()
-  prepare
-    .mockResolvedValueOnce(readable)
-    .mockResolvedValue({ useRealCodexHome: false, cliForkSource: undefined } as never)
+  prepare.mockResolvedValueOnce(readable).mockResolvedValue({ useRealCodexHome: false })
   const { result, settled, stoppedSource } = await switchFromKeptTerminal()
   expect(result).toMatchObject({
     status: 'refused',
@@ -638,13 +638,8 @@ function holdUntilReleased() {
 }
 
 it('settles a kept source once at the deadline while work after the stop is still running', async () => {
-  await savedTranscript()
+  const readable = await savedTranscript()
   const prepare = vi.mocked(cliTranscript.prepareStructuredChatCliTranscript)
-  const readable = await prepare.getMockImplementation()!(
-    undefined as never,
-    undefined as never,
-    false
-  )
   const work = holdUntilReleased()
   prepare.mockReset()
   prepare.mockResolvedValueOnce(readable).mockImplementation(async () => {
@@ -690,7 +685,9 @@ it('settles a kept source at once when its stop is proven only after the deadlin
 
 it('settles a kept source once when an addressed close stops it but cannot retire its tab', async () => {
   const { runtime, source, incarnationId, settled, stoppedSource } = keptSourceTerminal()
-  vi.spyOn(runtime, 'closeMobileSessionTab').mockResolvedValue({ refused: true } as never)
+  vi.spyOn(runtime, 'closeMobileSessionTab').mockResolvedValue(
+    refusedMobileSessionTabClose('retirement-owner')
+  )
   await expect(
     runtime.closeTerminal(source.handle, incarnationId, source.presentation)
   ).rejects.toThrow('terminal_pane_close_failed')
diff --git a/src/main/runtime/structured-native-switch-physical.test-fixture.ts b/src/main/runtime/structured-native-switch-physical.test-fixture.ts
index 1f4ff56943e3..aab5c884bd2a 100644
--- a/src/main/runtime/structured-native-switch-physical.test-fixture.ts
+++ b/src/main/runtime/structured-native-switch-physical.test-fixture.ts
@@ -17,7 +17,7 @@ export async function nativeSwitchPhysicalFixture(
 ) {
   const record = host.deps.store.getRecord(sessionId)!
   const head = agentSessionProviderHandleChainHead(record.providerHandleChain)!
-  const { runtime, bindPty, handleOf } = setupMainOwnedWorkspace()
+  const { runtime, handleOf } = setupMainOwnedWorkspace()
   Object.assign(runtime, {
     resolveTerminalWorkspaceLaunchScope: async () => ({
       id: record.location.workspaceId,
@@ -64,22 +64,14 @@ export async function nativeSwitchPhysicalFixture(
   const spawn = vi
     .spyOn(runtime, 'createTerminal')
     .mockImplementation(async (_selector, opts = {}) => {
+      // The switch prepares its terminal at rest: a pane identity, no tab until the one replace.
       if (!opts.tabId || !opts.leafId) {
-        throw new Error('missing ordinary published pane')
+        throw new Error('missing prepared pane identity')
       }
-      opts.beforePtySpawn?.()
       opts.onPtySpawnDispatched?.({
-        tabId: opts.tabId,
-        leafId: opts.leafId,
         launchAgent: agent,
         ...(opts.launchConfig ? { launchConfig: opts.launchConfig } : {})
       })
-      bindPty({
-        worktreeId: record.location.workspaceId,
-        tabId: opts.tabId,
-        leafId: opts.leafId,
-        ptyId: 'physical-switch-destination'
-      })
       runtime.registerPty('physical-switch-destination', record.location.workspaceId, null, {
         tabId: opts.tabId,
         leafId: opts.leafId,
diff --git a/src/renderer/src/components/native-chat/NativeChatPaneHeader.test.tsx b/src/renderer/src/components/native-chat/NativeChatPaneHeader.test.tsx
index 08b2eae7c67d..5536afeed86b 100644
--- a/src/renderer/src/components/native-chat/NativeChatPaneHeader.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatPaneHeader.test.tsx
@@ -54,9 +54,13 @@ beforeEach(() => {
   })
 })
 
-function renderHeader(handOff?: NativeChatHeaderHandOff, focused = true) {
+function renderHeader(
+  handOff?: NativeChatHeaderHandOff,
+  focused = true,
+  agent: 'codex' | 'omp' = 'codex'
+) {
   const source = useAppStore.getState().createUnifiedTab('folder:workspace', 'agent-session', {
-    agentSessionAgent: 'codex',
+    agentSessionAgent: agent,
     executionHostId: 'runtime:remote-host'
   })
   render(
@@ -65,7 +69,7 @@ function renderHeader(handOff?: NativeChatHeaderHandOff, focused = true) {
         tabId={source.id}
         worktreeId={source.worktreeId}
         groupId={source.groupId}
-        nativeChat={{ sessionId: source.entityId, agent: 'codex' }}
+        nativeChat={{ sessionId: source.entityId, agent }}
         focused={focused}
         colorScheme="dark"
         handOff={handOff}
@@ -166,7 +170,8 @@ it('keeps the switch hit target stable while its inactive pane gains focus durin
 })
 
 it('offers the terminal header action order and targets Resume and Close at the displayed chat', async () => {
-  const source = renderHeader()
+  // The copy button is for an agent the top-right control can't switch in place.
+  const source = renderHeader(undefined, true, 'omp')
   expect(screen.getAllByRole('button').map((button) => button.getAttribute('aria-label'))).toEqual([
     'Continue with Terminal Agent',
     'Split Chat Right',
@@ -187,9 +192,9 @@ it('offers the terminal header action order and targets Resume and Close at the
           request: { scopePaths: ['/repo'], executionHostScope: 'local', sessionLimit: 250 }
         }),
         tab: { id: source.id, worktreeId: source.worktreeId },
-        agent: 'codex',
+        agent: 'omp',
         queuedMessage:
-          'A copy of this Codex conversation opens in a new terminal. The original chat stays open.'
+          'A copy of this OMP conversation opens in a new terminal. The original chat stays open.'
       })
     )
   )
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.retained-draft.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.retained-draft.test.tsx
index 5ec53458be08..18d18fc2bd5b 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.retained-draft.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.retained-draft.test.tsx
@@ -43,6 +43,7 @@ import {
 } from './native-chat-composer-draft-store'
 
 import { TooltipProvider } from '@/components/ui/tooltip'
+import { ConfirmationDialogProvider } from '@/components/confirmation-dialog'
 import { promptEditor } from './native-chat-prompt-editor.test-support'
 import { promptTextContent } from './native-chat-prompt-document-text'
 import {
@@ -87,17 +88,20 @@ it('shows and copies the ordinary source of an unsupported installed launch', as
     { text, document: promptTextContent(text) },
     'immediate'
   )
+  // The app renders chats inside the confirmation provider; the header's switch asks through it.
   render(
-    <TooltipProvider>
-      <NativeChatStructuredSession
-        isVisible
-        isFocusedGroup
-        tabId="structured-tab-1"
-        sessionId="session-1"
-        target={{ kind: 'local' }}
-        agent="codex"
-      />
-    </TooltipProvider>
+    <ConfirmationDialogProvider>
+      <TooltipProvider>
+        <NativeChatStructuredSession
+          isVisible
+          isFocusedGroup
+          tabId="structured-tab-1"
+          sessionId="session-1"
+          target={{ kind: 'local' }}
+          agent="codex"
+        />
+      </TooltipProvider>
+    </ConfirmationDialogProvider>
   )
   const field = await screen.findByRole('textbox')
   expect(field.getAttribute('contenteditable')).toBe('true')
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-account-native.test.tsx b/src/renderer/src/components/right-sidebar/ai-vault-account-native.test.tsx
index 9dff0dfa3bb8..cb0eededee77 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-account-native.test.tsx
+++ b/src/renderer/src/components/right-sidebar/ai-vault-account-native.test.tsx
@@ -18,8 +18,12 @@ import {
   flushAccountWork,
   installAccountFixture
 } from './ai-vault-account-test-fixture'
+import type * as I18n from '@/i18n/i18n'
 
-vi.mock('@/i18n/i18n', () => ({ translate: (_key: string, fallback: string) => fallback }))
+vi.mock('@/i18n/i18n', async (importOriginal) => ({
+  ...(await importOriginal<typeof I18n>()),
+  translate: (_key: string, fallback: string) => fallback
+}))
 installAccountFixture()
 
 it.each([
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-account-peer.test.tsx b/src/renderer/src/components/right-sidebar/ai-vault-account-peer.test.tsx
index a5c7c96333a7..53b14b21d85e 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-account-peer.test.tsx
+++ b/src/renderer/src/components/right-sidebar/ai-vault-account-peer.test.tsx
@@ -17,8 +17,12 @@ import {
   flushAccountWork,
   installAccountFixture
 } from './ai-vault-account-test-fixture'
+import type * as I18n from '@/i18n/i18n'
 
-vi.mock('@/i18n/i18n', () => ({ translate: (_key: string, fallback: string) => fallback }))
+vi.mock('@/i18n/i18n', async (importOriginal) => ({
+  ...(await importOriginal<typeof I18n>()),
+  translate: (_key: string, fallback: string) => fallback
+}))
 installAccountFixture()
 
 it.each([
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-session-account-render.test.tsx b/src/renderer/src/components/right-sidebar/ai-vault-session-account-render.test.tsx
index b426ed6af87c..92286fda6168 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-session-account-render.test.tsx
+++ b/src/renderer/src/components/right-sidebar/ai-vault-session-account-render.test.tsx
@@ -10,8 +10,12 @@ import {
   flushAccountWork,
   installAccountFixture
 } from './ai-vault-account-test-fixture'
+import type * as I18n from '@/i18n/i18n'
 
-vi.mock('@/i18n/i18n', () => ({ translate: (_key: string, fallback: string) => fallback }))
+vi.mock('@/i18n/i18n', async (importOriginal) => ({
+  ...(await importOriginal<typeof I18n>()),
+  translate: (_key: string, fallback: string) => fallback
+}))
 installAccountFixture()
 
 it('requires successful Claude evidence, with Account after Worktree and usable Unknown actions', async () => {
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
index 6766b3540e2f..4b1143385abb 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
@@ -652,7 +652,6 @@ it.each(['preparation', 'refusal'])(
       mocks.call.mockResolvedValue({ ok: false, refusal: refuse('transcriptUnreadable') })
     }
     await runCliChatResume(SOURCE, true, {
-      current: () => true,
       sourceCurrent: () => true,
       afterTabId: SOURCE.tabId,
       reportFailure: (error) => {
diff --git a/src/renderer/src/lib/agent-launch-pane-verdict-application.test.ts b/src/renderer/src/lib/agent-launch-pane-verdict-application.test.ts
index d14bd2351ee2..0fff7f97a1f8 100644
--- a/src/renderer/src/lib/agent-launch-pane-verdict-application.test.ts
+++ b/src/renderer/src/lib/agent-launch-pane-verdict-application.test.ts
@@ -52,7 +52,7 @@ function launchTab() {
 }
 
 function apply(verdict: AgentLaunchPaneVerdict, leafId = LEAF): void {
-  applyAgentLaunchPaneVerdict({ worktreeId: WT, tabId, leafId, operationId: 'op-1', verdict })
+  applyAgentLaunchPaneVerdict({ worktreeId: WT, tabId, leafId, verdict })
 }
 
 beforeEach(() => {
diff --git a/src/renderer/src/lib/unified-tab-replace.test.ts b/src/renderer/src/lib/unified-tab-replace.test.ts
index 5beb7c2bd225..d1ad6f6c81b7 100644
--- a/src/renderer/src/lib/unified-tab-replace.test.ts
+++ b/src/renderer/src/lib/unified-tab-replace.test.ts
@@ -1,5 +1,4 @@
 import { beforeEach, expect, it, vi } from 'vitest'
-import type { AppState } from '@/store/types'
 import type * as RuntimeRpcClientModule from '@/runtime/runtime-rpc-client'
 
 // The real store: a replace must close the chat as layout only, never as a user's close of its conversation.
@@ -82,7 +81,7 @@ function seed(pinnedChat: boolean): void {
     activeGroupIdByWorktree: { [WT]: GROUP },
     openFiles: [],
     browserTabsByWorktree: {}
-  } as Partial<AppState>)
+  })
 }
 
 beforeEach(() => {
diff --git a/src/renderer/src/runtime/local-structured-session-replaced-slot.test.ts b/src/renderer/src/runtime/local-structured-session-replaced-slot.test.ts
index 4063422f5582..77fa0415a9ae 100644
--- a/src/renderer/src/runtime/local-structured-session-replaced-slot.test.ts
+++ b/src/renderer/src/runtime/local-structured-session-replaced-slot.test.ts
@@ -1,7 +1,6 @@
 // @vitest-environment happy-dom
 
 import { afterEach, expect, it, vi } from 'vitest'
-import type { AppState } from '@/store/types'
 import type { RuntimeMobileSessionTabsResult } from '../../../shared/runtime-types'
 
 // The window's half of a terminal→chat switch, through the real store: the host's frame carries the
@@ -71,9 +70,9 @@ it('puts the chat in the replaced terminal’s pinned slot and closes it without
     activeGroupIdByWorktree: { [WORKTREE]: GROUP },
     openFiles: [],
     browserTabsByWorktree: {}
-  } as Partial<AppState>)
+  })
   const reopenStack = store.getState().recentlyClosedTerminalTabsByWorktree
-  const frame = {
+  const frame: RuntimeMobileSessionTabsResult = {
     worktree: WORKTREE,
     publicationEpoch: 'renderer:switch',
     snapshotVersion: 1,
@@ -92,7 +91,7 @@ it('puts the chat in the replaced terminal’s pinned slot and closes it without
       }
     ],
     tabGroups: [{ id: GROUP, activeTabId: null, tabOrder: ['agent-session:session-1'] }]
-  } as unknown as RuntimeMobileSessionTabsResult
+  }
 
   applyStructuredSessionTabSnapshots([frame])
 
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/replaced-slot-placement.test.ts b/src/renderer/src/runtime/web-session-tabs-sync/replaced-slot-placement.test.ts
index 814349ab7692..353f1528b88f 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/replaced-slot-placement.test.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/replaced-slot-placement.test.ts
@@ -1,5 +1,6 @@
 import { beforeEach, expect, it, vi } from 'vitest'
 import type { RuntimeMobileSessionTabsResult } from '../../../../shared/runtime-types'
+import type { ReplacedTab } from '../../../../shared/workspace-layout/workspace-layout-command-types'
 import { applyWebSessionTabsSnapshot } from './snapshot-api'
 import type { WebSessionTabsSyncState } from './state'
 import {
@@ -16,18 +17,17 @@ vi.mock('../../store', () => ({ useAppStore: { setState: vi.fn() } }))
 
 type Row = RuntimeMobileSessionTabsResult['tabs'][number]
 
-const terminal = (hostTabId: string, extra: Partial<Row> = {}): Row =>
-  ({
-    type: 'terminal',
-    id: `${hostTabId}::${LEAF_ID}`,
-    parentTabId: hostTabId,
-    leafId: LEAF_ID,
-    title: hostTabId,
-    isActive: false,
-    status: 'ready',
-    terminal: `handle-${hostTabId}`,
-    ...extra
-  }) as Row
+const terminal = (hostTabId: string, extra: { replaces?: ReplacedTab } = {}): Row => ({
+  type: 'terminal',
+  id: `${hostTabId}::${LEAF_ID}`,
+  parentTabId: hostTabId,
+  leafId: LEAF_ID,
+  title: hostTabId,
+  isActive: false,
+  status: 'ready',
+  terminal: `handle-${hostTabId}`,
+  ...extra
+})
 
 const chat: Row = {
   type: 'agent-session',
diff --git a/tests/e2e/ai-vault-account-stream.unit.test.ts b/tests/e2e/ai-vault-account-stream.unit.test.ts
index 3a43c6757e78..0ff009eb1654 100644
--- a/tests/e2e/ai-vault-account-stream.unit.test.ts
+++ b/tests/e2e/ai-vault-account-stream.unit.test.ts
@@ -19,9 +19,13 @@ import {
   flushAccountWork,
   installAccountFixture
 } from '@/components/right-sidebar/ai-vault-account-test-fixture'
+import type * as I18n from '@/i18n/i18n'
 
 vi.mock('node:fs', async (original) => ({ ...(await original<typeof fs>()) }))
-vi.mock('@/i18n/i18n', () => ({ translate: (_key: string, fallback: string) => fallback }))
+vi.mock('@/i18n/i18n', async (importOriginal) => ({
+  ...(await importOriginal<typeof I18n>()),
+  translate: (_key: string, fallback: string) => fallback
+}))
 const bridge = vi.hoisted(() => ({ subscribe: vi.fn() }))
 vi.mock('@/web/preload-api/web-runtime-session', () => ({
   requireActiveEnvironmentOrNull: () => ({ id: 'fixture' }),

From 079394f2b94ef97c946ccd0d8eae7202ebf9feec Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 19:12:11 -0700
Subject: [PATCH 146/207] Offer the copy where the chat's host cannot switch in
 place

A desktop paired with a host on a released build saw an enabled "Switch
to CLI" that stopped the agent and then always failed, and lost the copy
entry. Every chat surface (header, tab menu, hover card, Session History)
now reads the host's answer the same way: no shows the copy and no switch,
unknown shows the switch disabled. A switch that races a host answering no
stops nothing and says why; the destructive old chat-to-terminal path is
gone.

Terminals whose agent forks but cannot switch in place (OMP) now take the
earlier chat resume instead of a switch that did nothing.

The chat header resolves its host only when workspace records change, not
on every store write, and the client deadline starts after consent.
---
 .../NativeChatResumeInCliButton.tsx           |  53 +-------
 .../NativeChatTopRightControls.test.tsx       | 124 ++++++++++++++++++
 .../NativeChatTopRightControls.tsx            |  26 ++--
 .../use-native-chat-execution-host.ts         |  63 +++++++++
 .../ai-vault-session-in-place-switch.test.ts  |  50 +++++++
 .../ai-vault-session-in-place-switch.ts       |   8 +-
 .../tab-bar/NativeChatCliForkMenuItems.tsx    |  21 ++-
 .../TabSessionSurfaceSwitchMenuItems.test.tsx |  32 ++++-
 .../tab-bar/TabSessionSwitchHoverAction.tsx   |   8 +-
 .../native-chat-cli-switch-run.test.ts        |  94 -------------
 .../tab-bar/native-chat-cli-switch-run.ts     | 114 ----------------
 src/renderer/src/i18n/locales/en.json         |   3 +-
 .../lib/conversation-surface-switch.test.tsx  |  26 +++-
 .../src/lib/conversation-surface-switch.ts    |  37 ++++--
 .../src/lib/conversation-switch-feedback.ts   |   8 ++
 .../src/lib/conversation-switch-legacy.ts     |  11 +-
 .../src/lib/conversation-switch-state.ts      |   1 -
 .../src/lib/in-place-switch-support.ts        |  11 +-
 18 files changed, 373 insertions(+), 317 deletions(-)
 create mode 100644 src/renderer/src/components/native-chat/NativeChatTopRightControls.test.tsx
 create mode 100644 src/renderer/src/components/native-chat/use-native-chat-execution-host.ts
 create mode 100644 src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.test.ts
 delete mode 100644 src/renderer/src/components/tab-bar/native-chat-cli-switch-run.test.ts
 delete mode 100644 src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts

diff --git a/src/renderer/src/components/native-chat/NativeChatResumeInCliButton.tsx b/src/renderer/src/components/native-chat/NativeChatResumeInCliButton.tsx
index 00fe0a82098c..400d9b8f2085 100644
--- a/src/renderer/src/components/native-chat/NativeChatResumeInCliButton.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatResumeInCliButton.tsx
@@ -1,58 +1,20 @@
-import { inPlaceSwitchEnabled } from '../../../../shared/structured-agent-cli-conversation-adoption'
-import { useMemo } from 'react'
 import { SquareTerminal } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import { useAppStore } from '@/store'
-import type { AppState } from '@/store/types'
-import { selectFolderWorkspaces, selectWorktreesByRepo } from '@/store/workspace-record-selectors'
 import { translate } from '@/i18n/i18n'
 import { agentLabel } from '../../../../shared/ai-vault-session-filters'
 import { AI_VAULT_AGENTS } from '../../../../shared/ai-vault-types'
+import { useInPlaceSwitchCapability } from '@/lib/in-place-switch-support'
 import {
   runNativeChatCliFork,
   useNativeChatCliForkPending
 } from '../tab-bar/native-chat-cli-fork-run'
 import {
   resolveTabSessionHistorySubject,
-  resolveNativeChatCliForkIdentity,
-  type NativeChatCliForkIdentity,
   type NativeChatTabSession
 } from '../tab-bar/tab-session-history-switch'
-
-function createExecutionHostSelector(
-  tabId: string,
-  worktreeId: string,
-  sessionId: string,
-  agent: NativeChatTabSession['agent']
-) {
-  let worktrees: AppState['worktreesByRepo'] | undefined
-  let folders: AppState['folderWorkspaces'] | undefined
-  let groups: AppState['projectGroups'] | undefined
-  let repos: AppState['repos'] | undefined
-  let scope: NativeChatCliForkIdentity['executionHostScope'] | null = null
-  return (state: AppState) => {
-    const nextWorktrees = selectWorktreesByRepo(state)
-    const nextFolders = selectFolderWorkspaces(state)
-    if (
-      worktrees !== nextWorktrees ||
-      folders !== nextFolders ||
-      groups !== state.projectGroups ||
-      repos !== state.repos
-    ) {
-      scope =
-        resolveNativeChatCliForkIdentity(state, {
-          tab: { id: tabId, worktreeId },
-          nativeChat: { sessionId, agent }
-        })?.executionHostScope ?? null
-      worktrees = nextWorktrees
-      folders = nextFolders
-      groups = state.projectGroups
-      repos = state.repos
-    }
-    return scope
-  }
-}
+import { useNativeChatExecutionHost } from './use-native-chat-execution-host'
 
 export function NativeChatResumeInCliButton({
   tabId,
@@ -65,22 +27,19 @@ export function NativeChatResumeInCliButton({
 }): React.JSX.Element | null {
   const tab = { id: tabId, worktreeId }
   const { sessionId, agent: nativeAgent } = nativeChat
-  const selectExecutionHost = useMemo(
-    () => createExecutionHostSelector(tabId, worktreeId, sessionId, nativeAgent),
-    [tabId, worktreeId, sessionId, nativeAgent]
-  )
-  const executionHostScope = useAppStore(selectExecutionHost)
+  const executionHostScope = useNativeChatExecutionHost(tabId, worktreeId, sessionId, nativeAgent)
   const pending = useNativeChatCliForkPending(
     executionHostScope ? { executionHostScope, sessionId: nativeChat.sessionId } : null
   )
   const commandOverrides = useAppStore((state) => state.settings?.agentCmdOverrides)
   const agent = AI_VAULT_AGENTS.find((candidate) => candidate === nativeChat.agent)
+  const inPlace = useInPlaceSwitchCapability(executionHostScope, agent)
   const label = translate(
     'components.tab.bar.SortableTabContextMenu.switchToTerminalView',
     'Continue with Terminal Agent'
   )
-  // The top-right switch control continues this agent's conversation in place; this keeps the copy for the rest.
-  if (!executionHostScope || !agent || inPlaceSwitchEnabled(agent)) {
+  // Where the host switches this agent in place (or hasn't answered yet) the top-right switch shows instead.
+  if (!executionHostScope || !agent || inPlace !== false) {
     return null
   }
   return (
diff --git a/src/renderer/src/components/native-chat/NativeChatTopRightControls.test.tsx b/src/renderer/src/components/native-chat/NativeChatTopRightControls.test.tsx
new file mode 100644
index 000000000000..7092d8433db9
--- /dev/null
+++ b/src/renderer/src/components/native-chat/NativeChatTopRightControls.test.tsx
@@ -0,0 +1,124 @@
+// @vitest-environment happy-dom
+import { act, cleanup, render, screen } from '@testing-library/react'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import type * as InPlaceSwitchSupport from '@/lib/in-place-switch-support'
+import type * as HistorySwitch from '../tab-bar/tab-session-history-switch'
+import { TooltipProvider } from '@/components/ui/tooltip'
+import { ConfirmationDialogProvider } from '@/components/confirmation-dialog'
+import { useAppStore } from '@/store'
+import { makeRepo, makeWorktree } from '../worktree-jump-palette-test-fixtures'
+import { createGlobalSettingsFixture } from '../../../../shared/global-settings-test-fixture'
+import { NativeChatTopRightControls } from './NativeChatTopRightControls'
+import { NativeChatResumeInCliButton } from './NativeChatResumeInCliButton'
+import type { NativeChatFind } from './use-native-chat-find'
+
+const mocks = vi.hoisted(() => ({
+  capability: undefined as boolean | undefined,
+  resolveIdentity: vi.fn(),
+  resolveSubject: vi.fn()
+}))
+
+vi.mock('@/lib/in-place-switch-support', async (original) => ({
+  ...(await original<typeof InPlaceSwitchSupport>()),
+  useInPlaceSwitchCapability: () => mocks.capability
+}))
+vi.mock('../tab-bar/tab-session-history-switch', async (original) => {
+  const actual = await original<typeof HistorySwitch>()
+  mocks.resolveIdentity.mockImplementation(actual.resolveNativeChatCliForkIdentity)
+  mocks.resolveSubject.mockImplementation(actual.resolveTabSessionHistorySubject)
+  return {
+    ...actual,
+    resolveNativeChatCliForkIdentity: mocks.resolveIdentity,
+    resolveTabSessionHistorySubject: mocks.resolveSubject
+  }
+})
+vi.mock('./use-native-chat-tab-owner', () => ({ useNativeChatTabOwnerWorktreeId: () => 'wt-1' }))
+
+const closedFind: NativeChatFind = {
+  isOpen: false,
+  query: '',
+  setQuery: () => {},
+  close: () => {},
+  open: undefined,
+  onKeyDownCapture: () => {},
+  rootRef: { current: null },
+  barRef: { current: null },
+  inputRef: { current: null },
+  revealMatch: () => {}
+}
+
+function renderChatHeader(chats = ['chat-1']): void {
+  render(
+    <ConfirmationDialogProvider>
+      <TooltipProvider>
+        {chats.map((sessionId) => (
+          <div key={sessionId}>
+            <NativeChatResumeInCliButton
+              tabId={`tab-${sessionId}`}
+              worktreeId="wt-1"
+              nativeChat={{ sessionId, agent: 'claude' }}
+            />
+            <NativeChatTopRightControls
+              find={closedFind}
+              session={{
+                tabId: `tab-${sessionId}`,
+                sessionId,
+                agent: 'claude',
+                isVisible: true
+              }}
+              working={false}
+            />
+          </div>
+        ))}
+      </TooltipProvider>
+    </ConfirmationDialogProvider>
+  )
+}
+
+beforeEach(() => {
+  useAppStore.setState(useAppStore.getInitialState(), true)
+  useAppStore.setState({
+    settings: createGlobalSettingsFixture(),
+    repos: [makeRepo()],
+    worktreesByRepo: { 'repo-1': [makeWorktree('wt-1', 'Worktree', { path: '/repo/wt' })] }
+  })
+  mocks.capability = undefined
+})
+
+afterEach(cleanup)
+
+it("offers the copy and no switch where the chat's host answered that it cannot switch in place", () => {
+  mocks.capability = false
+  renderChatHeader()
+  expect(screen.queryByRole('button', { name: 'Switch to CLI' })).toBeNull()
+  expect(screen.getByRole('button', { name: 'Continue with Terminal Agent' })).not.toBeNull()
+})
+
+it('shows only the switch, disabled until the host answers, then enabled once it says yes', () => {
+  renderChatHeader()
+  const pending = screen.getByRole('button', { name: 'Switch to CLI' })
+  expect(pending.hasAttribute('disabled')).toBe(true)
+  expect(screen.queryByRole('button', { name: 'Continue with Terminal Agent' })).toBeNull()
+  cleanup()
+  mocks.capability = true
+  renderChatHeader()
+  expect(screen.getByRole('button', { name: 'Switch to CLI' }).hasAttribute('disabled')).toBe(false)
+  expect(screen.queryByRole('button', { name: 'Continue with Terminal Agent' })).toBeNull()
+})
+
+it('resolves no History subject for mounted chats on unrelated store writes, at any write count', () => {
+  mocks.capability = true
+  renderChatHeader(['chat-1', 'chat-2', 'chat-3', 'chat-4'])
+  const resolverCalls = (): number =>
+    mocks.resolveIdentity.mock.calls.length + mocks.resolveSubject.mock.calls.length
+  const unrelatedWrites = (count: number): void => {
+    for (let index = 0; index < count; index += 1) {
+      act(() => useAppStore.setState({ agentStatusByPaneKey: {} }))
+    }
+  }
+  const before = resolverCalls()
+  unrelatedWrites(20)
+  expect(resolverCalls()).toBe(before)
+  unrelatedWrites(200)
+  expect(resolverCalls()).toBe(before)
+})
diff --git a/src/renderer/src/components/native-chat/NativeChatTopRightControls.tsx b/src/renderer/src/components/native-chat/NativeChatTopRightControls.tsx
index 15716ab05b1b..db8203fd17cd 100644
--- a/src/renderer/src/components/native-chat/NativeChatTopRightControls.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatTopRightControls.tsx
@@ -1,4 +1,4 @@
-import { inPlaceSwitchEnabled } from '../../../../shared/structured-agent-cli-conversation-adoption'
+import { useInPlaceSwitchCapability } from '@/lib/in-place-switch-support'
 import { useConfirmationDialog } from '@/components/confirmation-dialog-context'
 import {
   useConversationSwitchBusy,
@@ -9,14 +9,13 @@ import { Loader2, SquareTerminal } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import { translate } from '@/i18n/i18n'
-import { useAppStore } from '@/store'
 import { AI_VAULT_AGENTS } from '../../../../shared/ai-vault-types'
 import { SwitchToCliTooltipText } from '../right-sidebar/ai-vault-session-cli-fork-copy'
-import { resolveTabSessionHistorySubject } from '../tab-bar/tab-session-history-switch'
 import { NativeChatFindBar } from './NativeChatFindBar'
 import type { NativeChatFind } from './use-native-chat-find'
 import type { NativeChatStructuredViewProps } from './native-chat-view-types'
 import { useNativeChatTabOwnerWorktreeId } from './use-native-chat-tab-owner'
+import { useNativeChatExecutionHost } from './use-native-chat-execution-host'
 
 /** The chat's top-right corner: its find bar while open, else its icon-only "Switch to CLI". */
 export function NativeChatTopRightControls({
@@ -30,17 +29,15 @@ export function NativeChatTopRightControls({
   inline?: boolean
 }): React.JSX.Element | null {
   const worktreeId = useNativeChatTabOwnerWorktreeId(session.tabId)
-  // A primitive, so the selector is stable; the chat's host is where its History row lives.
-  const hostId = useAppStore((state) => {
-    const subject = worktreeId
-      ? resolveTabSessionHistorySubject(state, {
-          tab: { id: session.tabId, worktreeId },
-          nativeChat: { sessionId: session.sessionId, agent: session.agent }
-        })
-      : null
-    return subject?.kind === 'chat' ? subject.request.executionHostScope : null
-  })
+  // The chat's host is where its History row lives.
+  const hostId = useNativeChatExecutionHost(
+    session.tabId,
+    worktreeId,
+    session.sessionId,
+    session.agent
+  )
   const agent = AI_VAULT_AGENTS.find((candidate) => candidate === session.agent)
+  const inPlace = useInPlaceSwitchCapability(hostId, agent)
   const confirm = useConfirmationDialog()
   const readiness = useConversationSwitchReadiness(
     worktreeId && hostId && agent
@@ -59,7 +56,8 @@ export function NativeChatTopRightControls({
   if (find.isOpen) {
     return <NativeChatFindBar find={find} isVisible={session.isVisible} />
   }
-  if (!worktreeId || !hostId || !agent || !inPlaceSwitchEnabled(agent)) {
+  // A host that answered no gets the header's copy entry instead; unknown shows this disabled.
+  if (!worktreeId || !hostId || !agent || inPlace === false) {
     return null
   }
   const label = translate('components.tab.bar.switch.toCli', 'Switch to CLI')
diff --git a/src/renderer/src/components/native-chat/use-native-chat-execution-host.ts b/src/renderer/src/components/native-chat/use-native-chat-execution-host.ts
new file mode 100644
index 000000000000..2f74ea090207
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-native-chat-execution-host.ts
@@ -0,0 +1,63 @@
+import { useMemo } from 'react'
+import { useAppStore } from '@/store'
+import type { AppState } from '@/store/types'
+import { selectFolderWorkspaces, selectWorktreesByRepo } from '@/store/workspace-record-selectors'
+import {
+  resolveNativeChatCliForkIdentity,
+  type NativeChatCliForkIdentity,
+  type NativeChatTabSession
+} from '../tab-bar/tab-session-history-switch'
+
+type ExecutionHostScope = NativeChatCliForkIdentity['executionHostScope']
+
+function createExecutionHostSelector(
+  tabId: string,
+  worktreeId: string | null,
+  sessionId: string,
+  agent: NativeChatTabSession['agent']
+) {
+  let worktrees: AppState['worktreesByRepo'] | undefined
+  let folders: AppState['folderWorkspaces'] | undefined
+  let groups: AppState['projectGroups'] | undefined
+  let repos: AppState['repos'] | undefined
+  let scope: ExecutionHostScope | null = null
+  return (state: AppState) => {
+    if (!worktreeId) {
+      return null
+    }
+    const nextWorktrees = selectWorktreesByRepo(state)
+    const nextFolders = selectFolderWorkspaces(state)
+    if (
+      worktrees !== nextWorktrees ||
+      folders !== nextFolders ||
+      groups !== state.projectGroups ||
+      repos !== state.repos
+    ) {
+      scope =
+        resolveNativeChatCliForkIdentity(state, {
+          tab: { id: tabId, worktreeId },
+          nativeChat: { sessionId, agent }
+        })?.executionHostScope ?? null
+      worktrees = nextWorktrees
+      folders = nextFolders
+      groups = state.projectGroups
+      repos = state.repos
+    }
+    return scope
+  }
+}
+
+/** The host a chat tab's conversation runs on; re-resolved only when workspace records change,
+ *  so a mounted chat does no History resolution on unrelated store writes. */
+export function useNativeChatExecutionHost(
+  tabId: string,
+  worktreeId: string | null,
+  sessionId: string,
+  agent: NativeChatTabSession['agent']
+): ExecutionHostScope | null {
+  const select = useMemo(
+    () => createExecutionHostSelector(tabId, worktreeId, sessionId, agent),
+    [tabId, worktreeId, sessionId, agent]
+  )
+  return useAppStore(select)
+}
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.test.ts b/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.test.ts
new file mode 100644
index 000000000000..baa27774e59e
--- /dev/null
+++ b/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.test.ts
@@ -0,0 +1,50 @@
+// @vitest-environment happy-dom
+import { renderHook } from '@testing-library/react'
+import { beforeEach, expect, it, vi } from 'vitest'
+import { useAppStore } from '@/store'
+import { useAiVaultInPlaceAgent } from '@/lib/in-place-switch-support'
+import { inPlaceSwitchCapability } from '../../../../shared/structured-agent-cli-conversation-adoption'
+import { makeTabSessionHistoryRow } from '../tab-bar/tab-session-history-test-fixture'
+import { switchAiVaultSessionToCli } from './ai-vault-session-in-place-switch'
+
+const mocks = vi.hoisted(() => ({
+  capabilities: null as readonly string[] | null,
+  runNativeChatCliSwitch: vi.fn(async () => {})
+}))
+
+vi.mock('@/runtime/local-runtime-capabilities', async (original) => ({
+  ...(await original<object>()),
+  readLocalRuntimeCapabilitiesOrUnknown: () => mocks.capabilities,
+  ensureLocalRuntimeCapabilities: async () => mocks.capabilities
+}))
+vi.mock('@/lib/conversation-surface-switch', () => ({
+  runNativeChatCliSwitch: mocks.runNativeChatCliSwitch,
+  runConversationSwitch: vi.fn()
+}))
+
+const chatRow = makeTabSessionHistoryRow({
+  structuredSession: { sessionId: 'chat-1', workspaceId: 'wt-1' }
+})
+
+beforeEach(() => {
+  useAppStore.setState(useAppStore.getInitialState(), true)
+  mocks.runNativeChatCliSwitch.mockClear()
+})
+
+it("labels and runs History's CLI move by the host's answer: no keeps the copy, unknown waits", () => {
+  mocks.capabilities = []
+  expect(renderHook(() => useAiVaultInPlaceAgent(chatRow)).result.current).toBeUndefined()
+  expect(switchAiVaultSessionToCli(chatRow)).toBe(false)
+
+  mocks.capabilities = null
+  expect(renderHook(() => useAiVaultInPlaceAgent(chatRow)).result.current).toBe('claude')
+  expect(switchAiVaultSessionToCli(chatRow)).toBe(false)
+  expect(mocks.runNativeChatCliSwitch).not.toHaveBeenCalled()
+
+  mocks.capabilities = [inPlaceSwitchCapability('claude')]
+  expect(renderHook(() => useAiVaultInPlaceAgent(chatRow)).result.current).toBe('claude')
+  expect(switchAiVaultSessionToCli(chatRow)).toBe(true)
+  expect(mocks.runNativeChatCliSwitch).toHaveBeenCalledWith(
+    expect.objectContaining({ sessionId: 'chat-1', workspaceId: 'wt-1', agent: 'claude' })
+  )
+})
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts b/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts
index f15a1518018b..2ececd62fd4a 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts
@@ -3,9 +3,9 @@ import type { ConfirmationDialogContextValue } from '@/components/confirmation-d
 import type { AiVaultOriginalPaneTarget } from './ai-vault-original-pane'
 import {
   cliConversationRowsShareAgent,
-  adoptsCliConversations,
-  inPlaceSwitchEnabled
+  adoptsCliConversations
 } from '../../../../shared/structured-agent-cli-conversation-adoption'
+import { inPlaceSwitchSupportedNow } from '@/lib/in-place-switch-support'
 import { useAppStore } from '@/store'
 import type { AiVaultSession } from '../../../../shared/ai-vault-types'
 import { resolveCliChatResumeSource } from '../tab-bar/cli-chat-resume-source'
@@ -22,7 +22,7 @@ export function switchAiVaultSessionToCli(
   confirm?: ConfirmationDialogContextValue
 ): boolean {
   const chat = session.structuredSession
-  if (!chat || !inPlaceSwitchEnabled(session.agent)) {
+  if (!chat || !inPlaceSwitchSupportedNow(session.executionHostId, session.agent)) {
     return false
   }
   const chatTab = useAppStore
@@ -50,7 +50,7 @@ export function switchAiVaultSessionToNativeChat(
   originalPaneTarget?: AiVaultOriginalPaneTarget | null,
   confirm?: ConfirmationDialogContextValue
 ): boolean {
-  if (!adoptsCliConversations(session.agent) || !inPlaceSwitchEnabled(session.agent)) {
+  if (!inPlaceSwitchSupportedNow(session.executionHostId, session.agent)) {
     return false
   }
   const source = historyPaneSource(session, originalPaneTarget)
diff --git a/src/renderer/src/components/tab-bar/NativeChatCliForkMenuItems.tsx b/src/renderer/src/components/tab-bar/NativeChatCliForkMenuItems.tsx
index 4f938863a760..2e1c52121ea7 100644
--- a/src/renderer/src/components/tab-bar/NativeChatCliForkMenuItems.tsx
+++ b/src/renderer/src/components/tab-bar/NativeChatCliForkMenuItems.tsx
@@ -15,7 +15,8 @@ import {
   type NativeChatTabSession
 } from './tab-session-history-switch'
 import { runNativeChatCliFork, useNativeChatCliForkPending } from './native-chat-cli-fork-run'
-import { inPlaceSwitchEnabled } from '../../../../shared/structured-agent-cli-conversation-adoption'
+import { useInPlaceSwitchCapability } from '@/lib/in-place-switch-support'
+import { useNativeChatExecutionHost } from '../native-chat/use-native-chat-execution-host'
 
 type NativeChatCliMenuItemsProps = {
   tab: { id: string; worktreeId: string }
@@ -24,14 +25,22 @@ type NativeChatCliMenuItemsProps = {
   onComplete?: () => void
 }
 
-/** An agent that switches in place moves the conversation; any other agent opens a copy in its CLI. */
+/** Where the chat's host switches its agent in place the conversation moves (disabled until the
+ *  host answers); where the host answered no, or the agent never switches, a copy opens in its CLI. */
 export function NativeChatCliForkMenuItems(
   props: NativeChatCliMenuItemsProps
 ): React.JSX.Element | null {
-  return inPlaceSwitchEnabled(props.nativeChat.agent) ? (
-    <NativeChatCliSwitchMenuItems {...props} />
-  ) : (
+  const { tab, nativeChat } = props
+  const host = useNativeChatExecutionHost(
+    tab.id,
+    tab.worktreeId,
+    nativeChat.sessionId,
+    nativeChat.agent
+  )
+  return useInPlaceSwitchCapability(host, nativeChat.agent) === false ? (
     <NativeChatCliCopyMenuItems {...props} />
+  ) : (
+    <NativeChatCliSwitchMenuItems {...props} />
   )
 }
 
@@ -59,7 +68,7 @@ function NativeChatCliSwitchMenuItems({
         }
       : null
   )
-  if (!chat || !agent || !inPlaceSwitchEnabled(agent)) {
+  if (!chat || !agent) {
     return null
   }
   return (
diff --git a/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx b/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx
index 3c50b6c124e7..2b228808a0bb 100644
--- a/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx
+++ b/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx
@@ -1,4 +1,3 @@
-vi.mock('@/lib/in-place-switch-support', () => ({ useInPlaceSwitchCapability: () => false }))
 // @vitest-environment happy-dom
 import { useAppStore } from '@/store'
 import { makeRepo, makeWorktree } from '../worktree-jump-palette-test-fixtures'
@@ -22,10 +21,17 @@ const mocks = vi.hoisted(() => {
     runNativeChatCliFork: vi.fn(),
     runNativeChatCliSwitch: vi.fn(),
     runCliChatResume: vi.fn(async () => {}),
-    listSessions: vi.fn()
+    listSessions: vi.fn(),
+    capability: true as boolean | undefined
   }
 })
 
+// The host's answer for agents that can switch in place; any other agent reads as no.
+vi.mock('@/lib/in-place-switch-support', () => ({
+  useInPlaceSwitchCapability: (_host: unknown, agent: string | undefined) =>
+    agent === 'omp' ? false : mocks.capability
+}))
+
 vi.mock('./native-chat-cli-fork-run', () => ({
   runNativeChatCliFork: mocks.runNativeChatCliFork,
   useNativeChatCliForkPending: () =>
@@ -58,7 +64,7 @@ vi.mock('@/lib/conversation-surface-switch', () => ({
       },
       () => mocks.pending
     )
-    return { ready: !pending, pending }
+    return { ready: !pending && mocks.capability !== undefined, pending }
   }
 }))
 
@@ -79,6 +85,7 @@ beforeEach(() => {
   mocks.subject = null
   mocks.cliSource = null
   mocks.pending = false
+  mocks.capability = true
   mocks.runNativeChatCliFork.mockReset()
   mocks.runNativeChatCliSwitch.mockReset()
   mocks.runCliChatResume.mockClear()
@@ -150,6 +157,25 @@ describe('TabSessionSurfaceSwitchMenuItems', () => {
     expect(mocks.runNativeChatCliSwitch).not.toHaveBeenCalled()
   })
 
+  it("keeps the copy item where the chat's host answered that it cannot switch in place", async () => {
+    mocks.subject = CHAT_SUBJECT
+    mocks.capability = false
+    renderItemsNow('orca-chat-1')
+    expect(screen.queryByRole('menuitem', { name: 'Switch to CLI' })).toBeNull()
+    fireEvent.click(screen.getByRole('menuitem'))
+    expect(mocks.runNativeChatCliFork).toHaveBeenCalledOnce()
+    expect(mocks.runNativeChatCliSwitch).not.toHaveBeenCalled()
+  })
+
+  it('shows the switch disabled while the host has not answered', async () => {
+    mocks.subject = CHAT_SUBJECT
+    mocks.capability = undefined
+    renderItemsNow('orca-chat-1')
+    const item = screen.getByRole('menuitem', { name: 'Switch to CLI' })
+    expect(item.getAttribute('data-disabled')).not.toBeNull()
+    expect(mocks.runNativeChatCliFork).not.toHaveBeenCalled()
+  })
+
   it('offers and dispatches a CLI identity while History never answers', async () => {
     const source = {
       tabId: 'tab-1',
diff --git a/src/renderer/src/components/tab-bar/TabSessionSwitchHoverAction.tsx b/src/renderer/src/components/tab-bar/TabSessionSwitchHoverAction.tsx
index 1cb1b4aaf21b..772197c4d400 100644
--- a/src/renderer/src/components/tab-bar/TabSessionSwitchHoverAction.tsx
+++ b/src/renderer/src/components/tab-bar/TabSessionSwitchHoverAction.tsx
@@ -10,7 +10,7 @@ import { Loader2, MessagesSquare, SquareTerminal } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import { translate } from '@/i18n/i18n'
 import { useAppStore } from '@/store'
-import { inPlaceSwitchEnabled } from '../../../../shared/structured-agent-cli-conversation-adoption'
+import { useInPlaceSwitchCapability } from '@/lib/in-place-switch-support'
 import { AI_VAULT_AGENTS } from '../../../../shared/ai-vault-types'
 import { resolveCliChatResumeSource } from './cli-chat-resume-source'
 import {
@@ -44,6 +44,7 @@ function ChatSwitchAction({
     useShallow((state) => resolveNativeChatCliForkIdentity(state, { tab, nativeChat }))
   )
   const agent = AI_VAULT_AGENTS.find((candidate) => candidate === nativeChat.agent)
+  const inPlace = useInPlaceSwitchCapability(chat?.executionHostScope, agent)
   const confirm = useConfirmationDialog()
   const readiness = useConversationSwitchReadiness(
     chat && agent
@@ -59,7 +60,7 @@ function ChatSwitchAction({
   )
   const busy = useConversationSwitchBusy(readiness.pending)
 
-  if (!chat || !agent || !inPlaceSwitchEnabled(agent)) {
+  if (!chat || !agent || inPlace === false) {
     return null
   }
   return (
@@ -91,13 +92,14 @@ function TerminalSwitchAction({
   tab: { id: string; worktreeId: string }
 }): React.JSX.Element | null {
   const source = useAppStore(useShallow((state) => resolveCliChatResumeSource(state, { tab })))
+  const inPlace = useInPlaceSwitchCapability(source?.executionHostId, source?.agent)
   const confirm = useConfirmationDialog()
   const readiness = useConversationSwitchReadiness(
     source ? { direction: 'chat', ...source, source } : null
   )
   const busy = useConversationSwitchBusy(readiness.pending)
 
-  if (!source || !inPlaceSwitchEnabled(source.agent)) {
+  if (!source || inPlace === false) {
     return null
   }
   return (
diff --git a/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.test.ts b/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.test.ts
deleted file mode 100644
index 7c7b09740b21..000000000000
--- a/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.test.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-import type { StructuredAgentSessionReadSnapshot } from '@/components/native-chat/structured-agent-session-read-owner'
-import { beforeEach, expect, it, vi } from 'vitest'
-
-const mocks = vi.hoisted(() => {
-  const live: { held?: StructuredAgentSessionReadSnapshot; view: string } = { view: 'worktrees' }
-  return {
-    supported: true,
-    live,
-    call: vi.fn(),
-    launch: vi.fn((_args: unknown): { tabId: string | null; runtimeLaunch?: Promise<unknown> } => ({
-      tabId: 'terminal-tab'
-    })),
-    closeUnifiedTab: vi.fn(),
-    toast: vi.fn()
-  }
-})
-vi.mock('sonner', () => ({ toast: { error: mocks.toast } }))
-vi.mock('@/store', () => ({
-  useAppStore: {
-    setState: vi.fn(),
-    getState: () => ({
-      settings: {},
-      closeUnifiedTab: mocks.closeUnifiedTab,
-      activeView: mocks.live.view
-    })
-  }
-}))
-vi.mock('@/runtime/local-runtime-capabilities', () => ({
-  subscribeLocalRuntimeCapabilityObservation: () => () => {},
-  readLocalRuntimeCapabilitiesOrUnknown: () => [],
-  ensureLocalRuntimeCapabilities: async () =>
-    mocks.supported
-      ? ['agent-session.structured.switch.v1:codex', 'agent-session.conversation-stop.v1']
-      : []
-}))
-vi.mock('@/runtime/runtime-rpc-client', () => ({
-  runtimeEnvironmentSupportsCapability: async () => false
-}))
-vi.mock('@/components/native-chat/structured-agent-session-read-owner-registry', () => ({
-  findStructuredAgentSessionReadOwner: () =>
-    mocks.live.held ? { getSnapshot: () => mocks.live.held } : undefined
-}))
-vi.mock('@/runtime/structured-agent-session-client', () => ({
-  supportsInPlaceSwitch: async () => mocks.supported,
-  callStructuredAgentSession: mocks.call
-}))
-vi.mock('@/lib/worktree-runtime-owner', () => ({ getExecutionHostIdForWorktree: () => 'local' }))
-vi.mock('@/lib/launch-ai-vault-session', () => ({ launchAiVaultSessionInNewTab: mocks.launch }))
-vi.mock('@/lib/ai-vault-resume-command', () => ({
-  buildAiVaultResumeStartupForWorktree: () => ({
-    command: 'codex resume thread-c',
-    env: { CODEX_HOME: '/accounts/a/home' },
-    providerSession: { key: 'session_id', id: 'thread-c' }
-  })
-}))
-
-import { runLegacyNativeChatCliSwitch as runNativeChatCliSwitch } from './native-chat-cli-switch-run'
-
-const SWITCH = {
-  sessionId: 'chat-1',
-  workspaceId: 'wt-1',
-  executionHostId: 'local',
-  agent: 'codex' as const,
-  chatTabId: 'chat-tab'
-}
-const SOURCE = {
-  agent: 'codex',
-  sourceAgent: 'codex',
-  sessionId: 'thread-c',
-  filePath: '/accounts/a/home/sessions/rollout-thread-c.jsonl',
-  cwd: '/repo',
-  codexHome: '/accounts/a/home',
-  executionHostPlatform: 'darwin'
-}
-
-beforeEach(() => {
-  vi.clearAllMocks()
-  mocks.supported = true
-  mocks.live.held = undefined
-  mocks.live.view = 'worktrees'
-  mocks.call.mockResolvedValue({ source: SOURCE })
-})
-
-it('preserves readable recovery and never launches from an old Close acknowledgement', async () => {
-  mocks.supported = false
-  await runNativeChatCliSwitch(SWITCH)
-  expect(mocks.call.mock.calls.map((call) => call[1])).toEqual([
-    'agentSession.close',
-    'agentSession.reveal'
-  ])
-  expect(mocks.launch).not.toHaveBeenCalled()
-  expect(mocks.closeUnifiedTab).not.toHaveBeenCalled()
-  expect(mocks.toast).toHaveBeenCalledOnce()
-})
diff --git a/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts b/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts
deleted file mode 100644
index 928245d29919..000000000000
--- a/src/renderer/src/components/tab-bar/native-chat-cli-switch-run.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-import { findStructuredAgentSessionReadOwner } from '@/components/native-chat/structured-agent-session-read-owner-registry'
-import { runningStructuredAgentSessionTurnId } from '../../../../shared/structured-agent-session-live-turn'
-import { structuredAgentSessionPayloadFingerprint } from '../../../../shared/structured-agent-session-mutation'
-import { createBrowserUuid } from '@/lib/browser-uuid'
-import { agentSessionRefusalError } from '../../../../shared/agent-session-wire-refusals'
-import { ensureLocalRuntimeCapabilities } from '@/runtime/local-runtime-capabilities'
-import { runtimeEnvironmentSupportsCapability } from '@/runtime/runtime-rpc-client'
-import { AGENT_SESSION_CONVERSATION_STOP_RUNTIME_CAPABILITY } from '../../../../shared/protocol-version'
-import {
-  conversationSwitchChanged,
-  pendingNativeChatCliSwitches as pending
-} from '@/lib/pending-conversation-surface-switches'
-import { conversationSwitchFailureText } from '@/lib/conversation-switch-feedback'
-import { toast } from 'sonner'
-import { useAppStore } from '@/store'
-import { callStructuredAgentSession } from '@/runtime/structured-agent-session-client'
-import { structuredAgentSessionTargetForHost } from '@/runtime/structured-agent-session-owner'
-import type { AiVaultAgent } from '../../../../shared/ai-vault-types'
-import { getExecutionHostIdForWorktree } from '@/lib/worktree-runtime-owner'
-import { parseExecutionHostId } from '../../../../shared/execution-host'
-
-const changed = conversationSwitchChanged
-/** Moves a chat's conversation into a terminal on the same id: the host proves the chat stopped, the
- *  terminal opens in the chat's slot, then the chat tab closes. `chatTabId` null opens a new tab. */
-export async function runLegacyNativeChatCliSwitch(args: {
-  sessionId: string
-  workspaceId: string
-  executionHostId: string
-  agent: AiVaultAgent
-  chatTabId: string | null
-  onComplete?: () => void
-  reportFailure?: (error: unknown) => void
-}): Promise<void> {
-  const key = `${args.executionHostId}\0${args.sessionId}\0legacy`
-  const target = structuredAgentSessionTargetForHost(args.executionHostId)
-  const hostId = parseExecutionHostId(args.executionHostId)?.id
-  if (pending.has(key) || !target || !hostId) {
-    return
-  }
-  pending.set(key, args)
-  try {
-    changed()
-    if (
-      getExecutionHostIdForWorktree(useAppStore.getState(), args.workspaceId) !==
-      args.executionHostId
-    ) {
-      throw new Error('source unavailable')
-    }
-    const supports = async (capability: string) =>
-      target.kind === 'local'
-        ? (await ensureLocalRuntimeCapabilities())?.includes(capability) === true
-        : runtimeEnvironmentSupportsCapability(target.environmentId, capability)
-    const held = findStructuredAgentSessionReadOwner(args.sessionId, target)?.getSnapshot()
-    if (held?.current && held.state.fence !== null) {
-      const conversationStop = await supports(AGENT_SESSION_CONVERSATION_STOP_RUNTIME_CAPABILITY)
-      const turnId = runningStructuredAgentSessionTurnId(held.state)
-      if (conversationStop || turnId) {
-        const fields = conversationStop ? {} : { turnId }
-        const stopped = await callStructuredAgentSession<{ ok: boolean }>(
-          target,
-          'agentSession.cancel',
-          {
-            envelope: {
-              sessionId: args.sessionId,
-              clientOperationId: createBrowserUuid(),
-              expectedRuntimeFence: held.state.fence,
-              payloadFingerprint: structuredAgentSessionPayloadFingerprint({
-                method: 'agentSession.cancel',
-                sessionId: args.sessionId,
-                fields
-              })
-            },
-            ...fields
-          }
-        )
-        if (!stopped.ok) {
-          throw agentSessionRefusalError('agent_session_ownership_unknown', {
-            reason: 'ownerUnproven'
-          })
-        }
-      }
-    }
-    // Ordinary old Close has no positive exit receipt; keep readable recovery without launching.
-    try {
-      await callStructuredAgentSession(target, 'agentSession.close', { sessionId: args.sessionId })
-    } finally {
-      await callStructuredAgentSession(target, 'agentSession.reveal', {
-        sessionId: args.sessionId
-      }).catch(() => {})
-    }
-    throw agentSessionRefusalError('agent_session_ownership_unknown', { reason: 'ownerUnproven' })
-  } catch (error) {
-    if (args.reportFailure) {
-      args.reportFailure(error)
-    } else {
-      toast.error(
-        conversationSwitchFailureText(error, { agent: args.agent, direction: 'terminal' })
-      )
-    }
-  } finally {
-    pending.delete(key)
-    try {
-      useAppStore.setState((state) => ({
-        agentConversationsByPaneKey: state.agentConversationsByPaneKey
-      }))
-    } finally {
-      try {
-        changed()
-      } finally {
-        args.onComplete?.()
-      }
-    }
-  }
-}
diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index fdc53d85b45a..2169ce0ae091 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -20104,7 +20104,8 @@
           "sourceExitUnconfirmed": "Orca could not confirm {{agent}} stopped in this terminal. Quit {{agent}} here, then try this action again.",
           "sourceKept": "{{agent}} opened successfully. The original tab was kept; continue in the new tab.",
           "changeInProgress": "{{agent}} is still finishing another change to this conversation. Try again in a moment.",
-          "conversationMissing": "Orca could not find this {{agent}} conversation. Open it from Session History, then try again."
+          "conversationMissing": "Orca could not find this {{agent}} conversation. Open it from Session History, then try again.",
+          "hostCannotSwitch": "Orca on this host cannot switch {{agent}} in place. Update Orca there, or open a copy with Continue with Terminal Agent."
         },
         "BrowserTab": {
           "closeOthers": "Close Others",
diff --git a/src/renderer/src/lib/conversation-surface-switch.test.tsx b/src/renderer/src/lib/conversation-surface-switch.test.tsx
index 2adb9b41bae3..a5dae407336a 100644
--- a/src/renderer/src/lib/conversation-surface-switch.test.tsx
+++ b/src/renderer/src/lib/conversation-surface-switch.test.tsx
@@ -68,9 +68,6 @@ vi.mock('@/components/native-chat/structured-agent-session-read-owner-registry',
 vi.mock('@/components/tab-bar/cli-chat-resume-run', () => ({
   runLegacyCliChatResume: mocks.legacy
 }))
-vi.mock('@/components/tab-bar/native-chat-cli-switch-run', () => ({
-  runLegacyNativeChatCliSwitch: mocks.legacy
-}))
 vi.mock('@/components/tab-bar/cli-chat-resume-feedback', () => ({
   switchIntoOwnerLegacy: mocks.legacy
 }))
@@ -147,9 +144,28 @@ it('reports a refused switch once and leaves nothing pending', async () => {
   await expect(runConversationSwitch(subject)).resolves.toBe(true)
 })
 
-it('falls back to the legacy path when the host cannot switch in place', async () => {
+it('keeps the earlier chat resume where the agent or host has no in-place switch', async () => {
+  mocks.support.mockResolvedValue(false)
+  const source = {
+    tabId: 'terminal',
+    workspaceId: 'workspace',
+    paneKey: 'terminal:leaf',
+    agent: 'omp' as const,
+    providerSessionId: 'omp-session',
+    executionHostId: 'local' as const,
+    ptyId: 'pty'
+  }
+  await expect(
+    runConversationSwitch({ direction: 'chat', ...source, source, agent: 'omp' })
+  ).resolves.toBe(false)
+  expect(mocks.legacy).toHaveBeenCalledWith(source, expect.any(Function))
+  expect(mocks.call).not.toHaveBeenCalled()
+})
+
+it('stops nothing when a chat switch races a host that cannot switch in place', async () => {
   mocks.support.mockResolvedValue(false)
   await expect(runConversationSwitch(subject)).resolves.toBe(false)
-  expect(mocks.legacy).toHaveBeenCalledOnce()
+  expect(mocks.legacy).not.toHaveBeenCalled()
   expect(mocks.call).not.toHaveBeenCalled()
+  expect(mocks.error).toHaveBeenCalledOnce()
 })
diff --git a/src/renderer/src/lib/conversation-surface-switch.ts b/src/renderer/src/lib/conversation-surface-switch.ts
index 840e3ac3e512..067342a1a083 100644
--- a/src/renderer/src/lib/conversation-surface-switch.ts
+++ b/src/renderer/src/lib/conversation-surface-switch.ts
@@ -2,17 +2,15 @@ import { adoptingAgentOnHost } from '@/components/right-sidebar/ai-vault-session
 import { translate } from '@/i18n/i18n'
 import { agentLabel } from '../../../shared/ai-vault-session-filters'
 import type { ConfirmationDialogContextValue } from '@/components/confirmation-dialog-context'
-import {
-  inPlaceSwitchEnabled,
-  adoptsCliConversations
-} from '../../../shared/structured-agent-cli-conversation-adoption'
+import { adoptsCliConversations } from '../../../shared/structured-agent-cli-conversation-adoption'
 import { toHostSessionPaneKey } from '../../../shared/terminal-surface-id'
 import { parseExecutionHostId, type ExecutionHostId } from '../../../shared/execution-host'
 import { toast } from 'sonner'
 import { useAppStore } from '@/store'
 import {
   conversationSwitchFailureText,
-  conversationSwitchSourceKept
+  conversationSwitchSourceKept,
+  conversationSwitchUnsupportedText
 } from './conversation-switch-feedback'
 import { structuredAgentSessionTargetForHost } from '@/runtime/structured-agent-session-owner'
 import {
@@ -68,7 +66,7 @@ export function runNativeChatCliSwitch(
  * exit is visible: the tab is replaced, or it stays as it was with one message.
  */
 export async function runConversationSwitch(args: ConversationSwitch): Promise<boolean> {
-  if (!inPlaceSwitchEnabled(args.agent) || pendingNow(args)) {
+  if (pendingNow(args)) {
     return false
   }
   args = withConversationSwitchPlatform(args)
@@ -80,7 +78,6 @@ export async function runConversationSwitch(args: ConversationSwitch): Promise<b
     feedback(conversationSwitchFailureText(new Error('host unavailable'), args), 'error')
     return false
   }
-  const deadline = agentSessionSwitchDeadline(Date.now, AGENT_SESSION_SWITCH_CLIENT_MS)
   const key = keyFor(args)
   pending.set(key, {
     chatTabId: args.source?.tabId ?? args.chatTabId ?? null,
@@ -89,11 +86,13 @@ export async function runConversationSwitch(args: ConversationSwitch): Promise<b
   })
   conversationSwitchChanged()
   let consented = false
+  let disposeDeadline: (() => void) | undefined
   try {
-    const supported = await deadline.wait(supportsInPlaceSwitch(target, args.agent, true))
-    if (!supported && args.legacyContinue) {
-      consented = true
-      await args.legacyContinue()
+    const supported = await withinSwitchBudget(supportsInPlaceSwitch(target, args.agent, true))
+    // The chat's surfaces offer the copy where the host can't switch; a click that raced the
+    // host's answer stops nothing and says so.
+    if (!supported && args.direction === 'terminal') {
+      feedback(conversationSwitchUnsupportedText(args.agent), 'error')
       return false
     }
     if (conversationSwitchReplying(args)) {
@@ -113,10 +112,14 @@ export async function runConversationSwitch(args: ConversationSwitch): Promise<b
       }
     }
     consented = true
+    // An agent or host without the in-place switch keeps the earlier chat resume.
     if (!supported) {
       await runLegacyConversationSwitch(args, target)
       return false
     }
+    // Time spent answering the consent dialog is not the switch's budget.
+    const deadline = agentSessionSwitchDeadline(Date.now, AGENT_SESSION_SWITCH_CLIENT_MS)
+    disposeDeadline = deadline.dispose
     const { sessionId, execution } = await switchRequest(args, hostId, deadline)
     const answer = await deadline.wait(
       callStructuredAgentSession<AgentSessionSwitchResult>(
@@ -145,7 +148,7 @@ export async function runConversationSwitch(args: ConversationSwitch): Promise<b
     feedback(conversationSwitchFailureText(error, args), 'error')
     return false
   } finally {
-    deadline.dispose()
+    disposeDeadline?.()
     pending.delete(key)
     conversationSwitchChanged()
     if (consented) {
@@ -154,6 +157,16 @@ export async function runConversationSwitch(args: ConversationSwitch): Promise<b
   }
 }
 
+/** The capability read before consent gets the same budget as the switch, but its own clock. */
+async function withinSwitchBudget<T>(work: Promise<T>): Promise<T> {
+  const budget = agentSessionSwitchDeadline(Date.now, AGENT_SESSION_SWITCH_CLIENT_MS)
+  try {
+    return await budget.wait(work)
+  } finally {
+    budget.dispose()
+  }
+}
+
 /** The host call's identity and execution facts, captured after consent. */
 async function switchRequest(
   args: ConversationSwitch,
diff --git a/src/renderer/src/lib/conversation-switch-feedback.ts b/src/renderer/src/lib/conversation-switch-feedback.ts
index 4b192e7ec83c..b534adc189f3 100644
--- a/src/renderer/src/lib/conversation-switch-feedback.ts
+++ b/src/renderer/src/lib/conversation-switch-feedback.ts
@@ -102,3 +102,11 @@ export function conversationSwitchSourceKept(agent: AiVaultAgent): string {
     { agent: agentLabel(agent) }
   )
 }
+
+export function conversationSwitchUnsupportedText(agent: AiVaultAgent): string {
+  return translate(
+    'components.tab.bar.switch.hostCannotSwitch',
+    'Orca on this host cannot switch {{agent}} in place. Update Orca there, or open a copy with Continue with Terminal Agent.',
+    { agent: agentLabel(agent) }
+  )
+}
diff --git a/src/renderer/src/lib/conversation-switch-legacy.ts b/src/renderer/src/lib/conversation-switch-legacy.ts
index e6a363799db2..8b01d61d79c3 100644
--- a/src/renderer/src/lib/conversation-switch-legacy.ts
+++ b/src/renderer/src/lib/conversation-switch-legacy.ts
@@ -2,7 +2,6 @@ import { toast } from 'sonner'
 import { conversationSwitchFailureText } from './conversation-switch-feedback'
 import { adoptsCliConversations } from '../../../shared/structured-agent-cli-conversation-adoption'
 import { runLegacyCliChatResume } from '@/components/tab-bar/cli-chat-resume-run'
-import { runLegacyNativeChatCliSwitch } from '@/components/tab-bar/native-chat-cli-switch-run'
 import { switchIntoOwnerLegacy } from '@/components/tab-bar/cli-chat-resume-feedback'
 
 import { newAgentLaunchRequestId } from './agent-launch-request-id'
@@ -10,16 +9,10 @@ import { resumeAiVaultSessionInNewChat } from '@/components/right-sidebar/ai-vau
 
 import type { ConversationSwitch } from './conversation-switch-state'
 import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
+/** A chat move where the agent or host has no in-place switch: the earlier resume into a chat. */
 export function runLegacyConversationSwitch(args: ConversationSwitch, target: RuntimeClientTarget) {
   const reportFailure = (error: unknown) => toast.error(conversationSwitchFailureText(error, args))
-  if (args.direction === 'terminal' && args.sessionId) {
-    return runLegacyNativeChatCliSwitch({
-      ...args,
-      sessionId: args.sessionId,
-      chatTabId: args.chatTabId ?? null,
-      reportFailure
-    })
-  } else if (args.source) {
+  if (args.source) {
     return runLegacyCliChatResume(args.source, reportFailure)
   } else if (args.sessionId) {
     return switchIntoOwnerLegacy(
diff --git a/src/renderer/src/lib/conversation-switch-state.ts b/src/renderer/src/lib/conversation-switch-state.ts
index 6f3ed9d37e3f..d91fadbe5b06 100644
--- a/src/renderer/src/lib/conversation-switch-state.ts
+++ b/src/renderer/src/lib/conversation-switch-state.ts
@@ -18,7 +18,6 @@ import type { AiVaultSession, AiVaultAgent } from '../../../shared/ai-vault-type
 import type { CliChatResumeSource } from '@/components/tab-bar/cli-chat-resume-source'
 
 export type ConversationSwitch = {
-  legacyContinue?: () => Promise<void>
   confirm?: ConfirmationDialogContextValue
   direction: 'chat' | 'terminal'
   executionHostId: string
diff --git a/src/renderer/src/lib/in-place-switch-support.ts b/src/renderer/src/lib/in-place-switch-support.ts
index 4f113d542f4e..523adec37be0 100644
--- a/src/renderer/src/lib/in-place-switch-support.ts
+++ b/src/renderer/src/lib/in-place-switch-support.ts
@@ -89,7 +89,8 @@ export function inPlaceSwitchSupportedNow(host: string | null | undefined, agent
   return inPlaceSwitchCapabilityNow(host, agent) === true
 }
 
-/** Whether the host running this conversation switches it in place; false until it answered yes. */
+/** Whether the host running this conversation switches it in place: undefined until it answers.
+ *  Every surface reads it the same way: false offers the copy, undefined shows the switch disabled. */
 export function useInPlaceSwitchCapability(
   executionHostId: string | null | undefined,
   agent: string | null | undefined
@@ -108,11 +109,13 @@ export function useInPlaceSwitchSupported(
   return useInPlaceSwitchCapability(host, agent) === true
 }
 
-/** A History row's agent when its host switches it in place: the row offers the switch, not a copy. */
+/** A History row's agent unless its host answered that it doesn't switch this agent in place: the
+ *  row then offers the copy, and until the host answers it shows the switch disabled. */
 export function useAiVaultInPlaceAgent(session: {
   agent: AiVaultAgent
   executionHostId?: string | null
 }): AiVaultAgent | undefined {
-  useInPlaceSwitchCapability(session.executionHostId, session.agent)
-  return inPlaceSwitchEnabled(session.agent) ? session.agent : undefined
+  return useInPlaceSwitchCapability(session.executionHostId, session.agent) === false
+    ? undefined
+    : session.agent
 }

From dc5350835cb62596aeaed44a1c52967c734b1a43 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 19:17:03 -0700
Subject: [PATCH 147/207] End a switch's terminal no tab will show after a
 connected failure

A chat-to-terminal switch that failed after its terminal started (the
work went stale, the layout write failed, or the deadline passed) left a
resumed CLI running with no tab. With the client still connected, that
terminal is now ended, fenced to its exact process and only while nothing
views it. A refused or unreachable end leaves it for a retry to adopt
through the conversation's claim, and a lost connection never ends it.
---
 ...red-agent-session-switch-execution.test.ts | 51 +++++++++++++++++++
 ...agent-session-switch-terminal-execution.ts | 26 +++++++---
 .../agent-session/switch-terminal-spawn.ts    | 25 +++++++++
 3 files changed, 94 insertions(+), 8 deletions(-)

diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
index 020e5648d1b7..b4d907e6fd3f 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
@@ -446,6 +446,57 @@ it('puts the switched terminal in the chat tab’s slot and closes the chat tab,
   ).toBe(false)
 })
 
+it.each([
+  ['connected', 1],
+  ['viewed', 0],
+  ['adopted', 0],
+  ['disconnected', 0]
+] as const)(
+  'ends a terminal no tab will show only for a connected client, fenced and unviewed: %s',
+  async (shape, discards) => {
+    const { runtime } = setupMainOwnedWorkspace()
+    vi.spyOn(runtime, 'resolveTerminalWorkspaceLaunchScope').mockResolvedValue({
+      id: WORKTREE_ID,
+      path: rig.root,
+      connectionId: null,
+      repo: null,
+      folderWorkspace: null
+    })
+    const incarnationId = '55555555-5555-4555-8555-555555555555'
+    const killFenced = vi.fn(async () => ({ outcome: 'ended' as const }))
+    runtime.setPtyController({
+      spawn: async () => ({ id: 'switch-pty', incarnationId }),
+      killFenced,
+      write: () => true,
+      kill: () => true,
+      stopAndWait: async () => true,
+      getForegroundProcess: async () => null
+    })
+    const spawn = runtime.spawnSwitchTerminal.bind(runtime)
+    vi.spyOn(runtime, 'spawnSwitchTerminal').mockImplementation(async (...args) => ({
+      ...(await spawn(...args)),
+      ...(shape === 'adopted' ? { agentSessionDisposition: 'adopted' as const } : {})
+    }))
+    vi.spyOn(runtime, 'hasTerminalViewer').mockReturnValue(shape === 'viewed')
+    vi.spyOn(runtime, 'placeSwitchTerminal').mockRejectedValue(new Error('terminal_handle_stale'))
+    const result = await executeStructuredSessionSwitch(
+      { sessionId: id, execution: { invocationId: `to-terminal-${shape}` } },
+      { runtime, ...(shape === 'disconnected' ? { signal: AbortSignal.abort() } : {}) },
+      'terminal'
+    )
+    expect(result.status).not.toBe('completed')
+    expect(killFenced).toHaveBeenCalledTimes(discards)
+    if (discards) {
+      expect(killFenced).toHaveBeenCalledWith({
+        id: 'switch-pty',
+        expectedIncarnationId: incarnationId,
+        requireNoAgentOwner: false,
+        requireUnattached: false
+      })
+    }
+  }
+)
+
 it('re-issuing a switch whose first answer was lost adopts the terminal it started', async () => {
   await savedTranscript()
   const { runtime, session } = setupMainOwnedWorkspace()
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts
index 33d399f8f047..2b007a0e367c 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts
@@ -82,14 +82,24 @@ export async function executeStructuredSessionTerminalSwitch(
       signal: deadline.signal
     })
   )
-  check()
-  const placed = await ctx.runtime.placeSwitchTerminal(record.location.workspaceId, {
-    terminal,
-    chatSessionId: sessionId,
-    windowTabId: execution?.sourceTabId,
-    activate: true,
-    focusWindow: agentLaunchMovesHostWindow(ctx)
-  })
+  let placed: Awaited<ReturnType<typeof ctx.runtime.placeSwitchTerminal>>
+  try {
+    check()
+    placed = await ctx.runtime.placeSwitchTerminal(record.location.workspaceId, {
+      terminal,
+      chatSessionId: sessionId,
+      windowTabId: execution?.sourceTabId,
+      activate: true,
+      focusWindow: agentLaunchMovesHostWindow(ctx)
+    })
+  } catch (error) {
+    // A connected client hears this failure and keeps its chat, so nothing will show this
+    // terminal; after a lost connection the client's retry adopts it instead.
+    if (!ctx.signal?.aborted) {
+      await ctx.runtime.discardSwitchTerminal(terminal)
+    }
+    throw error
+  }
   // A chat tab the layout owner kept stays listed; only a replaced one leaves the saved tabs.
   if (placed.replaced) {
     await host.setSessionTabVisibility(sessionId, false)
diff --git a/src/main/runtime/session-construction/agent-session/switch-terminal-spawn.ts b/src/main/runtime/session-construction/agent-session/switch-terminal-spawn.ts
index 5ec78da65994..6fcf76f9ac67 100644
--- a/src/main/runtime/session-construction/agent-session/switch-terminal-spawn.ts
+++ b/src/main/runtime/session-construction/agent-session/switch-terminal-spawn.ts
@@ -101,4 +101,29 @@ export abstract class OrcaRuntimeWithSpawnSwitchTerminal extends OrcaRuntimeWith
       signal: args.signal
     })
   }
+
+  /**
+   * A switch's terminal that no tab will show once the switch failed with its client connected:
+   * ended only while it is still that exact process and nothing views it. Refused or unreachable,
+   * it stays for a retry's create to adopt through the claim; one it adopted was never its own.
+   */
+  async discardSwitchTerminal(terminal: RuntimeTerminalCreate): Promise<void> {
+    const pty = terminal.ptyId ? this.ptysById.get(terminal.ptyId) : undefined
+    if (
+      !pty?.incarnationId ||
+      terminal.agentSessionDisposition === 'adopted' ||
+      this.hasTerminalViewer(pty.ptyId)
+    ) {
+      return
+    }
+    // Main attaches what it spawns, so the viewer check is main's own, as for a window's fenced kill.
+    await this.ptyController
+      ?.killFenced?.({
+        id: pty.ptyId,
+        expectedIncarnationId: pty.incarnationId,
+        requireNoAgentOwner: false,
+        requireUnattached: false
+      })
+      .catch(() => undefined)
+  }
 }

From ba7b302594bd1bd75450f374e544931aaa716969 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 19:32:40 -0700
Subject: [PATCH 148/207] Let a switch take the selection only from a tab that
 still holds it

A chat-terminal switch always selected its new tab and revealed its
workspace, even when the user had picked another tab while it ran. The
new tab still takes the replaced tab's slot, but takes the selection only
when no other tab of that group holds it at the moment the replace lands.
Each layout owner decides this in its own write: the window's terminal
reveal, the window's apply of a replaced chat, main's saved layout, and
the session snapshot paired clients mirror. The older-host chat resume
uses the same rule.
---
 .../agent-session/agent-session-tab-layout.ts |  16 ++
 .../main-owned-workspace-runtime-fixture.ts   |   3 +-
 ...red-agent-session-switch-execution.test.ts |  18 ++-
 .../session-tabs/session-tab-replace.test.ts  |  25 +++
 .../session-tabs/session-tab-replace.ts       |   7 +-
 .../structured-session-tab-restoration.ts     |  38 ++++-
 .../terminal-presentation-ipc-bridge.ts       |   6 +-
 ...nal-presentation-replace-selection.test.ts | 107 +++++++++++++
 ...tructured-agent-session-provisional-tab.ts |  11 +-
 .../src/lib/replaced-tab-selection.ts         |  14 ++
 ...l-structured-session-replaced-slot.test.ts | 146 ++++++++++--------
 .../snapshot-apply.ts                         |  11 ++
 12 files changed, 317 insertions(+), 85 deletions(-)
 create mode 100644 src/renderer/src/hooks/ipc-events/terminal-presentation-replace-selection.test.ts
 create mode 100644 src/renderer/src/lib/replaced-tab-selection.ts

diff --git a/src/main/runtime/agent-session/agent-session-tab-layout.ts b/src/main/runtime/agent-session/agent-session-tab-layout.ts
index 85f46583f105..c3cf03c59422 100644
--- a/src/main/runtime/agent-session/agent-session-tab-layout.ts
+++ b/src/main/runtime/agent-session/agent-session-tab-layout.ts
@@ -128,6 +128,22 @@ export function chatTabId(sessionId: string): string {
 }
 
 /** Select in the existing view without rebuilding membership from a partial runtime snapshot. */
+/** Whether a same-slot replace may take the selection from this tab in the saved view: unless
+ *  another tab of its group holds it. */
+export function savedTabHoldsSelection(
+  hostId: ExecutionHostId,
+  session: WorkspaceSessionState,
+  worktreeId: string,
+  tabId: string
+): boolean {
+  const { loaded } = loadChatTabLayout(hostId, session, worktreeId)
+  const group = loaded.layout.workspaces[worktreeId]?.groups.find((row) =>
+    row.tabOrder.includes(tabId)
+  )
+  const active = group && loaded.desktopView.groups[worktreeId]?.[group.id]?.activeTabId
+  return active == null || active === tabId
+}
+
 export function withSelectedChatTab(
   hostId: ExecutionHostId,
   session: WorkspaceSessionState,
diff --git a/src/main/runtime/main-owned-workspace-runtime-fixture.ts b/src/main/runtime/main-owned-workspace-runtime-fixture.ts
index 438e4925ea3e..7bc31f1062ef 100644
--- a/src/main/runtime/main-owned-workspace-runtime-fixture.ts
+++ b/src/main/runtime/main-owned-workspace-runtime-fixture.ts
@@ -164,6 +164,7 @@ export function setupMainOwnedWorkspace(
     frames: () => frames,
     handleOf,
     ptyRecord: (ptyId: string) => internals.ptysById.get(ptyId),
-    session: () => current
+    session: () => current,
+    setSession: write
   }
 }
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
index b4d907e6fd3f..fdd2941777d9 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
@@ -28,7 +28,7 @@ import type { AiVaultPrepareSessionResumeResult } from '../../../../shared/ai-va
 import { refusedMobileSessionTabClose } from '../../mobile-session-tab-close-outcome'
 import { AGENT_SESSION_SWITCH_HOST_MS } from '../../../../shared/agent-session-switch-execution'
 import { DaemonRequestTimeoutError } from '../../../daemon/daemon-errors'
-import { chatTabId } from '../../agent-session/agent-session-tab-layout'
+import { chatTabId, withSelectedChatTab } from '../../agent-session/agent-session-tab-layout'
 import { ClaimedAgentPtyOwnerRegistry } from '../../../../shared/claimed-agent-pty-owner'
 import type { RuntimePtyController } from '../../runtime-pty-controller-contract'
 
@@ -115,7 +115,7 @@ async function savedTranscript(sessionId = id) {
   return readable
 }
 
-it.each(['single', 'split', 'other-workspace'] as const)(
+it.each(['single', 'split', 'other-workspace', 'reselected'] as const)(
   'uses ordinary exact physical exit and source placement, retaining siblings: %s',
   async (shape) => {
     const split = shape === 'split'
@@ -149,7 +149,7 @@ it.each(['single', 'split', 'other-workspace'] as const)(
       ).toMatchObject({ ok: true })
     }
     await savedTranscript(sessionId)
-    const { runtime, session } = setupMainOwnedWorkspace({ split: shape === 'split' })
+    const { runtime, session, setSession } = setupMainOwnedWorkspace({ split: shape === 'split' })
     const incarnationId = '11111111-1111-4111-8111-111111111111'
     runtime.registerPty(PTY_A, WORKTREE_ID, null, { tabId: TAB_ID, leafId: LEAF_A, incarnationId })
     const source = runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_A}`, WORKTREE_ID)
@@ -180,6 +180,10 @@ it.each(['single', 'split', 'other-workspace'] as const)(
         tabId: 'agent-session:later-tab'
       })
     ).toMatchObject({ ok: true })
+    // The user picked another tab while the switch ran: the chat takes the slot, not the selection.
+    if (shape === 'reselected') {
+      setSession(withSelectedChatTab('local', session(), WORKTREE_ID, 'later-tab') ?? session())
+    }
     if (elsewhere) {
       await runtime.publishStructuredAgentSessionTab({
         workspaceId: destinationWorkspace,
@@ -244,7 +248,9 @@ it.each(['single', 'split', 'other-workspace'] as const)(
         ...(elsewhere ? [] : ['agent-session:later-tab'])
       ]
     )
-    expect(group?.activeTabId).toBe(savedDestination)
+    expect(group?.activeTabId).toBe(
+      shape === 'reselected' ? 'agent-session:later-tab' : savedDestination
+    )
     if (existingDestination) {
       expect(
         session().unifiedTabs?.[destinationWorkspace]?.find(
@@ -253,7 +259,9 @@ it.each(['single', 'split', 'other-workspace'] as const)(
       ).toBe(existingDestination.tabId)
     }
     const published = await runtime.listMobileSessionTabs(`id:${destinationWorkspace}`)
-    expect(published.activeTabId).toBe(destination)
+    if (shape !== 'reselected') {
+      expect(published.activeTabId).toBe(destination)
+    }
     if (!split && !elsewhere) {
       // A whole tab is replaced in the one write: its rows are gone from the published snapshot.
       expect(
diff --git a/src/main/runtime/session-tabs/session-tab-replace.test.ts b/src/main/runtime/session-tabs/session-tab-replace.test.ts
index 3fa9e012a631..c08427e892fb 100644
--- a/src/main/runtime/session-tabs/session-tab-replace.test.ts
+++ b/src/main/runtime/session-tabs/session-tab-replace.test.ts
@@ -106,4 +106,29 @@ describe('replaceSessionTabInSnapshot', () => {
     ])
     expect(gone.tabs.at(-1)).not.toHaveProperty('replaces')
   })
+
+  it.each([
+    ['still holds it', 't0::l0', true],
+    ['lost it to another tab', 'agent-session:s1', false]
+  ])('takes the selection only from a replaced tab that %s', (_name, held, takes) => {
+    const next = replaceSessionTabInSnapshot(
+      { ...snapshot, tabGroups: [{ ...snapshot.tabGroups![0]!, activeTabId: held }] },
+      {
+        workspaceId: 'ws',
+        replacedTabId: 't0',
+        row: {
+          type: 'agent-session',
+          id: 'agent-session:s2',
+          title: 'Chat 2',
+          sessionId: 's2',
+          agent: 'codex',
+          isActive: false
+        },
+        activate: true
+      }
+    )
+    expect(next.tabs.at(-1)?.isActive).toBe(takes)
+    expect(next.tabGroups?.[0]?.activeTabId).toBe(takes ? 'agent-session:s2' : held)
+    expect(next.activeTabId).toBe(takes ? 'agent-session:s2' : snapshot.activeTabId)
+  })
 })
diff --git a/src/main/runtime/session-tabs/session-tab-replace.ts b/src/main/runtime/session-tabs/session-tab-replace.ts
index 210dc30d6e41..c9c09287f0dc 100644
--- a/src/main/runtime/session-tabs/session-tab-replace.ts
+++ b/src/main/runtime/session-tabs/session-tab-replace.ts
@@ -27,12 +27,17 @@ export function replaceSessionTabInSnapshot(
   existing: RuntimeMobileSessionTabsSnapshot | undefined,
   input: { workspaceId: string; replacedTabId: string; row: ReplacementRow; activate: boolean }
 ): RuntimeMobileSessionTabsSnapshot {
-  const { replacedTabId, activate } = input
+  const { replacedTabId } = input
   const replaced = new Set(existing ? rowsOfTab(existing, replacedTabId).map((row) => row.id) : [])
   const groups = existing?.tabGroups ?? [
     { id: getHeadlessMobileSessionGroupId(input.workspaceId), activeTabId: null, tabOrder: [] }
   ]
   const slot = groups.find((group) => group.tabOrder.includes(replacedTabId))
+  // Decided in this write: the new row takes the selection only from a tab that still holds its
+  // group's; with no slot here to read, the request's own choice stands.
+  const held = slot?.activeTabId
+  const activate =
+    input.activate && (!slot || (held != null && (held === replacedTabId || replaced.has(held))))
   // The hint names a tab this snapshot knew; a client that still shows it puts the row there.
   const row: ReplacementRow = {
     ...input.row,
diff --git a/src/main/runtime/session-tabs/structured-session-tab-restoration.ts b/src/main/runtime/session-tabs/structured-session-tab-restoration.ts
index d4135294e1f3..e7381093031b 100644
--- a/src/main/runtime/session-tabs/structured-session-tab-restoration.ts
+++ b/src/main/runtime/session-tabs/structured-session-tab-restoration.ts
@@ -1,4 +1,7 @@
-import { withSelectedChatTab } from '../agent-session/agent-session-tab-layout'
+import {
+  savedTabHoldsSelection,
+  withSelectedChatTab
+} from '../agent-session/agent-session-tab-layout'
 import type { OrcaRuntimeWithScheduleMobileSessionTabsChanged as ScheduleMobileSessionTabsChangedMethods } from './session-tabs-change-publication'
 import { getStructuredAgentSessionHost } from '../../native-chat/agent-session-wire/structured-agent-session-registry'
 import { LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host'
@@ -107,15 +110,34 @@ export abstract class OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce exten
     }
     // Window creates retain the window's own placement decision.
     input.check?.()
+    // A replace takes the selection only from a tab that still holds it, decided by the layout
+    // owner as it writes: here for main's layout, else by the window applying the replace.
+    let activate = input.activate
+    const windowReplaces = Boolean(
+      input.replaces && !ORCA_LAYOUT_OWNER_IS_MAIN && this.getAvailableAuthoritativeWindow()
+    )
     if (input.check && (ORCA_LAYOUT_OWNER_IS_MAIN || !this.getAvailableAuthoritativeWindow())) {
       const check = input.check
       const applied = await this.queueChatTabChanges(
-        () => [
-          {
-            worktreeId: input.workspaceId,
-            change: { open: { ...input, tabId: input.tabId ?? `agent-session:${input.sessionId}` } }
+        () => {
+          const session = this.getWorkspaceSessionForWorktree(input.workspaceId)
+          if (input.replaces && session) {
+            activate &&= savedTabHoldsSelection(
+              this.getWorkspaceSessionHostIdForWorktree(input.workspaceId),
+              session,
+              input.workspaceId,
+              input.replaces
+            )
           }
-        ],
+          return [
+            {
+              worktreeId: input.workspaceId,
+              change: {
+                open: { ...input, tabId: input.tabId ?? `agent-session:${input.sessionId}` }
+              }
+            }
+          ]
+        },
         () => {
           check()
           return true
@@ -129,7 +151,7 @@ export abstract class OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce exten
     }
     input.check?.()
     this.projectStructuredAgentSessionTab(input)
-    if (input.activate && input.check) {
+    if (activate && input.check) {
       // The saved view selects the chat the switch put in the slot; the window draws from it.
       this.commitWindowlessChatSession(input.workspaceId, (session) =>
         withSelectedChatTab(
@@ -140,7 +162,7 @@ export abstract class OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce exten
         )
       )
     }
-    if (input.activate && input.focusWindow !== false && input.check) {
+    if (activate && !windowReplaces && input.focusWindow !== false && input.check) {
       this.notifier?.focusEditorTab?.(
         input.tabId ?? host?.getSessionTabId(input.sessionId) ?? `agent-session:${input.sessionId}`,
         input.workspaceId
diff --git a/src/renderer/src/hooks/ipc-events/terminal-presentation-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/terminal-presentation-ipc-bridge.ts
index d739b4113e46..83d14bddc742 100644
--- a/src/renderer/src/hooks/ipc-events/terminal-presentation-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/terminal-presentation-ipc-bridge.ts
@@ -12,6 +12,7 @@ import { tryMakePaneKey } from './agent-status-routing'
 import { registerLaunchRecipe } from './launch-recipe-registration'
 import { wasAgentLaunchPaneClosedByUser } from '@/lib/agent-launch-pane-closes'
 import { revealWorkspaceSurface } from '@/lib/workspace-surface-reveal'
+import { replacedTabHoldsSelection } from '@/lib/replaced-tab-selection'
 import { useAppStore } from '../../store'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
 import {
@@ -57,8 +58,11 @@ export function registerTerminalPresentationIpcBridge(unsubs: (() => void)[]): v
           const store = useAppStore.getState()
           // A replace opens in the replaced tab's group and takes its slot once the tab exists.
           const replaced = replaces && findUnifiedTab(worktreeId, replaces.tabId)
+          // Decided in this write: a replace takes the selection only from a tab that still holds
+          // it; otherwise the terminal fills the slot without moving the user.
+          const takesSelection = !replaced || replacedTabHoldsSelection(store, worktreeId, replaced)
           const terminalPresentation = resolveTerminalPresentation({
-            presentation,
+            presentation: takesSelection ? presentation : 'background',
             activate,
             focus
           })
diff --git a/src/renderer/src/hooks/ipc-events/terminal-presentation-replace-selection.test.ts b/src/renderer/src/hooks/ipc-events/terminal-presentation-replace-selection.test.ts
new file mode 100644
index 000000000000..72204f547bb7
--- /dev/null
+++ b/src/renderer/src/hooks/ipc-events/terminal-presentation-replace-selection.test.ts
@@ -0,0 +1,107 @@
+import { expect, it, vi } from 'vitest'
+import type * as RuntimeRpcClientModule from '@/runtime/runtime-rpc-client'
+
+// The window's half of a chat→terminal switch, through the real store: the terminal takes the
+// chat's slot, and takes the selection only if the chat still held it when the replace landed.
+
+const mocks = vi.hoisted(() => ({
+  createTerminal: undefined as ((payload: Record<string, unknown>) => void) | undefined,
+  reply: vi.fn()
+}))
+vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } }))
+vi.mock('@/runtime/structured-agent-session-close', () => ({
+  closeStructuredAgentSession: vi.fn(() => Promise.resolve())
+}))
+vi.mock('@/runtime/runtime-rpc-client', async (actual) => ({
+  ...(await actual<typeof RuntimeRpcClientModule>()),
+  callRuntimeRpc: vi.fn(() => Promise.resolve({ ok: true }))
+}))
+vi.mock('@/lib/focus-terminal-tab-surface', () => ({ focusTerminalTabSurface: vi.fn() }))
+vi.mock('@/components/terminal/background-terminal-worktree-mount', () => ({
+  requestBackgroundTerminalWorktreeMount: vi.fn()
+}))
+
+const { createTabsSliceMockApi } = await import('@/store/slices/tabs-slice-test-harness')
+const api = createTabsSliceMockApi()
+Object.assign(api.ui, {
+  onLaunchRecipe: () => () => {},
+  onRequestTerminalTabMount: () => () => {},
+  onCreateTerminal: (listener: (payload: Record<string, unknown>) => void) => {
+    mocks.createTerminal = listener
+    return () => {}
+  },
+  replyTerminalCreate: mocks.reply
+})
+Object.assign(window, { dispatchEvent: () => true })
+const { createTestStore, makeTabGroup, makeUnifiedTab, makeTab, makeWorktree, seedStore } =
+  await import('@/store/slices/store-test-helpers')
+const store = createTestStore()
+vi.mock('@/store', () => ({ useAppStore: store }))
+
+const { registerTerminalPresentationIpcBridge } = await import('./terminal-presentation-ipc-bridge')
+registerTerminalPresentationIpcBridge([])
+
+const WT = 'repo1::/tmp/wt1'
+const GROUP = 'group-1'
+const TERMINAL = 'aaaaaaaa-bbbb-4ccc-8ddd-eeeeeeeeeeee'
+
+it.each([
+  ['still held it', 'chat-tab', TERMINAL],
+  ['lost it to another tab', 'u-other', 'u-other']
+])('takes the chat’s slot, and its selection only if the chat %s', (_name, active, after) => {
+  seedStore(store, {
+    activeWorktreeId: WT,
+    worktreesByRepo: { repo1: [makeWorktree({ id: WT, repoId: 'repo1', path: '/tmp/wt1' })] },
+    tabsByWorktree: { [WT]: [makeTab({ id: 'other', worktreeId: WT })] },
+    unifiedTabsByWorktree: {
+      [WT]: [
+        makeUnifiedTab({
+          id: 'chat-tab',
+          entityId: 'session-1',
+          groupId: GROUP,
+          worktreeId: WT,
+          contentType: 'agent-session',
+          executionHostId: 'local'
+        }),
+        makeUnifiedTab({
+          id: 'u-other',
+          entityId: 'other',
+          groupId: GROUP,
+          worktreeId: WT,
+          contentType: 'terminal'
+        })
+      ]
+    },
+    groupsByWorktree: {
+      [WT]: [
+        makeTabGroup({
+          id: GROUP,
+          worktreeId: WT,
+          activeTabId: active,
+          tabOrder: ['chat-tab', 'u-other'],
+          recentTabIds: [active]
+        })
+      ]
+    },
+    layoutByWorktree: { [WT]: { type: 'leaf', groupId: GROUP } },
+    activeGroupIdByWorktree: { [WT]: GROUP },
+    openFiles: [],
+    browserTabsByWorktree: {}
+  })
+  mocks.createTerminal?.({
+    requestId: `request-${active}`,
+    worktreeId: WT,
+    ptyId: 'switch-pty',
+    tabId: TERMINAL,
+    leafId: '11111111-1111-4111-8111-111111111111',
+    activate: true,
+    focus: true,
+    replaces: { tabId: 'chat-tab' }
+  })
+  const group = store.getState().groupsByWorktree[WT]?.[0]
+  expect(group?.tabOrder).toEqual([TERMINAL, 'u-other'])
+  expect(group?.activeTabId).toBe(after)
+  expect(mocks.reply).toHaveBeenLastCalledWith(
+    expect.objectContaining({ tabId: TERMINAL, closed: ['chat-tab'] })
+  )
+})
diff --git a/src/renderer/src/lib/agent-session/structured-agent-session-provisional-tab.ts b/src/renderer/src/lib/agent-session/structured-agent-session-provisional-tab.ts
index dfc57c95e668..bca6934f2e51 100644
--- a/src/renderer/src/lib/agent-session/structured-agent-session-provisional-tab.ts
+++ b/src/renderer/src/lib/agent-session/structured-agent-session-provisional-tab.ts
@@ -6,6 +6,8 @@ import { nativeChatDraftPositions } from '@/components/native-chat/native-chat-c
 import { structuredAgentSessionTabId } from '../../../../shared/structured-agent-session-projection'
 import { afterPendingTab } from '@/runtime/layout-owner-pending-tabs'
 import { resolveWebSessionVisibleTabId } from '@/runtime/web-session-focus-intent'
+import { replacedTabHoldsSelection } from '@/lib/replaced-tab-selection'
+import { findUnifiedTab } from '@/lib/unified-tab-anchor-insertion'
 import type { NativeChatComposerFocusIntent } from '@/components/native-chat/use-native-chat-composer-reveal-focus'
 import type {
   AgentSessionLaunchPlan,
@@ -167,10 +169,15 @@ export function beginStructuredAgentSessionProvisionalLaunch(
       executionHostId: owner.executionHostId,
       target: owner.target,
       openAdmitted: (seedOptions) => {
-        // The host can answer after the user picked another tab; their newer selection wins.
+        // The host can answer after the user picked another tab; their newer selection wins, by the
+        // same rule as a same-slot replace: the tab shown at the action must still hold its group.
+        const shownAtAction = visibleAtAction ? findUnifiedTab(worktreeId, visibleAtAction) : null
         if (
           args.deferPublication &&
-          resolveWebSessionVisibleTabId(useAppStore.getState(), worktreeId) !== visibleAtAction
+          !(
+            shownAtAction &&
+            replacedTabHoldsSelection(useAppStore.getState(), worktreeId, shownAtAction)
+          )
         ) {
           focusIntent?.cancel()
           args = { ...args, activate: false }
diff --git a/src/renderer/src/lib/replaced-tab-selection.ts b/src/renderer/src/lib/replaced-tab-selection.ts
new file mode 100644
index 000000000000..3a97c0d1aff6
--- /dev/null
+++ b/src/renderer/src/lib/replaced-tab-selection.ts
@@ -0,0 +1,14 @@
+import type { AppState } from '@/store/types'
+
+/** A same-slot switch takes the selection only while the tab it replaces still holds it, judged
+ *  in its group when the replace lands: a user who picked another tab there keeps that choice. */
+export function replacedTabHoldsSelection(
+  state: Pick<AppState, 'groupsByWorktree'>,
+  worktreeId: string,
+  tab: { id: string; groupId: string }
+): boolean {
+  const active = state.groupsByWorktree[worktreeId]?.find(
+    (group) => group.id === tab.groupId
+  )?.activeTabId
+  return active == null || active === tab.id
+}
diff --git a/src/renderer/src/runtime/local-structured-session-replaced-slot.test.ts b/src/renderer/src/runtime/local-structured-session-replaced-slot.test.ts
index 77fa0415a9ae..d182f5602bfb 100644
--- a/src/renderer/src/runtime/local-structured-session-replaced-slot.test.ts
+++ b/src/renderer/src/runtime/local-structured-session-replaced-slot.test.ts
@@ -34,73 +34,85 @@ afterEach(() => {
   resetWebSessionTabsSnapshotFreshnessForTests()
 })
 
-it('puts the chat in the replaced terminal’s pinned slot and closes it without a reopen entry', () => {
-  const terminal = (id: string, isPinned = false) =>
-    makeUnifiedTab({
-      id,
-      entityId: id,
-      groupId: GROUP,
-      worktreeId: WORKTREE,
-      contentType: 'terminal',
-      isPinned
+it.each([
+  ['still held the selection', 'switched'],
+  ['lost the selection to another tab', 'after']
+])(
+  'puts the chat in the replaced terminal’s pinned slot, closing it as a replace, when it %s',
+  (_name, active) => {
+    const terminal = (id: string, isPinned = false) =>
+      makeUnifiedTab({
+        id,
+        entityId: id,
+        groupId: GROUP,
+        worktreeId: WORKTREE,
+        contentType: 'terminal',
+        isPinned
+      })
+    seedStore(store, {
+      activeWorktreeId: WORKTREE,
+      worktreesByRepo: {
+        'repo-1': [makeWorktree({ id: WORKTREE, repoId: 'repo-1', path: '/tmp/wt-switch' })]
+      },
+      tabsByWorktree: {
+        [WORKTREE]: ['before', 'switched', 'after'].map((id) =>
+          makeTab({ id, worktreeId: WORKTREE })
+        )
+      },
+      unifiedTabsByWorktree: {
+        [WORKTREE]: [terminal('before', true), terminal('switched', true), terminal('after')]
+      },
+      groupsByWorktree: {
+        [WORKTREE]: [
+          makeTabGroup({
+            id: GROUP,
+            worktreeId: WORKTREE,
+            activeTabId: active,
+            tabOrder: ['before', 'switched', 'after'],
+            recentTabIds: ['before', active]
+          })
+        ]
+      },
+      layoutByWorktree: { [WORKTREE]: { type: 'leaf', groupId: GROUP } },
+      activeGroupIdByWorktree: { [WORKTREE]: GROUP },
+      openFiles: [],
+      browserTabsByWorktree: {}
     })
-  seedStore(store, {
-    activeWorktreeId: WORKTREE,
-    worktreesByRepo: {
-      'repo-1': [makeWorktree({ id: WORKTREE, repoId: 'repo-1', path: '/tmp/wt-switch' })]
-    },
-    tabsByWorktree: {
-      [WORKTREE]: ['before', 'switched', 'after'].map((id) => makeTab({ id, worktreeId: WORKTREE }))
-    },
-    unifiedTabsByWorktree: {
-      [WORKTREE]: [terminal('before', true), terminal('switched', true), terminal('after')]
-    },
-    groupsByWorktree: {
-      [WORKTREE]: [
-        makeTabGroup({
-          id: GROUP,
-          worktreeId: WORKTREE,
-          activeTabId: 'switched',
-          tabOrder: ['before', 'switched', 'after'],
-          recentTabIds: ['switched']
-        })
-      ]
-    },
-    layoutByWorktree: { [WORKTREE]: { type: 'leaf', groupId: GROUP } },
-    activeGroupIdByWorktree: { [WORKTREE]: GROUP },
-    openFiles: [],
-    browserTabsByWorktree: {}
-  })
-  const reopenStack = store.getState().recentlyClosedTerminalTabsByWorktree
-  const frame: RuntimeMobileSessionTabsResult = {
-    worktree: WORKTREE,
-    publicationEpoch: 'renderer:switch',
-    snapshotVersion: 1,
-    activeGroupId: GROUP,
-    activeTabId: 'agent-session:session-1',
-    activeTabType: 'agent-session',
-    tabs: [
-      {
-        type: 'agent-session',
-        id: 'agent-session:session-1',
-        title: 'Codex',
-        sessionId: 'session-1',
-        agent: 'codex',
-        isActive: true,
-        replaces: { tabId: 'switched' }
-      }
-    ],
-    tabGroups: [{ id: GROUP, activeTabId: null, tabOrder: ['agent-session:session-1'] }]
-  }
+    const reopenStack = store.getState().recentlyClosedTerminalTabsByWorktree
+    const frame: RuntimeMobileSessionTabsResult = {
+      worktree: WORKTREE,
+      publicationEpoch: 'renderer:switch',
+      snapshotVersion: 1,
+      activeGroupId: GROUP,
+      activeTabId: 'agent-session:session-1',
+      activeTabType: 'agent-session',
+      tabs: [
+        {
+          type: 'agent-session',
+          id: 'agent-session:session-1',
+          title: 'Codex',
+          sessionId: 'session-1',
+          agent: 'codex',
+          isActive: true,
+          replaces: { tabId: 'switched' }
+        }
+      ],
+      tabGroups: [{ id: GROUP, activeTabId: null, tabOrder: ['agent-session:session-1'] }]
+    }
 
-  applyStructuredSessionTabSnapshots([frame])
+    applyStructuredSessionTabSnapshots([frame])
 
-  const state = store.getState()
-  const chat = state.unifiedTabsByWorktree[WORKTREE]?.find(
-    (tab) => tab.contentType === 'agent-session'
-  )
-  expect(state.groupsByWorktree[WORKTREE]?.[0]?.tabOrder).toEqual(['before', chat?.id, 'after'])
-  expect(chat?.isPinned).toBe(true)
-  expect(state.tabsByWorktree[WORKTREE]?.some((tab) => tab.id === 'switched')).toBe(false)
-  expect(state.recentlyClosedTerminalTabsByWorktree).toEqual(reopenStack)
-})
+    const state = store.getState()
+    const chat = state.unifiedTabsByWorktree[WORKTREE]?.find(
+      (tab) => tab.contentType === 'agent-session'
+    )
+    expect(state.groupsByWorktree[WORKTREE]?.[0]?.tabOrder).toEqual(['before', chat?.id, 'after'])
+    expect(chat?.isPinned).toBe(true)
+    expect(state.tabsByWorktree[WORKTREE]?.some((tab) => tab.id === 'switched')).toBe(false)
+    expect(state.recentlyClosedTerminalTabsByWorktree).toEqual(reopenStack)
+    // The chat takes the selection only from a terminal that still held it.
+    expect(state.groupsByWorktree[WORKTREE]?.[0]?.activeTabId).toBe(
+      active === 'switched' ? chat?.id : 'after'
+    )
+  }
+)
diff --git a/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts b/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts
index 82c148b11601..e42e4a7dafd7 100644
--- a/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts
+++ b/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts
@@ -36,6 +36,7 @@ import { closeStructuredAgentSession } from '../structured-agent-session-close'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
 import { useAppStore } from '../../store'
 import { closeTerminalTab } from '@/components/terminal/terminal-tab-actions'
+import { replacedTabHoldsSelection } from '@/lib/replaced-tab-selection'
 import { framesDrawWorkspace } from '../workspace-layout-frame-drawn-workspaces'
 import { drawnChatLabelChanges, type DrawnChatLabel } from './frame-drawn-chat-tabs'
 
@@ -263,6 +264,7 @@ function closeReplacedTerminalTabs(replacements: readonly ReplacedSessionTab[]):
     if (replaced.isPinned && !chat.isPinned) {
       useAppStore.getState().pinTab(chat.id, { recordInteraction: false })
     }
+    const takesSelection = replacedTabHoldsSelection(useAppStore.getState(), worktreeId, replaced)
     // Not a user close: a replace never feeds Reopen Closed Tab or drops the tab's drafts.
     closeTerminalTab(replaced.entityId, {
       reason: 'cleanup',
@@ -270,5 +272,14 @@ function closeReplacedTerminalTabs(replacements: readonly ReplacedSessionTab[]):
       skipRunningProcessConfirm: true,
       localPtyTeardownOwnedExternally: true
     })
+    // The chat takes the selection only from a terminal that still held it when the replace landed.
+    if (takesSelection) {
+      const store = useAppStore.getState()
+      store.activateTab(chat.id, { worktreeId })
+      if (store.activeWorktreeId === worktreeId) {
+        store.focusGroup(worktreeId, chat.groupId)
+        store.setActiveTabType('agent-session', worktreeId)
+      }
+    }
   }
 }

From 17da3df1143d39d4218735d3062263a8d1385758 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 19:35:12 -0700
Subject: [PATCH 149/207] Name the chat view Chat UI in the switch's labels,
 and drop dead switch code

The switch's labels and tooltips said "native chat"; they now say Chat UI,
as the rest of the app does. Two unused files and an unused host method
from earlier rounds are removed.
---
 ...structured-agent-session-attach-options.ts |  1 -
 .../structured-agent-session-host.ts          |  1 -
 ...tructured-agent-session-switch-commands.ts |  1 -
 .../AiVaultSessionDetailsSwitchButtons.tsx    |  2 +-
 .../AiVaultSessionSurfaceSwitchMenuItems.tsx  |  2 +-
 .../ai-vault-history-native-return.test.tsx   |  2 +-
 .../ai-vault-session-cli-fork-copy.tsx        |  2 +-
 .../ai-vault-session-in-place-switch.ts       |  2 +-
 .../TabSessionSurfaceSwitchMenuItems.test.tsx |  2 +-
 .../tab-bar/TabSessionSwitchHoverAction.tsx   |  2 +-
 ...alPaneResumeInChatButton.held-job.test.tsx |  2 +-
 .../TerminalPaneResumeInChatButton.test.tsx   |  6 +--
 .../TerminalPaneResumeInChatButton.tsx        |  4 +-
 src/renderer/src/i18n/locales/en.json         |  6 +--
 src/renderer/src/i18n/locales/es.json         |  6 +--
 src/renderer/src/i18n/locales/fr.json         |  6 +--
 src/renderer/src/i18n/locales/ja.json         |  6 +--
 src/renderer/src/i18n/locales/ko.json         |  6 +--
 src/renderer/src/i18n/locales/zh.json         |  6 +--
 ...runtime-environment-compatibility-cache.ts | 51 -------------------
 20 files changed, 31 insertions(+), 85 deletions(-)
 delete mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-attach-options.ts
 delete mode 100644 src/renderer/src/runtime/runtime-environment-compatibility-cache.ts

diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-attach-options.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-attach-options.ts
deleted file mode 100644
index bf4ce2b4999c..000000000000
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-attach-options.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type { StructuredAgentSessionAttachOptions } from './structured-agent-session-attach-context'
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
index 0b970bd49690..edd23f3b8ecf 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
@@ -204,7 +204,6 @@ export class StructuredAgentSessionHost extends StructuredAgentSessionHostContex
   captureSwitchWork = (
     ...args: Parameters<ReturnType<typeof structuredAgentSessionSwitchSource>['captureSwitchWork']>
   ) => this.switchSource().captureSwitchWork(...args)
-  switchExecuting = (id: string) => this.lifetime.switchExecuting(id)
 
   supportsCreate = (location: AgentSessionExecutionLocation, agent: string): boolean =>
     providerSupport.adapterSupportsCreate(this.deps.adapter, location, agent)
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-commands.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-commands.ts
index 58a9fc4e3555..f44360256b82 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-commands.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-commands.ts
@@ -80,7 +80,6 @@ export function createStructuredAgentSessionSwitchCommands(
         }
       },
       switchGeneration: (id: string) => commands.get(id)?.generation,
-      switchExecuting: (id: string) => Boolean(commands.get(id) && !commands.get(id)?.settled),
       /** Stop and spawn work already dispatched settles even when the observing request expired. */
       trackSwitchPhysical: <T>(id: string, work: Promise<T>): Promise<T> => {
         const command = commands.get(id)
diff --git a/src/renderer/src/components/right-sidebar/AiVaultSessionDetailsSwitchButtons.tsx b/src/renderer/src/components/right-sidebar/AiVaultSessionDetailsSwitchButtons.tsx
index fe964a2803ba..85bb19c39191 100644
--- a/src/renderer/src/components/right-sidebar/AiVaultSessionDetailsSwitchButtons.tsx
+++ b/src/renderer/src/components/right-sidebar/AiVaultSessionDetailsSwitchButtons.tsx
@@ -48,7 +48,7 @@ export function AiVaultSessionDetailsSwitchButtons({
         >
           <MessagesSquare className="size-3.5" />
           {inPlaceAgent
-            ? translate('components.tab.bar.switch.toNativeChat', 'Switch to native chat')
+            ? translate('components.tab.bar.switch.toNativeChat', 'Switch to Chat UI')
             : translate(
                 'auto.components.right.sidebar.AiVaultSessionRow.resumeInNewNativeChat',
                 'Resume in New Chat'
diff --git a/src/renderer/src/components/right-sidebar/AiVaultSessionSurfaceSwitchMenuItems.tsx b/src/renderer/src/components/right-sidebar/AiVaultSessionSurfaceSwitchMenuItems.tsx
index 758d2dbcfec9..6d1b1372ea81 100644
--- a/src/renderer/src/components/right-sidebar/AiVaultSessionSurfaceSwitchMenuItems.tsx
+++ b/src/renderer/src/components/right-sidebar/AiVaultSessionSurfaceSwitchMenuItems.tsx
@@ -65,7 +65,7 @@ export function AiVaultSessionSurfaceSwitchMenuItems({
                 'auto.components.right.sidebar.AiVaultSessionRow.resumeInNewNativeChat',
                 'Resume in New Chat'
               )
-            : translate('components.tab.bar.switch.toNativeChat', 'Switch to native chat')}
+            : translate('components.tab.bar.switch.toNativeChat', 'Switch to Chat UI')}
         </Item>
       ) : null}
       {onResumeInNewCli ? (
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx b/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx
index 3e94fa246e9d..81a66ea946a1 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx
+++ b/src/renderer/src/components/right-sidebar/ai-vault-history-native-return.test.tsx
@@ -190,7 +190,7 @@ it.each(['local', 'runtime:paired'] as const)(
       runtimeStatusByEnvironmentId: new Map([['paired', pairedHistoryStatus()]])
     })
     render(<History session={{ ...row, executionHostId: host }} />)
-    const button = await screen.findByRole('button', { name: 'Switch to native chat' })
+    const button = await screen.findByRole('button', { name: 'Switch to Chat UI' })
     expect(button.hasAttribute('disabled')).toBe(false)
     await userEvent.setup().click(button)
     expect(mocks.startOwner).toHaveBeenCalledWith(
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-session-cli-fork-copy.tsx b/src/renderer/src/components/right-sidebar/ai-vault-session-cli-fork-copy.tsx
index b05f0c666407..8ec7ace0efb7 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-session-cli-fork-copy.tsx
+++ b/src/renderer/src/components/right-sidebar/ai-vault-session-cli-fork-copy.tsx
@@ -28,7 +28,7 @@ export function SwitchToCliTooltipText({ agent }: { agent: AiVaultAgent }): Reac
     <>
       {translate(
         'components.tab.bar.switch.toCliTooltip',
-        'Switch to CLI: stops {{agent}} in native chat and continues the same conversation in a terminal.',
+        'Switch to CLI: stops {{agent}} in Chat UI and continues the same conversation in a terminal.',
         { agent: agentLabel(agent) }
       )}
     </>
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts b/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts
index 2ececd62fd4a..c7536945309e 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.ts
@@ -42,7 +42,7 @@ export function switchAiVaultSessionToCli(
   return true
 }
 
-/** History's "Switch to native chat": in place when a pane in this window last reported the
+/** History's "Switch to Chat UI": in place when a pane in this window last reported the
  *  conversation. False otherwise, so the row opens or reveals its chat in a new tab. */
 export function switchAiVaultSessionToNativeChat(
   session: AiVaultSession,
diff --git a/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx b/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx
index 2b228808a0bb..49f2ce720f18 100644
--- a/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx
+++ b/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx
@@ -187,7 +187,7 @@ describe('TabSessionSurfaceSwitchMenuItems', () => {
     }
     mocks.cliSource = source
     renderItemsNow()
-    fireEvent.click(screen.getByRole('menuitem', { name: 'Switch to native chat' }))
+    fireEvent.click(screen.getByRole('menuitem', { name: 'Switch to Chat UI' }))
     await act(async () => {})
     expect(mocks.runCliChatResume).toHaveBeenCalledWith(source, expect.any(Function))
     expect(mocks.listSessions).not.toHaveBeenCalled()
diff --git a/src/renderer/src/components/tab-bar/TabSessionSwitchHoverAction.tsx b/src/renderer/src/components/tab-bar/TabSessionSwitchHoverAction.tsx
index 772197c4d400..99168cb7063b 100644
--- a/src/renderer/src/components/tab-bar/TabSessionSwitchHoverAction.tsx
+++ b/src/renderer/src/components/tab-bar/TabSessionSwitchHoverAction.tsx
@@ -111,7 +111,7 @@ function TerminalSwitchAction({
       onClick={() => void runCliChatResume(source, confirm)}
     >
       {busy ? <Loader2 className="animate-spin" /> : <MessagesSquare />}
-      {translate('components.tab.bar.switch.toNativeChat', 'Switch to native chat')}
+      {translate('components.tab.bar.switch.toNativeChat', 'Switch to Chat UI')}
     </Button>
   )
 }
diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.held-job.test.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.held-job.test.tsx
index 5a55cced50e1..82a5a98b64a3 100644
--- a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.held-job.test.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.held-job.test.tsx
@@ -55,7 +55,7 @@ it.each(['suspended'] as const)(
         <TerminalPaneResumeInChatButton tabId="shell" worktreeId="wt-1" paneKey={paneKey} />
       </TooltipProvider>
     )
-    const header = screen.getByRole('button', { name: 'Switch to native chat', hidden: true })
+    const header = screen.getByRole('button', { name: 'Switch to Chat UI', hidden: true })
     expect(header.hasAttribute('disabled')).toBe(false)
     act(() =>
       useAppStore.getState().setPaneForegroundAgent(paneKey, { agent: null, shellForeground: true })
diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.test.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.test.tsx
index 4baa7918e5e2..882a53b5a1ea 100644
--- a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.test.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.test.tsx
@@ -46,8 +46,8 @@ beforeEach(() => {
 })
 
 it.each([
-  ['claude', 'Switch to native chat'],
-  ['codex', 'Switch to native chat']
+  ['claude', 'Switch to Chat UI'],
+  ['codex', 'Switch to Chat UI']
 ] as const)('offers the %s action for the exact pane and shares pending', (agent, label) => {
   mocks.source.agent = agent
   if (agent === 'claude') {
@@ -87,7 +87,7 @@ it('keeps an older host visible but disabled, telling the user to update it', as
     </TooltipProvider>
   )
   const button = screen.getByRole('button', {
-    name: 'Switch to native chat. Update Orca on this host to continue in Chat UI.'
+    name: 'Switch to Chat UI. Update Orca on this host to continue in Chat UI.'
   })
   expect(button.hasAttribute('disabled')).toBe(true)
   const trigger = button.parentElement
diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx
index eb446a4266c8..20d89099ba99 100644
--- a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx
@@ -36,7 +36,7 @@ export function TerminalPaneResumeInChatButton({
   )
   const busy = useConversationSwitchBusy(readiness.pending)
 
-  const label = translate('components.tab.bar.switch.toNativeChat', 'Switch to native chat')
+  const label = translate('components.tab.bar.switch.toNativeChat', 'Switch to Chat UI')
   const updateRequired = source?.hostUpdateRequired === true
   const tooltip = updateRequired
     ? translate(
@@ -53,7 +53,7 @@ export function TerminalPaneResumeInChatButton({
           ? label
           : translate(
               'components.tab.bar.switch.toNativeChatTooltip',
-              'Switch to native chat: continues the same conversation in a chat, in this tab.'
+              'Switch to Chat UI: continues the same conversation in a chat, in this tab.'
             )))
 
   return (
diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index 2169ce0ae091..96420d8a874d 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -20086,10 +20086,10 @@
         "switch": {
           "legacyCopy": "A copy of this {{agent}} conversation opens in a new terminal. The original chat stays open.",
           "toCli": "Switch to CLI",
-          "toNativeChat": "Switch to native chat",
-          "toCliTooltip": "Switch to CLI: stops {{agent}} in native chat and continues the same conversation in a terminal.",
+          "toNativeChat": "Switch to Chat UI",
+          "toCliTooltip": "Switch to CLI: stops {{agent}} in Chat UI and continues the same conversation in a terminal.",
           "openedInWorkspace": "Opened chat in {{workspace}}.",
-          "toNativeChatTooltip": "Switch to native chat: continues the same conversation in a chat, in this tab.",
+          "toNativeChatTooltip": "Switch to Chat UI: continues the same conversation in a chat, in this tab.",
           "noConversation": "No saved conversation is available in this terminal yet.",
           "openElsewhere": "{{agent}} is open in another chat or terminal. Continue there, then try switching again.",
           "stopUnknown": "Orca could not confirm {{agent}} stopped. Check its open chats and terminals, then try switching again.",
diff --git a/src/renderer/src/i18n/locales/es.json b/src/renderer/src/i18n/locales/es.json
index a6829c9bbc9f..9a6d3505e1be 100644
--- a/src/renderer/src/i18n/locales/es.json
+++ b/src/renderer/src/i18n/locales/es.json
@@ -19753,10 +19753,10 @@
         },
         "switch": {
           "toCli": "Cambiar a la CLI",
-          "toNativeChat": "Cambiar al chat nativo",
-          "toCliTooltip": "Cambiar a la CLI: detiene {{agent}} en el chat nativo y continúa la misma conversación en una terminal.",
+          "toNativeChat": "Cambiar a la interfaz de chat",
+          "toCliTooltip": "Cambiar a la CLI: detiene {{agent}} en la interfaz de chat y continúa la misma conversación en una terminal.",
           "openedInWorkspace": "Chat abierto en {{workspace}}.",
-          "toNativeChatTooltip": "Cambiar al chat nativo: continúa la misma conversación en un chat, en esta pestaña.",
+          "toNativeChatTooltip": "Cambiar a la interfaz de chat: continúa la misma conversación en un chat, en esta pestaña.",
           "noConversation": "Todavía no hay una conversación guardada disponible en este terminal."
         },
         "BrowserTab": {
diff --git a/src/renderer/src/i18n/locales/fr.json b/src/renderer/src/i18n/locales/fr.json
index 7239156e6157..f6a26682351f 100644
--- a/src/renderer/src/i18n/locales/fr.json
+++ b/src/renderer/src/i18n/locales/fr.json
@@ -19973,10 +19973,10 @@
         },
         "switch": {
           "toCli": "Passer à la CLI",
-          "toNativeChat": "Passer au chat natif",
-          "toCliTooltip": "Passer à la CLI : arrête {{agent}} dans le chat natif et poursuit la même conversation dans un terminal.",
+          "toNativeChat": "Passer à l'interface de chat",
+          "toCliTooltip": "Passer à la CLI : arrête {{agent}} dans l'interface de chat et poursuit la même conversation dans un terminal.",
           "openedInWorkspace": "Chat ouvert dans {{workspace}}.",
-          "toNativeChatTooltip": "Passer au chat natif : poursuit la même conversation dans un chat, dans cet onglet.",
+          "toNativeChatTooltip": "Passer à l'interface de chat : poursuit la même conversation dans un chat, dans cet onglet.",
           "noConversation": "Aucune conversation enregistrée n’est encore disponible dans ce terminal."
         },
         "BrowserTab": {
diff --git a/src/renderer/src/i18n/locales/ja.json b/src/renderer/src/i18n/locales/ja.json
index 26e614824a35..6c953fd8ac88 100644
--- a/src/renderer/src/i18n/locales/ja.json
+++ b/src/renderer/src/i18n/locales/ja.json
@@ -19219,10 +19219,10 @@
         },
         "switch": {
           "toCli": "CLI に切り替える",
-          "toNativeChat": "ネイティブチャットに切り替える",
-          "toCliTooltip": "CLI に切り替え: ネイティブチャットで {{agent}} を停止し、ターミナルで同じ会話を続けます。",
+          "toNativeChat": "チャット UI に切り替える",
+          "toCliTooltip": "CLI に切り替え: チャット UI で {{agent}} を停止し、ターミナルで同じ会話を続けます。",
           "openedInWorkspace": "{{workspace}} でチャットを開きました。",
-          "toNativeChatTooltip": "ネイティブチャットに切り替え: このタブのチャットで同じ会話を続けます。",
+          "toNativeChatTooltip": "チャット UI に切り替え: このタブのチャットで同じ会話を続けます。",
           "noConversation": "このターミナルには、保存された会話がまだありません。"
         },
         "BrowserTab": {
diff --git a/src/renderer/src/i18n/locales/ko.json b/src/renderer/src/i18n/locales/ko.json
index 2188c6c8bd79..e34c7c248126 100644
--- a/src/renderer/src/i18n/locales/ko.json
+++ b/src/renderer/src/i18n/locales/ko.json
@@ -19219,10 +19219,10 @@
         },
         "switch": {
           "toCli": "CLI로 전환",
-          "toNativeChat": "네이티브 채팅으로 전환",
-          "toCliTooltip": "CLI로 전환: 네이티브 채팅에서 {{agent}}을(를) 중지하고 터미널에서 같은 대화를 이어갑니다.",
+          "toNativeChat": "채팅 UI로 전환",
+          "toCliTooltip": "CLI로 전환: 채팅 UI에서 {{agent}}을(를) 중지하고 터미널에서 같은 대화를 이어갑니다.",
           "openedInWorkspace": "{{workspace}}에서 채팅을 열었습니다.",
-          "toNativeChatTooltip": "네이티브 채팅으로 전환: 이 탭의 채팅에서 같은 대화를 이어갑니다.",
+          "toNativeChatTooltip": "채팅 UI로 전환: 이 탭의 채팅에서 같은 대화를 이어갑니다.",
           "noConversation": "이 터미널에는 아직 저장된 대화가 없습니다."
         },
         "BrowserTab": {
diff --git a/src/renderer/src/i18n/locales/zh.json b/src/renderer/src/i18n/locales/zh.json
index 247ef04fc251..67e8d3fa9153 100644
--- a/src/renderer/src/i18n/locales/zh.json
+++ b/src/renderer/src/i18n/locales/zh.json
@@ -19185,10 +19185,10 @@
         },
         "switch": {
           "toCli": "切换到 CLI",
-          "toNativeChat": "切换到原生聊天",
-          "toCliTooltip": "切换到 CLI：停止原生聊天中的 {{agent}}，并在终端中继续同一对话。",
+          "toNativeChat": "切换到聊天界面",
+          "toCliTooltip": "切换到 CLI：停止聊天界面中的 {{agent}}，并在终端中继续同一对话。",
           "openedInWorkspace": "已在 {{workspace}} 中打开聊天。",
-          "toNativeChatTooltip": "切换到原生聊天：在此标签页的聊天中继续同一对话。",
+          "toNativeChatTooltip": "切换到聊天界面：在此标签页的聊天中继续同一对话。",
           "noConversation": "此终端中尚无可用的已保存对话。"
         },
         "BrowserTab": {
diff --git a/src/renderer/src/runtime/runtime-environment-compatibility-cache.ts b/src/renderer/src/runtime/runtime-environment-compatibility-cache.ts
deleted file mode 100644
index 384138cf00cf..000000000000
--- a/src/renderer/src/runtime/runtime-environment-compatibility-cache.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import type { RuntimeStatus } from '../../../shared/runtime-types'
-
-export const RUNTIME_COMPATIBILITY_CACHE_MAX = 32
-
-export const RECENT_RUNTIME_COMPATIBILITY_FAILURE_TTL_MS = 60_000
-
-// Why: capability verdicts must eventually follow a saved environment's version changes.
-export const RUNTIME_CAPABILITY_STATUS_TTL_MS = 60_000
-
-export type RuntimeCompatibilityCacheEntry = {
-  check: Promise<void>
-  failedAt: number | null
-  // False while probing so recovery can drop a doomed pending compatibility check.
-  provenCompatible: boolean
-  status: RuntimeStatus | null
-  statusCheckedAt: number | null
-}
-
-export const runtimeCompatibilityChecks = new Map<string, RuntimeCompatibilityCacheEntry>()
-
-/** A pending probe by default; an observed status is proof of itself. */
-export function compatibilityEntry(
-  status: RuntimeStatus | null = null,
-  provenCompatible = status !== null
-): RuntimeCompatibilityCacheEntry {
-  const statusCheckedAt = status ? Date.now() : null
-  return { check: Promise.resolve(), failedAt: null, provenCompatible, status, statusCheckedAt }
-}
-
-export function getCachedRuntimeCompatibilityCheck(
-  environmentId: string,
-  options: { reuseRecentCompatibilityFailure?: boolean }
-): RuntimeCompatibilityCacheEntry | null {
-  const cached = runtimeCompatibilityChecks.get(environmentId)
-  if (!cached) {
-    return null
-  }
-  if (
-    cached.failedAt !== null &&
-    Date.now() - cached.failedAt >= RECENT_RUNTIME_COMPATIBILITY_FAILURE_TTL_MS
-  ) {
-    runtimeCompatibilityChecks.delete(environmentId)
-    return null
-  }
-  if (cached.failedAt !== null && options.reuseRecentCompatibilityFailure !== true) {
-    return null
-  }
-  runtimeCompatibilityChecks.delete(environmentId)
-  runtimeCompatibilityChecks.set(environmentId, cached)
-  return cached
-}

From dcdeedfb5b3ac2189d99b2c9288739190fb97d3b Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 19:43:38 -0700
Subject: [PATCH 150/207] Keep the chat's turn-status test off main's modules

The renderer test that showed a switch-stopped CLI turn as Interrupted ran
main's transcript import itself, which pulled the main-process graph into
the web typecheck. The host half (import, switch stop, catch-up) is now a
main test that proves it leaves exactly a shared recorded journal; the
renderer test renders that journal.
---
 ...-agent-session-switch-stopped-turn.test.ts |  90 ++++++++++++
 ...NativeChatMessageList.turn-status.test.tsx | 131 ++++--------------
 .../switch-stopped-cli-turn.test-fixture.ts   |  61 ++++++++
 3 files changed, 181 insertions(+), 101 deletions(-)
 create mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-switch-stopped-turn.test.ts
 create mode 100644 src/shared/native-chat/switch-stopped-cli-turn.test-fixture.ts

diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-stopped-turn.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-stopped-turn.test.ts
new file mode 100644
index 000000000000..d3047a4c39f8
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-stopped-turn.test.ts
@@ -0,0 +1,90 @@
+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 { agentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
+import { claudeProviderHandle } from '../../../shared/agent-session-provider-handle-encoding'
+import { selectStructuredAgentTurnBars } from '../../../shared/structured-agent-session-turn-timing'
+import {
+  SWITCH_STOPPED_CLI_TURN_ID,
+  SWITCH_STOPPED_CLI_TURN_ITEMS,
+  SWITCH_STOPPED_CLI_USER_ITEM_KEY
+} from '../../../shared/native-chat/switch-stopped-cli-turn.test-fixture'
+import { createTrackedJournalOpener } from '../agent-session-journal/journal-host-database-test-support'
+import { importLegacyTranscriptIntoJournal } from '../agent-session-journal/journal-legacy-import'
+import {
+  captureSwitchStoppedCliTurn,
+  catchUpSwitchedCliTranscript
+} from './structured-agent-session-switch-import'
+
+// The host half of "a switch-stopped CLI turn shows Interrupted": the recorded working turn is
+// imported, stopped by the switch, and settles as a person's Stop with no invented elapsed time.
+// The journal it leaves is the shared fixture the chat's own test renders.
+it('settles an imported turn a switch stopped as a Stop, with no invented elapsed time', async () => {
+  const root = await mkdtemp(join(tmpdir(), 'orca-switch-stopped-turn-'))
+  const journals = createTrackedJournalOpener()
+  const deadline = agentSessionSwitchDeadline()
+  try {
+    const recording = await readFile(
+      join(import.meta.dirname, '__fixtures__/claude-cli-switch-2.1.302.jsonl'),
+      'utf8'
+    )
+    const rows = recording.trimEnd().split('\n')
+    const sessionId: string = JSON.parse(rows[0]!).sessionId
+    const filePath = join(root, 'cli.jsonl')
+    await writeFile(filePath, `${rows.slice(0, 2).join('\n')}\n`)
+    const source = { agent: 'claude' as const, sessionId, filePath }
+    const imported = await journals.open({
+      stateDirectory: root,
+      identity: {
+        sessionId: 'imported-stop',
+        workspaceId: 'folder',
+        hostId: 'local',
+        agent: 'claude',
+        providerHandle: claudeProviderHandle(sessionId, null)
+      }
+    })
+    expect(
+      await importLegacyTranscriptIntoJournal({
+        journal: imported,
+        agent: 'claude',
+        sessionId,
+        fence: 1,
+        options: { filePath }
+      })
+    ).toMatchObject({ ok: true, replaced: true })
+    // Still working when imported: nothing has settled yet.
+    expect(
+      selectStructuredAgentTurnBars(imported.snapshot().items, [], null).settledTurns.size
+    ).toBe(0)
+    const stopped = await captureSwitchStoppedCliTurn(source, true, deadline)
+    expect(stopped).toMatchObject({
+      userItemKey: SWITCH_STOPPED_CLI_USER_ITEM_KEY,
+      turnId: SWITCH_STOPPED_CLI_TURN_ID
+    })
+    await catchUpSwitchedCliTranscript({
+      journal: imported,
+      source,
+      fence: 1,
+      deadline,
+      stopped: stopped!
+    })
+    const snapshot = imported.snapshot()
+    expect(snapshot.items).toEqual(
+      SWITCH_STOPPED_CLI_TURN_ITEMS.map((item) =>
+        item.body.kind === 'turn' ? { ...item, observedAt: expect.any(Number) } : item
+      )
+    )
+    const bars = selectStructuredAgentTurnBars(snapshot.items, [], null)
+    expect(bars.settledTurns.get(SWITCH_STOPPED_CLI_USER_ITEM_KEY)).toEqual({
+      startedAt: null,
+      workedSeconds: null,
+      verdict: 'cancellation'
+    })
+    expect(bars.runningTiming).toBeNull()
+  } finally {
+    deadline.dispose()
+    await journals.closeAll()
+    await rm(root, { recursive: true, force: true })
+  }
+})
diff --git a/src/renderer/src/components/native-chat/NativeChatMessageList.turn-status.test.tsx b/src/renderer/src/components/native-chat/NativeChatMessageList.turn-status.test.tsx
index 71932b10569e..e7b535e83006 100644
--- a/src/renderer/src/components/native-chat/NativeChatMessageList.turn-status.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatMessageList.turn-status.test.tsx
@@ -2,9 +2,6 @@
 
 import '@testing-library/jest-dom/vitest'
 
-import { mkdtemp, readFile, rm, writeFile } from 'node:fs/promises'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
 import { cleanup, screen } from '@testing-library/react'
 import { render } from './native-chat-tooltip-test-harness'
 import { afterAll, afterEach, beforeAll, describe, expect, it, vi } from 'vitest'
@@ -40,14 +37,10 @@ import {
   selectStructuredAgentSettledTurns,
   selectStructuredAgentTurnBars
 } from '../../../../shared/structured-agent-session-turn-timing'
-import { agentSessionSwitchDeadline } from '../../../../shared/agent-session-switch-execution'
-import { claudeProviderHandle } from '../../../../shared/agent-session-provider-handle-encoding'
-import { createTrackedJournalOpener } from '../../../../main/native-chat/agent-session-journal/journal-host-database-test-support'
-import { importLegacyTranscriptIntoJournal } from '../../../../main/native-chat/agent-session-journal/journal-legacy-import'
 import {
-  captureSwitchStoppedCliTurn,
-  catchUpSwitchedCliTranscript
-} from '../../../../main/native-chat/agent-session-wire/structured-agent-session-switch-import'
+  SWITCH_STOPPED_CLI_TURN_ITEMS,
+  SWITCH_STOPPED_CLI_USER_ITEM_KEY
+} from '../../../../shared/native-chat/switch-stopped-cli-turn.test-fixture'
 import type { NativeChatLiveSession } from './use-native-chat-live-session'
 import { NativeChatMessageList } from './NativeChatMessageList'
 import { installNativeChatMessageListTestViewport } from './native-chat-message-list-test-viewport'
@@ -162,98 +155,34 @@ const usageLimitView = {
   }
 
   describe('NativeChatMessageList folded turn headers', () => {
-    it('renders an imported explicit Stop without inventing elapsed time and keeps timed cancellation', async () => {
-      const root = await mkdtemp(join(tmpdir(), 'orca-renderer65-stop-import-'))
-      const journals = createTrackedJournalOpener()
-      const deadline = agentSessionSwitchDeadline()
-      try {
-        const recording = await readFile(
-          join(
-            import.meta.dirname,
-            '../../../../main/native-chat/agent-session-wire/__fixtures__/claude-cli-switch-2.1.302.jsonl'
-          ),
-          'utf8'
-        )
-        const rows = recording.trimEnd().split('\n')
-        const sessionId: string = JSON.parse(rows[0]!).sessionId
-        const filePath = join(root, 'cli.jsonl')
-        await writeFile(filePath, `${rows.slice(0, 2).join('\n')}\n`)
-        const source = { agent: 'claude' as const, sessionId, filePath }
-        const imported = await journals.open({
-          stateDirectory: root,
-          identity: {
-            sessionId: 'imported-stop',
-            workspaceId: 'folder',
-            hostId: 'local',
-            agent: 'claude',
-            providerHandle: claudeProviderHandle(sessionId, null)
-          }
-        })
-        expect(
-          await importLegacyTranscriptIntoJournal({
-            journal: imported,
+    // The host's half (import, switch stop, catch-up → this journal) is main's switch-import test.
+    it('renders an imported explicit Stop without inventing elapsed time and keeps timed cancellation', () => {
+      const items = [...SWITCH_STOPPED_CLI_TURN_ITEMS, ...journal()]
+      const bars = selectStructuredAgentTurnBars(items, [], null)
+      expect(bars.settledTurns.get(SWITCH_STOPPED_CLI_USER_ITEM_KEY)).toEqual({
+        startedAt: null,
+        workedSeconds: null,
+        verdict: 'cancellation'
+      })
+      render(
+        <NativeChatMessageList
+          session={{
+            ...session(),
             agent: 'claude',
-            sessionId,
-            fence: 1,
-            options: { filePath }
-          })
-        ).toMatchObject({ ok: true, replaced: true })
-        expect(
-          selectStructuredAgentTurnBars(imported.snapshot().items, [], null).settledTurns.size
-        ).toBe(0)
-        const stopped = await captureSwitchStoppedCliTurn(source, true, deadline)
-        if (!stopped) {
-          throw new Error('Expected the recorded CLI turn to be working')
-        }
-        await catchUpSwitchedCliTranscript({
-          journal: imported,
-          source,
-          fence: 1,
-          deadline,
-          stopped
-        })
-        const snapshot = imported.snapshot()
-        const lifecycle = snapshot.items.find(({ body }) => body.kind === 'turn')
-        expect(lifecycle?.body).toMatchObject({
-          state: 'interrupted',
-          outcome: 'cancellation',
-          turnId: stopped.turnId
-        })
-        expect(lifecycle?.body).not.toHaveProperty('startedAt')
-        const items = [...snapshot.items, ...journal()]
-        const bars = selectStructuredAgentTurnBars(items, [], null)
-        expect(bars.settledTurns.get(stopped.userItemKey)).toEqual({
-          startedAt: null,
-          workedSeconds: null,
-          verdict: 'cancellation'
-        })
-        expect(bars.runningTiming).toBeNull()
-        render(
-          <NativeChatMessageList
-            session={{
-              ...session(),
-              agent: 'claude',
-              messages: projectStructuredAgentSessionMessages(items, [], [])
-            }}
-            journalItems={items}
-            settledTurns={bars.settledTurns}
-            isWorking={false}
-            expandSignal={false}
-          />
-        )
-        expect(
-          screen.getByText('Interrupted').closest('[data-native-chat-turn-status]')
-        ).toHaveAttribute('data-native-chat-turn-status', 'settled')
-        expect(screen.getByText('Interrupted after 12s')).toBeInTheDocument()
-        expect(screen.getAllByText('Worked for 12s')).toHaveLength(2)
-        expect(screen.queryByText(/^Working for/)).toBeNull()
-        expect(imported.snapshot()).toEqual(snapshot)
-      } finally {
-        cleanup()
-        deadline.dispose()
-        await journals.closeAll()
-        await rm(root, { recursive: true, force: true })
-      }
+            messages: projectStructuredAgentSessionMessages(items, [], [])
+          }}
+          journalItems={items}
+          settledTurns={bars.settledTurns}
+          isWorking={false}
+          expandSignal={false}
+        />
+      )
+      expect(
+        screen.getByText('Interrupted').closest('[data-native-chat-turn-status]')
+      ).toHaveAttribute('data-native-chat-turn-status', 'settled')
+      expect(screen.getByText('Interrupted after 12s')).toBeInTheDocument()
+      expect(screen.getAllByText('Worked for 12s')).toHaveLength(2)
+      expect(screen.queryByText(/^Working for/)).toBeNull()
     })
 
     it('says a crash-cut turn worked like a finished one and a stopped turn was interrupted', () => {
diff --git a/src/shared/native-chat/switch-stopped-cli-turn.test-fixture.ts b/src/shared/native-chat/switch-stopped-cli-turn.test-fixture.ts
new file mode 100644
index 000000000000..effb5a4a1537
--- /dev/null
+++ b/src/shared/native-chat/switch-stopped-cli-turn.test-fixture.ts
@@ -0,0 +1,61 @@
+import type { AgentJournalRenderItem } from '../agent-session-journal-types'
+
+// The journal a recorded Claude CLI turn (main's `__fixtures__/claude-cli-switch-2.1.302.jsonl`,
+// first two rows) leaves after a switch stopped it: imported, then caught up as a person's Stop.
+// Main's switch-import test proves the import produces exactly these items; the chat renders them.
+
+const SESSION = '402eff2b-84dc-4e05-8fe8-49fffb2cd3c3'
+const TURN = '124e6d1a-016e-46a5-8113-6a893a97b769'
+
+export const SWITCH_STOPPED_CLI_USER_ITEM_KEY = `claude:${SESSION}:${TURN}`
+export const SWITCH_STOPPED_CLI_TURN_ID = TURN
+
+export const SWITCH_STOPPED_CLI_TURN_ITEMS: AgentJournalRenderItem[] = [
+  {
+    itemId: SWITCH_STOPPED_CLI_USER_ITEM_KEY,
+    revision: 1,
+    body: {
+      kind: 'message',
+      role: 'user',
+      blocks: [
+        {
+          type: 'text',
+          text: 'Think briefly, then read notes.txt with the Read tool, then answer in two short paragraphs what it says.'
+        }
+      ]
+    },
+    sequence: 2,
+    observedAt: 1792607323188,
+    turnScope: { kind: 'thread' }
+  },
+  {
+    itemId: `claude:${SESSION}:ec769311-5ca1-4473-9aef-6eb98c796aea`,
+    revision: 1,
+    body: {
+      kind: 'tool-call',
+      name: 'Read',
+      input: { file_path: '/workspace/notes.txt' },
+      callId: 'toolu_01JdDiY9LSSGER1aErtVjSW3',
+      state: 'completed'
+    },
+    sequence: 3,
+    observedAt: 1792607327931,
+    turnScope: { kind: 'thread' }
+  },
+  {
+    itemId: `legacy:claude:${SESSION}:turn-lifecycle%3A${TURN}`,
+    revision: 1,
+    // The Stop names no start: an imported turn never invents elapsed time.
+    body: {
+      kind: 'turn',
+      turnId: TURN,
+      userItemId: SWITCH_STOPPED_CLI_USER_ITEM_KEY,
+      state: 'interrupted',
+      outcome: 'cancellation'
+    },
+    sequence: 4,
+    // Written when the switch caught up; main's test reads it as any time.
+    observedAt: 1793414497171,
+    turnScope: { kind: 'thread' }
+  }
+]

From b7c4b0e5cfdbbe93d51113a0ca544758f604b83a Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 21:50:08 -0700
Subject: [PATCH 151/207] Settle a terminal turn left open once nothing can
 still write it

A Codex terminal stopped by a switch before it recorded its turn's end left the chat replying forever. Once the census proves no CLI writer is left and the chat's own owner is at rest, an open latest turn reads as interrupted for every agent, from that agent's own lifecycle source; a real end recorded later replaces it. The switch gives the agent a short, bounded wait to record its own end before the stop, and a chat with no turn running gets no Stop.
---
 .../journal-legacy-import-contract.ts         |   4 +
 .../journal-legacy-import.ts                  |  53 ++-
 ...codex-switch-stopped-before-boundary.jsonl |  17 +
 ...tured-agent-session-abandoned-turn.test.ts | 382 ++++++++++++++++++
 ...ructured-agent-session-at-rest-catch-up.ts | 247 ++++++++---
 .../structured-agent-session-codex-turns.ts   |  48 +++
 .../structured-agent-session-host.ts          |   1 +
 ...ctured-agent-session-switch-import.test.ts |  40 +-
 .../structured-agent-session-switch-import.ts |  92 ++++-
 .../structured-agent-session-switch-source.ts |  57 ++-
 ...agent-session-switch-turn-boundary.test.ts |  71 ++++
 ...ured-agent-session-switch-turn-boundary.ts |  96 +++++
 ...structured-agent-session-synthetic-turn.ts |  25 ++
 .../structured-worker-switch-stop.test.ts     |  26 ++
 ...ructured-agent-session-switch-execution.ts |  59 ++-
 ...red-agent-session-switch-open-turn.test.ts | 158 ++++++++
 ...ured-agent-session-switch-terminal-stop.ts |  70 ++++
 17 files changed, 1278 insertions(+), 168 deletions(-)
 create mode 100644 src/main/native-chat/agent-session-wire/__fixtures__/codex-switch-stopped-before-boundary.jsonl
 create mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-abandoned-turn.test.ts
 create mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-codex-turns.ts
 create mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-switch-turn-boundary.test.ts
 create mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-switch-turn-boundary.ts
 create mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-synthetic-turn.ts
 create mode 100644 src/main/runtime/rpc/methods/structured-agent-session-switch-open-turn.test.ts
 create mode 100644 src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-stop.ts

diff --git a/src/main/native-chat/agent-session-journal/journal-legacy-import-contract.ts b/src/main/native-chat/agent-session-journal/journal-legacy-import-contract.ts
index 96ca2aa756e4..fce48728cdff 100644
--- a/src/main/native-chat/agent-session-journal/journal-legacy-import-contract.ts
+++ b/src/main/native-chat/agent-session-journal/journal-legacy-import-contract.ts
@@ -28,5 +28,9 @@ export type PreparedLegacyImport =
       items: JournalReplacementItem[]
       sourceEmpty: boolean
       latestTurn?: NativeChatTurnLifecycle
+      /** Each turn's last lifecycle state, so a later import can replace an Orca-settled record. */
+      turnStates?: ReadonlyMap<string, NativeChatTurnLifecycle>
+      /** The open latest turn ended on a row only a legacy format calls complete: outcome unknown. */
+      latestTurnAmbiguous?: true
     }
   | { ok: false; error: string }
diff --git a/src/main/native-chat/agent-session-journal/journal-legacy-import.ts b/src/main/native-chat/agent-session-journal/journal-legacy-import.ts
index 0e3558fcb318..557dd65014b8 100644
--- a/src/main/native-chat/agent-session-journal/journal-legacy-import.ts
+++ b/src/main/native-chat/agent-session-journal/journal-legacy-import.ts
@@ -97,25 +97,28 @@ export async function prepareLegacyTranscriptImport(input: {
   }
 
   try {
-    const { items, consumedBytes, latestTurn } = await decodeReplacementItems({
-      filePath,
-      piAfterEntry: input.piAfterEntry,
-      transcriptAgent,
-      agent: input.agent,
-      sessionId: input.sessionId,
-      source: options.source,
-      codexSessionsDirs: options.source?.conversationStore
-        ? [options.source.conversationStore]
-        : options.codexSessionsDirs,
-      signal: options.signal,
-      decodedMessageIdentities: options.decodedMessageIdentities,
-      limits
-    })
+    const { items, consumedBytes, latestTurn, turnStates, latestTurnAmbiguous } =
+      await decodeReplacementItems({
+        filePath,
+        piAfterEntry: input.piAfterEntry,
+        transcriptAgent,
+        agent: input.agent,
+        sessionId: input.sessionId,
+        source: options.source,
+        codexSessionsDirs: options.source?.conversationStore
+          ? [options.source.conversationStore]
+          : options.codexSessionsDirs,
+        signal: options.signal,
+        decodedMessageIdentities: options.decodedMessageIdentities,
+        limits
+      })
     return {
       ok: true,
       items,
       sourceEmpty: consumedBytes === 0,
-      ...(latestTurn ? { latestTurn } : {})
+      turnStates,
+      ...(latestTurn ? { latestTurn } : {}),
+      ...(latestTurnAmbiguous ? { latestTurnAmbiguous } : {})
     }
   } catch (err) {
     return { ok: false, error: err instanceof Error ? err.message : String(err) }
@@ -186,6 +189,8 @@ async function decodeReplacementItems(input: {
   items: JournalReplacementItem[]
   consumedBytes: number
   latestTurn?: NativeChatTurnLifecycle
+  turnStates: ReadonlyMap<string, NativeChatTurnLifecycle>
+  latestTurnAmbiguous?: true
 }> {
   const source = input.source
     ? adoptedTranscriptSourceObserver({
@@ -209,11 +214,20 @@ async function decodeReplacementItems(input: {
       ? decodePiTurnLifecycle
       : nativeChatTurnLifecycleDecoderForAgent(input.agent, true)
   let latestTurn: NativeChatTurnLifecycle | undefined
+  const turnStates = new Map<string, NativeChatTurnLifecycle>()
+  // A legacy Claude reply may omit its stop reason: an open turn ending on such prose may be done.
+  const loose =
+    input.agent === 'claude' ? nativeChatTurnLifecycleDecoderForAgent(input.agent, false) : null
+  let latestTurnAmbiguous = false
   const observe = (line: string, fallbackId: string) => {
     const next = lifecycle?.(line, fallbackId)
     if (next) {
       latestTurn =
         next.state === 'working' || !latestTurn ? next : { ...next, turnId: latestTurn.turnId }
+      turnStates.set(latestTurn.turnId, latestTurn)
+      latestTurnAmbiguous = false
+    } else if (loose && latestTurn?.state === 'working') {
+      latestTurnAmbiguous ||= loose(line, fallbackId)?.state === 'completed'
     }
   }
   const pi =
@@ -285,7 +299,14 @@ async function decodeReplacementItems(input: {
         latestTurn = undefined
       }
     }
-    return { items: retained.items(), consumedBytes, ...(latestTurn ? { latestTurn } : {}) }
+    const ambiguous = latestTurnAmbiguous && latestTurn?.state === 'working'
+    return {
+      items: retained.items(),
+      consumedBytes,
+      turnStates,
+      ...(latestTurn ? { latestTurn } : {}),
+      ...(ambiguous ? { latestTurnAmbiguous: true as const } : {})
+    }
   } finally {
     pi?.close()
   }
diff --git a/src/main/native-chat/agent-session-wire/__fixtures__/codex-switch-stopped-before-boundary.jsonl b/src/main/native-chat/agent-session-wire/__fixtures__/codex-switch-stopped-before-boundary.jsonl
new file mode 100644
index 000000000000..2ed4c6db98bf
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/__fixtures__/codex-switch-stopped-before-boundary.jsonl
@@ -0,0 +1,17 @@
+{"timestamp":"2026-10-31T02:53:14.185Z","ordinal":0,"type":"session_meta","payload":{"id":"01a18fe0-25a2-71a1-8181-92fabd97d936","timestamp":"2026-10-31T02:53:14.095Z","history_mode":"paginated","originator":"orca_desktop","cli_version":"0.162.1","cwd":"/workspace"}}
+{"timestamp":"2026-10-31T02:53:14.191Z","ordinal":1,"type":"event_msg","payload":{"type":"task_started","turn_attribution":{"turn_id":"01a18fe0-2621-7c91-800c-39b51ebc61e1","turn_trigger":null,"parent_turn_id":null,"initiating_agent_path":null,"root_turn_id":"01a18fe0-2621-7c91-800c-39b51ebc61e1"},"turn_id":"01a18fe0-2621-7c91-800c-39b51ebc61e1","root_turn_id":"01a18fe0-2621-7c91-800c-39b51ebc61e1","started_at":1793415194,"model_context_window":258400,"collaboration_mode_kind":"default"}}
+{"timestamp":"2026-10-31T02:53:16.236Z","ordinal":8,"type":"response_item","payload":{"type":"message","id":"msg_01a18fe0-2e4c-7cf3-a297-40bfda0b05ab","role":"user","content":[{"type":"input_text","text":"Reply with the single word F8D-codex-1"}],"internal_chat_message_metadata_passthrough":{"turn_id":"01a18fe0-2621-7c91-800c-39b51ebc61e1","create_time":1793415196.236285,"content_item_kinds":["user.text"]}},"metadata":{"retained_source":{"id":{"message_id":"msg_01a18fe0-2e4c-7cf3-a297-40bfda0b05ab","turn_id":"01a18fe0-2621-7c91-800c-39b51ebc61e1","role":"user"},"revision":"retained_01a18fe0-2e4c-7cf3-a297-40dba47b2541","complete":true},"client_authored":false,"user_input_order":0,"mcp_attribution":{"status":"none"}}}
+{"timestamp":"2026-10-31T02:53:16.237Z","ordinal":9,"type":"event_msg","payload":{"type":"item_completed","thread_id":"01a18fe0-25a2-71a1-8181-92fabd97d936","turn_id":"01a18fe0-2621-7c91-800c-39b51ebc61e1","item":{"type":"UserMessage","id":"01a18fe0-2e4c-7cf3-a297-40cd166ac2b6","client_id":"1793415193719-ea8b3cbd3ca243548b98019abccfb45b","content":[{"type":"text","text":"Reply with the single word F8D-codex-1","text_elements":[]}]},"started_at_ms":1793415196237,"completed_at_ms":1793415196237}}
+{"timestamp":"2026-10-31T02:53:18.975Z","ordinal":10,"type":"event_msg","payload":{"type":"item_completed","thread_id":"01a18fe0-25a2-71a1-8181-92fabd97d936","turn_id":"01a18fe0-2621-7c91-800c-39b51ebc61e1","item":{"type":"AgentMessage","id":"msg_073624eba125d720016ae5581ed5f48198bfa3904e6cdb2958","content":[{"type":"Text","text":"F8D-codex-1"}],"phase":"final_answer"},"started_at_ms":1793415198868,"completed_at_ms":1793415198975}}
+{"timestamp":"2026-10-31T02:53:18.976Z","ordinal":11,"type":"response_item","payload":{"type":"message","id":"msg_073624eba125d720016ae5581ed5f48198bfa3904e6cdb2958","role":"assistant","content":[{"type":"output_text","text":"F8D-codex-1"}],"phase":"final_answer","internal_chat_message_metadata_passthrough":{"turn_id":"01a18fe0-2621-7c91-800c-39b51ebc61e1","create_time":1793415198.8516943,"content_item_kinds":["unknown"]}},"metadata":{"retained_source":{"id":{"message_id":"msg_073624eba125d720016ae5581ed5f48198bfa3904e6cdb2958","turn_id":"01a18fe0-2621-7c91-800c-39b51ebc61e1","role":"assistant"},"revision":"retained_01a18fe0-3900-7bd2-8936-c3cabba60ade","complete":true},"client_authored":false,"user_input_order":1}}
+{"timestamp":"2026-10-31T02:53:19.014Z","ordinal":14,"type":"event_msg","payload":{"type":"task_complete","root_turn_id":"01a18fe0-2621-7c91-800c-39b51ebc61e1","turn_id":"01a18fe0-2621-7c91-800c-39b51ebc61e1","last_agent_message":"F8D-codex-1","started_at":1793415194,"completed_at":1793415199,"duration_ms":4867,"time_to_first_token_ms":4753}}
+{"timestamp":"2026-10-31T02:54:16.436Z","ordinal":17,"type":"event_msg","payload":{"type":"task_started","turn_attribution":{"turn_id":"01a18fe1-196a-71b3-b7f4-93f46a1d844f","turn_trigger":"user","parent_turn_id":null,"initiating_agent_path":null,"root_turn_id":"01a18fe1-196a-71b3-b7f4-93f46a1d844f"},"turn_id":"01a18fe1-196a-71b3-b7f4-93f46a1d844f","root_turn_id":"01a18fe1-196a-71b3-b7f4-93f46a1d844f","started_at":1793415256,"model_context_window":258400,"collaboration_mode_kind":"default"}}
+{"timestamp":"2026-10-31T02:54:16.562Z","ordinal":22,"type":"response_item","payload":{"type":"message","id":"msg_01a18fe1-19f2-7c62-b06b-09096af4f366","role":"user","content":[{"type":"input_text","text":"Reply with the single word F8DSAVED"}],"internal_chat_message_metadata_passthrough":{"turn_id":"01a18fe1-196a-71b3-b7f4-93f46a1d844f","create_time":1793415256.562063,"content_item_kinds":["user.text"]}},"metadata":{"retained_source":{"id":{"message_id":"msg_01a18fe1-19f2-7c62-b06b-09096af4f366","turn_id":"01a18fe1-196a-71b3-b7f4-93f46a1d844f","role":"user"},"revision":"retained_01a18fe1-19f2-7c62-b06b-0928cc3ee502","complete":true},"client_authored":false,"user_input_order":2,"mcp_attribution":{"status":"none"}}}
+{"timestamp":"2026-10-31T02:54:16.563Z","ordinal":23,"type":"event_msg","payload":{"type":"item_completed","thread_id":"01a18fe0-25a2-71a1-8181-92fabd97d936","turn_id":"01a18fe1-196a-71b3-b7f4-93f46a1d844f","item":{"type":"UserMessage","id":"01a18fe1-19f2-7c62-b06b-0913735c6e94","client_id":"0639bcf5-3d4f-47e1-bfca-fb6bedf22a1c","content":[{"type":"text","text":"Reply with the single word F8DSAVED","text_elements":[]}]},"started_at_ms":1793415256563,"completed_at_ms":1793415256563}}
+{"timestamp":"2026-10-31T02:54:18.718Z","ordinal":24,"type":"event_msg","payload":{"type":"item_completed","thread_id":"01a18fe0-25a2-71a1-8181-92fabd97d936","turn_id":"01a18fe1-196a-71b3-b7f4-93f46a1d844f","item":{"type":"AgentMessage","id":"msg_0e631c70c21ab32e016ae5585a2b1c8198a571fa0008f07e12","content":[{"type":"Text","text":"F8DSAVED"}],"phase":"final_answer"},"started_at_ms":1793415258463,"completed_at_ms":1793415258718}}
+{"timestamp":"2026-10-31T02:54:18.719Z","ordinal":25,"type":"response_item","payload":{"type":"message","id":"msg_0e631c70c21ab32e016ae5585a2b1c8198a571fa0008f07e12","role":"assistant","content":[{"type":"output_text","text":"F8DSAVED"}],"phase":"final_answer","internal_chat_message_metadata_passthrough":{"turn_id":"01a18fe1-196a-71b3-b7f4-93f46a1d844f","create_time":1793415258.3316724,"content_item_kinds":["unknown"]}},"metadata":{"retained_source":{"id":{"message_id":"msg_0e631c70c21ab32e016ae5585a2b1c8198a571fa0008f07e12","turn_id":"01a18fe1-196a-71b3-b7f4-93f46a1d844f","role":"assistant"},"revision":"retained_01a18fe1-225f-7cc0-a6cf-ab66c31adad5","complete":true},"client_authored":false,"user_input_order":3}}
+{"timestamp":"2026-10-31T02:54:18.805Z","ordinal":28,"type":"event_msg","payload":{"type":"task_complete","root_turn_id":"01a18fe1-196a-71b3-b7f4-93f46a1d844f","turn_id":"01a18fe1-196a-71b3-b7f4-93f46a1d844f","last_agent_message":"F8DSAVED","started_at":1793415256,"completed_at":1793415258,"duration_ms":2369,"time_to_first_token_ms":2030}}
+{"timestamp":"2026-10-31T02:54:29.249Z","ordinal":30,"type":"event_msg","payload":{"type":"task_started","turn_attribution":{"turn_id":"01a18fe1-4b7c-75a0-a33d-98196775537d","turn_trigger":"user","parent_turn_id":null,"initiating_agent_path":null,"root_turn_id":"01a18fe1-4b7c-75a0-a33d-98196775537d"},"turn_id":"01a18fe1-4b7c-75a0-a33d-98196775537d","root_turn_id":"01a18fe1-4b7c-75a0-a33d-98196775537d","started_at":1793415269,"model_context_window":258400,"collaboration_mode_kind":"default"}}
+{"timestamp":"2026-10-31T02:54:29.303Z","ordinal":32,"type":"response_item","payload":{"type":"message","id":"msg_01a18fe1-4bb7-7cf2-a6d5-b1d8b2c44ff3","role":"user","content":[{"type":"input_text","text":"Write a 300-line poem about canyons, numbered lines, no preamble."}],"internal_chat_message_metadata_passthrough":{"turn_id":"01a18fe1-4b7c-75a0-a33d-98196775537d","create_time":1793415269.303297,"content_item_kinds":["user.text"]}},"metadata":{"retained_source":{"id":{"message_id":"msg_01a18fe1-4bb7-7cf2-a6d5-b1d8b2c44ff3","turn_id":"01a18fe1-4b7c-75a0-a33d-98196775537d","role":"user"},"revision":"retained_01a18fe1-4bb7-7cf2-a6d5-b1f8ee78e355","complete":true},"client_authored":false,"user_input_order":4,"mcp_attribution":{"status":"none"}}}
+{"timestamp":"2026-10-31T02:54:29.304Z","ordinal":33,"type":"event_msg","payload":{"type":"item_completed","thread_id":"01a18fe0-25a2-71a1-8181-92fabd97d936","turn_id":"01a18fe1-4b7c-75a0-a33d-98196775537d","item":{"type":"UserMessage","id":"01a18fe1-4bb7-7cf2-a6d5-b1e410cbecec","client_id":"3554849a-534e-4745-9cc5-b3cb6b15f787","content":[{"type":"text","text":"Write a 300-line poem about canyons, numbered lines, no preamble.","text_elements":[]}]},"started_at_ms":1793415269304,"completed_at_ms":1793415269304}}
+{"timestamp":"2026-10-31T02:54:40.074Z","ordinal":35,"type":"response_item","payload":{"type":"message","id":"msg_01a18fe1-75ca-7b81-b40a-f37c2efa94e1","role":"developer","content":[{"type":"input_text","text":"<turn_aborted>\nThe previous turn was interrupted on purpose. Any running unified exec processes may still be running in the background. If any tools/commands were aborted, they may have partially executed.\n</turn_aborted>"}],"internal_chat_message_metadata_passthrough":{"turn_id":"01a18fe1-4b7c-75a0-a33d-98196775537d","create_time":1793415280.074168,"content_item_kinds":["generic.turn_aborted"]}}}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-abandoned-turn.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-abandoned-turn.test.ts
new file mode 100644
index 000000000000..ad5c7eafdee1
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-abandoned-turn.test.ts
@@ -0,0 +1,382 @@
+import { mkdtemp, readFile, rm, writeFile } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { agentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
+import {
+  claudeProviderHandle,
+  codexProviderHandle
+} from '../../../shared/agent-session-provider-handle-encoding'
+import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key'
+import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
+import { createTrackedJournalOpener } from '../agent-session-journal/journal-host-database-test-support'
+import { importLegacyTranscriptIntoJournal } from '../agent-session-journal/journal-legacy-import'
+import { catchUpStructuredSessionAtRest } from './structured-agent-session-at-rest-catch-up'
+import { catchUpSwitchedCliTranscript } from './structured-agent-session-switch-import'
+
+vi.mock('../../ai-vault/session-scanner-opencode-sqlite-worker-spawn', async () => {
+  const query = await import('../transcript-opencode-sqlite-query')
+  return {
+    readOpenCodeTranscriptPageViaWorker: async (
+      args: Parameters<typeof query.readOpenCodeTranscriptPage>[0]
+    ) => query.readOpenCodeTranscriptPage(args),
+    readOpenCodeTranscriptSignalViaWorker: async (args: { dbPath: string; sessionId: string }) =>
+      query.readOpenCodeTranscriptSignal(args.dbPath, args.sessionId)
+  }
+})
+
+// A Codex terminal a switch stopped before Codex wrote its turn's end (the QA rig's own rollout):
+// with nothing left writing, the open turn is over and settles; it never latches the conversation.
+
+const THREAD = '01a18fe0-25a2-71a1-8181-92fabd97d936'
+const STOPPED_TURN = '01a18fe1-4b7c-75a0-a33d-98196775537d'
+const recording = (
+  await readFile(
+    join(import.meta.dirname, '__fixtures__', 'codex-switch-stopped-before-boundary.jsonl'),
+    'utf8'
+  )
+)
+  .trimEnd()
+  .split('\n')
+// Rows 0–12 hold two finished turns; 13–16 the turn the switch stopped (no end event).
+const FINISHED = 13
+
+const journals = createTrackedJournalOpener()
+let root: string
+let filePath: string
+let deadline: ReturnType<typeof agentSessionSwitchDeadline>
+beforeEach(async () => {
+  root = await mkdtemp(join(tmpdir(), 'orca-abandoned-turn-'))
+  filePath = join(root, 'rollout.jsonl')
+  deadline = agentSessionSwitchDeadline()
+})
+afterEach(async () => {
+  deadline.dispose()
+  await journals.closeAll()
+  await rm(root, { recursive: true, force: true })
+})
+
+function open(sessionId: string) {
+  return journals.open({
+    stateDirectory: root,
+    identity: {
+      sessionId,
+      workspaceId: 'folder',
+      hostId: 'local',
+      agent: 'codex',
+      providerHandle: codexProviderHandle(THREAD)
+    }
+  })
+}
+
+/** Rows written after the chat's import carry times after it. */
+function later(rows: string[]): string[] {
+  const at = Date.now() + 60_000
+  return rows.map((row, index) => {
+    const parsed = JSON.parse(row)
+    return JSON.stringify({ ...parsed, timestamp: new Date(at + index).toISOString() })
+  })
+}
+
+async function writeRows(rows: string[]) {
+  await writeFile(filePath, `${rows.join('\n')}\n`)
+}
+
+function atRest(
+  journal: AgentSessionJournal,
+  extra: { settleAbandoned?: boolean; stopped?: true }
+) {
+  return catchUpStructuredSessionAtRest({
+    journal,
+    threadId: THREAD,
+    filePath,
+    fence: 1,
+    deadline,
+    settleAbandoned: extra.settleAbandoned,
+    ...(extra.stopped ? { stoppedTurnId: STOPPED_TURN } : {})
+  })
+}
+
+const turnKey = (turnId: string) =>
+  agentJournalItemKey({
+    provider: 'legacy',
+    agent: 'codex',
+    sessionId: THREAD,
+    recordId: `turn-lifecycle:${turnId}`
+  })
+
+const turns = (journal: AgentSessionJournal) =>
+  journal.snapshot().items.flatMap(({ body }) => (body.kind === 'turn' ? [body] : []))
+
+/** A chat that imported the first two turns, then the terminal ran a third that was stopped. */
+async function retainedChat(sessionId: string) {
+  await writeRows(recording.slice(0, FINISHED))
+  const journal = await open(sessionId)
+  await importLegacyTranscriptIntoJournal({
+    journal,
+    agent: 'codex',
+    sessionId: THREAD,
+    fence: 1,
+    options: { filePath }
+  })
+  await atRest(journal, {})
+  await writeRows([...recording.slice(0, FINISHED), ...later(recording.slice(FINISHED))])
+  return journal
+}
+
+describe('a Codex turn a switch stopped before Codex recorded its end', () => {
+  it('refuses while a writer may remain, and settles once nothing can write it', async () => {
+    const journal = await retainedChat('retained')
+    await expect(atRest(journal, {})).rejects.toMatchObject({
+      refusal: { details: { reason: 'messagesUnsettled' } }
+    })
+    expect(journal.item(turnKey(STOPPED_TURN))).toBeNull()
+
+    await atRest(journal, { settleAbandoned: true })
+    expect(journal.item(turnKey(STOPPED_TURN))?.body).toEqual({
+      kind: 'turn',
+      turnId: STOPPED_TURN,
+      state: 'interrupted'
+    })
+    // The stopped turn's prompt arrived and is that turn's row.
+    const prompt = journal
+      .snapshot()
+      .items.find(
+        ({ body, turnScope }) =>
+          body.kind === 'message' &&
+          body.role === 'user' &&
+          turnScope?.kind === 'turn' &&
+          turnScope.turnItemId === turnKey(STOPPED_TURN)
+      )
+    expect(prompt).toBeDefined()
+    const settled = journal.snapshot()
+
+    // After a restart (or a retry from Session History) nothing latches and nothing repeats.
+    await journal.close()
+    const reopened = await open('retained')
+    await atRest(reopened, { settleAbandoned: true })
+    expect(reopened.snapshot()).toEqual(settled)
+  })
+
+  it('takes a real end and the rest of the turn when they arrive after the settle', async () => {
+    const journal = await retainedChat('healed')
+    await atRest(journal, { settleAbandoned: true })
+    const settledRows = journal.snapshot().items.length
+    const tail = later([
+      JSON.stringify({
+        type: 'event_msg',
+        payload: {
+          type: 'item_completed',
+          turn_id: STOPPED_TURN,
+          item: {
+            type: 'AgentMessage',
+            id: 'late-answer',
+            content: [{ type: 'Text', text: 'written before the end' }]
+          }
+        }
+      }),
+      JSON.stringify({
+        type: 'event_msg',
+        payload: { type: 'turn_aborted', turn_id: STOPPED_TURN }
+      }),
+      // A later turn is already there too: the earlier turn still heals.
+      JSON.stringify({
+        type: 'event_msg',
+        payload: { type: 'task_started', turn_id: 'later-turn' }
+      }),
+      JSON.stringify({
+        type: 'event_msg',
+        payload: { type: 'task_complete', turn_id: 'later-turn' }
+      })
+    ])
+    await writeRows([...recording.slice(0, FINISHED), ...later(recording.slice(FINISHED)), ...tail])
+
+    await atRest(journal, { settleAbandoned: true })
+
+    const healed = journal.item(turnKey(STOPPED_TURN))?.body
+    expect(healed).toMatchObject({ state: 'interrupted', completedAt: expect.any(Number) })
+    expect(journal.item(turnKey('later-turn'))?.body).toMatchObject({ state: 'completed' })
+    expect(
+      journal
+        .snapshot()
+        .items.some(
+          ({ body }) =>
+            body.kind === 'message' &&
+            body.blocks.some(
+              (block) => block.type === 'text' && block.text.includes('before the end')
+            )
+        )
+    ).toBe(true)
+    // The late answer and the later turn's record; the healed record replaces the settled one.
+    expect(journal.snapshot().items.length).toBe(settledRows + 2)
+  })
+
+  it.each([
+    ['stopped by this switch, no end recorded', false, true],
+    ['stopped by this switch, end recorded', true, true],
+    ['reopened from history after a restart', false, false]
+  ])(
+    'anchors a first adopted conversation’s last turn to its saved prompt: %s',
+    async (_name, ended, stopped) => {
+      await writeRows([
+        ...recording,
+        ...(ended
+          ? [
+              JSON.stringify({
+                timestamp: '2026-10-31T02:54:41.000Z',
+                type: 'event_msg',
+                payload: { type: 'turn_aborted', turn_id: STOPPED_TURN }
+              })
+            ]
+          : [])
+      ])
+      const journal = await open(`adopted-${String(ended)}-${String(stopped)}`)
+      await importLegacyTranscriptIntoJournal({
+        journal,
+        agent: 'codex',
+        sessionId: THREAD,
+        fence: 1,
+        options: { filePath }
+      })
+      const imported = journal.snapshot().items
+
+      await atRest(journal, { settleAbandoned: !stopped, ...(stopped ? { stopped: true } : {}) })
+
+      const record = journal.item(turnKey(STOPPED_TURN))?.body
+      expect(record).toMatchObject({
+        state: 'interrupted',
+        ...(stopped ? { outcome: 'cancellation' } : {}),
+        ...(ended ? { completedAt: Date.parse('2026-10-31T02:54:41.000Z') } : {})
+      })
+      const opener = record?.kind === 'turn' ? journal.item(record.userItemId ?? '') : null
+      expect(opener?.body).toMatchObject({ kind: 'message', role: 'user' })
+      // The stopped turn's own prompt, as the import saved it (no second opener id).
+      expect(record?.kind === 'turn' && record.userItemId).toBe(
+        imported.findLast(({ body }) => body.kind === 'message' && body.role === 'user')?.itemId
+      )
+      // Nothing it already saved is imported again.
+      expect(journal.snapshot().items.filter(({ body }) => body.kind !== 'turn')).toEqual(imported)
+      expect(turns(journal)).toHaveLength(1)
+    }
+  )
+})
+
+// Every agent's own lifecycle source decides: a killed turn settles as interrupted, a finished one
+// keeps its end, and missing or ambiguous evidence gets no guessed label.
+const claudeRecording = await readFile(
+  join(import.meta.dirname, '__fixtures__', 'claude-cli-switch-2.1.302.jsonl'),
+  'utf8'
+)
+const claudeRecordingId: string = JSON.parse(claudeRecording.split('\n')[0]!).sessionId
+describe.each([
+  ['claude', claudeRecordingId],
+  ['pi', '01a1841b-2daa-7238-ade8-4b2474dcac14'],
+  ['grok', '01a105db-937d-7ec0-b1d1-5396ae618abf'],
+  ['opencode', 'ses_e7afa14d9ffernpe5xoa3e21SL'],
+  ['opencode2', 'ses_e7bc5544cffeP7rTuOdvcklM2n']
+] as const)('a %s turn with nothing left writing it', (agent, recordedId) => {
+  const fixtures = join(import.meta.dirname, '__fixtures__', 'recorded-native-switch', agent)
+  const sqlite = agent === 'opencode' || agent === 'opencode2'
+  async function install(completed: boolean) {
+    const target = join(root, sqlite ? 'native.db' : 'native.jsonl')
+    if (agent === 'claude') {
+      const rows = claudeRecording.trimEnd().split('\n')
+      await writeFile(target, completed ? claudeRecording : `${rows.slice(0, 2).join('\n')}\n`)
+    } else if (agent === 'grok') {
+      const directory = join(fixtures, completed ? 'completed' : 'interrupted-prefix')
+      await writeFile(target, await readFile(join(directory, 'chat_history.jsonl')))
+      await writeFile(join(root, 'events.jsonl'), await readFile(join(directory, 'events.jsonl')))
+    } else if (agent === 'pi') {
+      const rows = (await readFile(join(fixtures, 'completed.jsonl'), 'utf8')).trimEnd().split('\n')
+      await writeFile(target, `${(completed ? rows : rows.slice(0, 6)).join('\n')}\n`)
+    } else {
+      const name = `${completed ? 'completed' : 'recorded-prefix'}.db`
+      await writeFile(target, await readFile(join(fixtures, name)))
+    }
+    return { agent, sessionId: agent === 'pi' ? target : recordedId, filePath: target }
+  }
+  async function settledTurns(completed: boolean) {
+    const source = await install(completed)
+    const journal = await journals.open({
+      stateDirectory: root,
+      identity: {
+        sessionId: `${agent}-${String(completed)}`,
+        workspaceId: 'folder',
+        hostId: 'local',
+        agent,
+        providerHandle: agent === 'claude' ? claudeProviderHandle(recordedId, null) : null
+      }
+    })
+    await importLegacyTranscriptIntoJournal({
+      journal,
+      agent,
+      sessionId: source.sessionId,
+      fence: 1,
+      options: { filePath: source.filePath }
+    })
+    await catchUpSwitchedCliTranscript({
+      journal,
+      source,
+      fence: 1,
+      deadline,
+      settleAbandoned: true
+    })
+    return turns(journal)
+  }
+
+  it('settles a killed turn as interrupted, with no Stop of its own', async () => {
+    const [turn, ...rest] = await settledTurns(false)
+    expect(rest).toEqual([])
+    expect(turn).toMatchObject({ state: 'interrupted' })
+    expect(turn).not.toHaveProperty('outcome')
+    expect(turn).not.toHaveProperty('completedAt')
+  })
+
+  it('keeps a finished turn’s own end', async () => {
+    const [turn, ...rest] = await settledTurns(true)
+    expect(rest).toEqual([])
+    expect(turn?.state).toBe('completed')
+  })
+})
+
+it('gives a Claude reply only a legacy format calls finished no Interrupted label', async () => {
+  const [first] = claudeRecording.trimEnd().split('\n')
+  const sessionId: string = JSON.parse(first!).sessionId
+  const target = join(root, 'legacy.jsonl')
+  const user = JSON.parse(first!)
+  await writeFile(
+    target,
+    `${first}\n${JSON.stringify({
+      type: 'assistant',
+      uuid: 'legacy-reply',
+      sessionId,
+      timestamp: new Date(Date.parse(user.timestamp) + 1).toISOString(),
+      message: {
+        role: 'assistant',
+        id: 'legacy-reply-message',
+        stop_reason: null,
+        content: [{ type: 'text', text: 'All done.' }]
+      }
+    })}\n`
+  )
+  const source = { agent: 'claude' as const, sessionId, filePath: target }
+  const journal = await journals.open({
+    stateDirectory: root,
+    identity: {
+      sessionId: 'legacy-claude',
+      workspaceId: 'folder',
+      hostId: 'local',
+      agent: 'claude',
+      providerHandle: claudeProviderHandle(sessionId, null)
+    }
+  })
+  await importLegacyTranscriptIntoJournal({
+    journal,
+    agent: 'claude',
+    sessionId,
+    fence: 1,
+    options: { filePath: target }
+  })
+  await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline, settleAbandoned: true })
+  expect(turns(journal)).toEqual([])
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.ts
index 4aa53d512d7c..541343e761f6 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.ts
@@ -6,7 +6,10 @@ import {
   sameCodexHistoryJournalView
 } from '../../codex/codex-history-journal-view'
 import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key'
-import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types'
+import {
+  AGENT_JOURNAL_THREAD_SCOPE,
+  type AgentJournalItemBody
+} from '../../../shared/agent-session-journal-types'
 import { agentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
 import type { AgentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
 import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
@@ -22,8 +25,34 @@ import {
   isCodexVisibleHistoryRecord
 } from '../transcript-line-decoders-codex'
 import { decodeCodexTurnLifecycle } from '../transcript-turn-lifecycle'
+import {
+  codexChildTurn,
+  lifecycleIdentity,
+  providerItemId,
+  savedCodexPrompts
+} from './structured-agent-session-codex-turns'
+import {
+  isSyntheticInterruptedTurn,
+  turnRecordReplaceable
+} from './structured-agent-session-synthetic-turn'
+
+type CodexTurn = {
+  id: string
+  /** Started after the last import: its rows are imported here. */
+  messages: boolean
+  /** Started before the import with no lifecycle record: only its outcome is derived here. */
+  baseline: boolean
+  /** The saved row that opened a baseline turn, so its record anchors to the real prompt. */
+  opener?: string
+  ended: boolean
+}
 
-/** Refresh a retained read owner without starting a provider or replacing native submissions. */
+/**
+ * Refresh a retained read owner without starting a provider or replacing native submissions. The
+ * one writer of this thread's Codex turn records: turns started since the last import, and the
+ * latest turn the import itself brought in. With no writer left (`settleAbandoned`), a turn the
+ * provider never ended is over and settles as interrupted, as Codex's own thread reader reports it.
+ */
 export async function catchUpStructuredSessionAtRest(input: {
   journal: AgentSessionJournal
   threadId: string
@@ -31,6 +60,10 @@ export async function catchUpStructuredSessionAtRest(input: {
   fence: number
   deadline: AgentSessionSwitchDeadline
   stoppedTurnId?: string
+  /** The saved prompt of the turn this switch stopped, for a transcript that never started it. */
+  stoppedUserItemKey?: string
+  /** The CLI writer census passed and the structured owner is at rest. */
+  settleAbandoned?: boolean
   check?: () => void
 }): Promise<void> {
   const { journal, threadId, deadline } = input
@@ -56,8 +89,48 @@ export async function catchUpStructuredSessionAtRest(input: {
     }
     items.push(item)
   }
-  let turn: string | undefined
-  let include = false
+  const settled = (turnId: string) => {
+    const current = journal.item(
+      journal.canonicalItemId(agentJournalItemKey(lifecycleIdentity(threadId, turnId)))
+    )
+    return view.known.has(turnId) && !isSyntheticInterruptedTurn(current?.body)
+  }
+  let prompts: Map<string, string> | undefined
+  let turn: CodexTurn | undefined
+  let baseline: JournalReplacementItem | undefined
+  const children = new Set<string>()
+  const started = new Set<string>()
+  const record = (target: CodexTurn, body: Extract<AgentJournalItemBody, { kind: 'turn' }>) => {
+    const item = {
+      identity: lifecycleIdentity(threadId, target.id),
+      ownerFence: 0,
+      turnScope: AGENT_JOURNAL_THREAD_SCOPE
+    }
+    if (target.messages) {
+      retain({ ...item, body })
+    } else if (target.baseline) {
+      // No saved prompt row to anchor to: write nothing rather than a dangling opener.
+      baseline = target.opener
+        ? { ...item, body: { ...body, userItemId: target.opener } }
+        : undefined
+    }
+  }
+  const close = (target: CodexTurn) => {
+    target.ended = true
+    if (input.settleAbandoned || target.id === input.stoppedTurnId) {
+      record(target, {
+        kind: 'turn',
+        turnId: target.id,
+        state: 'interrupted',
+        ...(target.id === input.stoppedTurnId ? { outcome: 'cancellation' as const } : {})
+      })
+    } else if (target.messages) {
+      // A writer may still be adding to it: stay retryable rather than declare it covered.
+      throw agentSessionRefusalError('agent_session_operation_invalid', {
+        reason: 'messagesUnsettled'
+      })
+    }
+  }
   let identityConfirmed = false
   let paginated = false
   let index = 0
@@ -65,9 +138,9 @@ export async function catchUpStructuredSessionAtRest(input: {
   for await (const { line } of splitTranscriptStreamLines(stream, 16 * 1024 * 1024)) {
     deadline.check()
     const currentLineIndex = index++
-    const record = parseJsonObject(line)
-    const payload = asRecord(record?.payload)
-    if (record?.type === 'session_meta') {
+    const parsed = parseJsonObject(line)
+    const payload = asRecord(parsed?.payload)
+    if (parsed?.type === 'session_meta') {
       if (payload?.id !== threadId) {
         throw agentSessionRefusalError('agent_session_identity_required', {
           reason: 'transcriptUnreadable'
@@ -78,73 +151,85 @@ export async function catchUpStructuredSessionAtRest(input: {
     }
     const lifecycle = decodeCodexTurnLifecycle(line, '')
     if (lifecycle?.state === 'working') {
-      if (include) {
-        throw agentSessionRefusalError('agent_session_operation_invalid', {
-          reason: 'messagesUnsettled'
-        })
+      if (codexChildTurn(payload)) {
+        children.add(lifecycle.turnId)
+        continue
+      }
+      if (turn && !turn.ended) {
+        close(turn)
+      }
+      const id = lifecycle.turnId
+      started.add(id)
+      const imported =
+        lifecycle.timestamp === null ||
+        (view.importedAt !== null && lifecycle.timestamp <= view.importedAt)
+      if (imported) {
+        baseline = undefined
       }
-      turn = lifecycle.turnId || undefined
-      include = Boolean(
-        turn &&
-        !view.known.has(turn) &&
-        lifecycle.timestamp !== null &&
-        (view.importedAt === null || lifecycle.timestamp > view.importedAt)
-      )
+      turn = id
+        ? {
+            id,
+            messages: !imported && !settled(id),
+            baseline: imported && !settled(id),
+            ended: false
+          }
+        : undefined
+      continue
     }
-    if (!include || !turn) {
+    if (!turn || turn.ended || (!turn.messages && !turn.baseline)) {
       continue
     }
-    if (lifecycle && lifecycle.state !== 'working') {
-      if (lifecycle.turnId !== turn) {
-        throw agentSessionRefusalError('agent_session_operation_invalid', {
-          reason: 'messagesUnsettled'
-        })
+    if (lifecycle) {
+      if (children.has(lifecycle.turnId)) {
+        continue
       }
-      retain({
-        identity: {
-          provider: 'legacy',
-          agent: 'codex',
-          sessionId: threadId,
-          recordId: `turn-lifecycle:${turn}`
-        },
-        body: {
-          kind: 'turn',
-          turnId: turn,
-          state: lifecycle.state,
-          ...(lifecycle.outcome
-            ? { outcome: lifecycle.outcome }
-            : lifecycle.state === 'interrupted' && turn === input.stoppedTurnId
-              ? { outcome: 'cancellation' as const }
-              : {}),
-          ...(lifecycle.timestamp === null ? {} : { completedAt: lifecycle.timestamp })
-        },
-        ownerFence: 0,
-        turnScope: AGENT_JOURNAL_THREAD_SCOPE
+      if (lifecycle.turnId !== turn.id) {
+        if (turn.messages) {
+          throw agentSessionRefusalError('agent_session_operation_invalid', {
+            reason: 'messagesUnsettled'
+          })
+        }
+        continue
+      }
+      turn.ended = true
+      record(turn, {
+        kind: 'turn',
+        turnId: turn.id,
+        state: lifecycle.state,
+        ...(lifecycle.outcome
+          ? { outcome: lifecycle.outcome }
+          : lifecycle.state === 'interrupted' && turn.id === input.stoppedTurnId
+            ? { outcome: 'cancellation' as const }
+            : {}),
+        ...(lifecycle.timestamp === null ? {} : { completedAt: lifecycle.timestamp })
       })
-      include = false
       continue
     }
-    if (!isCodexVisibleHistoryRecord(record, paginated)) {
+    if (!isCodexVisibleHistoryRecord(parsed, paginated)) {
       continue
     }
     const message = decodeCodexTranscriptLine(line, `#${currentLineIndex}`, { historyImport: true })
-    if (message) {
-      retain({
-        identity: tracker.identify(line, currentLineIndex),
-        body: legacyItemBody(message, LEGACY_IMPORT_BLOCK_LIMITS),
-        ownerFence: 0,
-        turnScope: {
-          kind: 'turn',
-          turnItemId: agentJournalItemKey({
-            provider: 'legacy',
-            agent: 'codex',
-            sessionId: threadId,
-            recordId: `turn-lifecycle:${turn}`
-          })
-        },
-        ...(message.timestamp === null ? {} : { observedAt: message.timestamp })
-      })
+    if (!message) {
+      continue
     }
+    if (turn.baseline) {
+      const id = turn.opener || message.role !== 'user' ? null : providerItemId(parsed)
+      if (id) {
+        prompts ??= savedCodexPrompts(journal, threadId)
+        turn.opener = prompts.get(id)
+      }
+      continue
+    }
+    retain({
+      identity: tracker.identify(line, currentLineIndex),
+      body: legacyItemBody(message, LEGACY_IMPORT_BLOCK_LIMITS),
+      ownerFence: 0,
+      turnScope: {
+        kind: 'turn',
+        turnItemId: agentJournalItemKey(lifecycleIdentity(threadId, turn.id))
+      },
+      ...(message.timestamp === null ? {} : { observedAt: message.timestamp })
+    })
   }
   deadline.check()
   if (!identityConfirmed) {
@@ -152,10 +237,33 @@ export async function catchUpStructuredSessionAtRest(input: {
       reason: 'transcriptUnreadable'
     })
   }
-  // Incomplete source turns must remain retryable rather than being declared covered.
-  if (include && turn !== input.stoppedTurnId) {
-    throw agentSessionRefusalError('agent_session_operation_invalid', {
-      reason: 'messagesUnsettled'
+  if (turn && !turn.ended) {
+    close(turn)
+  }
+  if (baseline) {
+    retain(baseline)
+  }
+  // A rollout with no turn events still names the prompt the switch stopped: the stop lands there.
+  const stoppedPrompt =
+    input.stoppedUserItemKey && journal.canonicalItemId(input.stoppedUserItemKey)
+  if (
+    input.stoppedTurnId &&
+    !started.has(input.stoppedTurnId) &&
+    !view.known.has(input.stoppedTurnId) &&
+    stoppedPrompt &&
+    journal.item(stoppedPrompt)
+  ) {
+    retain({
+      identity: lifecycleIdentity(threadId, input.stoppedTurnId),
+      ownerFence: 0,
+      turnScope: AGENT_JOURNAL_THREAD_SCOPE,
+      body: {
+        kind: 'turn',
+        turnId: input.stoppedTurnId,
+        userItemId: stoppedPrompt,
+        state: 'interrupted',
+        outcome: 'cancellation'
+      }
     })
   }
   if (!items.length) {
@@ -176,7 +284,12 @@ export async function catchUpStructuredSessionAtRest(input: {
       return {
         dispatches: [],
         mutations: items
-          .filter((item) => !journal.item(agentJournalItemKey(item.identity)))
+          .filter((item) => {
+            const current = journal.item(
+              journal.canonicalItemId(agentJournalItemKey(item.identity))
+            )
+            return !current || turnRecordReplaceable(current.body, item.body)
+          })
           .map((item) => ({
             kind: 'item' as const,
             ...item,
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-codex-turns.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-codex-turns.ts
new file mode 100644
index 000000000000..2545c20e2678
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-codex-turns.ts
@@ -0,0 +1,48 @@
+import { asRecord } from '../../ai-vault/session-scanner-values'
+import { parseAgentJournalItemKey } from '../../../shared/agent-session-journal-item-key'
+import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
+
+// Codex rollout facts the resting importer reads beside its message rows.
+
+export function lifecycleIdentity(threadId: string, turnId: string) {
+  return {
+    provider: 'legacy' as const,
+    agent: 'codex' as const,
+    sessionId: threadId,
+    recordId: `turn-lifecycle:${turnId}`
+  }
+}
+
+/** A sub-agent's turn names its parent; it neither ends nor opens a root turn. */
+export function codexChildTurn(payload: Record<string, unknown> | null): boolean {
+  const parent = asRecord(payload?.turn_attribution)?.parent_turn_id ?? payload?.parent_turn_id
+  return typeof parent === 'string' && parent !== ''
+}
+
+/** Saved prompt rows of this thread by provider item id, under either import's identity scheme. */
+export function savedCodexPrompts(
+  journal: AgentSessionJournal,
+  threadId: string
+): Map<string, string> {
+  const prompts = new Map<string, string>()
+  journal.visitItemsWithLinkage((itemId, _sequence, body) => {
+    const identity = parseAgentJournalItemKey(itemId)
+    if (
+      identity?.provider === 'legacy' &&
+      identity.agent === 'codex' &&
+      identity.sessionId === threadId &&
+      body.kind === 'message' &&
+      body.role === 'user'
+    ) {
+      // Paginated imports prefix the rollout id; the bare provider id is the shared part.
+      prompts.set(identity.recordId.slice(identity.recordId.lastIndexOf(':') + 1), itemId)
+    }
+  })
+  return prompts
+}
+
+export function providerItemId(record: Record<string, unknown> | null): string | null {
+  const payload = asRecord(record?.payload)
+  const id = asRecord(payload?.item)?.id ?? payload?.id ?? record?.id
+  return typeof id === 'string' && id ? id : null
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
index edd23f3b8ecf..554460f72369 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
@@ -186,6 +186,7 @@ export class StructuredAgentSessionHost extends StructuredAgentSessionHostContex
       cancel: this.cancel,
       switchGeneration: this.switchGeneration,
       guardSwitchWork: this.guardSwitchWork,
+      currentWork: this.currentWork,
       startFlights: this.runtimeState.startFlights,
       now: this.now,
       lifetime: this.lifetime,
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.test.ts
index bce230547583..711f035473c0 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.test.ts
@@ -61,6 +61,22 @@ const claudeRecording = await readFile(
   'utf8'
 )
 const claudeRecordingId: string = JSON.parse(claudeRecording.split('\n')[0]!).sessionId
+/** The production refresh: Codex's resting import (its one turn-record writer), then the shared one. */
+async function refresh(input: Parameters<typeof catchUpSwitchedCliTranscript>[0]) {
+  if (input.source.agent === 'codex') {
+    await catchUpStructuredSessionAtRest({
+      journal: input.journal,
+      threadId: input.source.sessionId,
+      filePath: input.source.filePath,
+      fence: input.fence,
+      deadline: input.deadline,
+      stoppedTurnId: input.stopped?.turnId,
+      stoppedUserItemKey: input.stopped?.userItemKey,
+      settleAbandoned: input.settleAbandoned
+    })
+  }
+  await catchUpSwitchedCliTranscript(input)
+}
 it.each([
   ['claude', claudeRecordingId],
   ['codex', '01a183db-b8d6-7170-af39-e004651c1e1e'],
@@ -144,7 +160,7 @@ it.each([
         )
     await install(false)
     const historical = await imported('historical-recording')
-    await catchUpSwitchedCliTranscript({ journal: historical, source, fence: 1, deadline })
+    await refresh({ journal: historical, source, fence: 1, deadline })
     expect(turns(historical)).toEqual([])
     const stopped = await captureSwitchStoppedCliTurn(source, true, deadline)
     expect(stopped).toMatchObject({ sessionId: source.sessionId })
@@ -154,7 +170,7 @@ it.each([
       content.filter(({ body }) => body.kind === 'message' && body.role === 'user')
     ).toHaveLength(1)
     expect(blocks(journal)).toContain('tool-call')
-    await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline, stopped })
+    await refresh({ journal, source, fence: 1, deadline, stopped })
     expect(turns(journal)).toEqual([
       expect.objectContaining({ state: 'interrupted', outcome: 'cancellation' })
     ])
@@ -175,7 +191,7 @@ it.each([
       ...recordedOptions,
       identity: { ...recordedOptions.identity, sessionId: 'switched-recording' }
     })
-    await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline, stopped })
+    await refresh({ journal, source, fence: 1, deadline, stopped })
     expect(journal.snapshot()).toEqual(interrupted)
     if (agent === 'claude') {
       const prefix = await readFile(filePath, 'utf8')
@@ -196,7 +212,7 @@ it.each([
         })}\n`
       )
       const historyWithMarker = await imported('historical-interruption-marker')
-      await catchUpSwitchedCliTranscript({ journal: historyWithMarker, source, fence: 1, deadline })
+      await refresh({ journal: historyWithMarker, source, fence: 1, deadline })
       const [historicalTurn] = turns(historyWithMarker)
       expect(historicalTurn).toMatchObject({ state: 'interrupted', turnId: stopped!.turnId })
       expect(historicalTurn!.outcome).toBeUndefined()
@@ -204,7 +220,7 @@ it.each([
       const historyItems = historyWithMarker.snapshot().items
       expect(withNativeChatCutTurnNotices(historyItems)).toHaveLength(historyItems.length + 1)
       const stoppedWithMarker = await imported('stopped-interruption-marker')
-      await catchUpSwitchedCliTranscript({
+      await refresh({
         journal: stoppedWithMarker,
         source,
         fence: 1,
@@ -221,7 +237,7 @@ it.each([
       const stoppedItems = stoppedWithMarker.snapshot().items
       expect(withNativeChatCutTurnNotices(stoppedItems)).toBe(stoppedItems)
       const stoppedSnapshot = stoppedWithMarker.snapshot()
-      await catchUpSwitchedCliTranscript({
+      await refresh({
         journal: stoppedWithMarker,
         source,
         fence: 1,
@@ -287,7 +303,7 @@ it.each([
           completedAt: Date.parse(started.timestamp) + 1
         })
         expect(retained.snapshot().items.slice(0, nativeItems.length)).toEqual(nativeItems)
-        await catchUpSwitchedCliTranscript({
+        await refresh({
           journal: retained,
           source,
           fence: 1,
@@ -323,7 +339,7 @@ it.each([
           stoppedTurnId: stopped!.turnId,
           check: deadline.check
         })
-        await catchUpSwitchedCliTranscript({
+        await refresh({
           journal: retained,
           source,
           fence: 1,
@@ -336,11 +352,11 @@ it.each([
     }
     await install(true)
     const completed = await imported('completed-recording')
-    await catchUpSwitchedCliTranscript({ journal: completed, source, fence: 1, deadline, stopped })
+    await refresh({ journal: completed, source, fence: 1, deadline, stopped })
     expect(turns(completed)).toEqual([expect.objectContaining({ state: 'completed' })])
     expect(blocks(completed)).toContain('tool-result')
     const final = completed.snapshot()
-    await catchUpSwitchedCliTranscript({ journal: completed, source, fence: 1, deadline, stopped })
+    await refresh({ journal: completed, source, fence: 1, deadline, stopped })
     expect(completed.snapshot()).toEqual(final)
   }
 )
@@ -394,7 +410,7 @@ it.each(['adopted-active', 'retained-archive'] as const)(
       { blocks: [{ text: 'current' }] },
       { blocks: [{ text: 'current answer' }] }
     ])
-    await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline, stopped })
+    await refresh({ journal, source, fence: 1, deadline, stopped })
     expect(journal.snapshot().items.filter(({ body }) => body.kind !== 'turn')).toEqual(messages)
     expect(
       journal
@@ -403,7 +419,7 @@ it.each(['adopted-active', 'retained-archive'] as const)(
         .map(({ body }) => body)
     ).toEqual([expect.objectContaining({ state: 'interrupted', turnId: stopped!.turnId })])
     const refreshed = journal.snapshot()
-    await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline })
+    await refresh({ journal, source, fence: 1, deadline })
     expect(journal.snapshot()).toEqual(refreshed)
     await expect(
       captureSwitchStoppedCliTurn(
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.ts
index 4a80b0cb690c..44f2a7aad943 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.ts
@@ -10,12 +10,19 @@ import type { AgentType } from '../../../shared/agent-status-types'
 import { getSystemCodexHomePath } from '../../codex/codex-home-paths'
 import type { AdoptedTranscriptSource } from '../agent-session-journal/adopted-transcript-source'
 import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key'
-import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types'
+import {
+  AGENT_JOURNAL_THREAD_SCOPE,
+  type AgentJournalItemBody
+} from '../../../shared/agent-session-journal-types'
 import { agentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
 import type { AgentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
 import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
 import { prepareLegacyTranscriptImport } from '../agent-session-journal/journal-legacy-import'
 import type { JournalReplacementItem } from '../agent-session-journal/journal-epoch-replacement'
+import {
+  isSyntheticInterruptedTurn,
+  turnRecordReplaceable
+} from './structured-agent-session-synthetic-turn'
 
 export type SwitchTranscriptSource = {
   agent: AgentType
@@ -91,6 +98,8 @@ export async function catchUpSwitchedCliTranscript(input: {
   fence: number
   deadline: AgentSessionSwitchDeadline
   stopped?: SwitchStoppedCliTurn
+  /** The CLI writer census passed and the structured owner is at rest: an open turn is over. */
+  settleAbandoned?: boolean
   check?: () => void
   resumeCursor?: string
 }) {
@@ -130,30 +139,58 @@ export async function catchUpSwitchedCliTranscript(input: {
       : items.filter((item) => !covered.has(agentJournalItemKey(item.identity)))
   const ended =
     latest && latest.state !== 'working' ? { ...latest, state: latest.state } : undefined
-  const turnId = interrupted ? input.stopped?.turnId : ended?.turnId
-  if (turnId && userKey && !covered.has(userKey)) {
-    additions.push({
-      identity: {
-        provider: 'legacy',
-        agent: input.source.agent,
-        sessionId: input.source.sessionId,
-        recordId: `turn-lifecycle:${turnId}`
-      },
-      ownerFence: 0,
-      turnScope: AGENT_JOURNAL_THREAD_SCOPE,
-      body: {
+  // No writer is left and the turn never ended: it is over. Unknown evidence (no lifecycle, or a
+  // reply only a legacy format calls complete) gets no label rather than a guessed one.
+  const abandoned =
+    !interrupted &&
+    input.settleAbandoned === true &&
+    latest?.state === 'working' &&
+    !prepared.latestTurnAmbiguous
+  const turnId = interrupted ? input.stopped?.turnId : abandoned ? latest?.turnId : ended?.turnId
+  // Codex's turn records have one writer, the resting importer, which anchors them to saved rows.
+  if (input.source.agent !== 'codex' && turnId && userKey && !covered.has(userKey)) {
+    additions.push(
+      lifecycleRecord(input.source, turnId, {
         kind: 'turn',
         turnId,
         userItemId: userKey,
-        state: interrupted ? 'interrupted' : ended!.state,
+        state: interrupted || abandoned ? 'interrupted' : ended!.state,
         ...(interrupted
           ? { outcome: 'cancellation' as const }
           : ended?.outcome
             ? { outcome: ended.outcome }
             : {}),
         ...(ended?.timestamp == null ? {} : { completedAt: ended.timestamp })
+      })
+    )
+  }
+  // An earlier turn Orca settled whose real boundary has since been recorded takes that boundary.
+  if (input.source.agent !== 'codex') {
+    // Grok's latest turn comes from its sidecar, not the transcript rows.
+    const states = new Map(prepared.turnStates)
+    if (latest) {
+      states.set(latest.turnId, latest)
+    }
+    for (const [id, state] of states) {
+      const body = input.journal.item(
+        input.journal.canonicalItemId(
+          agentJournalItemKey(lifecycleRecord(input.source, id).identity)
+        )
+      )?.body
+      if (id !== turnId && state.state !== 'working' && isSyntheticInterruptedTurn(body)) {
+        const outcome = state.outcome ?? (state.state === 'interrupted' ? body.outcome : undefined)
+        additions.push(
+          lifecycleRecord(input.source, id, {
+            kind: 'turn',
+            turnId: id,
+            ...(body.userItemId ? { userItemId: body.userItemId } : {}),
+            state: state.state,
+            ...(outcome ? { outcome } : {}),
+            ...(state.timestamp == null ? {} : { completedAt: state.timestamp })
+          })
+        )
       }
-    })
+    }
   }
   const digest = createHash('sha256').update(JSON.stringify(additions)).digest('hex')
   await input.journal.appendPlannedLifecycleBatch({
@@ -169,12 +206,7 @@ export async function catchUpSwitchedCliTranscript(input: {
             const current = input.journal.item(
               input.journal.canonicalItemId(agentJournalItemKey(item.identity))
             )
-            return (
-              !current ||
-              (item.body.kind === 'turn' &&
-                current.body.kind === 'turn' &&
-                current.body.state === 'running')
-            )
+            return !current || turnRecordReplaceable(current.body, item.body)
           })
           .map((item) => ({
             kind: 'item' as const,
@@ -185,3 +217,21 @@ export async function catchUpSwitchedCliTranscript(input: {
     }
   })
 }
+
+function lifecycleRecord(
+  source: SwitchTranscriptSource,
+  turnId: string,
+  body?: Extract<AgentJournalItemBody, { kind: 'turn' }>
+): JournalReplacementItem {
+  return {
+    identity: {
+      provider: 'legacy',
+      agent: source.agent,
+      sessionId: source.sessionId,
+      recordId: `turn-lifecycle:${turnId}`
+    },
+    ownerFence: 0,
+    turnScope: AGENT_JOURNAL_THREAD_SCOPE,
+    body: body ?? { kind: 'turn', turnId, state: 'running' }
+  }
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts
index 79a09f8a23ae..232d33b2fb46 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts
@@ -3,6 +3,7 @@ import { randomUUID } from 'node:crypto'
 import { createStructuredAgentSessionOperationId } from '../../../shared/structured-agent-session-mutation'
 import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope'
 import { agentSessionLeasePossiblyWriting } from '../../../shared/agent-session-lease-adjudication'
+import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission'
 import {
   AgentSessionRefusalError,
   agentSessionRefusalError
@@ -21,7 +22,7 @@ import type { StructuredAgentSessionConversationLifetime } from './structured-ag
 import type { StructuredAgentSessionStartFlights } from './structured-agent-session-start-flight'
 type SwitchSourceContext = Pick<
   StructuredAgentSessionHost,
-  'deps' | 'cancel' | 'switchGeneration' | 'guardSwitchWork'
+  'deps' | 'cancel' | 'switchGeneration' | 'guardSwitchWork' | 'currentWork'
 > & {
   now: () => number
   startFlights: Pick<StructuredAgentSessionStartFlights, 'physicalExit'>
@@ -52,7 +53,7 @@ export function structuredAgentSessionSwitchSource(context: SwitchSourceContext)
       deadline: AgentSessionSwitchDeadline
     ) => {
       deadline.check()
-      await context.lifetime.conversation(sessionId)
+      const conversation = await context.lifetime.conversation(sessionId)
       deadline.check()
       let child = context.sessions.get(sessionId)?.child ?? null
       let admitted = context.deps.store.admittedSendCount(sessionId)
@@ -79,26 +80,38 @@ export function structuredAgentSessionSwitchSource(context: SwitchSourceContext)
           sessionId
         })
       }
+      // A Stop with no turn running and nothing queued stops nothing (the common pattern makes it a
+      // no-op, so no Stop note is written); the process stop below still ends the agent with proof.
+      const work = context.currentWork(sessionId, conversation.journal)
+      const stops =
+        work === undefined ||
+        work.working() ||
+        conversation.journal.submissions().some(isQueuedAgentJournalSubmission)
       let proven = false
       try {
-        const answer = await context.cancel(caller, {
-          envelope: {
-            sessionId,
-            clientOperationId: createStructuredAgentSessionOperationId(randomUUID, context.now()),
-            expectedRuntimeFence: record.lease.runtimeFence,
-            payloadFingerprint: computeAgentSessionPayloadFingerprint({
-              method: 'agentSession.cancel',
-              sessionId,
-              fields: {}
+        const answer = !stops
+          ? ({ ok: true } as const)
+          : await context.cancel(caller, {
+              envelope: {
+                sessionId,
+                clientOperationId: createStructuredAgentSessionOperationId(
+                  randomUUID,
+                  context.now()
+                ),
+                expectedRuntimeFence: record.lease.runtimeFence,
+                payloadFingerprint: computeAgentSessionPayloadFingerprint({
+                  method: 'agentSession.cancel',
+                  sessionId,
+                  fields: {}
+                })
+              },
+              onAccepted: (captured) => {
+                child = captured
+                admitted = context.deps.store.admittedSendCount(sessionId)
+                accepted = true
+              },
+              waitForShutdown: true
             })
-          },
-          onAccepted: (captured) => {
-            child = captured
-            admitted = context.deps.store.admittedSendCount(sessionId)
-            accepted = true
-          },
-          waitForShutdown: true
-        })
         if (!answer.ok) {
           throw new AgentSessionRefusalError(answer.refusal)
         }
@@ -192,7 +205,8 @@ export function structuredAgentSessionSwitchSource(context: SwitchSourceContext)
       },
       deadline: AgentSessionSwitchDeadline,
       stopped?: SwitchStoppedCliTurn,
-      check: () => void = deadline.check
+      check: () => void = deadline.check,
+      settleAbandoned = false
     ) => {
       const session = await context.lifetime.conversation(sessionId)
       const transcript = { ...source, agent: source.agent ?? session.params.agent }
@@ -204,6 +218,8 @@ export function structuredAgentSessionSwitchSource(context: SwitchSourceContext)
           fence: context.deps.store.getRecord(sessionId)?.lease.runtimeFence ?? 0,
           deadline,
           stoppedTurnId: stopped?.turnId,
+          stoppedUserItemKey: stopped?.userItemKey,
+          settleAbandoned,
           check
         })
       }
@@ -216,6 +232,7 @@ export function structuredAgentSessionSwitchSource(context: SwitchSourceContext)
         fence: context.deps.store.getRecord(sessionId)?.lease.runtimeFence ?? 0,
         deadline,
         stopped,
+        settleAbandoned,
         check
       })
       context.subscribers.publish(sessionId, session.journal)
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-turn-boundary.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-turn-boundary.test.ts
new file mode 100644
index 000000000000..458a61779cb8
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-turn-boundary.test.ts
@@ -0,0 +1,71 @@
+import { appendFile, mkdtemp, rm, writeFile } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, expect, it } from 'vitest'
+import { armSwitchTurnBoundaryWait } from './structured-agent-session-switch-turn-boundary'
+
+const TURN = 'stopped-turn'
+const row = (payload: object) => `${JSON.stringify({ type: 'event_msg', payload })}\n`
+let root: string
+let filePath: string
+let controller: AbortController
+beforeEach(async () => {
+  root = await mkdtemp(join(tmpdir(), 'orca-turn-boundary-'))
+  filePath = join(root, 'rollout.jsonl')
+  controller = new AbortController()
+})
+afterEach(async () => {
+  controller.abort()
+  await rm(root, { recursive: true, force: true })
+})
+
+async function arm(remainingMs: number) {
+  return armSwitchTurnBoundaryWait(
+    { agent: 'codex', sessionId: 'thread', filePath },
+    { sessionId: 'thread', userItemKey: 'user', turnId: TURN },
+    controller.signal,
+    () => remainingMs
+  )
+}
+
+it('reads only what the agent appends, so a long history costs nothing and the wait stays bounded', async () => {
+  const history = row({ type: 'agent_message', message: 'x'.repeat(1_000) }).repeat(20_000)
+  await writeFile(filePath, `${history}${row({ type: 'task_started', turn_id: TURN })}`)
+  const armedAt = performance.now()
+  const wait = await arm(1_400)
+  // An earlier turn's end in the appended rows is not the stopped turn's.
+  await appendFile(filePath, row({ type: 'task_complete', turn_id: 'earlier' }))
+  await wait()
+  const elapsed = performance.now() - armedAt
+  expect(elapsed).toBeGreaterThanOrEqual(350)
+  expect(elapsed).toBeLessThan(1_500)
+})
+
+it('returns as soon as the stopped turn’s end is recorded', async () => {
+  await writeFile(filePath, row({ type: 'task_started', turn_id: TURN }))
+  const wait = await arm(60_000)
+  const started = performance.now()
+  setTimeout(() => void appendFile(filePath, row({ type: 'turn_aborted', turn_id: TURN })), 150)
+  await wait()
+  expect(performance.now() - started).toBeLessThan(1_500)
+})
+
+it('never throws: a vanished transcript or an aborted request returns and the stop goes on', async () => {
+  await writeFile(filePath, row({ type: 'task_started', turn_id: TURN }))
+  const wait = await arm(60_000)
+  await rm(filePath)
+  await expect(wait()).resolves.toBeUndefined()
+  await writeFile(filePath, '')
+  const aborted = await arm(60_000)
+  const started = performance.now()
+  setTimeout(() => controller.abort(), 100)
+  await expect(aborted()).resolves.toBeUndefined()
+  expect(performance.now() - started).toBeLessThan(1_500)
+  const missing = await armSwitchTurnBoundaryWait(
+    { agent: 'codex', sessionId: 'thread', filePath: join(root, 'missing.jsonl') },
+    { sessionId: 'thread', userItemKey: 'user', turnId: TURN },
+    new AbortController().signal,
+    () => 60_000
+  )
+  await expect(missing()).resolves.toBeUndefined()
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-turn-boundary.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-turn-boundary.ts
new file mode 100644
index 000000000000..37017b8cd17f
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-turn-boundary.ts
@@ -0,0 +1,96 @@
+import { open, stat } from 'node:fs/promises'
+import { StringDecoder } from 'node:string_decoder'
+import type { AgentType } from '../../../shared/agent-status-types'
+import {
+  decodeClaudeTurnLifecycle,
+  decodeCodexTurnLifecycle,
+  decodePiTurnLifecycle,
+  type NativeChatTurnLifecycleDecoder
+} from '../transcript-turn-lifecycle'
+import type {
+  SwitchStoppedCliTurn,
+  SwitchTranscriptSource
+} from './structured-agent-session-switch-import'
+
+const BOUNDARY_WAIT_MS = 5_000
+const BOUNDARY_POLL_MS = 100
+const BOUNDARY_READ_BYTES = 4 * 1024 * 1024
+
+// Agents that append their turn's end to the transcript Orca tails. Grok records it in a sidecar
+// and OpenCode in a database; their one Escape does not end the turn either, so they skip the
+// wait and the resting import settles the turn, as the wait's own timeout would.
+const BOUNDARY_DECODERS: Partial<Record<AgentType, NativeChatTurnLifecycleDecoder>> = {
+  codex: decodeCodexTurnLifecycle,
+  claude: (line, fallbackId) => decodeClaudeTurnLifecycle(line, fallbackId, true),
+  pi: decodePiTurnLifecycle
+}
+
+/**
+ * After the switch's Escape, give the agent a short while to record its own end of the stopped
+ * turn before the process is stopped (the common pattern: interrupt, await that turn's settle,
+ * bounded, then stop anyway). Reads only what the agent appends after the Escape; one agent writes
+ * the file in order, so the first end recorded there is the stopped turn's (Codex names it).
+ * Arm before the Escape; the returned wait never throws: a read failure, a vanished file, the
+ * abort or the bound all return, and the stop proceeds as it would have.
+ */
+export async function armSwitchTurnBoundaryWait(
+  source: SwitchTranscriptSource,
+  stopped: SwitchStoppedCliTurn,
+  signal: AbortSignal,
+  remainingMs: () => number
+): Promise<() => Promise<void>> {
+  const decode = BOUNDARY_DECODERS[source.agent]
+  let offset: number
+  try {
+    offset = decode ? (await stat(source.filePath)).size : -1
+  } catch {
+    offset = -1
+  }
+  if (!decode || offset < 0) {
+    return async () => {}
+  }
+  return async () => {
+    const until = Date.now() + Math.min(BOUNDARY_WAIT_MS, Math.max(0, remainingMs() - 1_000))
+    const text = new StringDecoder('utf8')
+    let pending = ''
+    try {
+      while (!signal.aborted && Date.now() < until) {
+        const size = (await stat(source.filePath)).size
+        if (size > offset) {
+          const length = Math.min(size - offset, BOUNDARY_READ_BYTES)
+          const chunk = Buffer.alloc(length)
+          const file = await open(source.filePath, 'r')
+          try {
+            await file.read(chunk, 0, length, offset)
+          } finally {
+            await file.close()
+          }
+          offset += length
+          const lines = (pending + text.write(chunk)).split('\n')
+          pending = lines.pop() ?? ''
+          for (const line of lines) {
+            const ended = decode(line, '')
+            if (
+              ended &&
+              ended.state !== 'working' &&
+              (source.agent !== 'codex' || ended.turnId === stopped.turnId)
+            ) {
+              return
+            }
+          }
+        }
+        await new Promise<void>((resolve) => {
+          const timer = setTimeout(done, BOUNDARY_POLL_MS)
+          function done() {
+            clearTimeout(timer)
+            signal.removeEventListener('abort', done)
+            resolve()
+          }
+          signal.addEventListener('abort', done, { once: true })
+        })
+      }
+    } catch {
+      // The proven stop and the resting import own correctness; this wait only adds fidelity.
+    }
+  }
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-synthetic-turn.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-synthetic-turn.ts
new file mode 100644
index 000000000000..817c9ab44f8d
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-synthetic-turn.ts
@@ -0,0 +1,25 @@
+import type { AgentJournalItemBody } from '../../../shared/agent-session-journal-types'
+
+/**
+ * An interrupted turn record with no completion time was settled by Orca, not read from the
+ * provider: the turn was open when no writer could still add to it. It stays revisitable, so a
+ * real boundary the provider wrote later (and any rows of that turn) replace it on the next import.
+ */
+export function isSyntheticInterruptedTurn(
+  body: AgentJournalItemBody | undefined
+): body is Extract<AgentJournalItemBody, { kind: 'turn' }> {
+  return body?.kind === 'turn' && body.state === 'interrupted' && body.completedAt === undefined
+}
+
+/** A recorded boundary may replace a running or Orca-settled record of the same turn. */
+export function turnRecordReplaceable(
+  current: AgentJournalItemBody,
+  next: AgentJournalItemBody
+): boolean {
+  return (
+    next.kind === 'turn' &&
+    current.kind === 'turn' &&
+    (current.state === 'running' ||
+      (isSyntheticInterruptedTurn(current) && !isSyntheticInterruptedTurn(next)))
+  )
+}
diff --git a/src/main/runtime/orchestration/structured-worker-switch-stop.test.ts b/src/main/runtime/orchestration/structured-worker-switch-stop.test.ts
index 15d32a517289..8e274d098d72 100644
--- a/src/main/runtime/orchestration/structured-worker-switch-stop.test.ts
+++ b/src/main/runtime/orchestration/structured-worker-switch-stop.test.ts
@@ -13,9 +13,12 @@ import {
   foundRestTestChat,
   REST_TEST_SESSION as id,
   REST_TEST_CALLER as caller,
+  REST_TEST_THREAD,
   type RestTestRig
 } from '../../native-chat/agent-session-wire/structured-agent-session-rest-test-rig'
 import { agentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
+import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types'
+import { STOP_NOTE_CANCELLATION_REQUESTED } from '../../native-chat/agent-session-wire/structured-agent-session-turn-stop-notes'
 
 let rig: RestTestRig
 let db: OrchestrationDb
@@ -93,3 +96,26 @@ it.each([false, true])(
     expect(db.getDispatchContextById(dispatch.id)?.status).toBe(proven ? 'failed' : 'dispatched')
   }
 )
+
+it.each([false, true])(
+  'sends the switch’s Stop only to a chat that is replying=%s, so an idle chat gets no Stop note',
+  async (replying) => {
+    await foundRestTestChat(rig)
+    const events = rig.adapter.acquire.mock.calls.at(-1)![0].events
+    for (const state of replying ? (['running'] as const) : (['running', 'completed'] as const)) {
+      events.appendItem(
+        { provider: 'codex', threadId: REST_TEST_THREAD, turnId: 'turn', ordinal: 50 },
+        { kind: 'turn', turnId: 'turn', state },
+        { turnScope: AGENT_JOURNAL_THREAD_SCOPE }
+      )
+    }
+    await rig.host.flushStreamedEvents(id)
+    const cancel = vi.spyOn(rig.host, 'cancel')
+    await rig.host.stopForSwitch(id, caller, deadline)
+    expect(cancel).toHaveBeenCalledTimes(replying ? 1 : 0)
+    const { journal } = await rig.host.collaboratorsForTests().lifetime.conversation(id)
+    expect(
+      JSON.stringify(journal.snapshot().items).includes(STOP_NOTE_CANCELLATION_REQUESTED)
+    ).toBe(replying)
+  }
+)
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
index d7faa44eb930..7d608f6d581a 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
@@ -33,7 +33,8 @@ import {
 } from './structured-agent-session-switch-source'
 import { executeStructuredSessionTerminalSwitch } from './structured-agent-session-switch-terminal-execution'
 import { agentLaunchMovesHostWindow } from './agent-launch-tab-publication'
-import { interruptWorkingAgent } from '../../terminal-agent-interrupt'
+import { stopStructuredSwitchTerminalSource } from './structured-agent-session-switch-terminal-stop'
+import { agentSessionLeasePossiblyWriting } from '../../../../shared/agent-session-lease-adjudication'
 import { mainAgentState } from '../../../../shared/main-agent-status'
 import { captureSwitchStoppedCliTurn } from '../../../native-chat/agent-session-wire/structured-agent-session-switch-import'
 import { worktreeIdsEqual } from '../../../../shared/worktree/id'
@@ -182,37 +183,19 @@ async function switchToChat(
     : undefined
   deadline.check()
   if (close && paneKey) {
-    await interruptWorkingAgent(
-      ctx.runtime,
-      (key) => ctx.runtime.agentTransitions.latestRow(key),
+    await stopStructuredSwitchTerminalSource({
+      ctx,
+      host,
+      sessionId,
+      close,
       paneKey,
-      { signal: deadline.signal, beforeWrite: async () => deadline.check() }
-    )
-    // Only a tab the chat will replace keeps its exited pane shown for that write; a source in
-    // another workspace, or a pane in a split, exits as any pane does.
-    const destination =
-      host.deps.store.getRecord(sessionId)?.location.workspaceId ??
-      create?.worktree.replace(/^id:/, '')
-    const replacing =
-      destination !== undefined &&
-      worktreeIdsEqual(close.source.worktreeId, destination) &&
-      close.wholeTab()
-    // Shutdown already accepted must finish even when the observing request expires.
-    try {
-      await host.trackSwitchPhysical(sessionId, close.stop(replacing))
-      // The window decides whether the stopped pane is still there; a chat that replaced it is
-      // named so the window waits for that replace's own pass.
-      keepSource(() => close.settleStoppedSource(replacedBy))
-    } catch {
-      host.deps.logger.warn('switch source exit was not confirmed', {
-        scope: 'session-switch',
-        sessionId,
-        direction: 'chat',
-        source: 'terminal',
-        exactIncarnation: true
-      })
-      throw agentSessionRefusalError('agent_session_ownership_unknown', { reason: 'ownerUnproven' })
-    }
+      deadline,
+      destination:
+        host.deps.store.getRecord(sessionId)?.location.workspaceId ??
+        create?.worktree.replace(/^id:/, ''),
+      boundary: before && stopped ? { source: before, stopped } : undefined,
+      keepSource: (settle) => keepSource(() => settle(replacedBy))
+    })
   }
   deadline.check()
   if (create) {
@@ -264,12 +247,24 @@ async function switchToChat(
         reason: 'transcriptUnreadable'
       })
     }
+    // An open turn settles only when nothing can still write it: no CLI writer (a live one refuses
+    // here, on every path, before the import) and a structured owner at rest.
+    if (providerSessionId) {
+      await ctx.runtime.assertStructuredAdoptionTerminalWritersExited(
+        record.provider,
+        providerSessionId,
+        create?.resumeFrom?.cliSource ??
+          (close && paneKey ? { workspaceId: close.source.worktreeId, paneKey } : undefined)
+      )
+    }
+    const lease = providerSessionId ? host.deps.store.getRecord(sessionId)?.lease : undefined
     await host.refreshSwitchTranscript(
       sessionId,
       transcript.cliForkSource,
       deadline,
       stopped,
-      check
+      check,
+      lease !== undefined && !agentSessionLeasePossiblyWriting(lease)
     )
   }
   const revealed = await host.revealSession(sessionId)
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-open-turn.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-open-turn.test.ts
new file mode 100644
index 000000000000..58b441594d04
--- /dev/null
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-open-turn.test.ts
@@ -0,0 +1,158 @@
+import { mkdir, writeFile } from 'node:fs/promises'
+import { join } from 'node:path'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import * as cliTranscript from '../../../ai-vault/structured-chat-cli-fork'
+import { structuredAgentRuntimeMetadata } from '../../structured-agent-runtime-metadata'
+import { agentSessionProviderHandleChainHead } from '../../../../shared/agent-session-provider-handle'
+import {
+  createRestTestRig,
+  type RestTestRig
+} from '../../../native-chat/agent-session-wire/structured-agent-session-rest-test-rig'
+import {
+  createTestParams,
+  CREATE_TEST_CALLER as caller
+} from '../../../native-chat/agent-session-wire/structured-agent-session-create-test-fixture'
+import { HOST_TEST_SESSION as id } from '../../../native-chat/agent-session-wire/structured-agent-session-host-test-data'
+import { setStructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-registry'
+import {
+  setupMainOwnedWorkspace,
+  WORKTREE_ID,
+  TAB_ID,
+  LEAF_A,
+  PTY_A
+} from '../../main-owned-workspace-runtime-fixture'
+import { executeStructuredSessionSwitch } from './structured-agent-session-switch-execution'
+
+// A terminal whose CLI turn never recorded its end (killed, crashed, or stopped before the write):
+// once the census proves no CLI writer is left and the chat's own owner is at rest, the chat
+// shows that turn as over, so it never reads as replying forever.
+
+let rig: RestTestRig
+beforeEach(async () => {
+  rig = await createRestTestRig({ idleSweep: { intervalMs: 60_000 } })
+  const params = createTestParams()
+  expect(
+    await rig.host.create(
+      caller,
+      createTestParams(undefined, { location: { ...params.location, workspaceId: WORKTREE_ID } })
+    )
+  ).toMatchObject({ ok: true })
+  setStructuredAgentSessionHost(rig.host)
+})
+afterEach(async () => {
+  setStructuredAgentSessionHost(null)
+  await rig.dispose()
+  vi.restoreAllMocks()
+})
+
+async function openCliTurn() {
+  await rig.host.switchToChat(id)
+  await rig.host.switchToTerminal(id)
+  const record = rig.store.getRecord(id)!
+  const head = agentSessionProviderHandleChainHead(record.providerHandleChain)!
+  const codexHome = join(rig.root, 'codex-account')
+  await mkdir(join(codexHome, 'sessions'), { recursive: true })
+  const filePath = join(codexHome, 'sessions', 'switch-source.jsonl')
+  const nativeId = head.handle.nativeId
+  const at = Date.now() + 60_000
+  await writeFile(
+    filePath,
+    `${[
+      { type: 'session_meta', payload: { id: nativeId } },
+      {
+        timestamp: new Date(at).toISOString(),
+        type: 'event_msg',
+        payload: { type: 'task_started', turn_id: 'cli-turn' }
+      },
+      {
+        timestamp: new Date(at + 1).toISOString(),
+        type: 'event_msg',
+        payload: { type: 'user_message', message: 'A terminal prompt' }
+      }
+    ]
+      .map((row) => JSON.stringify(row))
+      .join('\n')}\n`
+  )
+  vi.spyOn(cliTranscript, 'resolveStructuredChatCliSource').mockResolvedValue({
+    host: rig.host,
+    record,
+    head,
+    agent: 'codex',
+    cwd: rig.root,
+    providerSessionId: nativeId,
+    requireCurrent: vi.fn(),
+    metadata: structuredAgentRuntimeMetadata('codex')!
+  })
+  vi.spyOn(cliTranscript, 'prepareStructuredChatCliTranscript').mockResolvedValue({
+    useRealCodexHome: false,
+    cliForkSource: {
+      agent: 'codex',
+      sourceAgent: 'codex',
+      sessionId: nativeId,
+      filePath,
+      cwd: rig.root,
+      codexHome,
+      executionHostPlatform: process.platform
+    }
+  })
+}
+
+it('settles a CLI turn left open once no writer is left, after the census', async () => {
+  await openCliTurn()
+  const { runtime } = setupMainOwnedWorkspace()
+  const incarnationId = '11111111-1111-4111-8111-111111111111'
+  runtime.registerPty(PTY_A, WORKTREE_ID, null, { tabId: TAB_ID, leafId: LEAF_A, incarnationId })
+  const source = runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_A}`, WORKTREE_ID)
+  if (!source.presentation) {
+    throw new Error('missing captured source')
+  }
+  const written = vi.fn(() => true)
+  runtime.setPtyController({
+    write: written,
+    kill: () => false,
+    stopAndWait: async () => {
+      await runtime.onPtyExit(PTY_A, 0, incarnationId, { hostExitConfirmed: true })
+      return true
+    },
+    // The CLI sits at its prompt: the switch stops the process without an Escape.
+    getForegroundProcess: async () => 'codex'
+  })
+  const order: string[] = []
+  const census = vi
+    .spyOn(runtime, 'assertStructuredAdoptionTerminalWritersExited')
+    .mockImplementation(async () => void order.push('census'))
+  const refresh = rig.host.refreshSwitchTranscript
+  const refreshed = vi
+    .spyOn(rig.host, 'refreshSwitchTranscript')
+    .mockImplementation(async (...args) => {
+      order.push('import')
+      return refresh(...args)
+    })
+  const answer = await executeStructuredSessionSwitch(
+    {
+      sessionId: id,
+      execution: {
+        invocationId: 'open-turn',
+        source: {
+          terminal: source.handle,
+          expectedIncarnationId: incarnationId,
+          originalPresentation: source.presentation
+        }
+      }
+    },
+    { runtime },
+    'chat'
+  )
+  expect(answer).toEqual({ status: 'completed', sessionId: id })
+  expect(order).toEqual(['census', 'import'])
+  expect(written).not.toHaveBeenCalled()
+  expect(census).toHaveBeenCalledWith('codex', expect.any(String), expect.anything())
+  expect(refreshed.mock.calls[0]?.[5]).toBe(true)
+  const { journal } = await rig.host.collaboratorsForTests().lifetime.conversation(id)
+  const turns = journal
+    .snapshot()
+    .items.flatMap(({ body }) => (body.kind === 'turn' ? [body] : []))
+    .filter((turn) => turn.turnId === 'cli-turn')
+  expect(turns).toEqual([expect.objectContaining({ state: 'interrupted' })])
+  expect(turns[0]).not.toHaveProperty('outcome')
+})
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-stop.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-stop.ts
new file mode 100644
index 000000000000..393519f3d212
--- /dev/null
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-stop.ts
@@ -0,0 +1,70 @@
+import type { RpcContext } from '../core'
+import type { StructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-host'
+import type {
+  SwitchStoppedCliTurn,
+  SwitchTranscriptSource
+} from '../../../native-chat/agent-session-wire/structured-agent-session-switch-import'
+import { armSwitchTurnBoundaryWait } from '../../../native-chat/agent-session-wire/structured-agent-session-switch-turn-boundary'
+import type { AgentSessionSwitchDeadline } from '../../../../shared/agent-session-switch-execution'
+import { agentSessionRefusalError } from '../../../../shared/agent-session-wire-refusals'
+import { worktreeIdsEqual } from '../../../../shared/worktree/id'
+import { interruptWorkingAgent } from '../../terminal-agent-interrupt'
+import type { captureStructuredSwitchTerminalSource } from './structured-agent-session-switch-source'
+
+/**
+ * A terminal source's stop: Escape a replying agent, let it record its own end of that turn
+ * (bounded), then stop the exact process with exit proof. Nothing here waits on the transcript to
+ * decide whether the stop happens; a turn still open after the stop settles at the resting import.
+ */
+export async function stopStructuredSwitchTerminalSource(input: {
+  ctx: RpcContext
+  host: StructuredAgentSessionHost
+  sessionId: string
+  close: NonNullable<ReturnType<typeof captureStructuredSwitchTerminalSource>>
+  paneKey: string
+  deadline: AgentSessionSwitchDeadline
+  destination: string | undefined
+  boundary?: { source: SwitchTranscriptSource; stopped: SwitchStoppedCliTurn }
+  keepSource: (settle: (replacedBy: string | undefined) => void) => void
+}): Promise<void> {
+  const { ctx, host, sessionId, close, deadline } = input
+  const awaitBoundary = input.boundary
+    ? await armSwitchTurnBoundaryWait(
+        input.boundary.source,
+        input.boundary.stopped,
+        deadline.signal,
+        deadline.remaining
+      )
+    : undefined
+  const interrupted = await interruptWorkingAgent(
+    ctx.runtime,
+    (key) => ctx.runtime.agentTransitions.latestRow(key),
+    input.paneKey,
+    { signal: deadline.signal, beforeWrite: async () => deadline.check() }
+  )
+  if (interrupted.outcome === 'accepted') {
+    await awaitBoundary?.()
+  }
+  // Only a tab the chat will replace keeps its exited pane shown for that write; a source in
+  // another workspace, or a pane in a split, exits as any pane does.
+  const replacing =
+    input.destination !== undefined &&
+    worktreeIdsEqual(close.source.worktreeId, input.destination) &&
+    close.wholeTab()
+  // Shutdown already accepted must finish even when the observing request expires.
+  try {
+    await host.trackSwitchPhysical(sessionId, close.stop(replacing))
+    // The window decides whether the stopped pane is still there; a chat that replaced it is
+    // named so the window waits for that replace's own pass.
+    input.keepSource((replacedBy) => close.settleStoppedSource(replacedBy))
+  } catch {
+    host.deps.logger.warn('switch source exit was not confirmed', {
+      scope: 'session-switch',
+      sessionId,
+      direction: 'chat',
+      source: 'terminal',
+      exactIncarnation: true
+    })
+    throw agentSessionRefusalError('agent_session_ownership_unknown', { reason: 'ownerUnproven' })
+  }
+}

From c976ddee87c8cb08dbc4ba20325d5cf8709a060f Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 22:05:03 -0700
Subject: [PATCH 152/207] Say what went wrong when a switch can't read history
 or loses its answer

A history read failing after the stop read "could not start in chat. Check its setup", and a lost answer after the host started the terminal read "could not start in a terminal". The switch now refuses a missing or unreadable saved conversation with the history copy (never "not saved yet" for a chat that shows saved turns), a failure after the request left reads as unconfirmed, and the remaining default names the agent without blaming its setup. On the web client a switch's 105 s bound now starts when the request actually leaves, and a request still queued at its send-by time is dropped unsent, as on desktop.
---
 src/main/ai-vault/structured-chat-cli-fork.ts |  41 +++++--
 ...ructured-agent-session-switch-execution.ts |  44 +++-----
 ...agent-session-switch-terminal-execution.ts |  23 +---
 ...ed-agent-session-switch-transcript.test.ts |  31 ++++++
 ...uctured-agent-session-switch-transcript.ts |  38 +++++++
 .../tab-bar/cli-chat-resume-run.test.ts       |   2 +-
 .../tab-bar/native-chat-cli-fork-run.test.ts  |   2 +-
 .../src/i18n/en-runtime-required.json         |   4 +-
 src/renderer/src/i18n/locales/en.json         |   4 +-
 .../lib/conversation-surface-switch.test.tsx  |  25 +++++
 .../src/lib/conversation-surface-switch.ts    |  14 ++-
 .../src/lib/conversation-switch-feedback.ts   |   8 +-
 .../web-runtime-environment-subscribe.test.ts |  44 ++++++++
 .../web-runtime-environment-subscribe.ts      | 100 ++++++++++++++++++
 .../web-runtime-environments-api.ts           |  82 ++------------
 .../web-runtime-client-timeout-budget.test.ts |  47 ++++++++
 src/renderer/src/web/web-runtime-client.ts    |   1 +
 .../web/web-runtime-subscription-contract.ts  |   2 +
 18 files changed, 369 insertions(+), 143 deletions(-)
 create mode 100644 src/main/runtime/rpc/methods/structured-agent-session-switch-transcript.test.ts
 create mode 100644 src/main/runtime/rpc/methods/structured-agent-session-switch-transcript.ts
 create mode 100644 src/renderer/src/web/preload-api/web-runtime-environment-subscribe.test.ts
 create mode 100644 src/renderer/src/web/preload-api/web-runtime-environment-subscribe.ts

diff --git a/src/main/ai-vault/structured-chat-cli-fork.ts b/src/main/ai-vault/structured-chat-cli-fork.ts
index 29253efee299..44e215aa7895 100644
--- a/src/main/ai-vault/structured-chat-cli-fork.ts
+++ b/src/main/ai-vault/structured-chat-cli-fork.ts
@@ -100,6 +100,17 @@ export function isStructuredChatCliForkSourceCurrent(
   )
 }
 
+/** The saved conversation file is missing or unreadable. The message keeps the copy path's words;
+ *  a switch reads the reason, so a history it cannot read is never shown as a setup problem. */
+export class StructuredChatTranscriptError extends Error {
+  constructor(
+    message: string,
+    readonly reason: 'transcriptNotFound' | 'transcriptUnreadable'
+  ) {
+    super(message)
+  }
+}
+
 /** The chat's current conversation on this host, as its CLI would open it; `fork` keeps its copy rules. */
 export async function resolveStructuredChatCliSource(
   sourceChat: AiVaultPrepareChatForkArgs['sourceChat'],
@@ -154,7 +165,10 @@ export async function resolveStructuredChatCliSource(
   }
   const providerSessionId = metadata.sessionHistory.rowSessionId(head)
   if (!providerSessionId.trim()) {
-    throw new Error('This chat has no saved conversation to copy.')
+    throw new StructuredChatTranscriptError(
+      'This chat has no saved conversation to copy.',
+      'transcriptNotFound'
+    )
   }
   assertNativeConversationContent(await host.journalSnapshot(record.sessionId))
   return { host, record, metadata, head, agent, cwd, providerSessionId, requireCurrent }
@@ -207,11 +221,17 @@ export async function prepareStructuredChatCliTranscript(
   if (importer.handleNamesTranscript) {
     filePath = head.handle.nativeId
     if (head.handle.transport !== 'jsonl-rpc' || !isAbsolute(filePath) || isWslUncPath(filePath)) {
-      throw new Error('The chat has no valid saved session file.')
+      throw new StructuredChatTranscriptError(
+        'The chat has no valid saved session file.',
+        'transcriptUnreadable'
+      )
     }
     const header = await readPiSessionHeader(filePath)
     if (!header || header.id !== providerSessionId) {
-      throw new Error('The saved conversation does not match this chat.')
+      throw new StructuredChatTranscriptError(
+        'The saved conversation does not match this chat.',
+        'transcriptUnreadable'
+      )
     }
   } else {
     const store = importer.conversationStore({ accountHome: record.accountHome, launchEnv })
@@ -219,12 +239,15 @@ export async function prepareStructuredChatCliTranscript(
       ? await importer.findTranscript({ providerSessionId, store, launchEnv, workspaceCwd: cwd })
       : null
   }
-  if (!filePath || !isAbsolute(filePath) || isWslUncPath(filePath)) {
-    throw new Error('This chat has no saved conversation to copy.')
-  }
-  const saved = await stat(filePath)
-  if (!saved.isFile() || saved.size === 0) {
-    throw new Error('This chat has no saved conversation to copy.')
+  const saved =
+    filePath && isAbsolute(filePath) && !isWslUncPath(filePath)
+      ? await stat(filePath).catch(() => null)
+      : null
+  if (!filePath || !saved?.isFile() || saved.size === 0) {
+    throw new StructuredChatTranscriptError(
+      'This chat has no saved conversation to copy.',
+      'transcriptNotFound'
+    )
   }
   const codexHome =
     agent === 'codex' && isLegacyAgentSessionAccountHome(record.accountHome)
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
index 7d608f6d581a..a6b1ae5fa229 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
@@ -12,15 +12,9 @@ import {
   type AgentSessionSwitchDeadline,
   type AgentSessionSwitchResult
 } from '../../../../shared/agent-session-switch-execution'
-import {
-  AgentSessionRefusalError,
-  agentSessionRefusalError
-} from '../../../../shared/agent-session-wire-refusals'
-import {
-  nativeConversationContent,
-  prepareStructuredChatCliTranscript,
-  resolveStructuredChatCliSource
-} from '../../../ai-vault/structured-chat-cli-fork'
+import { AgentSessionRefusalError } from '../../../../shared/agent-session-wire-refusals'
+import { nativeConversationContent } from '../../../ai-vault/structured-chat-cli-fork'
+import { prepareSwitchCliTranscript } from './structured-agent-session-switch-transcript'
 import { structuredCallerFor } from './structured-agent-session-gate'
 import {
   prepareStructuredAgentSessionCreateForWorktree,
@@ -157,12 +151,10 @@ async function switchToChat(
   const adopt = createIdentity?.adopt
   const retainedSource =
     !adopt && source
-      ? await prepareStructuredChatCliTranscript(
-          await resolveStructuredChatCliSource(
-            { sessionId, workspaceId: recordWorkspace(host, sessionId) },
-            false
-          ),
-          (args) => ctx.runtime.prepareAiVaultSessionResume(args),
+      ? await prepareSwitchCliTranscript(
+          ctx.runtime,
+          sessionId,
+          recordWorkspace(host, sessionId),
           false
         )
       : undefined
@@ -173,7 +165,7 @@ async function switchToChat(
         filePath: adopt.transcriptPath,
         source: adopt.source
       }
-    : retainedSource?.cliForkSource
+    : retainedSource
   const stopped = before
     ? await captureSwitchStoppedCliTurn(
         before,
@@ -232,21 +224,15 @@ async function switchToChat(
   }
   const record = requireStructuredSwitchRecord(host, sessionId)
   const check = captureStructuredSwitchWorkCheck(host, sessionId, deadline, 'chat')
+  // Read before the stop (or shown as saved turns): a file gone now is history Orca can't read.
   if (source || nativeConversationContent(await host.journalSnapshot(sessionId)) === 'saved') {
-    const transcript = await prepareStructuredChatCliTranscript(
-      await resolveStructuredChatCliSource(
-        { sessionId, workspaceId: record.location.workspaceId },
-        false
-      ),
-      (args) => ctx.runtime.prepareAiVaultSessionResume(args),
-      false
+    const transcript = await prepareSwitchCliTranscript(
+      ctx.runtime,
+      sessionId,
+      record.location.workspaceId,
+      true
     )
     check()
-    if (!transcript.cliForkSource) {
-      throw agentSessionRefusalError('agent_session_identity_required', {
-        reason: 'transcriptUnreadable'
-      })
-    }
     // An open turn settles only when nothing can still write it: no CLI writer (a live one refuses
     // here, on every path, before the import) and a structured owner at rest.
     if (providerSessionId) {
@@ -260,7 +246,7 @@ async function switchToChat(
     const lease = providerSessionId ? host.deps.store.getRecord(sessionId)?.lease : undefined
     await host.refreshSwitchTranscript(
       sessionId,
-      transcript.cliForkSource,
+      transcript,
       deadline,
       stopped,
       check,
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts
index 2b007a0e367c..2ed0236a3482 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts
@@ -10,11 +10,8 @@ import type {
   AgentSessionSwitchResult
 } from '../../../../shared/agent-session-switch-execution'
 import { agentSessionRefusalError } from '../../../../shared/agent-session-wire-refusals'
-import {
-  nativeConversationContent,
-  prepareStructuredChatCliTranscript,
-  resolveStructuredChatCliSource
-} from '../../../ai-vault/structured-chat-cli-fork'
+import { nativeConversationContent } from '../../../ai-vault/structured-chat-cli-fork'
+import { prepareSwitchCliTranscript } from './structured-agent-session-switch-transcript'
 
 /** Stop the chat with proof, spawn the terminal parked, then one layout replace into the chat's slot. */
 export async function executeStructuredSessionTerminalSwitch(
@@ -55,28 +52,16 @@ export async function executeStructuredSessionTerminalSwitch(
   }
   const prepared =
     content === 'saved'
-      ? await prepareStructuredChatCliTranscript(
-          await resolveStructuredChatCliSource(
-            { sessionId, workspaceId: record.location.workspaceId },
-            false
-          ),
-          (args) => ctx.runtime.prepareAiVaultSessionResume(args),
-          false
-        )
+      ? await prepareSwitchCliTranscript(ctx.runtime, sessionId, record.location.workspaceId, true)
       : undefined
   check()
-  if (content === 'saved' && !prepared?.cliForkSource) {
-    throw agentSessionRefusalError('agent_session_identity_required', {
-      reason: 'transcriptNotFound'
-    })
-  }
   // Parked: bound to a pane no layout shows yet. A lost reply is answered by re-issuing this same
   // create, which adopts the running terminal through the conversation's claim.
   const terminal = await host.trackSwitchPhysical(
     sessionId,
     ctx.runtime.spawnSwitchTerminal(record.location.workspaceId, {
       agent,
-      source: prepared?.cliForkSource,
+      source: prepared,
       commandOverride: execution?.commandOverride,
       options: record.options,
       signal: deadline.signal
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-transcript.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-transcript.test.ts
new file mode 100644
index 000000000000..0284ca2275f3
--- /dev/null
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-transcript.test.ts
@@ -0,0 +1,31 @@
+import { afterEach, expect, it, vi } from 'vitest'
+import * as cliTranscript from '../../../ai-vault/structured-chat-cli-fork'
+import { prepareSwitchCliTranscript } from './structured-agent-session-switch-transcript'
+
+const runtime = { prepareAiVaultSessionResume: vi.fn() }
+
+afterEach(() => vi.restoreAllMocks())
+
+function failPreparation(error: Error) {
+  vi.spyOn(cliTranscript, 'resolveStructuredChatCliSource').mockRejectedValue(error)
+}
+
+it.each([
+  [false, 'transcriptNotFound', 'transcriptNotFound'],
+  [false, 'transcriptUnreadable', 'transcriptUnreadable'],
+  // A chat that already shows saved turns: a missing file is history Orca can't read.
+  [true, 'transcriptNotFound', 'transcriptUnreadable']
+] as const)('types a transcript failure (saved=%s, %s → %s)', async (saved, reason, expected) => {
+  failPreparation(new cliTranscript.StructuredChatTranscriptError('no file', reason))
+  await expect(
+    prepareSwitchCliTranscript(runtime, 'chat', 'workspace', saved)
+  ).rejects.toMatchObject({
+    refusal: { code: 'agent_session_identity_required', details: { reason: expected } }
+  })
+})
+
+it('keeps an unrelated precondition’s own error, such as a rewind waiting for its next message', async () => {
+  const rewind = new Error('Send a message after rewinding this chat, then open it in a terminal.')
+  failPreparation(rewind)
+  await expect(prepareSwitchCliTranscript(runtime, 'chat', 'workspace', true)).rejects.toBe(rewind)
+})
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-transcript.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-transcript.ts
new file mode 100644
index 000000000000..d20fb6d125f1
--- /dev/null
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-transcript.ts
@@ -0,0 +1,38 @@
+import {
+  prepareStructuredChatCliTranscript,
+  resolveStructuredChatCliSource,
+  StructuredChatTranscriptError
+} from '../../../ai-vault/structured-chat-cli-fork'
+import type { AiVaultChatForkSource } from '../../../../shared/ai-vault-resume-preparation'
+import { agentSessionRefusalError } from '../../../../shared/agent-session-wire-refusals'
+import type { OrcaRuntimeService } from '../../orca-runtime'
+
+/**
+ * The transcript a switch opens, with its failures typed for the user. `saved`: the chat already
+ * shows saved turns, so a file that is gone is history Orca cannot read, never "not saved yet".
+ * Other preconditions (a rewind waiting for its next message, a moved chat) keep their own errors.
+ */
+export async function prepareSwitchCliTranscript(
+  runtime: Pick<OrcaRuntimeService, 'prepareAiVaultSessionResume'>,
+  sessionId: string,
+  workspaceId: string,
+  saved: boolean
+): Promise<AiVaultChatForkSource> {
+  const refuse = (reason: StructuredChatTranscriptError['reason']) =>
+    agentSessionRefusalError('agent_session_identity_required', {
+      reason: saved ? 'transcriptUnreadable' : reason
+    })
+  try {
+    const prepared = await prepareStructuredChatCliTranscript(
+      await resolveStructuredChatCliSource({ sessionId, workspaceId }, false),
+      (args) => runtime.prepareAiVaultSessionResume(args),
+      false
+    )
+    if (!prepared.cliForkSource) {
+      throw refuse('transcriptNotFound')
+    }
+    return prepared.cliForkSource
+  } catch (error) {
+    throw error instanceof StructuredChatTranscriptError ? refuse(error.reason) : error
+  }
+}
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
index 4b1143385abb..a545b4c5aded 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
@@ -667,7 +667,7 @@ it.each(['preparation', 'refusal'])(
     expect(mocks.toast).toHaveBeenCalledExactlyOnceWith(
       stage === 'refusal'
         ? "Claude couldn't open this conversation's history. Check that its saved conversation is available, then try again."
-        : 'Claude could not start in chat. Check its setup and try again.'
+        : 'Claude could not switch to chat. Try again.'
     )
     expect(tabs()).toEqual([])
     expect(mocks.activate).not.toHaveBeenCalled()
diff --git a/src/renderer/src/components/tab-bar/native-chat-cli-fork-run.test.ts b/src/renderer/src/components/tab-bar/native-chat-cli-fork-run.test.ts
index e03f6de0683d..b334183b888a 100644
--- a/src/renderer/src/components/tab-bar/native-chat-cli-fork-run.test.ts
+++ b/src/renderer/src/components/tab-bar/native-chat-cli-fork-run.test.ts
@@ -225,7 +225,7 @@ it.each(['prepare', 'launch'])(
         })
     })
     expect(mocks.error).toHaveBeenCalledExactlyOnceWith(
-      'Claude could not start in a terminal. Check its setup and try again.'
+      'Claude could not switch to a terminal. Try again.'
     )
     expect(mocks.notify).not.toHaveBeenCalled()
   }
diff --git a/src/renderer/src/i18n/en-runtime-required.json b/src/renderer/src/i18n/en-runtime-required.json
index 155c950a935b..ca90849e20a8 100644
--- a/src/renderer/src/i18n/en-runtime-required.json
+++ b/src/renderer/src/i18n/en-runtime-required.json
@@ -1905,8 +1905,8 @@
           "stopUnknown": "Orca could not confirm {{agent}} stopped. Check its open chats and terminals, then try switching again.",
           "outcomeUnknown": "Orca could not confirm the {{agent}} switch. Check the open chat and terminal before trying again.",
           "historyUnavailable": "{{agent}} couldn't open this conversation's history. Check that its saved conversation is available, then try again.",
-          "chatStartFailed": "{{agent}} could not start in chat. Check its setup and try again.",
-          "terminalStartFailed": "{{agent}} could not start in a terminal. Check its setup and try again.",
+          "chatSwitchFailed": "{{agent}} could not switch to chat. Try again.",
+          "terminalSwitchFailed": "{{agent}} could not switch to a terminal. Try again.",
           "writerUnconfirmed": "Orca could not confirm {{agent}} stopped. Check its open chats and terminals, then try this action again.",
           "sourceExitUnconfirmed": "Orca could not confirm {{agent}} stopped in this terminal. Quit {{agent}} here, then try this action again.",
           "sourceKept": "{{agent}} opened successfully. The original tab was kept; continue in the new tab.",
diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index 96420d8a874d..fc745a3f4910 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -20098,8 +20098,8 @@
           "stopAndSwitch": "Stop and switch",
           "outcomeUnknown": "Orca could not confirm the {{agent}} switch. Check the open chat and terminal before trying again.",
           "historyUnavailable": "{{agent}} couldn't open this conversation's history. Check that its saved conversation is available, then try again.",
-          "chatStartFailed": "{{agent}} could not start in chat. Check its setup and try again.",
-          "terminalStartFailed": "{{agent}} could not start in a terminal. Check its setup and try again.",
+          "chatSwitchFailed": "{{agent}} could not switch to chat. Try again.",
+          "terminalSwitchFailed": "{{agent}} could not switch to a terminal. Try again.",
           "writerUnconfirmed": "Orca could not confirm {{agent}} stopped. Check its open chats and terminals, then try this action again.",
           "sourceExitUnconfirmed": "Orca could not confirm {{agent}} stopped in this terminal. Quit {{agent}} here, then try this action again.",
           "sourceKept": "{{agent}} opened successfully. The original tab was kept; continue in the new tab.",
diff --git a/src/renderer/src/lib/conversation-surface-switch.test.tsx b/src/renderer/src/lib/conversation-surface-switch.test.tsx
index a5dae407336a..4e030c4fcc26 100644
--- a/src/renderer/src/lib/conversation-surface-switch.test.tsx
+++ b/src/renderer/src/lib/conversation-surface-switch.test.tsx
@@ -169,3 +169,28 @@ it('stops nothing when a chat switch races a host that cannot switch in place',
   expect(mocks.call).not.toHaveBeenCalled()
   expect(mocks.error).toHaveBeenCalledOnce()
 })
+
+it.each([false, true])(
+  'reads a lost answer once the request left (sent=%s) as unconfirmed, never as a setup problem',
+  async (sent) => {
+    mocks.call.mockImplementation(
+      async (
+        _target: unknown,
+        _method: string,
+        _params: unknown,
+        options: { beforeSend: (sentAt?: number) => void }
+      ) => {
+        if (sent) {
+          options.beforeSend()
+        }
+        throw new Error('Runtime request closed before agentSession.switchToTerminal completed')
+      }
+    )
+    await expect(runConversationSwitch(subject)).resolves.toBe(false)
+    expect(mocks.error).toHaveBeenCalledExactlyOnceWith(
+      sent
+        ? 'Orca could not confirm the Codex switch. Check the open chat and terminal before trying again.'
+        : 'Codex could not switch to a terminal. Try again.'
+    )
+  }
+)
diff --git a/src/renderer/src/lib/conversation-surface-switch.ts b/src/renderer/src/lib/conversation-surface-switch.ts
index 067342a1a083..c21237d37e65 100644
--- a/src/renderer/src/lib/conversation-surface-switch.ts
+++ b/src/renderer/src/lib/conversation-surface-switch.ts
@@ -30,6 +30,7 @@ import {
   type AgentSessionSwitchResult
 } from '../../../shared/agent-session-switch-execution'
 import { AgentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
+import { structuredLaunchFailure } from './structured-agent-session-launch-failure'
 import { prepareAiVaultSessionForResume } from './ai-vault-session-resume-preparation'
 import type { CliChatResumeSource } from '@/components/tab-bar/cli-chat-resume-source'
 import { runLegacyConversationSwitch } from './conversation-switch-legacy'
@@ -86,6 +87,7 @@ export async function runConversationSwitch(args: ConversationSwitch): Promise<b
   })
   conversationSwitchChanged()
   let consented = false
+  let sent = false
   let disposeDeadline: (() => void) | undefined
   try {
     const supported = await withinSwitchBudget(supportsInPlaceSwitch(target, args.agent, true))
@@ -129,7 +131,10 @@ export async function runConversationSwitch(args: ConversationSwitch): Promise<b
         {
           signal: deadline.signal,
           dispatchObservation: deadline.delegateSend,
-          beforeSend: (sentAt) => deadline.beforeSend(sentAt)
+          beforeSend: (sentAt) => {
+            deadline.beforeSend(sentAt)
+            sent = true
+          }
         }
       )
     )
@@ -145,7 +150,12 @@ export async function runConversationSwitch(args: ConversationSwitch): Promise<b
     }
     return true
   } catch (error) {
-    feedback(conversationSwitchFailureText(error, args), 'error')
+    // Once the request left, a failure that isn't the host's answer can't say what the host did.
+    const unknown = sent && !structuredLaunchFailure(error)
+    feedback(
+      conversationSwitchFailureText(error, args, unknown ? 'outcomeUnknown' : undefined),
+      'error'
+    )
     return false
   } finally {
     disposeDeadline?.()
diff --git a/src/renderer/src/lib/conversation-switch-feedback.ts b/src/renderer/src/lib/conversation-switch-feedback.ts
index b534adc189f3..9dd8027c6647 100644
--- a/src/renderer/src/lib/conversation-switch-feedback.ts
+++ b/src/renderer/src/lib/conversation-switch-feedback.ts
@@ -84,13 +84,13 @@ export function conversationSwitchFailureText(
   }
   return args.direction === 'chat'
     ? translate(
-        'components.tab.bar.switch.chatStartFailed',
-        '{{agent}} could not start in chat. Check its setup and try again.',
+        'components.tab.bar.switch.chatSwitchFailed',
+        '{{agent}} could not switch to chat. Try again.',
         values
       )
     : translate(
-        'components.tab.bar.switch.terminalStartFailed',
-        '{{agent}} could not start in a terminal. Check its setup and try again.',
+        'components.tab.bar.switch.terminalSwitchFailed',
+        '{{agent}} could not switch to a terminal. Try again.',
         values
       )
 }
diff --git a/src/renderer/src/web/preload-api/web-runtime-environment-subscribe.test.ts b/src/renderer/src/web/preload-api/web-runtime-environment-subscribe.test.ts
new file mode 100644
index 000000000000..385c05c13f84
--- /dev/null
+++ b/src/renderer/src/web/preload-api/web-runtime-environment-subscribe.test.ts
@@ -0,0 +1,44 @@
+import { afterEach, expect, it, vi } from 'vitest'
+import { subscribeWebRuntimeEnvironment } from './web-runtime-environment-subscribe'
+
+const mocks = vi.hoisted(() => ({
+  subscribe: vi.fn(),
+  // A busy connection: the request waits in line until its signal ends the wait.
+  enqueue: vi.fn(
+    (_id: string, _method: string, _run: () => unknown, _priority: number, signal: AbortSignal) =>
+      new Promise((_resolve, reject) =>
+        signal.addEventListener('abort', () => reject(new Error('aborted')), { once: true })
+      )
+  )
+}))
+vi.mock('./web-runtime-calls', () => ({ assertEnvironmentPairing: () => undefined }))
+vi.mock('./web-runtime-session', () => ({
+  resolveEnvironment: () => ({ id: 'environment' }),
+  getClientForEnvironment: () => ({ subscribe: mocks.subscribe }),
+  manuallyDisconnectedEnvironmentIds: new Set(),
+  manuallyDisconnectedResponse: vi.fn(),
+  updateEnvironmentFromResponse: vi.fn(),
+  runtimeCallQueuePool: { enqueue: mocks.enqueue }
+}))
+
+afterEach(() => vi.useRealTimers())
+
+it('drops a request still queued at its send-by time, unsent, as the desktop does', async () => {
+  vi.useFakeTimers()
+  const onSent = vi.fn()
+  const subscribing = subscribeWebRuntimeEnvironment(
+    {
+      subscriptionId: 'switch',
+      selector: 'environment',
+      method: 'agentSession.switchToChat',
+      params: {},
+      dispatchObservation: { expiresAt: Date.now() + 1_000, responseTimeoutMs: 105_000 }
+    },
+    { onResponse: vi.fn(), onSent }
+  )
+  const settled = expect(subscribing).rejects.toThrow('aborted')
+  await vi.advanceTimersByTimeAsync(1_000)
+  await settled
+  expect(mocks.subscribe).not.toHaveBeenCalled()
+  expect(onSent).not.toHaveBeenCalled()
+})
diff --git a/src/renderer/src/web/preload-api/web-runtime-environment-subscribe.ts b/src/renderer/src/web/preload-api/web-runtime-environment-subscribe.ts
new file mode 100644
index 000000000000..58eb7b61bada
--- /dev/null
+++ b/src/renderer/src/web/preload-api/web-runtime-environment-subscribe.ts
@@ -0,0 +1,100 @@
+import type { PreloadApi } from '../../../../preload/api-types'
+import { assertEnvironmentPairing } from './web-runtime-calls'
+import {
+  getClientForEnvironment,
+  manuallyDisconnectedEnvironmentIds,
+  manuallyDisconnectedResponse,
+  resolveEnvironment,
+  runtimeCallQueuePool,
+  updateEnvironmentFromResponse
+} from './web-runtime-session'
+
+type RuntimeEnvironmentsApi = NonNullable<PreloadApi['runtimeEnvironments']>
+
+const pendingSubscriptions = new Map<string, AbortController>()
+
+export const cancelWebRuntimeEnvironmentSubscription: RuntimeEnvironmentsApi['cancelSubscription'] =
+  async ({ subscriptionId }) => {
+    pendingSubscriptions.get(subscriptionId)?.abort()
+  }
+
+export const subscribeWebRuntimeEnvironment: RuntimeEnvironmentsApi['subscribe'] = async (
+  {
+    selector,
+    method,
+    params,
+    timeoutMs,
+    subscriptionId,
+    expectedEnvironmentPairingRevision,
+    dispatchObservation
+  },
+  callbacks
+) => {
+  const environment = resolveEnvironment(selector)
+  assertEnvironmentPairing(selector, expectedEnvironmentPairingRevision)
+  const client = getClientForEnvironment(environment)
+  const controller = new AbortController()
+  if (subscriptionId) {
+    if (pendingSubscriptions.has(subscriptionId)) {
+      throw new Error('Subscription id already exists')
+    }
+    pendingSubscriptions.set(subscriptionId, controller)
+  }
+  // As the desktop's main process does: a request still queued at its send-by time is dropped
+  // unsent, so the caller's response bound starts only at the actual send.
+  const unsent =
+    dispatchObservation &&
+    setTimeout(() => controller.abort(), Math.max(0, dispatchObservation.expiresAt - Date.now()))
+  let subscription
+  try {
+    subscription = await runtimeCallQueuePool.enqueue(
+      environment.id,
+      method,
+      () => {
+        assertEnvironmentPairing(selector, expectedEnvironmentPairingRevision)
+        if (manuallyDisconnectedEnvironmentIds.has(environment.id)) {
+          throw new Error('runtime_manually_disconnected')
+        }
+        return client.subscribe(
+          method,
+          params,
+          {
+            ...callbacks,
+            onResponse: (response) => {
+              try {
+                assertEnvironmentPairing(selector, expectedEnvironmentPairingRevision)
+              } catch (error) {
+                callbacks.onError?.({
+                  code: 'runtime_environment_changed',
+                  message: String(error)
+                })
+                callbacks.onClose?.()
+                controller.abort()
+                return
+              }
+              const result = manuallyDisconnectedEnvironmentIds.has(environment.id)
+                ? manuallyDisconnectedResponse(environment)
+                : response
+              updateEnvironmentFromResponse(environment, result)
+              callbacks.onResponse(result)
+            }
+          },
+          { timeoutMs, signal: controller.signal }
+        )
+      },
+      0,
+      controller.signal
+    )
+  } finally {
+    // Settled: the frame was sent, or the request failed.
+    clearTimeout(unsent)
+    if (subscriptionId && pendingSubscriptions.get(subscriptionId) === controller) {
+      pendingSubscriptions.delete(subscriptionId)
+    }
+  }
+  if (manuallyDisconnectedEnvironmentIds.has(environment.id)) {
+    subscription.unsubscribe()
+    throw new Error('runtime_manually_disconnected')
+  }
+  return subscription
+}
diff --git a/src/renderer/src/web/preload-api/web-runtime-environments-api.ts b/src/renderer/src/web/preload-api/web-runtime-environments-api.ts
index 6ca8e0e56f48..e7c5c4dd656a 100644
--- a/src/renderer/src/web/preload-api/web-runtime-environments-api.ts
+++ b/src/renderer/src/web/preload-api/web-runtime-environments-api.ts
@@ -1,5 +1,4 @@
 import { pairedRuntimeConnectionFromOffer } from '../../../../shared/paired-runtime-connection'
-const pendingSubscriptions = new Map<string, AbortController>()
 import type { PreloadApi } from '../../../../preload/api-types'
 import { parseHostAccessLink } from '../../../../shared/remote-pairing-address'
 import { verifyRemotePairingRuntimeStatus } from '../../../../shared/remote-pairing-verification'
@@ -15,7 +14,11 @@ import {
 } from '../web-runtime-environment'
 import { translate } from '@/i18n/i18n'
 import { translateHostAccessLinkError } from '@/lib/remote-pairing-copy'
-import { assertEnvironmentPairing, callEnvironmentEnvelope } from './web-runtime-calls'
+import { callEnvironmentEnvelope } from './web-runtime-calls'
+import {
+  cancelWebRuntimeEnvironmentSubscription,
+  subscribeWebRuntimeEnvironment
+} from './web-runtime-environment-subscribe'
 import {
   closeActiveRuntimeClients,
   subscribeWebRuntimeStatus,
@@ -27,10 +30,7 @@ import {
   removeActiveRuntimeEnvironment,
   requireActiveEnvironmentOrNull,
   resolveEnvironment,
-  webRuntimeState,
-  runtimeCallQueuePool,
-  updateEnvironmentFromResponse,
-  manuallyDisconnectedResponse
+  webRuntimeState
 } from './web-runtime-session'
 
 export function createRuntimeEnvironmentsApi(): NonNullable<
@@ -227,73 +227,7 @@ export function createRuntimeEnvironmentsApi(): NonNullable<
         expectedEnvironmentPairingRevision,
         expectedEnvironmentRuntimeId
       ),
-    cancelSubscription: async ({ subscriptionId }) => {
-      pendingSubscriptions.get(subscriptionId)?.abort()
-    },
-    subscribe: async (
-      { selector, method, params, timeoutMs, subscriptionId, expectedEnvironmentPairingRevision },
-      callbacks
-    ) => {
-      const environment = resolveEnvironment(selector)
-      assertEnvironmentPairing(selector, expectedEnvironmentPairingRevision)
-      const client = getClientForEnvironment(environment)
-      const controller = new AbortController()
-      if (subscriptionId) {
-        if (pendingSubscriptions.has(subscriptionId)) {
-          throw new Error('Subscription id already exists')
-        }
-        pendingSubscriptions.set(subscriptionId, controller)
-      }
-      let subscription
-      try {
-        subscription = await runtimeCallQueuePool.enqueue(
-          environment.id,
-          method,
-          () => {
-            assertEnvironmentPairing(selector, expectedEnvironmentPairingRevision)
-            if (manuallyDisconnectedEnvironmentIds.has(environment.id)) {
-              throw new Error('runtime_manually_disconnected')
-            }
-            return client.subscribe(
-              method,
-              params,
-              {
-                ...callbacks,
-                onResponse: (response) => {
-                  try {
-                    assertEnvironmentPairing(selector, expectedEnvironmentPairingRevision)
-                  } catch (error) {
-                    callbacks.onError?.({
-                      code: 'runtime_environment_changed',
-                      message: String(error)
-                    })
-                    callbacks.onClose?.()
-                    controller.abort()
-                    return
-                  }
-                  const result = manuallyDisconnectedEnvironmentIds.has(environment.id)
-                    ? manuallyDisconnectedResponse(environment)
-                    : response
-                  updateEnvironmentFromResponse(environment, result)
-                  callbacks.onResponse(result)
-                }
-              },
-              { timeoutMs, signal: controller.signal }
-            )
-          },
-          0,
-          controller.signal
-        )
-      } finally {
-        if (subscriptionId && pendingSubscriptions.get(subscriptionId) === controller) {
-          pendingSubscriptions.delete(subscriptionId)
-        }
-      }
-      if (manuallyDisconnectedEnvironmentIds.has(environment.id)) {
-        subscription.unsubscribe()
-        throw new Error('runtime_manually_disconnected')
-      }
-      return subscription
-    }
+    cancelSubscription: cancelWebRuntimeEnvironmentSubscription,
+    subscribe: subscribeWebRuntimeEnvironment
   }
 }
diff --git a/src/renderer/src/web/web-runtime-client-timeout-budget.test.ts b/src/renderer/src/web/web-runtime-client-timeout-budget.test.ts
index b2eaf52db09e..9ca35458515a 100644
--- a/src/renderer/src/web/web-runtime-client-timeout-budget.test.ts
+++ b/src/renderer/src/web/web-runtime-client-timeout-budget.test.ts
@@ -81,4 +81,51 @@ describe('WebRuntimeClient timeout budget', () => {
     await vi.advanceTimersByTimeAsync(1)
     await expect(call).rejects.toThrow('Request timed out: runtime.two-phase-timeout')
   })
+
+  it('reports a request sent only once its frame left, so a caller’s response deadline starts there', async () => {
+    const client = new WebRuntimeClient(
+      pairedRuntimeConnectionFromOffer({
+        v: 2,
+        endpoint: 'ws://127.0.0.1:6768',
+        deviceToken: 'token',
+        publicKeyB64: Buffer.alloc(32).toString('base64')
+      })
+    )
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the test reaches the client's private transport state; a renamed field fails the test.
+    const internals = client as unknown as {
+      waitForConnected: () => Promise<void>
+      sendEncrypted: (message: unknown) => boolean
+      subscribeOnCurrentConnection: WebRuntimeClient['subscribe']
+    }
+    vi.spyOn(internals, 'waitForConnected').mockResolvedValue(undefined)
+    const order: string[] = []
+    const send = vi.spyOn(internals, 'sendEncrypted').mockImplementation(() => {
+      order.push('frame')
+      return true
+    })
+    const onSent = vi.fn(() => void order.push('sent'))
+    await internals.subscribeOnCurrentConnection(
+      'agentSession.switchToChat',
+      {},
+      {
+        onResponse: vi.fn(),
+        onSent
+      }
+    )
+    expect(order).toEqual(['frame', 'sent'])
+    send.mockReturnValue(false)
+    onSent.mockClear()
+    await expect(
+      internals.subscribeOnCurrentConnection(
+        'agentSession.switchToChat',
+        {},
+        {
+          onResponse: vi.fn(),
+          onSent
+        }
+      )
+    ).rejects.toThrow('not connected')
+    expect(onSent).not.toHaveBeenCalled()
+    client.close()
+  })
 })
diff --git a/src/renderer/src/web/web-runtime-client.ts b/src/renderer/src/web/web-runtime-client.ts
index b1be52e77192..08b024ede7cb 100644
--- a/src/renderer/src/web/web-runtime-client.ts
+++ b/src/renderer/src/web/web-runtime-client.ts
@@ -205,6 +205,7 @@ export class WebRuntimeClient {
       this.subscriptions.delete(id)
       throw new Error('Remote Orca runtime is not connected.')
     }
+    callbacks.onSent?.(Date.now())
     return {
       unsubscribe: () => {
         this.subscriptions.delete(subscription.id)
diff --git a/src/renderer/src/web/web-runtime-subscription-contract.ts b/src/renderer/src/web/web-runtime-subscription-contract.ts
index 2d2e1daf5b39..939bb37cc026 100644
--- a/src/renderer/src/web/web-runtime-subscription-contract.ts
+++ b/src/renderer/src/web/web-runtime-subscription-contract.ts
@@ -2,6 +2,8 @@ import type { RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope'
 
 export type WebRuntimeSubscriptionCallbacks = {
   onResponse: (response: RuntimeRpcResponse<unknown>) => void
+  /** The request left this client: the caller's response deadline starts here, not at enqueue. */
+  onSent?: (sentAt?: number) => void
   onBinary?: (bytes: Uint8Array<ArrayBufferLike>) => void
   onError?: (error: { code: string; message: string }) => void
   onClose?: () => void

From 895345b74a3ef5119bde9705fee5020b15a9af68 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 22:34:10 -0700
Subject: [PATCH 153/207] Put a switch's destination where each client showed
 its source, and select it only from its source
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A split pane's chat landed at the end of the tab strip, a paired client appended the destination of its own switch and selected an unrelated tab, and the window's chat→terminal revealed a workspace the user had left. A switch now records where its destination goes (the replaced tab's slot, or beside a split pane's tab) and every frame paired clients get carries it for the destination's life, so a window republish or an early frame can't drop it; terminal rows now carry it too. Each client places the destination in that slot in one pass that also sets its group, keeps its own pin from the replaced tab, and gives it the selection only if its source, or nothing, held it. The host snapshot, the window's replace and focus, and paired clients use that same rule, and nothing reveals a workspace the user moved away from.
---
 ...red-agent-session-switch-execution.test.ts |   8 +
 ...ructured-agent-session-switch-execution.ts |   7 +
 .../runtime-mobile-session-projection.ts      |   1 +
 src/main/runtime/runtime-notifier-contract.ts |   4 +-
 .../prune-mobile-session-tab-group-layout.ts  |   5 +-
 .../pty-backed-session-publication.ts         |   3 +
 .../session-tabs/session-tab-replace.test.ts  |   3 +-
 .../session-tabs/session-tab-replace.ts       |  12 +-
 .../structured-session-tab-restoration.ts     |   9 +-
 .../session-tabs/switch-slot-anchors.test.ts  |  44 +++++
 .../session-tabs/switch-slot-anchors.ts       |  61 +++++++
 .../session-tabs/switch-terminal-placement.ts |   5 +
 src/main/window/runtime-window-lifecycle.ts   |   3 +-
 .../ui-bridge-terminal-and-session-tabs.ts    |  17 +-
 src/preload/api/ui-command-event-api.ts       |   2 +
 .../terminal-presentation-ipc-bridge.ts       |   8 +-
 ...nal-presentation-replace-selection.test.ts | 128 +++++++-------
 .../terminal-ui-routing-ipc-bridge.ts         |  16 +-
 .../web-session-client-owned-tab-placement.ts |  24 ++-
 .../apply-preparation-base.ts                 |  25 ++-
 .../apply-preparation-groups.ts               |  69 ++------
 .../replaced-slot-placement.test.ts           | 163 ++++++++++++++++++
 .../web-session-tabs-sync/slot-anchor.ts      |  53 ++++++
 .../web-session-tabs-sync/terminal-build.ts   |   9 +-
 .../terminal-surfaces.ts                      |   7 +-
 .../runtime-mobile-session-tab-contracts.ts   |   3 +
 26 files changed, 548 insertions(+), 141 deletions(-)
 create mode 100644 src/main/runtime/session-tabs/switch-slot-anchors.test.ts
 create mode 100644 src/main/runtime/session-tabs/switch-slot-anchors.ts
 create mode 100644 src/renderer/src/runtime/web-session-tabs-sync/slot-anchor.ts

diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
index fdd2941777d9..02a35c5eee5e 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
@@ -259,6 +259,10 @@ it.each(['single', 'split', 'other-workspace', 'reselected'] as const)(
       ).toBe(existingDestination.tabId)
     }
     const published = await runtime.listMobileSessionTabs(`id:${destinationWorkspace}`)
+    // Paired clients put the chat where they showed its source: its slot, or beside a split pane.
+    expect(published.tabs.find((tab) => tab.id === destination)).toMatchObject(
+      elsewhere ? {} : split ? { after: { tabId: TAB_ID } } : { replaces: { tabId: TAB_ID } }
+    )
     if (shape !== 'reselected') {
       expect(published.activeTabId).toBe(destination)
     }
@@ -447,6 +451,10 @@ it('puts the switched terminal in the chat tab’s slot and closes the chat tab,
     row.tabOrder.includes(terminal ?? '')
   )
   expect(group?.tabOrder).toEqual([TAB_ID, terminal, 'agent-session:later-tab'])
+  const published = await runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)
+  expect(
+    published.tabs.find((tab) => tab.type === 'terminal' && tab.parentTabId === terminal)
+  ).toMatchObject({ replaces: { tabId: `agent-session:${id}` } })
   expect(
     session().unifiedTabs?.[WORKTREE_ID]?.some(
       (tab) => tab.contentType === 'agent-session' && tab.entityId === id
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
index a6b1ae5fa229..9a760775397d 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
@@ -263,6 +263,13 @@ async function switchToChat(
   const sameWorkspace =
     close !== undefined && worktreeIdsEqual(close.source.worktreeId, record.location.workspaceId)
   const replaces = sameWorkspace && close.wholeTab() ? close.source.tabId : undefined
+  if (sameWorkspace) {
+    ctx.runtime.switchSlotAnchors.record(
+      record.location.workspaceId,
+      `agent-session:${sessionId}`,
+      replaces ? { replaces: { tabId: replaces } } : { after: { tabId: close.source.tabId } }
+    )
+  }
   await ctx.runtime.publishStructuredAgentSessionTab({
     ...revealed,
     activate: true,
diff --git a/src/main/runtime/runtime-mobile-session-projection.ts b/src/main/runtime/runtime-mobile-session-projection.ts
index 3d6cf075c2fd..2271be2d9ca0 100644
--- a/src/main/runtime/runtime-mobile-session-projection.ts
+++ b/src/main/runtime/runtime-mobile-session-projection.ts
@@ -283,6 +283,7 @@ export function projectRuntimeMobileSessionTabs(
       ? { agentStatus: clientStatusFields as AgentStatusEntry }
       : {}
     tabs.push({
+      ...(tab.replaces ? { replaces: tab.replaces } : tab.after ? { after: tab.after } : {}),
       type: 'terminal',
       id: tab.id,
       parentTabId: tab.parentTabId,
diff --git a/src/main/runtime/runtime-notifier-contract.ts b/src/main/runtime/runtime-notifier-contract.ts
index df8dcedf6829..a5a1493b010c 100644
--- a/src/main/runtime/runtime-notifier-contract.ts
+++ b/src/main/runtime/runtime-notifier-contract.ts
@@ -140,7 +140,9 @@ export type RuntimeNotifier = {
   focusTerminal(tabId: string, worktreeId: string, leafId?: string | null): void
   /** Raises the window onto a pane it shows; resolves false when the window does not know the worktree. */
   revealTerminalPane?(target: TerminalPaneRevealTarget): Promise<boolean>
-  focusEditorTab?(tabId: string, worktreeId: string): void
+  /** `sourceTabId`: a switch's source; the window focuses the tab only while that source, or
+   *  nothing, holds its group's selection in the workspace the user is in. */
+  focusEditorTab?(tabId: string, worktreeId: string, sourceTabId?: string): void
   closeSessionTab?(tabId: string, worktreeId: string): void | Promise<void | boolean>
   moveSessionTab?(worktreeId: string, move: RuntimeMobileSessionTabMove): void
   /** Host window only: host/all move it; caller/clients open without moving it; absence keeps legacy switching. Paired clients never navigate (all means host). */
diff --git a/src/main/runtime/session-lifecycle/projection/prune-mobile-session-tab-group-layout.ts b/src/main/runtime/session-lifecycle/projection/prune-mobile-session-tab-group-layout.ts
index 699e691f6e24..cd70f7642e98 100644
--- a/src/main/runtime/session-lifecycle/projection/prune-mobile-session-tab-group-layout.ts
+++ b/src/main/runtime/session-lifecycle/projection/prune-mobile-session-tab-group-layout.ts
@@ -80,8 +80,9 @@ export abstract class OrcaRuntimeWithPruneMobileSessionTabGroupLayout extends Or
   protected toMobileSessionTabsResult(
     snapshot: RuntimeMobileSessionTabsSnapshot
   ): RuntimeMobileSessionTabsResult {
-    snapshot = titleStructuredConversationTabs(snapshot, (sessionId) =>
-      this.structuredConversationTabName(snapshot.worktree, sessionId)
+    snapshot = titleStructuredConversationTabs(
+      this.switchSlotAnchors.stamp(snapshot),
+      (sessionId) => this.structuredConversationTabName(snapshot.worktree, sessionId)
     )
     return projectRuntimeMobileSessionTabs(snapshot, this.getMobileSessionProjectionHost())
   }
diff --git a/src/main/runtime/session-tabs/pty-backed-session-publication.ts b/src/main/runtime/session-tabs/pty-backed-session-publication.ts
index 2914d5c2f2ab..f142b2c4d5b1 100644
--- a/src/main/runtime/session-tabs/pty-backed-session-publication.ts
+++ b/src/main/runtime/session-tabs/pty-backed-session-publication.ts
@@ -18,8 +18,11 @@ import {
   mergeMobileSessionSnapshotTabs,
   mergeMobileSessionTabGroups
 } from '../mobile-session-tab-merge'
+import { SwitchSlotAnchors } from './switch-slot-anchors'
 
 export abstract class OrcaRuntimeWithPublishPtyBackedMobileSessionTerminal extends OrcaRuntimeWithHasLiveOrPersistedServeOrSshOwnedPtyBinding {
+  /** Where switches put their destinations, for each destination's life (memory only). */
+  readonly switchSlotAnchors = new SwitchSlotAnchors()
   protected abstract markPaneLiveTitlesDirty(): void
   protected abstract getPtyManualTitle(
     ...args: Parameters<PtyTerminalSummaryMethods['getPtyManualTitle']>
diff --git a/src/main/runtime/session-tabs/session-tab-replace.test.ts b/src/main/runtime/session-tabs/session-tab-replace.test.ts
index c08427e892fb..0361c9ff6afc 100644
--- a/src/main/runtime/session-tabs/session-tab-replace.test.ts
+++ b/src/main/runtime/session-tabs/session-tab-replace.test.ts
@@ -104,7 +104,8 @@ describe('replaceSessionTabInSnapshot', () => {
       't2',
       'agent-session:s2'
     ])
-    expect(gone.tabs.at(-1)).not.toHaveProperty('replaces')
+    // The window can drop the source before this write: clients that still show it get the slot.
+    expect(gone.tabs.at(-1)).toMatchObject({ replaces: { tabId: 'missing' } })
   })
 
   it.each([
diff --git a/src/main/runtime/session-tabs/session-tab-replace.ts b/src/main/runtime/session-tabs/session-tab-replace.ts
index c9c09287f0dc..0dcdca68b467 100644
--- a/src/main/runtime/session-tabs/session-tab-replace.ts
+++ b/src/main/runtime/session-tabs/session-tab-replace.ts
@@ -33,15 +33,15 @@ export function replaceSessionTabInSnapshot(
     { id: getHeadlessMobileSessionGroupId(input.workspaceId), activeTabId: null, tabOrder: [] }
   ]
   const slot = groups.find((group) => group.tabOrder.includes(replacedTabId))
-  // Decided in this write: the new row takes the selection only from a tab that still holds its
-  // group's; with no slot here to read, the request's own choice stands.
+  // Decided in this write: the new row takes the selection only from its source, or from a group
+  // nothing holds; with no slot here to read, the request's own choice stands.
   const held = slot?.activeTabId
-  const activate =
-    input.activate && (!slot || (held != null && (held === replacedTabId || replaced.has(held))))
-  // The hint names a tab this snapshot knew; a client that still shows it puts the row there.
+  const activate = input.activate && (held == null || held === replacedTabId || replaced.has(held))
+  // The hint names the confirmed source even when this snapshot no longer lists it (the window can
+  // drop it first); a client that still shows that tab puts the row there.
   const row: ReplacementRow = {
     ...input.row,
-    ...(slot || replaced.size > 0 ? { replaces: { tabId: replacedTabId } } : {}),
+    replaces: { tabId: replacedTabId },
     isActive: activate
   }
   const newId = tabBarIdOf(row)
diff --git a/src/main/runtime/session-tabs/structured-session-tab-restoration.ts b/src/main/runtime/session-tabs/structured-session-tab-restoration.ts
index e7381093031b..91e00d4b27b8 100644
--- a/src/main/runtime/session-tabs/structured-session-tab-restoration.ts
+++ b/src/main/runtime/session-tabs/structured-session-tab-restoration.ts
@@ -113,6 +113,8 @@ export abstract class OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce exten
     // A replace takes the selection only from a tab that still holds it, decided by the layout
     // owner as it writes: here for main's layout, else by the window applying the replace.
     let activate = input.activate
+    // The switch's source: the replaced tab, or the split pane's tab the chat opens beside.
+    const source = input.replaces ?? (input.check ? input.placement?.afterTabId : undefined)
     const windowReplaces = Boolean(
       input.replaces && !ORCA_LAYOUT_OWNER_IS_MAIN && this.getAvailableAuthoritativeWindow()
     )
@@ -121,12 +123,12 @@ export abstract class OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce exten
       const applied = await this.queueChatTabChanges(
         () => {
           const session = this.getWorkspaceSessionForWorktree(input.workspaceId)
-          if (input.replaces && session) {
+          if (source && session) {
             activate &&= savedTabHoldsSelection(
               this.getWorkspaceSessionHostIdForWorktree(input.workspaceId),
               session,
               input.workspaceId,
-              input.replaces
+              source
             )
           }
           return [
@@ -165,7 +167,8 @@ export abstract class OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce exten
     if (activate && !windowReplaces && input.focusWindow !== false && input.check) {
       this.notifier?.focusEditorTab?.(
         input.tabId ?? host?.getSessionTabId(input.sessionId) ?? `agent-session:${input.sessionId}`,
-        input.workspaceId
+        input.workspaceId,
+        source
       )
     }
   }
diff --git a/src/main/runtime/session-tabs/switch-slot-anchors.test.ts b/src/main/runtime/session-tabs/switch-slot-anchors.test.ts
new file mode 100644
index 000000000000..fcf605de9ff3
--- /dev/null
+++ b/src/main/runtime/session-tabs/switch-slot-anchors.test.ts
@@ -0,0 +1,44 @@
+import { expect, it } from 'vitest'
+import type { RuntimeMobileSessionTabsSnapshot } from '../../../shared/runtime-types'
+import { AGENT_SESSION_SWITCH_HOST_MS } from '../../../shared/agent-session-switch-execution'
+import { SwitchSlotAnchors } from './switch-slot-anchors'
+
+const terminal = (tabId: string) => ({
+  type: 'terminal' as const,
+  id: `${tabId}::leaf`,
+  parentTabId: tabId,
+  leafId: 'leaf',
+  title: tabId,
+  isActive: false
+})
+const frame = (tabIds: string[]): RuntimeMobileSessionTabsSnapshot => ({
+  worktree: 'ws',
+  publicationEpoch: 'epoch',
+  snapshotVersion: 1,
+  activeGroupId: null,
+  activeTabId: null,
+  activeTabType: null,
+  tabs: tabIds.map(terminal)
+})
+
+it('names the slot on every frame for the destination’s life, renderer frames first included', () => {
+  const anchors = new SwitchSlotAnchors()
+  anchors.record('ws', 'switched', { replaces: { tabId: 'agent-session:chat' } })
+  // The window republished before main's own write: its rows never carry the anchor.
+  expect(anchors.stamp(frame(['other'])).tabs).toEqual([terminal('other')])
+  const shown = anchors.stamp(frame(['switched', 'other']))
+  expect(shown.tabs[0]).toMatchObject({ replaces: { tabId: 'agent-session:chat' } })
+  expect(anchors.stamp(frame(['switched'])).tabs[0]).toHaveProperty('replaces')
+  // The destination left: the anchor dies with it and a later tab of that id gets none.
+  anchors.stamp(frame(['other']))
+  expect(anchors.stamp(frame(['switched'])).tabs[0]).not.toHaveProperty('replaces')
+})
+
+it('drops an anchor whose switch never placed its destination', () => {
+  let now = 0
+  const anchors = new SwitchSlotAnchors(() => now)
+  anchors.record('ws', 'never-placed', { after: { tabId: 'source' } })
+  now = AGENT_SESSION_SWITCH_HOST_MS + 1
+  anchors.stamp(frame([]))
+  expect(anchors.stamp(frame(['never-placed'])).tabs[0]).not.toHaveProperty('after')
+})
diff --git a/src/main/runtime/session-tabs/switch-slot-anchors.ts b/src/main/runtime/session-tabs/switch-slot-anchors.ts
new file mode 100644
index 000000000000..0cf1d13b1add
--- /dev/null
+++ b/src/main/runtime/session-tabs/switch-slot-anchors.ts
@@ -0,0 +1,61 @@
+import type { RuntimeMobileSessionTabsSnapshot } from '../../../shared/runtime-types'
+import type { ReplacedTab } from '../../../shared/workspace-layout/workspace-layout-command-types'
+import { AGENT_SESSION_SWITCH_HOST_MS } from '../../../shared/agent-session-switch-execution'
+
+type SlotAnchor = { replaces: ReplacedTab } | { after: ReplacedTab }
+type Entry = { anchor: SlotAnchor; seen: boolean; recordedAt: number }
+type Row = RuntimeMobileSessionTabsSnapshot['tabs'][number]
+
+const tabBarId = (row: Row): string => (row.type === 'terminal' ? row.parentTabId : row.id)
+
+/**
+ * Where a switch put its destination, kept in memory for that destination's life. Every frame
+ * paired clients get carries it on the destination's rows, so a renderer republish (which never
+ * names it) or a renderer frame that lands before main's own write can't expose the destination
+ * without it. It dies when the destination's rows leave the snapshot, or when a switch that
+ * recorded it never placed the destination.
+ */
+export class SwitchSlotAnchors {
+  private readonly byWorkspace = new Map<string, Map<string, Entry>>()
+
+  constructor(private readonly now: () => number = Date.now) {}
+
+  record(workspaceId: string, destinationTabId: string, anchor: SlotAnchor): void {
+    const entries = this.byWorkspace.get(workspaceId) ?? new Map<string, Entry>()
+    entries.set(destinationTabId, { anchor, seen: false, recordedAt: this.now() })
+    this.byWorkspace.set(workspaceId, entries)
+  }
+
+  forget(workspaceId: string, destinationTabId: string): void {
+    this.byWorkspace.get(workspaceId)?.delete(destinationTabId)
+  }
+
+  stamp(snapshot: RuntimeMobileSessionTabsSnapshot): RuntimeMobileSessionTabsSnapshot {
+    const entries = this.byWorkspace.get(snapshot.worktree)
+    if (!entries) {
+      return snapshot
+    }
+    const present = new Set(snapshot.tabs.map(tabBarId))
+    for (const [id, entry] of entries) {
+      if (present.has(id)) {
+        entry.seen = true
+      } else if (entry.seen || this.now() - entry.recordedAt > AGENT_SESSION_SWITCH_HOST_MS) {
+        entries.delete(id)
+      }
+    }
+    if (entries.size === 0) {
+      this.byWorkspace.delete(snapshot.worktree)
+      return snapshot
+    }
+    return {
+      ...snapshot,
+      tabs: snapshot.tabs.map((row) => {
+        const entry =
+          row.type === 'terminal' || row.type === 'agent-session'
+            ? entries.get(tabBarId(row))
+            : undefined
+        return entry && !row.replaces && !row.after ? { ...row, ...entry.anchor } : row
+      })
+    }
+  }
+}
diff --git a/src/main/runtime/session-tabs/switch-terminal-placement.ts b/src/main/runtime/session-tabs/switch-terminal-placement.ts
index 83fc685ea58c..573af139b3b1 100644
--- a/src/main/runtime/session-tabs/switch-terminal-placement.ts
+++ b/src/main/runtime/session-tabs/switch-terminal-placement.ts
@@ -39,6 +39,8 @@ export abstract class OrcaRuntimeWithSwitchTerminalPlacement extends OrcaRuntime
     }
     const layoutTabId = chatTabId(args.chatSessionId)
     const snapshotTabId = `agent-session:${args.chatSessionId}`
+    // Before the layout write: a window frame can name the terminal before main's own write does.
+    this.switchSlotAnchors.record(workspaceId, tabId, { replaces: { tabId: snapshotTabId } })
     // Whether the chat left is the layout owner's answer, never assumed.
     let replaced: boolean
     const windowOwnsLayout = !ORCA_LAYOUT_OWNER_IS_MAIN && this.getAvailableAuthoritativeWindow()
@@ -82,6 +84,9 @@ export abstract class OrcaRuntimeWithSwitchTerminalPlacement extends OrcaRuntime
       }
       replaced = reply.result.closed?.includes(layoutTabId) === true
     }
+    if (!replaced) {
+      this.switchSlotAnchors.forget(workspaceId, tabId)
+    }
     this.publishPtyBackedMobileSessionTerminal(workspaceId, pty, {
       tabId,
       leafId,
diff --git a/src/main/window/runtime-window-lifecycle.ts b/src/main/window/runtime-window-lifecycle.ts
index 818e94e5f918..dc12af68df0c 100644
--- a/src/main/window/runtime-window-lifecycle.ts
+++ b/src/main/window/runtime-window-lifecycle.ts
@@ -180,7 +180,8 @@ export function registerRuntimeWindowLifecycle(
     focusTerminal: (tabId, worktreeId, leafId) =>
       send('ui:focusTerminal', { tabId, worktreeId, leafId }),
     revealTerminalPane: (target) => revealTerminalPaneInWindow(mainWindow, target),
-    focusEditorTab: (tabId, worktreeId) => send('ui:focusEditorTab', { tabId, worktreeId }),
+    focusEditorTab: (tabId, worktreeId, sourceTabId) =>
+      send('ui:focusEditorTab', { tabId, worktreeId, ...(sourceTabId ? { sourceTabId } : {}) }),
     closeSessionTab: (tabId, worktreeId) =>
       requestSessionTabCloseFromRenderer(mainWindow, tabId, worktreeId),
     moveSessionTab: (worktreeId: string, move: RuntimeMobileSessionTabMove) =>
diff --git a/src/preload/api/ui-bridge-terminal-and-session-tabs.ts b/src/preload/api/ui-bridge-terminal-and-session-tabs.ts
index 56d7f050ba93..3a0912534277 100644
--- a/src/preload/api/ui-bridge-terminal-and-session-tabs.ts
+++ b/src/preload/api/ui-bridge-terminal-and-session-tabs.ts
@@ -29,6 +29,13 @@ import type {
 } from '../../shared/runtime-types'
 import type { PreloadApi } from '../api-types'
 
+type FocusEditorTabPayload = {
+  tabId: string
+  worktreeId: string
+  userInitiated?: boolean
+  sourceTabId?: string
+}
+
 export const uiTerminalAndSessionTabsApi = {
   onCreateTerminal: (
     callback: (data: {
@@ -223,13 +230,9 @@ export const uiTerminalAndSessionTabsApi = {
     ipcRenderer.on('ui:focusTerminal', listener)
     return () => ipcRenderer.removeListener('ui:focusTerminal', listener)
   },
-  onFocusEditorTab: (
-    callback: (data: { tabId: string; worktreeId: string; userInitiated?: boolean }) => void
-  ): (() => void) => {
-    const listener = (
-      _event: Electron.IpcRendererEvent,
-      data: { tabId: string; worktreeId: string; userInitiated?: boolean }
-    ) => callback(data)
+  onFocusEditorTab: (callback: (data: FocusEditorTabPayload) => void): (() => void) => {
+    const listener = (_event: Electron.IpcRendererEvent, data: FocusEditorTabPayload) =>
+      callback(data)
     ipcRenderer.on('ui:focusEditorTab', listener)
     return () => ipcRenderer.removeListener('ui:focusEditorTab', listener)
   },
diff --git a/src/preload/api/ui-command-event-api.ts b/src/preload/api/ui-command-event-api.ts
index 810bedd95214..852b44aa8656 100644
--- a/src/preload/api/ui-command-event-api.ts
+++ b/src/preload/api/ui-command-event-api.ts
@@ -257,6 +257,8 @@ export type UiCommandEventApi = {
       worktreeId: string
       /** A notification click authorizes revealing the tab. */
       userInitiated?: boolean
+      /** A switch's source: focus only while it, or nothing, holds its group's selection. */
+      sourceTabId?: string
     }) => void
   ) => () => void
   onCloseSessionTab: (callback: (data: { tabId: string; worktreeId: string }) => void) => () => void
diff --git a/src/renderer/src/hooks/ipc-events/terminal-presentation-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/terminal-presentation-ipc-bridge.ts
index 83d14bddc742..31595742ef84 100644
--- a/src/renderer/src/hooks/ipc-events/terminal-presentation-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/terminal-presentation-ipc-bridge.ts
@@ -59,8 +59,12 @@ export function registerTerminalPresentationIpcBridge(unsubs: (() => void)[]): v
           // A replace opens in the replaced tab's group and takes its slot once the tab exists.
           const replaced = replaces && findUnifiedTab(worktreeId, replaces.tabId)
           // Decided in this write: a replace takes the selection only from a tab that still holds
-          // it; otherwise the terminal fills the slot without moving the user.
-          const takesSelection = !replaced || replacedTabHoldsSelection(store, worktreeId, replaced)
+          // it, in the workspace the user is in; otherwise the terminal fills the slot without
+          // moving the user (a source already gone is no proof the user stayed).
+          const takesSelection = replaced
+            ? store.activeWorktreeId === worktreeId &&
+              replacedTabHoldsSelection(store, worktreeId, replaced)
+            : !replaces
           const terminalPresentation = resolveTerminalPresentation({
             presentation: takesSelection ? presentation : 'background',
             activate,
diff --git a/src/renderer/src/hooks/ipc-events/terminal-presentation-replace-selection.test.ts b/src/renderer/src/hooks/ipc-events/terminal-presentation-replace-selection.test.ts
index 72204f547bb7..d06b75faea54 100644
--- a/src/renderer/src/hooks/ipc-events/terminal-presentation-replace-selection.test.ts
+++ b/src/renderer/src/hooks/ipc-events/terminal-presentation-replace-selection.test.ts
@@ -5,7 +5,7 @@ import type * as RuntimeRpcClientModule from '@/runtime/runtime-rpc-client'
 // chat's slot, and takes the selection only if the chat still held it when the replace landed.
 
 const mocks = vi.hoisted(() => ({
-  createTerminal: undefined as ((payload: Record<string, unknown>) => void) | undefined,
+  createTerminal: vi.fn<(payload: Record<string, unknown>) => void>(),
   reply: vi.fn()
 }))
 vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } }))
@@ -27,7 +27,7 @@ Object.assign(api.ui, {
   onLaunchRecipe: () => () => {},
   onRequestTerminalTabMount: () => () => {},
   onCreateTerminal: (listener: (payload: Record<string, unknown>) => void) => {
-    mocks.createTerminal = listener
+    mocks.createTerminal.mockImplementation(listener)
     return () => {}
   },
   replyTerminalCreate: mocks.reply
@@ -46,62 +46,68 @@ const GROUP = 'group-1'
 const TERMINAL = 'aaaaaaaa-bbbb-4ccc-8ddd-eeeeeeeeeeee'
 
 it.each([
-  ['still held it', 'chat-tab', TERMINAL],
-  ['lost it to another tab', 'u-other', 'u-other']
-])('takes the chat’s slot, and its selection only if the chat %s', (_name, active, after) => {
-  seedStore(store, {
-    activeWorktreeId: WT,
-    worktreesByRepo: { repo1: [makeWorktree({ id: WT, repoId: 'repo1', path: '/tmp/wt1' })] },
-    tabsByWorktree: { [WT]: [makeTab({ id: 'other', worktreeId: WT })] },
-    unifiedTabsByWorktree: {
-      [WT]: [
-        makeUnifiedTab({
-          id: 'chat-tab',
-          entityId: 'session-1',
-          groupId: GROUP,
-          worktreeId: WT,
-          contentType: 'agent-session',
-          executionHostId: 'local'
-        }),
-        makeUnifiedTab({
-          id: 'u-other',
-          entityId: 'other',
-          groupId: GROUP,
-          worktreeId: WT,
-          contentType: 'terminal'
-        })
-      ]
-    },
-    groupsByWorktree: {
-      [WT]: [
-        makeTabGroup({
-          id: GROUP,
-          worktreeId: WT,
-          activeTabId: active,
-          tabOrder: ['chat-tab', 'u-other'],
-          recentTabIds: [active]
-        })
-      ]
-    },
-    layoutByWorktree: { [WT]: { type: 'leaf', groupId: GROUP } },
-    activeGroupIdByWorktree: { [WT]: GROUP },
-    openFiles: [],
-    browserTabsByWorktree: {}
-  })
-  mocks.createTerminal?.({
-    requestId: `request-${active}`,
-    worktreeId: WT,
-    ptyId: 'switch-pty',
-    tabId: TERMINAL,
-    leafId: '11111111-1111-4111-8111-111111111111',
-    activate: true,
-    focus: true,
-    replaces: { tabId: 'chat-tab' }
-  })
-  const group = store.getState().groupsByWorktree[WT]?.[0]
-  expect(group?.tabOrder).toEqual([TERMINAL, 'u-other'])
-  expect(group?.activeTabId).toBe(after)
-  expect(mocks.reply).toHaveBeenLastCalledWith(
-    expect.objectContaining({ tabId: TERMINAL, closed: ['chat-tab'] })
-  )
-})
+  ['still held it', 'chat-tab', WT, TERMINAL],
+  ['lost it to another tab', 'u-other', WT, 'u-other'],
+  // The user moved to another workspace while the switch ran: nothing reveals this one.
+  ['held it in a workspace the user left', 'chat-tab', 'repo1::/tmp/wt2', 'u-other']
+])(
+  'takes the chat’s slot, and its selection only if the chat %s',
+  (_name, active, shown, after) => {
+    seedStore(store, {
+      activeWorktreeId: shown,
+      worktreesByRepo: { repo1: [makeWorktree({ id: WT, repoId: 'repo1', path: '/tmp/wt1' })] },
+      tabsByWorktree: { [WT]: [makeTab({ id: 'other', worktreeId: WT })] },
+      unifiedTabsByWorktree: {
+        [WT]: [
+          makeUnifiedTab({
+            id: 'chat-tab',
+            entityId: 'session-1',
+            groupId: GROUP,
+            worktreeId: WT,
+            contentType: 'agent-session',
+            executionHostId: 'local'
+          }),
+          makeUnifiedTab({
+            id: 'u-other',
+            entityId: 'other',
+            groupId: GROUP,
+            worktreeId: WT,
+            contentType: 'terminal'
+          })
+        ]
+      },
+      groupsByWorktree: {
+        [WT]: [
+          makeTabGroup({
+            id: GROUP,
+            worktreeId: WT,
+            activeTabId: active,
+            tabOrder: ['chat-tab', 'u-other'],
+            recentTabIds: [active]
+          })
+        ]
+      },
+      layoutByWorktree: { [WT]: { type: 'leaf', groupId: GROUP } },
+      activeGroupIdByWorktree: { [WT]: GROUP },
+      openFiles: [],
+      browserTabsByWorktree: {}
+    })
+    mocks.createTerminal({
+      requestId: `request-${active}`,
+      worktreeId: WT,
+      ptyId: 'switch-pty',
+      tabId: TERMINAL,
+      leafId: '11111111-1111-4111-8111-111111111111',
+      activate: true,
+      focus: true,
+      replaces: { tabId: 'chat-tab' }
+    })
+    const group = store.getState().groupsByWorktree[WT]?.[0]
+    expect(group?.tabOrder).toEqual([TERMINAL, 'u-other'])
+    expect(group?.activeTabId).toBe(after)
+    expect(store.getState().activeWorktreeId).toBe(shown)
+    expect(mocks.reply).toHaveBeenLastCalledWith(
+      expect.objectContaining({ tabId: TERMINAL, closed: ['chat-tab'] })
+    )
+  }
+)
diff --git a/src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge.ts
index 7538f0fc793b..5a8c36e402a8 100644
--- a/src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge.ts
@@ -11,6 +11,7 @@ import type { AppState } from '../../store/types'
 import { resolveBrowserSessionTabTarget } from './browser-session-tab-target'
 import { resolveWindowTabIdForHostTab } from './host-session-tab-target'
 import { revealWorkspaceSurface } from '@/lib/workspace-surface-reveal'
+import { replacedTabHoldsSelection } from '@/lib/replaced-tab-selection'
 import { focusTerminalInitiatedTab } from './terminal-command-state'
 import { applyRuntimePaneTitle } from './terminal-pane-title-ipc-bridge'
 
@@ -150,7 +151,7 @@ export function registerTerminalUiRoutingIpcBridge(unsubs: (() => void)[]): void
   )
 
   unsubs.push(
-    window.api.ui.onFocusEditorTab(({ tabId, worktreeId, userInitiated }) => {
+    window.api.ui.onFocusEditorTab(({ tabId, worktreeId, userInitiated, sourceTabId }) => {
       const localTabId = resolveWindowTabIdForHostTab(worktreeId, tabId)
       const store = useAppStore.getState()
       const tab = (store.unifiedTabsByWorktree[worktreeId] ?? []).find(
@@ -165,6 +166,19 @@ export function registerTerminalUiRoutingIpcBridge(unsubs: (() => void)[]): void
       ) {
         return
       }
+      // A switch's destination: never reveal a workspace the user left, nor take a group's selection
+      // from a tab the user picked there.
+      if (
+        sourceTabId &&
+        tab &&
+        (store.activeWorktreeId !== worktreeId ||
+          !replacedTabHoldsSelection(store, worktreeId, {
+            id: resolveWindowTabIdForHostTab(worktreeId, sourceTabId),
+            groupId: tab.groupId
+          }))
+      ) {
+        return
+      }
       if (!tab) {
         if (browserTarget) {
           // Why: older/mobile fallback snapshots identify browser tabs by workspace id when no unified tab wrapper exists.
diff --git a/src/renderer/src/runtime/web-session-client-owned-tab-placement.ts b/src/renderer/src/runtime/web-session-client-owned-tab-placement.ts
index 9ac23eefd73f..51be11c00b34 100644
--- a/src/renderer/src/runtime/web-session-client-owned-tab-placement.ts
+++ b/src/renderer/src/runtime/web-session-client-owned-tab-placement.ts
@@ -10,6 +10,8 @@ import {
 export type ClientOwnedAdoptedTab = {
   tabId: string
   groupId: string
+  /** A switch's destination: this client's ids for the tab it replaced (or sits beside). */
+  anchor?: { tabIds: readonly string[]; after: boolean }
 }
 
 export type ClientOwnedPlacementInput = {
@@ -165,10 +167,28 @@ export function reconcileClientOwnedTabPlacement(
       target.tabOrder.push(move.tabId)
     }
   }
+  // A destination takes its group's selection only from its source, or from an empty group.
+  const inheritedActive = new Map<string, string>()
   for (const adopted of input.adoptedTabs) {
     if (movedTabIds.has(adopted.tabId) || !input.validUnifiedTabIds.has(adopted.tabId)) {
       continue
     }
+    const anchorIds = adopted.anchor?.tabIds ?? []
+    const slot = [...working.values()].find((entry) =>
+      entry.group.tabOrder.some((id) => anchorIds.includes(id))
+    )
+    if (slot && !slot.tabOrder.includes(adopted.tabId)) {
+      // After the last tab still shown that stood at or before the anchor in this client's order.
+      const at = slot.group.tabOrder.findIndex((id) => anchorIds.includes(id))
+      const before = new Set(slot.group.tabOrder.slice(0, at + 1))
+      const index = slot.tabOrder.reduce((last, id, i) => (before.has(id) ? i + 1 : last), 0)
+      slot.tabOrder.splice(index, 0, adopted.tabId)
+      const held = slot.group.activeTabId
+      if (held == null || anchorIds.includes(held)) {
+        inheritedActive.set(slot.group.id, adopted.tabId)
+      }
+      continue
+    }
     const targetGroupId = resolveTargetGroupId(adopted.groupId)
     if (!targetGroupId) {
       continue
@@ -188,7 +208,9 @@ export function reconcileClientOwnedTabPlacement(
     const { group, tabOrder } = entry
     const realOrder = tabOrder.filter((id) => input.validUnifiedTabIds.has(id))
     const intentActive =
-      input.intentTabId && realOrder.includes(input.intentTabId) ? input.intentTabId : null
+      input.intentTabId && realOrder.includes(input.intentTabId)
+        ? input.intentTabId
+        : (inheritedActive.get(group.id) ?? null)
     const displacedActive =
       group.activeTabId && !realOrder.includes(group.activeTabId) ? group.activeTabId : null
     // Close/move successors follow local-close MRU then neighbor, limited to surviving tabs.
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-base.ts b/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-base.ts
index 02f59921677b..edee253b719e 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-base.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-base.ts
@@ -34,6 +34,7 @@ import {
   isTerminalRowRetiredByHost
 } from './host-retired-terminal-rows'
 import { hostSnapshotAffirmsWorktreeContents } from '../host-session-snapshot-authority'
+import { slotAnchorLocalTabIds, slotAnchorOf } from './slot-anchor'
 
 export function prepareWebSessionTabsSnapshotBase(
   state: WebSessionTabsSyncState,
@@ -98,7 +99,26 @@ export function prepareWebSessionTabsSnapshotBase(
     snapshot.navigationIntent === 'follow'
       ? (snapshot.tabs.find((tab) => tab.id === snapshot.activeTabId) ?? null)
       : null
-  const navigationIntentTab = callerFocusIntentTab ?? followIntentTab
+  // A switch's destination takes the focus its source had here, checked when it lands as a recorded
+  // intent's expected tab is; read from the snapshot, so a client that never got the answer converges.
+  const unifiedTabs = state.unifiedTabsByWorktree[worktreeId] ?? []
+  const anchoredIntentTab =
+    (currentVisibleLocalTabId !== null &&
+      snapshot.tabs.find((tab) => {
+        const anchor = slotAnchorOf(tab)
+        const shown = unifiedTabs.some((local) =>
+          tab.type === 'terminal'
+            ? local.id === toWebTerminalSurfaceTabId(tab.parentTabId)
+            : tab.type === 'agent-session' && local.entityId === tab.sessionId
+        )
+        return (
+          anchor &&
+          !shown &&
+          slotAnchorLocalTabIds(unifiedTabs, anchor.hostTabId).includes(currentVisibleLocalTabId)
+        )
+      })) ||
+    null
+  const navigationIntentTab = callerFocusIntentTab ?? anchoredIntentTab ?? followIntentTab
   const honorSnapshotActiveFocus = navigationIntentTab !== null
   if (matchingFocusIntentTab) {
     clearWebSessionFocusIntent({ environmentId }, worktreeId)
@@ -175,7 +195,8 @@ export function prepareWebSessionTabsSnapshotBase(
           leafId: callerFocusIntentTab.leafId
         }
       : undefined,
-    options?.terminalPtyMode
+    options?.terminalPtyMode,
+    unifiedTabs
   )
   const mirroredTerminalTabEntries = mirroredTerminalTabs.map((entry) => entry.tab)
   const retainedTerminalIds = new Set(retainedTerminalTabs.map((tab) => tab.id))
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-groups.ts b/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-groups.ts
index bfaacdfe863e..d751ce45c784 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-groups.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-groups.ts
@@ -1,7 +1,6 @@
 import type { TabGroup } from '../../../../shared/tab-types'
 import type { prepareWebSessionTabsSnapshotUnified } from './apply-preparation-unified'
 import { toWebTerminalSurfaceTabId } from '../../../../shared/terminal-surface-id'
-import { isStructuredAgentSessionHostTabId } from '../../../../shared/structured-agent-session-host-tab-id'
 import {
   isWebSessionBrowserPlacementGroupReserved,
   peekWebSessionBrowserPlacementGroup
@@ -10,6 +9,7 @@ import { peekWebSessionTerminalPlacementGroup } from '../web-session-terminal-pl
 import { reconcileClientOwnedTabPlacement } from '../web-session-client-owned-tab-placement'
 import { buildMirroredHostGroups, retainClientPlacedMirroredTabs } from './layout-groups'
 import { sanitizeRecentTabIds, pushRecentTabId } from './state-equality-core'
+import { slotAnchorLocalTabIds, slotAnchorOf } from './slot-anchor'
 
 export function prepareWebSessionTabsSnapshotGroups(
   base: ReturnType<typeof prepareWebSessionTabsSnapshotUnified>
@@ -94,11 +94,27 @@ export function prepareWebSessionTabsSnapshotGroups(
         })
       }
     }
+    // A switch's destination goes where this client showed its source, on first appearance.
+    const anchors = new Map(
+      snapshot.tabs.flatMap((row) => {
+        const anchor = slotAnchorOf(row)
+        const tabId = hostToLocalTabId.get(row.type === 'terminal' ? row.parentTabId : row.id)
+        const tabIds =
+          anchor &&
+          slotAnchorLocalTabIds(
+            state.unifiedTabsByWorktree[worktreeId] ?? [],
+            anchor.hostTabId,
+            hostToLocalTabId
+          )
+        return anchor && tabId && tabIds ? [[tabId, { tabIds, after: anchor.after }] as const] : []
+      })
+    )
     const adoptedTabs = mirroredUnifiedTabs
       .filter((tab) => !knownGroupTabIds.has(tab.id))
       .map((tab) => ({
         tabId: tab.id,
-        groupId: clientGroupIdByLocalTabId.get(tab.id) ?? tab.groupId
+        groupId: clientGroupIdByLocalTabId.get(tab.id) ?? tab.groupId,
+        anchor: anchors.get(tab.id)
       }))
     return reconcileClientOwnedTabPlacement({
       currentGroups,
@@ -185,53 +201,6 @@ export function prepareWebSessionTabsSnapshotGroups(
     )
   })()
 
-  // A replaced chat has already left this snapshot, so its local tab is found by its session.
-  const replacedLocalTabIds = (hostTabId: string): string[] => {
-    const chat = isStructuredAgentSessionHostTabId(hostTabId)
-      ? (state.unifiedTabsByWorktree[worktreeId] ?? []).find(
-          (tab) =>
-            tab.contentType === 'agent-session' &&
-            tab.entityId === hostTabId.slice('agent-session:'.length)
-        )
-      : undefined
-    return [
-      ...(chat ? [chat.id] : []),
-      ...[hostTabId, toWebTerminalSurfaceTabId(hostTabId)].map(
-        (id) => hostToLocalTabId.get(id) ?? id
-      )
-    ]
-  }
-  // A row published in a replaced tab's slot lands where this client showed that tab, not at the end.
-  let placedGroups = nextGroups
-  for (const row of snapshot.tabs) {
-    // Only terminal and chat rows can name the tab they replaced.
-    const replaces = 'replaces' in row ? row.replaces : undefined
-    const tabId =
-      replaces && hostToLocalTabId.get(row.type === 'terminal' ? row.parentTabId : row.id)
-    const replaced = replaces ? replacedLocalTabIds(replaces.tabId) : []
-    const slot = currentGroups.find((group) => group.tabOrder.some((id) => replaced.includes(id)))
-    if (
-      !tabId ||
-      !slot ||
-      currentGroups.some((group) => group.tabOrder.includes(tabId)) ||
-      !placedGroups?.some((group) => group.tabOrder.includes(tabId)) ||
-      !placedGroups.some((group) => group.id === slot.id)
-    ) {
-      continue
-    }
-    const index = slot.tabOrder.findIndex((id) => replaced.includes(id))
-    placedGroups = placedGroups.map((group) => {
-      if (group.id !== slot.id && !group.tabOrder.includes(tabId)) {
-        return group
-      }
-      const tabOrder = group.tabOrder.filter((id) => id !== tabId)
-      if (group.id === slot.id) {
-        tabOrder.splice(Math.min(index, tabOrder.length), 0, tabId)
-      }
-      return { ...group, tabOrder }
-    })
-  }
-
   const nextTabBarOrder = (() => {
     const current = state.tabBarOrderByWorktree[worktreeId] ?? []
     const validTabBarIds = new Set([
@@ -268,7 +237,7 @@ export function prepareWebSessionTabsSnapshotGroups(
     currentGroups,
     clientGroupIdByLocalTabId,
     clientOwnedPlacement,
-    nextGroups: placedGroups,
+    nextGroups,
     nextTabBarOrder
   }
 }
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/replaced-slot-placement.test.ts b/src/renderer/src/runtime/web-session-tabs-sync/replaced-slot-placement.test.ts
index 353f1528b88f..3b2b94ff6a98 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/replaced-slot-placement.test.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/replaced-slot-placement.test.ts
@@ -100,3 +100,166 @@ it('puts a terminal that replaced a chat where this client showed the chat', ()
   expect(switched).toBeDefined()
   expect(order).toEqual([switched!.id, group.tabOrder[0], group.tabOrder[2]])
 })
+
+const chatAfter = (tabId: string): Row => ({ ...chat, after: { tabId } })
+
+/** This client shows host-a, host-b, host-c in one group, its own order, with `active` selected. */
+function shownThree(active: 'host-a' | 'host-b') {
+  const shown = apply(
+    makeState(),
+    makeSnapshot([terminal('host-a'), terminal('host-b'), terminal('host-c')], {
+      tabGroups: [
+        { id: 'host-group-1', activeTabId: null, tabOrder: ['host-a', 'host-b', 'host-c'] }
+      ]
+    })
+  )
+  const group = shown.groupsByWorktree[WT]![0]!
+  const [a, b, c] = [group.tabOrder[0]!, group.tabOrder[1]!, group.tabOrder[2]!]
+  const local = { 'host-a': a, 'host-b': b }
+  // The host's order differs: this client moved host-c first.
+  const state = {
+    ...shown,
+    groupsByWorktree: { [WT]: [{ ...group, tabOrder: [c, a, b], activeTabId: local[active] }] }
+  }
+  return { state, a, b, c }
+}
+
+it.each([
+  ['the split pane’s tab held the selection', 'host-a', true],
+  ['the user had picked another tab', 'host-b', false]
+] as const)(
+  'opens a chat beside the split pane it came from on this client; selection when %s',
+  (_name, active, takes) => {
+    const { state, a, b, c } = shownThree(active)
+    const next = apply(
+      state,
+      makeSnapshot(
+        [terminal('host-a'), terminal('host-b'), terminal('host-c'), chatAfter('host-a')],
+        {
+          snapshotVersion: 2,
+          tabGroups: [
+            {
+              id: 'host-group-1',
+              activeTabId: null,
+              tabOrder: ['host-a', 'host-b', 'host-c', chat.id]
+            }
+          ]
+        }
+      )
+    )
+    const group = next.groupsByWorktree[WT]![0]!
+    const chatTab = next.unifiedTabsByWorktree[WT]!.find((tab) => tab.entityId === 'session-1')!
+    expect(group.tabOrder).toEqual([c, a, chatTab.id, b])
+    expect(group.activeTabId).toBe(takes ? chatTab.id : b)
+  }
+)
+
+it.each([
+  [true, undefined, true],
+  // The pin is this client's own: a host flag on the new row never overrides it.
+  [false, true, false]
+] as const)(
+  'keeps this client’s pin on the replaced tab (client pinned=%s, host pinned=%s)',
+  (clientPinned, hostPinned, expected) => {
+    const shown = apply(
+      makeState(),
+      makeSnapshot([chat, terminal('host-b')], {
+        tabGroups: [{ id: 'host-group-1', activeTabId: null, tabOrder: [chat.id, 'host-b'] }]
+      })
+    )
+    const state = {
+      ...shown,
+      unifiedTabsByWorktree: {
+        [WT]: shown.unifiedTabsByWorktree[WT]!.map((tab) =>
+          tab.entityId === 'session-1' ? { ...tab, isPinned: clientPinned } : tab
+        )
+      }
+    }
+    const next = apply(
+      state,
+      makeSnapshot(
+        [
+          {
+            ...terminal('host-switched', { replaces: { tabId: chat.id } }),
+            ...(hostPinned ? { isPinned: true } : {})
+          },
+          terminal('host-b')
+        ],
+        {
+          snapshotVersion: 2,
+          tabGroups: [
+            { id: 'host-group-1', activeTabId: null, tabOrder: ['host-switched', 'host-b'] }
+          ]
+        }
+      )
+    )
+    const switched = next.unifiedTabsByWorktree[WT]!.find((tab) => tab.label === 'host-switched')!
+    expect(switched.isPinned).toBe(expected)
+    expect(next.tabsByWorktree[WT]!.find((tab) => tab.id === switched.id)?.isPinned).toBe(expected)
+  }
+)
+
+it('places a destination in a split group this client is not looking at, without moving focus', () => {
+  const { state, a, b, c } = shownThree('host-a')
+  const [group] = state.groupsByWorktree[WT]!
+  // Two groups here: host-c alone in the active one, the source in the other (order unlike the host).
+  const twoGroups = {
+    ...state,
+    groupsByWorktree: {
+      [WT]: [
+        { ...group!, id: 'local-left', tabOrder: [c], activeTabId: c },
+        { ...group!, id: 'local-right', tabOrder: [b, a], activeTabId: a }
+      ]
+    },
+    activeGroupIdByWorktree: { [WT]: 'local-left' }
+  }
+  const next = apply(
+    twoGroups,
+    makeSnapshot(
+      [
+        terminal('host-switched', { replaces: { tabId: 'host-a' } }),
+        terminal('host-b'),
+        terminal('host-c')
+      ],
+      {
+        snapshotVersion: 2,
+        tabGroups: [
+          {
+            id: 'host-group-1',
+            activeTabId: null,
+            tabOrder: ['host-switched', 'host-b', 'host-c']
+          }
+        ]
+      }
+    )
+  )
+  const switched = next.unifiedTabsByWorktree[WT]!.find((tab) => tab.label === 'host-switched')!
+  const right = next.groupsByWorktree[WT]!.find((entry) => entry.id === 'local-right')!
+  expect(right.tabOrder).toEqual([b, switched.id])
+  expect(right.activeTabId).toBe(switched.id)
+  expect(switched.groupId).toBe('local-right')
+  expect(next.activeGroupIdByWorktree[WT]).toBe('local-left')
+})
+
+it.each([
+  ['shows the replaced tab', 'host-a', 'agent-session'],
+  ['moved to another tab', 'host-b', 'terminal']
+] as const)(
+  'focuses a chat that replaced a terminal only when this client %s, before any answer',
+  (_name, active, visibleType) => {
+    const { state } = shownThree(active)
+    const next = apply(
+      { ...state, activeGroupIdByWorktree: { [WT]: state.groupsByWorktree[WT]![0]!.id } },
+      makeSnapshot(
+        [{ ...chat, replaces: { tabId: 'host-a' } }, terminal('host-b'), terminal('host-c')],
+        {
+          snapshotVersion: 2,
+          tabGroups: [
+            { id: 'host-group-1', activeTabId: null, tabOrder: [chat.id, 'host-b', 'host-c'] }
+          ]
+        }
+      )
+    )
+    expect(next.activeTabTypeByWorktree[WT] ?? next.activeTabType).toBe(visibleType)
+  }
+)
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/slot-anchor.ts b/src/renderer/src/runtime/web-session-tabs-sync/slot-anchor.ts
new file mode 100644
index 000000000000..46744c694e35
--- /dev/null
+++ b/src/renderer/src/runtime/web-session-tabs-sync/slot-anchor.ts
@@ -0,0 +1,53 @@
+import type { RuntimeMobileSessionTabsResult } from '../../../../shared/runtime-types'
+import type { Tab } from '../../../../shared/tab-types'
+import { toWebTerminalSurfaceTabId } from '../../../../shared/terminal-surface-id'
+import { isStructuredAgentSessionHostTabId } from '../../../../shared/structured-agent-session-host-tab-id'
+
+/** Where a switch published a row: in the tab it replaced's slot, or beside a split pane's tab. */
+export type SlotAnchor = { hostTabId: string; after: boolean }
+
+export function slotAnchorOf(row: RuntimeMobileSessionTabsResult['tabs'][number]) {
+  if (row.type !== 'terminal' && row.type !== 'agent-session') {
+    return undefined
+  }
+  return row.replaces
+    ? { hostTabId: row.replaces.tabId, after: false }
+    : row.after
+      ? { hostTabId: row.after.tabId, after: true }
+      : undefined
+}
+
+/** This client's ids for a tab the host names; a replaced chat has left the snapshot, so it is
+ *  found by its session. */
+export function slotAnchorLocalTabIds(
+  unifiedTabs: readonly Tab[],
+  hostTabId: string,
+  hostToLocalTabId?: ReadonlyMap<string, string>
+): string[] {
+  const chat = isStructuredAgentSessionHostTabId(hostTabId)
+    ? unifiedTabs.find(
+        (tab) =>
+          tab.contentType === 'agent-session' &&
+          tab.entityId === hostTabId.slice('agent-session:'.length)
+      )
+    : undefined
+  return [
+    ...(chat ? [chat.id] : []),
+    ...[hostTabId, toWebTerminalSurfaceTabId(hostTabId)].map(
+      (id) => hostToLocalTabId?.get(id) ?? id
+    )
+  ]
+}
+
+/** A new row in a replaced tab's slot keeps that tab's pin on this client: the pin is this
+ *  client's own, so the host's flag never overrides it. Undefined when this client never showed
+ *  the replaced tab; a tab beside a split pane inherits nothing. */
+export function replacedTabPinned(
+  unifiedTabs: readonly Tab[],
+  row: RuntimeMobileSessionTabsResult['tabs'][number]
+): boolean | undefined {
+  const anchor = slotAnchorOf(row)
+  const ids = anchor && !anchor.after ? slotAnchorLocalTabIds(unifiedTabs, anchor.hostTabId) : []
+  const replaced = unifiedTabs.find((tab) => ids.includes(tab.id))
+  return replaced ? replaced.isPinned === true : undefined
+}
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/terminal-build.ts b/src/renderer/src/runtime/web-session-tabs-sync/terminal-build.ts
index 4e80efd504b3..9e9c8b71ef19 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/terminal-build.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/terminal-build.ts
@@ -8,6 +8,8 @@ import { toRemoteRuntimePtyId } from '../../../../shared/remote-runtime/remote-r
 import { toWebTerminalSurfaceTabId } from '../../../../shared/terminal-surface-id'
 import type { MirroredTerminalTab, TerminalSurface, ReadyTerminalSurface } from './state'
 import { chooseRemoteTerminalLayout, isTerminalSurfaceTab } from './terminal-surfaces'
+import { replacedTabPinned } from './slot-anchor'
+import type { Tab } from '../../../../shared/tab-types'
 
 function pendingBindingBelongsToEnvironment(
   ptyId: string,
@@ -62,7 +64,8 @@ export function buildMirroredTerminalTabs(
   sortOffset: number,
   now: number,
   focusTarget?: { parentTabId: string; leafId: string },
-  terminalPtyMode: 'local' | 'remote' = 'remote'
+  terminalPtyMode: 'local' | 'remote' = 'remote',
+  currentUnifiedTabs: readonly Tab[] = []
 ): MirroredTerminalTab[] {
   const groups = new Map<string, TerminalSurface[]>()
   for (const tab of snapshot.tabs.filter(isTerminalSurfaceTab)) {
@@ -164,7 +167,9 @@ export function buildMirroredTerminalTabs(
     const color = existing ? (existing.color ?? null) : (hostColorSurface?.color ?? null)
     const isPinned = existing
       ? existing.isPinned === true
-      : surfaces.some((surface) => surface.isPinned)
+      : (surfaces
+          .map((surface) => replacedTabPinned(currentUnifiedTabs, surface))
+          .find((pinned) => pinned !== undefined) ?? surfaces.some((surface) => surface.isPinned))
     // Why: viewMode echoes back through host snapshots, so prefer the client's record during the echo window and adopt the host value only without a prior tab.
     const hostViewModeSurface = surfaces.find((surface) => surface.viewMode)
     const viewMode = existing ? existing.viewMode : hostViewModeSurface?.viewMode
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/terminal-surfaces.ts b/src/renderer/src/runtime/web-session-tabs-sync/terminal-surfaces.ts
index a5c11e99418a..6d38ffbdd1c8 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/terminal-surfaces.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/terminal-surfaces.ts
@@ -22,6 +22,7 @@ import type {
   MirroredAgentTab
 } from './state'
 import type { Tab } from '../../../../shared/tab-types'
+import { replacedTabPinned } from './slot-anchor'
 import type { ExecutionHostId } from '../../../../shared/execution-host'
 import { structuredAgentSessionTabId } from '../../../../shared/structured-agent-session-projection'
 import { hasStructuredAgentSessionLaunchCancellationTombstone } from '@/lib/agent-session/launch/structured-agent-session-launch-registry'
@@ -155,7 +156,11 @@ export function buildMirroredAgentTabs(
         color: tab.color !== undefined ? tab.color : (existing?.color ?? null),
         sortOrder: sortOffset + index,
         createdAt: existing?.createdAt ?? now + sortOffset + index,
-        isPinned: tab.isPinned !== undefined ? tab.isPinned : existing?.isPinned === true
+        isPinned: existing
+          ? tab.isPinned !== undefined
+            ? tab.isPinned
+            : existing.isPinned === true
+          : (replacedTabPinned(currentUnifiedTabs, tab) ?? tab.isPinned === true)
       }
     }
   })
diff --git a/src/shared/runtime-mobile-session-tab-contracts.ts b/src/shared/runtime-mobile-session-tab-contracts.ts
index 080c3b55e592..2de1e2315455 100644
--- a/src/shared/runtime-mobile-session-tab-contracts.ts
+++ b/src/shared/runtime-mobile-session-tab-contracts.ts
@@ -10,6 +10,8 @@ import type { StructuredAgentId } from './agent-session-provider-handle'
 export type RuntimeMobileSessionTerminalTab = {
   /** Published in the tab it replaced's slot; a client whose order differs puts it where that tab was. */
   replaces?: ReplacedTab
+  /** Published beside a split pane's tab it came from; a client puts it right after that tab. */
+  after?: ReplacedTab
   type: 'terminal'
   id: string
   title: string
@@ -110,6 +112,7 @@ export type RuntimeMobileSessionBrowserTab = {
 
 export type RuntimeMobileSessionAgentTab = {
   replaces?: ReplacedTab
+  after?: ReplacedTab
   type: 'agent-session'
   id: string
   title: string

From 57b917aa4a02abf6a24331345bee68e6e0b4594d Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 22:44:04 -0700
Subject: [PATCH 154/207] Let the host decide when a switch needs the user's
 yes

A paired client could show "is replying. Stop it and switch?" for an idle terminal, because it read its own merged copy of the agent's status, and that copy could equally let a replying agent be stopped without asking. A host advertising switch consent now refuses a replying agent when the client sends `consented: false`, checked where the stop is admitted (before the Escape, at its write, and before the exit), so a turn started while the switch prepared is never stopped unconfirmed. The client asks only on that refusal; a yes is a new switch under its own invocation and Cancel leaves the agent running. Older hosts get no new field and keep the client's own check; older clients keep today's behaviour.
---
 .../structured-agent-session-switch-source.ts | 22 ++++--
 .../structured-worker-switch-stop.test.ts     | 18 +++++
 ...ructured-agent-session-switch-execution.ts |  3 +-
 ...red-agent-session-switch-open-turn.test.ts | 61 +++++++++++++++
 ...agent-session-switch-terminal-execution.ts |  3 +-
 ...ured-agent-session-switch-terminal-stop.ts | 22 +++++-
 .../lib/conversation-surface-switch.test.tsx  | 40 ++++++++++
 .../src/lib/conversation-surface-switch.ts    | 78 +++++++++++++------
 ...structured-agent-session-switch-consent.ts |  8 ++
 .../structured-agent-session-params.ts        |  7 +-
 ...uctured-agent-cli-conversation-adoption.ts | 15 +++-
 11 files changed, 237 insertions(+), 40 deletions(-)
 create mode 100644 src/renderer/src/runtime/structured-agent-session-switch-consent.ts

diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts
index 232d33b2fb46..bb69bddc14c2 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts
@@ -50,7 +50,9 @@ export function structuredAgentSessionSwitchSource(context: SwitchSourceContext)
     stopForSwitch: async (
       sessionId: string,
       caller: HostTypes.StructuredAgentSessionCaller,
-      deadline: AgentSessionSwitchDeadline
+      deadline: AgentSessionSwitchDeadline,
+      /** False: the client left consent to this host, so a replying chat is refused, not stopped. */
+      consented?: boolean
     ) => {
       deadline.check()
       const conversation = await context.lifetime.conversation(sessionId)
@@ -71,6 +73,17 @@ export function structuredAgentSessionSwitchSource(context: SwitchSourceContext)
           reason: 'recordMissing'
         })
       }
+      // A Stop with no turn running and nothing queued stops nothing (the common pattern makes it a
+      // no-op, so no Stop note is written); the process stop below still ends the agent with proof.
+      const work = context.currentWork(sessionId, conversation.journal)
+      const stops =
+        work === undefined ||
+        work.working() ||
+        conversation.journal.submissions().some(isQueuedAgentJournalSubmission)
+      // Before any effect; later sends are fenced by the admitted-send count above.
+      if (consented === false && stops) {
+        throw agentSessionRefusalError('agent_session_operation_invalid', { reason: 'turnActive' })
+      }
       let settleWorker: ((proven: boolean) => void) | undefined
       try {
         settleWorker = context.deps.captureSessionSwitchStop?.(sessionId)
@@ -80,13 +93,6 @@ export function structuredAgentSessionSwitchSource(context: SwitchSourceContext)
           sessionId
         })
       }
-      // A Stop with no turn running and nothing queued stops nothing (the common pattern makes it a
-      // no-op, so no Stop note is written); the process stop below still ends the agent with proof.
-      const work = context.currentWork(sessionId, conversation.journal)
-      const stops =
-        work === undefined ||
-        work.working() ||
-        conversation.journal.submissions().some(isQueuedAgentJournalSubmission)
       let proven = false
       try {
         const answer = !stops
diff --git a/src/main/runtime/orchestration/structured-worker-switch-stop.test.ts b/src/main/runtime/orchestration/structured-worker-switch-stop.test.ts
index 8e274d098d72..d8ed8aa98aaf 100644
--- a/src/main/runtime/orchestration/structured-worker-switch-stop.test.ts
+++ b/src/main/runtime/orchestration/structured-worker-switch-stop.test.ts
@@ -119,3 +119,21 @@ it.each([false, true])(
     ).toBe(replying)
   }
 )
+
+it('refuses a replying chat, stopping nothing, when the client left consent to the host', async () => {
+  await foundRestTestChat(rig)
+  rig.adapter.acquire.mock.calls
+    .at(-1)![0]
+    .events.appendItem(
+      { provider: 'codex', threadId: REST_TEST_THREAD, turnId: 'turn', ordinal: 50 },
+      { kind: 'turn', turnId: 'turn', state: 'running' },
+      { turnScope: AGENT_JOURNAL_THREAD_SCOPE }
+    )
+  await rig.host.flushStreamedEvents(id)
+  const cancel = vi.spyOn(rig.host, 'cancel')
+  await expect(rig.host.stopForSwitch(id, caller, deadline, false)).rejects.toMatchObject({
+    refusal: { details: { reason: 'turnActive' } }
+  })
+  expect(cancel).not.toHaveBeenCalled()
+  expect(rig.adapter.closeSession).not.toHaveBeenCalled()
+})
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
index 9a760775397d..5d4e06077e4a 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
@@ -186,7 +186,8 @@ async function switchToChat(
         host.deps.store.getRecord(sessionId)?.location.workspaceId ??
         create?.worktree.replace(/^id:/, ''),
       boundary: before && stopped ? { source: before, stopped } : undefined,
-      keepSource: (settle) => keepSource(() => settle(replacedBy))
+      keepSource: (settle) => keepSource(() => settle(replacedBy)),
+      consented: execution.consented
     })
   }
   deadline.check()
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-open-turn.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-open-turn.test.ts
index 58b441594d04..bb18048d56d0 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-open-turn.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-open-turn.test.ts
@@ -156,3 +156,64 @@ it('settles a CLI turn left open once no writer is left, after the census', asyn
   expect(turns).toEqual([expect.objectContaining({ state: 'interrupted' })])
   expect(turns[0]).not.toHaveProperty('outcome')
 })
+
+it('refuses, stopping nothing, when the terminal agent starts replying while the switch prepares', async () => {
+  await openCliTurn()
+  const { runtime } = setupMainOwnedWorkspace()
+  const incarnationId = '11111111-1111-4111-8111-111111111111'
+  runtime.registerPty(PTY_A, WORKTREE_ID, null, { tabId: TAB_ID, leafId: LEAF_A, incarnationId })
+  const source = runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_A}`, WORKTREE_ID)
+  if (!source.presentation) {
+    throw new Error('missing captured source')
+  }
+  const written = vi.fn(() => true)
+  const stopped = vi.fn(async () => true)
+  runtime.setPtyController({
+    write: written,
+    kill: () => false,
+    stopAndWait: stopped,
+    getForegroundProcess: async () => 'codex'
+  })
+  // Idle when the request arrives; replying by the time the stop would be admitted.
+  let replying = false
+  vi.spyOn(runtime.agentTransitions, 'latestRow').mockImplementation((paneKey) =>
+    replying
+      ? {
+          state: 'working',
+          prompt: '',
+          paneKey,
+          connectionId: null,
+          receivedAt: 0,
+          stateStartedAt: 0
+        }
+      : null
+  )
+  const prepare = vi.mocked(cliTranscript.prepareStructuredChatCliTranscript)
+  const readable = prepare.getMockImplementation()!
+  prepare.mockImplementation(async (...args) => {
+    replying = true
+    return readable(...args)
+  })
+  const answer = await executeStructuredSessionSwitch(
+    {
+      sessionId: id,
+      execution: {
+        invocationId: 'consent-left-to-host',
+        consented: false,
+        source: {
+          terminal: source.handle,
+          expectedIncarnationId: incarnationId,
+          originalPresentation: source.presentation
+        }
+      }
+    },
+    { runtime },
+    'chat'
+  )
+  expect(answer).toMatchObject({
+    status: 'refused',
+    refusal: { code: 'agent_session_operation_invalid', details: { reason: 'turnActive' } }
+  })
+  expect(written).not.toHaveBeenCalled()
+  expect(stopped).not.toHaveBeenCalled()
+})
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts
index 2ed0236a3482..4fd1309d0d2c 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts
@@ -32,7 +32,8 @@ export async function executeStructuredSessionTerminalSwitch(
   const workCurrent = await host.stopForSwitch(
     sessionId,
     { callerKey: 'trusted-local:session-switch' },
-    deadline
+    deadline,
+    execution?.consented
   )
   host.guardSwitchWork(sessionId, workCurrent)
   const check = () => {
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-stop.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-stop.ts
index 393519f3d212..b0dd226c3552 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-stop.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-stop.ts
@@ -9,6 +9,7 @@ import type { AgentSessionSwitchDeadline } from '../../../../shared/agent-sessio
 import { agentSessionRefusalError } from '../../../../shared/agent-session-wire-refusals'
 import { worktreeIdsEqual } from '../../../../shared/worktree/id'
 import { interruptWorkingAgent } from '../../terminal-agent-interrupt'
+import { mainAgentState } from '../../../../shared/main-agent-status'
 import type { captureStructuredSwitchTerminalSource } from './structured-agent-session-switch-source'
 
 /**
@@ -26,8 +27,20 @@ export async function stopStructuredSwitchTerminalSource(input: {
   destination: string | undefined
   boundary?: { source: SwitchTranscriptSource; stopped: SwitchStoppedCliTurn }
   keepSource: (settle: (replacedBy: string | undefined) => void) => void
+  /** False: the client left consent to this host, so a replying agent is refused, not stopped. */
+  consented?: boolean
 }): Promise<void> {
   const { ctx, host, sessionId, close, deadline } = input
+  // Checked where the stop is admitted (before the Escape, at its write, and before the exit), so
+  // a turn the user started while the switch prepared is never stopped without their yes.
+  const requireConsent = (): void => {
+    const row =
+      input.consented === false ? ctx.runtime.agentTransitions.latestRow(input.paneKey) : null
+    if (row && mainAgentState(row) === 'working') {
+      throw agentSessionRefusalError('agent_session_operation_invalid', { reason: 'turnActive' })
+    }
+  }
+  requireConsent()
   const awaitBoundary = input.boundary
     ? await armSwitchTurnBoundaryWait(
         input.boundary.source,
@@ -40,7 +53,13 @@ export async function stopStructuredSwitchTerminalSource(input: {
     ctx.runtime,
     (key) => ctx.runtime.agentTransitions.latestRow(key),
     input.paneKey,
-    { signal: deadline.signal, beforeWrite: async () => deadline.check() }
+    {
+      signal: deadline.signal,
+      beforeWrite: async () => {
+        deadline.check()
+        requireConsent()
+      }
+    }
   )
   if (interrupted.outcome === 'accepted') {
     await awaitBoundary?.()
@@ -51,6 +70,7 @@ export async function stopStructuredSwitchTerminalSource(input: {
     input.destination !== undefined &&
     worktreeIdsEqual(close.source.worktreeId, input.destination) &&
     close.wholeTab()
+  requireConsent()
   // Shutdown already accepted must finish even when the observing request expires.
   try {
     await host.trackSwitchPhysical(sessionId, close.stop(replacing))
diff --git a/src/renderer/src/lib/conversation-surface-switch.test.tsx b/src/renderer/src/lib/conversation-surface-switch.test.tsx
index 4e030c4fcc26..3c97235449b3 100644
--- a/src/renderer/src/lib/conversation-surface-switch.test.tsx
+++ b/src/renderer/src/lib/conversation-surface-switch.test.tsx
@@ -14,6 +14,7 @@ const mocks = vi.hoisted(() => {
   return {
     target: makeTarget(),
     support: vi.fn(),
+    consent: vi.fn(async () => false),
     rpc: vi.fn(),
     capture: vi.fn(),
     prepare: vi.fn(),
@@ -36,6 +37,9 @@ vi.mock('@/runtime/structured-agent-session-client', () => ({
   supportsInPlaceSwitch: mocks.support,
   callStructuredAgentSession: mocks.call
 }))
+vi.mock('@/runtime/structured-agent-session-switch-consent', () => ({
+  supportsSwitchConsent: mocks.consent
+}))
 vi.mock('@/runtime/structured-agent-session-owner', async (original) => ({
   ...(await original<typeof SessionOwner>()),
   structuredAgentSessionTargetForHost: () => mocks.target.current
@@ -100,6 +104,7 @@ beforeEach(() => {
   })
   mocks.reader.mockReturnValue(undefined)
   mocks.support.mockResolvedValue(true)
+  mocks.consent.mockResolvedValue(false)
   mocks.call.mockResolvedValue({ status: 'completed', sessionId: subject.sessionId })
   useAppStore.setState(useAppStore.getInitialState(), true)
 })
@@ -194,3 +199,38 @@ it.each([false, true])(
     )
   }
 )
+
+it.each([
+  ['confirms', true],
+  ['cancels', false]
+])(
+  'asks only when a host that decides consent refuses a replying agent, and the user %s',
+  async (_name, confirmed) => {
+    mocks.consent.mockResolvedValue(true)
+    const confirm = vi.fn(async () => confirmed)
+    mocks.call
+      .mockResolvedValueOnce({
+        status: 'refused',
+        sessionId: subject.sessionId,
+        refusal: { code: 'agent_session_operation_invalid', details: { reason: 'turnActive' } }
+      })
+      .mockResolvedValueOnce({ status: 'completed', sessionId: subject.sessionId })
+    await expect(runConversationSwitch({ ...subject, confirm })).resolves.toBe(confirmed)
+    expect(confirm).toHaveBeenCalledOnce()
+    const executions = mocks.call.mock.calls.map(([, , params]) => params.execution)
+    expect(executions[0]).toMatchObject({ consented: false })
+    if (confirmed) {
+      // A yes is a fresh switch, never a replay of the refused invocation.
+      expect(executions[1]).toMatchObject({ consented: true })
+      expect(executions[1].invocationId).not.toBe(executions[0].invocationId)
+    } else {
+      expect(mocks.call).toHaveBeenCalledOnce()
+    }
+    expect(mocks.error).not.toHaveBeenCalled()
+  }
+)
+
+it('sends no consent field to a host that does not decide consent (its strict schema)', async () => {
+  await expect(runConversationSwitch(subject)).resolves.toBe(true)
+  expect(mocks.call.mock.calls[0]![2].execution).not.toHaveProperty('consented')
+})
diff --git a/src/renderer/src/lib/conversation-surface-switch.ts b/src/renderer/src/lib/conversation-surface-switch.ts
index c21237d37e65..46dddda471dd 100644
--- a/src/renderer/src/lib/conversation-surface-switch.ts
+++ b/src/renderer/src/lib/conversation-surface-switch.ts
@@ -17,6 +17,7 @@ import {
   callStructuredAgentSession,
   supportsInPlaceSwitch
 } from '@/runtime/structured-agent-session-client'
+import { supportsSwitchConsent } from '@/runtime/structured-agent-session-switch-consent'
 import { createStructuredAgentSessionLaunchIntent } from './launch-structured-agent-session'
 import { createBrowserUuid } from './browser-uuid'
 import { captureSourceTerminal } from '@/components/tab-bar/cli-chat-resume-terminal-capture'
@@ -97,8 +98,8 @@ export async function runConversationSwitch(args: ConversationSwitch): Promise<b
       feedback(conversationSwitchUnsupportedText(args.agent), 'error')
       return false
     }
-    if (conversationSwitchReplying(args)) {
-      const confirmed = await args.confirm?.({
+    const confirmStop = async (): Promise<boolean> =>
+      (await args.confirm?.({
         title: translate(
           'components.tab.bar.switch.stopAndSwitchTitle',
           '{{agent}} is replying. Stop it and switch?',
@@ -108,10 +109,12 @@ export async function runConversationSwitch(args: ConversationSwitch): Promise<b
         cancelLabel: translate('common.cancel', 'Cancel'),
         compact: true,
         ignoresOpeningGesture: true
-      })
-      if (!confirmed) {
-        return false
-      }
+      })) === true
+    // A host that decides consent refuses a replying agent itself; this client's copy of the
+    // agent's status is never permission to stop it, nor a reason to ask.
+    const hostConsents = supported && (await withinSwitchBudget(supportsSwitchConsent(target)))
+    if (!hostConsents && conversationSwitchReplying(args) && !(await confirmStop())) {
+      return false
     }
     consented = true
     // An agent or host without the in-place switch keeps the earlier chat resume.
@@ -119,25 +122,54 @@ export async function runConversationSwitch(args: ConversationSwitch): Promise<b
       await runLegacyConversationSwitch(args, target)
       return false
     }
-    // Time spent answering the consent dialog is not the switch's budget.
-    const deadline = agentSessionSwitchDeadline(Date.now, AGENT_SESSION_SWITCH_CLIENT_MS)
-    disposeDeadline = deadline.dispose
-    const { sessionId, execution } = await switchRequest(args, hostId, deadline)
-    const answer = await deadline.wait(
-      callStructuredAgentSession<AgentSessionSwitchResult>(
-        target,
-        args.direction === 'chat' ? 'agentSession.switchToChat' : 'agentSession.switchToTerminal',
-        { sessionId, execution },
-        {
-          signal: deadline.signal,
-          dispatchObservation: deadline.delegateSend,
-          beforeSend: (sentAt) => {
-            deadline.beforeSend(sentAt)
-            sent = true
+    let consent = hostConsents ? false : undefined
+    let request: Awaited<ReturnType<typeof switchRequest>> | undefined
+    let answer: AgentSessionSwitchResult
+    for (;;) {
+      // Time spent answering the consent dialog is not the switch's budget.
+      const deadline = agentSessionSwitchDeadline(Date.now, AGENT_SESSION_SWITCH_CLIENT_MS)
+      disposeDeadline = deadline.dispose
+      request ??= await switchRequest(args, hostId, deadline)
+      answer = await deadline.wait(
+        callStructuredAgentSession<AgentSessionSwitchResult>(
+          target,
+          args.direction === 'chat' ? 'agentSession.switchToChat' : 'agentSession.switchToTerminal',
+          {
+            sessionId: request.sessionId,
+            execution: {
+              ...request.execution,
+              ...(consent === undefined ? {} : { consented: consent })
+            }
+          },
+          {
+            signal: deadline.signal,
+            dispatchObservation: deadline.delegateSend,
+            beforeSend: (sentAt) => {
+              deadline.beforeSend(sentAt)
+              sent = true
+            }
           }
-        }
+        )
       )
-    )
+      deadline.dispose()
+      const needsConsent =
+        consent === false &&
+        answer.status === 'refused' &&
+        answer.refusal.details?.reason === 'turnActive'
+      if (!needsConsent) {
+        break
+      }
+      // The host stopped nothing. A yes is a new switch under its own invocation, never a replay.
+      if (!(await confirmStop())) {
+        return false
+      }
+      consent = true
+      sent = false
+      request = {
+        ...request,
+        execution: { ...request.execution, invocationId: createBrowserUuid() }
+      }
+    }
     if (answer.status !== 'completed') {
       feedback(
         conversationSwitchFailureText(new AgentSessionRefusalError(answer.refusal), args),
diff --git a/src/renderer/src/runtime/structured-agent-session-switch-consent.ts b/src/renderer/src/runtime/structured-agent-session-switch-consent.ts
new file mode 100644
index 000000000000..1c796bf580bc
--- /dev/null
+++ b/src/renderer/src/runtime/structured-agent-session-switch-consent.ts
@@ -0,0 +1,8 @@
+import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
+import { SWITCH_CONSENT_RUNTIME_CAPABILITY } from '../../../shared/structured-agent-cli-conversation-adoption'
+import { structuredAgentSessionHostSupports } from './structured-agent-session-client'
+
+/** Whether the host decides a switch's consent (refuses a replying agent unless consented). */
+export function supportsSwitchConsent(target: RuntimeClientTarget): Promise<boolean> {
+  return structuredAgentSessionHostSupports(target, SWITCH_CONSENT_RUNTIME_CAPABILITY)
+}
diff --git a/src/shared/rpc-contract/structured-agent-session-params.ts b/src/shared/rpc-contract/structured-agent-session-params.ts
index dbc1335139ea..4d3f33b4438d 100644
--- a/src/shared/rpc-contract/structured-agent-session-params.ts
+++ b/src/shared/rpc-contract/structured-agent-session-params.ts
@@ -222,7 +222,9 @@ export const SwitchToChatParams = OptionsParams.extend({
     .object({
       invocationId: Identifier('Invalid invocation'),
       create: CreateIntentParams.omit({ firstMessage: true }).optional(),
-      source: TerminalClose.required().optional()
+      source: TerminalClose.required().optional(),
+      /** Sent only to a host advertising switch consent; false refuses a replying agent. */
+      consented: z.boolean().optional()
     })
     .strict()
     .optional()
@@ -233,7 +235,8 @@ export const SwitchToTerminalParams = OptionsParams.extend({
       invocationId: Identifier('Invalid invocation'),
       sourceTabId: Identifier('Invalid tab').optional(),
       groupId: Identifier('Invalid group').optional(),
-      commandOverride: z.string().max(8192).optional()
+      commandOverride: z.string().max(8192).optional(),
+      consented: z.boolean().optional()
     })
     .strict()
     .optional()
diff --git a/src/shared/structured-agent-cli-conversation-adoption.ts b/src/shared/structured-agent-cli-conversation-adoption.ts
index 9e61f5a80edf..f13094f24466 100644
--- a/src/shared/structured-agent-cli-conversation-adoption.ts
+++ b/src/shared/structured-agent-cli-conversation-adoption.ts
@@ -57,10 +57,17 @@ export function inPlaceSwitchCapability(agent: string): string {
   return `agent-session.structured.switch.v1:${agent}`
 }
 
-export const IN_PLACE_SWITCH_RUNTIME_CAPABILITIES = IN_PLACE_SWITCH_AGENTS.flatMap((agent) => [
-  inPlaceSwitchCapability(agent),
-  inPlaceSwitchExecutionCapability(agent)
-])
+/** The host decides whether a switch needs the user's yes: a client sends `consented: false` and
+ *  shows its dialog only when the host refuses a replying agent. */
+export const SWITCH_CONSENT_RUNTIME_CAPABILITY = 'agent-session.structured.switch-consent.v1'
+
+export const IN_PLACE_SWITCH_RUNTIME_CAPABILITIES = [
+  ...IN_PLACE_SWITCH_AGENTS.flatMap((agent) => [
+    inPlaceSwitchCapability(agent),
+    inPlaceSwitchExecutionCapability(agent)
+  ]),
+  SWITCH_CONSENT_RUNTIME_CAPABILITY
+]
 
 export function inPlaceSwitchExecutionCapability(agent: string): string {
   return `agent-session.structured.switch-execution.v1:${agent}`

From 019cf1a46d0d3a04f56ed7187a57f2a48382c82e Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 23:00:44 -0700
Subject: [PATCH 155/207] Name the agent a switch stopped, and restart that
 pane as a fresh shell

After a switch failed past its stop, the kept terminal said "Its output is preserved" over a full-screen agent that kept nothing, and Restart reattached to the killed session and showed a blank pane. The pane now says which agent the switch stopped and that Restart opens a new shell there, and its Restart replaces the stopped process so main starts a fresh session, also when the pane was parked and shown again. A switch now ends the terminal it started only when nothing will show it (it never sent the placement, or the layout owner refused it); a timed-out reveal keeps it for the retry to adopt.
---
 ...red-agent-session-switch-execution.test.ts | 16 +++++++--
 ...ructured-agent-session-switch-execution.ts |  4 ++-
 ...agent-session-switch-terminal-execution.ts | 10 ++++--
 ...ured-agent-session-switch-terminal-stop.ts |  5 ++-
 .../session-tabs/switch-terminal-placement.ts |  5 +--
 .../session-tabs/terminal-not-placed-error.ts |  5 +++
 .../terminal-switch-close-capture.ts          |  6 ++--
 src/main/window/runtime-window-lifecycle.ts   |  5 +--
 .../TerminalProcessExitOverlay.test.tsx       | 21 +++++++++++
 .../TerminalProcessExitOverlay.tsx            | 36 ++++++++++++++-----
 .../terminal-pane/pty-connection-types.ts     |  6 +++-
 .../stopped-switch-source-exit.ts             | 12 ++++---
 .../stopped-switch-source.test.ts             |  8 +++--
 .../terminal-pane/stopped-switch-sources.ts   | 10 +++---
 ...terminal-pane-process-exit-actions.test.ts | 21 +++++++++++
 .../use-terminal-pane-process-exit-actions.ts | 16 +++++++--
 src/renderer/src/i18n/locales/en.json         |  3 ++
 src/shared/stopped-switch-source.ts           |  4 +++
 18 files changed, 156 insertions(+), 37 deletions(-)
 create mode 100644 src/main/runtime/session-tabs/terminal-not-placed-error.ts

diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
index 02a35c5eee5e..6c1ba8fcaa3c 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
@@ -24,6 +24,7 @@ import {
   LEAF_B
 } from '../../main-owned-workspace-runtime-fixture'
 import { executeStructuredSessionSwitch } from './structured-agent-session-switch-execution'
+import { TerminalNotPlacedError } from '../../session-tabs/terminal-not-placed-error'
 import type { AiVaultPrepareSessionResumeResult } from '../../../../shared/ai-vault-resume-preparation'
 import { refusedMobileSessionTabClose } from '../../mobile-session-tab-close-outcome'
 import { AGENT_SESSION_SWITCH_HOST_MS } from '../../../../shared/agent-session-switch-execution'
@@ -464,6 +465,8 @@ it('puts the switched terminal in the chat tab’s slot and closes the chat tab,
 
 it.each([
   ['connected', 1],
+  // The window may have placed it before the answer was lost: kept for the retry to adopt.
+  ['timed-out', 0],
   ['viewed', 0],
   ['adopted', 0],
   ['disconnected', 0]
@@ -494,7 +497,11 @@ it.each([
       ...(shape === 'adopted' ? { agentSessionDisposition: 'adopted' as const } : {})
     }))
     vi.spyOn(runtime, 'hasTerminalViewer').mockReturnValue(shape === 'viewed')
-    vi.spyOn(runtime, 'placeSwitchTerminal').mockRejectedValue(new Error('terminal_handle_stale'))
+    vi.spyOn(runtime, 'placeSwitchTerminal').mockRejectedValue(
+      shape === 'timed-out'
+        ? new Error('Terminal reveal timed out')
+        : new TerminalNotPlacedError('terminal_handle_stale')
+    )
     const result = await executeStructuredSessionSwitch(
       { sessionId: id, execution: { invocationId: `to-terminal-${shape}` } },
       { runtime, ...(shape === 'disconnected' ? { signal: AbortSignal.abort() } : {}) },
@@ -625,7 +632,9 @@ function keptSourceTerminal(options: KeptTerminalSwitchOptions = {}) {
     tabId: TAB_ID,
     leafId: LEAF_A,
     ptyId: PTY_A,
-    incarnationId
+    incarnationId,
+    // The stopped pane names it.
+    agent: 'codex' as const
   }
   return {
     runtime,
@@ -758,5 +767,6 @@ it('settles a kept source once when an addressed close stops it but cannot retir
   await expect(
     runtime.closeTerminal(source.handle, incarnationId, source.presentation)
   ).rejects.toThrow('terminal_pane_close_failed')
-  expect(settled).toHaveBeenCalledExactlyOnceWith(stoppedSource)
+  // An ordinary close, not a switch: no agent to name.
+  expect(settled).toHaveBeenCalledExactlyOnceWith({ ...stoppedSource, agent: undefined })
 })
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
index 5d4e06077e4a..f0bd3eecce07 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
@@ -33,6 +33,7 @@ import { mainAgentState } from '../../../../shared/main-agent-status'
 import { captureSwitchStoppedCliTurn } from '../../../native-chat/agent-session-wire/structured-agent-session-switch-import'
 import { worktreeIdsEqual } from '../../../../shared/worktree/id'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
+import { isAiVaultAgent } from '../../../../shared/ai-vault-types'
 
 type Prepared = Awaited<ReturnType<typeof prepareStructuredSessionSwitch>>
 
@@ -187,7 +188,8 @@ async function switchToChat(
         create?.worktree.replace(/^id:/, ''),
       boundary: before && stopped ? { source: before, stopped } : undefined,
       keepSource: (settle) => keepSource(() => settle(replacedBy)),
-      consented: execution.consented
+      consented: execution.consented,
+      agent: [create?.agent, host.deps.store.getRecord(sessionId)?.provider].find(isAiVaultAgent)
     })
   }
   deadline.check()
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts
index 4fd1309d0d2c..d2108cf9b0e1 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-execution.ts
@@ -12,6 +12,7 @@ import type {
 import { agentSessionRefusalError } from '../../../../shared/agent-session-wire-refusals'
 import { nativeConversationContent } from '../../../ai-vault/structured-chat-cli-fork'
 import { prepareSwitchCliTranscript } from './structured-agent-session-switch-transcript'
+import { TerminalNotPlacedError } from '../../session-tabs/terminal-not-placed-error'
 
 /** Stop the chat with proof, spawn the terminal parked, then one layout replace into the chat's slot. */
 export async function executeStructuredSessionTerminalSwitch(
@@ -69,8 +70,10 @@ export async function executeStructuredSessionTerminalSwitch(
     })
   )
   let placed: Awaited<ReturnType<typeof ctx.runtime.placeSwitchTerminal>>
+  let dispatched = false
   try {
     check()
+    dispatched = true
     placed = await ctx.runtime.placeSwitchTerminal(record.location.workspaceId, {
       terminal,
       chatSessionId: sessionId,
@@ -79,9 +82,10 @@ export async function executeStructuredSessionTerminalSwitch(
       focusWindow: agentLaunchMovesHostWindow(ctx)
     })
   } catch (error) {
-    // A connected client hears this failure and keeps its chat, so nothing will show this
-    // terminal; after a lost connection the client's retry adopts it instead.
-    if (!ctx.signal?.aborted) {
+    // Ended only when nothing will show it: a connected client hears this failure and keeps its
+    // chat, and the layout owner never got or refused the placement. A timed-out reveal may have
+    // placed it, and after a lost connection the client's retry adopts it.
+    if (!ctx.signal?.aborted && (!dispatched || error instanceof TerminalNotPlacedError)) {
       await ctx.runtime.discardSwitchTerminal(terminal)
     }
     throw error
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-stop.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-stop.ts
index b0dd226c3552..e4ed5871b6c9 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-stop.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-stop.ts
@@ -10,6 +10,7 @@ import { agentSessionRefusalError } from '../../../../shared/agent-session-wire-
 import { worktreeIdsEqual } from '../../../../shared/worktree/id'
 import { interruptWorkingAgent } from '../../terminal-agent-interrupt'
 import { mainAgentState } from '../../../../shared/main-agent-status'
+import type { AiVaultAgent } from '../../../../shared/ai-vault-types'
 import type { captureStructuredSwitchTerminalSource } from './structured-agent-session-switch-source'
 
 /**
@@ -29,6 +30,8 @@ export async function stopStructuredSwitchTerminalSource(input: {
   keepSource: (settle: (replacedBy: string | undefined) => void) => void
   /** False: the client left consent to this host, so a replying agent is refused, not stopped. */
   consented?: boolean
+  /** The stopped agent, named by the pane the window keeps on screen. */
+  agent?: AiVaultAgent
 }): Promise<void> {
   const { ctx, host, sessionId, close, deadline } = input
   // Checked where the stop is admitted (before the Escape, at its write, and before the exit), so
@@ -76,7 +79,7 @@ export async function stopStructuredSwitchTerminalSource(input: {
     await host.trackSwitchPhysical(sessionId, close.stop(replacing))
     // The window decides whether the stopped pane is still there; a chat that replaced it is
     // named so the window waits for that replace's own pass.
-    input.keepSource((replacedBy) => close.settleStoppedSource(replacedBy))
+    input.keepSource((replacedBy) => close.settleStoppedSource(replacedBy, input.agent))
   } catch {
     host.deps.logger.warn('switch source exit was not confirmed', {
       scope: 'session-switch',
diff --git a/src/main/runtime/session-tabs/switch-terminal-placement.ts b/src/main/runtime/session-tabs/switch-terminal-placement.ts
index 573af139b3b1..576aad8b5f6a 100644
--- a/src/main/runtime/session-tabs/switch-terminal-placement.ts
+++ b/src/main/runtime/session-tabs/switch-terminal-placement.ts
@@ -4,6 +4,7 @@ import type { RuntimeTerminalCreate } from '../../../shared/runtime-terminal-cre
 import type { LayoutApplyReply } from '../../../shared/workspace-layout/workspace-layout-command-types'
 import type { LayoutCommandRunOptions, WindowLayoutCommand } from '../runtime-layout-apply'
 import { OrcaRuntimeWithPublishPtyBackedMobileSessionTerminal } from './pty-backed-session-publication'
+import { TerminalNotPlacedError } from './terminal-not-placed-error'
 
 export abstract class OrcaRuntimeWithSwitchTerminalPlacement extends OrcaRuntimeWithPublishPtyBackedMobileSessionTerminal {
   abstract applyLayoutCommand(
@@ -35,7 +36,7 @@ export abstract class OrcaRuntimeWithSwitchTerminalPlacement extends OrcaRuntime
         ? terminal.paneKey.slice(tabId.length + 1)
         : undefined
     if (!pty || !tabId || !leafId) {
-      throw new Error('terminal_handle_stale')
+      throw new TerminalNotPlacedError('terminal_handle_stale')
     }
     const layoutTabId = chatTabId(args.chatSessionId)
     const snapshotTabId = `agent-session:${args.chatSessionId}`
@@ -80,7 +81,7 @@ export abstract class OrcaRuntimeWithSwitchTerminalPlacement extends OrcaRuntime
         replaces: { tabId: layoutTabId }
       })
       if (!reply.ok) {
-        throw new Error(reply.code)
+        throw new TerminalNotPlacedError(reply.code)
       }
       replaced = reply.result.closed?.includes(layoutTabId) === true
     }
diff --git a/src/main/runtime/session-tabs/terminal-not-placed-error.ts b/src/main/runtime/session-tabs/terminal-not-placed-error.ts
new file mode 100644
index 000000000000..fdae1593ece2
--- /dev/null
+++ b/src/main/runtime/session-tabs/terminal-not-placed-error.ts
@@ -0,0 +1,5 @@
+/**
+ * The layout owner answered that it did not show the terminal, or the request never reached it.
+ * Only this failure proves no tab will show the terminal; a timeout or a lost answer does not.
+ */
+export class TerminalNotPlacedError extends Error {}
diff --git a/src/main/runtime/session-tabs/terminal-switch-close-capture.ts b/src/main/runtime/session-tabs/terminal-switch-close-capture.ts
index 0725dbff49a2..f81946b8876c 100644
--- a/src/main/runtime/session-tabs/terminal-switch-close-capture.ts
+++ b/src/main/runtime/session-tabs/terminal-switch-close-capture.ts
@@ -6,6 +6,7 @@ import {
   type TerminalSurfaceCloseCapture
 } from '../../../shared/terminal-tab-close'
 import { OrcaRuntimeWithExplicitTerminalTabClose } from './explicit-terminal-tab-close'
+import type { AiVaultAgent } from '../../../shared/ai-vault-types'
 export abstract class OrcaRuntimeWithTerminalSwitchCloseCapture extends OrcaRuntimeWithExplicitTerminalTabClose {
   captureTerminalSwitchClose(
     handle: string,
@@ -112,7 +113,7 @@ export abstract class OrcaRuntimeWithTerminalSwitchCloseCapture extends OrcaRunt
        * once, only after proof of the stop; a replace's chat names itself, so the window settles
        * only once that chat is there and its replace has had its pass.
        */
-      settleStoppedSource: (replacedBySessionId?: string) => {
+      settleStoppedSource: (replacedBySessionId?: string, agent?: AiVaultAgent) => {
         if (!keptStopped || stoppedSourceSettled) {
           return
         }
@@ -123,7 +124,8 @@ export abstract class OrcaRuntimeWithTerminalSwitchCloseCapture extends OrcaRunt
           leafId: source.leafId,
           ptyId: addressedPty,
           incarnationId: incarnation,
-          ...(replacedBySessionId ? { replacedBySessionId } : {})
+          ...(replacedBySessionId ? { replacedBySessionId } : {}),
+          ...(agent ? { agent } : {})
         })
       },
       /** Retires the pane's bookkeeping; its presentation too, unless a replace or its exit already did. */
diff --git a/src/main/window/runtime-window-lifecycle.ts b/src/main/window/runtime-window-lifecycle.ts
index dc12af68df0c..002f106e5a42 100644
--- a/src/main/window/runtime-window-lifecycle.ts
+++ b/src/main/window/runtime-window-lifecycle.ts
@@ -9,6 +9,7 @@ import type { TerminalTabCreateReply } from '../../shared/terminal-reveal-identi
 import { runWorktreeChangeInvalidators } from '../ipc/worktree-change-invalidators'
 import { requestAgentLaunchTabPublishFromRenderer } from './agent-launch-tab-publish-relay'
 import type { OrcaRuntimeService } from '../runtime/orca-runtime'
+import { TerminalNotPlacedError } from '../runtime/session-tabs/terminal-not-placed-error'
 import { registerRendererDocumentNavigation } from './renderer-document-navigation'
 import { createRuntimeRendererNotificationSender } from './runtime-renderer-notification-sender'
 import { requestSessionTabCloseFromRenderer } from './session-tab-close-request-relay'
@@ -81,7 +82,7 @@ export function registerRuntimeWindowLifecycle(
             : null
           : undefined
         if (expectedIdentity === null) {
-          reject(new Error('terminal_reveal_identity_required'))
+          reject(new TerminalNotPlacedError('terminal_reveal_identity_required'))
           return
         }
         const timer = setTimeout(() => {
@@ -96,7 +97,7 @@ export function registerRuntimeWindowLifecycle(
           clearTimeout(timer)
           ipcMain.removeListener('terminal:tabCreateReply', handler)
           if (reply.error) {
-            reject(new Error(reply.error))
+            reject(new TerminalNotPlacedError(reply.error))
             return
           }
           if (
diff --git a/src/renderer/src/components/terminal-pane/TerminalProcessExitOverlay.test.tsx b/src/renderer/src/components/terminal-pane/TerminalProcessExitOverlay.test.tsx
index 6270a5de91ec..82dfcec6a1f8 100644
--- a/src/renderer/src/components/terminal-pane/TerminalProcessExitOverlay.test.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalProcessExitOverlay.test.tsx
@@ -42,4 +42,25 @@ describe('TerminalProcessExitOverlay', () => {
 
     expect(screen.getByRole('alert').textContent).toContain('exit code 7')
   })
+
+  it('names the agent a switch stopped and claims no kept output', () => {
+    render(
+      <TerminalProcessExitOverlay
+        processExit={{
+          paneId: 1,
+          exitCode: 0,
+          reason: 'switch-stopped',
+          startup: null,
+          replacesPtyId: 'pty-stopped',
+          agent: 'codex'
+        }}
+        onRestart={vi.fn()}
+        onClose={vi.fn()}
+      />
+    )
+
+    const text = screen.getByRole('alert').textContent
+    expect(text).toContain('Codex stopped')
+    expect(text).not.toContain('preserved')
+  })
 })
diff --git a/src/renderer/src/components/terminal-pane/TerminalProcessExitOverlay.tsx b/src/renderer/src/components/terminal-pane/TerminalProcessExitOverlay.tsx
index 5e450c24b059..069f2316b11b 100644
--- a/src/renderer/src/components/terminal-pane/TerminalProcessExitOverlay.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalProcessExitOverlay.tsx
@@ -2,6 +2,7 @@ import { RotateCw, X } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import { translate } from '@/i18n/i18n'
 import type { PaneProcessExit } from './pty-connection-types'
+import { agentLabel } from '../../../../shared/ai-vault-session-filters'
 
 export function TerminalProcessExitOverlay({
   processExit,
@@ -13,24 +14,43 @@ export function TerminalProcessExitOverlay({
   onClose: () => void
 }): React.JSX.Element {
   const capacityError = processExit.reason === 'git-bash-console-capacity'
+  // A switch stopped the agent; a full-screen agent leaves no output here to keep.
+  const switchStopped = processExit.reason === 'switch-stopped'
+  const agent = processExit.agent ? agentLabel(processExit.agent) : null
   const title = capacityError
     ? translate(
         'auto.components.terminal.pane.TerminalProcessExitOverlay.capacityTitle',
         'Git Bash console limit reached'
       )
-    : translate(
-        'auto.components.terminal.pane.TerminalProcessExitOverlay.failedTitle',
-        'Terminal exited'
-      )
+    : switchStopped
+      ? agent
+        ? translate(
+            'auto.components.terminal.pane.TerminalProcessExitOverlay.agentStoppedTitle',
+            '{{agent}} stopped',
+            { agent }
+          )
+        : translate(
+            'auto.components.terminal.pane.TerminalProcessExitOverlay.stoppedTitle',
+            'Agent stopped'
+          )
+      : translate(
+          'auto.components.terminal.pane.TerminalProcessExitOverlay.failedTitle',
+          'Terminal exited'
+        )
   const detail = capacityError
     ? translate(
         'auto.components.terminal.pane.TerminalProcessExitOverlay.capacityDetail',
         'Git Bash reached its 128-console limit. Close unused Git Bash terminals, then restart this terminal.'
       )
-    : translate(
-        'auto.components.terminal.pane.TerminalProcessExitOverlay.failedDetail',
-        'The shell process ended with exit code {{code}}. Its output is preserved.'
-      ).replace('{{code}}', String(processExit.exitCode))
+    : switchStopped
+      ? translate(
+          'auto.components.terminal.pane.TerminalProcessExitOverlay.stoppedDetail',
+          'Orca stopped it to switch this conversation. Restart opens a new shell in this pane.'
+        )
+      : translate(
+          'auto.components.terminal.pane.TerminalProcessExitOverlay.failedDetail',
+          'The shell process ended with exit code {{code}}. Its output is preserved.'
+        ).replace('{{code}}', String(processExit.exitCode))
 
   return (
     <div className="pointer-events-none absolute inset-0 z-40 flex items-end justify-center p-4">
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-types.ts b/src/renderer/src/components/terminal-pane/pty-connection-types.ts
index 5ac026a3c4c7..9fbc7173b601 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-types.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-types.ts
@@ -20,6 +20,7 @@ import type { TerminalKittyKeyboardModeTracker } from '../../../../shared/termin
 import type { SessionOptionValue } from '../../../../shared/native-chat/input/native-chat-session-options'
 import type { PtyPreconnectInputEntry } from './pty-preconnect-input-buffer'
 import type { AgentPaneLaunchRequest } from '../../../../shared/agent-pane-launch-request'
+import type { AiVaultAgent } from '../../../../shared/ai-vault-types'
 
 export type PtyPaneStartup = {
   command: string
@@ -53,8 +54,11 @@ export type PtyPaneStartup = {
 export type PaneProcessExit = {
   paneId: number
   exitCode: number
-  reason: 'git-bash-console-capacity' | 'process-failed'
+  reason: 'git-bash-console-capacity' | 'process-failed' | 'switch-stopped'
   startup: PtyPaneStartup
+  /** A switch stopped this process: Restart replaces it with a fresh shell session in this pane. */
+  replacesPtyId?: string
+  agent?: AiVaultAgent
 }
 
 export type PtyConnectionDeps = {
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/stopped-switch-source-exit.ts b/src/renderer/src/components/terminal-pane/pty-connection/stopped-switch-source-exit.ts
index 8b0c91fcac22..2bc0654503d0 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/stopped-switch-source-exit.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/stopped-switch-source-exit.ts
@@ -3,8 +3,8 @@ import type { ConnectPanePtySession } from './connect-pane-pty-session'
 
 /**
  * A `closing` exit keeps the stopped process's screen for the replace that should remove its tab.
- * If main says no replace removed it, the pane takes the ordinary exited state: the overlay with
- * Restart and Close, at the exit code it recorded, never an automatic close or restart.
+ * If main says no replace removed it, the pane takes the exited state: the overlay naming the
+ * stopped agent, with Restart (a fresh shell here) and Close, never an automatic close or restart.
  */
 export function holdClosingExit(
   session: ConnectPanePtySession,
@@ -15,18 +15,22 @@ export function holdClosingExit(
   session.stopWatchingStoppedSwitchSource?.()
   session.stopWatchingStoppedSwitchSource = watchStoppedSwitchSource(
     { tabId: session.deps.tabId, leafId: session.pane.leafId, ptyId, incarnationId, exitCode },
-    () => {
+    (notice) => {
       session.stopWatchingStoppedSwitchSource = null
       if (session.disposed || session.handledExitPtyId !== ptyId) {
         return
       }
       session.clearExitedPanePtyLayoutBinding(ptyId)
       session.deps.clearTabPtyId(session.deps.tabId, ptyId)
+      // Main keeps a `closing` stop's binding, so a Restart must name the stopped process as the
+      // one it replaces; otherwise main reattaches to it and finds its session killed.
       session.deps.onPaneProcessDied?.({
         paneId: session.pane.id,
         exitCode,
         startup: null,
-        reason: 'process-failed'
+        reason: 'switch-stopped',
+        replacesPtyId: ptyId,
+        ...(notice.agent ? { agent: notice.agent } : {})
       })
     }
   )
diff --git a/src/renderer/src/components/terminal-pane/stopped-switch-source.test.ts b/src/renderer/src/components/terminal-pane/stopped-switch-source.test.ts
index b28636be5d89..a4b4b86e2f86 100644
--- a/src/renderer/src/components/terminal-pane/stopped-switch-source.test.ts
+++ b/src/renderer/src/components/terminal-pane/stopped-switch-source.test.ts
@@ -160,13 +160,17 @@ it('shows the kept pane exited at its own code once main settles it, with no clo
     kept.stoppedForReplace()
     await flushAsyncTicks(5)
     expect(kept.died).not.toHaveBeenCalled()
-    kept.modules.sources.noteStoppedSwitchSource(kept.source)
+    kept.modules.sources.noteStoppedSwitchSource({ ...kept.source, agent: 'codex' })
     await flushAsyncTicks(5)
+    // It names the agent the switch stopped, and its Restart replaces that process with a fresh
+    // shell session: main kept the stopped process's binding, whose session is killed.
     expect(kept.died).toHaveBeenCalledExactlyOnceWith({
       paneId: kept.pane.id,
       exitCode: 0,
       startup: null,
-      reason: 'process-failed'
+      reason: 'switch-stopped',
+      replacesPtyId: kept.source.ptyId,
+      agent: 'codex'
     })
     expect(kept.automaticClose).not.toHaveBeenCalled()
     expect(kept.transport.sendInput('must not run\r', 'driving')).toBe(false)
diff --git a/src/renderer/src/components/terminal-pane/stopped-switch-sources.ts b/src/renderer/src/components/terminal-pane/stopped-switch-sources.ts
index 9804bfbcff9c..0b5ab08f708d 100644
--- a/src/renderer/src/components/terminal-pane/stopped-switch-sources.ts
+++ b/src/renderer/src/components/terminal-pane/stopped-switch-sources.ts
@@ -15,7 +15,7 @@ type Entry = {
   leafId: string
   stopped?: StoppedPane
   notice?: StoppedSwitchSource
-  watcher?: () => void
+  watcher?: (notice: StoppedSwitchSource) => void
 }
 
 const entries = new Map<string, Entry>()
@@ -78,10 +78,10 @@ function reconcile(): void {
     }
     if (!entry.stopped && !entry.notice) {
       entries.delete(key)
-    } else if (entry.watcher && settles(state, entry)) {
+    } else if (entry.watcher && entry.notice && settles(state, entry)) {
       const settle = entry.watcher
       entries.delete(key)
-      settle()
+      settle(entry.notice)
     }
   }
   if (entries.size === 0) {
@@ -138,11 +138,11 @@ export function noteStoppedSwitchSource(notice: StoppedSwitchSource): void {
  */
 export function watchStoppedSwitchSource(
   pane: { tabId: string; leafId: string } & StoppedPane,
-  settle: () => void
+  settle: (notice: StoppedSwitchSource) => void
 ): () => void {
   const entry = entryFor(pane.tabId, pane.leafId)
   entry.stopped = { ptyId: pane.ptyId, incarnationId: pane.incarnationId, exitCode: pane.exitCode }
-  const watcher = (): void => settle()
+  const watcher = (notice: StoppedSwitchSource): void => settle(notice)
   entry.watcher = watcher
   track()
   return () => {
diff --git a/src/renderer/src/components/terminal-pane/use-terminal-pane-process-exit-actions.test.ts b/src/renderer/src/components/terminal-pane/use-terminal-pane-process-exit-actions.test.ts
index ad03b76a7ff0..5450117e27c5 100644
--- a/src/renderer/src/components/terminal-pane/use-terminal-pane-process-exit-actions.test.ts
+++ b/src/renderer/src/components/terminal-pane/use-terminal-pane-process-exit-actions.test.ts
@@ -95,6 +95,27 @@ describe('useTerminalPaneProcessExitActions', () => {
     expect(mocks.buildPaneAccountRestartStartup).not.toHaveBeenCalled()
   })
 
+  it('restarts a pane a switch stopped as a fresh shell that replaces the stopped process', () => {
+    const { result } = renderHook(() => useTerminalPaneProcessExitActions(createController()))
+
+    act(() =>
+      result.current.handleRestartExitedPane({
+        paneId: PANE.id,
+        exitCode: 0,
+        reason: 'switch-stopped',
+        startup: null,
+        replacesPtyId: 'pty-stopped',
+        agent: 'codex'
+      })
+    )
+
+    expect(mocks.connectPanePty).toHaveBeenCalledWith(
+      PANE,
+      expect.anything(),
+      expect.objectContaining({ startup: null, replacesPtyId: 'pty-stopped' })
+    )
+  })
+
   it('still resumes Codex when an account switch restarts the pane', () => {
     mocks.readyRestartPtyIds = ['pty-1']
     mocks.pendingAgent = 'codex'
diff --git a/src/renderer/src/components/terminal-pane/use-terminal-pane-process-exit-actions.ts b/src/renderer/src/components/terminal-pane/use-terminal-pane-process-exit-actions.ts
index c1c8f620414f..827cb471d68c 100644
--- a/src/renderer/src/components/terminal-pane/use-terminal-pane-process-exit-actions.ts
+++ b/src/renderer/src/components/terminal-pane/use-terminal-pane-process-exit-actions.ts
@@ -10,6 +10,7 @@ import { makePaneKey } from '../../../../shared/stable-pane-id'
 import { connectPanePty } from './pty-connection'
 import { bindPanePtyId } from '@/lib/pane-manager/mobile-fit-overrides'
 import { releasePaneTransportForRestart } from './pane-restart-transport-handoff'
+import { isRemoteRuntimePtyId } from '../../../../shared/remote-runtime/remote-runtime-pty-id'
 import { clearPaneTerminalError } from './terminal-error-accumulation'
 import { resolveTerminalProcessExitRestartStartup } from './terminal-process-exit-restart'
 import type { PaneProcessExit, PtyConnectionDeps } from './pty-connection-types'
@@ -71,7 +72,11 @@ export function useTerminalPaneProcessExitActions(controller: TerminalPaneCloseC
   )
 
   const handleRestartPane = useCallback(
-    (paneId: number, startup: PtyConnectionDeps['startup'], options: { focus: boolean }) => {
+    (
+      paneId: number,
+      startup: PtyConnectionDeps['startup'],
+      options: { focus: boolean; replacesPtyId?: string }
+    ) => {
       const manager = managerRef.current
       const pane = manager?.getPanes().find((candidate) => candidate.id === paneId)
       if (!manager || !pane) {
@@ -88,7 +93,11 @@ export function useTerminalPaneProcessExitActions(controller: TerminalPaneCloseC
       panePtyBinding?.dispose()
       panePtyBindingsRef.current.delete(paneId)
       syncPanePtyLayoutBinding(paneId, null)
-      const replacesPtyId = releasePaneTransportForRestart(transport)
+      const replacesPtyId =
+        releasePaneTransportForRestart(transport) ??
+        (options.replacesPtyId && !isRemoteRuntimePtyId(options.replacesPtyId)
+          ? options.replacesPtyId
+          : null)
       paneTransportsRef.current.delete(paneId)
       setCacheTimerStartedAt(makePaneKey(tabId, pane.leafId), null)
       setTerminalError(null)
@@ -188,7 +197,8 @@ export function useTerminalPaneProcessExitActions(controller: TerminalPaneCloseC
       clearPaneProcessExit(processExit.paneId)
       // Why no agent fallback: a null startup means a plain shell; account switches restart via their own path.
       handleRestartPane(processExit.paneId, resolveTerminalProcessExitRestartStartup(processExit), {
-        focus: true
+        focus: true,
+        ...(processExit.replacesPtyId ? { replacesPtyId: processExit.replacesPtyId } : {})
       })
     },
     [clearPaneProcessExit, handleRestartPane]
diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index fc745a3f4910..302da5425824 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -3995,6 +3995,9 @@
             "capacityDetail": "Git Bash reached its 128-console limit. Close unused Git Bash terminals, then restart this terminal.",
             "failedTitle": "Terminal exited",
             "failedDetail": "The shell process ended with exit code {{code}}. Its output is preserved.",
+            "agentStoppedTitle": "{{agent}} stopped",
+            "stoppedTitle": "Agent stopped",
+            "stoppedDetail": "Orca stopped it to switch this conversation. Restart opens a new shell in this pane.",
             "close": "Close",
             "restart": "Restart"
           },
diff --git a/src/shared/stopped-switch-source.ts b/src/shared/stopped-switch-source.ts
index 452fb519c46c..d32c1848927f 100644
--- a/src/shared/stopped-switch-source.ts
+++ b/src/shared/stopped-switch-source.ts
@@ -1,3 +1,5 @@
+import type { AiVaultAgent } from './ai-vault-types'
+
 /** One stopped switch source: the exact pane whose process a switch stopped and kept on screen. */
 export type StoppedSwitchSource = {
   worktreeId: string
@@ -7,4 +9,6 @@ export type StoppedSwitchSource = {
   incarnationId?: string
   /** The chat a replace put in this tab's slot; the window settles the pane only once it has it. */
   replacedBySessionId?: string
+  /** The agent the switch stopped, which the stopped pane names. */
+  agent?: AiVaultAgent
 }

From c06b4d2f4af714348d18f700e2f617cde770a7d7 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 23:03:21 -0700
Subject: [PATCH 156/207] Type the switch tests' mock state without casts, and
 expect the copy on older hosts

The History row tests still expected "Switch to CLI" for a chat on a host that can't switch in place; that row now offers the terminal copy instead, from both menus. The switch tests' hoisted mock state is typed by annotation rather than casts.
---
 .../native-chat/NativeChatTopRightControls.test.tsx      | 9 ++++-----
 .../components/right-sidebar/AiVaultVirtualRow.test.tsx  | 8 +++++---
 .../ai-vault-session-in-place-switch.test.ts             | 8 ++++----
 .../tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx    | 6 +++---
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/renderer/src/components/native-chat/NativeChatTopRightControls.test.tsx b/src/renderer/src/components/native-chat/NativeChatTopRightControls.test.tsx
index 7092d8433db9..7588b535616f 100644
--- a/src/renderer/src/components/native-chat/NativeChatTopRightControls.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatTopRightControls.test.tsx
@@ -12,11 +12,10 @@ import { NativeChatTopRightControls } from './NativeChatTopRightControls'
 import { NativeChatResumeInCliButton } from './NativeChatResumeInCliButton'
 import type { NativeChatFind } from './use-native-chat-find'
 
-const mocks = vi.hoisted(() => ({
-  capability: undefined as boolean | undefined,
-  resolveIdentity: vi.fn(),
-  resolveSubject: vi.fn()
-}))
+const mocks = vi.hoisted(() => {
+  const state: { capability: boolean | undefined } = { capability: undefined }
+  return Object.assign(state, { resolveIdentity: vi.fn(), resolveSubject: vi.fn() })
+})
 
 vi.mock('@/lib/in-place-switch-support', async (original) => ({
   ...(await original<typeof InPlaceSwitchSupport>()),
diff --git a/src/renderer/src/components/right-sidebar/AiVaultVirtualRow.test.tsx b/src/renderer/src/components/right-sidebar/AiVaultVirtualRow.test.tsx
index ee47a8b153e0..07d09517ea8f 100644
--- a/src/renderer/src/components/right-sidebar/AiVaultVirtualRow.test.tsx
+++ b/src/renderer/src/components/right-sidebar/AiVaultVirtualRow.test.tsx
@@ -322,7 +322,8 @@ describe('AiVaultVirtualRow CLI surface actions', () => {
   const owner = { sessionId: 'chat-1', workspaceId: 'worktree-1' }
 
   it.each(['claude', 'codex'] as const)(
-    'offers the ordinary CLI switch on an older host for a chat-owned %s row from both menus',
+    // A host that can't switch in place offers the copy instead of a switch it would refuse.
+    'offers the terminal copy on an older host for a chat-owned %s row from both menus',
     async (agent) => {
       useAppStore.setState((state) => ({
         settings: {
@@ -336,13 +337,14 @@ describe('AiVaultVirtualRow CLI surface actions', () => {
       const user = userEvent.setup()
 
       await user.click(screen.getByTestId('ai-vault-session-more-actions'))
-      await user.click(await screen.findByRole('menuitem', { name: 'Switch to CLI' }))
+      await user.click(await screen.findByRole('menuitem', { name: 'Resume in New Terminal' }))
       expect(onResumeInNewCli).toHaveBeenCalledExactlyOnceWith(session, 'worktree-1')
 
       fireEvent.contextMenu(screen.getByText('CLI session'))
-      await user.click(await screen.findByRole('menuitem', { name: 'Switch to CLI' }))
+      await user.click(await screen.findByRole('menuitem', { name: 'Resume in New Terminal' }))
       expect(onResumeInNewCli).toHaveBeenCalledTimes(2)
       expect(onResume).not.toHaveBeenCalled()
+      expect(screen.queryByRole('menuitem', { name: 'Switch to CLI' })).toBeNull()
     }
   )
 
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.test.ts b/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.test.ts
index baa27774e59e..c6b7c82cca78 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.test.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault-session-in-place-switch.test.ts
@@ -7,10 +7,10 @@ import { inPlaceSwitchCapability } from '../../../../shared/structured-agent-cli
 import { makeTabSessionHistoryRow } from '../tab-bar/tab-session-history-test-fixture'
 import { switchAiVaultSessionToCli } from './ai-vault-session-in-place-switch'
 
-const mocks = vi.hoisted(() => ({
-  capabilities: null as readonly string[] | null,
-  runNativeChatCliSwitch: vi.fn(async () => {})
-}))
+const mocks = vi.hoisted(() => {
+  const state: { capabilities: readonly string[] | null } = { capabilities: null }
+  return Object.assign(state, { runNativeChatCliSwitch: vi.fn(async () => {}) })
+})
 
 vi.mock('@/runtime/local-runtime-capabilities', async (original) => ({
   ...(await original<object>()),
diff --git a/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx b/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx
index 49f2ce720f18..9da5ba01d39b 100644
--- a/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx
+++ b/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx
@@ -13,7 +13,8 @@ const mocks = vi.hoisted(() => {
   const state: {
     subject: Record<string, unknown> | null
     cliSource: Record<string, unknown> | null
-  } = { subject: null, cliSource: null }
+    capability: boolean | undefined
+  } = { subject: null, cliSource: null, capability: true }
   return {
     ...state,
     pending: false,
@@ -21,8 +22,7 @@ const mocks = vi.hoisted(() => {
     runNativeChatCliFork: vi.fn(),
     runNativeChatCliSwitch: vi.fn(),
     runCliChatResume: vi.fn(async () => {}),
-    listSessions: vi.fn(),
-    capability: true as boolean | undefined
+    listSessions: vi.fn()
   }
 })
 

From 8f74e76b3819d8acf57e836bd5e00f996be7eb57 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Fri, 30 Oct 2026 23:35:22 -0700
Subject: [PATCH 157/207] Fix the switch's type errors and keep its tests off
 the wall clock

The switch's Stop read the chat's work with an extra argument the host never takes (it reads that session's own journal, the one just opened), and now treats no held session as possibly working instead of failing. The slot anchor is stamped only after narrowing a row to the two kinds that carry it. The tests reach the provider's events through a checked helper, and date transcript rows after the import with a fixed time rather than the clock.
---
 ...tured-agent-session-abandoned-turn.test.ts |  3 ++-
 .../structured-agent-session-switch-source.ts |  5 +++--
 .../structured-worker-switch-stop.test.ts     | 22 ++++++++++++-------
 ...red-agent-session-switch-open-turn.test.ts |  3 ++-
 .../session-tabs/switch-slot-anchors.ts       |  8 +++----
 5 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-abandoned-turn.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-abandoned-turn.test.ts
index ad5c7eafdee1..dcb3ba8f6119 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-abandoned-turn.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-abandoned-turn.test.ts
@@ -71,7 +71,8 @@ function open(sessionId: string) {
 
 /** Rows written after the chat's import carry times after it. */
 function later(rows: string[]): string[] {
-  const at = Date.now() + 60_000
+  // Any time after the import's own (written at the run's real time) will do.
+  const at = Date.parse('2999-01-01T00:00:00Z')
   return rows.map((row, index) => {
     const parsed = JSON.parse(row)
     return JSON.stringify({ ...parsed, timestamp: new Date(at + index).toISOString() })
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts
index bb69bddc14c2..8a77cad71263 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts
@@ -75,9 +75,10 @@ export function structuredAgentSessionSwitchSource(context: SwitchSourceContext)
       }
       // A Stop with no turn running and nothing queued stops nothing (the common pattern makes it a
       // no-op, so no Stop note is written); the process stop below still ends the agent with proof.
-      const work = context.currentWork(sessionId, conversation.journal)
+      // The held session's work, the conversation just opened; none held reads as possibly working.
+      const work = context.currentWork(sessionId)
       const stops =
-        work === undefined ||
+        work == null ||
         work.working() ||
         conversation.journal.submissions().some(isQueuedAgentJournalSubmission)
       // Before any effect; later sends are fenced by the admitted-send count above.
diff --git a/src/main/runtime/orchestration/structured-worker-switch-stop.test.ts b/src/main/runtime/orchestration/structured-worker-switch-stop.test.ts
index d8ed8aa98aaf..3a691cc595a7 100644
--- a/src/main/runtime/orchestration/structured-worker-switch-stop.test.ts
+++ b/src/main/runtime/orchestration/structured-worker-switch-stop.test.ts
@@ -97,11 +97,19 @@ it.each([false, true])(
   }
 )
 
+function providerEvents() {
+  const events = rig.adapter.acquire.mock.calls.at(-1)?.[0].events
+  if (!events) {
+    throw new Error('no provider child was started')
+  }
+  return events
+}
+
 it.each([false, true])(
   'sends the switch’s Stop only to a chat that is replying=%s, so an idle chat gets no Stop note',
   async (replying) => {
     await foundRestTestChat(rig)
-    const events = rig.adapter.acquire.mock.calls.at(-1)![0].events
+    const events = providerEvents()
     for (const state of replying ? (['running'] as const) : (['running', 'completed'] as const)) {
       events.appendItem(
         { provider: 'codex', threadId: REST_TEST_THREAD, turnId: 'turn', ordinal: 50 },
@@ -122,13 +130,11 @@ it.each([false, true])(
 
 it('refuses a replying chat, stopping nothing, when the client left consent to the host', async () => {
   await foundRestTestChat(rig)
-  rig.adapter.acquire.mock.calls
-    .at(-1)![0]
-    .events.appendItem(
-      { provider: 'codex', threadId: REST_TEST_THREAD, turnId: 'turn', ordinal: 50 },
-      { kind: 'turn', turnId: 'turn', state: 'running' },
-      { turnScope: AGENT_JOURNAL_THREAD_SCOPE }
-    )
+  providerEvents().appendItem(
+    { provider: 'codex', threadId: REST_TEST_THREAD, turnId: 'turn', ordinal: 50 },
+    { kind: 'turn', turnId: 'turn', state: 'running' },
+    { turnScope: AGENT_JOURNAL_THREAD_SCOPE }
+  )
   await rig.host.flushStreamedEvents(id)
   const cancel = vi.spyOn(rig.host, 'cancel')
   await expect(rig.host.stopForSwitch(id, caller, deadline, false)).rejects.toMatchObject({
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-open-turn.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-open-turn.test.ts
index bb18048d56d0..37fa57e36f0f 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-open-turn.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-open-turn.test.ts
@@ -54,7 +54,8 @@ async function openCliTurn() {
   await mkdir(join(codexHome, 'sessions'), { recursive: true })
   const filePath = join(codexHome, 'sessions', 'switch-source.jsonl')
   const nativeId = head.handle.nativeId
-  const at = Date.now() + 60_000
+  // After the chat's import, which is stamped at the run's real time.
+  const at = Date.parse('2999-01-01T00:00:00Z')
   await writeFile(
     filePath,
     `${[
diff --git a/src/main/runtime/session-tabs/switch-slot-anchors.ts b/src/main/runtime/session-tabs/switch-slot-anchors.ts
index 0cf1d13b1add..b162c4dfa4a3 100644
--- a/src/main/runtime/session-tabs/switch-slot-anchors.ts
+++ b/src/main/runtime/session-tabs/switch-slot-anchors.ts
@@ -50,10 +50,10 @@ export class SwitchSlotAnchors {
     return {
       ...snapshot,
       tabs: snapshot.tabs.map((row) => {
-        const entry =
-          row.type === 'terminal' || row.type === 'agent-session'
-            ? entries.get(tabBarId(row))
-            : undefined
+        if (row.type !== 'terminal' && row.type !== 'agent-session') {
+          return row
+        }
+        const entry = entries.get(tabBarId(row))
         return entry && !row.replaces && !row.after ? { ...row, ...entry.anchor } : row
       })
     }

From 78b625716fb9aa445c5577447a250d072802fe24 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 00:15:56 -0700
Subject: [PATCH 158/207] Type the boundary test's rollout rows with a named
 event shape

---
 .../structured-agent-session-switch-turn-boundary.test.ts     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-turn-boundary.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-turn-boundary.test.ts
index 458a61779cb8..142a7a5ab923 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-turn-boundary.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-turn-boundary.test.ts
@@ -5,7 +5,9 @@ import { afterEach, beforeEach, expect, it } from 'vitest'
 import { armSwitchTurnBoundaryWait } from './structured-agent-session-switch-turn-boundary'
 
 const TURN = 'stopped-turn'
-const row = (payload: object) => `${JSON.stringify({ type: 'event_msg', payload })}\n`
+/** One Codex rollout event, as the agent appends it. */
+type CodexEventPayload = { type: string; turn_id?: string; message?: string }
+const row = (payload: CodexEventPayload) => `${JSON.stringify({ type: 'event_msg', payload })}\n`
 let root: string
 let filePath: string
 let controller: AbortController

From 529156e9d64f713605d1b39fda5608310e2cca5a Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 00:18:42 -0700
Subject: [PATCH 159/207] Ask before a switch only while the chat is replying;
 a paused queue still gets its Stop

---
 .../structured-agent-session-switch-source.ts |  8 +++--
 .../structured-worker-switch-stop.test.ts     | 32 +++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts
index 8a77cad71263..063fbd4337e4 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts
@@ -77,12 +77,14 @@ export function structuredAgentSessionSwitchSource(context: SwitchSourceContext)
       // no-op, so no Stop note is written); the process stop below still ends the agent with proof.
       // The held session's work, the conversation just opened; none held reads as possibly working.
       const work = context.currentWork(sessionId)
+      const replying = work?.working() === true
       const stops =
         work == null ||
-        work.working() ||
+        replying ||
         conversation.journal.submissions().some(isQueuedAgentJournalSubmission)
-      // Before any effect; later sends are fenced by the admitted-send count above.
-      if (consented === false && stops) {
+      // Consent is asked only while a turn runs: queued sends still get the Stop that fences them,
+      // without a dialog. Before any effect; later sends are fenced by the admitted-send count above.
+      if (consented === false && replying) {
         throw agentSessionRefusalError('agent_session_operation_invalid', { reason: 'turnActive' })
       }
       let settleWorker: ((proven: boolean) => void) | undefined
diff --git a/src/main/runtime/orchestration/structured-worker-switch-stop.test.ts b/src/main/runtime/orchestration/structured-worker-switch-stop.test.ts
index 3a691cc595a7..e369f6f64e3f 100644
--- a/src/main/runtime/orchestration/structured-worker-switch-stop.test.ts
+++ b/src/main/runtime/orchestration/structured-worker-switch-stop.test.ts
@@ -143,3 +143,35 @@ it('refuses a replying chat, stopping nothing, when the client left consent to t
   expect(cancel).not.toHaveBeenCalled()
   expect(rig.adapter.closeSession).not.toHaveBeenCalled()
 })
+
+it('stops a paused queue without asking, since nothing is replying', async () => {
+  await foundRestTestChat(rig)
+  const events = providerEvents()
+  for (const state of ['running', 'completed'] as const) {
+    events.appendItem(
+      { provider: 'codex', threadId: REST_TEST_THREAD, turnId: 'turn', ordinal: 50 },
+      { kind: 'turn', turnId: 'turn', state },
+      { turnScope: AGENT_JOURNAL_THREAD_SCOPE }
+    )
+  }
+  await rig.host.flushStreamedEvents(id)
+  const { journal } = await rig.host.collaboratorsForTests().lifetime.conversation(id)
+  vi.spyOn(journal, 'submissions').mockReturnValue([
+    {
+      clientMessageId: 'queued',
+      fence: 1,
+      payloadFingerprint: 'queued',
+      dispatchState: 'pending',
+      providerItemId: null,
+      reason: null,
+      submittedAt: 1,
+      resolvedAt: null,
+      handoverRecorded: true
+    }
+  ])
+  // Queued before this host opened the conversation: held paused, not handed over.
+  vi.spyOn(journal, 'wroteBeforeOpen').mockReturnValue(true)
+  const cancel = vi.spyOn(rig.host, 'cancel').mockResolvedValue({ ok: true, value: {} })
+  await rig.host.stopForSwitch(id, caller, deadline, false)
+  expect(cancel).toHaveBeenCalledTimes(1)
+})

From ccc46c33abcbbb6011a5a1c3ed10f1be73ffe29b Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 00:20:05 -0700
Subject: [PATCH 160/207] Refuse an unconsented switch of a replying terminal
 agent before reading its transcript

---
 ...ructured-agent-session-switch-execution.ts |   7 +-
 ...red-agent-session-switch-open-turn.test.ts | 123 +++++++++---------
 ...ured-agent-session-switch-terminal-stop.ts |  22 +++-
 3 files changed, 85 insertions(+), 67 deletions(-)

diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
index f0bd3eecce07..8b0cdde8e600 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
@@ -27,7 +27,10 @@ import {
 } from './structured-agent-session-switch-source'
 import { executeStructuredSessionTerminalSwitch } from './structured-agent-session-switch-terminal-execution'
 import { agentLaunchMovesHostWindow } from './agent-launch-tab-publication'
-import { stopStructuredSwitchTerminalSource } from './structured-agent-session-switch-terminal-stop'
+import {
+  requireTerminalSwitchConsent,
+  stopStructuredSwitchTerminalSource
+} from './structured-agent-session-switch-terminal-stop'
 import { agentSessionLeasePossiblyWriting } from '../../../../shared/agent-session-lease-adjudication'
 import { mainAgentState } from '../../../../shared/main-agent-status'
 import { captureSwitchStoppedCliTurn } from '../../../native-chat/agent-session-wire/structured-agent-session-switch-import'
@@ -149,6 +152,8 @@ async function switchToChat(
     : undefined
   const paneKey = close ? `${close.source.tabId}:${close.source.leafId}` : undefined
   const row = paneKey ? ctx.runtime.agentTransitions.latestRow(paneKey) : null
+  // A replying agent without consent is refused before the transcript is read; the stop re-checks.
+  requireTerminalSwitchConsent(row, execution.consented)
   const adopt = createIdentity?.adopt
   const retainedSource =
     !adopt && source
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-open-turn.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-open-turn.test.ts
index 37fa57e36f0f..80a2f40f5a88 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-open-turn.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-open-turn.test.ts
@@ -158,63 +158,68 @@ it('settles a CLI turn left open once no writer is left, after the census', asyn
   expect(turns[0]).not.toHaveProperty('outcome')
 })
 
-it('refuses, stopping nothing, when the terminal agent starts replying while the switch prepares', async () => {
-  await openCliTurn()
-  const { runtime } = setupMainOwnedWorkspace()
-  const incarnationId = '11111111-1111-4111-8111-111111111111'
-  runtime.registerPty(PTY_A, WORKTREE_ID, null, { tabId: TAB_ID, leafId: LEAF_A, incarnationId })
-  const source = runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_A}`, WORKTREE_ID)
-  if (!source.presentation) {
-    throw new Error('missing captured source')
-  }
-  const written = vi.fn(() => true)
-  const stopped = vi.fn(async () => true)
-  runtime.setPtyController({
-    write: written,
-    kill: () => false,
-    stopAndWait: stopped,
-    getForegroundProcess: async () => 'codex'
-  })
-  // Idle when the request arrives; replying by the time the stop would be admitted.
-  let replying = false
-  vi.spyOn(runtime.agentTransitions, 'latestRow').mockImplementation((paneKey) =>
-    replying
-      ? {
-          state: 'working',
-          prompt: '',
-          paneKey,
-          connectionId: null,
-          receivedAt: 0,
-          stateStartedAt: 0
-        }
-      : null
-  )
-  const prepare = vi.mocked(cliTranscript.prepareStructuredChatCliTranscript)
-  const readable = prepare.getMockImplementation()!
-  prepare.mockImplementation(async (...args) => {
-    replying = true
-    return readable(...args)
-  })
-  const answer = await executeStructuredSessionSwitch(
-    {
-      sessionId: id,
-      execution: {
-        invocationId: 'consent-left-to-host',
-        consented: false,
-        source: {
-          terminal: source.handle,
-          expectedIncarnationId: incarnationId,
-          originalPresentation: source.presentation
+it.each([false, true])(
+  'refuses a replying terminal agent without consent, stopping nothing (replying from the start=%s)',
+  async (fromStart) => {
+    await openCliTurn()
+    const { runtime } = setupMainOwnedWorkspace()
+    const incarnationId = '11111111-1111-4111-8111-111111111111'
+    runtime.registerPty(PTY_A, WORKTREE_ID, null, { tabId: TAB_ID, leafId: LEAF_A, incarnationId })
+    const source = runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_A}`, WORKTREE_ID)
+    if (!source.presentation) {
+      throw new Error('missing captured source')
+    }
+    const written = vi.fn(() => true)
+    const stopped = vi.fn(async () => true)
+    runtime.setPtyController({
+      write: written,
+      kill: () => false,
+      stopAndWait: stopped,
+      getForegroundProcess: async () => 'codex'
+    })
+    // Idle when the request arrives, replying by the time the stop would be admitted; or replying
+    // already, refused before the transcript is read.
+    let replying = fromStart
+    vi.spyOn(runtime.agentTransitions, 'latestRow').mockImplementation((paneKey) =>
+      replying
+        ? {
+            state: 'working',
+            prompt: '',
+            paneKey,
+            connectionId: null,
+            receivedAt: 0,
+            stateStartedAt: 0
+          }
+        : null
+    )
+    const prepare = vi.mocked(cliTranscript.prepareStructuredChatCliTranscript)
+    const readable = prepare.getMockImplementation()!
+    prepare.mockImplementation(async (...args) => {
+      replying = true
+      return readable(...args)
+    })
+    const answer = await executeStructuredSessionSwitch(
+      {
+        sessionId: id,
+        execution: {
+          invocationId: 'consent-left-to-host',
+          consented: false,
+          source: {
+            terminal: source.handle,
+            expectedIncarnationId: incarnationId,
+            originalPresentation: source.presentation
+          }
         }
-      }
-    },
-    { runtime },
-    'chat'
-  )
-  expect(answer).toMatchObject({
-    status: 'refused',
-    refusal: { code: 'agent_session_operation_invalid', details: { reason: 'turnActive' } }
-  })
-  expect(written).not.toHaveBeenCalled()
-  expect(stopped).not.toHaveBeenCalled()
-})
+      },
+      { runtime },
+      'chat'
+    )
+    expect(answer).toMatchObject({
+      status: 'refused',
+      refusal: { code: 'agent_session_operation_invalid', details: { reason: 'turnActive' } }
+    })
+    expect(written).not.toHaveBeenCalled()
+    expect(stopped).not.toHaveBeenCalled()
+    expect(prepare).toHaveBeenCalledTimes(fromStart ? 0 : 1)
+  }
+)
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-stop.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-stop.ts
index e4ed5871b6c9..1aaef0c5dc24 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-stop.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-stop.ts
@@ -13,6 +13,16 @@ import { mainAgentState } from '../../../../shared/main-agent-status'
 import type { AiVaultAgent } from '../../../../shared/ai-vault-types'
 import type { captureStructuredSwitchTerminalSource } from './structured-agent-session-switch-source'
 
+/** False consent: the client left it to this host, so a replying terminal agent is refused. */
+export function requireTerminalSwitchConsent(
+  row: ReturnType<RpcContext['runtime']['agentTransitions']['latestRow']>,
+  consented: boolean | undefined
+): void {
+  if (consented === false && row && mainAgentState(row) === 'working') {
+    throw agentSessionRefusalError('agent_session_operation_invalid', { reason: 'turnActive' })
+  }
+}
+
 /**
  * A terminal source's stop: Escape a replying agent, let it record its own end of that turn
  * (bounded), then stop the exact process with exit proof. Nothing here waits on the transcript to
@@ -36,13 +46,11 @@ export async function stopStructuredSwitchTerminalSource(input: {
   const { ctx, host, sessionId, close, deadline } = input
   // Checked where the stop is admitted (before the Escape, at its write, and before the exit), so
   // a turn the user started while the switch prepared is never stopped without their yes.
-  const requireConsent = (): void => {
-    const row =
-      input.consented === false ? ctx.runtime.agentTransitions.latestRow(input.paneKey) : null
-    if (row && mainAgentState(row) === 'working') {
-      throw agentSessionRefusalError('agent_session_operation_invalid', { reason: 'turnActive' })
-    }
-  }
+  const requireConsent = (): void =>
+    requireTerminalSwitchConsent(
+      input.consented === false ? ctx.runtime.agentTransitions.latestRow(input.paneKey) : null,
+      input.consented
+    )
   requireConsent()
   const awaitBoundary = input.boundary
     ? await armSwitchTurnBoundaryWait(

From 53083af2e8cf4a94c930270b4dbb934f6ac83e74 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 00:22:17 -0700
Subject: [PATCH 161/207] Answer a switch whose terminal reveal timed out with
 "couldn't confirm", not "try again"

---
 ...ructured-agent-session-switch-execution.test.ts | 14 ++++++++++++--
 .../structured-agent-session-switch-failure.ts     |  5 ++++-
 .../session-tabs/terminal-not-placed-error.ts      |  3 +++
 src/main/window/runtime-window-lifecycle.ts        |  7 +++++--
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
index 6c1ba8fcaa3c..9db2a21e2805 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
@@ -24,7 +24,10 @@ import {
   LEAF_B
 } from '../../main-owned-workspace-runtime-fixture'
 import { executeStructuredSessionSwitch } from './structured-agent-session-switch-execution'
-import { TerminalNotPlacedError } from '../../session-tabs/terminal-not-placed-error'
+import {
+  TerminalNotPlacedError,
+  TerminalRevealUnconfirmedError
+} from '../../session-tabs/terminal-not-placed-error'
 import type { AiVaultPrepareSessionResumeResult } from '../../../../shared/ai-vault-resume-preparation'
 import { refusedMobileSessionTabClose } from '../../mobile-session-tab-close-outcome'
 import { AGENT_SESSION_SWITCH_HOST_MS } from '../../../../shared/agent-session-switch-execution'
@@ -499,7 +502,7 @@ it.each([
     vi.spyOn(runtime, 'hasTerminalViewer').mockReturnValue(shape === 'viewed')
     vi.spyOn(runtime, 'placeSwitchTerminal').mockRejectedValue(
       shape === 'timed-out'
-        ? new Error('Terminal reveal timed out')
+        ? new TerminalRevealUnconfirmedError('Terminal reveal timed out')
         : new TerminalNotPlacedError('terminal_handle_stale')
     )
     const result = await executeStructuredSessionSwitch(
@@ -508,6 +511,13 @@ it.each([
       'terminal'
     )
     expect(result.status).not.toBe('completed')
+    if (shape === 'timed-out') {
+      // It may be on screen already, so the answer is "couldn't confirm", not "try again".
+      expect(result).toMatchObject({
+        status: 'uncertain',
+        refusal: { details: { reason: 'outcomeUnknown' } }
+      })
+    }
     expect(killFenced).toHaveBeenCalledTimes(discards)
     if (discards) {
       expect(killFenced).toHaveBeenCalledWith({
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-failure.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-failure.ts
index e746fdc5c2d8..1a3829c89a53 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-failure.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-failure.ts
@@ -1,5 +1,6 @@
 import { DaemonConnectionLostError, DaemonRequestTimeoutError } from '../../../daemon/daemon-errors'
 import { isAgentSessionOperationOutcomeUnknown } from '../../runtime-agent-launch-resolution'
+import { TerminalRevealUnconfirmedError } from '../../session-tabs/terminal-not-placed-error'
 import type { AgentSessionSwitchResult } from '../../../../shared/agent-session-switch-execution'
 import {
   agentSessionRefusalError,
@@ -14,7 +15,9 @@ export function structuredSessionSwitchFailure(
     ? error.refusal
     : isAgentSessionOperationOutcomeUnknown(error) ||
         error instanceof DaemonConnectionLostError ||
-        error instanceof DaemonRequestTimeoutError
+        error instanceof DaemonRequestTimeoutError ||
+        // The terminal may already be in the chat's slot: the user is told to check the open tab.
+        error instanceof TerminalRevealUnconfirmedError
       ? agentSessionRefusalError('agent_session_operation_unknown', { reason: 'outcomeUnknown' })
           .refusal
       : refuseUnclassified(
diff --git a/src/main/runtime/session-tabs/terminal-not-placed-error.ts b/src/main/runtime/session-tabs/terminal-not-placed-error.ts
index fdae1593ece2..f7c98b5d0e3a 100644
--- a/src/main/runtime/session-tabs/terminal-not-placed-error.ts
+++ b/src/main/runtime/session-tabs/terminal-not-placed-error.ts
@@ -3,3 +3,6 @@
  * Only this failure proves no tab will show the terminal; a timeout or a lost answer does not.
  */
 export class TerminalNotPlacedError extends Error {}
+
+/** The window didn't answer the reveal in time: the terminal may be on screen, or may not. */
+export class TerminalRevealUnconfirmedError extends Error {}
diff --git a/src/main/window/runtime-window-lifecycle.ts b/src/main/window/runtime-window-lifecycle.ts
index 002f106e5a42..493b0488d1c0 100644
--- a/src/main/window/runtime-window-lifecycle.ts
+++ b/src/main/window/runtime-window-lifecycle.ts
@@ -9,7 +9,10 @@ import type { TerminalTabCreateReply } from '../../shared/terminal-reveal-identi
 import { runWorktreeChangeInvalidators } from '../ipc/worktree-change-invalidators'
 import { requestAgentLaunchTabPublishFromRenderer } from './agent-launch-tab-publish-relay'
 import type { OrcaRuntimeService } from '../runtime/orca-runtime'
-import { TerminalNotPlacedError } from '../runtime/session-tabs/terminal-not-placed-error'
+import {
+  TerminalNotPlacedError,
+  TerminalRevealUnconfirmedError
+} from '../runtime/session-tabs/terminal-not-placed-error'
 import { registerRendererDocumentNavigation } from './renderer-document-navigation'
 import { createRuntimeRendererNotificationSender } from './runtime-renderer-notification-sender'
 import { requestSessionTabCloseFromRenderer } from './session-tab-close-request-relay'
@@ -87,7 +90,7 @@ export function registerRuntimeWindowLifecycle(
         }
         const timer = setTimeout(() => {
           ipcMain.removeListener('terminal:tabCreateReply', handler)
-          reject(new Error('Terminal reveal timed out'))
+          reject(new TerminalRevealUnconfirmedError('Terminal reveal timed out'))
         }, 10_000)
         const handler = (event: Electron.IpcMainEvent, reply: TerminalTabCreateReply): void => {
           // Renderer-supplied request IDs confer no authority; only this window can satisfy reveal.

From 7adf68de3003d57416aa570d9b68f07ac4271a3a Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 00:25:14 -0700
Subject: [PATCH 162/207] Never say a conversation with saved turns hasn't been
 saved: a CLI that took a prompt, or a chat with saved turns, reads as
 unreadable history

---
 .../structured-agent-cli-source.ts            | 13 ++++-
 ...red-agent-session-source-admission.test.ts | 47 +++++++++++++++++++
 ...ructured-agent-session-switch-execution.ts |  2 +-
 ...tructured-agent-session-create-adoption.ts |  5 +-
 4 files changed, 63 insertions(+), 4 deletions(-)

diff --git a/src/main/native-chat/structured-agent-cli-source.ts b/src/main/native-chat/structured-agent-cli-source.ts
index 900fdc214a6a..38c6df9fc346 100644
--- a/src/main/native-chat/structured-agent-cli-source.ts
+++ b/src/main/native-chat/structured-agent-cli-source.ts
@@ -15,7 +15,12 @@ type CliSource = NonNullable<StructuredAgentSessionResumeSource['cliSource']>
 export type StructuredAgentCliSourceRoute = 'native-local' | 'unsupported' | 'unknown'
 export type StructuredAgentCliSourceLocator =
   | { kind: 'none' }
-  | { kind: 'matched'; transcriptPath?: string }
+  | {
+      kind: 'matched'
+      transcriptPath?: string
+      /** The CLI took a prompt, so it saved this conversation: a transcript gone now is unreadable. */
+      conversed?: true
+    }
   | { kind: 'absent' }
 
 export type StructuredAgentCliSourceEvidence = (
@@ -149,5 +154,9 @@ function resolveSource(input: {
       reason: 'hostUnsupported'
     })
   }
-  return { kind: 'matched', ...(path ? { transcriptPath: path } : {}) }
+  return {
+    kind: 'matched',
+    ...(path ? { transcriptPath: path } : {}),
+    ...(row.prompt.trim() ? { conversed: true as const } : {})
+  }
 }
diff --git a/src/main/native-chat/structured-agent-session-source-admission.test.ts b/src/main/native-chat/structured-agent-session-source-admission.test.ts
index ace61d29ec28..aab28dc3bdd2 100644
--- a/src/main/native-chat/structured-agent-session-source-admission.test.ts
+++ b/src/main/native-chat/structured-agent-session-source-admission.test.ts
@@ -254,6 +254,53 @@ it('creates from the host hook path when Claude filename differs, then checks ac
   expect(find).not.toHaveBeenCalled()
 })
 
+it.each([true, false])(
+  'a CLI whose transcript is gone reads as unreadable once it took a prompt=%s, never "not saved"',
+  async (conversed) => {
+    await expect(
+      resolveStructuredAgentSessionAdoptionForCreate({
+        settings: {},
+        agent: 'claude',
+        transcriptImport: CLAUDE_CLI_CONVERSATIONS.transcriptImport!,
+        providerSessionId: id,
+        selectedAccountHome: { variable: 'CLAUDE_CONFIG_DIR', path: root },
+        launchEnv: {},
+        workspaceCwd: root,
+        resolveTranscriptSource: () =>
+          structuredAgentCliSourceFromEvidence({
+            agent: 'claude',
+            workspaceId: 'folder',
+            resumeFrom: {
+              providerSessionId: id,
+              cliSource: { workspaceId: 'folder', paneKey: 'tab:leaf' }
+            },
+            evidence: {
+              rows: [
+                {
+                  paneKey: 'tab:leaf',
+                  worktreeId: 'folder',
+                  agentType: 'claude',
+                  state: 'done',
+                  prompt: conversed ? 'Fix the build' : '',
+                  connectionId: null,
+                  receivedAt: 1,
+                  stateStartedAt: 1,
+                  providerSession: {
+                    key: 'session_id',
+                    id,
+                    transcriptPath: join(root, 'projects', 'folder', `${id}.jsonl`)
+                  }
+                }
+              ]
+            }
+          })
+      })
+    ).rejects.toMatchObject({
+      refusal: { details: { reason: conversed ? 'transcriptUnreadable' : 'transcriptNotFound' } }
+    })
+  }
+)
+
 it('imports early and late Claude history with an absent locator and captured native source', async () => {
   const transcriptPath = await file(join(root, 'projects', 'folder', `${id}.jsonl`), [
     {
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
index 8b0cdde8e600..9b57d7f3c0c0 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
@@ -161,7 +161,7 @@ async function switchToChat(
           ctx.runtime,
           sessionId,
           recordWorkspace(host, sessionId),
-          false
+          nativeConversationContent(await host.journalSnapshot(sessionId)) === 'saved'
         )
       : undefined
   const before = adopt?.transcriptPath
diff --git a/src/main/runtime/structured-agent-session-create-adoption.ts b/src/main/runtime/structured-agent-session-create-adoption.ts
index bf7b01c101d4..14d64dde8c4c 100644
--- a/src/main/runtime/structured-agent-session-create-adoption.ts
+++ b/src/main/runtime/structured-agent-session-create-adoption.ts
@@ -149,7 +149,10 @@ export async function resolveStructuredAgentSessionAdoptionForCreate(input: {
     }
     const adoption = await resolveStructuredAgentSessionAdoption({
       providerSessionId: input.providerSessionId,
-      ...(source?.kind === 'absent' ? { exhaustionReason: 'transcriptUnreadable' as const } : {}),
+      // A source that proves the CLI saved this conversation never reads as "not saved yet".
+      ...(source?.kind === 'absent' || (source?.kind === 'matched' && source.conversed)
+        ? { exhaustionReason: 'transcriptUnreadable' as const }
+        : {}),
       candidateAccountHomes: admitted ? [admitted.accountHome] : candidates,
       resolveTranscript: async (args) => {
         const exact = admitted?.path

From e64095d921aa2f9b5d90e8138cb9c8a9e5f12e06 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 00:26:48 -0700
Subject: [PATCH 163/207] Keep a first attempt's slot anchor through a retry,
 and stamp anchors in one pass that costs nothing without one

---
 .../session-tabs/switch-slot-anchors.test.ts  | 40 +++++++++++
 .../session-tabs/switch-slot-anchors.ts       | 67 ++++++++++++++-----
 .../session-tabs/switch-terminal-placement.ts |  7 +-
 3 files changed, 94 insertions(+), 20 deletions(-)

diff --git a/src/main/runtime/session-tabs/switch-slot-anchors.test.ts b/src/main/runtime/session-tabs/switch-slot-anchors.test.ts
index fcf605de9ff3..64354fd296e9 100644
--- a/src/main/runtime/session-tabs/switch-slot-anchors.test.ts
+++ b/src/main/runtime/session-tabs/switch-slot-anchors.test.ts
@@ -42,3 +42,43 @@ it('drops an anchor whose switch never placed its destination', () => {
   anchors.stamp(frame([]))
   expect(anchors.stamp(frame(['never-placed'])).tabs[0]).not.toHaveProperty('after')
 })
+
+it('keeps the anchor a first attempt left when a retry after a lost answer places nothing', () => {
+  const anchors = new SwitchSlotAnchors()
+  const slot = { replaces: { tabId: 'agent-session:chat' } }
+  expect(anchors.record('ws', 'switched', slot)).toBe(true)
+  anchors.stamp(frame(['switched']))
+  // The retry names the same slot; its layout owner reports nothing closed.
+  expect(anchors.record('ws', 'switched', slot)).toBe(false)
+  anchors.forget('ws', 'switched')
+  expect(anchors.stamp(frame(['switched'])).tabs[0]).toMatchObject(slot)
+})
+
+it.each([100, 1_000])('stamps %i rows in one pass, and touches none without an anchor', (n) => {
+  const ids = Array.from({ length: n }, (_, index) => `tab-${index}`)
+  let reads = 0
+  const counted = (snapshot: RuntimeMobileSessionTabsSnapshot) => ({
+    ...snapshot,
+    tabs: new Proxy(snapshot.tabs, {
+      get(target, key, receiver) {
+        if (typeof key === 'string' && /^\d+$/.test(key)) {
+          reads += 1
+        }
+        return Reflect.get(target, key, receiver)
+      }
+    })
+  })
+  const anchors = new SwitchSlotAnchors()
+  anchors.record('elsewhere', 'switched', { after: { tabId: 'source' } })
+  const plain = counted(frame(ids))
+  expect(anchors.stamp(plain)).toBe(plain)
+  expect(reads).toBe(0)
+  anchors.record('ws', 'tab-7', { after: { tabId: 'source' } })
+  const source = frame(ids)
+  const stamped = anchors.stamp(counted(source))
+  expect(reads).toBeLessThanOrEqual(2 * n)
+  // Only the destination's row is new.
+  expect(stamped.tabs.filter((row, index) => row !== source.tabs[index])).toEqual([
+    { ...source.tabs[7], after: { tabId: 'source' } }
+  ])
+})
diff --git a/src/main/runtime/session-tabs/switch-slot-anchors.ts b/src/main/runtime/session-tabs/switch-slot-anchors.ts
index b162c4dfa4a3..f9dda6d6d390 100644
--- a/src/main/runtime/session-tabs/switch-slot-anchors.ts
+++ b/src/main/runtime/session-tabs/switch-slot-anchors.ts
@@ -20,42 +20,73 @@ export class SwitchSlotAnchors {
 
   constructor(private readonly now: () => number = Date.now) {}
 
-  record(workspaceId: string, destinationTabId: string, anchor: SlotAnchor): void {
+  /** False when the same slot is already recorded for this destination: a retry after a lost
+   *  answer keeps the entry its first attempt left, so it can't withdraw an anchor already shown. */
+  record(workspaceId: string, destinationTabId: string, anchor: SlotAnchor): boolean {
     const entries = this.byWorkspace.get(workspaceId) ?? new Map<string, Entry>()
-    entries.set(destinationTabId, { anchor, seen: false, recordedAt: this.now() })
     this.byWorkspace.set(workspaceId, entries)
+    const existing = entries.get(destinationTabId)
+    if (existing && sameSlot(existing.anchor, anchor)) {
+      if (!existing.seen) {
+        existing.recordedAt = this.now()
+      }
+      return false
+    }
+    entries.set(destinationTabId, { anchor, seen: false, recordedAt: this.now() })
+    return true
   }
 
+  /** Withdraws an anchor whose destination no frame has shown. */
   forget(workspaceId: string, destinationTabId: string): void {
-    this.byWorkspace.get(workspaceId)?.delete(destinationTabId)
+    const entries = this.byWorkspace.get(workspaceId)
+    if (entries?.get(destinationTabId)?.seen === false) {
+      entries.delete(destinationTabId)
+    }
   }
 
+  /** One pass over the frame's rows, and a new rows array only when a row gains its anchor;
+   *  a workspace with no anchor costs nothing. */
   stamp(snapshot: RuntimeMobileSessionTabsSnapshot): RuntimeMobileSessionTabsSnapshot {
     const entries = this.byWorkspace.get(snapshot.worktree)
     if (!entries) {
       return snapshot
     }
-    const present = new Set(snapshot.tabs.map(tabBarId))
+    const present = new Set<string>()
+    let tabs: Row[] | undefined
+    snapshot.tabs.forEach((row, index) => {
+      const id = tabBarId(row)
+      const entry = entries.get(id)
+      if (!entry) {
+        return
+      }
+      present.add(id)
+      entry.seen = true
+      if (
+        (row.type === 'terminal' || row.type === 'agent-session') &&
+        !row.replaces &&
+        !row.after
+      ) {
+        tabs ??= [...snapshot.tabs]
+        tabs[index] = { ...row, ...entry.anchor }
+      }
+    })
     for (const [id, entry] of entries) {
-      if (present.has(id)) {
-        entry.seen = true
-      } else if (entry.seen || this.now() - entry.recordedAt > AGENT_SESSION_SWITCH_HOST_MS) {
+      if (
+        !present.has(id) &&
+        (entry.seen || this.now() - entry.recordedAt > AGENT_SESSION_SWITCH_HOST_MS)
+      ) {
         entries.delete(id)
       }
     }
     if (entries.size === 0) {
       this.byWorkspace.delete(snapshot.worktree)
-      return snapshot
-    }
-    return {
-      ...snapshot,
-      tabs: snapshot.tabs.map((row) => {
-        if (row.type !== 'terminal' && row.type !== 'agent-session') {
-          return row
-        }
-        const entry = entries.get(tabBarId(row))
-        return entry && !row.replaces && !row.after ? { ...row, ...entry.anchor } : row
-      })
     }
+    return tabs ? { ...snapshot, tabs } : snapshot
   }
 }
+
+function sameSlot(a: SlotAnchor, b: SlotAnchor): boolean {
+  return 'replaces' in a
+    ? 'replaces' in b && a.replaces.tabId === b.replaces.tabId
+    : 'after' in b && a.after.tabId === b.after.tabId
+}
diff --git a/src/main/runtime/session-tabs/switch-terminal-placement.ts b/src/main/runtime/session-tabs/switch-terminal-placement.ts
index 576aad8b5f6a..46de3f6d8c4a 100644
--- a/src/main/runtime/session-tabs/switch-terminal-placement.ts
+++ b/src/main/runtime/session-tabs/switch-terminal-placement.ts
@@ -41,7 +41,9 @@ export abstract class OrcaRuntimeWithSwitchTerminalPlacement extends OrcaRuntime
     const layoutTabId = chatTabId(args.chatSessionId)
     const snapshotTabId = `agent-session:${args.chatSessionId}`
     // Before the layout write: a window frame can name the terminal before main's own write does.
-    this.switchSlotAnchors.record(workspaceId, tabId, { replaces: { tabId: snapshotTabId } })
+    const recorded = this.switchSlotAnchors.record(workspaceId, tabId, {
+      replaces: { tabId: snapshotTabId }
+    })
     // Whether the chat left is the layout owner's answer, never assumed.
     let replaced: boolean
     const windowOwnsLayout = !ORCA_LAYOUT_OWNER_IS_MAIN && this.getAvailableAuthoritativeWindow()
@@ -85,7 +87,8 @@ export abstract class OrcaRuntimeWithSwitchTerminalPlacement extends OrcaRuntime
       }
       replaced = reply.result.closed?.includes(layoutTabId) === true
     }
-    if (!replaced) {
+    // A retry finds the chat already gone (its first attempt replaced it); that anchor stays.
+    if (!replaced && recorded) {
       this.switchSlotAnchors.forget(workspaceId, tabId)
     }
     this.publishPtyBackedMobileSessionTerminal(workspaceId, pty, {

From 65478a7785feffc856727eee5023e08104945267 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 00:27:53 -0700
Subject: [PATCH 164/207] Keep a switched chat's client pin from the tab it
 replaced on every frame, as a switched terminal does

---
 .../replaced-slot-placement.test.ts           | 20 +++++++++++++++++++
 .../terminal-surfaces.ts                      |  4 +++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/renderer/src/runtime/web-session-tabs-sync/replaced-slot-placement.test.ts b/src/renderer/src/runtime/web-session-tabs-sync/replaced-slot-placement.test.ts
index 3b2b94ff6a98..7868de0a1cfd 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/replaced-slot-placement.test.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/replaced-slot-placement.test.ts
@@ -199,6 +199,26 @@ it.each([
   }
 )
 
+it('keeps the pin a chat took from the terminal it replaced on every later frame', () => {
+  const { state } = shownThree('host-a')
+  // The host pinned its terminal; this client never did.
+  const replacing = { ...chat, replaces: { tabId: 'host-a' }, isPinned: true }
+  const frame = (snapshotVersion: number) =>
+    makeSnapshot([replacing, terminal('host-b'), terminal('host-c')], {
+      snapshotVersion,
+      tabGroups: [
+        { id: 'host-group-1', activeTabId: null, tabOrder: [chat.id, 'host-b', 'host-c'] }
+      ]
+    })
+  const first = apply(state, frame(2))
+  const second = apply(first, frame(3))
+  for (const next of [first, second]) {
+    expect(
+      next.unifiedTabsByWorktree[WT]!.find((tab) => tab.entityId === 'session-1')?.isPinned
+    ).toBe(false)
+  }
+})
+
 it('places a destination in a split group this client is not looking at, without moving focus', () => {
   const { state, a, b, c } = shownThree('host-a')
   const [group] = state.groupsByWorktree[WT]!
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/terminal-surfaces.ts b/src/renderer/src/runtime/web-session-tabs-sync/terminal-surfaces.ts
index 6d38ffbdd1c8..e431263685c9 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/terminal-surfaces.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/terminal-surfaces.ts
@@ -156,8 +156,10 @@ export function buildMirroredAgentTabs(
         color: tab.color !== undefined ? tab.color : (existing?.color ?? null),
         sortOrder: sortOffset + index,
         createdAt: existing?.createdAt ?? now + sortOffset + index,
+        // A chat in a replaced tab's slot keeps the pin it took from that tab here for its life,
+        // as a terminal does; the host's flag on later frames never flips it.
         isPinned: existing
-          ? tab.isPinned !== undefined
+          ? tab.isPinned !== undefined && !tab.replaces
             ? tab.isPinned
             : existing.isPinned === true
           : (replacedTabPinned(currentUnifiedTabs, tab) ?? tab.isPinned === true)

From dbea5587f87351bdaa640753f27f05995b488c11 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 00:31:45 -0700
Subject: [PATCH 165/207] Move only the initiator's view to a chat opened
 beside a split pane; a replaced tab's slot still passes its selection in
 every view

---
 .../src/lib/conversation-surface-switch.ts    | 18 +++++-
 .../conversation-switch-focus-intent.test.ts  | 60 +++++++++++++++++++
 .../lib/conversation-switch-focus-intent.ts   | 44 ++++++++++++++
 .../web-session-client-owned-tab-placement.ts | 17 +++---
 .../src/runtime/web-session-focus-intent.ts   |  9 ++-
 .../apply-preparation-base.ts                 | 37 ++++++++----
 .../replaced-slot-placement.test.ts           | 23 +++++--
 7 files changed, 181 insertions(+), 27 deletions(-)
 create mode 100644 src/renderer/src/lib/conversation-switch-focus-intent.test.ts
 create mode 100644 src/renderer/src/lib/conversation-switch-focus-intent.ts

diff --git a/src/renderer/src/lib/conversation-surface-switch.ts b/src/renderer/src/lib/conversation-surface-switch.ts
index 46dddda471dd..ef2323ab9da4 100644
--- a/src/renderer/src/lib/conversation-surface-switch.ts
+++ b/src/renderer/src/lib/conversation-surface-switch.ts
@@ -35,6 +35,7 @@ import { structuredLaunchFailure } from './structured-agent-session-launch-failu
 import { prepareAiVaultSessionForResume } from './ai-vault-session-resume-preparation'
 import type { CliChatResumeSource } from '@/components/tab-bar/cli-chat-resume-source'
 import { runLegacyConversationSwitch } from './conversation-switch-legacy'
+import { recordConversationSwitchFocus } from './conversation-switch-focus-intent'
 import {
   type ConversationSwitch,
   keyFor,
@@ -161,6 +162,7 @@ export async function runConversationSwitch(args: ConversationSwitch): Promise<b
       }
       // The host stopped nothing. A yes is a new switch under its own invocation, never a replay.
       if (!(await confirmStop())) {
+        request.abandonFocus?.()
         return false
       }
       consent = true
@@ -171,6 +173,9 @@ export async function runConversationSwitch(args: ConversationSwitch): Promise<b
       }
     }
     if (answer.status !== 'completed') {
+      if (answer.status === 'refused') {
+        request?.abandonFocus?.()
+      }
       feedback(
         conversationSwitchFailureText(new AgentSessionRefusalError(answer.refusal), args),
         'error'
@@ -214,7 +219,11 @@ async function switchRequest(
   args: ConversationSwitch,
   hostId: ExecutionHostId,
   deadline: ReturnType<typeof agentSessionSwitchDeadline>
-): Promise<{ sessionId: string | undefined; execution: Record<string, unknown> }> {
+): Promise<{
+  sessionId: string | undefined
+  execution: Record<string, unknown>
+  abandonFocus?: () => void
+}> {
   const invocationId = createBrowserUuid()
   if (args.direction === 'chat' && args.source) {
     const captured = await deadline.wait(captureSourceTerminal(args.source))
@@ -239,6 +248,13 @@ async function switchRequest(
     )
     return {
       sessionId: intent.sessionId,
+      abandonFocus: recordConversationSwitchFocus({
+        target: captured.target,
+        workspaceId: args.workspaceId,
+        sourceTabId: args.source.tabId,
+        hostSourceTabId: captured.presentation?.identity.tabId,
+        chatSessionId: intent.sessionId
+      }),
       execution: {
         invocationId,
         create: intent.params,
diff --git a/src/renderer/src/lib/conversation-switch-focus-intent.test.ts b/src/renderer/src/lib/conversation-switch-focus-intent.test.ts
new file mode 100644
index 000000000000..884b62771f6f
--- /dev/null
+++ b/src/renderer/src/lib/conversation-switch-focus-intent.test.ts
@@ -0,0 +1,60 @@
+import { beforeEach, expect, it, vi } from 'vitest'
+import { recordConversationSwitchFocus } from './conversation-switch-focus-intent'
+import { structuredAgentSessionFocusOwner } from '@/runtime/structured-agent-session-owner'
+import {
+  peekWebSessionFocusIntent,
+  resetWebSessionFocusIntentForTests
+} from '@/runtime/web-session-focus-intent'
+
+const store = vi.hoisted(() => ({ activeTabId: 'local-source' }))
+vi.mock('@/store', () => ({
+  useAppStore: {
+    getState: () => ({
+      groupsByWorktree: {
+        ws: [{ id: 'group', activeTabId: store.activeTabId, tabOrder: ['local-source', 'other'] }]
+      },
+      activeGroupIdByWorktree: { ws: 'group' },
+      unifiedTabsByWorktree: {
+        ws: [
+          { id: 'local-source', groupId: 'group' },
+          { id: 'other', groupId: 'group' }
+        ]
+      }
+    })
+  }
+}))
+
+const remote = { kind: 'environment' as const, environmentId: 'env' }
+const record = (target: Parameters<typeof recordConversationSwitchFocus>[0]['target']) =>
+  recordConversationSwitchFocus({
+    target,
+    workspaceId: 'ws',
+    sourceTabId: 'local-source',
+    hostSourceTabId: 'host-source',
+    chatSessionId: 'chat'
+  })
+
+beforeEach(() => {
+  resetWebSessionFocusIntentForTests()
+  store.activeTabId = 'local-source'
+})
+
+it('lets only a paired client still on the source follow its switch, until a refusal withdraws it', () => {
+  const abandon = record(remote)
+  expect(peekWebSessionFocusIntent({ environmentId: 'env' }, 'ws')).toEqual({
+    hostTabId: 'agent-session:chat',
+    expectedCurrentLocalTabId: 'local-source',
+    afterHostTabId: 'host-source'
+  })
+  abandon()
+  expect(peekWebSessionFocusIntent({ environmentId: 'env' }, 'ws')).toBeNull()
+})
+
+it.each([
+  ['this host’s own window, which main focuses', { kind: 'local' as const }, 'local-source'],
+  ['a client looking at another tab', remote, 'other']
+] as const)('records nothing for %s', (_name, target, active) => {
+  store.activeTabId = active
+  record(target)
+  expect(peekWebSessionFocusIntent(structuredAgentSessionFocusOwner(target), 'ws')).toBeNull()
+})
diff --git a/src/renderer/src/lib/conversation-switch-focus-intent.ts b/src/renderer/src/lib/conversation-switch-focus-intent.ts
new file mode 100644
index 000000000000..6b8460a2aa7e
--- /dev/null
+++ b/src/renderer/src/lib/conversation-switch-focus-intent.ts
@@ -0,0 +1,44 @@
+import { useAppStore } from '@/store'
+import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
+import { structuredAgentSessionFocusOwner } from '@/runtime/structured-agent-session-owner'
+import {
+  clearWebSessionFocusIntentIfMatches,
+  recordWebSessionFocusIntent,
+  resolveWebSessionVisibleTabId
+} from '@/runtime/web-session-focus-intent'
+
+/**
+ * A paired client's switch of a terminal pane to chat: the chat lands where this client looks only
+ * if the source still holds its selection when the chat arrives. Recorded before the request, so
+ * a snapshot ahead of the answer, or a lost answer, still finds it; matched by the slot the host
+ * names, so a chat the host reused still lands. On this host's own window, main focuses instead.
+ * Returns how to withdraw it after a definite refusal.
+ */
+export function recordConversationSwitchFocus(args: {
+  target: RuntimeClientTarget
+  workspaceId: string
+  /** This client's id for the source tab, and the host's. */
+  sourceTabId: string
+  hostSourceTabId: string | undefined
+  chatSessionId: string
+}): () => void {
+  const state = useAppStore.getState()
+  if (
+    args.target.kind === 'local' ||
+    !args.hostSourceTabId ||
+    resolveWebSessionVisibleTabId(state, args.workspaceId) !== args.sourceTabId
+  ) {
+    return () => {}
+  }
+  const owner = structuredAgentSessionFocusOwner(args.target)
+  const hostTabId = `agent-session:${args.chatSessionId}`
+  recordWebSessionFocusIntent(
+    owner,
+    args.workspaceId,
+    hostTabId,
+    undefined,
+    args.sourceTabId,
+    args.hostSourceTabId
+  )
+  return () => clearWebSessionFocusIntentIfMatches(owner, args.workspaceId, hostTabId)
+}
diff --git a/src/renderer/src/runtime/web-session-client-owned-tab-placement.ts b/src/renderer/src/runtime/web-session-client-owned-tab-placement.ts
index 51be11c00b34..cfcfc32c0d0d 100644
--- a/src/renderer/src/runtime/web-session-client-owned-tab-placement.ts
+++ b/src/renderer/src/runtime/web-session-client-owned-tab-placement.ts
@@ -167,24 +167,27 @@ export function reconcileClientOwnedTabPlacement(
       target.tabOrder.push(move.tabId)
     }
   }
-  // A destination takes its group's selection only from its source, or from an empty group.
+  // A tab that replaced another takes its group's selection only from it, or from an empty
+  // group; one beside a split pane's surviving tab takes none (its initiator's intent may).
   const inheritedActive = new Map<string, string>()
   for (const adopted of input.adoptedTabs) {
     if (movedTabIds.has(adopted.tabId) || !input.validUnifiedTabIds.has(adopted.tabId)) {
       continue
     }
-    const anchorIds = adopted.anchor?.tabIds ?? []
-    const slot = [...working.values()].find((entry) =>
-      entry.group.tabOrder.some((id) => anchorIds.includes(id))
-    )
+    const anchor = adopted.anchor
+    const slot =
+      anchor &&
+      [...working.values()].find((entry) =>
+        entry.group.tabOrder.some((id) => anchor.tabIds.includes(id))
+      )
     if (slot && !slot.tabOrder.includes(adopted.tabId)) {
       // After the last tab still shown that stood at or before the anchor in this client's order.
-      const at = slot.group.tabOrder.findIndex((id) => anchorIds.includes(id))
+      const at = slot.group.tabOrder.findIndex((id) => anchor.tabIds.includes(id))
       const before = new Set(slot.group.tabOrder.slice(0, at + 1))
       const index = slot.tabOrder.reduce((last, id, i) => (before.has(id) ? i + 1 : last), 0)
       slot.tabOrder.splice(index, 0, adopted.tabId)
       const held = slot.group.activeTabId
-      if (held == null || anchorIds.includes(held)) {
+      if (!anchor.after && (held == null || anchor.tabIds.includes(held))) {
         inheritedActive.set(slot.group.id, adopted.tabId)
       }
       continue
diff --git a/src/renderer/src/runtime/web-session-focus-intent.ts b/src/renderer/src/runtime/web-session-focus-intent.ts
index 1c3518a8411b..ef04a0ead639 100644
--- a/src/renderer/src/runtime/web-session-focus-intent.ts
+++ b/src/renderer/src/runtime/web-session-focus-intent.ts
@@ -8,6 +8,9 @@ export type WebSessionFocusIntent = {
   hostTabId: string
   leafId?: string
   expectedCurrentLocalTabId?: string | null
+  /** Also matches a row this client hasn't shown that the host placed beside this tab: a split
+   *  pane's switch, whose host may answer with a chat other than the one this client named. */
+  afterHostTabId?: string
 }
 
 export const MAX_WEB_SESSION_FOCUS_INTENTS = 512
@@ -126,7 +129,8 @@ export function recordWebSessionFocusIntent(
   worktreeId: string,
   hostTabId: string,
   leafId?: string,
-  expectedCurrentLocalTabId?: string | null
+  expectedCurrentLocalTabId?: string | null,
+  afterHostTabId?: string
 ): void {
   const trimmed = hostTabId.trim()
   if (!worktreeId || !trimmed) {
@@ -138,7 +142,8 @@ export function recordWebSessionFocusIntent(
   pendingFocusByOwnerAndWorktree.set(key, {
     hostTabId: trimmed,
     ...(trimmedLeafId ? { leafId: trimmedLeafId } : {}),
-    ...(expectedCurrentLocalTabId !== undefined ? { expectedCurrentLocalTabId } : {})
+    ...(expectedCurrentLocalTabId !== undefined ? { expectedCurrentLocalTabId } : {}),
+    ...(afterHostTabId ? { afterHostTabId } : {})
   })
   while (pendingFocusByOwnerAndWorktree.size > MAX_WEB_SESSION_FOCUS_INTENTS) {
     const oldest = pendingFocusByOwnerAndWorktree.keys().next()
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-base.ts b/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-base.ts
index edee253b719e..c11f5961f7c6 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-base.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-base.ts
@@ -68,9 +68,17 @@ export function prepareWebSessionTabsSnapshotBase(
         )
       }
     : rawSnapshot
+  const unifiedTabs = state.unifiedTabsByWorktree[worktreeId] ?? []
+  const shownHere = (tab: RuntimeMobileSessionTabsResult['tabs'][number]): boolean =>
+    unifiedTabs.some((local) =>
+      tab.type === 'terminal'
+        ? local.id === toWebTerminalSurfaceTabId(tab.parentTabId)
+        : tab.type === 'agent-session' && local.entityId === tab.sessionId
+    )
   // Why: only a caller-recorded create intent may focus its arriving tab; unsolicited server-active must not steal focus (#5435).
   const focusIntent = peekWebSessionFocusIntent({ environmentId }, worktreeId)
   const focusIntentHostTabId = focusIntent?.hostTabId ?? null
+  const afterHostTabId = focusIntent?.afterHostTabId
   const matchingFocusIntentTab =
     focusIntentHostTabId === null
       ? null
@@ -86,7 +94,16 @@ export function prepareWebSessionTabsSnapshotBase(
               tab.id === focusIntentHostTabId ||
               (tab.type === 'terminal' && tab.parentTabId === focusIntentHostTabId) ||
               (tab.type === 'browser' && tab.browserPageId === focusIntentHostTabId)
-          ) ?? null)
+          ) ??
+          (afterHostTabId
+            ? snapshot.tabs.find(
+                (tab) =>
+                  slotAnchorOf(tab)?.after === true &&
+                  slotAnchorOf(tab)?.hostTabId === afterHostTabId &&
+                  !shownHere(tab)
+              )
+            : undefined) ??
+          null)
   const expectedCurrentLocalTabId = focusIntent?.expectedCurrentLocalTabId
   const currentVisibleLocalTabId = resolveWebSessionVisibleTabId(state, worktreeId)
   const callerFocusIntentTab =
@@ -99,22 +116,18 @@ export function prepareWebSessionTabsSnapshotBase(
     snapshot.navigationIntent === 'follow'
       ? (snapshot.tabs.find((tab) => tab.id === snapshot.activeTabId) ?? null)
       : null
-  // A switch's destination takes the focus its source had here, checked when it lands as a recorded
-  // intent's expected tab is; read from the snapshot, so a client that never got the answer converges.
-  const unifiedTabs = state.unifiedTabsByWorktree[worktreeId] ?? []
+  // A tab that replaced the one shown here takes its focus in every view, since that tab is gone
+  // everywhere; read from the snapshot, so a client that never got the answer converges. A tab
+  // placed beside a split pane's surviving tab is focused only by its initiator's intent above.
   const anchoredIntentTab =
     (currentVisibleLocalTabId !== null &&
       snapshot.tabs.find((tab) => {
         const anchor = slotAnchorOf(tab)
-        const shown = unifiedTabs.some((local) =>
-          tab.type === 'terminal'
-            ? local.id === toWebTerminalSurfaceTabId(tab.parentTabId)
-            : tab.type === 'agent-session' && local.entityId === tab.sessionId
-        )
         return (
-          anchor &&
-          !shown &&
-          slotAnchorLocalTabIds(unifiedTabs, anchor.hostTabId).includes(currentVisibleLocalTabId)
+          anchor !== undefined &&
+          !anchor.after &&
+          slotAnchorLocalTabIds(unifiedTabs, anchor.hostTabId).includes(currentVisibleLocalTabId) &&
+          !shownHere(tab)
         )
       })) ||
     null
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/replaced-slot-placement.test.ts b/src/renderer/src/runtime/web-session-tabs-sync/replaced-slot-placement.test.ts
index 7868de0a1cfd..ad38a14d1586 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/replaced-slot-placement.test.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/replaced-slot-placement.test.ts
@@ -3,6 +3,7 @@ import type { RuntimeMobileSessionTabsResult } from '../../../../shared/runtime-
 import type { ReplacedTab } from '../../../../shared/workspace-layout/workspace-layout-command-types'
 import { applyWebSessionTabsSnapshot } from './snapshot-api'
 import type { WebSessionTabsSyncState } from './state'
+import { recordWebSessionFocusIntent } from '../web-session-focus-intent'
 import {
   ENV,
   LEAF_ID,
@@ -125,12 +126,24 @@ function shownThree(active: 'host-a' | 'host-b') {
 }
 
 it.each([
-  ['the split pane’s tab held the selection', 'host-a', true],
-  ['the user had picked another tab', 'host-b', false]
+  ['the initiator, still on the split pane’s tab', 'host-a', true, 'chat'],
+  ['the initiator, after clicking to another tab', 'host-b', true, 'host-b'],
+  ['another viewer showing the split pane’s tab', 'host-a', false, 'host-a']
 ] as const)(
-  'opens a chat beside the split pane it came from on this client; selection when %s',
-  (_name, active, takes) => {
+  'opens a chat beside the split pane it came from; only its initiator follows: %s',
+  (_name, active, initiated, selected) => {
     const { state, a, b, c } = shownThree(active)
+    if (initiated) {
+      // Named a chat the host then reused: the intent still matches by the slot.
+      recordWebSessionFocusIntent(
+        { environmentId: ENV },
+        WT,
+        'agent-session:minted',
+        undefined,
+        a,
+        'host-a'
+      )
+    }
     const next = apply(
       state,
       makeSnapshot(
@@ -150,7 +163,7 @@ it.each([
     const group = next.groupsByWorktree[WT]![0]!
     const chatTab = next.unifiedTabsByWorktree[WT]!.find((tab) => tab.entityId === 'session-1')!
     expect(group.tabOrder).toEqual([c, a, chatTab.id, b])
-    expect(group.activeTabId).toBe(takes ? chatTab.id : b)
+    expect(group.activeTabId).toBe({ chat: chatTab.id, 'host-a': a, 'host-b': b }[selected])
   }
 )
 

From c882d6575945ff9d33b958bb46ce8a11eb290ec2 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 00:33:31 -0700
Subject: [PATCH 166/207] Pin the paired apply's slot-anchor cost: none without
 a switch, fixed with one, linear in tabs

---
 .../slot-anchor-scaling.test.ts               | 92 +++++++++++++++++++
 1 file changed, 92 insertions(+)
 create mode 100644 src/renderer/src/runtime/web-session-tabs-sync/slot-anchor-scaling.test.ts

diff --git a/src/renderer/src/runtime/web-session-tabs-sync/slot-anchor-scaling.test.ts b/src/renderer/src/runtime/web-session-tabs-sync/slot-anchor-scaling.test.ts
new file mode 100644
index 000000000000..e19c3201e284
--- /dev/null
+++ b/src/renderer/src/runtime/web-session-tabs-sync/slot-anchor-scaling.test.ts
@@ -0,0 +1,92 @@
+import { beforeEach, expect, it, vi } from 'vitest'
+import type { RuntimeMobileSessionTabsResult } from '../../../../shared/runtime-types'
+import { applyWebSessionTabsSnapshot } from './snapshot-api'
+import {
+  ENV,
+  LEAF_ID,
+  NOW,
+  WT,
+  makeSnapshot,
+  makeState,
+  resetWebSessionTabsSyncTestState
+} from '../web-session-tabs-sync-test-harness'
+import * as slotAnchor from './slot-anchor'
+
+vi.mock('../../store', () => ({ useAppStore: { setState: vi.fn() } }))
+vi.mock('./slot-anchor', async (load) => {
+  const actual = await load<typeof slotAnchor>()
+  return { ...actual, slotAnchorLocalTabIds: vi.fn(actual.slotAnchorLocalTabIds) }
+})
+
+type Row = RuntimeMobileSessionTabsResult['tabs'][number]
+const terminal = (hostTabId: string): Row => ({
+  type: 'terminal',
+  id: `${hostTabId}::${LEAF_ID}`,
+  parentTabId: hostTabId,
+  leafId: LEAF_ID,
+  title: hostTabId,
+  isActive: false,
+  status: 'ready',
+  terminal: `handle-${hostTabId}`
+})
+const frame = (rows: Row[], snapshotVersion: number) =>
+  makeSnapshot(rows, {
+    snapshotVersion,
+    tabGroups: [{ id: 'host-group-1', activeTabId: null, tabOrder: rows.map((row) => row.id) }]
+  })
+
+beforeEach(resetWebSessionTabsSyncTestState)
+
+it.each([50, 500])(
+  'does no anchor work for %i tabs without a switch, and a fixed amount with one',
+  (n) => {
+    const rows = Array.from({ length: n }, (_, index) => terminal(`host-${index}`))
+    const resolve = vi.mocked(slotAnchor.slotAnchorLocalTabIds)
+    resolve.mockClear()
+    const shown = {
+      ...makeState(),
+      ...applyWebSessionTabsSnapshot(makeState(), frame(rows, 1), ENV, NOW)
+    }
+    applyWebSessionTabsSnapshot(shown, frame(rows, 2), ENV, NOW)
+    expect(resolve).not.toHaveBeenCalled()
+    const switched: Row = {
+      type: 'agent-session',
+      id: 'agent-session:chat',
+      title: 'Codex',
+      sessionId: 'chat',
+      agent: 'codex',
+      isActive: false,
+      after: { tabId: 'host-0' }
+    }
+    applyWebSessionTabsSnapshot(shown, frame([...rows, switched], 3), ENV, NOW)
+    expect(resolve.mock.calls.length).toBeGreaterThan(0)
+    expect(resolve.mock.calls.length).toBeLessThanOrEqual(4)
+  }
+)
+
+it('reads this client’s tabs a linear number of times per frame as the workspace grows', () => {
+  const reads = (n: number): number => {
+    const rows = Array.from({ length: n }, (_, index) => terminal(`host-${index}`))
+    const shown = {
+      ...makeState(),
+      ...applyWebSessionTabsSnapshot(makeState(), frame(rows, 1), ENV, NOW)
+    }
+    let count = 0
+    const tabs = new Proxy(shown.unifiedTabsByWorktree[WT]!, {
+      get(target, key, receiver) {
+        if (typeof key === 'string' && /^\d+$/.test(key)) {
+          count += 1
+        }
+        return Reflect.get(target, key, receiver)
+      }
+    })
+    applyWebSessionTabsSnapshot(
+      { ...shown, unifiedTabsByWorktree: { [WT]: tabs } },
+      frame(rows, 2),
+      ENV,
+      NOW
+    )
+    return count
+  }
+  expect(reads(500)).toBeLessThanOrEqual(15 * reads(50))
+})

From d8fd6911f95609ae40b09f277b98ba2bc84aeace Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 00:40:20 -0700
Subject: [PATCH 167/207] Publish the selection a switch's layout write
 decided, and take none from a source no group lists

---
 ...red-agent-session-switch-execution.test.ts |  9 +++-
 ...ructured-agent-session-switch-execution.ts |  6 ++-
 .../session-tabs/session-tab-replace.test.ts  | 51 ++++++++++---------
 .../session-tabs/session-tab-replace.ts       | 19 +++++--
 .../structured-session-tab-projection.ts      |  5 +-
 .../structured-session-tab-restoration.ts     | 11 +++-
 6 files changed, 68 insertions(+), 33 deletions(-)

diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
index 9db2a21e2805..99623b897745 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
@@ -211,6 +211,8 @@ it.each(['single', 'split', 'other-workspace', 'reselected'] as const)(
           return { tabId: tab.id, groupId: group!.id, tabOrder: [...group!.tabOrder] }
         })
       : undefined
+    const focusEditorTab = vi.fn()
+    runtime.setNotifier({ focusEditorTab })
     const acquisitions = rig.adapter.acquire.mock.calls.length
     const operation = executeStructuredSessionSwitch(
       {
@@ -267,9 +269,12 @@ it.each(['single', 'split', 'other-workspace', 'reselected'] as const)(
     expect(published.tabs.find((tab) => tab.id === destination)).toMatchObject(
       elsewhere ? {} : split ? { after: { tabId: TAB_ID } } : { replaces: { tabId: TAB_ID } }
     )
-    if (shape !== 'reselected') {
-      expect(published.activeTabId).toBe(destination)
+    if (split) {
+      // The window's focus is judged against the split pane's tab the chat opened beside.
+      expect(focusEditorTab).toHaveBeenCalledWith(expect.any(String), WORKTREE_ID, TAB_ID)
     }
+    // What paired clients mirror is the write's decision: a user who picked another tab keeps it.
+    expect(published.activeTabId === destination).toBe(shape !== 'reselected')
     if (!split && !elsewhere) {
       // A whole tab is replaced in the one write: its rows are gone from the published snapshot.
       expect(
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
index 9b57d7f3c0c0..a840105c79e3 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
@@ -283,7 +283,11 @@ async function switchToChat(
     activate: true,
     check,
     focusWindow: agentLaunchMovesHostWindow(ctx),
-    ...(replaces ? { replaces } : sameWorkspace ? { placement: close.placement() } : {})
+    ...(replaces
+      ? { replaces }
+      : sameWorkspace
+        ? { placement: close.placement(), sourceTabId: close.source.tabId }
+        : {})
   })
   replacedBy = replaces ? sessionId : undefined
   deadline.check()
diff --git a/src/main/runtime/session-tabs/session-tab-replace.test.ts b/src/main/runtime/session-tabs/session-tab-replace.test.ts
index 0361c9ff6afc..a275932798ef 100644
--- a/src/main/runtime/session-tabs/session-tab-replace.test.ts
+++ b/src/main/runtime/session-tabs/session-tab-replace.test.ts
@@ -109,27 +109,32 @@ describe('replaceSessionTabInSnapshot', () => {
   })
 
   it.each([
-    ['still holds it', 't0::l0', true],
-    ['lost it to another tab', 'agent-session:s1', false]
-  ])('takes the selection only from a replaced tab that %s', (_name, held, takes) => {
-    const next = replaceSessionTabInSnapshot(
-      { ...snapshot, tabGroups: [{ ...snapshot.tabGroups![0]!, activeTabId: held }] },
-      {
-        workspaceId: 'ws',
-        replacedTabId: 't0',
-        row: {
-          type: 'agent-session',
-          id: 'agent-session:s2',
-          title: 'Chat 2',
-          sessionId: 's2',
-          agent: 'codex',
-          isActive: false
-        },
-        activate: true
-      }
-    )
-    expect(next.tabs.at(-1)?.isActive).toBe(takes)
-    expect(next.tabGroups?.[0]?.activeTabId).toBe(takes ? 'agent-session:s2' : held)
-    expect(next.activeTabId).toBe(takes ? 'agent-session:s2' : snapshot.activeTabId)
-  })
+    ['still holds it', 't0', 't0::l0', true],
+    ['lost it to another tab', 't0', 'agent-session:s1', false],
+    // Gone from every group before this write: no proof the user stayed on it.
+    ['no group lists', 'missing', 't0::l0', false]
+  ])(
+    'takes the selection only from a replaced tab that %s',
+    (_name, replacedTabId, held, takes) => {
+      const next = replaceSessionTabInSnapshot(
+        { ...snapshot, tabGroups: [{ ...snapshot.tabGroups![0]!, activeTabId: held }] },
+        {
+          workspaceId: 'ws',
+          replacedTabId,
+          row: {
+            type: 'agent-session',
+            id: 'agent-session:s2',
+            title: 'Chat 2',
+            sessionId: 's2',
+            agent: 'codex',
+            isActive: false
+          },
+          activate: true
+        }
+      )
+      expect(next.tabs.at(-1)?.isActive).toBe(takes)
+      expect(next.tabGroups?.[0]?.activeTabId).toBe(takes ? 'agent-session:s2' : held)
+      expect(next.activeTabId).toBe(takes ? 'agent-session:s2' : snapshot.activeTabId)
+    }
+  )
 })
diff --git a/src/main/runtime/session-tabs/session-tab-replace.ts b/src/main/runtime/session-tabs/session-tab-replace.ts
index 0dcdca68b467..3201b00b26da 100644
--- a/src/main/runtime/session-tabs/session-tab-replace.ts
+++ b/src/main/runtime/session-tabs/session-tab-replace.ts
@@ -25,7 +25,14 @@ function tabBarIdOf(row: ReplacementRow): string {
  */
 export function replaceSessionTabInSnapshot(
   existing: RuntimeMobileSessionTabsSnapshot | undefined,
-  input: { workspaceId: string; replacedTabId: string; row: ReplacementRow; activate: boolean }
+  input: {
+    workspaceId: string
+    replacedTabId: string
+    row: ReplacementRow
+    activate: boolean
+    /** The layout owner's write already decided `activate` from the source's selection. */
+    selectionDecided?: boolean
+  }
 ): RuntimeMobileSessionTabsSnapshot {
   const { replacedTabId } = input
   const replaced = new Set(existing ? rowsOfTab(existing, replacedTabId).map((row) => row.id) : [])
@@ -33,10 +40,14 @@ export function replaceSessionTabInSnapshot(
     { id: getHeadlessMobileSessionGroupId(input.workspaceId), activeTabId: null, tabOrder: [] }
   ]
   const slot = groups.find((group) => group.tabOrder.includes(replacedTabId))
-  // Decided in this write: the new row takes the selection only from its source, or from a group
-  // nothing holds; with no slot here to read, the request's own choice stands.
+  // The new row takes the selection only from its source, or from a group nothing holds. A source
+  // no group lists here is no proof the user stayed on it, unless the layout owner's write decided.
   const held = slot?.activeTabId
-  const activate = input.activate && (held == null || held === replacedTabId || replaced.has(held))
+  const activate =
+    input.activate &&
+    (slot
+      ? held == null || held === replacedTabId || replaced.has(held)
+      : input.selectionDecided === true)
   // The hint names the confirmed source even when this snapshot no longer lists it (the window can
   // drop it first); a client that still shows that tab puts the row there.
   const row: ReplacementRow = {
diff --git a/src/main/runtime/session-tabs/structured-session-tab-projection.ts b/src/main/runtime/session-tabs/structured-session-tab-projection.ts
index 586aa9a389de..359c6ba49d5a 100644
--- a/src/main/runtime/session-tabs/structured-session-tab-projection.ts
+++ b/src/main/runtime/session-tabs/structured-session-tab-projection.ts
@@ -17,6 +17,8 @@ export type StructuredSessionTabProjection = {
   placement?: { groupId?: string; afterTabId?: string; index?: number }
   /** A same-slot switch: the chat takes this tab's slot and the tab's rows leave, in one write. */
   replaces?: string
+  /** The layout owner's own write already decided `activate` from its source's selection. */
+  selectionDecided?: boolean
 }
 
 /** Publish membership; a listed chat keeps its place, a new one goes last or into the replaced slot. */
@@ -42,7 +44,8 @@ export function projectStructuredSessionTab(
       workspaceId: input.workspaceId,
       replacedTabId: input.replaces,
       row,
-      activate: input.activate
+      activate: input.activate,
+      selectionDecided: input.selectionDecided
     })
   }
   const tabs = [...(existing?.tabs ?? [])].map((tab) => ({
diff --git a/src/main/runtime/session-tabs/structured-session-tab-restoration.ts b/src/main/runtime/session-tabs/structured-session-tab-restoration.ts
index 91e00d4b27b8..206e364aeca2 100644
--- a/src/main/runtime/session-tabs/structured-session-tab-restoration.ts
+++ b/src/main/runtime/session-tabs/structured-session-tab-restoration.ts
@@ -91,6 +91,8 @@ export abstract class OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce exten
     placement?: { groupId?: string; afterTabId?: string; index?: number }
     /** A same-slot switch: the chat takes this tab's slot and the tab's rows leave, in one write. */
     replaces?: string
+    /** A split pane's switch: the tab the chat opens beside, whose selection it may take. */
+    sourceTabId?: string
   }): Promise<void> {
     const host = getStructuredAgentSessionHost()
     input.check?.()
@@ -113,8 +115,10 @@ export abstract class OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce exten
     // A replace takes the selection only from a tab that still holds it, decided by the layout
     // owner as it writes: here for main's layout, else by the window applying the replace.
     let activate = input.activate
+    let selectionDecided = false
     // The switch's source: the replaced tab, or the split pane's tab the chat opens beside.
-    const source = input.replaces ?? (input.check ? input.placement?.afterTabId : undefined)
+    const source =
+      input.replaces ?? input.sourceTabId ?? (input.check ? input.placement?.afterTabId : undefined)
     const windowReplaces = Boolean(
       input.replaces && !ORCA_LAYOUT_OWNER_IS_MAIN && this.getAvailableAuthoritativeWindow()
     )
@@ -124,6 +128,7 @@ export abstract class OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce exten
         () => {
           const session = this.getWorkspaceSessionForWorktree(input.workspaceId)
           if (source && session) {
+            selectionDecided = true
             activate &&= savedTabHoldsSelection(
               this.getWorkspaceSessionHostIdForWorktree(input.workspaceId),
               session,
@@ -152,7 +157,8 @@ export abstract class OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce exten
       this.saveWindowlessAgentSessionTab(input.workspaceId, input)
     }
     input.check?.()
-    this.projectStructuredAgentSessionTab(input)
+    // The snapshot paired clients mirror says what this write decided, never the request's wish.
+    this.projectStructuredAgentSessionTab({ ...input, activate, selectionDecided })
     if (activate && input.check) {
       // The saved view selects the chat the switch put in the slot; the window draws from it.
       this.commitWindowlessChatSession(input.workspaceId, (session) =>
@@ -182,6 +188,7 @@ export abstract class OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce exten
     notify?: boolean
     /** A same-slot switch: the chat takes this tab's slot and the tab's rows leave, in one write. */
     replaces?: string
+    selectionDecided?: boolean
   }): void {
     const next = projectStructuredSessionTab(
       this.mobileSessionTabsByWorktree.get(input.workspaceId),

From c62209c5f7aa6c8fcf96f77bd60fca639c25df96 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 00:44:47 -0700
Subject: [PATCH 168/207] A switch's replacement takes its group's selection
 wherever its source held it, but reveals and focuses only the group the user
 is in

---
 .../terminal-presentation-ipc-bridge.ts       | 15 +++---
 ...nal-presentation-replace-selection.test.ts | 18 ++++---
 .../terminal-ui-routing-ipc-bridge.ts         |  8 +--
 .../src/lib/replaced-tab-selection.ts         | 51 +++++++++++++++++--
 ...l-structured-session-replaced-slot.test.ts | 23 ++++++---
 .../snapshot-apply.ts                         | 17 ++++---
 6 files changed, 94 insertions(+), 38 deletions(-)

diff --git a/src/renderer/src/hooks/ipc-events/terminal-presentation-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/terminal-presentation-ipc-bridge.ts
index 31595742ef84..908971a7402d 100644
--- a/src/renderer/src/hooks/ipc-events/terminal-presentation-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/terminal-presentation-ipc-bridge.ts
@@ -12,7 +12,7 @@ import { tryMakePaneKey } from './agent-status-routing'
 import { registerLaunchRecipe } from './launch-recipe-registration'
 import { wasAgentLaunchPaneClosedByUser } from '@/lib/agent-launch-pane-closes'
 import { revealWorkspaceSurface } from '@/lib/workspace-surface-reveal'
-import { replacedTabHoldsSelection } from '@/lib/replaced-tab-selection'
+import { replacementSelection, selectReplacementInGroup } from '@/lib/replaced-tab-selection'
 import { useAppStore } from '../../store'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
 import {
@@ -58,13 +58,9 @@ export function registerTerminalPresentationIpcBridge(unsubs: (() => void)[]): v
           const store = useAppStore.getState()
           // A replace opens in the replaced tab's group and takes its slot once the tab exists.
           const replaced = replaces && findUnifiedTab(worktreeId, replaces.tabId)
-          // Decided in this write: a replace takes the selection only from a tab that still holds
-          // it, in the workspace the user is in; otherwise the terminal fills the slot without
-          // moving the user (a source already gone is no proof the user stayed).
-          const takesSelection = replaced
-            ? store.activeWorktreeId === worktreeId &&
-              replacedTabHoldsSelection(store, worktreeId, replaced)
-            : !replaces
+          // Decided in this write: otherwise the terminal fills the slot without moving the user.
+          const selection = replaced ? replacementSelection(store, worktreeId, replaced) : 'none'
+          const takesSelection = replaced ? selection === 'focus' : !replaces
           const terminalPresentation = resolveTerminalPresentation({
             presentation: takesSelection ? presentation : 'background',
             activate,
@@ -155,6 +151,9 @@ export function registerTerminalPresentationIpcBridge(unsubs: (() => void)[]): v
                 ))
           const closedReplaced =
             placeCreatedTerminalTab(worktreeId, tab.id, { afterTabId, replaced }) && replaces
+          if (closedReplaced && selection === 'group') {
+            selectReplacementInGroup(worktreeId, tab.id)
+          }
           // Different reused IDs break the PTY’s baked-in paneKey attribution; warn in dev.
           if (tabId !== undefined && tab.id !== tabId) {
             console.warn(
diff --git a/src/renderer/src/hooks/ipc-events/terminal-presentation-replace-selection.test.ts b/src/renderer/src/hooks/ipc-events/terminal-presentation-replace-selection.test.ts
index d06b75faea54..11578c320d5e 100644
--- a/src/renderer/src/hooks/ipc-events/terminal-presentation-replace-selection.test.ts
+++ b/src/renderer/src/hooks/ipc-events/terminal-presentation-replace-selection.test.ts
@@ -46,13 +46,15 @@ const GROUP = 'group-1'
 const TERMINAL = 'aaaaaaaa-bbbb-4ccc-8ddd-eeeeeeeeeeee'
 
 it.each([
-  ['still held it', 'chat-tab', WT, TERMINAL],
-  ['lost it to another tab', 'u-other', WT, 'u-other'],
-  // The user moved to another workspace while the switch ran: nothing reveals this one.
-  ['held it in a workspace the user left', 'chat-tab', 'repo1::/tmp/wt2', 'u-other']
+  ['still held it', 'chat-tab', WT, GROUP, TERMINAL],
+  ['lost it to another tab', 'u-other', WT, GROUP, 'u-other'],
+  // The user moved to another workspace, or another split group, while the switch ran: the group
+  // still shows the terminal in the chat's place, and nothing reveals or focuses it.
+  ['held it in a workspace the user left', 'chat-tab', 'repo1::/tmp/wt2', GROUP, TERMINAL],
+  ['held it while the user worked in another split group', 'chat-tab', WT, 'group-2', TERMINAL]
 ])(
   'takes the chat’s slot, and its selection only if the chat %s',
-  (_name, active, shown, after) => {
+  (_name, active, shown, activeGroup, after) => {
     seedStore(store, {
       activeWorktreeId: shown,
       worktreesByRepo: { repo1: [makeWorktree({ id: WT, repoId: 'repo1', path: '/tmp/wt1' })] },
@@ -84,11 +86,12 @@ it.each([
             activeTabId: active,
             tabOrder: ['chat-tab', 'u-other'],
             recentTabIds: [active]
-          })
+          }),
+          makeTabGroup({ id: 'group-2', worktreeId: WT, activeTabId: null, tabOrder: [] })
         ]
       },
       layoutByWorktree: { [WT]: { type: 'leaf', groupId: GROUP } },
-      activeGroupIdByWorktree: { [WT]: GROUP },
+      activeGroupIdByWorktree: { [WT]: activeGroup },
       openFiles: [],
       browserTabsByWorktree: {}
     })
@@ -106,6 +109,7 @@ it.each([
     expect(group?.tabOrder).toEqual([TERMINAL, 'u-other'])
     expect(group?.activeTabId).toBe(after)
     expect(store.getState().activeWorktreeId).toBe(shown)
+    expect(store.getState().activeGroupIdByWorktree[WT]).toBe(activeGroup)
     expect(mocks.reply).toHaveBeenLastCalledWith(
       expect.objectContaining({ tabId: TERMINAL, closed: ['chat-tab'] })
     )
diff --git a/src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge.ts
index 5a8c36e402a8..da299228b41d 100644
--- a/src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge.ts
@@ -11,7 +11,7 @@ import type { AppState } from '../../store/types'
 import { resolveBrowserSessionTabTarget } from './browser-session-tab-target'
 import { resolveWindowTabIdForHostTab } from './host-session-tab-target'
 import { revealWorkspaceSurface } from '@/lib/workspace-surface-reveal'
-import { replacedTabHoldsSelection } from '@/lib/replaced-tab-selection'
+import { replacedTabGroupInView, replacedTabHoldsSelection } from '@/lib/replaced-tab-selection'
 import { focusTerminalInitiatedTab } from './terminal-command-state'
 import { applyRuntimePaneTitle } from './terminal-pane-title-ipc-bridge'
 
@@ -166,12 +166,12 @@ export function registerTerminalUiRoutingIpcBridge(unsubs: (() => void)[]): void
       ) {
         return
       }
-      // A switch's destination: never reveal a workspace the user left, nor take a group's selection
-      // from a tab the user picked there.
+      // A switch's destination: never reveal a workspace the user left, pull focus from another
+      // group they moved to, nor take a group's selection from a tab the user picked there.
       if (
         sourceTabId &&
         tab &&
-        (store.activeWorktreeId !== worktreeId ||
+        (!replacedTabGroupInView(store, worktreeId, tab.groupId) ||
           !replacedTabHoldsSelection(store, worktreeId, {
             id: resolveWindowTabIdForHostTab(worktreeId, sourceTabId),
             groupId: tab.groupId
diff --git a/src/renderer/src/lib/replaced-tab-selection.ts b/src/renderer/src/lib/replaced-tab-selection.ts
index 3a97c0d1aff6..bebd16a0a5ad 100644
--- a/src/renderer/src/lib/replaced-tab-selection.ts
+++ b/src/renderer/src/lib/replaced-tab-selection.ts
@@ -1,14 +1,55 @@
+import { useAppStore } from '@/store'
+import { tabActivationPatch } from '@/store/slices/tabs/tabs-focus-actions'
 import type { AppState } from '@/store/types'
 
 /** A same-slot switch takes the selection only while the tab it replaces still holds it, judged
- *  in its group when the replace lands: a user who picked another tab there keeps that choice. */
+ *  in its group when the replace lands: a user who picked another tab there keeps that choice. A
+ *  tab no group lists is no proof the user stayed on it. */
 export function replacedTabHoldsSelection(
   state: Pick<AppState, 'groupsByWorktree'>,
   worktreeId: string,
   tab: { id: string; groupId: string }
 ): boolean {
-  const active = state.groupsByWorktree[worktreeId]?.find(
-    (group) => group.id === tab.groupId
-  )?.activeTabId
-  return active == null || active === tab.id
+  const group = state.groupsByWorktree[worktreeId]?.find((entry) => entry.id === tab.groupId)
+  return group !== undefined && (group.activeTabId == null || group.activeTabId === tab.id)
+}
+
+/** Whether the user is looking at this group now: it is the active group of their workspace. */
+export function replacedTabGroupInView(
+  state: Pick<AppState, 'activeWorktreeId' | 'activeGroupIdByWorktree'>,
+  worktreeId: string,
+  groupId: string
+): boolean {
+  return (
+    state.activeWorktreeId === worktreeId &&
+    (state.activeGroupIdByWorktree[worktreeId] ?? groupId) === groupId
+  )
+}
+
+/** What a replacement takes, decided as the replace lands: focus where the user is looking at its
+ *  source, only its group's selection where they aren't, or nothing once they picked another tab. */
+export function replacementSelection(
+  state: Pick<AppState, 'groupsByWorktree' | 'activeWorktreeId' | 'activeGroupIdByWorktree'>,
+  worktreeId: string,
+  replaced: { id: string; groupId: string }
+): 'focus' | 'group' | 'none' {
+  return !replacedTabHoldsSelection(state, worktreeId, replaced)
+    ? 'none'
+    : replacedTabGroupInView(state, worktreeId, replaced.groupId)
+      ? 'focus'
+      : 'group'
+}
+
+/** The replacement takes its group's selection where the user isn't looking: their workspace,
+ *  active group and focus stay where they are. */
+export function selectReplacementInGroup(worktreeId: string, tabId: string): void {
+  useAppStore.setState((state) => {
+    const tab = state.unifiedTabsByWorktree[worktreeId]?.find((entry) => entry.id === tabId)
+    return tab
+      ? {
+          ...tabActivationPatch(state, tab, worktreeId, { recordFocus: false }, false),
+          activeGroupIdByWorktree: state.activeGroupIdByWorktree
+        }
+      : state
+  })
 }
diff --git a/src/renderer/src/runtime/local-structured-session-replaced-slot.test.ts b/src/renderer/src/runtime/local-structured-session-replaced-slot.test.ts
index d182f5602bfb..a7b080b522cd 100644
--- a/src/renderer/src/runtime/local-structured-session-replaced-slot.test.ts
+++ b/src/renderer/src/runtime/local-structured-session-replaced-slot.test.ts
@@ -35,11 +35,13 @@ afterEach(() => {
 })
 
 it.each([
-  ['still held the selection', 'switched'],
-  ['lost the selection to another tab', 'after']
+  ['still held the selection', 'switched', GROUP],
+  ['lost the selection to another tab', 'after', GROUP],
+  // The user works in another split group: the group shows the chat, focus stays with the user.
+  ['held the selection of a group the user left', 'switched', 'group-2']
 ])(
   'puts the chat in the replaced terminal’s pinned slot, closing it as a replace, when it %s',
-  (_name, active) => {
+  (_name, active, activeGroup) => {
     const terminal = (id: string, isPinned = false) =>
       makeUnifiedTab({
         id,
@@ -70,11 +72,19 @@ it.each([
             activeTabId: active,
             tabOrder: ['before', 'switched', 'after'],
             recentTabIds: ['before', active]
-          })
+          }),
+          makeTabGroup({ id: 'group-2', worktreeId: WORKTREE, activeTabId: null, tabOrder: [] })
         ]
       },
-      layoutByWorktree: { [WORKTREE]: { type: 'leaf', groupId: GROUP } },
-      activeGroupIdByWorktree: { [WORKTREE]: GROUP },
+      layoutByWorktree: {
+        [WORKTREE]: {
+          type: 'split',
+          direction: 'horizontal',
+          first: { type: 'leaf', groupId: GROUP },
+          second: { type: 'leaf', groupId: 'group-2' }
+        }
+      },
+      activeGroupIdByWorktree: { [WORKTREE]: activeGroup },
       openFiles: [],
       browserTabsByWorktree: {}
     })
@@ -114,5 +124,6 @@ it.each([
     expect(state.groupsByWorktree[WORKTREE]?.[0]?.activeTabId).toBe(
       active === 'switched' ? chat?.id : 'after'
     )
+    expect(state.activeGroupIdByWorktree[WORKTREE]).toBe(activeGroup)
   }
 )
diff --git a/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts b/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts
index e42e4a7dafd7..94c0c49c6c04 100644
--- a/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts
+++ b/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts
@@ -36,7 +36,7 @@ import { closeStructuredAgentSession } from '../structured-agent-session-close'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
 import { useAppStore } from '../../store'
 import { closeTerminalTab } from '@/components/terminal/terminal-tab-actions'
-import { replacedTabHoldsSelection } from '@/lib/replaced-tab-selection'
+import { replacementSelection, selectReplacementInGroup } from '@/lib/replaced-tab-selection'
 import { framesDrawWorkspace } from '../workspace-layout-frame-drawn-workspaces'
 import { drawnChatLabelChanges, type DrawnChatLabel } from './frame-drawn-chat-tabs'
 
@@ -264,7 +264,7 @@ function closeReplacedTerminalTabs(replacements: readonly ReplacedSessionTab[]):
     if (replaced.isPinned && !chat.isPinned) {
       useAppStore.getState().pinTab(chat.id, { recordInteraction: false })
     }
-    const takesSelection = replacedTabHoldsSelection(useAppStore.getState(), worktreeId, replaced)
+    const selection = replacementSelection(useAppStore.getState(), worktreeId, replaced)
     // Not a user close: a replace never feeds Reopen Closed Tab or drops the tab's drafts.
     closeTerminalTab(replaced.entityId, {
       reason: 'cleanup',
@@ -272,14 +272,15 @@ function closeReplacedTerminalTabs(replacements: readonly ReplacedSessionTab[]):
       skipRunningProcessConfirm: true,
       localPtyTeardownOwnedExternally: true
     })
-    // The chat takes the selection only from a terminal that still held it when the replace landed.
-    if (takesSelection) {
+    // The chat takes its group's selection only from a terminal that still held it when the
+    // replace landed, and focus only where the user is looking.
+    if (selection === 'focus') {
       const store = useAppStore.getState()
       store.activateTab(chat.id, { worktreeId })
-      if (store.activeWorktreeId === worktreeId) {
-        store.focusGroup(worktreeId, chat.groupId)
-        store.setActiveTabType('agent-session', worktreeId)
-      }
+      store.focusGroup(worktreeId, chat.groupId)
+      store.setActiveTabType('agent-session', worktreeId)
+    } else if (selection === 'group') {
+      selectReplacementInGroup(worktreeId, chat.id)
     }
   }
 }

From fb563e6527c752db2a348ae7fa3bb5b86e59ad88 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 00:48:07 -0700
Subject: [PATCH 169/207] Name a stopped pane's switch only when a switch
 stopped it; a close that couldn't remove its tab shows an ordinary exit

---
 ...red-agent-session-switch-execution.test.ts |  7 ++++---
 ...ured-agent-session-switch-terminal-stop.ts |  4 +++-
 .../terminal-switch-close-capture.ts          |  8 +++++---
 .../stopped-switch-source-exit.ts             |  5 +++--
 .../stopped-switch-source.test.ts             | 20 ++++++++++++++++++-
 src/shared/stopped-switch-source.ts           |  5 +++--
 6 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
index 99623b897745..827e51c15ed0 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
@@ -648,8 +648,8 @@ function keptSourceTerminal(options: KeptTerminalSwitchOptions = {}) {
     leafId: LEAF_A,
     ptyId: PTY_A,
     incarnationId,
-    // The stopped pane names it.
-    agent: 'codex' as const
+    // A switch stopped it, and the stopped pane names the agent.
+    switched: { agent: 'codex' as const }
   }
   return {
     runtime,
@@ -783,5 +783,6 @@ it('settles a kept source once when an addressed close stops it but cannot retir
     runtime.closeTerminal(source.handle, incarnationId, source.presentation)
   ).rejects.toThrow('terminal_pane_close_failed')
   // An ordinary close, not a switch: no agent to name.
-  expect(settled).toHaveBeenCalledExactlyOnceWith({ ...stoppedSource, agent: undefined })
+  // No switch happened: the pane exits as any pane does, never with the switch's copy.
+  expect(settled).toHaveBeenCalledExactlyOnceWith({ ...stoppedSource, switched: undefined })
 })
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-stop.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-stop.ts
index 1aaef0c5dc24..bf44426b0030 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-stop.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-stop.ts
@@ -87,7 +87,9 @@ export async function stopStructuredSwitchTerminalSource(input: {
     await host.trackSwitchPhysical(sessionId, close.stop(replacing))
     // The window decides whether the stopped pane is still there; a chat that replaced it is
     // named so the window waits for that replace's own pass.
-    input.keepSource((replacedBy) => close.settleStoppedSource(replacedBy, input.agent))
+    input.keepSource((replacedBy) =>
+      close.settleStoppedSource({ replacedBySessionId: replacedBy, agent: input.agent })
+    )
   } catch {
     host.deps.logger.warn('switch source exit was not confirmed', {
       scope: 'session-switch',
diff --git a/src/main/runtime/session-tabs/terminal-switch-close-capture.ts b/src/main/runtime/session-tabs/terminal-switch-close-capture.ts
index f81946b8876c..39c77f5e806f 100644
--- a/src/main/runtime/session-tabs/terminal-switch-close-capture.ts
+++ b/src/main/runtime/session-tabs/terminal-switch-close-capture.ts
@@ -113,7 +113,7 @@ export abstract class OrcaRuntimeWithTerminalSwitchCloseCapture extends OrcaRunt
        * once, only after proof of the stop; a replace's chat names itself, so the window settles
        * only once that chat is there and its replace has had its pass.
        */
-      settleStoppedSource: (replacedBySessionId?: string, agent?: AiVaultAgent) => {
+      settleStoppedSource: (switched?: { replacedBySessionId?: string; agent?: AiVaultAgent }) => {
         if (!keptStopped || stoppedSourceSettled) {
           return
         }
@@ -124,8 +124,10 @@ export abstract class OrcaRuntimeWithTerminalSwitchCloseCapture extends OrcaRunt
           leafId: source.leafId,
           ptyId: addressedPty,
           incarnationId: incarnation,
-          ...(replacedBySessionId ? { replacedBySessionId } : {}),
-          ...(agent ? { agent } : {})
+          ...(switched?.replacedBySessionId
+            ? { replacedBySessionId: switched.replacedBySessionId }
+            : {}),
+          ...(switched ? { switched: switched.agent ? { agent: switched.agent } : {} } : {})
         })
       },
       /** Retires the pane's bookkeeping; its presentation too, unless a replace or its exit already did. */
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/stopped-switch-source-exit.ts b/src/renderer/src/components/terminal-pane/pty-connection/stopped-switch-source-exit.ts
index 2bc0654503d0..ec360175d95a 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/stopped-switch-source-exit.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/stopped-switch-source-exit.ts
@@ -24,13 +24,14 @@ export function holdClosingExit(
       session.deps.clearTabPtyId(session.deps.tabId, ptyId)
       // Main keeps a `closing` stop's binding, so a Restart must name the stopped process as the
       // one it replaces; otherwise main reattaches to it and finds its session killed.
+      // Only a switch's stop is named as one; a close that stopped it exits as any pane does.
       session.deps.onPaneProcessDied?.({
         paneId: session.pane.id,
         exitCode,
         startup: null,
-        reason: 'switch-stopped',
+        reason: notice.switched ? 'switch-stopped' : 'process-failed',
         replacesPtyId: ptyId,
-        ...(notice.agent ? { agent: notice.agent } : {})
+        ...(notice.switched?.agent ? { agent: notice.switched.agent } : {})
       })
     }
   )
diff --git a/src/renderer/src/components/terminal-pane/stopped-switch-source.test.ts b/src/renderer/src/components/terminal-pane/stopped-switch-source.test.ts
index a4b4b86e2f86..5b9c8674e106 100644
--- a/src/renderer/src/components/terminal-pane/stopped-switch-source.test.ts
+++ b/src/renderer/src/components/terminal-pane/stopped-switch-source.test.ts
@@ -160,7 +160,7 @@ it('shows the kept pane exited at its own code once main settles it, with no clo
     kept.stoppedForReplace()
     await flushAsyncTicks(5)
     expect(kept.died).not.toHaveBeenCalled()
-    kept.modules.sources.noteStoppedSwitchSource({ ...kept.source, agent: 'codex' })
+    kept.modules.sources.noteStoppedSwitchSource({ ...kept.source, switched: { agent: 'codex' } })
     await flushAsyncTicks(5)
     // It names the agent the switch stopped, and its Restart replaces that process with a fresh
     // shell session: main kept the stopped process's binding, whose session is killed.
@@ -237,6 +237,24 @@ it.each([
   }
 )
 
+it('shows a pane a close stopped, but could not remove, as an ordinary exit', async () => {
+  const kept = await keptStoppedPane()
+  try {
+    kept.stoppedForReplace()
+    kept.modules.sources.noteStoppedSwitchSource(kept.source)
+    await flushAsyncTicks(5)
+    expect(kept.died).toHaveBeenCalledExactlyOnceWith({
+      paneId: kept.pane.id,
+      exitCode: 0,
+      startup: null,
+      reason: 'process-failed',
+      replacesPtyId: kept.source.ptyId
+    })
+  } finally {
+    kept.dispose()
+  }
+})
+
 it('settles a pane that was parked when main settled it, once it is shown', async () => {
   const kept = await keptStoppedPane()
   try {
diff --git a/src/shared/stopped-switch-source.ts b/src/shared/stopped-switch-source.ts
index d32c1848927f..891638bd4acf 100644
--- a/src/shared/stopped-switch-source.ts
+++ b/src/shared/stopped-switch-source.ts
@@ -9,6 +9,7 @@ export type StoppedSwitchSource = {
   incarnationId?: string
   /** The chat a replace put in this tab's slot; the window settles the pane only once it has it. */
   replacedBySessionId?: string
-  /** The agent the switch stopped, which the stopped pane names. */
-  agent?: AiVaultAgent
+  /** Present when a switch stopped it, naming the agent the pane shows as stopped; absent when an
+   *  addressed close stopped it but could not remove its tab, which exits as any pane does. */
+  switched?: { agent?: AiVaultAgent }
 }

From 7c53613166bf00682efb5ccf94f8cf08c37152e7 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 00:49:58 -0700
Subject: [PATCH 170/207] A window that fails after a tab holds the switched
 terminal answers "maybe shown", so the terminal is kept

---
 ...e-window-lifecycle-terminal-reveal.test.ts | 22 +++++++++++++++++++
 src/main/window/runtime-window-lifecycle.ts   |  7 +++++-
 .../terminal-presentation-ipc-bridge.ts       |  6 ++++-
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/src/main/window/runtime-window-lifecycle-terminal-reveal.test.ts b/src/main/window/runtime-window-lifecycle-terminal-reveal.test.ts
index 66bf50fce859..d43b62bd445b 100644
--- a/src/main/window/runtime-window-lifecycle-terminal-reveal.test.ts
+++ b/src/main/window/runtime-window-lifecycle-terminal-reveal.test.ts
@@ -12,6 +12,10 @@ vi.mock('../ipc/worktree-change-invalidators', () => ({ runWorktreeChangeInvalid
 vi.mock('./renderer-document-navigation', () => ({ registerRendererDocumentNavigation: vi.fn() }))
 
 import { registerRuntimeWindowLifecycle } from './runtime-window-lifecycle'
+import {
+  TerminalNotPlacedError,
+  TerminalRevealUnconfirmedError
+} from '../runtime/session-tabs/terminal-not-placed-error'
 
 function attachWindow(id: number): {
   destroy: () => void
@@ -92,4 +96,22 @@ describe('runtime window terminal reveal', () => {
       vi.useRealTimers()
     }
   })
+
+  it.each([
+    ['before any tab held the terminal', undefined, TerminalNotPlacedError],
+    ['after a tab held it', 'tab-1', TerminalRevealUnconfirmedError]
+  ])(
+    'answers a window that failed %s as placed nowhere, or maybe placed',
+    async (_name, tabId, kind) => {
+      const window = attachWindow(3)
+      const reveal = window.notifier.revealTerminalSession?.('wt-1', { ptyId: 'pty-3' })
+      const [, payload] = window.send.mock.calls[0]
+      ipcMain.emit(
+        'terminal:tabCreateReply',
+        { sender: window.webContents },
+        { requestId: payload.requestId, error: 'boom', ...(tabId ? { tabId } : {}) }
+      )
+      await expect(reveal).rejects.toBeInstanceOf(kind)
+    }
+  )
 })
diff --git a/src/main/window/runtime-window-lifecycle.ts b/src/main/window/runtime-window-lifecycle.ts
index 493b0488d1c0..bafe553ec3e9 100644
--- a/src/main/window/runtime-window-lifecycle.ts
+++ b/src/main/window/runtime-window-lifecycle.ts
@@ -100,7 +100,12 @@ export function registerRuntimeWindowLifecycle(
           clearTimeout(timer)
           ipcMain.removeListener('terminal:tabCreateReply', handler)
           if (reply.error) {
-            reject(new TerminalNotPlacedError(reply.error))
+            // A tab already held the terminal when the window failed: it may be on screen.
+            reject(
+              reply.tabId
+                ? new TerminalRevealUnconfirmedError(reply.error)
+                : new TerminalNotPlacedError(reply.error)
+            )
             return
           }
           if (
diff --git a/src/renderer/src/hooks/ipc-events/terminal-presentation-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/terminal-presentation-ipc-bridge.ts
index 908971a7402d..a843676206bb 100644
--- a/src/renderer/src/hooks/ipc-events/terminal-presentation-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/terminal-presentation-ipc-bridge.ts
@@ -54,6 +54,8 @@ export function registerTerminalPresentationIpcBridge(unsubs: (() => void)[]): v
         splitTelemetrySource,
         replaces
       }) => {
+        // Once a tab holds the terminal, a later failure says so: it may already be on screen.
+        let heldBy: string | undefined
         try {
           const store = useAppStore.getState()
           // A replace opens in the replaced tab's group and takes its slot once the tab exists.
@@ -149,6 +151,7 @@ export function registerTerminalPresentationIpcBridge(unsubs: (() => void)[]): v
                         ...(cwd ? { startupCwd: cwd } : {})
                       }
                 ))
+          heldBy = tab.id
           const closedReplaced =
             placeCreatedTerminalTab(worktreeId, tab.id, { afterTabId, replaced }) && replaces
           if (closedReplaced && selection === 'group') {
@@ -278,7 +281,8 @@ export function registerTerminalPresentationIpcBridge(unsubs: (() => void)[]): v
           }
           window.api.ui.replyTerminalCreate({
             requestId,
-            error: err instanceof Error ? err.message : 'Terminal reveal failed'
+            error: err instanceof Error ? err.message : 'Terminal reveal failed',
+            ...(heldBy ? { tabId: heldBy } : {})
           })
         }
       }

From 384695c7674321fa83d82ac8718949bcb8a6113f Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 00:51:35 -0700
Subject: [PATCH 171/207] On the web client, report a request's send only to a
 caller observing it, as the desktop does

---
 .../web-runtime-environment-subscribe.test.ts   | 17 +++++++++++++++++
 .../web-runtime-environment-subscribe.ts        |  7 +++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/renderer/src/web/preload-api/web-runtime-environment-subscribe.test.ts b/src/renderer/src/web/preload-api/web-runtime-environment-subscribe.test.ts
index 385c05c13f84..664884a903f6 100644
--- a/src/renderer/src/web/preload-api/web-runtime-environment-subscribe.test.ts
+++ b/src/renderer/src/web/preload-api/web-runtime-environment-subscribe.test.ts
@@ -42,3 +42,20 @@ it('drops a request still queued at its send-by time, unsent, as the desktop doe
   expect(mocks.subscribe).not.toHaveBeenCalled()
   expect(onSent).not.toHaveBeenCalled()
 })
+
+it.each([true, false])(
+  'tells the caller its request was sent only when it asked to observe the send=%s',
+  async (observeDispatch) => {
+    mocks.enqueue.mockImplementationOnce(async (_id, _method, run) => run())
+    mocks.subscribe.mockImplementationOnce(async (_method, _params, callbacks) => {
+      callbacks.onSent?.(1)
+      return { unsubscribe: vi.fn() }
+    })
+    const onSent = vi.fn()
+    await subscribeWebRuntimeEnvironment(
+      { selector: 'environment', method: 'agentSession.switchToChat', params: {}, observeDispatch },
+      { onResponse: vi.fn(), onSent }
+    )
+    expect(onSent).toHaveBeenCalledTimes(observeDispatch ? 1 : 0)
+  }
+)
diff --git a/src/renderer/src/web/preload-api/web-runtime-environment-subscribe.ts b/src/renderer/src/web/preload-api/web-runtime-environment-subscribe.ts
index 58eb7b61bada..43a9ac2ad759 100644
--- a/src/renderer/src/web/preload-api/web-runtime-environment-subscribe.ts
+++ b/src/renderer/src/web/preload-api/web-runtime-environment-subscribe.ts
@@ -26,9 +26,10 @@ export const subscribeWebRuntimeEnvironment: RuntimeEnvironmentsApi['subscribe']
     timeoutMs,
     subscriptionId,
     expectedEnvironmentPairingRevision,
-    dispatchObservation
+    dispatchObservation,
+    observeDispatch
   },
-  callbacks
+  { onSent, ...callbacks }
 ) => {
   const environment = resolveEnvironment(selector)
   assertEnvironmentPairing(selector, expectedEnvironmentPairingRevision)
@@ -60,6 +61,8 @@ export const subscribeWebRuntimeEnvironment: RuntimeEnvironmentsApi['subscribe']
           params,
           {
             ...callbacks,
+            // As on the desktop, only a caller that asked to observe the send hears it.
+            ...(observeDispatch ? { onSent } : {}),
             onResponse: (response) => {
               try {
                 assertEnvironmentPairing(selector, expectedEnvironmentPairingRevision)

From 2b191b2bcb3407d17c0b484bd50cb31df148fa9b Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 01:29:22 -0700
Subject: [PATCH 172/207] Keep the switch's "source still writes" fact on the
 reply only, so saved history never declares it

---
 src/shared/agent-session-refusal-details.ts   |  7 +++--
 .../agent-session-reply-refusal-facts.ts      | 29 +++++++++++++++++++
 .../agent-session-wire-refusals.test.ts       | 13 +++++++++
 src/shared/agent-session-wire-refusals.ts     | 24 ++++++++++-----
 4 files changed, 63 insertions(+), 10 deletions(-)
 create mode 100644 src/shared/agent-session-reply-refusal-facts.ts

diff --git a/src/shared/agent-session-refusal-details.ts b/src/shared/agent-session-refusal-details.ts
index e30544d03d41..b145ed74a09b 100644
--- a/src/shared/agent-session-refusal-details.ts
+++ b/src/shared/agent-session-refusal-details.ts
@@ -1,5 +1,6 @@
 // Codes span situations with different next steps (cleared chat versus busy command). Name only a listed reason; otherwise omit it for the code fallback, as older hosts do.
 
+import type { AgentSessionReplyRefusalDetails } from './agent-session-reply-refusal-facts'
 import type { AgentSessionAccountKind } from './agent-session-availability'
 import type { AgentJournalResolution } from './agent-session-journal-types'
 import {
@@ -174,7 +175,7 @@ type NoFacts = Record<never, never>
 
 export type AgentSessionConversationOwner = { sessionId: string; workspaceId: string }
 
-type ConversationOwnerFacts = { owner?: AgentSessionConversationOwner; source?: true }
+type ConversationOwnerFacts = { owner?: AgentSessionConversationOwner }
 
 /** The facts a code carries beside its reason. */
 type AgentSessionRefusalFactsByCode = {
@@ -293,7 +294,7 @@ export function isAgentSessionRefusalReason<C extends AgentSessionWireRefusalCod
 export function readAgentSessionRefusalDetails<C extends AgentSessionWireRefusalCode>(
   code: C,
   value: unknown
-): AgentSessionRefusalDetails<C> | undefined {
+): AgentSessionReplyRefusalDetails<C> | undefined {
   if (!isRecord(value)) {
     return undefined
   }
@@ -348,7 +349,7 @@ export function readAgentSessionRefusalDetails<C extends AgentSessionWireRefusal
     ...(codexInstallation ? { codexInstallation } : {})
   }
   // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the reason was checked against `code`'s list and only the facts `code` lists (plus the verdict every code may carry) were kept.
-  return Object.keys(read).length > 0 ? (read as AgentSessionRefusalDetails<C>) : undefined
+  return Object.keys(read).length > 0 ? (read as AgentSessionReplyRefusalDetails<C>) : undefined
 }
 
 /** The loose fields released clients read, taken from details; the one place they are written. */
diff --git a/src/shared/agent-session-reply-refusal-facts.ts b/src/shared/agent-session-reply-refusal-facts.ts
new file mode 100644
index 000000000000..b16eed32f6d2
--- /dev/null
+++ b/src/shared/agent-session-reply-refusal-facts.ts
@@ -0,0 +1,29 @@
+import type { AgentSessionWireRefusalCode } from './agent-session-wire-refusals'
+import type {
+  AgentSessionAnyRefusalDetails,
+  AgentSessionRefusalDetails
+} from './agent-session-refusal-details'
+
+/** Facts only a live reply carries, never saved history: a switch's own source pane still writes
+ *  the conversation. A refusal reduced to a reference drops them. */
+type AgentSessionReplyOnlyFactsByCode = {
+  agent_session_conflict: { source?: true }
+  agent_session_ownership_unknown: { source?: true }
+}
+export type AgentSessionReplyOnlyFacts<C extends AgentSessionWireRefusalCode> =
+  C extends keyof AgentSessionReplyOnlyFactsByCode
+    ? AgentSessionReplyOnlyFactsByCode[C]
+    : Record<never, never>
+export type AgentSessionReplyRefusalDetails<C extends AgentSessionWireRefusalCode> =
+  AgentSessionRefusalDetails<C> & AgentSessionReplyOnlyFacts<C>
+export type AgentSessionAnyReplyRefusalDetails =
+  AgentSessionReplyRefusalDetails<AgentSessionWireRefusalCode>
+
+/** Details as saved history may hold them: without the reply-only facts. */
+export function savedAgentSessionRefusalDetails(
+  details: AgentSessionAnyReplyRefusalDetails
+): AgentSessionAnyRefusalDetails {
+  return 'source' in details
+    ? Object.fromEntries(Object.entries(details).filter(([key]) => key !== 'source'))
+    : details
+}
diff --git a/src/shared/agent-session-wire-refusals.test.ts b/src/shared/agent-session-wire-refusals.test.ts
index d6c29d9e74a4..0f210f1e1a14 100644
--- a/src/shared/agent-session-wire-refusals.test.ts
+++ b/src/shared/agent-session-wire-refusals.test.ts
@@ -203,3 +203,16 @@ describe('a stored refusal read back', () => {
     expect(readAgentSessionRefusalReference({ code: 'agent_session_future' })).toBeUndefined()
   })
 })
+
+it('tells the client a switch’s own source still writes, but never keeps that in saved history', () => {
+  const refusal = refuse(
+    'agent_session_conflict',
+    { reason: 'conversationHeldElsewhere', source: true },
+    'agent_session_conflict'
+  )
+  expect(refusal.details).toEqual({ reason: 'conversationHeldElsewhere', source: true })
+  expect(readAgentSessionRefusalDetails(refusal.code, refusal.details)).toEqual(refusal.details)
+  const saved = { code: 'agent_session_conflict', details: { reason: 'conversationHeldElsewhere' } }
+  expect(agentSessionRefusalReference(refusal)).toEqual(saved)
+  expect(readAgentSessionRefusalReference(refusal)).toEqual(saved)
+})
diff --git a/src/shared/agent-session-wire-refusals.ts b/src/shared/agent-session-wire-refusals.ts
index 192af32ca748..16043b3c38a4 100644
--- a/src/shared/agent-session-wire-refusals.ts
+++ b/src/shared/agent-session-wire-refusals.ts
@@ -4,12 +4,17 @@
 import {
   agentSessionLegacyRefusalFields,
   readAgentSessionRefusalDetails,
-  type AgentSessionAnyRefusalDetails,
   type AgentSessionLegacyRefusalFields,
   type AgentSessionRefusalDetails,
   type AgentSessionRefusalDetailsByCode,
   type AgentSessionRefusalFacts
 } from './agent-session-refusal-details'
+import {
+  savedAgentSessionRefusalDetails,
+  type AgentSessionAnyReplyRefusalDetails,
+  type AgentSessionReplyOnlyFacts,
+  type AgentSessionReplyRefusalDetails
+} from './agent-session-reply-refusal-facts'
 
 export type {
   AgentSessionAnyRefusalDetails,
@@ -60,7 +65,7 @@ export type AgentSessionRefusalOf<C extends AgentSessionWireRefusalCode> = {
     /** For logs and released clients, which print it; newer clients choose words from details. */
     message: string
     /** Absent from older hosts. */
-    details?: AgentSessionRefusalDetails<K>
+    details?: AgentSessionReplyRefusalDetails<K>
     /** This create attempt refused before commit; earlier attempts may still have committed. */
     createAttemptRefusedBeforeCommit?: true
   } & AgentSessionLegacyRefusalFields
@@ -75,7 +80,7 @@ export type AgentSessionRefusalReference = {
 
 function buildRefusal(
   code: AgentSessionWireRefusalCode,
-  details: AgentSessionAnyRefusalDetails | undefined,
+  details: AgentSessionAnyReplyRefusalDetails | undefined,
   message: string
 ): AgentSessionWireRefusal {
   const kept = details && Object.keys(details).length > 0 ? details : undefined
@@ -92,7 +97,7 @@ function buildRefusal(
 /** Require a reason listed for code; copy legacy top-level fields only here from details. */
 export function refuse<C extends AgentSessionWireRefusalCode>(
   code: C,
-  details: NoInfer<AgentSessionRefusalDetailsByCode[C]>,
+  details: NoInfer<AgentSessionRefusalDetailsByCode[C] & AgentSessionReplyOnlyFacts<C>>,
   message: string
 ): AgentSessionWireRefusal {
   return buildRefusal(code, details, message)
@@ -150,9 +155,14 @@ export function readAgentSessionRefusalReference(
 
 function buildReference(
   code: AgentSessionWireRefusalCode,
-  details: AgentSessionAnyRefusalDetails | undefined
+  replyDetails: AgentSessionAnyReplyRefusalDetails | undefined
 ): AgentSessionRefusalReference {
-  const reference = { code, ...(details ? { details } : {}) }
+  // A reference may be saved: it never keeps what only a live reply may say.
+  const details = replyDetails && savedAgentSessionRefusalDetails(replyDetails)
+  const reference = {
+    code,
+    ...(details && Object.keys(details).length > 0 ? { details } : {})
+  }
   // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: `details` is the refusal's own, or was read against `code`.
   return reference as AgentSessionRefusalReference
 }
@@ -171,7 +181,7 @@ export class AgentSessionRefusalError extends Error {
 /** A store or host refusal thrown under its situation; the error's message stays the code. */
 export function agentSessionRefusalError<C extends AgentSessionWireRefusalCode>(
   code: C,
-  details: NoInfer<AgentSessionRefusalDetailsByCode[C]>,
+  details: NoInfer<AgentSessionRefusalDetailsByCode[C] & AgentSessionReplyOnlyFacts<C>>,
   message: string = code
 ): AgentSessionRefusalError {
   return new AgentSessionRefusalError(refuse(code, details, message))

From 198c4419ce4df68b5465ad1aa9e79d8aeb9a1627 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 01:30:42 -0700
Subject: [PATCH 173/207] Count rows in the anchor perf tests through index
 getters, and type the switch tests' mocks fully

---
 .../structured-worker-switch-stop.test.ts     |  4 +++-
 ...red-agent-session-switch-execution.test.ts | 14 ++++++++++++-
 .../session-tabs/switch-slot-anchors.test.ts  | 20 ++++++++++---------
 .../slot-anchor-scaling.test.ts               | 14 +++++++------
 4 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/src/main/runtime/orchestration/structured-worker-switch-stop.test.ts b/src/main/runtime/orchestration/structured-worker-switch-stop.test.ts
index e369f6f64e3f..ebcca82f7c6f 100644
--- a/src/main/runtime/orchestration/structured-worker-switch-stop.test.ts
+++ b/src/main/runtime/orchestration/structured-worker-switch-stop.test.ts
@@ -171,7 +171,9 @@ it('stops a paused queue without asking, since nothing is replying', async () =>
   ])
   // Queued before this host opened the conversation: held paused, not handed over.
   vi.spyOn(journal, 'wroteBeforeOpen').mockReturnValue(true)
-  const cancel = vi.spyOn(rig.host, 'cancel').mockResolvedValue({ ok: true, value: {} })
+  const cancel = vi
+    .spyOn(rig.host, 'cancel')
+    .mockResolvedValue({ ok: true, value: { cancelled: true } })
   await rig.host.stopForSwitch(id, caller, deadline, false)
   expect(cancel).toHaveBeenCalledTimes(1)
 })
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
index 827e51c15ed0..f8fc91672f1e 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
@@ -212,7 +212,19 @@ it.each(['single', 'split', 'other-workspace', 'reselected'] as const)(
         })
       : undefined
     const focusEditorTab = vi.fn()
-    runtime.setNotifier({ focusEditorTab })
+    runtime.setNotifier({
+      worktreesChanged: vi.fn(),
+      reposChanged: vi.fn(),
+      activateWorktree: vi.fn(),
+      createTerminal: vi.fn(),
+      splitTerminal: vi.fn(),
+      renameTerminal: vi.fn(),
+      focusTerminal: vi.fn(),
+      closeTerminal: vi.fn(),
+      terminalFitOverrideChanged: vi.fn(),
+      terminalDriverChanged: vi.fn(),
+      focusEditorTab
+    })
     const acquisitions = rig.adapter.acquire.mock.calls.length
     const operation = executeStructuredSessionSwitch(
       {
diff --git a/src/main/runtime/session-tabs/switch-slot-anchors.test.ts b/src/main/runtime/session-tabs/switch-slot-anchors.test.ts
index 64354fd296e9..3784524c0bde 100644
--- a/src/main/runtime/session-tabs/switch-slot-anchors.test.ts
+++ b/src/main/runtime/session-tabs/switch-slot-anchors.test.ts
@@ -57,17 +57,19 @@ it('keeps the anchor a first attempt left when a retry after a lost answer place
 it.each([100, 1_000])('stamps %i rows in one pass, and touches none without an anchor', (n) => {
   const ids = Array.from({ length: n }, (_, index) => `tab-${index}`)
   let reads = 0
-  const counted = (snapshot: RuntimeMobileSessionTabsSnapshot) => ({
-    ...snapshot,
-    tabs: new Proxy(snapshot.tabs, {
-      get(target, key, receiver) {
-        if (typeof key === 'string' && /^\d+$/.test(key)) {
+  // Every row read goes through its index's getter.
+  const counted = (snapshot: RuntimeMobileSessionTabsSnapshot) => {
+    const tabs = [...snapshot.tabs]
+    tabs.forEach((row, index) =>
+      Object.defineProperty(tabs, index, {
+        get: () => {
           reads += 1
+          return row
         }
-        return Reflect.get(target, key, receiver)
-      }
-    })
-  })
+      })
+    )
+    return { ...snapshot, tabs }
+  }
   const anchors = new SwitchSlotAnchors()
   anchors.record('elsewhere', 'switched', { after: { tabId: 'source' } })
   const plain = counted(frame(ids))
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/slot-anchor-scaling.test.ts b/src/renderer/src/runtime/web-session-tabs-sync/slot-anchor-scaling.test.ts
index e19c3201e284..24764e1574ee 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/slot-anchor-scaling.test.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/slot-anchor-scaling.test.ts
@@ -72,14 +72,16 @@ it('reads this client’s tabs a linear number of times per frame as the workspa
       ...applyWebSessionTabsSnapshot(makeState(), frame(rows, 1), ENV, NOW)
     }
     let count = 0
-    const tabs = new Proxy(shown.unifiedTabsByWorktree[WT]!, {
-      get(target, key, receiver) {
-        if (typeof key === 'string' && /^\d+$/.test(key)) {
+    // Every tab read goes through its index's getter.
+    const tabs = [...shown.unifiedTabsByWorktree[WT]!]
+    tabs.forEach((tab, index) =>
+      Object.defineProperty(tabs, index, {
+        get: () => {
           count += 1
+          return tab
         }
-        return Reflect.get(target, key, receiver)
-      }
-    })
+      })
+    )
     applyWebSessionTabsSnapshot(
       { ...shown, unifiedTabsByWorktree: { [WT]: tabs } },
       frame(rows, 2),

From 35fd7f490a4178fab79b6361c5d0016491ac8d32 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 01:31:19 -0700
Subject: [PATCH 174/207] Expect the decided projection input in the session
 runtime dispatch test

---
 .../session-tabs/session-tab-prototype-dispatch.test.ts   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/runtime/session-tabs/session-tab-prototype-dispatch.test.ts b/src/main/runtime/session-tabs/session-tab-prototype-dispatch.test.ts
index 9cb135ea33e8..b6febe52ab89 100644
--- a/src/main/runtime/session-tabs/session-tab-prototype-dispatch.test.ts
+++ b/src/main/runtime/session-tabs/session-tab-prototype-dispatch.test.ts
@@ -359,7 +359,13 @@ describe('session runtime reentry', () => {
     await runtime.publishStructuredAgentSessionTab(input)
 
     expect(list).toHaveBeenCalledExactlyOnceWith('client')
-    expect(project).toHaveBeenCalledExactlyOnceWith(input)
+    // The projection gets what this write decided (no switch source here, so nothing gated it),
+    // not the request as sent.
+    expect(project).toHaveBeenCalledExactlyOnceWith({
+      ...input,
+      activate: false,
+      selectionDecided: false
+    })
   })
 
   it('re-enters the protected graph reload override', () => {

From 2f5cbd15d0bc1fae993fbf992f2240b8420d0156 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 01:34:12 -0700
Subject: [PATCH 175/207] Withdraw where a split switch would land after any
 definite failure, sent or not

---
 .../lib/conversation-surface-switch.test.tsx  | 61 +++++++++++++++++++
 .../src/lib/conversation-surface-switch.ts    |  6 +-
 2 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/src/renderer/src/lib/conversation-surface-switch.test.tsx b/src/renderer/src/lib/conversation-surface-switch.test.tsx
index 3c97235449b3..834e5efd91a3 100644
--- a/src/renderer/src/lib/conversation-surface-switch.test.tsx
+++ b/src/renderer/src/lib/conversation-surface-switch.test.tsx
@@ -21,6 +21,7 @@ const mocks = vi.hoisted(() => {
     pairedRefresh: vi.fn(),
     call: vi.fn(),
     legacy: vi.fn(async () => {}),
+    abandonFocus: vi.fn(),
     refresh: vi.fn(async () => {}),
     error: vi.fn(),
     info: vi.fn(),
@@ -51,6 +52,9 @@ vi.mock('@/runtime/runtime-rpc-client', async (original) => ({
 vi.mock('@/components/tab-bar/cli-chat-resume-terminal-capture', () => ({
   captureSourceTerminal: mocks.capture
 }))
+vi.mock('./conversation-switch-focus-intent', () => ({
+  recordConversationSwitchFocus: () => mocks.abandonFocus
+}))
 vi.mock('./ai-vault-session-resume-preparation', () => ({
   prepareAiVaultSessionForResume: mocks.prepare
 }))
@@ -234,3 +238,60 @@ it('sends no consent field to a host that does not decide consent (its strict sc
   await expect(runConversationSwitch(subject)).resolves.toBe(true)
   expect(mocks.call.mock.calls[0]![2].execution).not.toHaveProperty('consented')
 })
+
+const fromPane = {
+  tabId: 'terminal',
+  workspaceId: 'workspace',
+  paneKey: 'terminal:leaf',
+  agent: 'codex' as const,
+  providerSessionId: 'codex-session',
+  executionHostId: 'local' as const,
+  ptyId: 'pty'
+}
+it.each([
+  ['refuses', 'refused', true],
+  ['asks for consent and the user declines', 'declined', true],
+  ['fails before the request is sent', 'unsent', true],
+  ['loses the answer after the send', 'lost', false]
+] as const)(
+  'withdraws where a split switch would land when the host %s',
+  async (_name, outcome, withdrawn) => {
+    mocks.consent.mockResolvedValue(outcome === 'declined')
+    mocks.capture.mockResolvedValue({
+      target: { kind: 'environment', environmentId: 'paired' },
+      handle: 'terminal-source',
+      incarnationId: 'incarnation',
+      presentation: { identity: { tabId: 'host-terminal' }, holders: [] }
+    })
+    mocks.call.mockImplementation(
+      async (
+        _target: unknown,
+        _method: string,
+        _params: unknown,
+        options: { beforeSend: (sentAt?: number) => void }
+      ) => {
+        if (outcome === 'unsent') {
+          throw new Error('Remote Orca runtime is not connected.')
+        }
+        options.beforeSend()
+        if (outcome === 'lost') {
+          throw new Error('Runtime request closed before agentSession.switchToChat completed')
+        }
+        return {
+          status: 'refused',
+          sessionId: 'chat',
+          refusal: {
+            code: 'agent_session_operation_invalid',
+            details: { reason: outcome === 'declined' ? 'turnActive' : 'messagesUnsettled' }
+          }
+        }
+      }
+    )
+    const confirm = vi.fn(async () => false)
+    await expect(
+      runConversationSwitch({ direction: 'chat', ...fromPane, source: fromPane, confirm })
+    ).resolves.toBe(false)
+    expect(mocks.call).toHaveBeenCalledOnce()
+    expect(mocks.abandonFocus).toHaveBeenCalledTimes(withdrawn ? 1 : 0)
+  }
+)
diff --git a/src/renderer/src/lib/conversation-surface-switch.ts b/src/renderer/src/lib/conversation-surface-switch.ts
index ef2323ab9da4..fd94a130e584 100644
--- a/src/renderer/src/lib/conversation-surface-switch.ts
+++ b/src/renderer/src/lib/conversation-surface-switch.ts
@@ -91,6 +91,7 @@ export async function runConversationSwitch(args: ConversationSwitch): Promise<b
   let consented = false
   let sent = false
   let disposeDeadline: (() => void) | undefined
+  let request: Awaited<ReturnType<typeof switchRequest>> | undefined
   try {
     const supported = await withinSwitchBudget(supportsInPlaceSwitch(target, args.agent, true))
     // The chat's surfaces offer the copy where the host can't switch; a click that raced the
@@ -124,7 +125,6 @@ export async function runConversationSwitch(args: ConversationSwitch): Promise<b
       return false
     }
     let consent = hostConsents ? false : undefined
-    let request: Awaited<ReturnType<typeof switchRequest>> | undefined
     let answer: AgentSessionSwitchResult
     for (;;) {
       // Time spent answering the consent dialog is not the switch's budget.
@@ -189,6 +189,10 @@ export async function runConversationSwitch(args: ConversationSwitch): Promise<b
   } catch (error) {
     // Once the request left, a failure that isn't the host's answer can't say what the host did.
     const unknown = sent && !structuredLaunchFailure(error)
+    // Only an answer that may still arrive keeps this client's claim on where the chat lands.
+    if (!unknown) {
+      request?.abandonFocus?.()
+    }
     feedback(
       conversationSwitchFailureText(error, args, unknown ? 'outcomeUnknown' : undefined),
       'error'

From 2973b244ccb64ee49b96dd278e1f5704d63613b5 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 01:36:52 -0700
Subject: [PATCH 176/207] Treat a capability probe the host couldn't answer as
 unknown: the switch runs nothing and says try again

---
 .../lib/conversation-surface-switch.test.tsx  |  19 ++
 .../structured-agent-session-client.ts        |  25 +-
 ...tructured-agent-session-host-capability.ts | 230 ++----------------
 ...structured-agent-session-switch-consent.ts |   7 +-
 ...uctured-agent-session-switch-probe.test.ts |  21 ++
 5 files changed, 69 insertions(+), 233 deletions(-)
 create mode 100644 src/renderer/src/runtime/structured-agent-session-switch-probe.test.ts

diff --git a/src/renderer/src/lib/conversation-surface-switch.test.tsx b/src/renderer/src/lib/conversation-surface-switch.test.tsx
index 834e5efd91a3..7bec92faa735 100644
--- a/src/renderer/src/lib/conversation-surface-switch.test.tsx
+++ b/src/renderer/src/lib/conversation-surface-switch.test.tsx
@@ -295,3 +295,22 @@ it.each([
     expect(mocks.abandonFocus).toHaveBeenCalledTimes(withdrawn ? 1 : 0)
   }
 )
+
+it.each([
+  ['terminal', 'Codex could not switch to a terminal. Try again.'],
+  ['chat', 'Codex could not switch to chat. Try again.']
+] as const)(
+  'runs nothing when the host could not be asked whether it switches (to %s)',
+  async (direction, text) => {
+    // A dropped connection while the capability is re-read: not an older host.
+    mocks.support.mockRejectedValue(new Error('Remote Orca runtime is not connected.'))
+    const args =
+      direction === 'chat'
+        ? { direction, ...fromPane, source: fromPane }
+        : { ...subject, direction }
+    await expect(runConversationSwitch(args)).resolves.toBe(false)
+    expect(mocks.call).not.toHaveBeenCalled()
+    expect(mocks.legacy).not.toHaveBeenCalled()
+    expect(mocks.error).toHaveBeenCalledExactlyOnceWith(text)
+  }
+)
diff --git a/src/renderer/src/runtime/structured-agent-session-client.ts b/src/renderer/src/runtime/structured-agent-session-client.ts
index c3a238ecf35d..12d03b9c7ef4 100644
--- a/src/renderer/src/runtime/structured-agent-session-client.ts
+++ b/src/renderer/src/runtime/structured-agent-session-client.ts
@@ -35,10 +35,7 @@ import {
 } from '../../../shared/structured-agent-cli-conversation-adoption'
 import { callRuntimeRpc, runtimeEnvironmentSupportsCapability } from './runtime-rpc-client'
 import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
-import {
-  ensureLocalRuntimeCapabilities,
-  readLocalRuntimeCapabilitiesOrUnknown
-} from './local-runtime-capabilities'
+import { readStructuredAgentSessionHostSupport } from './structured-agent-session-host-capability'
 import { subscribeRuntimeRpc } from './runtime-rpc-subscribe'
 /** Read a capability through the runtime's existing status cache. A failed/unknown
  *  probe is treated as legacy so a newer call is never made before the host has
@@ -48,12 +45,7 @@ export async function structuredAgentSessionHostSupports(
   capability: RuntimeCapability
 ): Promise<boolean> {
   try {
-    if (target.kind === 'local') {
-      const known = readLocalRuntimeCapabilitiesOrUnknown()
-      const capabilities = known ?? (await ensureLocalRuntimeCapabilities())
-      return capabilities?.includes(capability) === true
-    }
-    return await runtimeEnvironmentSupportsCapability(target.environmentId, capability)
+    return await readStructuredAgentSessionHostSupport(target, capability)
   } catch {
     return false
   }
@@ -104,12 +96,13 @@ export function supportsInPlaceSwitch(
   agent: string,
   execution = false
 ): Promise<boolean> {
-  return inPlaceSwitchEnabled(agent)
-    ? structuredAgentSessionHostSupports(
-        target,
-        execution ? inPlaceSwitchExecutionCapability(agent) : inPlaceSwitchCapability(agent)
-      )
-    : Promise.resolve(false)
+  // The switch itself rejects on a probe it couldn't read, so it never mistakes a dropped
+  // connection for a host without the switch; surfaces only choose what to offer.
+  return !inPlaceSwitchEnabled(agent)
+    ? Promise.resolve(false)
+    : execution
+      ? readStructuredAgentSessionHostSupport(target, inPlaceSwitchExecutionCapability(agent))
+      : structuredAgentSessionHostSupports(target, inPlaceSwitchCapability(agent))
 }
 
 /** Whether the host writes no row for a Stop that stopped nothing, so a repeated Stop is quiet. */
diff --git a/src/renderer/src/runtime/structured-agent-session-host-capability.ts b/src/renderer/src/runtime/structured-agent-session-host-capability.ts
index e37d033cd663..3cfda602554a 100644
--- a/src/renderer/src/runtime/structured-agent-session-host-capability.ts
+++ b/src/renderer/src/runtime/structured-agent-session-host-capability.ts
@@ -1,222 +1,24 @@
-import { AGENT_SESSION_PERMISSION_OWN_RUNTIME_CAPABILITY } from '../../../shared/agent-session-permission-modes-capability'
-import { useEffect, useState, useSyncExternalStore } from 'react'
-import { useAppStore } from '@/store'
-import {
-  AGENT_SESSION_CONVERSATION_STOP_RUNTIME_CAPABILITY,
-  AGENT_SESSION_QUEUED_COMMANDS_RUNTIME_CAPABILITY,
-  AGENT_SESSION_QUEUED_MESSAGE_EDIT_RUNTIME_CAPABILITY,
-  AGENT_SESSION_QUEUED_MESSAGE_REORDER_RUNTIME_CAPABILITY,
-  AGENT_SESSION_QUEUED_MESSAGE_IMAGE_EDIT_RUNTIME_CAPABILITY,
-  AGENT_SESSION_QUEUED_MESSAGE_SKILLS_EDIT_RUNTIME_CAPABILITY,
-  AGENT_SESSION_QUEUED_MESSAGES_RUNTIME_CAPABILITY,
-  AGENT_SESSION_REWIND_RECOVERY_CAPABILITY,
-  type RuntimeCapability
-} from '../../../shared/protocol-version'
+import type { RuntimeCapability } from '../../../shared/protocol-version'
 import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
+import { runtimeEnvironmentSupportsCapability } from './runtime-rpc-client'
 import {
   ensureLocalRuntimeCapabilities,
-  readLocalRuntimeCapabilitiesOrUnknown,
-  subscribeLocalRuntimeCapabilityObservation
+  readLocalRuntimeCapabilitiesOrUnknown
 } from './local-runtime-capabilities'
-import { runtimeEnvironmentSupportsCapability } from './runtime-rpc-client'
-import { subscribeRuntimeHostContactRegained } from './runtime-host-contact-regained'
-import {
-  isRuntimeHostContactRevoked,
-  lastVerifiedRuntimeStatus
-} from '../../../shared/runtime-host-status'
-
-export function structuredAgentSessionHostKey(target: RuntimeClientTarget): string {
-  return target.kind === 'local' ? 'local' : `environment:${target.environmentId}`
-}
-
-/** Unknown before verification or after revocation; a contact outage retains the known build. */
-export type StructuredAgentSessionHostCapabilityState = 'unknown' | 'supported' | 'unsupported'
-
-/** Displays the existing host status; connection lifecycle owns probing. */
-export function useStructuredAgentSessionOwnPermissionState(
-  target: RuntimeClientTarget | null
-): StructuredAgentSessionHostCapabilityState {
-  const capability = AGENT_SESSION_PERMISSION_OWN_RUNTIME_CAPABILITY
-  const environmentId = target?.kind === 'environment' ? target.environmentId : null
-  // Select the verdict, not the map: unrelated host flips must not rerender every chat.
-  const remote = useAppStore((state): StructuredAgentSessionHostCapabilityState => {
-    if (environmentId === null) {
-      return 'unknown'
-    }
-    const entry = state.runtimeStatusByEnvironmentId.get(environmentId)
-    const status = isRuntimeHostContactRevoked(entry) ? null : lastVerifiedRuntimeStatus(entry)
-    return status
-      ? status.capabilities?.includes(capability)
-        ? 'supported'
-        : 'unsupported'
-      : 'unknown'
-  })
-  const local = useSyncExternalStore(
-    subscribeLocalRuntimeCapabilityObservation,
-    () => localCapabilityState(capability),
-    () => 'unknown' as const
-  )
-  useEffect(() => {
-    if (target?.kind === 'local') {
-      void ensureLocalRuntimeCapabilities()
-    }
-  }, [target?.kind])
-  return !target ? 'unknown' : environmentId === null ? local : remote
-}
 
-/** Whether the session's host advertises `capability`. A failed probe stays `unknown` and a remote
- *  host is asked again each time this client regains contact with it. */
-export function useStructuredAgentSessionHostCapabilityState(
-  target: RuntimeClientTarget | null,
-  capability: RuntimeCapability
-): StructuredAgentSessionHostCapabilityState {
-  const key = target ? structuredAgentSessionHostKey(target) : null
-  const [answer, setAnswer] = useState<{
-    key: string | null
-    state: StructuredAgentSessionHostCapabilityState
-  }>(() => ({
-    key,
-    state: target?.kind === 'local' ? localCapabilityState(capability) : 'unknown'
-  }))
-  const environmentId = target?.kind === 'environment' ? target.environmentId : null
-  const [contact, setContact] = useState(0)
-  useEffect(() => {
-    if (environmentId === null) {
-      return
-    }
-    return subscribeRuntimeHostContactRegained(environmentId, () => setContact((n) => n + 1))
-  }, [environmentId])
-  useEffect(() => {
-    if (key === null) {
-      return
-    }
-    let cancelled = false
-    const probe: Promise<StructuredAgentSessionHostCapabilityState> =
-      environmentId === null
-        ? ensureLocalRuntimeCapabilities().then(() => localCapabilityState(capability))
-        : runtimeEnvironmentSupportsCapability(environmentId, capability).then((supported) =>
-            supported ? 'supported' : 'unsupported'
-          )
-    void probe
-      .catch((): StructuredAgentSessionHostCapabilityState => 'unknown')
-      .then((state) => {
-        if (!cancelled) {
-          setAnswer((current) =>
-            current.key === key && current.state === state ? current : { key, state }
-          )
-        }
-      })
-    return () => {
-      cancelled = true
-    }
-  }, [capability, contact, environmentId, key])
-  return answer.key === key ? answer.state : 'unknown'
-}
-
-function localCapabilityState(
-  capability: RuntimeCapability
-): StructuredAgentSessionHostCapabilityState {
-  const capabilities = readLocalRuntimeCapabilitiesOrUnknown()
-  return capabilities === null
-    ? 'unknown'
-    : capabilities.includes(capability)
-      ? 'supported'
-      : 'unsupported'
-}
-
-/** Whether the session's host advertises `capability`. False until the host has said so, and for
- *  a failed probe: an older host is handled as it always was. */
-export function useStructuredAgentSessionHostCapability(
+/** The host's answer, rejecting when it couldn't be read: for an action that must tell "this
+ *  host can't" from "couldn't ask it" (a dropped connection is not an older host). */
+export async function readStructuredAgentSessionHostSupport(
   target: RuntimeClientTarget,
   capability: RuntimeCapability
-): boolean {
-  return useStructuredAgentSessionHostCapabilityState(target, capability) === 'supported'
-}
-
-/** Whether the host takes a Stop naming no turn: the only Stop before the provider opens one. */
-export function useStructuredAgentSessionHostStopsConversation(
-  target: RuntimeClientTarget
-): boolean {
-  return useStructuredAgentSessionHostCapability(
-    target,
-    AGENT_SESSION_CONVERSATION_STOP_RUNTIME_CAPABILITY
-  )
-}
-
-/** Whether the host settles a rewind left in doubt on the next send, agent running or not: only
- *  then may a client offer a rewind, which hands an in-doubt prompt back for that send. */
-export function useStructuredAgentSessionHostRecoversRewindOnSend(
-  target: RuntimeClientTarget
-): boolean {
-  return useStructuredAgentSessionHostCapability(target, AGENT_SESSION_REWIND_RECOVERY_CAPABILITY)
-}
-
-/** Whether the host holds mid-turn sends as drafts: only then may a client send `delivery`. The
- *  published cards and their queuedMessage actions are not gated on it. */
-export function useStructuredAgentSessionHostQueuesMessages(target: RuntimeClientTarget): boolean {
-  return useStructuredAgentSessionHostQueuesMessagesState(target) === 'supported'
-}
-
-/** Three-state: only `supported` lets a send ask to be queued; `unknown` holds nothing back. */
-export function useStructuredAgentSessionHostQueuesMessagesState(
-  target: RuntimeClientTarget
-): StructuredAgentSessionHostCapabilityState {
-  return useStructuredAgentSessionHostCapabilityState(
-    target,
-    AGENT_SESSION_QUEUED_MESSAGES_RUNTIME_CAPABILITY
-  )
-}
-
-/** Whether the host holds a /compact sent while the agent works as a queued card: only then may
- *  a client send the command's `delivery`, and only where it also renders the queue's cards. */
-export function useStructuredAgentSessionHostQueuesCommands(target: RuntimeClientTarget): boolean {
-  return useStructuredAgentSessionHostCapability(
-    target,
-    AGENT_SESSION_QUEUED_COMMANDS_RUNTIME_CAPABILITY
-  )
-}
-
-/** Whether the host edits a queued card in place and holds it from delivery while edited. Until
- *  it says so, and against an older host, a card offers no Edit. */
-export function useStructuredAgentSessionHostEditsQueuedMessages(
-  target: RuntimeClientTarget
-): boolean {
-  return useStructuredAgentSessionHostCapability(
-    target,
-    AGENT_SESSION_QUEUED_MESSAGE_EDIT_RUNTIME_CAPABILITY
-  )
-}
-
-/** Whether Save may send a queued card's image set; against an older host the edit is text only. */
-export function useStructuredAgentSessionHostEditsQueuedImages(
-  target: RuntimeClientTarget
-): boolean {
-  return useStructuredAgentSessionHostCapability(
-    target,
-    AGENT_SESSION_QUEUED_MESSAGE_IMAGE_EDIT_RUNTIME_CAPABILITY
-  )
-}
-
-/** Whether queue order can be changed by message ID on the execution host. */
-export function useStructuredAgentSessionHostReordersQueuedMessages(
-  target: RuntimeClientTarget
-): boolean {
-  return useStructuredAgentSessionHostCapability(
-    target,
-    AGENT_SESSION_QUEUED_MESSAGE_REORDER_RUNTIME_CAPABILITY
-  )
-}
-
-/** The API runtime owns Chat settings; on web the local API forwards to the active paired host. */
-export function useChatSettingsOwnPermissions(): boolean {
-  return useStructuredAgentSessionOwnPermissionState({ kind: 'local' }) === 'supported'
-}
-
-export function useStructuredAgentSessionHostEditsQueuedSkills(
-  target: RuntimeClientTarget
-): boolean {
-  return useStructuredAgentSessionHostCapability(
-    target,
-    AGENT_SESSION_QUEUED_MESSAGE_SKILLS_EDIT_RUNTIME_CAPABILITY
-  )
+): Promise<boolean> {
+  if (target.kind === 'local') {
+    const capabilities =
+      readLocalRuntimeCapabilitiesOrUnknown() ?? (await ensureLocalRuntimeCapabilities())
+    if (!capabilities) {
+      throw new Error('host capabilities unknown')
+    }
+    return capabilities.includes(capability)
+  }
+  return runtimeEnvironmentSupportsCapability(target.environmentId, capability)
 }
diff --git a/src/renderer/src/runtime/structured-agent-session-switch-consent.ts b/src/renderer/src/runtime/structured-agent-session-switch-consent.ts
index 1c796bf580bc..767680910a90 100644
--- a/src/renderer/src/runtime/structured-agent-session-switch-consent.ts
+++ b/src/renderer/src/runtime/structured-agent-session-switch-consent.ts
@@ -1,8 +1,9 @@
 import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
 import { SWITCH_CONSENT_RUNTIME_CAPABILITY } from '../../../shared/structured-agent-cli-conversation-adoption'
-import { structuredAgentSessionHostSupports } from './structured-agent-session-client'
+import { readStructuredAgentSessionHostSupport } from './structured-agent-session-host-capability'
 
-/** Whether the host decides a switch's consent (refuses a replying agent unless consented). */
+/** Whether the host decides a switch's consent (refuses a replying agent unless consented);
+ *  rejects when the host couldn't be asked. */
 export function supportsSwitchConsent(target: RuntimeClientTarget): Promise<boolean> {
-  return structuredAgentSessionHostSupports(target, SWITCH_CONSENT_RUNTIME_CAPABILITY)
+  return readStructuredAgentSessionHostSupport(target, SWITCH_CONSENT_RUNTIME_CAPABILITY)
 }
diff --git a/src/renderer/src/runtime/structured-agent-session-switch-probe.test.ts b/src/renderer/src/runtime/structured-agent-session-switch-probe.test.ts
new file mode 100644
index 000000000000..0fb764402aa8
--- /dev/null
+++ b/src/renderer/src/runtime/structured-agent-session-switch-probe.test.ts
@@ -0,0 +1,21 @@
+import { expect, it, vi } from 'vitest'
+import type * as RuntimeRpcClient from './runtime-rpc-client'
+import { supportsInPlaceSwitch } from './structured-agent-session-client'
+import { supportsSwitchConsent } from './structured-agent-session-switch-consent'
+
+vi.mock('./runtime-rpc-client', async (original) => ({
+  ...(await original<typeof RuntimeRpcClient>()),
+  // The connection dropped while the host's capabilities were re-read.
+  runtimeEnvironmentSupportsCapability: vi.fn(async () => {
+    throw new Error('Remote Orca runtime is not connected.')
+  })
+}))
+
+const paired = { kind: 'environment' as const, environmentId: 'paired' }
+
+it('lets the switch tell a host it could not ask from one without the switch', async () => {
+  await expect(supportsInPlaceSwitch(paired, 'codex', true)).rejects.toThrow('not connected')
+  await expect(supportsSwitchConsent(paired)).rejects.toThrow('not connected')
+  // Surfaces that only choose what to offer still read "not offered".
+  await expect(supportsInPlaceSwitch(paired, 'codex')).resolves.toBe(false)
+})

From 086810442894061c24020b58e0373d43037c8423 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 01:38:22 -0700
Subject: [PATCH 177/207] Let a switched chat's inherited client pin yield once
 the host's own pin on it changes

---
 .../web-session-tabs-sync-test-harness.ts     |  2 +
 .../inherited-chat-pins.ts                    | 48 +++++++++++++++++++
 .../replaced-slot-placement.test.ts           | 40 +++++++++-------
 .../terminal-surfaces.ts                      | 20 ++++++--
 4 files changed, 90 insertions(+), 20 deletions(-)
 create mode 100644 src/renderer/src/runtime/web-session-tabs-sync/inherited-chat-pins.ts

diff --git a/src/renderer/src/runtime/web-session-tabs-sync-test-harness.ts b/src/renderer/src/runtime/web-session-tabs-sync-test-harness.ts
index 7c315199a531..0c21f87510da 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync-test-harness.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync-test-harness.ts
@@ -1,4 +1,5 @@
 import type { RuntimeMobileSessionTabsResult } from '../../../shared/runtime-types'
+import { resetInheritedChatPinsForTests } from './web-session-tabs-sync/inherited-chat-pins'
 import type { TabGroupLayoutNode } from '../../../shared/tab-types'
 import { resetWebSessionFocusIntentForTests } from './web-session-focus-intent'
 import { resetWebSessionCloseIntentForTests } from './web-session-close-intent'
@@ -25,6 +26,7 @@ export function resetWebSessionTabsSyncTestState(): void {
   resetWebSessionReorderIntentForTests()
   resetWebAgentSessionHandoffsForTests()
   resetWebRuntimeInitialTerminalBootstrapForTests()
+  resetInheritedChatPinsForTests()
 }
 
 export function layoutHasGroup(layout: TabGroupLayoutNode | undefined, groupId: string): boolean {
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/inherited-chat-pins.ts b/src/renderer/src/runtime/web-session-tabs-sync/inherited-chat-pins.ts
new file mode 100644
index 000000000000..877df3a7c525
--- /dev/null
+++ b/src/renderer/src/runtime/web-session-tabs-sync/inherited-chat-pins.ts
@@ -0,0 +1,48 @@
+/**
+ * A switched chat takes its pin from the tab it replaced on this client, and keeps it while the
+ * host's flag still says what it said when this client adopted the chat. Once the host's flag
+ * changes (someone pinned or unpinned it there), the chat follows the host as any chat does.
+ * Renderer memory only: an entry dies with that change or when its chat leaves the snapshot.
+ */
+const hostPinAtAdoption = new Map<string, boolean>()
+
+const keyOf = (scope: string, sessionId: string) => `${scope}\0${sessionId}`
+
+export function adoptInheritedChatPin(scope: string, sessionId: string, hostPinned: boolean): void {
+  hostPinAtAdoption.set(keyOf(scope, sessionId), hostPinned)
+}
+
+/** Whether this client's inherited pin still stands against the host's flag on this frame. */
+export function inheritedChatPinHolds(
+  scope: string,
+  sessionId: string,
+  hostPinned: boolean | undefined
+): boolean {
+  const key = keyOf(scope, sessionId)
+  const adopted = hostPinAtAdoption.get(key)
+  if (adopted === undefined) {
+    return false
+  }
+  if (hostPinned !== undefined && hostPinned !== adopted) {
+    hostPinAtAdoption.delete(key)
+    return false
+  }
+  return true
+}
+
+/** Drops entries of this scope whose chats the snapshot no longer lists. */
+export function pruneInheritedChatPins(scope: string, listed: ReadonlySet<string>): void {
+  if (hostPinAtAdoption.size === 0) {
+    return
+  }
+  const prefix = `${scope}\0`
+  for (const key of hostPinAtAdoption.keys()) {
+    if (key.startsWith(prefix) && !listed.has(key.slice(prefix.length))) {
+      hostPinAtAdoption.delete(key)
+    }
+  }
+}
+
+export function resetInheritedChatPinsForTests(): void {
+  hostPinAtAdoption.clear()
+}
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/replaced-slot-placement.test.ts b/src/renderer/src/runtime/web-session-tabs-sync/replaced-slot-placement.test.ts
index ad38a14d1586..bd3e4151d24e 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/replaced-slot-placement.test.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/replaced-slot-placement.test.ts
@@ -212,24 +212,32 @@ it.each([
   }
 )
 
-it('keeps the pin a chat took from the terminal it replaced on every later frame', () => {
+it('keeps the pin a chat took from the terminal it replaced, until the host’s own pin changes', () => {
   const { state } = shownThree('host-a')
   // The host pinned its terminal; this client never did.
-  const replacing = { ...chat, replaces: { tabId: 'host-a' }, isPinned: true }
-  const frame = (snapshotVersion: number) =>
-    makeSnapshot([replacing, terminal('host-b'), terminal('host-c')], {
-      snapshotVersion,
-      tabGroups: [
-        { id: 'host-group-1', activeTabId: null, tabOrder: [chat.id, 'host-b', 'host-c'] }
-      ]
-    })
-  const first = apply(state, frame(2))
-  const second = apply(first, frame(3))
-  for (const next of [first, second]) {
-    expect(
-      next.unifiedTabsByWorktree[WT]!.find((tab) => tab.entityId === 'session-1')?.isPinned
-    ).toBe(false)
-  }
+  const frame = (snapshotVersion: number, hostPinned: boolean) =>
+    makeSnapshot(
+      [
+        { ...chat, replaces: { tabId: 'host-a' }, isPinned: hostPinned },
+        terminal('host-b'),
+        terminal('host-c')
+      ],
+      {
+        snapshotVersion,
+        tabGroups: [
+          { id: 'host-group-1', activeTabId: null, tabOrder: [chat.id, 'host-b', 'host-c'] }
+        ]
+      }
+    )
+  const pinned = (next: WebSessionTabsSyncState) =>
+    next.unifiedTabsByWorktree[WT]!.find((tab) => tab.entityId === 'session-1')?.isPinned
+  const first = apply(state, frame(2, true))
+  const second = apply(first, frame(3, true))
+  expect([pinned(first), pinned(second)]).toEqual([false, false])
+  // The desktop user unpins it, then pins it again: from the first change, the host decides.
+  const unpinned = apply(second, frame(4, false))
+  const repinned = apply(unpinned, frame(5, true))
+  expect([pinned(unpinned), pinned(repinned)]).toEqual([false, true])
 })
 
 it('places a destination in a split group this client is not looking at, without moving focus', () => {
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/terminal-surfaces.ts b/src/renderer/src/runtime/web-session-tabs-sync/terminal-surfaces.ts
index e431263685c9..3de2b9886d02 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/terminal-surfaces.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/terminal-surfaces.ts
@@ -22,6 +22,11 @@ import type {
   MirroredAgentTab
 } from './state'
 import type { Tab } from '../../../../shared/tab-types'
+import {
+  adoptInheritedChatPin,
+  inheritedChatPinHolds,
+  pruneInheritedChatPins
+} from './inherited-chat-pins'
 import { replacedTabPinned } from './slot-anchor'
 import type { ExecutionHostId } from '../../../../shared/execution-host'
 import { structuredAgentSessionTabId } from '../../../../shared/structured-agent-session-projection'
@@ -115,8 +120,14 @@ export function buildMirroredAgentTabs(
       replacementIds.add(existing.id)
     }
   }
+  const pinScope = `${executionHostId}\0${snapshot.worktree}`
+  pruneInheritedChatPins(pinScope, new Set(agentTabs.map((tab) => tab.sessionId)))
   return agentTabs.map((tab, index) => {
     const existing = replacementTabs.get(tab.sessionId) ?? firstUnreplaced(tab.sessionId)
+    const inheritedPin = existing ? undefined : replacedTabPinned(currentUnifiedTabs, tab)
+    if (inheritedPin !== undefined) {
+      adoptInheritedChatPin(pinScope, tab.sessionId, tab.isPinned === true)
+    }
     const launch = readStructuredAgentLaunchRecord(tab.sessionId)
     const address =
       executionHostId === 'local' &&
@@ -156,13 +167,14 @@ export function buildMirroredAgentTabs(
         color: tab.color !== undefined ? tab.color : (existing?.color ?? null),
         sortOrder: sortOffset + index,
         createdAt: existing?.createdAt ?? now + sortOffset + index,
-        // A chat in a replaced tab's slot keeps the pin it took from that tab here for its life,
-        // as a terminal does; the host's flag on later frames never flips it.
+        // A chat in a replaced tab's slot keeps the pin it took from that tab here until the
+        // host's own flag on it changes (inherited-chat-pins.ts).
         isPinned: existing
-          ? tab.isPinned !== undefined && !tab.replaces
+          ? tab.isPinned !== undefined &&
+            !inheritedChatPinHolds(pinScope, tab.sessionId, tab.isPinned)
             ? tab.isPinned
             : existing.isPinned === true
-          : (replacedTabPinned(currentUnifiedTabs, tab) ?? tab.isPinned === true)
+          : (inheritedPin ?? tab.isPinned === true)
       }
     }
   })

From bd91983ecd850eb11897302e2558c481a314d5e9 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 01:40:41 -0700
Subject: [PATCH 178/207] Resolve every slot anchor in an apply through one
 index of this client's tabs

---
 .../apply-preparation-base.ts                 | 10 ++-
 .../slot-anchor-scaling.test.ts               | 72 ++++++++++++-------
 .../web-session-tabs-sync/slot-anchor.ts      | 29 ++++++--
 3 files changed, 73 insertions(+), 38 deletions(-)

diff --git a/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-base.ts b/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-base.ts
index c11f5961f7c6..370b20e73fe4 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-base.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-base.ts
@@ -34,7 +34,7 @@ import {
   isTerminalRowRetiredByHost
 } from './host-retired-terminal-rows'
 import { hostSnapshotAffirmsWorktreeContents } from '../host-session-snapshot-authority'
-import { slotAnchorLocalTabIds, slotAnchorOf } from './slot-anchor'
+import { localTabIndex, slotAnchorLocalTabIds, slotAnchorOf } from './slot-anchor'
 
 export function prepareWebSessionTabsSnapshotBase(
   state: WebSessionTabsSyncState,
@@ -70,11 +70,9 @@ export function prepareWebSessionTabsSnapshotBase(
     : rawSnapshot
   const unifiedTabs = state.unifiedTabsByWorktree[worktreeId] ?? []
   const shownHere = (tab: RuntimeMobileSessionTabsResult['tabs'][number]): boolean =>
-    unifiedTabs.some((local) =>
-      tab.type === 'terminal'
-        ? local.id === toWebTerminalSurfaceTabId(tab.parentTabId)
-        : tab.type === 'agent-session' && local.entityId === tab.sessionId
-    )
+    tab.type === 'terminal'
+      ? localTabIndex(unifiedTabs).byId.has(toWebTerminalSurfaceTabId(tab.parentTabId))
+      : tab.type === 'agent-session' && localTabIndex(unifiedTabs).chatByEntity.has(tab.sessionId)
   // Why: only a caller-recorded create intent may focus its arriving tab; unsolicited server-active must not steal focus (#5435).
   const focusIntent = peekWebSessionFocusIntent({ environmentId }, worktreeId)
   const focusIntentHostTabId = focusIntent?.hostTabId ?? null
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/slot-anchor-scaling.test.ts b/src/renderer/src/runtime/web-session-tabs-sync/slot-anchor-scaling.test.ts
index 24764e1574ee..134529f2400f 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/slot-anchor-scaling.test.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/slot-anchor-scaling.test.ts
@@ -64,31 +64,51 @@ it.each([50, 500])(
   }
 )
 
-it('reads this client’s tabs a linear number of times per frame as the workspace grows', () => {
-  const reads = (n: number): number => {
-    const rows = Array.from({ length: n }, (_, index) => terminal(`host-${index}`))
-    const shown = {
-      ...makeState(),
-      ...applyWebSessionTabsSnapshot(makeState(), frame(rows, 1), ENV, NOW)
+it.each([0, 10])(
+  'reads this client’s tabs a linear number of times per frame as the workspace grows, with %i in 100 chats switched',
+  (switchedPer100) => {
+    const reads = (n: number): number => {
+      // K = n / 10 chats beside the terminals; each was switched to a terminal in its slot.
+      const switched = Math.floor((n * switchedPer100) / 100)
+      const chats = Array.from({ length: switched }, (_, index): Row => ({
+        type: 'agent-session',
+        id: `agent-session:chat-${index}`,
+        title: 'Codex',
+        sessionId: `chat-${index}`,
+        agent: 'codex',
+        isActive: false
+      }))
+      const rows = Array.from({ length: n - switched }, (_, index) => terminal(`host-${index}`))
+      const shown = {
+        ...makeState(),
+        ...applyWebSessionTabsSnapshot(makeState(), frame([...chats, ...rows], 1), ENV, NOW)
+      }
+      const next = [
+        ...chats.map((chat, index): Row => ({
+          ...terminal(`switched-${index}`),
+          replaces: { tabId: chat.id }
+        })),
+        ...rows
+      ]
+      let count = 0
+      // Every tab read goes through its index's getter.
+      const tabs = [...shown.unifiedTabsByWorktree[WT]!]
+      tabs.forEach((tab, index) =>
+        Object.defineProperty(tabs, index, {
+          get: () => {
+            count += 1
+            return tab
+          }
+        })
+      )
+      applyWebSessionTabsSnapshot(
+        { ...shown, unifiedTabsByWorktree: { [WT]: tabs } },
+        frame(next, 2),
+        ENV,
+        NOW
+      )
+      return count
     }
-    let count = 0
-    // Every tab read goes through its index's getter.
-    const tabs = [...shown.unifiedTabsByWorktree[WT]!]
-    tabs.forEach((tab, index) =>
-      Object.defineProperty(tabs, index, {
-        get: () => {
-          count += 1
-          return tab
-        }
-      })
-    )
-    applyWebSessionTabsSnapshot(
-      { ...shown, unifiedTabsByWorktree: { [WT]: tabs } },
-      frame(rows, 2),
-      ENV,
-      NOW
-    )
-    return count
+    expect(reads(500)).toBeLessThanOrEqual(15 * reads(50))
   }
-  expect(reads(500)).toBeLessThanOrEqual(15 * reads(50))
-})
+)
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/slot-anchor.ts b/src/renderer/src/runtime/web-session-tabs-sync/slot-anchor.ts
index 46744c694e35..3aa3987e74bc 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/slot-anchor.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/slot-anchor.ts
@@ -17,6 +17,26 @@ export function slotAnchorOf(row: RuntimeMobileSessionTabsResult['tabs'][number]
       : undefined
 }
 
+type LocalTabIndex = { byId: Map<string, Tab>; chatByEntity: Map<string, Tab> }
+const localTabIndexes = new WeakMap<readonly Tab[], LocalTabIndex>()
+
+/** This client's tabs by id and its chats by session, built once per tab list (O(tabs)) and
+ *  shared by every anchored row an apply resolves; nothing builds it without an anchor. */
+export function localTabIndex(unifiedTabs: readonly Tab[]): LocalTabIndex {
+  let index = localTabIndexes.get(unifiedTabs)
+  if (!index) {
+    index = { byId: new Map(), chatByEntity: new Map() }
+    for (const tab of unifiedTabs) {
+      index.byId.set(tab.id, tab)
+      if (tab.contentType === 'agent-session' && !index.chatByEntity.has(tab.entityId)) {
+        index.chatByEntity.set(tab.entityId, tab)
+      }
+    }
+    localTabIndexes.set(unifiedTabs, index)
+  }
+  return index
+}
+
 /** This client's ids for a tab the host names; a replaced chat has left the snapshot, so it is
  *  found by its session. */
 export function slotAnchorLocalTabIds(
@@ -25,11 +45,7 @@ export function slotAnchorLocalTabIds(
   hostToLocalTabId?: ReadonlyMap<string, string>
 ): string[] {
   const chat = isStructuredAgentSessionHostTabId(hostTabId)
-    ? unifiedTabs.find(
-        (tab) =>
-          tab.contentType === 'agent-session' &&
-          tab.entityId === hostTabId.slice('agent-session:'.length)
-      )
+    ? localTabIndex(unifiedTabs).chatByEntity.get(hostTabId.slice('agent-session:'.length))
     : undefined
   return [
     ...(chat ? [chat.id] : []),
@@ -48,6 +64,7 @@ export function replacedTabPinned(
 ): boolean | undefined {
   const anchor = slotAnchorOf(row)
   const ids = anchor && !anchor.after ? slotAnchorLocalTabIds(unifiedTabs, anchor.hostTabId) : []
-  const replaced = unifiedTabs.find((tab) => ids.includes(tab.id))
+  const byId = ids.length > 0 ? localTabIndex(unifiedTabs).byId : undefined
+  const replaced = ids.map((id) => byId?.get(id)).find((tab) => tab !== undefined)
   return replaced ? replaced.isPinned === true : undefined
 }

From 1a7ef5ea269f69ad43be7c85a298f5a554f5fb2d Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 01:42:43 -0700
Subject: [PATCH 179/207] Let History open the conversation as a chat when a
 stopped paired pane can no longer be captured

---
 .../lib/conversation-surface-switch.test.tsx  | 25 +++++++++++++++++++
 .../src/lib/conversation-surface-switch.ts    | 15 +++++++----
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/src/renderer/src/lib/conversation-surface-switch.test.tsx b/src/renderer/src/lib/conversation-surface-switch.test.tsx
index 7bec92faa735..6fccfc043f3b 100644
--- a/src/renderer/src/lib/conversation-surface-switch.test.tsx
+++ b/src/renderer/src/lib/conversation-surface-switch.test.tsx
@@ -7,6 +7,7 @@ import type * as SessionOwner from '@/runtime/structured-agent-session-owner'
 import { useAppStore } from '@/store'
 import { runConversationSwitch } from './conversation-surface-switch'
 import { pendingNativeChatCliSwitches } from './pending-conversation-surface-switches'
+import { makeTabSessionHistoryRow } from '@/components/tab-bar/tab-session-history-test-fixture'
 const mocks = vi.hoisted(() => {
   function makeTarget(): { current: RuntimeClientTarget } {
     return { current: { kind: 'local' } }
@@ -314,3 +315,27 @@ it.each([
     expect(mocks.error).toHaveBeenCalledExactlyOnceWith(text)
   }
 )
+
+it('opens the conversation from History beside a stopped paired pane it can no longer capture', async () => {
+  // A failed switch stopped the pane on a paired host; its binding is gone, so it can't be captured.
+  mocks.target.current = { kind: 'environment', environmentId: 'paired' }
+  mocks.capture.mockResolvedValue(null)
+  mocks.prepare.mockResolvedValue({ sessionId: 'codex-session' })
+  mocks.call.mockResolvedValue({ status: 'completed', sessionId: 'chat' })
+  const history = makeTabSessionHistoryRow({ agent: 'codex', sessionId: 'codex-session' })
+  await expect(
+    runConversationSwitch({ direction: 'chat', ...fromPane, source: fromPane, history })
+  ).resolves.toBe(true)
+  expect(mocks.prepare).toHaveBeenCalledWith(history)
+  const [, method, params] = mocks.call.mock.calls[0]!
+  expect(method).toBe('agentSession.switchToChat')
+  expect(params.execution).toMatchObject({ create: expect.any(Object) })
+  expect(params.execution).not.toHaveProperty('source')
+  expect(mocks.error).not.toHaveBeenCalled()
+  // Without History's conversation, the pane's own controls still say it can't switch.
+  mocks.call.mockClear()
+  await expect(
+    runConversationSwitch({ direction: 'chat', ...fromPane, source: fromPane })
+  ).resolves.toBe(false)
+  expect(mocks.call).not.toHaveBeenCalled()
+})
diff --git a/src/renderer/src/lib/conversation-surface-switch.ts b/src/renderer/src/lib/conversation-surface-switch.ts
index fd94a130e584..660b0ab49d74 100644
--- a/src/renderer/src/lib/conversation-surface-switch.ts
+++ b/src/renderer/src/lib/conversation-surface-switch.ts
@@ -229,11 +229,16 @@ async function switchRequest(
   abandonFocus?: () => void
 }> {
   const invocationId = createBrowserUuid()
-  if (args.direction === 'chat' && args.source) {
-    const captured = await deadline.wait(captureSourceTerminal(args.source))
-    if (!captured) {
-      throw new Error('source unavailable')
-    }
+  const captured =
+    args.direction === 'chat' && args.source
+      ? await deadline.wait(captureSourceTerminal(args.source))
+      : null
+  // A pane that can't be captured (a paired host's pane a failed switch stopped has lost its
+  // binding) still lets History open the conversation as a chat beside it, as before the switch.
+  if (args.direction === 'chat' && args.source && !captured && !args.history) {
+    throw new Error('source unavailable')
+  }
+  if (args.direction === 'chat' && args.source && captured) {
     const intent = createStructuredAgentSessionLaunchIntent(
       args.workspaceId,
       await deadline.wait(

From 357bd38d24164bb4444b0a3a69461bcde9d9de1d Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 02:17:14 -0700
Subject: [PATCH 180/207] Keep a user's Stop as Interrupted however the chat
 later reads the turn

Each agent's own stop record now carries the user's Stop: Codex turn_aborted with reason interrupted (only that reason), Claude's interruption notice (with or without the interrupted message's id), and Pi's aborted reply. A switch that stopped the exact CLI turn with proof of exit records interrupted + cancellation on that turn's normal record right away, before any later read, adoption or publication can fail; a first adoption founds the chat on the history read before the stop when the file can't be read after it. An interruption saved earlier without its verdict is explained when evidence arrives, keeping its id and content. A chat the switch stopped and proved exited no longer keeps the "could not confirm Stop" note; an unacknowledged goal pause keeps its own. With no proof and no stop record a dead turn keeps the ruled interruption.
---
 .../codex-qa-3734-stop-marker-only-1.jsonl    |  12 +
 .../codex-qa-3734-stop-marker-only-2.jsonl    |  12 +
 ...ructured-agent-session-at-rest-catch-up.ts |  23 +-
 .../structured-agent-session-chat-stop.ts     |   3 +-
 ...structured-agent-session-create-options.ts |   3 +
 .../structured-agent-session-create.ts        |   5 +-
 .../structured-agent-session-host.ts          |   3 +
 ...ctured-agent-session-switch-import.test.ts |  24 +-
 .../structured-agent-session-switch-import.ts | 101 ++++-
 ...d-agent-session-switch-proven-chat-stop.ts |  54 +++
 .../structured-agent-session-switch-source.ts |  34 ++
 ...ed-agent-session-switch-stop-label.test.ts | 353 ++++++++++++++++++
 ...structured-agent-session-synthetic-turn.ts |  24 +-
 .../transcript-turn-lifecycle.test.ts         |  53 +++
 .../native-chat/transcript-turn-lifecycle.ts  |  35 +-
 .../structured-agent-session-create.ts        |   2 +
 ...ructured-agent-session-switch-execution.ts |  11 +-
 17 files changed, 722 insertions(+), 30 deletions(-)
 create mode 100644 src/main/native-chat/agent-session-wire/__fixtures__/codex-qa-3734-stop-marker-only-1.jsonl
 create mode 100644 src/main/native-chat/agent-session-wire/__fixtures__/codex-qa-3734-stop-marker-only-2.jsonl
 create mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-switch-proven-chat-stop.ts
 create mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-switch-stop-label.test.ts

diff --git a/src/main/native-chat/agent-session-wire/__fixtures__/codex-qa-3734-stop-marker-only-1.jsonl b/src/main/native-chat/agent-session-wire/__fixtures__/codex-qa-3734-stop-marker-only-1.jsonl
new file mode 100644
index 000000000000..6d49a3f808db
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/__fixtures__/codex-qa-3734-stop-marker-only-1.jsonl
@@ -0,0 +1,12 @@
+{"timestamp":"2026-10-31T07:13:16.468Z","ordinal":0,"type":"session_meta","payload":{"id":"01a190ce-384d-7be3-b9b1-92f7069b4966","timestamp":"2026-10-31T07:13:16.398Z","history_mode":"paginated","originator":"orca_desktop","cli_version":"0.162.1","cwd":"/workspace"}}
+{"timestamp":"2026-10-31T07:13:16.468Z","ordinal":1,"type":"event_msg","payload":{"type":"task_started","turn_attribution":{"turn_id":"01a190ce-3895-7aa1-9378-dfe61ba65ea4","turn_trigger":null,"parent_turn_id":null,"initiating_agent_path":null,"root_turn_id":"01a190ce-3895-7aa1-9378-dfe61ba65ea4"},"turn_id":"01a190ce-3895-7aa1-9378-dfe61ba65ea4","root_turn_id":"01a190ce-3895-7aa1-9378-dfe61ba65ea4","started_at":1793430796,"model_context_window":258400,"collaboration_mode_kind":"default"}}
+{"timestamp":"2026-10-31T07:13:17.908Z","ordinal":9,"type":"event_msg","payload":{"type":"item_completed","thread_id":"01a190ce-384d-7be3-b9b1-92f7069b4966","turn_id":"01a190ce-3895-7aa1-9378-dfe61ba65ea4","item":{"type":"UserMessage","id":"01a190ce-3e53-7ec0-a5d6-b324984807ee","client_id":"1793430796229-a05a47624cd5492a9acff21d0d972c85","content":[{"type":"text","text":"Reply with the single word F8A-codex-1","text_elements":[]}]},"started_at_ms":1793430797908,"completed_at_ms":1793430797908}}
+{"timestamp":"2026-10-31T07:13:22.268Z","ordinal":10,"type":"event_msg","payload":{"type":"item_completed","thread_id":"01a190ce-384d-7be3-b9b1-92f7069b4966","turn_id":"01a190ce-3895-7aa1-9378-dfe61ba65ea4","item":{"type":"AgentMessage","id":"msg_0aaa0852706e5b3f016ae595122bb48198b3f1bf1cc01dcc94","content":[{"type":"Text","text":"F8A-codex-1"}],"phase":"final_answer"},"started_at_ms":1793430802179,"completed_at_ms":1793430802268}}
+{"timestamp":"2026-10-31T07:13:22.297Z","ordinal":14,"type":"event_msg","payload":{"type":"task_complete","root_turn_id":"01a190ce-3895-7aa1-9378-dfe61ba65ea4","turn_id":"01a190ce-3895-7aa1-9378-dfe61ba65ea4","last_agent_message":"F8A-codex-1","started_at":1793430796,"completed_at":1793430802,"duration_ms":5858,"time_to_first_token_ms":5753}}
+{"timestamp":"2026-10-31T07:13:48.980Z","ordinal":17,"type":"event_msg","payload":{"type":"task_started","turn_attribution":{"turn_id":"01a190ce-b7b1-7762-958b-386e0558d0db","turn_trigger":"user","parent_turn_id":null,"initiating_agent_path":null,"root_turn_id":"01a190ce-b7b1-7762-958b-386e0558d0db"},"turn_id":"01a190ce-b7b1-7762-958b-386e0558d0db","root_turn_id":"01a190ce-b7b1-7762-958b-386e0558d0db","started_at":1793430828,"model_context_window":258400,"collaboration_mode_kind":"default"}}
+{"timestamp":"2026-10-31T07:13:49.046Z","ordinal":23,"type":"event_msg","payload":{"type":"item_completed","thread_id":"01a190ce-384d-7be3-b9b1-92f7069b4966","turn_id":"01a190ce-b7b1-7762-958b-386e0558d0db","item":{"type":"UserMessage","id":"01a190ce-b7f6-7572-a386-03ca5cdef515","client_id":"619f5257-bf49-4ad0-abf3-71e529d6e974","content":[{"type":"text","text":"Reply with the single word F8ASAVED","text_elements":[]}]},"started_at_ms":1793430829046,"completed_at_ms":1793430829046}}
+{"timestamp":"2026-10-31T07:13:50.885Z","ordinal":24,"type":"event_msg","payload":{"type":"item_completed","thread_id":"01a190ce-384d-7be3-b9b1-92f7069b4966","turn_id":"01a190ce-b7b1-7762-958b-386e0558d0db","item":{"type":"AgentMessage","id":"msg_095801543e63b762016ae5952eb1548199954ffa73825d757d","content":[{"type":"Text","text":"F8ASAVED"}],"phase":"final_answer"},"started_at_ms":1793430830812,"completed_at_ms":1793430830885}}
+{"timestamp":"2026-10-31T07:13:51.015Z","ordinal":28,"type":"event_msg","payload":{"type":"task_complete","root_turn_id":"01a190ce-b7b1-7762-958b-386e0558d0db","turn_id":"01a190ce-b7b1-7762-958b-386e0558d0db","last_agent_message":"F8ASAVED","started_at":1793430828,"completed_at":1793430831,"duration_ms":2034,"time_to_first_token_ms":1832}}
+{"timestamp":"2026-10-31T07:14:02.741Z","ordinal":30,"type":"event_msg","payload":{"type":"task_started","turn_attribution":{"turn_id":"01a190ce-ed72-7401-89da-a327957ec74b","turn_trigger":"user","parent_turn_id":null,"initiating_agent_path":null,"root_turn_id":"01a190ce-ed72-7401-89da-a327957ec74b"},"turn_id":"01a190ce-ed72-7401-89da-a327957ec74b","root_turn_id":"01a190ce-ed72-7401-89da-a327957ec74b","started_at":1793430842,"model_context_window":258400,"collaboration_mode_kind":"default"}}
+{"timestamp":"2026-10-31T07:14:02.783Z","ordinal":33,"type":"event_msg","payload":{"type":"item_completed","thread_id":"01a190ce-384d-7be3-b9b1-92f7069b4966","turn_id":"01a190ce-ed72-7401-89da-a327957ec74b","item":{"type":"UserMessage","id":"01a190ce-ed9e-75c2-af72-900948cef0bd","client_id":"d4a2b444-317b-4251-9ff9-e8b63e4a71b0","content":[{"type":"text","text":"Write a 300-line poem about canyons, numbered lines, no preamble.","text_elements":[]}]},"started_at_ms":1793430842783,"completed_at_ms":1793430842783}}
+{"timestamp":"2026-10-31T07:14:26.945Z","ordinal":35,"type":"response_item","payload":{"type":"message","id":"msg_01a190cf-4c01-70c1-b4f9-c7959033fd25","role":"developer","content":[{"type":"input_text","text":"<turn_aborted>\nThe previous turn was interrupted on purpose. Any running unified exec processes may still be running in the background. If any tools/commands were aborted, they may have partially executed.\n</turn_aborted>"}],"internal_chat_message_metadata_passthrough":{"turn_id":"01a190ce-ed72-7401-89da-a327957ec74b","create_time":1793430866.945311,"content_item_kinds":["generic.turn_aborted"]}}}
diff --git a/src/main/native-chat/agent-session-wire/__fixtures__/codex-qa-3734-stop-marker-only-2.jsonl b/src/main/native-chat/agent-session-wire/__fixtures__/codex-qa-3734-stop-marker-only-2.jsonl
new file mode 100644
index 000000000000..05ddc7b9e0b6
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/__fixtures__/codex-qa-3734-stop-marker-only-2.jsonl
@@ -0,0 +1,12 @@
+{"timestamp":"2026-10-31T07:16:42.281Z","ordinal":0,"type":"session_meta","payload":{"id":"01a190d1-5c38-75e2-ae52-84acc7d4b2c7","timestamp":"2026-10-31T07:16:42.202Z","history_mode":"paginated","originator":"orca_desktop","cli_version":"0.162.1","cwd":"/workspace"}}
+{"timestamp":"2026-10-31T07:16:42.281Z","ordinal":1,"type":"event_msg","payload":{"type":"task_started","turn_attribution":{"turn_id":"01a190d1-5c84-7de3-bff5-3b4671b4c160","turn_trigger":null,"parent_turn_id":null,"initiating_agent_path":null,"root_turn_id":"01a190d1-5c84-7de3-bff5-3b4671b4c160"},"turn_id":"01a190d1-5c84-7de3-bff5-3b4671b4c160","root_turn_id":"01a190d1-5c84-7de3-bff5-3b4671b4c160","started_at":1793431002,"model_context_window":258400,"collaboration_mode_kind":"default"}}
+{"timestamp":"2026-10-31T07:16:43.219Z","ordinal":9,"type":"event_msg","payload":{"type":"item_completed","thread_id":"01a190d1-5c38-75e2-ae52-84acc7d4b2c7","turn_id":"01a190d1-5c84-7de3-bff5-3b4671b4c160","item":{"type":"UserMessage","id":"01a190d1-6052-7761-93f8-0630191f1a74","client_id":"1793431002020-951f0abd6e544574ad8fc7dccc7a7718","content":[{"type":"text","text":"Reply with the single word F8B-codex-1","text_elements":[]}]},"started_at_ms":1793431003219,"completed_at_ms":1793431003219}}
+{"timestamp":"2026-10-31T07:16:44.674Z","ordinal":10,"type":"event_msg","payload":{"type":"item_completed","thread_id":"01a190d1-5c38-75e2-ae52-84acc7d4b2c7","turn_id":"01a190d1-5c84-7de3-bff5-3b4671b4c160","item":{"type":"AgentMessage","id":"msg_0975b6e94f7c2429016ae595dc98dc8193a19558cabda7aa5c","content":[{"type":"Text","text":"F8B-codex-1"}],"phase":"final_answer"},"started_at_ms":1793431004612,"completed_at_ms":1793431004674}}
+{"timestamp":"2026-10-31T07:16:44.700Z","ordinal":14,"type":"event_msg","payload":{"type":"task_complete","root_turn_id":"01a190d1-5c84-7de3-bff5-3b4671b4c160","turn_id":"01a190d1-5c84-7de3-bff5-3b4671b4c160","last_agent_message":"F8B-codex-1","started_at":1793431002,"completed_at":1793431004,"duration_ms":2454,"time_to_first_token_ms":2368}}
+{"timestamp":"2026-10-31T07:16:59.506Z","ordinal":17,"type":"event_msg","payload":{"type":"task_started","turn_attribution":{"turn_id":"01a190d1-9fee-7710-a2d8-6f9489b3b9d7","turn_trigger":"user","parent_turn_id":null,"initiating_agent_path":null,"root_turn_id":"01a190d1-9fee-7710-a2d8-6f9489b3b9d7"},"turn_id":"01a190d1-9fee-7710-a2d8-6f9489b3b9d7","root_turn_id":"01a190d1-9fee-7710-a2d8-6f9489b3b9d7","started_at":1793431019,"model_context_window":258400,"collaboration_mode_kind":"default"}}
+{"timestamp":"2026-10-31T07:16:59.618Z","ordinal":23,"type":"event_msg","payload":{"type":"item_completed","thread_id":"01a190d1-5c38-75e2-ae52-84acc7d4b2c7","turn_id":"01a190d1-9fee-7710-a2d8-6f9489b3b9d7","item":{"type":"UserMessage","id":"01a190d1-a05f-7fb3-889e-da38b5130a81","client_id":"994ea6f5-d121-4c3f-b716-ddb0344397b0","content":[{"type":"text","text":"Reply with the single word F8BSAVED","text_elements":[]}]},"started_at_ms":1793431019618,"completed_at_ms":1793431019618}}
+{"timestamp":"2026-10-31T07:17:01.084Z","ordinal":24,"type":"event_msg","payload":{"type":"item_completed","thread_id":"01a190d1-5c38-75e2-ae52-84acc7d4b2c7","turn_id":"01a190d1-9fee-7710-a2d8-6f9489b3b9d7","item":{"type":"AgentMessage","id":"msg_069e44755a563497016ae595ed03ec8190b4900626bbfa44c3","content":[{"type":"Text","text":"F8BSAVED"}],"phase":"final_answer"},"started_at_ms":1793431021038,"completed_at_ms":1793431021084}}
+{"timestamp":"2026-10-31T07:17:01.154Z","ordinal":28,"type":"event_msg","payload":{"type":"task_complete","root_turn_id":"01a190d1-9fee-7710-a2d8-6f9489b3b9d7","turn_id":"01a190d1-9fee-7710-a2d8-6f9489b3b9d7","last_agent_message":"F8BSAVED","started_at":1793431019,"completed_at":1793431021,"duration_ms":1648,"time_to_first_token_ms":1537}}
+{"timestamp":"2026-10-31T07:17:13.513Z","ordinal":30,"type":"event_msg","payload":{"type":"task_started","turn_attribution":{"turn_id":"01a190d1-d6a5-7990-ad77-2500e59457c8","turn_trigger":"user","parent_turn_id":null,"initiating_agent_path":null,"root_turn_id":"01a190d1-d6a5-7990-ad77-2500e59457c8"},"turn_id":"01a190d1-d6a5-7990-ad77-2500e59457c8","root_turn_id":"01a190d1-d6a5-7990-ad77-2500e59457c8","started_at":1793431033,"model_context_window":258400,"collaboration_mode_kind":"default"}}
+{"timestamp":"2026-10-31T07:17:13.552Z","ordinal":33,"type":"event_msg","payload":{"type":"item_completed","thread_id":"01a190d1-5c38-75e2-ae52-84acc7d4b2c7","turn_id":"01a190d1-d6a5-7990-ad77-2500e59457c8","item":{"type":"UserMessage","id":"01a190d1-d6cf-79c1-9e65-726a26c6bb32","client_id":"1b7f0237-0147-470c-82d4-bcae2bc74418","content":[{"type":"text","text":"Write a 300-line poem about glaciers, numbered lines, no preamble.","text_elements":[]}]},"started_at_ms":1793431033552,"completed_at_ms":1793431033552}}
+{"timestamp":"2026-10-31T07:17:39.482Z","ordinal":35,"type":"response_item","payload":{"type":"message","id":"msg_01a190d2-3c1a-7a51-994e-b89a426e0e85","role":"developer","content":[{"type":"input_text","text":"<turn_aborted>\nThe previous turn was interrupted on purpose. Any running unified exec processes may still be running in the background. If any tools/commands were aborted, they may have partially executed.\n</turn_aborted>"}],"internal_chat_message_metadata_passthrough":{"turn_id":"01a190d1-d6a5-7990-ad77-2500e59457c8","create_time":1793431059.482895,"content_item_kinds":["generic.turn_aborted"]}}}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.ts
index 541343e761f6..7f7575d564ef 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-catch-up.ts
@@ -33,6 +33,7 @@ import {
 } from './structured-agent-session-codex-turns'
 import {
   isSyntheticInterruptedTurn,
+  isUnexplainedInterruptedTurn,
   turnRecordReplaceable
 } from './structured-agent-session-synthetic-turn'
 
@@ -44,6 +45,8 @@ type CodexTurn = {
   baseline: boolean
   /** The saved row that opened a baseline turn, so its record anchors to the real prompt. */
   opener?: string
+  /** A baseline turn's existing record that a later boundary may still replace or explain. */
+  recorded?: Extract<AgentJournalItemBody, { kind: 'turn' }>
   ended: boolean
 }
 
@@ -89,11 +92,14 @@ export async function catchUpStructuredSessionAtRest(input: {
     }
     items.push(item)
   }
-  const settled = (turnId: string) => {
+  // A known turn is settled unless Orca settled it or its interruption still lacks a verdict.
+  const revisited = (turnId: string) => {
     const current = journal.item(
       journal.canonicalItemId(agentJournalItemKey(lifecycleIdentity(threadId, turnId)))
-    )
-    return view.known.has(turnId) && !isSyntheticInterruptedTurn(current?.body)
+    )?.body
+    return isSyntheticInterruptedTurn(current) || isUnexplainedInterruptedTurn(current)
+      ? current
+      : undefined
   }
   let prompts: Map<string, string> | undefined
   let turn: CodexTurn | undefined
@@ -108,6 +114,10 @@ export async function catchUpStructuredSessionAtRest(input: {
     }
     if (target.messages) {
       retain({ ...item, body })
+    } else if (target.recorded) {
+      // Its record exists: the boundary replaces or explains it, keeping the record's anchor.
+      const anchor = target.recorded.userItemId
+      retain({ ...item, body: { ...body, ...(anchor ? { userItemId: anchor } : {}) } })
     } else if (target.baseline) {
       // No saved prompt row to anchor to: write nothing rather than a dangling opener.
       baseline = target.opener
@@ -166,11 +176,14 @@ export async function catchUpStructuredSessionAtRest(input: {
       if (imported) {
         baseline = undefined
       }
+      const recorded = revisited(id)
+      const open = Boolean(recorded) || !view.known.has(id)
       turn = id
         ? {
             id,
-            messages: !imported && !settled(id),
-            baseline: imported && !settled(id),
+            messages: !imported && open,
+            baseline: imported && open,
+            ...(imported && recorded ? { recorded } : {}),
             ended: false
           }
         : undefined
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-chat-stop.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-chat-stop.ts
index 8931a19b56b8..5cfefdf5c830 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-chat-stop.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-chat-stop.ts
@@ -29,6 +29,7 @@ import {
 } from './structured-agent-session-stop-wind-down'
 import { performCancel, type AcceptedChatStop } from './structured-agent-session-turns-cancel'
 import { contextStructuredAgentSessionCurrentWork } from './structured-agent-session-current-work'
+import { structuredAgentSessionChildStopFeedbackId } from './structured-agent-session-switch-proven-chat-stop'
 import type { AgentSessionTurnContext, TurnOutcome } from './structured-agent-session-turns'
 import type { AgentSessionCloseObserver } from './structured-agent-session-adapter-stop'
 import {
@@ -92,7 +93,7 @@ export function mutateWithChatStop<TValue>(
       return { ok: true, value: { ...named, cancelled: settled } }
     }
     const { child } = target
-    const feedbackId = `child:${child.fence}:${child.generation ?? 'unknown'}`
+    const feedbackId = structuredAgentSessionChildStopFeedbackId(child)
     let stopOutcome = child.close?.stopOutcome
     const observeClose: AgentSessionCloseObserver = (evidence) => {
       if (stopOutcome && evidence) {
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-create-options.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-create-options.ts
index c93dcf13819b..273b1de00bd7 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-create-options.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-create-options.ts
@@ -1,6 +1,7 @@
 import type { StructuredAgentSessionFirstMessage } from '../../../shared/structured-agent-session-create'
 import type { reserveRequestFor } from './structured-agent-session-attach'
 import type { AgentSessionExecutionOptions } from '../../../shared/agent-session-execution-options'
+import type { SwitchStoppedCliTurn } from './structured-agent-session-switch-import'
 
 export type StructuredAgentSessionCreateOptions = {
   check?: () => void
@@ -9,6 +10,8 @@ export type StructuredAgentSessionCreateOptions = {
   catalogModels?: Parameters<typeof reserveRequestFor>[0]['models']
   /** Publish after durable creation, before agent delivery starts. */
   publishTab?: () => Promise<void>
+  /** The CLI turn a switch stopped with proof before this adoption. */
+  switchStop?: SwitchStoppedCliTurn
 }
 
 /** Opening messages retain creation-time model/effort choices like later sends. */
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-create.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-create.ts
index b86901c8672e..2e5aac08e4fa 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-create.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-create.ts
@@ -18,6 +18,7 @@ import {
   prepareCreateTranscript,
   importAdoptedTranscript
 } from './structured-agent-session-adopted-import'
+import { withSwitchStoppedTurn } from './structured-agent-session-switch-import'
 import {
   pinnedAgentSessionLaunchArgs,
   pinnedAgentSessionLaunchEnv
@@ -149,9 +150,11 @@ async function foundConversation(
             )
     }
   }
-  const prepared = replayed
+  const read = replayed
     ? { ok: true as const, items: null }
     : await prepareCreateTranscript(context, params)
+  const prepared =
+    options.switchStop && !replayed ? withSwitchStoppedTurn(read, options.switchStop) : read
   if (!prepared.ok) {
     const { refusal } = prepared
     return {
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
index f68d8bb4658f..91e4db79a494 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
@@ -196,6 +196,9 @@ export class StructuredAgentSessionHost extends StructuredAgentSessionHostContex
   stopForSwitch = (
     ...args: Parameters<ReturnType<typeof structuredAgentSessionSwitchSource>['stopForSwitch']>
   ) => this.switchSource().stopForSwitch(...args)
+  commitSwitchStop = (
+    ...args: Parameters<ReturnType<typeof structuredAgentSessionSwitchSource>['commitSwitchStop']>
+  ) => this.switchSource().commitSwitchStop(...args)
   refreshSwitchTranscript = (
     ...args: Parameters<
       ReturnType<typeof structuredAgentSessionSwitchSource>['refreshSwitchTranscript']
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.test.ts
index 711f035473c0..bd9ff663952a 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.test.ts
@@ -214,11 +214,14 @@ it.each([
       const historyWithMarker = await imported('historical-interruption-marker')
       await refresh({ journal: historyWithMarker, source, fence: 1, deadline })
       const [historicalTurn] = turns(historyWithMarker)
-      expect(historicalTurn).toMatchObject({ state: 'interrupted', turnId: stopped!.turnId })
-      expect(historicalTurn!.outcome).toBeUndefined()
-      expect(agentTurnVerdict({ state: historicalTurn!.state, outcome: null })).toBe('interruption')
+      // Claude's own interruption notice is the user's Stop, with or without this switch's proof.
+      expect(historicalTurn).toMatchObject({
+        state: 'interrupted',
+        turnId: stopped!.turnId,
+        outcome: 'cancellation'
+      })
       const historyItems = historyWithMarker.snapshot().items
-      expect(withNativeChatCutTurnNotices(historyItems)).toHaveLength(historyItems.length + 1)
+      expect(withNativeChatCutTurnNotices(historyItems)).toBe(historyItems)
       const stoppedWithMarker = await imported('stopped-interruption-marker')
       await refresh({
         journal: stoppedWithMarker,
@@ -347,7 +350,18 @@ it.each([
           stopped
         })
         expect(retained.canonicalItemId(canonicalTurn)).toBe(canonicalTurn)
-        expect(retained.snapshot()).toEqual(snapshot)
+        if (personalStop) {
+          expect(retained.snapshot()).toEqual(snapshot)
+        } else {
+          // A proven stop explains the interruption an earlier import saved without a verdict.
+          expect(retained.item(canonicalTurn)?.body).toEqual({
+            ...firstEnd!.body,
+            outcome: 'cancellation'
+          })
+          expect(retained.snapshot().items.filter(({ body }) => body.kind !== 'turn')).toEqual(
+            snapshot.items.filter(({ body }) => body.kind !== 'turn')
+          )
+        }
       }
     }
     await install(true)
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.ts
index 44f2a7aad943..4990fab7fd46 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.ts
@@ -15,12 +15,14 @@ import {
   type AgentJournalItemBody
 } from '../../../shared/agent-session-journal-types'
 import { agentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
+import type { AgentSessionWireRefusal } from '../../../shared/agent-session-wire'
 import type { AgentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
 import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
 import { prepareLegacyTranscriptImport } from '../agent-session-journal/journal-legacy-import'
 import type { JournalReplacementItem } from '../agent-session-journal/journal-epoch-replacement'
 import {
   isSyntheticInterruptedTurn,
+  isUnexplainedInterruptedTurn,
   turnRecordReplaceable
 } from './structured-agent-session-synthetic-turn'
 
@@ -32,10 +34,17 @@ export type SwitchTranscriptSource = {
   source?: AdoptedTranscriptSource
 }
 
+type AdoptedTranscriptRead =
+  | { ok: true; items: JournalReplacementItem[] | null }
+  | { ok: false; refusal: AgentSessionWireRefusal }
+
 export type SwitchStoppedCliTurn = {
+  agent: AgentType
   sessionId: string
   userItemKey: string
   turnId: string
+  /** The history read before the stop: a first adoption's if the file can't be read after it. */
+  baseline: readonly JournalReplacementItem[]
 }
 
 async function prepare(
@@ -85,12 +94,84 @@ export async function captureSwitchStoppedCliTurn(
   }
   const key = agentJournalItemKey(user.identity)
   return {
+    agent: source.agent,
     sessionId: source.sessionId,
     userItemKey: key,
-    turnId: prepared.latestTurn?.turnId ?? key
+    turnId: prepared.latestTurn?.turnId ?? key,
+    baseline: prepared.items
   }
 }
 
+/** The turn a switch stopped with proof of exit, as the turn record every later import keeps. */
+function stoppedTurnRecord(stopped: SwitchStoppedCliTurn, userItemId?: string) {
+  return lifecycleRecord(stopped, stopped.turnId, {
+    kind: 'turn',
+    turnId: stopped.turnId,
+    ...(userItemId ? { userItemId } : {}),
+    state: 'interrupted',
+    outcome: 'cancellation'
+  })
+}
+
+/**
+ * A first adoption after a proven stop founds the chat on its fresh read, or on what the switch read
+ * before the stop when the file can't be read now, and saves the stopped turn with that history.
+ */
+export function withSwitchStoppedTurn(
+  read: AdoptedTranscriptRead,
+  stopped: SwitchStoppedCliTurn
+): AdoptedTranscriptRead {
+  const items = read.ok ? read.items : [...stopped.baseline]
+  if (!items?.some((item) => agentJournalItemKey(item.identity) === stopped.userItemKey)) {
+    return read
+  }
+  return { ok: true, items: [...items, stoppedTurnRecord(stopped, stopped.userItemKey)] }
+}
+
+/**
+ * Record a proven stop on the chat that already holds the conversation, before any later read can
+ * fail. Its prompt anchors the record; a prompt not saved yet comes from the read before the stop,
+ * except Codex's, whose resting import scopes the turn's rows to this record when it reads them.
+ */
+export async function commitSwitchStoppedCliTurn(input: {
+  journal: AgentSessionJournal
+  stopped: SwitchStoppedCliTurn
+  fence: number
+}): Promise<void> {
+  const { journal, stopped } = input
+  const prompt = journal.canonicalItemId(stopped.userItemKey)
+  const saved = journal.item(prompt) !== null
+  const opener =
+    saved || stopped.agent === 'codex'
+      ? undefined
+      : stopped.baseline.find((item) => agentJournalItemKey(item.identity) === stopped.userItemKey)
+  const record = stoppedTurnRecord(stopped, saved ? prompt : opener && stopped.userItemKey)
+  await journal.appendPlannedLifecycleBatch({
+    settlementId: `switch-stop:${stopped.sessionId}:${stopped.turnId}`,
+    fence: input.fence,
+    plan: () => {
+      const current = journal.item(journal.canonicalItemId(agentJournalItemKey(record.identity)))
+      const body = current?.body
+      // An interruption saved without its verdict keeps its record and takes this one.
+      const turn = isUnexplainedInterruptedTurn(body)
+        ? { ...record, body: { ...body, outcome: 'cancellation' as const } }
+        : record
+      const items = [
+        ...(opener && !journal.item(journal.canonicalItemId(stopped.userItemKey)) ? [opener] : []),
+        ...(!current || turnRecordReplaceable(current.body, turn.body) ? [turn] : [])
+      ]
+      return {
+        dispatches: [],
+        mutations: items.map((item) => ({
+          kind: 'item' as const,
+          ...item,
+          turnScope: item.turnScope ?? AGENT_JOURNAL_THREAD_SCOPE
+        }))
+      }
+    }
+  })
+}
+
 /** Append through the existing journal owner: native submissions and imported identities survive. */
 export async function catchUpSwitchedCliTranscript(input: {
   journal: AgentSessionJournal
@@ -164,20 +245,22 @@ export async function catchUpSwitchedCliTranscript(input: {
       })
     )
   }
-  // An earlier turn Orca settled whose real boundary has since been recorded takes that boundary.
+  // An earlier turn Orca settled whose real boundary has since been recorded takes that boundary,
+  // and an interruption saved without its verdict takes the one its stop record carries.
   if (input.source.agent !== 'codex') {
+    const added = new Set(additions.map((item) => agentJournalItemKey(item.identity)))
     // Grok's latest turn comes from its sidecar, not the transcript rows.
     const states = new Map(prepared.turnStates)
     if (latest) {
       states.set(latest.turnId, latest)
     }
     for (const [id, state] of states) {
-      const body = input.journal.item(
-        input.journal.canonicalItemId(
-          agentJournalItemKey(lifecycleRecord(input.source, id).identity)
-        )
-      )?.body
-      if (id !== turnId && state.state !== 'working' && isSyntheticInterruptedTurn(body)) {
+      const key = agentJournalItemKey(lifecycleRecord(input.source, id).identity)
+      const body = input.journal.item(input.journal.canonicalItemId(key))?.body
+      const revisit =
+        isSyntheticInterruptedTurn(body) ||
+        (isUnexplainedInterruptedTurn(body) && state.outcome !== undefined)
+      if (state.state !== 'working' && revisit && !added.has(key)) {
         const outcome = state.outcome ?? (state.state === 'interrupted' ? body.outcome : undefined)
         additions.push(
           lifecycleRecord(input.source, id, {
@@ -219,7 +302,7 @@ export async function catchUpSwitchedCliTranscript(input: {
 }
 
 function lifecycleRecord(
-  source: SwitchTranscriptSource,
+  source: Pick<SwitchTranscriptSource, 'agent' | 'sessionId'>,
   turnId: string,
   body?: Extract<AgentJournalItemBody, { kind: 'turn' }>
 ): JournalReplacementItem {
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-proven-chat-stop.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-proven-chat-stop.ts
new file mode 100644
index 000000000000..96b3deec4127
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-proven-chat-stop.ts
@@ -0,0 +1,54 @@
+import { agentSessionFailureFact } from '../../../shared/agent-session-failure'
+import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words'
+import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key'
+import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types'
+import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
+import { structuredAgentSessionStopNoteIdentity } from './structured-agent-session-command-turn'
+import type { StructuredAgentSessionProviderChildIdentity } from './structured-agent-session-host-types'
+import type { AgentSessionStopOutcome } from './structured-agent-session-adapter-stop'
+
+/** Every Stop of one child revises one feedback note. */
+export function structuredAgentSessionChildStopFeedbackId(
+  child: StructuredAgentSessionProviderChildIdentity
+): string {
+  return `child:${child.fence}:${child.generation ?? 'unknown'}`
+}
+
+/**
+ * A chat a switch stopped, once the switch proved its agent exited: the Stop's wind-down may have
+ * noted it could not confirm the Stop before that proof. The exit is now proven, so that note goes;
+ * a goal pause the agent never acknowledged is still unknown and keeps its own note.
+ */
+export async function settleSwitchProvenChatStop(input: {
+  journal: AgentSessionJournal
+  fence: number
+  child: StructuredAgentSessionProviderChildIdentity
+  pause?: AgentSessionStopOutcome['pause']
+}): Promise<void> {
+  const feedbackId = structuredAgentSessionChildStopFeedbackId(input.child)
+  const identity = structuredAgentSessionStopNoteIdentity(feedbackId)
+  if (input.journal.item(agentJournalItemKey(identity))?.body.kind !== 'status') {
+    return
+  }
+  await input.journal.appendLifecycleBatch({
+    settlementId: `switch-stop-proven:${feedbackId}`,
+    fence: input.fence,
+    mutations: [
+      input.pause === 'unconfirmed'
+        ? {
+            kind: 'item',
+            identity,
+            turnScope: AGENT_JOURNAL_THREAD_SCOPE,
+            body: {
+              kind: 'status',
+              tone: 'warning',
+              ...agentSessionFailureWords(agentSessionFailureFact('cancelUnconfirmed'), {
+                surface: 'row',
+                stopNotice: 'pauseUnconfirmed'
+              })
+            }
+          }
+        : { kind: 'tombstone', identity }
+    ]
+  })
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts
index 063fbd4337e4..4730d86e0cde 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts
@@ -10,10 +10,12 @@ import {
 } from '../../../shared/agent-session-wire-refusals'
 import {
   catchUpSwitchedCliTranscript,
+  commitSwitchStoppedCliTurn,
   type SwitchStoppedCliTurn,
   type SwitchTranscriptSource
 } from './structured-agent-session-switch-import'
 import { catchUpStructuredSessionAtRest } from './structured-agent-session-at-rest-catch-up'
+import { settleSwitchProvenChatStop } from './structured-agent-session-switch-proven-chat-stop'
 import type * as HostTypes from './structured-agent-session-host-types'
 import type { AgentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
 import type { StructuredAgentSessionHost } from './structured-agent-session-host'
@@ -194,6 +196,20 @@ export function structuredAgentSessionSwitchSource(context: SwitchSourceContext)
           }
         }
         proven = true
+        if (child && accepted) {
+          await settleSwitchProvenChatStop({
+            journal: conversation.journal,
+            fence: context.deps.store.getRecord(sessionId)?.lease.runtimeFence ?? 0,
+            child,
+            pause: child.close?.stopOutcome?.pause
+          }).catch((error: unknown) =>
+            context.deps.logger.warn("settling a switched chat's Stop note failed", {
+              scope: 'session-switch',
+              sessionId,
+              error
+            })
+          )
+        }
         return () => workCurrent() && source.physical.current()
       } finally {
         try {
@@ -207,6 +223,24 @@ export function structuredAgentSessionSwitchSource(context: SwitchSourceContext)
         }
       }
     },
+    commitSwitchStop: async (sessionId: string, stopped: SwitchStoppedCliTurn) => {
+      // The label is history: a write that fails leaves the switch to its own result.
+      try {
+        const session = await context.lifetime.conversation(sessionId)
+        await commitSwitchStoppedCliTurn({
+          journal: session.journal,
+          stopped,
+          fence: context.deps.store.getRecord(sessionId)?.lease.runtimeFence ?? 0
+        })
+        context.subscribers.publish(sessionId, session.journal)
+      } catch (error) {
+        context.deps.logger.warn("recording a switch's proven stop failed", {
+          scope: 'session-switch',
+          sessionId,
+          error
+        })
+      }
+    },
     refreshSwitchTranscript: async (
       sessionId: string,
       source: Omit<SwitchTranscriptSource, 'agent'> & {
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-stop-label.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-stop-label.test.ts
new file mode 100644
index 000000000000..2701fe96917f
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-stop-label.test.ts
@@ -0,0 +1,353 @@
+import { mkdtemp, readFile, rename, rm, writeFile } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import { agentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
+import { agentTurnVerdict } from '../../../shared/agent-turn-outcome'
+import { agentVerdictDisplayMark } from '../../../shared/agent-main-agent-verdict'
+import { withNativeChatCutTurnNotices } from '../../../shared/native-chat/transcript/native-chat-cut-turn-notice'
+import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key'
+import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types'
+import { agentSessionFailureFact } from '../../../shared/agent-session-failure'
+import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words'
+import { AGENT_SESSION_GOAL_CONTROL_COPY } from '../../../shared/agent-session-goal-control-copy'
+import { refuse } from '../../../shared/agent-session-wire'
+import {
+  claudeProviderHandle,
+  codexProviderHandle
+} from '../../../shared/agent-session-provider-handle-encoding'
+import type { AgentType } from '../../../shared/agent-status-types'
+import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
+import { createTrackedJournalOpener } from '../agent-session-journal/journal-host-database-test-support'
+import { importLegacyTranscriptIntoJournal } from '../agent-session-journal/journal-legacy-import'
+import { catchUpStructuredSessionAtRest } from './structured-agent-session-at-rest-catch-up'
+import { structuredAgentSessionStopNoteIdentity } from './structured-agent-session-command-turn'
+import {
+  captureSwitchStoppedCliTurn,
+  catchUpSwitchedCliTranscript,
+  commitSwitchStoppedCliTurn,
+  withSwitchStoppedTurn,
+  type SwitchTranscriptSource
+} from './structured-agent-session-switch-import'
+import {
+  settleSwitchProvenChatStop,
+  structuredAgentSessionChildStopFeedbackId
+} from './structured-agent-session-switch-proven-chat-stop'
+
+// A user's Stop reads "Interrupted" however the chat later reads the turn: from the agent's own stop
+// record, or from a switch's proven stop recorded before anything later could fail.
+
+const fixtures = join(import.meta.dirname, '__fixtures__')
+const journals = createTrackedJournalOpener()
+let root: string
+let filePath: string
+let deadline: ReturnType<typeof agentSessionSwitchDeadline>
+beforeEach(async () => {
+  root = await mkdtemp(join(tmpdir(), 'orca-stop-label-'))
+  filePath = join(root, 'transcript.jsonl')
+  deadline = agentSessionSwitchDeadline()
+})
+afterEach(async () => {
+  deadline.dispose()
+  await journals.closeAll()
+  await rm(root, { recursive: true, force: true })
+})
+
+function open(name: string, agent: AgentType, providerId: string) {
+  return journals.open({
+    stateDirectory: root,
+    identity: {
+      sessionId: name,
+      workspaceId: 'folder',
+      hostId: 'local',
+      agent,
+      providerHandle:
+        agent === 'codex'
+          ? codexProviderHandle(providerId)
+          : agent === 'claude'
+            ? claudeProviderHandle(providerId, null)
+            : null
+    }
+  })
+}
+
+/** The production refresh: Codex's resting import, then the shared one; nothing left writing. */
+async function refresh(journal: AgentSessionJournal, source: SwitchTranscriptSource) {
+  if (source.agent === 'codex') {
+    await catchUpStructuredSessionAtRest({
+      journal,
+      threadId: source.sessionId,
+      filePath: source.filePath,
+      fence: 1,
+      deadline,
+      settleAbandoned: true
+    })
+  }
+  await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline, settleAbandoned: true })
+}
+
+const turns = (journal: AgentSessionJournal) =>
+  journal.snapshot().items.flatMap(({ body }) => (body.kind === 'turn' ? [body] : []))
+
+function expectInterrupted(journal: AgentSessionJournal, turnId: string) {
+  const turn = turns(journal).find((body) => body.turnId === turnId)
+  const verdict = agentTurnVerdict({ state: turn?.state ?? null, outcome: turn?.outcome ?? null })
+  expect(verdict).toBe('cancellation')
+  expect(
+    agentVerdictDisplayMark({ state: 'done', mainAgent: { state: 'done', outcome: verdict! } })
+  ).toBe('interrupted')
+  const { items } = journal.snapshot()
+  expect(withNativeChatCutTurnNotices(items)).toBe(items)
+}
+
+const lines = (text: string) => text.trimEnd().split('\n')
+const json = (line: string): Record<string, unknown> => JSON.parse(line)
+/** A rollout row's payload field. */
+const payload = (line: string, key: string) => {
+  const value = json(line).payload
+  return typeof value === 'object' && value !== null
+    ? String(Object.entries(value).find(([name]) => name === key)?.[1])
+    : ''
+}
+const at = (row: string, year: number, ms: number) =>
+  JSON.stringify({ ...json(row), timestamp: new Date(Date.UTC(year, 0, 1) + ms).toISOString() })
+const later = (row: string, ms: number) =>
+  JSON.stringify({
+    ...json(row),
+    timestamp: new Date(Date.parse(String(json(row).timestamp)) + ms)
+  })
+
+describe('the Codex switches QA saw fail after the stop (the marker, no abort event)', () => {
+  it.each(['codex-qa-3734-stop-marker-only-1.jsonl', 'codex-qa-3734-stop-marker-only-2.jsonl'])(
+    '%s reads Interrupted after a failure, a retry from Session History and a restart',
+    async (name) => {
+      const recording = await readFile(join(fixtures, name), 'utf8')
+      const rows = lines(recording)
+      const thread = payload(rows[0]!, 'id')
+      const stoppedTurn = payload(rows.at(-3)!, 'turn_id')
+      const source = { agent: 'codex' as const, sessionId: thread, filePath }
+
+      for (const retained of [false, true]) {
+        const journal = await open(`${name}-${String(retained)}`, 'codex', thread)
+        if (retained) {
+          // A chat that already holds the first two turns; the CLI ran the third.
+          await writeFile(filePath, `${rows.slice(0, 9).join('\n')}\n`)
+          await importLegacyTranscriptIntoJournal({
+            journal,
+            agent: 'codex',
+            sessionId: thread,
+            fence: 1,
+            options: { filePath }
+          })
+          await refresh(journal, source)
+        }
+        // The CLI's turn came after the chat's import (any later time will do).
+        const cli = retained
+          ? [...rows.slice(0, 9), ...rows.slice(9).map((row, index) => at(row, 2999, index))]
+          : rows
+        await writeFile(filePath, `${cli.join('\n')}\n`)
+        const stopped = await captureSwitchStoppedCliTurn(source, true, deadline)
+        expect(stopped?.turnId).toBe(stoppedTurn)
+        // The stop is proven, then the history can't be read (QA hid the file 36 ms in).
+        await rename(filePath, `${filePath}.hidden`)
+        if (retained) {
+          await commitSwitchStoppedCliTurn({ journal, stopped: stopped!, fence: 1 })
+        } else {
+          const read = withSwitchStoppedTurn(
+            { ok: false, refusal: refuse('agent_session_identity_required', {}, 'hidden') },
+            stopped!
+          )
+          expect(read.ok).toBe(true)
+          await journal.replaceEpochItems('legacy_import', 1, read.ok ? (read.items ?? []) : [])
+        }
+        expectInterrupted(journal, stoppedTurn)
+
+        // Session History's retry, with no stop of its own, then a restart.
+        await rename(`${filePath}.hidden`, filePath)
+        await refresh(journal, source)
+        expectInterrupted(journal, stoppedTurn)
+        const prompt = journal
+          .snapshot()
+          .items.filter(({ body }) => body.kind === 'message' && body.role === 'user')
+        expect(prompt).toHaveLength(3)
+        const settled = journal.snapshot()
+        await journal.close()
+        const reopened = await open(`${name}-${String(retained)}`, 'codex', thread)
+        await refresh(reopened, source)
+        expect(reopened.snapshot()).toEqual(settled)
+      }
+    }
+  )
+
+  it('keeps the ruled interruption with no proven stop and no abort record', async () => {
+    const recording = await readFile(join(fixtures, 'codex-qa-3734-stop-marker-only-1.jsonl'))
+    await writeFile(filePath, recording)
+    const thread = payload(lines(String(recording))[0]!, 'id')
+    const journal = await open('no-proof', 'codex', thread)
+    await importLegacyTranscriptIntoJournal({
+      journal,
+      agent: 'codex',
+      sessionId: thread,
+      fence: 1,
+      options: { filePath }
+    })
+    await refresh(journal, { agent: 'codex', sessionId: thread, filePath })
+    const [turn] = turns(journal)
+    expect(turn).toMatchObject({ state: 'interrupted' })
+    expect(turn).not.toHaveProperty('outcome')
+    expect(agentTurnVerdict({ state: turn!.state, outcome: null })).toBe('interruption')
+  })
+})
+
+describe("each agent's own stop record, then an idle switch", () => {
+  const claudeRows = async () =>
+    lines(await readFile(join(fixtures, 'claude-cli-switch-2.1.302.jsonl'), 'utf8'))
+  const piRows = async () =>
+    lines(await readFile(join(fixtures, 'recorded-native-switch', 'pi', 'completed.jsonl'), 'utf8'))
+  const codexRows = async () =>
+    lines(await readFile(join(fixtures, 'codex-qa-3734-stop-marker-only-1.jsonl'), 'utf8'))
+
+  /** The agent's transcript up to a turn the user stopped in the CLI, and that turn's id. */
+  async function stoppedInCli(agent: 'claude' | 'codex' | 'pi') {
+    if (agent === 'codex') {
+      const rows = await codexRows()
+      const turnId = payload(rows.at(-3)!, 'turn_id')
+      const abort = later(rows.at(-1)!, 30)
+      const aborted = { ...json(abort), type: 'event_msg' }
+      return {
+        rows: [
+          ...rows,
+          JSON.stringify({
+            ...aborted,
+            payload: { type: 'turn_aborted', reason: 'interrupted', turn_id: turnId }
+          })
+        ],
+        providerId: payload(rows[0]!, 'id'),
+        turnId
+      }
+    }
+    if (agent === 'claude') {
+      const rows = (await claudeRows()).slice(0, 2)
+      const prompt = json(rows[0]!)
+      // Esc before Claude replied: the notice names no interrupted message.
+      const notice = JSON.stringify({
+        type: 'user',
+        uuid: 'esc-notice',
+        sessionId: prompt.sessionId,
+        timestamp: new Date(Date.parse(String(json(rows[1]!).timestamp)) + 1).toISOString(),
+        message: {
+          role: 'user',
+          content: [{ type: 'text', text: '[Request interrupted by user]' }]
+        }
+      })
+      return { rows: [...rows, notice], providerId: String(prompt.sessionId), turnId: null }
+    }
+    const rows = (await piRows()).slice(0, 6)
+    const aborted = JSON.stringify({
+      type: 'message',
+      id: 'pi-aborted',
+      parentId: json(rows[5]!).id,
+      timestamp: json(rows[5]!).timestamp,
+      message: { role: 'assistant', content: [], stopReason: 'aborted' }
+    })
+    return { rows: [...rows, aborted], providerId: filePath, turnId: null }
+  }
+
+  it.each(['claude', 'codex', 'pi'] as const)(
+    '%s: Interrupted, and an earlier import that saved it without a verdict is repaired',
+    async (agent) => {
+      const recorded = await stoppedInCli(agent)
+      await writeFile(filePath, `${recorded.rows.join('\n')}\n`)
+      const source = { agent, sessionId: recorded.providerId, filePath }
+      const journal = await open(`${agent}-esc`, agent, recorded.providerId)
+      await importLegacyTranscriptIntoJournal({
+        journal,
+        agent,
+        sessionId: source.sessionId,
+        fence: 1,
+        options: { filePath }
+      })
+      await refresh(journal, source)
+      const [turn, ...rest] = turns(journal)
+      expect(rest).toEqual([])
+      expect(turn).toMatchObject({ state: 'interrupted', outcome: 'cancellation' })
+      if (recorded.turnId) {
+        expect(turn?.turnId).toBe(recorded.turnId)
+      }
+      expectInterrupted(journal, turn!.turnId)
+
+      // What an earlier import saved for it, before the decoders kept the user's Stop.
+      const item = journal.snapshot().items.find(({ body }) => body.kind === 'turn')!
+      const { outcome: _outcome, ...wrong } = turn!
+      const wrongJournal = await open(`${agent}-wrong`, agent, recorded.providerId)
+      await importLegacyTranscriptIntoJournal({
+        journal: wrongJournal,
+        agent,
+        sessionId: source.sessionId,
+        fence: 1,
+        options: { filePath }
+      })
+      const identity = {
+        provider: 'legacy' as const,
+        agent,
+        sessionId: source.sessionId,
+        recordId: `turn-lifecycle:${turn!.turnId}`
+      }
+      expect(agentJournalItemKey(identity)).toBe(item.itemId)
+      await wrongJournal.appendItem(identity, wrong, {
+        fence: 1,
+        turnScope: AGENT_JOURNAL_THREAD_SCOPE
+      })
+      const before = wrongJournal.snapshot().items
+      await refresh(wrongJournal, source)
+      expect(wrongJournal.item(item.itemId)?.body).toEqual({ ...wrong, outcome: 'cancellation' })
+      expect(wrongJournal.snapshot().items.map(({ itemId }) => itemId)).toEqual(
+        before.map(({ itemId }) => itemId)
+      )
+      const repaired = wrongJournal.snapshot()
+      await refresh(wrongJournal, source)
+      expect(wrongJournal.snapshot()).toEqual(repaired)
+    }
+  )
+})
+
+describe('a chat a switch stopped and proved exited', () => {
+  const child = { fence: 3, generation: 'generation-1' }
+  const identity = structuredAgentSessionStopNoteIdentity(
+    structuredAgentSessionChildStopFeedbackId(child)
+  )
+  async function withUnconfirmedNote(name: string) {
+    const journal = await open(name, 'codex', '01a190ce-384d-7be3-b9b1-92f7069b4966')
+    await journal.appendItem(
+      identity,
+      {
+        kind: 'status',
+        tone: 'warning',
+        ...agentSessionFailureWords(agentSessionFailureFact('cancelUnconfirmed'), {
+          surface: 'row',
+          stopNotice: 'stopUnconfirmed'
+        })
+      },
+      { fence: 3, turnScope: AGENT_JOURNAL_THREAD_SCOPE }
+    )
+    return journal
+  }
+  const shown = (journal: AgentSessionJournal) => JSON.stringify(journal.snapshot().items)
+
+  it('drops the Stop note that could not confirm the exit', async () => {
+    const journal = await withUnconfirmedNote('proven')
+    expect(shown(journal)).toContain(AGENT_SESSION_GOAL_CONTROL_COPY.stopUnconfirmed)
+    await settleSwitchProvenChatStop({ journal, fence: 3, child, pause: 'acknowledged' })
+    expect(shown(journal)).not.toContain(AGENT_SESSION_GOAL_CONTROL_COPY.stopUnconfirmed)
+    await journal.close()
+    const reopened = await open('proven', 'codex', '01a190ce-384d-7be3-b9b1-92f7069b4966')
+    expect(shown(reopened)).not.toContain(AGENT_SESSION_GOAL_CONTROL_COPY.stopUnconfirmed)
+  })
+
+  it('keeps only what is still unknown: a goal pause Codex never acknowledged', async () => {
+    const journal = await withUnconfirmedNote('pause')
+    await settleSwitchProvenChatStop({ journal, fence: 3, child, pause: 'unconfirmed' })
+    expect(shown(journal)).not.toContain(AGENT_SESSION_GOAL_CONTROL_COPY.stopUnconfirmed)
+    expect(shown(journal)).toContain(AGENT_SESSION_GOAL_CONTROL_COPY.pauseUnconfirmed)
+  })
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-synthetic-turn.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-synthetic-turn.ts
index 817c9ab44f8d..3c7ecbfeb90f 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-synthetic-turn.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-synthetic-turn.ts
@@ -1,5 +1,7 @@
 import type { AgentJournalItemBody } from '../../../shared/agent-session-journal-types'
 
+type TurnBody = Extract<AgentJournalItemBody, { kind: 'turn' }>
+
 /**
  * An interrupted turn record with no completion time was settled by Orca, not read from the
  * provider: the turn was open when no writer could still add to it. It stays revisitable, so a
@@ -7,11 +9,24 @@ import type { AgentJournalItemBody } from '../../../shared/agent-session-journal
  */
 export function isSyntheticInterruptedTurn(
   body: AgentJournalItemBody | undefined
-): body is Extract<AgentJournalItemBody, { kind: 'turn' }> {
+): body is TurnBody {
   return body?.kind === 'turn' && body.state === 'interrupted' && body.completedAt === undefined
 }
 
-/** A recorded boundary may replace a running or Orca-settled record of the same turn. */
+/**
+ * An interrupted record with no verdict: Orca settled it, or an earlier import dropped the
+ * provider's reason. Evidence read later (the provider's stop record, a proven Stop) may add one.
+ */
+export function isUnexplainedInterruptedTurn(
+  body: AgentJournalItemBody | undefined
+): body is TurnBody {
+  return body?.kind === 'turn' && body.state === 'interrupted' && body.outcome === undefined
+}
+
+/**
+ * A recorded boundary may replace a running or Orca-settled record of the same turn, and an
+ * unexplained interruption takes the verdict its evidence carries; any other recorded end stays.
+ */
 export function turnRecordReplaceable(
   current: AgentJournalItemBody,
   next: AgentJournalItemBody
@@ -20,6 +35,9 @@ export function turnRecordReplaceable(
     next.kind === 'turn' &&
     current.kind === 'turn' &&
     (current.state === 'running' ||
-      (isSyntheticInterruptedTurn(current) && !isSyntheticInterruptedTurn(next)))
+      (isSyntheticInterruptedTurn(current) && !isSyntheticInterruptedTurn(next)) ||
+      (isUnexplainedInterruptedTurn(current) &&
+        next.state === 'interrupted' &&
+        next.outcome !== undefined))
   )
 }
diff --git a/src/main/native-chat/transcript-turn-lifecycle.test.ts b/src/main/native-chat/transcript-turn-lifecycle.test.ts
index dd70bc12009a..79b7f55d69d5 100644
--- a/src/main/native-chat/transcript-turn-lifecycle.test.ts
+++ b/src/main/native-chat/transcript-turn-lifecycle.test.ts
@@ -2,6 +2,7 @@ import { describe, expect, it } from 'vitest'
 import {
   decodeClaudeTurnLifecycle,
   decodeCodexTurnLifecycle,
+  decodePiTurnLifecycle,
   nativeChatTurnLifecycleDecoderForAgent
 } from './transcript-turn-lifecycle'
 
@@ -55,9 +56,21 @@ describe('native chat transcript turn lifecycle', () => {
       )
     ).toEqual({
       state: 'interrupted',
+      outcome: 'cancellation',
       turnId: 'turn-2',
       timestamp: Date.parse('2026-07-16T23:46:01.000Z')
     })
+
+    // Only the user's interrupt is a Stop; Codex's other abort reasons keep no verdict.
+    expect(
+      decodeCodexTurnLifecycle(
+        JSON.stringify({
+          type: 'event_msg',
+          payload: { type: 'turn_aborted', reason: 'replaced', turn_id: 'turn-3' }
+        }),
+        'fallback'
+      )
+    ).toEqual({ state: 'interrupted', turnId: 'turn-3', timestamp: null })
   })
 
   it('does not mistake a Codex assistant message for completion', () => {
@@ -332,8 +345,48 @@ describe('native chat transcript turn lifecycle', () => {
       )
     ).toEqual({
       state: 'interrupted',
+      outcome: 'cancellation',
       turnId: 'assistant-request-1',
       timestamp: Date.parse('2026-07-16T23:46:01.000Z')
     })
   })
+
+  it("reads each agent's own stop record as the user's Stop", () => {
+    // Esc before Claude replied: the notice names no interrupted message.
+    for (const text of [
+      '[Request interrupted by user]',
+      '[Request interrupted by user for tool use]'
+    ]) {
+      expect(
+        decodeClaudeTurnLifecycle(
+          JSON.stringify({
+            type: 'user',
+            uuid: 'notice-row',
+            message: { role: 'user', content: [{ type: 'text', text }] }
+          }),
+          'fallback'
+        )
+      ).toEqual({
+        state: 'interrupted',
+        outcome: 'cancellation',
+        turnId: 'notice-row',
+        timestamp: null
+      })
+    }
+    expect(
+      decodePiTurnLifecycle(
+        JSON.stringify({
+          type: 'message',
+          id: 'pi-reply',
+          message: { role: 'assistant', stopReason: 'aborted' }
+        }),
+        'fallback'
+      )
+    ).toEqual({
+      state: 'interrupted',
+      outcome: 'cancellation',
+      turnId: 'pi-reply',
+      timestamp: null
+    })
+  })
 })
diff --git a/src/main/native-chat/transcript-turn-lifecycle.ts b/src/main/native-chat/transcript-turn-lifecycle.ts
index bb9e0925cc50..cef48a5f9460 100644
--- a/src/main/native-chat/transcript-turn-lifecycle.ts
+++ b/src/main/native-chat/transcript-turn-lifecycle.ts
@@ -59,6 +59,10 @@ export function decodeCodexTurnLifecycle(
         : 'completed'
   return {
     state,
+    // Only a user's interrupt is a Stop; replaced, review-ended and budget-limited aborts aren't.
+    ...(state === 'interrupted' && payload.reason === 'interrupted'
+      ? { outcome: 'cancellation' as const }
+      : {}),
     turnId: extractString(payload.turn_id) ?? fallbackId,
     timestamp: lifecycleTimestamp(record.timestamp)
   }
@@ -82,9 +86,15 @@ export function decodeClaudeTurnLifecycle(
   const message = asRecord(record.message)
   const timestamp = lifecycleTimestamp(record.timestamp)
   const interruptedMessageId = claudeInterruptedMessageId(record)
-  if (interruptedMessageId) {
-    // Injected interruption notices end the active generation; they never open a user turn.
-    return { state: 'interrupted', turnId: interruptedMessageId, timestamp }
+  if (interruptedMessageId || (record.type === 'user' && isClaudeInterruptionNotice(message))) {
+    // Injected interruption notices end the active generation as the user's Stop; they never open
+    // a user turn. Esc before any reply writes the notice without the interrupted message's id.
+    return {
+      state: 'interrupted',
+      outcome: 'cancellation',
+      turnId: interruptedMessageId ?? extractString(record.uuid) ?? fallbackId,
+      timestamp
+    }
   }
   if (record.type === 'assistant') {
     const stopReason = message?.stop_reason
@@ -119,6 +129,19 @@ export function decodeClaudeTurnLifecycle(
   return { state: 'working', turnId: decoded.id, timestamp }
 }
 
+const CLAUDE_INTERRUPTION_NOTICE = /^\[Request interrupted by user( for tool use)?\]$/
+
+function isClaudeInterruptionNotice(message: Record<string, unknown> | null): boolean {
+  const content = message?.content
+  const text =
+    typeof content === 'string'
+      ? content
+      : Array.isArray(content) && content.length === 1
+        ? extractString(asRecord(content[0])?.text)
+        : null
+  return message?.role === 'user' && text != null && CLAUDE_INTERRUPTION_NOTICE.test(text)
+}
+
 // ! commands are not prompts; without a reply terminal, a working mark would stick.
 function isClaudeBashInputRecord(record: Record<string, unknown>): boolean {
   const content = asRecord(record.message)?.content
@@ -200,7 +223,11 @@ export function decodePiTurnLifecycle(
   return state
     ? {
         state: state === 'failed' ? 'completed' : state,
-        ...(state === 'failed' ? { outcome: 'failure' as const } : {}),
+        ...(state === 'failed'
+          ? { outcome: 'failure' as const }
+          : state === 'interrupted'
+            ? { outcome: 'cancellation' as const }
+            : {}),
         turnId,
         timestamp
       }
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-create.ts b/src/main/runtime/rpc/methods/structured-agent-session-create.ts
index ceac52b48174..6b5648039e89 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-create.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-create.ts
@@ -153,6 +153,7 @@ export async function commitStructuredAgentSessionCreate(args: {
   placedByWindow?: boolean
   /** Where the creating client opens the chat, in this host's ids. */
   tabPlacement?: ChatTabPlacement
+  switchStop?: StructuredAgentSessionCreateOptions['switchStop']
 }): Promise<AgentSessionMutationResult<AgentSessionAttachResult>> {
   const { prepared } = args
   const tab = prepared.tab
@@ -164,6 +165,7 @@ export async function commitStructuredAgentSessionCreate(args: {
     return prepared.host.create(args.caller, prepared.attachParams, {
       ...prepared.atRest,
       check: args.check,
+      ...(args.switchStop ? { switchStop: args.switchStop } : {}),
       ...(prepared.catalogModels ? { catalogModels: prepared.catalogModels } : {}),
       ...(prepared.hostLaunchDirectory
         ? { hostLaunchDirectory: prepared.hostLaunchDirectory }
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
index a840105c79e3..8b65ec95f62b 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
@@ -197,8 +197,8 @@ async function switchToChat(
       agent: [create?.agent, host.deps.store.getRecord(sessionId)?.provider].find(isAiVaultAgent)
     })
   }
-  deadline.check()
   if (create) {
+    deadline.check()
     try {
       const preparedCreate = await prepareStructuredAgentSessionCreateForWorktree({
         ...create,
@@ -214,7 +214,8 @@ async function switchToChat(
         caller: structuredCallerFor(ctx),
         prepared: { ...preparedCreate, tab: null },
         activate: false,
-        check: deadline.check
+        check: deadline.check,
+        ...(adopt && stopped ? { switchStop: stopped } : {})
       })
       if (!created.ok) {
         throw new AgentSessionRefusalError(created.refusal)
@@ -228,6 +229,12 @@ async function switchToChat(
         providerSessionId
       )
     }
+  }
+  // The proven stop goes on the turn's own record now, so no later failure can lose it.
+  if (stopped) {
+    await host.commitSwitchStop(sessionId, stopped)
+  }
+  if (create) {
     await host.adoptSwitch(conversation?.commandKey ?? params.sessionId, sessionId)
   }
   const record = requireStructuredSwitchRecord(host, sessionId)

From 40b2e19b952b53e5880459d10fb66254fb47acbb Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 02:31:36 -0700
Subject: [PATCH 181/207] Hold a closing terminal's teardown output from the
 pane the switch replaces

The 'closing' intentional-stop mark, already set before the stop and pinned to the exact process, now also holds that process's presentation output: a side-effect-free, incarnation-exact query that never claims the exit. The window's hand-off drops held bytes before they are queued or charged to delivery; paired clients that can restore after a drop (multiplex streams with the drop notice) skip them too. Runtime ingestion, history, status, exit and stop proof still see every byte, and the stream's sequence keeps counting them. If the stop isn't proven the mark is released and the pane restores through the existing restore marker (window) or drop notice (paired client) before output resumes, so no gap is left silent. Clients without a restore path keep receiving the output. A later process on the same PTY id is never held. Split sources (closing: false) are unchanged.
---
 src/main/ipc/pty/delivery/accept.ts           |  19 +++
 .../pty/delivery/pty-ipc-closing-hold.test.ts | 131 ++++++++++++++++++
 src/main/ipc/pty/delivery/visibility-state.ts |   2 +
 src/main/ipc/pty/provider/state-cleanup.ts    |   2 +
 ...erminal-multiplex-stream-initialization.ts |  11 ++
 .../methods/terminal/terminal-stream-types.ts |   2 +
 ...minal-multiplex-paused-output-drop.test.ts |  30 +++-
 .../runtime-terminal-stream-consumers.ts      |   2 +
 .../runtime/terminal-intentional-stops.ts     |  14 ++
 .../terminal/output/pty-output-ingestion.ts   |   5 +-
 10 files changed, 215 insertions(+), 3 deletions(-)
 create mode 100644 src/main/ipc/pty/delivery/pty-ipc-closing-hold.test.ts

diff --git a/src/main/ipc/pty/delivery/accept.ts b/src/main/ipc/pty/delivery/accept.ts
index 52f4ce7513a9..547a135786a3 100644
--- a/src/main/ipc/pty/delivery/accept.ts
+++ b/src/main/ipc/pty/delivery/accept.ts
@@ -3,10 +3,12 @@ import {
   shouldDropHiddenRendererPtyData
 } from './pty-hidden-delivery-gate'
 import {
+  presentationHeldPtys,
   rendererVisibilityKnownPtys,
   visibleRendererPtys,
   activeRendererPtys
 } from './visibility-state'
+import { ptyIncarnationById } from '../provider/ownership-state'
 import { PTY_BATCH_INTERVAL_MS } from './constants'
 import {
   appendPendingPtyData,
@@ -60,6 +62,23 @@ export function acceptPtyDataForRenderer(
     return
   }
   const escapeStateBefore = advancePtyEscapeBoundary(payload.id, payload.data)
+  if (
+    session.runtime?.intentionalPtyStops?.holdsPresentation(
+      payload.id,
+      ptyIncarnationById.get(payload.id)
+    )
+  ) {
+    // A whole-tab close owns this process: its teardown output never reaches the pane it removes,
+    // and is never queued or charged to delivery.
+    presentationHeldPtys.add(payload.id)
+    return
+  }
+  if (presentationHeldPtys.delete(payload.id)) {
+    // The stop wasn't proven and the process lives on: the pane restores what was held back
+    // instead of continuing across a silent gap.
+    markPtyRendererStreamGap(payload.id)
+    sendModelRestoreNeededMarker(session, payload.id, 'pending-cap', startSeq)
+  }
   if (shouldDropHiddenRendererPtyData(payload.id, session.getSettings?.())) {
     const droppedChars = payload.data.length
     const drop = recordHiddenRendererPtyDataDrop(payload.id, droppedChars)
diff --git a/src/main/ipc/pty/delivery/pty-ipc-closing-hold.test.ts b/src/main/ipc/pty/delivery/pty-ipc-closing-hold.test.ts
new file mode 100644
index 000000000000..ca56153cbd70
--- /dev/null
+++ b/src/main/ipc/pty/delivery/pty-ipc-closing-hold.test.ts
@@ -0,0 +1,131 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { setupPtyIpcSuite } from '../pty-ipc-test-harness'
+import { registerPtyHandlers } from '../register-handlers'
+
+vi.mock('electron', () => import('../pty-ipc-mock-registry').then((m) => m.electronModuleMock()))
+vi.mock('fs', () => import('../pty-ipc-mock-registry').then((m) => m.fsModuleMock()))
+vi.mock('node-pty', () => import('../pty-ipc-mock-registry').then((m) => m.nodePtyModuleMock()))
+vi.mock('node:child_process', async (importOriginal) =>
+  (await import('../pty-ipc-mock-registry')).childProcessModuleMock(await importOriginal())
+)
+vi.mock('../../../opencode/hook-service', () =>
+  import('../pty-ipc-mock-registry').then((m) => m.openCodeHookServiceModuleMock())
+)
+vi.mock('../../../mimo/hook-service', () =>
+  import('../pty-ipc-mock-registry').then((m) => m.mimoHookServiceModuleMock())
+)
+vi.mock('../../../agent-hooks/server', () =>
+  import('../pty-ipc-mock-registry').then((m) => m.agentHookServerModuleMock())
+)
+vi.mock('../../../pi/titlebar-extension-service', () =>
+  import('../pty-ipc-mock-registry').then((m) => m.piTitlebarExtensionModuleMock())
+)
+vi.mock('../../../pwsh', () => import('../pty-ipc-mock-registry').then((m) => m.pwshModuleMock()))
+vi.mock('../../../wsl', async (importOriginal) =>
+  (await import('../pty-ipc-mock-registry')).wslModuleMock(await importOriginal())
+)
+vi.mock('../../../telemetry/client', () =>
+  import('../pty-ipc-mock-registry').then((m) => m.telemetryClientModuleMock())
+)
+vi.mock('../../../telemetry/classify-error', () =>
+  import('../pty-ipc-mock-registry').then((m) => m.classifyErrorModuleMock())
+)
+vi.mock('../../../cli/linux-terminal-orca-cli-shim', () =>
+  import('../pty-ipc-mock-registry').then((m) => m.linuxCliShimModuleMock())
+)
+vi.mock('../../../memory/pty-registry', () =>
+  import('../pty-ipc-mock-registry').then((m) => m.ptyRegistryModuleMock())
+)
+vi.mock('../../../agent-hooks/migration-unsupported-pty-state', () =>
+  import('../pty-ipc-mock-registry').then((m) => m.migrationUnsupportedPtyModuleMock())
+)
+vi.mock('../../../codex/codex-pane-account-registry', () =>
+  import('../pty-ipc-mock-registry').then((m) => m.codexPaneAccountRegistryModuleMock())
+)
+vi.mock('../../../codex/codex-state-db-backfill-recovery', () =>
+  import('../pty-ipc-mock-registry').then((m) => m.codexBackfillRecoveryModuleMock())
+)
+import { TerminalIntentionalStops } from '../../../runtime/terminal-intentional-stops'
+import { restorePtyIncarnation } from '../provider/ownership-state'
+
+// A whole-tab close (a terminal→chat switch) holds its process's teardown output from the pane it
+// removes: never queued or charged, the stream's sequence kept, and restored if the stop isn't proven.
+const PTY_ID = 'daemon-session'
+
+describe('output of a process a whole-tab close is stopping', () => {
+  const { handlers, mainWindow, installObservableDaemonTestProvider } = setupPtyIpcSuite()
+
+  async function closing() {
+    vi.useFakeTimers()
+    let seq = 0
+    const stops = new TerminalIntentionalStops()
+    const runtime = {
+      setPtyController: vi.fn(),
+      registerPty: vi.fn(),
+      noteTerminalSpawnCommand: vi.fn(),
+      onPtySpawned: vi.fn(),
+      onPtyExit: vi.fn(),
+      onPtyData: vi.fn((_id: string, _data: string, _at: number, chars: number) => (seq += chars)),
+      getPtyOutputSequence: vi.fn(() => seq),
+      hasRemoteTerminalViewSubscriber: vi.fn(() => false),
+      createPreAllocatedTerminalHandle: vi.fn(() => null),
+      registerPreAllocatedHandleForPty: vi.fn(),
+      intentionalPtyStops: stops
+    }
+    const daemon = installObservableDaemonTestProvider()
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the suite's window and runtime stubs cover every member registerPtyHandlers reads.
+    registerPtyHandlers(mainWindow as never, runtime as never)
+    await handlers.get('pty:spawn')!(null, { cols: 80, rows: 24, sessionId: PTY_ID })
+    restorePtyIncarnation(PTY_ID, 'incarnation-1')
+    const emit = (data: string) => {
+      daemon.emitData(PTY_ID, data)
+      vi.advanceTimersByTime(50)
+    }
+    const sent = (channel: string) =>
+      mainWindow.webContents.send.mock.calls
+        .filter(([name]) => name === channel)
+        .map(([, payload]): Record<string, unknown> => payload)
+    const settle = stops.mark(PTY_ID, 'closing', 'incarnation-1')
+    mainWindow.webContents.send.mockClear()
+    return { emit, sent, settle, seq: () => seq }
+  }
+
+  afterEach(() => {
+    vi.useRealTimers()
+  })
+
+  it('never shows or charges the teardown output once the stop is proven', async () => {
+    const pane = await closing()
+    pane.emit('zsh: terminated  codex resume\r\n% ')
+    pane.settle(true)
+    // A late byte from the same process inside the exit window stays held too.
+    pane.emit('\r\n')
+    expect(pane.sent('pty:data')).toEqual([])
+    expect(pane.sent('pty:modelRestoreNeeded')).toEqual([])
+  })
+
+  it('restores the pane before output resumes when the stop was not proven', async () => {
+    const pane = await closing()
+    pane.emit('held while stopping')
+    const heldThrough = pane.seq()
+    pane.settle(false)
+    pane.emit('still running')
+    expect(pane.sent('pty:modelRestoreNeeded')).toEqual([
+      { id: PTY_ID, reason: 'pending-cap', markerSeq: heldThrough }
+    ])
+    // The stream's sequence still counts the held bytes; only the resumed bytes are delivered.
+    expect(pane.sent('pty:data')).toEqual([
+      expect.objectContaining({ data: 'still running', seq: pane.seq(), rawLength: 13 })
+    ])
+    const order = mainWindow.webContents.send.mock.calls.map(([name]) => name)
+    expect(order.indexOf('pty:modelRestoreNeeded')).toBeLessThan(order.indexOf('pty:data'))
+  })
+
+  it('never holds a later process that reuses the id', async () => {
+    const pane = await closing()
+    pane.settle(true)
+    restorePtyIncarnation(PTY_ID, 'incarnation-2')
+    pane.emit('a new shell')
+    expect(pane.sent('pty:data')).toEqual([expect.objectContaining({ data: 'a new shell' })])
+  })
+})
diff --git a/src/main/ipc/pty/delivery/visibility-state.ts b/src/main/ipc/pty/delivery/visibility-state.ts
index 3a5b19b584b0..52d6bf145e01 100644
--- a/src/main/ipc/pty/delivery/visibility-state.ts
+++ b/src/main/ipc/pty/delivery/visibility-state.ts
@@ -30,6 +30,8 @@ export const KEEP_HISTORY_STOP_SETTLE_MS = 1_000
 export const KEEP_HISTORY_STOP_POLL_MS = 100
 // Keep using provider snapshots after daemon tail thinning; main's mirror no longer holds full history.
 export const providerSnapshotRequiredPtys = new Set<string>()
+// Output a whole-tab close held from the pane; a stop that wasn't proven restores the pane first.
+export const presentationHeldPtys = new Set<string>()
 
 export function setInvalidatePendingPtyDrainPriority(
   fn: (id?: string, schedule?: boolean) => void
diff --git a/src/main/ipc/pty/provider/state-cleanup.ts b/src/main/ipc/pty/provider/state-cleanup.ts
index 4da1e6ceb6fd..0bacec5d3ed0 100644
--- a/src/main/ipc/pty/provider/state-cleanup.ts
+++ b/src/main/ipc/pty/provider/state-cleanup.ts
@@ -20,6 +20,7 @@ import {
   invalidatePendingPtyDrainPolicy,
   invalidatePendingPtyDrainPriority,
   lastInputAtByPty,
+  presentationHeldPtys,
   providerSnapshotRequiredPtys,
   ptySizes,
   rendererVisibilityKnownPtys,
@@ -57,6 +58,7 @@ export function clearProviderPtyState(
   }
   clearBackgroundedDeliverySyncForPty(id)
   providerSnapshotRequiredPtys.delete(id)
+  presentationHeldPtys.delete(id)
   // Reused IDs must not inherit ConPTY startup-query state.
   clearNativeWindowsConptyPty(id)
   const paneKey = ptyPaneKey.get(id)
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-multiplex-stream-initialization.ts b/src/main/runtime/rpc/methods/terminal/terminal-multiplex-stream-initialization.ts
index b9bfb0fca18b..8295b5758f6a 100644
--- a/src/main/runtime/rpc/methods/terminal/terminal-multiplex-stream-initialization.ts
+++ b/src/main/runtime/rpc/methods/terminal/terminal-multiplex-stream-initialization.ts
@@ -94,6 +94,17 @@ export async function initializeMultiplexStream(
     if (!isMultiplexStreamAttached(state, stream)) {
       return
     }
+    // Only a client that restores after a drop can be held: one without that notice would carry on
+    // across a silent gap if the stop isn't proven, so it keeps receiving the output.
+    if (meta?.presentationHeld && stream.supportsOutputPauseDropNotice) {
+      stream.presentationHeld = true
+      return
+    }
+    if (stream.presentationHeld) {
+      stream.presentationHeld = false
+      stream.outputBatcher.flush()
+      state.sendFrame(stream.streamId, TerminalStreamOpcode.PausedOutputDropped)
+    }
     if (stream.outputPaused) {
       notePausedOutputDropped(state, stream)
       return
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-stream-types.ts b/src/main/runtime/rpc/methods/terminal/terminal-stream-types.ts
index 3840acceeca0..dc8cea60dcbe 100644
--- a/src/main/runtime/rpc/methods/terminal/terminal-stream-types.ts
+++ b/src/main/runtime/rpc/methods/terminal/terminal-stream-types.ts
@@ -71,6 +71,8 @@ export type TerminalMultiplexStream = {
   // Why: lets the client skip the reveal snapshot when a pause discarded nothing.
   supportsOutputPauseDropNotice: boolean
   pausedOutputDropNoticeSent: boolean
+  /** Teardown output a whole-tab close held back; a resumed stream tells the client to restore. */
+  presentationHeld?: boolean
   supportsWriteUnavailable: boolean
   // Also sends WriteUnavailable unprompted when the PTY's daemon endpoint drops.
   supportsEndpointLossNotice: boolean
diff --git a/src/main/runtime/rpc/terminal-multiplex-paused-output-drop.test.ts b/src/main/runtime/rpc/terminal-multiplex-paused-output-drop.test.ts
index 3c8c304f91d3..64f293c087a6 100644
--- a/src/main/runtime/rpc/terminal-multiplex-paused-output-drop.test.ts
+++ b/src/main/runtime/rpc/terminal-multiplex-paused-output-drop.test.ts
@@ -70,9 +70,13 @@ async function subscribePausable(
         })
       )!
     )
-  const emitOutput = (text: string): void => {
+  const emitOutput = (text: string, held = false): void => {
     seq += text.length
-    listeners[0]?.(text, { seq, rawLength: text.length })
+    listeners[0]?.(text, {
+      seq,
+      rawLength: text.length,
+      ...(held ? { presentationHeld: true } : {})
+    })
   }
   const dropNotices = (): number =>
     harness.binaryFrames.filter(
@@ -203,6 +207,28 @@ describe('terminal multiplex paused-output drop notice', () => {
     expect(host.remoteViewHoldsAuthority()).toBe(false)
   })
 
+  // A whole-tab close holds its process's teardown output from the view it removes.
+  it('holds teardown output, and has the client restore if output resumes', async () => {
+    const host = await subscribePausable({ ackOutput: 1, outputPause: 1, outputPauseDropNotice: 1 })
+    host.emitOutput('before the stop ')
+    host.emitOutput('zsh: terminated  codex resume', true)
+    expect(host.dropNotices()).toBe(0)
+    // The stop wasn't proven and the process lives on: one notice, then output as usual.
+    host.emitOutput('still running')
+    host.emitOutput(' and more')
+    expect(host.dropNotices()).toBe(1)
+    await vi.waitFor(() => expect(host.outputText()).toBe('before the stop still running and more'))
+    await host.close()
+  })
+
+  it('keeps showing teardown output to a client that could not restore after a gap', async () => {
+    const host = await subscribePausable({ ackOutput: 1, outputPause: 1 })
+    host.emitOutput('zsh: terminated', true)
+    await vi.waitFor(() => expect(host.outputText()).toBe('zsh: terminated'))
+    expect(host.dropNotices()).toBe(0)
+    await host.close()
+  })
+
   it('never sends the frame to a client that did not negotiate it', async () => {
     const host = await subscribePausable({ ackOutput: 1, outputPause: 1 })
     expect(host.subscribed.capabilities?.outputPauseDropNotice).toBeUndefined()
diff --git a/src/main/runtime/runtime-terminal-stream-consumers.ts b/src/main/runtime/runtime-terminal-stream-consumers.ts
index cbadb8097a7e..3ee30d7bf4cf 100644
--- a/src/main/runtime/runtime-terminal-stream-consumers.ts
+++ b/src/main/runtime/runtime-terminal-stream-consumers.ts
@@ -3,6 +3,8 @@ export type RuntimeTerminalDataMeta = Readonly<{
   rawLength?: number
   transformed?: boolean
   cwd?: string
+  /** A whole-tab close owns this process: views leave its teardown output unshown. */
+  presentationHeld?: true
 }>
 
 type TerminalDataListener = (data: string, meta?: RuntimeTerminalDataMeta) => void
diff --git a/src/main/runtime/terminal-intentional-stops.ts b/src/main/runtime/terminal-intentional-stops.ts
index 7993da33fdcb..588b6fbbb74f 100644
--- a/src/main/runtime/terminal-intentional-stops.ts
+++ b/src/main/runtime/terminal-intentional-stops.ts
@@ -80,6 +80,20 @@ export class TerminalIntentionalStops {
     return [...stop.ownersByKind.keys()]
   }
 
+  /**
+   * Whether a whole-tab close owns this exact process, so its teardown output is held from the pane
+   * the close removes. Reads only: never pins the stop to a process the way an exit claim does.
+   * Released when an unproven stop settles; a later process on the same id is never held.
+   */
+  holdsPresentation(ptyId: string, incarnationId: string | null | undefined): boolean {
+    const stop = this.stopsByPtyId.get(ptyId)
+    return (
+      stop?.ownersByKind.has('closing') === true &&
+      incarnationId != null &&
+      stop.incarnationId === incarnationId
+    )
+  }
+
   /** Whether a stop of this PTY that may still be undone is in flight. */
   isReversibleStopInFlight(ptyId: string): boolean {
     return (this.stopsByPtyId.get(ptyId)?.ownersByKind.get('reversible')?.inFlight ?? 0) > 0
diff --git a/src/main/runtime/terminal/output/pty-output-ingestion.ts b/src/main/runtime/terminal/output/pty-output-ingestion.ts
index d7041487eb25..ae0ba95aa9c2 100644
--- a/src/main/runtime/terminal/output/pty-output-ingestion.ts
+++ b/src/main/runtime/terminal/output/pty-output-ingestion.ts
@@ -309,7 +309,10 @@ export abstract class OrcaRuntimeWithOnPtyData extends OrcaRuntimeWithPreparePty
       seq: outputSequence,
       rawLength: sequenceChars,
       ...(transformed ? { transformed: true } : {}),
-      ...(cwdChanged && cwd !== null ? { cwd } : {})
+      ...(cwdChanged && cwd !== null ? { cwd } : {}),
+      ...(this.intentionalPtyStops.holdsPresentation(ptyId, this.ptysById.get(ptyId)?.incarnationId)
+        ? { presentationHeld: true }
+        : {})
     }))
     return outputSequence
   }

From 8cb91b572aa0d3c0e7de0ac43ada95c23bbd8e6d Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 02:46:39 -0700
Subject: [PATCH 182/207] Offer Switch to Chat UI on a pane whose agent exited,
 as main's header did

The pane header's gate reads the pane's last reported conversation again (main's gate), so a pane a failed switch stopped still shows "Switch to Chat UI", which replaces the tab in place. A host's pane with no live agent is switched through the terminal it stays bound to; one a failed switch unbound offers nothing, and Session History opens its conversation as a chat instead. From a terminal, the failure copy names the agent and says to use Switch to Chat UI to try again.
---
 .../tab-bar/cli-chat-resume-run.test.ts       |  4 +-
 .../tab-bar/cli-chat-resume-source.ts         |  4 +-
 .../tab-session-history-switch.test.ts        | 84 +++++++++++++------
 .../tab-bar/tab-session-history-switch.ts     | 31 +++----
 .../src/i18n/en-runtime-required.json         |  2 +
 src/renderer/src/i18n/locales/en.json         |  2 +
 .../lib/conversation-surface-switch.test.tsx  |  2 +-
 .../src/lib/conversation-switch-feedback.ts   | 19 ++++-
 8 files changed, 96 insertions(+), 52 deletions(-)

diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
index a545b4c5aded..5074634c79e7 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
@@ -666,8 +666,8 @@ it.each(['preparation', 'refusal'])(
     })
     expect(mocks.toast).toHaveBeenCalledExactlyOnceWith(
       stage === 'refusal'
-        ? "Claude couldn't open this conversation's history. Check that its saved conversation is available, then try again."
-        : 'Claude could not switch to chat. Try again.'
+        ? "Claude couldn't open this conversation's history. Check that its saved conversation is available, then use Switch to Chat UI to try again."
+        : 'Claude could not switch to chat. Use Switch to Chat UI to try again.'
     )
     expect(tabs()).toEqual([])
     expect(mocks.activate).not.toHaveBeenCalled()
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts
index 5b250e042cc7..bb3246b13572 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-source.ts
@@ -12,7 +12,7 @@ import {
   adoptsCliConversations,
   type CliConversationRowAgent
 } from '../../../../shared/structured-agent-cli-conversation-adoption'
-import { resolvePaneSwitchToChatOffer } from './tab-session-history-switch'
+import { resolvePaneResumeInNewChatOffer } from './tab-session-history-switch'
 
 export type CliChatResumeSource = {
   tabId: string
@@ -46,7 +46,7 @@ export function resolveCliChatResumeSource(
         tab: { worktreeId: args.tab.worktreeId, tabId: args.tab.id }
       }).find((candidate) => candidate.tabId === args.tab.id)
   const offer = conversation
-    ? resolvePaneSwitchToChatOffer(state, {
+    ? resolvePaneResumeInNewChatOffer(state, {
         worktreeId: conversation.worktreeId,
         paneKey: conversation.paneKey
       })
diff --git a/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts b/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts
index f3592184212d..199170a6fef5 100644
--- a/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts
+++ b/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts
@@ -126,6 +126,33 @@ const exitedAgentRecords: Record<string, Partial<AppState>> = {
   }
 }
 
+/** server-1's runtime status: structured chats, with or without History resume. */
+const serverWithChat = (resumeHistory: boolean): AppState['runtimeStatusByEnvironmentId'] =>
+  new Map([
+    [
+      'server-1',
+      {
+        checkedAt: 1,
+        status: {
+          runtimeId: 'server-runtime',
+          rendererGraphEpoch: 0,
+          graphStatus: 'ready',
+          authoritativeWindowId: null,
+          liveTabCount: 1,
+          liveLeafCount: 1,
+          capabilities: [
+            protocol.STRUCTURED_AGENT_SESSION_CLIENT_LAUNCH_MODE_CAPABILITY,
+            protocol.STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY,
+            protocol.STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY,
+            ...(resumeHistory
+              ? [protocol.STRUCTURED_AGENT_SESSION_RESUME_HISTORY_RUNTIME_CAPABILITY]
+              : [])
+          ]
+        }
+      }
+    ]
+  ])
+
 describe('resolveTabSessionHistorySubject', () => {
   it('retains the chosen pane in the direct CLI create identity without a History row', () => {
     expect(
@@ -167,30 +194,7 @@ describe('resolveTabSessionHistorySubject', () => {
         }
       }
 
-      state.runtimeStatusByEnvironmentId = new Map([
-        [
-          'server-1',
-          {
-            checkedAt: 1,
-            status: {
-              runtimeId: 'server-runtime',
-              rendererGraphEpoch: 0,
-              graphStatus: 'ready',
-              authoritativeWindowId: null,
-              liveTabCount: 1,
-              liveLeafCount: 1,
-              capabilities: [
-                protocol.STRUCTURED_AGENT_SESSION_CLIENT_LAUNCH_MODE_CAPABILITY,
-                protocol.STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY,
-                protocol.STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY,
-                ...(supported
-                  ? [protocol.STRUCTURED_AGENT_SESSION_RESUME_HISTORY_RUNTIME_CAPABILITY]
-                  : [])
-              ]
-            }
-          }
-        ]
-      ])
+      state.runtimeStatusByEnvironmentId = serverWithChat(supported)
       const source = resolveCliChatResumeSource(state, {
         tab: { id: 'term-1', worktreeId: workspaceId }
       })
@@ -477,6 +481,38 @@ describe('one pane of a terminal tab', () => {
     expect(paneGate(state, claudePane)).toBe(true)
   })
 
+  it.each(['local', 'runtime:server-1'])(
+    "still offers an exited agent's conversation on a %s pane, while it is bound to its terminal",
+    (host) => {
+      makeState({}, host === 'local' ? {} : { executionHostId: host })
+      useAppStore.setState({ runtimeStatusByEnvironmentId: serverWithChat(true) })
+      const leaf = '11111111-1111-4111-8111-111111111111'
+      const pane = `term-1:${leaf}`
+      const bind = (ptyIdsByLeafId?: Record<string, string>) =>
+        useAppStore.setState({
+          terminalLayoutsByTabId: {
+            'term-1': { root: null, activeLeafId: leaf, expandedLeafId: null, ptyIdsByLeafId }
+          }
+        })
+      bind({ [leaf]: 'pty-1' })
+      const store = () => useAppStore.getState()
+      store().setAgentStatus(
+        pane,
+        { state: 'done', prompt: 'hi', agentType: 'claude' },
+        undefined,
+        undefined,
+        { tabId: 'term-1', worktreeId: WORKTREE_ID },
+        { providerSession: { key: 'session_id', id: 'claude-session-1' } }
+      )
+      store().removeAgentStatus(pane)
+      expect(store().agentStatusByPaneKey).toEqual({})
+      expect(paneGate(store(), pane)).toBe(true)
+      // A failed switch unbinds a host's pane; only Session History can switch that one now.
+      bind(undefined)
+      expect(paneGate(store(), pane)).toBe(host === 'local')
+    }
+  )
+
   it.each(Object.keys(exitedAgentRecords))(
     'offers nothing once the agent exited and only a %s record remains, as the tab menu does',
     (kind) => {
diff --git a/src/renderer/src/components/tab-bar/tab-session-history-switch.ts b/src/renderer/src/components/tab-bar/tab-session-history-switch.ts
index 55698d4ff0c4..23a5bc6e9105 100644
--- a/src/renderer/src/components/tab-bar/tab-session-history-switch.ts
+++ b/src/renderer/src/components/tab-bar/tab-session-history-switch.ts
@@ -4,6 +4,7 @@ import type { AppState } from '@/store/types'
 import { getIndexedAllWorktrees } from '@/store/worktree-repo-index'
 import {
   collectAgentPaneConversations,
+  panePtyId,
   resolvePaneAgentConversation,
   resolvePaneLastAgentConversation
 } from '@/lib/ai-vault-tab-title-requests'
@@ -83,27 +84,15 @@ export function resolvePaneResumeInNewChatOffer(
   state: AppState,
   pane: { worktreeId: string; paneKey: string }
 ): PaneResumeInNewChatOffer {
-  return conversationResumeOffer(
-    state,
-    resolvePaneAgentConversation(state, pane, adoptsCliConversations)
-  )
-}
-
-export function resolvePaneSwitchToChatOffer(
-  state: AppState,
-  pane: { worktreeId: string; paneKey: string }
-): PaneResumeInNewChatOffer {
-  return conversationResumeOffer(
-    state,
-    resolvePaneLastAgentConversation(state, pane, adoptsCliConversations)
-  )
-}
-
-function conversationResumeOffer(
-  state: AppState,
-  conversation: ReturnType<typeof resolvePaneLastAgentConversation>
-): PaneResumeInNewChatOffer {
-  if (!conversation) {
+  const conversation = resolvePaneLastAgentConversation(state, pane, adoptsCliConversations)
+  // A host's pane whose agent is gone is switched through the terminal it stays bound to; one a
+  // failed switch unbound offers nothing here, and Session History opens it as a chat instead.
+  if (
+    !conversation ||
+    (conversation.executionHostId !== LOCAL_EXECUTION_HOST_ID &&
+      !state.agentStatusByPaneKey[conversation.paneKey] &&
+      !panePtyId(state, conversation.paneKey))
+  ) {
     return null
   }
   const hostScope = resolveAiVaultHostScopeDefaults(
diff --git a/src/renderer/src/i18n/en-runtime-required.json b/src/renderer/src/i18n/en-runtime-required.json
index 2dc0faafef77..180f667717cc 100644
--- a/src/renderer/src/i18n/en-runtime-required.json
+++ b/src/renderer/src/i18n/en-runtime-required.json
@@ -1909,6 +1909,8 @@
           "outcomeUnknown": "Orca could not confirm the {{agent}} switch. Check the open chat and terminal before trying again.",
           "historyUnavailable": "{{agent}} couldn't open this conversation's history. Check that its saved conversation is available, then try again.",
           "chatSwitchFailed": "{{agent}} could not switch to chat. Try again.",
+          "chatSwitchFailedFromTerminal": "{{agent}} could not switch to chat. Use Switch to Chat UI to try again.",
+          "historyUnavailableFromTerminal": "{{agent}} couldn't open this conversation's history. Check that its saved conversation is available, then use Switch to Chat UI to try again.",
           "terminalSwitchFailed": "{{agent}} could not switch to a terminal. Try again.",
           "writerUnconfirmed": "Orca could not confirm {{agent}} stopped. Check its open chats and terminals, then try this action again.",
           "sourceExitUnconfirmed": "Orca could not confirm {{agent}} stopped in this terminal. Quit {{agent}} here, then try this action again.",
diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index 09a0d147c13f..cbb9bf6f70f7 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -20139,6 +20139,8 @@
           "outcomeUnknown": "Orca could not confirm the {{agent}} switch. Check the open chat and terminal before trying again.",
           "historyUnavailable": "{{agent}} couldn't open this conversation's history. Check that its saved conversation is available, then try again.",
           "chatSwitchFailed": "{{agent}} could not switch to chat. Try again.",
+          "chatSwitchFailedFromTerminal": "{{agent}} could not switch to chat. Use Switch to Chat UI to try again.",
+          "historyUnavailableFromTerminal": "{{agent}} couldn't open this conversation's history. Check that its saved conversation is available, then use Switch to Chat UI to try again.",
           "terminalSwitchFailed": "{{agent}} could not switch to a terminal. Try again.",
           "writerUnconfirmed": "Orca could not confirm {{agent}} stopped. Check its open chats and terminals, then try this action again.",
           "sourceExitUnconfirmed": "Orca could not confirm {{agent}} stopped in this terminal. Quit {{agent}} here, then try this action again.",
diff --git a/src/renderer/src/lib/conversation-surface-switch.test.tsx b/src/renderer/src/lib/conversation-surface-switch.test.tsx
index 6fccfc043f3b..d5948a90e75c 100644
--- a/src/renderer/src/lib/conversation-surface-switch.test.tsx
+++ b/src/renderer/src/lib/conversation-surface-switch.test.tsx
@@ -299,7 +299,7 @@ it.each([
 
 it.each([
   ['terminal', 'Codex could not switch to a terminal. Try again.'],
-  ['chat', 'Codex could not switch to chat. Try again.']
+  ['chat', 'Codex could not switch to chat. Use Switch to Chat UI to try again.']
 ] as const)(
   'runs nothing when the host could not be asked whether it switches (to %s)',
   async (direction, text) => {
diff --git a/src/renderer/src/lib/conversation-switch-feedback.ts b/src/renderer/src/lib/conversation-switch-feedback.ts
index 9dd8027c6647..4b04e6a865ab 100644
--- a/src/renderer/src/lib/conversation-switch-feedback.ts
+++ b/src/renderer/src/lib/conversation-switch-feedback.ts
@@ -75,10 +75,25 @@ export function conversationSwitchFailureText(
       values
     )
   }
+  // From a terminal, the retry is the Switch to Chat UI its pane (or Session History) still offers.
+  const fromTerminal = args.direction === 'chat' && args.source !== undefined
   if (reason === 'transcriptUnreadable') {
+    return fromTerminal
+      ? translate(
+          'components.tab.bar.switch.historyUnavailableFromTerminal',
+          "{{agent}} couldn't open this conversation's history. Check that its saved conversation is available, then use Switch to Chat UI to try again.",
+          values
+        )
+      : translate(
+          'components.tab.bar.switch.historyUnavailable',
+          "{{agent}} couldn't open this conversation's history. Check that its saved conversation is available, then try again.",
+          values
+        )
+  }
+  if (fromTerminal) {
     return translate(
-      'components.tab.bar.switch.historyUnavailable',
-      "{{agent}} couldn't open this conversation's history. Check that its saved conversation is available, then try again.",
+      'components.tab.bar.switch.chatSwitchFailedFromTerminal',
+      '{{agent}} could not switch to chat. Use Switch to Chat UI to try again.',
       values
     )
   }

From 284b3b5c25ba216aa071348196854f4145bd21b6 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 02:49:50 -0700
Subject: [PATCH 183/207] Restore the host capability hooks the probe change
 dropped

2973b244ccb meant to add readStructuredAgentSessionHostSupport but replaced the whole module, removing structuredAgentSessionHostKey and the host capability hooks native chat still imports. Restore them and keep the new reader.
---
 ...tructured-agent-session-host-capability.ts | 221 +++++++++++++++++-
 1 file changed, 218 insertions(+), 3 deletions(-)

diff --git a/src/renderer/src/runtime/structured-agent-session-host-capability.ts b/src/renderer/src/runtime/structured-agent-session-host-capability.ts
index 3cfda602554a..029b3f248c6c 100644
--- a/src/renderer/src/runtime/structured-agent-session-host-capability.ts
+++ b/src/renderer/src/runtime/structured-agent-session-host-capability.ts
@@ -1,10 +1,225 @@
-import type { RuntimeCapability } from '../../../shared/protocol-version'
+import { AGENT_SESSION_PERMISSION_OWN_RUNTIME_CAPABILITY } from '../../../shared/agent-session-permission-modes-capability'
+import { useEffect, useState, useSyncExternalStore } from 'react'
+import { useAppStore } from '@/store'
+import {
+  AGENT_SESSION_CONVERSATION_STOP_RUNTIME_CAPABILITY,
+  AGENT_SESSION_QUEUED_COMMANDS_RUNTIME_CAPABILITY,
+  AGENT_SESSION_QUEUED_MESSAGE_EDIT_RUNTIME_CAPABILITY,
+  AGENT_SESSION_QUEUED_MESSAGE_REORDER_RUNTIME_CAPABILITY,
+  AGENT_SESSION_QUEUED_MESSAGE_IMAGE_EDIT_RUNTIME_CAPABILITY,
+  AGENT_SESSION_QUEUED_MESSAGE_SKILLS_EDIT_RUNTIME_CAPABILITY,
+  AGENT_SESSION_QUEUED_MESSAGES_RUNTIME_CAPABILITY,
+  AGENT_SESSION_REWIND_RECOVERY_CAPABILITY,
+  type RuntimeCapability
+} from '../../../shared/protocol-version'
 import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
-import { runtimeEnvironmentSupportsCapability } from './runtime-rpc-client'
 import {
   ensureLocalRuntimeCapabilities,
-  readLocalRuntimeCapabilitiesOrUnknown
+  readLocalRuntimeCapabilitiesOrUnknown,
+  subscribeLocalRuntimeCapabilityObservation
 } from './local-runtime-capabilities'
+import { runtimeEnvironmentSupportsCapability } from './runtime-rpc-client'
+import { subscribeRuntimeHostContactRegained } from './runtime-host-contact-regained'
+import {
+  isRuntimeHostContactRevoked,
+  lastVerifiedRuntimeStatus
+} from '../../../shared/runtime-host-status'
+
+export function structuredAgentSessionHostKey(target: RuntimeClientTarget): string {
+  return target.kind === 'local' ? 'local' : `environment:${target.environmentId}`
+}
+
+/** Unknown before verification or after revocation; a contact outage retains the known build. */
+export type StructuredAgentSessionHostCapabilityState = 'unknown' | 'supported' | 'unsupported'
+
+/** Displays the existing host status; connection lifecycle owns probing. */
+export function useStructuredAgentSessionOwnPermissionState(
+  target: RuntimeClientTarget | null
+): StructuredAgentSessionHostCapabilityState {
+  const capability = AGENT_SESSION_PERMISSION_OWN_RUNTIME_CAPABILITY
+  const environmentId = target?.kind === 'environment' ? target.environmentId : null
+  // Select the verdict, not the map: unrelated host flips must not rerender every chat.
+  const remote = useAppStore((state): StructuredAgentSessionHostCapabilityState => {
+    if (environmentId === null) {
+      return 'unknown'
+    }
+    const entry = state.runtimeStatusByEnvironmentId.get(environmentId)
+    const status = isRuntimeHostContactRevoked(entry) ? null : lastVerifiedRuntimeStatus(entry)
+    return status
+      ? status.capabilities?.includes(capability)
+        ? 'supported'
+        : 'unsupported'
+      : 'unknown'
+  })
+  const local = useSyncExternalStore(
+    subscribeLocalRuntimeCapabilityObservation,
+    () => localCapabilityState(capability),
+    () => 'unknown' as const
+  )
+  useEffect(() => {
+    if (target?.kind === 'local') {
+      void ensureLocalRuntimeCapabilities()
+    }
+  }, [target?.kind])
+  return !target ? 'unknown' : environmentId === null ? local : remote
+}
+
+/** Whether the session's host advertises `capability`. A failed probe stays `unknown` and a remote
+ *  host is asked again each time this client regains contact with it. */
+export function useStructuredAgentSessionHostCapabilityState(
+  target: RuntimeClientTarget | null,
+  capability: RuntimeCapability
+): StructuredAgentSessionHostCapabilityState {
+  const key = target ? structuredAgentSessionHostKey(target) : null
+  const [answer, setAnswer] = useState<{
+    key: string | null
+    state: StructuredAgentSessionHostCapabilityState
+  }>(() => ({
+    key,
+    state: target?.kind === 'local' ? localCapabilityState(capability) : 'unknown'
+  }))
+  const environmentId = target?.kind === 'environment' ? target.environmentId : null
+  const [contact, setContact] = useState(0)
+  useEffect(() => {
+    if (environmentId === null) {
+      return
+    }
+    return subscribeRuntimeHostContactRegained(environmentId, () => setContact((n) => n + 1))
+  }, [environmentId])
+  useEffect(() => {
+    if (key === null) {
+      return
+    }
+    let cancelled = false
+    const probe: Promise<StructuredAgentSessionHostCapabilityState> =
+      environmentId === null
+        ? ensureLocalRuntimeCapabilities().then(() => localCapabilityState(capability))
+        : runtimeEnvironmentSupportsCapability(environmentId, capability).then((supported) =>
+            supported ? 'supported' : 'unsupported'
+          )
+    void probe
+      .catch((): StructuredAgentSessionHostCapabilityState => 'unknown')
+      .then((state) => {
+        if (!cancelled) {
+          setAnswer((current) =>
+            current.key === key && current.state === state ? current : { key, state }
+          )
+        }
+      })
+    return () => {
+      cancelled = true
+    }
+  }, [capability, contact, environmentId, key])
+  return answer.key === key ? answer.state : 'unknown'
+}
+
+function localCapabilityState(
+  capability: RuntimeCapability
+): StructuredAgentSessionHostCapabilityState {
+  const capabilities = readLocalRuntimeCapabilitiesOrUnknown()
+  return capabilities === null
+    ? 'unknown'
+    : capabilities.includes(capability)
+      ? 'supported'
+      : 'unsupported'
+}
+
+/** Whether the session's host advertises `capability`. False until the host has said so, and for
+ *  a failed probe: an older host is handled as it always was. */
+export function useStructuredAgentSessionHostCapability(
+  target: RuntimeClientTarget,
+  capability: RuntimeCapability
+): boolean {
+  return useStructuredAgentSessionHostCapabilityState(target, capability) === 'supported'
+}
+
+/** Whether the host takes a Stop naming no turn: the only Stop before the provider opens one. */
+export function useStructuredAgentSessionHostStopsConversation(
+  target: RuntimeClientTarget
+): boolean {
+  return useStructuredAgentSessionHostCapability(
+    target,
+    AGENT_SESSION_CONVERSATION_STOP_RUNTIME_CAPABILITY
+  )
+}
+
+/** Whether the host settles a rewind left in doubt on the next send, agent running or not: only
+ *  then may a client offer a rewind, which hands an in-doubt prompt back for that send. */
+export function useStructuredAgentSessionHostRecoversRewindOnSend(
+  target: RuntimeClientTarget
+): boolean {
+  return useStructuredAgentSessionHostCapability(target, AGENT_SESSION_REWIND_RECOVERY_CAPABILITY)
+}
+
+/** Whether the host holds mid-turn sends as drafts: only then may a client send `delivery`. The
+ *  published cards and their queuedMessage actions are not gated on it. */
+export function useStructuredAgentSessionHostQueuesMessages(target: RuntimeClientTarget): boolean {
+  return useStructuredAgentSessionHostQueuesMessagesState(target) === 'supported'
+}
+
+/** Three-state: only `supported` lets a send ask to be queued; `unknown` holds nothing back. */
+export function useStructuredAgentSessionHostQueuesMessagesState(
+  target: RuntimeClientTarget
+): StructuredAgentSessionHostCapabilityState {
+  return useStructuredAgentSessionHostCapabilityState(
+    target,
+    AGENT_SESSION_QUEUED_MESSAGES_RUNTIME_CAPABILITY
+  )
+}
+
+/** Whether the host holds a /compact sent while the agent works as a queued card: only then may
+ *  a client send the command's `delivery`, and only where it also renders the queue's cards. */
+export function useStructuredAgentSessionHostQueuesCommands(target: RuntimeClientTarget): boolean {
+  return useStructuredAgentSessionHostCapability(
+    target,
+    AGENT_SESSION_QUEUED_COMMANDS_RUNTIME_CAPABILITY
+  )
+}
+
+/** Whether the host edits a queued card in place and holds it from delivery while edited. Until
+ *  it says so, and against an older host, a card offers no Edit. */
+export function useStructuredAgentSessionHostEditsQueuedMessages(
+  target: RuntimeClientTarget
+): boolean {
+  return useStructuredAgentSessionHostCapability(
+    target,
+    AGENT_SESSION_QUEUED_MESSAGE_EDIT_RUNTIME_CAPABILITY
+  )
+}
+
+/** Whether Save may send a queued card's image set; against an older host the edit is text only. */
+export function useStructuredAgentSessionHostEditsQueuedImages(
+  target: RuntimeClientTarget
+): boolean {
+  return useStructuredAgentSessionHostCapability(
+    target,
+    AGENT_SESSION_QUEUED_MESSAGE_IMAGE_EDIT_RUNTIME_CAPABILITY
+  )
+}
+
+/** Whether queue order can be changed by message ID on the execution host. */
+export function useStructuredAgentSessionHostReordersQueuedMessages(
+  target: RuntimeClientTarget
+): boolean {
+  return useStructuredAgentSessionHostCapability(
+    target,
+    AGENT_SESSION_QUEUED_MESSAGE_REORDER_RUNTIME_CAPABILITY
+  )
+}
+
+/** The API runtime owns Chat settings; on web the local API forwards to the active paired host. */
+export function useChatSettingsOwnPermissions(): boolean {
+  return useStructuredAgentSessionOwnPermissionState({ kind: 'local' }) === 'supported'
+}
+
+export function useStructuredAgentSessionHostEditsQueuedSkills(
+  target: RuntimeClientTarget
+): boolean {
+  return useStructuredAgentSessionHostCapability(
+    target,
+    AGENT_SESSION_QUEUED_MESSAGE_SKILLS_EDIT_RUNTIME_CAPABILITY
+  )
+}
 
 /** The host's answer, rejecting when it couldn't be read: for an action that must tell "this
  *  host can't" from "couldn't ask it" (a dropped connection is not an older host). */

From 442d796d7ee95d4ea6539d8ca0d8cc641d2a48c6 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 02:56:16 -0700
Subject: [PATCH 184/207] Fix the CI-8 type errors, and read the switch's
 source fact from the live reply

The start refusal helper takes the same details refuse() does, reply-only facts included. The launch failure read `source` from a refusal reference, which drops reply-only facts by design, so a refused switch never said its own terminal still writes; it now reads the live reply's details. Test mocks use the full mutation result and a terminal row type for `replaces`.
---
 ...uctured-agent-session-start-eligibility.ts |  3 ++-
 .../structured-worker-switch-stop.test.ts     | 10 +++++---
 ...tured-agent-session-launch-failure.test.ts | 16 +++++++++++++
 ...structured-agent-session-launch-failure.ts | 24 +++++++++++++++++--
 .../slot-anchor-scaling.test.ts               |  2 +-
 5 files changed, 48 insertions(+), 7 deletions(-)
 create mode 100644 src/renderer/src/lib/structured-agent-session-launch-failure.test.ts

diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-start-eligibility.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-start-eligibility.ts
index 56ff19468e2b..9971848a049f 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-start-eligibility.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-start-eligibility.ts
@@ -6,6 +6,7 @@ import {
   type AgentSessionRefusalDetailsByCode,
   type AgentSessionWireRefusalCode
 } from '../../../shared/agent-session-wire-refusals'
+import type { AgentSessionReplyOnlyFacts } from '../../../shared/agent-session-reply-refusal-facts'
 import { terminalOwnerRefusalMessage } from '../../../shared/agent-session-legacy-handoff-lease'
 import type { StructuredAgentSessionAttachContext } from './structured-agent-session-attach-context'
 import type { StructuredAgentSessionResumeOutcome } from './structured-agent-session-agent-start'
@@ -84,7 +85,7 @@ export function structuredAgentSessionStartParams(
 
 export function refusedStructuredAgentSessionStart<C extends AgentSessionWireRefusalCode>(
   code: C,
-  details: NoInfer<AgentSessionRefusalDetailsByCode[C]>,
+  details: NoInfer<AgentSessionRefusalDetailsByCode[C] & AgentSessionReplyOnlyFacts<C>>,
   message: string
 ): Extract<StructuredAgentSessionResumeOutcome, { ok: false }> {
   return { ok: false, refusal: refuse(code, details, message) }
diff --git a/src/main/runtime/orchestration/structured-worker-switch-stop.test.ts b/src/main/runtime/orchestration/structured-worker-switch-stop.test.ts
index ebcca82f7c6f..d91dcec1012b 100644
--- a/src/main/runtime/orchestration/structured-worker-switch-stop.test.ts
+++ b/src/main/runtime/orchestration/structured-worker-switch-stop.test.ts
@@ -171,9 +171,13 @@ it('stops a paused queue without asking, since nothing is replying', async () =>
   ])
   // Queued before this host opened the conversation: held paused, not handed over.
   vi.spyOn(journal, 'wroteBeforeOpen').mockReturnValue(true)
-  const cancel = vi
-    .spyOn(rig.host, 'cancel')
-    .mockResolvedValue({ ok: true, value: { cancelled: true } })
+  const cancel = vi.spyOn(rig.host, 'cancel').mockResolvedValue({
+    ok: true,
+    replayed: false,
+    fence: 1,
+    cursor: journal.cursor(),
+    value: { cancelled: true }
+  })
   await rig.host.stopForSwitch(id, caller, deadline, false)
   expect(cancel).toHaveBeenCalledTimes(1)
 })
diff --git a/src/renderer/src/lib/structured-agent-session-launch-failure.test.ts b/src/renderer/src/lib/structured-agent-session-launch-failure.test.ts
new file mode 100644
index 000000000000..bfbc2d7a90d0
--- /dev/null
+++ b/src/renderer/src/lib/structured-agent-session-launch-failure.test.ts
@@ -0,0 +1,16 @@
+import { expect, it } from 'vitest'
+import { AgentSessionRefusalError, refuse } from '../../../shared/agent-session-wire-refusals'
+import { structuredLaunchFailure } from './structured-agent-session-launch-failure'
+
+it("reads that the switch's own source still writes from the live reply only", () => {
+  const reply = (source?: true) =>
+    new AgentSessionRefusalError(
+      refuse(
+        'agent_session_conflict',
+        { reason: 'conversationHeldElsewhere', ...(source ? { source } : {}) },
+        'held'
+      )
+    )
+  expect(structuredLaunchFailure(reply(true))).toMatchObject({ source: true })
+  expect(structuredLaunchFailure(reply())).not.toHaveProperty('source')
+})
diff --git a/src/renderer/src/lib/structured-agent-session-launch-failure.ts b/src/renderer/src/lib/structured-agent-session-launch-failure.ts
index 2ef3764a75a8..429138ed8897 100644
--- a/src/renderer/src/lib/structured-agent-session-launch-failure.ts
+++ b/src/renderer/src/lib/structured-agent-session-launch-failure.ts
@@ -4,7 +4,10 @@ import {
   readAgentSessionRefusalReference,
   type AgentSessionRefusalReference
 } from '../../../shared/agent-session-wire-refusals'
-import type { AgentSessionConversationOwner } from '../../../shared/agent-session-refusal-details'
+import {
+  readAgentSessionRefusalDetails,
+  type AgentSessionConversationOwner
+} from '../../../shared/agent-session-refusal-details'
 import {
   agentSessionRefusalFailure,
   readAgentSessionErrorRefusal,
@@ -79,7 +82,7 @@ export function structuredLaunchFailure(error: unknown): StructuredLaunchFailure
     ...(owner ? { owner } : {}),
     ...((refusal.code === 'agent_session_conflict' ||
       refusal.code === 'agent_session_ownership_unknown') &&
-    refusal.details?.source
+    replyNamesSource(error, refusal.code)
       ? { source: true as const }
       : {})
   }
@@ -101,6 +104,23 @@ export function structuredLaunchConversationOwner(
   return details && 'owner' in details ? details.owner : undefined
 }
 
+/** A fact only the live reply carries (its reference drops it): the switch's own source pane
+ *  still writes the conversation. */
+function replyNamesSource(
+  error: unknown,
+  code: 'agent_session_conflict' | 'agent_session_ownership_unknown'
+): boolean {
+  const reply =
+    error instanceof Error &&
+    'refusal' in error &&
+    typeof error.refusal === 'object' &&
+    error.refusal !== null &&
+    'details' in error.refusal
+      ? readAgentSessionRefusalDetails(code, error.refusal.details)
+      : undefined
+  return reply?.source === true
+}
+
 function launchRefusal(error: unknown): AgentSessionRefusalReference | undefined {
   return error instanceof Error && 'refusal' in error
     ? readAgentSessionRefusalReference(error.refusal)
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/slot-anchor-scaling.test.ts b/src/renderer/src/runtime/web-session-tabs-sync/slot-anchor-scaling.test.ts
index 134529f2400f..5e84b0968831 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/slot-anchor-scaling.test.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/slot-anchor-scaling.test.ts
@@ -19,7 +19,7 @@ vi.mock('./slot-anchor', async (load) => {
 })
 
 type Row = RuntimeMobileSessionTabsResult['tabs'][number]
-const terminal = (hostTabId: string): Row => ({
+const terminal = (hostTabId: string): Extract<Row, { type: 'terminal' }> => ({
   type: 'terminal',
   id: `${hostTabId}::${LEAF_ID}`,
   parentTabId: hostTabId,

From 75c5b0c3bf323e61376b81ad11a9d909ad6d56fc Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 03:33:12 -0700
Subject: [PATCH 185/207] Keep a switch's proven stop when the transcript moves
 during the stop

The create a switch runs after stopping the CLI re-found the transcript, so a rollout renamed during the stop refused before any chat existed: the founding fallback and the stop record never ran, and a retry read the turn as Codex failing. After a stop, the create now adopts the transcript and account home it resolved before the stop; a missing file fails the founding read, where the stop's record still founds the chat.
---
 .../structured-agent-session-create.ts        |   5 +-
 ...ructured-agent-session-switch-execution.ts |   7 +-
 ...gent-session-switch-first-adoption.test.ts | 198 ++++++++++++++++++
 .../structured-session-create-support.ts      |   1 +
 ...tructured-agent-session-create-adoption.ts | 185 ++++++++--------
 5 files changed, 309 insertions(+), 87 deletions(-)
 create mode 100644 src/main/runtime/rpc/methods/structured-agent-session-switch-first-adoption.test.ts

diff --git a/src/main/runtime/rpc/methods/structured-agent-session-create.ts b/src/main/runtime/rpc/methods/structured-agent-session-create.ts
index 6b5648039e89..8027a692c132 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-create.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-create.ts
@@ -26,6 +26,7 @@ import {
   type StructuredAgentCliSourceEvidence
 } from '../../../native-chat/structured-agent-cli-source'
 import type { StructuredAgentId } from '../../../../shared/agent-session-provider-handle'
+import type { StructuredAgentSessionAdoption } from '../../../native-chat/structured-agent-session-history-adoption'
 import { resolveUncommittedStructuredCreate } from './structured-agent-session-precommit-refusal'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
 import { structuredAgentSessionClosedBeforeCreate } from './structured-agent-session-close-before-create'
@@ -56,6 +57,7 @@ export async function prepareStructuredAgentSessionCreateForWorktree(args: {
   caller: StructuredAgentSessionCaller
   resumeFrom?: StructuredAgentSessionResumeSource
   structuredAgentCliSourceEvidence?: StructuredAgentCliSourceEvidence
+  pinnedAdoption?: StructuredAgentSessionAdoption
   /** Explicit picks override seed keys at rest; acquired in-process launches replace the seed. */
   optionsMode?: 'replace-model-selection'
   options?: Readonly<Record<string, string>>
@@ -81,7 +83,8 @@ export async function prepareStructuredAgentSessionCreateForWorktree(args: {
     agent: args.agent,
     callerKey: args.caller.callerKey,
     structuredAgentCliSourceEvidence,
-    ...(args.resumeFrom ? { resumeFrom: args.resumeFrom } : {})
+    ...(args.resumeFrom ? { resumeFrom: args.resumeFrom } : {}),
+    ...(args.pinnedAdoption ? { pinnedAdoption: args.pinnedAdoption } : {})
   })
   const attachFingerprint = computeAgentSessionPayloadFingerprint({
     method: 'agentSession.attach',
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
index 8b65ec95f62b..9d733c186008 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
@@ -206,7 +206,12 @@ async function switchToChat(
         caller: structuredCallerFor(ctx),
         atRest: true,
         ensureHost: async () => host,
-        structuredAgentCliSourceEvidence: sourceEvidence
+        structuredAgentCliSourceEvidence: sourceEvidence,
+        // After a stop, the transcript read before it: the stop's record founds even if it moved.
+        pinnedAdoption:
+          adopt?.transcriptPath && stopped
+            ? { accountHome: createIdentity!.accountHome, transcriptPath: adopt.transcriptPath }
+            : undefined
       })
       deadline.check()
       const created = await commitStructuredAgentSessionCreate({
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-first-adoption.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-first-adoption.test.ts
new file mode 100644
index 000000000000..c78594c73a9d
--- /dev/null
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-first-adoption.test.ts
@@ -0,0 +1,198 @@
+import { mkdir, rename, writeFile } from 'node:fs/promises'
+import { dirname, join } from 'node:path'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { computeAgentSessionPayloadFingerprint } from '../../../../shared/agent-session-mutation-envelope'
+import type { AgentStatusIpcPayload } from '../../../../shared/agent-status-types'
+import { createStructuredAgentSessionOperationId } from '../../../../shared/structured-agent-session-mutation'
+import {
+  createRestTestRig,
+  type RestTestRig
+} from '../../../native-chat/agent-session-wire/structured-agent-session-rest-test-rig'
+import { setStructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-registry'
+import {
+  setupMainOwnedWorkspace,
+  WORKTREE_ID,
+  TAB_ID,
+  LEAF_A,
+  PTY_A
+} from '../../main-owned-workspace-runtime-fixture'
+import { executeStructuredSessionSwitch } from './structured-agent-session-switch-execution'
+
+// A Codex CLI that was never a chat, stopped mid-reply by a switch whose rollout moved during the
+// stop: the switch fails, but the proven stop is kept, so a retry once the file is back reads
+// the turn as the user's Stop, not as Codex failing.
+
+const THREAD = '019a0000-0000-7000-8000-000000000001'
+const SESSION = 'session-first-adoption'
+const PANE = `${TAB_ID}:${LEAF_A}`
+
+let rig: RestTestRig
+beforeEach(async () => {
+  rig = await createRestTestRig({
+    idleSweep: { intervalMs: 60_000 },
+    resolveWorkspacePath: async () => rig.root
+  })
+  setStructuredAgentSessionHost(rig.host)
+  vi.stubEnv('HOME', join(rig.root, 'home'))
+  vi.stubEnv('USERPROFILE', join(rig.root, 'home'))
+  vi.stubEnv('ORCA_USER_DATA_PATH', join(rig.root, 'user-data'))
+})
+afterEach(async () => {
+  setStructuredAgentSessionHost(null)
+  await rig.dispose()
+  vi.restoreAllMocks()
+  vi.unstubAllEnvs()
+})
+
+function switchParams(sessionId: string, source?: object) {
+  const fields = {
+    worktree: `id:${WORKTREE_ID}`,
+    agent: 'codex' as const,
+    resumeFrom: {
+      providerSessionId: THREAD,
+      cliSource: { workspaceId: WORKTREE_ID, paneKey: PANE }
+    }
+  }
+  const envelope = {
+    sessionId,
+    clientOperationId: createStructuredAgentSessionOperationId(
+      () => globalThis.crypto.randomUUID(),
+      rig.clock.now
+    ),
+    expectedRuntimeFence: null,
+    payloadFingerprint: computeAgentSessionPayloadFingerprint({
+      method: 'agentSession.create',
+      sessionId,
+      fields
+    })
+  }
+  return {
+    sessionId,
+    execution: {
+      invocationId: sessionId,
+      consented: true,
+      create: { envelope, ...fields },
+      ...(source ? { source } : {})
+    }
+  }
+}
+
+it('keeps a proven stop when the rollout moved during the stop, so a retry reads Interrupted', async () => {
+  const codexHome = join(rig.root, 'codex-account')
+  const transcriptPath = join(codexHome, 'sessions', '2026', '10', '31', `rollout-${THREAD}.jsonl`)
+  await mkdir(dirname(transcriptPath), { recursive: true })
+  const at = Date.parse('2026-10-31T12:00:00Z')
+  await writeFile(
+    transcriptPath,
+    `${[
+      { type: 'session_meta', payload: { id: THREAD, timestamp: new Date(at).toISOString() } },
+      {
+        timestamp: new Date(at + 1).toISOString(),
+        type: 'event_msg',
+        payload: { type: 'task_started', turn_id: 'cli-turn' }
+      },
+      {
+        timestamp: new Date(at + 2).toISOString(),
+        type: 'event_msg',
+        payload: { type: 'user_message', message: 'A terminal prompt' }
+      }
+    ]
+      .map((row) => JSON.stringify(row))
+      .join('\n')}\n`
+  )
+  const { runtime } = setupMainOwnedWorkspace({
+    runtimeDeps: {
+      prepareCodexStructuredLaunch: () => codexHome,
+      resolveCodexStructuredLaunchHome: () => codexHome
+    }
+  })
+  const incarnationId = '11111111-1111-4111-8111-111111111111'
+  runtime.registerPty(PTY_A, WORKTREE_ID, null, { tabId: TAB_ID, leafId: LEAF_A, incarnationId })
+  const pane = runtime.resolveTerminalPane(PANE, WORKTREE_ID)
+  if (!pane.presentation) {
+    throw new Error('missing captured source')
+  }
+  const row: AgentStatusIpcPayload = {
+    paneKey: PANE,
+    worktreeId: WORKTREE_ID,
+    agentType: 'codex',
+    connectionId: null,
+    receivedAt: 1,
+    stateStartedAt: 1,
+    state: 'working',
+    prompt: 'A terminal prompt',
+    providerSession: { key: 'session_id', id: THREAD, transcriptPath }
+  }
+  vi.spyOn(runtime, 'getAgentProviderSessionRows').mockReturnValue([row])
+  vi.spyOn(runtime.agentTransitions, 'latestRow').mockReturnValue(row)
+  vi.spyOn(runtime, 'getStructuredAgentSessionCreateSupport').mockResolvedValue({ supported: true })
+  vi.spyOn(runtime, 'assertStructuredAdoptionTerminalWritersExited').mockResolvedValue()
+  vi.spyOn(runtime, 'resolveRuntimeFileTarget').mockResolvedValue({
+    worktree: {
+      id: WORKTREE_ID,
+      repoId: 'repo-1',
+      path: rig.root,
+      head: 'head',
+      branch: 'main',
+      isBare: false,
+      isMainWorktree: true,
+      displayName: 'repo',
+      comment: '',
+      linkedIssue: null,
+      linkedPR: null,
+      linkedLinearIssue: null,
+      isArchived: false,
+      isUnread: false,
+      isPinned: false,
+      sortOrder: 0,
+      lastActivityAt: 0,
+      parentWorktreeId: null,
+      childWorktreeIds: [],
+      lineage: null,
+      git: { path: rig.root, head: 'head', branch: 'main', isBare: false, isMainWorktree: true }
+    },
+    executionHostId: 'local'
+  })
+  const moved = `${transcriptPath}.moved`
+  runtime.setPtyController({
+    write: () => true,
+    kill: () => false,
+    // The rollout moves while Codex is stopped, before it can record why the turn ended.
+    stopAndWait: async () => {
+      await rename(transcriptPath, moved)
+      await runtime.onPtyExit(PTY_A, 0, incarnationId, { hostExitConfirmed: true })
+      return true
+    },
+    getForegroundProcess: async () => 'codex'
+  })
+
+  const failed = await executeStructuredSessionSwitch(
+    switchParams(SESSION, {
+      terminal: pane.handle,
+      expectedIncarnationId: incarnationId,
+      originalPresentation: pane.presentation
+    }),
+    { runtime },
+    'chat'
+  )
+  expect(failed).toMatchObject({
+    status: 'refused',
+    refusal: { details: { reason: 'transcriptUnreadable' } }
+  })
+  // The chat exists at rest, holding the stop, so the retry (a new create) switches to it.
+  expect(rig.store.getRecord(SESSION)).toBeTruthy()
+
+  await rename(moved, transcriptPath)
+  vi.mocked(runtime.agentTransitions.latestRow).mockReturnValue(null)
+  const retried = await executeStructuredSessionSwitch(
+    switchParams(`${SESSION}-retry`),
+    { runtime },
+    'chat'
+  )
+  expect(retried).toMatchObject({ status: 'completed', sessionId: SESSION })
+  const { journal } = await rig.host.collaboratorsForTests().lifetime.conversation(SESSION)
+  const turns = journal.snapshot().items.flatMap(({ body }) => (body.kind === 'turn' ? [body] : []))
+  expect(turns).toEqual([
+    expect.objectContaining({ turnId: 'cli-turn', state: 'interrupted', outcome: 'cancellation' })
+  ])
+})
diff --git a/src/main/runtime/session-tabs/structured-session-create-support.ts b/src/main/runtime/session-tabs/structured-session-create-support.ts
index 1cd82a2bd757..7583dd62ef36 100644
--- a/src/main/runtime/session-tabs/structured-session-create-support.ts
+++ b/src/main/runtime/session-tabs/structured-session-create-support.ts
@@ -208,6 +208,7 @@ export abstract class OrcaRuntimeWithGetStructuredAgentSessionCreateSupport exte
               }),
             prepareCodexResume:
               purpose === 'launch' ? (this.prepareAiVaultSessionResumeFn ?? undefined) : undefined,
+            pinnedAdoption: input.pinnedAdoption,
             selectedAccountHome,
             launchEnv: await resolveHostStructuredAgentLaunchEnvironment(input.agent, settings),
             workspaceCwd: workspaceCwd
diff --git a/src/main/runtime/structured-agent-session-create-adoption.ts b/src/main/runtime/structured-agent-session-create-adoption.ts
index 14d64dde8c4c..4c7bd1a3342b 100644
--- a/src/main/runtime/structured-agent-session-create-adoption.ts
+++ b/src/main/runtime/structured-agent-session-create-adoption.ts
@@ -24,7 +24,8 @@ import {
   findCommittedStructuredAgentSessionAdoptionReplay,
   findConflictingStructuredAdoption,
   resolveStructuredAgentSessionAdoption,
-  structuredAdoptionConflictError
+  structuredAdoptionConflictError,
+  type StructuredAgentSessionAdoption
 } from '../native-chat/structured-agent-session-history-adoption'
 import { structuredAgentRuntimeMetadata } from './structured-agent-runtime-metadata'
 import type {
@@ -39,6 +40,12 @@ export type StructuredAgentSessionCreateIntentInput = {
   callerKey?: string
   resumeFrom?: StructuredAgentSessionResumeSource
   structuredAgentCliSourceEvidence?: StructuredAgentCliSourceEvidence
+  /**
+   * The transcript a switch read before it stopped the CLI. The create after the stop adopts it
+   * as read then: a file renamed during the stop fails the founding read, where the stop's own
+   * record still founds the chat, instead of refusing before any chat exists.
+   */
+  pinnedAdoption?: StructuredAgentSessionAdoption
 }
 
 export function resolveCommittedStructuredAgentSessionAdoptionIntent(input: {
@@ -112,93 +119,11 @@ export async function resolveStructuredAgentSessionAdoptionForCreate(input: {
   workspaceCwd: string
   resolveTranscriptSource?: () => StructuredAgentCliSourceLocator
   prepareCodexResume?: NativeCodexResumePreparation
+  pinnedAdoption?: StructuredAgentSessionAdoption
 }) {
   try {
-    const source = input.resolveTranscriptSource?.()
-    const transcriptPath = source?.kind === 'matched' ? source.transcriptPath : undefined
     const candidates = input.transcriptImport.accountHomeCandidates(input)
-    // Resolve each account store once so lookup, hook path and re-admission agree despite environment changes.
-    const stores = new Map<AgentSessionAccountHome, string | null>()
-    const storeOf = (accountHome: AgentSessionAccountHome): string | null => {
-      if (!stores.has(accountHome)) {
-        stores.set(
-          accountHome,
-          input.transcriptImport.conversationStore({
-            accountHome,
-            launchEnv: input.launchEnv
-          })
-        )
-      }
-      return stores.get(accountHome) ?? null
-    }
-    let admitted: { accountHome: AgentSessionAccountHome; path: string } | null = null
-    if (transcriptPath) {
-      for (const accountHome of candidates) {
-        const store = storeOf(accountHome)
-        const path = store
-          ? await input.transcriptImport.admitTranscriptPath({ store, transcriptPath })
-          : null
-        if (path) {
-          admitted = { accountHome, path }
-          break
-        }
-      }
-    }
-    if (transcriptPath && !admitted) {
-      throw new Error('The conversation account is not available on this host.')
-    }
-    const adoption = await resolveStructuredAgentSessionAdoption({
-      providerSessionId: input.providerSessionId,
-      // A source that proves the CLI saved this conversation never reads as "not saved yet".
-      ...(source?.kind === 'absent' || (source?.kind === 'matched' && source.conversed)
-        ? { exhaustionReason: 'transcriptUnreadable' as const }
-        : {}),
-      candidateAccountHomes: admitted ? [admitted.accountHome] : candidates,
-      resolveTranscript: async (args) => {
-        const exact = admitted?.path
-        if (exact) {
-          try {
-            if ((await stat(exact)).isFile()) {
-              return exact
-            }
-          } catch (error) {
-            if (
-              !(
-                error instanceof Error &&
-                'code' in error &&
-                (error.code === 'ENOENT' || error.code === 'ENOTDIR')
-              )
-            ) {
-              throw error
-            }
-          }
-        }
-        const store = storeOf(args.accountHome)
-        if (!store) {
-          return null
-        }
-        const found = await input.transcriptImport.findTranscript({
-          providerSessionId: args.providerSessionId,
-          store,
-          launchEnv: args.launchEnv,
-          workspaceCwd: args.workspaceCwd,
-          strictErrors: true
-        })
-        if (!found) {
-          return null
-        }
-        const path = await input.transcriptImport.admitTranscriptPath({
-          store,
-          transcriptPath: found
-        })
-        if (!path) {
-          throw new Error('The conversation path is outside its account storage.')
-        }
-        return path
-      },
-      launchEnv: input.launchEnv,
-      workspaceCwd: input.workspaceCwd
-    })
+    const adoption = input.pinnedAdoption ?? (await findAdoptionForCreate(input, candidates))
     return input.agent === 'codex'
       ? await prepareCodexAdoption(
           adoption,
@@ -219,6 +144,96 @@ export async function resolveStructuredAgentSessionAdoptionForCreate(input: {
   }
 }
 
+async function findAdoptionForCreate(
+  input: Parameters<typeof resolveStructuredAgentSessionAdoptionForCreate>[0],
+  candidates: readonly AgentSessionAccountHome[]
+): Promise<StructuredAgentSessionAdoption> {
+  const source = input.resolveTranscriptSource?.()
+  const transcriptPath = source?.kind === 'matched' ? source.transcriptPath : undefined
+  // Resolve each account store once so lookup, hook path and re-admission agree despite environment changes.
+  const stores = new Map<AgentSessionAccountHome, string | null>()
+  const storeOf = (accountHome: AgentSessionAccountHome): string | null => {
+    if (!stores.has(accountHome)) {
+      stores.set(
+        accountHome,
+        input.transcriptImport.conversationStore({
+          accountHome,
+          launchEnv: input.launchEnv
+        })
+      )
+    }
+    return stores.get(accountHome) ?? null
+  }
+  let admitted: { accountHome: AgentSessionAccountHome; path: string } | null = null
+  if (transcriptPath) {
+    for (const accountHome of candidates) {
+      const store = storeOf(accountHome)
+      const path = store
+        ? await input.transcriptImport.admitTranscriptPath({ store, transcriptPath })
+        : null
+      if (path) {
+        admitted = { accountHome, path }
+        break
+      }
+    }
+  }
+  if (transcriptPath && !admitted) {
+    throw new Error('The conversation account is not available on this host.')
+  }
+  return await resolveStructuredAgentSessionAdoption({
+    providerSessionId: input.providerSessionId,
+    // A source that proves the CLI saved this conversation never reads as "not saved yet".
+    ...(source?.kind === 'absent' || (source?.kind === 'matched' && source.conversed)
+      ? { exhaustionReason: 'transcriptUnreadable' as const }
+      : {}),
+    candidateAccountHomes: admitted ? [admitted.accountHome] : candidates,
+    resolveTranscript: async (args) => {
+      const exact = admitted?.path
+      if (exact) {
+        try {
+          if ((await stat(exact)).isFile()) {
+            return exact
+          }
+        } catch (error) {
+          if (
+            !(
+              error instanceof Error &&
+              'code' in error &&
+              (error.code === 'ENOENT' || error.code === 'ENOTDIR')
+            )
+          ) {
+            throw error
+          }
+        }
+      }
+      const store = storeOf(args.accountHome)
+      if (!store) {
+        return null
+      }
+      const found = await input.transcriptImport.findTranscript({
+        providerSessionId: args.providerSessionId,
+        store,
+        launchEnv: args.launchEnv,
+        workspaceCwd: args.workspaceCwd,
+        strictErrors: true
+      })
+      if (!found) {
+        return null
+      }
+      const path = await input.transcriptImport.admitTranscriptPath({
+        store,
+        transcriptPath: found
+      })
+      if (!path) {
+        throw new Error('The conversation path is outside its account storage.')
+      }
+      return path
+    },
+    launchEnv: input.launchEnv,
+    workspaceCwd: input.workspaceCwd
+  })
+}
+
 /** Only adopt seeds the handle chain; ensure already passes providerHandle without adopting. */
 export function structuredAgentSessionAdoptAttach(input: {
   definition: {

From 39a20b0ceb4af0115255a2f43ecec9bd3f52c6fb Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 03:38:01 -0700
Subject: [PATCH 186/207] Offer Switch to Chat UI on every pane main did,
 opening the chat beside one that can't be captured

A paired pane whose shell exited (or that a failed switch stopped) loses its terminal binding. The header, tab menu and hover card had stopped offering the switch there, and the failure toast still pointed at that control. The pane gate is main's again, and a pane control that can't capture its terminal opens the conversation as a chat beside the pane with nothing to stop: the same create without a terminal source on hosts that switch in place, and the earlier chat resume on older hosts.
---
 .../components/tab-bar/cli-chat-resume-run.ts | 10 +++-
 .../tab-session-history-switch.test.ts        |  7 ++-
 .../tab-bar/tab-session-history-switch.ts     | 10 +---
 ...d-agent-session-provisional-switch.test.ts | 53 ++++++++++++------
 .../lib/conversation-surface-switch.test.tsx  | 56 +++++++++++--------
 .../src/lib/conversation-surface-switch.ts    | 13 +++--
 6 files changed, 90 insertions(+), 59 deletions(-)

diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
index bf923c0eb7ec..0a504c9f06ea 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-run.ts
@@ -65,8 +65,14 @@ export async function runLegacyCliChatResume(
   conversationSwitchChanged()
   try {
     const captured = await captureSourceTerminal(source)
-    const ptyId = captured?.presentation?.identity.ptyId
-    if (!captured || !ptyId || !isCurrent()) {
+    // A pane with no terminal to capture has no process to stop: the earlier resume opens the
+    // conversation as a chat beside it.
+    if (!captured) {
+      await runOrdinaryCliChatResume(source, true)
+      return
+    }
+    const ptyId = captured.presentation?.identity.ptyId
+    if (!ptyId || !isCurrent()) {
       throw stopUnknown()
     }
     if (!stillCaptured()) {
diff --git a/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts b/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts
index 199170a6fef5..2c65f5563ca2 100644
--- a/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts
+++ b/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts
@@ -482,7 +482,7 @@ describe('one pane of a terminal tab', () => {
   })
 
   it.each(['local', 'runtime:server-1'])(
-    "still offers an exited agent's conversation on a %s pane, while it is bound to its terminal",
+    "still offers an exited agent's conversation on a %s pane, bound to its terminal or not",
     (host) => {
       makeState({}, host === 'local' ? {} : { executionHostId: host })
       useAppStore.setState({ runtimeStatusByEnvironmentId: serverWithChat(true) })
@@ -507,9 +507,10 @@ describe('one pane of a terminal tab', () => {
       store().removeAgentStatus(pane)
       expect(store().agentStatusByPaneKey).toEqual({})
       expect(paneGate(store(), pane)).toBe(true)
-      // A failed switch unbinds a host's pane; only Session History can switch that one now.
+      // The shell's exit (or a failed switch) unbinds the pane; its controls still offer the
+      // switch, which opens the chat beside it.
       bind(undefined)
-      expect(paneGate(store(), pane)).toBe(host === 'local')
+      expect(paneGate(store(), pane)).toBe(true)
     }
   )
 
diff --git a/src/renderer/src/components/tab-bar/tab-session-history-switch.ts b/src/renderer/src/components/tab-bar/tab-session-history-switch.ts
index 23a5bc6e9105..4c6a79d55e46 100644
--- a/src/renderer/src/components/tab-bar/tab-session-history-switch.ts
+++ b/src/renderer/src/components/tab-bar/tab-session-history-switch.ts
@@ -4,7 +4,6 @@ import type { AppState } from '@/store/types'
 import { getIndexedAllWorktrees } from '@/store/worktree-repo-index'
 import {
   collectAgentPaneConversations,
-  panePtyId,
   resolvePaneAgentConversation,
   resolvePaneLastAgentConversation
 } from '@/lib/ai-vault-tab-title-requests'
@@ -85,14 +84,7 @@ export function resolvePaneResumeInNewChatOffer(
   pane: { worktreeId: string; paneKey: string }
 ): PaneResumeInNewChatOffer {
   const conversation = resolvePaneLastAgentConversation(state, pane, adoptsCliConversations)
-  // A host's pane whose agent is gone is switched through the terminal it stays bound to; one a
-  // failed switch unbound offers nothing here, and Session History opens it as a chat instead.
-  if (
-    !conversation ||
-    (conversation.executionHostId !== LOCAL_EXECUTION_HOST_ID &&
-      !state.agentStatusByPaneKey[conversation.paneKey] &&
-      !panePtyId(state, conversation.paneKey))
-  ) {
+  if (!conversation) {
     return null
   }
   const hostScope = resolveAiVaultHostScopeDefaults(
diff --git a/src/renderer/src/lib/agent-session/structured-agent-session-provisional-switch.test.ts b/src/renderer/src/lib/agent-session/structured-agent-session-provisional-switch.test.ts
index a3e64725f68d..0cc54e84a26c 100644
--- a/src/renderer/src/lib/agent-session/structured-agent-session-provisional-switch.test.ts
+++ b/src/renderer/src/lib/agent-session/structured-agent-session-provisional-switch.test.ts
@@ -83,12 +83,16 @@ vi.mock('@/components/tab-bar/cli-chat-resume-terminal-capture', async (original
     ...actual,
     captureSourceTerminal: (...args: Parameters<typeof actual.captureSourceTerminal>) =>
       mocks.source.current
-        ? Promise.resolve({
-            target: { kind: 'local' },
-            handle: 'source-handle',
-            incarnationId: 'source-incarnation',
-            presentation: { identity: { ptyId: 'source-pty' } }
-          })
+        ? Promise.resolve(
+            mocks.captured.current
+              ? {
+                  target: { kind: 'local' },
+                  handle: 'source-handle',
+                  incarnationId: 'source-incarnation',
+                  presentation: { identity: { ptyId: 'source-pty' } }
+                }
+              : null
+          )
         : actual.captureSourceTerminal(...args)
   }
 })
@@ -102,7 +106,13 @@ const mocks = vi.hoisted(() => {
   function makeSource(): { current: CliChatResumeSource | null } {
     return { current: null }
   }
-  return { create: vi.fn(), support: vi.fn(), stopped: vi.fn(), source: makeSource() }
+  return {
+    create: vi.fn(),
+    support: vi.fn(),
+    stopped: vi.fn(),
+    source: makeSource(),
+    captured: { current: true }
+  }
 })
 vi.mock('sonner', () => ({ toast: { info: vi.fn(), error: vi.fn() } }))
 vi.mock('../focus-terminal-tab-surface', () => ({ focusTerminalTabSurface: vi.fn() }))
@@ -125,6 +135,7 @@ let main: TabsDrawnFromMain
 beforeEach(async () => {
   vi.clearAllMocks()
   mocks.source.current = null
+  mocks.captured.current = true
   setLocalRuntimeCapabilitiesForTests([])
   clearNativeChatComposerDraftsForTests()
   setNativeChatComposerDraftStorageForTests(createMemoryNativeChatComposerDraftStorage())
@@ -149,9 +160,15 @@ async function mainLoadsStoreLayout(): Promise<void> {
   main = await drawTabsFromMain(useAppStore)
 }
 
-it.each([false, true])(
-  'strict legacy Stop through real host admission and provisional/layout writers, newer navigation=%s',
-  async (navigate) => {
+it.each([
+  [false, true],
+  [true, true],
+  [false, false]
+])(
+  'strict legacy Stop through real host admission and provisional/layout writers, newer navigation=%s, captured=%s',
+  async (navigate, captured) => {
+    // A pane with no terminal to capture (its shell exited) stops nothing and opens the chat.
+    mocks.captured.current = captured
     const source = useAppStore
       .getState()
       .createUnifiedTab('wt-1', 'terminal', { id: 'source-terminal', entityId: 'source-terminal' })
@@ -226,12 +243,16 @@ it.each([false, true])(
       source: mocks.source.current
     })
     await vi.waitFor(() => expect(mocks.support).toHaveBeenCalledOnce())
-    expect(mocks.stopped).toHaveBeenCalledExactlyOnceWith({
-      worktree: 'id:wt-1',
-      expectedPtyIds: ['source-pty'],
-      targetOnly: true,
-      keepHistory: true
-    })
+    if (captured) {
+      expect(mocks.stopped).toHaveBeenCalledExactlyOnceWith({
+        worktree: 'id:wt-1',
+        expectedPtyIds: ['source-pty'],
+        targetOnly: true,
+        keepHistory: true
+      })
+    } else {
+      expect(mocks.stopped).not.toHaveBeenCalled()
+    }
     expect(mocks.create).not.toHaveBeenCalled()
     await main.settle()
     if (navigate) {
diff --git a/src/renderer/src/lib/conversation-surface-switch.test.tsx b/src/renderer/src/lib/conversation-surface-switch.test.tsx
index d5948a90e75c..e8b47fa0b430 100644
--- a/src/renderer/src/lib/conversation-surface-switch.test.tsx
+++ b/src/renderer/src/lib/conversation-surface-switch.test.tsx
@@ -316,26 +316,36 @@ it.each([
   }
 )
 
-it('opens the conversation from History beside a stopped paired pane it can no longer capture', async () => {
-  // A failed switch stopped the pane on a paired host; its binding is gone, so it can't be captured.
-  mocks.target.current = { kind: 'environment', environmentId: 'paired' }
-  mocks.capture.mockResolvedValue(null)
-  mocks.prepare.mockResolvedValue({ sessionId: 'codex-session' })
-  mocks.call.mockResolvedValue({ status: 'completed', sessionId: 'chat' })
-  const history = makeTabSessionHistoryRow({ agent: 'codex', sessionId: 'codex-session' })
-  await expect(
-    runConversationSwitch({ direction: 'chat', ...fromPane, source: fromPane, history })
-  ).resolves.toBe(true)
-  expect(mocks.prepare).toHaveBeenCalledWith(history)
-  const [, method, params] = mocks.call.mock.calls[0]!
-  expect(method).toBe('agentSession.switchToChat')
-  expect(params.execution).toMatchObject({ create: expect.any(Object) })
-  expect(params.execution).not.toHaveProperty('source')
-  expect(mocks.error).not.toHaveBeenCalled()
-  // Without History's conversation, the pane's own controls still say it can't switch.
-  mocks.call.mockClear()
-  await expect(
-    runConversationSwitch({ direction: 'chat', ...fromPane, source: fromPane })
-  ).resolves.toBe(false)
-  expect(mocks.call).not.toHaveBeenCalled()
-})
+it.each([true, false])(
+  'opens the conversation beside a paired pane it can no longer capture (from History=%s)',
+  async (fromHistory) => {
+    // The pane's shell exited, or a failed switch stopped it: its binding is gone, so the pane
+    // can't be captured, and nothing is left in it to stop.
+    mocks.target.current = { kind: 'environment', environmentId: 'paired' }
+    mocks.capture.mockResolvedValue(null)
+    mocks.prepare.mockResolvedValue({ sessionId: 'history-session' })
+    mocks.call.mockResolvedValue({ status: 'completed', sessionId: 'chat' })
+    const history = makeTabSessionHistoryRow({ agent: 'codex', sessionId: 'history-session' })
+    await expect(
+      runConversationSwitch({
+        direction: 'chat',
+        ...fromPane,
+        source: fromPane,
+        ...(fromHistory ? { history } : {})
+      })
+    ).resolves.toBe(true)
+    expect(mocks.prepare).toHaveBeenCalledTimes(fromHistory ? 1 : 0)
+    const [, method, params] = mocks.call.mock.calls[0]!
+    expect(method).toBe('agentSession.switchToChat')
+    expect(params.execution.create.resumeFrom).toEqual(
+      fromHistory
+        ? { providerSessionId: 'history-session' }
+        : {
+            providerSessionId: fromPane.providerSessionId,
+            cliSource: { workspaceId: fromPane.workspaceId, paneKey: fromPane.paneKey }
+          }
+    )
+    expect(params.execution).not.toHaveProperty('source')
+    expect(mocks.error).not.toHaveBeenCalled()
+  }
+)
diff --git a/src/renderer/src/lib/conversation-surface-switch.ts b/src/renderer/src/lib/conversation-surface-switch.ts
index 660b0ab49d74..dfb9cbc0b39e 100644
--- a/src/renderer/src/lib/conversation-surface-switch.ts
+++ b/src/renderer/src/lib/conversation-surface-switch.ts
@@ -233,12 +233,10 @@ async function switchRequest(
     args.direction === 'chat' && args.source
       ? await deadline.wait(captureSourceTerminal(args.source))
       : null
-  // A pane that can't be captured (a paired host's pane a failed switch stopped has lost its
-  // binding) still lets History open the conversation as a chat beside it, as before the switch.
-  if (args.direction === 'chat' && args.source && !captured && !args.history) {
-    throw new Error('source unavailable')
-  }
-  if (args.direction === 'chat' && args.source && captured) {
+  // A pane that can't be captured (a paired host's pane whose shell exited, or that a failed
+  // switch stopped, has lost its binding) opens the conversation as a chat beside it, with no
+  // terminal to stop; History takes its own row's route.
+  if (args.direction === 'chat' && args.source && (captured || !args.history)) {
     const intent = createStructuredAgentSessionLaunchIntent(
       args.workspaceId,
       await deadline.wait(
@@ -255,6 +253,9 @@ async function switchRequest(
       undefined,
       false
     )
+    if (!captured) {
+      return { sessionId: intent.sessionId, execution: { invocationId, create: intent.params } }
+    }
     return {
       sessionId: intent.sessionId,
       abandonFocus: recordConversationSwitchFocus({

From d5f58eb33fb1337520f735c437b5815fc67834c6 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 03:47:50 -0700
Subject: [PATCH 187/207] Type the switch tests' fixtures to the current shapes

The paired host id is a host id literal, the refused read names its reason, and the boundary wait's stopped turn carries its agent and baseline.
---
 .../structured-agent-session-switch-stop-label.test.ts   | 9 ++++++++-
 ...structured-agent-session-switch-turn-boundary.test.ts | 4 ++--
 .../tab-bar/tab-session-history-switch.test.ts           | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-stop-label.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-stop-label.test.ts
index 2701fe96917f..25aa307ddb9b 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-stop-label.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-stop-label.test.ts
@@ -154,7 +154,14 @@ describe('the Codex switches QA saw fail after the stop (the marker, no abort ev
           await commitSwitchStoppedCliTurn({ journal, stopped: stopped!, fence: 1 })
         } else {
           const read = withSwitchStoppedTurn(
-            { ok: false, refusal: refuse('agent_session_identity_required', {}, 'hidden') },
+            {
+              ok: false,
+              refusal: refuse(
+                'agent_session_identity_required',
+                { reason: 'transcriptUnreadable' },
+                'hidden'
+              )
+            },
             stopped!
           )
           expect(read.ok).toBe(true)
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-turn-boundary.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-turn-boundary.test.ts
index 142a7a5ab923..c2034191f300 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-turn-boundary.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-turn-boundary.test.ts
@@ -24,7 +24,7 @@ afterEach(async () => {
 async function arm(remainingMs: number) {
   return armSwitchTurnBoundaryWait(
     { agent: 'codex', sessionId: 'thread', filePath },
-    { sessionId: 'thread', userItemKey: 'user', turnId: TURN },
+    { agent: 'codex', sessionId: 'thread', userItemKey: 'user', turnId: TURN, baseline: [] },
     controller.signal,
     () => remainingMs
   )
@@ -65,7 +65,7 @@ it('never throws: a vanished transcript or an aborted request returns and the st
   expect(performance.now() - started).toBeLessThan(1_500)
   const missing = await armSwitchTurnBoundaryWait(
     { agent: 'codex', sessionId: 'thread', filePath: join(root, 'missing.jsonl') },
-    { sessionId: 'thread', userItemKey: 'user', turnId: TURN },
+    { agent: 'codex', sessionId: 'thread', userItemKey: 'user', turnId: TURN, baseline: [] },
     new AbortController().signal,
     () => 60_000
   )
diff --git a/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts b/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts
index 2c65f5563ca2..80023639ef0c 100644
--- a/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts
+++ b/src/renderer/src/components/tab-bar/tab-session-history-switch.test.ts
@@ -481,7 +481,7 @@ describe('one pane of a terminal tab', () => {
     expect(paneGate(state, claudePane)).toBe(true)
   })
 
-  it.each(['local', 'runtime:server-1'])(
+  it.each(['local', 'runtime:server-1'] as const)(
     "still offers an exited agent's conversation on a %s pane, bound to its terminal or not",
     (host) => {
       makeState({}, host === 'local' ? {} : { executionHostId: host })

From d28ae862eb51970b0bb3f1e5b73ba160df649d45 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 03:54:07 -0700
Subject: [PATCH 188/207] Type the first-adoption test's terminal source by the
 switch contract

---
 ...structured-agent-session-switch-first-adoption.test.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-first-adoption.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-first-adoption.test.ts
index c78594c73a9d..a8fb242c48cd 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-first-adoption.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-first-adoption.test.ts
@@ -1,6 +1,7 @@
 import { mkdir, rename, writeFile } from 'node:fs/promises'
 import { dirname, join } from 'node:path'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import type { z } from 'zod'
 import { computeAgentSessionPayloadFingerprint } from '../../../../shared/agent-session-mutation-envelope'
 import type { AgentStatusIpcPayload } from '../../../../shared/agent-status-types'
 import { createStructuredAgentSessionOperationId } from '../../../../shared/structured-agent-session-mutation'
@@ -17,6 +18,7 @@ import {
   PTY_A
 } from '../../main-owned-workspace-runtime-fixture'
 import { executeStructuredSessionSwitch } from './structured-agent-session-switch-execution'
+import type { SwitchToChatParams } from './structured-agent-session-schemas'
 
 // A Codex CLI that was never a chat, stopped mid-reply by a switch whose rollout moved during the
 // stop: the switch fails, but the proven stop is kept, so a retry once the file is back reads
@@ -26,6 +28,10 @@ const THREAD = '019a0000-0000-7000-8000-000000000001'
 const SESSION = 'session-first-adoption'
 const PANE = `${TAB_ID}:${LEAF_A}`
 
+type SwitchSource = NonNullable<
+  NonNullable<z.infer<typeof SwitchToChatParams>['execution']>['source']
+>
+
 let rig: RestTestRig
 beforeEach(async () => {
   rig = await createRestTestRig({
@@ -44,7 +50,7 @@ afterEach(async () => {
   vi.unstubAllEnvs()
 })
 
-function switchParams(sessionId: string, source?: object) {
+function switchParams(sessionId: string, source?: SwitchSource) {
   const fields = {
     worktree: `id:${WORKTREE_ID}`,
     agent: 'codex' as const,

From 74e0c2fe2566261b25eda4abf54c6f4b21885730 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 04:03:48 -0700
Subject: [PATCH 189/207] Ship the turn status's Interrupted label in the
 runtime English catalog

The native chat status passes its shared copy as the default, which i18next cannot rebuild from the call site, so the key must ship with the boot bundle like the status's other labels.
---
 src/renderer/src/i18n/en-runtime-required.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/renderer/src/i18n/en-runtime-required.json b/src/renderer/src/i18n/en-runtime-required.json
index 180f667717cc..85b096901f02 100644
--- a/src/renderer/src/i18n/en-runtime-required.json
+++ b/src/renderer/src/i18n/en-runtime-required.json
@@ -55,6 +55,9 @@
   },
   "auto": {
     "components": {
+      "AgentStateDot": {
+        "interrupted": "Interrupted"
+      },
       "GitHubItemDialog": {
         "filesViewed_one": "{{viewed}} / {{count}} file viewed",
         "filesViewed_other": "{{viewed}} / {{count}} files viewed",

From 08d6a30d04f9a5ec338c6383dd0fac7fa06feae4 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 04:18:42 -0700
Subject: [PATCH 190/207] Read a switch's host support without importing the
 store
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The session client is reached from the tabs slice (tab close → chat retirement → close), and reading host support through the capability hooks module pulled the store back in while its slices were still initializing. The reader now lives in its own store-free module; the hooks module is main's again.
---
 .../structured-agent-session-client.ts        |  2 +-
 ...tructured-agent-session-host-capability.ts | 17 ------------
 .../structured-agent-session-host-support.ts  | 26 +++++++++++++++++++
 ...structured-agent-session-switch-consent.ts |  2 +-
 4 files changed, 28 insertions(+), 19 deletions(-)
 create mode 100644 src/renderer/src/runtime/structured-agent-session-host-support.ts

diff --git a/src/renderer/src/runtime/structured-agent-session-client.ts b/src/renderer/src/runtime/structured-agent-session-client.ts
index 12d03b9c7ef4..b66325d0b812 100644
--- a/src/renderer/src/runtime/structured-agent-session-client.ts
+++ b/src/renderer/src/runtime/structured-agent-session-client.ts
@@ -35,7 +35,7 @@ import {
 } from '../../../shared/structured-agent-cli-conversation-adoption'
 import { callRuntimeRpc, runtimeEnvironmentSupportsCapability } from './runtime-rpc-client'
 import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
-import { readStructuredAgentSessionHostSupport } from './structured-agent-session-host-capability'
+import { readStructuredAgentSessionHostSupport } from './structured-agent-session-host-support'
 import { subscribeRuntimeRpc } from './runtime-rpc-subscribe'
 /** Read a capability through the runtime's existing status cache. A failed/unknown
  *  probe is treated as legacy so a newer call is never made before the host has
diff --git a/src/renderer/src/runtime/structured-agent-session-host-capability.ts b/src/renderer/src/runtime/structured-agent-session-host-capability.ts
index 029b3f248c6c..e37d033cd663 100644
--- a/src/renderer/src/runtime/structured-agent-session-host-capability.ts
+++ b/src/renderer/src/runtime/structured-agent-session-host-capability.ts
@@ -220,20 +220,3 @@ export function useStructuredAgentSessionHostEditsQueuedSkills(
     AGENT_SESSION_QUEUED_MESSAGE_SKILLS_EDIT_RUNTIME_CAPABILITY
   )
 }
-
-/** The host's answer, rejecting when it couldn't be read: for an action that must tell "this
- *  host can't" from "couldn't ask it" (a dropped connection is not an older host). */
-export async function readStructuredAgentSessionHostSupport(
-  target: RuntimeClientTarget,
-  capability: RuntimeCapability
-): Promise<boolean> {
-  if (target.kind === 'local') {
-    const capabilities =
-      readLocalRuntimeCapabilitiesOrUnknown() ?? (await ensureLocalRuntimeCapabilities())
-    if (!capabilities) {
-      throw new Error('host capabilities unknown')
-    }
-    return capabilities.includes(capability)
-  }
-  return runtimeEnvironmentSupportsCapability(target.environmentId, capability)
-}
diff --git a/src/renderer/src/runtime/structured-agent-session-host-support.ts b/src/renderer/src/runtime/structured-agent-session-host-support.ts
new file mode 100644
index 000000000000..6ed461845143
--- /dev/null
+++ b/src/renderer/src/runtime/structured-agent-session-host-support.ts
@@ -0,0 +1,26 @@
+import type { RuntimeCapability } from '../../../shared/protocol-version'
+import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
+import {
+  ensureLocalRuntimeCapabilities,
+  readLocalRuntimeCapabilitiesOrUnknown
+} from './local-runtime-capabilities'
+import { runtimeEnvironmentSupportsCapability } from './runtime-rpc-client'
+
+// Store-free: the session client reaches this from the tabs slice, so it must not import the store.
+
+/** The host's answer, rejecting when it couldn't be read: for an action that must tell "this
+ *  host can't" from "couldn't ask it" (a dropped connection is not an older host). */
+export async function readStructuredAgentSessionHostSupport(
+  target: RuntimeClientTarget,
+  capability: RuntimeCapability
+): Promise<boolean> {
+  if (target.kind === 'local') {
+    const capabilities =
+      readLocalRuntimeCapabilitiesOrUnknown() ?? (await ensureLocalRuntimeCapabilities())
+    if (!capabilities) {
+      throw new Error('host capabilities unknown')
+    }
+    return capabilities.includes(capability)
+  }
+  return runtimeEnvironmentSupportsCapability(target.environmentId, capability)
+}
diff --git a/src/renderer/src/runtime/structured-agent-session-switch-consent.ts b/src/renderer/src/runtime/structured-agent-session-switch-consent.ts
index 767680910a90..477d022206d2 100644
--- a/src/renderer/src/runtime/structured-agent-session-switch-consent.ts
+++ b/src/renderer/src/runtime/structured-agent-session-switch-consent.ts
@@ -1,6 +1,6 @@
 import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
 import { SWITCH_CONSENT_RUNTIME_CAPABILITY } from '../../../shared/structured-agent-cli-conversation-adoption'
-import { readStructuredAgentSessionHostSupport } from './structured-agent-session-host-capability'
+import { readStructuredAgentSessionHostSupport } from './structured-agent-session-host-support'
 
 /** Whether the host decides a switch's consent (refuses a replying agent unless consented);
  *  rejects when the host couldn't be asked. */

From 7f4594a609d4480988d9c40013314e23f739f877 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 04:56:16 -0700
Subject: [PATCH 191/207] Let a pane respawn onto its id while the old process
 is still exiting

A leftover pre-check in the daemon's create admission refused any create
whose id was still tearing down, before the host's wait-for-teardown path
could run, bringing back the 'Session not found' respawn failure #18063
fixed. The switch never needed it: its terminal always has a fresh id.
---
 ...daemon-terminal-admission-teardown.test.ts | 126 ++++++++++++++++++
 src/main/daemon/daemon-terminal-admission.ts  |   1 -
 src/main/daemon/terminal-host.ts              |   9 +-
 3 files changed, 127 insertions(+), 9 deletions(-)
 create mode 100644 src/main/daemon/daemon-terminal-admission-teardown.test.ts

diff --git a/src/main/daemon/daemon-terminal-admission-teardown.test.ts b/src/main/daemon/daemon-terminal-admission-teardown.test.ts
new file mode 100644
index 000000000000..b8314dffeb0e
--- /dev/null
+++ b/src/main/daemon/daemon-terminal-admission-teardown.test.ts
@@ -0,0 +1,126 @@
+import './mock-descendant-sweep'
+import { Socket } from 'node:net'
+import { describe, expect, it, vi } from 'vitest'
+import { TerminalHost } from './terminal-host'
+import { DaemonTerminalAdmission } from './daemon-terminal-admission'
+import { DaemonPtySpawnPreparations } from './daemon-pty-spawn-preparations'
+import { DaemonClientConnections } from './daemon-client-connections'
+import { DaemonEndpointLifecycle } from './daemon-endpoint-lifecycle'
+import { DaemonSessionAttachments } from './daemon-session-attachments'
+import { DaemonStreamDataBatcher } from './daemon-stream-data-batcher'
+import { BackgroundTransientFactRelay } from './daemon-background-transient-facts'
+import { TerminalHistorySeedTransferRegistry } from './terminal-history-seed-transfer-registry'
+import { createNoopDaemonFileLog } from './daemon-file-log'
+import type { SubprocessHandle } from './session-subprocess-handle'
+
+function slowExitSubprocess(): SubprocessHandle {
+  let onExit: ((code: number) => void) | undefined
+  return {
+    pid: 4242,
+    shellPath: '/bin/sh',
+    getForegroundProcess: () => null,
+    write: vi.fn(),
+    resize: vi.fn(),
+    kill: () => {
+      setTimeout(() => onExit?.(0), 40).unref?.()
+    },
+    terminateOwnedTree: () => 'unavailable',
+    forceKill: () => {
+      setTimeout(() => onExit?.(137), 40).unref?.()
+    },
+    signal: vi.fn(),
+    dispose: vi.fn(),
+    onData: vi.fn(),
+    onExit: (callback) => {
+      onExit = callback
+    }
+  }
+}
+
+function admissionFor(host: TerminalHost, socket: Socket): DaemonTerminalAdmission {
+  const log = createNoopDaemonFileLog()
+  const unexpected = (): never => {
+    throw new Error('unexpected admission lifecycle callback')
+  }
+  const connections = new DaemonClientConnections({
+    token: 'test-token',
+    protocolVersion: 1,
+    identity: {
+      launchNonce: null,
+      startedAtMs: null,
+      entryPath: null,
+      appVersion: null,
+      spawnerExecPath: null
+    },
+    log,
+    streamDataBatcher: new DaemonStreamDataBatcher(() => undefined),
+    isAcceptingWork: () => true,
+    onTransportChanged: unexpected,
+    onConnectionAccepted: unexpected,
+    onAuthenticatedPair: unexpected,
+    onLastAuthenticatedClientDisconnected: unexpected,
+    onControlRequest: unexpected,
+    onControlReplaced: unexpected,
+    onClientDisconnected: unexpected,
+    onStreamDisconnected: unexpected
+  })
+  vi.spyOn(connections, 'get').mockReturnValue({
+    clientId: 'client',
+    authenticatedPairEstablished: true,
+    controlSocket: socket,
+    streamSocket: socket
+  })
+  return new DaemonTerminalAdmission({
+    host,
+    connections,
+    endpoint: new DaemonEndpointLifecycle({
+      socketPath: 'unused-test-endpoint',
+      tokenPath: 'unused-test-token',
+      pidPath: null,
+      launchNonce: null,
+      token: 'test-token',
+      publishEndpointOwnership: unexpected,
+      log,
+      isServing: () => false,
+      onOwnershipLost: unexpected
+    }),
+    preparations: new DaemonPtySpawnPreparations(async () => {}),
+    attachments: new DaemonSessionAttachments(host),
+    historySeedTransfers: new TerminalHistorySeedTransferRegistry(),
+    transientFactRelay: new BackgroundTransientFactRelay(unexpected),
+    streamDataBatcher: new DaemonStreamDataBatcher(() => undefined),
+    log,
+    isAcceptingWork: () => true,
+    requestEndpointRetirement: unexpected,
+    reevaluateIdleShutdown: vi.fn()
+  })
+}
+
+describe('daemon terminal admission during teardown', () => {
+  it('waits for teardown and creates the respawned pane on its stable id', async () => {
+    const spawnSubprocess = vi.fn(slowExitSubprocess)
+    const host = new TerminalHost({ spawnSubprocess })
+    const socket = new Socket()
+    try {
+      const admission = admissionFor(host, socket)
+      const sessionId = 'wt-1@@respawning-pane'
+      const create = (id: string): Promise<unknown> =>
+        admission.createOrAttach('client', {
+          id,
+          type: 'createOrAttach',
+          payload: { sessionId, cols: 80, rows: 24 }
+        })
+      await create('first')
+
+      const killed = host.kill(sessionId, { immediate: true })
+      await expect(create('respawn')).resolves.toMatchObject({ isNew: true })
+
+      expect(spawnSubprocess).toHaveBeenCalledTimes(2)
+      expect(admission.inFlight).toBe(0)
+      await killed
+    } finally {
+      socket.destroy()
+      await host.dispose()
+    }
+  })
+})
diff --git a/src/main/daemon/daemon-terminal-admission.ts b/src/main/daemon/daemon-terminal-admission.ts
index 91cf0f5e225c..6a725c2759c7 100644
--- a/src/main/daemon/daemon-terminal-admission.ts
+++ b/src/main/daemon/daemon-terminal-admission.ts
@@ -71,7 +71,6 @@ export class DaemonTerminalAdmission {
       this.options.requestEndpointRetirement()
       throw new Error(DAEMON_ENDPOINT_LOST_MESSAGE)
     }
-    this.options.host.noteSpawnPreparation(payload.sessionId)
     this.createOrAttachInFlight++
     let routedSessionId = payload.sessionId
     let result: CreateOrAttachResult
diff --git a/src/main/daemon/terminal-host.ts b/src/main/daemon/terminal-host.ts
index 28a1fdca5b71..dc0e95b555b6 100644
--- a/src/main/daemon/terminal-host.ts
+++ b/src/main/daemon/terminal-host.ts
@@ -3,7 +3,7 @@ import { runTerminalCreation, type PendingTerminalCreation } from './terminal-cr
 import { beginTerminalHostFencedTermination } from './terminal-host-fenced-termination'
 import type { PtyFencedTerminationRequest } from '../../shared/pty-fenced-termination'
 import type { Session } from './session'
-import { SessionNotFoundError, type SessionInfo } from './types'
+import type { SessionInfo } from './types'
 import type { CreateOrAttachResult } from './terminal-host-create-contract'
 import type { TerminalHostOptions } from './terminal-host-options'
 import { recordTerminalHostSessionExit } from './terminal-host-session-exit'
@@ -57,13 +57,6 @@ export class TerminalHost extends TerminalHostInspection {
     this.killedTombstones = new TerminalHostTombstones(opts.maxTombstones ?? DEFAULT_MAX_TOMBSTONES)
   }
 
-  noteSpawnPreparation(sessionId: string): void {
-    const session = this.sessions.get(sessionId)
-    if (session?.isTerminating) {
-      throw new SessionNotFoundError(sessionId)
-    }
-  }
-
   createOrAttach(opts: InternalCreateOrAttachOptions): Promise<CreateOrAttachResult> {
     return runTerminalCreation(
       opts,

From db1496be695be685b6c79607b30ba2fb521d53d9 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 04:58:04 -0700
Subject: [PATCH 192/207] Forget a pane's launch start once it settles, as main
 does

The abandoned two-stage switch had the RPC client record every agent
launch with a pane key and kept the entry after its start settled, so the
map grew for the renderer's life. The attempt bookkeeping it carried had
no reader; drop it and the method-name hook in the generic RPC client.
---
 .../src/lib/agent-launch-pane-closes.ts       |  6 +-
 .../src/lib/agent-launch-pane-start.test.ts   | 15 ++++-
 .../src/lib/agent-launch-pane-start.ts        | 61 +++----------------
 .../src/runtime/runtime-rpc-client.ts         | 15 -----
 4 files changed, 22 insertions(+), 75 deletions(-)

diff --git a/src/renderer/src/lib/agent-launch-pane-closes.ts b/src/renderer/src/lib/agent-launch-pane-closes.ts
index a6ed4bbf1196..cc8e15f6a66c 100644
--- a/src/renderer/src/lib/agent-launch-pane-closes.ts
+++ b/src/renderer/src/lib/agent-launch-pane-closes.ts
@@ -1,9 +1,6 @@
 /** Remember explicit user closes so a racing spawn reveal stops the agent instead of resurrecting its tab; absence after reload is not a close. Keep store-free for teardown callers. */
 
-import {
-  settleAgentLaunchPaneStart,
-  forgetAgentLaunchPaneAttempts
-} from './agent-launch-pane-start'
+import { settleAgentLaunchPaneStart } from './agent-launch-pane-start'
 
 const MAX_REMEMBERED_CLOSES = 32
 const closedPaneKeys = new Set<string>()
@@ -15,7 +12,6 @@ function closeKey(tabId: string, leafId: string): string {
 
 export function noteAgentLaunchPaneClosedByUser(tabId: string, leafId: string): void {
   settleAgentLaunchPaneStart(tabId, leafId, null)
-  forgetAgentLaunchPaneAttempts(tabId, leafId)
   const paneKey = closeKey(tabId, leafId)
   closedPaneKeys.delete(paneKey)
   closedPaneKeys.add(paneKey)
diff --git a/src/renderer/src/lib/agent-launch-pane-start.test.ts b/src/renderer/src/lib/agent-launch-pane-start.test.ts
index 237cf283c04c..70e1d807f4b3 100644
--- a/src/renderer/src/lib/agent-launch-pane-start.test.ts
+++ b/src/renderer/src/lib/agent-launch-pane-start.test.ts
@@ -1,5 +1,9 @@
 import { describe, expect, it } from 'vitest'
-import { awaitAgentLaunchPaneStart, settleAgentLaunchPaneStart } from './agent-launch-pane-start'
+import {
+  awaitAgentLaunchPaneStart,
+  pendingAgentLaunchPaneStartCountForTests,
+  settleAgentLaunchPaneStart
+} from './agent-launch-pane-start'
 import { noteAgentLaunchPaneClosedByUser } from './agent-launch-pane-closes'
 
 const TAB = '9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d'
@@ -19,4 +23,13 @@ describe("an AI button's pane says whether its agent started", () => {
     noteAgentLaunchPaneClosedByUser(TAB, LEAF)
     await expect(started).resolves.toBeNull()
   })
+
+  it.each([50, 500])('keeps no entry after %i launches settle', async (launches) => {
+    for (let index = 0; index < launches; index++) {
+      const started = awaitAgentLaunchPaneStart(TAB, `leaf-${index}`)
+      settleAgentLaunchPaneStart(TAB, `leaf-${index}`, `pty-${index}`)
+      await started
+    }
+    expect(pendingAgentLaunchPaneStartCountForTests()).toBe(0)
+  })
 })
diff --git a/src/renderer/src/lib/agent-launch-pane-start.ts b/src/renderer/src/lib/agent-launch-pane-start.ts
index 61df9d7cf63f..8ab88419661a 100644
--- a/src/renderer/src/lib/agent-launch-pane-start.ts
+++ b/src/renderer/src/lib/agent-launch-pane-start.ts
@@ -1,9 +1,6 @@
 // Session-only: this pane's own spawn answers first, and its answer gates the prompt's paste.
 
-const pendingStarts = new Map<
-  string,
-  { resolve?: (startedPtyId: string | null) => void; operationId?: string; awaitingHost?: boolean }
->()
+const pendingStarts = new Map<string, (startedPtyId: string | null) => void>()
 
 // Not `makePaneKey`: that validates the leaf id, and a launch must never fail over bookkeeping.
 function startKey(tabId: string, leafId: string): string {
@@ -13,9 +10,9 @@ function startKey(tabId: string, leafId: string): string {
 /** Registered before the pane exists, so its first spawn already answers it: with its PTY, or null. */
 export function awaitAgentLaunchPaneStart(tabId: string, leafId: string): Promise<string | null> {
   const key = startKey(tabId, leafId)
-  pendingStarts.get(key)?.resolve?.(null)
+  pendingStarts.get(key)?.(null)
   return new Promise((resolve) => {
-    pendingStarts.set(key, { ...pendingStarts.get(key), resolve })
+    pendingStarts.set(key, resolve)
   })
 }
 
@@ -27,55 +24,11 @@ export function settleAgentLaunchPaneStart(
   if (tabId && leafId) {
     const key = startKey(tabId, leafId)
     const settle = pendingStarts.get(key)
-    const resolve = settle?.resolve
-    if (settle) {
-      settle.resolve = undefined
-    }
-    resolve?.(startedPtyId)
+    pendingStarts.delete(key)
+    settle?.(startedPtyId)
   }
 }
 
-/** New addressed work wins before launch preparation or a late old verdict. */
-export function acceptAgentLaunchPaneAttempt(paneKey: string, operationId?: string): void {
-  const split = paneKey.indexOf(':')
-  if (split === -1) {
-    return
-  }
-  const key = startKey(paneKey.slice(0, split), paneKey.slice(split + 1))
-  const entry = pendingStarts.get(key)
-  entry?.resolve?.(null)
-  pendingStarts.set(key, { operationId, awaitingHost: true })
-}
-export function confirmAgentLaunchPaneAttempt(
-  tabId: string,
-  leafId: string,
-  operationId?: string
-): void {
-  const key = startKey(tabId, leafId)
-  const current = pendingStarts.get(key)
-  if (current?.awaitingHost && current.operationId !== operationId) {
-    return
-  }
-  if (current?.operationId !== operationId) {
-    current?.resolve?.(null)
-  }
-  pendingStarts.set(key, { ...current, operationId, awaitingHost: false })
-}
-
-export function agentLaunchPaneAttemptCurrent(
-  tabId: string,
-  leafId: string,
-  operationId?: string
-): boolean {
-  const entry = pendingStarts.get(startKey(tabId, leafId))
-  return !entry || entry.operationId === operationId
-}
-
-export function forgetAgentLaunchPaneAttempts(tabId: string, leafId?: string): void {
-  for (const [key, entry] of pendingStarts) {
-    if (JSON.parse(key)[0] === tabId && (leafId === undefined || JSON.parse(key)[1] === leafId)) {
-      entry.resolve?.(null)
-      pendingStarts.delete(key)
-    }
-  }
+export function pendingAgentLaunchPaneStartCountForTests(): number {
+  return pendingStarts.size
 }
diff --git a/src/renderer/src/runtime/runtime-rpc-client.ts b/src/renderer/src/runtime/runtime-rpc-client.ts
index 2b62bac5fd02..61bcf1a5c6b0 100644
--- a/src/renderer/src/runtime/runtime-rpc-client.ts
+++ b/src/renderer/src/runtime/runtime-rpc-client.ts
@@ -2,7 +2,6 @@ import type {
   RuntimeRpcDispatchObservation,
   RuntimeRpcResponse
 } from '../../../shared/runtime-rpc-envelope'
-import { acceptAgentLaunchPaneAttempt } from '@/lib/agent-launch-pane-start'
 import { waitForPromiseWithSignal } from '../../../shared/abort-signal-reason'
 import type { RuntimeStatus } from '../../../shared/runtime-types'
 import type { RuntimeCapability } from '../../../shared/protocol-version'
@@ -45,20 +44,6 @@ export async function callRuntimeRpc<TResult>(
     dispatchObservation?: () => RuntimeRpcDispatchObservation
   } = {}
 ): Promise<TResult> {
-  if (
-    (method === 'agent.launch' || method === 'agent.launchReplay') &&
-    params &&
-    typeof params === 'object' &&
-    'paneKey' in params &&
-    typeof params.paneKey === 'string'
-  ) {
-    acceptAgentLaunchPaneAttempt(
-      params.paneKey,
-      'operationId' in params && typeof params.operationId === 'string'
-        ? params.operationId
-        : undefined
-    )
-  }
   if (options.signal?.aborted) {
     throw createRuntimeRpcAbortError()
   }

From 0e6820e0f013cd436dfac50947a9108863736aff Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 05:00:49 -0700
Subject: [PATCH 193/207] Run a remote call's pre-send guard before dispatch
 again

A throwing beforeSend stops the send on every path, as on main. The
switch's actual-send time is now its own onSent report instead of riding
on the guard, which had moved the guard after dispatch on remote hosts.
---
 .../lib/conversation-surface-switch.test.tsx  |  8 +--
 .../src/lib/conversation-surface-switch.ts    |  2 +-
 .../abortable-runtime-environment-call.ts     |  6 +--
 .../src/runtime/runtime-rpc-client.test.ts    | 49 +++++++++++++++++++
 .../src/runtime/runtime-rpc-client.ts         | 17 ++++---
 .../runtime/runtime-rpc-environment-call.ts   |  6 +--
 .../structured-agent-session-client.ts        |  3 +-
 7 files changed, 72 insertions(+), 19 deletions(-)

diff --git a/src/renderer/src/lib/conversation-surface-switch.test.tsx b/src/renderer/src/lib/conversation-surface-switch.test.tsx
index e8b47fa0b430..cd3dd730fd81 100644
--- a/src/renderer/src/lib/conversation-surface-switch.test.tsx
+++ b/src/renderer/src/lib/conversation-surface-switch.test.tsx
@@ -188,10 +188,10 @@ it.each([false, true])(
         _target: unknown,
         _method: string,
         _params: unknown,
-        options: { beforeSend: (sentAt?: number) => void }
+        options: { onSent: (sentAt?: number) => void }
       ) => {
         if (sent) {
-          options.beforeSend()
+          options.onSent()
         }
         throw new Error('Runtime request closed before agentSession.switchToTerminal completed')
       }
@@ -269,12 +269,12 @@ it.each([
         _target: unknown,
         _method: string,
         _params: unknown,
-        options: { beforeSend: (sentAt?: number) => void }
+        options: { onSent: (sentAt?: number) => void }
       ) => {
         if (outcome === 'unsent') {
           throw new Error('Remote Orca runtime is not connected.')
         }
-        options.beforeSend()
+        options.onSent()
         if (outcome === 'lost') {
           throw new Error('Runtime request closed before agentSession.switchToChat completed')
         }
diff --git a/src/renderer/src/lib/conversation-surface-switch.ts b/src/renderer/src/lib/conversation-surface-switch.ts
index dfb9cbc0b39e..88493f01ed7d 100644
--- a/src/renderer/src/lib/conversation-surface-switch.ts
+++ b/src/renderer/src/lib/conversation-surface-switch.ts
@@ -145,7 +145,7 @@ export async function runConversationSwitch(args: ConversationSwitch): Promise<b
           {
             signal: deadline.signal,
             dispatchObservation: deadline.delegateSend,
-            beforeSend: (sentAt) => {
+            onSent: (sentAt) => {
               deadline.beforeSend(sentAt)
               sent = true
             }
diff --git a/src/renderer/src/runtime/abortable-runtime-environment-call.ts b/src/renderer/src/runtime/abortable-runtime-environment-call.ts
index 104efa00f6ae..64747d6a79d3 100644
--- a/src/renderer/src/runtime/abortable-runtime-environment-call.ts
+++ b/src/renderer/src/runtime/abortable-runtime-environment-call.ts
@@ -18,7 +18,7 @@ export async function callAbortableRuntimeEnvironment(
   signal: AbortSignal,
   expectedEnvironmentPairingRevision?: number,
   expectedEnvironmentRuntimeId?: string,
-  beforeSend?: (sentAt?: number) => void,
+  onSent?: (sentAt?: number) => void,
   dispatchObservation?: RuntimeRpcDispatchObservation
 ): Promise<RuntimeRpcResponse<unknown>> {
   if (signal.aborted) {
@@ -78,7 +78,7 @@ export async function callAbortableRuntimeEnvironment(
           timeoutMs,
           expectedEnvironmentPairingRevision,
           expectedEnvironmentRuntimeId,
-          observeDispatch: Boolean(beforeSend),
+          observeDispatch: Boolean(onSent),
           dispatchObservation
         },
         {
@@ -88,7 +88,7 @@ export async function callAbortableRuntimeEnvironment(
             }
             sent = true
             try {
-              beforeSend?.(sentAt)
+              onSent?.(sentAt)
             } catch (error) {
               finish(() => reject(error))
               return
diff --git a/src/renderer/src/runtime/runtime-rpc-client.test.ts b/src/renderer/src/runtime/runtime-rpc-client.test.ts
index 72afe7578b4a..cf44e30415d5 100644
--- a/src/renderer/src/runtime/runtime-rpc-client.test.ts
+++ b/src/renderer/src/runtime/runtime-rpc-client.test.ts
@@ -101,6 +101,55 @@ describe('runtime RPC client routing', () => {
     expect(runtimeEnvironmentCall).not.toHaveBeenCalled()
   })
 
+  it.each([false, true])(
+    'never sends a paired-runtime request whose pre-send guard throws (abortable=%s)',
+    async (abortable) => {
+      const onSent = vi.fn()
+      const request = callRuntimeRpc(
+        { kind: 'environment', environmentId: 'env-1' },
+        'status.get',
+        undefined,
+        {
+          ...(abortable ? { signal: new AbortController().signal } : {}),
+          beforeSend: () => {
+            throw new Error('superseded')
+          },
+          onSent
+        }
+      )
+
+      await expect(request).rejects.toThrow('superseded')
+      expect(runtimeEnvironmentSubscribe).not.toHaveBeenCalled()
+      expect(runtimeEnvironmentCall).not.toHaveBeenCalled()
+      expect(onSent).not.toHaveBeenCalled()
+    }
+  )
+
+  it("reports the paired host's send time separately from the pre-send guard", async () => {
+    const order: string[] = []
+    runtimeEnvironmentSubscribe.mockImplementation(
+      async (_args: unknown, callbacks: { onSent: (sentAt?: number) => void }) => {
+        order.push('dispatch')
+        callbacks.onSent(1234)
+        return { unsubscribe: vi.fn(), sendBinary: vi.fn() }
+      }
+    )
+    const controller = new AbortController()
+    const request = callRuntimeRpc(
+      { kind: 'environment', environmentId: 'env-1' },
+      'status.get',
+      undefined,
+      {
+        signal: controller.signal,
+        beforeSend: () => order.push('guard'),
+        onSent: (sentAt) => order.push(`sent ${sentAt}`)
+      }
+    )
+    await vi.waitFor(() => expect(order).toEqual(['guard', 'dispatch', 'sent 1234']))
+    controller.abort()
+    await expect(request).rejects.toMatchObject({ name: 'AbortError' })
+  })
+
   it('rejects an abortable paired-runtime request at the response deadline', async () => {
     vi.useFakeTimers()
     try {
diff --git a/src/renderer/src/runtime/runtime-rpc-client.ts b/src/renderer/src/runtime/runtime-rpc-client.ts
index 61bcf1a5c6b0..b1a7c117e18b 100644
--- a/src/renderer/src/runtime/runtime-rpc-client.ts
+++ b/src/renderer/src/runtime/runtime-rpc-client.ts
@@ -1,8 +1,8 @@
+import { waitForPromiseWithSignal } from '../../../shared/abort-signal-reason'
 import type {
   RuntimeRpcDispatchObservation,
   RuntimeRpcResponse
 } from '../../../shared/runtime-rpc-envelope'
-import { waitForPromiseWithSignal } from '../../../shared/abort-signal-reason'
 import type { RuntimeStatus } from '../../../shared/runtime-types'
 import type { RuntimeCapability } from '../../../shared/protocol-version'
 import { withBrowserPaneUiRuntimeRpcSource } from '../../../shared/runtime-rpc-feature-interaction-source'
@@ -40,7 +40,9 @@ export async function callRuntimeRpc<TResult>(
     signal?: AbortSignal
     expectedEnvironmentPairingRevision?: number
     expectedEnvironmentRuntimeId?: string
-    beforeSend?: (sentAt?: number) => void
+    beforeSend?: () => void
+    /** When the request actually left; a remote host may report a later time than dispatch. */
+    onSent?: (sentAt?: number) => void
     dispatchObservation?: () => RuntimeRpcDispatchObservation
   } = {}
 ): Promise<TResult> {
@@ -73,18 +75,19 @@ export async function callRuntimeRpc<TResult>(
   const nextParams = options.suppressFeatureInteraction
     ? withBrowserPaneUiRuntimeRpcSource(params)
     : params
+  options.beforeSend?.()
+  if (target.kind === 'local') {
+    options.onSent?.()
+  }
   const response =
     target.kind === 'local'
-      ? await (() => {
-          options.beforeSend?.()
-          return window.api.runtime.call({ method, params: nextParams })
-        })()
+      ? await window.api.runtime.call({ method, params: nextParams })
       : await callRuntimeEnvironmentWithRevision({
           environmentId: target.environmentId,
           method,
           params: nextParams,
           timeoutMs: options.timeoutMs,
-          beforeSend: options.beforeSend,
+          onSent: options.onSent,
           dispatchObservation: options.dispatchObservation,
           signal: options.signal,
           expectedEnvironmentPairingRevision,
diff --git a/src/renderer/src/runtime/runtime-rpc-environment-call.ts b/src/renderer/src/runtime/runtime-rpc-environment-call.ts
index dbbf59389cbf..b96ab70cc27b 100644
--- a/src/renderer/src/runtime/runtime-rpc-environment-call.ts
+++ b/src/renderer/src/runtime/runtime-rpc-environment-call.ts
@@ -13,7 +13,7 @@ async function callRuntimeEnvironmentOnce(args: {
   method: string
   params: unknown
   timeoutMs?: number
-  beforeSend?: (sentAt?: number) => void
+  onSent?: (sentAt?: number) => void
   dispatchObservation?: () => RuntimeRpcDispatchObservation
   signal?: AbortSignal
   expectedEnvironmentPairingRevision?: number
@@ -28,11 +28,11 @@ async function callRuntimeEnvironmentOnce(args: {
       args.signal,
       args.expectedEnvironmentPairingRevision,
       args.expectedEnvironmentRuntimeId,
-      args.beforeSend,
+      args.onSent,
       args.dispatchObservation?.()
     )
   }
-  args.beforeSend?.()
+  args.onSent?.()
   return window.api.runtimeEnvironments.call({
     selector: args.environmentId,
     method: args.method,
diff --git a/src/renderer/src/runtime/structured-agent-session-client.ts b/src/renderer/src/runtime/structured-agent-session-client.ts
index b66325d0b812..e1e9eb5a935a 100644
--- a/src/renderer/src/runtime/structured-agent-session-client.ts
+++ b/src/renderer/src/runtime/structured-agent-session-client.ts
@@ -170,7 +170,8 @@ export async function callStructuredAgentSession<TResult>(
   /** For a caller that checked the remote host's compatibility itself, just before. */
   options: {
     skipCompatibilityCheck?: true
-    beforeSend?: (sentAt?: number) => void
+    beforeSend?: () => void
+    onSent?: (sentAt?: number) => void
     dispatchObservation?: () => RuntimeRpcDispatchObservation
     signal?: AbortSignal
     expectedEnvironmentPairingRevision?: number

From 46f3ed8d5dd9188bcb1aecb1e062a749c92c52ff Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 05:07:52 -0700
Subject: [PATCH 194/207] Release a held pane when an unproven close settles,
 not on its next write

A whole-tab close holds its process's teardown output from the pane it
removes. When the stop can't be proven, the hold now ends as the stop
settles: the window pane and paired streams that can restore resync at
once, so a quiet process no longer leaves the old screen until it writes.
---
 src/main/ipc/pty/delivery/accept.ts           | 35 +++++++++++++++----
 .../pty/delivery/pty-ipc-closing-hold.test.ts | 15 ++++++++
 src/main/ipc/pty/delivery/visibility-state.ts |  5 +--
 src/main/ipc/pty/provider/state-cleanup.ts    |  1 +
 ...erminal-multiplex-stream-initialization.ts | 24 ++++++++++---
 ...minal-multiplex-paused-output-drop.test.ts | 13 +++++++
 .../runtime/terminal-intentional-stops.ts     |  7 +++-
 .../pty-presentation-release-signal.ts        | 32 +++++++++++++++++
 8 files changed, 117 insertions(+), 15 deletions(-)
 create mode 100644 src/main/runtime/terminal/pty-presentation-release-signal.ts

diff --git a/src/main/ipc/pty/delivery/accept.ts b/src/main/ipc/pty/delivery/accept.ts
index 547a135786a3..43d4141b706c 100644
--- a/src/main/ipc/pty/delivery/accept.ts
+++ b/src/main/ipc/pty/delivery/accept.ts
@@ -26,6 +26,24 @@ import {
   takePtyGapEscapeState
 } from './pty-gap-escape-state'
 import type { PtyIpcSession } from '../session'
+import { subscribeToPtyPresentationRelease } from '../../../runtime/terminal/pty-presentation-release-signal'
+
+// The stop wasn't proven and the process lives on: the pane restores what was held back instead of
+// continuing across a silent gap.
+function releaseHeldPtyPresentation(
+  session: PtyIpcSession,
+  id: string,
+  markerSeq: number | undefined
+): void {
+  const unsubscribe = presentationHeldPtys.get(id)
+  if (!unsubscribe) {
+    return
+  }
+  presentationHeldPtys.delete(id)
+  unsubscribe()
+  markPtyRendererStreamGap(id)
+  sendModelRestoreNeededMarker(session, id, 'pending-cap', markerSeq)
+}
 
 export function rendererPtyIsKnownHidden(id: string): boolean {
   return rendererVisibilityKnownPtys.has(id) && !visibleRendererPtys.has(id)
@@ -70,15 +88,18 @@ export function acceptPtyDataForRenderer(
   ) {
     // A whole-tab close owns this process: its teardown output never reaches the pane it removes,
     // and is never queued or charged to delivery.
-    presentationHeldPtys.add(payload.id)
+    if (!presentationHeldPtys.has(payload.id)) {
+      const id = payload.id
+      presentationHeldPtys.set(
+        id,
+        subscribeToPtyPresentationRelease(id, () =>
+          releaseHeldPtyPresentation(session, id, session.runtime?.getPtyOutputSequence(id))
+        )
+      )
+    }
     return
   }
-  if (presentationHeldPtys.delete(payload.id)) {
-    // The stop wasn't proven and the process lives on: the pane restores what was held back
-    // instead of continuing across a silent gap.
-    markPtyRendererStreamGap(payload.id)
-    sendModelRestoreNeededMarker(session, payload.id, 'pending-cap', startSeq)
-  }
+  releaseHeldPtyPresentation(session, payload.id, startSeq)
   if (shouldDropHiddenRendererPtyData(payload.id, session.getSettings?.())) {
     const droppedChars = payload.data.length
     const drop = recordHiddenRendererPtyDataDrop(payload.id, droppedChars)
diff --git a/src/main/ipc/pty/delivery/pty-ipc-closing-hold.test.ts b/src/main/ipc/pty/delivery/pty-ipc-closing-hold.test.ts
index ca56153cbd70..e2af3cbbbfa9 100644
--- a/src/main/ipc/pty/delivery/pty-ipc-closing-hold.test.ts
+++ b/src/main/ipc/pty/delivery/pty-ipc-closing-hold.test.ts
@@ -47,6 +47,7 @@ vi.mock('../../../codex/codex-state-db-backfill-recovery', () =>
 )
 import { TerminalIntentionalStops } from '../../../runtime/terminal-intentional-stops'
 import { restorePtyIncarnation } from '../provider/ownership-state'
+import { clearProviderPtyState } from '../provider/state-cleanup'
 
 // A whole-tab close (a terminal→chat switch) holds its process's teardown output from the pane it
 // removes: never queued or charged, the stream's sequence kept, and restored if the stop isn't proven.
@@ -91,6 +92,8 @@ describe('output of a process a whole-tab close is stopping', () => {
   }
 
   afterEach(() => {
+    // The process's exit clears its held output; these fakes never exit.
+    clearProviderPtyState(PTY_ID)
     vi.useRealTimers()
   })
 
@@ -121,6 +124,18 @@ describe('output of a process a whole-tab close is stopping', () => {
     expect(order.indexOf('pty:modelRestoreNeeded')).toBeLessThan(order.indexOf('pty:data'))
   })
 
+  it('restores the pane when the unproven stop settles, though the process stays quiet', async () => {
+    const pane = await closing()
+    pane.emit('held while stopping')
+    const heldThrough = pane.seq()
+    pane.settle(false)
+    expect(pane.sent('pty:modelRestoreNeeded')).toEqual([
+      { id: PTY_ID, reason: 'pending-cap', markerSeq: heldThrough }
+    ])
+    pane.emit('still running')
+    expect(pane.sent('pty:modelRestoreNeeded')).toHaveLength(1)
+  })
+
   it('never holds a later process that reuses the id', async () => {
     const pane = await closing()
     pane.settle(true)
diff --git a/src/main/ipc/pty/delivery/visibility-state.ts b/src/main/ipc/pty/delivery/visibility-state.ts
index 52d6bf145e01..88c7e0436f21 100644
--- a/src/main/ipc/pty/delivery/visibility-state.ts
+++ b/src/main/ipc/pty/delivery/visibility-state.ts
@@ -30,8 +30,9 @@ export const KEEP_HISTORY_STOP_SETTLE_MS = 1_000
 export const KEEP_HISTORY_STOP_POLL_MS = 100
 // Keep using provider snapshots after daemon tail thinning; main's mirror no longer holds full history.
 export const providerSnapshotRequiredPtys = new Set<string>()
-// Output a whole-tab close held from the pane; a stop that wasn't proven restores the pane first.
-export const presentationHeldPtys = new Set<string>()
+// Output a whole-tab close held from the pane, with its release subscription; a stop that wasn't
+// proven restores the pane when it settles.
+export const presentationHeldPtys = new Map<string, () => void>()
 
 export function setInvalidatePendingPtyDrainPriority(
   fn: (id?: string, schedule?: boolean) => void
diff --git a/src/main/ipc/pty/provider/state-cleanup.ts b/src/main/ipc/pty/provider/state-cleanup.ts
index 0bacec5d3ed0..2b70c4ae6f4e 100644
--- a/src/main/ipc/pty/provider/state-cleanup.ts
+++ b/src/main/ipc/pty/provider/state-cleanup.ts
@@ -58,6 +58,7 @@ export function clearProviderPtyState(
   }
   clearBackgroundedDeliverySyncForPty(id)
   providerSnapshotRequiredPtys.delete(id)
+  presentationHeldPtys.get(id)?.()
   presentationHeldPtys.delete(id)
   // Reused IDs must not inherit ConPTY startup-query state.
   clearNativeWindowsConptyPty(id)
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-multiplex-stream-initialization.ts b/src/main/runtime/rpc/methods/terminal/terminal-multiplex-stream-initialization.ts
index 8295b5758f6a..218eaeb3f443 100644
--- a/src/main/runtime/rpc/methods/terminal/terminal-multiplex-stream-initialization.ts
+++ b/src/main/runtime/rpc/methods/terminal/terminal-multiplex-stream-initialization.ts
@@ -17,6 +17,7 @@ import {
 } from './terminal-multiplex-connection'
 import type { TerminalMultiplexStream } from './terminal-stream-types'
 import { subscribeToPtyEndpointLoss } from '../../../terminal/pty-endpoint-loss-signal'
+import { subscribeToPtyPresentationRelease } from '../../../terminal/pty-presentation-release-signal'
 
 export async function initializeMultiplexStream(
   state: TerminalMultiplexConnection,
@@ -90,6 +91,14 @@ export async function initializeMultiplexStream(
   )
   onInstalled(stream)
 
+  const releasePresentation = (): void => {
+    if (!stream.presentationHeld) {
+      return
+    }
+    stream.presentationHeld = false
+    stream.outputBatcher.flush()
+    state.sendFrame(stream.streamId, TerminalStreamOpcode.PausedOutputDropped)
+  }
   const unsubscribeStreamData = runtime.subscribeToTerminalData(ptyId, (data, meta) => {
     if (!isMultiplexStreamAttached(state, stream)) {
       return
@@ -100,11 +109,7 @@ export async function initializeMultiplexStream(
       stream.presentationHeld = true
       return
     }
-    if (stream.presentationHeld) {
-      stream.presentationHeld = false
-      stream.outputBatcher.flush()
-      state.sendFrame(stream.streamId, TerminalStreamOpcode.PausedOutputDropped)
-    }
+    releasePresentation()
     if (stream.outputPaused) {
       notePausedOutputDropped(state, stream)
       return
@@ -130,10 +135,19 @@ export async function initializeMultiplexStream(
         }
       })
     : () => {}
+  // An unproven stop releases the hold when it settles; a quiet process would otherwise keep the old screen.
+  const unsubscribePresentationRelease = stream.supportsOutputPauseDropNotice
+    ? subscribeToPtyPresentationRelease(ptyId, () => {
+        if (isMultiplexStreamAttached(state, stream)) {
+          releasePresentation()
+        }
+      })
+    : () => {}
   stream.unsubscribeData = () => {
     releaseViewSubscriber()
     unsubscribeStreamData()
     unsubscribeEndpointLoss()
+    unsubscribePresentationRelease()
   }
 
   if (isMobile && request.client?.id) {
diff --git a/src/main/runtime/rpc/terminal-multiplex-paused-output-drop.test.ts b/src/main/runtime/rpc/terminal-multiplex-paused-output-drop.test.ts
index 64f293c087a6..9f65207be11d 100644
--- a/src/main/runtime/rpc/terminal-multiplex-paused-output-drop.test.ts
+++ b/src/main/runtime/rpc/terminal-multiplex-paused-output-drop.test.ts
@@ -14,6 +14,7 @@ import {
 } from '../../../shared/terminal-multiplex-flow-control'
 import { startDesktopMultiplexSubscribe } from './terminal-multiplex-test-harness'
 import { RuntimeTerminalViewSubscribers } from '../runtime-terminal-view-subscribers'
+import { publishPtyPresentationRelease } from '../terminal/pty-presentation-release-signal'
 
 async function subscribePausable(
   capabilities: Record<string, 1>,
@@ -221,6 +222,18 @@ describe('terminal multiplex paused-output drop notice', () => {
     await host.close()
   })
 
+  it('has the client restore when an unproven stop settles, though the process stays quiet', async () => {
+    const host = await subscribePausable({ ackOutput: 1, outputPause: 1, outputPauseDropNotice: 1 })
+    host.emitOutput('zsh: terminated  codex resume', true)
+    publishPtyPresentationRelease('pty-1')
+    expect(host.dropNotices()).toBe(1)
+    host.emitOutput('still running')
+    expect(host.dropNotices()).toBe(1)
+    await host.close()
+    publishPtyPresentationRelease('pty-1')
+    expect(host.dropNotices()).toBe(1)
+  })
+
   it('keeps showing teardown output to a client that could not restore after a gap', async () => {
     const host = await subscribePausable({ ackOutput: 1, outputPause: 1 })
     host.emitOutput('zsh: terminated', true)
diff --git a/src/main/runtime/terminal-intentional-stops.ts b/src/main/runtime/terminal-intentional-stops.ts
index 588b6fbbb74f..4aa26d4941de 100644
--- a/src/main/runtime/terminal-intentional-stops.ts
+++ b/src/main/runtime/terminal-intentional-stops.ts
@@ -1,4 +1,5 @@
 import { SYNTHETIC_KILL_EXIT_DUPLICATE_WINDOW_MS } from '../ipc/pty/delivery/visibility-state'
+import { publishPtyPresentationRelease } from './terminal/pty-presentation-release-signal'
 
 /**
  * Why main stopped a PTY on purpose. These kinds keep the pane's binding through the exit:
@@ -57,10 +58,14 @@ export class TerminalIntentionalStops {
       settled = true
       owners.stopped ||= stopped
       owners.inFlight -= 1
-      if (owners.inFlight === 0 && !owners.stopped) {
+      const released = owners.inFlight === 0 && !owners.stopped
+      if (released) {
         owned.ownersByKind.delete(kind)
       }
       this.settleIfIdle(ptyId, owned)
+      if (released && kind === 'closing') {
+        publishPtyPresentationRelease(ptyId)
+      }
     }
   }
 
diff --git a/src/main/runtime/terminal/pty-presentation-release-signal.ts b/src/main/runtime/terminal/pty-presentation-release-signal.ts
new file mode 100644
index 000000000000..d9144d5657e2
--- /dev/null
+++ b/src/main/runtime/terminal/pty-presentation-release-signal.ts
@@ -0,0 +1,32 @@
+/** An unproven whole-tab close stops holding a process's output: every view holding it resyncs now, not on its next write. */
+const listenersByPtyId = new Map<string, Set<() => void>>()
+
+export function subscribeToPtyPresentationRelease(ptyId: string, listener: () => void): () => void {
+  let listeners = listenersByPtyId.get(ptyId)
+  if (!listeners) {
+    listeners = new Set()
+    listenersByPtyId.set(ptyId, listeners)
+  }
+  listeners.add(listener)
+  return () => {
+    const current = listenersByPtyId.get(ptyId)
+    current?.delete(listener)
+    if (current?.size === 0) {
+      listenersByPtyId.delete(ptyId)
+    }
+  }
+}
+
+export function publishPtyPresentationRelease(ptyId: string): void {
+  const listeners = listenersByPtyId.get(ptyId)
+  if (!listeners) {
+    return
+  }
+  for (const listener of listeners) {
+    try {
+      listener()
+    } catch (error) {
+      console.warn('[terminal] presentation release listener failed:', error)
+    }
+  }
+}

From a0cf7f6b1a8f85c75aa527040d7d226187980c68 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 05:09:21 -0700
Subject: [PATCH 195/207] Keep a switched tab's slot in the middle of the
 pinned group

The window pinned the destination after placing it at the source's index,
and pinning moves a tab to the end of the pinned group. Pin first, then
take the index, on both window replace paths.
---
 .../src/lib/unified-tab-anchor-insertion.ts   | 35 ++++++++++++++-----
 .../src/lib/unified-tab-replace.test.ts       | 15 ++++++--
 ...l-structured-session-replaced-slot.test.ts | 28 ++++++++++-----
 .../snapshot-apply.ts                         |  5 ++-
 4 files changed, 62 insertions(+), 21 deletions(-)

diff --git a/src/renderer/src/lib/unified-tab-anchor-insertion.ts b/src/renderer/src/lib/unified-tab-anchor-insertion.ts
index 105c1a8ee72e..1a1b9291b9d4 100644
--- a/src/renderer/src/lib/unified-tab-anchor-insertion.ts
+++ b/src/renderer/src/lib/unified-tab-anchor-insertion.ts
@@ -28,14 +28,7 @@ export function replaceUnifiedTab(
   if (!tab || !replaced || !group || tab.id === replaced.id) {
     return false
   }
-  const order = group.tabOrder.filter((id) => id !== tab.id)
-  order.splice(order.indexOf(replaced.id), 0, tab.id)
-  if (group.tabOrder.includes(tab.id)) {
-    state.reorderUnifiedTabs(group.id, order, { recordInteraction: false })
-  }
-  if (replaced.isPinned && !tab.isPinned) {
-    state.pinTab(tab.id, { recordInteraction: false })
-  }
+  takeReplacedTabSlot(worktreeId, tab, replaced)
   return (
     useAppStore
       .getState()
@@ -43,6 +36,32 @@ export function replaceUnifiedTab(
   )
 }
 
+/**
+ * The new tab takes the replaced tab's pin, then its index. Pinning moves a tab to the end of the
+ * pinned group, so it comes first, or a slot in the middle of that group would be lost.
+ */
+export function takeReplacedTabSlot(
+  worktreeId: string,
+  tab: { id: string; isPinned?: boolean },
+  replaced: { id: string; isPinned?: boolean }
+): void {
+  if (replaced.isPinned && !tab.isPinned) {
+    useAppStore.getState().pinTab(tab.id, { recordInteraction: false })
+  }
+  const state = useAppStore.getState()
+  const group = (state.groupsByWorktree[worktreeId] ?? []).find((candidate) =>
+    candidate.tabOrder.includes(replaced.id)
+  )
+  if (!group?.tabOrder.includes(tab.id)) {
+    return
+  }
+  const order = group.tabOrder.filter((id) => id !== tab.id)
+  order.splice(order.indexOf(replaced.id), 0, tab.id)
+  if (order.some((id, index) => id !== group.tabOrder[index])) {
+    state.reorderUnifiedTabs(group.id, order, { recordInteraction: false })
+  }
+}
+
 export function insertUnifiedTabAfterAnchor(
   worktreeId: string,
   tabId: string,
diff --git a/src/renderer/src/lib/unified-tab-replace.test.ts b/src/renderer/src/lib/unified-tab-replace.test.ts
index d1ad6f6c81b7..35b99afb24ec 100644
--- a/src/renderer/src/lib/unified-tab-replace.test.ts
+++ b/src/renderer/src/lib/unified-tab-replace.test.ts
@@ -27,7 +27,7 @@ const { replaceUnifiedTab } = await import('./unified-tab-anchor-insertion')
 const WT = 'repo1::/tmp/wt1'
 const GROUP = 'group-1'
 
-function seed(pinnedChat: boolean): void {
+function seed(pinnedChat: boolean, pinnedAfter = false): void {
   const pinned = makeUnifiedTab({
     id: 'u-pinned',
     entityId: 'pinned',
@@ -50,7 +50,8 @@ function seed(pinnedChat: boolean): void {
     entityId: 'other',
     groupId: GROUP,
     worktreeId: WT,
-    contentType: 'terminal'
+    contentType: 'terminal',
+    isPinned: pinnedAfter
   })
   const terminal = makeUnifiedTab({
     id: 'u-switched',
@@ -104,3 +105,13 @@ it.each([false, true])(
     expect(rpc.call).not.toHaveBeenCalled()
   }
 )
+
+it('keeps a pinned slot in the middle of the pinned group', () => {
+  seed(true, true)
+  expect(replaceUnifiedTab(WT, 'u-switched', 'chat-tab')).toBe(true)
+  const state = store.getState()
+  expect(state.groupsByWorktree[WT]?.[0]?.tabOrder).toEqual(['u-pinned', 'u-switched', 'u-other'])
+  expect(state.unifiedTabsByWorktree[WT]?.find((tab) => tab.id === 'u-switched')?.isPinned).toBe(
+    true
+  )
+})
diff --git a/src/renderer/src/runtime/local-structured-session-replaced-slot.test.ts b/src/renderer/src/runtime/local-structured-session-replaced-slot.test.ts
index a7b080b522cd..b4b8cb681ffb 100644
--- a/src/renderer/src/runtime/local-structured-session-replaced-slot.test.ts
+++ b/src/renderer/src/runtime/local-structured-session-replaced-slot.test.ts
@@ -35,13 +35,15 @@ afterEach(() => {
 })
 
 it.each([
-  ['still held the selection', 'switched', GROUP],
-  ['lost the selection to another tab', 'after', GROUP],
+  ['still held the selection', 'switched', GROUP, false],
+  ['lost the selection to another tab', 'after', GROUP, false],
   // The user works in another split group: the group shows the chat, focus stays with the user.
-  ['held the selection of a group the user left', 'switched', 'group-2']
+  ['held the selection of a group the user left', 'switched', 'group-2', false],
+  // [P1, S, P2 | U]: pinning must not move the chat to the end of the pinned group.
+  ['sat in the middle of the pinned group', 'switched', GROUP, true]
 ])(
   'puts the chat in the replaced terminal’s pinned slot, closing it as a replace, when it %s',
-  (_name, active, activeGroup) => {
+  (_name, active, activeGroup, pinnedAfter) => {
     const terminal = (id: string, isPinned = false) =>
       makeUnifiedTab({
         id,
@@ -57,12 +59,17 @@ it.each([
         'repo-1': [makeWorktree({ id: WORKTREE, repoId: 'repo-1', path: '/tmp/wt-switch' })]
       },
       tabsByWorktree: {
-        [WORKTREE]: ['before', 'switched', 'after'].map((id) =>
+        [WORKTREE]: ['before', 'switched', 'pinned-after', 'after'].map((id) =>
           makeTab({ id, worktreeId: WORKTREE })
         )
       },
       unifiedTabsByWorktree: {
-        [WORKTREE]: [terminal('before', true), terminal('switched', true), terminal('after')]
+        [WORKTREE]: [
+          terminal('before', true),
+          terminal('switched', true),
+          terminal('pinned-after', pinnedAfter),
+          terminal('after')
+        ]
       },
       groupsByWorktree: {
         [WORKTREE]: [
@@ -70,7 +77,7 @@ it.each([
             id: GROUP,
             worktreeId: WORKTREE,
             activeTabId: active,
-            tabOrder: ['before', 'switched', 'after'],
+            tabOrder: ['before', 'switched', 'pinned-after', 'after'],
             recentTabIds: ['before', active]
           }),
           makeTabGroup({ id: 'group-2', worktreeId: WORKTREE, activeTabId: null, tabOrder: [] })
@@ -116,7 +123,12 @@ it.each([
     const chat = state.unifiedTabsByWorktree[WORKTREE]?.find(
       (tab) => tab.contentType === 'agent-session'
     )
-    expect(state.groupsByWorktree[WORKTREE]?.[0]?.tabOrder).toEqual(['before', chat?.id, 'after'])
+    expect(state.groupsByWorktree[WORKTREE]?.[0]?.tabOrder).toEqual([
+      'before',
+      chat?.id,
+      'pinned-after',
+      'after'
+    ])
     expect(chat?.isPinned).toBe(true)
     expect(state.tabsByWorktree[WORKTREE]?.some((tab) => tab.id === 'switched')).toBe(false)
     expect(state.recentlyClosedTerminalTabsByWorktree).toEqual(reopenStack)
diff --git a/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts b/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts
index 94c0c49c6c04..39cb61488e88 100644
--- a/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts
+++ b/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts
@@ -37,6 +37,7 @@ import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switc
 import { useAppStore } from '../../store'
 import { closeTerminalTab } from '@/components/terminal/terminal-tab-actions'
 import { replacementSelection, selectReplacementInGroup } from '@/lib/replaced-tab-selection'
+import { takeReplacedTabSlot } from '@/lib/unified-tab-anchor-insertion'
 import { framesDrawWorkspace } from '../workspace-layout-frame-drawn-workspaces'
 import { drawnChatLabelChanges, type DrawnChatLabel } from './frame-drawn-chat-tabs'
 
@@ -261,9 +262,7 @@ function closeReplacedTerminalTabs(replacements: readonly ReplacedSessionTab[]):
     if (!replaced || !chat) {
       continue
     }
-    if (replaced.isPinned && !chat.isPinned) {
-      useAppStore.getState().pinTab(chat.id, { recordInteraction: false })
-    }
+    takeReplacedTabSlot(worktreeId, chat, replaced)
     const selection = replacementSelection(useAppStore.getState(), worktreeId, replaced)
     // Not a user close: a replace never feeds Reopen Closed Tab or drops the tab's drafts.
     closeTerminalTab(replaced.entityId, {

From 21638b1d7c3cc2796ff34a64aaa94fb2e0617d04 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 05:10:20 -0700
Subject: [PATCH 196/207] Carry a replaced tab's pin on the host's switched row

On a host with no desktop window, the switched tab's pin lived only in
each client's memory, so a client that reloaded or connected later saw
it unpinned. The host's replacement row now takes the replaced tab's pin
through the rows' existing pin field, as the main-owned layout does.
---
 .../session-tabs/session-tab-replace.test.ts  | 26 +++++++++++++++++++
 .../session-tabs/session-tab-replace.ts       |  7 +++--
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/main/runtime/session-tabs/session-tab-replace.test.ts b/src/main/runtime/session-tabs/session-tab-replace.test.ts
index a275932798ef..682e13e830c5 100644
--- a/src/main/runtime/session-tabs/session-tab-replace.test.ts
+++ b/src/main/runtime/session-tabs/session-tab-replace.test.ts
@@ -137,4 +137,30 @@ describe('replaceSessionTabInSnapshot', () => {
       expect(next.activeTabId).toBe(takes ? 'agent-session:s2' : snapshot.activeTabId)
     }
   )
+
+  it('keeps a pinned slot pinned for a client that never showed the source', () => {
+    const pinned = {
+      ...snapshot,
+      tabs: snapshot.tabs.map((tab) =>
+        tab.id === 'agent-session:s1' ? { ...tab, isPinned: true } : tab
+      )
+    }
+    const terminal = {
+      type: 'terminal' as const,
+      id: 't9::l9',
+      parentTabId: 't9',
+      leafId: 'l9',
+      title: 'C',
+      isActive: false
+    }
+    const replace = (existing: RuntimeMobileSessionTabsSnapshot) =>
+      replaceSessionTabInSnapshot(existing, {
+        workspaceId: 'ws',
+        replacedTabId: 'agent-session:s1',
+        row: terminal,
+        activate: false
+      }).tabs.at(-1)?.isPinned
+    expect(replace(pinned)).toBe(true)
+    expect(replace(snapshot)).toBeUndefined()
+  })
 })
diff --git a/src/main/runtime/session-tabs/session-tab-replace.ts b/src/main/runtime/session-tabs/session-tab-replace.ts
index 3201b00b26da..9b88c8eb434d 100644
--- a/src/main/runtime/session-tabs/session-tab-replace.ts
+++ b/src/main/runtime/session-tabs/session-tab-replace.ts
@@ -35,7 +35,8 @@ export function replaceSessionTabInSnapshot(
   }
 ): RuntimeMobileSessionTabsSnapshot {
   const { replacedTabId } = input
-  const replaced = new Set(existing ? rowsOfTab(existing, replacedTabId).map((row) => row.id) : [])
+  const replacedRows = existing ? rowsOfTab(existing, replacedTabId) : []
+  const replaced = new Set(replacedRows.map((row) => row.id))
   const groups = existing?.tabGroups ?? [
     { id: getHeadlessMobileSessionGroupId(input.workspaceId), activeTabId: null, tabOrder: [] }
   ]
@@ -49,9 +50,11 @@ export function replaceSessionTabInSnapshot(
       ? held == null || held === replacedTabId || replaced.has(held)
       : input.selectionDecided === true)
   // The hint names the confirmed source even when this snapshot no longer lists it (the window can
-  // drop it first); a client that still shows that tab puts the row there.
+  // drop it first); a client that still shows that tab puts the row there. A pinned slot stays
+  // pinned here too, so a client that never showed the source still sees the pin.
   const row: ReplacementRow = {
     ...input.row,
+    ...(replacedRows.some((candidate) => candidate.isPinned) ? { isPinned: true } : {}),
     replaces: { tabId: replacedTabId },
     isActive: activate
   }

From e29260f416e1d15d7cd8ed2d75bcb1a46bfa254d Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 05:20:10 -0700
Subject: [PATCH 197/207] Keep main's Continue labels where a switch opens
 beside its source

On an older host or for omp, the terminal pane control and tab menu open
the chat beside the pane, so they read 'Continue in Chat UI' again, and
the chat tab menu's copy reads 'Continue with Terminal Agent', with
main's translations. The 'host can't switch' message names that menu.
The de, ru, tr and zh-Hant 'Show as chat' strings now match English.
---
 .../AiVaultSessionSurfaceSwitchMenuItems.tsx  | 37 +++++++++++++------
 .../tab-bar/CliChatResumeMenuItems.tsx        |  4 +-
 .../TabSessionSurfaceSwitchMenuItems.test.tsx | 18 ++++++++-
 ...alPaneResumeInChatButton.held-job.test.tsx | 11 +++++-
 .../TerminalPaneResumeInChatButton.test.tsx   |  6 ++-
 .../TerminalPaneResumeInChatButton.tsx        |  9 ++++-
 src/renderer/src/i18n/locales/de.json         |  3 +-
 src/renderer/src/i18n/locales/en.json         |  3 +-
 src/renderer/src/i18n/locales/es.json         |  1 +
 src/renderer/src/i18n/locales/fr.json         |  1 +
 src/renderer/src/i18n/locales/ja.json         |  1 +
 src/renderer/src/i18n/locales/ko.json         |  1 +
 src/renderer/src/i18n/locales/pt.json         |  1 +
 src/renderer/src/i18n/locales/ru.json         |  3 +-
 src/renderer/src/i18n/locales/tr.json         |  3 +-
 src/renderer/src/i18n/locales/zh-Hant.json    |  3 +-
 src/renderer/src/i18n/locales/zh.json         |  1 +
 .../src/lib/conversation-switch-feedback.ts   |  2 +-
 18 files changed, 82 insertions(+), 26 deletions(-)

diff --git a/src/renderer/src/components/right-sidebar/AiVaultSessionSurfaceSwitchMenuItems.tsx b/src/renderer/src/components/right-sidebar/AiVaultSessionSurfaceSwitchMenuItems.tsx
index 6d1b1372ea81..b57ad5edec9b 100644
--- a/src/renderer/src/components/right-sidebar/AiVaultSessionSurfaceSwitchMenuItems.tsx
+++ b/src/renderer/src/components/right-sidebar/AiVaultSessionSurfaceSwitchMenuItems.tsx
@@ -24,7 +24,8 @@ export function AiVaultSessionSurfaceSwitchMenuItems({
   session,
   originalPaneTarget,
   switchExplanation,
-  switchLoading = false
+  switchLoading = false,
+  switchesInPlace = inPlaceAgent !== undefined
 }: {
   session?: AiVaultSession
   originalPaneTarget?: AiVaultOriginalPaneTarget | null
@@ -39,6 +40,8 @@ export function AiVaultSessionSurfaceSwitchMenuItems({
   /** The agent whose conversation switches in place on its host; unset keeps the new-tab entries. */
   switchLoading?: boolean
   inPlaceAgent?: AiVaultAgent
+  /** Whether a switch replaces in place; otherwise it opens beside the source, as main's Continue did. */
+  switchesInPlace?: boolean
 }): React.JSX.Element {
   const chat = useConversationSwitchReadiness(
     session ? historyConversationSwitch(session, 'chat', undefined, originalPaneTarget) : null
@@ -48,7 +51,7 @@ export function AiVaultSessionSurfaceSwitchMenuItems({
   )
   const heldChat = session && inPlaceAgent ? chat : null
   const heldCli = session?.structuredSession && inPlaceAgent ? cli : null
-  const inPlace = inPlaceAgent !== undefined
+  const inPlace = switchesInPlace
   const Item = menuKind === 'context' ? ContextMenuItem : DropdownMenuItem
   return (
     <>
@@ -60,12 +63,17 @@ export function AiVaultSessionSurfaceSwitchMenuItems({
           aria-busy={chatPending || undefined}
         >
           <MessagesSquare className="size-3.5" />
-          {action === 'resume' && !inPlace
-            ? translate(
-                'auto.components.right.sidebar.AiVaultSessionRow.resumeInNewNativeChat',
-                'Resume in New Chat'
-              )
-            : translate('components.tab.bar.switch.toNativeChat', 'Switch to Chat UI')}
+          {inPlace
+            ? translate('components.tab.bar.switch.toNativeChat', 'Switch to Chat UI')
+            : action === 'resume'
+              ? translate(
+                  'auto.components.right.sidebar.AiVaultSessionRow.resumeInNewNativeChat',
+                  'Resume in New Chat'
+                )
+              : translate(
+                  'components.tab.bar.SortableTabContextMenu.continueInChatView',
+                  'Continue in Chat UI'
+                )}
         </Item>
       ) : null}
       {onResumeInNewCli ? (
@@ -84,10 +92,15 @@ export function AiVaultSessionSurfaceSwitchMenuItems({
               )}
               {inPlace
                 ? translate('components.tab.bar.switch.toCli', 'Switch to CLI')
-                : translate(
-                    'auto.components.right.sidebar.AiVaultSessionRow.resumeInNewCli',
-                    'Resume in New Terminal'
-                  )}
+                : action === 'resume'
+                  ? translate(
+                      'auto.components.right.sidebar.AiVaultSessionRow.resumeInNewCli',
+                      'Resume in New Terminal'
+                    )
+                  : translate(
+                      'components.tab.bar.SortableTabContextMenu.switchToTerminalView',
+                      'Continue with Terminal Agent'
+                    )}
             </Item>
           </TooltipTrigger>
           <TooltipContent side={tooltipSide} sideOffset={8}>
diff --git a/src/renderer/src/components/tab-bar/CliChatResumeMenuItems.tsx b/src/renderer/src/components/tab-bar/CliChatResumeMenuItems.tsx
index 624be0c5b90c..977f3836a3aa 100644
--- a/src/renderer/src/components/tab-bar/CliChatResumeMenuItems.tsx
+++ b/src/renderer/src/components/tab-bar/CliChatResumeMenuItems.tsx
@@ -5,7 +5,7 @@ import { useAppStore } from '@/store'
 import { ContextMenuSeparator } from '@/components/ui/context-menu'
 import type { TerminalTab } from '../../../../shared/terminal-tab-types'
 import { AiVaultSessionSurfaceSwitchMenuItems } from '../right-sidebar/AiVaultSessionSurfaceSwitchMenuItems'
-import { resolveCliChatResumeSource } from './cli-chat-resume-source'
+import { resolveCliChatResumeSource, useCliChatResumeCapability } from './cli-chat-resume-source'
 
 export function CliChatResumeMenuItems({
   tab,
@@ -18,6 +18,7 @@ export function CliChatResumeMenuItems({
 }): React.JSX.Element | null {
   const source = useAppStore(useShallow((state) => resolveCliChatResumeSource(state, { tab })))
   const confirm = useConfirmationDialog()
+  const capability = useCliChatResumeCapability(tab.worktreeId, source?.agent)
   const readiness = useConversationSwitchReadiness(
     source ? { direction: 'chat', ...source, source } : null
   )
@@ -29,6 +30,7 @@ export function CliChatResumeMenuItems({
       {leadingSeparator ? <ContextMenuSeparator /> : null}
       <AiVaultSessionSurfaceSwitchMenuItems
         action="switch"
+        switchesInPlace={capability !== false}
         switchLoading={!readiness.ready}
         switchExplanation={readiness.explanation}
         menuKind="context"
diff --git a/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx b/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx
index 9da5ba01d39b..7f9e5cee9149 100644
--- a/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx
+++ b/src/renderer/src/components/tab-bar/TabSessionSurfaceSwitchMenuItems.test.tsx
@@ -50,7 +50,7 @@ vi.mock('./tab-session-history-switch', async (importOriginal) => ({
 }))
 
 vi.mock('./cli-chat-resume-source', () => ({
-  useCliChatResumeCapability: (_worktreeId: string, agent: string) => agent === 'codex',
+  useCliChatResumeCapability: (_worktreeId: string, agent: string) => agent !== 'omp',
   resolveCliChatResumeSource: () => mocks.cliSource
 }))
 vi.mock('@/lib/conversation-surface-switch', () => ({
@@ -150,7 +150,7 @@ describe('TabSessionSurfaceSwitchMenuItems', () => {
     mocks.subject = CHAT_SUBJECT
     renderItemsNow('orca-chat-1', 'omp')
     expect(screen.queryByRole('menuitem', { name: 'Switch to CLI' })).toBeNull()
-    fireEvent.click(screen.getByRole('menuitem'))
+    fireEvent.click(screen.getByRole('menuitem', { name: 'Continue with Terminal Agent' }))
     expect(mocks.runNativeChatCliFork).toHaveBeenCalledWith(
       expect.objectContaining({ subject: CHAT_SUBJECT, agent: 'omp' })
     )
@@ -176,6 +176,20 @@ describe('TabSessionSurfaceSwitchMenuItems', () => {
     expect(mocks.runNativeChatCliFork).not.toHaveBeenCalled()
   })
 
+  it("keeps main's label where the terminal's chat opens beside it", () => {
+    mocks.cliSource = {
+      tabId: 'tab-1',
+      workspaceId: 'wt-1',
+      paneKey: 'tab-1:leaf',
+      agent: 'omp',
+      providerSessionId: 'provider-1',
+      executionHostId: 'local'
+    }
+    renderItemsNow()
+    expect(screen.queryByRole('menuitem', { name: 'Switch to Chat UI' })).toBeNull()
+    expect(screen.getByRole('menuitem', { name: 'Continue in Chat UI' })).toBeTruthy()
+  })
+
   it('offers and dispatches a CLI identity while History never answers', async () => {
     const source = {
       tabId: 'tab-1',
diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.held-job.test.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.held-job.test.tsx
index 82a5a98b64a3..cb0589ce71f3 100644
--- a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.held-job.test.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.held-job.test.tsx
@@ -11,9 +11,16 @@ import {
 import { TooltipProvider } from '@/components/ui/tooltip'
 import { TerminalPaneResumeInChatButton } from './TerminalPaneResumeInChatButton'
 import { STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY } from '../../../../shared/protocol-version'
+import { IN_PLACE_SWITCH_RUNTIME_CAPABILITIES } from '../../../../shared/structured-agent-cli-conversation-adoption'
 vi.mock('@/runtime/local-runtime-capabilities', () => ({
-  ensureLocalRuntimeCapabilities: async () => [STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY],
-  readLocalRuntimeCapabilitiesOrUnknown: () => [STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY],
+  ensureLocalRuntimeCapabilities: async () => [
+    STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY,
+    ...IN_PLACE_SWITCH_RUNTIME_CAPABILITIES
+  ],
+  readLocalRuntimeCapabilitiesOrUnknown: () => [
+    STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY,
+    ...IN_PLACE_SWITCH_RUNTIME_CAPABILITIES
+  ],
   subscribeLocalRuntimeCapabilityObservation: () => () => {}
 }))
 afterEach(cleanup)
diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.test.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.test.tsx
index 882a53b5a1ea..03241ecf1e11 100644
--- a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.test.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.test.tsx
@@ -20,7 +20,7 @@ const mocks = vi.hoisted(() => {
   return { source, resolve: vi.fn(), run: vi.fn(), pending: false }
 })
 vi.mock('../tab-bar/cli-chat-resume-source', () => ({
-  useCliChatResumeCapability: (_worktreeId: string, agent: string) => agent === 'codex',
+  useCliChatResumeCapability: (_worktreeId: string, agent: string) => agent !== 'omp',
   resolveCliChatResumeSource: (_state: unknown, args: unknown) => {
     mocks.resolve(args)
     return mocks.source
@@ -47,7 +47,9 @@ beforeEach(() => {
 
 it.each([
   ['claude', 'Switch to Chat UI'],
-  ['codex', 'Switch to Chat UI']
+  ['codex', 'Switch to Chat UI'],
+  // The route that opens the chat beside the pane keeps main's label.
+  ['omp', 'Continue in Chat UI']
 ] as const)('offers the %s action for the exact pane and shares pending', (agent, label) => {
   mocks.source.agent = agent
   if (agent === 'claude') {
diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx
index 20d89099ba99..5f076a165e2e 100644
--- a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.tsx
@@ -36,7 +36,14 @@ export function TerminalPaneResumeInChatButton({
   )
   const busy = useConversationSwitchBusy(readiness.pending)
 
-  const label = translate('components.tab.bar.switch.toNativeChat', 'Switch to Chat UI')
+  // An older host or an agent that can't switch opens the chat beside the pane, as main's Continue did.
+  const label =
+    capability === false
+      ? translate(
+          'components.tab.bar.SortableTabContextMenu.continueInChatView',
+          'Continue in Chat UI'
+        )
+      : translate('components.tab.bar.switch.toNativeChat', 'Switch to Chat UI')
   const updateRequired = source?.hostUpdateRequired === true
   const tooltip = updateRequired
     ? translate(
diff --git a/src/renderer/src/i18n/locales/de.json b/src/renderer/src/i18n/locales/de.json
index 145711ee701b..87968109313e 100644
--- a/src/renderer/src/i18n/locales/de.json
+++ b/src/renderer/src/i18n/locales/de.json
@@ -20010,7 +20010,8 @@
       "bar": {
         "SortableTabContextMenu": {
           "switchToTerminalView": "Mit Terminal-Agenten fortfahren",
-          "switchToChatView": "In der Chat-Oberfläche fortfahren",
+          "continueInChatView": "In der Chat-Oberfläche fortfahren",
+          "switchToChatView": "Als Chat anzeigen",
           "showAsTerminal": "Als Terminal anzeigen",
           "allowAutoClose": "Automatisches Schließen erlauben"
         },
diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index 16850012fbd9..794f8ec938e2 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -20137,6 +20137,7 @@
       "bar": {
         "SortableTabContextMenu": {
           "switchToTerminalView": "Continue with Terminal Agent",
+          "continueInChatView": "Continue in Chat UI",
           "switchToChatView": "Show as chat",
           "showAsTerminal": "Show as terminal",
           "allowAutoClose": "Allow Auto-Close"
@@ -20165,7 +20166,7 @@
           "sourceKept": "{{agent}} opened successfully. The original tab was kept; continue in the new tab.",
           "changeInProgress": "{{agent}} is still finishing another change to this conversation. Try again in a moment.",
           "conversationMissing": "Orca could not find this {{agent}} conversation. Open it from Session History, then try again.",
-          "hostCannotSwitch": "Orca on this host cannot switch {{agent}} in place. Update Orca there, or open a copy with Continue with Terminal Agent."
+          "hostCannotSwitch": "Orca on this host cannot switch {{agent}} in place. Update Orca there, or open a copy with Continue with Terminal Agent in this tab's menu."
         },
         "BrowserTab": {
           "closeOthers": "Close Others",
diff --git a/src/renderer/src/i18n/locales/es.json b/src/renderer/src/i18n/locales/es.json
index 2469f5bef3cb..b5ac195ae1b7 100644
--- a/src/renderer/src/i18n/locales/es.json
+++ b/src/renderer/src/i18n/locales/es.json
@@ -19832,6 +19832,7 @@
       "bar": {
         "SortableTabContextMenu": {
           "switchToTerminalView": "Continuar con el agente de terminal",
+          "continueInChatView": "Continuar en la interfaz de chat",
           "switchToChatView": "Mostrar como chat",
           "showAsTerminal": "Mostrar como terminal",
           "allowAutoClose": "Permitir cierre automático"
diff --git a/src/renderer/src/i18n/locales/fr.json b/src/renderer/src/i18n/locales/fr.json
index 4fff0386ee62..580faf4819f6 100644
--- a/src/renderer/src/i18n/locales/fr.json
+++ b/src/renderer/src/i18n/locales/fr.json
@@ -20052,6 +20052,7 @@
       "bar": {
         "SortableTabContextMenu": {
           "switchToTerminalView": "Continuer avec l’agent de terminal",
+          "continueInChatView": "Continuer dans l’interface de chat",
           "switchToChatView": "Afficher en chat",
           "showAsTerminal": "Afficher en terminal",
           "allowAutoClose": "Autoriser la fermeture automatique"
diff --git a/src/renderer/src/i18n/locales/ja.json b/src/renderer/src/i18n/locales/ja.json
index 5230b0a6a7c1..117198e49f4d 100644
--- a/src/renderer/src/i18n/locales/ja.json
+++ b/src/renderer/src/i18n/locales/ja.json
@@ -19298,6 +19298,7 @@
       "bar": {
         "SortableTabContextMenu": {
           "switchToTerminalView": "ターミナル Agent で続ける",
+          "continueInChatView": "チャット UI で続ける",
           "switchToChatView": "チャットとして表示",
           "showAsTerminal": "ターミナルとして表示",
           "allowAutoClose": "自動終了を許可"
diff --git a/src/renderer/src/i18n/locales/ko.json b/src/renderer/src/i18n/locales/ko.json
index 4d4760a74b71..8ba892c0d20c 100644
--- a/src/renderer/src/i18n/locales/ko.json
+++ b/src/renderer/src/i18n/locales/ko.json
@@ -19298,6 +19298,7 @@
       "bar": {
         "SortableTabContextMenu": {
           "switchToTerminalView": "터미널 에이전트로 계속하기",
+          "continueInChatView": "채팅 UI에서 계속하기",
           "switchToChatView": "채팅으로 표시",
           "showAsTerminal": "터미널로 표시",
           "allowAutoClose": "자동 닫기 허용"
diff --git a/src/renderer/src/i18n/locales/pt.json b/src/renderer/src/i18n/locales/pt.json
index c67f326a3d0c..08b9a74823ab 100644
--- a/src/renderer/src/i18n/locales/pt.json
+++ b/src/renderer/src/i18n/locales/pt.json
@@ -20964,6 +20964,7 @@
       "bar": {
         "SortableTabContextMenu": {
           "switchToTerminalView": "Continuar com o agente de terminal",
+          "continueInChatView": "Alternar para visualização de chat",
           "switchToChatView": "Alternar para visualização de chat",
           "showAsTerminal": "Mostrar como terminal",
           "allowAutoClose": "Permitir fechamento automático"
diff --git a/src/renderer/src/i18n/locales/ru.json b/src/renderer/src/i18n/locales/ru.json
index 4f5bfef0a5ec..cec5af77435b 100644
--- a/src/renderer/src/i18n/locales/ru.json
+++ b/src/renderer/src/i18n/locales/ru.json
@@ -20678,7 +20678,8 @@
       "bar": {
         "SortableTabContextMenu": {
           "switchToTerminalView": "Продолжить с агентом в терминале",
-          "switchToChatView": "Продолжить в чате",
+          "continueInChatView": "Продолжить в чате",
+          "switchToChatView": "Показать как чат",
           "showAsTerminal": "Показать как терминал",
           "allowAutoClose": "Разрешить автоматическое закрытие"
         },
diff --git a/src/renderer/src/i18n/locales/tr.json b/src/renderer/src/i18n/locales/tr.json
index 9b682cefef40..5960be1ac7cf 100644
--- a/src/renderer/src/i18n/locales/tr.json
+++ b/src/renderer/src/i18n/locales/tr.json
@@ -19994,7 +19994,8 @@
       "bar": {
         "SortableTabContextMenu": {
           "switchToTerminalView": "Terminal ajanıyla devam et",
-          "switchToChatView": "Sohbet arayüzünde devam et",
+          "continueInChatView": "Sohbet arayüzünde devam et",
+          "switchToChatView": "Sohbet olarak göster",
           "showAsTerminal": "Terminal olarak göster",
           "allowAutoClose": "Otomatik Kapatmaya İzin Ver"
         },
diff --git a/src/renderer/src/i18n/locales/zh-Hant.json b/src/renderer/src/i18n/locales/zh-Hant.json
index 02a74d1ef08c..57bae99a3517 100644
--- a/src/renderer/src/i18n/locales/zh-Hant.json
+++ b/src/renderer/src/i18n/locales/zh-Hant.json
@@ -19703,7 +19703,8 @@
       "bar": {
         "SortableTabContextMenu": {
           "switchToTerminalView": "使用終端機代理程式繼續",
-          "switchToChatView": "在聊天介面中繼續",
+          "continueInChatView": "在聊天介面中繼續",
+          "switchToChatView": "以聊天顯示",
           "showAsTerminal": "以終端機顯示",
           "allowAutoClose": "允許自動關閉"
         },
diff --git a/src/renderer/src/i18n/locales/zh.json b/src/renderer/src/i18n/locales/zh.json
index 0f5eed45ae98..e270f5852054 100644
--- a/src/renderer/src/i18n/locales/zh.json
+++ b/src/renderer/src/i18n/locales/zh.json
@@ -19264,6 +19264,7 @@
       "bar": {
         "SortableTabContextMenu": {
           "switchToTerminalView": "使用终端智能体继续",
+          "continueInChatView": "在聊天界面中继续",
           "switchToChatView": "以聊天显示",
           "showAsTerminal": "以终端显示",
           "allowAutoClose": "允许自动关闭"
diff --git a/src/renderer/src/lib/conversation-switch-feedback.ts b/src/renderer/src/lib/conversation-switch-feedback.ts
index 4b04e6a865ab..0483f19824b6 100644
--- a/src/renderer/src/lib/conversation-switch-feedback.ts
+++ b/src/renderer/src/lib/conversation-switch-feedback.ts
@@ -121,7 +121,7 @@ export function conversationSwitchSourceKept(agent: AiVaultAgent): string {
 export function conversationSwitchUnsupportedText(agent: AiVaultAgent): string {
   return translate(
     'components.tab.bar.switch.hostCannotSwitch',
-    'Orca on this host cannot switch {{agent}} in place. Update Orca there, or open a copy with Continue with Terminal Agent.',
+    "Orca on this host cannot switch {{agent}} in place. Update Orca there, or open a copy with Continue with Terminal Agent in this tab's menu.",
     { agent: agentLabel(agent) }
   )
 }

From dd36ce9a3806f6affb0ab84aa654975022832271 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 05:24:07 -0700
Subject: [PATCH 198/207] Restore main's daemon and local terminal behaviour
 the switch doesn't use

Leftovers of the abandoned two-stage switch changed behaviour no switch
path reaches: a daemon restart also disposed the old adapter's history
and listeners, a create mid-spawn during host shutdown was refused, a
Windows pane with a retired master stopped inspecting its children, the
local fallback shell chain stopped on cancel, and the startup command was
skipped for a replaced process. Each is back to main's behaviour.
---
 src/main/daemon/daemon-provider-restart.ts    |   1 -
 ...on-pty-adapter-history-checkpoints.test.ts |  14 +--
 ...ty-adapter-live-rebased-checkpoint.test.ts |  19 +--
 ...pty-adapter-protocol-compatibility.test.ts |  23 ++--
 src/main/daemon/daemon-pty-adapter.ts         |   4 +-
 .../daemon/daemon-pty-event-subscriptions.ts  |   6 -
 src/main/daemon/daemon-pty-runtime-state.ts   |  29 ++---
 ...on-server-async-spawn-cancellation.test.ts | 116 +++++++++++-------
 ...on-server-creation-failure.test-fixture.ts |  63 ----------
 ...emon-server-native-failure.test-fixture.ts |  73 -----------
 .../pty-subprocess/subprocess-handle.ts       |  27 ++--
 .../terminal-host-concurrent-create.test.ts   |   3 +-
 .../daemon/terminal-host-session-publish.ts   |   8 +-
 .../providers/local-pty-session-activation.ts |   7 +-
 .../local-pty-shell-ready-startup-command.ts  |   5 +-
 src/main/providers/local-pty-spawn.ts         |   1 -
 src/main/providers/local-pty-utils.ts         |  11 +-
 17 files changed, 135 insertions(+), 275 deletions(-)
 delete mode 100644 src/main/daemon/daemon-server-native-failure.test-fixture.ts

diff --git a/src/main/daemon/daemon-provider-restart.ts b/src/main/daemon/daemon-provider-restart.ts
index b1d1aa91d56e..f47ff331aabd 100644
--- a/src/main/daemon/daemon-provider-restart.ts
+++ b/src/main/daemon/daemon-provider-restart.ts
@@ -185,7 +185,6 @@ async function runRestartDaemon(
 
   // Dispose only old subscriptions after adoption; full disposal would kill shared legacy adapters.
   disposeProviderSubscriptionsOnly(currentAdapter)
-  currentOnly.dispose()
 
   replaceDaemonProvider(newProvider)
 
diff --git a/src/main/daemon/daemon-pty-adapter-history-checkpoints.test.ts b/src/main/daemon/daemon-pty-adapter-history-checkpoints.test.ts
index 87563f108016..670fb77b414c 100644
--- a/src/main/daemon/daemon-pty-adapter-history-checkpoints.test.ts
+++ b/src/main/daemon/daemon-pty-adapter-history-checkpoints.test.ts
@@ -183,9 +183,9 @@ describe('DaemonPtyAdapter (IPtyProvider)', () => {
       const checkpoint = vi.fn(async () => 'committed' as const)
       const appendIncrements = vi.fn(async () => 'ok' as const)
       const dispose = vi.fn(async () => {})
-      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: replace only the owned history fixture dependencies with their typed stubs.
+      const disconnect = vi.fn()
       const internals = historyAdapter as unknown as {
-        client: { request: typeof request; disconnect: () => void }
+        client: { request: typeof request; disconnect: typeof disconnect }
         historyManager: {
           checkpoint: typeof checkpoint
           appendIncrements: typeof appendIncrements
@@ -193,7 +193,7 @@ describe('DaemonPtyAdapter (IPtyProvider)', () => {
         }
         checkpointSessions(sessionIds: Iterable<string>): Promise<Set<string>>
       }
-      internals.client.request = request
+      internals.client = { request, disconnect }
       internals.historyManager = { checkpoint, appendIncrements, dispose }
 
       const checkpointing = internals.checkpointSessions(['a', 'b', 'c', 'd', 'e', 'f'])
@@ -248,7 +248,7 @@ describe('DaemonPtyAdapter (IPtyProvider)', () => {
         nonFinalCheckpointAdmissionSessionIds: Set<string>
         tryAdmitNonFinalCheckpoint(sessionId: string): boolean
       }
-      internals.client.request = request
+      internals.client = { request, disconnect: vi.fn() }
       internals.historyManager = {
         checkpoint: vi.fn(async () => 'committed' as const),
         appendIncrements,
@@ -334,7 +334,7 @@ describe('DaemonPtyAdapter (IPtyProvider)', () => {
         client: { request: typeof request; disconnect: ReturnType<typeof vi.fn> }
         checkpointSessions(sessionIds: Iterable<string>): Promise<Set<string>>
       }
-      internals.client.request = request
+      internals.client = { request, disconnect: vi.fn() }
       const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
 
       try {
@@ -367,7 +367,7 @@ describe('DaemonPtyAdapter (IPtyProvider)', () => {
         client: { request: typeof request; disconnect: ReturnType<typeof vi.fn> }
         checkpointSessions(sessionIds: Iterable<string>): Promise<Set<string>>
       }
-      internals.client.request = request
+      internals.client = { request, disconnect: vi.fn() }
       const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
 
       try {
@@ -431,7 +431,7 @@ describe('DaemonPtyAdapter (IPtyProvider)', () => {
           }
         })
         const internals = historyAdapter as unknown as CooldownInternals
-        internals.client.request = request
+        internals.client = { request, disconnect: vi.fn() }
         internals.historyManager = {
           checkpoint: vi.fn(async () => takeResult.checkpointResult ?? 'committed'),
           appendIncrements: vi.fn(async () => takeResult.appendResult ?? 'ok'),
diff --git a/src/main/daemon/daemon-pty-adapter-live-rebased-checkpoint.test.ts b/src/main/daemon/daemon-pty-adapter-live-rebased-checkpoint.test.ts
index c4de28ed9266..895b60222116 100644
--- a/src/main/daemon/daemon-pty-adapter-live-rebased-checkpoint.test.ts
+++ b/src/main/daemon/daemon-pty-adapter-live-rebased-checkpoint.test.ts
@@ -200,7 +200,7 @@ describe('DaemonPtyAdapter checkpoints rebased on live', () => {
       expect(await manager.checkpoint(sessionId, disk.getSnapshot())).toBe('committed')
       expect(live.writeSync(base + drained)).toBe(true)
       const liveSnapshot = { ...live.getSnapshot(), outputSequence: 99 }
-      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: stub only external RPC answers, keeping actual client and history lifetime.
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: a teardown checkpoint only calls client.request and the history manager/reader, all real or faked here.
       const internals = historyAdapter as unknown as {
         client: { request: ReturnType<typeof vi.fn>; disconnect: () => void }
         checkpointSessions(
@@ -208,13 +208,16 @@ describe('DaemonPtyAdapter checkpoints rebased on live', () => {
           opts?: { final?: boolean; teardown?: boolean }
         ): Promise<Set<string>>
       }
-      internals.client.request = vi.fn(async () => ({
-        records: [{ kind: 'output', data: marker }],
-        drainedRecords: [{ kind: 'output', data: drained }],
-        seq: 2,
-        overflowed: false,
-        snapshot: liveSnapshot
-      }))
+      internals.client = {
+        request: vi.fn(async () => ({
+          records: [{ kind: 'output', data: marker }],
+          drainedRecords: [{ kind: 'output', data: drained }],
+          seq: 2,
+          overflowed: false,
+          snapshot: liveSnapshot
+        })),
+        disconnect: () => {}
+      }
 
       const append = vi.spyOn(manager, 'appendIncrements')
 
diff --git a/src/main/daemon/daemon-pty-adapter-protocol-compatibility.test.ts b/src/main/daemon/daemon-pty-adapter-protocol-compatibility.test.ts
index 4595a65c572b..445fda53163c 100644
--- a/src/main/daemon/daemon-pty-adapter-protocol-compatibility.test.ts
+++ b/src/main/daemon/daemon-pty-adapter-protocol-compatibility.test.ts
@@ -472,12 +472,14 @@ describe('DaemonPtyAdapter (IPtyProvider)', () => {
 
     function createProbeAdapter(
       protocolVersion: number,
-      request: (...args: Parameters<DaemonClient['request']>) => Promise<unknown>
+      request: ReturnType<typeof vi.fn>
     ): DaemonPtyAdapter {
       const probeAdapter = new DaemonPtyAdapter({ socketPath, tokenPath, protocolVersion })
-      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: stub external RPC answers while keeping the actual client's transport lifetime.
-      const client = (probeAdapter as unknown as { client: DaemonClient }).client
-      vi.spyOn(client, 'request').mockImplementation(request)
+      ;(
+        probeAdapter as unknown as {
+          client: { request: ReturnType<typeof vi.fn>; disconnect: ReturnType<typeof vi.fn> }
+        }
+      ).client = { request, disconnect: vi.fn() }
       return probeAdapter
     }
 
@@ -679,18 +681,23 @@ describe('DaemonPtyAdapter (IPtyProvider)', () => {
   })
 
   describe('inspectProcess on pre-inspection daemon protocols', () => {
+    type ClientInternals = {
+      client: { request: ReturnType<typeof vi.fn>; disconnect: ReturnType<typeof vi.fn> }
+    }
+
     function createInspectionAdapter(
       protocolVersion: number,
-      request: (...args: Parameters<DaemonClient['request']>) => Promise<unknown>
+      request: ReturnType<typeof vi.fn>
     ): DaemonPtyAdapter {
       const inspectionAdapter = new DaemonPtyAdapter({
         socketPath,
         tokenPath,
         protocolVersion
       })
-      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: stub external RPC answers while keeping the actual client's transport lifetime.
-      const client = (inspectionAdapter as unknown as { client: DaemonClient }).client
-      vi.spyOn(client, 'request').mockImplementation(request)
+      ;(inspectionAdapter as unknown as ClientInternals).client = {
+        request,
+        disconnect: vi.fn()
+      }
       return inspectionAdapter
     }
 
diff --git a/src/main/daemon/daemon-pty-adapter.ts b/src/main/daemon/daemon-pty-adapter.ts
index 3268c94762ca..fabb1a33c18d 100644
--- a/src/main/daemon/daemon-pty-adapter.ts
+++ b/src/main/daemon/daemon-pty-adapter.ts
@@ -30,9 +30,7 @@ export class DaemonPtyAdapter extends DaemonPtyDaemonRecovery implements IPtyPro
   constructor(opts: DaemonPtyAdapterOptions) {
     super(opts)
     // Registered after the base listener, which marks the sessions awaiting recovery first.
-    this.disconnectedListenerCleanups.push(
-      this.client.onDisconnected(() => this.recoverAfterEndpointLoss())
-    )
+    this.client.onDisconnected(() => this.recoverAfterEndpointLoss())
   }
 
   supportsFencedTermination(_id: string): boolean {
diff --git a/src/main/daemon/daemon-pty-event-subscriptions.ts b/src/main/daemon/daemon-pty-event-subscriptions.ts
index 79e7f385ffd2..27563bacddf8 100644
--- a/src/main/daemon/daemon-pty-event-subscriptions.ts
+++ b/src/main/daemon/daemon-pty-event-subscriptions.ts
@@ -79,9 +79,6 @@ export abstract class DaemonPtyEventSubscriptions extends DaemonPtySessionInvent
         .dispose()
         .catch((err) => console.warn('[history] dispose failed:', err))
     }
-    for (const cleanup of this.disconnectedListenerCleanups.splice(0)) {
-      cleanup()
-    }
     this.client.disconnect()
   }
 
@@ -254,9 +251,6 @@ export abstract class DaemonPtyEventSubscriptions extends DaemonPtySessionInvent
         // Closing auth sockets still permits the daemon to retire itself once empty.
       }
     }
-    for (const cleanup of this.disconnectedListenerCleanups.splice(0)) {
-      cleanup()
-    }
     this.client.disconnect()
   }
 }
diff --git a/src/main/daemon/daemon-pty-runtime-state.ts b/src/main/daemon/daemon-pty-runtime-state.ts
index 028017ebd329..fe9c9681cba3 100644
--- a/src/main/daemon/daemon-pty-runtime-state.ts
+++ b/src/main/daemon/daemon-pty-runtime-state.ts
@@ -79,7 +79,6 @@ export abstract class DaemonPtyRuntimeState {
   protected exitListeners: ((payload: DaemonPtyRouterExitEvent) => void)[] = []
   protected backgroundStreamListeners: ((payload: PtyBackgroundStreamEvent) => void)[] = []
   protected writeUnavailableListeners: ((payload: { id: string }) => void)[] = []
-  protected readonly disconnectedListenerCleanups: (() => void)[] = []
   protected removeEventListener: (() => void) | null = null
   protected initialCwds = new Map<string, string>()
   protected wslDistrosBySessionId = new Map<string, string>()
@@ -220,22 +219,20 @@ export abstract class DaemonPtyRuntimeState {
     this.supportsAuthoritativeBufferSnapshots =
       this.protocolVersion >= SNAPSHOT_SERIALIZER_FIDELITY_DAEMON_PROTOCOL_VERSION
     this.supportsStartupIngress = supportsPtyStartupIngress(this.protocolVersion)
-    this.disconnectedListenerCleanups.push(
-      this.client.onDisconnected(() => {
-        this.ptyInventory.reset()
-        if (!this.respawnAdoptionClosed) {
-          this.writeRecoveryAttempted = false
-          for (const id of this.activeSessionIds) {
-            this.sessionsAwaitingDaemonRecovery.add(id)
-          }
+    this.client.onDisconnected(() => {
+      this.ptyInventory.reset()
+      if (!this.respawnAdoptionClosed) {
+        this.writeRecoveryAttempted = false
+        for (const id of this.activeSessionIds) {
+          this.sessionsAwaitingDaemonRecovery.add(id)
         }
-        for (const id of this.pausedProducerSessionIds) {
-          this.producerResumesOwedOnReconnect.add(id)
-        }
-        this.pausedProducerSessionIds.clear()
-        this.observeAuditFailure('transport_closed')
-      })
-    )
+      }
+      for (const id of this.pausedProducerSessionIds) {
+        this.producerResumesOwedOnReconnect.add(id)
+      }
+      this.pausedProducerSessionIds.clear()
+      this.observeAuditFailure('transport_closed')
+    })
   }
 
   supportsGitCredentialGuardHost(): boolean {
diff --git a/src/main/daemon/daemon-server-async-spawn-cancellation.test.ts b/src/main/daemon/daemon-server-async-spawn-cancellation.test.ts
index bef5cad77e87..3a5a1377ddd4 100644
--- a/src/main/daemon/daemon-server-async-spawn-cancellation.test.ts
+++ b/src/main/daemon/daemon-server-async-spawn-cancellation.test.ts
@@ -1,5 +1,4 @@
 import { registerDaemonCreationFailureTests } from './daemon-server-creation-failure.test-fixture'
-import type * as LocalPtyUtils from '../providers/local-pty-utils'
 import './mock-descendant-sweep'
 import { mkdtempSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
@@ -9,14 +8,6 @@ import { DaemonClient } from './client'
 import { createMockSubprocess } from './daemon-pty-adapter-test-harness'
 import { DaemonServer } from './daemon-server'
 import { getDaemonSocketPath } from './daemon-spawner'
-const nativePty = vi.hoisted(() => ({ spawn: vi.fn() }))
-vi.mock('node-pty', () => nativePty)
-
-vi.mock('../providers/local-pty-utils', async (importOriginal) => ({
-  ...(await importOriginal<typeof LocalPtyUtils>()),
-  ensureNodePtySpawnHelperExecutable: () => {},
-  getNodePtySpawnHelperCandidates: () => [process.execPath]
-}))
 type DaemonServerInternals = {
   preparations: {
     pending: Map<string, Set<{ canceled: boolean }>>
@@ -25,14 +16,13 @@ type DaemonServerInternals = {
 }
 
 describe('daemon async spawn cancellation', () => {
+  let spawned = 0
   let directory: string
   let server: DaemonServer
   let client: DaemonClient
   let releaseSpawn: () => void
   let spawnStarted: Promise<void>
   let subprocess: ReturnType<typeof createMockSubprocess>
-  let preparation: Promise<void>
-  let spawned: number
 
   beforeEach(async () => {
     spawned = 0
@@ -44,14 +34,11 @@ describe('daemon async spawn cancellation', () => {
     const spawnGate = new Promise<void>((resolve) => {
       releaseSpawn = resolve
     })
-    preparation = Promise.resolve()
-    spawned = 0
     server = new DaemonServer({
       socketPath: getDaemonSocketPath(directory),
       tokenPath: join(directory, 'daemon.token'),
-      preparePtySpawn: () => preparation,
       spawnSubprocess: async () => {
-        spawned += 1
+        spawned++
         subprocess = createMockSubprocess()
         markSpawnStarted()
         await spawnGate
@@ -74,6 +61,25 @@ describe('daemon async spawn cancellation', () => {
     rmSync(directory, { recursive: true, force: true })
   })
 
+  registerDaemonCreationFailureTests({
+    get server() {
+      return server
+    },
+    get client() {
+      return client
+    },
+    get subprocess() {
+      return subprocess
+    },
+    get spawnStarted() {
+      return spawnStarted
+    },
+    get spawned() {
+      return spawned
+    },
+    releaseSpawn: () => releaseSpawn()
+  })
+
   it.each(['cancelCreateOrAttach', 'kill'] as const)(
     'reaps a subprocess canceled by %s during async spawn',
     async (requestType) => {
@@ -152,6 +158,59 @@ describe('daemon async spawn cancellation', () => {
     await expect(client.request('listSessions', undefined)).resolves.toEqual({ sessions: [] })
   })
 
+  it('matches a cancel for an attach-only request queued behind a hung create', async () => {
+    const create = client.request('createOrAttach', {
+      sessionId: 'shared-session',
+      cols: 80,
+      rows: 24
+    })
+    await spawnStarted
+    const abort = new AbortController()
+    const attach = client.request(
+      'createOrAttach',
+      { sessionId: 'shared-session', cols: 80, rows: 24, attachOnly: true },
+      30_000,
+      abort.signal
+    )
+    const daemon = server as unknown as DaemonServerInternals
+    // Attach-only preparations must remain registered so cancellation can find them.
+    await vi.waitFor(() => expect(daemon.preparations.pending.get('shared-session')?.size).toBe(2))
+
+    abort.abort()
+    await expect(attach).rejects.toThrow('client_disconnected')
+
+    releaseSpawn()
+    await expect(create).resolves.toMatchObject({ isNew: true })
+  })
+
+  it('does not cancel a sibling request for the same session id', async () => {
+    const first = client.request('createOrAttach', {
+      sessionId: 'shared-session',
+      cols: 80,
+      rows: 24
+    })
+    const abort = new AbortController()
+    const second = client.request(
+      'createOrAttach',
+      { sessionId: 'shared-session', cols: 80, rows: 24 },
+      30_000,
+      abort.signal
+    )
+    await spawnStarted
+    const daemon = server as unknown as DaemonServerInternals
+    await vi.waitFor(() => expect(daemon.preparations.pending.get('shared-session')?.size).toBe(2))
+
+    abort.abort()
+    await expect(second).rejects.toThrow('client_disconnected')
+    releaseSpawn()
+
+    await expect(first).resolves.toMatchObject({ isNew: true })
+    expect(subprocess.forceKill).not.toHaveBeenCalled()
+    await expect(client.request('listSessions', undefined)).resolves.toMatchObject({
+      sessions: [expect.objectContaining({ sessionId: 'shared-session' })]
+    })
+  })
+
   it('reaps an async spawn before daemon shutdown completes', async () => {
     const create = client
       .request('createOrAttach', {
@@ -170,31 +229,4 @@ describe('daemon async spawn cancellation', () => {
     expect(subprocess.forceKill).toHaveBeenCalledOnce()
     expect(subprocess.dispose).toHaveBeenCalledOnce()
   })
-  registerDaemonCreationFailureTests({
-    nativePty,
-    get directory() {
-      return directory
-    },
-    get server() {
-      return server
-    },
-    set server(value) {
-      server = value
-    },
-    get client() {
-      return client
-    },
-    get subprocess() {
-      return subprocess
-    },
-    get releaseSpawn() {
-      return releaseSpawn
-    },
-    get spawnStarted() {
-      return spawnStarted
-    },
-    get spawned() {
-      return spawned
-    }
-  })
 })
diff --git a/src/main/daemon/daemon-server-creation-failure.test-fixture.ts b/src/main/daemon/daemon-server-creation-failure.test-fixture.ts
index 331a416ffffe..6433a5564a44 100644
--- a/src/main/daemon/daemon-server-creation-failure.test-fixture.ts
+++ b/src/main/daemon/daemon-server-creation-failure.test-fixture.ts
@@ -1,24 +1,17 @@
-import { registerDaemonNativeFailureTests } from './daemon-server-native-failure.test-fixture'
 import './mock-descendant-sweep'
 import { expect, it, vi } from 'vitest'
 import type { DaemonClient } from './client'
 import type { createMockSubprocess } from './daemon-pty-adapter-test-harness'
 import type { DaemonServer } from './daemon-server'
-type DaemonServerInternals = {
-  preparations: { pending: Map<string, Set<{ canceled: boolean }>> }
-}
 export type DaemonCreationFailureFixture = {
-  directory: string
   server: DaemonServer
   client: DaemonClient
   subprocess: ReturnType<typeof createMockSubprocess>
   releaseSpawn: () => void
   spawnStarted: Promise<void>
   spawned: number
-  nativePty: { spawn: ReturnType<typeof vi.fn> }
 }
 export function registerDaemonCreationFailureTests(fixture: DaemonCreationFailureFixture) {
-  registerDaemonNativeFailureTests(fixture)
   it.each([
     ['observer', 'retry'],
     ['constructor', 'retry'],
@@ -96,60 +89,4 @@ export function registerDaemonCreationFailureTests(fixture: DaemonCreationFailur
       expect(fixture.server.automaticWork.gate.snapshot().terminals).toBe(0)
     }
   )
-
-  it('matches a cancel for an attach-only request queued behind a hung create', async () => {
-    const create = fixture.client.request('createOrAttach', {
-      sessionId: 'shared-session',
-      cols: 80,
-      rows: 24
-    })
-    await fixture.spawnStarted
-    const abort = new AbortController()
-    const attach = fixture.client.request(
-      'createOrAttach',
-      { sessionId: 'shared-session', cols: 80, rows: 24, attachOnly: true },
-      30_000,
-      abort.signal
-    )
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: inspect only the fixture receiver pending cancellation registrations.
-    const daemon = fixture.server as unknown as {
-      preparations: { pending: Map<string, Set<{ canceled: boolean }>> }
-    }
-    // Attach-only preparations must remain registered so cancellation can find them.
-    await vi.waitFor(() => expect(daemon.preparations.pending.get('shared-session')?.size).toBe(2))
-
-    abort.abort()
-    await expect(attach).rejects.toThrow('client_disconnected')
-
-    fixture.releaseSpawn()
-    await expect(create).resolves.toMatchObject({ isNew: true })
-  })
-  it('does not cancel a sibling request for the same session id', async () => {
-    const first = fixture.client.request('createOrAttach', {
-      sessionId: 'shared-session',
-      cols: 80,
-      rows: 24
-    })
-    const abort = new AbortController()
-    const second = fixture.client.request(
-      'createOrAttach',
-      { sessionId: 'shared-session', cols: 80, rows: 24 },
-      30_000,
-      abort.signal
-    )
-    await fixture.spawnStarted
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: inspect only the fixture receiver pending map after its real spawn admission.
-    const daemon = fixture.server as unknown as DaemonServerInternals
-    await vi.waitFor(() => expect(daemon.preparations.pending.get('shared-session')?.size).toBe(2))
-
-    abort.abort()
-    await expect(second).rejects.toThrow('client_disconnected')
-    fixture.releaseSpawn()
-
-    await expect(first).resolves.toMatchObject({ isNew: true })
-    expect(fixture.subprocess.forceKill).not.toHaveBeenCalled()
-    await expect(fixture.client.request('listSessions', undefined)).resolves.toMatchObject({
-      sessions: [expect.objectContaining({ sessionId: 'shared-session' })]
-    })
-  })
 }
diff --git a/src/main/daemon/daemon-server-native-failure.test-fixture.ts b/src/main/daemon/daemon-server-native-failure.test-fixture.ts
deleted file mode 100644
index 6d39e8ecd91b..000000000000
--- a/src/main/daemon/daemon-server-native-failure.test-fixture.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import './mock-descendant-sweep'
-import { join } from 'node:path'
-import { expect, it, vi } from 'vitest'
-import { createPtySubprocess } from './pty-subprocess'
-import { mockPtyProcess } from './pty-subprocess-test-harness'
-import { DaemonServer } from './daemon-server'
-import { getDaemonSocketPath } from './daemon-spawner'
-import type { DaemonCreationFailureFixture } from './daemon-server-creation-failure.test-fixture'
-export function registerDaemonNativeFailureTests(fixture: DaemonCreationFailureFixture) {
-  it('ordinary authenticated native throw releases its exact logical claim/cap before same-ID retry and delivery', async () => {
-    fixture.client.disconnect()
-    await fixture.server.shutdown()
-    fixture.server = new DaemonServer({
-      socketPath: getDaemonSocketPath(fixture.directory),
-      tokenPath: join(fixture.directory, 'daemon.token'),
-      spawnSubprocess: createPtySubprocess,
-      preparePtySpawn: async () => {},
-      ptySpawnHealthCheck: async () => {}
-    })
-    await fixture.server.start()
-    await fixture.client.ensureConnected()
-    const native = mockPtyProcess(999_999_999)
-    fixture.nativePty.spawn
-      .mockReset()
-      .mockImplementationOnce(() => {
-        throw new Error('exact native no-export failure')
-      })
-      .mockReturnValue(native)
-    const payload = {
-      sessionId: 'failed-native-ordinary',
-      cols: 80,
-      rows: 24,
-      cwd: fixture.directory,
-      agentSessionEnsure: {
-        claim: {
-          digestVersion: 1 as const,
-          keyId: 'key',
-          identityDigest: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
-          worktreeScopeDigest: 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
-          agent: 'codex' as const
-        },
-        surface: {
-          worktreeId: 'worktree',
-          tabId: 'tab',
-          leafId: '11111111-1111-4111-8111-111111111111',
-          terminalHandle: 'term_native'
-        }
-      }
-    }
-    try {
-      await expect(fixture.client.request('createOrAttach', payload)).rejects.toThrow(
-        'exact native no-export failure'
-      )
-      await vi.waitFor(() => expect(fixture.server.automaticWork.gate.snapshot().terminals).toBe(0))
-      expect(fixture.server.host.listSessions()).toEqual([])
-      expect(await fixture.client.request('createOrAttach', payload)).toMatchObject({
-        isNew: true
-      })
-      expect(fixture.nativePty.spawn).toHaveBeenCalledTimes(2)
-      expect(fixture.server.automaticWork.gate.snapshot().terminals).toBe(1)
-      await fixture.client.request('write', {
-        sessionId: payload.sessionId,
-        data: 'new ordinary input'
-      })
-      expect(native.write).toHaveBeenCalledWith('new ordinary input')
-    } finally {
-      // External native exit reaches the actual owner; never signal a fixture PID.
-      native._simulateExit(0)
-      await fixture.server.host.dispose()
-    }
-    expect(fixture.server.automaticWork.gate.snapshot().terminals).toBe(0)
-  })
-}
diff --git a/src/main/daemon/pty-subprocess/subprocess-handle.ts b/src/main/daemon/pty-subprocess/subprocess-handle.ts
index d1f3f6336b03..0e6050f516e9 100644
--- a/src/main/daemon/pty-subprocess/subprocess-handle.ts
+++ b/src/main/daemon/pty-subprocess/subprocess-handle.ts
@@ -11,12 +11,7 @@ import type { SubprocessHandle } from '../session-subprocess-handle'
 import { createPtyForegroundProcessTracker } from './foreground-process-tracker'
 import { PtyPreListenerEvents } from './pre-listener-events'
 import { ptyProcessNameIsSpawnFile } from './spawn-file-foreground-process'
-import {
-  inspectSpawnFileWindowsChildProcesses,
-  inspectSpawnFileChildProcessesFromRows
-} from './spawn-file-child-processes'
-import { getStrictProcessTableSnapshotWithAge } from '../../../shared/process-table-snapshot-reader'
-import { getSpawnedShellName } from '../../providers/local-pty-launch-helpers'
+import { inspectSpawnFileWindowsChildProcesses } from './spawn-file-child-processes'
 import type { ConptyStartupEvents } from './conpty-startup-input-reader'
 
 export { createDaemonPtyPhysicalOwner } from './daemon-pty-physical-owner'
@@ -137,20 +132,12 @@ export function createDaemonPtySubprocessHandle(args: {
     processNameIsSpawnFile: ptyProcessNameIsSpawnFile(proc),
     // Only the login(1) wrapper hides the shell's exit status, and it forks the shell as its child.
     shellIsRootChild: !reportsChildExitStatus,
-    inspectChildProcesses: async (fresh?: boolean, ignoreDetached?: boolean) => {
-      if (dead || masterRetired) {
-        return 'unverifiable'
-      }
-      const verdict =
-        process.platform === 'win32'
-          ? await inspectSpawnFileWindowsChildProcesses(proc, shellPath, fresh, ignoreDetached)
-          : inspectSpawnFileChildProcessesFromRows(
-              (await getStrictProcessTableSnapshotWithAge()).rows,
-              proc.pid,
-              getSpawnedShellName(shellPath)
-            )
-      return dead || masterRetired ? 'unverifiable' : verdict
-    },
+    ...(process.platform === 'win32'
+      ? {
+          inspectChildProcesses: (fresh?: boolean, ignoreDetached?: boolean) =>
+            inspectSpawnFileWindowsChildProcesses(proc, shellPath, fresh, ignoreDetached)
+        }
+      : {}),
     shellPath: args.shellPath,
     shellCwd: args.spawnCwd,
     shellPathEnv: args.env.PATH,
diff --git a/src/main/daemon/terminal-host-concurrent-create.test.ts b/src/main/daemon/terminal-host-concurrent-create.test.ts
index 9f631b20a7b6..1cf8ca1537cc 100644
--- a/src/main/daemon/terminal-host-concurrent-create.test.ts
+++ b/src/main/daemon/terminal-host-concurrent-create.test.ts
@@ -178,7 +178,6 @@ describe('concurrent createOrAttach across the async spawn', () => {
     })
 
     const creation = host.createOrAttach(createOptions('shutdown-race'))
-    const canceled = expect(creation).rejects.toThrow('Attach canceled')
     const disposal = host.dispose()
     let disposed = false
     void disposal.then(() => {
@@ -189,7 +188,7 @@ describe('concurrent createOrAttach across the async spawn', () => {
     expect(disposed).toBe(false)
 
     releaseSpawn()
-    await canceled
+    await creation
     await disposal
 
     expect(subprocess.forceKill).toHaveBeenCalledOnce()
diff --git a/src/main/daemon/terminal-host-session-publish.ts b/src/main/daemon/terminal-host-session-publish.ts
index 688c48f47f21..43c63477943a 100644
--- a/src/main/daemon/terminal-host-session-publish.ts
+++ b/src/main/daemon/terminal-host-session-publish.ts
@@ -146,13 +146,7 @@ export async function spawnAndPublishSession(
     throw error
   }
 
-  let revoked = false
-  try {
-    deps.assertCreateAllowed()
-  } catch {
-    revoked = true
-  }
-  if (revoked) {
+  if (opts.isCanceled?.()) {
     // Retain cleanup ownership if the native child refuses to exit.
     deps.sessions.set(opts.sessionId, session)
     // Retain the live-cap charge until physical exit.
diff --git a/src/main/providers/local-pty-session-activation.ts b/src/main/providers/local-pty-session-activation.ts
index eee953c001cc..eb7117fe02d3 100644
--- a/src/main/providers/local-pty-session-activation.ts
+++ b/src/main/providers/local-pty-session-activation.ts
@@ -116,9 +116,7 @@ export function activateLocalPtySession(args: {
   const startupIngress = new PtyStartupIngress({
     ...(spawn.startupIngress ? { intent: spawn.startupIngress } : {}),
     ownerBackend,
-    write: (data) => {
-      proc.write(data)
-    },
+    write: (data) => proc.write(data),
     onEmission: emitIngressData
   })
   startupIngressByPty.set(id, startupIngress)
@@ -222,8 +220,7 @@ export function activateLocalPtySession(args: {
         readiness.setStartupCommandCleanup(cleanup)
       },
       {
-        bracketedPasteSafe,
-        beforeWrite: () => ptyProcesses.get(id) === proc
+        bracketedPasteSafe
       }
     )
   }
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 2a0b3e7a9698..dc9e3ff4ac0c 100644
--- a/src/main/providers/local-pty-shell-ready-startup-command.ts
+++ b/src/main/providers/local-pty-shell-ready-startup-command.ts
@@ -15,7 +15,7 @@ export function writeStartupCommandWhenShellReady(
   startupCommand: string,
   onExit: (cleanup: () => void) => void,
   // Only shells with active bracketed paste accept its escape wrapper without echoing it.
-  options: { bracketedPasteSafe?: boolean; beforeWrite?: () => boolean } = {}
+  options: { bracketedPasteSafe?: boolean } = {}
 ): void {
   let sent = false
   let postReadyTimer: ReturnType<typeof setTimeout> | null = null
@@ -42,9 +42,6 @@ export function writeStartupCommandWhenShellReady(
       clearTimeout(postReadyTimer)
       postReadyTimer = null
     }
-    if (options.beforeWrite?.() === false) {
-      return
-    }
     // Keep the interactive shell alive after agent exit; write once past readiness to avoid incremental-paste drops.
     proc.write(
       buildStartupCommandSubmission(startupCommand, {
diff --git a/src/main/providers/local-pty-spawn.ts b/src/main/providers/local-pty-spawn.ts
index 55136a4248a0..1b45cab8e0f3 100644
--- a/src/main/providers/local-pty-spawn.ts
+++ b/src/main/providers/local-pty-spawn.ts
@@ -110,7 +110,6 @@ export async function spawnLocalPty(
         return concurrentWinner
       }
       const pendingSpawn = spawn({
-        assertCreateAllowed: checkCanceled,
         shellPath: plan.shellPath,
         shellArgs: plan.shellArgs,
         cols: args.cols,
diff --git a/src/main/providers/local-pty-utils.ts b/src/main/providers/local-pty-utils.ts
index 708359fe8910..83ddd0677cda 100644
--- a/src/main/providers/local-pty-utils.ts
+++ b/src/main/providers/local-pty-utils.ts
@@ -119,7 +119,6 @@ export type ShellSpawnParams = {
   cwd: string
   env: Record<string, string>
   ptySpawn: typeof pty.spawn
-  assertCreateAllowed?: () => void
   getShellReadyConfig?: (
     shell: string
   ) => { args: string[] | null; env: Record<string, string> } | null
@@ -155,7 +154,6 @@ function spawnWindowsFallbackChain(
   // Skip the first entry: it is the primary that already failed above.
   for (const attempt of attempts.slice(1)) {
     try {
-      params.assertCreateAllowed?.()
       const proc = ptySpawn(attempt.shellPath, attempt.shellArgs, {
         name: termName,
         cols,
@@ -173,7 +171,6 @@ function spawnWindowsFallbackChain(
         startupCommandDeliveredInShellArgs: attempt.startupCommandDeliveredInShellArgs
       }
     } catch {
-      params.assertCreateAllowed?.()
       // This fallback shell also failed -- try the next link in the chain.
     }
   }
@@ -182,13 +179,12 @@ function spawnWindowsFallbackChain(
 
 export type PtyExecutableSpawnParams = Pick<
   ShellSpawnParams,
-  'termName' | 'cols' | 'rows' | 'cwd' | 'env' | 'ptySpawn' | 'assertCreateAllowed'
+  'termName' | 'cols' | 'rows' | 'cwd' | 'env' | 'ptySpawn'
 > & { file: string; args: string[] }
 
 /** One executable with an argv array, no shell and no fallback; throws when it can't start. */
 export function spawnPtyExecutable(params: PtyExecutableSpawnParams): pty.IPty {
   const { file, args, termName = 'xterm-256color', cols, rows, cwd, env, ptySpawn } = params
-  params.assertCreateAllowed?.()
   return ptySpawn(file, args, {
     name: termName,
     cols,
@@ -230,8 +226,7 @@ export function spawnShellWithFallback(params: ShellSpawnParams): ShellSpawnResu
           rows,
           cwd,
           env,
-          ptySpawn,
-          assertCreateAllowed: params.assertCreateAllowed
+          ptySpawn
         }),
         shellPath,
         reportsChildExitStatus: hostReportsChildExitStatus(wrapped.file)
@@ -275,7 +270,6 @@ export function spawnShellWithFallback(params: ShellSpawnParams): ShellSpawnResu
           fallbackReady?.args ?? ['-l'],
           env
         )
-        params.assertCreateAllowed?.()
         const proc = ptySpawn(wrapped.file, wrapped.args, {
           name: termName,
           cols,
@@ -292,7 +286,6 @@ export function spawnShellWithFallback(params: ShellSpawnParams): ShellSpawnResu
           reportsChildExitStatus: hostReportsChildExitStatus(wrapped.file)
         }
       } catch {
-        params.assertCreateAllowed?.()
         // Fallback also failed -- try next.
       }
     }

From f6661b3151e95c65a71e5f209d615b7ff6f9d6fe Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 05:26:29 -0700
Subject: [PATCH 199/207] Close a switched chat's replaced tab through one
 index, only while it shows

Main stamps the replaced slot on every frame for the chat's life, and the
window looked the replaced tab up per chat on every accepted frame. Now
one index of the workspace's terminal tabs decides, and only a replaced
tab still shown reaches the close.
---
 ...ured-session-replaced-slot-scaling.test.ts | 106 ++++++++++++++++++
 .../snapshot-apply.ts                         |  13 ++-
 2 files changed, 118 insertions(+), 1 deletion(-)
 create mode 100644 src/renderer/src/runtime/local-structured-session-replaced-slot-scaling.test.ts

diff --git a/src/renderer/src/runtime/local-structured-session-replaced-slot-scaling.test.ts b/src/renderer/src/runtime/local-structured-session-replaced-slot-scaling.test.ts
new file mode 100644
index 000000000000..b186a31da42b
--- /dev/null
+++ b/src/renderer/src/runtime/local-structured-session-replaced-slot-scaling.test.ts
@@ -0,0 +1,106 @@
+// @vitest-environment happy-dom
+
+// Main stamps a switched chat's slot on every frame for the chat's life. The window's apply must
+// hand only replaced tabs still shown to the close, so each frame stays linear in the workspace.
+
+import { afterEach, expect, it } from 'vitest'
+import type { RuntimeMobileSessionTabsResult } from '../../../shared/runtime-types'
+import type { WorktreeRuntimeOwnerState } from '../lib/worktree-runtime-owner-state'
+import { applyLocalStructuredSessionTabSnapshots } from './local-structured-session-tabs-sync/snapshot-apply'
+import { resetLocalStructuredSessionVersionForTests } from './local-structured-session-tabs-sync/inventory-generation-fence'
+import type { WebSessionTabsSyncState } from './web-session-tabs-sync/state'
+import { resetWebSessionTabsSnapshotFreshnessForTests } from './web-session-tabs-sync/tracking-lifecycle'
+
+const WORKTREE = 'repo-1::/tmp/wt-scaling'
+type SyncState = WebSessionTabsSyncState & WorktreeRuntimeOwnerState
+type Row = RuntimeMobileSessionTabsResult['tabs'][number]
+
+afterEach(() => {
+  resetLocalStructuredSessionVersionForTests()
+  resetWebSessionTabsSnapshotFreshnessForTests()
+})
+
+function stateWithTerminals(count: number): SyncState {
+  const terminals = Array.from({ length: count }, (_, index) => ({
+    id: `terminal-${index}`,
+    entityId: `terminal-${index}`,
+    groupId: 'group-1',
+    worktreeId: WORKTREE,
+    contentType: 'terminal',
+    label: `Terminal ${index}`,
+    customLabel: null,
+    color: null,
+    sortOrder: index,
+    createdAt: 0
+  }))
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the apply reads only these slices of the store for a local workspace.
+  return {
+    activeBrowserTabId: null,
+    activeBrowserTabIdByWorktree: {},
+    activeFileId: null,
+    activeFileIdByWorktree: {},
+    activeGroupIdByWorktree: {},
+    activeTabId: null,
+    activeTabIdByWorktree: {},
+    activeTabType: 'terminal',
+    activeTabTypeByWorktree: {},
+    activeWorktreeId: WORKTREE,
+    agentStatusByPaneKey: {},
+    agentStatusEpoch: 0,
+    browserCertificateFailuresByPageId: {},
+    browserPagesByWorkspace: {},
+    browserTabsByWorktree: {},
+    groupsByWorktree: {},
+    layoutByWorktree: {},
+    openFiles: [],
+    ptyIdsByTabId: {},
+    remoteBrowserPageHandlesByPageId: {},
+    tabBarOrderByWorktree: {},
+    tabsByWorktree: {},
+    terminalLayoutsByTabId: {},
+    unifiedTabsByWorktree: { [WORKTREE]: terminals },
+    unreadTerminalTabs: {},
+    sortEpoch: 0,
+    worktreesByRepo: { 'repo-1': [{ id: WORKTREE, path: '/tmp/wt-scaling' }] }
+  } as unknown as SyncState
+}
+
+function frameWithSwitchedChats(
+  chats: number,
+  shownTerminal: string
+): RuntimeMobileSessionTabsResult {
+  const rows: Row[] = Array.from({ length: chats }, (_, index) => ({
+    type: 'agent-session',
+    id: `agent-session:chat-${index}`,
+    title: 'Codex',
+    sessionId: `chat-${index}`,
+    agent: 'codex',
+    isActive: false,
+    // Every chat but the first replaced a terminal this window already closed.
+    replaces: { tabId: index === 0 ? shownTerminal : `closed-${index}` }
+  }))
+  return {
+    worktree: WORKTREE,
+    publicationEpoch: 'renderer:scaling',
+    snapshotVersion: 1,
+    activeGroupId: null,
+    activeTabId: null,
+    activeTabType: null,
+    tabs: rows
+  }
+}
+
+it.each([50, 500])(
+  'hands only a still-shown replaced tab to the close, with %i tabs and a tenth of them switched chats',
+  (tabs) => {
+    const closes: string[] = []
+    applyLocalStructuredSessionTabSnapshots(
+      stateWithTerminals(tabs),
+      [frameWithSwitchedChats(tabs / 10, 'terminal-3')],
+      undefined,
+      0,
+      { onReplacedTab: ({ tabId }) => closes.push(tabId) }
+    )
+    expect(closes).toEqual(['terminal-3'])
+  }
+)
diff --git a/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts b/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts
index 39cb61488e88..ab53dc6ae2a7 100644
--- a/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts
+++ b/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts
@@ -203,8 +203,19 @@ export function applyLocalStructuredSessionTabSnapshots<
       }
     } else {
       next = patch === next ? next : ({ ...next, ...patch } as State)
+      // Main stamps the slot on every frame for the chat's life; only a replaced tab still shown
+      // has anything to close, found through one index rather than a scan per chat.
+      let shownTerminals: Set<string> | undefined
       for (const tab of effectiveSnapshot.tabs) {
-        if (tab.type === 'agent-session' && tab.replaces) {
+        if (tab.type !== 'agent-session' || !tab.replaces) {
+          continue
+        }
+        shownTerminals ??= new Set(
+          (next.unifiedTabsByWorktree[snapshot.worktree] ?? []).flatMap((shown) =>
+            shown.contentType === 'terminal' ? [shown.id, shown.entityId] : []
+          )
+        )
+        if (shownTerminals.has(tab.replaces.tabId)) {
           options.onReplacedTab?.({
             worktreeId: snapshot.worktree,
             tabId: tab.replaces.tabId,

From 8cdfe990747e8522d3ad9347710e2644cb625875 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 05:32:29 -0700
Subject: [PATCH 200/207] Skip the shared transcript import for a Codex switch

For Codex the resting importer is the one reader and writer of the
transcript; the shared import after it parsed the whole rollout again
and wrote nothing, a full parse per switch that its deadline can't stop.
---
 .../structured-agent-session-switch-source.ts | 51 ++++++++++---------
 ...red-agent-session-switch-open-turn.test.ts | 14 ++++-
 2 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts
index 4730d86e0cde..26665d5a563b 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts
@@ -253,31 +253,32 @@ export function structuredAgentSessionSwitchSource(context: SwitchSourceContext)
     ) => {
       const session = await context.lifetime.conversation(sessionId)
       const transcript = { ...source, agent: source.agent ?? session.params.agent }
-      if (transcript.agent === 'codex') {
-        await catchUpStructuredSessionAtRest({
-          journal: session.journal,
-          threadId: source.sessionId,
-          filePath: source.filePath,
-          fence: context.deps.store.getRecord(sessionId)?.lease.runtimeFence ?? 0,
-          deadline,
-          stoppedTurnId: stopped?.turnId,
-          stoppedUserItemKey: stopped?.userItemKey,
-          settleAbandoned,
-          check
-        })
-      }
-      await catchUpSwitchedCliTranscript({
-        journal: session.journal,
-        source: transcript,
-        resumeCursor: agentSessionProviderHandleChainHead(
-          context.deps.store.getRecord(sessionId)?.providerHandleChain ?? []
-        )?.handle.resumeCursor,
-        fence: context.deps.store.getRecord(sessionId)?.lease.runtimeFence ?? 0,
-        deadline,
-        stopped,
-        settleAbandoned,
-        check
-      })
+      // Codex's turns and rows have one writer, the resting importer; the shared import would only
+      // parse the whole transcript again and write nothing.
+      await (transcript.agent === 'codex'
+        ? catchUpStructuredSessionAtRest({
+            journal: session.journal,
+            threadId: source.sessionId,
+            filePath: source.filePath,
+            fence: context.deps.store.getRecord(sessionId)?.lease.runtimeFence ?? 0,
+            deadline,
+            stoppedTurnId: stopped?.turnId,
+            stoppedUserItemKey: stopped?.userItemKey,
+            settleAbandoned,
+            check
+          })
+        : catchUpSwitchedCliTranscript({
+            journal: session.journal,
+            source: transcript,
+            resumeCursor: agentSessionProviderHandleChainHead(
+              context.deps.store.getRecord(sessionId)?.providerHandleChain ?? []
+            )?.handle.resumeCursor,
+            fence: context.deps.store.getRecord(sessionId)?.lease.runtimeFence ?? 0,
+            deadline,
+            stopped,
+            settleAbandoned,
+            check
+          }))
       context.subscribers.publish(sessionId, session.journal)
     }
   }
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-open-turn.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-open-turn.test.ts
index 80a2f40f5a88..7873b74813d0 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-open-turn.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-open-turn.test.ts
@@ -22,6 +22,12 @@ import {
   PTY_A
 } from '../../main-owned-workspace-runtime-fixture'
 import { executeStructuredSessionSwitch } from './structured-agent-session-switch-execution'
+import * as legacyImport from '../../../native-chat/agent-session-journal/journal-legacy-import'
+
+vi.mock('../../../native-chat/agent-session-journal/journal-legacy-import', async (load) => {
+  const actual = await load<typeof legacyImport>()
+  return { ...actual, prepareLegacyTranscriptImport: vi.fn(actual.prepareLegacyTranscriptImport) }
+})
 
 // A terminal whose CLI turn never recorded its end (killed, crashed, or stopped before the write):
 // once the census proves no CLI writer is left and the chat's own owner is at rest, the chat
@@ -123,11 +129,15 @@ it('settles a CLI turn left open once no writer is left, after the census', asyn
     .spyOn(runtime, 'assertStructuredAdoptionTerminalWritersExited')
     .mockImplementation(async () => void order.push('census'))
   const refresh = rig.host.refreshSwitchTranscript
+  let legacyParses = 0
   const refreshed = vi
     .spyOn(rig.host, 'refreshSwitchTranscript')
     .mockImplementation(async (...args) => {
       order.push('import')
-      return refresh(...args)
+      const before = vi.mocked(legacyImport.prepareLegacyTranscriptImport).mock.calls.length
+      await refresh(...args)
+      legacyParses +=
+        vi.mocked(legacyImport.prepareLegacyTranscriptImport).mock.calls.length - before
     })
   const answer = await executeStructuredSessionSwitch(
     {
@@ -149,6 +159,8 @@ it('settles a CLI turn left open once no writer is left, after the census', asyn
   expect(written).not.toHaveBeenCalled()
   expect(census).toHaveBeenCalledWith('codex', expect.any(String), expect.anything())
   expect(refreshed.mock.calls[0]?.[5]).toBe(true)
+  // Codex's resting importer is its one reader: no second, unused parse of the whole transcript.
+  expect(legacyParses).toBe(0)
   const { journal } = await rig.host.collaboratorsForTests().lifetime.conversation(id)
   const turns = journal
     .snapshot()

From 0d60aa577eb78ca7384968339a46f03e2c23124a Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 05:34:15 -0700
Subject: [PATCH 201/207] Pin the switch hooks' cost on unrelated status and
 switch changes

Every History row, chat header, pane button and menu mounts the in-place
capability and pending hooks. At 20 and 200 consumers, an unrelated store
write reads nothing, another host's status or conversation's switch
re-reads each consumer a fixed number of times, and none re-renders.
---
 .../in-place-switch-hooks-scaling.test.tsx    | 99 +++++++++++++++++++
 1 file changed, 99 insertions(+)
 create mode 100644 src/renderer/src/lib/in-place-switch-hooks-scaling.test.tsx

diff --git a/src/renderer/src/lib/in-place-switch-hooks-scaling.test.tsx b/src/renderer/src/lib/in-place-switch-hooks-scaling.test.tsx
new file mode 100644
index 000000000000..4f575ff20482
--- /dev/null
+++ b/src/renderer/src/lib/in-place-switch-hooks-scaling.test.tsx
@@ -0,0 +1,99 @@
+// @vitest-environment happy-dom
+import { act, cleanup, renderHook } from '@testing-library/react'
+import { afterEach, expect, it, vi } from 'vitest'
+import type * as HostOwner from '@/runtime/structured-agent-session-owner'
+import { useAppStore } from '@/store'
+
+// Every History row, chat header, pane button and menu mounts these hooks. A status or switch
+// change elsewhere may re-read each one once, never re-render a consumer whose answer is unchanged.
+
+const lookups = vi.hoisted(() => ({ count: 0 }))
+vi.mock('@/runtime/structured-agent-session-owner', async (load) => {
+  const actual = await load<typeof HostOwner>()
+  return {
+    ...actual,
+    structuredAgentSessionTargetForHost: (
+      ...args: Parameters<typeof actual.structuredAgentSessionTargetForHost>
+    ) => {
+      lookups.count += 1
+      return actual.structuredAgentSessionTargetForHost(...args)
+    }
+  }
+})
+vi.mock('@/runtime/local-runtime-capabilities', () => ({
+  ensureLocalRuntimeCapabilities: async () => [],
+  readLocalRuntimeCapabilitiesOrUnknown: () => [],
+  subscribeLocalRuntimeCapabilityObservation: () => () => {}
+}))
+
+const { useInPlaceSwitchCapability } = await import('./in-place-switch-support')
+const { useConversationSwitchPending } = await import('./conversation-switch-state')
+const { conversationSwitchChanged, pendingNativeChatCliSwitches } =
+  await import('./pending-conversation-surface-switches')
+
+afterEach(() => {
+  cleanup()
+  pendingNativeChatCliSwitches.clear()
+})
+
+function environment(id: string) {
+  return {
+    id,
+    name: id,
+    createdAt: 1,
+    updatedAt: 1,
+    pairingRevision: 1,
+    lastUsedAt: null,
+    runtimeId: null,
+    endpoints: [],
+    preferredEndpointId: id
+  }
+}
+
+function work(consumers: number): { reads: number; renders: number } {
+  useAppStore.getState().setRuntimeEnvironments([environment('host-a')])
+  let renders = 0
+  for (let index = 0; index < consumers; index++) {
+    renderHook(() => {
+      renders += 1
+      return [
+        useInPlaceSwitchCapability('runtime:host-a', 'codex'),
+        useConversationSwitchPending({
+          direction: 'chat',
+          executionHostId: 'runtime:host-a',
+          workspaceId: 'wt-1',
+          agent: 'codex',
+          sessionId: `chat-${index}`
+        })
+      ]
+    })
+  }
+  renders = 0
+  lookups.count = 0
+  act(() => {
+    // Unrelated to the hooks: no subscriber runs.
+    useAppStore.setState({ agentStatusEpoch: useAppStore.getState().agentStatusEpoch + 1 })
+    // Another host's status and another conversation's switch: each consumer re-reads, none renders.
+    useAppStore.getState().setRuntimeEnvironments([environment('host-a'), environment('host-b')])
+    useAppStore.getState().setRuntimeEnvironments([environment('host-a')])
+    pendingNativeChatCliSwitches.set('runtime:host-b\0other-chat', {
+      chatTabId: null,
+      workspaceId: 'wt-2',
+      executionHostId: 'runtime:host-b'
+    })
+    conversationSwitchChanged()
+  })
+  cleanup()
+  return { reads: lookups.count, renders }
+}
+
+it('re-reads each mounted switch consumer a fixed number of times and renders none', () => {
+  const small = work(20)
+  const large = work(200)
+  expect(small.reads).toBeGreaterThan(0)
+  expect(small.renders).toBe(0)
+  expect(large.renders).toBe(0)
+  // Two status changes, two reads each at most (the hook and React's tearing check).
+  expect(small.reads).toBeLessThanOrEqual(20 * 4)
+  expect(large.reads).toBeLessThanOrEqual(10 * small.reads)
+})

From 850d29b10efd21be1b5b9798107ced51166bfd8f Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 05:38:28 -0700
Subject: [PATCH 202/207] Withdraw a chat switch's slot anchor when its
 publication fails

The terminal-to-chat switch recorded where the chat goes before
publishing it and kept the anchor if publishing threw, so for up to 90
seconds another open of that chat could be stamped into the stopped
pane's slot. A failed write now withdraws the anchor it added, as the
chat-to-terminal direction already did.
---
 ...red-agent-session-switch-execution.test.ts | 21 +++++++++++
 ...ructured-agent-session-switch-execution.ts | 36 +++++++++----------
 .../session-tabs/switch-slot-anchors.ts       | 24 +++++++++++++
 3 files changed, 63 insertions(+), 18 deletions(-)

diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
index f8fc91672f1e..243be75e9708 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
@@ -360,6 +360,27 @@ it('keeps the stopped source when destination publication fails before retiremen
   )
   expect(runtime.getPtyLivenessVerdict(PTY_A)).toMatchObject({ status: 'exited' })
   expect(publish).toHaveBeenCalledOnce()
+  // The slot anchor is withdrawn: a later open of the chat is not stamped into the stopped tab.
+  const later = runtime.switchSlotAnchors.stamp({
+    worktree: WORKTREE_ID,
+    publicationEpoch: 'later',
+    snapshotVersion: 1,
+    activeGroupId: null,
+    activeTabId: null,
+    activeTabType: null,
+    tabs: [
+      {
+        type: 'agent-session',
+        id: `agent-session:${id}`,
+        title: 'Codex',
+        sessionId: id,
+        agent: 'codex',
+        isActive: false
+      }
+    ]
+  })
+  expect(later.tabs[0]).not.toHaveProperty('replaces')
+  expect(later.tabs[0]).not.toHaveProperty('after')
   expect(session().tabsByWorktree[WORKTREE_ID]).toEqual(originalSourceTabs)
   expect(session().terminalLayoutsByTabId[TAB_ID]).toEqual(originalSourceLayout)
   expect(rig.adapter.acquire).toHaveBeenCalledTimes(acquisitions)
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
index 9d733c186008..be52bf16bb23 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
@@ -37,6 +37,7 @@ import { captureSwitchStoppedCliTurn } from '../../../native-chat/agent-session-
 import { worktreeIdsEqual } from '../../../../shared/worktree/id'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
 import { isAiVaultAgent } from '../../../../shared/ai-vault-types'
+import { slotAnchor } from '../../session-tabs/switch-slot-anchors'
 
 type Prepared = Awaited<ReturnType<typeof prepareStructuredSessionSwitch>>
 
@@ -283,24 +284,23 @@ async function switchToChat(
   const sameWorkspace =
     close !== undefined && worktreeIdsEqual(close.source.worktreeId, record.location.workspaceId)
   const replaces = sameWorkspace && close.wholeTab() ? close.source.tabId : undefined
-  if (sameWorkspace) {
-    ctx.runtime.switchSlotAnchors.record(
-      record.location.workspaceId,
-      `agent-session:${sessionId}`,
-      replaces ? { replaces: { tabId: replaces } } : { after: { tabId: close.source.tabId } }
-    )
-  }
-  await ctx.runtime.publishStructuredAgentSessionTab({
-    ...revealed,
-    activate: true,
-    check,
-    focusWindow: agentLaunchMovesHostWindow(ctx),
-    ...(replaces
-      ? { replaces }
-      : sameWorkspace
-        ? { placement: close.placement(), sourceTabId: close.source.tabId }
-        : {})
-  })
+  await ctx.runtime.switchSlotAnchors.recordFor(
+    record.location.workspaceId,
+    `agent-session:${sessionId}`,
+    sameWorkspace ? slotAnchor(replaces, close.source.tabId) : undefined,
+    () =>
+      ctx.runtime.publishStructuredAgentSessionTab({
+        ...revealed,
+        activate: true,
+        check,
+        focusWindow: agentLaunchMovesHostWindow(ctx),
+        ...(replaces
+          ? { replaces }
+          : sameWorkspace
+            ? { placement: close.placement(), sourceTabId: close.source.tabId }
+            : {})
+      })
+  )
   replacedBy = replaces ? sessionId : undefined
   deadline.check()
   if (sameWorkspace) {
diff --git a/src/main/runtime/session-tabs/switch-slot-anchors.ts b/src/main/runtime/session-tabs/switch-slot-anchors.ts
index f9dda6d6d390..74b139035ab4 100644
--- a/src/main/runtime/session-tabs/switch-slot-anchors.ts
+++ b/src/main/runtime/session-tabs/switch-slot-anchors.ts
@@ -36,6 +36,25 @@ export class SwitchSlotAnchors {
     return true
   }
 
+  /** Records the anchor before the write that publishes its destination; a write that fails
+   *  withdraws the anchor it added, so a later open isn't stamped into the source's slot. */
+  async recordFor<T>(
+    workspaceId: string,
+    destinationTabId: string,
+    anchor: SlotAnchor | undefined,
+    write: () => Promise<T>
+  ): Promise<T> {
+    const recorded = anchor !== undefined && this.record(workspaceId, destinationTabId, anchor)
+    try {
+      return await write()
+    } catch (error) {
+      if (recorded) {
+        this.forget(workspaceId, destinationTabId)
+      }
+      throw error
+    }
+  }
+
   /** Withdraws an anchor whose destination no frame has shown. */
   forget(workspaceId: string, destinationTabId: string): void {
     const entries = this.byWorkspace.get(workspaceId)
@@ -85,6 +104,11 @@ export class SwitchSlotAnchors {
   }
 }
 
+/** The source's slot when the destination replaces its whole tab, else the place beside it. */
+export function slotAnchor(replacedTabId: string | undefined, sourceTabId: string): SlotAnchor {
+  return replacedTabId ? { replaces: { tabId: replacedTabId } } : { after: { tabId: sourceTabId } }
+}
+
 function sameSlot(a: SlotAnchor, b: SlotAnchor): boolean {
   return 'replaces' in a
     ? 'replaces' in b && a.replaces.tabId === b.replaces.tabId

From dac59dfa9c0621460b7ab0eb7eb232740598f0bd Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 06:18:42 -0700
Subject: [PATCH 203/207] Save a stopped CLI turn after the history ahead of it

After Stop and switch into a chat that already held the conversation, the
early stop record went in ahead of the CLI turns the chat hadn't imported
yet, so the stopped prompt and "Interrupted" showed above the turn before
it and the partial reply landed after it. For Codex the record named no
prompt, so the stopped turn's rows grouped under the previous turn.

The early commit now plans what the later import plans, from the read
taken before the stop: the rows the chat lacks in transcript order, then
the record, in one write, still before anything later can fail. A retained
Pi chat's read starts after its history claim, and its own-work check
refuses as the import does. Codex keeps one writer of its rows; its record
names the prompt as the resting importer does (a paginated read's rollout
prefix dropped), so the rows join their own turn wherever they land.
---
 .../claude-qa-final-stop-third-turn.jsonl     |   8 +
 .../structured-agent-session-codex-turns.ts   |  30 +-
 .../structured-agent-session-host.ts          |  25 +-
 ...ctured-agent-session-switch-import-plan.ts | 155 +++++++++++
 .../structured-agent-session-switch-import.ts | 262 ++++++------------
 .../structured-agent-session-switch-source.ts |  30 +-
 ...ed-agent-session-switch-stop-label.test.ts | 131 +++++++--
 ...agent-session-switch-turn-boundary.test.ts |  18 +-
 ...ructured-agent-session-switch-execution.ts |   4 +-
 9 files changed, 445 insertions(+), 218 deletions(-)
 create mode 100644 src/main/native-chat/agent-session-wire/__fixtures__/claude-qa-final-stop-third-turn.jsonl
 create mode 100644 src/main/native-chat/agent-session-wire/structured-agent-session-switch-import-plan.ts

diff --git a/src/main/native-chat/agent-session-wire/__fixtures__/claude-qa-final-stop-third-turn.jsonl b/src/main/native-chat/agent-session-wire/__fixtures__/claude-qa-final-stop-third-turn.jsonl
new file mode 100644
index 000000000000..d265b41d0cd7
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/__fixtures__/claude-qa-final-stop-third-turn.jsonl
@@ -0,0 +1,8 @@
+{"type":"user","uuid":"22305aa2-ed95-4fd8-b753-ff3f76aaba2d","parentUuid":"2c9682b0-0614-4985-ac6a-bf3fbbece3ef","sessionId":"2fb91c1d-29e7-430d-8819-53d18bb9ca93","timestamp":"2026-10-31T11:59:23.627Z","version":"2.1.310","message":{"role":"user","content":[{"type":"text","text":"Reply with the single word M6B-claude-1"}]}}
+{"type":"assistant","uuid":"72b2384e-d61d-4e5f-8c4b-d1514703f8b4","parentUuid":"1b3a722c-0bb8-4455-bf9e-dd715d610f72","sessionId":"2fb91c1d-29e7-430d-8819-53d18bb9ca93","timestamp":"2026-10-31T11:59:26.736Z","version":"2.1.310","message":{"model":"claude-opus-5-5","id":"msg_011CgaH1SU1jsMZRxsv4Wu9o","type":"message","role":"assistant","content":[{"type":"text","text":"M6B-claude-1"}],"stop_reason":"end_turn","stop_sequence":null,"stop_details":null,"diagnostics":null}}
+{"type":"user","uuid":"1488c9c2-3797-4268-88f2-41f313250aa3","parentUuid":"377bf08c-2f74-42f7-a555-6af97ce61848","sessionId":"2fb91c1d-29e7-430d-8819-53d18bb9ca93","timestamp":"2026-10-31T12:00:25.080Z","version":"2.1.310","message":{"role":"user","content":"Reply with the single word M6B-claude-2"}}
+{"type":"assistant","uuid":"ba6ba8e6-9446-4c7d-95c1-8601d8aaf104","parentUuid":"b8cc80b5-8e7b-483d-8219-429e8a13f36e","sessionId":"2fb91c1d-29e7-430d-8819-53d18bb9ca93","timestamp":"2026-10-31T12:00:26.078Z","version":"2.1.310","message":{"model":"claude-opus-5-5","id":"msg_011CgaH5wHyPbuNnFihCawGG","type":"message","role":"assistant","content":[{"type":"text","text":"M6B-claude-2"}],"stop_reason":"end_turn","stop_sequence":null,"stop_details":null,"diagnostics":null}}
+{"type":"user","uuid":"76fbff13-30ce-4e4b-933c-e0a09e5fd801","parentUuid":"98a51a73-b754-4156-9f06-35e9cfbfcfd5","sessionId":"2fb91c1d-29e7-430d-8819-53d18bb9ca93","timestamp":"2026-10-31T12:01:19.680Z","version":"2.1.310","message":{"role":"user","content":"Write a 300-line poem about rivers, numbered lines, no preamble."}}
+{"type":"assistant","uuid":"129066a5-e45d-4208-a504-5783f7031692","parentUuid":"3e564ba9-a4e6-413f-990d-7682446e8d7d","sessionId":"2fb91c1d-29e7-430d-8819-53d18bb9ca93","timestamp":"2026-10-31T12:01:21.251Z","version":"2.1.310","message":{"model":"claude-opus-5-5","id":"msg_011CgaH9xk9vSctdZbHz5SR6","type":"message","role":"assistant","content":[{"type":"thinking","thinking":"","signature":"CAQS3QYKEAgTGAI4AUIIdGhpbmtpbmcSDJsh22No0twzssLKVxoMVv2raEzWEmTNNqYVIjAr5aWXS2kebZsOMZkRhxZUrMW+tIksu2yY11603/wG3CvLJAa9nnor080T8NgoDtkq+gWB/EI4s6jJ94hhqJByRY2bUIC+n7pSLKk+LC4HP1fkwmlHiVyYvtBacNBjXmQWcegTFqzrowNFzLg0aeLcbydCaSG948ZkoXq2KOHYyFhqWAQnPcQAZ3++BapqFl9utktAm0oRV3MmASxyP4ta82x52+deMFXduaiMrJFXkrVci2XyEVirgUIofmZtc0uTtK6TO0BMm+Bm/1iqkeG8u6OIZ6dQG+hdwSiv8yJWcyQprhY/bJtaj5TtrSUlMqj/8k32NSOeepsHx3ZS9bDP2mEi6yUwtDrbV4mftWPHNmzy+Mrp4DeQA61bxu9bx1J/L1KIQtq9+LIiMTO8wYQuFaCYeoV/Qk1EPixaWXTsZ/OP/PNpbbyEoK05G+7bUJkvo82nf+lCTz3AJGSNFOZy7Uid6xFJRaoeASPB8QjDnlx9PUDa/AIphzjnN63sD4nYL49N6Nzok6+pi2dvqYtnNExNBATQZSFxOKjVz8XO7cRN0Cy+965D71i3E24M/CIWgQlEXiOj/c4A9aiMrvkoShx1Y+pllXjMojXo59SWv5W0J8+jXt/xHnZ5ZDYTeWK650dJmjPThM+ljB/X8Ne52Lf033eJ7TgsDLCP40f6mHQukmRlrGXYJXlggrsAXUqVZ01ai769IbNKEY4Hxr0lNK/PUHf99aW7vdQjK6xc78B2i1d01+/rVRUh3uTICqLQBx1r8v287IhPpZlP+xqyWbL5nZ6uzBQy/nOKUILSlWFxTp9H14CF3/NeURF5YHlskTzquDzWBWxyVNlz+g64RPatIpS8y0rprygIgZE7mXWGOIsEmZMRGNojQ/gfGlhbFYO22NCrJnHPsQPGCvjR8MNY1IRBgRTgEbBpYrTDo5NU2PMMXQ5CQIl6BY5Y8i/dF+lpXKOJIW1zcDAIIIK1cmbgZAZ9pZWaLAlJVZV3PKbs1krU8+QkB13sF4qLICw+y+CHpzXO4Xtm3khKFjnDN5YdxI0vlbullZeHTebsWDVBrhoNZcRynfBIde0YAQ=="}],"stop_reason":null,"stop_sequence":null,"stop_details":null,"diagnostics":null}}
+{"type":"assistant","uuid":"8c99c1d7-84f6-4fc9-9a5d-9b656a32c297","parentUuid":"129066a5-e45d-4208-a504-5783f7031692","sessionId":"2fb91c1d-29e7-430d-8819-53d18bb9ca93","timestamp":"2026-10-31T12:02:00.503Z","version":"2.1.310","message":{"model":"claude-opus-5-5","id":"msg_011CgaH9xk9vSctdZbHz5SR6","type":"message","role":"assistant","content":[{"type":"text","text":"1. Before the names, before the maps were drawn,\n2. the water knew the shape of every valley,\n3. pressing its cold thumb into the stone\n4. the way a sculptor tests the yielding clay.\n5. It did not ask the mountain for permission.\n6. It simply leaned, and kept on leaning, downward,\n7. a patience older than the oldest trees,\n8. a hunger that was not a hunger, only weight.\n9. Somewhere high, a single drop let go\n10. of a glacier's blue and ancient shoulder,\n11. and that was the beginning, if there is one,\n12. if anything that moves can claim a start.\n13. The drop found another, and the two\n14. went looking for a third among the gravel,\n15. and soon a thread of silver stitched the moss,\n16. and soon the thread was singing to itself.\n17. This is how a river learns its voice:\n18. by falling, and by falling, and by falling,\n19. by striking rock and finding that the rock\n20. will hum back, if you strike it long enough.\n21. The first rill does not know it is a river.\n22. It thinks it is a whisper in the fern,\n23. a trembling in the roots of mountain heather,\n24. a coldness that the marmot stops to drink.\n25. But gravity is a kind of argument\n26. that water never tires of agreeing with,\n27. and so it gathers, so it braids and doubles,\n28. and so the whisper thickens to a word.\n29. Below the snowline, where the larches stand\n30. like sentries who have long forgotten why,\n31. the stream begins to carve its first ravine,\n32. a shallow wound that will become a canyon.\n33. It takes ten thousand years to cut a foot.\n34. It takes a million to unmake a range.\n35. The river does not count. It has no clock\n36. except the slow pulse of the turning seasons.\n37. In spring it swells with everything the winter\n38. kept locked in white and silent treasuries,\n39. and roars down through the gorges, brown and furious,\n40. tearing out the boulders like loose teeth.\n41. In summer it grows thin and clear and thoughtful,\n42. showing every pebble on its floor,\n43. the trout suspended in it like a thought\n44. that hasn't quite decided to be spoken.\n45. In autumn it is littered with the gold\n46. of aspens shaking out their brief inheritance,\n47. a currency the current spends at once,\n48. carrying each coin away to nowhere.\n49. In winter it goes quiet under ice,\n50. but listen, kneel, and press your ear to it:\n51. beneath the frozen lid it is still going,\n52. still muttering its one unending sentence.\n53. I have stood beside a river at dawn\n54. when mist was lifting off it like a breath,\n55. as if the water dreamed all night and woke\n56. and exhaled the last remnants of its dreaming.\n57. A heron stood there too, one-legged, grave,\n58. a gray priest at the altar of the shallows,\n59. and neither of us spoke, and neither moved,\n60. and the river went on praying for us both.\n61. What does a river want? It wants the sea.\n62. That is the only answer it has ever given.\n63. Every bend, every oxbow, every delay\n64. is just the long way round to the same ending.\n65. And yet it does not hurry. Look at how\n66. it lingers in the meadows, how it loops\n67. back on itself as if it had forgotten\n68. something on the far side of the field.\n69. The meander is the river's way of thinking.\n70. It doubles back to reconsider things.\n71. It cuts the neck of its own wandering\n72. and leaves a crescent lake behind, a memory.\n73. Those oxbow lakes go still and green with reeds.\n74. The frogs move in. The dragonflies arrive.\n75. They are the river's abandoned sentences,\n76. the clauses it decided not to finish.\n77. Along the banks the willows lean and listen.\n78. They have been leaning for a hundred years.\n79. Their roots drink deep; their branches trail the surface\n80. like fingers of a girl leaned over a boat.\n81. The kingfisher, that flash of stolen sky,\n82. goes stitching through the shadows like a needle,\n83. and where it dives, a ring of light expands\n84. and travels out and vanishes downstream.\n85. Everything here is traveling downstream:\n86. the leaf, the twig, the feather, and the silt,\n87. the reflection of the cloud, the cloud itself\n88. eventually, returning as the rain.\n89. Heraclitus said you cannot step\n90. into the same river twice, and he was right,\n91. but he forgot to add that you yourself\n92. are not the same who stepped in yesterday.\n93. Two rivers, then: the water and the wader,\n94. both changing, both pretending to stay still,\n95. both carrying their sediment of years\n96. toward some estuary they can't see.\n97. The towns grew up where rivers could be crossed.\n98. The fords became the bridges, then the cities.\n99. Every capital is kneeling at a river\n100. the way a calf kneels down beside its mother.\n101. The Thames, the Seine, the Tiber, and the Nile,\n102. the Danube threading empires like a rosary,\n103. the Ganges where the ashes of the dead\n104. drift outward on a current made of prayer.\n105. The Mississippi, wide and brown and drowsy,\n106. carrying the topsoil of a continent,\n107. a whole midwestern farm in every mile,\n108. the corn and wheat dissolved into its body.\n109. The Amazon, so vast it has no shore\n110. that you can see from the middle of its channel,\n111. pushing fresh water a hundred miles to sea,\n112. as if it would not let the ocean have it.\n113. The Yangtze, through its gorges, through its dams,\n114. the Mekong feeding half a world of rice,\n115. the Volga slow and patient as a grandmother,\n116. the Congo dark with forests it has drunk.\n117. The Indus, where the oldest cities rose\n118. and fell, and left their brickwork in the mud;\n119. the Tigris and Euphrates, the first garden,\n120. where someone first wrote down a word for water.\n121. That word was older than the word for god.\n122. Before we prayed, we had to drink. Before\n123. we built a temple, we had dug a channel\n124. and watched the barley rise along its edges.\n125. Irrigation is the oldest poem:\n126. a line of water drawn across the dust,\n127. and where the line goes, green begins to follow,\n128. and where it stops, the desert holds its breath.\n129. We have dammed them, we have straightened them,\n130. we have poured our poisons in them, made them burn.\n131. The Cuyahoga caught fire, and we were shocked\n132. that water could forget it was a water.\n133. We have lined them up in concrete, buried some\n134. beneath the streets, where they still run in darkness,\n135. lost rivers flowing under London, under\n136. every city, singing in their tunnels.\n137. Somewhere under your feet, perhaps, right now,\n138. a stream that once had trout and kingfishers\n139. is moving through a culvert, blind and patient,\n140. remembering the sun it used to hold.\n141. And yet they are forgiving, rivers are.\n142. Tear out a dam and watch: within a season\n143. the salmon find the old way home again,\n144. nosing up the gravel that they dreamed of.\n145. The salmon are the river's memory.\n146. They leave as finger-length and silver children,\n147. go out to the enormous salt and wander,\n148. and years later, something calls them back.\n149. They taste the water, and they know it. Somehow\n150. among a thousand tributaries they choose\n151. the one that tastes like being born, and climb it,\n152. leaping falls, against the whole weight of the world.\n153. They do not eat on that last journey. They\n154. go red, go hooked of jaw, go ragged-finned,\n155. and spawn, and die there in the shallow redds,\n156. and give their bodies back to feed the forest.\n157. The cedars on those banks are made of salmon.\n158. The nitrogen of oceans in their rings.\n159. The bear who fishes at the falls is carrying\n160. the sea into the mountains in her belly.\n161. So the river runs both ways, you see:\n162. the water down, the life of it back up,\n163. a circulation like the blood's own circuit,\n164. the heart of it the ocean, and the veins\n165. the creeks and brooks and runnels of the uplands,\n166. and we, who live along them, only cells\n167. carried a little distance on the current\n168. before we, too, are given back as silt.\n169. I remember the river of my childhood,\n170. how small it seems now, how en"}],"stop_reason":null,"stop_sequence":null,"stop_details":null,"diagnostics":null}}
+{"type":"user","uuid":"9c71b3bb-3518-413f-9d5c-06a44b51b302","parentUuid":"8c99c1d7-84f6-4fc9-9a5d-9b656a32c297","sessionId":"2fb91c1d-29e7-430d-8819-53d18bb9ca93","timestamp":"2026-10-31T12:02:00.505Z","version":"2.1.310","message":{"role":"user","content":[{"type":"text","text":"[Request interrupted by user]"}]}}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-codex-turns.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-codex-turns.ts
index 2545c20e2678..9b8098c19c26 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-codex-turns.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-codex-turns.ts
@@ -1,5 +1,8 @@
 import { asRecord } from '../../ai-vault/session-scanner-values'
-import { parseAgentJournalItemKey } from '../../../shared/agent-session-journal-item-key'
+import {
+  agentJournalItemKey,
+  parseAgentJournalItemKey
+} from '../../../shared/agent-session-journal-item-key'
 import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
 
 // Codex rollout facts the resting importer reads beside its message rows.
@@ -34,13 +37,34 @@ export function savedCodexPrompts(
       body.kind === 'message' &&
       body.role === 'user'
     ) {
-      // Paginated imports prefix the rollout id; the bare provider id is the shared part.
-      prompts.set(identity.recordId.slice(identity.recordId.lastIndexOf(':') + 1), itemId)
+      prompts.set(sharedRecordId(identity.recordId), itemId)
     }
   })
   return prompts
 }
 
+/** Paginated imports prefix the rollout id; the bare provider id is the shared part. */
+function sharedRecordId(recordId: string): string {
+  return recordId.slice(recordId.lastIndexOf(':') + 1)
+}
+
+/** A prompt another import named, as the resting importer finds or writes it. */
+export function codexRestingPromptKey(
+  journal: AgentSessionJournal,
+  threadId: string,
+  key: string
+): string {
+  const identity = parseAgentJournalItemKey(key)
+  if (identity?.provider !== 'legacy') {
+    return journal.canonicalItemId(key)
+  }
+  const id = sharedRecordId(identity.recordId)
+  return (
+    savedCodexPrompts(journal, threadId).get(id) ??
+    agentJournalItemKey({ ...identity, recordId: id })
+  )
+}
+
 export function providerItemId(record: Record<string, unknown> | null): string | null {
   const payload = asRecord(record?.payload)
   const id = asRecord(payload?.item)?.id ?? payload?.id ?? record?.id
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
index 91e4db79a494..03a3d700af8f 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host.ts
@@ -35,6 +35,7 @@ import {
 // Serialize durable mutations per conversation; open at rest and start a child only when work needs it.
 
 export type { StructuredAgentSessionHostDeps } from './structured-agent-session-host-types'
+type SwitchSource = ReturnType<typeof structuredAgentSessionSwitchSource>
 
 export class StructuredAgentSessionHost extends StructuredAgentSessionHostContexts {
   private readonly conversationCommands = new StructuredConversationCommandController(
@@ -193,20 +194,16 @@ export class StructuredAgentSessionHost extends StructuredAgentSessionHostContex
       serialize: this.serialize,
       subscribers: this.subscribers
     })
-  stopForSwitch = (
-    ...args: Parameters<ReturnType<typeof structuredAgentSessionSwitchSource>['stopForSwitch']>
-  ) => this.switchSource().stopForSwitch(...args)
-  commitSwitchStop = (
-    ...args: Parameters<ReturnType<typeof structuredAgentSessionSwitchSource>['commitSwitchStop']>
-  ) => this.switchSource().commitSwitchStop(...args)
-  refreshSwitchTranscript = (
-    ...args: Parameters<
-      ReturnType<typeof structuredAgentSessionSwitchSource>['refreshSwitchTranscript']
-    >
-  ) => this.switchSource().refreshSwitchTranscript(...args)
-  captureSwitchWork = (
-    ...args: Parameters<ReturnType<typeof structuredAgentSessionSwitchSource>['captureSwitchWork']>
-  ) => this.switchSource().captureSwitchWork(...args)
+  stopForSwitch: SwitchSource['stopForSwitch'] = (...args) =>
+    this.switchSource().stopForSwitch(...args)
+  captureSwitchStop: SwitchSource['captureSwitchStop'] = (...args) =>
+    this.switchSource().captureSwitchStop(...args)
+  commitSwitchStop: SwitchSource['commitSwitchStop'] = (...args) =>
+    this.switchSource().commitSwitchStop(...args)
+  refreshSwitchTranscript: SwitchSource['refreshSwitchTranscript'] = (...args) =>
+    this.switchSource().refreshSwitchTranscript(...args)
+  captureSwitchWork: SwitchSource['captureSwitchWork'] = (...args) =>
+    this.switchSource().captureSwitchWork(...args)
 
   supportsCreate = (location: AgentSessionExecutionLocation, agent: string): boolean =>
     providerSupport.adapterSupportsCreate(this.deps.adapter, location, agent)
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import-plan.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import-plan.ts
new file mode 100644
index 000000000000..e03a318f6148
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import-plan.ts
@@ -0,0 +1,155 @@
+import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key'
+import {
+  AGENT_JOURNAL_THREAD_SCOPE,
+  type AgentJournalItemBody
+} from '../../../shared/agent-session-journal-types'
+import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
+import type { JournalReplacementItem } from '../agent-session-journal/journal-epoch-replacement'
+import type { PreparedLegacyImport } from '../agent-session-journal/journal-legacy-import-contract'
+import { switchTranscriptNativeCoverage } from './structured-agent-session-switch-import-coverage'
+import type {
+  SwitchStoppedCliTurn,
+  SwitchTranscriptSource
+} from './structured-agent-session-switch-import'
+import {
+  isSyntheticInterruptedTurn,
+  isUnexplainedInterruptedTurn,
+  turnRecordReplaceable
+} from './structured-agent-session-synthetic-turn'
+
+export type PreparedSwitchRead = Extract<PreparedLegacyImport, { ok: true }>
+
+export function lastUserItem(items: readonly JournalReplacementItem[]) {
+  return items.findLast((item) => item.body.kind === 'message' && item.body.role === 'user')
+}
+
+/** The rows a read holds that this chat doesn't, in transcript order, then the turn records. */
+export function planSwitchTranscriptAdditions(input: {
+  journal: AgentSessionJournal
+  source: Pick<SwitchTranscriptSource, 'agent' | 'sessionId'>
+  prepared: PreparedSwitchRead
+  stopped?: SwitchStoppedCliTurn
+  settleAbandoned?: boolean
+  check: () => void
+}): JournalReplacementItem[] {
+  const { prepared } = input
+  const items = prepared.items
+  const user = lastUserItem(items)
+  const userKey = user && agentJournalItemKey(user.identity)
+  const latest = prepared.latestTurn
+  const interrupted =
+    input.stopped?.sessionId === input.source.sessionId &&
+    input.stopped.userItemKey === userKey &&
+    (!latest ||
+      (latest.turnId === input.stopped.turnId &&
+        (latest.state === 'working' ||
+          (latest.state === 'interrupted' && latest.outcome === undefined))))
+  const covered = switchTranscriptNativeCoverage({
+    agent: input.source.agent,
+    providerSessionId: input.source.sessionId,
+    journal: input.journal,
+    items,
+    check: input.check
+  })
+  const additions =
+    input.source.agent === 'codex'
+      ? []
+      : items.filter((item) => !covered.has(agentJournalItemKey(item.identity)))
+  const ended =
+    latest && latest.state !== 'working' ? { ...latest, state: latest.state } : undefined
+  // No writer is left and the turn never ended: it is over. Unknown evidence (no lifecycle, or a
+  // reply only a legacy format calls complete) gets no label rather than a guessed one.
+  const abandoned =
+    !interrupted &&
+    input.settleAbandoned === true &&
+    latest?.state === 'working' &&
+    !prepared.latestTurnAmbiguous
+  const turnId = interrupted ? input.stopped?.turnId : abandoned ? latest?.turnId : ended?.turnId
+  // Codex's turn records have one writer, the resting importer, which anchors them to saved rows.
+  if (input.source.agent !== 'codex' && turnId && userKey && !covered.has(userKey)) {
+    additions.push(
+      switchLifecycleRecord(input.source, turnId, {
+        kind: 'turn',
+        turnId,
+        userItemId: userKey,
+        state: interrupted || abandoned ? 'interrupted' : ended!.state,
+        ...(interrupted
+          ? { outcome: 'cancellation' as const }
+          : ended?.outcome
+            ? { outcome: ended.outcome }
+            : {}),
+        ...(ended?.timestamp == null ? {} : { completedAt: ended.timestamp })
+      })
+    )
+  }
+  // An earlier turn Orca settled whose real boundary has since been recorded takes that boundary,
+  // and an interruption saved without its verdict takes the one its stop record carries.
+  if (input.source.agent !== 'codex') {
+    const added = new Set(additions.map((item) => agentJournalItemKey(item.identity)))
+    // Grok's latest turn comes from its sidecar, not the transcript rows.
+    const states = new Map(prepared.turnStates)
+    if (latest) {
+      states.set(latest.turnId, latest)
+    }
+    for (const [id, state] of states) {
+      const key = agentJournalItemKey(switchLifecycleRecord(input.source, id).identity)
+      const body = input.journal.item(input.journal.canonicalItemId(key))?.body
+      const revisit =
+        isSyntheticInterruptedTurn(body) ||
+        (isUnexplainedInterruptedTurn(body) && state.outcome !== undefined)
+      if (state.state !== 'working' && revisit && !added.has(key)) {
+        const outcome = state.outcome ?? (state.state === 'interrupted' ? body.outcome : undefined)
+        additions.push(
+          switchLifecycleRecord(input.source, id, {
+            kind: 'turn',
+            turnId: id,
+            ...(body.userItemId ? { userItemId: body.userItemId } : {}),
+            state: state.state,
+            ...(outcome ? { outcome } : {}),
+            ...(state.timestamp == null ? {} : { completedAt: state.timestamp })
+          })
+        )
+      }
+    }
+  }
+  return additions
+}
+
+/** Each addition the chat lacks, or a turn record its newer evidence may replace. */
+export function switchTranscriptMutations(
+  journal: AgentSessionJournal,
+  additions: readonly JournalReplacementItem[],
+  revise?: (item: JournalReplacementItem, current?: AgentJournalItemBody) => JournalReplacementItem
+) {
+  return additions.flatMap((addition) => {
+    const current = journal.item(journal.canonicalItemId(agentJournalItemKey(addition.identity)))
+    const item = revise?.(addition, current?.body) ?? addition
+    return !current || turnRecordReplaceable(current.body, item.body)
+      ? [
+          {
+            kind: 'item' as const,
+            ...item,
+            turnScope: item.turnScope ?? AGENT_JOURNAL_THREAD_SCOPE
+          }
+        ]
+      : []
+  })
+}
+
+export function switchLifecycleRecord(
+  source: Pick<SwitchTranscriptSource, 'agent' | 'sessionId'>,
+  turnId: string,
+  body?: Extract<AgentJournalItemBody, { kind: 'turn' }>
+): JournalReplacementItem {
+  return {
+    identity: {
+      provider: 'legacy',
+      agent: source.agent,
+      sessionId: source.sessionId,
+      recordId: `turn-lifecycle:${turnId}`
+    },
+    ownerFence: 0,
+    turnScope: AGENT_JOURNAL_THREAD_SCOPE,
+    body: body ?? { kind: 'turn', turnId, state: 'running' }
+  }
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.ts
index 4990fab7fd46..d8ff2a8f8982 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-import.ts
@@ -1,4 +1,3 @@
-import { switchTranscriptNativeCoverage } from './structured-agent-session-switch-import-coverage'
 import {
   decodePiHistoryClaim,
   readPiHistoryJournalView,
@@ -10,10 +9,6 @@ import type { AgentType } from '../../../shared/agent-status-types'
 import { getSystemCodexHomePath } from '../../codex/codex-home-paths'
 import type { AdoptedTranscriptSource } from '../agent-session-journal/adopted-transcript-source'
 import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key'
-import {
-  AGENT_JOURNAL_THREAD_SCOPE,
-  type AgentJournalItemBody
-} from '../../../shared/agent-session-journal-types'
 import { agentSessionRefusalError } from '../../../shared/agent-session-wire-refusals'
 import type { AgentSessionWireRefusal } from '../../../shared/agent-session-wire'
 import type { AgentSessionSwitchDeadline } from '../../../shared/agent-session-switch-execution'
@@ -21,10 +16,14 @@ import type { AgentSessionJournal } from '../agent-session-journal/journal-store
 import { prepareLegacyTranscriptImport } from '../agent-session-journal/journal-legacy-import'
 import type { JournalReplacementItem } from '../agent-session-journal/journal-epoch-replacement'
 import {
-  isSyntheticInterruptedTurn,
-  isUnexplainedInterruptedTurn,
-  turnRecordReplaceable
-} from './structured-agent-session-synthetic-turn'
+  lastUserItem,
+  planSwitchTranscriptAdditions,
+  switchLifecycleRecord,
+  switchTranscriptMutations,
+  type PreparedSwitchRead
+} from './structured-agent-session-switch-import-plan'
+import { isUnexplainedInterruptedTurn } from './structured-agent-session-synthetic-turn'
+import { codexRestingPromptKey } from './structured-agent-session-codex-turns'
 
 export type SwitchTranscriptSource = {
   agent: AgentType
@@ -38,20 +37,24 @@ type AdoptedTranscriptRead =
   | { ok: true; items: JournalReplacementItem[] | null }
   | { ok: false; refusal: AgentSessionWireRefusal }
 
-export type SwitchStoppedCliTurn = {
-  agent: AgentType
-  sessionId: string
+export type SwitchStoppedCliTurn = Pick<
+  SwitchTranscriptSource,
+  'agent' | 'sessionId' | 'filePath'
+> & {
   userItemKey: string
   turnId: string
   /** The history read before the stop: a first adoption's if the file can't be read after it. */
-  baseline: readonly JournalReplacementItem[]
+  baseline: PreparedSwitchRead
 }
 
+const transcriptUnreadable = () =>
+  agentSessionRefusalError('agent_session_identity_required', { reason: 'transcriptUnreadable' })
+
 async function prepare(
   source: SwitchTranscriptSource,
   deadline: AgentSessionSwitchDeadline,
   piAfterEntry?: string
-) {
+): Promise<PreparedSwitchRead> {
   deadline.check()
   const prepared = await prepareLegacyTranscriptImport({
     agent: source.agent,
@@ -67,28 +70,42 @@ async function prepare(
   })
   deadline.check()
   if (!prepared.ok) {
-    throw agentSessionRefusalError('agent_session_identity_required', {
-      reason: 'transcriptUnreadable'
-    })
+    throw transcriptUnreadable()
   }
   return prepared
 }
 
-function lastUser(items: readonly JournalReplacementItem[]) {
-  return items.findLast((item) => item.body.kind === 'message' && item.body.role === 'user')
+/** Pi entries through the chat's claim are already its history; its own work since can't merge. */
+function piHistoryCut(
+  journal: AgentSessionJournal,
+  source: Pick<SwitchTranscriptSource, 'agent' | 'filePath'>,
+  resumeCursor: string | undefined
+): { entry?: string; mergeable: boolean } {
+  if (source.agent !== 'pi') {
+    return { mergeable: true }
+  }
+  const view = readPiHistoryJournalView(journal, new Set([source.filePath]))
+  const claim = usablePiHistoryClaim(decodePiHistoryClaim(resumeCursor), view)
+  return { entry: claim?.entry, mergeable: view.ownWorkSequence <= (claim?.sequence ?? 0) }
 }
 
-/** This capture is used only with an explicit Stop and positive exit of its exact CLI. */
+/**
+ * This capture is used only with an explicit Stop and positive exit of its exact CLI. `retained`:
+ * the chat that already holds the conversation, whose own history the read starts after.
+ */
 export async function captureSwitchStoppedCliTurn(
   source: SwitchTranscriptSource,
   working: boolean,
-  deadline: AgentSessionSwitchDeadline
+  deadline: AgentSessionSwitchDeadline,
+  retained?: { journal: AgentSessionJournal; resumeCursor?: string }
 ): Promise<SwitchStoppedCliTurn | undefined> {
   if (!working) {
     return undefined
   }
-  const prepared = await prepare(source, deadline)
-  const user = lastUser(prepared.items)
+  const piAfterEntry =
+    retained && piHistoryCut(retained.journal, source, retained.resumeCursor).entry
+  const prepared = await prepare(source, deadline, piAfterEntry)
+  const user = lastUserItem(prepared.items)
   if (!user || (prepared.latestTurn && prepared.latestTurn.state !== 'working')) {
     return undefined
   }
@@ -96,18 +113,19 @@ export async function captureSwitchStoppedCliTurn(
   return {
     agent: source.agent,
     sessionId: source.sessionId,
+    filePath: source.filePath,
     userItemKey: key,
     turnId: prepared.latestTurn?.turnId ?? key,
-    baseline: prepared.items
+    baseline: prepared
   }
 }
 
 /** The turn a switch stopped with proof of exit, as the turn record every later import keeps. */
-function stoppedTurnRecord(stopped: SwitchStoppedCliTurn, userItemId?: string) {
-  return lifecycleRecord(stopped, stopped.turnId, {
+function stoppedTurnRecord(stopped: SwitchStoppedCliTurn, userItemId: string) {
+  return switchLifecycleRecord(stopped, stopped.turnId, {
     kind: 'turn',
     turnId: stopped.turnId,
-    ...(userItemId ? { userItemId } : {}),
+    userItemId,
     state: 'interrupted',
     outcome: 'cancellation'
   })
@@ -121,7 +139,7 @@ export function withSwitchStoppedTurn(
   read: AdoptedTranscriptRead,
   stopped: SwitchStoppedCliTurn
 ): AdoptedTranscriptRead {
-  const items = read.ok ? read.items : [...stopped.baseline]
+  const items = read.ok ? read.items : [...stopped.baseline.items]
   if (!items?.some((item) => agentJournalItemKey(item.identity) === stopped.userItemKey)) {
     return read
   }
@@ -130,45 +148,48 @@ export function withSwitchStoppedTurn(
 
 /**
  * Record a proven stop on the chat that already holds the conversation, before any later read can
- * fail. Its prompt anchors the record; a prompt not saved yet comes from the read before the stop,
- * except Codex's, whose resting import scopes the turn's rows to this record when it reads them.
+ * fail, in the same write as the history ahead of it: what the import adds from the read before the
+ * stop. Codex's rows have one writer, the resting import; its record names its prompt as that
+ * import does, so the rows it lands later join this turn wherever the record sits.
  */
 export async function commitSwitchStoppedCliTurn(input: {
   journal: AgentSessionJournal
   stopped: SwitchStoppedCliTurn
   fence: number
+  resumeCursor?: string
 }): Promise<void> {
   const { journal, stopped } = input
-  const prompt = journal.canonicalItemId(stopped.userItemKey)
-  const saved = journal.item(prompt) !== null
-  const opener =
-    saved || stopped.agent === 'codex'
-      ? undefined
-      : stopped.baseline.find((item) => agentJournalItemKey(item.identity) === stopped.userItemKey)
-  const record = stoppedTurnRecord(stopped, saved ? prompt : opener && stopped.userItemKey)
+  if (!piHistoryCut(journal, stopped, input.resumeCursor).mergeable) {
+    throw transcriptUnreadable()
+  }
+  const additions =
+    stopped.agent === 'codex'
+      ? [
+          stoppedTurnRecord(
+            stopped,
+            codexRestingPromptKey(journal, stopped.sessionId, stopped.userItemKey)
+          )
+        ]
+      : planSwitchTranscriptAdditions({
+          journal,
+          source: stopped,
+          prepared: stopped.baseline,
+          stopped,
+          check: () => {}
+        })
+  const record = agentJournalItemKey(switchLifecycleRecord(stopped, stopped.turnId).identity)
   await journal.appendPlannedLifecycleBatch({
     settlementId: `switch-stop:${stopped.sessionId}:${stopped.turnId}`,
     fence: input.fence,
-    plan: () => {
-      const current = journal.item(journal.canonicalItemId(agentJournalItemKey(record.identity)))
-      const body = current?.body
+    plan: () => ({
+      dispatches: [],
       // An interruption saved without its verdict keeps its record and takes this one.
-      const turn = isUnexplainedInterruptedTurn(body)
-        ? { ...record, body: { ...body, outcome: 'cancellation' as const } }
-        : record
-      const items = [
-        ...(opener && !journal.item(journal.canonicalItemId(stopped.userItemKey)) ? [opener] : []),
-        ...(!current || turnRecordReplaceable(current.body, turn.body) ? [turn] : [])
-      ]
-      return {
-        dispatches: [],
-        mutations: items.map((item) => ({
-          kind: 'item' as const,
-          ...item,
-          turnScope: item.turnScope ?? AGENT_JOURNAL_THREAD_SCOPE
-        }))
-      }
-    }
+      mutations: switchTranscriptMutations(journal, additions, (item, current) =>
+        agentJournalItemKey(item.identity) === record && isUnexplainedInterruptedTurn(current)
+          ? { ...item, body: { ...current, outcome: 'cancellation' } }
+          : item
+      )
+    })
   })
 }
 
@@ -184,97 +205,16 @@ export async function catchUpSwitchedCliTranscript(input: {
   check?: () => void
   resumeCursor?: string
 }) {
-  let piAfterEntry: string | undefined
-  if (input.source.agent === 'pi') {
-    const view = readPiHistoryJournalView(input.journal, new Set([input.source.filePath]))
-    const claim = usablePiHistoryClaim(decodePiHistoryClaim(input.resumeCursor), view)
-    if (view.ownWorkSequence > (claim?.sequence ?? 0)) {
-      throw agentSessionRefusalError('agent_session_identity_required', {
-        reason: 'transcriptUnreadable'
-      })
-    }
-    piAfterEntry = claim?.entry
+  const cut = piHistoryCut(input.journal, input.source, input.resumeCursor)
+  if (!cut.mergeable) {
+    throw transcriptUnreadable()
   }
-  const prepared = await prepare(input.source, input.deadline, piAfterEntry)
-  const items = prepared.items
-  const user = lastUser(items)
-  const userKey = user && agentJournalItemKey(user.identity)
-  const latest = prepared.latestTurn
-  const interrupted =
-    input.stopped?.sessionId === input.source.sessionId &&
-    input.stopped.userItemKey === userKey &&
-    (!latest ||
-      (latest.turnId === input.stopped.turnId &&
-        (latest.state === 'working' ||
-          (latest.state === 'interrupted' && latest.outcome === undefined))))
-  const covered = switchTranscriptNativeCoverage({
-    agent: input.source.agent,
-    providerSessionId: input.source.sessionId,
-    journal: input.journal,
-    items,
+  const prepared = await prepare(input.source, input.deadline, cut.entry)
+  const additions = planSwitchTranscriptAdditions({
+    ...input,
+    prepared,
     check: input.check ?? input.deadline.check
   })
-  const additions =
-    input.source.agent === 'codex'
-      ? []
-      : items.filter((item) => !covered.has(agentJournalItemKey(item.identity)))
-  const ended =
-    latest && latest.state !== 'working' ? { ...latest, state: latest.state } : undefined
-  // No writer is left and the turn never ended: it is over. Unknown evidence (no lifecycle, or a
-  // reply only a legacy format calls complete) gets no label rather than a guessed one.
-  const abandoned =
-    !interrupted &&
-    input.settleAbandoned === true &&
-    latest?.state === 'working' &&
-    !prepared.latestTurnAmbiguous
-  const turnId = interrupted ? input.stopped?.turnId : abandoned ? latest?.turnId : ended?.turnId
-  // Codex's turn records have one writer, the resting importer, which anchors them to saved rows.
-  if (input.source.agent !== 'codex' && turnId && userKey && !covered.has(userKey)) {
-    additions.push(
-      lifecycleRecord(input.source, turnId, {
-        kind: 'turn',
-        turnId,
-        userItemId: userKey,
-        state: interrupted || abandoned ? 'interrupted' : ended!.state,
-        ...(interrupted
-          ? { outcome: 'cancellation' as const }
-          : ended?.outcome
-            ? { outcome: ended.outcome }
-            : {}),
-        ...(ended?.timestamp == null ? {} : { completedAt: ended.timestamp })
-      })
-    )
-  }
-  // An earlier turn Orca settled whose real boundary has since been recorded takes that boundary,
-  // and an interruption saved without its verdict takes the one its stop record carries.
-  if (input.source.agent !== 'codex') {
-    const added = new Set(additions.map((item) => agentJournalItemKey(item.identity)))
-    // Grok's latest turn comes from its sidecar, not the transcript rows.
-    const states = new Map(prepared.turnStates)
-    if (latest) {
-      states.set(latest.turnId, latest)
-    }
-    for (const [id, state] of states) {
-      const key = agentJournalItemKey(lifecycleRecord(input.source, id).identity)
-      const body = input.journal.item(input.journal.canonicalItemId(key))?.body
-      const revisit =
-        isSyntheticInterruptedTurn(body) ||
-        (isUnexplainedInterruptedTurn(body) && state.outcome !== undefined)
-      if (state.state !== 'working' && revisit && !added.has(key)) {
-        const outcome = state.outcome ?? (state.state === 'interrupted' ? body.outcome : undefined)
-        additions.push(
-          lifecycleRecord(input.source, id, {
-            kind: 'turn',
-            turnId: id,
-            ...(body.userItemId ? { userItemId: body.userItemId } : {}),
-            state: state.state,
-            ...(outcome ? { outcome } : {}),
-            ...(state.timestamp == null ? {} : { completedAt: state.timestamp })
-          })
-        )
-      }
-    }
-  }
   const digest = createHash('sha256').update(JSON.stringify(additions)).digest('hex')
   await input.journal.appendPlannedLifecycleBatch({
     settlementId: `switch-import:${digest}`,
@@ -282,39 +222,7 @@ export async function catchUpSwitchedCliTranscript(input: {
     plan: () => {
       input.deadline.check()
       input.check?.()
-      return {
-        dispatches: [],
-        mutations: additions
-          .filter((item) => {
-            const current = input.journal.item(
-              input.journal.canonicalItemId(agentJournalItemKey(item.identity))
-            )
-            return !current || turnRecordReplaceable(current.body, item.body)
-          })
-          .map((item) => ({
-            kind: 'item' as const,
-            ...item,
-            turnScope: item.turnScope ?? AGENT_JOURNAL_THREAD_SCOPE
-          }))
-      }
+      return { dispatches: [], mutations: switchTranscriptMutations(input.journal, additions) }
     }
   })
 }
-
-function lifecycleRecord(
-  source: Pick<SwitchTranscriptSource, 'agent' | 'sessionId'>,
-  turnId: string,
-  body?: Extract<AgentJournalItemBody, { kind: 'turn' }>
-): JournalReplacementItem {
-  return {
-    identity: {
-      provider: 'legacy',
-      agent: source.agent,
-      sessionId: source.sessionId,
-      recordId: `turn-lifecycle:${turnId}`
-    },
-    ownerFence: 0,
-    turnScope: AGENT_JOURNAL_THREAD_SCOPE,
-    body: body ?? { kind: 'turn', turnId, state: 'running' }
-  }
-}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts
index 26665d5a563b..21f9cfdb9119 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-source.ts
@@ -9,6 +9,7 @@ import {
   agentSessionRefusalError
 } from '../../../shared/agent-session-wire-refusals'
 import {
+  captureSwitchStoppedCliTurn,
   catchUpSwitchedCliTranscript,
   commitSwitchStoppedCliTurn,
   type SwitchStoppedCliTurn,
@@ -39,6 +40,10 @@ type SwitchSourceContext = Pick<
   }
 }
 export function structuredAgentSessionSwitchSource(context: SwitchSourceContext) {
+  const resumeCursorOf = (sessionId: string) =>
+    agentSessionProviderHandleChainHead(
+      context.deps.store.getRecord(sessionId)?.providerHandleChain ?? []
+    )?.handle.resumeCursor
   return {
     captureSwitchWork: (id: string, deadline: AgentSessionSwitchDeadline) => {
       const count = context.deps.store.admittedSendCount(id)
@@ -223,6 +228,24 @@ export function structuredAgentSessionSwitchSource(context: SwitchSourceContext)
         }
       }
     },
+    /** Read before the stop; `retainedId`: the chat that already holds the conversation. */
+    captureSwitchStop: async (
+      retainedId: string | undefined,
+      source: SwitchTranscriptSource,
+      working: boolean,
+      deadline: AgentSessionSwitchDeadline
+    ) =>
+      captureSwitchStoppedCliTurn(
+        source,
+        working,
+        deadline,
+        retainedId === undefined
+          ? undefined
+          : {
+              journal: (await context.lifetime.conversation(retainedId)).journal,
+              resumeCursor: resumeCursorOf(retainedId)
+            }
+      ),
     commitSwitchStop: async (sessionId: string, stopped: SwitchStoppedCliTurn) => {
       // The label is history: a write that fails leaves the switch to its own result.
       try {
@@ -230,7 +253,8 @@ export function structuredAgentSessionSwitchSource(context: SwitchSourceContext)
         await commitSwitchStoppedCliTurn({
           journal: session.journal,
           stopped,
-          fence: context.deps.store.getRecord(sessionId)?.lease.runtimeFence ?? 0
+          fence: context.deps.store.getRecord(sessionId)?.lease.runtimeFence ?? 0,
+          resumeCursor: resumeCursorOf(sessionId)
         })
         context.subscribers.publish(sessionId, session.journal)
       } catch (error) {
@@ -270,9 +294,7 @@ export function structuredAgentSessionSwitchSource(context: SwitchSourceContext)
         : catchUpSwitchedCliTranscript({
             journal: session.journal,
             source: transcript,
-            resumeCursor: agentSessionProviderHandleChainHead(
-              context.deps.store.getRecord(sessionId)?.providerHandleChain ?? []
-            )?.handle.resumeCursor,
+            resumeCursor: resumeCursorOf(sessionId),
             fence: context.deps.store.getRecord(sessionId)?.lease.runtimeFence ?? 0,
             deadline,
             stopped,
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-stop-label.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-stop-label.test.ts
index 25aa307ddb9b..f60e53ba21a6 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-stop-label.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-stop-label.test.ts
@@ -12,6 +12,9 @@ import { agentSessionFailureFact } from '../../../shared/agent-session-failure'
 import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words'
 import { AGENT_SESSION_GOAL_CONTROL_COPY } from '../../../shared/agent-session-goal-control-copy'
 import { refuse } from '../../../shared/agent-session-wire'
+import { nativeChatTurnMembership } from '../../../shared/native-chat-turn-membership'
+import type { NativeChatMessage } from '../../../shared/native-chat-types'
+import { projectStructuredItemToNativeChat } from '../../../shared/structured-agent-session-projection'
 import {
   claudeProviderHandle,
   codexProviderHandle
@@ -27,6 +30,7 @@ import {
   catchUpSwitchedCliTranscript,
   commitSwitchStoppedCliTurn,
   withSwitchStoppedTurn,
+  type SwitchStoppedCliTurn,
   type SwitchTranscriptSource
 } from './structured-agent-session-switch-import'
 import {
@@ -71,19 +75,49 @@ function open(name: string, agent: AgentType, providerId: string) {
   })
 }
 
-/** The production refresh: Codex's resting import, then the shared one; nothing left writing. */
-async function refresh(journal: AgentSessionJournal, source: SwitchTranscriptSource) {
-  if (source.agent === 'codex') {
-    await catchUpStructuredSessionAtRest({
-      journal,
-      threadId: source.sessionId,
-      filePath: source.filePath,
-      fence: 1,
-      deadline,
-      settleAbandoned: true
-    })
+/** The production refresh (Codex's resting import, or the shared one), with nothing left writing. */
+async function refresh(
+  journal: AgentSessionJournal,
+  source: SwitchTranscriptSource,
+  stopped?: SwitchStoppedCliTurn
+) {
+  await (source.agent === 'codex'
+    ? catchUpStructuredSessionAtRest({
+        journal,
+        threadId: source.sessionId,
+        filePath: source.filePath,
+        fence: 1,
+        deadline,
+        stoppedTurnId: stopped?.turnId,
+        stoppedUserItemKey: stopped?.userItemKey,
+        settleAbandoned: true
+      })
+    : catchUpSwitchedCliTranscript({
+        journal,
+        source,
+        fence: 1,
+        deadline,
+        stopped,
+        settleAbandoned: true
+      }))
+}
+
+/** The prompts in saved order, and each row's turn as the chat groups it. */
+function shownTurns(journal: AgentSessionJournal) {
+  const { items } = journal.snapshot()
+  const messages = items
+    .map(projectStructuredItemToNativeChat)
+    .filter((message): message is NativeChatMessage => message !== null)
+  const { turnKeys } = nativeChatTurnMembership(messages, {
+    items,
+    submissions: journal.submissions()
+  })
+  const prompts = messages.filter((message) => message.role === 'user')
+  return {
+    prompts: prompts.map((message) => message.id),
+    turnOf: (id: string) => turnKeys[messages.findIndex((message) => message.id === id)],
+    rowsAfter: (id: string) => messages.slice(messages.findIndex((message) => message.id === id))
   }
-  await catchUpSwitchedCliTranscript({ journal, source, fence: 1, deadline, settleAbandoned: true })
 }
 
 const turns = (journal: AgentSessionJournal) =>
@@ -173,10 +207,16 @@ describe('the Codex switches QA saw fail after the stop (the marker, no abort ev
         await rename(`${filePath}.hidden`, filePath)
         await refresh(journal, source)
         expectInterrupted(journal, stoppedTurn)
-        const prompt = journal
-          .snapshot()
-          .items.filter(({ body }) => body.kind === 'message' && body.role === 'user')
-        expect(prompt).toHaveLength(3)
+        // The stopped turn's prompt comes last and its rows join its own turn, not the one before.
+        const shown = shownTurns(journal)
+        expect(shown.prompts).toHaveLength(3)
+        const last = shown.prompts[2]!
+        // Either import's name for the stopped prompt: the bare provider id is the shared part.
+        const bare = (key: string) => decodeURIComponent(key).split(':').at(-1)
+        expect(bare(last)).toBe(bare(stopped!.userItemKey))
+        for (const row of shown.rowsAfter(last)) {
+          expect(shown.turnOf(row.id)).toBe(last)
+        }
         const settled = journal.snapshot()
         await journal.close()
         const reopened = await open(`${name}-${String(retained)}`, 'codex', thread)
@@ -206,6 +246,65 @@ describe('the Codex switches QA saw fail after the stop (the marker, no abort ev
   })
 })
 
+describe('a Stop and switch into the chat that already holds the conversation', () => {
+  // Recorded on the QA Mac: the chat ran W2a; the CLI ran W2b to the end, then W2c until Stop.
+  // Rows 0-1 are W2a, 2-3 W2b, 4-6 W2c up to the stop, 7 the notice Claude writes as it stops.
+  it.each([false, true])(
+    'Claude keeps W2a, W2b, W2c in order with W2c its own turn (file hidden after the stop: %s)',
+    async (hidden) => {
+      const rows = lines(
+        await readFile(join(fixtures, 'claude-qa-final-stop-third-turn.jsonl'), 'utf8')
+      )
+      const providerId = String(json(rows[0]!).sessionId)
+      const source = { agent: 'claude' as const, sessionId: providerId, filePath }
+      const journal = await open(`claude-retained-${String(hidden)}`, 'claude', providerId)
+      await writeFile(filePath, `${rows.slice(0, 2).join('\n')}\n`)
+      await importLegacyTranscriptIntoJournal({
+        journal,
+        agent: 'claude',
+        sessionId: providerId,
+        fence: 1,
+        options: { filePath }
+      })
+      await writeFile(filePath, `${rows.slice(0, 7).join('\n')}\n`)
+      const stopped = await captureSwitchStoppedCliTurn(source, true, deadline, { journal })
+      const [w2a, w2aReply, w2b, w2bReply, w2c, , w2cReply] = rows.map(
+        (row) => `claude:${providerId}:${String(json(row).uuid)}`
+      )
+      expect(stopped?.userItemKey).toBe(w2c)
+      await writeFile(filePath, `${rows.join('\n')}\n`)
+      if (hidden) {
+        await rename(filePath, `${filePath}.hidden`)
+      }
+      await commitSwitchStoppedCliTurn({ journal, stopped: stopped!, fence: 1 })
+      const expectInOrder = () => {
+        expectInterrupted(journal, stopped!.turnId)
+        const shown = shownTurns(journal)
+        expect(shown.prompts.slice(0, 3)).toEqual([w2a, w2b, w2c])
+        // Saved in transcript order: W2c's partial reply follows its prompt, after all of W2b.
+        const order = journal.snapshot().items.map(({ itemId }) => itemId)
+        expect(
+          [w2a, w2aReply, w2b, w2bReply, w2c, w2cReply].map((id) => order.indexOf(id))
+        ).toEqual([0, 1, 2, 3, 4, 5])
+        expect(shown.turnOf(w2c)).toBe(w2c)
+        for (const reply of [w2bReply, w2cReply]) {
+          expect([undefined, w2c]).toContain(shown.turnOf(reply))
+        }
+      }
+      if (hidden) {
+        await expect(refresh(journal, source, stopped)).rejects.toThrow()
+        expectInOrder()
+        // Session History's retry once the file is back.
+        await rename(`${filePath}.hidden`, filePath)
+        await refresh(journal, source)
+      } else {
+        await refresh(journal, source, stopped)
+      }
+      expectInOrder()
+    }
+  )
+})
+
 describe("each agent's own stop record, then an idle switch", () => {
   const claudeRows = async () =>
     lines(await readFile(join(fixtures, 'claude-cli-switch-2.1.302.jsonl'), 'utf8'))
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-turn-boundary.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-turn-boundary.test.ts
index c2034191f300..d791c93ab1a8 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-switch-turn-boundary.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-switch-turn-boundary.test.ts
@@ -24,7 +24,14 @@ afterEach(async () => {
 async function arm(remainingMs: number) {
   return armSwitchTurnBoundaryWait(
     { agent: 'codex', sessionId: 'thread', filePath },
-    { agent: 'codex', sessionId: 'thread', userItemKey: 'user', turnId: TURN, baseline: [] },
+    {
+      agent: 'codex',
+      sessionId: 'thread',
+      userItemKey: 'user',
+      turnId: TURN,
+      filePath: '',
+      baseline: { ok: true, items: [], sourceEmpty: true }
+    },
     controller.signal,
     () => remainingMs
   )
@@ -65,7 +72,14 @@ it('never throws: a vanished transcript or an aborted request returns and the st
   expect(performance.now() - started).toBeLessThan(1_500)
   const missing = await armSwitchTurnBoundaryWait(
     { agent: 'codex', sessionId: 'thread', filePath: join(root, 'missing.jsonl') },
-    { agent: 'codex', sessionId: 'thread', userItemKey: 'user', turnId: TURN, baseline: [] },
+    {
+      agent: 'codex',
+      sessionId: 'thread',
+      userItemKey: 'user',
+      turnId: TURN,
+      filePath: '',
+      baseline: { ok: true, items: [], sourceEmpty: true }
+    },
     new AbortController().signal,
     () => 60_000
   )
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
index be52bf16bb23..28a40315b49f 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
@@ -33,7 +33,6 @@ import {
 } from './structured-agent-session-switch-terminal-stop'
 import { agentSessionLeasePossiblyWriting } from '../../../../shared/agent-session-lease-adjudication'
 import { mainAgentState } from '../../../../shared/main-agent-status'
-import { captureSwitchStoppedCliTurn } from '../../../native-chat/agent-session-wire/structured-agent-session-switch-import'
 import { worktreeIdsEqual } from '../../../../shared/worktree/id'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
 import { isAiVaultAgent } from '../../../../shared/ai-vault-types'
@@ -174,7 +173,8 @@ async function switchToChat(
       }
     : retainedSource
   const stopped = before
-    ? await captureSwitchStoppedCliTurn(
+    ? await host.captureSwitchStop(
+        adopt ? undefined : sessionId,
         before,
         Boolean(row && mainAgentState(row) === 'working'),
         deadline

From d4300e9a18362517a4728736c400e0ac975f526a Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 06:24:14 -0700
Subject: [PATCH 204/207] Restore main's daemon and local terminal file shapes

The abandoned two-stage switch design moved code between daemon, provider
and terminal-host modules without changing what it does. Those moves are
now undone: every moved file is main's again and the extracted modules are
gone. What the switch needs stays: the daemon kill fence on the expected
incarnation (its options type now a one-line alias of the provider
contract) and the local terminal's matching fence.
---
 src/main/daemon/client.ts                     | 257 ++++++++++++++++-
 src/main/daemon/daemon-client-connection.ts   | 259 ------------------
 .../daemon-create-or-attach-cancellation.ts   |  16 --
 .../daemon-create-or-attach-contract.ts       |  52 ----
 .../daemon/daemon-pty-adapter-contract.ts     |  62 -----
 .../daemon/daemon-pty-adapter-test-harness.ts |   4 +-
 src/main/daemon/daemon-pty-adapter.ts         |   6 +
 src/main/daemon/daemon-pty-daemon-recovery.ts |   3 +
 .../daemon/daemon-pty-history-isolation.ts    |  44 ---
 src/main/daemon/daemon-pty-reattach-result.ts |  54 ----
 src/main/daemon/daemon-pty-runtime-state.ts   |  81 ++++--
 src/main/daemon/daemon-pty-session-control.ts |  21 +-
 src/main/daemon/daemon-pty-session-input.ts   |  15 -
 src/main/daemon/daemon-pty-session-spawn.ts   |  46 +++-
 src/main/daemon/daemon-pty-spawn-context.ts   |  25 --
 src/main/daemon/daemon-pty-spawn-request.ts   |  37 ++-
 src/main/daemon/daemon-pty-spawn-result.ts    |  53 +++-
 src/main/daemon/daemon-request-router.ts      |  13 +-
 src/main/daemon/daemon-server-request.ts      |  38 ---
 src/main/daemon/daemon-server.ts              |  34 ++-
 ...n-final-checkpoint-caller-deadline.test.ts |   1 -
 src/main/daemon/daemon-terminal-admission.ts  |  71 ++++-
 .../daemon/daemon-terminal-stream-client.ts   |  62 -----
 .../native-pty-spawn-windows.test.ts          | 212 +-------------
 src/main/daemon/session-process-inspection.ts |  62 -----
 .../daemon/session-subprocess.test-fixture.ts |  78 ------
 src/main/daemon/session.test.ts               |  75 ++++-
 src/main/daemon/session.ts                    |  83 ++++--
 src/main/daemon/terminal-creation-work.ts     |   5 +-
 src/main/daemon/terminal-host-inspection.ts   | 119 --------
 ...erminal-host-spawn-input-retention.test.ts |  86 +-----
 src/main/daemon/terminal-host.ts              | 128 ++++++++-
 src/main/daemon/types.ts                      |  65 ++++-
 .../ipc/pty/runtime/spawn-commit-response.ts  |   8 +-
 .../providers/local-pty-provider-state.ts     |  22 +-
 src/main/providers/local-pty-termination.ts   |  20 +-
 src/main/pty-descendant-ancestry.ts           |  52 ----
 src/main/pty-descendant-termination.ts        |  51 +++-
 38 files changed, 944 insertions(+), 1376 deletions(-)
 delete mode 100644 src/main/daemon/daemon-client-connection.ts
 delete mode 100644 src/main/daemon/daemon-create-or-attach-cancellation.ts
 delete mode 100644 src/main/daemon/daemon-create-or-attach-contract.ts
 delete mode 100644 src/main/daemon/daemon-pty-adapter-contract.ts
 delete mode 100644 src/main/daemon/daemon-pty-history-isolation.ts
 delete mode 100644 src/main/daemon/daemon-pty-reattach-result.ts
 delete mode 100644 src/main/daemon/daemon-pty-spawn-context.ts
 delete mode 100644 src/main/daemon/daemon-server-request.ts
 delete mode 100644 src/main/daemon/daemon-terminal-stream-client.ts
 delete mode 100644 src/main/daemon/session-process-inspection.ts
 delete mode 100644 src/main/daemon/session-subprocess.test-fixture.ts
 delete mode 100644 src/main/daemon/terminal-host-inspection.ts
 delete mode 100644 src/main/pty-descendant-ancestry.ts

diff --git a/src/main/daemon/client.ts b/src/main/daemon/client.ts
index c1673c15d81b..22495a18e3e5 100644
--- a/src/main/daemon/client.ts
+++ b/src/main/daemon/client.ts
@@ -1,16 +1,196 @@
-import { DaemonClientConnection } from './daemon-client-connection'
+import type { Socket } from 'node:net'
+import { readDaemonClientToken } from './daemon-client-token'
+import { randomUUID } from 'node:crypto'
 import { encodeNdjson } from './ndjson'
-import { NOTIFY_PREFIX, DaemonConnectionLostError } from './types'
+import {
+  PROTOCOL_VERSION,
+  NOTIFY_PREFIX,
+  DaemonConnectionLostError,
+  DaemonProtocolError,
+  type DaemonEndpointIdentity
+} from './types'
 import { writeRefused, type WriteSettlement } from '../../shared/pty-write-settlement'
+import {
+  armDaemonSocketCloseHandlers,
+  connectDaemonSocket,
+  waitForDaemonConnectionAttempt
+} from './daemon-client-socket-connect'
+import { DaemonClientListeners } from './daemon-client-listener-registry'
+import { sameDaemonIdentity, sendDaemonHello } from './daemon-client-hello-handshake'
+import { DaemonPendingRequests } from './daemon-client-pending-requests'
+import {
+  attachControlResponseReader,
+  attachStreamEventReader
+} from './daemon-client-ndjson-readers'
 import { writeNotifyWithSettlement } from './daemon-client-notify-settlement'
 import { requestDaemonRpc } from './daemon-client-rpc-request'
-export type { DaemonClientOptions } from './daemon-client-connection'
 
+const CONNECT_TIMEOUT_MS = 5000
+const CONNECTION_ATTEMPT_WAIT_MS = CONNECT_TIMEOUT_MS * 4
 const REQUEST_TIMEOUT_MS = 30000
 const NOTIFY_SETTLEMENT_TIMEOUT_MS = 5000
 
-export class DaemonClient extends DaemonClientConnection {
+export type DaemonClientOptions = {
+  socketPath: string
+  tokenPath: string
+  protocolVersion?: number
+}
+
+export class DaemonClient {
+  private socketPath: string
+  private tokenPath: string
+  private protocolVersion: number
+  private clientId = randomUUID()
+
+  private controlSocket: Socket | null = null
+  private streamSocket: Socket | null = null
+  private connected = false
+  private disconnectArmed = false
+  // Ignore old-socket close events after reconnect so they cannot tear down the new connection.
+  private connectionGeneration = 0
+  // Share connection attempts across concurrent pane spawns.
+  private connectingPromise: Promise<void> | null = null
+  private connectionAttemptGeneration = 0
+  private daemonIdentity: DaemonEndpointIdentity | null = null
+  private daemonResizeModel: string | null | undefined
+  private observedAuthenticatedDisconnect = false
+
+  private pendingRequests = new DaemonPendingRequests()
+  private eventListeners = new DaemonClientListeners<(event: unknown) => void>()
+  private disconnectedListeners = new DaemonClientListeners<() => void>()
   private requestCounter = 0
+  private cleanupSocketListeners: (() => void) | null = null
+
+  constructor(opts: DaemonClientOptions) {
+    this.socketPath = opts.socketPath
+    this.tokenPath = opts.tokenPath
+    this.protocolVersion = opts.protocolVersion ?? PROTOCOL_VERSION
+  }
+
+  isConnected(): boolean {
+    return this.connected
+  }
+
+  getDaemonIdentity(): DaemonEndpointIdentity | null {
+    return this.daemonIdentity ? { ...this.daemonIdentity } : null
+  }
+
+  /**
+   * The last daemon's resize model, kept through a disconnect (the next hello replaces it): null is
+   * an older daemon, undefined that no daemon has answered yet.
+   */
+  getDaemonResizeModel(): string | null | undefined {
+    return this.daemonResizeModel
+  }
+
+  hasObservedAuthenticatedDisconnect(): boolean {
+    return this.observedAuthenticatedDisconnect
+  }
+
+  async ensureConnected(): Promise<void> {
+    return this.ensureConnectedWithTimeout(CONNECT_TIMEOUT_MS, false)
+  }
+
+  async ensureConnectedWithin(timeoutMs: number): Promise<void> {
+    return this.ensureConnectedWithTimeout(timeoutMs, true)
+  }
+
+  private async ensureConnectedWithTimeout(
+    timeoutMs: number,
+    sharedBudget: boolean
+  ): Promise<void> {
+    if (this.connected) {
+      return
+    }
+    if (this.connectingPromise) {
+      // Teardown shares one deadline; normal connects allow separate socket and handshake budgets.
+      const waiterTimeoutMs = sharedBudget ? timeoutMs : CONNECTION_ATTEMPT_WAIT_MS
+      return waitForDaemonConnectionAttempt(this.connectingPromise, waiterTimeoutMs)
+    }
+
+    const attemptGeneration = this.connectionAttemptGeneration
+    this.connectingPromise = this.doConnect(timeoutMs, attemptGeneration, sharedBudget)
+    try {
+      await this.connectingPromise
+    } finally {
+      this.connectingPromise = null
+    }
+  }
+
+  private async doConnect(
+    timeoutMs: number,
+    attemptGeneration: number,
+    sharedBudget: boolean
+  ): Promise<void> {
+    const token = readDaemonClientToken(this.tokenPath)
+    const deadlineMs = Date.now() + timeoutMs
+    const remainingMs = (): number =>
+      sharedBudget ? Math.max(1, deadlineMs - Date.now()) : timeoutMs
+    const pendingListenerCleanups: (() => void)[] = []
+    const cleanupPendingListeners = (): void => {
+      for (const cleanup of pendingListenerCleanups.splice(0)) {
+        cleanup()
+      }
+    }
+
+    try {
+      const pendingControlSocket = await connectDaemonSocket(this.socketPath, remainingMs())
+      this.assertConnectionAttemptCurrent(attemptGeneration, pendingControlSocket)
+      this.controlSocket = pendingControlSocket
+      const controlHello = await this.sendHello(this.controlSocket, token, 'control', remainingMs())
+      const controlIdentity = controlHello.identity
+      this.assertConnectionAttemptCurrent(attemptGeneration, this.controlSocket)
+      pendingListenerCleanups.push(
+        attachControlResponseReader(
+          this.controlSocket,
+          (response) => this.pendingRequests.settle(response),
+          controlHello.remainder
+        )
+      )
+
+      const pendingStreamSocket = await connectDaemonSocket(this.socketPath, remainingMs())
+      this.assertConnectionAttemptCurrent(attemptGeneration, pendingStreamSocket)
+      this.streamSocket = pendingStreamSocket
+      const streamHello = await this.sendHello(this.streamSocket, token, 'stream', remainingMs())
+      this.assertConnectionAttemptCurrent(attemptGeneration, this.streamSocket)
+      if (!sameDaemonIdentity(controlIdentity, streamHello.identity)) {
+        throw new DaemonProtocolError('Daemon identity changed during connection')
+      }
+      const streamReader = attachStreamEventReader(this.streamSocket, streamHello, (event) => {
+        this.eventListeners.each((listener) => listener(event))
+      })
+      pendingListenerCleanups.push(streamReader.detach)
+
+      this.assertConnectionAttemptCurrent(attemptGeneration)
+      this.connected = true
+      this.observedAuthenticatedDisconnect = false
+      this.daemonIdentity = controlIdentity
+      this.daemonResizeModel = controlHello.resizeModel
+      this.disconnectArmed = true
+      this.connectionGeneration++
+
+      const gen = this.connectionGeneration
+      pendingListenerCleanups.push(
+        armDaemonSocketCloseHandlers(
+          this.controlSocket,
+          this.streamSocket,
+          () => this.handleDisconnect(gen),
+          streamReader.drainBuffered
+        )
+      )
+      this.cleanupSocketListeners = cleanupPendingListeners
+    } catch (error) {
+      cleanupPendingListeners()
+      this.controlSocket?.destroy()
+      this.streamSocket?.destroy()
+      this.controlSocket = null
+      this.streamSocket = null
+      this.connected = false
+      this.daemonIdentity = null
+      this.disconnectArmed = false
+      throw error
+    }
+  }
 
   async request<T = unknown>(
     type: string,
@@ -91,4 +271,73 @@ export class DaemonClient extends DaemonClientConnection {
   onDisconnected(listener: () => void): () => void {
     return this.disconnectedListeners.add(listener)
   }
+
+  disconnect(): void {
+    this.connectionAttemptGeneration++
+    this.connected = false
+    this.daemonIdentity = null
+    this.disconnectArmed = false
+    this.cleanupActiveSocketListeners()
+
+    this.pendingRequests.rejectAll('Disconnected')
+
+    this.controlSocket?.destroy()
+    this.streamSocket?.destroy()
+    this.controlSocket = null
+    this.streamSocket = null
+  }
+
+  private assertConnectionAttemptCurrent(attemptGeneration: number, socket?: Socket): void {
+    if (attemptGeneration === this.connectionAttemptGeneration) {
+      return
+    }
+    socket?.destroy()
+    throw new DaemonProtocolError('Disconnected')
+  }
+
+  private sendHello(
+    socket: Socket,
+    token: string,
+    role: 'control' | 'stream',
+    timeoutMs: number
+  ): ReturnType<typeof sendDaemonHello> {
+    return sendDaemonHello({
+      socket,
+      token,
+      role,
+      timeoutMs,
+      protocolVersion: this.protocolVersion,
+      clientId: this.clientId
+    })
+  }
+
+  private handleDisconnect(generation: number): void {
+    if (!this.disconnectArmed || generation !== this.connectionGeneration) {
+      return
+    }
+    this.disconnectArmed = false
+    this.connectionAttemptGeneration++
+    if (this.daemonIdentity) {
+      this.observedAuthenticatedDisconnect = true
+    }
+    this.connected = false
+    this.daemonIdentity = null
+    this.daemonResizeModel = null
+    this.cleanupActiveSocketListeners()
+
+    this.pendingRequests.rejectAll('Connection lost')
+
+    this.controlSocket?.destroy()
+    this.streamSocket?.destroy()
+    this.controlSocket = null
+    this.streamSocket = null
+
+    this.disconnectedListeners.each((listener) => listener())
+  }
+
+  private cleanupActiveSocketListeners(): void {
+    const cleanup = this.cleanupSocketListeners
+    this.cleanupSocketListeners = null
+    cleanup?.()
+  }
 }
diff --git a/src/main/daemon/daemon-client-connection.ts b/src/main/daemon/daemon-client-connection.ts
deleted file mode 100644
index f0fc98da236c..000000000000
--- a/src/main/daemon/daemon-client-connection.ts
+++ /dev/null
@@ -1,259 +0,0 @@
-import type { Socket } from 'node:net'
-import { readDaemonClientToken } from './daemon-client-token'
-import { randomUUID } from 'node:crypto'
-import { PROTOCOL_VERSION, DaemonProtocolError, type DaemonEndpointIdentity } from './types'
-import {
-  armDaemonSocketCloseHandlers,
-  connectDaemonSocket,
-  waitForDaemonConnectionAttempt
-} from './daemon-client-socket-connect'
-import { DaemonClientListeners } from './daemon-client-listener-registry'
-import { sameDaemonIdentity, sendDaemonHello } from './daemon-client-hello-handshake'
-import { DaemonPendingRequests } from './daemon-client-pending-requests'
-import {
-  attachControlResponseReader,
-  attachStreamEventReader
-} from './daemon-client-ndjson-readers'
-const CONNECT_TIMEOUT_MS = 5000
-const CONNECTION_ATTEMPT_WAIT_MS = CONNECT_TIMEOUT_MS * 4
-export type DaemonClientOptions = {
-  socketPath: string
-  tokenPath: string
-  protocolVersion?: number
-}
-
-export class DaemonClientConnection {
-  private socketPath: string
-
-  private tokenPath: string
-
-  private protocolVersion: number
-
-  private clientId = randomUUID()
-
-  protected controlSocket: Socket | null = null
-
-  private streamSocket: Socket | null = null
-
-  protected connected = false
-
-  private disconnectArmed = false
-
-  // Old-socket close events cannot tear down a replacement connection.
-  protected connectionGeneration = 0
-
-  // Concurrent pane spawns share their connection attempt.
-  private connectingPromise: Promise<void> | null = null
-
-  private connectionAttemptGeneration = 0
-
-  private daemonIdentity: DaemonEndpointIdentity | null = null
-
-  private daemonResizeModel: string | null | undefined
-
-  private observedAuthenticatedDisconnect = false
-
-  protected pendingRequests = new DaemonPendingRequests()
-
-  protected eventListeners = new DaemonClientListeners<(event: unknown) => void>()
-
-  protected disconnectedListeners = new DaemonClientListeners<() => void>()
-
-  private cleanupSocketListeners: (() => void) | null = null
-
-  constructor(opts: DaemonClientOptions) {
-    this.socketPath = opts.socketPath
-    this.tokenPath = opts.tokenPath
-    this.protocolVersion = opts.protocolVersion ?? PROTOCOL_VERSION
-  }
-
-  isConnected(): boolean {
-    return this.connected
-  }
-
-  getDaemonIdentity(): DaemonEndpointIdentity | null {
-    return this.daemonIdentity ? { ...this.daemonIdentity } : null
-  }
-
-  getDaemonResizeModel(): string | null | undefined {
-    return this.daemonResizeModel
-  }
-
-  hasObservedAuthenticatedDisconnect(): boolean {
-    return this.observedAuthenticatedDisconnect
-  }
-
-  async ensureConnected(): Promise<void> {
-    return this.ensureConnectedWithTimeout(CONNECT_TIMEOUT_MS, false)
-  }
-
-  async ensureConnectedWithin(timeoutMs: number): Promise<void> {
-    return this.ensureConnectedWithTimeout(timeoutMs, true)
-  }
-
-  private async ensureConnectedWithTimeout(
-    timeoutMs: number,
-    sharedBudget: boolean
-  ): Promise<void> {
-    if (this.connected) {
-      return
-    }
-    if (this.connectingPromise) {
-      // Teardown shares one deadline; normal connects allow separate socket and handshake budgets.
-      const waiterTimeoutMs = sharedBudget ? timeoutMs : CONNECTION_ATTEMPT_WAIT_MS
-      return waitForDaemonConnectionAttempt(this.connectingPromise, waiterTimeoutMs)
-    }
-
-    const attemptGeneration = this.connectionAttemptGeneration
-    this.connectingPromise = this.doConnect(timeoutMs, attemptGeneration, sharedBudget)
-    try {
-      await this.connectingPromise
-    } finally {
-      this.connectingPromise = null
-    }
-  }
-
-  private async doConnect(
-    timeoutMs: number,
-    attemptGeneration: number,
-    sharedBudget: boolean
-  ): Promise<void> {
-    const token = readDaemonClientToken(this.tokenPath)
-    const deadlineMs = Date.now() + timeoutMs
-    const remainingMs = (): number =>
-      sharedBudget ? Math.max(1, deadlineMs - Date.now()) : timeoutMs
-    const pendingListenerCleanups: (() => void)[] = []
-    const cleanupPendingListeners = (): void => {
-      for (const cleanup of pendingListenerCleanups.splice(0)) {
-        cleanup()
-      }
-    }
-
-    try {
-      const pendingControlSocket = await connectDaemonSocket(this.socketPath, remainingMs())
-      this.assertConnectionAttemptCurrent(attemptGeneration, pendingControlSocket)
-      this.controlSocket = pendingControlSocket
-      const controlHello = await this.sendHello(this.controlSocket, token, 'control', remainingMs())
-      const controlIdentity = controlHello.identity
-      this.assertConnectionAttemptCurrent(attemptGeneration, this.controlSocket)
-      pendingListenerCleanups.push(
-        attachControlResponseReader(
-          this.controlSocket,
-          (response) => this.pendingRequests.settle(response),
-          controlHello.remainder
-        )
-      )
-
-      const pendingStreamSocket = await connectDaemonSocket(this.socketPath, remainingMs())
-      this.assertConnectionAttemptCurrent(attemptGeneration, pendingStreamSocket)
-      this.streamSocket = pendingStreamSocket
-      const streamHello = await this.sendHello(this.streamSocket, token, 'stream', remainingMs())
-      this.assertConnectionAttemptCurrent(attemptGeneration, this.streamSocket)
-      if (!sameDaemonIdentity(controlIdentity, streamHello.identity)) {
-        throw new DaemonProtocolError('Daemon identity changed during connection')
-      }
-      const streamReader = attachStreamEventReader(this.streamSocket, streamHello, (event) => {
-        this.eventListeners.each((listener) => listener(event))
-      })
-      pendingListenerCleanups.push(streamReader.detach)
-
-      this.assertConnectionAttemptCurrent(attemptGeneration)
-      this.connected = true
-      this.observedAuthenticatedDisconnect = false
-      this.daemonIdentity = controlIdentity
-      this.daemonResizeModel = controlHello.resizeModel
-      this.disconnectArmed = true
-      this.connectionGeneration++
-
-      const gen = this.connectionGeneration
-      pendingListenerCleanups.push(
-        armDaemonSocketCloseHandlers(
-          this.controlSocket,
-          this.streamSocket,
-          () => this.handleDisconnect(gen),
-          streamReader.drainBuffered
-        )
-      )
-      this.cleanupSocketListeners = cleanupPendingListeners
-    } catch (error) {
-      cleanupPendingListeners()
-      this.controlSocket?.destroy()
-      this.streamSocket?.destroy()
-      this.controlSocket = null
-      this.streamSocket = null
-      this.connected = false
-      this.daemonIdentity = null
-      this.disconnectArmed = false
-      throw error
-    }
-  }
-
-  disconnect(): void {
-    this.connectionAttemptGeneration++
-    this.connected = false
-    this.daemonIdentity = null
-    this.disconnectArmed = false
-    this.cleanupActiveSocketListeners()
-
-    this.pendingRequests.rejectAll('Disconnected')
-
-    this.controlSocket?.destroy()
-    this.streamSocket?.destroy()
-    this.controlSocket = null
-    this.streamSocket = null
-  }
-
-  private assertConnectionAttemptCurrent(attemptGeneration: number, socket?: Socket): void {
-    if (attemptGeneration === this.connectionAttemptGeneration) {
-      return
-    }
-    socket?.destroy()
-    throw new DaemonProtocolError('Disconnected')
-  }
-
-  private sendHello(
-    socket: Socket,
-    token: string,
-    role: 'control' | 'stream',
-    timeoutMs: number
-  ): ReturnType<typeof sendDaemonHello> {
-    return sendDaemonHello({
-      socket,
-      token,
-      role,
-      timeoutMs,
-      protocolVersion: this.protocolVersion,
-      clientId: this.clientId
-    })
-  }
-
-  protected handleDisconnect(generation: number): void {
-    if (!this.disconnectArmed || generation !== this.connectionGeneration) {
-      return
-    }
-    this.disconnectArmed = false
-    this.connectionAttemptGeneration++
-    if (this.daemonIdentity) {
-      this.observedAuthenticatedDisconnect = true
-    }
-    this.connected = false
-    this.daemonIdentity = null
-    this.daemonResizeModel = null
-    this.cleanupActiveSocketListeners()
-
-    this.pendingRequests.rejectAll('Connection lost')
-
-    this.controlSocket?.destroy()
-    this.streamSocket?.destroy()
-    this.controlSocket = null
-    this.streamSocket = null
-
-    this.disconnectedListeners.each((listener) => listener())
-  }
-
-  private cleanupActiveSocketListeners(): void {
-    const cleanup = this.cleanupSocketListeners
-    this.cleanupSocketListeners = null
-    cleanup?.()
-  }
-}
diff --git a/src/main/daemon/daemon-create-or-attach-cancellation.ts b/src/main/daemon/daemon-create-or-attach-cancellation.ts
deleted file mode 100644
index 432a84e7d20a..000000000000
--- a/src/main/daemon/daemon-create-or-attach-cancellation.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import type { DaemonRequest } from './types'
-import type { DaemonRequestRouterOptions } from './daemon-request-router'
-export async function cancelDaemonCreateOrAttach(
-  options: DaemonRequestRouterOptions,
-  clientId: string,
-  request: Extract<DaemonRequest, { type: 'cancelCreateOrAttach' }>
-): Promise<unknown> {
-  return {
-    canceled: options.preparations.cancel(request.payload.sessionId, {
-      clientId,
-      ...(typeof request.payload.requestId === 'string'
-        ? { requestId: request.payload.requestId }
-        : {})
-    })
-  }
-}
diff --git a/src/main/daemon/daemon-create-or-attach-contract.ts b/src/main/daemon/daemon-create-or-attach-contract.ts
deleted file mode 100644
index 25e4c94e848d..000000000000
--- a/src/main/daemon/daemon-create-or-attach-contract.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import type { SpawnIntent } from '../../shared/host-spawn-admission'
-import type { StartupCommandDelivery } from '../../shared/codex-startup-delivery'
-import type { TuiAgent } from '../../shared/tui-agent'
-import type { PtyStartupIngressIntent } from '../../shared/pty-startup-ingress'
-import type {
-  AgentSessionExecutionClaim,
-  AgentSessionSurfaceBinding
-} from '../../shared/agent-session-host-authority'
-import type * as HistorySeedProtocol from './terminal-history-seed-transfer-protocol'
-export type CreateOrAttachRequest = {
-  id: string
-  type: 'createOrAttach'
-  payload: HistorySeedProtocol.CreateOrAttachHistorySeedPayload & {
-    sessionId: string
-    cols: number
-    rows: number
-    cwd?: string
-    env?: Record<string, string>
-    envToDelete?: string[]
-    command?: string
-    startupCommandDelivery?: StartupCommandDelivery
-    launchAgent?: TuiAgent
-    /** Rejects an absent session instead of interpreting mount uncertainty as create permission. */
-    attachOnly?: boolean
-    /** Preserve the selected shell instead of defaulting to the daemon’s platform fallback. */
-    shellOverride?: string
-    terminalShellArgs?: string[]
-    /** Preferred WSL distro for generic `wsl.exe` launches. */
-    terminalWindowsWslDistro?: string | null
-    /** Preserve the selected PowerShell implementation so daemon and local spawns resolve the same executable. */
-    terminalWindowsPowerShellImplementation?: 'auto' | 'powershell.exe' | 'pwsh.exe'
-    shellReadySupported?: boolean
-    shellReadyTimeoutMs?: number
-    cancelAfterMs?: number
-    startupIngress?: PtyStartupIngressIntent
-    /** Optional; an old daemon ignores it and an old client omits it (legacy pacing). */
-    spawnIntent?: SpawnIntent
-    agentSessionEnsure?: {
-      claim: AgentSessionExecutionClaim
-      surface: AgentSessionSurfaceBinding
-    }
-  }
-}
-
-export type CancelCreateOrAttachRequest = {
-  id: string
-  type: 'cancelCreateOrAttach'
-  payload: {
-    sessionId: string
-    requestId?: string
-  }
-}
diff --git a/src/main/daemon/daemon-pty-adapter-contract.ts b/src/main/daemon/daemon-pty-adapter-contract.ts
deleted file mode 100644
index 6ee07faf689e..000000000000
--- a/src/main/daemon/daemon-pty-adapter-contract.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import type { WslBridgeBootIdentity } from './daemon-wsl-bridge-boot-identity'
-import type { DaemonEndpointIdentity } from './daemon-hello-protocol'
-import type { TakePendingOutputResult } from './types'
-import type { HistoryCheckpointResult, HistoryRecoveryFreeze } from './history-manager'
-import type { ReadRunningWslDistros } from './daemon-wsl-bridge-exit'
-import type { DaemonPtyRouterExitEvent } from './daemon-pty-router-events'
-export type PendingDaemonSpawnOperation = {
-  exitsBySessionId: Map<string, Omit<DaemonPtyRouterExitEvent, 'id'>[]>
-  ignoredExitIncarnationIds: Set<string>
-  ignoreNextExit: boolean
-}
-
-export type HistoryRecoveryContext = {
-  freeze: HistoryRecoveryFreeze | null
-  unreadableSessionId: string | null
-  identityChanged: boolean
-}
-
-export type SnapshotCheckpointResult = {
-  checkpoint: HistoryCheckpointResult
-  snapshot: NonNullable<TakePendingOutputResult['snapshot']> | null
-}
-
-export type DaemonPtyShutdownOptions = {
-  immediate?: boolean
-  keepHistory?: boolean
-  deadlineMs?: number
-  expectedIncarnationId?: string
-}
-
-export type DaemonPtyAdapterOptions = {
-  socketPath: string
-  tokenPath: string
-  pidPath?: string
-  profileScope?: string
-  protocolVersion?: number
-  historyPath?: string
-  runtimeDir?: string
-  packagedAppVersion?: string | null
-  respawn?: (reason: DaemonRespawnReason) => Promise<void | (() => void)>
-  /** Test seam; production reads the shared, coalesced `wsl --list --running`. */
-  readRunningWslDistros?: ReadRunningWslDistros
-  /** Test seam; production reads each distro's boot id through the background-work gate. */
-  wslBridgeBootIdentity?: WslBridgeBootIdentity
-}
-
-export type DaemonRespawnReason =
-  | 'daemon_died'
-  | 'unhealthy_resolver'
-  | 'stale_bundle'
-  | 'severed_tcc_attribution'
-
-export type DaemonIdentityChangeEvent = {
-  previous: DaemonEndpointIdentity
-  current: DaemonEndpointIdentity
-}
-
-export type DaemonIdleRetirementResult =
-  | { state: 'retiring' }
-  | { state: 'busy'; liveSessions: number | null; admissionReopened?: true }
-  | { state: 'unsupported' }
-  | { state: 'unverifiable' }
diff --git a/src/main/daemon/daemon-pty-adapter-test-harness.ts b/src/main/daemon/daemon-pty-adapter-test-harness.ts
index 6efcc4c49d39..3390d035cdf5 100644
--- a/src/main/daemon/daemon-pty-adapter-test-harness.ts
+++ b/src/main/daemon/daemon-pty-adapter-test-harness.ts
@@ -7,11 +7,10 @@ import type { DaemonPtyAdapterOptions } from './daemon-pty-runtime-state'
 import { DaemonServer } from './daemon-server'
 import { getDaemonSocketPath } from './daemon-spawner'
 import type { SubprocessHandle } from './session-subprocess-handle'
-import type { TerminalHostOptions } from './terminal-host-options'
 import type { DaemonFileLog } from './daemon-file-log'
 import type { TerminalExitCause } from '../../shared/terminal-exit-cause'
 
-export type SpawnSubprocess = TerminalHostOptions['spawnSubprocess']
+export type SpawnSubprocess = ConstructorParameters<typeof DaemonServer>[0]['spawnSubprocess']
 
 export type DaemonAdapterHarness = {
   dir: string
@@ -28,7 +27,6 @@ function createTestDir(): string {
 }
 
 export function createMockSubprocess(dataOnSubscribe?: string): SubprocessHandle & {
-  forceKill: ReturnType<typeof vi.fn<SubprocessHandle['forceKill']>>
   write: ReturnType<typeof vi.fn<(data: string) => void>>
   pause: ReturnType<typeof vi.fn<() => void>>
   resume: ReturnType<typeof vi.fn<() => void>>
diff --git a/src/main/daemon/daemon-pty-adapter.ts b/src/main/daemon/daemon-pty-adapter.ts
index fabb1a33c18d..49f53d08e460 100644
--- a/src/main/daemon/daemon-pty-adapter.ts
+++ b/src/main/daemon/daemon-pty-adapter.ts
@@ -12,6 +12,7 @@ import { isProvenProcessExit } from '../../shared/terminal-exit-cause'
 import { DaemonPtyDaemonRecovery } from './daemon-pty-daemon-recovery'
 import type { DaemonPtyAdapterOptions } from './daemon-pty-runtime-state'
 import { supportsMode2031UnsubscribeFact, type DaemonEvent } from './types'
+import type { DaemonEndpointIdentity } from './daemon-hello-protocol'
 import type { IPtyProvider } from '../providers/pty-provider-contract'
 import type { DeveloperPermissionStatus } from '../../shared/developer-permissions-types'
 import {
@@ -125,6 +126,11 @@ export class DaemonPtyAdapter extends DaemonPtyDaemonRecovery implements IPtyPro
     return 'unknown'
   }
 
+  /** Identity of the daemon behind this adapter; null until hello completes or after a disconnect. */
+  getDaemonIdentity(): DaemonEndpointIdentity | null {
+    return this.client.getDaemonIdentity()
+  }
+
   protected setupEventRouting(): void {
     if (this.removeEventListener) {
       return
diff --git a/src/main/daemon/daemon-pty-daemon-recovery.ts b/src/main/daemon/daemon-pty-daemon-recovery.ts
index a84c2aecb215..54f1f0dd48e3 100644
--- a/src/main/daemon/daemon-pty-daemon-recovery.ts
+++ b/src/main/daemon/daemon-pty-daemon-recovery.ts
@@ -9,8 +9,11 @@ import type { DaemonRespawnReason } from './daemon-pty-runtime-state'
 import type { ListSessionsResult } from './types'
 import type { PtyBackgroundStreamEvent } from '../providers/pty-provider-contract'
 import type { TerminalLimitStatus, TerminalLimitUpdate } from '../../shared/terminal-limit-policy'
+import type { DaemonEndpointIdentity } from './daemon-hello-protocol'
 
 export abstract class DaemonPtyDaemonRecovery extends DaemonPtyCheckpointPersistence {
+  abstract getDaemonIdentity(): DaemonEndpointIdentity | null
+
   async terminalLimit(update?: TerminalLimitUpdate): Promise<TerminalLimitStatus | null> {
     await this.ensureConnected()
     const identity = this.getDaemonIdentity()
diff --git a/src/main/daemon/daemon-pty-history-isolation.ts b/src/main/daemon/daemon-pty-history-isolation.ts
deleted file mode 100644
index 1403162c7582..000000000000
--- a/src/main/daemon/daemon-pty-history-isolation.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import type { PtySpawnOptions } from '../providers/pty-provider-contract'
-import { resolveSafePtyDefaultCwd } from '../providers/pty-default-cwd'
-import { resolveUnixShellPath } from '../providers/local-pty-utils'
-import { injectHistoryEnv, injectWslFishHistoryEnv, logHistoryInjection } from '../terminal-history'
-import { addWslEnvKeys } from '../wsl-env'
-import { resolveWslSessionContext } from './wsl-session-context'
-
-export function withDaemonPtyHistoryIsolation(opts: PtySpawnOptions): PtySpawnOptions {
-  const wslContext = resolveWslSessionContext({
-    cwd: opts.cwd,
-    sessionId: opts.sessionId,
-    shellOverride: opts.shellOverride,
-    terminalWindowsWslDistro: opts.terminalWindowsWslDistro
-  })
-  if (
-    opts.attachOnly === true ||
-    (opts.sessionId !== undefined && opts.isNewSession !== true) ||
-    !opts.worktreeId ||
-    opts.historyIsolationEnabled !== true ||
-    (process.platform === 'win32' && !wslContext)
-  ) {
-    return opts
-  }
-  const env = { ...opts.env }
-  const preferredShell = wslContext
-    ? 'bash'
-    : opts.shellOverride || env.SHELL || process.env.SHELL || '/bin/zsh'
-  const shellPath = resolveUnixShellPath(preferredShell)
-  const historyArgs = [
-    env,
-    opts.worktreeId,
-    shellPath,
-    opts.cwd ?? resolveSafePtyDefaultCwd()
-  ] as const
-  const result = wslContext
-    ? injectHistoryEnv(...historyArgs, { wslDistro: wslContext.distro })
-    : injectHistoryEnv(...historyArgs)
-  if (wslContext) {
-    injectWslFishHistoryEnv(env, opts.worktreeId, wslContext.distro)
-    addWslEnvKeys(env, ['HISTFILE', 'fish_history'])
-  }
-  logHistoryInjection(opts.worktreeId, result)
-  return { ...opts, env }
-}
diff --git a/src/main/daemon/daemon-pty-reattach-result.ts b/src/main/daemon/daemon-pty-reattach-result.ts
deleted file mode 100644
index f6cf82925fdc..000000000000
--- a/src/main/daemon/daemon-pty-reattach-result.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { parseTerminalKittyKeyboardFlags } from '../../shared/terminal-kitty-keyboard-flags'
-import { daemonSpawnResultIdentity } from './daemon-spawn-result-identity'
-import type { PtySpawnResult } from '../providers/pty-provider-contract'
-import type { CreateOrAttachResult, TerminalSnapshot } from './types'
-export function daemonPtyReattachResult(
-  sessionId: string,
-  result: CreateOrAttachResult,
-  pid: number | null,
-  providerWslDistro: string | null | undefined,
-  reattachSnapshot: TerminalSnapshot,
-  providerSequence: PtySpawnResult['providerSequence']
-): PtySpawnResult {
-  const reattachProviderSequence =
-    typeof reattachSnapshot.outputSequence === 'number'
-      ? { value: reattachSnapshot.outputSequence, generation: 'continued' as const }
-      : providerSequence
-  const isAltScreen = reattachSnapshot.modes.alternateScreen
-  const snapshotPrefix = reattachSnapshot.scrollbackAnsi + reattachSnapshot.rehydrateSequences
-  const snapshotFrame = reattachSnapshot.snapshotAnsi
-  const snapshotPayload = snapshotPrefix + snapshotFrame
-  // Reassert kitty flags after payload screen switches; carry known zero separately from unknown.
-  const kittyKeyboardFlags = parseTerminalKittyKeyboardFlags(
-    reattachSnapshot.modes.kittyKeyboardFlags
-  )
-  return {
-    id: sessionId,
-    ...daemonSpawnResultIdentity(result),
-    pid,
-    ...(providerWslDistro !== undefined ? { wslDistro: providerWslDistro } : {}),
-    snapshot: snapshotPayload,
-    snapshotCols: reattachSnapshot.cols,
-    snapshotRows: reattachSnapshot.rows,
-    // Only alt frames need a separate restore; normal history can replay at its captured grid.
-    ...(isAltScreen && snapshotFrame && reattachSnapshot.frameRestoreAnsi
-      ? {
-          snapshotPrefixAnsi: snapshotPrefix,
-          snapshotFrameAnsi: snapshotFrame,
-          snapshotFrameRestoreAnsi: reattachSnapshot.frameRestoreAnsi
-        }
-      : {}),
-    ...(reattachProviderSequence ? { providerSequence: reattachProviderSequence } : {}),
-    ...(kittyKeyboardFlags !== undefined ? { snapshotKittyKeyboardFlags: kittyKeyboardFlags } : {}),
-    ...(reattachSnapshot.terminalOwner
-      ? { snapshotTerminalOwner: reattachSnapshot.terminalOwner }
-      : {}),
-    isAlternateScreen: isAltScreen,
-    // Snapshot ANSI lacks title frames; carry the title separately across relaunch.
-    ...(reattachSnapshot.lastTitle ? { lastTitle: reattachSnapshot.lastTitle } : {}),
-    // Replay the mid-escape tail after renderer reset so split escapes do not render literally.
-    ...(reattachSnapshot.pendingEscapeTailAnsi
-      ? { pendingEscapeTailAnsi: reattachSnapshot.pendingEscapeTailAnsi }
-      : {})
-  }
-}
diff --git a/src/main/daemon/daemon-pty-runtime-state.ts b/src/main/daemon/daemon-pty-runtime-state.ts
index fe9c9681cba3..674d15a2bb62 100644
--- a/src/main/daemon/daemon-pty-runtime-state.ts
+++ b/src/main/daemon/daemon-pty-runtime-state.ts
@@ -1,19 +1,3 @@
-import type {
-  PendingDaemonSpawnOperation,
-  DaemonPtyAdapterOptions,
-  DaemonIdentityChangeEvent,
-  DaemonIdleRetirementResult
-} from './daemon-pty-adapter-contract'
-export type {
-  PendingDaemonSpawnOperation,
-  HistoryRecoveryContext,
-  SnapshotCheckpointResult,
-  DaemonPtyShutdownOptions,
-  DaemonPtyAdapterOptions,
-  DaemonRespawnReason,
-  DaemonIdentityChangeEvent,
-  DaemonIdleRetirementResult
-} from './daemon-pty-adapter-contract'
 import { DaemonClient } from './client'
 import { DaemonPtyInputClosedIncarnations } from './daemon-pty-input-closed-incarnations'
 import { DaemonPtyInventoryObservation } from './daemon-pty-inventory-observation'
@@ -36,15 +20,71 @@ import {
   GIT_CREDENTIAL_GUARD_HOST_PROTOCOL_VERSION,
   PROTOCOL_VERSION,
   supportsMode2031UnsubscribeFact,
-  supportsPtyStartupIngress
+  supportsPtyStartupIngress,
+  type TakePendingOutputResult
 } from './types'
 import { ColdRestorePayloadCache } from './cold-restore-payload-cache'
-import { HistoryManager } from './history-manager'
+import {
+  HistoryManager,
+  type HistoryCheckpointResult,
+  type HistoryRecoveryFreeze
+} from './history-manager'
 import { HistoryReader } from './history-reader'
 import type { PtyBackgroundStreamEvent } from '../providers/pty-provider-contract'
 import type { DaemonPtyRouterDataEvent, DaemonPtyRouterExitEvent } from './daemon-pty-router-events'
 import type { ReadRunningWslDistros } from './daemon-wsl-bridge-exit'
 import { WslBridgeBootIdentity } from './daemon-wsl-bridge-boot-identity'
+
+export type PendingDaemonSpawnOperation = {
+  exitsBySessionId: Map<string, Omit<DaemonPtyRouterExitEvent, 'id'>[]>
+  ignoredExitIncarnationIds: Set<string>
+  ignoreNextExit: boolean
+}
+
+export type HistoryRecoveryContext = {
+  freeze: HistoryRecoveryFreeze | null
+  unreadableSessionId: string | null
+  identityChanged: boolean
+}
+
+export type SnapshotCheckpointResult = {
+  checkpoint: HistoryCheckpointResult
+  snapshot: NonNullable<TakePendingOutputResult['snapshot']> | null
+}
+
+export type DaemonPtyAdapterOptions = {
+  socketPath: string
+  tokenPath: string
+  pidPath?: string
+  profileScope?: string
+  protocolVersion?: number
+  historyPath?: string
+  runtimeDir?: string
+  packagedAppVersion?: string | null
+  respawn?: (reason: DaemonRespawnReason) => Promise<void | (() => void)>
+  /** Test seam; production reads the shared, coalesced `wsl --list --running`. */
+  readRunningWslDistros?: ReadRunningWslDistros
+  /** Test seam; production reads each distro's boot id through the background-work gate. */
+  wslBridgeBootIdentity?: WslBridgeBootIdentity
+}
+
+export type DaemonRespawnReason =
+  | 'daemon_died'
+  | 'unhealthy_resolver'
+  | 'stale_bundle'
+  | 'severed_tcc_attribution'
+
+export type DaemonIdentityChangeEvent = {
+  previous: DaemonEndpointIdentity
+  current: DaemonEndpointIdentity
+}
+
+export type DaemonIdleRetirementResult =
+  | { state: 'retiring' }
+  | { state: 'busy'; liveSessions: number | null; admissionReopened?: true }
+  | { state: 'unsupported' }
+  | { state: 'unverifiable' }
+
 export abstract class DaemonPtyRuntimeState {
   protected readonly readRunningWslDistros: ReadRunningWslDistros | undefined
   protected readonly wslBridgeBootIdentity: WslBridgeBootIdentity
@@ -255,11 +295,6 @@ export abstract class DaemonPtyRuntimeState {
     return this.historyManager
   }
 
-  /** Identity of the daemon behind this adapter; null until hello completes or after a disconnect. */
-  getDaemonIdentity(): DaemonEndpointIdentity | null {
-    return this.client.getDaemonIdentity()
-  }
-
   getLastAuthenticatedDaemonIdentity(): DaemonEndpointIdentity | null {
     return this.lastAuthenticatedIdentity ? { ...this.lastAuthenticatedIdentity } : null
   }
diff --git a/src/main/daemon/daemon-pty-session-control.ts b/src/main/daemon/daemon-pty-session-control.ts
index 1f0b573d928e..1a4363ccf05b 100644
--- a/src/main/daemon/daemon-pty-session-control.ts
+++ b/src/main/daemon/daemon-pty-session-control.ts
@@ -1,4 +1,3 @@
-import type { DaemonPtyShutdownOptions } from './daemon-pty-runtime-state'
 import { coldRestorePayloadFromInfo, type ColdRestorePayload } from './cold-restore-payload-cache'
 import { isUnknownRequestTypeError } from './daemon-endpoint-errors'
 import { GET_SIZE_PROTOCOL_VERSION } from './daemon-protocol-version'
@@ -13,11 +12,14 @@ import { logSleepFolderRead, readDaemonWslSleepCwdWithFacts } from './daemon-wsl
 import * as unlistedSession from './daemon-unlisted-session'
 import { SessionNotFoundError, type ListSessionsResult } from './types'
 import { resolveSafePtyDefaultCwd } from '../providers/pty-default-cwd'
-import type { PtySpawnResult } from '../providers/pty-provider-contract'
+import type { IPtyProvider, PtySpawnResult } from '../providers/pty-provider-contract'
+
+type DaemonPtyShutdownOptions = Parameters<IPtyProvider['shutdown']>[1]
 
 export const LIVENESS_PROBE_TIMEOUT_MS = 2_000
 
 const MAX_TOMBSTONES = 1000
+// A busy daemon must not eat the final checkpoint's share of the Sleep deadline.
 
 export abstract class DaemonPtySessionControl extends DaemonPtySessionInput {
   protected abstract adoptListedSessionForSleep(
@@ -300,6 +302,21 @@ export abstract class DaemonPtySessionControl extends DaemonPtySessionInput {
     return coldRestorePayloadFromInfo(restoreInfo)
   }
 
+  async sendSignal(id: string, signal: string): Promise<void> {
+    await this.client.request('signal', { sessionId: id, signal })
+  }
+
+  async getCwd(id: string): Promise<string> {
+    try {
+      const result = await this.client.request<{ cwd: string | null }>('getCwd', {
+        sessionId: id
+      })
+      return result.cwd ?? ''
+    } catch {
+      return ''
+    }
+  }
+
   async getInitialCwd(id: string): Promise<string> {
     return this.initialCwds.get(id) ?? ''
   }
diff --git a/src/main/daemon/daemon-pty-session-input.ts b/src/main/daemon/daemon-pty-session-input.ts
index a2d5e1b7e4ce..44123e92f27b 100644
--- a/src/main/daemon/daemon-pty-session-input.ts
+++ b/src/main/daemon/daemon-pty-session-input.ts
@@ -75,21 +75,6 @@ export abstract class DaemonPtySessionInput extends DaemonPtySessionSpawn {
     this.reconnectAfterWriteFailure()
   }
 
-  async sendSignal(id: string, signal: string): Promise<void> {
-    await this.client.request('signal', { sessionId: id, signal })
-  }
-
-  async getCwd(id: string): Promise<string> {
-    try {
-      const result = await this.client.request<{ cwd: string | null }>('getCwd', {
-        sessionId: id
-      })
-      return result.cwd ?? ''
-    } catch {
-      return ''
-    }
-  }
-
   resize(id: string, cols: number, rows: number): void {
     this.markSessionDirty(id)
     this.client.notify('resize', { sessionId: id, cols, rows })
diff --git a/src/main/daemon/daemon-pty-session-spawn.ts b/src/main/daemon/daemon-pty-session-spawn.ts
index fc7e8ef3fb69..b911ca9d9fd5 100644
--- a/src/main/daemon/daemon-pty-session-spawn.ts
+++ b/src/main/daemon/daemon-pty-session-spawn.ts
@@ -1,4 +1,3 @@
-import { withDaemonPtyHistoryIsolation } from './daemon-pty-history-isolation'
 import type {
   HistoryRecoveryContext,
   PendingDaemonSpawnOperation
@@ -20,6 +19,8 @@ import { resolveSafePtyDefaultCwd } from '../providers/pty-default-cwd'
 import { probeRecoveredStartupCwdDirectory } from '../ipc/pty/host-env/startup-cwd-directory-exists'
 import { resolveUnixShellPath } from '../providers/local-pty-utils'
 import type { PtySpawnOptions, PtySpawnResult } from '../providers/pty-provider-contract'
+import { injectHistoryEnv, injectWslFishHistoryEnv, logHistoryInjection } from '../terminal-history'
+import { addWslEnvKeys } from '../wsl-env'
 import { holdPassiveRestoreOfStoppedWslDistro } from './daemon-wsl-passive-restore-hold'
 
 export abstract class DaemonPtySessionSpawn extends DaemonPtySpawnResult {
@@ -51,8 +52,11 @@ export abstract class DaemonPtySessionSpawn extends DaemonPtySpawnResult {
       identityChanged: false
     }
     try {
-      const create = () => this.doSpawn({ ...spawnOpts, sessionId }, operation, historyRecovery)
-      return await this.withHistorySpawnLock(sessionId, () => this.withDaemonRetry(create))
+      return await this.withHistorySpawnLock(sessionId, () =>
+        this.withDaemonRetry(() =>
+          this.doSpawn({ ...spawnOpts, sessionId }, operation, historyRecovery)
+        )
+      )
     } finally {
       if (historyRecovery.freeze) {
         this.historyManager?.abandonRecoveryFreeze(historyRecovery.freeze)
@@ -66,7 +70,41 @@ export abstract class DaemonPtySessionSpawn extends DaemonPtySpawnResult {
   }
 
   protected withHistoryIsolation(opts: PtySpawnOptions): PtySpawnOptions {
-    return withDaemonPtyHistoryIsolation(opts)
+    const wslContext = resolveWslSessionContext({
+      cwd: opts.cwd,
+      sessionId: opts.sessionId,
+      shellOverride: opts.shellOverride,
+      terminalWindowsWslDistro: opts.terminalWindowsWslDistro
+    })
+    if (
+      opts.attachOnly === true ||
+      (opts.sessionId !== undefined && opts.isNewSession !== true) ||
+      !opts.worktreeId ||
+      opts.historyIsolationEnabled !== true ||
+      (process.platform === 'win32' && !wslContext)
+    ) {
+      return opts
+    }
+    const env = { ...opts.env }
+    const preferredShell = wslContext
+      ? 'bash'
+      : opts.shellOverride || env.SHELL || process.env.SHELL || '/bin/zsh'
+    const shellPath = resolveUnixShellPath(preferredShell)
+    const historyArgs = [
+      env,
+      opts.worktreeId,
+      shellPath,
+      opts.cwd ?? resolveSafePtyDefaultCwd()
+    ] as const
+    const result = wslContext
+      ? injectHistoryEnv(...historyArgs, { wslDistro: wslContext.distro })
+      : injectHistoryEnv(...historyArgs)
+    if (wslContext) {
+      injectWslFishHistoryEnv(env, opts.worktreeId, wslContext.distro)
+      addWslEnvKeys(env, ['HISTFILE', 'fish_history'])
+    }
+    logHistoryInjection(opts.worktreeId, result)
+    return { ...opts, env }
   }
 
   protected async doSpawn(
diff --git a/src/main/daemon/daemon-pty-spawn-context.ts b/src/main/daemon/daemon-pty-spawn-context.ts
deleted file mode 100644
index e0fc08fa1f64..000000000000
--- a/src/main/daemon/daemon-pty-spawn-context.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import type {
-  HistoryRecoveryContext,
-  PendingDaemonSpawnOperation
-} from './daemon-pty-runtime-state'
-import type { ColdRestoreInfo } from './history-reader'
-import type { PtySpawnOptions } from '../providers/pty-provider-contract'
-export type DaemonPtySpawnContext = {
-  opts: PtySpawnOptions
-  operation: PendingDaemonSpawnOperation
-  historyRecovery: HistoryRecoveryContext
-  requestedSessionId: string
-  attachOnly: boolean
-  emulateLegacyAttachOnly: boolean
-  sessionId: string
-  wslDistro: string | undefined
-  restoreInfo: ColdRestoreInfo | null
-  restoreSkippedForLiveSession: boolean
-  effectiveCwd: string | undefined
-  effectiveCols: number
-  effectiveRows: number
-  shellReadySupported: boolean
-  shellReadyTimeoutMs: number | undefined
-  historySeedSegments: readonly string[] | null
-  detectColdRestore(options?: { ignoreCleanEnd?: boolean }): Promise<ColdRestoreInfo | null>
-}
diff --git a/src/main/daemon/daemon-pty-spawn-request.ts b/src/main/daemon/daemon-pty-spawn-request.ts
index 19fb39590e2e..fc7271d51100 100644
--- a/src/main/daemon/daemon-pty-spawn-request.ts
+++ b/src/main/daemon/daemon-pty-spawn-request.ts
@@ -1,14 +1,14 @@
-import type { DaemonPtySpawnContext } from './daemon-pty-spawn-context'
-import { DaemonPtyRuntimeState } from './daemon-pty-runtime-state'
-import { HISTORY_SEED_TRANSFER_PROTOCOL_VERSION } from './daemon-protocol-version'
 import type { SpawnIntent } from '../../shared/host-spawn-admission'
 import type { ColdRestorePayload } from './cold-restore-payload-cache'
 import type { DaemonAuditObservation } from './daemon-audit-classifier'
-import type {
-  PendingDaemonSpawnOperation,
-  SnapshotCheckpointResult
+import {
+  DaemonPtyRuntimeState,
+  type HistoryRecoveryContext,
+  type PendingDaemonSpawnOperation,
+  type SnapshotCheckpointResult
 } from './daemon-pty-runtime-state'
 import { isDaemonGoneError } from './daemon-endpoint-errors'
+import { HISTORY_SEED_TRANSFER_PROTOCOL_VERSION } from './daemon-protocol-version'
 import type { ColdRestoreInfo } from './history-reader'
 import { NdjsonLineTooLongError } from './ndjson'
 import {
@@ -17,16 +17,35 @@ import {
   TERMINAL_HISTORY_INLINE_SEED_CODE_UNITS
 } from './terminal-history-seed-chunks'
 import type { CreateOrAttachResult, GetSnapshotResult } from './types'
-import type { PtySpawnResult } from '../providers/pty-provider-contract'
+import type { PtySpawnOptions, PtySpawnResult } from '../providers/pty-provider-contract'
 import { resolveSafePtyDefaultCwd } from '../providers/pty-default-cwd'
 import { isMissingWorkingDirectoryError } from '../providers/working-directory-validation'
-export { type DaemonPtySpawnContext } from './daemon-pty-spawn-context'
 
 /** A daemon kept running across an update trusts `interactive` even for a claimed resume. */
 function forwardedSpawnIntent(intent: SpawnIntent, claim: unknown): SpawnIntent {
   return intent === 'interactive' && claim !== undefined ? 'automatic-restore' : intent
 }
 
+export type DaemonPtySpawnContext = {
+  opts: PtySpawnOptions
+  operation: PendingDaemonSpawnOperation
+  historyRecovery: HistoryRecoveryContext
+  requestedSessionId: string
+  attachOnly: boolean
+  emulateLegacyAttachOnly: boolean
+  sessionId: string
+  wslDistro: string | undefined
+  restoreInfo: ColdRestoreInfo | null
+  restoreSkippedForLiveSession: boolean
+  effectiveCwd: string | undefined
+  effectiveCols: number
+  effectiveRows: number
+  shellReadySupported: boolean
+  shellReadyTimeoutMs: number | undefined
+  historySeedSegments: readonly string[] | null
+  detectColdRestore(options?: { ignoreCleanEnd?: boolean }): Promise<ColdRestoreInfo | null>
+}
+
 export abstract class DaemonPtySpawnRequest extends DaemonPtyRuntimeState {
   protected abstract takeSnapshotAndCheckpoint(
     sessionId: string,
@@ -87,7 +106,7 @@ export abstract class DaemonPtySpawnRequest extends DaemonPtyRuntimeState {
     context: DaemonPtySpawnContext,
     historySeedSegments: readonly string[] | null
   ): Promise<CreateOrAttachResult> {
-    const requestCreateOrAttach = async (
+    const requestCreateOrAttach = (
       historySeed: string | undefined,
       historySeedTransferId: string | undefined
     ) => {
diff --git a/src/main/daemon/daemon-pty-spawn-result.ts b/src/main/daemon/daemon-pty-spawn-result.ts
index 72371356e903..d6b35d3d8ffa 100644
--- a/src/main/daemon/daemon-pty-spawn-result.ts
+++ b/src/main/daemon/daemon-pty-spawn-result.ts
@@ -1,5 +1,5 @@
-import { daemonPtyReattachResult } from './daemon-pty-reattach-result'
 import { isAgentSessionClaimedSpawnResult } from '../../shared/agent-session-host-authority'
+import { parseTerminalKittyKeyboardFlags } from '../../shared/terminal-kitty-keyboard-flags'
 import { daemonSpawnResultIdentity } from './daemon-spawn-result-identity'
 import { retireUnexpectedAttachOnlySpawn } from './daemon-attach-only-retirement'
 import { DaemonPtySpawnRequest, type DaemonPtySpawnContext } from './daemon-pty-spawn-request'
@@ -8,6 +8,7 @@ import { takeHistoryRecoveryFreeze } from './daemon-history-recovery-freeze'
 import { getRecoveredHistorySeedSegments } from './terminal-history-seed-segments'
 import { SessionNotFoundError, type CreateOrAttachResult } from './types'
 import type { PtySpawnResult } from '../providers/pty-provider-contract'
+
 export abstract class DaemonPtySpawnResult extends DaemonPtySpawnRequest {
   protected async finishSpawn(
     context: DaemonPtySpawnContext,
@@ -279,15 +280,47 @@ export abstract class DaemonPtySpawnResult extends DaemonPtySpawnRequest {
     }
 
     const reattachSnapshot = await this.overlayDurableRestoreSnapshot(sessionId, result.snapshot)
-    return finalizeSpawnResult(
-      daemonPtyReattachResult(
-        sessionId,
-        result,
-        pid,
-        providerWslDistro,
-        reattachSnapshot,
-        providerSequence
-      )
+    const reattachProviderSequence =
+      typeof reattachSnapshot.outputSequence === 'number'
+        ? { value: reattachSnapshot.outputSequence, generation: 'continued' as const }
+        : providerSequence
+    const isAltScreen = reattachSnapshot.modes.alternateScreen
+    const snapshotPrefix = reattachSnapshot.scrollbackAnsi + reattachSnapshot.rehydrateSequences
+    const snapshotFrame = reattachSnapshot.snapshotAnsi
+    // Reassert kitty flags after payload screen switches; carry known zero separately from unknown.
+    const kittyKeyboardFlags = parseTerminalKittyKeyboardFlags(
+      reattachSnapshot.modes.kittyKeyboardFlags
     )
+    return finalizeSpawnResult({
+      id: sessionId,
+      ...daemonSpawnResultIdentity(result),
+      pid,
+      ...(providerWslDistro !== undefined ? { wslDistro: providerWslDistro } : {}),
+      snapshot: snapshotPrefix + snapshotFrame,
+      snapshotCols: reattachSnapshot.cols,
+      snapshotRows: reattachSnapshot.rows,
+      // Only alt frames need a separate restore; normal history can replay at its captured grid.
+      ...(isAltScreen && snapshotFrame && reattachSnapshot.frameRestoreAnsi
+        ? {
+            snapshotPrefixAnsi: snapshotPrefix,
+            snapshotFrameAnsi: snapshotFrame,
+            snapshotFrameRestoreAnsi: reattachSnapshot.frameRestoreAnsi
+          }
+        : {}),
+      ...(reattachProviderSequence ? { providerSequence: reattachProviderSequence } : {}),
+      ...(kittyKeyboardFlags !== undefined
+        ? { snapshotKittyKeyboardFlags: kittyKeyboardFlags }
+        : {}),
+      ...(reattachSnapshot.terminalOwner
+        ? { snapshotTerminalOwner: reattachSnapshot.terminalOwner }
+        : {}),
+      isAlternateScreen: isAltScreen,
+      // Snapshot ANSI lacks title frames; carry the title separately across relaunch.
+      ...(reattachSnapshot.lastTitle ? { lastTitle: reattachSnapshot.lastTitle } : {}),
+      // Replay the mid-escape tail after renderer reset so split escapes do not render literally.
+      ...(reattachSnapshot.pendingEscapeTailAnsi
+        ? { pendingEscapeTailAnsi: reattachSnapshot.pendingEscapeTailAnsi }
+        : {})
+    })
   }
 }
diff --git a/src/main/daemon/daemon-request-router.ts b/src/main/daemon/daemon-request-router.ts
index 68907e06adc7..39bcdf63bedd 100644
--- a/src/main/daemon/daemon-request-router.ts
+++ b/src/main/daemon/daemon-request-router.ts
@@ -1,4 +1,3 @@
-import { cancelDaemonCreateOrAttach } from './daemon-create-or-attach-cancellation'
 import { handleDaemonTerminalKill } from './daemon-terminal-kill'
 import { handleDaemonFencedTermination } from './daemon-fenced-termination'
 import { performance } from 'node:perf_hooks'
@@ -16,7 +15,8 @@ import { DaemonHealthRequests } from './daemon-health-requests'
 import type { TerminalHistorySeedTransferRegistry } from './terminal-history-seed-transfer-registry'
 import type { TerminalHost } from './terminal-host'
 import { SessionNotFoundError, type DaemonRequest } from './types'
-export type DaemonRequestRouterOptions = {
+
+type DaemonRequestRouterOptions = {
   host: TerminalHost
   connections: DaemonClientConnections
   lifecycle: DaemonServerLifecycle
@@ -65,7 +65,14 @@ export class DaemonRequestRouter {
       case 'createOrAttach':
         return this.options.admission.createOrAttach(clientId, request)
       case 'cancelCreateOrAttach':
-        return cancelDaemonCreateOrAttach(this.options, clientId, request)
+        return {
+          canceled: this.options.preparations.cancel(request.payload.sessionId, {
+            clientId,
+            ...(typeof request.payload.requestId === 'string'
+              ? { requestId: request.payload.requestId }
+              : {})
+          })
+        }
       case 'closeStartupQueryAuthority':
         return {
           appliedSeq: this.options.host.closeStartupQueryAuthority(request.payload.sessionId)
diff --git a/src/main/daemon/daemon-server-request.ts b/src/main/daemon/daemon-server-request.ts
deleted file mode 100644
index 4c74f1b7b43b..000000000000
--- a/src/main/daemon/daemon-server-request.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import type { Socket } from 'node:net'
-import type { DaemonEndpointLifecycle } from './daemon-endpoint-lifecycle'
-import type { DaemonRequestRouter } from './daemon-request-router'
-import type { DaemonServerLifecycle } from './daemon-server-lifecycle'
-import type { DaemonAutomaticWorkGuard } from './daemon-automatic-work-guard'
-import { answerAutomaticWorkRequest } from './daemon-automatic-work-protocol'
-import type { DaemonRequest } from './types'
-import type { HostTerminalPolicy } from './host-terminal-policy'
-import { answerTerminalLimitRequest } from './daemon-terminal-limit-protocol'
-import { answerDaemonControlRequest } from './daemon-control-request'
-export async function handleDaemonRequest(
-  options: {
-    automaticWork: DaemonAutomaticWorkGuard
-    endpoint: DaemonEndpointLifecycle
-    requestRouter: DaemonRequestRouter
-    terminalPolicy: HostTerminalPolicy
-    terminalPolicyNonce: string
-    lifecycle: DaemonServerLifecycle
-  },
-  socket: Socket,
-  clientId: string,
-  request: DaemonRequest
-): Promise<void> {
-  return answerDaemonControlRequest(
-    socket,
-    request,
-    async () =>
-      answerTerminalLimitRequest(
-        request,
-        options.terminalPolicy,
-        options.terminalPolicyNonce,
-        () => options.lifecycle.isAcceptingWork() && !options.endpoint.hasLostOwnership()
-      ) ??
-      answerAutomaticWorkRequest(request, options.automaticWork, options.endpoint) ??
-      options.requestRouter.route(clientId, request),
-    () => options.lifecycle.startPendingShutdownReply(clientId, request.id)
-  )
-}
diff --git a/src/main/daemon/daemon-server.ts b/src/main/daemon/daemon-server.ts
index 59f160974cc0..e322b91aba96 100644
--- a/src/main/daemon/daemon-server.ts
+++ b/src/main/daemon/daemon-server.ts
@@ -1,4 +1,3 @@
-import { handleDaemonRequest } from './daemon-server-request'
 import { randomUUID } from 'node:crypto'
 import type { Socket } from 'node:net'
 import { setImmediate as waitForImmediate } from 'node:timers/promises'
@@ -23,8 +22,12 @@ import { checkPtySpawnHealth } from './pty-subprocess'
 import { TerminalHistorySeedTransferRegistry } from './terminal-history-seed-transfer-registry'
 import { TerminalHost } from './terminal-host'
 import { DaemonAutomaticWorkGuard } from './daemon-automatic-work-guard'
+import { answerAutomaticWorkRequest } from './daemon-automatic-work-protocol'
 import { HostTerminalPolicy } from './host-terminal-policy'
+import { answerTerminalLimitRequest } from './daemon-terminal-limit-protocol'
 import { CLEAN_DISCONNECT_PROTOCOL_VERSION, PROTOCOL_VERSION, type DaemonRequest } from './types'
+import { answerDaemonControlRequest } from './daemon-control-request'
+
 export class DaemonServer {
   private static readonly INITIAL_ADOPTION_TIMEOUT_MS = 2 * 60 * 1000
 
@@ -285,19 +288,24 @@ export class DaemonServer {
     this.connections.dispose()
   }
 
-  private handleRequest(socket: Socket, clientId: string, request: DaemonRequest): Promise<void> {
-    return handleDaemonRequest(
-      {
-        automaticWork: this.automaticWork,
-        endpoint: this.endpoint,
-        requestRouter: this.requestRouter,
-        lifecycle: this.lifecycle,
-        terminalPolicy: this.terminalPolicy,
-        terminalPolicyNonce: this.terminalPolicyNonce
-      },
+  private async handleRequest(
+    socket: Socket,
+    clientId: string,
+    request: DaemonRequest
+  ): Promise<void> {
+    return answerDaemonControlRequest(
       socket,
-      clientId,
-      request
+      request,
+      async () =>
+        answerTerminalLimitRequest(
+          request,
+          this.terminalPolicy,
+          this.terminalPolicyNonce,
+          () => this.lifecycle.isAcceptingWork() && !this.endpoint.hasLostOwnership()
+        ) ??
+        answerAutomaticWorkRequest(request, this.automaticWork, this.endpoint) ??
+        this.requestRouter.route(clientId, request),
+      () => this.lifecycle.startPendingShutdownReply(clientId, request.id)
     )
   }
 }
diff --git a/src/main/daemon/daemon-shutdown-final-checkpoint-caller-deadline.test.ts b/src/main/daemon/daemon-shutdown-final-checkpoint-caller-deadline.test.ts
index 110e6657858c..050b12f53131 100644
--- a/src/main/daemon/daemon-shutdown-final-checkpoint-caller-deadline.test.ts
+++ b/src/main/daemon/daemon-shutdown-final-checkpoint-caller-deadline.test.ts
@@ -113,7 +113,6 @@ describe('STA-4228 keep-history stop bounds only the caller wait on the final ch
     rmSync(dir, { recursive: true, force: true })
   })
 
-  /** Wedges one session's checkpoint at the history-write layer until explicitly released. */
   function stallCheckpointFor(stalledSessionId: string): { release: () => void } {
     const manager = adapter.getHistoryManager()
     expect(manager).not.toBeNull()
diff --git a/src/main/daemon/daemon-terminal-admission.ts b/src/main/daemon/daemon-terminal-admission.ts
index 6a725c2759c7..04dff1c93d43 100644
--- a/src/main/daemon/daemon-terminal-admission.ts
+++ b/src/main/daemon/daemon-terminal-admission.ts
@@ -1,4 +1,4 @@
-import { createAdmissionStreamClient } from './daemon-terminal-stream-client'
+import { performance } from 'node:perf_hooks'
 import type { BackgroundTransientFactRelay } from './daemon-background-transient-facts'
 import type { DaemonClientConnections } from './daemon-client-connections'
 import type { DaemonEndpointLifecycle } from './daemon-endpoint-lifecycle'
@@ -9,9 +9,10 @@ import type {
   PendingPtySpawnPreparation
 } from './daemon-pty-spawn-preparations'
 import type { DaemonSessionAttachments } from './daemon-session-attachments'
+import { recordDaemonStreamBacklogEvent } from './daemon-stream-backlog-probe'
 import type { DaemonStreamDataBatcher } from './daemon-stream-data-batcher'
 import type { TerminalHistorySeedTransferRegistry } from './terminal-history-seed-transfer-registry'
-import type { CreateOrAttachResult, TerminalHost } from './terminal-host'
+import type { CreateOrAttachOptions, CreateOrAttachResult, TerminalHost } from './terminal-host'
 import { isTuiAgent } from '../../shared/tui-agent-config'
 import { isSpawnIntent } from '../../shared/host-spawn-admission'
 import { parsePtyStartupIngressIntent } from '../../shared/pty-startup-ingress'
@@ -20,6 +21,7 @@ import {
   isAgentSessionSurfaceBinding
 } from '../../shared/agent-session-host-authority'
 import { type DaemonRequest, TerminalAttachCanceledError } from './types'
+
 type CreateOrAttachRequest = Extract<DaemonRequest, { type: 'createOrAttach' }>
 
 const MAX_SPAWN_ADMISSION_WINDOW_MS = 12_000
@@ -33,7 +35,7 @@ function resolveSpawnAdmissionDeadline(cancelAfterMs: unknown): number {
   return Date.now() + windowMs
 }
 
-export type DaemonTerminalAdmissionOptions = {
+type DaemonTerminalAdmissionOptions = {
   host: TerminalHost
   connections: DaemonClientConnections
   endpoint: DaemonEndpointLifecycle
@@ -49,6 +51,8 @@ export type DaemonTerminalAdmissionOptions = {
 }
 
 export class DaemonTerminalAdmission {
+  private static readonly INTERACTIVE_OUTPUT_WINDOW_MS = 100
+  private static readonly INTERACTIVE_OUTPUT_MAX_CHARS = 1024
   private createOrAttachInFlight = 0
 
   constructor(private readonly options: DaemonTerminalAdmissionOptions) {}
@@ -128,13 +132,12 @@ export class DaemonTerminalAdmission {
           declaredIntent: isSpawnIntent(payload.spawnIntent) ? payload.spawnIntent : null,
           deadlineAt: resolveSpawnAdmissionDeadline(payload.cancelAfterMs)
         },
-        isCanceled: () =>
-          spawnPreparation !== null && this.options.preparations.isCanceled(spawnPreparation),
+        isCanceled: () => spawnPreparation?.canceled === true,
         cancelSignal: spawnPreparation.controller.signal,
         onSessionResolved: (sessionId) => {
           routedSessionId = sessionId
         },
-        streamClient: createAdmissionStreamClient(this.options, clientId, () => routedSessionId)
+        streamClient: this.createStreamClient(clientId, () => routedSessionId)
       })
     } finally {
       if (spawnPreparation) {
@@ -183,4 +186,60 @@ export class DaemonTerminalAdmission {
       ...(result.inputClosed ? { inputClosed: true as const } : {})
     }
   }
+
+  private createStreamClient(
+    clientId: string,
+    sessionId: () => string
+  ): CreateOrAttachOptions['streamClient'] {
+    return {
+      onData: (data, rawLength = data.length, transformed = false, seq) => {
+        const routedSessionId = sessionId()
+        this.options.transientFactRelay.onSessionData(routedSessionId, data)
+        const lastInputAt = this.options.attachments.lastInputAt(routedSessionId)
+        const isInteractiveOutput =
+          data.length <= DaemonTerminalAdmission.INTERACTIVE_OUTPUT_MAX_CHARS &&
+          lastInputAt !== undefined &&
+          performance.now() - lastInputAt <= DaemonTerminalAdmission.INTERACTIVE_OUTPUT_WINDOW_MS
+        this.options.streamDataBatcher.enqueue(clientId, routedSessionId, data, {
+          flushImmediately: isInteractiveOutput,
+          flushMaxChars: DaemonTerminalAdmission.INTERACTIVE_OUTPUT_MAX_CHARS,
+          rawLength,
+          transformed,
+          seq
+        })
+      },
+      onInputClosed: (incarnationId) => {
+        const routedSessionId = sessionId()
+        this.options.streamDataBatcher.enqueueControlEvent(clientId, routedSessionId, {
+          type: 'event',
+          event: 'inputClosed',
+          sessionId: routedSessionId,
+          payload: { incarnationId }
+        })
+        this.options.streamDataBatcher.flush(clientId)
+      },
+      onExit: (code, incarnationId, cause) => {
+        const routedSessionId = sessionId()
+        this.options.log.log('session-exited', {
+          sessionId: routedSessionId,
+          code,
+          cause: cause?.kind
+        })
+        this.options.streamDataBatcher.enqueueControlEvent(clientId, routedSessionId, {
+          type: 'event',
+          event: 'exit',
+          sessionId: routedSessionId,
+          payload: { code, incarnationId, ...(cause ? { cause } : {}) }
+        })
+        this.options.streamDataBatcher.flush(clientId)
+        recordDaemonStreamBacklogEvent('sessionExit', {
+          sessionIdSuffix: routedSessionId.slice(-10)
+        })
+        this.options.transientFactRelay.onSessionExit(routedSessionId)
+        this.options.streamDataBatcher.refreshSessionDroppability(routedSessionId)
+        this.options.attachments.release(routedSessionId)
+        this.options.reevaluateIdleShutdown()
+      }
+    }
+  }
 }
diff --git a/src/main/daemon/daemon-terminal-stream-client.ts b/src/main/daemon/daemon-terminal-stream-client.ts
deleted file mode 100644
index 90b30966d6a0..000000000000
--- a/src/main/daemon/daemon-terminal-stream-client.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import { performance } from 'node:perf_hooks'
-import { recordDaemonStreamBacklogEvent } from './daemon-stream-backlog-probe'
-import type { CreateOrAttachOptions } from './terminal-host'
-import type { DaemonTerminalAdmissionOptions } from './daemon-terminal-admission'
-const INTERACTIVE_OUTPUT_WINDOW_MS = 100
-const INTERACTIVE_OUTPUT_MAX_CHARS = 1024
-export function createAdmissionStreamClient(
-  options: DaemonTerminalAdmissionOptions,
-  clientId: string,
-  sessionId: () => string
-): CreateOrAttachOptions['streamClient'] {
-  return {
-    onData: (data, rawLength = data.length, transformed = false, seq) => {
-      const routedSessionId = sessionId()
-      options.transientFactRelay.onSessionData(routedSessionId, data)
-      const lastInputAt = options.attachments.lastInputAt(routedSessionId)
-      const isInteractiveOutput =
-        data.length <= INTERACTIVE_OUTPUT_MAX_CHARS &&
-        lastInputAt !== undefined &&
-        performance.now() - lastInputAt <= INTERACTIVE_OUTPUT_WINDOW_MS
-      options.streamDataBatcher.enqueue(clientId, routedSessionId, data, {
-        flushImmediately: isInteractiveOutput,
-        flushMaxChars: INTERACTIVE_OUTPUT_MAX_CHARS,
-        rawLength,
-        transformed,
-        seq
-      })
-    },
-    onInputClosed: (incarnationId) => {
-      const routedSessionId = sessionId()
-      options.streamDataBatcher.enqueueControlEvent(clientId, routedSessionId, {
-        type: 'event',
-        event: 'inputClosed',
-        sessionId: routedSessionId,
-        payload: { incarnationId }
-      })
-      options.streamDataBatcher.flush(clientId)
-    },
-    onExit: (code, incarnationId, cause) => {
-      const routedSessionId = sessionId()
-      options.log.log('session-exited', {
-        sessionId: routedSessionId,
-        code,
-        cause: cause?.kind
-      })
-      options.streamDataBatcher.enqueueControlEvent(clientId, routedSessionId, {
-        type: 'event',
-        event: 'exit',
-        sessionId: routedSessionId,
-        payload: { code, incarnationId, ...(cause ? { cause } : {}) }
-      })
-      options.streamDataBatcher.flush(clientId)
-      recordDaemonStreamBacklogEvent('sessionExit', {
-        sessionIdSuffix: routedSessionId.slice(-10)
-      })
-      options.transientFactRelay.onSessionExit(routedSessionId)
-      options.streamDataBatcher.refreshSessionDroppability(routedSessionId)
-      options.attachments.release(routedSessionId)
-      options.reevaluateIdleShutdown()
-    }
-  }
-}
diff --git a/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts b/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts
index 3d5e3c16e477..8816cae17fed 100644
--- a/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts
+++ b/src/main/daemon/pty-subprocess/native-pty-spawn-windows.test.ts
@@ -1,13 +1,4 @@
-import '../mock-descendant-sweep'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { spawnNativeDaemonPty } from './native-pty-spawn'
-import { createDaemonPtySubprocessHandle } from './subprocess-handle'
-import { TerminalCreationWork } from '../terminal-creation-work'
-import {
-  _resetConptyStartupTrustForTest,
-  CONPTY_NO_INPUT_READER_NOTICE,
-  CONPTY_STARTUP_DECISION_LIMIT_MS
-} from './conpty-startup-input-reader'
 import { createHash } from 'node:crypto'
 import { readFileSync } from 'node:fs'
 
@@ -20,12 +11,21 @@ const ptyJob = vi.hoisted(() => ({
 }))
 vi.mock('../../windows/windows-pty-job', () => ptyJob)
 
+import '../mock-descendant-sweep'
 import { TerminalHost } from '../terminal-host'
 import { TerminalSpawnGate } from '../terminal-spawn-gate'
+import { TerminalCreationWork } from '../terminal-creation-work'
 import { IMMEDIATE_KILL_PHYSICAL_EXIT_TIMEOUT_MS } from '../immediate-kill-reply-budget'
+import { createDaemonPtySubprocessHandle } from './subprocess-handle'
+import { spawnNativeDaemonPty } from './native-pty-spawn'
 import { Session } from '../session'
 import { readTerminalStartFailure } from '../../../shared/terminal-start-failure'
 import { mapRuntimeError } from '../../runtime/rpc/errors'
+import {
+  _resetConptyStartupTrustForTest,
+  CONPTY_NO_INPUT_READER_NOTICE,
+  CONPTY_STARTUP_DECISION_LIMIT_MS
+} from './conpty-startup-input-reader'
 
 const attempts = ['pwsh.exe', 'powershell.exe', 'cmd.exe'].map((shellPath) => ({
   shellPath,
@@ -51,7 +51,7 @@ const CAPACITY_MARKER = 'too many consoles in use, max consoles is 128'
 /** A pane that writes `chunks` on later ticks, as ConPTY's output socket does. */
 function fakePane(pid: number, chunks: string[], exitCode?: number) {
   const dataListeners = new Set<(data: string) => void>()
-  const exitListeners = new Set<(event: { exitCode: number; signal?: number }) => void>()
+  const exitListeners = new Set<(event: { exitCode: number }) => void>()
   const pane = {
     pid,
     kill: vi.fn(() => {
@@ -69,12 +69,6 @@ function fakePane(pid: number, chunks: string[], exitCode?: number) {
         listener(data)
       }
     },
-    exitSubscriberCount: () => exitListeners.size,
-    exit: (exitCode: number, signal?: number) => {
-      for (const listener of exitListeners) {
-        listener({ exitCode, ...(signal !== undefined ? { signal } : {}) })
-      }
-    },
     emitExit: (exitCode: number) => {
       for (const listener of exitListeners) {
         listener({ exitCode })
@@ -84,7 +78,7 @@ function fakePane(pid: number, chunks: string[], exitCode?: number) {
       dataListeners.add(listener)
       return { dispose: () => dataListeners.delete(listener) }
     },
-    onExit: (listener: (event: { exitCode: number; signal?: number }) => void) => {
+    onExit: (listener: (event: { exitCode: number }) => void) => {
       exitListeners.add(listener)
       return { dispose: () => exitListeners.delete(listener) }
     }
@@ -125,42 +119,6 @@ describe('Windows shell fallback over node-pty ConPTY', () => {
     vi.restoreAllMocks()
   })
 
-  it.each(['physical', 'exited'] as const)(
-    'keeps every %s predecessor when a later native invocation fails',
-    async (predecessor) => {
-      const creationWork = new TerminalCreationWork()
-      const pane = healthyPane(999_999_999)
-      nodePty.spawn.mockReturnValueOnce(pane)
-      await spawnNativeDaemonPty({ ...args, creationWork })
-      if (predecessor === 'exited') {
-        pane.emitExit(0)
-      }
-      nodePty.spawn.mockImplementation(() => {
-        throw new Error('later no-export failure')
-      })
-      await expect(spawnNativeDaemonPty({ ...args, creationWork })).rejects.toThrow(
-        'later no-export failure'
-      )
-      await creationWork.finish()
-      const disposition = await creationWork.completion
-      if (disposition.kind !== 'failed') {
-        throw new Error('failed aggregate was collapsed')
-      }
-      let completed = false
-      void disposition.completion.then(() => {
-        completed = true
-      })
-      await Promise.resolve()
-      if (predecessor === 'physical') {
-        expect(completed).toBe(false)
-      }
-      expect(disposition.recover).toBeTypeOf('function')
-      pane.emitExit(0)
-      await disposition.completion
-      expect((await creationWork.completion).kind).toBe('failed')
-    }
-  )
-
   it('classifies installed-DLL-format-derived bytes through fresh rejection and the RPC envelope', async () => {
     // Expanded installed DLL format strings with max 128/PID 4242; not a console-exhaustion capture.
     const bytes = readFileSync(
@@ -401,12 +359,7 @@ describe('Windows shell fallback over node-pty ConPTY', () => {
       }
       return proc
     })
-    const creationWork = new TerminalCreationWork()
-    const result = await spawnNativeDaemonPty({ ...args, creationWork })
-    await creationWork.finish()
-    // Ordinary fallback keeps the actual returned owner and earlier failed physical-unknown fact.
-    expect(await creationWork.completion).toMatchObject({ kind: 'failed' })
-    proc.emitExit(0)
+    const result = await spawnNativeDaemonPty(args)
     expect(nodePty.spawn.mock.calls.map(([file]) => file)).toEqual([
       'pwsh.exe',
       'powershell.exe',
@@ -422,23 +375,9 @@ describe('Windows shell fallback over node-pty ConPTY', () => {
     // Measured on CI: such a pane prints its banner and prompt, then ignores every keystroke.
     const broken = fakePane(990001, ['Microsoft Windows [Version 10.0.20348]\r\n'])
     const healthy = fakePane(990002, ['\x1b[1t', '\x1b[c\x1b[?1004h', 'Microsoft Windows'])
-    broken.kill.mockImplementation(() => broken.emitExit(137))
     nodePty.spawn.mockReturnValueOnce(broken).mockReturnValueOnce(healthy)
-    const creationWork = new TerminalCreationWork()
-    const result = await spawnNativeDaemonPty({ ...args, creationWork })
-    await creationWork.finish()
-    const disposition = await creationWork.completion
-    if (disposition.kind !== 'physical') {
-      throw new Error('native attempts lost their owners')
-    }
-    let completed = false
-    void disposition.completion.then(() => {
-      completed = true
-    })
-    await Promise.resolve()
-    expect(completed).toBe(false)
-    healthy.emitExit(0)
-    await disposition.completion
+
+    const result = await spawnNativeDaemonPty(args)
 
     expect(nodePty.spawn.mock.calls.map(([file]) => file)).toEqual(['pwsh.exe', 'pwsh.exe'])
     expect(ptyJob.terminatePtyJob).toHaveBeenCalledWith(broken)
@@ -450,26 +389,6 @@ describe('Windows shell fallback over node-pty ConPTY', () => {
     expect(result.claimStartupEvents?.().data).toEqual(['\x1b[1t\x1b[?1004h'])
   })
 
-  it('keeps failed after a retained ConPTY predecessor really exits before the native retry throws', async () => {
-    const creationWork = new TerminalCreationWork()
-    const broken = deadPane(999_999_999)
-    broken.kill.mockImplementation(() => broken.emitExit(137))
-    nodePty.spawn.mockReturnValueOnce(broken).mockImplementationOnce(() => {
-      throw new Error('retry exported no handle')
-    })
-    await expect(
-      spawnNativeDaemonPty({ ...args, windowsFallbackAttempts: attempts.slice(0, 1), creationWork })
-    ).rejects.toThrow('retry exported no handle')
-    await creationWork.finish()
-    const disposition = await creationWork.completion
-    if (disposition.kind !== 'failed') {
-      throw new Error('failed retry was collapsed into exit')
-    }
-    await disposition.completion
-    expect(nodePty.spawn.mock.calls.map(([file]) => file)).toEqual(['pwsh.exe', 'pwsh.exe'])
-    expect(broken.kill).toHaveBeenCalledOnce()
-    expect(broken.write).not.toHaveBeenCalled()
-  })
   it.each(['physical-exit', 'deadline', 'observation-retry'] as const)(
     'ordinary create keeps the startup predecessor owned through %s and host disposal',
     async (outcome) => {
@@ -671,108 +590,7 @@ describe('Windows shell fallback over node-pty ConPTY', () => {
     const result = await spawnNativeDaemonPty(args)
 
     expect(nodePty.spawn).toHaveBeenCalledOnce()
-    const exits = vi.fn()
-    result.physicalOwner?.onExit(exits)
-    expect(exits).toHaveBeenCalledExactlyOnceWith({ exitCode: 3 })
-    expect(result.claimStartupEvents?.().data).toEqual([])
-  })
-
-  it('commits one receipt before reentrant, disposed and throwing consumers receive it', async () => {
-    const pane = healthyPane(990001)
-    const subscribe = pane.onExit
-    let nativeExit: Parameters<typeof subscribe>[0] | undefined
-    pane.onExit = (listener) => {
-      nativeExit = listener
-      return subscribe(listener)
-    }
-    nodePty.spawn.mockReturnValue(pane)
-    const result = await spawnNativeDaemonPty(args)
-    result.claimStartupEvents?.()
-    const owner = result.physicalOwner
-    if (!owner) {
-      throw new Error('selected physical owner missing')
-    }
-    const late = vi.fn()
-    const removed = vi.fn()
-    const surviving = vi.fn()
-    const first = vi.fn()
-    let remove = (): void => {}
-    const failure = new Error('exit consumer failed')
-    owner.onExit((event) => {
-      first(event)
-      expect(owner.hasExited()).toBe(true)
-      expect(owner.exitCode()).toBe(7)
-      owner.onExit(late)
-      remove()
-      throw failure
-    })
-    const subscription = owner.onExit(removed)
-    remove = () => subscription.dispose()
-    owner.onExit(surviving)
-    expect(() => pane.exit(7, 15)).toThrow(failure)
-    await owner.completion
-    expect(first).toHaveBeenCalledExactlyOnceWith({ exitCode: 7, signal: 15 })
-    expect(late).toHaveBeenCalledExactlyOnceWith({ exitCode: 7, signal: 15 })
-    expect(surviving).toHaveBeenCalledExactlyOnceWith({ exitCode: 7, signal: 15 })
-    expect(removed).not.toHaveBeenCalled()
-    expect(pane.exitSubscriberCount()).toBe(0)
-    nativeExit?.({ exitCode: 99 })
-    const replay = vi.fn()
-    owner.onExit(replay).dispose()
-    expect(replay).toHaveBeenCalledExactlyOnceWith({ exitCode: 7, signal: 15 })
-    expect(first).toHaveBeenCalledOnce()
-    expect(surviving).toHaveBeenCalledOnce()
-    expect(pane.kill).not.toHaveBeenCalled()
-  })
-
-  it('retires native observation even when exit arrives during subscription installation', async () => {
-    const pane = fakePane(990001, [])
-    const retired = vi.fn(() => true)
-    pane.onExit = (listener) => {
-      listener({ exitCode: 3, signal: 15 })
-      return { dispose: retired }
-    }
-    nodePty.spawn.mockReturnValue(pane)
-    const result = await spawnNativeDaemonPty(args)
-    const exits = vi.fn()
-    result.physicalOwner?.onExit(exits)
-    expect(exits).toHaveBeenCalledExactlyOnceWith({ exitCode: 3, signal: 15 })
-    expect(retired).toHaveBeenCalledOnce()
-    expect(result.claimStartupEvents?.().data).toEqual([])
-    expect(nodePty.spawn).toHaveBeenCalledOnce()
-  })
-
-  it('does not deliver a queued exit into a handle disposed by an earlier consumer', async () => {
-    const pane = healthyPane(990001)
-    nodePty.spawn.mockReturnValue(pane)
-    const result = await spawnNativeDaemonPty(args)
-    const owner = result.physicalOwner
-    if (!owner) {
-      throw new Error('selected physical owner missing')
-    }
-    const retire = owner.onExit(() => handle.dispose())
-    const handle = createDaemonPtySubprocessHandle({
-      process: result.process,
-      physicalOwner: owner,
-      shellPath: result.shellPath,
-      spawnCwd: result.spawnCwd,
-      env: {},
-      reportsChildExitStatus: result.reportsChildExitStatus,
-      startupCommandDeliveredInShellArgs: false,
-      startupAgentRecognition: null,
-      sessionId: 'disposed-during-exit',
-      startupEvents: result.claimStartupEvents?.()
-    })
-    const exits = vi.fn()
-    handle.onExit(exits)
-    pane.emitExit(0)
-    await owner.completion
-    expect(exits).not.toHaveBeenCalled()
-    expect(pane.exitSubscriberCount()).toBe(0)
-    handle.write('after disposal')
-    expect(pane.write).toHaveBeenCalledExactlyOnceWith('\x1b[?61;4c')
-    retire.dispose()
-    handle.dispose()
+    expect(result.claimStartupEvents?.().exit).toEqual({ exitCode: 3 })
   })
 
   it('kills the pane tree when the spawn is canceled while startup is awaited', async () => {
diff --git a/src/main/daemon/session-process-inspection.ts b/src/main/daemon/session-process-inspection.ts
deleted file mode 100644
index c350291a6711..000000000000
--- a/src/main/daemon/session-process-inspection.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import type { SessionTerminationController } from './session-termination-controller'
-import type { SessionOutputPlane } from './session-output-plane'
-import type { TerminalShellRecoveryBarrier } from './terminal-shell-recovery-barrier'
-import type { SubprocessHandle, ChildProcessVerdictRead } from './session-subprocess-handle'
-export abstract class SessionProcessInspection {
-  protected abstract subprocess: SubprocessHandle
-  protected abstract readonly output: SessionOutputPlane
-  protected abstract readonly recoveryBarrier: TerminalShellRecoveryBarrier
-  inspectChildProcesses(fresh?: boolean, ignoreDetached?: boolean): ChildProcessVerdictRead {
-    return this.subprocess.inspectChildProcesses?.(fresh, ignoreDetached) ?? 'unverifiable'
-  }
-
-  getForegroundProcess(options?: { rawFallback?: boolean; cachedOnly?: boolean }): string | null {
-    return this.subprocess.getForegroundProcess(options)
-  }
-
-  async confirmForegroundProcess(context?: { decision?: boolean }): Promise<string | null> {
-    return (
-      this.subprocess.confirmForegroundProcess?.(context) ?? this.subprocess.getForegroundProcess()
-    )
-  }
-
-  confirmShellForeground(): Promise<boolean> {
-    return this.recoveryBarrier.confirmOwnerSettled()
-  }
-
-  async settleShellOwnershipConfirmation(): Promise<void> {
-    await this.recoveryBarrier.awaitProofSettled()
-    // Snapshot only after the drained prompt is parsed into the model.
-    await this.output.flushParsedWrites()
-  }
-
-  getPartialEscapeTailAnsi(): string {
-    return this.output.getPartialEscapeTailAnsi()
-  }
-
-  getAppliedSize(): { cols: number; rows: number } | null {
-    return this.output.getAppliedSize()
-  }
-
-  getCwd(): string | null {
-    return this.output.getCwd()
-  }
-
-  protected abstract readonly termination: SessionTerminationController
-
-  signalTerminationRoot(): void {
-    this.termination.signalTerminationRoot()
-  }
-
-  scheduleForceDisposeFallback(): void {
-    this.termination.scheduleForceDisposeFallback()
-  }
-
-  async forceKillAndWaitForExit(timeoutMs?: number): Promise<void> {
-    await this.termination.forceKillAndWaitForExit(timeoutMs)
-  }
-
-  signal(sig: string): void {
-    this.termination.signal(sig)
-  }
-}
diff --git a/src/main/daemon/session-subprocess.test-fixture.ts b/src/main/daemon/session-subprocess.test-fixture.ts
deleted file mode 100644
index 2fcfe027efdc..000000000000
--- a/src/main/daemon/session-subprocess.test-fixture.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-import { vi } from 'vitest'
-
-import type { PtyChildProcessVerdict } from '../../shared/terminal-process-inspection'
-
-export function createMockSubprocess() {
-  const written: string[] = []
-  const signals: string[] = []
-  let onData: ((data: string) => void) | null = null
-  let onExit: ((code: number) => void) | null = null
-  let killed = false
-  let clearCalls = 0
-  let pid = 12345
-  let pauseCalls = 0
-  let resumeCalls = 0
-
-  return {
-    written,
-    signals,
-    get killed() {
-      return killed
-    },
-    get pid() {
-      return pid
-    },
-    get pauseCalls() {
-      return pauseCalls
-    },
-    get resumeCalls() {
-      return resumeCalls
-    },
-    foregroundProcess: null as string | null,
-    getForegroundProcess(): string | null {
-      return this.foregroundProcess
-    },
-    confirmShellForeground: vi.fn(async () => true),
-    inspectChildProcesses: vi.fn(async (): Promise<PtyChildProcessVerdict> => 'no-children'),
-    write(data: string) {
-      written.push(data)
-    },
-    resize(_cols: number, _rows: number) {},
-    pause() {
-      pauseCalls++
-    },
-    resume() {
-      resumeCalls++
-    },
-    get clearCalls() {
-      return clearCalls
-    },
-    clear() {
-      clearCalls++
-    },
-    kill() {
-      killed = true
-      setTimeout(() => onExit?.(0), 5)
-    },
-    terminateOwnedTree: () => 'terminated' as const,
-    forceKill() {
-      killed = true
-    },
-    signal(sig: string) {
-      signals.push(sig)
-    },
-    onData(cb: (data: string) => void) {
-      onData = cb
-    },
-    onExit(cb: (code: number) => void) {
-      onExit = cb
-    },
-    dispose() {},
-    simulateData(data: string) {
-      onData?.(data)
-    },
-    simulateExit(code: number) {
-      onExit?.(code)
-    }
-  }
-}
diff --git a/src/main/daemon/session.test.ts b/src/main/daemon/session.test.ts
index 33fd5f6f2bc6..ce8f6c633663 100644
--- a/src/main/daemon/session.test.ts
+++ b/src/main/daemon/session.test.ts
@@ -11,13 +11,86 @@ import {
   _resetPtyOwnerHostColorsForTest,
   setPtyOwnerHostColors
 } from '../../shared/pty-owner-color-query-colors'
-import { createMockSubprocess } from './session-subprocess.test-fixture'
 
 const killWithDescendantSweepMock = vi.hoisted(() => vi.fn())
 vi.mock('../pty-descendant-termination', () => ({
   killWithDescendantSweep: killWithDescendantSweepMock
 }))
 
+function createMockSubprocess() {
+  const written: string[] = []
+  const signals: string[] = []
+  let onData: ((data: string) => void) | null = null
+  let onExit: ((code: number) => void) | null = null
+  let killed = false
+  let clearCalls = 0
+  let pid = 12345
+  let pauseCalls = 0
+  let resumeCalls = 0
+
+  return {
+    written,
+    signals,
+    get killed() {
+      return killed
+    },
+    get pid() {
+      return pid
+    },
+    get pauseCalls() {
+      return pauseCalls
+    },
+    get resumeCalls() {
+      return resumeCalls
+    },
+    foregroundProcess: null as string | null,
+    getForegroundProcess(): string | null {
+      return this.foregroundProcess
+    },
+    confirmShellForeground: vi.fn(async () => true),
+    write(data: string) {
+      written.push(data)
+    },
+    resize(_cols: number, _rows: number) {},
+    pause() {
+      pauseCalls++
+    },
+    resume() {
+      resumeCalls++
+    },
+    get clearCalls() {
+      return clearCalls
+    },
+    clear() {
+      clearCalls++
+    },
+    kill() {
+      killed = true
+      setTimeout(() => onExit?.(0), 5)
+    },
+    terminateOwnedTree: () => 'terminated' as const,
+    forceKill() {
+      killed = true
+    },
+    signal(sig: string) {
+      signals.push(sig)
+    },
+    onData(cb: (data: string) => void) {
+      onData = cb
+    },
+    onExit(cb: (code: number) => void) {
+      onExit = cb
+    },
+    dispose() {},
+    simulateData(data: string) {
+      onData?.(data)
+    },
+    simulateExit(code: number) {
+      onExit?.(code)
+    }
+  }
+}
+
 type MockSubprocess = ReturnType<typeof createMockSubprocess>
 
 describe('Session', () => {
diff --git a/src/main/daemon/session.ts b/src/main/daemon/session.ts
index b79287664c68..13a2449fcfd7 100644
--- a/src/main/daemon/session.ts
+++ b/src/main/daemon/session.ts
@@ -6,12 +6,13 @@ import { SessionProducerPause } from './session-producer-pause'
 import type { SessionShellReadyBarrier } from './session-shell-ready-barrier'
 import type { TerminalShellRecoveryBarrier } from './terminal-shell-recovery-barrier'
 import { SessionTerminationController } from './session-termination-controller'
-import type { SubprocessHandle } from './session-subprocess-handle'
+import type { ChildProcessVerdictRead, SubprocessHandle } from './session-subprocess-handle'
 import type { JobTerminationOutcome } from '../windows/windows-pty-job'
 import type { SessionOptions } from './session-options'
 import type { TuiAgent } from '../../shared/tui-agent'
 import { randomUUID } from 'node:crypto'
 import { PtyStartupIngress } from '../../shared/pty-startup-ingress'
+
 import type {
   SessionState,
   ShellReadyState,
@@ -19,8 +20,8 @@ import type {
   TerminalSnapshot
 } from './types'
 import type { TerminalExitCause } from '../../shared/terminal-exit-cause'
-import { SessionProcessInspection } from './session-process-inspection'
-export class Session extends SessionProcessInspection {
+
+export class Session {
   readonly sessionId: string
   readonly incarnationId = randomUUID()
   readonly terminalHandle: string | null
@@ -33,18 +34,16 @@ export class Session extends SessionProcessInspection {
   exitCause: TerminalExitCause | undefined
   private readonly initialOutput: ReturnType<typeof createSessionInitialOutput>
   private _disposed = false
-
-  protected subprocess: SubprocessHandle
+  private subprocess: SubprocessHandle
   private readonly onSessionExit?: (code: number) => void
-  protected readonly output: SessionOutputPlane
+  private readonly output: SessionOutputPlane
   private readonly producerPause: SessionProducerPause
-  protected readonly shellReady: SessionShellReadyBarrier
-  protected readonly termination: SessionTerminationController
+  private readonly shellReady: SessionShellReadyBarrier
+  private readonly termination: SessionTerminationController
   readonly startupIngress: PtyStartupIngress
-  protected readonly recoveryBarrier: TerminalShellRecoveryBarrier
+  private readonly recoveryBarrier: TerminalShellRecoveryBarrier
 
   constructor(opts: SessionOptions) {
-    super()
     this.initialOutput = createSessionInitialOutput(opts)
     this.sessionId = opts.sessionId
     this.terminalHandle = opts.terminalHandle ?? null
@@ -73,9 +72,7 @@ export class Session extends SessionProcessInspection {
     this.startupIngress = new PtyStartupIngress({
       ...(opts.startupIngress ? { intent: opts.startupIngress } : {}),
       ...(opts.ownerBackend ? { ownerBackend: opts.ownerBackend } : {}),
-      write: (data) => {
-        this.subprocess.write(data)
-      },
+      write: (data) => this.subprocess.write(data),
       onEmission: (emission) => this.recoveryBarrier.accept(emission)
     })
     try {
@@ -141,21 +138,15 @@ export class Session extends SessionProcessInspection {
   }
 
   write(data: string): void {
-    if (this._state === 'exited' || this._disposed) {
-      return
-    }
     // Human input must reach rc-file readers while automatic startup commands wait for readiness.
-    if (!this.startupIngress.answerLiveQueryReply(data)) {
+    if (this.isAlive && !this._disposed && !this.startupIngress.answerLiveQueryReply(data)) {
       this.subprocess.write(data)
     }
   }
 
   /** Orca's own startup command: held by the shell-ready barrier until the shell can read it. */
   writeStartupCommand(data: string): void {
-    if (this._state === 'exited' || this._disposed) {
-      return
-    }
-    if (!this.shellReady.tryEnqueue(data)) {
+    if (this._state !== 'exited' && !this._disposed && !this.shellReady.tryEnqueue(data)) {
       this.subprocess.write(data)
     }
   }
@@ -181,8 +172,22 @@ export class Session extends SessionProcessInspection {
   }
 
   /** Signal the root only after its descendant snapshot has completed. */
+  signalTerminationRoot(): void {
+    this.termination.signalTerminationRoot()
+  }
 
   /** Arm escalation after a coordinator begins snapshot-first teardown. */
+  scheduleForceDisposeFallback(): void {
+    this.termination.scheduleForceDisposeFallback()
+  }
+
+  async forceKillAndWaitForExit(timeoutMs?: number): Promise<void> {
+    await this.termination.forceKillAndWaitForExit(timeoutMs)
+  }
+
+  signal(sig: string): void {
+    this.termination.signal(sig)
+  }
 
   attachClient(client: Omit<AttachedClient, 'token'>): symbol {
     return this.output.attachClient(client)
@@ -206,6 +211,14 @@ export class Session extends SessionProcessInspection {
     return this.output.getSnapshot(opts)
   }
 
+  getPartialEscapeTailAnsi(): string {
+    return this.output.getPartialEscapeTailAnsi()
+  }
+
+  getAppliedSize(): { cols: number; rows: number } | null {
+    return this.output.getAppliedSize()
+  }
+
   takePendingOutput(
     includeSnapshot: boolean,
     opts: { teardownSnapshot?: boolean } = {}
@@ -218,6 +231,34 @@ export class Session extends SessionProcessInspection {
     return this.output.takePendingOutput(includeSnapshot, heldBytes, () => this.getSnapshot())
   }
 
+  getCwd(): string | null {
+    return this.output.getCwd()
+  }
+
+  inspectChildProcesses(fresh?: boolean, ignoreDetached?: boolean): ChildProcessVerdictRead {
+    return this.subprocess.inspectChildProcesses?.(fresh, ignoreDetached) ?? 'unverifiable'
+  }
+
+  getForegroundProcess(options?: { rawFallback?: boolean; cachedOnly?: boolean }): string | null {
+    return this.subprocess.getForegroundProcess(options)
+  }
+
+  async confirmForegroundProcess(context?: { decision?: boolean }): Promise<string | null> {
+    return (
+      this.subprocess.confirmForegroundProcess?.(context) ?? this.subprocess.getForegroundProcess()
+    )
+  }
+
+  confirmShellForeground(): Promise<boolean> {
+    return this.recoveryBarrier.confirmOwnerSettled()
+  }
+
+  async settleShellOwnershipConfirmation(): Promise<void> {
+    await this.recoveryBarrier.awaitProofSettled()
+    // Snapshot only after the drained prompt is parsed into the model.
+    await this.output.flushParsedWrites()
+  }
+
   clearScrollback(): void {
     this.output.clearScrollback(this.subprocess, this.shellReady.isGatingWrites)
   }
diff --git a/src/main/daemon/terminal-creation-work.ts b/src/main/daemon/terminal-creation-work.ts
index ff29b5035028..8129e8ca1e74 100644
--- a/src/main/daemon/terminal-creation-work.ts
+++ b/src/main/daemon/terminal-creation-work.ts
@@ -1,4 +1,3 @@
-import type { Session } from './session'
 import type { InternalCreateOrAttachOptions } from './terminal-host-agent-session-claim'
 import { waitForTerminalAttachOperation } from './terminal-attach-cancellation'
 import type { PtyCreationDisposition } from '../../shared/claimed-agent-pty-owner'
@@ -95,7 +94,7 @@ export function reconcileUnpublishedTerminalCreation(
   sessionId: string
 ): (release: () => Promise<void>) => Promise<void> {
   return async (release) => {
-    // Registered Sessions retain their ordinary teardown owner.
+    // Registered Sessions retain their ordinary current/use-fenced close authority.
     if (!sessions.has(sessionId)) {
       await release()
     }
@@ -172,7 +171,7 @@ export function recoverUnpublishedTerminalCreation(disposition: PtyCreationDispo
 
 export async function runTerminalCreation<Result>(
   opts: InternalCreateOrAttachOptions,
-  sessions: ReadonlyMap<string, Session>,
+  sessions: ReadonlyMap<string, unknown>,
   pendingCreations: Map<string, PendingTerminalCreation>,
   assertCreateAllowed: (options: InternalCreateOrAttachOptions) => void,
   operation: (
diff --git a/src/main/daemon/terminal-host-inspection.ts b/src/main/daemon/terminal-host-inspection.ts
deleted file mode 100644
index 13828f6628f2..000000000000
--- a/src/main/daemon/terminal-host-inspection.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-import { hasLiveTerminalHostSessions } from './terminal-host-session-listing'
-import type { TakePendingOutputResult, TerminalSnapshot } from './types'
-import {
-  confirmTerminalHostForegroundProcess,
-  confirmTerminalHostShellForeground,
-  getSettledTerminalHostSnapshot,
-  getTerminalHostAppliedSize,
-  getTerminalHostPartialEscapeTail,
-  getTerminalHostSnapshot,
-  takeTerminalHostPendingOutput
-} from './terminal-host-session-inspection-operations'
-import type { Session } from './session'
-import type { PtyProcessInspectionOptions } from '../providers/pty-process-inspection'
-import { getAliveTerminalHostSession } from './terminal-host-session-access'
-import { resolveTerminalHostSessionCwd } from './terminal-host-session-cwd'
-import {
-  inspectTerminalHostSession,
-  type TerminalHostProcessInspection
-} from './terminal-host-process-inspection'
-export abstract class TerminalHostInspection {
-  protected abstract sessions: Map<string, Session>
-  protected abstract readonly retiredIncarnations: Map<
-    string,
-    { incarnationId: string; code: number; expiresAt: number }
-  >
-  protected abstract readonly authorityGeneration: string
-  protected abstract observationEpoch: number
-  async getCwd(sessionId: string): Promise<string | null> {
-    return await resolveTerminalHostSessionCwd(
-      getAliveTerminalHostSession(this.sessions, sessionId)
-    )
-  }
-
-  // A vanished pane has no agent icon to display.
-  getForegroundProcess(sessionId: string): string | null {
-    const session = this.sessions.get(sessionId)
-    if (!session || !session.isAlive) {
-      return null
-    }
-    return session.getForegroundProcess()
-  }
-
-  inspectProcess(
-    sessionId: string,
-    options?: PtyProcessInspectionOptions
-  ): Promise<TerminalHostProcessInspection> {
-    return inspectTerminalHostSession(
-      this.sessions,
-      this.retiredIncarnations,
-      sessionId,
-      options,
-      this.authorityGeneration,
-      () => ++this.observationEpoch
-    )
-  }
-
-  async confirmForegroundProcess(sessionId: string): Promise<string | null> {
-    return confirmTerminalHostForegroundProcess(this.sessions.get(sessionId))
-  }
-
-  async confirmShellForeground(sessionId: string): Promise<boolean> {
-    return confirmTerminalHostShellForeground(this.sessions.get(sessionId), () =>
-      this.sessions.get(sessionId)
-    )
-  }
-
-  signal(sessionId: string, sig: string): void {
-    getAliveTerminalHostSession(this.sessions, sessionId).signal(sig)
-  }
-
-  detach(sessionId: string, token: symbol): void {
-    this.detachClients([{ sessionId, token }])
-  }
-
-  detachClients(attachments: readonly { sessionId: string; token: symbol }[]): void {
-    for (const { sessionId, token } of attachments) {
-      this.sessions.get(sessionId)?.detachClient(token)
-    }
-  }
-
-  clearScrollback(sessionId: string): void {
-    getAliveTerminalHostSession(this.sessions, sessionId).clearScrollback()
-  }
-
-  resetInputModes(sessionId: string): void {
-    getAliveTerminalHostSession(this.sessions, sessionId).resetInputModes()
-  }
-
-  getSnapshot(sessionId: string, opts: { scrollbackRows?: number } = {}): TerminalSnapshot | null {
-    return getTerminalHostSnapshot(this.sessions.get(sessionId), opts)
-  }
-
-  async getSettledSnapshot(
-    sessionId: string,
-    opts: { scrollbackRows?: number } = {}
-  ): Promise<TerminalSnapshot | null> {
-    return getSettledTerminalHostSnapshot(this.sessions.get(sessionId), opts)
-  }
-
-  getPartialEscapeTailAnsi(sessionId: string): string {
-    return getTerminalHostPartialEscapeTail(this.sessions.get(sessionId))
-  }
-
-  getAppliedSize(sessionId: string): { cols: number; rows: number } | null {
-    return getTerminalHostAppliedSize(this.sessions.get(sessionId))
-  }
-
-  takePendingOutput(
-    sessionId: string,
-    includeSnapshot: boolean,
-    opts: { teardownSnapshot?: boolean } = {}
-  ): TakePendingOutputResult | null {
-    return takeTerminalHostPendingOutput(this.sessions.get(sessionId), includeSnapshot, opts)
-  }
-
-  hasLiveSessions(): boolean {
-    return hasLiveTerminalHostSessions(this.sessions)
-  }
-}
diff --git a/src/main/daemon/terminal-host-spawn-input-retention.test.ts b/src/main/daemon/terminal-host-spawn-input-retention.test.ts
index 4b499dd25436..4738380c773c 100644
--- a/src/main/daemon/terminal-host-spawn-input-retention.test.ts
+++ b/src/main/daemon/terminal-host-spawn-input-retention.test.ts
@@ -2,8 +2,6 @@ import { describe, expect, it, vi } from 'vitest'
 import type { SubprocessHandle } from './session-subprocess-handle'
 import type { InternalCreateOrAttachOptions } from './terminal-host-agent-session-claim'
 import { TerminalHost } from './terminal-host'
-import { TerminalSpawnGate } from './terminal-spawn-gate'
-import type { PtyCreationDisposition } from '../../shared/claimed-agent-pty-owner'
 
 import './mock-descendant-sweep'
 
@@ -47,17 +45,12 @@ function subprocess() {
 
 const streamClient = { onData() {}, onExit() {} }
 
-function startWithInputs(
-  host: TerminalHost,
-  sessionId: string,
-  onCreationDisposition?: InternalCreateOrAttachOptions['onCreationDisposition']
-) {
+function startWithInputs(host: TerminalHost, sessionId: string) {
   const controller = new AbortController()
   const env = { RETENTION_FIXTURE: 'x'.repeat(1024) }
   const historySeedChunks = ['retention-seed\r\n']
   const options: InternalCreateOrAttachOptions = {
     sessionId,
-    ...(onCreationDisposition ? { onCreationDisposition } : {}),
     cols: 80,
     rows: 24,
     env,
@@ -215,80 +208,3 @@ describe('TerminalHost completed spawn inputs', () => {
     }
   })
 })
-
-it('collects completed inputs while unpublished physical work still owns recovery, capacity and same-ID exclusion', async () => {
-  const handle = {
-    ...subprocess(),
-    forceKill: vi.fn(() => {}),
-    onInputClosed() {
-      throw new Error('input-observer-install-failed')
-    }
-  }
-  let spawns = 0
-  const spawn = async () => (++spawns === 1 ? handle : subprocess())
-  const spawnGate = new TerminalSpawnGate({ log: () => {} })
-  const host = new TerminalHost({ spawnSubprocess: spawn, spawnGate })
-  const retained: { disposition?: PtyCreationDisposition } = {}
-  const refs = await observeUnpublishedFailure(host, retained)
-  try {
-    expect(retained.disposition?.kind).toBe('physical')
-    expect(host.listSessions()).toEqual([])
-    expect(spawnGate.snapshot().terminals).toBe(1)
-    await collect()
-    expect(refs.map((ref) => ref.deref() === undefined)).toEqual(Array(4).fill(true))
-    const canceled = new AbortController()
-    const blocked = host.createOrAttach({
-      sessionId: 'unpublished-retained',
-      cols: 80,
-      rows: 24,
-      streamClient,
-      cancelSignal: canceled.signal,
-      isCanceled: () => canceled.signal.aborted
-    })
-    const rejected = expect(blocked).rejects.toThrow('canceled')
-    canceled.abort()
-    await rejected
-    expect(spawns).toBe(1)
-    expect(spawnGate.snapshot().terminals).toBe(1)
-    const recovered =
-      retained.disposition?.kind !== 'no-fork' ? retained.disposition?.recover?.() : undefined
-    handle.emitExit(7)
-    await recovered
-    if (retained.disposition?.kind !== 'physical') {
-      throw new Error('missing physical owner')
-    }
-    await retained.disposition.completion
-    expect(retained.disposition.exitCode()).toBe(7)
-    await new Promise<void>((resolve) => setImmediate(resolve))
-    expect(spawnGate.snapshot().terminals).toBe(0)
-    expect(
-      (
-        await host.createOrAttach({
-          sessionId: 'unpublished-retained',
-          cols: 80,
-          rows: 24,
-          streamClient
-        })
-      ).isNew
-    ).toBe(true)
-    expect(spawns).toBe(2)
-  } finally {
-    handle.emitExit(7)
-    await host.dispose()
-  }
-})
-
-async function observeUnpublishedFailure(
-  host: TerminalHost,
-  retained: { disposition?: PtyCreationDisposition }
-): Promise<WeakRef<object>[]> {
-  const created = startWithInputs(host, 'unpublished-retained', (disposition) => {
-    retained.disposition = disposition
-  })
-  const failure = await created.creation.then(
-    () => 'unexpected-success',
-    (error: unknown) => (error instanceof Error ? error.message : 'unexpected-error')
-  )
-  expect(failure).toBe('input-observer-install-failed')
-  return created.refs
-}
diff --git a/src/main/daemon/terminal-host.ts b/src/main/daemon/terminal-host.ts
index dc0e95b555b6..1243ff32de96 100644
--- a/src/main/daemon/terminal-host.ts
+++ b/src/main/daemon/terminal-host.ts
@@ -3,7 +3,8 @@ import { runTerminalCreation, type PendingTerminalCreation } from './terminal-cr
 import { beginTerminalHostFencedTermination } from './terminal-host-fenced-termination'
 import type { PtyFencedTerminationRequest } from '../../shared/pty-fenced-termination'
 import type { Session } from './session'
-import type { SessionInfo } from './types'
+import type { PtyProcessInspectionOptions } from '../providers/pty-process-inspection'
+import type { SessionInfo, TakePendingOutputResult, TerminalSnapshot } from './types'
 import type { CreateOrAttachResult } from './terminal-host-create-contract'
 import type { TerminalHostOptions } from './terminal-host-options'
 import { recordTerminalHostSessionExit } from './terminal-host-session-exit'
@@ -15,20 +16,35 @@ import { ClaimedAgentPtyOwnerRegistry } from '../../shared/claimed-agent-pty-own
 import { createOrAttachClaimedAgentSession } from './terminal-host-agent-session-claim'
 import type { InternalCreateOrAttachOptions } from './terminal-host-agent-session-claim'
 import { TerminalHostAgentSessionGenerations } from './terminal-host-agent-session-generations'
+import { resolveTerminalHostSessionCwd } from './terminal-host-session-cwd'
 import { TerminalHostTombstones } from './terminal-host-tombstones'
-import { listLiveTerminalHostSessions } from './terminal-host-session-listing'
+import {
+  listLiveTerminalHostSessions,
+  hasLiveTerminalHostSessions
+} from './terminal-host-session-listing'
 import { createOrAttachTerminalSession } from './terminal-host-session-create'
 import { TerminalAttachCanceledError } from './daemon-errors'
 import { randomUUID } from 'node:crypto'
-import { TerminalHostInspection } from './terminal-host-inspection'
+import { inspectTerminalHostSession } from './terminal-host-process-inspection'
+import type { TerminalHostProcessInspection } from './terminal-host-process-inspection'
+import {
+  confirmTerminalHostForegroundProcess,
+  confirmTerminalHostShellForeground,
+  getSettledTerminalHostSnapshot,
+  getTerminalHostAppliedSize,
+  getTerminalHostPartialEscapeTail,
+  getTerminalHostSnapshot,
+  takeTerminalHostPendingOutput
+} from './terminal-host-session-inspection-operations'
+
 export type { CreateOrAttachOptions, CreateOrAttachResult } from './terminal-host-create-contract'
 
 export type { TerminalHostOptions } from './terminal-host-options'
 
 const DEFAULT_MAX_TOMBSTONES = 1000
 
-export class TerminalHost extends TerminalHostInspection {
-  protected sessions = new Map<string, Session>()
+export class TerminalHost {
+  private sessions = new Map<string, Session>()
   // Serializes creates for one id across async spawn validation.
   private pendingCreations = new Map<string, PendingTerminalCreation>()
   private sessionTeardown = new TerminalSessionTeardown(this.sessions)
@@ -41,15 +57,14 @@ export class TerminalHost extends TerminalHostInspection {
   private disposePromise: Promise<void> | null = null
   private readonly agentSessionOwners = new ClaimedAgentPtyOwnerRegistry()
   private readonly agentSessionGenerations = new TerminalHostAgentSessionGenerations()
-  protected readonly authorityGeneration = randomUUID()
-  protected observationEpoch = 0
-  protected readonly retiredIncarnations = new Map<
+  private readonly authorityGeneration = randomUUID()
+  private observationEpoch = 0
+  private readonly retiredIncarnations = new Map<
     string,
     { incarnationId: string; code: number; expiresAt: number }
   >()
 
   constructor(opts: TerminalHostOptions) {
-    super()
     this.spawnOptions = opts
     this.onSessionReaped = opts.onSessionReaped
     this.reportReadinessEvent = opts.reportReadinessEvent
@@ -182,6 +197,97 @@ export class TerminalHost extends TerminalHostInspection {
     this.onSessionReaped?.(sessionId)
   }
 
+  signal(sessionId: string, sig: string): void {
+    getAliveTerminalHostSession(this.sessions, sessionId).signal(sig)
+  }
+
+  detach(sessionId: string, token: symbol): void {
+    this.detachClients([{ sessionId, token }])
+  }
+
+  detachClients(attachments: readonly { sessionId: string; token: symbol }[]): void {
+    for (const { sessionId, token } of attachments) {
+      this.sessions.get(sessionId)?.detachClient(token)
+    }
+  }
+
+  async getCwd(sessionId: string): Promise<string | null> {
+    return await resolveTerminalHostSessionCwd(
+      getAliveTerminalHostSession(this.sessions, sessionId)
+    )
+  }
+
+  // A vanished pane has no agent icon to display.
+  getForegroundProcess(sessionId: string): string | null {
+    const session = this.sessions.get(sessionId)
+    if (!session || !session.isAlive) {
+      return null
+    }
+    return session.getForegroundProcess()
+  }
+
+  inspectProcess(
+    sessionId: string,
+    options?: PtyProcessInspectionOptions
+  ): Promise<TerminalHostProcessInspection> {
+    return inspectTerminalHostSession(
+      this.sessions,
+      this.retiredIncarnations,
+      sessionId,
+      options,
+      this.authorityGeneration,
+      () => ++this.observationEpoch
+    )
+  }
+
+  async confirmForegroundProcess(sessionId: string): Promise<string | null> {
+    return confirmTerminalHostForegroundProcess(this.sessions.get(sessionId))
+  }
+
+  async confirmShellForeground(sessionId: string): Promise<boolean> {
+    return confirmTerminalHostShellForeground(this.sessions.get(sessionId), () =>
+      this.sessions.get(sessionId)
+    )
+  }
+
+  clearScrollback(sessionId: string): void {
+    getAliveTerminalHostSession(this.sessions, sessionId).clearScrollback()
+  }
+
+  resetInputModes(sessionId: string): void {
+    getAliveTerminalHostSession(this.sessions, sessionId).resetInputModes()
+  }
+
+  // Checkpoint reads tolerate sessions that have just exited.
+  getSnapshot(sessionId: string, opts: { scrollbackRows?: number } = {}): TerminalSnapshot | null {
+    return getTerminalHostSnapshot(this.sessions.get(sessionId), opts)
+  }
+
+  async getSettledSnapshot(
+    sessionId: string,
+    opts: { scrollbackRows?: number } = {}
+  ): Promise<TerminalSnapshot | null> {
+    return getSettledTerminalHostSnapshot(this.sessions.get(sessionId), opts)
+  }
+
+  // Seed scan-authority handoff with the incomplete escape at the current stream position.
+  getPartialEscapeTailAnsi(sessionId: string): string {
+    return getTerminalHostPartialEscapeTail(this.sessions.get(sessionId))
+  }
+
+  // Let the renderer detect dropped or coerced resizes from the applied dimensions.
+  getAppliedSize(sessionId: string): { cols: number; rows: number } | null {
+    return getTerminalHostAppliedSize(this.sessions.get(sessionId))
+  }
+
+  takePendingOutput(
+    sessionId: string,
+    includeSnapshot: boolean,
+    opts: { teardownSnapshot?: boolean } = {}
+  ): TakePendingOutputResult | null {
+    return takeTerminalHostPendingOutput(this.sessions.get(sessionId), includeSnapshot, opts)
+  }
+
   isKilled(sessionId: string): boolean {
     return this.killedTombstones.has(sessionId)
   }
@@ -190,6 +296,10 @@ export class TerminalHost extends TerminalHostInspection {
     return listLiveTerminalHostSessions(this.sessions, this.agentSessionOwners)
   }
 
+  hasLiveSessions(): boolean {
+    return hasLiveTerminalHostSessions(this.sessions)
+  }
+
   /** Last resort when shutdown overruns its deadline: an async group sweep may not have signalled yet. */
   killLiveSessionGroupsSync(): void {
     killLiveSessionGroupsSync(this.sessions.values())
diff --git a/src/main/daemon/types.ts b/src/main/daemon/types.ts
index 59a656e35704..ba82bfb36984 100644
--- a/src/main/daemon/types.ts
+++ b/src/main/daemon/types.ts
@@ -1,8 +1,4 @@
 import type { TerminalStartFailure } from '../../shared/terminal-start-failure'
-import type {
-  CreateOrAttachRequest,
-  CancelCreateOrAttachRequest
-} from './daemon-create-or-attach-contract'
 import type {
   AsyncIoHealthRequest,
   FullDiskAccessStatusRequest,
@@ -10,6 +6,7 @@ import type {
   PtySpawnHealthRequest,
   SystemResolverHealthRequest
 } from './daemon-health-requests'
+import type { SpawnIntent } from '../../shared/host-spawn-admission'
 import type { SessionInfo } from './daemon-session-info'
 import type {
   ConfirmForegroundProcessRequest,
@@ -17,13 +14,6 @@ import type {
   GetForegroundProcessRequest,
   InspectProcessRequest
 } from './daemon-foreground-process-protocol'
-import type * as HistorySeedProtocol from './terminal-history-seed-transfer-protocol'
-import type * as PtyOwnerQueryProtocol from './daemon-pty-owner-query-protocol'
-import type { TerminalSnapshot } from './terminal-snapshot'
-export {
-  type CreateOrAttachRequest,
-  type CancelCreateOrAttachRequest
-} from './daemon-create-or-attach-contract'
 
 export type {
   ConfirmForegroundProcessRequest,
@@ -32,8 +22,17 @@ export type {
   InspectProcessRequest
 } from './daemon-foreground-process-protocol'
 
+import type { StartupCommandDelivery } from '../../shared/codex-startup-delivery'
+import type { TuiAgent } from '../../shared/tui-agent'
+import type { PtyStartupIngressIntent } from '../../shared/pty-startup-ingress'
+import type {
+  AgentSessionExecutionClaim,
+  AgentSessionSurfaceBinding
+} from '../../shared/agent-session-host-authority'
+import type * as HistorySeedProtocol from './terminal-history-seed-transfer-protocol'
+import type * as PtyOwnerQueryProtocol from './daemon-pty-owner-query-protocol'
 export type { TerminalModes } from './terminal-modes'
-
+import type { TerminalSnapshot } from './terminal-snapshot'
 export type { TerminalSnapshot } from './terminal-snapshot'
 export {
   AGENT_SESSION_CLAIM_DAEMON_PROTOCOL_VERSION,
@@ -59,6 +58,48 @@ export type { TerminalCheckpointFile } from './daemon-checkpoint-file'
 
 export type { DaemonEndpointIdentity, HelloMessage, HelloResponse } from './daemon-hello-protocol'
 
+export type CreateOrAttachRequest = {
+  id: string
+  type: 'createOrAttach'
+  payload: HistorySeedProtocol.CreateOrAttachHistorySeedPayload & {
+    sessionId: string
+    cols: number
+    rows: number
+    cwd?: string
+    env?: Record<string, string>
+    envToDelete?: string[]
+    command?: string
+    startupCommandDelivery?: StartupCommandDelivery
+    launchAgent?: TuiAgent
+    /** Rejects an absent session instead of interpreting mount uncertainty as create permission. */
+    attachOnly?: boolean
+    /** Preserve the selected shell instead of defaulting to the daemon’s platform fallback. */
+    shellOverride?: string
+    terminalShellArgs?: string[]
+    /** Preferred WSL distro for generic `wsl.exe` launches. */
+    terminalWindowsWslDistro?: string | null
+    /** Preserve the selected PowerShell implementation so daemon and local spawns resolve the same executable. */
+    terminalWindowsPowerShellImplementation?: 'auto' | 'powershell.exe' | 'pwsh.exe'
+    shellReadySupported?: boolean
+    shellReadyTimeoutMs?: number
+    /** Server-side fence that prevents a client timeout from publishing an orphan PTY. */
+    cancelAfterMs?: number
+    startupIngress?: PtyStartupIngressIntent
+    /** Optional; an old daemon ignores it and an old client omits it (legacy pacing). */
+    spawnIntent?: SpawnIntent
+    agentSessionEnsure?: {
+      claim: AgentSessionExecutionClaim
+      surface: AgentSessionSurfaceBinding
+    }
+  }
+}
+
+export type CancelCreateOrAttachRequest = {
+  id: string
+  type: 'cancelCreateOrAttach'
+  payload: { sessionId: string; requestId?: string }
+}
+
 export type WriteRequest = {
   id: string
   type: 'write'
diff --git a/src/main/ipc/pty/runtime/spawn-commit-response.ts b/src/main/ipc/pty/runtime/spawn-commit-response.ts
index 0a30d2e5ecb4..2ea9dcfc435d 100644
--- a/src/main/ipc/pty/runtime/spawn-commit-response.ts
+++ b/src/main/ipc/pty/runtime/spawn-commit-response.ts
@@ -2,10 +2,10 @@ import type { RuntimePtySpawnState } from './spawn-state'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
 import type { PaneResumeOutcome } from '../../../../shared/workspace-layout/workspace-layout-published'
 
-type RuntimeResumeOutcomeState = Pick<RuntimePtySpawnState, 'result' | 'codexResumeArgvDropped'> & {
-  args: Pick<RuntimePtySpawnState['args'], 'resumeProviderSession' | 'onResumeOutcome'>
-  codexResumeUnavailable?: boolean
-}
+type RuntimeResumeOutcomeState = Pick<
+  RuntimePtySpawnState,
+  'args' | 'result' | 'codexResumeArgvDropped'
+> & { codexResumeUnavailable?: boolean }
 
 /** Whether a fresh start resumed the agent it was asked to; a reattach ran no launch command. */
 export function resumeOutcomeOf(ctx: RuntimeResumeOutcomeState): PaneResumeOutcome | null {
diff --git a/src/main/providers/local-pty-provider-state.ts b/src/main/providers/local-pty-provider-state.ts
index 4ef1d48f32c0..956934904e4d 100644
--- a/src/main/providers/local-pty-provider-state.ts
+++ b/src/main/providers/local-pty-provider-state.ts
@@ -1,5 +1,5 @@
 import type * as pty from 'node-pty'
-import { PhysicalExitTracker } from '../../shared/physical-exit-tracker'
+import type { PhysicalExitTracker } from '../../shared/physical-exit-tracker'
 import type { PtyStartupIngress } from '../../shared/pty-startup-ingress'
 import type { IPtyProvider } from './pty-provider-contract'
 import type { PtyDataEvent } from './pty-provider-events'
@@ -53,26 +53,6 @@ export const ptyExitDisposables = new Map<string, { dispose: () => void }>()
 export const ptyCleanupCallbacks = new Map<string, () => void>()
 export const ptyTerminationMode = new Map<string, 'graceful' | 'force'>()
 export const ptyPhysicalExits = new Map<string, PhysicalExitTracker>()
-
-export const LOCAL_PTY_PHYSICAL_EXIT_TIMEOUT_MS = 8_000
-
-export function createPtyPhysicalExit(id: string): void {
-  ptyPhysicalExits.set(id, new PhysicalExitTracker())
-}
-
-export function waitForPtyPhysicalExit(
-  id: string,
-  physicalExit?: PhysicalExitTracker
-): Promise<void> {
-  if (!physicalExit) {
-    return Promise.reject(new Error(`PTY "${id}" exit tracking unavailable`))
-  }
-  return physicalExit.waitForExit(
-    LOCAL_PTY_PHYSICAL_EXIT_TIMEOUT_MS,
-    () => new Error(`Timed out waiting for PTY process exit: ${id}`)
-  )
-}
-
 // macOS TCC wrapper status is not the shell/agent exit status (STA-4536).
 export const ptyReportsChildExitStatus = new Map<string, boolean>()
 export const ptyForceKillTimers = new Map<string, ReturnType<typeof setTimeout>>()
diff --git a/src/main/providers/local-pty-termination.ts b/src/main/providers/local-pty-termination.ts
index 407ab5fe5b8f..974c43c8ce55 100644
--- a/src/main/providers/local-pty-termination.ts
+++ b/src/main/providers/local-pty-termination.ts
@@ -1,4 +1,5 @@
 import type * as pty from 'node-pty'
+import { PhysicalExitTracker } from '../../shared/physical-exit-tracker'
 import { killWithDescendantSweep } from '../pty-descendant-termination'
 import { terminateShutdownDescendants } from '../daemon/terminal-descendant-shutdown'
 import {
@@ -21,7 +22,6 @@ import {
   ptyTerminationMode,
   ptyLoadGeneration,
   runPtyCleanup,
-  waitForPtyPhysicalExit,
   type PtyShutdownOperation
 } from './local-pty-provider-state'
 import {
@@ -29,13 +29,23 @@ import {
   cancelPendingLocalPtySpawns
 } from './local-pty-spawn-state'
 
+export const LOCAL_PTY_PHYSICAL_EXIT_TIMEOUT_MS = 8_000
 export const LOCAL_PTY_GRACEFUL_FORCE_TIMEOUT_MS = 5_000
 export const LOCAL_PTY_FORCE_KILL_RETRY_MS = 250
 
-export {
-  createPtyPhysicalExit,
-  LOCAL_PTY_PHYSICAL_EXIT_TIMEOUT_MS
-} from './local-pty-provider-state'
+export function createPtyPhysicalExit(id: string): void {
+  ptyPhysicalExits.set(id, new PhysicalExitTracker())
+}
+
+function waitForPtyPhysicalExit(id: string, physicalExit?: PhysicalExitTracker): Promise<void> {
+  if (!physicalExit) {
+    return Promise.reject(new Error(`PTY "${id}" exit tracking unavailable`))
+  }
+  return physicalExit.waitForExit(
+    LOCAL_PTY_PHYSICAL_EXIT_TIMEOUT_MS,
+    () => new Error(`Timed out waiting for PTY process exit: ${id}`)
+  )
+}
 
 const groupSweeps = new WeakMap<pty.IPty, PendingPtyGroupSweep>()
 
diff --git a/src/main/pty-descendant-ancestry.ts b/src/main/pty-descendant-ancestry.ts
deleted file mode 100644
index 89e358a25e9b..000000000000
--- a/src/main/pty-descendant-ancestry.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import type { DescendantSnapshot } from './pty-descendant-termination'
-import type { ProcessTableRow } from './pty-process-table-parser'
-
-export function collectDescendantRows(
-  rootPid: number,
-  table: ProcessTableRow[],
-  capturedAtMs = Date.now()
-): DescendantSnapshot {
-  const childrenByPpid = new Map<number, ProcessTableRow[]>()
-  let rootRow: ProcessTableRow | null = null
-  let duplicateRoot = false
-  for (const row of table) {
-    if (row.pid === rootPid) {
-      // Duplicate root rows from a non-atomic read leave its identity ambiguous.
-      duplicateRoot = rootRow !== null
-      rootRow ??= row
-      continue
-    }
-    const siblings = childrenByPpid.get(row.ppid)
-    if (siblings) {
-      siblings.push(row)
-    } else {
-      childrenByPpid.set(row.ppid, [row])
-    }
-  }
-  // After root exit, descendants reparent; remaining rows with its old PID as parent may reflect PID reuse.
-  if (!rootRow || duplicateRoot) {
-    return { rootPgid: null, descendants: [], capturedAtMs }
-  }
-  const descendants: ProcessTableRow[] = []
-  const queue = [rootPid]
-  const visited = new Set(queue)
-  for (let nextIndex = 0; nextIndex < queue.length; nextIndex += 1) {
-    const pid = queue[nextIndex]
-    for (const child of childrenByPpid.get(pid) ?? []) {
-      // Non-atomic ps output can contain duplicate or cyclic rows; never loop on them.
-      if (visited.has(child.pid)) {
-        continue
-      }
-      visited.add(child.pid)
-      descendants.push(child)
-      queue.push(child.pid)
-    }
-  }
-  return {
-    root: { pid: rootRow.pid, startedAt: rootRow.startedAt },
-    rootPgid: rootRow.pgid,
-    descendants,
-    capturedAtMs,
-    reDerivedPids: new Set(descendants.map((row) => row.pid))
-  }
-}
diff --git a/src/main/pty-descendant-termination.ts b/src/main/pty-descendant-termination.ts
index 1515edc5c915..f623a32ae931 100644
--- a/src/main/pty-descendant-termination.ts
+++ b/src/main/pty-descendant-termination.ts
@@ -4,7 +4,6 @@ import {
   verifyWindowsTreeKillTarget,
   type WindowsTreeKillTarget
 } from './windows-pty-root-identity'
-import { collectDescendantRows } from './pty-descendant-ancestry'
 import type { ProcessTableRow } from './pty-process-table-parser'
 import {
   DESCENDANT_SNAPSHOT_TIMEOUT_MS,
@@ -105,7 +104,55 @@ export function readProcessTableBeforeDeadline(
   })
 }
 
-export { collectDescendantRows } from './pty-descendant-ancestry'
+export function collectDescendantRows(
+  rootPid: number,
+  table: ProcessTableRow[],
+  capturedAtMs = Date.now()
+): DescendantSnapshot {
+  const childrenByPpid = new Map<number, ProcessTableRow[]>()
+  let rootRow: ProcessTableRow | null = null
+  let duplicateRoot = false
+  for (const row of table) {
+    if (row.pid === rootPid) {
+      // Duplicate root rows from a non-atomic read leave its identity ambiguous.
+      duplicateRoot = rootRow !== null
+      rootRow ??= row
+      continue
+    }
+    const siblings = childrenByPpid.get(row.ppid)
+    if (siblings) {
+      siblings.push(row)
+    } else {
+      childrenByPpid.set(row.ppid, [row])
+    }
+  }
+  // After root exit, descendants reparent; remaining rows with its old PID as parent may reflect PID reuse.
+  if (!rootRow || duplicateRoot) {
+    return { rootPgid: null, descendants: [], capturedAtMs }
+  }
+  const descendants: ProcessTableRow[] = []
+  const queue = [rootPid]
+  const visited = new Set(queue)
+  for (let nextIndex = 0; nextIndex < queue.length; nextIndex += 1) {
+    const pid = queue[nextIndex]
+    for (const child of childrenByPpid.get(pid) ?? []) {
+      // Non-atomic ps output can contain duplicate or cyclic rows; never loop on them.
+      if (visited.has(child.pid)) {
+        continue
+      }
+      visited.add(child.pid)
+      descendants.push(child)
+      queue.push(child.pid)
+    }
+  }
+  return {
+    root: { pid: rootRow.pid, startedAt: rootRow.startedAt },
+    rootPgid: rootRow.pgid,
+    descendants,
+    capturedAtMs,
+    reDerivedPids: new Set(descendants.map((row) => row.pid))
+  }
+}
 
 type SnapshotDeps = {
   readTable?: ProcessTableReader

From e1cb805217ec3ab1e8988c137dfa261384aa735f Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 06:34:52 -0700
Subject: [PATCH 205/207] Refuse to switch an agent paused with Ctrl+Z

The branch had taught every terminal surface to treat a Ctrl+Z'd agent as
the tab's agent, which made the switch offer it and then kill it. That
detection is gone: tabs, the pane tracker and process inspection read the
pane as main does.

A paused agent's pane can still offer Switch to Chat UI through its last
conversation, so the host now checks once, before stopping anything: an
agent job-control stopped below the pane's shell refuses the switch with
"Claude is paused in this terminal. Resume it with fg or exit it, then
switch." The agent and its tab are left as they were.
---
 .../spawn-file-foreground-process.ts          |   3 -
 ...gent-foreground-process-remote-evidence.ts |   3 -
 .../providers/agent-foreground-process.ts     |   6 +-
 .../local-pty-foreground-inspection.ts        |   6 +-
 src/main/providers/local-pty-provider.ts      |   9 +-
 ...red-agent-session-switch-execution.test.ts |  13 ++-
 ...ured-agent-session-switch-terminal-stop.ts |   4 +
 .../structured-session-cli-writer-host.ts     |  16 +++
 .../structured-agent-cli-writers.test.ts      |  16 +++
 .../runtime/structured-agent-cli-writers.ts   |   7 ++
 ...alPaneResumeInChatButton.held-job.test.tsx |  77 -------------
 .../pane-foreground-agent-retry.ts            |  18 ---
 .../pane-foreground-agent-tracker-contract.ts |  14 ---
 .../pane-foreground-agent-tracker.ts          | 105 +++++++++---------
 .../pane-foreground-process-exit.ts           |  46 --------
 .../pane-foreground-process-reader.ts         |   8 --
 ...onnection-command-finished-cleanup.spec.ts |  52 +++------
 ...onnection-foreground-agent-routing.spec.ts |  63 +++--------
 ...nnection-foreground-agent-sampling.spec.ts |  36 ++----
 ...on-foreground-routing-confirmation.spec.ts |  14 +--
 ...-hibernation-kill-shell-foreground.test.ts |  17 ++-
 .../pty-connection/pane-agent-identity.ts     |   4 +-
 .../terminal-tab-agent-type-index.ts          |   9 +-
 .../src/i18n/en-runtime-required.json         |   1 +
 src/renderer/src/i18n/locales/en.json         |   1 +
 .../src/lib/conversation-switch-feedback.ts   |   7 ++
 .../src/lib/open-tab-occupant-agent.ts        |   5 +-
 src/renderer/src/lib/use-tab-agent.ts         |  11 +-
 .../src/store/slices/pane-foreground-agent.ts |   3 -
 src/shared/agent-session-refusal-details.ts   |   2 +
 .../agent-session-refusal-reason-words.ts     |   2 +
 src/shared/foreground-process-evidence.ts     |   3 -
 src/shared/terminal-process-inspection.ts     |   2 -
 33 files changed, 190 insertions(+), 393 deletions(-)
 delete mode 100644 src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.held-job.test.tsx
 delete mode 100644 src/renderer/src/components/terminal-pane/pane-foreground-agent-retry.ts
 delete mode 100644 src/renderer/src/components/terminal-pane/pane-foreground-process-exit.ts

diff --git a/src/main/daemon/pty-subprocess/spawn-file-foreground-process.ts b/src/main/daemon/pty-subprocess/spawn-file-foreground-process.ts
index 5872cb9ef664..97d9b394dd13 100644
--- a/src/main/daemon/pty-subprocess/spawn-file-foreground-process.ts
+++ b/src/main/daemon/pty-subprocess/spawn-file-foreground-process.ts
@@ -1,4 +1,3 @@
-import { resolveSuspendedAgentProcessFromPs } from '../../providers/suspended-agent-process'
 import type { IPty } from 'node-pty'
 import { isShellProcess } from '../../../shared/shell-process-detection'
 import {
@@ -71,9 +70,7 @@ export function resolveSpawnFileForegroundFromRows(
     ''
   )
   const selected = selectForegroundProcessCandidate(candidates, tree)
-  const suspendedAgentProcess = resolveSuspendedAgentProcessFromPs(rows, rootPid)
   return {
-    ...(suspendedAgentProcess ? { suspendedAgentProcess } : {}),
     available: name.length > 0,
     processName: selected
       ? resolveOuterWrapperForegroundProcess(selected.recognized, selected.candidate, tree)
diff --git a/src/main/providers/agent-foreground-process-remote-evidence.ts b/src/main/providers/agent-foreground-process-remote-evidence.ts
index 2a378dde55ea..4a76d98f2478 100644
--- a/src/main/providers/agent-foreground-process-remote-evidence.ts
+++ b/src/main/providers/agent-foreground-process-remote-evidence.ts
@@ -1,4 +1,3 @@
-import { resolveSuspendedAgentProcessFromPs } from './suspended-agent-process'
 import { hasControllingTty } from '../../shared/posix-controlling-terminal'
 import { recognizeAgentProcessFromCommandLine } from '../../shared/agent-process-recognition'
 import type {
@@ -105,12 +104,10 @@ export function resolveRemoteForegroundEvidenceFromRows(
   if (candidate && !candidate.row.startTime) {
     return { ...metadata, verdict: 'unverifiable', reason: 'candidate_start_time_missing' }
   }
-  const suspendedAgentProcess = resolveSuspendedAgentProcessFromPs(rows, root.pid)
   return {
     ...metadata,
     verdict: 'live',
     processName: candidate?.name.processName ?? null,
-    ...(suspendedAgentProcess ? { suspendedAgentProcess } : {}),
     fence
   }
 }
diff --git a/src/main/providers/agent-foreground-process.ts b/src/main/providers/agent-foreground-process.ts
index 630bb14e32a6..bc0eebca9a3b 100644
--- a/src/main/providers/agent-foreground-process.ts
+++ b/src/main/providers/agent-foreground-process.ts
@@ -1,4 +1,3 @@
-import { resolveSuspendedAgentProcessFromPs } from './suspended-agent-process'
 import { recognizeAgentProcessFromCommandLine } from '../../shared/agent-process-recognition'
 import { resolveOuterWrapperForegroundProcess } from '../../shared/foreground-wrapper-agent'
 import { unreadableArgvName, type ProcessTableRow } from '../../shared/process-table-snapshot'
@@ -38,7 +37,6 @@ export {
 export type AgentForegroundProcessResolution = {
   available: boolean
   processName: string | null
-  suspendedAgentProcess?: string
   /** Windows liveness anchor for an unambiguous recognized name; omitted for fallbacks and POSIX. */
   processId?: number
   /** Windows: the scan proved the caller's `anchorProcessId` is now a non-agent. */
@@ -174,11 +172,9 @@ export async function resolveAgentForegroundProcessWithAvailability(
     ) {
       return { available: false, processName: fallbackProcess }
     }
-    const suspendedAgentProcess = resolveSuspendedAgentProcessFromPs(rows, shellPid)
     return {
       available: true,
-      processName: resolveAgentForegroundProcessFromPs(rows, shellPid) ?? fallbackProcess,
-      ...(suspendedAgentProcess ? { suspendedAgentProcess } : {})
+      processName: resolveAgentForegroundProcessFromPs(rows, shellPid) ?? fallbackProcess
     }
   } catch {
     // Why: a failed scan cannot prove fallback ownership; callers retain the last recognized agent.
diff --git a/src/main/providers/local-pty-foreground-inspection.ts b/src/main/providers/local-pty-foreground-inspection.ts
index 19510fafa7f7..d7f378e27df2 100644
--- a/src/main/providers/local-pty-foreground-inspection.ts
+++ b/src/main/providers/local-pty-foreground-inspection.ts
@@ -243,8 +243,7 @@ async function readPosixSteadyState(
 
 export async function confirmLocalPtyForegroundProcess(
   id: string,
-  decision = false,
-  observeSuspended?: (name: string | undefined) => void
+  decision = false
 ): Promise<string | null> {
   const proc = ptyProcesses.get(id)
   if (!proc) {
@@ -269,9 +268,6 @@ export async function confirmLocalPtyForegroundProcess(
     if (ptyProcesses.get(id) !== proc) {
       return null
     }
-    if (resolution.available) {
-      observeSuspended?.(resolution.suspendedAgentProcess)
-    }
     if (windowsDecision) {
       const recognized = recognizeAgentProcessFromCommandLine(resolution.processName ?? '')
       if (resolution.available && recognized) {
diff --git a/src/main/providers/local-pty-provider.ts b/src/main/providers/local-pty-provider.ts
index 3dc45aa71301..415b0d9d1389 100644
--- a/src/main/providers/local-pty-provider.ts
+++ b/src/main/providers/local-pty-provider.ts
@@ -162,12 +162,8 @@ export class LocalPtyProvider implements IPtyProvider {
         childProcessEvidence: 'unverifiable'
       }
     }
-    let suspendedAgentProcess: string | undefined
-    const foregroundProcess = await (options?.scanChildProcesses ||
-    (process.platform === 'win32' && options?.steadyState !== true)
-      ? confirmLocalPtyForegroundProcess(id, process.platform === 'win32', (name) => {
-          suspendedAgentProcess = name
-        })
+    const foregroundProcess = await (process.platform === 'win32' && options?.steadyState !== true
+      ? confirmLocalPtyForegroundProcess(id, true)
       : getLocalPtyForegroundProcess(id))
     // A steady-state poll never decides adoption or close, so it may read the cached process table.
     const childProcessEvidence = await inspectLocalPtyChildProcesses(
@@ -185,7 +181,6 @@ export class LocalPtyProvider implements IPtyProvider {
     }
     return {
       foregroundProcess,
-      ...(suspendedAgentProcess ? { suspendedAgentProcess } : {}),
       hasChildProcesses: childProcessEvidence !== 'no-children',
       childProcessEvidence
     }
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
index 243be75e9708..36634febd4de 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
@@ -388,7 +388,10 @@ it('keeps the stopped source when destination publication fails before retiremen
   expect(kill).not.toHaveBeenCalled()
 })
 
-it('does not acquire or retire a terminal whose physical stop is unproven', async () => {
+it.each([
+  ['its physical stop is unproven', false],
+  ['its agent is paused with Ctrl+Z, stopping nothing', true]
+] as const)('does not acquire or retire a terminal when %s', async (_case, paused) => {
   await savedTranscript()
   const { runtime, session } = setupMainOwnedWorkspace()
   const incarnationId = '11111111-1111-4111-8111-111111111111'
@@ -397,6 +400,7 @@ it('does not acquire or retire a terminal whose physical stop is unproven', asyn
   if (!source.presentation) {
     throw new Error('missing captured source')
   }
+  const layout = structuredClone(session().terminalLayoutsByTabId[TAB_ID])
   const acquisitions = rig.adapter.acquire.mock.calls.length
   const stop = vi.fn(async () => false)
   runtime.setPtyController({
@@ -405,6 +409,7 @@ it('does not acquire or retire a terminal whose physical stop is unproven', asyn
     stopAndWait: stop,
     getForegroundProcess: async () => null
   })
+  vi.spyOn(runtime, 'terminalAgentPaused').mockResolvedValue(paused)
   const result = await executeStructuredSessionSwitch(
     {
       sessionId: id,
@@ -421,9 +426,13 @@ it('does not acquire or retire a terminal whose physical stop is unproven', asyn
     'chat'
   )
   expect(result.status).toBe('refused')
-  expect(stop).toHaveBeenCalledOnce()
+  expect(stop).toHaveBeenCalledTimes(paused ? 0 : 1)
   expect(rig.adapter.acquire).toHaveBeenCalledTimes(acquisitions)
   expect(session().tabsByWorktree[WORKTREE_ID]?.some((tab) => tab.id === TAB_ID)).toBe(true)
+  if (paused) {
+    expect(result).toMatchObject({ refusal: { details: { reason: 'agentPaused' } } })
+    expect(session().terminalLayoutsByTabId[TAB_ID]).toEqual(layout)
+  }
 })
 
 it('reports a dispatched terminal with a lost answer as uncertain, preserving its source', async () => {
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-stop.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-stop.ts
index bf44426b0030..468d2458899f 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-stop.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-stop.ts
@@ -52,6 +52,10 @@ export async function stopStructuredSwitchTerminalSource(input: {
       input.consented
     )
   requireConsent()
+  // A paused agent (Ctrl+Z) is the user's to resume or quit: nothing is stopped and the tab stays.
+  if (await ctx.runtime.terminalAgentPaused(close.source.ptyId)) {
+    throw agentSessionRefusalError('agent_session_operation_invalid', { reason: 'agentPaused' })
+  }
   const awaitBoundary = input.boundary
     ? await armSwitchTurnBoundaryWait(
         input.boundary.source,
diff --git a/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts b/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts
index 9692e8912c7a..14e47f858259 100644
--- a/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts
+++ b/src/main/runtime/session-tabs/structured-session-cli-writer-host.ts
@@ -12,6 +12,7 @@ import { inspectPtyProviderProcess } from '../../providers/pty-process-inspectio
 import { inspectionShowsShellAlone } from '../run-terminal-shell-alone'
 import {
   assertCliConversationWritersExited,
+  posixAgentPausedBelow,
   posixCliWriterShellAlone,
   type CliWriterPane,
   type CliWriterTerminal
@@ -146,6 +147,21 @@ export abstract class OrcaRuntimeWithStructuredSessionCliWriterHost extends Orca
     await this.assertStructuredAdoptionTerminalWritersExited(record.provider, key.id)
   }
 
+  /** Whether job control paused an agent in this pane (Ctrl+Z); Windows terminals have no such stop. */
+  async terminalAgentPaused(ptyId: string): Promise<boolean> {
+    if (process.platform === 'win32') {
+      return false
+    }
+    try {
+      const processes = await this.ptyController?.listProcesses?.(LOCAL_EXECUTION_HOST_ID)
+      const rootPid = processes?.find((candidate) => candidate.id === ptyId)?.rootProcessId
+      return !!rootPid && (await posixAgentPausedBelow(rootPid))
+    } catch {
+      // An unreadable process table proves nothing paused; the switch's own stop proof still applies.
+      return false
+    }
+  }
+
   async assertStructuredAdoptionTerminalWritersExited(
     agent: StructuredAgentId,
     providerSessionId: string,
diff --git a/src/main/runtime/structured-agent-cli-writers.test.ts b/src/main/runtime/structured-agent-cli-writers.test.ts
index 61ab4182680f..c7fcd9809163 100644
--- a/src/main/runtime/structured-agent-cli-writers.test.ts
+++ b/src/main/runtime/structured-agent-cli-writers.test.ts
@@ -8,6 +8,7 @@ import type { SleepingAgentSessionRecord } from '../../shared/agent-session-resu
 import type { EnrichedAgentHookEventPayload } from '../agent-hooks/server/server-types'
 import {
   assertCliConversationWritersExited,
+  posixAgentPausedBelow,
   posixCliWriterShellAlone,
   type CliWriterHost
 } from './structured-agent-cli-writers'
@@ -121,6 +122,21 @@ describe('execution-host conversation writer inspection', () => {
     }
   })
 
+  it('finds an agent paused by Ctrl+Z below the pane, and only a paused agent', async () => {
+    const shell = { pid: 10, ppid: 1, stat: 'Ss', command: '-/bin/zsh -l' }
+    const job = { pid: 11, ppid: 10, stat: 'T', command: 'claude' }
+    snapshot.mockResolvedValue([shell, job])
+    await expect(posixAgentPausedBelow(10)).resolves.toBe(true)
+    for (const rows of [
+      [shell, { ...job, stat: 'S+' }],
+      [shell, { ...job, command: 'vim notes.txt' }],
+      [shell]
+    ]) {
+      snapshot.mockResolvedValue(rows)
+      await expect(posixAgentPausedBelow(10)).resolves.toBe(false)
+    }
+  })
+
   it.skipIf(
     process.platform !== 'darwin' ||
       process.env.GITHUB_ACTIONS !== 'true' ||
diff --git a/src/main/runtime/structured-agent-cli-writers.ts b/src/main/runtime/structured-agent-cli-writers.ts
index f9685d45acf9..be106b30a026 100644
--- a/src/main/runtime/structured-agent-cli-writers.ts
+++ b/src/main/runtime/structured-agent-cli-writers.ts
@@ -14,6 +14,7 @@ import { getFreshShellForegroundSnapshot } from '../../shared/process-table-snap
 import { collectDescendantsFromIndex, getProcessTableIndex } from '../../shared/process-table-index'
 import { isShellProcess } from '../../shared/shell-process-detection'
 import { MACOS_LOGIN_PATH } from '../providers/macos-tcc-login-shell'
+import { resolveSuspendedAgentProcessFromPs } from '../providers/suspended-agent-process'
 import type { PtyIncarnationId } from '../../shared/pty-incarnation'
 import type { AgentProcessIdentity } from '../../shared/agent-process-presence'
 import { probeAgentProcessPresence } from '../../shared/agent-process-presence-probe'
@@ -69,6 +70,12 @@ export async function posixCliWriterShellAlone(rootPid: number): Promise<boolean
   )
 }
 
+/** An agent job control paused (Ctrl+Z) below the pane's root process. */
+export async function posixAgentPausedBelow(rootPid: number): Promise<boolean> {
+  const rows = await getFreshShellForegroundSnapshot()
+  return resolveSuspendedAgentProcessFromPs(rows, rootPid) !== null
+}
+
 /** Execution-host observations release a terminal writer; loss of evidence never does. */
 export async function assertCliConversationWritersExited(
   host: CliWriterHost,
diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.held-job.test.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.held-job.test.tsx
deleted file mode 100644
index cb0589ce71f3..000000000000
--- a/src/renderer/src/components/terminal-pane/TerminalPaneResumeInChatButton.held-job.test.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-// @vitest-environment happy-dom
-import { act, cleanup, render, screen } from '@testing-library/react'
-import { afterEach, expect, it, vi } from 'vitest'
-import { useAppStore } from '@/store'
-import { createGlobalSettingsFixture } from '../../../../shared/global-settings-test-fixture'
-import {
-  TEST_REPO,
-  makeWorktree,
-  makeTerminalTab
-} from '@/store/slices/worktrees-slice-test-fixtures'
-import { TooltipProvider } from '@/components/ui/tooltip'
-import { TerminalPaneResumeInChatButton } from './TerminalPaneResumeInChatButton'
-import { STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY } from '../../../../shared/protocol-version'
-import { IN_PLACE_SWITCH_RUNTIME_CAPABILITIES } from '../../../../shared/structured-agent-cli-conversation-adoption'
-vi.mock('@/runtime/local-runtime-capabilities', () => ({
-  ensureLocalRuntimeCapabilities: async () => [
-    STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY,
-    ...IN_PLACE_SWITCH_RUNTIME_CAPABILITIES
-  ],
-  readLocalRuntimeCapabilitiesOrUnknown: () => [
-    STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY,
-    ...IN_PLACE_SWITCH_RUNTIME_CAPABILITIES
-  ],
-  subscribeLocalRuntimeCapabilityObservation: () => () => {}
-}))
-afterEach(cleanup)
-it.each(['suspended'] as const)(
-  'keeps the real Claude header/menu switchable during held %s work and after exit',
-  () => {
-    useAppStore.setState(useAppStore.getInitialState(), true)
-    const paneKey = 'shell:3f2504e0-4f89-41d3-9a0c-0305e82c3301'
-    useAppStore.setState({
-      settings: createGlobalSettingsFixture(),
-      repos: [TEST_REPO],
-      worktreesByRepo: { repo1: [makeWorktree({ id: 'wt-1', repoId: 'repo1' })] },
-      tabsByWorktree: { 'wt-1': [makeTerminalTab({ id: 'shell', worktreeId: 'wt-1' })] },
-      terminalLayoutsByTabId: {
-        shell: {
-          root: { type: 'leaf', leafId: '3f2504e0-4f89-41d3-9a0c-0305e82c3301' },
-          activeLeafId: '3f2504e0-4f89-41d3-9a0c-0305e82c3301',
-          expandedLeafId: null,
-          ptyIdsByLeafId: { '3f2504e0-4f89-41d3-9a0c-0305e82c3301': 'pty-1' }
-        }
-      }
-    })
-    useAppStore
-      .getState()
-      .recordAgentProviderSession(
-        paneKey,
-        'claude',
-        { key: 'session_id', id: 'real-claude' },
-        undefined,
-        { worktreeId: 'wt-1', tabId: 'shell' }
-      )
-    useAppStore.getState().setPaneForegroundAgent(paneKey, {
-      agent: 'claude',
-      shellForeground: true,
-      suspendedAgent: 'claude'
-    })
-    render(
-      <TooltipProvider>
-        <TerminalPaneResumeInChatButton tabId="shell" worktreeId="wt-1" paneKey={paneKey} />
-      </TooltipProvider>
-    )
-    const header = screen.getByRole('button', { name: 'Switch to Chat UI', hidden: true })
-    expect(header.hasAttribute('disabled')).toBe(false)
-    act(() =>
-      useAppStore.getState().setPaneForegroundAgent(paneKey, { agent: null, shellForeground: true })
-    )
-    expect(header.hasAttribute('disabled')).toBe(false)
-  }
-)
-
-vi.mock('@/components/confirmation-dialog-context', async (original) => ({
-  ...(await original<Record<string, unknown>>()),
-  useConfirmationDialog: () => vi.fn(async () => false)
-}))
diff --git a/src/renderer/src/components/terminal-pane/pane-foreground-agent-retry.ts b/src/renderer/src/components/terminal-pane/pane-foreground-agent-retry.ts
deleted file mode 100644
index 3ab8df9e0a1a..000000000000
--- a/src/renderer/src/components/terminal-pane/pane-foreground-agent-retry.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { isAgentForegroundWrapperProcess } from '../../../../shared/agent-process-recognition'
-import type { ForegroundReadReason } from './pane-foreground-agent-tracker-contract'
-
-export function shouldRetryForegroundAgentRead(
-  hasConfirmationExpectation: boolean,
-  reason: ForegroundReadReason,
-  processName: string | null,
-  retryDelay: number | undefined
-): boolean {
-  const shouldRetryExpectedIdentity =
-    hasConfirmationExpectation && (reason !== 'command-finished' || processName === null)
-  const shouldRetry =
-    retryDelay !== undefined &&
-    (shouldRetryExpectedIdentity ||
-      (processName !== null &&
-        (reason === 'command' || isAgentForegroundWrapperProcess(processName))))
-  return shouldRetry
-}
diff --git a/src/renderer/src/components/terminal-pane/pane-foreground-agent-tracker-contract.ts b/src/renderer/src/components/terminal-pane/pane-foreground-agent-tracker-contract.ts
index 7be00ec79f8e..83274a01746a 100644
--- a/src/renderer/src/components/terminal-pane/pane-foreground-agent-tracker-contract.ts
+++ b/src/renderer/src/components/terminal-pane/pane-foreground-agent-tracker-contract.ts
@@ -1,4 +1,3 @@
-import type { TerminalAgent } from '../../../../shared/terminal-agent'
 import type { RecognizedAgentProcess } from '../../../../shared/agent-process-recognition'
 import type { PaneForegroundAgentEntry } from '@/store/slices/pane-foreground-agent'
 import type { RuntimeTerminalProcessInspection } from '@/runtime/runtime-terminal-inspection'
@@ -33,16 +32,3 @@ export type PaneForegroundAgentTrackerDeps = {
   onCommandFinishedUnavailable?: () => void
   onVisibleForegroundSettled?: (outcome: 'agent' | 'shell' | 'inconclusive') => void
 }
-
-export type PaneForegroundAgentTracker = {
-  /** True while any read is scheduled or running, whatever its authority. */
-  hasReadInFlight: () => boolean
-  onVisiblePtyBound: (expectsAgent?: boolean) => boolean
-  onCommandStarted: (expectedAgent?: TerminalAgent | null) => void
-  onAgentStartupObserved: () => void
-  /** True when pane identity must remain visible until an async shell confirmation. */
-  onCommandFinished: () => boolean
-  /** The process monitor confirmed this agent exited (no agent, no children, settled). */
-  onProcessExitConfirmed: (process: RecognizedAgentProcess) => void
-  dispose: () => void
-}
diff --git a/src/renderer/src/components/terminal-pane/pane-foreground-agent-tracker.ts b/src/renderer/src/components/terminal-pane/pane-foreground-agent-tracker.ts
index 2ddc941b3f47..387a076b0049 100644
--- a/src/renderer/src/components/terminal-pane/pane-foreground-agent-tracker.ts
+++ b/src/renderer/src/components/terminal-pane/pane-foreground-agent-tracker.ts
@@ -1,21 +1,33 @@
-import { recognizeAgentProcess } from '../../../../shared/agent-process-recognition'
+import {
+  isAgentForegroundWrapperProcess,
+  recognizeAgentProcess,
+  type RecognizedAgentProcess
+} from '../../../../shared/agent-process-recognition'
+import { resolveCompatibleAgentTypeForOwner } from '../../../../shared/agent-title-owner'
 import { isShellProcess } from '../../../../shared/shell-process-detection'
+import type { TerminalAgent } from '../../../../shared/terminal-agent'
 import { createPaneForegroundProcessReader } from './pane-foreground-process-reader'
 import { FOREGROUND_COMMAND_READS } from '../../../../shared/foreground-command-settle'
 import type {
   ForegroundReadReason,
-  PaneForegroundAgentTrackerDeps,
-  PaneForegroundAgentTracker
+  PaneForegroundAgentTrackerDeps
 } from './pane-foreground-agent-tracker-contract'
-import { confirmPaneForegroundProcessExit } from './pane-foreground-process-exit'
-import { shouldRetryForegroundAgentRead } from './pane-foreground-agent-retry'
 
 const VISIBLE_PTY_SETTLE_MS = 350
 
 /** Read foreground identity at command boundaries; confirm 133;D before clearing known agents because nested shells can leak that marker. */
-export function createPaneForegroundAgentTracker(
-  deps: PaneForegroundAgentTrackerDeps
-): PaneForegroundAgentTracker {
+export function createPaneForegroundAgentTracker(deps: PaneForegroundAgentTrackerDeps): {
+  /** True while any read is scheduled or running, whatever its authority. */
+  hasReadInFlight: () => boolean
+  onVisiblePtyBound: (expectsAgent?: boolean) => boolean
+  onCommandStarted: (expectedAgent?: TerminalAgent | null) => void
+  onAgentStartupObserved: () => void
+  /** True when pane identity must remain visible until an async shell confirmation. */
+  onCommandFinished: () => boolean
+  /** The process monitor confirmed this agent exited (no agent, no children, settled). */
+  onProcessExitConfirmed: (process: RecognizedAgentProcess) => void
+  dispose: () => void
+} {
   let disposed = false
   let readTimer: ReturnType<typeof setTimeout> | null = null
   let scheduledReadReason: ForegroundReadReason | null = null
@@ -103,13 +115,10 @@ export function createPaneForegroundAgentTracker(
       hasForegroundAgentEvidence ||
       hasKnownAgentEvidence ||
       hasAgentExpectation
-    const {
-      processName,
-      suspendedAgentProcess,
-      remoteEvidenceVerdict,
-      expectedIncarnationId,
-      remote
-    } = await readProcess(ptyId, requiresRoutingConfirmation)
+    const { processName, remoteEvidenceVerdict, expectedIncarnationId, remote } = await readProcess(
+      ptyId,
+      requiresRoutingConfirmation
+    )
     // Fence pending inspection so an old PTY cannot publish identity into its replacement.
     if (
       disposed ||
@@ -120,23 +129,6 @@ export function createPaneForegroundAgentTracker(
       settleAbortedRead(generation)
       return
     }
-    const suspended = recognizeAgentProcess(suspendedAgentProcess ?? null)
-    if (suspended) {
-      hasKnownAgentEvidence = true
-      hasAgentExpectation = false
-      deps.publish({
-        agent: null,
-        suspendedAgent: suspended.agent,
-        agentEvidence: 'process-read',
-        shellForeground: true,
-        routingTrusted: false,
-        routingRevoked: true
-      })
-      if (reason === 'visible-pty') {
-        deps.onVisibleForegroundSettled?.('agent')
-      }
-      return
-    }
     const recognized =
       remoteEvidenceVerdict === 'live'
         ? recognizeAgentProcess(processName)
@@ -165,12 +157,13 @@ export function createPaneForegroundAgentTracker(
     const retryDelay = FOREGROUND_COMMAND_READS.retryDelaysMs[retryIndex]
     const hasConfirmationExpectation =
       hasForegroundAgentEvidence || hasKnownAgentEvidence || hasAgentExpectation
-    const shouldRetry = shouldRetryForegroundAgentRead(
-      hasConfirmationExpectation,
-      reason,
-      processName,
-      retryDelay
-    )
+    const shouldRetryExpectedIdentity =
+      hasConfirmationExpectation && (reason !== 'command-finished' || processName === null)
+    const shouldRetry =
+      retryDelay !== undefined &&
+      (shouldRetryExpectedIdentity ||
+        (processName !== null &&
+          (reason === 'command' || isAgentForegroundWrapperProcess(processName))))
     if (shouldRetry) {
       // Bound retries across PowerShell-to-WMIC enrichment, which may initially hide a live agent.
       scheduleRead(retryDelay, retryIndex + 1, reason)
@@ -227,7 +220,9 @@ export function createPaneForegroundAgentTracker(
 
   return {
     // A higher-authority command read still promises confirmation when visibility schedules nothing.
-    hasReadInFlight: hasPendingRead,
+    hasReadInFlight(): boolean {
+      return hasPendingRead()
+    },
     onVisiblePtyBound(expectsAgent = false) {
       // Lower-authority visibility recovery must not cancel command-boundary reads that own the exit decision.
       if (hasCommandReadInFlight()) {
@@ -307,18 +302,26 @@ export function createPaneForegroundAgentTracker(
       return true
     },
     onProcessExitConfirmed(process) {
-      confirmPaneForegroundProcessExit({
-        deps,
-        process,
-        disposed,
-        commandReadInFlight: hasCommandReadInFlight(),
-        pendingRead: hasPendingRead(),
-        cancelPendingRead,
-        clearAgentEvidence,
-        resetStartupSample: () => {
-          startupSampled = false
-        }
-      })
+      // Why: an in-flight command read owns the pane's next identity, and only a live read is ours.
+      const published = deps.getPublishedEntry?.()
+      if (
+        disposed ||
+        hasCommandReadInFlight() ||
+        published?.agentEvidence !== 'process-read' ||
+        resolveCompatibleAgentTypeForOwner(process.agent, published.agent) !== published.agent
+      ) {
+        return
+      }
+      const hadVisibleRead = hasPendingRead()
+      cancelPendingRead()
+      clearAgentEvidence()
+      startupSampled = false
+      // Without command marks, shellForeground would never lift and would block Enter from identifying the next agent.
+      deps.publish({ agent: null, shellForeground: false })
+      if (hadVisibleRead) {
+        deps.onVisibleForegroundSettled?.('shell')
+      }
+      deps.onConfirmedShellForeground?.('process-exit')
     },
     dispose() {
       const hadReadAtDispose = hasPendingRead()
diff --git a/src/renderer/src/components/terminal-pane/pane-foreground-process-exit.ts b/src/renderer/src/components/terminal-pane/pane-foreground-process-exit.ts
deleted file mode 100644
index 7bb37f25812e..000000000000
--- a/src/renderer/src/components/terminal-pane/pane-foreground-process-exit.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import type { RecognizedAgentProcess } from '../../../../shared/agent-process-recognition'
-import { resolveCompatibleAgentTypeForOwner } from '../../../../shared/agent-title-owner'
-
-import type { PaneForegroundAgentTrackerDeps } from './pane-foreground-agent-tracker-contract'
-
-export function confirmPaneForegroundProcessExit(args: {
-  deps: PaneForegroundAgentTrackerDeps
-  process: RecognizedAgentProcess
-  disposed: boolean
-  commandReadInFlight: boolean
-  pendingRead: boolean
-  cancelPendingRead: () => void
-  clearAgentEvidence: () => void
-  resetStartupSample: () => void
-}): void {
-  const {
-    deps,
-    process,
-    disposed,
-    commandReadInFlight,
-    pendingRead,
-    cancelPendingRead,
-    clearAgentEvidence,
-    resetStartupSample
-  } = args
-  // Why: an in-flight command read owns the pane's next identity, and only a live read is ours.
-  const published = deps.getPublishedEntry?.()
-  if (
-    disposed ||
-    commandReadInFlight ||
-    published?.agentEvidence !== 'process-read' ||
-    resolveCompatibleAgentTypeForOwner(process.agent, published.agent) !== published.agent
-  ) {
-    return
-  }
-  const hadVisibleRead = pendingRead
-  cancelPendingRead()
-  clearAgentEvidence()
-  resetStartupSample()
-  // Without command marks, shellForeground would never lift and would block Enter from identifying the next agent.
-  deps.publish({ agent: null, shellForeground: false })
-  if (hadVisibleRead) {
-    deps.onVisibleForegroundSettled?.('shell')
-  }
-  deps.onConfirmedShellForeground?.('process-exit')
-}
diff --git a/src/renderer/src/components/terminal-pane/pane-foreground-process-reader.ts b/src/renderer/src/components/terminal-pane/pane-foreground-process-reader.ts
index 45e75845d1e4..51627feb119e 100644
--- a/src/renderer/src/components/terminal-pane/pane-foreground-process-reader.ts
+++ b/src/renderer/src/components/terminal-pane/pane-foreground-process-reader.ts
@@ -22,7 +22,6 @@ export function createPaneForegroundProcessReader(deps: {
 
   return async (ptyId: string, requiresConfirmation: boolean) => {
     let processName: string | null = null
-    let suspendedAgentProcess: string | undefined
     let remoteEvidenceVerdict: 'live' | 'unverifiable' | 'exited' | null = null
     const expectedIncarnationId = deps.getExpectedIncarnationId?.() ?? null
     const options = expectedIncarnationId ? { expectedIncarnationId } : undefined
@@ -67,15 +66,9 @@ export function createPaneForegroundProcessReader(deps: {
         remoteEvidenceVerdict = admitted?.verdict ?? 'unverifiable'
         if (admitted?.verdict === 'live') {
           processName = admitted.processName
-          suspendedAgentProcess = admitted.suspendedAgentProcess
         }
       } else {
         processName = inspection.foregroundProcess
-        suspendedAgentProcess =
-          inspection.suspendedAgentProcess ??
-          (inspection.foregroundProcessEvidence?.verdict === 'live'
-            ? inspection.foregroundProcessEvidence.suspendedAgentProcess
-            : undefined)
       }
     } catch {
       // Missing legacy/injected-provider answers remain unverifiable remote verdicts.
@@ -83,7 +76,6 @@ export function createPaneForegroundProcessReader(deps: {
     }
     return {
       processName,
-      suspendedAgentProcess,
       remoteEvidenceVerdict,
       expectedIncarnationId,
       remote
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-command-finished-cleanup.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection-command-finished-cleanup.spec.ts
index 8082aac8f226..df0a0abbf4f2 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-command-finished-cleanup.spec.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-command-finished-cleanup.spec.ts
@@ -159,8 +159,8 @@ export function registerPtyConnectionCommandFinishedCleanupTests(): void {
     it('keeps Droid routing visible through command-finished foreground confirmation', async () => {
       vi.useFakeTimers()
       const { connectPanePty } = await import('./pty-connection')
-      const inspectProcess = vi.mocked(window.api.pty.inspectProcess)
-      inspectProcess.mockResolvedValue({ foregroundProcess: 'droid', hasChildProcesses: false })
+      const getForegroundProcess = vi.mocked(window.api.pty.confirmForegroundProcess)
+      getForegroundProcess.mockResolvedValue('droid')
       const dataCallbackRef: { current: ((data: string) => void) | null } = { current: null }
       const ptyId = 'pty-droid-confirmation-window'
       const transport = createMockTransport(ptyId)
@@ -190,7 +190,7 @@ export function registerPtyConnectionCommandFinishedCleanupTests(): void {
         delete mockStoreState.agentLaunchConfigByPaneKey[key]
       })
 
-      const readsBeforeFinish = inspectProcess.mock.calls.length
+      const readsBeforeFinish = getForegroundProcess.mock.calls.length
       dataCallbackRef.current?.('\x1b]133;D;0\x07')
       expect(mockStoreState.clearAgentLaunchConfig).not.toHaveBeenCalled()
       expect(resolveMockPaneWindowsShiftEnterEncoding(mockStoreState, paneKey)).toBe('alt-enter')
@@ -199,7 +199,7 @@ export function registerPtyConnectionCommandFinishedCleanupTests(): void {
       expect(mockStoreState.clearAgentLaunchConfig).not.toHaveBeenCalled()
       expect(resolveMockPaneWindowsShiftEnterEncoding(mockStoreState, paneKey)).toBe('csi-u')
 
-      expect(inspectProcess).toHaveBeenCalledTimes(readsBeforeFinish + 1)
+      expect(getForegroundProcess).toHaveBeenCalledTimes(readsBeforeFinish + 1)
       expect(mockStoreState.clearAgentLaunchConfig).not.toHaveBeenCalled()
       expect(mockStoreState.paneForegroundAgentByPaneKey[paneKey]).toEqual({
         agent: 'droid',
@@ -213,10 +213,7 @@ export function registerPtyConnectionCommandFinishedCleanupTests(): void {
     it('retires pane launch routing after one fresh scan confirms shell', async () => {
       vi.useFakeTimers()
       const { connectPanePty } = await import('./pty-connection')
-      vi.mocked(window.api.pty.inspectProcess).mockResolvedValue({
-        foregroundProcess: 'powershell.exe',
-        hasChildProcesses: false
-      })
+      vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue('powershell.exe')
       const dataCallbackRef: { current: ((data: string) => void) | null } = { current: null }
       const ptyId = 'pty-droid-confirmed-shell'
       const transport = createMockTransport(ptyId)
@@ -262,10 +259,7 @@ export function registerPtyConnectionCommandFinishedCleanupTests(): void {
     ])('%s', async (_label, stoppingOnPurpose) => {
       vi.useFakeTimers()
       const { connectPanePty } = await import('./pty-connection')
-      vi.mocked(window.api.pty.inspectProcess).mockResolvedValue({
-        foregroundProcess: 'zsh',
-        hasChildProcesses: false
-      })
+      vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue('zsh')
       const dataCallbackRef: { current: ((data: string) => void) | null } = { current: null }
       const ptyId = 'pty-sleeping-confirmed-shell'
       const transport = createMockTransport(ptyId)
@@ -374,10 +368,7 @@ export function registerPtyConnectionCommandFinishedCleanupTests(): void {
       // Import after resetModules to share pty-connection’s registry; static imports would assert against a different instance.
       const { createCommandFinishedStatusStore } =
         await import('./command-finished-status-store-test-fixture')
-      vi.mocked(window.api.pty.inspectProcess).mockResolvedValue({
-        foregroundProcess: 'powershell.exe',
-        hasChildProcesses: false
-      })
+      vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue('powershell.exe')
       vi.mocked(window.api.agentStatus.reconcileEndedProcess).mockClear()
       const dataCallbackRef: { current: ((data: string) => void) | null } = { current: null }
       const ptyId = 'pty-claude-row-confirmed-shell'
@@ -423,10 +414,7 @@ export function registerPtyConnectionCommandFinishedCleanupTests(): void {
     it('does NOT reconcile when the process check could not confirm a shell', async () => {
       vi.useFakeTimers()
       const { connectPanePty } = await import('./pty-connection')
-      vi.mocked(window.api.pty.inspectProcess).mockResolvedValue({
-        foregroundProcess: null,
-        hasChildProcesses: false
-      })
+      vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue(null)
       vi.mocked(window.api.agentStatus.reconcileEndedProcess).mockClear()
       const dataCallbackRef: { current: ((data: string) => void) | null } = { current: null }
       const ptyId = 'pty-unconfirmed-shell'
@@ -470,10 +458,7 @@ export function registerPtyConnectionCommandFinishedCleanupTests(): void {
     it('disarms stale TUI modes in the emulator after a confirmed return to shell', async () => {
       vi.useFakeTimers()
       const { connectPanePty } = await import('./pty-connection')
-      vi.mocked(window.api.pty.inspectProcess).mockResolvedValue({
-        foregroundProcess: 'bash',
-        hasChildProcesses: false
-      })
+      vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue('bash')
       const dataCallbackRef: { current: ((data: string) => void) | null } = { current: null }
       const ptyId = 'pty-stale-mode-disarm'
       const transport = createMockTransport(ptyId)
@@ -519,9 +504,8 @@ export function registerPtyConnectionCommandFinishedCleanupTests(): void {
     it('grounds xterm and the input mirror in stream order when output is still queued', async () => {
       vi.useFakeTimers()
       const { connectPanePty } = await import('./pty-connection')
-      const confirmRead =
-        createDeferred<Awaited<ReturnType<typeof window.api.pty.inspectProcess>>>()
-      vi.mocked(window.api.pty.inspectProcess).mockReturnValue(confirmRead.promise)
+      const confirmRead = createDeferred<string>()
+      vi.mocked(window.api.pty.confirmForegroundProcess).mockReturnValue(confirmRead.promise)
       const dataCallbackRef: { current: ((data: string) => void) | null } = { current: null }
       const ptyId = 'pty-stale-mode-queued-output'
       const transport = createMockTransport(ptyId)
@@ -547,12 +531,12 @@ export function registerPtyConnectionCommandFinishedCleanupTests(): void {
       dataCallbackRef.current?.('\x1b]133;D;0\x07')
       await vi.advanceTimersByTimeAsync(350)
       await flushAsyncTicks()
-      expect(window.api.pty.inspectProcess).toHaveBeenCalled()
+      expect(window.api.pty.confirmForegroundProcess).toHaveBeenCalled()
 
       // Hidden-pane output sits in the background queue when the shell proof lands.
       dataCallbackRef.current?.('\x1b[>5u')
       expect(writes.some((w) => w.includes('\x1b[>5u'))).toBe(false)
-      confirmRead.resolve({ foregroundProcess: 'bash', hasChildProcesses: false })
+      confirmRead.resolve('bash')
       await flushAsyncTicks()
       await vi.advanceTimersByTimeAsync(100)
 
@@ -605,10 +589,7 @@ export function registerPtyConnectionCommandFinishedCleanupTests(): void {
     it('retires stale routing after unavailable command-finish reads without asserting shell', async () => {
       vi.useFakeTimers()
       const { connectPanePty } = await import('./pty-connection')
-      vi.mocked(window.api.pty.inspectProcess).mockResolvedValue({
-        foregroundProcess: null,
-        hasChildProcesses: false
-      })
+      vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue(null)
       const dataCallbackRef: { current: ((data: string) => void) | null } = { current: null }
       const ptyId = 'pty-droid-unavailable-finish'
       const tabId = 'tab-droid-unavailable-finish'
@@ -654,10 +635,7 @@ export function registerPtyConnectionCommandFinishedCleanupTests(): void {
     it('cancels deferred cleanup on a new command and retires identity at its later shell', async () => {
       vi.useFakeTimers()
       const { connectPanePty } = await import('./pty-connection')
-      vi.mocked(window.api.pty.inspectProcess).mockResolvedValue({
-        foregroundProcess: 'powershell.exe',
-        hasChildProcesses: false
-      })
+      vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue('powershell.exe')
       const dataCallbackRef: { current: ((data: string) => void) | null } = { current: null }
       const ptyId = 'pty-droid-superseded-confirmation'
       const transport = createMockTransport(ptyId)
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-foreground-agent-routing.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection-foreground-agent-routing.spec.ts
index 2885685336f6..e68028b8ec02 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-foreground-agent-routing.spec.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-foreground-agent-routing.spec.ts
@@ -109,10 +109,7 @@ export function registerPtyConnectionForegroundAgentRoutingTests(): void {
     it('clears pre-hook launch config when an Orca-started command exits', async () => {
       vi.useFakeTimers({ toFake: ['setTimeout'] })
       const { connectPanePty } = await import('./pty-connection')
-      vi.mocked(window.api.pty.inspectProcess).mockResolvedValue({
-        foregroundProcess: 'zsh',
-        hasChildProcesses: false
-      })
+      vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue('zsh')
 
       const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null }
       const transport = createMockTransport()
@@ -176,10 +173,9 @@ export function registerPtyConnectionForegroundAgentRoutingTests(): void {
       const ptyId = 'pty-manually-typed-droid'
       const tabId = 'tab-manually-typed-droid'
       const foregroundResults = ['powershell.exe', 'droid']
-      vi.mocked(window.api.pty.inspectProcess).mockImplementation(async (id: string) => ({
-        foregroundProcess: id === ptyId ? (foregroundResults.shift() ?? 'droid') : null,
-        hasChildProcesses: false
-      }))
+      vi.mocked(window.api.pty.confirmForegroundProcess).mockImplementation(async (id: string) =>
+        id === ptyId ? (foregroundResults.shift() ?? 'droid') : null
+      )
       const transport = createMockTransport(ptyId)
       transport.connect.mockImplementation(
         async ({ callbacks }: { callbacks: ConnectCallbacks }) => {
@@ -219,10 +215,7 @@ export function registerPtyConnectionForegroundAgentRoutingTests(): void {
     it('confirms a manually typed Droid without OSC command boundaries', async () => {
       vi.useFakeTimers()
       const { connectPanePty } = await import('./pty-connection')
-      vi.mocked(window.api.pty.inspectProcess).mockResolvedValue({
-        foregroundProcess: 'droid',
-        hasChildProcesses: false
-      })
+      vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue('droid')
       const pane = createPane(1)
       const ptyId = 'pty-manual-droid-no-osc'
       const tabId = 'tab-manual-droid-no-osc'
@@ -244,9 +237,7 @@ export function registerPtyConnectionForegroundAgentRoutingTests(): void {
 
       await vi.advanceTimersByTimeAsync(350)
 
-      expect(window.api.pty.inspectProcess).toHaveBeenCalledWith(ptyId, {
-        scanChildProcesses: true
-      })
+      expect(window.api.pty.confirmForegroundProcess).toHaveBeenCalledWith(ptyId)
       expect(mockStoreState.paneForegroundAgentByPaneKey[paneKey]).toEqual({
         agent: 'droid',
         agentEvidence: 'process-read',
@@ -261,10 +252,7 @@ export function registerPtyConnectionForegroundAgentRoutingTests(): void {
       vi.useFakeTimers()
       const { connectPanePty } = await import('./pty-connection')
       vi.mocked(window.api.pty.getForegroundProcess).mockResolvedValue('droid')
-      vi.mocked(window.api.pty.inspectProcess).mockResolvedValue({
-        foregroundProcess: 'droid',
-        hasChildProcesses: false
-      })
+      vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue('droid')
       const pane = createPane(1)
       const ptyId = 'pty-launched-droid-no-osc'
       const tabId = 'tab-launched-droid-no-osc'
@@ -295,9 +283,7 @@ export function registerPtyConnectionForegroundAgentRoutingTests(): void {
       )
       await flushAsyncTicks()
 
-      expect(window.api.pty.inspectProcess).toHaveBeenCalledWith(ptyId, {
-        scanChildProcesses: true
-      })
+      expect(window.api.pty.confirmForegroundProcess).toHaveBeenCalledWith(ptyId)
       expect(mockStoreState.paneForegroundAgentByPaneKey[paneKey]).toEqual({
         agent: 'droid',
         agentEvidence: 'process-read',
@@ -312,10 +298,9 @@ export function registerPtyConnectionForegroundAgentRoutingTests(): void {
       vi.useFakeTimers()
       const { connectPanePty } = await import('./pty-connection')
       const foregroundResults = ['bash.exe', 'bash.exe', 'droid']
-      vi.mocked(window.api.pty.inspectProcess).mockImplementation(async () => ({
-        foregroundProcess: foregroundResults.shift() ?? 'droid',
-        hasChildProcesses: false
-      }))
+      vi.mocked(window.api.pty.confirmForegroundProcess).mockImplementation(
+        async () => foregroundResults.shift() ?? 'droid'
+      )
       const pane = createPane(1)
       const ptyId = 'pty-launched-droid-slow-boot'
       const tabId = 'tab-launched-droid-slow-boot'
@@ -357,10 +342,7 @@ export function registerPtyConnectionForegroundAgentRoutingTests(): void {
       let foreground = 'bash.exe'
       // Why both: the pane's process monitor reads the same foreground the confirm read sees.
       vi.mocked(window.api.pty.getForegroundProcess).mockImplementation(async () => foreground)
-      vi.mocked(window.api.pty.inspectProcess).mockImplementation(async () => ({
-        foregroundProcess: foreground,
-        hasChildProcesses: false
-      }))
+      vi.mocked(window.api.pty.confirmForegroundProcess).mockImplementation(async () => foreground)
       const pane = createPane(1)
       const ptyId = 'pty-launched-droid-slow'
       const tabId = 'tab-launched-droid-slow'
@@ -412,10 +394,7 @@ export function registerPtyConnectionForegroundAgentRoutingTests(): void {
       const { connectPanePty } = await import('./pty-connection')
       let foreground = 'sleep'
       vi.mocked(window.api.pty.getForegroundProcess).mockImplementation(async () => foreground)
-      vi.mocked(window.api.pty.inspectProcess).mockImplementation(async () => ({
-        foregroundProcess: foreground,
-        hasChildProcesses: false
-      }))
+      vi.mocked(window.api.pty.confirmForegroundProcess).mockImplementation(async () => foreground)
       const tabId = 'tab-delayed-claude'
       const ptyId = 'pty-delayed-claude'
       const paneKey = makePaneKey(tabId, LEAF_1)
@@ -449,10 +428,7 @@ export function registerPtyConnectionForegroundAgentRoutingTests(): void {
     it('revokes trusted Droid after accepted no-OSC exit input until shell confirmation', async () => {
       vi.useFakeTimers()
       const { connectPanePty } = await import('./pty-connection')
-      vi.mocked(window.api.pty.inspectProcess).mockResolvedValue({
-        foregroundProcess: 'cmd.exe',
-        hasChildProcesses: false
-      })
+      vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue('cmd.exe')
       const pane = createPane(1)
       const ptyId = 'pty-droid-exit-no-osc'
       const tabId = 'tab-droid-exit-no-osc'
@@ -494,10 +470,7 @@ export function registerPtyConnectionForegroundAgentRoutingTests(): void {
       const { connectPanePty } = await import('./pty-connection')
       let foreground = 'pi'
       vi.mocked(window.api.pty.getForegroundProcess).mockResolvedValue('pi')
-      vi.mocked(window.api.pty.inspectProcess).mockImplementation(async () => ({
-        foregroundProcess: foreground,
-        hasChildProcesses: false
-      }))
+      vi.mocked(window.api.pty.confirmForegroundProcess).mockImplementation(async () => foreground)
       const pane = createPane(1)
       const ptyId = 'pty-pi-no-osc-lifecycle'
       const tabId = 'tab-pi-no-osc-lifecycle'
@@ -551,10 +524,10 @@ export function registerPtyConnectionForegroundAgentRoutingTests(): void {
     it('never promotes typed Droid text when foreground enrichment is unavailable', async () => {
       vi.useFakeTimers()
       const { connectPanePty } = await import('./pty-connection')
-      vi.mocked(window.api.pty.inspectProcess)
-        .mockResolvedValueOnce({ foregroundProcess: null, hasChildProcesses: false })
+      vi.mocked(window.api.pty.confirmForegroundProcess)
+        .mockResolvedValueOnce(null)
         .mockRejectedValueOnce(new Error('inspection unavailable'))
-        .mockResolvedValueOnce({ foregroundProcess: null, hasChildProcesses: false })
+        .mockResolvedValueOnce(null)
       const dataCallbackRef: { current: ((data: string) => void) | null } = { current: null }
       const pane = createPane(1)
       const ptyId = 'pty-typed-droid-unavailable-start'
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-foreground-agent-sampling.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection-foreground-agent-sampling.spec.ts
index 65061ce51994..ba0961f43e2a 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-foreground-agent-sampling.spec.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-foreground-agent-sampling.spec.ts
@@ -229,9 +229,7 @@ export function registerPtyConnectionForegroundAgentSamplingTests(): void {
           await vi.advanceTimersByTimeAsync(10_000)
 
           // Scope to this pane's pty id: a delayed confirm for another test's pane can fire during this advance.
-          expect(window.api.pty.inspectProcess).not.toHaveBeenCalledWith(ptyId, {
-            scanChildProcesses: true
-          })
+          expect(window.api.pty.confirmForegroundProcess).not.toHaveBeenCalledWith(ptyId)
           expect(mockStoreState.paneForegroundAgentByPaneKey[cacheKey]).toEqual({
             agent: 'droid',
             routingRevoked: true,
@@ -274,9 +272,7 @@ export function registerPtyConnectionForegroundAgentSamplingTests(): void {
           binding.sampleForegroundAgentOnFocus()
           await vi.advanceTimersByTimeAsync(10_000)
 
-          expect(window.api.pty.inspectProcess).not.toHaveBeenCalledWith(ptyId, {
-            scanChildProcesses: true
-          })
+          expect(window.api.pty.confirmForegroundProcess).not.toHaveBeenCalledWith(ptyId)
           expect(mockStoreState.paneForegroundAgentByPaneKey[cacheKey]).toEqual({
             agent: 'droid',
             routingRevoked: true,
@@ -307,10 +303,7 @@ export function registerPtyConnectionForegroundAgentSamplingTests(): void {
           state: 'working',
           agentType: 'droid'
         }
-        vi.mocked(window.api.pty.inspectProcess).mockResolvedValue({
-          foregroundProcess: 'droid',
-          hasChildProcesses: false
-        })
+        vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue('droid')
 
         binding.requestWindowsShiftEnterReconfirmation()
         await vi.advanceTimersByTimeAsync(200)
@@ -334,9 +327,7 @@ export function registerPtyConnectionForegroundAgentSamplingTests(): void {
 
         await vi.advanceTimersByTimeAsync(350)
         await flushAsyncTicks()
-        expect(window.api.pty.inspectProcess).toHaveBeenCalledWith(ptyId, {
-          scanChildProcesses: true
-        })
+        expect(window.api.pty.confirmForegroundProcess).toHaveBeenCalledWith(ptyId)
         expect(mockStoreState.paneForegroundAgentByPaneKey[cacheKey]).toEqual({
           agent: 'droid',
           agentEvidence: 'process-read',
@@ -372,10 +363,7 @@ export function registerPtyConnectionForegroundAgentSamplingTests(): void {
           state: 'working',
           agentType: 'pi'
         }
-        vi.mocked(window.api.pty.inspectProcess).mockResolvedValue({
-          foregroundProcess: 'cmd.exe',
-          hasChildProcesses: false
-        })
+        vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue('cmd.exe')
 
         binding.sampleForegroundAgentOnFocus()
 
@@ -416,10 +404,7 @@ export function registerPtyConnectionForegroundAgentSamplingTests(): void {
 
       it('confirms daemon launch identity before restoring warm-reattach routing', async () => {
         vi.useFakeTimers()
-        vi.mocked(window.api.pty.inspectProcess).mockResolvedValue({
-          foregroundProcess: 'droid',
-          hasChildProcesses: false
-        })
+        vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue('droid')
         const ptyId = 'pty-launch-identity-no-sample'
         const tabId = `tab-${ptyId}`
         mockStoreState.tabsByWorktree = { 'wt-1': [{ id: tabId, ptyId }] }
@@ -511,10 +496,7 @@ export function registerPtyConnectionForegroundAgentSamplingTests(): void {
 
       it('retires stale daemon launch identity when warm reattach finds the shell', async () => {
         vi.useFakeTimers()
-        vi.mocked(window.api.pty.inspectProcess).mockResolvedValue({
-          foregroundProcess: 'powershell.exe',
-          hasChildProcesses: false
-        })
+        vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue('powershell.exe')
         const ptyId = 'pty-stale-daemon-launch-identity'
         const tabId = `tab-${ptyId}`
         mockStoreState.tabsByWorktree = { 'wt-1': [{ id: tabId, ptyId }] }
@@ -532,7 +514,9 @@ export function registerPtyConnectionForegroundAgentSamplingTests(): void {
         await flushAsyncTicks()
 
         // Assert the floor (initial read + two retries), not an exact count: an incidental droid reconfirm can add one more.
-        expect(vi.mocked(window.api.pty.inspectProcess).mock.calls.length).toBeGreaterThanOrEqual(3)
+        expect(
+          vi.mocked(window.api.pty.confirmForegroundProcess).mock.calls.length
+        ).toBeGreaterThanOrEqual(3)
         expect(mockStoreState.paneForegroundAgentByPaneKey[cacheKey]).toEqual({
           agent: null,
           shellForeground: true
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-foreground-routing-confirmation.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection-foreground-routing-confirmation.spec.ts
index a320255240b8..330dd9deb652 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-foreground-routing-confirmation.spec.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-foreground-routing-confirmation.spec.ts
@@ -160,7 +160,7 @@ export function registerPtyConnectionForegroundRoutingConfirmationTests(): void
       it('does not let a pending confirmation re-arm itself', async () => {
         vi.useFakeTimers()
         // Never resolves: the confirmation stays in flight for the whole test.
-        vi.mocked(window.api.pty.inspectProcess).mockReturnValue(new Promise(() => {}))
+        vi.mocked(window.api.pty.confirmForegroundProcess).mockReturnValue(new Promise(() => {}))
         const ptyId = 'pty-pi-no-remint'
         const tabId = `tab-${ptyId}`
         const { binding, cacheKey } = await connectRestoredPaneForForegroundSampling({
@@ -219,14 +219,11 @@ export function registerPtyConnectionForegroundRoutingConfirmationTests(): void
         async (outcome) => {
           vi.useFakeTimers()
           if (outcome === 'provider rejection') {
-            vi.mocked(window.api.pty.inspectProcess).mockRejectedValue(
+            vi.mocked(window.api.pty.confirmForegroundProcess).mockRejectedValue(
               new Error('inspection unavailable')
             )
           } else {
-            vi.mocked(window.api.pty.inspectProcess).mockResolvedValue({
-              foregroundProcess: null,
-              hasChildProcesses: false
-            })
+            vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue(null)
           }
           const ptyId = `pty-pi-reconfirm-${outcome.replace(' ', '-')}`
           const tabId = `tab-${ptyId}`
@@ -261,10 +258,7 @@ export function registerPtyConnectionForegroundRoutingConfirmationTests(): void
 
       it('replaces pending Pi routing when confirmation finds another agent', async () => {
         vi.useFakeTimers()
-        vi.mocked(window.api.pty.inspectProcess).mockResolvedValue({
-          foregroundProcess: 'codex',
-          hasChildProcesses: false
-        })
+        vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue('codex')
         const ptyId = 'pty-pi-reconfirm-codex'
         const tabId = `tab-${ptyId}`
         const { binding, cacheKey } = await connectRestoredPaneForForegroundSampling({
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-hibernation-kill-shell-foreground.test.ts b/src/renderer/src/components/terminal-pane/pty-connection-hibernation-kill-shell-foreground.test.ts
index 9f4bd8cc3e55..f8f5cb0a31a8 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-hibernation-kill-shell-foreground.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-hibernation-kill-shell-foreground.test.ts
@@ -156,10 +156,7 @@ describe('shell showing through a hibernation kill', () => {
   }> {
     vi.useFakeTimers()
     const { connectPanePty } = await import('./pty-connection')
-    vi.mocked(window.api.pty.inspectProcess).mockResolvedValue({
-      foregroundProcess: 'zsh',
-      hasChildProcesses: false
-    })
+    vi.mocked(window.api.pty.confirmForegroundProcess).mockResolvedValue('zsh')
     const dataCallbackRef: { current: ((data: string) => void) | null } = { current: null }
     const ptyId = 'pty-hibernating'
     const transport = createMockTransport(ptyId)
@@ -239,19 +236,19 @@ describe('shell showing through a hibernation kill', () => {
     'preserves the wake record when a pending confirmation settles with PTY %s',
     async (boundPtyId) => {
       const pane = await connectHibernatingPane(true)
-      const foreground = createDeferred<Awaited<ReturnType<typeof window.api.pty.inspectProcess>>>()
-      vi.mocked(window.api.pty.inspectProcess).mockReturnValue(foreground.promise)
+      const foreground = createDeferred<string | null>()
+      vi.mocked(window.api.pty.confirmForegroundProcess).mockReturnValue(foreground.promise)
 
       pane.finishCommand()
       await vi.advanceTimersByTimeAsync(350)
-      expect(window.api.pty.inspectProcess).toHaveBeenCalledExactlyOnceWith('pty-hibernating', {
-        scanChildProcesses: true
-      })
+      expect(window.api.pty.confirmForegroundProcess).toHaveBeenCalledExactlyOnceWith(
+        'pty-hibernating'
+      )
       pane.exitPty()
       pane.rebindPty(boundPtyId)
       await flushAsyncTicks()
       expect(mockStoreState.suppressedPtyExitIds).toEqual({})
-      foreground.resolve({ foregroundProcess: 'zsh', hasChildProcesses: false })
+      foreground.resolve('zsh')
       await flushAsyncTicks()
 
       // A detached transport rejects the stale read; a retained binding reaches shell cleanup.
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/pane-agent-identity.ts b/src/renderer/src/components/terminal-pane/pty-connection/pane-agent-identity.ts
index bc4cd52795e9..d61189e9fada 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/pane-agent-identity.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/pane-agent-identity.ts
@@ -142,7 +142,9 @@ export function installPaneAgentIdentity(session: ConnectPanePtySession): void {
         ? inspectRuntimeTerminalProcess(id, options)
         : window.api.pty.getForegroundProcess(id),
     confirmForegroundProcess: (id, options) =>
-      inspectRuntimeTerminalProcess(id, { ...options, scanChildProcesses: true }),
+      isRemoteExecutionHostPtyId(id)
+        ? inspectRuntimeTerminalProcess(id, options)
+        : window.api.pty.confirmForegroundProcess(id),
     isRemotePtyId: isRemoteExecutionHostPtyId,
     getExpectedIncarnationId: () => session.remotePtyIncarnationId ?? null,
     publish: (entry) => useAppStore.getState().setPaneForegroundAgent(session.cacheKey, entry),
diff --git a/src/renderer/src/components/terminal-pane/terminal-tab-agent-type-index.ts b/src/renderer/src/components/terminal-pane/terminal-tab-agent-type-index.ts
index 6bec879ea930..3e31c5aefb7a 100644
--- a/src/renderer/src/components/terminal-pane/terminal-tab-agent-type-index.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-tab-agent-type-index.ts
@@ -62,10 +62,7 @@ export function createTerminalTabAgentTypeSelector(
         }
       }
       for (const [paneKey, entry] of Object.entries(foreground)) {
-        const agent =
-          entry.suspendedAgent ??
-          (!entry.shellForeground && !entry.routingRevoked ? entry.agent : null)
-        if (!agent) {
+        if (!entry.agent || entry.shellForeground || entry.routingRevoked) {
           continue
         }
         const separator = paneKey.indexOf(':')
@@ -76,9 +73,9 @@ export function createTerminalTabAgentTypeSelector(
         const leafId = paneKey.slice(separator + 1)
         const byLeaf = nextByTabId.get(entryTabId)
         if (byLeaf) {
-          byLeaf[leafId] ??= agent
+          byLeaf[leafId] ??= entry.agent
         } else {
-          nextByTabId.set(entryTabId, { [leafId]: agent })
+          nextByTabId.set(entryTabId, { [leafId]: entry.agent })
         }
       }
 
diff --git a/src/renderer/src/i18n/en-runtime-required.json b/src/renderer/src/i18n/en-runtime-required.json
index 85b096901f02..f6d6fa293f6d 100644
--- a/src/renderer/src/i18n/en-runtime-required.json
+++ b/src/renderer/src/i18n/en-runtime-required.json
@@ -1917,6 +1917,7 @@
           "terminalSwitchFailed": "{{agent}} could not switch to a terminal. Try again.",
           "writerUnconfirmed": "Orca could not confirm {{agent}} stopped. Check its open chats and terminals, then try this action again.",
           "sourceExitUnconfirmed": "Orca could not confirm {{agent}} stopped in this terminal. Quit {{agent}} here, then try this action again.",
+          "agentPaused": "{{agent}} is paused in this terminal. Resume it with fg or exit it, then switch.",
           "sourceKept": "{{agent}} opened successfully. The original tab was kept; continue in the new tab.",
           "sourceStopUnknown": "Orca could not confirm {{agent}} stopped. Check {{agent}} in the original terminal, then try switching again.",
           "changeInProgress": "{{agent}} is still finishing another change to this conversation. Try again in a moment.",
diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index 794f8ec938e2..bb706b570a95 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -20163,6 +20163,7 @@
           "terminalSwitchFailed": "{{agent}} could not switch to a terminal. Try again.",
           "writerUnconfirmed": "Orca could not confirm {{agent}} stopped. Check its open chats and terminals, then try this action again.",
           "sourceExitUnconfirmed": "Orca could not confirm {{agent}} stopped in this terminal. Quit {{agent}} here, then try this action again.",
+          "agentPaused": "{{agent}} is paused in this terminal. Resume it with fg or exit it, then switch.",
           "sourceKept": "{{agent}} opened successfully. The original tab was kept; continue in the new tab.",
           "changeInProgress": "{{agent}} is still finishing another change to this conversation. Try again in a moment.",
           "conversationMissing": "Orca could not find this {{agent}} conversation. Open it from Session History, then try again.",
diff --git a/src/renderer/src/lib/conversation-switch-feedback.ts b/src/renderer/src/lib/conversation-switch-feedback.ts
index 0483f19824b6..0d7d6b17416c 100644
--- a/src/renderer/src/lib/conversation-switch-feedback.ts
+++ b/src/renderer/src/lib/conversation-switch-feedback.ts
@@ -36,6 +36,13 @@ export function conversationSwitchFailureText(
             values
           )
   }
+  if (reason === 'agentPaused') {
+    return translate(
+      'components.tab.bar.switch.agentPaused',
+      '{{agent}} is paused in this terminal. Resume it with fg or exit it, then switch.',
+      values
+    )
+  }
   if (reason === 'ownerUnproven' || reason === 'previousExitUnverifiable') {
     return translate(
       args.source
diff --git a/src/renderer/src/lib/open-tab-occupant-agent.ts b/src/renderer/src/lib/open-tab-occupant-agent.ts
index cfac9940b87a..002c2cc5c49c 100644
--- a/src/renderer/src/lib/open-tab-occupant-agent.ts
+++ b/src/renderer/src/lib/open-tab-occupant-agent.ts
@@ -50,8 +50,9 @@ export function resolveOpenTabOccupantAgent({
     resolveSiblingCompletedTabAgent(agentStatusByPaneKey, layout, tabId) ??
     resolveSiblingRetainedTabAgent(retainedAgentsByPaneKey, layout, tabId)
   const focusedPaneKey = focusedPaneKeyFor(tabId, layout)
-  const process = focusedPaneKey ? paneForegroundAgentByPaneKey?.[focusedPaneKey] : undefined
-  const processAgent = process?.agent ?? process?.suspendedAgent ?? null
+  const processAgent = focusedPaneKey
+    ? (paneForegroundAgentByPaneKey?.[focusedPaneKey]?.agent ?? null)
+    : null
   const sleepingSessionAgent = focusedPaneKey
     ? (sleepingAgentSessionsByPaneKey[focusedPaneKey]?.agent ?? null)
     : null
diff --git a/src/renderer/src/lib/use-tab-agent.ts b/src/renderer/src/lib/use-tab-agent.ts
index f452c0b5fda8..221d906a9290 100644
--- a/src/renderer/src/lib/use-tab-agent.ts
+++ b/src/renderer/src/lib/use-tab-agent.ts
@@ -60,18 +60,11 @@ export function useTabAgent(tab: TerminalTab): TerminalAgent | null {
     return activeLeafId && isTerminalLeafId(activeLeafId) ? makePaneKey(tab.id, activeLeafId) : null
   })
   const processAgent = useAppStore((s) =>
-    focusedPaneKey
-      ? (s.paneForegroundAgentByPaneKey[focusedPaneKey]?.agent ??
-        s.paneForegroundAgentByPaneKey[focusedPaneKey]?.suspendedAgent ??
-        null)
-      : null
+    focusedPaneKey ? (s.paneForegroundAgentByPaneKey[focusedPaneKey]?.agent ?? null) : null
   )
   const processShellForeground = useAppStore((s) =>
     focusedPaneKey
-      ? Boolean(
-          s.paneForegroundAgentByPaneKey[focusedPaneKey]?.shellForeground &&
-          !s.paneForegroundAgentByPaneKey[focusedPaneKey]?.suspendedAgent
-        )
+      ? Boolean(s.paneForegroundAgentByPaneKey[focusedPaneKey]?.shellForeground)
       : false
   )
   // Why: a hibernated pane's session record is the freshest identity once PTY, hook, and process signals are all gone.
diff --git a/src/renderer/src/store/slices/pane-foreground-agent.ts b/src/renderer/src/store/slices/pane-foreground-agent.ts
index ad7ff7d7c0c7..2a955997fc13 100644
--- a/src/renderer/src/store/slices/pane-foreground-agent.ts
+++ b/src/renderer/src/store/slices/pane-foreground-agent.ts
@@ -8,8 +8,6 @@ export type PaneForegroundAgentEvidence = 'process-read' | 'launch-record'
 export type PaneForegroundAgentEntry = {
   /** Recognized agent process in the pane's foreground; null when unknown. */
   agent: TerminalAgent | null
-  /** Observed stopped job; independent of foreground byte routing. */
-  suspendedAgent?: TerminalAgent
   /** Where `agent` came from. Only 'process-read' is a live read; absent counts as unconfirmed,
    *  so a writer that omits it cannot make a sidebar row look process-backed. */
   agentEvidence?: PaneForegroundAgentEvidence
@@ -48,7 +46,6 @@ export const createPaneForegroundAgentSlice: StateCreator<
       if (
         current &&
         current.agent === entry.agent &&
-        current.suspendedAgent === entry.suspendedAgent &&
         current.agentEvidence === entry.agentEvidence &&
         current.routingTrusted === entry.routingTrusted &&
         current.routingRevoked === entry.routingRevoked &&
diff --git a/src/shared/agent-session-refusal-details.ts b/src/shared/agent-session-refusal-details.ts
index b145ed74a09b..3c83d88b4434 100644
--- a/src/shared/agent-session-refusal-details.ts
+++ b/src/shared/agent-session-refusal-details.ts
@@ -93,6 +93,8 @@ export const AGENT_SESSION_REFUSAL_REASONS = {
     /** A terminal may still be writing the chat's conversation, so its agent did not start. */
     'conversationOpenInTerminal',
     'conversationOpenElsewhere',
+    /** Job control paused the terminal's agent (Ctrl+Z); a switch leaves it to the user. */
+    'agentPaused',
     /** The agent started, then Orca could not open the chat's conversation for it. */
     'attachFailed'
   ],
diff --git a/src/shared/agent-session-refusal-reason-words.ts b/src/shared/agent-session-refusal-reason-words.ts
index 8970e86cf222..677872d513ec 100644
--- a/src/shared/agent-session-refusal-reason-words.ts
+++ b/src/shared/agent-session-refusal-reason-words.ts
@@ -120,6 +120,8 @@ const REASON_WORDS = {
     launchPreparationFailed: { fact: 'launchPreparationFailed', action: 'retry' },
     conversationOpenInTerminal: { fact: 'conversationOpenInTerminal', action: 'actFirst' },
     conversationOpenElsewhere: { fact: 'conversationOpenElsewhere', action: 'actFirst' },
+    // Only a terminal switch sends this, and it words the refusal itself.
+    agentPaused: codeWords('actFirst'),
     attachFailed: codeWords('retry')
   },
   agent_session_ownership_unknown: {
diff --git a/src/shared/foreground-process-evidence.ts b/src/shared/foreground-process-evidence.ts
index 21d61029cfa7..4744575aa137 100644
--- a/src/shared/foreground-process-evidence.ts
+++ b/src/shared/foreground-process-evidence.ts
@@ -51,7 +51,6 @@ export type RemoteForegroundEvidence =
   | ({
       verdict: 'live'
       processName: string | null
-      suspendedAgentProcess?: string
       fence: PosixFence | WindowsFence
     } & HostObservation)
   | ({ verdict: 'unverifiable'; reason: string } & HostObservation)
@@ -143,8 +142,6 @@ export function isRemoteForegroundEvidence(value: unknown): value is RemoteForeg
   if (input.verdict === 'live') {
     return (
       (input.processName === null || typeof input.processName === 'string') &&
-      (input.suspendedAgentProcess === undefined ||
-        isNonEmptyString(input.suspendedAgentProcess)) &&
       (isPosixFence(input.fence) || isWindowsFence(input.fence))
     )
   }
diff --git a/src/shared/terminal-process-inspection.ts b/src/shared/terminal-process-inspection.ts
index a469fd4a9868..4cdfe32e092c 100644
--- a/src/shared/terminal-process-inspection.ts
+++ b/src/shared/terminal-process-inspection.ts
@@ -27,8 +27,6 @@ export type ClientOnlyUnverifiableInspection = {
 
 /** Compatibility-shaped host/local inspection returned by the inspect RPC. */
 export type HostProcessInspection = {
-  suspendedAgentProcess?: string
-
   foregroundProcess: string | null
   hasChildProcesses: boolean
   /** Optional on old hosts; the renderer treats an omitted field as old-host unverifiable. */

From 140105de0a207b6258f52c5c4e2a33242157551e Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 07:01:52 -0700
Subject: [PATCH 206/207] Open a History or unbound-pane chat selected, right
 after its source tab

When a switch to chat had no pane to stop (History's row, or a paired pane whose binding was gone), the client recorded no focus for the chat it asked for and named no source, so the chat opened unselected at the end of the strip. The client now records its focus intent for that chat (withdrawn on a definite refusal) and names the source's host tab when it knows one; the host places the chat right after that tab with the existing `after` slot anchor, so every client puts it there. With no source tab it goes at the end, as before. A tab that is only named places the chat but does not gate the selection, which stays the rule for a captured split pane.
---
 ...ructured-agent-session-switch-execution.ts | 18 +++--
 ...ession-switch-uncaptured-placement.test.ts | 77 +++++++++++++++++++
 .../structured-session-tab-restoration.ts     |  3 +-
 .../session-tabs/switch-slot-anchors.ts       | 29 +++++++
 .../lib/conversation-surface-switch.test.tsx  | 36 ++++++++-
 .../src/lib/conversation-surface-switch.ts    | 15 ++--
 .../lib/conversation-switch-focus-intent.ts   | 41 ++++++++++
 .../structured-agent-session-params.ts        |  2 +
 8 files changed, 204 insertions(+), 17 deletions(-)
 create mode 100644 src/main/runtime/rpc/methods/structured-agent-session-switch-uncaptured-placement.test.ts

diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
index 28a40315b49f..b477dad6741c 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
@@ -36,7 +36,7 @@ import { mainAgentState } from '../../../../shared/main-agent-status'
 import { worktreeIdsEqual } from '../../../../shared/worktree/id'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
 import { isAiVaultAgent } from '../../../../shared/ai-vault-types'
-import { slotAnchor } from '../../session-tabs/switch-slot-anchors'
+import { switchChatSlot } from '../../session-tabs/switch-slot-anchors'
 
 type Prepared = Awaited<ReturnType<typeof prepareStructuredSessionSwitch>>
 
@@ -280,25 +280,27 @@ async function switchToChat(
     throw new AgentSessionRefusalError(revealed.openRefusal)
   }
   // The one layout write: the chat takes the terminal tab's slot. A split sibling keeps the tab,
-  // so the chat opens beside it; a source in another workspace keeps its tab untouched.
+  // so the chat opens beside it; a source in another workspace keeps its tab untouched. A source
+  // the client couldn't capture is only named, so the chat opens right after it.
   const sameWorkspace =
     close !== undefined && worktreeIdsEqual(close.source.worktreeId, record.location.workspaceId)
   const replaces = sameWorkspace && close.wholeTab() ? close.source.tabId : undefined
+  const slot = switchChatSlot(
+    replaces,
+    close ? (sameWorkspace ? close.source.tabId : undefined) : execution.sourceTabId,
+    close?.placement
+  )
   await ctx.runtime.switchSlotAnchors.recordFor(
     record.location.workspaceId,
     `agent-session:${sessionId}`,
-    sameWorkspace ? slotAnchor(replaces, close.source.tabId) : undefined,
+    slot.anchor,
     () =>
       ctx.runtime.publishStructuredAgentSessionTab({
         ...revealed,
         activate: true,
         check,
         focusWindow: agentLaunchMovesHostWindow(ctx),
-        ...(replaces
-          ? { replaces }
-          : sameWorkspace
-            ? { placement: close.placement(), sourceTabId: close.source.tabId }
-            : {})
+        ...slot.publish
       })
   )
   replacedBy = replaces ? sessionId : undefined
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-uncaptured-placement.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-uncaptured-placement.test.ts
new file mode 100644
index 000000000000..d2c4ec24d26d
--- /dev/null
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-uncaptured-placement.test.ts
@@ -0,0 +1,77 @@
+import { afterEach, beforeEach, expect, it } from 'vitest'
+import {
+  createRestTestRig,
+  type RestTestRig
+} from '../../../native-chat/agent-session-wire/structured-agent-session-rest-test-rig'
+import {
+  createTestParams,
+  CREATE_TEST_CALLER as caller
+} from '../../../native-chat/agent-session-wire/structured-agent-session-create-test-fixture'
+import { HOST_TEST_SESSION as id } from '../../../native-chat/agent-session-wire/structured-agent-session-host-test-data'
+import { setStructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-registry'
+import {
+  setupMainOwnedWorkspace,
+  WORKTREE_ID,
+  TAB_ID
+} from '../../main-owned-workspace-runtime-fixture'
+import { executeStructuredSessionSwitch } from './structured-agent-session-switch-execution'
+
+let rig: RestTestRig
+beforeEach(async () => {
+  rig = await createRestTestRig({ idleSweep: { intervalMs: 60_000 } })
+  const params = createTestParams()
+  expect(
+    await rig.host.create(
+      caller,
+      createTestParams(undefined, { location: { ...params.location, workspaceId: WORKTREE_ID } })
+    )
+  ).toMatchObject({ ok: true })
+  setStructuredAgentSessionHost(rig.host)
+})
+afterEach(async () => {
+  setStructuredAgentSessionHost(null)
+  await rig.dispose()
+})
+
+it.each([true, false])(
+  'opens a chat with no source to stop right after the tab the client named (named: %s)',
+  async (named) => {
+    // A pane the client couldn't capture, or History's row: nothing to stop, only a place.
+    const { runtime, session } = setupMainOwnedWorkspace({ split: false })
+    expect(
+      await runtime.applyLayoutCommand({
+        type: 'openAgentSessionTab',
+        workspace: WORKTREE_ID,
+        sessionId: 'later-tab',
+        agent: 'codex',
+        tabId: 'agent-session:later-tab'
+      })
+    ).toMatchObject({ ok: true })
+    const answer = await executeStructuredSessionSwitch(
+      {
+        sessionId: id,
+        execution: { invocationId: 'uncaptured', ...(named ? { sourceTabId: TAB_ID } : {}) }
+      },
+      { runtime },
+      'chat'
+    )
+    expect(answer).toEqual({ status: 'completed', sessionId: id })
+    const destination = `agent-session:${id}`
+    const group = session().tabGroups?.[WORKTREE_ID]?.find((row) =>
+      row.tabOrder.includes(destination)
+    )
+    expect(group?.tabOrder).toEqual(
+      named
+        ? [TAB_ID, destination, 'agent-session:later-tab']
+        : [TAB_ID, 'agent-session:later-tab', destination]
+    )
+    expect(group?.activeTabId).toBe(destination)
+    const published = await runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)
+    const row = published.tabs.find((tab) => tab.id === destination)
+    if (named) {
+      expect(row).toMatchObject({ after: { tabId: TAB_ID } })
+    } else {
+      expect(row).not.toHaveProperty('after')
+    }
+  }
+)
diff --git a/src/main/runtime/session-tabs/structured-session-tab-restoration.ts b/src/main/runtime/session-tabs/structured-session-tab-restoration.ts
index 206e364aeca2..8a653e971472 100644
--- a/src/main/runtime/session-tabs/structured-session-tab-restoration.ts
+++ b/src/main/runtime/session-tabs/structured-session-tab-restoration.ts
@@ -117,8 +117,7 @@ export abstract class OrcaRuntimeWithRestoreStructuredAgentSessionTabsOnce exten
     let activate = input.activate
     let selectionDecided = false
     // The switch's source: the replaced tab, or the split pane's tab the chat opens beside.
-    const source =
-      input.replaces ?? input.sourceTabId ?? (input.check ? input.placement?.afterTabId : undefined)
+    const source = input.replaces ?? input.sourceTabId
     const windowReplaces = Boolean(
       input.replaces && !ORCA_LAYOUT_OWNER_IS_MAIN && this.getAvailableAuthoritativeWindow()
     )
diff --git a/src/main/runtime/session-tabs/switch-slot-anchors.ts b/src/main/runtime/session-tabs/switch-slot-anchors.ts
index 74b139035ab4..7b216394417c 100644
--- a/src/main/runtime/session-tabs/switch-slot-anchors.ts
+++ b/src/main/runtime/session-tabs/switch-slot-anchors.ts
@@ -1,6 +1,7 @@
 import type { RuntimeMobileSessionTabsSnapshot } from '../../../shared/runtime-types'
 import type { ReplacedTab } from '../../../shared/workspace-layout/workspace-layout-command-types'
 import { AGENT_SESSION_SWITCH_HOST_MS } from '../../../shared/agent-session-switch-execution'
+import type { ChatTabPlacement } from '../agent-session/agent-session-tab-layout'
 
 type SlotAnchor = { replaces: ReplacedTab } | { after: ReplacedTab }
 type Entry = { anchor: SlotAnchor; seen: boolean; recordedAt: number }
@@ -109,6 +110,34 @@ export function slotAnchor(replacedTabId: string | undefined, sourceTabId: strin
   return replacedTabId ? { replaces: { tabId: replacedTabId } } : { after: { tabId: sourceTabId } }
 }
 
+/**
+ * Where a switch's chat opens: in the slot of the whole tab it replaces, right after the source's
+ * tab when it keeps that tab, else at the end with no anchor. A captured split pane's tab also
+ * decides the selection (the chat takes it only from that tab); a tab the client could only name
+ * (History, or a pane with no binding) just places the chat, which the user asked to see.
+ */
+export function switchChatSlot(
+  replaces: string | undefined,
+  besideTabId: string | undefined,
+  capturedPlacement?: () => ChatTabPlacement | undefined
+): {
+  anchor?: SlotAnchor
+  publish: { replaces?: string; placement?: ChatTabPlacement; sourceTabId?: string }
+} {
+  if (replaces) {
+    return { anchor: slotAnchor(replaces, replaces), publish: { replaces } }
+  }
+  if (!besideTabId) {
+    return { publish: {} }
+  }
+  return {
+    anchor: slotAnchor(undefined, besideTabId),
+    publish: capturedPlacement
+      ? { placement: capturedPlacement(), sourceTabId: besideTabId }
+      : { placement: { afterTabId: besideTabId } }
+  }
+}
+
 function sameSlot(a: SlotAnchor, b: SlotAnchor): boolean {
   return 'replaces' in a
     ? 'replaces' in b && a.replaces.tabId === b.replaces.tabId
diff --git a/src/renderer/src/lib/conversation-surface-switch.test.tsx b/src/renderer/src/lib/conversation-surface-switch.test.tsx
index cd3dd730fd81..dccad2c46caa 100644
--- a/src/renderer/src/lib/conversation-surface-switch.test.tsx
+++ b/src/renderer/src/lib/conversation-surface-switch.test.tsx
@@ -4,6 +4,11 @@ import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import { createTabsSliceMockApi } from '../store/slices/tabs-slice-test-harness'
 import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
 import type * as SessionOwner from '@/runtime/structured-agent-session-owner'
+import type * as FocusIntent from './conversation-switch-focus-intent'
+import {
+  peekWebSessionFocusIntent,
+  resetWebSessionFocusIntentForTests
+} from '@/runtime/web-session-focus-intent'
 import { useAppStore } from '@/store'
 import { runConversationSwitch } from './conversation-surface-switch'
 import { pendingNativeChatCliSwitches } from './pending-conversation-surface-switches'
@@ -53,7 +58,8 @@ vi.mock('@/runtime/runtime-rpc-client', async (original) => ({
 vi.mock('@/components/tab-bar/cli-chat-resume-terminal-capture', () => ({
   captureSourceTerminal: mocks.capture
 }))
-vi.mock('./conversation-switch-focus-intent', () => ({
+vi.mock('./conversation-switch-focus-intent', async (original) => ({
+  ...(await original<typeof FocusIntent>()),
   recordConversationSwitchFocus: () => mocks.abandonFocus
 }))
 vi.mock('./ai-vault-session-resume-preparation', () => ({
@@ -117,6 +123,7 @@ afterEach(() => {
   cleanup()
   vi.useRealTimers()
   pendingNativeChatCliSwitches.clear()
+  resetWebSessionFocusIntentForTests()
 })
 
 it('sends one switch, shows pending only while the host runs it, and settles without a message', async () => {
@@ -346,6 +353,33 @@ it.each([true, false])(
           }
     )
     expect(params.execution).not.toHaveProperty('source')
+    // The chat this user asked for lands selected here, right after the pane's tab.
+    expect(params.execution.sourceTabId).toBe('terminal')
+    expect(peekWebSessionFocusIntent({ environmentId: 'paired' }, 'workspace')).toMatchObject({
+      hostTabId: `agent-session:${params.sessionId}`,
+      afterHostTabId: 'terminal'
+    })
     expect(mocks.error).not.toHaveBeenCalled()
   }
 )
+
+it('opens a History chat with no pane selected, at the end, and withdraws that on a refusal', async () => {
+  mocks.target.current = { kind: 'environment', environmentId: 'paired' }
+  mocks.prepare.mockResolvedValue({ sessionId: 'history-session' })
+  mocks.call.mockResolvedValue({ status: 'completed', sessionId: 'chat' })
+  const history = makeTabSessionHistoryRow({ agent: 'codex', sessionId: 'history-session' })
+  const args = { ...fromPane, direction: 'chat' as const, history }
+  await expect(runConversationSwitch(args)).resolves.toBe(true)
+  const [, , params] = mocks.call.mock.calls[0]!
+  expect(params.execution).not.toHaveProperty('sourceTabId')
+  expect(peekWebSessionFocusIntent({ environmentId: 'paired' }, 'workspace')).toEqual(
+    expect.objectContaining({ hostTabId: `agent-session:${params.sessionId}` })
+  )
+  mocks.call.mockResolvedValue({
+    status: 'refused',
+    sessionId: 'chat',
+    refusal: { code: 'agent_session_operation_invalid', details: { reason: 'messagesUnsettled' } }
+  })
+  await expect(runConversationSwitch(args)).resolves.toBe(false)
+  expect(peekWebSessionFocusIntent({ environmentId: 'paired' }, 'workspace')).toBeNull()
+})
diff --git a/src/renderer/src/lib/conversation-surface-switch.ts b/src/renderer/src/lib/conversation-surface-switch.ts
index 88493f01ed7d..ed2a3b6fd572 100644
--- a/src/renderer/src/lib/conversation-surface-switch.ts
+++ b/src/renderer/src/lib/conversation-surface-switch.ts
@@ -35,7 +35,10 @@ import { structuredLaunchFailure } from './structured-agent-session-launch-failu
 import { prepareAiVaultSessionForResume } from './ai-vault-session-resume-preparation'
 import type { CliChatResumeSource } from '@/components/tab-bar/cli-chat-resume-source'
 import { runLegacyConversationSwitch } from './conversation-switch-legacy'
-import { recordConversationSwitchFocus } from './conversation-switch-focus-intent'
+import {
+  recordConversationSwitchFocus,
+  uncapturedSwitchChat
+} from './conversation-switch-focus-intent'
 import {
   type ConversationSwitch,
   keyFor,
@@ -233,9 +236,9 @@ async function switchRequest(
     args.direction === 'chat' && args.source
       ? await deadline.wait(captureSourceTerminal(args.source))
       : null
-  // A pane that can't be captured (a paired host's pane whose shell exited, or that a failed
-  // switch stopped, has lost its binding) opens the conversation as a chat beside it, with no
-  // terminal to stop; History takes its own row's route.
+  // A pane that can't be captured (a paired host's pane whose shell exited has lost its binding)
+  // opens the conversation as a selected chat right after its tab, with no terminal to stop;
+  // History takes its own row's route.
   if (args.direction === 'chat' && args.source && (captured || !args.history)) {
     const intent = createStructuredAgentSessionLaunchIntent(
       args.workspaceId,
@@ -254,7 +257,7 @@ async function switchRequest(
       false
     )
     if (!captured) {
-      return { sessionId: intent.sessionId, execution: { invocationId, create: intent.params } }
+      return uncapturedSwitchChat(intent, invocationId, args.source.tabId)
     }
     return {
       sessionId: intent.sessionId,
@@ -291,7 +294,7 @@ async function switchRequest(
       undefined,
       false
     )
-    return { sessionId: intent.sessionId, execution: { invocationId, create: intent.params } }
+    return uncapturedSwitchChat(intent, invocationId, args.source?.tabId)
   }
   if (args.direction === 'terminal') {
     return {
diff --git a/src/renderer/src/lib/conversation-switch-focus-intent.ts b/src/renderer/src/lib/conversation-switch-focus-intent.ts
index 6b8460a2aa7e..bc341e0716e7 100644
--- a/src/renderer/src/lib/conversation-switch-focus-intent.ts
+++ b/src/renderer/src/lib/conversation-switch-focus-intent.ts
@@ -1,5 +1,10 @@
 import { useAppStore } from '@/store'
 import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
+import {
+  HOST_TERMINAL_SURFACE_SEPARATOR,
+  toHostSessionTabId
+} from '../../../shared/terminal-surface-id'
+import type { StructuredAgentSessionLaunchIntent } from './launch-structured-agent-session'
 import { structuredAgentSessionFocusOwner } from '@/runtime/structured-agent-session-owner'
 import {
   clearWebSessionFocusIntentIfMatches,
@@ -42,3 +47,39 @@ export function recordConversationSwitchFocus(args: {
   )
   return () => clearWebSessionFocusIntentIfMatches(owner, args.workspaceId, hostTabId)
 }
+
+/**
+ * The request for a chat opened with no source to stop (History, or a pane whose binding is gone):
+ * selected where this client looks, as any chat the user opens is, and right after the source's
+ * tab when one is known (a chat the host reused lands by that slot). Returns how to withdraw the
+ * focus after a definite refusal.
+ */
+export function uncapturedSwitchChat(
+  intent: Pick<
+    StructuredAgentSessionLaunchIntent,
+    'target' | 'worktreeId' | 'sessionId' | 'params'
+  >,
+  invocationId: string,
+  /** This client's id for the source's tab. */
+  sourceTab: string | undefined
+) {
+  const { worktreeId } = intent
+  const owner = structuredAgentSessionFocusOwner(intent.target)
+  const hostTabId = `agent-session:${intent.sessionId}`
+  const sourceTabId = sourceTab
+    ? toHostSessionTabId(sourceTab).split(HOST_TERMINAL_SURFACE_SEPARATOR)[0]
+    : undefined
+  recordWebSessionFocusIntent(
+    owner,
+    worktreeId,
+    hostTabId,
+    undefined,
+    resolveWebSessionVisibleTabId(useAppStore.getState(), worktreeId),
+    sourceTabId
+  )
+  return {
+    sessionId: intent.sessionId,
+    abandonFocus: () => clearWebSessionFocusIntentIfMatches(owner, worktreeId, hostTabId),
+    execution: { invocationId, create: intent.params, ...(sourceTabId ? { sourceTabId } : {}) }
+  }
+}
diff --git a/src/shared/rpc-contract/structured-agent-session-params.ts b/src/shared/rpc-contract/structured-agent-session-params.ts
index b59d14186cd0..10c94429fb4c 100644
--- a/src/shared/rpc-contract/structured-agent-session-params.ts
+++ b/src/shared/rpc-contract/structured-agent-session-params.ts
@@ -223,6 +223,8 @@ export const SwitchToChatParams = OptionsParams.extend({
       invocationId: Identifier('Invalid invocation'),
       create: CreateIntentParams.omit({ firstMessage: true }).optional(),
       source: TerminalClose.required().optional(),
+      /** With no source to stop: the tab the chat opens right after, when the client knows it. */
+      sourceTabId: Identifier('Invalid tab').optional(),
       /** Sent only to a host advertising switch consent; false refuses a replying agent. */
       consented: z.boolean().optional()
     })

From 999bbcb1a5275781411d53d886673c66453017fb Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Sat, 31 Oct 2026 07:17:06 -0700
Subject: [PATCH 207/207] Keep a switch-stopped terminal's fact in main and
 publish it to every viewer

When a switch to chat stopped a terminal agent with proof and then failed, only the host window learned that the pane was stopped and which conversation it ran. Paired clients kept a published surface whose process was dead, reattached in a loop, and had no conversation to offer "Switch to Chat UI" from.

Main now records one fact when an unreplaced switch stop settles: the exact process (PTY and incarnation) and the agent and provider conversation it ran. Every frame it publishes carries the fact on that pane's terminal row as an optional field, so a reconnecting or new viewer re-derives it; a renderer republish can neither drop nor invent it. The row keeps that exited process's own handle, and an attach to it is answered with the existing definitive `terminal_exited` refusal, which already ends an older client's recovery. The fact dies when the row leaves (close, or a retry's replace) or the pane names another process (Restart, a rebind, a successor on the same id). A stop without proof records nothing. No daemon protocol change and no new RPC.

Test helpers for the kept-source switch moved to a fixture so the execution test stays under its size limit.
---
 ...t-session-switch-execution.test-fixture.ts | 167 +++++++++++++++++
 ...red-agent-session-switch-execution.test.ts | 172 ++----------------
 ...ructured-agent-session-switch-execution.ts |  14 +-
 ...session-switch-stopped-source-fact.test.ts | 119 ++++++++++++
 ...ured-agent-session-switch-terminal-stop.ts |   9 +-
 ...stream-extraction-characterization.test.ts |   1 +
 ...terminal-multiplex-subscribe-resolution.ts |   6 +
 .../terminal-multiplex-escape-tail.test.ts    |   1 +
 ...minal-multiplex-resync-replay-trim.test.ts |   1 +
 .../rpc/terminal-multiplex-test-harness.ts    |   1 +
 ...-requested-snapshot-unavailability.test.ts |   1 +
 .../runtime-mobile-session-projection.ts      |   4 +-
 .../prune-mobile-session-tab-group-layout.ts  |   4 +-
 .../pty-backed-session-publication.ts         |   3 +
 .../stopped-switch-source-facts.test.ts       | 107 +++++++++++
 .../stopped-switch-source-facts.ts            | 100 ++++++++++
 .../terminal-switch-close-capture.ts          |  25 ++-
 .../runtime-mobile-session-tab-contracts.ts   |   3 +
 src/shared/stopped-switch-source.ts           |  12 ++
 19 files changed, 578 insertions(+), 172 deletions(-)
 create mode 100644 src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test-fixture.ts
 create mode 100644 src/main/runtime/rpc/methods/structured-agent-session-switch-stopped-source-fact.test.ts
 create mode 100644 src/main/runtime/session-tabs/stopped-switch-source-facts.test.ts
 create mode 100644 src/main/runtime/session-tabs/stopped-switch-source-facts.ts

diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test-fixture.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test-fixture.ts
new file mode 100644
index 000000000000..14939c41a85a
--- /dev/null
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test-fixture.ts
@@ -0,0 +1,167 @@
+import { mkdir, writeFile } from 'node:fs/promises'
+import { join } from 'node:path'
+import { vi } from 'vitest'
+import * as cliTranscript from '../../../ai-vault/structured-chat-cli-fork'
+import { structuredAgentRuntimeMetadata } from '../../structured-agent-runtime-metadata'
+import { agentSessionProviderHandleChainHead } from '../../../../shared/agent-session-provider-handle'
+import type { RestTestRig } from '../../../native-chat/agent-session-wire/structured-agent-session-rest-test-rig'
+import { HOST_TEST_SESSION as id } from '../../../native-chat/agent-session-wire/structured-agent-session-host-test-data'
+import {
+  setupMainOwnedWorkspace,
+  WORKTREE_ID,
+  TAB_ID,
+  LEAF_A,
+  PTY_A
+} from '../../main-owned-workspace-runtime-fixture'
+import { executeStructuredSessionSwitch } from './structured-agent-session-switch-execution'
+import type { AiVaultPrepareSessionResumeResult } from '../../../../shared/ai-vault-resume-preparation'
+
+/** A saved Codex conversation whose CLI transcript the switch reads, for the host's first chat. */
+export async function savedTranscript(rig: RestTestRig, sessionId = id) {
+  await rig.host.switchToChat(sessionId)
+  await rig.host.switchToTerminal(sessionId)
+  const record = rig.store.getRecord(sessionId)!
+  const head = agentSessionProviderHandleChainHead(record.providerHandleChain)!
+  const codexHome = join(rig.root, 'codex-account')
+  const sessions = join(codexHome, 'sessions')
+  await mkdir(sessions, { recursive: true })
+  const filePath = join(sessions, 'switch-source.jsonl')
+  const nativeId = head.handle.nativeId
+  await writeFile(
+    filePath,
+    `${[
+      { type: 'session_meta', payload: { id: nativeId } },
+      {
+        timestamp: '2026-10-26T12:00:00Z',
+        type: 'event_msg',
+        payload: { type: 'task_started', turn_id: 'cli-turn' }
+      },
+      {
+        type: 'event_msg',
+        payload: {
+          type: 'user_message',
+          message: 'A terminal prompt'
+        }
+      },
+      {
+        timestamp: '2026-10-26T12:00:01Z',
+        type: 'event_msg',
+        payload: { type: 'task_complete', turn_id: 'cli-turn' }
+      }
+    ]
+      .map((row) => JSON.stringify(row))
+      .join('\n')}\n`
+  )
+  vi.spyOn(cliTranscript, 'resolveStructuredChatCliSource').mockResolvedValue({
+    host: rig.host,
+    record,
+    head,
+    agent: 'codex',
+    cwd: rig.root,
+    providerSessionId: nativeId,
+    requireCurrent: vi.fn(),
+    metadata: structuredAgentRuntimeMetadata('codex')!
+  })
+  const readable: AiVaultPrepareSessionResumeResult = {
+    useRealCodexHome: false,
+    cliForkSource: {
+      agent: 'codex',
+      sourceAgent: 'codex',
+      sessionId: nativeId,
+      filePath,
+      cwd: rig.root,
+      codexHome,
+      executionHostPlatform: process.platform
+    }
+  }
+  vi.spyOn(cliTranscript, 'prepareStructuredChatCliTranscript').mockResolvedValue(readable)
+  return readable
+}
+
+/** A whole-tab terminal→chat switch whose stop keeps the pane for the replace; records main's settlements. */
+export async function switchFromKeptTerminal(options: KeptTerminalSwitchOptions = {}) {
+  const started = startSwitchFromKeptTerminal(options)
+  return { ...started, result: await started.result }
+}
+
+export type KeptTerminalSwitchOptions = {
+  beforeStop?: () => Promise<void>
+  /** The host was lost before any exit proof: liveness stays unknown. */
+  unproven?: boolean
+  afterStop?: (runtime: ReturnType<typeof setupMainOwnedWorkspace>['runtime']) => Promise<void>
+}
+
+/** A whole-tab terminal whose stop keeps the pane; records main's settlements for it. */
+export function keptSourceTerminal(options: KeptTerminalSwitchOptions = {}) {
+  const { runtime } = setupMainOwnedWorkspace()
+  const incarnationId = '11111111-1111-4111-8111-111111111111'
+  runtime.registerPty(PTY_A, WORKTREE_ID, null, { tabId: TAB_ID, leafId: LEAF_A, incarnationId })
+  const source = runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_A}`, WORKTREE_ID)
+  if (!source.presentation) {
+    throw new Error('missing captured source')
+  }
+  const settled = vi.fn()
+  runtime.setNotifier({
+    settleStoppedSwitchSource: settled,
+    closeTerminal: () => {},
+    worktreesChanged: () => {},
+    reposChanged: () => {},
+    activateWorktree: () => {},
+    createTerminal: () => {},
+    splitTerminal: () => {},
+    renameTerminal: () => {},
+    focusTerminal: () => {},
+    terminalFitOverrideChanged: () => {},
+    terminalDriverChanged: () => {}
+  })
+  runtime.setPtyController({
+    write: () => true,
+    kill: () => false,
+    stopAndWait: async () => {
+      await options.beforeStop?.()
+      if (options.unproven) {
+        return false
+      }
+      await runtime.onPtyExit(PTY_A, 0, incarnationId, { hostExitConfirmed: true })
+      await options.afterStop?.(runtime)
+      return true
+    },
+    getForegroundProcess: async () => null
+  })
+  const stoppedSource = {
+    worktreeId: WORKTREE_ID,
+    tabId: TAB_ID,
+    leafId: LEAF_A,
+    ptyId: PTY_A,
+    incarnationId,
+    // A switch stopped it, and the stopped pane names the agent.
+    switched: { agent: 'codex' as const }
+  }
+  return {
+    runtime,
+    source: { ...source, presentation: source.presentation },
+    incarnationId,
+    settled,
+    stoppedSource
+  }
+}
+
+export function startSwitchFromKeptTerminal(options: KeptTerminalSwitchOptions = {}) {
+  const { runtime, source, incarnationId, settled, stoppedSource } = keptSourceTerminal(options)
+  const result = executeStructuredSessionSwitch(
+    {
+      sessionId: id,
+      execution: {
+        invocationId: 'kept-source',
+        source: {
+          terminal: source.handle,
+          expectedIncarnationId: incarnationId,
+          originalPresentation: source.presentation
+        }
+      }
+    },
+    { runtime },
+    'chat'
+  )
+  return { result, settled, stoppedSource }
+}
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
index 36634febd4de..72b75b6c1382 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.test.ts
@@ -1,8 +1,4 @@
-import { mkdir, writeFile } from 'node:fs/promises'
-import { join } from 'node:path'
 import * as cliTranscript from '../../../ai-vault/structured-chat-cli-fork'
-import { structuredAgentRuntimeMetadata } from '../../structured-agent-runtime-metadata'
-import { agentSessionProviderHandleChainHead } from '../../../../shared/agent-session-provider-handle'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import {
   createRestTestRig,
@@ -24,11 +20,16 @@ import {
   LEAF_B
 } from '../../main-owned-workspace-runtime-fixture'
 import { executeStructuredSessionSwitch } from './structured-agent-session-switch-execution'
+import {
+  keptSourceTerminal,
+  savedTranscript,
+  startSwitchFromKeptTerminal,
+  switchFromKeptTerminal
+} from './structured-agent-session-switch-execution.test-fixture'
 import {
   TerminalNotPlacedError,
   TerminalRevealUnconfirmedError
 } from '../../session-tabs/terminal-not-placed-error'
-import type { AiVaultPrepareSessionResumeResult } from '../../../../shared/ai-vault-resume-preparation'
 import { refusedMobileSessionTabClose } from '../../mobile-session-tab-close-outcome'
 import { AGENT_SESSION_SWITCH_HOST_MS } from '../../../../shared/agent-session-switch-execution'
 import { DaemonRequestTimeoutError } from '../../../daemon/daemon-errors'
@@ -58,66 +59,6 @@ afterEach(async () => {
   await rig.dispose()
   vi.restoreAllMocks()
 })
-async function savedTranscript(sessionId = id) {
-  await rig.host.switchToChat(sessionId)
-  await rig.host.switchToTerminal(sessionId)
-  const record = rig.store.getRecord(sessionId)!
-  const head = agentSessionProviderHandleChainHead(record.providerHandleChain)!
-  const codexHome = join(rig.root, 'codex-account')
-  const sessions = join(codexHome, 'sessions')
-  await mkdir(sessions, { recursive: true })
-  const filePath = join(sessions, 'switch-source.jsonl')
-  const nativeId = head.handle.nativeId
-  await writeFile(
-    filePath,
-    `${[
-      { type: 'session_meta', payload: { id: nativeId } },
-      {
-        timestamp: '2026-10-26T12:00:00Z',
-        type: 'event_msg',
-        payload: { type: 'task_started', turn_id: 'cli-turn' }
-      },
-      {
-        type: 'event_msg',
-        payload: {
-          type: 'user_message',
-          message: 'A terminal prompt'
-        }
-      },
-      {
-        timestamp: '2026-10-26T12:00:01Z',
-        type: 'event_msg',
-        payload: { type: 'task_complete', turn_id: 'cli-turn' }
-      }
-    ]
-      .map((row) => JSON.stringify(row))
-      .join('\n')}\n`
-  )
-  vi.spyOn(cliTranscript, 'resolveStructuredChatCliSource').mockResolvedValue({
-    host: rig.host,
-    record,
-    head,
-    agent: 'codex',
-    cwd: rig.root,
-    providerSessionId: nativeId,
-    requireCurrent: vi.fn(),
-    metadata: structuredAgentRuntimeMetadata('codex')!
-  })
-  const readable: AiVaultPrepareSessionResumeResult = {
-    useRealCodexHome: false,
-    cliForkSource: {
-      agent: 'codex',
-      sourceAgent: 'codex',
-      sessionId: nativeId,
-      filePath,
-      cwd: rig.root,
-      codexHome,
-      executionHostPlatform: process.platform
-    }
-  }
-  vi.spyOn(cliTranscript, 'prepareStructuredChatCliTranscript').mockResolvedValue(readable)
-  return readable
-}
 
 it.each(['single', 'split', 'other-workspace', 'reselected'] as const)(
   'uses ordinary exact physical exit and source placement, retaining siblings: %s',
@@ -152,7 +93,7 @@ it.each(['single', 'split', 'other-workspace', 'reselected'] as const)(
         )
       ).toMatchObject({ ok: true })
     }
-    await savedTranscript(sessionId)
+    await savedTranscript(rig, sessionId)
     const { runtime, session, setSession } = setupMainOwnedWorkspace({ split: shape === 'split' })
     const incarnationId = '11111111-1111-4111-8111-111111111111'
     runtime.registerPty(PTY_A, WORKTREE_ID, null, { tabId: TAB_ID, leafId: LEAF_A, incarnationId })
@@ -310,7 +251,7 @@ it.each(['single', 'split', 'other-workspace', 'reselected'] as const)(
 )
 
 it('keeps the stopped source when destination publication fails before retirement', async () => {
-  await savedTranscript()
+  await savedTranscript(rig)
   const { runtime, session } = setupMainOwnedWorkspace()
   const incarnationId = '11111111-1111-4111-8111-111111111111'
   runtime.registerPty(PTY_A, WORKTREE_ID, null, { tabId: TAB_ID, leafId: LEAF_A, incarnationId })
@@ -392,7 +333,7 @@ it.each([
   ['its physical stop is unproven', false],
   ['its agent is paused with Ctrl+Z, stopping nothing', true]
 ] as const)('does not acquire or retire a terminal when %s', async (_case, paused) => {
-  await savedTranscript()
+  await savedTranscript(rig)
   const { runtime, session } = setupMainOwnedWorkspace()
   const incarnationId = '11111111-1111-4111-8111-111111111111'
   runtime.registerPty(PTY_A, WORKTREE_ID, null, { tabId: TAB_ID, leafId: LEAF_A, incarnationId })
@@ -578,7 +519,7 @@ it.each([
 )
 
 it('re-issuing a switch whose first answer was lost adopts the terminal it started', async () => {
-  await savedTranscript()
+  await savedTranscript(rig)
   const { runtime, session } = setupMainOwnedWorkspace()
   vi.spyOn(runtime, 'resolveTerminalWorkspaceLaunchScope').mockResolvedValue({
     id: WORKTREE_ID,
@@ -639,91 +580,8 @@ it('re-issuing a switch whose first answer was lost adopts the terminal it start
   ).toEqual([TAB_ID, lost.tabId].sort())
 })
 
-/** A whole-tab terminal→chat switch whose stop keeps the pane for the replace; records main's settlements. */
-async function switchFromKeptTerminal(options: KeptTerminalSwitchOptions = {}) {
-  const started = startSwitchFromKeptTerminal(options)
-  return { ...started, result: await started.result }
-}
-
-type KeptTerminalSwitchOptions = {
-  beforeStop?: () => Promise<void>
-  afterStop?: (runtime: ReturnType<typeof setupMainOwnedWorkspace>['runtime']) => Promise<void>
-}
-
-/** A whole-tab terminal whose stop keeps the pane; records main's settlements for it. */
-function keptSourceTerminal(options: KeptTerminalSwitchOptions = {}) {
-  const { runtime } = setupMainOwnedWorkspace()
-  const incarnationId = '11111111-1111-4111-8111-111111111111'
-  runtime.registerPty(PTY_A, WORKTREE_ID, null, { tabId: TAB_ID, leafId: LEAF_A, incarnationId })
-  const source = runtime.resolveTerminalPane(`${TAB_ID}:${LEAF_A}`, WORKTREE_ID)
-  if (!source.presentation) {
-    throw new Error('missing captured source')
-  }
-  const settled = vi.fn()
-  runtime.setNotifier({
-    settleStoppedSwitchSource: settled,
-    closeTerminal: () => {},
-    worktreesChanged: () => {},
-    reposChanged: () => {},
-    activateWorktree: () => {},
-    createTerminal: () => {},
-    splitTerminal: () => {},
-    renameTerminal: () => {},
-    focusTerminal: () => {},
-    terminalFitOverrideChanged: () => {},
-    terminalDriverChanged: () => {}
-  })
-  runtime.setPtyController({
-    write: () => true,
-    kill: () => false,
-    stopAndWait: async () => {
-      await options.beforeStop?.()
-      await runtime.onPtyExit(PTY_A, 0, incarnationId, { hostExitConfirmed: true })
-      await options.afterStop?.(runtime)
-      return true
-    },
-    getForegroundProcess: async () => null
-  })
-  const stoppedSource = {
-    worktreeId: WORKTREE_ID,
-    tabId: TAB_ID,
-    leafId: LEAF_A,
-    ptyId: PTY_A,
-    incarnationId,
-    // A switch stopped it, and the stopped pane names the agent.
-    switched: { agent: 'codex' as const }
-  }
-  return {
-    runtime,
-    source: { ...source, presentation: source.presentation },
-    incarnationId,
-    settled,
-    stoppedSource
-  }
-}
-
-function startSwitchFromKeptTerminal(options: KeptTerminalSwitchOptions = {}) {
-  const { runtime, source, incarnationId, settled, stoppedSource } = keptSourceTerminal(options)
-  const result = executeStructuredSessionSwitch(
-    {
-      sessionId: id,
-      execution: {
-        invocationId: 'kept-source',
-        source: {
-          terminal: source.handle,
-          expectedIncarnationId: incarnationId,
-          originalPresentation: source.presentation
-        }
-      }
-    },
-    { runtime },
-    'chat'
-  )
-  return { result, settled, stoppedSource }
-}
-
 it('settles a kept source once when the switch fails after stopping it', async () => {
-  const readable = await savedTranscript()
+  const readable = await savedTranscript(rig)
   const prepare = vi.mocked(cliTranscript.prepareStructuredChatCliTranscript)
   prepare.mockReset()
   prepare.mockResolvedValueOnce(readable).mockResolvedValue({ useRealCodexHome: false })
@@ -736,7 +594,7 @@ it('settles a kept source once when the switch fails after stopping it', async (
 })
 
 it('settles a kept source once when its tab became a split after the stop', async () => {
-  await savedTranscript()
+  await savedTranscript(rig)
   const { result, settled, stoppedSource } = await switchFromKeptTerminal({
     afterStop: async (runtime) => {
       expect(
@@ -756,7 +614,7 @@ it('settles a kept source once when its tab became a split after the stop', asyn
 })
 
 it('settles a replaced source naming its chat, so the window waits for that replace', async () => {
-  await savedTranscript()
+  await savedTranscript(rig)
   const { result, settled, stoppedSource } = await switchFromKeptTerminal()
   expect(result).toEqual({ status: 'completed', sessionId: id })
   expect(settled).toHaveBeenCalledExactlyOnceWith({ ...stoppedSource, replacedBySessionId: id })
@@ -771,7 +629,7 @@ function holdUntilReleased() {
 }
 
 it('settles a kept source once at the deadline while work after the stop is still running', async () => {
-  const readable = await savedTranscript()
+  const readable = await savedTranscript(rig)
   const prepare = vi.mocked(cliTranscript.prepareStructuredChatCliTranscript)
   const work = holdUntilReleased()
   prepare.mockReset()
@@ -797,7 +655,7 @@ it('settles a kept source once at the deadline while work after the stop is stil
 })
 
 it('settles a kept source at once when its stop is proven only after the deadline', async () => {
-  await savedTranscript()
+  await savedTranscript(rig)
   const stop = holdUntilReleased()
   vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] })
   try {
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
index b477dad6741c..c07ef517882b 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-execution.ts
@@ -127,15 +127,8 @@ async function switchToChat(
   deadline: AgentSessionSwitchDeadline,
   keepSource: (settle: () => void) => void
 ): Promise<AgentSessionSwitchResult> {
-  const {
-    host,
-    execution,
-    create,
-    sourceEvidence,
-    createIdentity,
-    providerSessionId,
-    conversation
-  } = prepared
+  const { host, execution, create, sourceEvidence, createIdentity } = prepared
+  const { providerSessionId, conversation } = prepared
   deadline.check()
   let replacedBy: string | undefined
   const source = 'source' in execution ? execution.source : undefined
@@ -195,7 +188,8 @@ async function switchToChat(
       boundary: before && stopped ? { source: before, stopped } : undefined,
       keepSource: (settle) => keepSource(() => settle(replacedBy)),
       consented: execution.consented,
-      agent: [create?.agent, host.deps.store.getRecord(sessionId)?.provider].find(isAiVaultAgent)
+      agent: [create?.agent, host.deps.store.getRecord(sessionId)?.provider].find(isAiVaultAgent),
+      providerSessionId
     })
   }
   if (create) {
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-stopped-source-fact.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-stopped-source-fact.test.ts
new file mode 100644
index 000000000000..e1f3da040835
--- /dev/null
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-stopped-source-fact.test.ts
@@ -0,0 +1,119 @@
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import * as cliTranscript from '../../../ai-vault/structured-chat-cli-fork'
+import {
+  createRestTestRig,
+  type RestTestRig
+} from '../../../native-chat/agent-session-wire/structured-agent-session-rest-test-rig'
+import {
+  createTestParams,
+  CREATE_TEST_CALLER as caller
+} from '../../../native-chat/agent-session-wire/structured-agent-session-create-test-fixture'
+import { HOST_TEST_SESSION as id } from '../../../native-chat/agent-session-wire/structured-agent-session-host-test-data'
+import { setStructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-registry'
+import { WORKTREE_ID, TAB_ID, PTY_A } from '../../main-owned-workspace-runtime-fixture'
+import { executeStructuredSessionSwitch } from './structured-agent-session-switch-execution'
+import {
+  keptSourceTerminal,
+  savedTranscript
+} from './structured-agent-session-switch-execution.test-fixture'
+
+let rig: RestTestRig
+beforeEach(async () => {
+  rig = await createRestTestRig({ idleSweep: { intervalMs: 60_000 } })
+  const params = createTestParams()
+  expect(
+    await rig.host.create(
+      caller,
+      createTestParams(undefined, { location: { ...params.location, workspaceId: WORKTREE_ID } })
+    )
+  ).toMatchObject({ ok: true })
+  setStructuredAgentSessionHost(rig.host)
+})
+afterEach(async () => {
+  setStructuredAgentSessionHost(null)
+  await rig.dispose()
+  vi.restoreAllMocks()
+})
+
+type Kept = ReturnType<typeof keptSourceTerminal>
+
+function switchFrom(kept: Kept, invocationId: string) {
+  return executeStructuredSessionSwitch(
+    {
+      sessionId: id,
+      execution: {
+        invocationId,
+        source: {
+          terminal: kept.source.handle,
+          expectedIncarnationId: kept.incarnationId,
+          originalPresentation: kept.source.presentation
+        }
+      }
+    },
+    { runtime: kept.runtime },
+    'chat'
+  )
+}
+
+async function sourceRow(kept: Kept) {
+  const frame = await kept.runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)
+  return frame.tabs.find((tab) => tab.type === 'terminal' && tab.parentTabId === TAB_ID)
+}
+
+/** The transcript reads before the stop, then is gone: the switch fails after a proven stop. */
+async function failingAfterStop() {
+  const readable = await savedTranscript(rig)
+  const prepare = vi.mocked(cliTranscript.prepareStructuredChatCliTranscript)
+  prepare.mockReset()
+  prepare.mockResolvedValueOnce(readable).mockResolvedValue({ useRealCodexHome: false })
+  return readable
+}
+
+it('publishes the stopped source to every viewer when a switch fails after its proven stop', async () => {
+  const readable = await failingAfterStop()
+  const kept = keptSourceTerminal()
+  expect(await switchFrom(kept, 'from-b')).toMatchObject({ status: 'refused' })
+  // Any viewer (the client that asked, another one, a reconnect) reads it from the frame.
+  const row = await sourceRow(kept)
+  expect(row).toMatchObject({
+    status: 'ready',
+    stoppedSwitchSource: {
+      ptyId: PTY_A,
+      incarnationId: kept.incarnationId,
+      agent: 'codex',
+      providerSessionId: readable.cliForkSource!.sessionId
+    }
+  })
+  // An older client reattaching to that exact process is answered exited, not left waiting.
+  expect(row?.status === 'ready' && kept.runtime.isStoppedSwitchSourceHandle(row.terminal)).toBe(
+    true
+  )
+  // The retry from the stopped pane replaces it in place; the fact dies with the row.
+  vi.mocked(cliTranscript.prepareStructuredChatCliTranscript).mockResolvedValue(readable)
+  const retry = kept.runtime.resolveTerminalPane(
+    `${TAB_ID}:${kept.stoppedSource.leafId}`,
+    WORKTREE_ID
+  )
+  expect(retry.incarnationId).toBe(kept.incarnationId)
+  expect(
+    await switchFrom({ ...kept, source: { ...retry, presentation: retry.presentation! } }, 'retry')
+  ).toEqual({ status: 'completed', sessionId: id })
+  expect(await sourceRow(kept)).toBeUndefined()
+  expect(kept.runtime.isStoppedSwitchSourceHandle(kept.source.handle)).toBe(false)
+})
+
+it('publishes nothing for a stop it could not prove', async () => {
+  await failingAfterStop()
+  const kept = keptSourceTerminal({ unproven: true })
+  expect(await switchFrom(kept, 'host-lost')).toMatchObject({
+    refusal: { details: { reason: 'ownerUnproven' } }
+  })
+  expect(await sourceRow(kept)).not.toHaveProperty('stoppedSwitchSource')
+})
+
+it('publishes nothing when the switch replaced the stopped pane', async () => {
+  await savedTranscript(rig)
+  const kept = keptSourceTerminal()
+  expect(await switchFrom(kept, 'replaced')).toEqual({ status: 'completed', sessionId: id })
+  expect(await sourceRow(kept)).toBeUndefined()
+})
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-stop.ts b/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-stop.ts
index 468d2458899f..b0b0fdc2e57f 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-stop.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-switch-terminal-stop.ts
@@ -40,8 +40,9 @@ export async function stopStructuredSwitchTerminalSource(input: {
   keepSource: (settle: (replacedBy: string | undefined) => void) => void
   /** False: the client left consent to this host, so a replying agent is refused, not stopped. */
   consented?: boolean
-  /** The stopped agent, named by the pane the window keeps on screen. */
+  /** The stopped agent and its conversation, named by the pane kept on screen. */
   agent?: AiVaultAgent
+  providerSessionId?: string | null
 }): Promise<void> {
   const { ctx, host, sessionId, close, deadline } = input
   // Checked where the stop is admitted (before the Escape, at its write, and before the exit), so
@@ -92,7 +93,11 @@ export async function stopStructuredSwitchTerminalSource(input: {
     // The window decides whether the stopped pane is still there; a chat that replaced it is
     // named so the window waits for that replace's own pass.
     input.keepSource((replacedBy) =>
-      close.settleStoppedSource({ replacedBySessionId: replacedBy, agent: input.agent })
+      close.settleStoppedSource({
+        replacedBySessionId: replacedBy,
+        agent: input.agent,
+        providerSessionId: input.providerSessionId ?? undefined
+      })
     )
   } catch {
     host.deps.logger.warn('switch source exit was not confirmed', {
diff --git a/src/main/runtime/rpc/methods/terminal-stream-extraction-characterization.test.ts b/src/main/runtime/rpc/methods/terminal-stream-extraction-characterization.test.ts
index 76f38fdf96e2..228ddfec780b 100644
--- a/src/main/runtime/rpc/methods/terminal-stream-extraction-characterization.test.ts
+++ b/src/main/runtime/rpc/methods/terminal-stream-extraction-characterization.test.ts
@@ -159,6 +159,7 @@ describe('terminal stream extraction characterization', () => {
       getPtyExecutionHostMetadata: () => ({}),
       getTerminalLaunchResult: () => undefined,
       resolveLiveLeafForHandle: () => ({ ptyId: stream.ptyId }),
+      isStoppedSwitchSourceHandle: () => false,
       readTerminal: vi.fn(async () => {
         readCount += 1
         if (readCount === 2) {
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-multiplex-subscribe-resolution.ts b/src/main/runtime/rpc/methods/terminal/terminal-multiplex-subscribe-resolution.ts
index b216ad8a37b0..4bd496b579c1 100644
--- a/src/main/runtime/rpc/methods/terminal/terminal-multiplex-subscribe-resolution.ts
+++ b/src/main/runtime/rpc/methods/terminal/terminal-multiplex-subscribe-resolution.ts
@@ -46,6 +46,12 @@ export function resolveMultiplexSubscribePty(
   state.detachStream(request.streamId, null)
   state.cancelPendingPtyWaits(request.streamId)
 
+  // A pane a switch stopped is gone for good: the definitive exit ends every client's recovery.
+  if (runtime.isStoppedSwitchSourceHandle(request.terminal)) {
+    state.sendStreamError(request.streamId, 'terminal_exited')
+    emit({ type: 'end', streamId: request.streamId })
+    return null
+  }
   let leaf: { ptyId: string | null } | null
   try {
     // Never bind stale handles to a pane's replacement PTY (#7718).
diff --git a/src/main/runtime/rpc/terminal-multiplex-escape-tail.test.ts b/src/main/runtime/rpc/terminal-multiplex-escape-tail.test.ts
index 926b15d7e427..632419789988 100644
--- a/src/main/runtime/rpc/terminal-multiplex-escape-tail.test.ts
+++ b/src/main/runtime/rpc/terminal-multiplex-escape-tail.test.ts
@@ -42,6 +42,7 @@ describe('terminal.multiplex pending-escape-tail threading (#7329)', () => {
       const cleanups = new Map<string, () => void>()
       const runtime = stubRuntime({
         resolveLiveLeafForHandle: vi.fn().mockReturnValue({ ptyId: 'pty-1' }),
+        isStoppedSwitchSourceHandle: () => false,
         readTerminal: vi.fn().mockResolvedValue({ tail: [], truncated: false }),
         serializeTerminalBuffer: vi.fn().mockResolvedValue({
           data: 'user@host:~$ ',
diff --git a/src/main/runtime/rpc/terminal-multiplex-resync-replay-trim.test.ts b/src/main/runtime/rpc/terminal-multiplex-resync-replay-trim.test.ts
index 5319da8ba1bd..dfe422c38f84 100644
--- a/src/main/runtime/rpc/terminal-multiplex-resync-replay-trim.test.ts
+++ b/src/main/runtime/rpc/terminal-multiplex-resync-replay-trim.test.ts
@@ -55,6 +55,7 @@ async function setupMultiplexStream(): Promise<{
     getPtyExecutionHostMetadata: () => ({ incarnationId: 'test-incarnation' }),
     getTerminalLaunchResult: () => undefined,
     resolveLiveLeafForHandle: vi.fn().mockReturnValue({ ptyId: 'pty-1' }),
+    isStoppedSwitchSourceHandle: () => false,
     readTerminal: vi.fn().mockResolvedValue({ tail: [], truncated: false }),
     serializeTerminalBuffer: serializeSnapshot,
     serializeAuthoritativeTerminalBuffer: serializeSnapshot,
diff --git a/src/main/runtime/rpc/terminal-multiplex-test-harness.ts b/src/main/runtime/rpc/terminal-multiplex-test-harness.ts
index ef12d36f3ec3..e5a96aaa5571 100644
--- a/src/main/runtime/rpc/terminal-multiplex-test-harness.ts
+++ b/src/main/runtime/rpc/terminal-multiplex-test-harness.ts
@@ -34,6 +34,7 @@ export function stubRuntime(overrides: Partial<OrcaRuntimeService> = {}): OrcaRu
     answerYieldedTerminalQueries: vi.fn(),
     // Default guarded handle lookup to live PTY for legacy harness stubs; null/stale cases override it (#7718).
     resolveLiveLeafForHandle: vi.fn().mockReturnValue({ ptyId: 'pty-1' }),
+    isStoppedSwitchSourceHandle: () => false,
     requestRendererTerminalTabMount: vi.fn().mockReturnValue(true),
     updateRemoteDesktopViewer: vi.fn().mockResolvedValue(true),
     unregisterRemoteDesktopViewer: vi.fn().mockResolvedValue(true),
diff --git a/src/main/runtime/rpc/terminal-requested-snapshot-unavailability.test.ts b/src/main/runtime/rpc/terminal-requested-snapshot-unavailability.test.ts
index 04e00788ffc1..4350280b9041 100644
--- a/src/main/runtime/rpc/terminal-requested-snapshot-unavailability.test.ts
+++ b/src/main/runtime/rpc/terminal-requested-snapshot-unavailability.test.ts
@@ -57,6 +57,7 @@ async function requestSnapshotReply(options: {
     getTerminalLaunchResult: () => undefined,
     registerRemoteTerminalViewSubscriber: () => () => {},
     resolveLiveLeafForHandle: vi.fn().mockReturnValue({ ptyId: 'pty-1' }),
+    isStoppedSwitchSourceHandle: () => false,
     requestRendererTerminalTabMount: vi.fn().mockReturnValue(true),
     updateRemoteDesktopViewer: vi.fn().mockResolvedValue(true),
     unregisterRemoteDesktopViewer: vi.fn().mockResolvedValue(true),
diff --git a/src/main/runtime/runtime-mobile-session-projection.ts b/src/main/runtime/runtime-mobile-session-projection.ts
index 2271be2d9ca0..f5a66c4a6019 100644
--- a/src/main/runtime/runtime-mobile-session-projection.ts
+++ b/src/main/runtime/runtime-mobile-session-projection.ts
@@ -28,6 +28,7 @@ import {
   terminalTitleBlocksExplicitAgentStatus
 } from './runtime-worktree-status-projection'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../shared/layout-owner-switch'
+import { stoppedSwitchSourcePty } from './session-tabs/stopped-switch-source-facts'
 
 export function projectRuntimeMobileSessionTabs(
   snapshot: RuntimeMobileSessionTabsSnapshot,
@@ -254,7 +255,7 @@ export function projectRuntimeMobileSessionTabs(
           paneKey,
           connected: true
         })
-      : livePty
+      : (livePty ?? stoppedSwitchSourcePty(tab, host.ptysById))
     const terminalHandle = terminalPty ? host.issuePtyHandle(terminalPty) : null
     const projectedAgentStatus =
       agentStatus ??
@@ -293,6 +294,7 @@ export function projectRuntimeMobileSessionTabs(
       ...(tab.ptyId ? { ptyId: tab.ptyId } : {}),
       // Bind identity to the handle's live owner, never a stale persisted surface.
       ...(terminalPty?.incarnationId ? { incarnationId: terminalPty.incarnationId } : {}),
+      ...(tab.stoppedSwitchSource ? { stoppedSwitchSource: tab.stoppedSwitchSource } : {}),
       ...(tab.terminalTheme ? { terminalTheme: tab.terminalTheme } : {}),
       ...(launchAgent ? { launchAgent } : {}),
       ...clientAgentStatus,
diff --git a/src/main/runtime/session-lifecycle/projection/prune-mobile-session-tab-group-layout.ts b/src/main/runtime/session-lifecycle/projection/prune-mobile-session-tab-group-layout.ts
index cd70f7642e98..d01e090f480c 100644
--- a/src/main/runtime/session-lifecycle/projection/prune-mobile-session-tab-group-layout.ts
+++ b/src/main/runtime/session-lifecycle/projection/prune-mobile-session-tab-group-layout.ts
@@ -81,7 +81,9 @@ export abstract class OrcaRuntimeWithPruneMobileSessionTabGroupLayout extends Or
     snapshot: RuntimeMobileSessionTabsSnapshot
   ): RuntimeMobileSessionTabsResult {
     snapshot = titleStructuredConversationTabs(
-      this.switchSlotAnchors.stamp(snapshot),
+      this.stoppedSwitchSources.stamp(this.switchSlotAnchors.stamp(snapshot), (ptyId) =>
+        this.ptysById.get(ptyId)
+      ),
       (sessionId) => this.structuredConversationTabName(snapshot.worktree, sessionId)
     )
     return projectRuntimeMobileSessionTabs(snapshot, this.getMobileSessionProjectionHost())
diff --git a/src/main/runtime/session-tabs/pty-backed-session-publication.ts b/src/main/runtime/session-tabs/pty-backed-session-publication.ts
index f142b2c4d5b1..f4751b24ff33 100644
--- a/src/main/runtime/session-tabs/pty-backed-session-publication.ts
+++ b/src/main/runtime/session-tabs/pty-backed-session-publication.ts
@@ -19,10 +19,13 @@ import {
   mergeMobileSessionTabGroups
 } from '../mobile-session-tab-merge'
 import { SwitchSlotAnchors } from './switch-slot-anchors'
+import { StoppedSwitchSourceFacts } from './stopped-switch-source-facts'
 
 export abstract class OrcaRuntimeWithPublishPtyBackedMobileSessionTerminal extends OrcaRuntimeWithHasLiveOrPersistedServeOrSshOwnedPtyBinding {
   /** Where switches put their destinations, for each destination's life (memory only). */
   readonly switchSlotAnchors = new SwitchSlotAnchors()
+  /** Panes a switch stopped with proof and nothing replaced (memory only). */
+  readonly stoppedSwitchSources = new StoppedSwitchSourceFacts()
   protected abstract markPaneLiveTitlesDirty(): void
   protected abstract getPtyManualTitle(
     ...args: Parameters<PtyTerminalSummaryMethods['getPtyManualTitle']>
diff --git a/src/main/runtime/session-tabs/stopped-switch-source-facts.test.ts b/src/main/runtime/session-tabs/stopped-switch-source-facts.test.ts
new file mode 100644
index 000000000000..06933884c3ad
--- /dev/null
+++ b/src/main/runtime/session-tabs/stopped-switch-source-facts.test.ts
@@ -0,0 +1,107 @@
+import '../rpc/unused-default-rpc-methods.test-fixture'
+import { expect, it, vi } from 'vitest'
+import type {
+  RuntimeMobileSessionTabsSnapshot,
+  RuntimeMobileSessionTerminalTab
+} from '../../../shared/runtime-types'
+import type { StoppedSwitchSourceFact } from '../../../shared/stopped-switch-source'
+import { StoppedSwitchSourceFacts } from './stopped-switch-source-facts'
+import {
+  sendDesktopMultiplexSubscribe,
+  startDesktopMultiplexSubscribe
+} from '../rpc/terminal-multiplex-test-harness'
+
+const pane = { worktreeId: 'w', tabId: 'tab', leafId: 'leaf' }
+const fact = (agent: 'claude' | 'codex'): StoppedSwitchSourceFact => ({
+  ptyId: 'pty-stopped',
+  incarnationId: 'inc-1',
+  agent,
+  providerSessionId: `${agent}-conversation`
+})
+const row = (extra: Partial<RuntimeMobileSessionTerminalTab> = {}) =>
+  ({
+    type: 'terminal',
+    id: 'tab::leaf',
+    title: 'Terminal',
+    parentTabId: 'tab',
+    leafId: 'leaf',
+    isActive: true,
+    ...extra
+  }) satisfies RuntimeMobileSessionTerminalTab
+const frame = (...tabs: RuntimeMobileSessionTerminalTab[]): RuntimeMobileSessionTabsSnapshot => ({
+  worktree: 'w',
+  publicationEpoch: 'epoch',
+  snapshotVersion: 1,
+  activeGroupId: null,
+  activeTabId: null,
+  activeTabType: null,
+  tabs
+})
+const stoppedOn = (snapshot: RuntimeMobileSessionTabsSnapshot) => {
+  const tab = snapshot.tabs[0]
+  return tab?.type === 'terminal' ? tab.stoppedSwitchSource : undefined
+}
+const exited = () => ({ connected: false, incarnationId: 'inc-1' })
+
+it.each(['claude', 'codex'] as const)(
+  'carries the fact on its pane in every frame while the pane names that process (%s)',
+  (agent) => {
+    const facts = new StoppedSwitchSourceFacts()
+    facts.record(pane, fact(agent))
+    // Before the window unbinds the pane, and after (a reconnect or new viewer re-reads it).
+    expect(stoppedOn(facts.stamp(frame(row({ ptyId: 'pty-stopped' })), exited))).toEqual(
+      fact(agent)
+    )
+    expect(stoppedOn(facts.stamp(frame(row()), exited))).toEqual(fact(agent))
+    expect(facts.stoppedProcess('pty-stopped', 'inc-1')).toBe(true)
+  }
+)
+
+it.each([
+  ['Restart or a rebind names another process', frame(row({ ptyId: 'pty-new' })), exited],
+  ['the pane closed, or a retry replaced it', frame(), exited],
+  [
+    'a successor runs on the same PTY id',
+    frame(row()),
+    () => ({ connected: true, incarnationId: 'inc-2' })
+  ]
+] as const)('drops the fact for good when %s', (_case, next, current) => {
+  const facts = new StoppedSwitchSourceFacts()
+  facts.record(pane, fact('codex'))
+  facts.stamp(next, current)
+  expect(stoppedOn(facts.stamp(frame(row()), exited))).toBeUndefined()
+  expect(facts.stoppedProcess('pty-stopped', 'inc-1')).toBe(false)
+})
+
+it('neither keeps a field a renderer republished nor costs a copy when there is none', () => {
+  const facts = new StoppedSwitchSourceFacts()
+  expect(stoppedOn(facts.stamp(frame(row({ stoppedSwitchSource: fact('codex') })), exited))).toBe(
+    undefined
+  )
+  const plain = frame(row({ ptyId: 'pty-live' }))
+  expect(facts.stamp(plain, exited)).toBe(plain)
+})
+
+it('never names an unknown or other incarnation stopped', () => {
+  const facts = new StoppedSwitchSourceFacts()
+  facts.record(pane, fact('codex'))
+  expect(facts.stoppedProcess('pty-stopped', undefined)).toBe(false)
+  expect(facts.stoppedProcess('pty-stopped', 'inc-2')).toBe(false)
+})
+
+it('answers an attach to a stopped source with the definitive exit', async () => {
+  const resolveLiveLeafForHandle = vi.fn()
+  const harness = startDesktopMultiplexSubscribe({
+    isStoppedSwitchSourceHandle: (handle) => handle === 'terminal-1',
+    resolveLiveLeafForHandle
+  })
+  await vi.waitFor(() => expect(harness.handlers.has(0)).toBe(true))
+  sendDesktopMultiplexSubscribe(harness.handlers)
+  await vi.waitFor(() =>
+    expect(harness.messages.map((message) => JSON.parse(message).result)).toContainEqual(
+      expect.objectContaining({ type: 'end', streamId: 7 })
+    )
+  )
+  expect(harness.messages.join('\n')).toContain('terminal_exited')
+  expect(resolveLiveLeafForHandle).not.toHaveBeenCalled()
+})
diff --git a/src/main/runtime/session-tabs/stopped-switch-source-facts.ts b/src/main/runtime/session-tabs/stopped-switch-source-facts.ts
new file mode 100644
index 000000000000..27e4c73eecee
--- /dev/null
+++ b/src/main/runtime/session-tabs/stopped-switch-source-facts.ts
@@ -0,0 +1,100 @@
+import type {
+  RuntimeMobileSessionTabsSnapshot,
+  RuntimeMobileSessionTerminalTab
+} from '../../../shared/runtime-types'
+import type { StoppedSwitchSourceFact } from '../../../shared/stopped-switch-source'
+
+type Row = RuntimeMobileSessionTabsSnapshot['tabs'][number]
+type Pane = { worktreeId: string; tabId: string; leafId: string }
+/** What main knows of a PTY now: a live successor on the same id ends the old process's fact. */
+type CurrentPty = (
+  ptyId: string
+) => { connected: boolean; incarnationId?: string | null } | undefined
+
+const paneKey = (tabId: string, leafId: string): string => `${tabId}\0${leafId}`
+
+/**
+ * The panes a switch stopped with proof and nothing replaced, kept in memory by main, which made
+ * the stop. Every frame carries the fact on that pane's row (a renderer republish can neither drop
+ * nor invent it), so the window and every paired client derive the stopped pane and its retry
+ * from one source. It dies when the row leaves (close, or a retry's replace) or when the pane
+ * names another process (Restart, a rebind, a successor on the same PTY id).
+ */
+export class StoppedSwitchSourceFacts {
+  private readonly byWorkspace = new Map<string, Map<string, StoppedSwitchSourceFact>>()
+
+  record(pane: Pane, fact: StoppedSwitchSourceFact): void {
+    const entries = this.byWorkspace.get(pane.worktreeId) ?? new Map()
+    this.byWorkspace.set(pane.worktreeId, entries)
+    entries.set(paneKey(pane.tabId, pane.leafId), fact)
+  }
+
+  /** Whether this exact process is a stopped switch source; an unknown incarnation never is. */
+  stoppedProcess(ptyId: string, incarnationId: string | null | undefined): boolean {
+    for (const entries of this.byWorkspace.values()) {
+      for (const fact of entries.values()) {
+        if (fact.ptyId === ptyId && fact.incarnationId === incarnationId) {
+          return true
+        }
+      }
+    }
+    return false
+  }
+
+  /** One pass over the frame's rows; a workspace with no fact and no stray field costs one scan. */
+  stamp(snapshot: RuntimeMobileSessionTabsSnapshot, current: CurrentPty) {
+    const entries = this.byWorkspace.get(snapshot.worktree)
+    const present = new Set<string>()
+    let tabs: Row[] | undefined
+    snapshot.tabs.forEach((row, index) => {
+      if (row.type !== 'terminal') {
+        return
+      }
+      const key = paneKey(row.parentTabId, row.leafId)
+      let fact = entries?.get(key)
+      const successor = fact && current(fact.ptyId)
+      if (
+        fact &&
+        ((row.ptyId && row.ptyId !== fact.ptyId) ||
+          (successor?.connected && successor.incarnationId !== fact.incarnationId))
+      ) {
+        entries!.delete(key)
+        fact = undefined
+      }
+      if (fact) {
+        present.add(key)
+      }
+      if (row.stoppedSwitchSource === fact) {
+        return
+      }
+      const { stoppedSwitchSource: _dropped, ...rest } = row
+      const next: RuntimeMobileSessionTerminalTab = fact
+        ? { ...rest, stoppedSwitchSource: fact }
+        : rest
+      tabs ??= [...snapshot.tabs]
+      tabs[index] = next
+    })
+    for (const key of entries?.keys() ?? []) {
+      if (!present.has(key)) {
+        entries!.delete(key)
+      }
+    }
+    if (entries?.size === 0) {
+      this.byWorkspace.delete(snapshot.worktree)
+    }
+    return tabs ? { ...snapshot, tabs } : snapshot
+  }
+}
+
+/**
+ * The exited process a stopped row still names, so the row keeps that process's own handle: an
+ * attach to it (an older client's reattach) is answered exited instead of waiting for a handle.
+ */
+export function stoppedSwitchSourcePty<Pty extends { incarnationId?: string | null }>(
+  row: Pick<RuntimeMobileSessionTerminalTab, 'stoppedSwitchSource'>,
+  ptysById: ReadonlyMap<string, Pty>
+): Pty | null {
+  const fact = row.stoppedSwitchSource
+  const pty = fact ? ptysById.get(fact.ptyId) : undefined
+  return pty && pty.incarnationId === fact?.incarnationId ? pty : null
+}
diff --git a/src/main/runtime/session-tabs/terminal-switch-close-capture.ts b/src/main/runtime/session-tabs/terminal-switch-close-capture.ts
index 39c77f5e806f..94ffcc579cef 100644
--- a/src/main/runtime/session-tabs/terminal-switch-close-capture.ts
+++ b/src/main/runtime/session-tabs/terminal-switch-close-capture.ts
@@ -8,6 +8,15 @@ import {
 import { OrcaRuntimeWithExplicitTerminalTabClose } from './explicit-terminal-tab-close'
 import type { AiVaultAgent } from '../../../shared/ai-vault-types'
 export abstract class OrcaRuntimeWithTerminalSwitchCloseCapture extends OrcaRuntimeWithExplicitTerminalTabClose {
+  /** Whether a handle names a process a switch stopped and left: an attach is answered exited. */
+  isStoppedSwitchSourceHandle(handle: string): boolean {
+    const ptyId = this.handles.get(handle)?.ptyId
+    return Boolean(
+      ptyId &&
+      this.stoppedSwitchSources.stoppedProcess(ptyId, this.ptysById.get(ptyId)?.incarnationId)
+    )
+  }
+
   captureTerminalSwitchClose(
     handle: string,
     incarnation: string,
@@ -113,11 +122,25 @@ export abstract class OrcaRuntimeWithTerminalSwitchCloseCapture extends OrcaRunt
        * once, only after proof of the stop; a replace's chat names itself, so the window settles
        * only once that chat is there and its replace has had its pass.
        */
-      settleStoppedSource: (switched?: { replacedBySessionId?: string; agent?: AiVaultAgent }) => {
+      settleStoppedSource: (switched?: {
+        replacedBySessionId?: string
+        agent?: AiVaultAgent
+        providerSessionId?: string
+      }) => {
         if (!keptStopped || stoppedSourceSettled) {
           return
         }
         stoppedSourceSettled = true
+        // Nothing replaced the stopped pane: main's fact, which every viewer's frame carries.
+        if (switched?.agent && switched.providerSessionId && !switched.replacedBySessionId) {
+          this.stoppedSwitchSources.record(source, {
+            ptyId: addressedPty,
+            incarnationId: incarnation,
+            agent: switched.agent,
+            providerSessionId: switched.providerSessionId
+          })
+          this.touchMobileSessionTabsForWorktree(source.worktreeId, { immediate: true })
+        }
         this.notifier?.settleStoppedSwitchSource?.({
           worktreeId: source.worktreeId,
           tabId: source.tabId,
diff --git a/src/shared/runtime-mobile-session-tab-contracts.ts b/src/shared/runtime-mobile-session-tab-contracts.ts
index 2de1e2315455..7f74657b5751 100644
--- a/src/shared/runtime-mobile-session-tab-contracts.ts
+++ b/src/shared/runtime-mobile-session-tab-contracts.ts
@@ -6,6 +6,7 @@ import type { TerminalColorOverrides } from './terminal-color-overrides'
 import type { TerminalLayoutSnapshot, TerminalTab } from './terminal-tab-types'
 import type { TuiAgent } from './tui-agent'
 import type { StructuredAgentId } from './agent-session-provider-handle'
+import type { StoppedSwitchSourceFact } from './stopped-switch-source'
 
 export type RuntimeMobileSessionTerminalTab = {
   /** Published in the tab it replaced's slot; a client whose order differs puts it where that tab was. */
@@ -26,6 +27,8 @@ export type RuntimeMobileSessionTerminalTab = {
   ptyId?: string | null
   /** Host-owned PTY incarnation used to fence remote identity observations. */
   incarnationId?: string | null
+  /** Main's: a switch stopped this pane's process and nothing replaced it. Old hosts omit it. */
+  stoppedSwitchSource?: StoppedSwitchSourceFact
   terminalTheme?: RuntimeMobileTerminalTheme
   agentStatus?: AgentStatusEntry | null
   /** Event-only lead-turn end time for paired clients; never persisted in AgentStatusEntry. */
diff --git a/src/shared/stopped-switch-source.ts b/src/shared/stopped-switch-source.ts
index 891638bd4acf..f570bff5563b 100644
--- a/src/shared/stopped-switch-source.ts
+++ b/src/shared/stopped-switch-source.ts
@@ -13,3 +13,15 @@ export type StoppedSwitchSource = {
    *  addressed close stopped it but could not remove its tab, which exits as any pane does. */
   switched?: { agent?: AiVaultAgent }
 }
+
+/**
+ * Main's fact on a terminal row: a switch stopped this exact process with proof and nothing
+ * replaced its pane. It names the conversation the process ran, so every viewer shows the stopped
+ * pane and offers the retry from the same fact. Current state, never an obligation.
+ */
+export type StoppedSwitchSourceFact = {
+  ptyId: string
+  incarnationId: string
+  agent: AiVaultAgent
+  providerSessionId: string
+}